Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (49 commits)
  powerpc: Fix build bug with binutils < 2.18 and GCC < 4.2
  powerpc/eeh: Don't panic when EEH_MAX_FAILS is exceeded
  fbdev: Teaches offb about palette on radeon r5xx/r6xx
  powerpc/cell/edac: Log a syndrome code in case of correctable error
  powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code
  powerpc: Indicate which oprofile counters to use while in compat mode
  powerpc/boot: Change spaces to tabs
  powerpc: Remove duplicate 6xx option in Kconfig
  powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.S
  powerpc: Use PPC_LONG_ALIGN in uaccess.h
  powerpc: Add a #define for aligning to a long-sized boundary
  powerpc: Fix OF parsing of 64 bits PCI addresses
  powerpc: Use WARN_ON(1) instead of __WARN()
  powerpc: Fix support for latencytop
  powerpc/ps3: Update ps3_defconfig
  powerpc/ps3: Add a sub-match id to ps3_system_bus
  powerpc: Add a 6xx defconfig
  powerpc/dma: Use the struct dma_attrs in iommu code
  powerpc/cell: Add support for power button of future IBM cell blades
  powerpc/cell: Cleanup sysreset_hack for IBM cell blades
  ...

11 files changed, 175 insertions, 699 deletions

diff --git a/drivers/net/fs_enet/Makefile b/drivers/net/fs_enet/Makefile
index 1ffbe0756a0c..d4a305ee3455 100644
--- a/drivers/net/fs_enet/Makefile
+++ b/drivers/net/fs_enet/Makefile
@@ -8,12 +8,7 @@ fs_enet-$(CONFIG_FS_ENET_HAS_SCC) += mac-scc.o
 fs_enet-$(CONFIG_FS_ENET_HAS_FEC) += mac-fec.o
 fs_enet-$(CONFIG_FS_ENET_HAS_FCC) += mac-fcc.o
 
-ifeq ($(CONFIG_PPC_CPM_NEW_BINDING),y)
 obj-$(CONFIG_FS_ENET_MDIO_FEC) += mii-fec.o
 obj-$(CONFIG_FS_ENET_MDIO_FCC) += mii-bitbang.o
-else
-fs_enet-$(CONFIG_FS_ENET_MDIO_FEC) += mii-fec.o
-fs_enet-$(CONFIG_FS_ENET_MDIO_FCC) += mii-bitbang.o
-endif
 
 fs_enet-objs := fs_enet-main.o $(fs_enet-m)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 445763e5648e..92591384afa5 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -36,26 +36,18 @@
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
 
 #include <linux/vmalloc.h>
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <linux/of_gpio.h>
-#include <linux/of_platform.h>
-#endif
-
 #include "fs_enet.h"
 
 /*************************************************/
 
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-static char version[] __devinitdata =
-    DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")" "\n";
-#endif
-
 MODULE_AUTHOR("Pantelis Antoniou <panto@intracom.gr>");
 MODULE_DESCRIPTION("Freescale Ethernet Driver");
 MODULE_LICENSE("GPL");
