kernel: add missing bcma defines and header file for bcrmfmac

[openwrt.git] / target / linux / generic / patches-3.8 / 025-bcma_backport.patch

diff --git a/target/linux/generic/patches-3.8/025-bcma_backport.patch b/target/linux/generic/patches-3.8/025-bcma_backport.patch
index 1cabd42..c80275b 100644 (file)
--- a/target/linux/generic/patches-3.8/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.8/025-bcma_backport.patch
@@ -649,7 +649,17 @@
  #define BCMA_CC_JCMD                  0x0030          /* Rev >= 10 only */
  #define  BCMA_CC_JCMD_START           0x80000000
  #define  BCMA_CC_JCMD_BUSY            0x80000000
-@@ -606,6 +607,8 @@ void bcma_chipco_bcm4331_ext_pa_lines_ct
+@@ -315,6 +316,9 @@
+ #define BCMA_CC_PMU_CTL                       0x0600 /* PMU control */
+ #define  BCMA_CC_PMU_CTL_ILP_DIV      0xFFFF0000 /* ILP div mask */
+ #define  BCMA_CC_PMU_CTL_ILP_DIV_SHIFT        16
++#define  BCMA_CC_PMU_CTL_RES          0x00006000 /* reset control mask */
++#define  BCMA_CC_PMU_CTL_RES_SHIFT    13
++#define  BCMA_CC_PMU_CTL_RES_RELOAD   0x2     /* reload POR values */
+ #define  BCMA_CC_PMU_CTL_PLL_UPD      0x00000400
+ #define  BCMA_CC_PMU_CTL_NOILPONW     0x00000200 /* No ILP on wait */
+ #define  BCMA_CC_PMU_CTL_HTREQEN      0x00000100 /* HT req enable */
+@@ -606,6 +610,8 @@ void bcma_chipco_bcm4331_ext_pa_lines_ct
  
  extern u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks);
  
@@ -793,3 +803,23 @@
                break;
        default:
                bcma_err(bus, "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
+--- a/include/linux/bcma/bcma.h
++++ b/include/linux/bcma/bcma.h
+@@ -134,6 +134,7 @@ struct bcma_host_ops {
+ #define BCMA_CORE_I2S                 0x834
+ #define BCMA_CORE_SDR_DDR1_MEM_CTL    0x835   /* SDR/DDR1 memory controller core */
+ #define BCMA_CORE_SHIM                        0x837   /* SHIM component in ubus/6362 */
++#define BCMA_CORE_ARM_CR4             0x83e
+ #define BCMA_CORE_DEFAULT             0xFFF
+ 
+ #define BCMA_MAX_NR_CORES             16
+--- a/include/linux/bcma/bcma_regs.h
++++ b/include/linux/bcma/bcma_regs.h
+@@ -37,6 +37,7 @@
+ #define  BCMA_IOST_BIST_DONE          0x8000
+ #define BCMA_RESET_CTL                        0x0800
+ #define  BCMA_RESET_CTL_RESET         0x0001
++#define BCMA_RESET_ST                 0x0804
+ 
+ /* BCMA PCI config space registers. */
+ #define BCMA_PCI_PMCSR                        0x44