common: Drop asm/global_data.h from common header

[J-u-boot.git] / drivers / gpio / mxs_gpio.c

diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 30daf4a74e0dbd8e7f871c1583b8225e08fe9c36..5775a22abd4301de5fae41a3f8f0fed4fe5fcda7 100644 (file)
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
 #include <asm/io.h>
@@ -150,7 +151,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * Bank 4: 0-20 -> 21 PINS
  */
 
-struct mxs_gpio_platdata {
+struct mxs_gpio_plat {
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
        struct dtd_fsl_imx23_gpio dtplat;
 #endif
@@ -235,7 +236,7 @@ static const struct dm_gpio_ops gpio_mxs_ops = {
 
 static int mxs_gpio_probe(struct udevice *dev)
 {
-       struct mxs_gpio_platdata *plat = dev_get_plat(dev);
+       struct mxs_gpio_plat *plat = dev_get_plat(dev);
        struct mxs_gpio_priv *priv = dev_get_priv(dev);
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
        char name[16], *str;
@@ -264,7 +265,7 @@ static int mxs_gpio_probe(struct udevice *dev)
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 static int mxs_of_to_plat(struct udevice *dev)
 {
-       struct mxs_gpio_platdata *plat = dev->plat;
+       struct mxs_gpio_plat *plat = dev_get_plat(dev);
        struct fdtdec_phandle_args args;
        int node = dev_of_offset(dev);
        int ret;
@@ -299,12 +300,12 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = {
        .ops    = &gpio_mxs_ops,
        .probe  = mxs_gpio_probe,
        .priv_auto      = sizeof(struct mxs_gpio_priv),
-       .plat_auto      = sizeof(struct mxs_gpio_platdata),
+       .plat_auto      = sizeof(struct mxs_gpio_plat),
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
        .of_match = mxs_gpio_ids,
        .of_to_plat = mxs_of_to_plat,
 #endif
 };
 
-U_BOOT_DRIVER_ALIAS(fsl_imx23_gpio, fsl_imx28_gpio)
+DM_DRIVER_ALIAS(fsl_imx23_gpio, fsl_imx28_gpio)
 #endif /* DM_GPIO */