@@ -958,190 +950,6 @@ static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 extern int fs_mii_connect(struct net_device *dev);
 extern void fs_mii_disconnect(struct net_device *dev);
 
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-static struct net_device *fs_init_instance(struct device *dev,
-                struct fs_platform_info *fpi)
-{
-        struct net_device *ndev = NULL;
-        struct fs_enet_private *fep = NULL;
-        int privsize, i, r, err = 0, registered = 0;
-
-        fpi->fs_no = fs_get_id(fpi);
-        /* guard */
-        if ((unsigned int)fpi->fs_no >= FS_MAX_INDEX)
-                return ERR_PTR(-EINVAL);
-
-        privsize = sizeof(*fep) + (sizeof(struct sk_buff **) *
-                            (fpi->rx_ring + fpi->tx_ring));
-
-        ndev = alloc_etherdev(privsize);
-        if (!ndev) {
-                err = -ENOMEM;
-                goto err;
-        }
-
-        fep = netdev_priv(ndev);
-
-        fep->dev = dev;
-        dev_set_drvdata(dev, ndev);
-        fep->fpi = fpi;
-        if (fpi->init_ioports)
-                fpi->init_ioports((struct fs_platform_info *)fpi);
-
-#ifdef CONFIG_FS_ENET_HAS_FEC
-        if (fs_get_fec_index(fpi->fs_no) >= 0)
-                fep->ops = &fs_fec_ops;
-#endif
-
-#ifdef CONFIG_FS_ENET_HAS_SCC
-        if (fs_get_scc_index(fpi->fs_no) >=0)
-                fep->ops = &fs_scc_ops;
-#endif
-
-#ifdef CONFIG_FS_ENET_HAS_FCC
-        if (fs_get_fcc_index(fpi->fs_no) >= 0)
-                fep->ops = &fs_fcc_ops;
-#endif
-
-        if (fep->ops == NULL) {
-                printk(KERN_ERR DRV_MODULE_NAME
-                       ": %s No matching ops found (%d).\n",
-                       ndev->name, fpi->fs_no);
-                err = -EINVAL;
-                goto err;
-        }
-
-        r = (*fep->ops->setup_data)(ndev);
-        if (r != 0) {
-                printk(KERN_ERR DRV_MODULE_NAME
-                       ": %s setup_data failed\n",
-                        ndev->name);
-                err = r;
-                goto err;
-        }
-
-        /* point rx_skbuff, tx_skbuff */
-        fep->rx_skbuff = (struct sk_buff **)&fep[1];
-        fep->tx_skbuff = fep->rx_skbuff + fpi->rx_ring;
-
-        /* init locks */
-        spin_lock_init(&fep->lock);
-        spin_lock_init(&fep->tx_lock);
-
-        /*
-         * Set the Ethernet address.
-         */
-        for (i = 0; i < 6; i++)
-                ndev->dev_addr[i] = fpi->macaddr[i];
-
-        r = (*fep->ops->allocate_bd)(ndev);
-
-        if (fep->ring_base == NULL) {
-                printk(KERN_ERR DRV_MODULE_NAME
-                       ": %s buffer descriptor alloc failed (%d).\n", ndev->name, r);
-                err = r;
-                goto err;
-        }
-
-        /*
-         * Set receive and transmit descriptor base.
-         */
-        fep->rx_bd_base = fep->ring_base;
-        fep->tx_bd_base = fep->rx_bd_base + fpi->rx_ring;
-
-        /* initialize ring size variables */
-        fep->tx_ring = fpi->tx_ring;
-        fep->rx_ring = fpi->rx_ring;
-
-        /*
-         * The FEC Ethernet specific entries in the device structure.
-         */
-        ndev->open = fs_enet_open;
-        ndev->hard_start_xmit = fs_enet_start_xmit;
-        ndev->tx_timeout = fs_timeout;
-        ndev->watchdog_timeo = 2 * HZ;
-        ndev->stop = fs_enet_close;
-        ndev->get_stats = fs_enet_get_stats;
-        ndev->set_multicast_list = fs_set_multicast_list;
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        ndev->poll_controller = fs_enet_netpoll;
-#endif
-
-        netif_napi_add(ndev, &fep->napi,
-                       fs_enet_rx_napi, fpi->napi_weight);
-
-        ndev->ethtool_ops = &fs_ethtool_ops;
-        ndev->do_ioctl = fs_ioctl;
-
-        init_timer(&fep->phy_timer_list);
-
-        netif_carrier_off(ndev);
-
-        err = register_netdev(ndev);
-        if (err != 0) {
-                printk(KERN_ERR DRV_MODULE_NAME
-                       ": %s register_netdev failed.\n", ndev->name);
-                goto err;
-        }
-        registered = 1;
-
-
-        return ndev;
-
-err:
-        if (ndev != NULL) {
-                if (registered)
-                        unregister_netdev(ndev);
-
-                if (fep && fep->ops) {
-                        (*fep->ops->free_bd)(ndev);
-                        (*fep->ops->cleanup_data)(ndev);
-                }
-
-                free_netdev(ndev);
-        }
-
-        dev_set_drvdata(dev, NULL);
-
-        return ERR_PTR(err);
-}
-
-static int fs_cleanup_instance(struct net_device *ndev)
-{
-        struct fs_enet_private *fep;
-        const struct fs_platform_info *fpi;
-        struct device *dev;
-
-        if (ndev == NULL)
-                return -EINVAL;
-
-        fep = netdev_priv(ndev);
-        if (fep == NULL)
-                return -EINVAL;
-
-        fpi = fep->fpi;
-
-        unregister_netdev(ndev);
-
-        dma_free_coherent(fep->dev, (fpi->tx_ring + fpi->rx_ring) * sizeof(cbd_t),
-                          (void __force *)fep->ring_base, fep->ring_mem_addr);
-
-        /* reset it */
-        (*fep->ops->cleanup_data)(ndev);
-
-        dev = fep->dev;
-        if (dev != NULL) {
-                dev_set_drvdata(dev, NULL);
-                fep->dev = NULL;
-        }
-
-        free_netdev(ndev);
-
-        return 0;
-}
-#endif
-
 /**************************************************************************************/
 
 /* handy pointer to the immap */
@@ -1168,7 +976,6 @@ static void cleanup_immap(void)
 
 /**************************************************************************************/
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
 static int __devinit find_phy(struct device_node *np,
                               struct fs_platform_info *fpi)
 {
@@ -1408,121 +1215,6 @@ static void __exit fs_cleanup(void)
         of_unregister_platform_driver(&fs_enet_driver);
         cleanup_immap();
 }
