8 files changed, 144 insertions, 52 deletions

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 5b631fe74738..e8266ccf818a 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -44,6 +44,10 @@
 #include <linux/platform_device.h>
 #include <linux/phy.h>
 #include <linux/fec.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/of_net.h>
 
 #include <asm/cacheflush.h>
 
@@ -66,17 +70,42 @@
 #define FEC_QUIRK_ENET_MAC              (1 << 0)
 /* Controller needs driver to swap frame */
 #define FEC_QUIRK_SWAP_FRAME            (1 << 1)
+/* Controller uses gasket */
+#define FEC_QUIRK_USE_GASKET            (1 << 2)
 
 static struct platform_device_id fec_devtype[] = {
         {
+                /* keep it for coldfire */
                 .name = DRIVER_NAME,
                 .driver_data = 0,
         }, {
+                .name = "imx25-fec",
+                .driver_data = FEC_QUIRK_USE_GASKET,
+        }, {
+                .name = "imx27-fec",
+                .driver_data = 0,
+        }, {
                 .name = "imx28-fec",
                 .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME,
-        },
-        { }
+        }, {
+                /* sentinel */
+        }
 };
+MODULE_DEVICE_TABLE(platform, fec_devtype);
+
+enum imx_fec_type {
+        IMX25_FEC = 1,  /* runs on i.mx25/50/53 */
+        IMX27_FEC,      /* runs on i.mx27/35/51 */
+        IMX28_FEC,
+};
+
+static const struct of_device_id fec_dt_ids[] = {
+        { .compatible = "fsl,imx25-fec", .data = &fec_devtype[IMX25_FEC], },
+        { .compatible = "fsl,imx27-fec", .data = &fec_devtype[IMX27_FEC], },
+        { .compatible = "fsl,imx28-fec", .data = &fec_devtype[IMX28_FEC], },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, fec_dt_ids);
 
 static unsigned char macaddr[ETH_ALEN];
 module_param_array(macaddr, byte, NULL, 0);
