diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-04-13 19:35:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-04-13 19:35:40 +0000 |
| commit | 5af062a0e0b49bf83019a10e850c418d9b2eb56b (patch) | |
| tree | 79b510da8615158d8c424316720200df96151644 /target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch | |
| parent | 53e32542e15ab3480085f11f94ad1e08368f2f0f (diff) | |
| download | master-187ad058-5af062a0e0b49bf83019a10e850c418d9b2eb56b.tar.gz master-187ad058-5af062a0e0b49bf83019a10e850c418d9b2eb56b.tar.bz2 master-187ad058-5af062a0e0b49bf83019a10e850c418d9b2eb56b.zip | |
kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31278 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch b/target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch index f86183466c..0042ff7ed8 100644 --- a/target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch +++ b/target/linux/brcm47xx/patches-3.2/020-bcma-move-parallel-flash-into-a-union.patch @@ -22,7 +22,7 @@ --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -108,10 +108,68 @@ +@@ -117,10 +117,68 @@ #define BCMA_CC_JCTL_EXT_EN 2 /* Enable external targets */ #define BCMA_CC_JCTL_EN 1 /* Enable Jtag master */ #define BCMA_CC_FLASHCTL 0x0040 @@ -91,7 +91,7 @@ #define BCMA_CC_BCAST_ADDR 0x0050 #define BCMA_CC_BCAST_DATA 0x0054 #define BCMA_CC_GPIOPULLUP 0x0058 /* Rev >= 20 only */ -@@ -300,6 +358,12 @@ +@@ -324,6 +382,12 @@ #define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4 BIT(16) /* enable bt_shd0 at gpio4 */ #define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5 BIT(17) /* enable bt_shd1 at gpio5 */ @@ -104,7 +104,7 @@ /* Data for the PMU, if available. * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU) */ -@@ -309,6 +373,10 @@ struct bcma_chipcommon_pmu { +@@ -333,6 +397,10 @@ struct bcma_chipcommon_pmu { }; #ifdef CONFIG_BCMA_DRIVER_MIPS @@ -115,7 +115,7 @@ struct bcma_pflash { u8 buswidth; u32 window; -@@ -334,7 +402,10 @@ struct bcma_drv_cc { +@@ -358,7 +426,10 @@ struct bcma_drv_cc { u16 fast_pwrup_delay; struct bcma_chipcommon_pmu pmu; #ifdef CONFIG_BCMA_DRIVER_MIPS |