diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-18 07:27:33 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-23 09:24:05 +0200 |
| commit | cf40770bdc33482d769e6154e0ffbc2e156d9a1e (patch) | |
| tree | caac2c35f19a60e2ba833aceb8f0ad843ae64b74 /linux/drivers/soc/fsl/qbman/qman_ccsr.c | |
| parent | qbman: Fix platform_get_irq() error checks (diff) | |
| download | rtems-libbsd-cf40770bdc33482d769e6154e0ffbc2e156d9a1e.tar.bz2 | |
Linux update to 4.12-rc1+
Linux baseline b23afd384801711ab6dbccd259cc14cb09a1dcaf.
Diffstat (limited to 'linux/drivers/soc/fsl/qbman/qman_ccsr.c')
| -rw-r--r-- | linux/drivers/soc/fsl/qbman/qman_ccsr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/soc/fsl/qbman/qman_ccsr.c b/linux/drivers/soc/fsl/qbman/qman_ccsr.c index 51fc7bfa..68925be0 100644 --- a/linux/drivers/soc/fsl/qbman/qman_ccsr.c +++ b/linux/drivers/soc/fsl/qbman/qman_ccsr.c @@ -46,6 +46,8 @@ u16 qman_ip_rev; EXPORT_SYMBOL(qman_ip_rev); u16 qm_channel_pool1 = QMAN_CHANNEL_POOL1; EXPORT_SYMBOL(qm_channel_pool1); +u16 qm_channel_caam = QMAN_CHANNEL_CAAM; +EXPORT_SYMBOL(qm_channel_caam); /* Register offsets */ #define REG_QCSP_LIO_CFG(n) (0x0000 + ((n) * 0x10)) @@ -754,8 +756,10 @@ static int fsl_qman_probe(struct platform_device *pdev) return -ENODEV; } - if ((qman_ip_rev & 0xff00) >= QMAN_REV30) + if ((qman_ip_rev & 0xff00) >= QMAN_REV30) { qm_channel_pool1 = QMAN_CHANNEL_POOL1_REV3; + qm_channel_caam = QMAN_CHANNEL_CAAM_REV3; + } ret = zero_priv_mem(dev, node, fqd_a, fqd_sz); WARN_ON(ret); |