-#else
-static int __devinit fs_enet_probe(struct device *dev)
-{
-        struct net_device *ndev;
-
-        /* no fixup - no device */
-        if (dev->platform_data == NULL) {
-                printk(KERN_INFO "fs_enet: "
-                                "probe called with no platform data; "
-                                "remove unused devices\n");
-                return -ENODEV;
-        }
-
-        ndev = fs_init_instance(dev, dev->platform_data);
-        if (IS_ERR(ndev))
-                return PTR_ERR(ndev);
-        return 0;
-}
-
-static int fs_enet_remove(struct device *dev)
-{
-        return fs_cleanup_instance(dev_get_drvdata(dev));
-}
-
-static struct device_driver fs_enet_fec_driver = {
-        .name           = "fsl-cpm-fec",
-        .bus            = &platform_bus_type,
-        .probe          = fs_enet_probe,
-        .remove         = fs_enet_remove,
-#ifdef CONFIG_PM
-/*      .suspend        = fs_enet_suspend,      TODO */
-/*      .resume         = fs_enet_resume,       TODO */
-#endif
-};
-
-static struct device_driver fs_enet_scc_driver = {
-        .name           = "fsl-cpm-scc",
-        .bus            = &platform_bus_type,
-        .probe          = fs_enet_probe,
-        .remove         = fs_enet_remove,
-#ifdef CONFIG_PM
-/*      .suspend        = fs_enet_suspend,      TODO */
-/*      .resume         = fs_enet_resume,       TODO */
-#endif
-};
-
-static struct device_driver fs_enet_fcc_driver = {
-        .name           = "fsl-cpm-fcc",
-        .bus            = &platform_bus_type,
-        .probe          = fs_enet_probe,
-        .remove         = fs_enet_remove,
-#ifdef CONFIG_PM
-/*      .suspend        = fs_enet_suspend,      TODO */
-/*      .resume         = fs_enet_resume,       TODO */
-#endif
-};
-
-static int __init fs_init(void)
-{
-        int r;
-
-        printk(KERN_INFO
-                        "%s", version);
-
-        r = setup_immap();
-        if (r != 0)
-                return r;
-
-#ifdef CONFIG_FS_ENET_HAS_FCC
-        /* let's insert mii stuff */
-        r = fs_enet_mdio_bb_init();
-
-        if (r != 0) {
-                printk(KERN_ERR DRV_MODULE_NAME
-                        "BB PHY init failed.\n");
-                return r;
-        }
-        r = driver_register(&fs_enet_fcc_driver);
-        if (r != 0)
-                goto err;
-#endif
-
-#ifdef CONFIG_FS_ENET_HAS_FEC
-        r =  fs_enet_mdio_fec_init();
-        if (r != 0) {
-                printk(KERN_ERR DRV_MODULE_NAME
-                        "FEC PHY init failed.\n");
-                return r;
-        }
-
-        r = driver_register(&fs_enet_fec_driver);
-        if (r != 0)
-                goto err;
-#endif
-
-#ifdef CONFIG_FS_ENET_HAS_SCC
-        r = driver_register(&fs_enet_scc_driver);
-        if (r != 0)
-                goto err;
-#endif
-
-        return 0;
-err:
-        cleanup_immap();
-        return r;
-}
-
-static void __exit fs_cleanup(void)
-{
-        driver_unregister(&fs_enet_fec_driver);
-        driver_unregister(&fs_enet_fcc_driver);
-        driver_unregister(&fs_enet_scc_driver);
-        cleanup_immap();
-}
-#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void fs_enet_netpoll(struct net_device *dev)
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h
index e05389c49bbb..db46d2e72329 100644
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
@@ -138,10 +138,6 @@ struct fs_enet_private {
 };
 
 /***************************************************************************/
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-int fs_enet_mdio_bb_init(void);
-int fs_enet_mdio_fec_init(void);
-#endif
 
 void fs_init_bds(struct net_device *dev);
 void fs_cleanup_bds(struct net_device *dev);
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 8268b3535b30..0a97fc2d97ec 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -33,6 +33,7 @@
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
+#include <linux/of_device.h>
 
 #include <asm/immap_cpm2.h>
 #include <asm/mpc8260.h>
@@ -42,10 +43,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_device.h>
-#endif
-
 #include "fs_enet.h"
 
 /*************************************************/
@@ -87,7 +84,6 @@ static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
 
 static int do_pd_setup(struct fs_enet_private *fep)
 {
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
         struct of_device *ofdev = to_of_device(fep->dev);
         struct fs_platform_info *fpi = fep->fpi;
         int ret = -EINVAL;
@@ -125,44 +121,6 @@ out_fccp:
         iounmap(fep->fcc.fccp);
 out:
         return ret;
-#else
-        struct platform_device *pdev = to_platform_device(fep->dev);
-        struct resource *r;
-
-        /* Fill out IRQ field */
-        fep->interrupt = platform_get_irq(pdev, 0);
-        if (fep->interrupt < 0)
-                return -EINVAL;
-
-        /* Attach the memory for the FCC Parameter RAM */
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fcc_pram");
-        fep->fcc.ep = ioremap(r->start, r->end - r->start + 1);
-        if (fep->fcc.ep == NULL)
-                return -EINVAL;
-
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fcc_regs");
-        fep->fcc.fccp = ioremap(r->start, r->end - r->start + 1);
-        if (fep->fcc.fccp == NULL)
-                return -EINVAL;
-
-        if (fep->fpi->fcc_regs_c) {
-                fep->fcc.fcccp = (void __iomem *)fep->fpi->fcc_regs_c;
-        } else {
-                r = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-                                "fcc_regs_c");
-                fep->fcc.fcccp = ioremap(r->start,
-                                r->end - r->start + 1);
-        }
-
-        if (fep->fcc.fcccp == NULL)
-                return -EINVAL;
-
-        fep->fcc.mem = (void __iomem *)fep->fpi->mem_offset;
-        if (fep->fcc.mem == NULL)
-                return -EINVAL;
-
-        return 0;
-#endif
 }
 
 #define FCC_NAPI_RX_EVENT_MSK   (FCC_ENET_RXF | FCC_ENET_RXB)
