|
@@ -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>
|
|
|
|
|
@@ -89,6 +93,20 @@ static struct platform_device_id fec_devtype[] = {
|
|
|
};
|
|
|
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);
|
|
|
MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
|
|
@@ -748,8 +766,22 @@ static void __inline__ fec_get_mac(struct net_device *ndev)
|
|
|
*/
|
|
|
iap = macaddr;
|
|
|
|
|
|
+#ifdef CONFIG_OF
|
|
|
+ /*
|
|
|
+ * 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
|
|
|
+
|
|
|
/*
|
|
|
- * 2) from flash or fuse (via platform data)
|
|
|
+ * 3) from flash or fuse (via platform data)
|
|
|
*/
|
|
|
if (!is_valid_ether_addr(iap)) {
|
|
|
#ifdef CONFIG_M5272
|
|
@@ -762,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]) =
|
|
@@ -1368,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)
|
|
|
{
|
|
@@ -1376,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)
|
|
@@ -1407,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++) {
|
|
@@ -1544,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,
|