Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

2 files changed, 14 insertions, 8 deletions

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index c2d012fcc29b..4bc6901b3819 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -27,9 +27,9 @@
 #include <linux/crc32.h>
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/system.h>
 
 #define TX_BUFFERS 15
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index 5fe17d5eaa54..448487e22fa3 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -335,11 +335,20 @@ static int ixp4xx_mdio_register(void)
         if (!(mdio_bus = mdiobus_alloc()))
                 return -ENOMEM;
 
-        /* All MII PHY accesses use NPE-B Ethernet registers */
-        spin_lock_init(&mdio_lock);
-        mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT;
-        __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
+        if (cpu_is_ixp43x()) {
+                /* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */
+                if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEC_ETH))
+                        return -ENOSYS;
+                mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT;
+        } else {
+                /* All MII PHY accesses use NPE-B Ethernet registers */
+                if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0))
+                        return -ENOSYS;
+                mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT;
+        }
 
+        __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
+        spin_lock_init(&mdio_lock);
         mdio_bus->name = "IXP4xx MII Bus";
         mdio_bus->read = &ixp4xx_mdio_read;
         mdio_bus->write = &ixp4xx_mdio_write;
@@ -1250,9 +1259,6 @@ static struct platform_driver ixp4xx_eth_driver = {
 static int __init eth_init_module(void)
 {
         int err;
-        if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0))
-                return -ENOSYS;
-
         if ((err = ixp4xx_mdio_register()))
                 return err;
         return platform_driver_register(&ixp4xx_eth_driver);