Merge git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (53 commits)
  powerpc: Support for relocatable kdump kernel
  powerpc: Don't use a 16G page if beyond mem= limits
  powerpc: Add del_node() for early boot code to prune inapplicable devices.
  powerpc: Further compile fixup for STRICT_MM_TYPECHECKS
  powerpc: Remove empty #else from signal_64.c
  powerpc: Move memory size print into common show_cpuinfo for 32-bit
  hvc_console: Remove __devexit annotation of hvc_remove()
  hvc_console: Add support for tty window resizing
  hvc_console: Fix loop if put_char() returns 0
  hvc_console: Add tty driver flag TTY_DRIVER_RESET_TERMIOS
  hvc_console: Add a hangup notifier for backends
  powerpc/83xx: Add DS1339 RTC support for MPC8349E-mITX boards .dts
  powerpc/83xx: Add support for MCU microcontroller in .dts files
  powerpc/85xx: Move mpc8572ds.dts to address-cells/size-cells = <2>
  of/spi: Support specifying chip select as active high via device tree
  powerpc: Remove device_type = "board_control" properties in .dts files
  i2c-cpm: Suppress autoprobing for devices
  powerpc/85xx: Fix mpc8536ds dma interrupt numbers
  powerpc/85xx: Enable enhanced functions for 8536 TSEC
  powerpc: Delete unused prom_strtoul and prom_memparse
  ...

3 files changed, 45 insertions, 35 deletions

diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 08e18bcb970f..45dd9bdc5d62 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -2,6 +2,7 @@
  * Driver for the MPC5200 Fast Ethernet Controller - MDIO bus driver
  *
  * Copyright (C) 2007  Domen Puncer, Telargo, Inc.
+ * Copyright (C) 2008  Wolfram Sang, Pengutronix
  *
  * This file is licensed under the terms of the GNU General Public License
  * version 2. This program is licensed "as is" without any warranty of any
@@ -21,58 +22,45 @@ struct mpc52xx_fec_mdio_priv {
         struct mpc52xx_fec __iomem *regs;
 };
 
-static int mpc52xx_fec_mdio_read(struct mii_bus *bus, int phy_id, int reg)
+static int mpc52xx_fec_mdio_transfer(struct mii_bus *bus, int phy_id,
+                int reg, u32 value)
 {
         struct mpc52xx_fec_mdio_priv *priv = bus->priv;
         struct mpc52xx_fec __iomem *fec;
         int tries = 100;
-        u32 request = FEC_MII_READ_FRAME;
+
+        value |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
+        value |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
 
         fec = priv->regs;
         out_be32(&fec->ievent, FEC_IEVENT_MII);
-
-        request |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
-        request |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
-
-        out_be32(&priv->regs->mii_data, request);
+        out_be32(&priv->regs->mii_data, value);
 
         /* wait for it to finish, this takes about 23 us on lite5200b */
         while (!(in_be32(&fec->ievent) & FEC_IEVENT_MII) && --tries)
                 udelay(5);
 
-        if (tries == 0)
+        if (!tries)
                 return -ETIMEDOUT;
 
-        return in_be32(&priv->regs->mii_data) & FEC_MII_DATA_DATAMSK;
+        return value & FEC_MII_DATA_OP_RD ?
+                in_be32(&priv->regs->mii_data) & FEC_MII_DATA_DATAMSK : 0;
 }
 
-static int mpc52xx_fec_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 data)
+static int mpc52xx_fec_mdio_read(struct mii_bus *bus, int phy_id, int reg)
 {
-        struct mpc52xx_fec_mdio_priv *priv = bus->priv;
-        struct mpc52xx_fec __iomem *fec;
-        u32 value = data;
-        int tries = 100;
-
-        fec = priv->regs;
-        out_be32(&fec->ievent, FEC_IEVENT_MII);
-
-        value |= FEC_MII_WRITE_FRAME;
-        value |= (phy_id << FEC_MII_DATA_PA_SHIFT) & FEC_MII_DATA_PA_MSK;
-        value |= (reg << FEC_MII_DATA_RA_SHIFT) & FEC_MII_DATA_RA_MSK;
-
-        out_be32(&priv->regs->mii_data, value);
-
-        /* wait for request to finish */
-        while (!(in_be32(&fec->ievent) & FEC_IEVENT_MII) && --tries)
-                udelay(5);
-
-        if (tries == 0)
-                return -ETIMEDOUT;
+        return mpc52xx_fec_mdio_transfer(bus, phy_id, reg, FEC_MII_READ_FRAME);
+}
 
