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>
diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index d156164..75f40e1 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -190,6 +190,6 @@
.bind = cdns3_bind,
.probe = cdns_ti_probe,
.remove = cdns_ti_remove,
- .platdata_auto = sizeof(struct cdns_ti),
+ .plat_auto = sizeof(struct cdns_ti),
.flags = DM_FLAG_OS_PREPARE,
};
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index fb09b3a..1755289 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -159,7 +159,7 @@
.probe = dwc3_generic_peripheral_probe,
.remove = dwc3_generic_peripheral_remove,
.priv_auto = sizeof(struct dwc3_generic_priv),
- .platdata_auto = sizeof(struct dwc3_generic_plat),
+ .plat_auto = sizeof(struct dwc3_generic_plat),
};
#endif
@@ -201,7 +201,7 @@
.probe = dwc3_generic_host_probe,
.remove = dwc3_generic_host_remove,
.priv_auto = sizeof(struct dwc3_generic_host_priv),
- .platdata_auto = sizeof(struct dwc3_generic_plat),
+ .plat_auto = sizeof(struct dwc3_generic_plat),
.ops = &xhci_usb_ops,
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
@@ -459,6 +459,6 @@
.bind = dwc3_glue_bind,
.probe = dwc3_glue_probe,
.remove = dwc3_glue_remove,
- .platdata_auto = sizeof(struct dwc3_glue_data),
+ .plat_auto = sizeof(struct dwc3_glue_data),
};
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 58d57ee..5be8bc8 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -469,6 +469,6 @@
.of_match = dwc3_meson_g12a_ids,
.probe = dwc3_meson_g12a_probe,
.remove = dwc3_meson_g12a_remove,
- .platdata_auto = sizeof(struct dwc3_meson_g12a),
+ .plat_auto = sizeof(struct dwc3_meson_g12a),
};
diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c
index 6e8c93a..1c7bfe8 100644
--- a/drivers/usb/dwc3/dwc3-meson-gxl.c
+++ b/drivers/usb/dwc3/dwc3-meson-gxl.c
@@ -420,6 +420,6 @@
.of_match = dwc3_meson_gxl_ids,
.probe = dwc3_meson_gxl_probe,
.remove = dwc3_meson_gxl_remove,
- .platdata_auto = sizeof(struct dwc3_meson_gxl),
+ .plat_auto = sizeof(struct dwc3_meson_gxl),
};
diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index d63dee4..62c8166 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -422,5 +422,5 @@
.ofdata_to_platdata = sandbox_flash_ofdata_to_platdata,
.ops = &sandbox_usb_flash_ops,
.priv_auto = sizeof(struct sandbox_flash_priv),
- .platdata_auto = sizeof(struct sandbox_flash_plat),
+ .plat_auto = sizeof(struct sandbox_flash_plat),
};
diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c
index 3e66ca4..91158e5 100644
--- a/drivers/usb/emul/sandbox_hub.c
+++ b/drivers/usb/emul/sandbox_hub.c
@@ -131,7 +131,7 @@
device_find_next_child(&dev)) {
struct sandbox_hub_platdata *plat;
- plat = dev_get_parent_platdata(dev);
+ plat = dev_get_parent_plat(dev);
if (plat->port == port) {
gen_desc = plat->plat.desc_list;
gen_desc = usb_emul_find_descriptor(gen_desc,
@@ -304,8 +304,8 @@
static int sandbox_child_post_bind(struct udevice *dev)
{
- struct sandbox_hub_platdata *plat = dev_get_parent_platdata(dev);
- struct usb_emul_platdata *emul = dev_get_uclass_platdata(dev);
+ struct sandbox_hub_platdata *plat = dev_get_parent_plat(dev);
+ struct usb_emul_platdata *emul = dev_get_uclass_plat(dev);
plat->port = dev_read_u32_default(dev, "reg", -1);
emul->port1 = plat->port + 1;
@@ -329,7 +329,7 @@
.bind = sandbox_hub_bind,
.ops = &sandbox_usb_hub_ops,
.priv_auto = sizeof(struct sandbox_hub_priv),
- .per_child_platdata_auto =
+ .per_child_plat_auto =
sizeof(struct sandbox_hub_platdata),
.child_post_bind = sandbox_child_post_bind,
};
diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c
index c64ce1f..16c5945 100644
--- a/drivers/usb/emul/sandbox_keyb.c
+++ b/drivers/usb/emul/sandbox_keyb.c
@@ -242,5 +242,5 @@
.probe = sandbox_keyb_probe,
.ops = &sandbox_usb_keyb_ops,
.priv_auto = sizeof(struct sandbox_keyb_priv),
- .platdata_auto = sizeof(struct sandbox_keyb_plat),
+ .plat_auto = sizeof(struct sandbox_keyb_plat),
};
diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c
index b306939..1b7e1ea 100644
--- a/drivers/usb/emul/usb-emul-uclass.c
+++ b/drivers/usb/emul/usb-emul-uclass.c
@@ -115,7 +115,7 @@
if (ret)
return ret;
uclass_foreach_dev(dev, uc) {
- struct usb_dev_platdata *udev = dev_get_parent_platdata(dev);
+ struct usb_dev_platdata *udev = dev_get_parent_plat(dev);
/*
* devnum is initialzied to zero at the beginning of the
@@ -140,7 +140,7 @@
return 0;
}
- plat = dev_get_uclass_platdata(dev);
+ plat = dev_get_uclass_plat(dev);
if (plat->port1 == port1) {
debug("%s: Found emulator '%s', port %d\n",
__func__, dev->name, port1);
@@ -169,7 +169,7 @@
int usb_emul_find_for_dev(struct udevice *dev, struct udevice **emulp)
{
- struct usb_dev_platdata *udev = dev_get_parent_platdata(dev);
+ struct usb_dev_platdata *udev = dev_get_parent_plat(dev);
return usb_emul_find_devnum(udev->devnum, 0, emulp);
}
@@ -183,7 +183,7 @@
int ret;
/* We permit getting the descriptor before we are probed */
- plat = dev_get_parent_platdata(emul);
+ plat = dev_get_parent_plat(emul);
if (!ops->control)
return -ENOSYS;
debug("%s: dev=%s\n", __func__, emul->name);
@@ -262,7 +262,7 @@
int usb_emul_setup_device(struct udevice *dev, struct usb_string *strings,
void **desc_list)
{
- struct usb_dev_platdata *plat = dev_get_parent_platdata(dev);
+ struct usb_dev_platdata *plat = dev_get_parent_plat(dev);
struct usb_generic_descriptor **ptr;
struct usb_config_descriptor *cdesc;
int upto;
@@ -298,7 +298,7 @@
.id = UCLASS_USB_EMUL,
.name = "usb_emul",
.post_bind = dm_scan_fdt_dev,
- .per_device_platdata_auto = sizeof(struct usb_emul_platdata),
+ .per_device_plat_auto = sizeof(struct usb_emul_platdata),
.per_child_auto = sizeof(struct usb_device),
- .per_child_platdata_auto = sizeof(struct usb_dev_platdata),
+ .per_child_plat_auto = sizeof(struct usb_dev_platdata),
};
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index 7115dcb..be69952 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -877,7 +877,7 @@
.probe = asix_eth_probe,
.ops = &asix_eth_ops,
.priv_auto = sizeof(struct asix_private),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
};
static const struct usb_device_id asix_eth_id_table[] = {
diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index ffc90c0..8abcf13 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -903,7 +903,7 @@
.probe = ax88179_eth_probe,
.ops = &ax88179_eth_ops,
.priv_auto = sizeof(struct asix_private),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
};
static const struct usb_device_id ax88179_eth_id_table[] = {
diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c
index 1fa7e53..d5e4c6a 100644
--- a/drivers/usb/eth/lan75xx.c
+++ b/drivers/usb/eth/lan75xx.c
@@ -305,7 +305,7 @@
.remove = lan7x_eth_remove,
.ops = &lan75xx_eth_ops,
.priv_auto = sizeof(struct lan7x_private),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
};
static const struct usb_device_id lan75xx_eth_id_table[] = {
diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c
index 3f7e03f..cc02e4d 100644
--- a/drivers/usb/eth/lan78xx.c
+++ b/drivers/usb/eth/lan78xx.c
@@ -467,7 +467,7 @@
.remove = lan7x_eth_remove,
.ops = &lan78xx_eth_ops,
.priv_auto = sizeof(struct lan7x_private),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
};
static const struct usb_device_id lan78xx_eth_id_table[] = {
diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 1746819..d835170 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -929,7 +929,7 @@
.probe = mcs7830_eth_probe,
.ops = &mcs7830_eth_ops,
.priv_auto = sizeof(struct mcs7830_private),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 804c331..600e9f5 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -1843,7 +1843,7 @@
.probe = r8152_eth_probe,
.ops = &r8152_eth_ops,
.priv_auto = sizeof(struct r8152),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
};
static const struct usb_device_id r8152_eth_id_table[] = {
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index d6863ad..836b534 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -1063,7 +1063,7 @@
.probe = smsc95xx_eth_probe,
.ops = &smsc95xx_eth_ops,
.priv_auto = sizeof(struct smsc95xx_private),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
};
static const struct usb_device_id smsc95xx_eth_id_table[] = {
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index a662d50..93b1c60 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -982,7 +982,7 @@
static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev)
{
- struct dwc2_plat_otg_data *platdata = dev_get_platdata(dev);
+ struct dwc2_plat_otg_data *plat = dev_get_platdata(dev);
ulong drvdata;
void (*set_params)(struct dwc2_plat_otg_data *data);
int ret;
@@ -993,35 +993,34 @@
return -ENODEV;
}
- platdata->regs_otg = dev_read_addr(dev);
+ plat->regs_otg = dev_read_addr(dev);
- platdata->rx_fifo_sz = dev_read_u32_default(dev, "g-rx-fifo-size", 0);
- platdata->np_tx_fifo_sz = dev_read_u32_default(dev,
- "g-np-tx-fifo-size", 0);
+ plat->rx_fifo_sz = dev_read_u32_default(dev, "g-rx-fifo-size", 0);
+ plat->np_tx_fifo_sz = dev_read_u32_default(dev, "g-np-tx-fifo-size", 0);
- platdata->tx_fifo_sz_nb =
+ plat->tx_fifo_sz_nb =
dev_read_size(dev, "g-tx-fifo-size") / sizeof(u32);
- if (platdata->tx_fifo_sz_nb > DWC2_MAX_HW_ENDPOINTS)
- platdata->tx_fifo_sz_nb = DWC2_MAX_HW_ENDPOINTS;
- if (platdata->tx_fifo_sz_nb) {
+ if (plat->tx_fifo_sz_nb > DWC2_MAX_HW_ENDPOINTS)
+ plat->tx_fifo_sz_nb = DWC2_MAX_HW_ENDPOINTS;
+ if (plat->tx_fifo_sz_nb) {
ret = dev_read_u32_array(dev, "g-tx-fifo-size",
- platdata->tx_fifo_sz_array,
- platdata->tx_fifo_sz_nb);
+ plat->tx_fifo_sz_array,
+ plat->tx_fifo_sz_nb);
if (ret)
return ret;
}
- platdata->force_b_session_valid =
+ plat->force_b_session_valid =
dev_read_bool(dev, "u-boot,force-b-session-valid");
- platdata->force_vbus_detection =
+ plat->force_vbus_detection =
dev_read_bool(dev, "u-boot,force-vbus-detection");
- /* force platdata according compatible */
+ /* force plat according compatible */
drvdata = dev_get_driver_data(dev);
if (drvdata) {
set_params = (void *)drvdata;
- set_params(platdata);
+ set_params(plat);
}
return 0;
@@ -1091,10 +1090,10 @@
static int dwc2_udc_otg_probe(struct udevice *dev)
{
- struct dwc2_plat_otg_data *platdata = dev_get_platdata(dev);
+ struct dwc2_plat_otg_data *plat = dev_get_platdata(dev);
struct dwc2_priv_data *priv = dev_get_priv(dev);
struct dwc2_usbotg_reg *usbotg_reg =
- (struct dwc2_usbotg_reg *)platdata->regs_otg;
+ (struct dwc2_usbotg_reg *)plat->regs_otg;
int ret;
ret = dwc2_udc_otg_clk_init(dev, &priv->clks);
@@ -1109,10 +1108,10 @@
if (ret)
return ret;
- if (platdata->activate_stm_id_vb_detection) {
+ if (plat->activate_stm_id_vb_detection) {
if (CONFIG_IS_ENABLED(DM_REGULATOR) &&
- (!platdata->force_b_session_valid ||
- platdata->force_vbus_detection)) {
+ (!plat->force_b_session_valid ||
+ plat->force_vbus_detection)) {
ret = device_get_supply_regulator(dev, "usb33d-supply",
&priv->usb33d_supply);
if (ret) {
@@ -1126,8 +1125,8 @@
}
}
- if (platdata->force_b_session_valid &&
- !platdata->force_vbus_detection) {
+ if (plat->force_b_session_valid &&
+ !plat->force_vbus_detection) {
/* Override VBUS detection: enable then value*/
setbits_le32(&usbotg_reg->gotgctl, VB_VALOEN);
setbits_le32(&usbotg_reg->gotgctl, VB_VALOVAL);
@@ -1136,7 +1135,7 @@
setbits_le32(&usbotg_reg->ggpio,
GGPIO_STM32_OTG_GCCFG_VBDEN);
}
- if (platdata->force_b_session_valid) {
+ if (plat->force_b_session_valid) {
/* Override B session bits: enable then value */
setbits_le32(&usbotg_reg->gotgctl, A_VALOEN | B_VALOEN);
setbits_le32(&usbotg_reg->gotgctl,
@@ -1148,7 +1147,7 @@
}
}
- ret = dwc2_udc_probe(platdata);
+ ret = dwc2_udc_probe(plat);
if (ret)
return ret;
@@ -1189,15 +1188,15 @@
.ofdata_to_platdata = dwc2_udc_otg_ofdata_to_platdata,
.probe = dwc2_udc_otg_probe,
.remove = dwc2_udc_otg_remove,
- .platdata_auto = sizeof(struct dwc2_plat_otg_data),
+ .plat_auto = sizeof(struct dwc2_plat_otg_data),
.priv_auto = sizeof(struct dwc2_priv_data),
};
int dwc2_udc_B_session_valid(struct udevice *dev)
{
- struct dwc2_plat_otg_data *platdata = dev_get_platdata(dev);
+ struct dwc2_plat_otg_data *plat = dev_get_platdata(dev);
struct dwc2_usbotg_reg *usbotg_reg =
- (struct dwc2_usbotg_reg *)platdata->regs_otg;
+ (struct dwc2_usbotg_reg *)plat->regs_otg;
return readl(&usbotg_reg->gotgctl) & B_SESSION_VALID;
}
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 0cce8e2..9d4bb9d 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2692,7 +2692,7 @@
.probe = usb_eth_probe,
.ops = &usb_eth_ops,
.priv_auto = sizeof(struct ether_priv),
- .platdata_auto = sizeof(struct eth_pdata),
+ .plat_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif /* CONFIG_DM_ETH */
diff --git a/drivers/usb/gadget/max3420_udc.c b/drivers/usb/gadget/max3420_udc.c
index 775754a..36f3eb5 100644
--- a/drivers/usb/gadget/max3420_udc.c
+++ b/drivers/usb/gadget/max3420_udc.c
@@ -826,7 +826,7 @@
uint speed, mode;
struct udevice *spid;
- slave_pdata = dev_get_parent_platdata(dev);
+ slave_pdata = dev_get_parent_plat(dev);
cs = slave_pdata->cs;
speed = slave_pdata->max_hz;
mode = slave_pdata->mode;
diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c
index 6240a45..9b1edcd 100644
--- a/drivers/usb/host/dwc3-of-simple.c
+++ b/drivers/usb/host/dwc3-of-simple.c
@@ -102,6 +102,6 @@
.of_match = dwc3_of_simple_ids,
.probe = dwc3_of_simple_probe,
.remove = dwc3_of_simple_remove,
- .platdata_auto = sizeof(struct dwc3_of_simple),
+ .plat_auto = sizeof(struct dwc3_of_simple),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c
index ba008bf..e9ebe2e 100644
--- a/drivers/usb/host/dwc3-sti-glue.c
+++ b/drivers/usb/host/dwc3-sti-glue.c
@@ -246,6 +246,6 @@
.probe = sti_dwc3_glue_probe,
.remove = sti_dwc3_glue_remove,
.bind = sti_dwc3_glue_bind,
- .platdata_auto = sizeof(struct sti_dwc3_glue_platdata),
+ .plat_auto = sizeof(struct sti_dwc3_glue_platdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 955cacd..22a35a5 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -124,7 +124,7 @@
.probe = ehci_atmel_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_atmel_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 3728b23..d1ff3f4 100644
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -259,6 +259,6 @@
.remove = ehci_usb_remove,
.ops = &ehci_usb_ops,
.priv_auto = sizeof(struct exynos_ehci),
- .platdata_auto = sizeof(struct exynos_ehci_platdata),
+ .plat_auto = sizeof(struct exynos_ehci_platdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index a53493a..9824b7b 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -145,7 +145,7 @@
.probe = ehci_fsl_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_fsl_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 3295936..f9e24b9 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -152,7 +152,7 @@
.probe = ehci_mvebu_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_mvebu_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 61ff13e..13ee268 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -145,6 +145,6 @@
.remove = ehci_usb_remove,
.ops = &ehci_usb_ops,
.priv_auto = sizeof(struct msm_ehci_priv),
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 2943b84..df54431 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -367,7 +367,7 @@
.probe = ehci_usb_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_mx5_priv_data),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index cd22b07..981bf81 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -650,7 +650,7 @@
.probe = ehci_usb_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_mx6_priv_data),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index ac264a2..51c5029 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -403,7 +403,7 @@
.of_match = omap_ehci_dt_ids,
.probe = omap_ehci_probe,
.ofdata_to_platdata = ehci_usb_ofdata_to_platdata,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_omap_priv_data),
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 7d91846..61f5a6c 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -163,7 +163,7 @@
.remove = ehci_pci_remove,
.of_match = ehci_pci_ids,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_pci_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 9ffaf00..c76e9c3 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -865,7 +865,7 @@
.probe = ehci_usb_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct fdt_usb),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index f370052..c0500e3 100644
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -355,7 +355,7 @@
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.ofdata_to_platdata = vf_usb_ofdata_to_platdata,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct ehci_vf_priv_data),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c
index 738eed3..df7ea0a 100644
--- a/drivers/usb/host/ehci-zynq.c
+++ b/drivers/usb/host/ehci-zynq.c
@@ -85,7 +85,7 @@
.probe = ehci_zynq_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct zynq_ehci_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 48ffa4a..c53b6f5 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -39,7 +39,7 @@
.remove = ohci_pci_remove,
.of_match = ohci_pci_ids,
.ops = &ohci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(ohci_t),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 1e7bec9..8e4e9e8 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -575,7 +575,7 @@
drv = entry->driver;
/*
* We could pass the descriptor to the driver as
- * platdata (instead of NULL) and allow its bind()
+ * plat (instead of NULL) and allow its bind()
* method to return -ENOENT if it doesn't support this
* device. That way we could continue the search to
* find another driver. For now this doesn't seem
@@ -587,7 +587,7 @@
goto error;
debug("%s: Match found: %s\n", __func__, drv->name);
dev->driver_data = id->driver_info;
- plat = dev_get_parent_platdata(dev);
+ plat = dev_get_parent_plat(dev);
plat->id = *id;
*devp = dev;
return 0;
@@ -622,7 +622,7 @@
for (device_find_first_child(parent, &dev);
dev;
device_find_next_child(&dev)) {
- struct usb_dev_platdata *plat = dev_get_parent_platdata(dev);
+ struct usb_dev_platdata *plat = dev_get_parent_plat(dev);
/* If this device is already in use, skip it */
if (device_active(dev))
@@ -707,7 +707,7 @@
return ret;
created = true;
}
- plat = dev_get_parent_platdata(dev);
+ plat = dev_get_parent_plat(dev);
debug("%s: Probing '%s', plat=%p\n", __func__, dev->name, plat);
plat->devnum = udev->devnum;
plat->udev = udev;
@@ -770,7 +770,7 @@
static int usb_child_post_bind(struct udevice *dev)
{
- struct usb_dev_platdata *plat = dev_get_parent_platdata(dev);
+ struct usb_dev_platdata *plat = dev_get_parent_plat(dev);
int val;
if (!dev_of_valid(dev))
@@ -809,7 +809,7 @@
int usb_child_pre_probe(struct udevice *dev)
{
struct usb_device *udev = dev_get_parent_priv(dev);
- struct usb_dev_platdata *plat = dev_get_parent_platdata(dev);
+ struct usb_dev_platdata *plat = dev_get_parent_plat(dev);
int ret;
if (plat->udev) {
@@ -854,7 +854,7 @@
.per_device_auto = sizeof(struct usb_bus_priv),
.child_post_bind = usb_child_post_bind,
.child_pre_probe = usb_child_pre_probe,
- .per_child_platdata_auto = sizeof(struct usb_dev_platdata),
+ .per_child_plat_auto = sizeof(struct usb_dev_platdata),
};
UCLASS_DRIVER(usb_dev_generic) = {
diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index f50f069..cc20cf0 100644
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -92,7 +92,7 @@
.remove = xhci_brcm_deregister,
.ops = &xhci_usb_ops,
.of_match = xhci_brcm_ids,
- .platdata_auto = sizeof(struct brcm_xhci_platdata),
+ .plat_auto = sizeof(struct brcm_xhci_platdata),
.priv_auto = sizeof(struct xhci_ctrl),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 4dba569..a57762f 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -187,7 +187,7 @@
.remove = xhci_dwc3_remove,
.ops = &xhci_usb_ops,
.priv_auto = sizeof(struct xhci_ctrl),
- .platdata_auto = sizeof(struct xhci_dwc3_platdata),
+ .plat_auto = sizeof(struct xhci_dwc3_platdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index 6e1b5f0..39e651e 100644
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -255,7 +255,7 @@
.probe = xhci_usb_probe,
.remove = xhci_usb_remove,
.ops = &xhci_usb_ops,
- .platdata_auto = sizeof(struct exynos_xhci_platdata),
+ .plat_auto = sizeof(struct exynos_xhci_platdata),
.priv_auto = sizeof(struct exynos_xhci),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c
index 95714d8..e54db0f 100644
--- a/drivers/usb/host/xhci-fsl.c
+++ b/drivers/usb/host/xhci-fsl.c
@@ -169,7 +169,7 @@
.probe = xhci_fsl_probe,
.remove = xhci_fsl_remove,
.ops = &xhci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct xhci_fsl_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index 6f56cc8..1762bbb 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -96,7 +96,7 @@
.probe = xhci_usb_probe,
.remove = xhci_deregister,
.ops = &xhci_usb_ops,
- .platdata_auto = sizeof(struct mvebu_xhci_platdata),
+ .plat_auto = sizeof(struct mvebu_xhci_platdata),
.priv_auto = sizeof(struct mvebu_xhci),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 888b17b..96d1de6 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -59,7 +59,7 @@
.remove = xhci_deregister,
.of_match = xhci_pci_ids,
.ops = &xhci_usb_ops,
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct xhci_ctrl),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 4322fb2..2ef072b 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -161,7 +161,7 @@
.ops = &xhci_usb_ops,
.of_match = xhci_rcar_ids,
.ofdata_to_platdata = xhci_rcar_ofdata_to_platdata,
- .platdata_auto = sizeof(struct rcar_xhci_platdata),
+ .plat_auto = sizeof(struct rcar_xhci_platdata),
.priv_auto = sizeof(struct rcar_xhci),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c
index 6c0d0b8..2889e85 100644
--- a/drivers/usb/musb-new/da8xx.c
+++ b/drivers/usb/musb-new/da8xx.c
@@ -258,43 +258,43 @@
static int da8xx_musb_ofdata_to_platdata(struct udevice *dev)
{
- struct da8xx_musb_platdata *platdata = dev_get_platdata(dev);
+ struct da8xx_musb_platdata *plat = dev_get_platdata(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_platdata *plat = dev_get_platdata(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 +302,14 @@
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 +321,7 @@
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;
}
@@ -348,6 +348,6 @@
.probe = da8xx_musb_probe,
.remove = da8xx_musb_remove,
.ops = &musb_usb_ops,
- .platdata_auto = sizeof(struct da8xx_musb_platdata),
+ .plat_auto = sizeof(struct da8xx_musb_platdata),
.priv_auto = sizeof(struct musb_host_data),
};
diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c
index 8adfa42..4847b2c 100644
--- a/drivers/usb/musb-new/mt85xx.c
+++ b/drivers/usb/musb-new/mt85xx.c
@@ -414,6 +414,6 @@
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct mtk_musb_glue),
};
diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index 2e029d8..9150c4d 100644
--- a/drivers/usb/musb-new/omap2430.c
+++ b/drivers/usb/musb-new/omap2430.c
@@ -151,67 +151,63 @@
static int omap2430_musb_ofdata_to_platdata(struct udevice *dev)
{
- struct omap2430_musb_platdata *platdata = dev_get_platdata(dev);
+ struct omap2430_musb_platdata *plat = dev_get_platdata(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
- platdata->base = (void *)dev_read_addr_ptr(dev);
+ plat->base = (void *)dev_read_addr_ptr(dev);
- platdata->musb_config.multipoint = fdtdec_get_int(fdt, node,
- "multipoint",
- -1);
- if (platdata->musb_config.multipoint < 0) {
+ plat->musb_config.multipoint = fdtdec_get_int(fdt, node, "multipoint",
+ -1);
+ if (plat->musb_config.multipoint < 0) {
pr_err("MUSB multipoint DT entry missing\n");
return -ENOENT;
}
- platdata->musb_config.dyn_fifo = 1;
- platdata->musb_config.num_eps = fdtdec_get_int(fdt, node,
- "num-eps", -1);
- if (platdata->musb_config.num_eps < 0) {
+ plat->musb_config.dyn_fifo = 1;
+ plat->musb_config.num_eps = fdtdec_get_int(fdt, node, "num-eps", -1);
+ if (plat->musb_config.num_eps < 0) {
pr_err("MUSB num-eps DT entry missing\n");
return -ENOENT;
}
- platdata->musb_config.ram_bits = fdtdec_get_int(fdt, node,
- "ram-bits", -1);
- if (platdata->musb_config.ram_bits < 0) {
+ plat->musb_config.ram_bits = fdtdec_get_int(fdt, node, "ram-bits", -1);
+ if (plat->musb_config.ram_bits < 0) {
pr_err("MUSB ram-bits DT entry missing\n");
return -ENOENT;
}
- platdata->plat.power = fdtdec_get_int(fdt, node,
- "power", -1);
- if (platdata->plat.power < 0) {
+ plat->plat.power = fdtdec_get_int(fdt, node, "power", -1);
+ if (plat->plat.power < 0) {
pr_err("MUSB power DT entry missing\n");
return -ENOENT;
}
- platdata->otg_board_data.interface_type = fdtdec_get_int(fdt, node,
- "interface-type", -1);
- if (platdata->otg_board_data.interface_type < 0) {
+ plat->otg_board_data.interface_type = fdtdec_get_int(fdt, node,
+ "interface-type",
+ -1);
+ if (plat->otg_board_data.interface_type < 0) {
pr_err("MUSB interface-type DT entry missing\n");
return -ENOENT;
}
#if 0 /* In a perfect world, mode would be set to OTG, mode 3 from DT */
- platdata->plat.mode = fdtdec_get_int(fdt, node,
- "mode", -1);
- if (platdata->plat.mode < 0) {
+ plat->plat.mode = fdtdec_get_int(fdt, node, "mode", -1);
+ if (plat->plat.mode < 0) {
pr_err("MUSB mode DT entry missing\n");
return -ENOENT;
}
#else /* MUSB_OTG, it doesn't work */
#ifdef CONFIG_USB_MUSB_HOST /* Host seems to be the only option that works */
- platdata->plat.mode = MUSB_HOST;
+ plat->plat.mode = MUSB_HOST;
#else /* For that matter, MUSB_PERIPHERAL doesn't either */
- platdata->plat.mode = MUSB_PERIPHERAL;
+ plat->plat.mode = MUSB_PERIPHERAL;
#endif
#endif
- platdata->otg_board_data.dev = dev;
- platdata->plat.config = &platdata->musb_config;
- platdata->plat.platform_ops = &omap2430_ops;
- platdata->plat.board_data = &platdata->otg_board_data;
+ plat->otg_board_data.dev = dev;
+ plat->plat.config = &plat->musb_config;
+ plat->plat.platform_ops = &omap2430_ops;
+ plat->plat.board_data = &plat->otg_board_data;
return 0;
}
@@ -222,7 +218,7 @@
#else
struct musb *musbp;
#endif
- struct omap2430_musb_platdata *platdata = dev_get_platdata(dev);
+ struct omap2430_musb_platdata *plat = dev_get_platdata(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
struct omap_musb_board_data *otg_board_data;
int ret = 0;
@@ -230,21 +226,20 @@
priv->desc_before_addr = true;
- otg_board_data = &platdata->otg_board_data;
+ otg_board_data = &plat->otg_board_data;
#ifdef CONFIG_USB_MUSB_HOST
- 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) {
return -EIO;
}
ret = musb_lowlevel_init(host);
#else
- musbp = musb_register(&platdata->plat,
- (struct device *)otg_board_data,
- platdata->base);
+ musbp = musb_register(&plat->plat, (struct device *)otg_board_data,
+ plat->base);
if (IS_ERR_OR_NULL(musbp))
return -EINVAL;
#endif
@@ -280,7 +275,7 @@
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
- .platdata_auto = sizeof(struct omap2430_musb_platdata),
+ .plat_auto = sizeof(struct omap2430_musb_platdata),
.priv_auto = sizeof(struct musb_host_data),
};
diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index e45ab20..7970d16 100644
--- a/drivers/usb/musb-new/pic32.c
+++ b/drivers/usb/musb-new/pic32.c
@@ -288,6 +288,6 @@
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct pic32_musb_data),
};
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 10bc3e8..1337e52 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -552,6 +552,6 @@
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
- .platdata_auto = sizeof(struct usb_platdata),
+ .plat_auto = sizeof(struct usb_platdata),
.priv_auto = sizeof(struct sunxi_glue),
};
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 @@
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_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 @@
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 @@
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_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 @@
#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 @@
.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 @@
#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 @@
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 @@
.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,
};