X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fmcs814x%2Ffiles-3.3%2Fdrivers%2Fnet%2Fethernet%2Fmcs8140%2Fnuport_mac.c;h=511d261d0d86b9850227a26ba132d60909d86833;hb=1be759708e3f4e4552d9185c2eb279a1c727e414;hp=4a4208604618fd71d409997f80f8d538189aac03;hpb=cfcb04f63cef7513c27777f3250ff833efd1146a;p=openwrt.git

diff --git a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
index 4a42086046..511d261d0d 100644
--- a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
+++ b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
@@ -19,6 +19,8 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
+#include <linux/of_mdio.h>
+#include <linux/of_net.h>
 #include <linux/irq.h>
 #include <linux/err.h>
 #include <linux/phy.h>
@@ -112,22 +114,22 @@
 
 static inline u32 nuport_mac_readl(void __iomem *reg)
 {
-	return __raw_readl(reg);
+	return readl_relaxed(reg);
 }
 
 static inline u8 nuport_mac_readb(void __iomem *reg)
 {
-	return __raw_readb(reg);
+	return readb_relaxed(reg);
 }
 
 static inline void nuport_mac_writel(u32 value, void __iomem *reg)
 {
-	__raw_writel(value, reg);
+	writel_relaxed(value, reg);
 }
 
 static inline void nuport_mac_writeb(u8 value, void __iomem *reg)
 {
-	__raw_writel(value, reg);
+	writel_relaxed(value, reg);
 }
 
 /* MAC private data */
@@ -168,6 +170,8 @@ struct nuport_mac_priv {
 	struct platform_device	*pdev;
 	struct mii_bus		*mii_bus;
 	struct phy_device	*phydev;
+	struct device_node	*phy_node;
+	phy_interface_t		phy_interface;
 	int			old_link;
 	int			old_duplex;
 	u32			msg_level;
@@ -396,7 +400,7 @@ static void nuport_mac_adjust_link(struct net_device *dev)
 		priv->old_link = phydev->link;
 	}
 
-	if (phydev->link & (priv->old_duplex != phydev->duplex)) {
+	if (phydev->link && (priv->old_duplex != phydev->duplex)) {
 		reg = nuport_mac_readl(CTRL_REG);
 		if (phydev->duplex == DUPLEX_FULL)
 			reg |= DUPLEX_FULL;
@@ -564,7 +568,6 @@ static int nuport_mac_rx(struct net_device *dev, int limit)
 
 		/* Get packet status */
 		status = get_unaligned((u32 *) (skb->data + len));
-		skb->dev = dev;
 
 		dma_unmap_single(&priv->pdev->dev, priv->rx_addr, skb->len,
 				DMA_FROM_DEVICE);
@@ -615,6 +618,9 @@ static int nuport_mac_rx(struct net_device *dev, int limit)
 
 exit:
 		skb = netdev_alloc_skb(dev, RX_ALLOC_SIZE);
+		if (!skb)
+			goto out;
+
 		skb_reserve(skb, RX_SKB_HEADROOM);
 		priv->rx_skb[priv->cur_rx] = skb;
 		priv->irq_rxskb[priv->cur_rx] = 1;
@@ -624,7 +630,7 @@ exit:
 			priv->cur_rx = 0;
 		count++;
 	}
-
+out:
 	return count;
 }
 
@@ -896,9 +902,9 @@ static int nuport_mac_mii_probe(struct net_device *dev)
 		goto out;
 	}
 
-	phydev = phy_connect(dev, dev_name(&phydev->dev),
+	phydev = of_phy_connect(dev, priv->phy_node,
 			nuport_mac_adjust_link, 0,
-			PHY_INTERFACE_MODE_MII);
+			priv->phy_interface);
 	if (IS_ERR(phydev)) {
 		netdev_err(dev, "could not attach PHY\n");
 		ret = PTR_ERR(phydev);
@@ -1080,6 +1086,20 @@ static int __init nuport_mac_probe(struct platform_device *pdev)
 
 	netif_napi_add(dev, &priv->napi, nuport_mac_poll, 64);
 
+	priv->phy_node = of_parse_phandle(pdev->dev.of_node, "phy", 0);
+	if (!priv->phy_node) {
+		dev_err(&pdev->dev, "no associated PHY\n");
+		ret = -ENODEV;
+		goto out;
+	}
+
+	priv->phy_interface = of_get_phy_mode(pdev->dev.of_node);
+	if (priv->phy_interface < 0) {
+		dev_err(&pdev->dev, "invalid PHY mode\n");
+		ret = -EINVAL;
+		goto out;
+	}
+
 	priv->mii_bus = mdiobus_alloc();
 	if (!priv->mii_bus) {
 		dev_err(&pdev->dev, "mii bus allocation failed\n");
@@ -1104,7 +1124,7 @@ static int __init nuport_mac_probe(struct platform_device *pdev)
 	for (i = 0; i < PHY_MAX_ADDR; i++)
 		priv->mii_bus->irq[i] = PHY_IGNORE_INTERRUPT;
 
-	ret = mdiobus_register(priv->mii_bus);
+	ret = of_mdiobus_register(priv->mii_bus, pdev->dev.of_node);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to register mii_bus\n");
 		goto out_mdio_irq;