diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-12-19 23:33:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-12-19 23:33:03 +0000 |
| commit | 1aa5a61754d4995d8144a48dde0565211da0d5a8 (patch) | |
| tree | a2c895a01cfc9fed7c1ae00faa35a208503c6de7 /target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch | |
| parent | 91d0ef6f19337ec72482a0eedf4e4ae91ffffca1 (diff) | |
| download | upstream-1aa5a61754d4995d8144a48dde0565211da0d5a8.tar.gz upstream-1aa5a61754d4995d8144a48dde0565211da0d5a8.tar.bz2 upstream-1aa5a61754d4995d8144a48dde0565211da0d5a8.zip | |
kernel: update bcma and ssb to version master-2011-12-16 from wireless-testing
SVN-Revision: 29574
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch b/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch index 9a4e877287..11855b4496 100644 --- a/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch +++ b/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch @@ -104,9 +104,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #define BCMA_CC_BCAST_ADDR 0x0050 #define BCMA_CC_BCAST_DATA 0x0054 #define BCMA_CC_GPIOPULLUP 0x0058 /* Rev >= 20 only */ -@@ -283,6 +341,12 @@ - #define BCMA_CC_PPL_PCHI_OFF 5 - #define BCMA_CC_PPL_PCHI_MASK 0x0000003f +@@ -300,6 +358,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 */ +#define BCMA_FLASH2 0x1c000000 /* Flash Region 2 (region 1 shadowed here) */ +#define BCMA_FLASH2_SZ 0x02000000 /* Size of Flash Region 2 */ @@ -117,7 +117,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /* Data for the PMU, if available. * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU) */ -@@ -292,6 +356,10 @@ struct bcma_chipcommon_pmu { +@@ -309,6 +373,10 @@ struct bcma_chipcommon_pmu { }; #ifdef CONFIG_BCMA_DRIVER_MIPS @@ -128,7 +128,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> struct bcma_pflash { u8 buswidth; u32 window; -@@ -317,7 +385,10 @@ struct bcma_drv_cc { +@@ -334,7 +402,10 @@ struct bcma_drv_cc { u16 fast_pwrup_delay; struct bcma_chipcommon_pmu pmu; #ifdef CONFIG_BCMA_DRIVER_MIPS |