@@ -173,17 +131,6 @@ out:
 static int setup_data(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-        struct fs_platform_info *fpi = fep->fpi;
-
-        fpi->cp_command = (fpi->cp_page << 26) |
-                          (fpi->cp_block << 21) |
-                          (12 << 6);
-
-        fep->fcc.idx = fs_get_fcc_index(fpi->fs_no);
-        if ((unsigned int)fep->fcc.idx >= 3)    /* max 3 FCCs */
-                return -EINVAL;
-#endif
 
         if (do_pd_setup(fep) != 0)
                 return -EINVAL;
@@ -304,9 +251,6 @@ static void restart(struct net_device *dev)
         fcc_enet_t __iomem *ep = fep->fcc.ep;
         dma_addr_t rx_bd_base_phys, tx_bd_base_phys;
         u16 paddrh, paddrm, paddrl;
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-        u16 mem_addr;
-#endif
         const unsigned char *mac;
         int i;
 
@@ -338,19 +282,10 @@ static void restart(struct net_device *dev)
          * this area.
          */
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
         W16(ep, fen_genfcc.fcc_riptr, fpi->dpram_offset);
         W16(ep, fen_genfcc.fcc_tiptr, fpi->dpram_offset + 32);
 
         W16(ep, fen_padptr, fpi->dpram_offset + 64);
-#else
-        mem_addr = (u32) fep->fcc.mem;  /* de-fixup dpram offset */
-
-        W16(ep, fen_genfcc.fcc_riptr, (mem_addr & 0xffff));
-        W16(ep, fen_genfcc.fcc_tiptr, ((mem_addr + 32) & 0xffff));
-
-        W16(ep, fen_padptr, mem_addr + 64);
-#endif
 
         /* fill with special symbol...  */
         memset_io(fep->fcc.mem + fpi->dpram_offset + 64, 0x88, 32);
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 8a311d1e435b..0a7d1c5c6524 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -32,6 +32,7 @@
 #include <linux/bitops.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
+#include <linux/of_device.h>
 
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -43,10 +44,6 @@
 #include <asm/cpm1.h>
 #endif
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <asm/of_device.h>
-#endif
-
 #include "fs_enet.h"
 #include "fec.h"
 
@@ -99,7 +96,6 @@ static int whack_reset(fec_t __iomem *fecp)
 
 static int do_pd_setup(struct fs_enet_private *fep)
 {
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
         struct of_device *ofdev = to_of_device(fep->dev);
 
         fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
@@ -111,23 +107,6 @@ static int do_pd_setup(struct fs_enet_private *fep)
                 return -EINVAL;
 
         return 0;
-#else
-        struct platform_device *pdev = to_platform_device(fep->dev);
-        struct resource *r;
-
-        /* Fill out IRQ field */
-        fep->interrupt = platform_get_irq_byname(pdev,"interrupt");
-        if (fep->interrupt < 0)
-                return -EINVAL;
-
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
-        fep->fec.fecp = ioremap(r->start, r->end - r->start + 1);
-
-        if(fep->fec.fecp == NULL)
-                return -EINVAL;
-
-        return 0;
-#endif
 }
 
 #define FEC_NAPI_RX_EVENT_MSK   (FEC_ENET_RXF | FEC_ENET_RXB)
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index e3557eca7b6d..029b3c7ef29c 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -32,6 +32,7 @@
 #include <linux/bitops.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -43,10 +44,6 @@
 #include <asm/cpm1.h>
 #endif
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <linux/of_platform.h>
-#endif
-
 #include "fs_enet.h"
 
 /*************************************************/
@@ -99,7 +96,6 @@ static inline int scc_cr_cmd(struct fs_enet_private *fep, u32 op)
 
 static int do_pd_setup(struct fs_enet_private *fep)
 {
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
         struct of_device *ofdev = to_of_device(fep->dev);
 
         fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
@@ -115,27 +111,6 @@ static int do_pd_setup(struct fs_enet_private *fep)
                 iounmap(fep->scc.sccp);
                 return -EINVAL;
         }
-#else
-        struct platform_device *pdev = to_platform_device(fep->dev);
-        struct resource *r;
-
-        /* Fill out IRQ field */
-        fep->interrupt = platform_get_irq_byname(pdev, "interrupt");
-        if (fep->interrupt < 0)
-                return -EINVAL;
-
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
-        fep->scc.sccp = ioremap(r->start, r->end - r->start + 1);
-
-        if (fep->scc.sccp == NULL)
-                return -EINVAL;
-
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pram");
-        fep->scc.ep = ioremap(r->start, r->end - r->start + 1);
-
-        if (fep->scc.ep == NULL)
-                return -EINVAL;
-#endif
 
         return 0;
 }
