From: Imre Kaloz <kaloz@openwrt.org>
Date: Wed, 29 Apr 2009 20:48:37 +0000 (+0000)
Subject: npe driver fixes for ixp43x are in upstream now
X-Git-Tag: reboot~23809
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e4fa7ac8f9f785985d79535ad09fb2e89cf9701d;p=openwrt%2Fstaging%2Flynxis.git

npe driver fixes for ixp43x are in upstream now

SVN-Revision: 15495
---

diff --git a/target/linux/ixp4xx/patches-2.6.30/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.30/204-npe_driver_ixp43x_support.patch
deleted file mode 100644
index 7ac41e5982..0000000000
--- a/target/linux/ixp4xx/patches-2.6.30/204-npe_driver_ixp43x_support.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From cba5c286f3ea34ea4767fc00c705434a00fe2c37 Mon Sep 17 00:00:00 2001
-From: Imre Kaloz <kaloz@openwrt.org>
-Date: Thu, 26 Jun 2008 01:58:02 +0200
-Subject: [PATCH] Add support for the ethernet ports on IXP43x
-
----
- arch/arm/mach-ixp4xx/ixp4xx_npe.c         |    6 +++---
- drivers/net/arm/ixp4xx_eth.c              |   13 +++++++++----
- include/asm-arm/arch-ixp4xx/cpu.h         |    2 ++
- include/asm-arm/arch-ixp4xx/ixp4xx-regs.h |    7 ++++---
- 4 files changed, 18 insertions(+), 10 deletions(-)
-
---- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
-@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, c
- 		for (i = 0; i < image->size; i++)
- 			image->data[i] = swab32(image->data[i]);
- 
--	if (!cpu_is_ixp46x() && ((image->id >> 28) & 0xF /* device ID */)) {
--		print_npe(KERN_INFO, npe, "IXP46x firmware ignored on "
-+	if (cpu_is_ixp42x() && ((image->id >> 28) & 0xF /* device ID */)) {
-+		print_npe(KERN_INFO, npe, "IXP46x/IXP43x firmware ignored on "
- 			  "IXP42x\n");
- 		goto err;
- 	}
-@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c
- 		  "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
- 		  (image->id >> 8) & 0xFF, image->id & 0xFF);
- 
--	if (!cpu_is_ixp46x()) {
-+	if (cpu_is_ixp42x()) {
- 		if (!npe->id)
- 			instr_size = NPE_A_42X_INSTR_SIZE;
- 		else
---- a/drivers/net/arm/ixp4xx_eth.c
-+++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -32,6 +32,7 @@
- #include <linux/kernel.h>
- #include <linux/phy.h>
- #include <linux/platform_device.h>
-+#include <mach/cpu.h>
- #include <mach/npe.h>
- #include <mach/qmgr.h>
- 
-@@ -337,7 +338,13 @@ static int ixp4xx_mdio_register(void)
- 
- 	/* All MII PHY accesses use NPE-B Ethernet registers */
- 	spin_lock_init(&mdio_lock);
--	mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT;
-+	if (!cpu_is_ixp43x())
-+		/* All MII PHY accesses use NPE-B Ethernet registers */
-+		mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT;
-+	else
-+		/* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */
-+		mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT;
-+
- 	__raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
- 
- 	mdio_bus->name = "IXP4xx MII Bus";
---- a/arch/arm/mach-ixp4xx/include/mach/cpu.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/cpu.h
-@@ -35,6 +35,8 @@ static inline u32 ixp4xx_read_feature_bi
- 	val &= ~IXP4XX_FEATURE_RESERVED;
- 	if (!cpu_is_ixp46x())
- 		val &= ~IXP4XX_FEATURE_IXP46X_ONLY;
-+	if (cpu_is_ixp42x())
-+		val &= ~IXP4XX_FEATURE_IXP43X_46X;
- 
- 	return val;
- }
---- a/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
-@@ -628,11 +628,12 @@
- #define IXP4XX_FEATURE_XSCALE_MAX_FREQ	(3 << 22)
- #define IXP4XX_FEATURE_RESERVED		(0xFF << 24)
- 
--#define IXP4XX_FEATURE_IXP46X_ONLY (IXP4XX_FEATURE_ECC_TIMESYNC |	\
-+#define IXP4XX_FEATURE_IXP43X_46X (IXP4XX_FEATURE_ECC_TIMESYNC |	\
- 				    IXP4XX_FEATURE_USB_HOST |		\
- 				    IXP4XX_FEATURE_NPEA_ETH |		\
--				    IXP4XX_FEATURE_NPEB_ETH_1_TO_3 |	\
--				    IXP4XX_FEATURE_RSA |		\
- 				    IXP4XX_FEATURE_XSCALE_MAX_FREQ)
- 
-+#define IXP4XX_FEATURE_IXP46X_ONLY (IXP4XX_FEATURE_NPEB_ETH_1_TO_3 |	\
-+				    IXP4XX_FEATURE_RSA)
-+
- #endif