@@ -427,7 +456,7 @@ fec_restart(struct net_device *ndev, int duplex)
 
         } else {
 #ifdef FEC_MIIGSK_ENR
-                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
+                if (id_entry->driver_data & FEC_QUIRK_USE_GASKET) {
                         /* disable the gasket and wait */
                         writel(0, fep->hwp + FEC_MIIGSK_ENR);
                         while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
@@ -436,8 +465,11 @@ fec_restart(struct net_device *ndev, int duplex)
                         /*
                          * configure the gasket:
                          *   RMII, 50 MHz, no loopback, no echo
+                         *   MII, 25 MHz, no loopback, no echo
                          */
-                        writel(1, fep->hwp + FEC_MIIGSK_CFGR);
+                        writel((fep->phy_interface == PHY_INTERFACE_MODE_RMII) ?
+                                        1 : 0, fep->hwp + FEC_MIIGSK_CFGR);
+
 
                         /* re-enable the gasket */
                         writel(2, fep->hwp + FEC_MIIGSK_ENR);
@@ -734,8 +766,22 @@ static void __inline__ fec_get_mac(struct net_device *ndev)
          */
         iap = macaddr;
 
+#ifdef CONFIG_OF
         /*
-         * 2) from flash or fuse (via platform data)
+         * 2) from device tree data
+         */
+        if (!is_valid_ether_addr(iap)) {
+                struct device_node *np = fep->pdev->dev.of_node;
+                if (np) {
+                        const char *mac = of_get_mac_address(np);
+                        if (mac)
+                                iap = (unsigned char *) mac;
+                }
+        }
+#endif
+
+        /*
+         * 3) from flash or fuse (via platform data)
          */
         if (!is_valid_ether_addr(iap)) {
 #ifdef CONFIG_M5272
@@ -748,7 +794,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev)
         }
 
         /*
-         * 3) FEC mac registers set by bootloader
+         * 4) FEC mac registers set by bootloader
          */
         if (!is_valid_ether_addr(iap)) {
                 *((unsigned long *) &tmpaddr[0]) =
@@ -1354,6 +1400,52 @@ static int fec_enet_init(struct net_device *ndev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+
+        if (np)
+                return of_get_phy_mode(np);
+
+        return -ENODEV;
+}
+
+static int __devinit fec_reset_phy(struct platform_device *pdev)
+{
+        int err, phy_reset;
+        struct device_node *np = pdev->dev.of_node;
+
+        if (!np)
+                return -ENODEV;
+
+        phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
+        err = gpio_request_one(phy_reset, GPIOF_OUT_INIT_LOW, "phy-reset");
+        if (err) {
+                pr_warn("FEC: failed to get gpio phy-reset: %d\n", err);
+                return err;
+        }
+        msleep(1);
+        gpio_set_value(phy_reset, 1);
+
+        return 0;
+}
+#else /* CONFIG_OF */
+static inline int fec_get_phy_mode_dt(struct platform_device *pdev)
+{
+        return -ENODEV;
+}
+
+static inline int fec_reset_phy(struct platform_device *pdev)
+{
+        /*
+         * In case of platform probe, the reset has been done
+         * by machine code.
+         */
+        return 0;
+}
+#endif /* CONFIG_OF */
+
 static int __devinit
 fec_probe(struct platform_device *pdev)
 {
@@ -1362,6 +1454,11 @@ fec_probe(struct platform_device *pdev)
         struct net_device *ndev;
         int i, irq, ret = 0;
         struct resource *r;
+        const struct of_device_id *of_id;
+
+        of_id = of_match_device(fec_dt_ids, &pdev->dev);
+        if (of_id)
+                pdev->id_entry = of_id->data;
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!r)
@@ -1393,9 +1490,18 @@ fec_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ndev);
 
-        pdata = pdev->dev.platform_data;
-        if (pdata)
-                fep->phy_interface = pdata->phy;
+        ret = fec_get_phy_mode_dt(pdev);
+        if (ret < 0) {
+                pdata = pdev->dev.platform_data;
+                if (pdata)
+                        fep->phy_interface = pdata->phy;
+                else
+                        fep->phy_interface = PHY_INTERFACE_MODE_MII;
+        } else {
+                fep->phy_interface = ret;
+        }
+
+        fec_reset_phy(pdev);
 
         /* This device has up to three irqs on some platforms */
         for (i = 0; i < 3; i++) {
@@ -1530,6 +1636,7 @@ static struct platform_driver fec_driver = {
 #ifdef CONFIG_PM
                 .pm     = &fec_pm_ops,
 #endif
+                .of_match_table = fec_dt_ids,
         },
         .id_table = fec_devtype,
         .probe  = fec_probe,
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 725399ea0690..70cb7d8a3b53 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -39,6 +39,7 @@
 #include <linux/bitops.h>
 #include <linux/workqueue.h>
 #include <linux/of.h>
+#include <linux/of_net.h>
 #include <linux/slab.h>
 
 #include <asm/processor.h>
@@ -2506,18 +2507,6 @@ static int __devinit emac_init_config(struct emac_instance *dev)
 {
         struct device_node *np = dev->ofdev->dev.of_node;
         const void *p;
-        unsigned int plen;
-        const char *pm, *phy_modes[] = {
-                [PHY_MODE_NA] = "",
-                [PHY_MODE_MII] = "mii",
-                [PHY_MODE_RMII] = "rmii",
-                [PHY_MODE_SMII] = "smii",
-                [PHY_MODE_RGMII] = "rgmii",
-                [PHY_MODE_TBI] = "tbi",
-                [PHY_MODE_GMII] = "gmii",
-                [PHY_MODE_RTBI] = "rtbi",
-                [PHY_MODE_SGMII] = "sgmii",
-        };
 
         /* Read config from device-tree */
         if (emac_read_uint_prop(np, "mal-device", &dev->mal_ph, 1))
@@ -2566,23 +2555,9 @@ static int __devinit emac_init_config(struct emac_instance *dev)
                 dev->mal_burst_size = 256;
 
         /* PHY mode needs some decoding */
-        dev->phy_mode = PHY_MODE_NA;
-        pm = of_get_property(np, "phy-mode", &plen);
-        if (pm != NULL) {
-                int i;
-                for (i = 0; i < ARRAY_SIZE(phy_modes); i++)
-                        if (!strcasecmp(pm, phy_modes[i])) {
-                                dev->phy_mode = i;
-                                break;
-                        }
-        }
-
-        /* Backward compat with non-final DT */
-        if (dev->phy_mode == PHY_MODE_NA && pm != NULL && plen == 4) {
-                u32 nmode = *(const u32 *)pm;
-                if (nmode > PHY_MODE_NA && nmode <= PHY_MODE_SGMII)
-                        dev->phy_mode = nmode;
-        }
+        dev->phy_mode = of_get_phy_mode(np);
+        if (dev->phy_mode < 0)
+                dev->phy_mode = PHY_MODE_NA;
 
         /* Check EMAC version */
         if (of_device_is_compatible(np, "ibm,emac4sync")) {
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ibm_newemac/emac.h
index 8a61b597a169..1568278d759a 100644
--- a/drivers/net/ibm_newemac/emac.h
+++ b/drivers/net/ibm_newemac/emac.h
@@ -26,6 +26,7 @@
 #define __IBM_NEWEMAC_H
 
 #include <linux/types.h>
+#include <linux/phy.h>
 
 /* EMAC registers                       Write Access rules */
 struct emac_regs {
@@ -106,15 +107,15 @@ struct emac_regs {
 /*
  * PHY mode settings (EMAC <-> ZMII/RGMII bridge <-> PHY)
  */
-#define PHY_MODE_NA     0
-#define PHY_MODE_MII    1
-#define PHY_MODE_RMII   2
-#define PHY_MODE_SMII   3
-#define PHY_MODE_RGMII  4
-#define PHY_MODE_TBI    5
-#define PHY_MODE_GMII   6
-#define PHY_MODE_RTBI   7
-#define PHY_MODE_SGMII  8
+#define PHY_MODE_NA     PHY_INTERFACE_MODE_NA
+#define PHY_MODE_MII    PHY_INTERFACE_MODE_MII
+#define PHY_MODE_RMII   PHY_INTERFACE_MODE_RMII
+#define PHY_MODE_SMII   PHY_INTERFACE_MODE_SMII
+#define PHY_MODE_RGMII  PHY_INTERFACE_MODE_RGMII
+#define PHY_MODE_TBI    PHY_INTERFACE_MODE_TBI
+#define PHY_MODE_GMII   PHY_INTERFACE_MODE_GMII
+#define PHY_MODE_RTBI   PHY_INTERFACE_MODE_RTBI
+#define PHY_MODE_SGMII  PHY_INTERFACE_MODE_SGMII
 
 /* EMACx_MR0 */
 #define EMAC_MR0_RXI                    0x80000000
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index ac9d964e59ec..ab4e5969fe65 100644
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -28,12 +28,15 @@
 #include "emac.h"
 #include "phy.h"
 
-static inline int phy_read(struct mii_phy *phy, int reg)
+#define phy_read _phy_read
+#define phy_write _phy_write
+
+static inline int _phy_read(struct mii_phy *phy, int reg)
 {
         return phy->mdio_read(phy->dev, phy->address, reg);
 }
 
-static inline void phy_write(struct mii_phy *phy, int reg, int val)
+static inline void _phy_write(struct mii_phy *phy, int reg, int val)
 {
         phy->mdio_write(phy->dev, phy->address, reg, val);
 }
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 1cd9394c3359..cffbc0373fa9 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -809,7 +809,7 @@ static int smc91c92_config(struct pcmcia_device *link)
     struct net_device *dev = link->priv;
     struct smc_private *smc = netdev_priv(dev);
     char *name;
-    int i, j, rev;
+    int i, rev, j = 0;
     unsigned int ioaddr;
     u_long mir;
 
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index be745ae8f4e3..ade35dde5b51 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -46,14 +46,15 @@
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
-#include <asm/prom.h>
 
 #ifdef CONFIG_SPARC
 #include <asm/idprom.h>
+#include <asm/prom.h>
 #endif
 
 #ifdef CONFIG_PPC_PMAC
 #include <asm/pci-bridge.h>
+#include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/pmac_feature.h>
 #endif
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index c052a0d5cbdd..5441ad195119 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -648,6 +648,8 @@ static const struct pcmcia_device_id hostap_cs_ids[] = {
                                          0x74c5e40d),
         PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil",
                                          0x4b801a17),
+        PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.02",
+                                         0x4b74baa0),
         PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
                                     0x7a954bd9, 0x74be00c6),
         PCMCIA_DEVICE_PROD_ID123(
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index 3f7fc4a0b43d..d7dbc00bcfbe 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -239,7 +239,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
 
 static const struct pcmcia_device_id orinoco_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */
-        PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */
         PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */
         PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */
         PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */
@@ -272,6 +271,7 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
         PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
         PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),
+        PCMCIA_DEVICE_MANF_CARD_PROD_ID3(0x0156, 0x0002, "Version 01.01", 0xd27deb1a), /* Lucent Orinoco */
 #ifdef CONFIG_HERMES_PRISM
         /* Only entries that certainly identify Prism chipset */
         PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */
@@ -321,6 +321,9 @@ static const struct pcmcia_device_id orinoco_cs_ids[] = {
         PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2),
         PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b),
         PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39),
+
+        /* This may be Agere or Intersil Firmware */
+        PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
 #endif
         PCMCIA_DEVICE_NULL,
 };