kernel: update bcma and ssb to wireless-testing master-2013-09-09

SVN-Revision: 37957

5 files changed, 0 insertions, 226 deletions

diff --git a/target/linux/bcm53xx/patches-3.10/101-bcma-add-some-more-core-names.patch b/target/linux/bcm53xx/patches-3.10/101-bcma-add-some-more-core-names.patch
deleted file mode 100644
index 64bf3435b1..0000000000
--- a/target/linux/bcm53xx/patches-3.10/101-bcma-add-some-more-core-names.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-bcma: add some more core names
-
-These cores were found on a BCM4708 (chipid 53010), this is a ARM SoC
-with two Cortex A9 cores.
-
-bcma: bus0: Found chip with id 0xCF12, rev 0x00 and package 0x02
-bcma: bus0: Core 0 found: ChipCommon (manuf 0x4BF, id 0x800, rev 0x2A, class 0x0)
-bcma: bus0: Core 1 found: DMA (manuf 0x4BF, id 0x502, rev 0x01, class 0x0)
-bcma: bus0: Core 2 found: GBit MAC (manuf 0x4BF, id 0x82D, rev 0x04, class 0x0)
-bcma: bus0: Core 3 found: GBit MAC (manuf 0x4BF, id 0x82D, rev 0x04, class 0x0)
-bcma: bus0: Core 4 found: GBit MAC (manuf 0x4BF, id 0x82D, rev 0x04, class 0x0)
-bcma: bus0: Core 5 found: GBit MAC (manuf 0x4BF, id 0x82D, rev 0x04, class 0x0)
-bcma: bus0: Core 6 found: PCIe Gen 2 (manuf 0x4BF, id 0x501, rev 0x01, class 0x0)
-bcma: bus0: Core 7 found: PCIe Gen 2 (manuf 0x4BF, id 0x501, rev 0x01, class 0x0)
-bcma: bus0: Core 8 found: ARM Cortex A9 core (ihost) (manuf 0x4BF, id 0x510, rev 0x01, class 0x0)
-bcma: bus0: Core 9 found: USB 2.0 (manuf 0x4BF, id 0x504, rev 0x01, class 0x0)
-bcma: bus0: Core 10 found: USB 3.0 (manuf 0x4BF, id 0x505, rev 0x01, class 0x0)
-bcma: bus0: Core 11 found: SDIO3 (manuf 0x4BF, id 0x503, rev 0x01, class 0x0)
-bcma: bus0: Core 12 found: ARM Cortex A9 JTAG (manuf 0x4BF, id 0x506, rev 0x01, class 0x0)
-bcma: bus0: Core 13 found: Denali DDR2/DDR3 memory controller (manuf 0x4BF, id 0x507, rev 0x01, class 0x0)
-bcma: bus0: Core 14 found: ROM (manuf 0x4BF, id 0x508, rev 0x01, class 0x0)
-bcma: bus0: Core 15 found: NAND flash controller (manuf 0x4BF, id 0x509, rev 0x01, class 0x0)
-bcma: bus0: Core 16 found: SPI flash controller (manuf 0x4BF, id 0x50A, rev 0x01, class 0x0)
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/bcma/scan.c       |   12 ++++++++++++
- include/linux/bcma/bcma.h |   12 ++++++++++++
- 2 files changed, 24 insertions(+)
-
---- a/drivers/bcma/scan.c
-+++ b/drivers/bcma/scan.c
-@@ -32,6 +32,18 @@ static const struct bcma_device_id_name
- 	{ BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
- 	{ BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
- 	{ BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
-+	{ BCMA_CORE_PCIEG2, "PCIe Gen 2" },
-+	{ BCMA_CORE_DMA, "DMA" },
-+	{ BCMA_CORE_SDIO3, "SDIO3" },
-+	{ BCMA_CORE_USB20, "USB 2.0" },
-+	{ BCMA_CORE_USB30, "USB 3.0" },
-+	{ BCMA_CORE_A9JTAG, "ARM Cortex A9 JTAG" },
-+	{ BCMA_CORE_DDR23, "Denali DDR2/DDR3 memory controller" },
-+	{ BCMA_CORE_ROM, "ROM" },
-+	{ BCMA_CORE_NAND, "NAND flash controller" },
-+	{ BCMA_CORE_QSPI, "SPI flash controller" },
-+	{ BCMA_CORE_CHIPCOMMON_B, "Chipcommon B" },
-+	{ BCMA_CORE_ARMCA9, "ARM Cortex A9 core (ihost)" },
- 	{ BCMA_CORE_AMEMC, "AMEMC (DDR)" },
- 	{ BCMA_CORE_ALTA, "ALTA (I2S)" },
- 	{ BCMA_CORE_INVALID, "Invalid" },
---- a/include/linux/bcma/bcma.h
-+++ b/include/linux/bcma/bcma.h
-@@ -72,7 +72,19 @@ struct bcma_host_ops {
- /* Core-ID values. */
- #define BCMA_CORE_OOB_ROUTER		0x367	/* Out of band */
- #define BCMA_CORE_4706_CHIPCOMMON	0x500
-+#define BCMA_CORE_PCIEG2		0x501
-+#define BCMA_CORE_DMA			0x502
-+#define BCMA_CORE_SDIO3			0x503
-+#define BCMA_CORE_USB20			0x504
-+#define BCMA_CORE_USB30			0x505
-+#define BCMA_CORE_A9JTAG		0x506
-+#define BCMA_CORE_DDR23			0x507
-+#define BCMA_CORE_ROM			0x508
-+#define BCMA_CORE_NAND			0x509
-+#define BCMA_CORE_QSPI			0x50A
-+#define BCMA_CORE_CHIPCOMMON_B		0x50B		/* ChipcommonB core */
- #define BCMA_CORE_4706_SOC_RAM		0x50E
-+#define BCMA_CORE_ARMCA9		0x510
- #define BCMA_CORE_4706_MAC_GBIT		0x52D
- #define BCMA_CORE_AMEMC			0x52E	/* DDR1/2 memory controller core */
- #define BCMA_CORE_ALTA			0x534	/* I2S core */
diff --git a/target/linux/bcm53xx/patches-3.10/102-bcma-make-it-possible-to-select-SoC-support-without-.patch b/target/linux/bcm53xx/patches-3.10/102-bcma-make-it-possible-to-select-SoC-support-without-.patch
deleted file mode 100644
index 4d0fd5f408..0000000000
--- a/target/linux/bcm53xx/patches-3.10/102-bcma-make-it-possible-to-select-SoC-support-without-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-bcma: make it possible to select SoC support without mips
-
-To make it possible to use the SoC host interface with ARM SoCs do not
-depend on the MIPS driver any more.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/bcma/Kconfig |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/drivers/bcma/Kconfig
-+++ b/drivers/bcma/Kconfig
-@@ -36,8 +36,14 @@ config BCMA_DRIVER_PCI_HOSTMODE
- 	  PCI core hostmode operation (external PCI bus).
- 
- config BCMA_HOST_SOC
--	bool
--	depends on BCMA_DRIVER_MIPS
-+	bool "Support for BCMA in a SoC"
-+	depends on BCMA
-+	help
-+	  Host interface for a Broadcom AIX bus directly mapped into 
-+	  the memory. This only works with the Broadcom SoCs from the
-+	  BCM47XX line.
-+
-+	  If unsure, say N
- 
- config BCMA_DRIVER_MIPS
- 	bool "BCMA Broadcom MIPS core driver"
diff --git a/target/linux/bcm53xx/patches-3.10/103-bcma-add-constants-for-new-ARM-based-SoCs.patch b/target/linux/bcm53xx/patches-3.10/103-bcma-add-constants-for-new-ARM-based-SoCs.patch
deleted file mode 100644
index 6714533c0b..0000000000
--- a/target/linux/bcm53xx/patches-3.10/103-bcma-add-constants-for-new-ARM-based-SoCs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-bcma: add constants for new ARM based SoCs
-
-These are the chipIDs of some ARM based SoCs from the BCM47xx line.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- include/linux/bcma/bcma.h |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/include/linux/bcma/bcma.h
-+++ b/include/linux/bcma/bcma.h
-@@ -189,6 +189,11 @@ struct bcma_host_ops {
- #define  BCMA_PKG_ID_BCM5357	11
- #define BCMA_CHIP_ID_BCM53572	53572
- #define  BCMA_PKG_ID_BCM47188	9
-+#define BCMA_CHIP_ID_BCM4707	53010
-+#define  BCMA_PKG_ID_BCM4707	1
-+#define  BCMA_PKG_ID_BCM4708	2
-+#define  BCMA_PKG_ID_BCM4709	0
-+#define BCMA_CHIP_ID_BCM53018	53018
- 
- /* Board types (on PCI usually equals to the subsystem dev id) */
- /* BCM4313 */
diff --git a/target/linux/bcm53xx/patches-3.10/104-bcma-return-correct-error-code-when-bus-scan-failed.patch b/target/linux/bcm53xx/patches-3.10/104-bcma-return-correct-error-code-when-bus-scan-failed.patch
deleted file mode 100644
index c6e8aca62a..0000000000
--- a/target/linux/bcm53xx/patches-3.10/104-bcma-return-correct-error-code-when-bus-scan-failed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-bcma: return correct error code when bus scan failed
-
-It is better to return the actual error code than just -1.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/bcma/main.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -237,7 +237,7 @@ int bcma_bus_register(struct bcma_bus *b
- 	err = bcma_bus_scan(bus);
- 	if (err) {
- 		bcma_err(bus, "Failed to scan: %d\n", err);
--		return -1;
-+		return err;
- 	}
- 
- 	/* Early init CC core */
diff --git a/target/linux/bcm53xx/patches-3.10/105-bcma-fix-handling-of-big-addrl.patch b/target/linux/bcm53xx/patches-3.10/105-bcma-fix-handling-of-big-addrl.patch
deleted file mode 100644
index 3d261b99e1..0000000000
--- a/target/linux/bcm53xx/patches-3.10/105-bcma-fix-handling-of-big-addrl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-bcma: fix handling of big addrl
-
-The return value of bcma_erom_get_addr_desc() is a unsigned value and it
-could wrap around in the two complement writing. This happens for one
-core in the BCM4708 SoC.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- drivers/bcma/scan.c |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/drivers/bcma/scan.c
-+++ b/drivers/bcma/scan.c
-@@ -213,7 +213,7 @@ static s32 bcma_erom_get_mst_port(struct
- 	return ent;
- }
- 
--static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
-+static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
- 				  u32 type, u8 port)
- {
- 	u32 addrl, addrh, sizel, sizeh = 0;
-@@ -225,7 +225,7 @@ static s32 bcma_erom_get_addr_desc(struc
- 	    ((ent & SCAN_ADDR_TYPE) != type) ||
- 	    (((ent & SCAN_ADDR_PORT) >> SCAN_ADDR_PORT_SHIFT) != port)) {
- 		bcma_erom_push_ent(eromptr);
--		return -EINVAL;
-+		return (u32)-EINVAL;
- 	}
- 
- 	addrl = ent & SCAN_ADDR_ADDR;
-@@ -273,7 +273,7 @@ static int bcma_get_next_core(struct bcm
- 			      struct bcma_device_id *match, int core_num,
- 			      struct bcma_device *core)
- {
--	s32 tmp;
-+	u32 tmp;
- 	u8 i, j;
- 	s32 cia, cib;
- 	u8 ports[2], wrappers[2];
-@@ -351,11 +351,11 @@ static int bcma_get_next_core(struct bcm
- 	 * the main register space for the core
- 	 */
- 	tmp = bcma_erom_get_addr_desc(bus, eromptr, SCAN_ADDR_TYPE_SLAVE, 0);
--	if (tmp <= 0) {
-+	if (tmp == 0 || IS_ERR_VALUE(tmp)) {
- 		/* Try again to see if it is a bridge */
- 		tmp = bcma_erom_get_addr_desc(bus, eromptr,
- 					      SCAN_ADDR_TYPE_BRIDGE, 0);
--		if (tmp <= 0) {
-+		if (tmp == 0 || IS_ERR_VALUE(tmp)) {
- 			return -EILSEQ;
- 		} else {
- 			bcma_info(bus, "Bridge found\n");
-@@ -369,7 +369,7 @@ static int bcma_get_next_core(struct bcm
- 		for (j = 0; ; j++) {
- 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
- 				SCAN_ADDR_TYPE_SLAVE, i);
--			if (tmp < 0) {
-+			if (IS_ERR_VALUE(tmp)) {
- 				/* no more entries for port _i_ */
- 				/* pr_debug("erom: slave port %d "
- 				 * "has %d descriptors\n", i, j); */
-@@ -386,7 +386,7 @@ static int bcma_get_next_core(struct bcm
- 		for (j = 0; ; j++) {
- 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
- 				SCAN_ADDR_TYPE_MWRAP, i);
--			if (tmp < 0) {
-+			if (IS_ERR_VALUE(tmp)) {
- 				/* no more entries for port _i_ */
- 				/* pr_debug("erom: master wrapper %d "
- 				 * "has %d descriptors\n", i, j); */
-@@ -404,7 +404,7 @@ static int bcma_get_next_core(struct bcm
- 		for (j = 0; ; j++) {
- 			tmp = bcma_erom_get_addr_desc(bus, eromptr,
- 				SCAN_ADDR_TYPE_SWRAP, i + hack);
--			if (tmp < 0) {
-+			if (IS_ERR_VALUE(tmp)) {
- 				/* no more entries for port _i_ */
- 				/* pr_debug("erom: master wrapper %d "
- 				 * has %d descriptors\n", i, j); */