@@ -149,16 +124,6 @@ static int setup_data(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
 
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-        struct fs_platform_info *fpi = fep->fpi;
-
-        fep->scc.idx = fs_get_scc_index(fpi->fs_no);
-        if ((unsigned int)fep->fcc.idx >= 4) /* max 4 SCCs */
-                return -EINVAL;
-
-        fpi->cp_command = fep->fcc.idx << 6;
-#endif
-
         do_pd_setup(fep);
 
         fep->scc.hthi = 0;
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index 1620030cd33c..be4b72f4f49a 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -22,10 +22,7 @@
 #include <linux/mii.h>
 #include <linux/platform_device.h>
 #include <linux/mdio-bitbang.h>
-
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
 #include <linux/of_platform.h>
-#endif
 
 #include "fs_enet.h"
 
@@ -110,7 +107,6 @@ static struct mdiobb_ops bb_ops = {
         .get_mdio_data = mdio_read,
 };
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
 static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
                                          struct device_node *np)
 {
@@ -271,106 +267,3 @@ static void fs_enet_mdio_bb_exit(void)
 
 module_init(fs_enet_mdio_bb_init);
 module_exit(fs_enet_mdio_bb_exit);
-#else
-static int __devinit fs_mii_bitbang_init(struct bb_info *bitbang,
-                                         struct fs_mii_bb_platform_info *fmpi)
-{
-        bitbang->dir = (u32 __iomem *)fmpi->mdio_dir.offset;
-        bitbang->dat = (u32 __iomem *)fmpi->mdio_dat.offset;
-        bitbang->mdio_msk = 1U << (31 - fmpi->mdio_dat.bit);
-        bitbang->mdc_msk = 1U << (31 - fmpi->mdc_dat.bit);
-
-        return 0;
-}
-
-static int __devinit fs_enet_mdio_probe(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct fs_mii_bb_platform_info *pdata;
-        struct mii_bus *new_bus;
-        struct bb_info *bitbang;
-        int err = 0;
-
-        if (NULL == dev)
-                return -EINVAL;
-
-        bitbang = kzalloc(sizeof(struct bb_info), GFP_KERNEL);
-
-        if (NULL == bitbang)
-                return -ENOMEM;
-
-        bitbang->ctrl.ops = &bb_ops;
-
-        new_bus = alloc_mdio_bitbang(&bitbang->ctrl);
-
-        if (NULL == new_bus)
-                return -ENOMEM;
-
-        new_bus->name = "BB MII Bus",
-        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
-
-        new_bus->phy_mask = ~0x9;
-        pdata = (struct fs_mii_bb_platform_info *)pdev->dev.platform_data;
-
-        if (NULL == pdata) {
-                printk(KERN_ERR "gfar mdio %d: Missing platform data!\n", pdev->id);
-                return -ENODEV;
-        }
-
-        /*set up workspace*/
-        fs_mii_bitbang_init(bitbang, pdata);
-
-        new_bus->priv = bitbang;
-
-        new_bus->irq = pdata->irq;
-
-        new_bus->dev = dev;
-        dev_set_drvdata(dev, new_bus);
-
-        err = mdiobus_register(new_bus);
-
-        if (0 != err) {
-                printk (KERN_ERR "%s: Cannot register as MDIO bus\n",
-                                new_bus->name);
-                goto bus_register_fail;
-        }
-
-        return 0;
-
-bus_register_fail:
-        free_mdio_bitbang(new_bus);
-        kfree(bitbang);
-
-        return err;
-}
-
-static int fs_enet_mdio_remove(struct device *dev)
-{
-        struct mii_bus *bus = dev_get_drvdata(dev);
-
-        mdiobus_unregister(bus);
-
-        dev_set_drvdata(dev, NULL);
-
-        free_mdio_bitbang(bus);
-
-        return 0;
-}
-
-static struct device_driver fs_enet_bb_mdio_driver = {
-        .name = "fsl-bb-mdio",
-        .bus = &platform_bus_type,
-        .probe = fs_enet_mdio_probe,
-        .remove = fs_enet_mdio_remove,
-};
-
-int fs_enet_mdio_bb_init(void)
-{
-        return driver_register(&fs_enet_bb_mdio_driver);
-}
-
-void fs_enet_mdio_bb_exit(void)
-{
-        driver_unregister(&fs_enet_bb_mdio_driver);
-}
-#endif
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 8f6a43b0e0ff..695f74cc4398 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -31,15 +31,12 @@
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
-#include <linux/of_platform.h>
-#endif
-
 #include "fs_enet.h"
 #include "fec.h"
 
@@ -51,52 +48,6 @@
 
 #define FEC_MII_LOOPS   10000
 
-#ifndef CONFIG_PPC_CPM_NEW_BINDING
-static int match_has_phy (struct device *dev, void* data)
-{
-        struct platform_device* pdev = container_of(dev, struct platform_device, dev);
-        struct fs_platform_info* fpi;
-        if(strcmp(pdev->name, (char*)data))
-        {
-            return 0;
-        }
-
-        fpi = pdev->dev.platform_data;
-        if((fpi)&&(fpi->has_phy))
-                return 1;
-        return 0;
-}
-
-static int fs_mii_fec_init(struct fec_info* fec, struct fs_mii_fec_platform_info *fmpi)
-{
-        struct resource *r;
-        fec_t __iomem *fecp;
-        char* name = "fsl-cpm-fec";
-
-        /* we need fec in order to be useful */
-        struct platform_device *fec_pdev =
-                container_of(bus_find_device(&platform_bus_type, NULL, name, match_has_phy),
-                                struct platform_device, dev);
-
-        if(fec_pdev == NULL) {
-                printk(KERN_ERR"Unable to find PHY for %s", name);
-                return -ENODEV;
-        }
-
-        r = platform_get_resource_byname(fec_pdev, IORESOURCE_MEM, "regs");
-
-        fec->fecp = fecp = ioremap(r->start,sizeof(fec_t));
-        fec->mii_speed = fmpi->mii_speed;
-
-        setbits32(&fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE);     /* MII enable */
-        setbits32(&fecp->fec_ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN);
-        out_be32(&fecp->fec_ievent, FEC_ENET_MII);
-        out_be32(&fecp->fec_mii_speed, fec->mii_speed);
-
-        return 0;
-}
-#endif
-
 static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location)
 {
         struct fec_info* fec = bus->priv;
@@ -151,7 +102,6 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus)
         return 0;
 }
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
 static void __devinit add_phy(struct mii_bus *bus, struct device_node *np)
 {
         const u32 *data;
@@ -286,95 +236,3 @@ static void fs_enet_mdio_fec_exit(void)
 
 module_init(fs_enet_mdio_fec_init);
 module_exit(fs_enet_mdio_fec_exit);
-#else
-static int __devinit fs_enet_fec_mdio_probe(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct fs_mii_fec_platform_info *pdata;
-        struct mii_bus *new_bus;
-        struct fec_info *fec;
-        int err = 0;
-        if (NULL == dev)
-                return -EINVAL;
-        new_bus = kzalloc(sizeof(struct mii_bus), GFP_KERNEL);
-
-        if (NULL == new_bus)
-                return -ENOMEM;
-
-        fec = kzalloc(sizeof(struct fec_info), GFP_KERNEL);
-
-        if (NULL == fec)
-                return -ENOMEM;
-
-        new_bus->name = "FEC MII Bus",
-        new_bus->read = &fs_enet_fec_mii_read,
-        new_bus->write = &fs_enet_fec_mii_write,
-        new_bus->reset = &fs_enet_fec_mii_reset,
-        snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
-
-        pdata = (struct fs_mii_fec_platform_info *)pdev->dev.platform_data;
-
-        if (NULL == pdata) {
-                printk(KERN_ERR "fs_enet FEC mdio %d: Missing platform data!\n", pdev->id);
-                return -ENODEV;
-        }
-
-        /*set up workspace*/
-
-        fs_mii_fec_init(fec, pdata);
-        new_bus->priv = fec;
-
-        new_bus->irq = pdata->irq;
-
-        new_bus->dev = dev;
-        dev_set_drvdata(dev, new_bus);
-
-        err = mdiobus_register(new_bus);
-
-        if (0 != err) {
-                printk (KERN_ERR "%s: Cannot register as MDIO bus\n",
-                                new_bus->name);
-                goto bus_register_fail;
-        }
-
-        return 0;
-
-bus_register_fail:
-        kfree(new_bus);
-
-        return err;
-}
-
-
-static int fs_enet_fec_mdio_remove(struct device *dev)
-{
-        struct mii_bus *bus = dev_get_drvdata(dev);
-
-        mdiobus_unregister(bus);
-
-        dev_set_drvdata(dev, NULL);
-        kfree(bus->priv);
-
-        bus->priv = NULL;
-        kfree(bus);
-
-        return 0;
-}
-
-static struct device_driver fs_enet_fec_mdio_driver = {
-        .name = "fsl-cpm-fec-mdio",
-        .bus = &platform_bus_type,
-        .probe = fs_enet_fec_mdio_probe,
-        .remove = fs_enet_fec_mdio_remove,
-};
-
-int fs_enet_mdio_fec_init(void)
-{
-        return driver_register(&fs_enet_fec_mdio_driver);
-}
-
-void fs_enet_mdio_fec_exit(void)
-{
-        driver_unregister(&fs_enet_fec_mdio_driver);
-}
-#endif
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 39b45e901be6..b8394cf134e8 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -134,6 +134,9 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int l
 static void gfar_vlan_rx_register(struct net_device *netdev,
                                 struct vlan_group *grp);
 void gfar_halt(struct net_device *dev);
+#ifdef CONFIG_PM
+static void gfar_halt_nodisable(struct net_device *dev);
+#endif
 void gfar_start(struct net_device *dev);
 static void gfar_clear_exact_match(struct net_device *dev);
 static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
@@ -207,6 +210,7 @@ static int gfar_probe(struct platform_device *pdev)
 
         spin_lock_init(&priv->txlock);
         spin_lock_init(&priv->rxlock);
+        spin_lock_init(&priv->bflock);
 
         platform_set_drvdata(pdev, dev);
 
@@ -378,6 +382,103 @@ static int gfar_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int gfar_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct gfar_private *priv = netdev_priv(dev);
+        unsigned long flags;
+        u32 tempval;
+
+        int magic_packet = priv->wol_en &&
+                (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+
+        netif_device_detach(dev);
+
+        if (netif_running(dev)) {
+                spin_lock_irqsave(&priv->txlock, flags);
+                spin_lock(&priv->rxlock);
+
+                gfar_halt_nodisable(dev);
+
+                /* Disable Tx, and Rx if wake-on-LAN is disabled. */
+                tempval = gfar_read(&priv->regs->maccfg1);
+
+                tempval &= ~MACCFG1_TX_EN;
+
+                if (!magic_packet)
+                        tempval &= ~MACCFG1_RX_EN;
+
+                gfar_write(&priv->regs->maccfg1, tempval);
+
+                spin_unlock(&priv->rxlock);
+                spin_unlock_irqrestore(&priv->txlock, flags);
+
+#ifdef CONFIG_GFAR_NAPI
+                napi_disable(&priv->napi);
+#endif
+
+                if (magic_packet) {
+                        /* Enable interrupt on Magic Packet */
+                        gfar_write(&priv->regs->imask, IMASK_MAG);
+
+                        /* Enable Magic Packet mode */
+                        tempval = gfar_read(&priv->regs->maccfg2);
+                        tempval |= MACCFG2_MPEN;
+                        gfar_write(&priv->regs->maccfg2, tempval);
+                } else {
+                        phy_stop(priv->phydev);
+                }
+        }
+
+        return 0;
+}
+
+static int gfar_resume(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct gfar_private *priv = netdev_priv(dev);
+        unsigned long flags;
+        u32 tempval;
+        int magic_packet = priv->wol_en &&
+                (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+
+        if (!netif_running(dev)) {
+                netif_device_attach(dev);
+                return 0;
+        }
+
+        if (!magic_packet && priv->phydev)
+                phy_start(priv->phydev);
+
+        /* Disable Magic Packet mode, in case something
+         * else woke us up.
+         */
+
+        spin_lock_irqsave(&priv->txlock, flags);
+        spin_lock(&priv->rxlock);
+
+        tempval = gfar_read(&priv->regs->maccfg2);
+        tempval &= ~MACCFG2_MPEN;
+        gfar_write(&priv->regs->maccfg2, tempval);
+
+        gfar_start(dev);
+
+        spin_unlock(&priv->rxlock);
+        spin_unlock_irqrestore(&priv->txlock, flags);
+
+        netif_device_attach(dev);
+
+#ifdef CONFIG_GFAR_NAPI
+        napi_enable(&priv->napi);
+#endif
+
+        return 0;
+}
+#else
+#define gfar_suspend NULL
+#define gfar_resume NULL
+#endif
 
 /* Reads the controller's registers to determine what interface
  * connects it to the PHY.
@@ -534,8 +635,9 @@ static void init_registers(struct net_device *dev)
 }
 
 
+#ifdef CONFIG_PM
 /* Halt the receive and transmit queues */
-void gfar_halt(struct net_device *dev)
+static void gfar_halt_nodisable(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar __iomem *regs = priv->regs;
@@ -558,6 +660,15 @@ void gfar_halt(struct net_device *dev)
                          (IEVENT_GRSC | IEVENT_GTSC)))
                         cpu_relax();
         }
