Merge git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / drivers / net / sunxi_emac.c

diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 8dbd3c50c117ce25729fbfdbf9314d6fde1a2bb5..6364beb9f2a8f31655d7f0fe29a7f1dc9d20887f 100644 (file)
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -6,7 +6,11 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
+#include <log.h>
+#include <dm/device_compat.h>
+#include <linux/delay.h>
 #include <linux/err.h>
 #include <malloc.h>
 #include <miiphy.h>
@@ -157,6 +161,7 @@ struct sunxi_sramc_regs {
 
 struct emac_eth_dev {
        struct emac_regs *regs;
+       struct clk clk;
        struct mii_dev *bus;
        struct phy_device *phydev;
        int link_printed;
@@ -500,14 +505,12 @@ static int _sunxi_emac_eth_send(struct emac_eth_dev *priv, void *packet,
        return 0;
 }
 
-static void sunxi_emac_board_setup(struct emac_eth_dev *priv)
+static int sunxi_emac_board_setup(struct emac_eth_dev *priv)
 {
-       struct sunxi_ccm_reg *const ccm =
-               (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
        struct sunxi_sramc_regs *sram =
                (struct sunxi_sramc_regs *)SUNXI_SRAMC_BASE;
        struct emac_regs *regs = priv->regs;
-       int pin;
+       int pin, ret;
 
        /* Map SRAM to EMAC */
        setbits_le32(&sram->ctrl1, 0x5 << 2);
@@ -517,10 +520,16 @@ static void sunxi_emac_board_setup(struct emac_eth_dev *priv)
                sunxi_gpio_set_cfgpin(pin, SUNXI_GPA_EMAC);
 
        /* Set up clock gating */
-       setbits_le32(&ccm->ahb_gate0, 0x1 << AHB_GATE_OFFSET_EMAC);
+       ret = clk_enable(&priv->clk);
+       if (ret) {
+               dev_err(dev, "failed to enable emac clock\n");
+               return ret;
+       }
 
        /* Set MII clock */
        clrsetbits_le32(&regs->mac_mcfg, 0xf << 2, 0xd << 2);
+
+       return 0;
 }
 
 static int sunxi_emac_eth_start(struct udevice *dev)
@@ -557,9 +566,19 @@ static int sunxi_emac_eth_probe(struct udevice *dev)
 {
        struct eth_pdata *pdata = dev_get_platdata(dev);
        struct emac_eth_dev *priv = dev_get_priv(dev);
+       int ret;
 
        priv->regs = (struct emac_regs *)pdata->iobase;
-       sunxi_emac_board_setup(priv);
+
+       ret = clk_get_by_index(dev, 0, &priv->clk);
+       if (ret) {
+               dev_err(dev, "failed to get emac clock\n");
+               return ret;
+       }
+
+       ret = sunxi_emac_board_setup(priv);
+       if (ret)
+               return ret;
 
        return sunxi_emac_init_phy(priv, dev);
 }