kernel: add PCI id 14e4:4350 to ssb
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 25 Oct 2012 15:50:47 +0000 (15:50 +0000)
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 25 Oct 2012 15:50:47 +0000 (15:50 +0000)
* 14e4:4350 is found on a Broadcom BCM43222.
* remove some warnings when using a BCM43222.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33929 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/patches-3.3/021-ssb-add-PCI-ID-0x4350.patch [new file with mode: 0644]
target/linux/generic/patches-3.3/022-ssb-handle-BCM43222-in-pmu-code.patch [new file with mode: 0644]
target/linux/generic/patches-3.6/021-ssb-add-PCI-ID-0x4350.patch [new file with mode: 0644]
target/linux/generic/patches-3.6/022-ssb-handle-BCM43222-in-pmu-code.patch [new file with mode: 0644]

diff --git a/target/linux/generic/patches-3.3/021-ssb-add-PCI-ID-0x4350.patch b/target/linux/generic/patches-3.3/021-ssb-add-PCI-ID-0x4350.patch
new file mode 100644 (file)
index 0000000..e0be839
--- /dev/null
@@ -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.3/022-ssb-handle-BCM43222-in-pmu-code.patch b/target/linux/generic/patches-3.3/022-ssb-handle-BCM43222-in-pmu-code.patch
new file mode 100644 (file)
index 0000000..fe7a512
--- /dev/null
@@ -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
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 (file)
index 0000000..e0be839
--- /dev/null
@@ -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 (file)
index 0000000..fe7a512
--- /dev/null
@@ -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