diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 15:50:47 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 15:50:47 +0000 |
| commit | d4ef5de6043feb3cb12bdc56fdc9d37d2ccb3db8 (patch) | |
| tree | cc9bcf1421563383ffcd7b89f708571653c58adc /target/linux/generic/patches-3.6 | |
| parent | 1e2962e63c9e4a6d6a0af120943d0b56ef53a3ce (diff) | |
| download | upstream-d4ef5de6043feb3cb12bdc56fdc9d37d2ccb3db8.tar.gz upstream-d4ef5de6043feb3cb12bdc56fdc9d37d2ccb3db8.tar.bz2 upstream-d4ef5de6043feb3cb12bdc56fdc9d37d2ccb3db8.zip | |
kernel: add PCI id 14e4:4350 to ssb
* 14e4:4350 is found on a Broadcom BCM43222.
* remove some warnings when using a BCM43222.
SVN-Revision: 33929
Diffstat (limited to 'target/linux/generic/patches-3.6')
| -rw-r--r-- | target/linux/generic/patches-3.6/021-ssb-add-PCI-ID-0x4350.patch | 10 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.6/022-ssb-handle-BCM43222-in-pmu-code.patch | 19 |
2 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.6/021-ssb-add-PCI-ID-0x4350.patch b/target/linux/generic/patches-3.6/021-ssb-add-PCI-ID-0x4350.patch new file mode 100644 index 0000000000..e0be83980f --- /dev/null +++ b/target/linux/generic/patches-3.6/021-ssb-add-PCI-ID-0x4350.patch @@ -0,0 +1,10 @@ +--- a/drivers/ssb/b43_pci_bridge.c ++++ b/drivers/ssb/b43_pci_bridge.c +@@ -37,6 +37,7 @@ static const struct pci_device_id b43_pc + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) }, + { 0, }, + }; + MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl); diff --git a/target/linux/generic/patches-3.6/022-ssb-handle-BCM43222-in-pmu-code.patch b/target/linux/generic/patches-3.6/022-ssb-handle-BCM43222-in-pmu-code.patch new file mode 100644 index 0000000000..fe7a5120af --- /dev/null +++ b/target/linux/generic/patches-3.6/022-ssb-handle-BCM43222-in-pmu-code.patch @@ -0,0 +1,19 @@ +--- a/drivers/ssb/driver_chipcommon_pmu.c ++++ b/drivers/ssb/driver_chipcommon_pmu.c +@@ -346,6 +346,8 @@ static void ssb_pmu_pll_init(struct ssb_ + chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0); + } + break; ++ case 43222: ++ break; + default: + ssb_printk(KERN_ERR PFX + "ERROR: PLL init unknown for device %04X\n", +@@ -434,6 +436,7 @@ static void ssb_pmu_resources_init(struc + min_msk = 0xCBB; + break; + case 0x4322: ++ case 43222: + /* We keep the default settings: + * min_msk = 0xCBB + * max_msk = 0x7FFFF |