+}
+#endif
+
+/* Halt the receive and transmit queues */
+void gfar_halt(struct net_device *dev)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+        struct gfar __iomem *regs = priv->regs;
+        u32 tempval;
 
         /* Disable Rx and Tx */
         tempval = gfar_read(&regs->maccfg1);
@@ -1909,7 +2020,12 @@ static irqreturn_t gfar_error(int irq, void *dev_id)
         u32 events = gfar_read(&priv->regs->ievent);
 
         /* Clear IEVENT */
-        gfar_write(&priv->regs->ievent, IEVENT_ERR_MASK);
+        gfar_write(&priv->regs->ievent, events & IEVENT_ERR_MASK);
+
+        /* Magic Packet is not an error. */
+        if ((priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET) &&
+            (events & IEVENT_MAG))
+                events &= ~IEVENT_MAG;
 
         /* Hmm... */
         if (netif_msg_rx_err(priv) || netif_msg_tx_err(priv))
@@ -1977,6 +2093,8 @@ MODULE_ALIAS("platform:fsl-gianfar");
 static struct platform_driver gfar_driver = {
         .probe = gfar_probe,
         .remove = gfar_remove,
+        .suspend = gfar_suspend,
+        .resume = gfar_resume,
         .driver = {
                 .name = "fsl-gianfar",
                 .owner = THIS_MODULE,
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index bead71cb2b16..d59df98bd636 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -157,6 +157,7 @@ extern const char gfar_driver_version[];
 #define MACCFG2_GMII            0x00000200
 #define MACCFG2_HUGEFRAME       0x00000020
 #define MACCFG2_LENGTHCHECK     0x00000010
+#define MACCFG2_MPEN            0x00000008
 
 #define ECNTRL_INIT_SETTINGS    0x00001000
 #define ECNTRL_TBI_MODE         0x00000020
@@ -229,6 +230,7 @@ extern const char gfar_driver_version[];
 #define IEVENT_CRL              0x00020000
 #define IEVENT_XFUN             0x00010000
 #define IEVENT_RXB0             0x00008000
+#define IEVENT_MAG              0x00000800
 #define IEVENT_GRSC             0x00000100
 #define IEVENT_RXF0             0x00000080
 #define IEVENT_FIR              0x00000008
@@ -241,7 +243,8 @@ extern const char gfar_driver_version[];
 #define IEVENT_ERR_MASK         \
 (IEVENT_RXC | IEVENT_BSY | IEVENT_EBERR | IEVENT_MSRO | \
  IEVENT_BABT | IEVENT_TXC | IEVENT_TXE | IEVENT_LC \
- | IEVENT_CRL | IEVENT_XFUN | IEVENT_DPE | IEVENT_PERR)
+ | IEVENT_CRL | IEVENT_XFUN | IEVENT_DPE | IEVENT_PERR \
+ | IEVENT_MAG)
 
 #define IMASK_INIT_CLEAR        0x00000000
 #define IMASK_BABR              0x80000000
@@ -259,6 +262,7 @@ extern const char gfar_driver_version[];
 #define IMASK_CRL               0x00020000
 #define IMASK_XFUN              0x00010000
 #define IMASK_RXB0              0x00008000
+#define IMASK_MAG               0x00000800
 #define IMASK_GTSC              0x00000100
 #define IMASK_RXFEN0            0x00000080
 #define IMASK_FIR               0x00000008
@@ -726,10 +730,14 @@ struct gfar_private {
         unsigned int fifo_starve;
         unsigned int fifo_starve_off;
 
+        /* Bitfield update lock */
+        spinlock_t bflock;
+
         unsigned char vlan_enable:1,
                 rx_csum_enable:1,
                 extended_hash:1,
-                bd_stash_en:1;
+                bd_stash_en:1,
+                wol_en:1; /* Wake-on-LAN enabled */
         unsigned short padding;
 
         unsigned int interruptTransmit;
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 6007147cc1e9..fb7d3ccc0fdc 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -479,14 +479,13 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
 static int gfar_set_rx_csum(struct net_device *dev, uint32_t data)
 {
         struct gfar_private *priv = netdev_priv(dev);
+        unsigned long flags;
         int err = 0;
 
         if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM))
                 return -EOPNOTSUPP;
 
         if (dev->flags & IFF_UP) {
-                unsigned long flags;
-
                 /* Halt TX and RX, and process the frames which
                  * have already been received */
                 spin_lock_irqsave(&priv->txlock, flags);
@@ -502,7 +501,9 @@ static int gfar_set_rx_csum(struct net_device *dev, uint32_t data)
                 stop_gfar(dev);
         }
 
+        spin_lock_irqsave(&priv->bflock, flags);
         priv->rx_csum_enable = data;
+        spin_unlock_irqrestore(&priv->bflock, flags);
 
         if (dev->flags & IFF_UP)
                 err = startup_gfar(dev);
@@ -564,6 +565,38 @@ static void gfar_set_msglevel(struct net_device *dev, uint32_t data)
         priv->msg_enable = data;
 }
 
