kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.2 / 020-bcma-move-parallel-flash-into-a-union.patch

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 f86183466c873272017c81b975d4730699188b96..0042ff7ed8f3fc8cee1c988bfe0198c02dcd1144 100644 (file)
--- 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