common: Drop asm/global_data.h from common header

[u-boot.git] / drivers / net / gmac_rockchip.c

diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index e152faf083dac0582a04715e1bfd62f200293ce4..f9096604840e33dafc1cadffc7d24a0f8c293608 100644 (file)
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -8,8 +8,11 @@
 #include <common.h>
 #include <dm.h>
 #include <clk.h>
+#include <log.h>
+#include <net.h>
 #include <phy.h>
 #include <syscon.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/clock.h>
@@ -24,6 +27,7 @@
 #include <asm/arch-rockchip/grf_rv1108.h>
 #include <dm/pinctrl.h>
 #include <dt-bindings/clock/rk3288-cru.h>
+#include <linux/bitops.h>
 #include "designware.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -36,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR;
  *
  * dw_eth_pdata: Required platform data for designware driver (must be first)
  */
-struct gmac_rockchip_platdata {
+struct gmac_rockchip_plat {
        struct dw_eth_pdata dw_eth_pdata;
        bool clock_input;
        int tx_delay;
@@ -45,14 +49,14 @@ struct gmac_rockchip_platdata {
 
 struct rk_gmac_ops {
        int (*fix_mac_speed)(struct dw_eth_dev *priv);
-       void (*set_to_rmii)(struct gmac_rockchip_platdata *pdata);
-       void (*set_to_rgmii)(struct gmac_rockchip_platdata *pdata);
+       void (*set_to_rmii)(struct gmac_rockchip_plat *pdata);
+       void (*set_to_rgmii)(struct gmac_rockchip_plat *pdata);
 };
 
 
-static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev)
+static int gmac_rockchip_of_to_plat(struct udevice *dev)
 {
-       struct gmac_rockchip_platdata *pdata = dev_get_platdata(dev);
+       struct gmac_rockchip_plat *pdata = dev_get_plat(dev);
        const char *string;
 
        string = dev_read_string(dev, "clock_in_out");
@@ -71,7 +75,7 @@ static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev)
        if (pdata->rx_delay == -ENOENT)
                pdata->rx_delay = dev_read_u32_default(dev, "rx-delay", 0x10);
 
-       return designware_eth_ofdata_to_platdata(dev);
+       return designware_eth_of_to_plat(dev);
 }
 
 static int px30_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -341,7 +345,7 @@ static int rv1108_set_rmii_speed(struct dw_eth_dev *priv)
        return 0;
 }
 
-static void px30_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)
+static void px30_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
 {
        struct px30_grf *grf;
        enum {
@@ -357,7 +361,7 @@ static void px30_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)
                     PX30_GMAC_PHY_INTF_SEL_RMII);
 }
 
-static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
+static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
 {
        struct rk322x_grf *grf;
        enum {
@@ -400,7 +404,7 @@ static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
                     pdata->tx_delay << RK3228_CLK_TX_DL_CFG_GMAC_SHIFT);
 }
 
-static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
+static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
 {
        struct rk3288_grf *grf;
 
@@ -419,7 +423,7 @@ static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
                     pdata->tx_delay << RK3288_CLK_TX_DL_CFG_GMAC_SHIFT);
 }
 
-static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)
+static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
 {
        struct rk3308_grf *grf;
        enum {
@@ -435,7 +439,7 @@ static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)
                     RK3308_GMAC_PHY_INTF_SEL_RMII);
 }
 
-static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
+static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
 {
        struct rk3328_grf_regs *grf;
        enum {
@@ -478,7 +482,7 @@ static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
                     pdata->tx_delay << RK3328_CLK_TX_DL_CFG_GMAC_SHIFT);
 }
 
-static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
+static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
 {
        struct rk3368_grf *grf;
        enum {
@@ -515,7 +519,7 @@ static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
                     pdata->tx_delay << RK3368_CLK_TX_DL_CFG_GMAC_SHIFT);
 }
 
-static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
+static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
 {
        struct rk3399_grf_regs *grf;
 
@@ -535,7 +539,7 @@ static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata)
                     pdata->tx_delay << RK3399_CLK_TX_DL_CFG_GMAC_SHIFT);
 }
 
-static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)
+static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
 {
        struct rv1108_grf *grf;
 
@@ -552,10 +556,10 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)
 
 static int gmac_rockchip_probe(struct udevice *dev)
 {
-       struct gmac_rockchip_platdata *pdata = dev_get_platdata(dev);
+       struct gmac_rockchip_plat *pdata = dev_get_plat(dev);
        struct rk_gmac_ops *ops =
                (struct rk_gmac_ops *)dev_get_driver_data(dev);
-       struct dw_eth_pdata *dw_pdata = dev_get_platdata(dev);
+       struct dw_eth_pdata *dw_pdata = dev_get_plat(dev);
        struct eth_pdata *eth_pdata = &dw_pdata->eth_pdata;
        struct clk clk;
        ulong rate;
@@ -661,7 +665,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
 
 static int gmac_rockchip_eth_start(struct udevice *dev)
 {
-       struct eth_pdata *pdata = dev_get_platdata(dev);
+       struct eth_pdata *pdata = dev_get_plat(dev);
        struct dw_eth_dev *priv = dev_get_priv(dev);
        struct rk_gmac_ops *ops =
                (struct rk_gmac_ops *)dev_get_driver_data(dev);
@@ -753,10 +757,10 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = {
        .name   = "gmac_rockchip",
        .id     = UCLASS_ETH,
        .of_match = rockchip_gmac_ids,
-       .ofdata_to_platdata = gmac_rockchip_ofdata_to_platdata,
+       .of_to_plat = gmac_rockchip_of_to_plat,
        .probe  = gmac_rockchip_probe,
        .ops    = &gmac_rockchip_eth_ops,
-       .priv_auto_alloc_size = sizeof(struct dw_eth_dev),
-       .platdata_auto_alloc_size = sizeof(struct gmac_rockchip_platdata),
+       .priv_auto      = sizeof(struct dw_eth_dev),
+       .plat_auto      = sizeof(struct gmac_rockchip_plat),
        .flags = DM_FLAG_ALLOC_PRIV_DMA,
 };