leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: treewide: Rename ..._platdata variables to just ..._plat

Browse Source 
Try to maintain some consistency between these variables by using _plat as
a suffix for them.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2020-12-03 16:55:23 -07:00
parent b012ff1f1b
commit 8a8d24bdf1
358 changed files with 1404 additions and 1411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/emul/sandbox_hub.c
View File

@@ -13,8 +13,8 @@
/* We only support up to 8 */
#define SANDBOX_NUM_PORTS 4
struct sandbox_hub_platdata {
struct usb_dev_platdata plat;
struct sandbox_hub_plat {
struct usb_dev_plat plat;
int port; /* Port number (numbered from 0) */
};
@@ -129,7 +129,7 @@ static struct udevice *hub_find_device(struct udevice *hub, int port,
for (device_find_first_child(hub, &dev);
dev;
device_find_next_child(&dev)) {
struct sandbox_hub_platdata *plat;
struct sandbox_hub_plat *plat;
plat = dev_get_parent_plat(dev);
if (plat->port == port) {
@@ -304,8 +304,8 @@ static int sandbox_hub_bind(struct udevice *dev)
static int sandbox_child_post_bind(struct udevice *dev)
{
struct sandbox_hub_platdata *plat = dev_get_parent_plat(dev);
struct usb_emul_platdata *emul = dev_get_uclass_plat(dev);
struct sandbox_hub_plat *plat = dev_get_parent_plat(dev);
struct usb_emul_plat *emul = dev_get_uclass_plat(dev);
plat->port = dev_read_u32_default(dev, "reg", -1);
emul->port1 = plat->port + 1;
@@ -329,6 +329,6 @@ U_BOOT_DRIVER(usb_sandbox_hub) = {
.bind = sandbox_hub_bind,
.ops = &sandbox_usb_hub_ops,
.priv_auto = sizeof(struct sandbox_hub_priv),
.per_child_plat_auto = sizeof(struct sandbox_hub_platdata),
.per_child_plat_auto = sizeof(struct sandbox_hub_plat),
.child_post_bind = sandbox_child_post_bind,
};

16
drivers/usb/emul/usb-emul-uclass.c
View File

@@ -75,7 +75,7 @@ struct usb_generic_descriptor **usb_emul_find_descriptor(
return ptr;
}
static int usb_emul_get_descriptor(struct usb_dev_platdata *plat, int value,
static int usb_emul_get_descriptor(struct usb_dev_plat *plat, int value,
void *buffer, int length)
{
struct usb_generic_descriptor **ptr;
@@ -115,7 +115,7 @@ static int usb_emul_find_devnum(int devnum, int port1, struct udevice **emulp)
if (ret)
return ret;
uclass_foreach_dev(dev, uc) {
struct usb_dev_platdata *udev = dev_get_parent_plat(dev);
struct usb_dev_plat *udev = dev_get_parent_plat(dev);
/*
* devnum is initialzied to zero at the beginning of the
@@ -126,7 +126,7 @@ static int usb_emul_find_devnum(int devnum, int port1, struct udevice **emulp)
* emulator device.
*/
if (!devnum) {
struct usb_emul_platdata *plat;
struct usb_emul_plat *plat;
/*
* If the parent is sandbox USB controller, we are
@@ -169,7 +169,7 @@ int usb_emul_find(struct udevice *bus, ulong pipe, int port1,
int usb_emul_find_for_dev(struct udevice *dev, struct udevice **emulp)
{
struct usb_dev_platdata *udev = dev_get_parent_plat(dev);
struct usb_dev_plat *udev = dev_get_parent_plat(dev);
return usb_emul_find_devnum(udev->devnum, 0, emulp);
}
@@ -179,7 +179,7 @@ int usb_emul_control(struct udevice *emul, struct usb_device *udev,
struct devrequest *setup)
{
struct dm_usb_ops *ops = usb_get_emul_ops(emul);
struct usb_dev_platdata *plat;
struct usb_dev_plat *plat;
int ret;
/* We permit getting the descriptor before we are probed */
@@ -262,7 +262,7 @@ int usb_emul_int(struct udevice *emul, struct usb_device *udev,
int usb_emul_setup_device(struct udevice *dev, struct usb_string *strings,
void **desc_list)
{
struct usb_dev_platdata *plat = dev_get_parent_plat(dev);
struct usb_dev_plat *plat = dev_get_parent_plat(dev);
struct usb_generic_descriptor **ptr;
struct usb_config_descriptor *cdesc;
int upto;
@@ -298,7 +298,7 @@ UCLASS_DRIVER(usb_emul) = {
.id = UCLASS_USB_EMUL,
.name = "usb_emul",
.post_bind = dm_scan_fdt_dev,
.per_device_plat_auto = sizeof(struct usb_emul_platdata),
.per_device_plat_auto = sizeof(struct usb_emul_plat),
.per_child_auto = sizeof(struct usb_device),
.per_child_plat_auto = sizeof(struct usb_dev_platdata),
.per_child_plat_auto = sizeof(struct usb_dev_plat),
};

2
drivers/usb/gadget/max3420_udc.c
View File

@@ -819,7 +819,7 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev)
static int max3420_udc_probe(struct udevice *dev)
{
struct max3420_udc *udc = dev_get_priv(dev);
struct dm_spi_slave_platdata *slave_pdata;
struct dm_spi_slave_plat *slave_pdata;
struct udevice *bus = dev->parent;
int busnum = bus->seq;
unsigned int cs;

18
drivers/usb/host/dwc3-sti-glue.c
View File

@@ -24,7 +24,7 @@
DECLARE_GLOBAL_DATA_PTR;
/*
* struct sti_dwc3_glue_platdata - dwc3 STi glue driver private structure
* struct sti_dwc3_glue_plat - dwc3 STi glue driver private structure
* @syscfg_base: addr for the glue syscfg
* @glue_base: addr for the glue registers
* @syscfg_offset: usb syscfg control offset
@@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
* @softreset_ctl: reset controller for softreset signal
* @mode: drd static host/device config
*/
struct sti_dwc3_glue_platdata {
struct sti_dwc3_glue_plat {
phys_addr_t syscfg_base;
phys_addr_t glue_base;
phys_addr_t syscfg_offset;
@@ -41,7 +41,7 @@ struct sti_dwc3_glue_platdata {
enum usb_dr_mode mode;
};
static int sti_dwc3_glue_drd_init(struct sti_dwc3_glue_platdata *plat)
static int sti_dwc3_glue_drd_init(struct sti_dwc3_glue_plat *plat)
{
unsigned long val;
@@ -77,7 +77,7 @@ static int sti_dwc3_glue_drd_init(struct sti_dwc3_glue_platdata *plat)
return 0;
}
static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat)
static void sti_dwc3_glue_init(struct sti_dwc3_glue_plat *plat)
{
unsigned long reg;
@@ -102,7 +102,7 @@ static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat)
static int sti_dwc3_glue_of_to_plat(struct udevice *dev)
{
struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev);
struct sti_dwc3_glue_plat *plat = dev_get_plat(dev);
struct udevice *syscon;
struct regmap *regmap;
int ret;
@@ -150,7 +150,7 @@ static int sti_dwc3_glue_of_to_plat(struct udevice *dev)
static int sti_dwc3_glue_bind(struct udevice *dev)
{
struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev);
struct sti_dwc3_glue_plat *plat = dev_get_plat(dev);
ofnode node, dwc3_node;
/* Find snps,dwc3 node from subnode */
@@ -175,7 +175,7 @@ static int sti_dwc3_glue_bind(struct udevice *dev)
static int sti_dwc3_glue_probe(struct udevice *dev)
{
struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev);
struct sti_dwc3_glue_plat *plat = dev_get_plat(dev);
int ret;
/* deassert both powerdown and softreset */
@@ -216,7 +216,7 @@ softreset_err:
static int sti_dwc3_glue_remove(struct udevice *dev)
{
struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev);
struct sti_dwc3_glue_plat *plat = dev_get_plat(dev);
int ret;
/* assert both powerdown and softreset */
@@ -246,6 +246,6 @@ U_BOOT_DRIVER(dwc3_sti_glue) = {
.probe = sti_dwc3_glue_probe,
.remove = sti_dwc3_glue_remove,
.bind = sti_dwc3_glue_bind,
.plat_auto = sizeof(struct sti_dwc3_glue_platdata),
.plat_auto = sizeof(struct sti_dwc3_glue_plat),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

2
drivers/usb/host/ehci-atmel.c
View File

@@ -124,7 +124,7 @@ U_BOOT_DRIVER(ehci_atmel) = {
.probe = ehci_atmel_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_atmel_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

10
drivers/usb/host/ehci-exynos.c
View File

@@ -26,8 +26,8 @@
/* Declare global data pointer */
DECLARE_GLOBAL_DATA_PTR;
struct exynos_ehci_platdata {
struct usb_platdata usb_plat;
struct exynos_ehci_plat {
struct usb_plat usb_plat;
fdt_addr_t hcd_base;
fdt_addr_t phy_base;
struct gpio_desc vbus_gpio;
@@ -45,7 +45,7 @@ struct exynos_ehci {
static int ehci_usb_of_to_plat(struct udevice *dev)
{
struct exynos_ehci_platdata *plat = dev_get_plat(dev);
struct exynos_ehci_plat *plat = dev_get_plat(dev);
const void *blob = gd->fdt_blob;
unsigned int node;
int depth;
@@ -214,7 +214,7 @@ static void reset_usb_phy(struct exynos_usb_phy *usb)
static int ehci_usb_probe(struct udevice *dev)
{
struct exynos_ehci_platdata *plat = dev_get_plat(dev);
struct exynos_ehci_plat *plat = dev_get_plat(dev);
struct exynos_ehci *ctx = dev_get_priv(dev);
struct ehci_hcor *hcor;
@@ -259,6 +259,6 @@ U_BOOT_DRIVER(usb_ehci) = {
.remove = ehci_usb_remove,
.ops = &ehci_usb_ops,
.priv_auto = sizeof(struct exynos_ehci),
.plat_auto = sizeof(struct exynos_ehci_platdata),
.plat_auto = sizeof(struct exynos_ehci_plat),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

2
drivers/usb/host/ehci-fsl.c
View File

@@ -145,7 +145,7 @@ U_BOOT_DRIVER(ehci_fsl) = {
.probe = ehci_fsl_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_fsl_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

2
drivers/usb/host/ehci-marvell.c
View File

@@ -152,7 +152,7 @@ U_BOOT_DRIVER(ehci_mvebu) = {
.probe = ehci_mvebu_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_mvebu_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

4
drivers/usb/host/ehci-msm.c
View File

@@ -47,7 +47,7 @@ static int ehci_usb_probe(struct udevice *dev)
{
struct msm_ehci_priv *p = dev_get_priv(dev);
struct usb_ehci *ehci = p->ehci;
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
struct ehci_hccr *hccr;
struct ehci_hcor *hcor;
int ret;
@@ -145,6 +145,6 @@ U_BOOT_DRIVER(usb_ehci) = {
.remove = ehci_usb_remove,
.ops = &ehci_usb_ops,
.priv_auto = sizeof(struct msm_ehci_priv),
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

6
drivers/usb/host/ehci-mx5.c
View File

@@ -287,7 +287,7 @@ static const struct ehci_ops mx5_ehci_ops = {
static int ehci_usb_of_to_plat(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
const char *mode;
mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "dr_mode", NULL);
@@ -305,7 +305,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev)
static int ehci_usb_probe(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
struct usb_ehci *ehci = dev_read_addr_ptr(dev);
struct ehci_mx5_priv_data *priv = dev_get_priv(dev);
enum usb_init_type type = plat->init_type;
@@ -367,7 +367,7 @@ U_BOOT_DRIVER(usb_mx5) = {
.probe = ehci_usb_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_mx5_priv_data),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

8
drivers/usb/host/ehci-mx6.c
View File

@@ -472,7 +472,7 @@ static const struct ehci_ops mx6_ehci_ops = {
static int ehci_usb_phy_mode(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
void *__iomem addr = dev_read_addr_ptr(dev);
void *__iomem phy_ctrl, *__iomem phy_status;
const void *blob = gd->fdt_blob;
@@ -520,7 +520,7 @@ static int ehci_usb_phy_mode(struct udevice *dev)
static int ehci_usb_of_to_plat(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
enum usb_dr_mode dr_mode;
dr_mode = usb_get_dr_mode(dev->node);
@@ -579,7 +579,7 @@ static int ehci_usb_bind(struct udevice *dev)
static int ehci_usb_probe(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
struct usb_ehci *ehci = dev_read_addr_ptr(dev);
struct ehci_mx6_priv_data *priv = dev_get_priv(dev);
enum usb_init_type type = plat->init_type;
@@ -650,7 +650,7 @@ U_BOOT_DRIVER(usb_mx6) = {
.probe = ehci_usb_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_mx6_priv_data),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

6
drivers/usb/host/ehci-omap.c
View File

@@ -368,7 +368,7 @@ struct ehci_omap_priv_data {
static int ehci_usb_of_to_plat(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
plat->init_type = USB_INIT_HOST;
@@ -377,7 +377,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev)
static int omap_ehci_probe(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
struct ehci_omap_priv_data *priv = dev_get_priv(dev);
struct ehci_hccr *hccr;
struct ehci_hcor *hcor;
@@ -403,7 +403,7 @@ U_BOOT_DRIVER(usb_omap_ehci) = {
.of_match = omap_ehci_dt_ids,
.probe = omap_ehci_probe,
.of_to_plat = ehci_usb_of_to_plat,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_omap_priv_data),
.remove = ehci_deregister,
.ops = &ehci_usb_ops,

2
drivers/usb/host/ehci-pci.c
View File

@@ -163,7 +163,7 @@ U_BOOT_DRIVER(ehci_pci) = {
.remove = ehci_pci_remove,
.of_match = ehci_pci_ids,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_pci_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

4
drivers/usb/host/ehci-tegra.c
View File

@@ -828,7 +828,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev)
static int ehci_usb_probe(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
struct fdt_usb *priv = dev_get_priv(dev);
struct ehci_hccr *hccr;
struct ehci_hcor *hcor;
@@ -865,7 +865,7 @@ U_BOOT_DRIVER(usb_ehci) = {
.probe = ehci_usb_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct fdt_usb),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

4
drivers/usb/host/ehci-vf.c
View File

@@ -312,7 +312,7 @@ static int vf_usb_bind(struct udevice *dev)
static int ehci_usb_probe(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
struct ehci_vf_priv_data *priv = dev_get_priv(dev);
struct usb_ehci *ehci = priv->ehci;
struct ehci_hccr *hccr;
@@ -355,7 +355,7 @@ U_BOOT_DRIVER(usb_ehci) = {
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.of_to_plat = vf_usb_of_to_plat,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct ehci_vf_priv_data),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

4
drivers/usb/host/ehci-zynq.c
View File

@@ -34,7 +34,7 @@ static int ehci_zynq_of_to_plat(struct udevice *dev)
static int ehci_zynq_probe(struct udevice *dev)
{
struct usb_platdata *plat = dev_get_plat(dev);
struct usb_plat *plat = dev_get_plat(dev);
struct zynq_ehci_priv *priv = dev_get_priv(dev);
struct ehci_hccr *hccr;
struct ehci_hcor *hcor;
@@ -85,7 +85,7 @@ U_BOOT_DRIVER(ehci_zynq) = {
.probe = ehci_zynq_probe,
.remove = ehci_deregister,
.ops = &ehci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct zynq_ehci_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

2
drivers/usb/host/ohci-pci.c
View File

@@ -39,7 +39,7 @@ U_BOOT_DRIVER(ohci_pci) = {
.remove = ohci_pci_remove,
.of_match = ohci_pci_ids,
.ops = &ohci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(ohci_t),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

14
drivers/usb/host/usb-uclass.c
View File

@@ -389,7 +389,7 @@ struct usb_device *usb_get_dev_index(struct udevice *bus, int index)
int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp)
{
struct usb_platdata *plat;
struct usb_plat *plat;
struct udevice *dev;
int ret;
@@ -566,7 +566,7 @@ static int usb_find_and_bind_driver(struct udevice *parent,
const struct usb_device_id *id;
struct udevice *dev;
const struct driver *drv;
struct usb_dev_platdata *plat;
struct usb_dev_plat *plat;
for (id = entry->match; id->match_flags; id++) {
if (!usb_match_one_id(desc, iface, id))
@@ -622,7 +622,7 @@ static int usb_find_child(struct udevice *parent,
for (device_find_first_child(parent, &dev);
dev;
device_find_next_child(&dev)) {
struct usb_dev_platdata *plat = dev_get_parent_plat(dev);
struct usb_dev_plat *plat = dev_get_parent_plat(dev);
/* If this device is already in use, skip it */
if (device_active(dev))
@@ -643,7 +643,7 @@ int usb_scan_device(struct udevice *parent, int port,
{
struct udevice *dev;
bool created = false;
struct usb_dev_platdata *plat;
struct usb_dev_plat *plat;
struct usb_bus_priv *priv;
struct usb_device *parent_udev;
int ret;
@@ -770,7 +770,7 @@ int usb_detect_change(void)
static int usb_child_post_bind(struct udevice *dev)
{
struct usb_dev_platdata *plat = dev_get_parent_plat(dev);
struct usb_dev_plat *plat = dev_get_parent_plat(dev);
int val;
if (!dev_of_valid(dev))
@@ -809,7 +809,7 @@ struct udevice *usb_get_bus(struct udevice *dev)
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_plat(dev);
struct usb_dev_plat *plat = dev_get_parent_plat(dev);
int ret;
if (plat->udev) {
@@ -854,7 +854,7 @@ UCLASS_DRIVER(usb) = {
.per_device_auto = sizeof(struct usb_bus_priv),
.child_post_bind = usb_child_post_bind,
.child_pre_probe = usb_child_pre_probe,
.per_child_plat_auto = sizeof(struct usb_dev_platdata),
.per_child_plat_auto = sizeof(struct usb_dev_plat),
};
UCLASS_DRIVER(usb_dev_generic) = {

8
drivers/usb/host/xhci-brcm.c
View File

@@ -22,7 +22,7 @@
#define USBAXI_SA_UA_MASK (USBAXI_UA_MASK | USBAXI_SA_MASK)
#define USBAXI_SA_UA_VAL (USBAXI_UA_VAL | USBAXI_SA_VAL)
struct brcm_xhci_platdata {
struct brcm_xhci_plat {
unsigned int arcache;
unsigned int awcache;
void __iomem *hc_base;
@@ -30,7 +30,7 @@ struct brcm_xhci_platdata {
static int xhci_brcm_probe(struct udevice *dev)
{
struct brcm_xhci_platdata *plat = dev_get_plat(dev);
struct brcm_xhci_plat *plat = dev_get_plat(dev);
struct xhci_hcor *hcor;
struct xhci_hccr *hcd;
int len, ret = 0;
@@ -71,7 +71,7 @@ static int xhci_brcm_probe(struct udevice *dev)
static int xhci_brcm_deregister(struct udevice *dev)
{
struct brcm_xhci_platdata *plat = dev_get_plat(dev);
struct brcm_xhci_plat *plat = dev_get_plat(dev);
/* Restore the default values for AXI read and write attributes */
writel(plat->awcache, plat->hc_base + DRD2U3H_XHC_REGS_AXIWRA);
@@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = {
.remove = xhci_brcm_deregister,
.ops = &xhci_usb_ops,
.of_match = xhci_brcm_ids,
.plat_auto = sizeof(struct brcm_xhci_platdata),
.plat_auto = sizeof(struct brcm_xhci_plat),
.priv_auto = sizeof(struct xhci_ctrl),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

8
drivers/usb/host/xhci-dwc3.c
View File

@@ -20,7 +20,7 @@
#include <linux/usb/dwc3.h>
#include <linux/usb/otg.h>
struct xhci_dwc3_platdata {
struct xhci_dwc3_plat {
struct phy_bulk phys;
};
@@ -117,7 +117,7 @@ static int xhci_dwc3_probe(struct udevice *dev)
struct xhci_hccr *hccr;
struct dwc3 *dwc3_reg;
enum usb_dr_mode dr_mode;
struct xhci_dwc3_platdata *plat = dev_get_plat(dev);
struct xhci_dwc3_plat *plat = dev_get_plat(dev);
const char *phy;
u32 reg;
int ret;
@@ -167,7 +167,7 @@ static int xhci_dwc3_probe(struct udevice *dev)
static int xhci_dwc3_remove(struct udevice *dev)
{
struct xhci_dwc3_platdata *plat = dev_get_plat(dev);
struct xhci_dwc3_plat *plat = dev_get_plat(dev);
dwc3_shutdown_phy(dev, &plat->phys);
@@ -187,7 +187,7 @@ U_BOOT_DRIVER(xhci_dwc3) = {
.remove = xhci_dwc3_remove,
.ops = &xhci_usb_ops,
.priv_auto = sizeof(struct xhci_ctrl),
.plat_auto = sizeof(struct xhci_dwc3_platdata),
.plat_auto = sizeof(struct xhci_dwc3_plat),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
#endif

10
drivers/usb/host/xhci-exynos5.c
View File

@@ -34,7 +34,7 @@
/* Declare global data pointer */
DECLARE_GLOBAL_DATA_PTR;
struct exynos_xhci_platdata {
struct exynos_xhci_plat {
fdt_addr_t hcd_base;
fdt_addr_t phy_base;
struct gpio_desc vbus_gpio;
@@ -45,7 +45,7 @@ struct exynos_xhci_platdata {
* for the usb controller.
*/
struct exynos_xhci {
struct usb_platdata usb_plat;
struct usb_plat usb_plat;
struct xhci_ctrl ctrl;
struct exynos_usb3_phy *usb3_phy;
struct xhci_hccr *hcd;
@@ -54,7 +54,7 @@ struct exynos_xhci {
static int xhci_usb_of_to_plat(struct udevice *dev)
{
struct exynos_xhci_platdata *plat = dev_get_plat(dev);
struct exynos_xhci_plat *plat = dev_get_plat(dev);
const void *blob = gd->fdt_blob;
unsigned int node;
int depth;
@@ -205,7 +205,7 @@ static void exynos_xhci_core_exit(struct exynos_xhci *exynos)
static int xhci_usb_probe(struct udevice *dev)
{
struct exynos_xhci_platdata *plat = dev_get_plat(dev);
struct exynos_xhci_plat *plat = dev_get_plat(dev);
struct exynos_xhci *ctx = dev_get_priv(dev);
struct xhci_hcor *hcor;
int ret;
@@ -255,7 +255,7 @@ U_BOOT_DRIVER(usb_xhci) = {
.probe = xhci_usb_probe,
.remove = xhci_usb_remove,
.ops = &xhci_usb_ops,
.plat_auto = sizeof(struct exynos_xhci_platdata),
.plat_auto = sizeof(struct exynos_xhci_plat),
.priv_auto = sizeof(struct exynos_xhci),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

2
drivers/usb/host/xhci-fsl.c
View File

@@ -169,7 +169,7 @@ U_BOOT_DRIVER(xhci_fsl) = {
.probe = xhci_fsl_probe,
.remove = xhci_fsl_remove,
.ops = &xhci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct xhci_fsl_priv),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

10
drivers/usb/host/xhci-mvebu.c
View File

@@ -15,7 +15,7 @@
#include <usb/xhci.h>
struct mvebu_xhci_platdata {
struct mvebu_xhci_plat {
fdt_addr_t hcd_base;
};
@@ -25,7 +25,7 @@ struct mvebu_xhci_platdata {
*/
struct mvebu_xhci {
struct xhci_ctrl ctrl; /* Needs to come first in this struct! */
struct usb_platdata usb_plat;
struct usb_plat usb_plat;
struct xhci_hccr *hcd;
};
@@ -40,7 +40,7 @@ __weak int board_xhci_enable(fdt_addr_t base)
static int xhci_usb_probe(struct udevice *dev)
{
struct mvebu_xhci_platdata *plat = dev_get_plat(dev);
struct mvebu_xhci_plat *plat = dev_get_plat(dev);
struct mvebu_xhci *ctx = dev_get_priv(dev);
struct xhci_hcor *hcor;
int len, ret;
@@ -67,7 +67,7 @@ static int xhci_usb_probe(struct udevice *dev)
static int xhci_usb_of_to_plat(struct udevice *dev)
{
struct mvebu_xhci_platdata *plat = dev_get_plat(dev);
struct mvebu_xhci_plat *plat = dev_get_plat(dev);
/*
* Get the base address for XHCI controller from the device node
@@ -96,7 +96,7 @@ U_BOOT_DRIVER(usb_xhci) = {
.probe = xhci_usb_probe,
.remove = xhci_deregister,
.ops = &xhci_usb_ops,
.plat_auto = sizeof(struct mvebu_xhci_platdata),
.plat_auto = sizeof(struct mvebu_xhci_plat),
.priv_auto = sizeof(struct mvebu_xhci),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

2
drivers/usb/host/xhci-pci.c
View File

@@ -59,7 +59,7 @@ U_BOOT_DRIVER(xhci_pci) = {
.remove = xhci_deregister,
.of_match = xhci_pci_ids,
.ops = &xhci_usb_ops,
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct xhci_ctrl),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

12
drivers/usb/host/xhci-rcar.c
View File

@@ -29,7 +29,7 @@
#define RCAR_USB3_DL_CTRL_FW_SUCCESS BIT(4)
#define RCAR_USB3_DL_CTRL_FW_SET_DATA0 BIT(8)
struct rcar_xhci_platdata {
struct rcar_xhci_plat {
fdt_addr_t hcd_base;
struct clk clk;
};
@@ -40,7 +40,7 @@ struct rcar_xhci_platdata {
*/
struct rcar_xhci {
struct xhci_ctrl ctrl; /* Needs to come first in this struct! */
struct usb_platdata usb_plat;
struct usb_plat usb_plat;
struct xhci_hccr *hcd;
};
@@ -76,7 +76,7 @@ static int xhci_rcar_download_fw(struct rcar_xhci *ctx, const u32 *fw_data,
static int xhci_rcar_probe(struct udevice *dev)
{
struct rcar_xhci_platdata *plat = dev_get_plat(dev);
struct rcar_xhci_plat *plat = dev_get_plat(dev);
struct rcar_xhci *ctx = dev_get_priv(dev);
struct xhci_hcor *hcor;
int len, ret;
@@ -122,7 +122,7 @@ err_clk:
static int xhci_rcar_deregister(struct udevice *dev)
{
int ret;
struct rcar_xhci_platdata *plat = dev_get_plat(dev);
struct rcar_xhci_plat *plat = dev_get_plat(dev);
ret = xhci_deregister(dev);
@@ -134,7 +134,7 @@ static int xhci_rcar_deregister(struct udevice *dev)
static int xhci_rcar_of_to_plat(struct udevice *dev)
{
struct rcar_xhci_platdata *plat = dev_get_plat(dev);
struct rcar_xhci_plat *plat = dev_get_plat(dev);
plat->hcd_base = dev_read_addr(dev);
if (plat->hcd_base == FDT_ADDR_T_NONE) {
@@ -161,7 +161,7 @@ U_BOOT_DRIVER(usb_xhci) = {
.ops = &xhci_usb_ops,
.of_match = xhci_rcar_ids,
.of_to_plat = xhci_rcar_of_to_plat,
.plat_auto = sizeof(struct rcar_xhci_platdata),
.plat_auto = sizeof(struct rcar_xhci_plat),
.priv_auto = sizeof(struct rcar_xhci),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};

8
drivers/usb/musb-new/da8xx.c
View File

@@ -247,7 +247,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;
@@ -258,7 +258,7 @@ struct da8xx_musb_platdata {
static int da8xx_musb_of_to_plat(struct udevice *dev)
{
struct da8xx_musb_platdata *plat = dev_get_plat(dev);
struct da8xx_musb_plat *plat = dev_get_plat(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
@@ -282,7 +282,7 @@ static int da8xx_musb_of_to_plat(struct udevice *dev)
static int da8xx_musb_probe(struct udevice *dev)
{
struct musb_host_data *host = dev_get_priv(dev);
struct da8xx_musb_platdata *plat = dev_get_plat(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;
@@ -348,6 +348,6 @@ U_BOOT_DRIVER(da8xx_musb) = {
.probe = da8xx_musb_probe,
.remove = da8xx_musb_remove,
.ops = &musb_usb_ops,
.plat_auto = sizeof(struct da8xx_musb_platdata),
.plat_auto = sizeof(struct da8xx_musb_plat),
.priv_auto = sizeof(struct musb_host_data),
};

2
drivers/usb/musb-new/mt85xx.c
View File

@@ -414,6 +414,6 @@ U_BOOT_DRIVER(mtk_musb) = {
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct mtk_musb_glue),
};

8
drivers/usb/musb-new/omap2430.c
View File

@@ -141,7 +141,7 @@ const struct musb_platform_ops omap2430_ops = {
#if CONFIG_IS_ENABLED(DM_USB)
struct omap2430_musb_platdata {
struct omap2430_musb_plat {
void *base;
void *ctrl_mod_base;
struct musb_hdrc_platform_data plat;
@@ -151,7 +151,7 @@ struct omap2430_musb_platdata {
static int omap2430_musb_of_to_plat(struct udevice *dev)
{
struct omap2430_musb_platdata *plat = dev_get_plat(dev);
struct omap2430_musb_plat *plat = dev_get_plat(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
@@ -218,7 +218,7 @@ static int omap2430_musb_probe(struct udevice *dev)
#else
struct musb *musbp;
#endif
struct omap2430_musb_platdata *plat = dev_get_plat(dev);
struct omap2430_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 = 0;
@@ -275,7 +275,7 @@ U_BOOT_DRIVER(omap2430_musb) = {
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
.plat_auto = sizeof(struct omap2430_musb_platdata),
.plat_auto = sizeof(struct omap2430_musb_plat),
.priv_auto = sizeof(struct musb_host_data),
};

2
drivers/usb/musb-new/pic32.c
View File

@@ -288,6 +288,6 @@ U_BOOT_DRIVER(usb_musb) = {
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct pic32_musb_data),
};

2
drivers/usb/musb-new/sunxi.c
View File

@@ -552,6 +552,6 @@ U_BOOT_DRIVER(usb_musb) = {
#ifdef CONFIG_USB_MUSB_HOST
.ops = &musb_usb_ops,
#endif
.plat_auto = sizeof(struct usb_platdata),
.plat_auto = sizeof(struct usb_plat),
.priv_auto = sizeof(struct sunxi_glue),
};

16
drivers/usb/musb-new/ti-musb.c
View File

@@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
static void ti_musb_set_phy_power(struct udevice *dev, u8 on)
{
struct ti_musb_platdata *plat = dev_get_plat(dev);
struct ti_musb_plat *plat = dev_get_plat(dev);
if (!plat->ctrl_mod_base)
return;
@@ -79,7 +79,7 @@ static int ti_musb_get_usb_index(int node)
static int ti_musb_of_to_plat(struct udevice *dev)
{
struct ti_musb_platdata *plat = dev_get_plat(dev);
struct ti_musb_plat *plat = dev_get_plat(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
int phys;
@@ -147,7 +147,7 @@ static int ti_musb_of_to_plat(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 *plat = dev_get_plat(dev);
struct ti_musb_plat *plat = dev_get_plat(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
int ret;
@@ -178,7 +178,7 @@ static int ti_musb_host_remove(struct udevice *dev)
#if CONFIG_IS_ENABLED(OF_CONTROL)
static int ti_musb_host_of_to_plat(struct udevice *dev)
{
struct ti_musb_platdata *plat = dev_get_plat(dev);
struct ti_musb_plat *plat = dev_get_plat(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
int ret;
@@ -204,7 +204,7 @@ U_BOOT_DRIVER(ti_musb_host) = {
.probe = ti_musb_host_probe,
.remove = ti_musb_host_remove,
.ops = &musb_usb_ops,
.plat_auto = sizeof(struct ti_musb_platdata),
.plat_auto = sizeof(struct ti_musb_plat),
.priv_auto = sizeof(struct musb_host_data),
};
@@ -216,7 +216,7 @@ struct ti_musb_peripheral {
#if CONFIG_IS_ENABLED(OF_CONTROL)
static int ti_musb_peripheral_of_to_plat(struct udevice *dev)
{
struct ti_musb_platdata *plat = dev_get_plat(dev);
struct ti_musb_plat *plat = dev_get_plat(dev);
const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev);
int ret;
@@ -244,7 +244,7 @@ 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 *plat = dev_get_plat(dev);
struct ti_musb_plat *plat = dev_get_plat(dev);
int ret;
priv->periph = musb_init_controller(&plat->plat,
@@ -277,7 +277,7 @@ U_BOOT_DRIVER(ti_musb_peripheral) = {
.probe = ti_musb_peripheral_probe,
.remove = ti_musb_peripheral_remove,
.ops = &musb_usb_ops,
.plat_auto = sizeof(struct ti_musb_platdata),
.plat_auto = sizeof(struct ti_musb_plat),
.priv_auto = sizeof(struct ti_musb_peripheral),
.flags = DM_FLAG_PRE_RELOC,
};