Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u...

[platform/kernel/u-boot.git] / drivers / usb / musb-new / da8xx.c

diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 67488dd..68fc0c3 100644 (file)
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -23,6 +23,7 @@
 #include <asm/arch/da8xx-usb.h>
 #include <linux/delay.h>
 #include <linux/usb/otg.h>
+#include <asm/global_data.h>
 #include <asm/omap_musb.h>
 #include <generic-phy.h>
 #include "linux-compat.h"
@@ -247,7 +248,7 @@ const struct musb_platform_ops da8xx_ops = {
        .disable        = da8xx_musb_disable,
 };
 
-struct da8xx_musb_platdata {
+struct da8xx_musb_plat {
        void *base;
        void *ctrl_mod_base;
        struct musb_hdrc_platform_data plat;
@@ -256,45 +257,45 @@ struct da8xx_musb_platdata {
        struct phy phy;
 };
 
-static int da8xx_musb_ofdata_to_platdata(struct udevice *dev)
+static int da8xx_musb_of_to_plat(struct udevice *dev)
 {
-       struct da8xx_musb_platdata *platdata = dev_get_platdata(dev);
+       struct da8xx_musb_plat *plat = dev_get_plat(dev);
        const void *fdt = gd->fdt_blob;
        int node = dev_of_offset(dev);
 
-       platdata->base = (void *)dev_read_addr_ptr(dev);
-       platdata->musb_config.multipoint = 1;
-       platdata->musb_config.dyn_fifo = 1;
-       platdata->musb_config.num_eps = 5;
-       platdata->musb_config.ram_bits = 10;
-       platdata->plat.power = fdtdec_get_int(fdt, node, "power", 50);
-       platdata->otg_board_data.interface_type = MUSB_INTERFACE_UTMI;
-       platdata->plat.mode = MUSB_HOST;
-       platdata->otg_board_data.dev = dev;
-       platdata->plat.config = &platdata->musb_config;
-       platdata->plat.platform_ops = &da8xx_ops;
-       platdata->plat.board_data = &platdata->otg_board_data;
-       platdata->otg_board_data.clear_irq = da8xx_musb_clear_irq;
-       platdata->otg_board_data.reset = da8xx_musb_reset;
+       plat->base = (void *)dev_read_addr_ptr(dev);
+       plat->musb_config.multipoint = 1;
+       plat->musb_config.dyn_fifo = 1;
+       plat->musb_config.num_eps = 5;
+       plat->musb_config.ram_bits = 10;
+       plat->plat.power = fdtdec_get_int(fdt, node, "power", 50);
+       plat->otg_board_data.interface_type = MUSB_INTERFACE_UTMI;
+       plat->plat.mode = MUSB_HOST;
+       plat->otg_board_data.dev = dev;
+       plat->plat.config = &plat->musb_config;
+       plat->plat.platform_ops = &da8xx_ops;
+       plat->plat.board_data = &plat->otg_board_data;
+       plat->otg_board_data.clear_irq = da8xx_musb_clear_irq;
+       plat->otg_board_data.reset = da8xx_musb_reset;
        return 0;
 }
 
 static int da8xx_musb_probe(struct udevice *dev)
 {
        struct musb_host_data *host = dev_get_priv(dev);
-       struct da8xx_musb_platdata *platdata = dev_get_platdata(dev);
+       struct da8xx_musb_plat *plat = dev_get_plat(dev);
        struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
        struct omap_musb_board_data *otg_board_data;
        int ret;
        void *base = dev_read_addr_ptr(dev);
 
        /* Get the phy info from the device tree */
-       ret = generic_phy_get_by_name(dev, "usb-phy", &platdata->phy);
+       ret = generic_phy_get_by_name(dev, "usb-phy", &plat->phy);
        if (ret)
                return ret;
 
        /* Initialize the phy */
-       ret = generic_phy_init(&platdata->phy);
+       ret = generic_phy_init(&plat->phy);
        if (ret)
                return ret;
 
@@ -302,14 +303,14 @@ static int da8xx_musb_probe(struct udevice *dev)
        lpsc_on(33);
 
        /* Enable phy */
-       generic_phy_power_on(&platdata->phy);
+       generic_phy_power_on(&plat->phy);
 
        priv->desc_before_addr = true;
-       otg_board_data = &platdata->otg_board_data;
+       otg_board_data = &plat->otg_board_data;
 
-       host->host = musb_init_controller(&platdata->plat,
+       host->host = musb_init_controller(&plat->plat,
                                          (struct device *)otg_board_data,
-                                         platdata->base);
+                                         plat->base);
        if (!host->host) {
                ret = -ENODEV;
                goto shutdown; /* Shutdown what we started */
@@ -321,7 +322,7 @@ static int da8xx_musb_probe(struct udevice *dev)
                return 0;
 shutdown:
        /* Turn off the phy if we fail */
-       generic_phy_power_off(&platdata->phy);
+       generic_phy_power_off(&plat->phy);
        lpsc_disable(33);
        return ret;
 }
@@ -344,10 +345,10 @@ U_BOOT_DRIVER(da8xx_musb) = {
        .name   = "da8xx-musb",
        .id             = UCLASS_USB,
        .of_match = da8xx_musb_ids,
-       .ofdata_to_platdata = da8xx_musb_ofdata_to_platdata,
+       .of_to_plat = da8xx_musb_of_to_plat,
        .probe = da8xx_musb_probe,
        .remove = da8xx_musb_remove,
        .ops = &musb_usb_ops,
-       .platdata_auto_alloc_size = sizeof(struct da8xx_musb_platdata),
-       .priv_auto_alloc_size = sizeof(struct musb_host_data),
+       .plat_auto      = sizeof(struct da8xx_musb_plat),
+       .priv_auto      = sizeof(struct musb_host_data),
 };