Changeset cf40770 in rtems-libbsd for linux/drivers/soc/fsl/qbman/qman_ccsr.c

Timestamp:

05/18/17 05:27:33 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, master

Children:

b3a6ad0

Parents:

721b1c1

git-author:

Sebastian Huber <sebastian.huber@…> (05/18/17 05:27:33)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/23/17 07:24:05)

Message:

Linux update to 4.12-rc1+

Linux baseline b23afd384801711ab6dbccd259cc14cb09a1dcaf.

File:

• linux/drivers/soc/fsl/qbman/qman_ccsr.c (modified) (2 diffs)

linux/drivers/soc/fsl/qbman/qman_ccsr.c

@@ -47 +47 @@
 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 */
@@ -755 +757 @@
         }
 
-        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);