diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-02 23:12:58 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-02 23:12:58 +0000 |
| commit | bd9fa13c731dc9265e9ca8b640449e769a4d3d2d (patch) | |
| tree | 7cb08e413b46265c3bef3318b166059676e162e7 /target/linux/brcm47xx/patches-3.3/020-bcma-move-parallel-flash-into-a-union.patch | |
| parent | b2e2de794ec0b592052d3a6375b8987654c25093 (diff) | |
| download | master-31e0f0ae-bd9fa13c731dc9265e9ca8b640449e769a4d3d2d.tar.gz master-31e0f0ae-bd9fa13c731dc9265e9ca8b640449e769a4d3d2d.tar.bz2 master-31e0f0ae-bd9fa13c731dc9265e9ca8b640449e769a4d3d2d.zip | |
kernel: ssb/bcma: update to version from wireless-testing tag master-2012-07-02
SVN-Revision: 32580
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/020-bcma-move-parallel-flash-into-a-union.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/020-bcma-move-parallel-flash-into-a-union.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/020-bcma-move-parallel-flash-into-a-union.patch b/target/linux/brcm47xx/patches-3.3/020-bcma-move-parallel-flash-into-a-union.patch index 0042ff7ed8..286508d543 100644 --- a/target/linux/brcm47xx/patches-3.3/020-bcma-move-parallel-flash-into-a-union.patch +++ b/target/linux/brcm47xx/patches-3.3/020-bcma-move-parallel-flash-into-a-union.patch @@ -91,9 +91,9 @@ #define BCMA_CC_BCAST_ADDR 0x0050 #define BCMA_CC_BCAST_DATA 0x0054 #define BCMA_CC_GPIOPULLUP 0x0058 /* Rev >= 20 only */ -@@ -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 */ +@@ -346,6 +404,12 @@ + /* 4313 Chip specific ChipControl register bits */ + #define BCMA_CCTRL_4313_12MA_LED_DRIVE 0x00000007 /* 12 mA drive strengh for later 4313 */ +#define BCMA_FLASH2 0x1c000000 /* Flash Region 2 (region 1 shadowed here) */ +#define BCMA_FLASH2_SZ 0x02000000 /* Size of Flash Region 2 */ @@ -104,7 +104,7 @@ /* Data for the PMU, if available. * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU) */ -@@ -333,6 +397,10 @@ struct bcma_chipcommon_pmu { +@@ -355,6 +419,10 @@ struct bcma_chipcommon_pmu { }; #ifdef CONFIG_BCMA_DRIVER_MIPS @@ -115,7 +115,7 @@ struct bcma_pflash { u8 buswidth; u32 window; -@@ -358,7 +426,10 @@ struct bcma_drv_cc { +@@ -380,7 +448,10 @@ struct bcma_drv_cc { u16 fast_pwrup_delay; struct bcma_chipcommon_pmu pmu; #ifdef CONFIG_BCMA_DRIVER_MIPS |