aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/musb-new/ti-musb.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-12-03 16:55:18 -0700
committerSimon Glass <sjg@chromium.org>2020-12-13 16:51:08 -0700
commitcaa4daa2ae3dc0a3e516addea5772c9af76abcb0 (patch)
tree0abbc5b538894532f4db28d56e4645d3be230d27 /drivers/usb/musb-new/ti-musb.c
parent41575d8e4c334df148c4cdd7c40cc825dc0fcaa1 (diff)
downloadu-boot-caa4daa2ae3dc0a3e516addea5772c9af76abcb0.zip
u-boot-caa4daa2ae3dc0a3e516addea5772c9af76abcb0.tar.gz
u-boot-caa4daa2ae3dc0a3e516addea5772c9af76abcb0.tar.bz2
dm: treewide: Rename 'platdata' variables to just 'plat'
We use 'priv' for private data but often use 'platdata' for platform data. We can't really use 'pdata' since that is ambiguous (it could mean private or platform data). Rename some of the latter variables to end with 'plat' for consistency. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/usb/musb-new/ti-musb.c')
-rw-r--r--drivers/usb/musb-new/ti-musb.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c
index 34b1a34..29a0632 100644
--- a/drivers/usb/musb-new/ti-musb.c
+++ b/drivers/usb/musb-new/ti-musb.c
@@ -33,17 +33,17 @@ DECLARE_GLOBAL_DATA_PTR;
static void ti_musb_set_phy_power(struct udevice *dev, u8 on)
{
- struct ti_musb_platdata *platdata = dev_get_platdata(dev);
+ struct ti_musb_platdata *plat = dev_get_platdata(dev);
- if (!platdata->ctrl_mod_base)
+ if (!plat->ctrl_mod_base)
return;
if (on) {
- clrsetbits_le32(platdata->ctrl_mod_base,
+ clrsetbits_le32(plat->ctrl_mod_base,
CM_PHY_PWRDN | CM_PHY_OTG_PWRDN,
OTGVDET_EN | OTGSESSENDEN);
} else {
- clrsetbits_le32(platdata->ctrl_mod_base, 0,
+ clrsetbits_le32(plat->ctrl_mod_base, 0,
CM_PHY_PWRDN | CM_PHY_OTG_PWRDN);
}
}
@@ -79,7 +79,7 @@ static int ti_musb_get_usb_index(int node)
static int ti_musb_ofdata_to_platdata(struct udevice *dev)
{
- struct ti_musb_platdata *platdata = dev_get_platdata(dev);
+ struct ti_musb_platdata *plat = dev_get_platdata(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
int phys;
@@ -87,18 +87,18 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
int usb_index;
struct musb_hdrc_config *musb_config;
- platdata->base = (void *)devfdt_get_addr_index(dev, 1);
+ plat->base = (void *)devfdt_get_addr_index(dev, 1);
phys = fdtdec_lookup_phandle(fdt, node, "phys");
ctrl_mod = fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod");
- platdata->ctrl_mod_base = (void *)fdtdec_get_addr(fdt, ctrl_mod, "reg");
+ plat->ctrl_mod_base = (void *)fdtdec_get_addr(fdt, ctrl_mod, "reg");
usb_index = ti_musb_get_usb_index(node);
switch (usb_index) {
case 1:
- platdata->ctrl_mod_base += AM335X_USB1_CTRL;
+ plat->ctrl_mod_base += AM335X_USB1_CTRL;
break;
case 0:
- platdata->ctrl_mod_base += AM335X_USB0_CTRL;
+ plat->ctrl_mod_base += AM335X_USB0_CTRL;
break;
default:
break;
@@ -130,15 +130,15 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
return -ENOENT;
}
- platdata->plat.config = musb_config;
+ plat->plat.config = musb_config;
- platdata->plat.power = fdtdec_get_int(fdt, node, "mentor,power", -1);
- if (platdata->plat.power < 0) {
+ plat->plat.power = fdtdec_get_int(fdt, node, "mentor,power", -1);
+ if (plat->plat.power < 0) {
pr_err("MUSB mentor,power DT entry missing\n");
return -ENOENT;
}
- platdata->plat.platform_ops = &musb_dsps_ops;
+ plat->plat.platform_ops = &musb_dsps_ops;
return 0;
}
@@ -147,15 +147,15 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev)
static int ti_musb_host_probe(struct udevice *dev)
{
struct musb_host_data *host = dev_get_priv(dev);
- struct ti_musb_platdata *platdata = dev_get_platdata(dev);
+ struct ti_musb_platdata *plat = dev_get_platdata(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
int ret;
priv->desc_before_addr = true;
- host->host = musb_init_controller(&platdata->plat,
+ host->host = musb_init_controller(&plat->plat,
NULL,
- platdata->base);
+ plat->base);
if (!host->host)
return -EIO;
@@ -178,18 +178,18 @@ static int ti_musb_host_remove(struct udevice *dev)
#if CONFIG_IS_ENABLED(OF_CONTROL)
static int ti_musb_host_ofdata_to_platdata(struct udevice *dev)
{
- struct ti_musb_platdata *platdata = dev_get_platdata(dev);
+ struct ti_musb_platdata *plat = dev_get_platdata(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
int ret;
ret = ti_musb_ofdata_to_platdata(dev);
if (ret) {
- pr_err("platdata dt parse error\n");
+ pr_err("plat dt parse error\n");
return ret;
}
- platdata->plat.mode = MUSB_HOST;
+ plat->plat.mode = MUSB_HOST;
return 0;
}
@@ -204,7 +204,7 @@ U_BOOT_DRIVER(ti_musb_host) = {
.probe = ti_musb_host_probe,
.remove = ti_musb_host_remove,
.ops = &musb_usb_ops,
- .platdata_auto = sizeof(struct ti_musb_platdata),
+ .plat_auto = sizeof(struct ti_musb_platdata),
.priv_auto = sizeof(struct musb_host_data),
};
@@ -216,17 +216,17 @@ struct ti_musb_peripheral {
#if CONFIG_IS_ENABLED(OF_CONTROL)
static int ti_musb_peripheral_ofdata_to_platdata(struct udevice *dev)
{
- struct ti_musb_platdata *platdata = dev_get_platdata(dev);
+ struct ti_musb_platdata *plat = dev_get_platdata(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
int ret;
ret = ti_musb_ofdata_to_platdata(dev);
if (ret) {
- pr_err("platdata dt parse error\n");
+ pr_err("plat dt parse error\n");
return ret;
}
- platdata->plat.mode = MUSB_PERIPHERAL;
+ plat->plat.mode = MUSB_PERIPHERAL;
return 0;
}
@@ -244,12 +244,12 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev)
static int ti_musb_peripheral_probe(struct udevice *dev)
{
struct ti_musb_peripheral *priv = dev_get_priv(dev);
- struct ti_musb_platdata *platdata = dev_get_platdata(dev);
+ struct ti_musb_platdata *plat = dev_get_platdata(dev);
int ret;
- priv->periph = musb_init_controller(&platdata->plat,
+ priv->periph = musb_init_controller(&plat->plat,
NULL,
- platdata->base);
+ plat->base);
if (!priv->periph)
return -EIO;
@@ -277,7 +277,7 @@ U_BOOT_DRIVER(ti_musb_peripheral) = {
.probe = ti_musb_peripheral_probe,
.remove = ti_musb_peripheral_remove,
.ops = &musb_usb_ops,
- .platdata_auto = sizeof(struct ti_musb_platdata),
+ .plat_auto = sizeof(struct ti_musb_platdata),
.priv_auto = sizeof(struct ti_musb_peripheral),
.flags = DM_FLAG_PRE_RELOC,
};