Changeset 41899


Ignore:
Timestamp:
2014-07-30T20:54:10+02:00 (4 years ago)
Author:
hauke
Message:

kernel: update bcma to version master-2014-07-29-1

This is a backport of bcma from wireless-tesing/master tag master-2014-07-29-1.

For kernel < 3.10 this only adds the header changes needed by more
recent b43 versions.

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk/target/linux/generic
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.10/025-bcma_backport.patch

    r41804 r41899  
    285285        bcma_pmu_workarounds(cc); 
    286286 } 
    287 @@ -480,6 +603,7 @@ void bcma_pmu_spuravoid_pllupdate(struct 
     287@@ -480,6 +603,8 @@ void bcma_pmu_spuravoid_pllupdate(struct 
    288288                tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW; 
    289289                break; 
    290290  
     291+       case BCMA_CHIP_ID_BCM43131: 
    291292+       case BCMA_CHIP_ID_BCM43217: 
    292293        case BCMA_CHIP_ID_BCM43227: 
     
    881882  
    882883 #ifdef CONFIG_PM_SLEEP 
    883 @@ -267,14 +269,17 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc 
     884@@ -267,14 +269,18 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc 
    884885  
    885886 #endif /* CONFIG_PM_SLEEP */ 
     
    897898+       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) }, 
    898899+       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) }, 
     900+       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) }, 
    899901        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, 
    900902        { 0, }, 
     
    12341236        SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON, 
    12351237             SSB_SPROM8_LEDDC_ON_SHIFT); 
    1236 @@ -502,12 +528,13 @@ static bool bcma_sprom_onchip_available( 
     1238@@ -502,12 +528,14 @@ static bool bcma_sprom_onchip_available( 
    12371239        case BCMA_CHIP_ID_BCM4331: 
    12381240                present = chip_status & BCMA_CC_CHIPST_4331_OTP_PRESENT; 
     
    12451247                present = true; 
    12461248                break; 
     1249+       case BCMA_CHIP_ID_BCM43131: 
    12471250+       case BCMA_CHIP_ID_BCM43217: 
    12481251        case BCMA_CHIP_ID_BCM43227: 
    12491252        case BCMA_CHIP_ID_BCM43228: 
    12501253        case BCMA_CHIP_ID_BCM43428: 
    1251 @@ -550,7 +577,9 @@ int bcma_sprom_get(struct bcma_bus *bus) 
     1254@@ -550,7 +578,9 @@ int bcma_sprom_get(struct bcma_bus *bus) 
    12521255 { 
    12531256        u16 offset = BCMA_CC_SPROM; 
     
    12601263        if (!bus->drv_cc.core) 
    12611264                return -EOPNOTSUPP; 
    1262 @@ -579,32 +608,37 @@ int bcma_sprom_get(struct bcma_bus *bus) 
     1265@@ -579,32 +609,37 @@ int bcma_sprom_get(struct bcma_bus *bus) 
    12631266                } 
    12641267        } 
     
    13411344 #define BCMA_CORE_AMEMC                        0x52E   /* DDR1/2 memory controller core */ 
    13421345 #define BCMA_CORE_ALTA                 0x534   /* I2S core */ 
    1343 @@ -144,6 +157,9 @@ struct bcma_host_ops { 
     1346@@ -144,6 +157,10 @@ struct bcma_host_ops { 
    13441347  
    13451348 /* Chip IDs of PCIe devices */ 
    13461349 #define BCMA_CHIP_ID_BCM4313   0x4313 
    13471350+#define BCMA_CHIP_ID_BCM43142  43142 
     1351+#define BCMA_CHIP_ID_BCM43131  43131 
    13481352+#define BCMA_CHIP_ID_BCM43217  43217 
    13491353+#define BCMA_CHIP_ID_BCM43222  43222 
     
    13511355 #define  BCMA_PKG_ID_BCM43224_FAB_CSM  0x8 
    13521356 #define  BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa 
    1353 @@ -176,6 +192,11 @@ struct bcma_host_ops { 
     1357@@ -176,6 +193,11 @@ struct bcma_host_ops { 
    13541358 #define  BCMA_PKG_ID_BCM5357   11 
    13551359 #define BCMA_CHIP_ID_BCM53572  53572 
     
    13631367 /* Board types (on PCI usually equals to the subsystem dev id) */ 
    13641368 /* BCM4313 */ 
    1365 @@ -315,6 +336,7 @@ struct bcma_bus { 
     1369@@ -315,6 +337,7 @@ struct bcma_bus { 
    13661370  
    13671371        struct bcma_drv_cc drv_cc; 
     
    13711375        struct bcma_drv_gmac_cmn drv_gmac_cmn; 
    13721376  
    1373 @@ -400,7 +422,14 @@ static inline void bcma_maskset16(struct 
     1377@@ -400,7 +423,14 @@ static inline void bcma_maskset16(struct 
    13741378        bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set); 
    13751379 } 
  • trunk/target/linux/generic/patches-3.13/025-bcma_backport.patch

    r41804 r41899  
    3232--- a/drivers/bcma/driver_chipcommon_pmu.c 
    3333+++ b/drivers/bcma/driver_chipcommon_pmu.c 
    34 @@ -603,6 +603,7 @@ void bcma_pmu_spuravoid_pllupdate(struct 
     34@@ -603,6 +603,8 @@ void bcma_pmu_spuravoid_pllupdate(struct 
    3535                tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW; 
    3636                break; 
    3737  
     38+       case BCMA_CHIP_ID_BCM43131: 
    3839+       case BCMA_CHIP_ID_BCM43217: 
    3940        case BCMA_CHIP_ID_BCM43227: 
     
    459460        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) }, 
    460461        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) }, 
    461 @@ -280,6 +279,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_ 
     462@@ -280,6 +279,8 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_ 
    462463        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) }, 
    463464        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) }, 
    464465        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) }, 
    465466+       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) }, 
     467+       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) }, 
    466468        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, 
    467469        { 0, }, 
     
    583585        SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON, 
    584586             SSB_SPROM8_LEDDC_ON_SHIFT); 
    585 @@ -509,6 +534,7 @@ static bool bcma_sprom_onchip_available( 
     587@@ -509,6 +534,8 @@ static bool bcma_sprom_onchip_available( 
    586588                /* for these chips OTP is always available */ 
    587589                present = true; 
    588590                break; 
     591+       case BCMA_CHIP_ID_BCM43131: 
    589592+       case BCMA_CHIP_ID_BCM43217: 
    590593        case BCMA_CHIP_ID_BCM43227: 
     
    601604 #include <linux/bcma/bcma_driver_gmac_cmn.h> 
    602605 #include <linux/ssb/ssb.h> /* SPROM sharing */ 
    603 @@ -157,6 +158,8 @@ struct bcma_host_ops { 
     606@@ -157,6 +158,9 @@ struct bcma_host_ops { 
    604607 /* Chip IDs of PCIe devices */ 
    605608 #define BCMA_CHIP_ID_BCM4313   0x4313 
    606609 #define BCMA_CHIP_ID_BCM43142  43142 
     610+#define BCMA_CHIP_ID_BCM43131  43131 
    607611+#define BCMA_CHIP_ID_BCM43217  43217 
    608612+#define BCMA_CHIP_ID_BCM43222  43222 
     
    610614 #define  BCMA_PKG_ID_BCM43224_FAB_CSM  0x8 
    611615 #define  BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa 
    612 @@ -333,6 +336,7 @@ struct bcma_bus { 
     616@@ -333,6 +337,7 @@ struct bcma_bus { 
    613617  
    614618        struct bcma_drv_cc drv_cc; 
     
    618622        struct bcma_drv_gmac_cmn drv_gmac_cmn; 
    619623  
    620 @@ -418,7 +422,14 @@ static inline void bcma_maskset16(struct 
     624@@ -418,7 +423,14 @@ static inline void bcma_maskset16(struct 
    621625        bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set); 
    622626 } 
  • trunk/target/linux/generic/patches-3.14/025-bcma_backport.patch

    r41804 r41899  
    1111--- a/drivers/bcma/driver_chipcommon_pmu.c 
    1212+++ b/drivers/bcma/driver_chipcommon_pmu.c 
    13 @@ -603,6 +603,7 @@ void bcma_pmu_spuravoid_pllupdate(struct 
     13@@ -603,6 +603,8 @@ void bcma_pmu_spuravoid_pllupdate(struct 
    1414                tmp = BCMA_CC_PMU_CTL_PLL_UPD | BCMA_CC_PMU_CTL_NOILPONW; 
    1515                break; 
    1616  
     17+       case BCMA_CHIP_ID_BCM43131: 
    1718+       case BCMA_CHIP_ID_BCM43217: 
    1819        case BCMA_CHIP_ID_BCM43227: 
     
    218219--- a/drivers/bcma/host_pci.c 
    219220+++ b/drivers/bcma/host_pci.c 
    220 @@ -279,6 +279,7 @@ static const struct pci_device_id bcma_p 
     221@@ -279,6 +279,8 @@ static const struct pci_device_id bcma_p 
    221222        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) }, 
    222223        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) }, 
    223224        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) }, 
    224225+       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) }, 
     226+       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) }, 
    225227        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, 
    226228        { 0, }, 
     
    307309        SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON, 
    308310             SSB_SPROM8_LEDDC_ON_SHIFT); 
    309 @@ -509,6 +534,7 @@ static bool bcma_sprom_onchip_available( 
     311@@ -509,6 +534,8 @@ static bool bcma_sprom_onchip_available( 
    310312                /* for these chips OTP is always available */ 
    311313                present = true; 
    312314                break; 
     315+       case BCMA_CHIP_ID_BCM43131: 
    313316+       case BCMA_CHIP_ID_BCM43217: 
    314317        case BCMA_CHIP_ID_BCM43227: 
     
    325328 #include <linux/bcma/bcma_driver_gmac_cmn.h> 
    326329 #include <linux/ssb/ssb.h> /* SPROM sharing */ 
    327 @@ -157,6 +158,8 @@ struct bcma_host_ops { 
     330@@ -157,6 +158,9 @@ struct bcma_host_ops { 
    328331 /* Chip IDs of PCIe devices */ 
    329332 #define BCMA_CHIP_ID_BCM4313   0x4313 
    330333 #define BCMA_CHIP_ID_BCM43142  43142 
     334+#define BCMA_CHIP_ID_BCM43131  43131 
    331335+#define BCMA_CHIP_ID_BCM43217  43217 
    332336+#define BCMA_CHIP_ID_BCM43222  43222 
     
    334338 #define  BCMA_PKG_ID_BCM43224_FAB_CSM  0x8 
    335339 #define  BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa 
    336 @@ -333,6 +336,7 @@ struct bcma_bus { 
     340@@ -333,6 +337,7 @@ struct bcma_bus { 
    337341  
    338342        struct bcma_drv_cc drv_cc; 
  • trunk/target/linux/generic/patches-3.3/025-bcma_backport.patch

    r38290 r41899  
    47184718 #define BCMA_CORE_CHIPCOMMON           0x800 
    47194719 #define BCMA_CORE_ILINE20              0x801 
    4720 @@ -121,10 +146,109 @@ struct bcma_host_ops { 
     4720@@ -121,10 +146,112 @@ struct bcma_host_ops { 
    47214721 #define BCMA_CORE_I2S                  0x834 
    47224722 #define BCMA_CORE_SDR_DDR1_MEM_CTL     0x835   /* SDR/DDR1 memory controller core */ 
     
    47334733+#define BCMA_CHIP_ID_BCM4313   0x4313 
    47344734+#define BCMA_CHIP_ID_BCM43142  43142 
     4735+#define BCMA_CHIP_ID_BCM43131  43131 
     4736+#define BCMA_CHIP_ID_BCM43217  43217 
     4737+#define BCMA_CHIP_ID_BCM43222  43222 
    47354738+#define BCMA_CHIP_ID_BCM43224  43224 
    47364739+#define  BCMA_PKG_ID_BCM43224_FAB_CSM  0x8 
     
    48284831        struct bcma_bus *bus; 
    48294832        struct bcma_device_id id; 
    4830 @@ -136,8 +260,10 @@ struct bcma_device { 
     4833@@ -136,8 +263,10 @@ struct bcma_device { 
    48314834        bool dev_registered; 
    48324835  
     
    48394842  
    48404843        void __iomem *io_addr; 
    4841 @@ -175,6 +301,12 @@ int __bcma_driver_register(struct bcma_d 
     4844@@ -175,6 +304,12 @@ int __bcma_driver_register(struct bcma_d 
    48424845  
    48434846 extern void bcma_driver_unregister(struct bcma_driver *drv); 
     
    48524855        /* The MMIO area. */ 
    48534856        void __iomem *mmio; 
    4854 @@ -191,14 +323,18 @@ struct bcma_bus { 
     4857@@ -191,14 +326,18 @@ struct bcma_bus { 
    48554858  
    48564859        struct bcma_chipinfo chipinfo; 
     
    48724875        /* We decided to share SPROM struct with SSB as long as we do not need 
    48734876         * any hacks for BCMA. This simplifies drivers code. */ 
    4874 @@ -282,6 +418,7 @@ static inline void bcma_maskset16(struct 
     4877@@ -282,6 +421,7 @@ static inline void bcma_maskset16(struct 
    48754878        bcma_write16(cc, offset, (bcma_read16(cc, offset) & mask) | set); 
    48764879 } 
     
    48804883 extern void bcma_core_disable(struct bcma_device *core, u32 flags); 
    48814884 extern int bcma_core_enable(struct bcma_device *core, u32 flags); 
    4882 @@ -289,6 +426,7 @@ extern void bcma_core_set_clockmode(stru 
     4885@@ -289,6 +429,7 @@ extern void bcma_core_set_clockmode(stru 
    48834886                                    enum bcma_clkmode clkmode); 
    48844887 extern void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, 
  • trunk/target/linux/generic/patches-3.8/025-bcma_backport.patch

    r38290 r41899  
    14771477 #define BCMA_CORE_AMEMC                        0x52E   /* DDR1/2 memory controller core */ 
    14781478 #define BCMA_CORE_ALTA                 0x534   /* I2S core */ 
    1479 @@ -134,12 +146,17 @@ struct bcma_host_ops { 
     1479@@ -134,12 +146,20 @@ struct bcma_host_ops { 
    14801480 #define BCMA_CORE_I2S                  0x834 
    14811481 #define BCMA_CORE_SDR_DDR1_MEM_CTL     0x835   /* SDR/DDR1 memory controller core */ 
     
    14921492 #define BCMA_CHIP_ID_BCM4313   0x4313 
    14931493+#define BCMA_CHIP_ID_BCM43142  43142 
     1494+#define BCMA_CHIP_ID_BCM43131  43131 
     1495+#define BCMA_CHIP_ID_BCM43217  43217 
     1496+#define BCMA_CHIP_ID_BCM43222  43222 
    14941497 #define BCMA_CHIP_ID_BCM43224  43224 
    14951498 #define  BCMA_PKG_ID_BCM43224_FAB_CSM  0x8 
    14961499 #define  BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa 
    1497 @@ -172,6 +189,65 @@ struct bcma_host_ops { 
     1500@@ -172,6 +192,65 @@ struct bcma_host_ops { 
    14981501 #define  BCMA_PKG_ID_BCM5357   11 
    14991502 #define BCMA_CHIP_ID_BCM53572  53572 
  • trunk/target/linux/generic/patches-3.9/025-bcma_backport.patch

    r38290 r41899  
    844844 #define BCMA_CORE_AMEMC                        0x52E   /* DDR1/2 memory controller core */ 
    845845 #define BCMA_CORE_ALTA                 0x534   /* I2S core */ 
    846 @@ -134,12 +146,17 @@ struct bcma_host_ops { 
     846@@ -134,12 +146,20 @@ struct bcma_host_ops { 
    847847 #define BCMA_CORE_I2S                  0x834 
    848848 #define BCMA_CORE_SDR_DDR1_MEM_CTL     0x835   /* SDR/DDR1 memory controller core */ 
     
    859859 #define BCMA_CHIP_ID_BCM4313   0x4313 
    860860+#define BCMA_CHIP_ID_BCM43142  43142 
     861+#define BCMA_CHIP_ID_BCM43131  43131 
     862+#define BCMA_CHIP_ID_BCM43217  43217 
     863+#define BCMA_CHIP_ID_BCM43222  43222 
    861864 #define BCMA_CHIP_ID_BCM43224  43224 
    862865 #define  BCMA_PKG_ID_BCM43224_FAB_CSM  0x8 
    863866 #define  BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa 
    864 @@ -172,6 +189,65 @@ struct bcma_host_ops { 
     867@@ -172,6 +192,65 @@ struct bcma_host_ops { 
    865868 #define  BCMA_PKG_ID_BCM5357   11 
    866869 #define BCMA_CHIP_ID_BCM53572  53572 
Note: See TracChangeset for help on using the changeset viewer.