Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c =================================================================== --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -571,8 +571,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; } @@ -594,7 +594,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 Index: linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c =================================================================== --- linux-2.6.24.7.orig/drivers/net/arm/ixp4xx_eth.c +++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -1335,12 +1336,16 @@ static struct platform_driver drv = { static int __init eth_init_module(void) { - if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0)) - return -ENOSYS; - /* 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); return platform_driver_register(&drv); Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/cpu.h =================================================================== --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/cpu.h +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/cpu.h @@ -34,6 +34,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; } Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h =================================================================== --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/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