Changeset 42020


Ignore:
Timestamp:
2014-08-07T00:01:13+02:00 (3 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.

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

backport: r41899

File:
1 edited

Legend:

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

    r41804 r42020  
    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 } 
Note: See TracChangeset for help on using the changeset viewer.