mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: ssb/bcma: update to version from wireless-testing tag master-2012-07-02
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32580 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/ssb/b43_pci_bridge.c
|
||||
+++ b/drivers/ssb/b43_pci_bridge.c
|
||||
@@ -29,6 +29,8 @@ static const struct pci_device_id b43_pc
|
||||
@@ -29,11 +29,14 @@ static const struct pci_device_id b43_pc
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
|
||||
@@ -9,6 +9,12 @@
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4329) },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
|
||||
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
|
||||
{ 0, },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
|
||||
--- a/drivers/ssb/driver_chipcommon_pmu.c
|
||||
+++ b/drivers/ssb/driver_chipcommon_pmu.c
|
||||
@@ -13,6 +13,9 @@
|
||||
@@ -444,7 +450,16 @@
|
||||
GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
|
||||
--- a/drivers/ssb/scan.c
|
||||
+++ b/drivers/ssb/scan.c
|
||||
@@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
|
||||
@@ -90,6 +90,8 @@ const char *ssb_core_name(u16 coreid)
|
||||
return "ARM 1176";
|
||||
case SSB_DEV_ARM_7TDMI:
|
||||
return "ARM 7TDMI";
|
||||
+ case SSB_DEV_ARM_CM3:
|
||||
+ return "ARM Cortex M3";
|
||||
}
|
||||
return "UNKNOWN";
|
||||
}
|
||||
@@ -318,6 +320,9 @@ int ssb_bus_scan(struct ssb_bus *bus,
|
||||
bus->chip_package = 0;
|
||||
}
|
||||
}
|
||||
@@ -650,6 +665,14 @@
|
||||
};
|
||||
|
||||
|
||||
@@ -166,6 +243,7 @@ struct ssb_bus_ops {
|
||||
#define SSB_DEV_MINI_MACPHY 0x823
|
||||
#define SSB_DEV_ARM_1176 0x824
|
||||
#define SSB_DEV_ARM_7TDMI 0x825
|
||||
+#define SSB_DEV_ARM_CM3 0x82A
|
||||
|
||||
/* Vendor-ID values */
|
||||
#define SSB_VENDOR_BROADCOM 0x4243
|
||||
--- a/include/linux/ssb/ssb_driver_gige.h
|
||||
+++ b/include/linux/ssb/ssb_driver_gige.h
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
Reference in New Issue
Block a user