+#ifdef CONFIG_PM
+static void gfar_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+
+        if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET) {
+                wol->supported = WAKE_MAGIC;
+                wol->wolopts = priv->wol_en ? WAKE_MAGIC : 0;
+        } else {
+                wol->supported = wol->wolopts = 0;
+        }
+}
+
+static int gfar_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct gfar_private *priv = netdev_priv(dev);
+        unsigned long flags;
+
+        if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET) &&
+            wol->wolopts != 0)
+                return -EINVAL;
+
+        if (wol->wolopts & ~WAKE_MAGIC)
+                return -EINVAL;
+
+        spin_lock_irqsave(&priv->bflock, flags);
+        priv->wol_en = wol->wolopts & WAKE_MAGIC ? 1 : 0;
+        spin_unlock_irqrestore(&priv->bflock, flags);
+
+        return 0;
+}
+#endif
 
 const struct ethtool_ops gfar_ethtool_ops = {
         .get_settings = gfar_gsettings,
@@ -585,4 +618,8 @@ const struct ethtool_ops gfar_ethtool_ops = {
         .set_tx_csum = gfar_set_tx_csum,
         .get_msglevel = gfar_get_msglevel,
         .set_msglevel = gfar_set_msglevel,
+#ifdef CONFIG_PM
+        .get_wol = gfar_get_wol,
+        .set_wol = gfar_set_wol,
+#endif
 };