-        return 0;
+static int mpc52xx_fec_mdio_write(struct mii_bus *bus, int phy_id, int reg,
+                u16 data)
+{
+        return mpc52xx_fec_mdio_transfer(bus, phy_id, reg,
+                data | FEC_MII_WRITE_FRAME);
 }
 
-static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_id *match)
+static int mpc52xx_fec_mdio_probe(struct of_device *of,
+                const struct of_device_id *match)
 {
         struct device *dev = &of->dev;
         struct device_node *np = of->node;
@@ -131,7 +119,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i
         dev_set_drvdata(dev, bus);
 
         /* set MII speed */
-        out_be32(&priv->regs->mii_speed, ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1);
+        out_be32(&priv->regs->mii_speed,
+                ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1);
 
         /* enable MII interrupt */
         out_be32(&priv->regs->imask, in_be32(&priv->regs->imask) | FEC_IMASK_MII);
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index efcf21c9f5c7..2ee2622258f5 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2604,8 +2604,16 @@ static int __devinit emac_init_config(struct emac_instance *dev)
                 if (of_device_is_compatible(np, "ibm,emac-440ep") ||
                     of_device_is_compatible(np, "ibm,emac-440gr"))
                         dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
-                if (of_device_is_compatible(np, "ibm,emac-405ez"))
+                if (of_device_is_compatible(np, "ibm,emac-405ez")) {
+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL
                         dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
+#else
+                        printk(KERN_ERR "%s: Flow control not disabled!\n",
+                                        np->full_name);
+                        return -ENXIO;
+#endif
+                }
+
         }
 
         /* Fixup some feature bits based on the device tree */
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index 1839d3f154a3..ecf9798987fa 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -280,9 +280,11 @@ static irqreturn_t mal_txeob(int irq, void *dev_instance)
         mal_schedule_poll(mal);
         set_mal_dcrn(mal, MAL_TXEOBISR, r);
 
+#ifdef CONFIG_PPC_DCR_NATIVE
         if (mal_has_feature(mal, MAL_FTR_CLEAR_ICINTSTAT))
                 mtdcri(SDR0, DCRN_SDR_ICINTSTAT,
                                 (mfdcri(SDR0, DCRN_SDR_ICINTSTAT) | ICINTSTAT_ICTX));
+#endif
 
         return IRQ_HANDLED;
 }
@@ -298,9 +300,11 @@ static irqreturn_t mal_rxeob(int irq, void *dev_instance)
         mal_schedule_poll(mal);
         set_mal_dcrn(mal, MAL_RXEOBISR, r);
 
+#ifdef CONFIG_PPC_DCR_NATIVE
         if (mal_has_feature(mal, MAL_FTR_CLEAR_ICINTSTAT))
                 mtdcri(SDR0, DCRN_SDR_ICINTSTAT,
                                 (mfdcri(SDR0, DCRN_SDR_ICINTSTAT) | ICINTSTAT_ICRX));
+#endif
 
         return IRQ_HANDLED;
 }
@@ -572,9 +576,18 @@ static int __devinit mal_probe(struct of_device *ofdev,
                 goto fail;
         }
 
-        if (of_device_is_compatible(ofdev->node, "ibm,mcmal-405ez"))
+        if (of_device_is_compatible(ofdev->node, "ibm,mcmal-405ez")) {
+#if defined(CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT) && \
+                defined(CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR)
                 mal->features |= (MAL_FTR_CLEAR_ICINTSTAT |
                                 MAL_FTR_COMMON_ERR_INT);
+#else
+                printk(KERN_ERR "%s: Support for 405EZ not enabled!\n",
+                                ofdev->node->full_name);
+                err = -ENODEV;
+                goto fail;
+#endif
+        }
 
         mal->txeob_irq = irq_of_parse_and_map(ofdev->node, 0);
         mal->rxeob_irq = irq_of_parse_and_map(ofdev->node, 1);