Update this file to reduce the number of pylint warnings. Also add a few missing comments while we are here.

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/dtoc/dtb_platdata.py | 91 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index 6b10eabafb9..b0d3c27720c 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -114,8 +114,8 @@ def get_value(ftype, value): if ftype == fdt.Type.INT: return '%#x' % fdt_util.fdt32_to_cpu(value) elif ftype == fdt.Type.BYTE: - ch = value[0] - return '%#x' % (ord(ch) if isinstance(ch, str) else ch) + char = value[0] + return '%#x' % (ord(char) if isinstance(char, str) else char) elif ftype == fdt.Type.STRING: # Handle evil ACPI backslashes by adding another backslash before them. # So "\_SB.GPO0" in the device tree effectively stays like that in C @@ -163,7 +163,7 @@ class DtbPlatdata(object): _drivers_additional: List of additional drivers to use during scanning """ def __init__(self, dtb_fname, include_disabled, warning_disabled, - drivers_additional=[]): + drivers_additional=None): self._fdt = None self._dtb_fname = dtb_fname self._valid_nodes = None @@ -173,7 +173,7 @@ class DtbPlatdata(object): self._lines = [] self._drivers = [] self._driver_aliases = {} - self._drivers_additional = drivers_additional + self._drivers_additional = drivers_additional or []

def get_normalized_compat_name(self, node): """Get a node's normalized compat name @@ -312,20 +312,20 @@ class DtbPlatdata(object): return PhandleInfo(max_args, args) return None

- def scan_driver(self, fn): + def scan_driver(self, fname): """Scan a driver file to build a list of driver names and aliases

This procedure will populate self._drivers and self._driver_aliases

Args - fn: Driver filename to scan + fname: Driver filename to scan """ - with open(fn, encoding='utf-8') as fd: + with open(fname, encoding='utf-8') as inf: try: - buff = fd.read() + buff = inf.read() except UnicodeDecodeError: # This seems to happen on older Python versions - print("Skipping file '%s' due to unicode error" % fn) + print("Skipping file '%s' due to unicode error" % fname) return

# The following re will search for driver names declared as @@ -337,8 +337,9 @@ class DtbPlatdata(object):

# The following re will search for driver aliases declared as # U_BOOT_DRIVER_ALIAS(alias, driver_name) - driver_aliases = re.findall('U_BOOT_DRIVER_ALIAS(\s*(\w+)\s*,\s*(\w+)\s*)', - buff) + driver_aliases = re.findall( + 'U_BOOT_DRIVER_ALIAS(\s*(\w+)\s*,\s*(\w+)\s*)', + buff)

for alias in driver_aliases: # pragma: no cover if len(alias) != 2: @@ -354,19 +355,19 @@ class DtbPlatdata(object): basedir = sys.argv[0].replace('tools/dtoc/dtoc', '') if basedir == '': basedir = './' - for (dirpath, dirnames, filenames) in os.walk(basedir): - for fn in filenames: - if not fn.endswith('.c'): + for (dirpath, _, filenames) in os.walk(basedir): + for fname in filenames: + if not fname.endswith('.c'): continue - self.scan_driver(dirpath + '/' + fn) + self.scan_driver(dirpath + '/' + fname)

- for fn in self._drivers_additional: - if not isinstance(fn, str) or len(fn) == 0: + for fname in self._drivers_additional: + if not isinstance(fname, str) or len(fname) == 0: continue - if fn[0] == '/': - self.scan_driver(fn) + if fname[0] == '/': + self.scan_driver(fname) else: - self.scan_driver(basedir + '/' + fn) + self.scan_driver(basedir + '/' + fname)

def scan_dtb(self): """Scan the device tree to obtain a tree of nodes and properties @@ -422,15 +423,15 @@ class DtbPlatdata(object): Number of size cells for this node """ parent = node.parent - na, ns = 2, 2 + num_addr, num_size = 2, 2 if parent: - na_prop = parent.props.get('#address-cells') - ns_prop = parent.props.get('#size-cells') - if na_prop: - na = fdt_util.fdt32_to_cpu(na_prop.value) - if ns_prop: - ns = fdt_util.fdt32_to_cpu(ns_prop.value) - return na, ns + addr_prop = parent.props.get('#address-cells') + size_prop = parent.props.get('#size-cells') + if addr_prop: + num_addr = fdt_util.fdt32_to_cpu(addr_prop.value) + if size_prop: + num_size = fdt_util.fdt32_to_cpu(size_prop.value) + return num_addr, num_size

def scan_reg_sizes(self): """Scan for 64-bit 'reg' properties and update the values @@ -443,8 +444,8 @@ class DtbPlatdata(object): reg = node.props.get('reg') if not reg: continue - na, ns = self.get_num_cells(node) - total = na + ns + num_addr, num_size = self.get_num_cells(node) + total = num_addr + num_size

if reg.type != fdt.Type.INT: raise ValueError("Node '%s' reg property is not an int" % @@ -453,10 +454,10 @@ class DtbPlatdata(object): raise ValueError( "Node '%s' reg property has %d cells " 'which is not a multiple of na + ns = %d + %d)' % - (node.name, len(reg.value), na, ns)) - reg.na = na - reg.ns = ns - if na != 1 or ns != 1: + (node.name, len(reg.value), num_addr, num_size)) + reg.num_addr = num_addr + reg.num_size = num_size + if num_addr != 1 or num_size != 1: reg.type = fdt.Type.INT64 i = 0 new_value = [] @@ -464,10 +465,10 @@ class DtbPlatdata(object): if not isinstance(val, list): val = [val] while i < len(val): - addr = fdt_util.fdt_cells_to_cpu(val[i:], reg.na) - i += na - size = fdt_util.fdt_cells_to_cpu(val[i:], reg.ns) - i += ns + addr = fdt_util.fdt_cells_to_cpu(val[i:], reg.num_addr) + i += num_addr + size = fdt_util.fdt_cells_to_cpu(val[i:], reg.num_size) + i += num_size new_value += [addr, size] reg.value = new_value

@@ -513,14 +514,12 @@ class DtbPlatdata(object): else: structs[node_name] = fields

- upto = 0 for node in self._valid_nodes: node_name, _ = self.get_normalized_compat_name(node) struct = structs[node_name] for name, prop in node.props.items(): if name not in PROP_IGNORE_LIST and name[0] != '#': prop.Widen(struct[name]) - upto += 1

return structs

@@ -613,12 +612,10 @@ class DtbPlatdata(object): if info: # Process the list as pairs of (phandle, id) pos = 0 - item = 0 for args in info.args: phandle_cell = prop.value[pos] phandle = fdt_util.fdt32_to_cpu(phandle_cell) target_node = self._fdt.phandle_to_node[phandle] - name = conv_name_to_c(target_node.name) arg_values = [] for i in range(args): arg_values.append( @@ -626,7 +623,6 @@ class DtbPlatdata(object): pos += 1 + args vals.append('\t{%d, {%s}}' % (target_node.idx, ', '.join(arg_values))) - item += 1 for val in vals: self.buf('\n\t\t%s,' % val) else: @@ -714,7 +710,7 @@ class DtbPlatdata(object): self.out(''.join(self.get_buf()))

def run_steps(args, dtb_file, include_disabled, output, warning_disabled=False, - drivers_additional=[]): + drivers_additional=None): """Run all the steps of the dtoc tool

Args: @@ -722,13 +718,18 @@ def run_steps(args, dtb_file, include_disabled, output, warning_disabled=False, dtb_file (str): Filename of dtb file to process include_disabled (bool): True to include disabled nodes output (str): Name of output file + warning_disabled (bool): True to avoid showing warnings about missing + drivers + _drivers_additional (list): List of additional drivers to use during + scanning Raises: ValueError: if args has no command, or an unknown command """ if not args: raise ValueError('Please specify a command: struct, platdata')

- plat = DtbPlatdata(dtb_file, include_disabled, warning_disabled, drivers_additional) + plat = DtbPlatdata(dtb_file, include_disabled, warning_disabled, + drivers_additional) plat.scan_drivers() plat.scan_dtb() plat.scan_tree()

This construct is quite long-winded. In earlier days it made some sense since auto-allocation was a strange concept. But with driver model now used pretty universally, we can shorten this to 'auto'. This reduces verbosity and makes it easier to read.

Coincidentally it also ensures that every declaration is on one line, thus making dtoc's job easier.

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-ipq40xx/clock-ipq4019.c | 2 +- arch/arm/mach-ipq40xx/pinctrl-snapdragon.c | 2 +- arch/arm/mach-snapdragon/clock-snapdragon.c | 2 +- arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 2 +- arch/arm/mach-stm32mp/bsec.c | 2 +- arch/arm/mach-stm32mp/pwr_regulator.c | 2 +- arch/x86/cpu/acpi_gpe.c | 2 +- arch/x86/cpu/apollolake/hostbridge.c | 2 +- arch/x86/cpu/apollolake/pmc.c | 2 +- arch/x86/cpu/apollolake/spl.c | 2 +- arch/x86/cpu/apollolake/uart.c | 4 +-- arch/x86/cpu/broadwell/cpu_full.c | 2 +- arch/x86/cpu/broadwell/sata.c | 2 +- arch/x86/cpu/intel_common/itss.c | 4 +-- arch/x86/cpu/intel_common/p2sb.c | 4 +-- arch/x86/cpu/irq.c | 2 +- arch/x86/cpu/slimbootloader/serial.c | 4 +-- arch/x86/cpu/tangier/pinmux.c | 2 +- arch/x86/lib/pmu.c | 2 +- arch/x86/lib/scu.c | 2 +- board/renesas/ulcb/cpld.c | 2 +- common/usb_hub.c | 6 ++-- common/usb_storage.c | 2 +- doc/driver-model/design.rst | 26 ++++++++--------- doc/driver-model/ethernet.rst | 8 +++--- doc/driver-model/of-plat.rst | 6 ++-- doc/driver-model/spi-howto.rst | 6 ++-- doc/driver-model/usb-info.rst | 6 ++-- doc/imx/clk/ccf.txt | 2 +- drivers/adc/adc-uclass.c | 2 +- drivers/adc/exynos-adc.c | 2 +- drivers/adc/meson-saradc.c | 2 +- drivers/adc/rockchip-saradc.c | 2 +- drivers/adc/sandbox.c | 2 +- drivers/adc/stm32-adc-core.c | 2 +- drivers/adc/stm32-adc.c | 2 +- drivers/ata/ahci-uclass.c | 2 +- drivers/ata/dwc_ahci.c | 2 +- drivers/ata/fsl_sata.c | 4 +-- drivers/ata/mtk_ahci.c | 2 +- drivers/ata/sata_ceva.c | 2 +- drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_sil.c | 4 +-- drivers/axi/ihs_axi.c | 2 +- drivers/axi/sandbox_store.c | 2 +- drivers/block/blk-uclass.c | 2 +- drivers/block/sandbox.c | 2 +- drivers/bootcount/bootcount.c | 2 +- drivers/bootcount/i2c-eeprom.c | 2 +- drivers/bootcount/rtc.c | 2 +- drivers/bootcount/spi-flash.c | 2 +- drivers/button/button-gpio.c | 2 +- drivers/button/button-uclass.c | 2 +- drivers/cache/cache-v5l2.c | 2 +- drivers/clk/altera/clk-agilex.c | 2 +- drivers/clk/altera/clk-arria10.c | 2 +- drivers/clk/aspeed/clk_ast2500.c | 2 +- drivers/clk/at91/compat.c | 22 +++++++-------- drivers/clk/at91/sckc.c | 2 +- drivers/clk/clk-cdce9xx.c | 2 +- drivers/clk/clk-hsdk-cgu.c | 2 +- drivers/clk/clk-ti-sci.c | 2 +- drivers/clk/clk_bcm6345.c | 2 +- drivers/clk/clk_boston.c | 2 +- drivers/clk/clk_fixed_factor.c | 2 +- drivers/clk/clk_fixed_rate.c | 2 +- drivers/clk/clk_octeon.c | 2 +- drivers/clk/clk_pic32.c | 2 +- drivers/clk/clk_sandbox.c | 2 +- drivers/clk/clk_sandbox_test.c | 2 +- drivers/clk/clk_stm32f.c | 2 +- drivers/clk/clk_stm32h7.c | 2 +- drivers/clk/clk_stm32mp1.c | 2 +- drivers/clk/clk_versal.c | 2 +- drivers/clk/clk_vexpress_osc.c | 2 +- drivers/clk/clk_zynq.c | 2 +- drivers/clk/clk_zynqmp.c | 2 +- drivers/clk/exynos/clk-exynos7420.c | 4 +-- drivers/clk/ics8n3qv01.c | 2 +- drivers/clk/mediatek/clk-mt7622.c | 16 +++++------ drivers/clk/mediatek/clk-mt7623.c | 12 ++++---- drivers/clk/mediatek/clk-mt7629.c | 14 +++++----- drivers/clk/mediatek/clk-mt8512.c | 8 +++--- drivers/clk/mediatek/clk-mt8516.c | 6 ++-- drivers/clk/mediatek/clk-mt8518.c | 6 ++-- drivers/clk/meson/axg.c | 2 +- drivers/clk/meson/g12a.c | 2 +- drivers/clk/meson/gxbb.c | 2 +- drivers/clk/mpc83xx_clk.c | 2 +- drivers/clk/mtmips/clk-mt7628.c | 2 +- drivers/clk/mvebu/armada-37xx-periph.c | 2 +- drivers/clk/mvebu/armada-37xx-tbg.c | 2 +- drivers/clk/owl/clk_owl.c | 2 +- drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a774b1-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a774c0-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a774e1-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7790-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7791-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7792-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7794-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77965-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77970-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77980-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77990-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +- drivers/clk/rockchip/clk_px30.c | 4 +-- drivers/clk/rockchip/clk_rk3036.c | 2 +- drivers/clk/rockchip/clk_rk3128.c | 2 +- drivers/clk/rockchip/clk_rk3188.c | 4 +-- drivers/clk/rockchip/clk_rk322x.c | 2 +- drivers/clk/rockchip/clk_rk3288.c | 4 +-- drivers/clk/rockchip/clk_rk3308.c | 2 +- drivers/clk/rockchip/clk_rk3328.c | 2 +- drivers/clk/rockchip/clk_rk3368.c | 4 +-- drivers/clk/rockchip/clk_rk3399.c | 8 +++--- drivers/clk/rockchip/clk_rv1108.c | 2 +- drivers/clk/sifive/fu540-prci.c | 2 +- drivers/clk/sunxi/clk_a10.c | 2 +- drivers/clk/sunxi/clk_a10s.c | 2 +- drivers/clk/sunxi/clk_a23.c | 2 +- drivers/clk/sunxi/clk_a31.c | 2 +- drivers/clk/sunxi/clk_a64.c | 2 +- drivers/clk/sunxi/clk_a80.c | 2 +- drivers/clk/sunxi/clk_a83t.c | 2 +- drivers/clk/sunxi/clk_h3.c | 2 +- drivers/clk/sunxi/clk_h6.c | 2 +- drivers/clk/sunxi/clk_r40.c | 2 +- drivers/clk/sunxi/clk_v3s.c | 2 +- drivers/clk/uniphier/clk-uniphier-core.c | 2 +- drivers/core/device-remove.c | 8 +++--- drivers/core/device.c | 26 ++++++++--------- drivers/core/simple-bus.c | 2 +- drivers/core/simple-pm-bus.c | 2 +- drivers/core/syscon-uclass.c | 2 +- drivers/core/uclass.c | 8 +++--- drivers/cpu/at91_cpu.c | 2 +- drivers/cpu/bmips_cpu.c | 2 +- drivers/cpu/cpu-uclass.c | 2 +- drivers/cpu/imx8_cpu.c | 2 +- drivers/cpu/mpc83xx_cpu.c | 2 +- drivers/crypto/fsl/rng.c | 2 +- drivers/ddr/altera/sdram_gen5.c | 4 +-- drivers/ddr/altera/sdram_soc64.c | 4 +-- drivers/demo/demo-shape.c | 4 +-- drivers/demo/demo-simple.c | 2 +- drivers/dma/bcm6348-iudma.c | 2 +- drivers/dma/dma-uclass.c | 2 +- drivers/dma/sandbox-dma-test.c | 2 +- drivers/dma/ti-edma3.c | 2 +- drivers/dma/ti/k3-udma.c | 2 +- drivers/firmware/scmi/mailbox_agent.c | 2 +- drivers/firmware/scmi/sandbox-scmi_agent.c | 2 +- drivers/firmware/scmi/sandbox-scmi_devices.c | 2 +- drivers/firmware/scmi/smccc_agent.c | 2 +- drivers/firmware/ti_sci.c | 2 +- drivers/gpio/74x164_gpio.c | 2 +- drivers/gpio/altera_pio.c | 2 +- drivers/gpio/at91_gpio.c | 4 +-- drivers/gpio/atmel_pio4.c | 2 +- drivers/gpio/bcm2835_gpio.c | 4 +-- drivers/gpio/bcm6345_gpio.c | 2 +- drivers/gpio/cortina_gpio.c | 2 +- drivers/gpio/da8xx_gpio.c | 4 +-- drivers/gpio/dwapb_gpio.c | 2 +- drivers/gpio/gpio-rcar.c | 2 +- drivers/gpio/gpio-rza1.c | 2 +- drivers/gpio/gpio-uclass.c | 6 ++-- drivers/gpio/gpio-uniphier.c | 2 +- drivers/gpio/hi6220_gpio.c | 2 +- drivers/gpio/hsdk-creg-gpio.c | 2 +- drivers/gpio/imx_rgpio2p.c | 2 +- drivers/gpio/intel_broadwell_gpio.c | 4 +-- drivers/gpio/intel_ich6_gpio.c | 4 +-- drivers/gpio/iproc_gpio.c | 2 +- drivers/gpio/lpc32xx_gpio.c | 2 +- drivers/gpio/mpc83xx_spisel_boot.c | 4 +-- drivers/gpio/mpc8xxx_gpio.c | 4 +-- drivers/gpio/mscc_sgpio.c | 2 +- drivers/gpio/msm_gpio.c | 2 +- drivers/gpio/mvebu_gpio.c | 2 +- drivers/gpio/mxc_gpio.c | 4 +-- drivers/gpio/mxs_gpio.c | 4 +-- drivers/gpio/nx_gpio.c | 2 +- drivers/gpio/octeon_gpio.c | 2 +- drivers/gpio/omap_gpio.c | 4 +-- drivers/gpio/pca953x_gpio.c | 2 +- drivers/gpio/pcf8575_gpio.c | 2 +- drivers/gpio/pic32_gpio.c | 2 +- drivers/gpio/pm8916_gpio.c | 4 +-- drivers/gpio/rk_gpio.c | 2 +- drivers/gpio/s5p_gpio.c | 2 +- drivers/gpio/sandbox.c | 2 +- drivers/gpio/sifive-gpio.c | 2 +- drivers/gpio/stm32_gpio.c | 2 +- drivers/gpio/tegra_gpio.c | 2 +- drivers/gpio/vybrid_gpio.c | 4 +-- drivers/gpio/xilinx_gpio.c | 4 +-- drivers/gpio/zynq_gpio.c | 2 +- drivers/hwspinlock/stm32_hwspinlock.c | 2 +- drivers/i2c/ast_i2c.c | 2 +- drivers/i2c/at91_i2c.c | 4 +-- drivers/i2c/cros_ec_tunnel.c | 2 +- drivers/i2c/davinci_i2c.c | 2 +- drivers/i2c/designware_i2c.c | 2 +- drivers/i2c/designware_i2c_pci.c | 2 +- drivers/i2c/exynos_hs_i2c.c | 2 +- drivers/i2c/fsl_i2c.c | 2 +- drivers/i2c/i2c-cdns.c | 2 +- drivers/i2c/i2c-cortina.c | 2 +- drivers/i2c/i2c-emul-uclass.c | 4 +-- drivers/i2c/i2c-gpio.c | 2 +- drivers/i2c/i2c-uclass.c | 8 +++--- drivers/i2c/i2c-uniphier-f.c | 2 +- drivers/i2c/i2c-uniphier.c | 2 +- drivers/i2c/i2c-versatile.c | 2 +- drivers/i2c/ihs_i2c.c | 2 +- drivers/i2c/imx_lpi2c.c | 2 +- drivers/i2c/intel_i2c.c | 2 +- drivers/i2c/iproc_i2c.c | 2 +- drivers/i2c/meson_i2c.c | 2 +- drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +- drivers/i2c/muxes/i2c-mux-gpio.c | 2 +- drivers/i2c/muxes/i2c-mux-uclass.c | 4 +-- drivers/i2c/muxes/pca954x.c | 2 +- drivers/i2c/mv_i2c.c | 2 +- drivers/i2c/mvtwsi.c | 2 +- drivers/i2c/mxc_i2c.c | 2 +- drivers/i2c/nx_i2c.c | 2 +- drivers/i2c/octeon_i2c.c | 2 +- drivers/i2c/omap24xx_i2c.c | 4 +-- drivers/i2c/rcar_i2c.c | 2 +- drivers/i2c/rcar_iic.c | 2 +- drivers/i2c/rk_i2c.c | 2 +- drivers/i2c/s3c24x0_i2c.c | 2 +- drivers/i2c/sandbox_i2c.c | 2 +- drivers/i2c/stm32f7_i2c.c | 2 +- drivers/i2c/tegra186_bpmp_i2c.c | 2 +- drivers/i2c/tegra_i2c.c | 2 +- drivers/i2c/xilinx_xiic.c | 2 +- drivers/input/cros_ec_keyb.c | 2 +- drivers/input/i8042.c | 2 +- drivers/input/keyboard-uclass.c | 2 +- drivers/input/tegra-kbc.c | 2 +- drivers/led/led-uclass.c | 2 +- drivers/led/led_bcm6328.c | 2 +- drivers/led/led_bcm6358.c | 2 +- drivers/led/led_bcm6858.c | 2 +- drivers/led/led_cortina.c | 4 +-- drivers/led/led_gpio.c | 2 +- drivers/mailbox/k3-sec-proxy.c | 2 +- drivers/mailbox/sandbox-mbox-test.c | 2 +- drivers/mailbox/sandbox-mbox.c | 2 +- drivers/mailbox/stm32-ipcc.c | 2 +- drivers/mailbox/tegra-hsp.c | 2 +- drivers/mailbox/zynqmp-ipi.c | 2 +- drivers/memory/stm32-fmc2-ebi.c | 2 +- drivers/misc/altera_sysid.c | 2 +- drivers/misc/atsha204a-i2c.c | 2 +- drivers/misc/cros_ec.c | 2 +- drivers/misc/cros_ec_sandbox.c | 2 +- drivers/misc/fs_loader.c | 4 +-- drivers/misc/gdsys_ioep.c | 2 +- drivers/misc/gdsys_rxaui_ctrl.c | 2 +- drivers/misc/gdsys_soc.c | 2 +- drivers/misc/i2c_eeprom.c | 4 +-- drivers/misc/i2c_eeprom_emul.c | 4 +-- drivers/misc/ihs_fpga.c | 2 +- drivers/misc/imx8/scu.c | 2 +- drivers/misc/irq_sandbox.c | 2 +- drivers/misc/k3_avs.c | 2 +- drivers/misc/microchip_flexcom.c | 2 +- drivers/misc/misc_sandbox.c | 2 +- drivers/misc/mpc83xx_serdes.c | 2 +- drivers/misc/p2sb-uclass.c | 4 +-- drivers/misc/p2sb_emul.c | 4 +-- drivers/misc/p2sb_sandbox.c | 2 +- drivers/misc/rockchip-efuse.c | 2 +- drivers/misc/rockchip-otp.c | 2 +- drivers/misc/sandbox_adder.c | 2 +- drivers/misc/sifive-otp.c | 2 +- drivers/misc/swap_case.c | 4 +-- drivers/misc/tegra186_bpmp.c | 2 +- drivers/mmc/am654_sdhci.c | 4 +-- drivers/mmc/arm_pl180_mmci.c | 4 +-- drivers/mmc/aspeed_sdhci.c | 4 +-- drivers/mmc/atmel_sdhci.c | 4 +-- drivers/mmc/bcm2835_sdhci.c | 4 +-- drivers/mmc/bcm2835_sdhost.c | 4 +-- drivers/mmc/bcmstb_sdhci.c | 4 +-- drivers/mmc/ca_dw_mmc.c | 4 +-- drivers/mmc/davinci_mmc.c | 4 +-- drivers/mmc/exynos_dw_mmc.c | 4 +-- drivers/mmc/fsl_esdhc.c | 4 +-- drivers/mmc/fsl_esdhc_imx.c | 4 +-- drivers/mmc/ftsdc010_mci.c | 4 +-- drivers/mmc/gen_atmel_mci.c | 4 +-- drivers/mmc/hi6220_dw_mmc.c | 4 +-- drivers/mmc/iproc_sdhci.c | 4 +-- drivers/mmc/jz_mmc.c | 4 +-- drivers/mmc/meson_gx_mmc.c | 2 +- drivers/mmc/mmc-uclass.c | 2 +- drivers/mmc/mmc_spi.c | 4 +-- drivers/mmc/msm_sdhci.c | 4 +-- drivers/mmc/mtk-sd.c | 4 +-- drivers/mmc/mv_sdhci.c | 4 +-- drivers/mmc/mxsmmc.c | 4 +-- drivers/mmc/nexell_dw_mmc.c | 4 +-- drivers/mmc/octeontx_hsmmc.c | 2 +- drivers/mmc/omap_hsmmc.c | 4 +-- drivers/mmc/pci_mmc.c | 4 +-- drivers/mmc/pic32_sdhci.c | 4 +-- drivers/mmc/pxa_mmc_gen.c | 2 +- drivers/mmc/renesas-sdhi.c | 4 +-- drivers/mmc/rockchip_dw_mmc.c | 4 +-- drivers/mmc/rockchip_sdhci.c | 4 +-- drivers/mmc/s5p_sdhci.c | 4 +-- drivers/mmc/sandbox_mmc.c | 2 +- drivers/mmc/sdhci-cadence.c | 4 +-- drivers/mmc/sh_mmcif.c | 4 +-- drivers/mmc/sh_sdhi.c | 4 +-- drivers/mmc/snps_dw_mmc.c | 4 +-- drivers/mmc/socfpga_dw_mmc.c | 4 +-- drivers/mmc/sti_sdhci.c | 4 +-- drivers/mmc/stm32_sdmmc2.c | 4 +-- drivers/mmc/sunxi_mmc.c | 4 +-- drivers/mmc/tangier_sdhci.c | 4 +-- drivers/mmc/tegra_mmc.c | 4 +-- drivers/mmc/uniphier-sd.c | 4 +-- drivers/mmc/xenon_sdhci.c | 4 +-- drivers/mmc/zynq_sdhci.c | 4 +-- drivers/mtd/altera_qspi.c | 2 +- drivers/mtd/hbmc-am654.c | 2 +- drivers/mtd/mtd-uclass.c | 2 +- drivers/mtd/nand/raw/arasan_nfc.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c | 2 +- drivers/mtd/nand/raw/davinci_nand.c | 2 +- drivers/mtd/nand/raw/denali_dt.c | 2 +- drivers/mtd/nand/raw/mxs_nand_dt.c | 2 +- drivers/mtd/nand/raw/octeontx_bch.c | 4 +-- drivers/mtd/nand/raw/octeontx_nand.c | 2 +- drivers/mtd/nand/raw/pxa3xx_nand.c | 2 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2 +- drivers/mtd/nand/raw/tegra_nand.c | 2 +- drivers/mtd/nand/raw/vf610_nfc.c | 2 +- drivers/mtd/nand/raw/zynq_nand.c | 2 +- drivers/mtd/nand/spi/core.c | 2 +- drivers/mtd/spi/sandbox.c | 4 +-- drivers/mtd/spi/sf-uclass.c | 2 +- drivers/mtd/spi/sf_dataflash.c | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mux/mux-uclass.c | 2 +- drivers/net/ag7xxx.c | 4 +-- drivers/net/altera_tse.c | 4 +-- drivers/net/bcm6348-eth.c | 4 +-- drivers/net/bcm6368-eth.c | 4 +-- drivers/net/bcmgenet.c | 4 +-- drivers/net/dc2114x.c | 4 +-- drivers/net/designware.c | 4 +-- drivers/net/dwc_eth_qos.c | 4 +-- drivers/net/dwmac_s700.c | 4 +-- drivers/net/dwmac_socfpga.c | 4 +-- drivers/net/e1000.c | 4 +-- drivers/net/eepro100.c | 4 +-- drivers/net/eth-phy-uclass.c | 2 +- drivers/net/ethoc.c | 4 +-- drivers/net/fec_mxc.c | 4 +-- drivers/net/fm/eth.c | 4 +-- drivers/net/fm/fm.c | 2 +- drivers/net/fm/memac_phy.c | 4 +-- drivers/net/fsl_enetc.c | 4 +-- drivers/net/fsl_enetc_mdio.c | 2 +- drivers/net/fsl_ls_mdio.c | 2 +- drivers/net/fsl_mcdmafec.c | 4 +-- drivers/net/fsl_mdio.c | 4 +-- drivers/net/ftgmac100.c | 4 +-- drivers/net/ftmac100.c | 4 +-- drivers/net/gmac_rockchip.c | 4 +-- drivers/net/higmacv300.c | 4 +-- drivers/net/ks8851_mll.c | 4 +-- drivers/net/ldpaa_eth/ldpaa_eth.c | 4 +-- drivers/net/macb.c | 4 +-- drivers/net/mcffec.c | 4 +-- drivers/net/mdio-ipq4019.c | 2 +- drivers/net/mdio_mux_i2creg.c | 2 +- drivers/net/mdio_mux_sandbox.c | 2 +- drivers/net/mdio_sandbox.c | 2 +- drivers/net/mscc_eswitch/jr2_switch.c | 4 +-- drivers/net/mscc_eswitch/luton_switch.c | 4 +-- drivers/net/mscc_eswitch/ocelot_switch.c | 4 +-- drivers/net/mscc_eswitch/serval_switch.c | 4 +-- drivers/net/mscc_eswitch/servalt_switch.c | 4 +-- drivers/net/mt7628-eth.c | 4 +-- drivers/net/mtk_eth.c | 4 +-- drivers/net/mvgbe.c | 4 +-- drivers/net/mvmdio.c | 2 +- drivers/net/mvneta.c | 4 +-- drivers/net/mvpp2.c | 6 ++-- drivers/net/octeontx/bgx.c | 2 +- drivers/net/octeontx/nic_main.c | 2 +- drivers/net/octeontx/nicvf_main.c | 4 +-- drivers/net/octeontx2/cgx.c | 2 +- drivers/net/octeontx2/rvu_af.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 4 +-- drivers/net/pch_gbe.c | 4 +-- drivers/net/pcnet.c | 4 +-- drivers/net/pfe_eth/pfe_eth.c | 4 +-- drivers/net/pic32_eth.c | 4 +-- drivers/net/qe/dm_qe_uec.c | 4 +-- drivers/net/qe/dm_qe_uec_phy.c | 2 +- drivers/net/ravb.c | 4 +-- drivers/net/rtl8139.c | 4 +-- drivers/net/rtl8169.c | 4 +-- drivers/net/sandbox-raw.c | 4 +-- drivers/net/sandbox.c | 4 +-- drivers/net/sh_eth.c | 4 +-- drivers/net/smc911x.c | 4 +-- drivers/net/sni_ave.c | 4 +-- drivers/net/sun8i_emac.c | 4 +-- drivers/net/sunxi_emac.c | 4 +-- drivers/net/ti/am65-cpsw-nuss.c | 4 +-- drivers/net/ti/cpsw.c | 4 +-- drivers/net/ti/davinci_emac.c | 2 +- drivers/net/ti/keystone_net.c | 8 +++--- drivers/net/tsec.c | 4 +-- drivers/net/xilinx_axi_emac.c | 4 +-- drivers/net/xilinx_emaclite.c | 4 +-- drivers/net/zynq_gem.c | 4 +-- drivers/nvme/nvme.c | 4 +-- drivers/pch/sandbox_pch.c | 2 +- drivers/pci/pci-aardvark.c | 2 +- drivers/pci/pci-emul-uclass.c | 6 ++-- drivers/pci/pci-rcar-gen2.c | 2 +- drivers/pci/pci-rcar-gen3.c | 2 +- drivers/pci/pci-uclass.c | 4 +-- drivers/pci/pci_mpc85xx.c | 2 +- drivers/pci/pci_mvebu.c | 2 +- drivers/pci/pci_octeontx.c | 2 +- drivers/pci/pci_sandbox.c | 4 +-- drivers/pci/pci_tegra.c | 2 +- drivers/pci/pcie_brcmstb.c | 2 +- drivers/pci/pcie_dw_mvebu.c | 2 +- drivers/pci/pcie_dw_ti.c | 2 +- drivers/pci/pcie_ecam_generic.c | 2 +- drivers/pci/pcie_fsl.c | 2 +- drivers/pci/pcie_imx.c | 2 +- drivers/pci/pcie_intel_fpga.c | 2 +- drivers/pci/pcie_iproc.c | 2 +- drivers/pci/pcie_layerscape_ep.c | 2 +- drivers/pci/pcie_layerscape_gen4.c | 2 +- drivers/pci/pcie_layerscape_rc.c | 2 +- drivers/pci/pcie_mediatek.c | 4 +-- drivers/pci/pcie_phytium.c | 2 +- drivers/pci/pcie_rockchip.c | 2 +- drivers/pci/pcie_xilinx.c | 2 +- drivers/pci_endpoint/pcie-cadence-ep.c | 2 +- drivers/pci_endpoint/sandbox-pci_ep.c | 2 +- drivers/phy/allwinner/phy-sun4i-usb.c | 4 +-- drivers/phy/bcm6318-usbh-phy.c | 2 +- drivers/phy/bcm6348-usbh-phy.c | 2 +- drivers/phy/bcm6358-usbh-phy.c | 2 +- drivers/phy/bcm6368-usbh-phy.c | 2 +- drivers/phy/keystone-usb-phy.c | 2 +- drivers/phy/marvell/comphy_core.c | 2 +- drivers/phy/meson-g12a-usb2.c | 2 +- drivers/phy/meson-g12a-usb3-pcie.c | 2 +- drivers/phy/meson-gxbb-usb2.c | 2 +- drivers/phy/meson-gxl-usb2.c | 2 +- drivers/phy/msm8916-usbh-phy.c | 2 +- drivers/phy/mt76x8-usb-phy.c | 2 +- drivers/phy/nop-phy.c | 2 +- drivers/phy/omap-usb2-phy.c | 2 +- drivers/phy/phy-bcm-sr-pcie.c | 4 +-- drivers/phy/phy-mtk-tphy.c | 2 +- drivers/phy/phy-qcom-ipq4019-usb.c | 4 +-- drivers/phy/phy-rcar-gen2.c | 2 +- drivers/phy/phy-rcar-gen3.c | 2 +- drivers/phy/phy-stm32-usbphyc.c | 2 +- drivers/phy/phy-ti-am654.c | 4 +-- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 2 +- drivers/phy/rockchip/phy-rockchip-pcie.c | 2 +- drivers/phy/rockchip/phy-rockchip-typec.c | 2 +- drivers/phy/sandbox-phy.c | 2 +- drivers/phy/sti_usb_phy.c | 2 +- drivers/phy/ti-pipe3-phy.c | 2 +- drivers/pinctrl/aspeed/pinctrl_ast2500.c | 2 +- drivers/pinctrl/ath79/pinctrl_ar933x.c | 2 +- drivers/pinctrl/ath79/pinctrl_qca953x.c | 2 +- drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 2 +- drivers/pinctrl/broadcom/pinctrl-bcm6838.c | 2 +- drivers/pinctrl/exynos/pinctrl-exynos7420.c | 2 +- drivers/pinctrl/intel/pinctrl_apl.c | 4 +-- drivers/pinctrl/mediatek/pinctrl-mt7622.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mt7623.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mt7629.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mt8512.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mt8516.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mt8518.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 2 +- drivers/pinctrl/mscc/pinctrl-jr2.c | 2 +- drivers/pinctrl/mscc/pinctrl-luton.c | 2 +- drivers/pinctrl/mscc/pinctrl-ocelot.c | 2 +- drivers/pinctrl/mscc/pinctrl-serval.c | 2 +- drivers/pinctrl/mscc/pinctrl-servalt.c | 2 +- drivers/pinctrl/mtmips/pinctrl-mt7628.c | 2 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 2 +- drivers/pinctrl/nexell/pinctrl-s5pxx18.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx5.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx6.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8m.c | 2 +- drivers/pinctrl/nxp/pinctrl-imxrt.c | 2 +- drivers/pinctrl/nxp/pinctrl-mxs.c | 2 +- drivers/pinctrl/nxp/pinctrl-vf610.c | 2 +- drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- drivers/pinctrl/pinctrl-at91.c | 2 +- drivers/pinctrl/pinctrl-kendryte.c | 2 +- drivers/pinctrl/pinctrl-qe-io.c | 2 +- drivers/pinctrl/pinctrl-sandbox.c | 2 +- drivers/pinctrl/pinctrl-single.c | 2 +- drivers/pinctrl/pinctrl-sti.c | 2 +- drivers/pinctrl/pinctrl-stmfx.c | 2 +- drivers/pinctrl/pinctrl_pic32.c | 2 +- drivers/pinctrl/pinctrl_stm32.c | 2 +- drivers/pinctrl/renesas/pfc-r7s72100.c | 2 +- drivers/pinctrl/renesas/pfc.c | 2 +- drivers/pinctrl/rockchip/pinctrl-px30.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3128.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3188.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk322x.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3288.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3308.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3328.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3368.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3399.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rv1108.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-ld11.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-ld20.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-ld4.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-pro4.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-pro5.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 2 +- .../pinctrl/uniphier/pinctrl-uniphier-sld8.c | 2 +- drivers/power/acpi_pmc/acpi-pmc-uclass.c | 2 +- drivers/power/acpi_pmc/pmc_emul.c | 4 +-- drivers/power/acpi_pmc/sandbox.c | 2 +- drivers/power/domain/bcm6328-power-domain.c | 2 +- .../power/domain/imx8-power-domain-legacy.c | 4 +-- drivers/power/domain/imx8m-power-domain.c | 2 +- drivers/power/domain/meson-ee-pwrc.c | 2 +- drivers/power/domain/meson-gx-pwrc-vpu.c | 2 +- drivers/power/domain/mtk-power-domain.c | 2 +- .../power/domain/sandbox-power-domain-test.c | 2 +- drivers/power/domain/sandbox-power-domain.c | 2 +- drivers/power/domain/ti-sci-power-domain.c | 2 +- drivers/power/pmic/i2c_pmic_emul.c | 2 +- drivers/power/pmic/pm8916.c | 2 +- drivers/power/pmic/pmic-uclass.c | 2 +- drivers/power/pmic/rk8xx.c | 2 +- drivers/power/regulator/bd71837.c | 2 +- drivers/power/regulator/da9063.c | 4 +-- drivers/power/regulator/fan53555.c | 4 +-- drivers/power/regulator/fixed.c | 2 +- drivers/power/regulator/gpio-regulator.c | 2 +- drivers/power/regulator/pbias_regulator.c | 2 +- drivers/power/regulator/pfuze100.c | 2 +- drivers/power/regulator/pwm_regulator.c | 2 +- drivers/power/regulator/regulator-uclass.c | 2 +- drivers/power/regulator/stm32-vrefbuf.c | 2 +- drivers/power/regulator/tps62360_regulator.c | 2 +- drivers/power/regulator/tps65910_regulator.c | 6 ++-- drivers/pwm/exynos_pwm.c | 2 +- drivers/pwm/pwm-imx.c | 2 +- drivers/pwm/pwm-meson.c | 2 +- drivers/pwm/pwm-mtk.c | 2 +- drivers/pwm/pwm-sifive.c | 2 +- drivers/pwm/rk_pwm.c | 2 +- drivers/pwm/sandbox_pwm.c | 2 +- drivers/pwm/sunxi_pwm.c | 2 +- drivers/pwm/tegra_pwm.c | 2 +- drivers/ram/aspeed/sdram_ast2500.c | 2 +- drivers/ram/bmips_ram.c | 2 +- drivers/ram/imxrt_sdram.c | 2 +- drivers/ram/k3-am654-ddrss.c | 2 +- drivers/ram/k3-j721e/k3-j721e-ddrss.c | 2 +- drivers/ram/mediatek/ddr3-mt7629.c | 2 +- drivers/ram/mpc83xx_sdram.c | 2 +- drivers/ram/octeon/octeon_ddr.c | 2 +- drivers/ram/rockchip/dmc-rk3368.c | 6 ++-- drivers/ram/rockchip/sdram_px30.c | 2 +- drivers/ram/rockchip/sdram_rk3128.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 4 +-- drivers/ram/rockchip/sdram_rk322x.c | 4 +-- drivers/ram/rockchip/sdram_rk3288.c | 4 +-- drivers/ram/rockchip/sdram_rk3308.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 4 +-- drivers/ram/rockchip/sdram_rk3399.c | 4 +-- drivers/ram/sifive/fu540_ddr.c | 4 +-- drivers/ram/stm32_sdram.c | 2 +- drivers/ram/stm32mp1/stm32mp1_ram.c | 2 +- drivers/remoteproc/k3_system_controller.c | 2 +- drivers/remoteproc/rproc-uclass.c | 2 +- drivers/remoteproc/sandbox_testproc.c | 2 +- drivers/remoteproc/stm32_copro.c | 2 +- drivers/remoteproc/ti_k3_arm64_rproc.c | 2 +- drivers/remoteproc/ti_k3_dsp_rproc.c | 2 +- drivers/remoteproc/ti_k3_r5f_rproc.c | 4 +-- drivers/remoteproc/ti_power_proc.c | 2 +- drivers/reset/reset-ast2500.c | 2 +- drivers/reset/reset-bcm6345.c | 2 +- drivers/reset/reset-hisilicon.c | 2 +- drivers/reset/reset-hsdk.c | 2 +- drivers/reset/reset-imx7.c | 2 +- drivers/reset/reset-ipq4019.c | 2 +- drivers/reset/reset-mediatek.c | 2 +- drivers/reset/reset-meson.c | 2 +- drivers/reset/reset-mtmips.c | 2 +- drivers/reset/reset-rockchip.c | 2 +- drivers/reset/reset-sifive.c | 2 +- drivers/reset/reset-socfpga.c | 2 +- drivers/reset/reset-sunxi.c | 2 +- drivers/reset/reset-syscon.c | 2 +- drivers/reset/reset-ti-sci.c | 2 +- drivers/reset/reset-uniphier.c | 2 +- drivers/reset/sandbox-reset-test.c | 2 +- drivers/reset/sandbox-reset.c | 2 +- drivers/reset/sti-reset.c | 2 +- drivers/reset/stm32-reset.c | 2 +- drivers/rng/meson-rng.c | 2 +- drivers/rng/msm_rng.c | 2 +- drivers/rng/rockchip_rng.c | 2 +- drivers/rng/stm32mp1_rng.c | 2 +- drivers/rtc/ds3232.c | 2 +- drivers/rtc/emul_rtc.c | 2 +- drivers/rtc/i2c_rtc_emul.c | 4 +-- drivers/rtc/pl031.c | 2 +- drivers/rtc/stm32_rtc.c | 2 +- drivers/scsi/scsi-uclass.c | 2 +- drivers/serial/altera_jtag_uart.c | 2 +- drivers/serial/altera_uart.c | 2 +- drivers/serial/atmel_usart.c | 4 +-- drivers/serial/lpc32xx_hsuart.c | 2 +- drivers/serial/ns16550.c | 4 +-- drivers/serial/sandbox.c | 4 +-- drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial_ar933x.c | 2 +- drivers/serial/serial_arc.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 4 +-- drivers/serial/serial_bcm283x_pl011.c | 4 +-- drivers/serial/serial_bcm6345.c | 2 +- drivers/serial/serial_coreboot.c | 4 +-- drivers/serial/serial_cortina.c | 2 +- drivers/serial/serial_efi.c | 2 +- drivers/serial/serial_intel_mid.c | 4 +-- drivers/serial/serial_linflexuart.c | 2 +- drivers/serial/serial_lpuart.c | 2 +- drivers/serial/serial_mcf.c | 2 +- drivers/serial/serial_meson.c | 2 +- drivers/serial/serial_msm.c | 2 +- drivers/serial/serial_mtk.c | 2 +- drivers/serial/serial_mvebu_a3700.c | 2 +- drivers/serial/serial_mxc.c | 2 +- drivers/serial/serial_omap.c | 4 +-- drivers/serial/serial_owl.c | 2 +- drivers/serial/serial_pic32.c | 2 +- drivers/serial/serial_pl01x.c | 4 +-- drivers/serial/serial_rockchip.c | 8 +++--- drivers/serial/serial_s5p.c | 2 +- drivers/serial/serial_sh.c | 4 +-- drivers/serial/serial_sifive.c | 2 +- drivers/serial/serial_sti_asc.c | 2 +- drivers/serial/serial_stm32.c | 2 +- drivers/serial/serial_uniphier.c | 2 +- drivers/serial/serial_xen.c | 2 +- drivers/serial/serial_xuartlite.c | 2 +- drivers/serial/serial_zynq.c | 2 +- drivers/soc/soc_ti_k3.c | 2 +- drivers/soc/ti/k3-navss-ringacc.c | 2 +- drivers/sound/broadwell_i2s.c | 2 +- drivers/sound/hda_codec.c | 2 +- drivers/sound/i2s-uclass.c | 2 +- drivers/sound/ivybridge_sound.c | 2 +- drivers/sound/max98088.c | 2 +- drivers/sound/max98090.c | 2 +- drivers/sound/max98095.c | 2 +- drivers/sound/rt5677.c | 2 +- drivers/sound/sandbox.c | 6 ++-- drivers/sound/sound-uclass.c | 2 +- drivers/sound/tegra_ahub.c | 2 +- drivers/sound/wm8994.c | 2 +- drivers/spi/altera_spi.c | 4 +-- drivers/spi/atcspi200_spi.c | 2 +- drivers/spi/ath79_spi.c | 2 +- drivers/spi/atmel-quadspi.c | 2 +- drivers/spi/atmel_spi.c | 4 +-- drivers/spi/bcm63xx_hsspi.c | 2 +- drivers/spi/bcm63xx_spi.c | 2 +- drivers/spi/bcmstb_spi.c | 4 +-- drivers/spi/cadence_qspi.c | 4 +-- drivers/spi/cf_spi.c | 4 +-- drivers/spi/davinci_spi.c | 4 +-- drivers/spi/designware_spi.c | 4 +-- drivers/spi/exynos_spi.c | 4 +-- drivers/spi/fsl_dspi.c | 4 +-- drivers/spi/fsl_espi.c | 4 +-- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/ich.c | 4 +-- drivers/spi/kirkwood_spi.c | 4 +-- drivers/spi/meson_spifc.c | 2 +- drivers/spi/mpc8xxx_spi.c | 2 +- drivers/spi/mscc_bb_spi.c | 2 +- drivers/spi/mt7621_spi.c | 2 +- drivers/spi/mtk_snfi_spi.c | 2 +- drivers/spi/mvebu_a3700_spi.c | 2 +- drivers/spi/mxc_spi.c | 2 +- drivers/spi/mxs_spi.c | 4 +-- drivers/spi/nxp_fspi.c | 2 +- drivers/spi/octeon_spi.c | 2 +- drivers/spi/omap3_spi.c | 4 +-- drivers/spi/pic32_spi.c | 2 +- drivers/spi/pl022_spi.c | 4 +-- drivers/spi/renesas_rpc_spi.c | 4 +-- drivers/spi/rk_spi.c | 4 +-- drivers/spi/sh_qspi.c | 2 +- drivers/spi/soft_spi.c | 4 +-- drivers/spi/spi-qup.c | 2 +- drivers/spi/spi-sifive.c | 2 +- drivers/spi/spi-sunxi.c | 4 +-- drivers/spi/spi-uclass.c | 6 ++-- drivers/spi/stm32_qspi.c | 2 +- drivers/spi/stm32_spi.c | 2 +- drivers/spi/tegra114_spi.c | 4 +-- drivers/spi/tegra20_sflash.c | 4 +-- drivers/spi/tegra20_slink.c | 4 +-- drivers/spi/tegra210_qspi.c | 6 ++-- drivers/spi/ti_qspi.c | 2 +- drivers/spi/uniphier_spi.c | 4 +-- drivers/spi/xilinx_spi.c | 2 +- drivers/spi/zynq_qspi.c | 4 +-- drivers/spi/zynq_spi.c | 4 +-- drivers/spi/zynqmp_gqspi.c | 4 +-- drivers/spmi/spmi-msm.c | 2 +- drivers/spmi/spmi-sandbox.c | 2 +- drivers/sysinfo/gazerbeam.c | 2 +- drivers/sysinfo/sandbox.c | 2 +- drivers/sysreset/poweroff_gpio.c | 2 +- drivers/sysreset/sysreset-ti-sci.c | 2 +- drivers/sysreset/sysreset_gpio.c | 2 +- drivers/sysreset/sysreset_octeon.c | 2 +- drivers/sysreset/sysreset_resetctl.c | 2 +- drivers/sysreset/sysreset_socfpga.c | 2 +- drivers/sysreset/sysreset_sti.c | 2 +- drivers/sysreset/sysreset_syscon.c | 2 +- drivers/sysreset/sysreset_watchdog.c | 2 +- drivers/sysreset/sysreset_x86.c | 2 +- drivers/tee/optee/core.c | 4 +-- drivers/tee/sandbox.c | 2 +- drivers/tee/tee-uclass.c | 2 +- drivers/thermal/imx_scu_thermal.c | 2 +- drivers/thermal/imx_thermal.c | 2 +- drivers/thermal/imx_tmu.c | 2 +- drivers/thermal/ti-bandgap.c | 2 +- drivers/timer/ag101p_timer.c | 2 +- drivers/timer/altera_timer.c | 2 +- drivers/timer/arc_timer.c | 2 +- drivers/timer/ast_timer.c | 2 +- drivers/timer/atcpit100_timer.c | 2 +- drivers/timer/atmel_pit_timer.c | 2 +- drivers/timer/cadence-ttc.c | 2 +- drivers/timer/dw-apb-timer.c | 2 +- drivers/timer/mchp-pit64b-timer.c | 2 +- drivers/timer/mpc83xx_timer.c | 2 +- drivers/timer/mtk_timer.c | 2 +- drivers/timer/nomadik-mtu-timer.c | 2 +- drivers/timer/omap-timer.c | 2 +- drivers/timer/ostm_timer.c | 2 +- drivers/timer/rockchip_timer.c | 4 +-- drivers/timer/sti-timer.c | 2 +- drivers/timer/stm32_timer.c | 2 +- drivers/timer/timer-uclass.c | 2 +- drivers/tpm/cr50_i2c.c | 2 +- drivers/tpm/tpm-uclass.c | 2 +- drivers/tpm/tpm2_ftpm_tee.c | 2 +- drivers/tpm/tpm2_tis_sandbox.c | 2 +- drivers/tpm/tpm2_tis_spi.c | 2 +- drivers/tpm/tpm_tis_infineon.c | 2 +- drivers/tpm/tpm_tis_lpc.c | 2 +- drivers/tpm/tpm_tis_sandbox.c | 2 +- drivers/tpm/tpm_tis_st33zp24_i2c.c | 2 +- drivers/tpm/tpm_tis_st33zp24_spi.c | 4 +-- drivers/ufs/ufs-uclass.c | 2 +- drivers/usb/cdns3/cdns3-ti.c | 2 +- drivers/usb/cdns3/core.c | 4 +-- drivers/usb/dwc3/dwc3-generic.c | 10 +++---- drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- drivers/usb/dwc3/dwc3-meson-gxl.c | 2 +- drivers/usb/emul/sandbox_flash.c | 4 +-- drivers/usb/emul/sandbox_hub.c | 4 +-- drivers/usb/emul/sandbox_keyb.c | 4 +-- drivers/usb/emul/usb-emul-uclass.c | 6 ++-- drivers/usb/eth/asix.c | 4 +-- drivers/usb/eth/asix88179.c | 4 +-- drivers/usb/eth/lan75xx.c | 4 +-- drivers/usb/eth/lan78xx.c | 4 +-- drivers/usb/eth/mcs7830.c | 4 +-- drivers/usb/eth/r8152.c | 4 +-- drivers/usb/eth/smsc95xx.c | 4 +-- drivers/usb/gadget/dwc2_udc_otg.c | 4 +-- drivers/usb/gadget/ether.c | 4 +-- drivers/usb/gadget/max3420_udc.c | 2 +- drivers/usb/host/dwc2.c | 2 +- drivers/usb/host/dwc3-of-simple.c | 2 +- drivers/usb/host/dwc3-sti-glue.c | 2 +- drivers/usb/host/ehci-atmel.c | 4 +-- drivers/usb/host/ehci-exynos.c | 4 +-- drivers/usb/host/ehci-fsl.c | 4 +-- drivers/usb/host/ehci-generic.c | 2 +- drivers/usb/host/ehci-marvell.c | 4 +-- drivers/usb/host/ehci-msm.c | 4 +-- drivers/usb/host/ehci-mx5.c | 4 +-- drivers/usb/host/ehci-mx6.c | 4 +-- drivers/usb/host/ehci-omap.c | 4 +-- drivers/usb/host/ehci-pci.c | 4 +-- drivers/usb/host/ehci-tegra.c | 4 +-- drivers/usb/host/ehci-vf.c | 4 +-- drivers/usb/host/ehci-zynq.c | 4 +-- drivers/usb/host/ohci-da8xx.c | 2 +- drivers/usb/host/ohci-generic.c | 2 +- drivers/usb/host/ohci-pci.c | 4 +-- drivers/usb/host/r8a66597-hcd.c | 2 +- drivers/usb/host/usb-sandbox.c | 2 +- drivers/usb/host/usb-uclass.c | 8 +++--- drivers/usb/host/xhci-brcm.c | 4 +-- drivers/usb/host/xhci-dwc3.c | 4 +-- drivers/usb/host/xhci-exynos5.c | 4 +-- drivers/usb/host/xhci-fsl.c | 4 +-- drivers/usb/host/xhci-mtk.c | 2 +- drivers/usb/host/xhci-mvebu.c | 4 +-- drivers/usb/host/xhci-pci.c | 4 +-- drivers/usb/host/xhci-rcar.c | 4 +-- drivers/usb/mtu3/mtu3_plat.c | 6 ++-- drivers/usb/musb-new/da8xx.c | 4 +-- drivers/usb/musb-new/mt85xx.c | 4 +-- drivers/usb/musb-new/omap2430.c | 4 +-- drivers/usb/musb-new/pic32.c | 4 +-- drivers/usb/musb-new/sunxi.c | 4 +-- drivers/usb/musb-new/ti-musb.c | 8 +++--- drivers/video/am335x-fb.c | 2 +- drivers/video/atmel_hlcdfb.c | 2 +- drivers/video/atmel_lcdfb.c | 4 +-- drivers/video/backlight_gpio.c | 2 +- drivers/video/bridge/anx6345.c | 2 +- drivers/video/bridge/video-bridge-uclass.c | 2 +- drivers/video/broadwell_igd.c | 4 +-- drivers/video/console_truetype.c | 2 +- drivers/video/display-uclass.c | 2 +- drivers/video/dw_mipi_dsi.c | 2 +- drivers/video/exynos/exynos_dp.c | 2 +- drivers/video/exynos/exynos_fb.c | 2 +- drivers/video/ihs_video_out.c | 2 +- drivers/video/imx/mxc_ipuv3_fb.c | 2 +- drivers/video/lg4573.c | 2 +- drivers/video/logicore_dp_tx.c | 2 +- drivers/video/mali_dp.c | 2 +- drivers/video/meson/meson_dw_hdmi.c | 2 +- drivers/video/meson/meson_vpu.c | 2 +- drivers/video/mvebu_lcd.c | 2 +- drivers/video/nexell_display.c | 4 +-- drivers/video/orisetech_otm8009a.c | 4 +-- drivers/video/pwm_backlight.c | 2 +- drivers/video/raydium-rm68200.c | 4 +-- drivers/video/rockchip/rk3288_hdmi.c | 2 +- drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3288_vop.c | 2 +- drivers/video/rockchip/rk3399_hdmi.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk3399_vop.c | 2 +- drivers/video/rockchip/rk_edp.c | 2 +- drivers/video/rockchip/rk_lvds.c | 2 +- drivers/video/sandbox_dsi_host.c | 2 +- drivers/video/sandbox_osd.c | 2 +- drivers/video/sandbox_sdl.c | 2 +- drivers/video/simple_panel.c | 2 +- drivers/video/stm32/stm32_dsi.c | 2 +- drivers/video/stm32/stm32_ltdc.c | 2 +- drivers/video/sunxi/sunxi_dw_hdmi.c | 2 +- drivers/video/sunxi/sunxi_lcd.c | 2 +- drivers/video/tda19988.c | 2 +- drivers/video/tegra.c | 2 +- drivers/video/tegra124/dp.c | 4 +-- drivers/video/tegra124/sor.c | 2 +- drivers/video/vidconsole-uclass.c | 2 +- drivers/video/video-uclass.c | 6 ++-- drivers/virtio/virtio-uclass.c | 2 +- drivers/virtio/virtio_blk.c | 2 +- drivers/virtio/virtio_mmio.c | 2 +- drivers/virtio/virtio_net.c | 4 +-- drivers/virtio/virtio_pci_legacy.c | 2 +- drivers/virtio/virtio_pci_modern.c | 2 +- drivers/virtio/virtio_rng.c | 2 +- drivers/virtio/virtio_sandbox.c | 4 +-- drivers/w1/mxc_w1.c | 2 +- drivers/w1/w1-gpio.c | 2 +- drivers/w1/w1-uclass.c | 4 +-- drivers/watchdog/armada-37xx-wdt.c | 2 +- drivers/watchdog/ast_wdt.c | 2 +- drivers/watchdog/at91sam9_wdt.c | 2 +- drivers/watchdog/bcm6345_wdt.c | 2 +- drivers/watchdog/cdns_wdt.c | 2 +- drivers/watchdog/designware_wdt.c | 2 +- drivers/watchdog/imx_watchdog.c | 2 +- drivers/watchdog/mt7621_wdt.c | 2 +- drivers/watchdog/mtk_wdt.c | 2 +- drivers/watchdog/octeontx_wdt.c | 2 +- drivers/watchdog/omap_wdt.c | 2 +- drivers/watchdog/orion_wdt.c | 2 +- drivers/watchdog/rti_wdt.c | 2 +- drivers/watchdog/sbsa_gwdt.c | 2 +- drivers/watchdog/sp805_wdt.c | 2 +- drivers/watchdog/stm32mp_wdt.c | 2 +- drivers/watchdog/xilinx_tb_wdt.c | 2 +- drivers/watchdog/xilinx_wwdt.c | 4 +-- drivers/xen/pvblock.c | 2 +- include/dm/device.h | 18 ++++++------ include/dm/uclass.h | 20 ++++++------- include/dwmmc.h | 2 +- include/sdhci.h | 2 +- include/spi.h | 2 +- lib/efi_driver/efi_block_device.c | 2 +- net/eth-uclass.c | 4 +-- net/mdio-mux-uclass.c | 4 +-- net/mdio-uclass.c | 2 +- test/dm/acpi.c | 2 +- test/dm/bus.c | 28 +++++++++---------- test/dm/core.c | 2 +- test/dm/mux-emul.c | 2 +- test/dm/regmap.c | 2 +- test/dm/test-driver.c | 4 +-- test/dm/test-fdt.c | 14 +++++----- test/dm/test-uclass.c | 6 ++-- 955 files changed, 1364 insertions(+), 1368 deletions(-)

diff --git a/arch/arm/mach-ipq40xx/clock-ipq4019.c b/arch/arm/mach-ipq40xx/clock-ipq4019.c index 31ae9719e82..17f6397bee1 100644 --- a/arch/arm/mach-ipq40xx/clock-ipq4019.c +++ b/arch/arm/mach-ipq40xx/clock-ipq4019.c @@ -78,6 +78,6 @@ U_BOOT_DRIVER(clk_msm) = { .id = UCLASS_CLK, .of_match = msm_clk_ids, .ops = &msm_clk_ops, - .priv_auto_alloc_size = sizeof(struct msm_clk_priv), + .priv_auto = sizeof(struct msm_clk_priv), .probe = msm_clk_probe, }; diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c index 64b8b049fa1..c51a75ee94b 100644 --- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c +++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c @@ -131,7 +131,7 @@ U_BOOT_DRIVER(pinctrl_snapdraon) = { .name = "pinctrl_msm", .id = UCLASS_PINCTRL, .of_match = msm_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct msm_pinctrl_priv), + .priv_auto = sizeof(struct msm_pinctrl_priv), .ops = &msm_pinctrl_ops, .probe = msm_pinctrl_probe, }; diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c index 69d65c82e3e..fbe0b5212f9 100644 --- a/arch/arm/mach-snapdragon/clock-snapdragon.c +++ b/arch/arm/mach-snapdragon/clock-snapdragon.c @@ -143,6 +143,6 @@ U_BOOT_DRIVER(clk_msm) = { .id = UCLASS_CLK, .of_match = msm_clk_ids, .ops = &msm_clk_ops, - .priv_auto_alloc_size = sizeof(struct msm_clk_priv), + .priv_auto = sizeof(struct msm_clk_priv), .probe = msm_clk_probe, }; diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c index 4c2af213082..e6b87c35732 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c @@ -123,7 +123,7 @@ U_BOOT_DRIVER(pinctrl_snapdraon) = { .name = "pinctrl_msm", .id = UCLASS_PINCTRL, .of_match = msm_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct msm_pinctrl_priv), + .priv_auto = sizeof(struct msm_pinctrl_priv), .ops = &msm_pinctrl_ops, .probe = msm_pinctrl_probe, }; diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index a9b9bd09027..cb9208981e7 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -513,7 +513,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = { .id = UCLASS_MISC, .of_match = stm32mp_bsec_ids, .ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct stm32mp_bsec_platdata), + .platdata_auto = sizeof(struct stm32mp_bsec_platdata), .ops = &stm32mp_bsec_ops, .probe = stm32mp_bsec_probe, }; diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c index 900dee4c38a..7985049f9b1 100644 --- a/arch/arm/mach-stm32mp/pwr_regulator.c +++ b/arch/arm/mach-stm32mp/pwr_regulator.c @@ -104,7 +104,7 @@ U_BOOT_DRIVER(stm32mp_pwr_pmic) = { .bind = stm32mp_pwr_bind, .ops = &stm32mp_pwr_ops, .ofdata_to_platdata = stm32mp_pwr_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct stm32mp_pwr_priv), + .priv_auto = sizeof(struct stm32mp_pwr_priv), };

static const struct stm32mp_pwr_reg_info stm32mp_pwr_reg11 = { diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c index 70badb15a3b..6ff80e5d312 100644 --- a/arch/x86/cpu/acpi_gpe.c +++ b/arch/x86/cpu/acpi_gpe.c @@ -108,5 +108,5 @@ U_BOOT_DRIVER(acpi_gpe_drv) = { .of_match = acpi_gpe_ids, .ops = &acpi_gpe_ops, .ofdata_to_platdata = acpi_gpe_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct acpi_gpe_priv), + .priv_auto = sizeof(struct acpi_gpe_priv), }; diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c index cafd9d65b24..4b627e325ec 100644 --- a/arch/x86/cpu/apollolake/hostbridge.c +++ b/arch/x86/cpu/apollolake/hostbridge.c @@ -403,7 +403,7 @@ U_BOOT_DRIVER(intel_apl_hostbridge) = { .ofdata_to_platdata = apl_hostbridge_ofdata_to_platdata, .probe = apl_hostbridge_probe, .remove = apl_hostbridge_remove, - .platdata_auto_alloc_size = sizeof(struct apl_hostbridge_platdata), + .platdata_auto = sizeof(struct apl_hostbridge_platdata), ACPI_OPS_PTR(&apl_hostbridge_acpi_ops) .flags = DM_FLAG_OS_PREPARE, }; diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index cacaa007e05..82e2187c505 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -224,5 +224,5 @@ U_BOOT_DRIVER(intel_apl_pmc) = { .ofdata_to_platdata = apl_pmc_ofdata_to_uc_platdata, .probe = apl_pmc_probe, .ops = &apl_pmc_ops, - .platdata_auto_alloc_size = sizeof(struct apl_pmc_platdata), + .platdata_auto = sizeof(struct apl_pmc_platdata), }; diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index 089b37c59f8..324dd6c9f1b 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -125,7 +125,7 @@ U_BOOT_DRIVER(winbond_w25q128fw) = { .of_match = apl_flash_ids, .bind = apl_flash_bind, .probe = apl_flash_probe, - .priv_auto_alloc_size = sizeof(struct spi_flash), + .priv_auto = sizeof(struct spi_flash), .ops = &apl_flash_ops, };

diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c index c522aa97803..6695234dce7 100644 --- a/arch/x86/cpu/apollolake/uart.c +++ b/arch/x86/cpu/apollolake/uart.c @@ -126,8 +126,8 @@ U_BOOT_DRIVER(intel_apl_ns16550) = { .name = "intel_apl_ns16550", .id = UCLASS_SERIAL, .of_match = apl_ns16550_serial_ids, - .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), - .priv_auto_alloc_size = sizeof(struct NS16550), + .platdata_auto = sizeof(struct ns16550_platdata), + .priv_auto = sizeof(struct NS16550), .ops = &ns16550_serial_ops, .ofdata_to_platdata = apl_ns16550_ofdata_to_platdata, .probe = apl_ns16550_probe, diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c index ff066028fe6..ea9e98dde69 100644 --- a/arch/x86/cpu/broadwell/cpu_full.c +++ b/arch/x86/cpu/broadwell/cpu_full.c @@ -665,6 +665,6 @@ U_BOOT_DRIVER(cpu_x86_broadwell_drv) = { .bind = cpu_x86_bind, .probe = cpu_x86_broadwell_probe, .ops = &cpu_x86_broadwell_ops, - .priv_auto_alloc_size = sizeof(struct cpu_broadwell_priv), + .priv_auto = sizeof(struct cpu_broadwell_priv), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index 641da515c8f..a31f5234220 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -266,5 +266,5 @@ U_BOOT_DRIVER(ahci_broadwell_drv) = { .of_match = broadwell_ahci_ids, .ofdata_to_platdata = broadwell_sata_ofdata_to_platdata, .probe = broadwell_sata_probe, - .platdata_auto_alloc_size = sizeof(struct sata_platdata), + .platdata_auto = sizeof(struct sata_platdata), }; diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c index de17b93ed43..ed0dad320e1 100644 --- a/arch/x86/cpu/intel_common/itss.c +++ b/arch/x86/cpu/intel_common/itss.c @@ -242,6 +242,6 @@ U_BOOT_DRIVER(intel_itss) = { .ops = &itss_ops, .bind = itss_bind, .ofdata_to_platdata = itss_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct itss_platdata), - .priv_auto_alloc_size = sizeof(struct itss_priv), + .platdata_auto = sizeof(struct itss_platdata), + .priv_auto = sizeof(struct itss_priv), }; diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index a0a4001e03b..40de1d34a3d 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -197,8 +197,8 @@ U_BOOT_DRIVER(intel_p2sb) = { .remove = p2sb_remove, .ops = &p2sb_ops, .ofdata_to_platdata = p2sb_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct p2sb_platdata), - .per_child_platdata_auto_alloc_size = + .platdata_auto = sizeof(struct p2sb_platdata), + .per_child_platdata_auto = sizeof(struct p2sb_child_platdata), .child_post_bind = p2sb_child_post_bind, .flags = DM_FLAG_OS_PREPARE, diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c index 836a0e8b86e..8b53b96822d 100644 --- a/arch/x86/cpu/irq.c +++ b/arch/x86/cpu/irq.c @@ -362,5 +362,5 @@ U_BOOT_DRIVER(irq_router_drv) = { .id = UCLASS_IRQ, .of_match = irq_router_ids, .probe = irq_router_probe, - .priv_auto_alloc_size = sizeof(struct irq_router), + .priv_auto = sizeof(struct irq_router), }; diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c index 9813f7977b5..5ffce9835d0 100644 --- a/arch/x86/cpu/slimbootloader/serial.c +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -58,8 +58,8 @@ U_BOOT_DRIVER(serial_slimbootloader) = { .id = UCLASS_SERIAL, .of_match = slimbootloader_serial_ids, .ofdata_to_platdata = slimbootloader_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), - .priv_auto_alloc_size = sizeof(struct NS16550), + .platdata_auto = sizeof(struct ns16550_platdata), + .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, }; diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c index 5b0e106011a..acf97e3af51 100644 --- a/arch/x86/cpu/tangier/pinmux.c +++ b/arch/x86/cpu/tangier/pinmux.c @@ -191,5 +191,5 @@ U_BOOT_DRIVER(tangier_pinctrl) = { .id = UCLASS_SYSCON, .of_match = tangier_pinctrl_match, .probe = tangier_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mrfld_pinctrl), + .priv_auto = sizeof(struct mrfld_pinctrl), }; diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c index 3cd7b1f536e..083aec8d8dd 100644 --- a/arch/x86/lib/pmu.c +++ b/arch/x86/lib/pmu.c @@ -113,5 +113,5 @@ U_BOOT_DRIVER(intel_mid_pmu) = { .id = UCLASS_SYSCON, .of_match = pmu_mid_match, .probe = pmu_mid_probe, - .priv_auto_alloc_size = sizeof(struct pmu_mid), + .priv_auto = sizeof(struct pmu_mid), }; diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c index d29d701631d..90ef239bcd3 100644 --- a/arch/x86/lib/scu.c +++ b/arch/x86/lib/scu.c @@ -227,5 +227,5 @@ U_BOOT_DRIVER(scu_ipc) = { .id = UCLASS_SYSCON, .of_match = scu_ipc_match, .probe = scu_ipc_probe, - .priv_auto_alloc_size = sizeof(struct scu), + .priv_auto = sizeof(struct scu), }; diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c index a20a34a92a8..e3fa3526b75 100644 --- a/board/renesas/ulcb/cpld.c +++ b/board/renesas/ulcb/cpld.c @@ -188,5 +188,5 @@ U_BOOT_DRIVER(sysreset_renesas_ulcb) = { .ops = &renesas_ulcb_sysreset, .probe = renesas_ulcb_sysreset_probe, .of_match = renesas_ulcb_sysreset_ids, - .priv_auto_alloc_size = sizeof(struct renesas_ulcb_sysreset_priv), + .priv_auto = sizeof(struct renesas_ulcb_sysreset_priv), }; diff --git a/common/usb_hub.c b/common/usb_hub.c index e578f0be284..36bf2abfeec 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -958,9 +958,9 @@ UCLASS_DRIVER(usb_hub) = { .post_bind = dm_scan_fdt_dev, .post_probe = usb_hub_post_probe, .child_pre_probe = usb_child_pre_probe, - .per_child_auto_alloc_size = sizeof(struct usb_device), - .per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata), - .per_device_auto_alloc_size = sizeof(struct usb_hub_device), + .per_child_auto = sizeof(struct usb_device), + .per_child_platdata_auto = sizeof(struct usb_dev_platdata), + .per_device_auto = sizeof(struct usb_hub_device), };

static const struct usb_device_id hub_id_table[] = { diff --git a/common/usb_storage.c b/common/usb_storage.c index ff254419951..4c8ad1be6d9 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -1529,7 +1529,7 @@ U_BOOT_DRIVER(usb_mass_storage) = { .of_match = usb_mass_storage_ids, .probe = usb_mass_storage_probe, #if CONFIG_IS_ENABLED(BLK) - .platdata_auto_alloc_size = sizeof(struct us_data), + .platdata_auto = sizeof(struct us_data), #endif };

diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst index 2db00e660e1..5c93d0a3f05 100644 --- a/doc/driver-model/design.rst +++ b/doc/driver-model/design.rst @@ -448,10 +448,10 @@ The easiest way to make this work it to add a few members to the driver:

.. code-block:: c

- .platdata_auto_alloc_size = sizeof(struct dm_test_pdata), + .platdata_auto = sizeof(struct dm_test_pdata), .ofdata_to_platdata = testfdt_ofdata_to_platdata,

-The 'auto_alloc' feature allowed space for the platdata to be allocated +The 'auto' feature allowed space for the platdata to be allocated and zeroed before the driver's ofdata_to_platdata() method is called. The ofdata_to_platdata() method, which the driver write supplies, should parse the device tree node for this device and place it in dev->platdata. Thus @@ -464,7 +464,7 @@ probe method it will be called next. See Driver Lifecycle below for more details.

If you don't want to have the platdata automatically allocated then you -can leave out platdata_auto_alloc_size. In this case you can use malloc +can leave out platdata_auto. In this case you can use malloc in your ofdata_to_platdata (or probe) method to allocate the required memory, and you should free it in the remove method.

@@ -604,7 +604,7 @@ as the bus speed for each device.

To achieve this, the bus device can use dev->parent_platdata in each of its three children. This can be auto-allocated if the bus driver (or bus uclass) -has a non-zero value for per_child_platdata_auto_alloc_size. If not, then +has a non-zero value for per_child_platdata_auto. If not, then the bus device or uclass can allocate the space itself before the child device is probed.

@@ -714,24 +714,24 @@ platdata. A parent's ofdata is always read before a child.

The steps are:

- 1. If priv_auto_alloc_size is non-zero, then the device-private space + 1. If priv_auto is non-zero, then the device-private space is allocated for the device and zeroed. It will be accessible as dev->priv. The driver can put anything it likes in there, but should use it for run-time information, not platform data (which should be static and known before the device is probed).

- 2. If platdata_auto_alloc_size is non-zero, then the platform data space + 2. If platdata_auto is non-zero, then the platform data space is allocated. This is only useful for device tree operation, since otherwise you would have to specific the platform data in the U_BOOT_DEVICE() declaration. The space is allocated for the device and zeroed. It will be accessible as dev->platdata.

- 3. If the device's uclass specifies a non-zero per_device_auto_alloc_size, + 3. If the device's uclass specifies a non-zero per_device_auto, then this space is allocated and zeroed also. It is allocated for and stored in the device, but it is uclass data. owned by the uclass driver. It is possible for the device to access it.

- 4. If the device's immediate parent specifies a per_child_auto_alloc_size + 4. If the device's immediate parent specifies a per_child_auto then this space is allocated. This is intended for use by the parent device to keep track of things related to the child. For example a USB flash stick attached to a USB host controller would likely use this @@ -745,7 +745,7 @@ The steps are: works the same way whether it was bound using a device tree node or U_BOOT_DEVICE() structure. In either case, the platform data is now stored in the platdata structure. Typically you will use the - platdata_auto_alloc_size feature to specify the size of the platform data + platdata_auto feature to specify the size of the platform data structure, and U-Boot will automatically allocate and zero it for you before entry to ofdata_to_platdata(). But if not, you can allocate it yourself in ofdata_to_platdata(). Note that it is preferable to do all the device tree @@ -810,9 +810,9 @@ as above and then following these steps (see device_probe()): - uclass data in dev->uclass_priv (for things the uclass stores about this device)

- Note: If you don't use priv_auto_alloc_size then you will need to + Note: If you don't use priv_auto then you will need to allocate the priv space here yourself. The same applies also to - platdata_auto_alloc_size. Remember to free them in the remove() method. + platdata_auto. Remember to free them in the remove() method.

3. The device is marked 'activated'

@@ -858,10 +858,10 @@ remove it. This performs the probe steps in reverse: be dynamically allocated, and thus needs to be deallocated during the remove() method, either:

- - if the platdata_auto_alloc_size is non-zero, the deallocation + - if the platdata_auto is non-zero, the deallocation happens automatically within the driver model core; or

- - when platdata_auto_alloc_size is 0, both the allocation (in probe() + - when platdata_auto is 0, both the allocation (in probe() or preferably ofdata_to_platdata()) and the deallocation in remove() are the responsibility of the driver author.

diff --git a/doc/driver-model/ethernet.rst b/doc/driver-model/ethernet.rst index 1f5310daaa0..781644d2e27 100644 --- a/doc/driver-model/ethernet.rst +++ b/doc/driver-model/ethernet.rst @@ -28,14 +28,14 @@ the UCLASS_ETH .id field in the U-Boot driver struct: .ofdata_to_platdata = eth_ape_ofdata_to_platdata, .probe = eth_ape_probe, .ops = &eth_ape_ops, - .priv_auto_alloc_size = sizeof(struct eth_ape_priv), - .platdata_auto_alloc_size = sizeof(struct eth_ape_pdata), + .priv_auto = sizeof(struct eth_ape_priv), + .platdata_auto = sizeof(struct eth_ape_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

struct eth_ape_priv contains runtime per-instance data, like buffers, pointers to current descriptors, current speed settings, pointers to PHY related data -(like struct mii_dev) and so on. Declaring its size in .priv_auto_alloc_size +(like struct mii_dev) and so on. Declaring its size in .priv_auto will let the driver framework allocate it at the right time. It can be retrieved using a dev_get_priv(dev) call.

@@ -43,7 +43,7 @@ struct eth_ape_pdata contains static platform data, like the MMIO base address, a hardware variant, the MAC address. ``struct eth_pdata eth_pdata`` as the first member of this struct helps to avoid duplicated code. If you don't need any more platform data beside the standard member, -just use sizeof(struct eth_pdata) for the platdata_auto_alloc_size. +just use sizeof(struct eth_pdata) for the platdata_auto.

PCI devices add a line pointing to supported vendor/device ID pairs:

diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst index 58481665cec..2df59edb7cc 100644 --- a/doc/driver-model/of-plat.rst +++ b/doc/driver-model/of-plat.rst @@ -293,8 +293,8 @@ For example: .of_match = mmc_ids, .ofdata_to_platdata = mmc_ofdata_to_platdata, .probe = mmc_probe, - .priv_auto_alloc_size = sizeof(struct mmc_priv), - .platdata_auto_alloc_size = sizeof(struct mmc_platdata), + .priv_auto = sizeof(struct mmc_priv), + .platdata_auto = sizeof(struct mmc_platdata), };

U_BOOT_DRIVER_ALIAS(mmc_drv, vendor_mmc) /* matches compatible string */ @@ -305,7 +305,7 @@ keep the use of each of-platdata struct to the smallest possible code area. There is just one driver C file for each struct, that can convert from the of-platdata struct to the standard one used by the driver.

-In the case where SPL_OF_PLATDATA is enabled, platdata_auto_alloc_size is +In the case where SPL_OF_PLATDATA is enabled, platdata_auto is still used to allocate space for the platform data. This is different from the normal behaviour and is triggered by the use of of-platdata (strictly speaking it is a non-zero platdata_size which triggers this). diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst index 9631a5059d3..a12d6922e55 100644 --- a/doc/driver-model/spi-howto.rst +++ b/doc/driver-model/spi-howto.rst @@ -231,7 +231,7 @@ tree, but we need to tell it the size:

U_BOOT_DRIVER(spi_exynos) = { ... - .platdata_auto_alloc_size = sizeof(struct exynos_spi_platdata), + .platdata_auto = sizeof(struct exynos_spi_platdata),

Here is a sample function. It gets a pointer to the platform data and @@ -335,7 +335,7 @@ DM can auto-allocate this also:

U_BOOT_DRIVER(spi_exynos) = { ... - .priv_auto_alloc_size = sizeof(struct exynos_spi_priv), + .priv_auto = sizeof(struct exynos_spi_priv),

Note that this is created before the probe method is called, and destroyed @@ -621,7 +621,7 @@ needs, but this is the minimum.

U_BOOT_DRIVER(exynos_spi) = { ... - .per_child_auto_alloc_size = sizeof(struct spi_slave), + .per_child_auto = sizeof(struct spi_slave), }

diff --git a/doc/driver-model/usb-info.rst b/doc/driver-model/usb-info.rst index 1817df420fb..5f7cbfce097 100644 --- a/doc/driver-model/usb-info.rst +++ b/doc/driver-model/usb-info.rst @@ -43,8 +43,8 @@ as drivers in the USB uclass. For example: .probe = tegra_ehci_usb_probe, .remove = tegra_ehci_usb_remove, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct fdt_usb), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct fdt_usb), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

@@ -58,7 +58,7 @@ The ops here are ehci_usb_ops. All EHCI drivers will use these same ops in most cases, since they are all EHCI-compatible. For EHCI there are also some special operations that can be overridden when calling ehci_register().

-The driver can use priv_auto_alloc_size to set the size of its private data. +The driver can use priv_auto to set the size of its private data. This can hold run-time information needed by the driver for operation. It exists when the device is probed (not when it is bound) and is removed when the driver is removed. diff --git a/doc/imx/clk/ccf.txt b/doc/imx/clk/ccf.txt index e40ac360e86..f47ca8832de 100644 --- a/doc/imx/clk/ccf.txt +++ b/doc/imx/clk/ccf.txt @@ -37,7 +37,7 @@ Design decisions: modify clk-uclass.c file and add there struct uc_clk_priv, which would have clock related members (like pointer to clk). As of this writing there is no such need, so to avoid extra allocations (as it can be auto allocated by - setting .per_device_auto_alloc_size = sizeof(struct uc_clk_priv)) the + setting .per_device_auto = sizeof(struct uc_clk_priv)) the uclass_priv stores the pointer to struct clk.

* Non-CCF clocks do not have a pointer to a clock in clk->dev->priv. In the case diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index d4356672581..7d0c8579478 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -437,5 +437,5 @@ UCLASS_DRIVER(adc) = { .id = UCLASS_ADC, .name = "adc", .pre_probe = adc_pre_probe, - .per_device_platdata_auto_alloc_size = ADC_UCLASS_PLATDATA_SIZE, + .per_device_platdata_auto = ADC_UCLASS_PLATDATA_SIZE, }; diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c index b459b570507..6bdc45a5fc0 100644 --- a/drivers/adc/exynos-adc.c +++ b/drivers/adc/exynos-adc.c @@ -140,5 +140,5 @@ U_BOOT_DRIVER(exynos_adc) = { .ops = &exynos_adc_ops, .probe = exynos_adc_probe, .ofdata_to_platdata = exynos_adc_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct exynos_adc_priv), + .priv_auto = sizeof(struct exynos_adc_priv), }; diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c index 72b0cc4e5bd..469ab1f178d 100644 --- a/drivers/adc/meson-saradc.c +++ b/drivers/adc/meson-saradc.c @@ -721,5 +721,5 @@ U_BOOT_DRIVER(meson_saradc) = { .ops = &meson_saradc_ops, .probe = meson_saradc_probe, .ofdata_to_platdata = meson_saradc_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct meson_saradc_priv), + .priv_auto = sizeof(struct meson_saradc_priv), }; diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index 561740f63b5..1e127209746 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -180,5 +180,5 @@ U_BOOT_DRIVER(rockchip_saradc) = { .ops = &rockchip_saradc_ops, .probe = rockchip_saradc_probe, .ofdata_to_platdata = rockchip_saradc_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct rockchip_saradc_priv), + .priv_auto = sizeof(struct rockchip_saradc_priv), }; diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c index 1f32289f603..14f2c2a7ed0 100644 --- a/drivers/adc/sandbox.c +++ b/drivers/adc/sandbox.c @@ -169,5 +169,5 @@ U_BOOT_DRIVER(sandbox_adc) = { .ops = &sandbox_adc_ops, .probe = sandbox_adc_probe, .ofdata_to_platdata = sandbox_adc_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct sandbox_adc_priv), + .priv_auto = sizeof(struct sandbox_adc_priv), }; diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c index f20c46fb36c..6c176961f17 100644 --- a/drivers/adc/stm32-adc-core.c +++ b/drivers/adc/stm32-adc-core.c @@ -209,5 +209,5 @@ U_BOOT_DRIVER(stm32_adc_core) = { .id = UCLASS_SIMPLE_BUS, .of_match = stm32_adc_core_ids, .probe = stm32_adc_core_probe, - .priv_auto_alloc_size = sizeof(struct stm32_adc_common), + .priv_auto = sizeof(struct stm32_adc_common), }; diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c index 3f0ed48846c..2c6984f2aa3 100644 --- a/drivers/adc/stm32-adc.c +++ b/drivers/adc/stm32-adc.c @@ -258,5 +258,5 @@ U_BOOT_DRIVER(stm32_adc) = { .of_match = stm32_adc_ids, .probe = stm32_adc_probe, .ops = &stm32_adc_ops, - .priv_auto_alloc_size = sizeof(struct stm32_adc), + .priv_auto = sizeof(struct stm32_adc), }; diff --git a/drivers/ata/ahci-uclass.c b/drivers/ata/ahci-uclass.c index 42bbff962bc..c4c7a03fe74 100644 --- a/drivers/ata/ahci-uclass.c +++ b/drivers/ata/ahci-uclass.c @@ -11,5 +11,5 @@ UCLASS_DRIVER(ahci) = { .id = UCLASS_AHCI, .name = "ahci", - .per_device_auto_alloc_size = sizeof(struct ahci_uc_priv), + .per_device_auto = sizeof(struct ahci_uc_priv), }; diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c index ed0527c9768..a865bcbcf9e 100644 --- a/drivers/ata/dwc_ahci.c +++ b/drivers/ata/dwc_ahci.c @@ -95,5 +95,5 @@ U_BOOT_DRIVER(dwc_ahci) = { .ofdata_to_platdata = dwc_ahci_ofdata_to_platdata, .ops = &scsi_ops, .probe = dwc_ahci_probe, - .priv_auto_alloc_size = sizeof(struct dwc_ahci_priv), + .priv_auto = sizeof(struct dwc_ahci_priv), }; diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c index 8c6726a6214..8e4f382fd18 100644 --- a/drivers/ata/fsl_sata.c +++ b/drivers/ata/fsl_sata.c @@ -900,7 +900,7 @@ U_BOOT_DRIVER(sata_fsl_driver) = { .name = "sata_fsl_blk", .id = UCLASS_BLK, .ops = &sata_fsl_blk_ops, - .platdata_auto_alloc_size = sizeof(struct fsl_ata_priv), + .platdata_auto = sizeof(struct fsl_ata_priv), };

static int fsl_ata_ofdata_to_platdata(struct udevice *dev) @@ -1029,6 +1029,6 @@ U_BOOT_DRIVER(fsl_ahci) = { .ofdata_to_platdata = fsl_ata_ofdata_to_platdata, .probe = fsl_ata_probe, .remove = fsl_ata_remove, - .priv_auto_alloc_size = sizeof(struct fsl_ata_priv), + .priv_auto = sizeof(struct fsl_ata_priv), }; #endif diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c index 4ad260a5bb9..ac7fa493b2f 100644 --- a/drivers/ata/mtk_ahci.c +++ b/drivers/ata/mtk_ahci.c @@ -124,5 +124,5 @@ U_BOOT_DRIVER(mtk_ahci) = { .ofdata_to_platdata = mtk_ahci_ofdata_to_platdata, .ops = &scsi_ops, .probe = mtk_ahci_probe, - .priv_auto_alloc_size = sizeof(struct mtk_ahci_priv), + .priv_auto = sizeof(struct mtk_ahci_priv), }; diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index 77508aa5bc7..9a77725ae61 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -233,7 +233,7 @@ U_BOOT_DRIVER(ceva_host_blk) = { .of_match = sata_ceva_ids, .bind = sata_ceva_bind, .ops = &scsi_ops, - .priv_auto_alloc_size = sizeof(struct ceva_sata_priv), + .priv_auto = sizeof(struct ceva_sata_priv), .probe = sata_ceva_probe, .ofdata_to_platdata = sata_ceva_ofdata_to_platdata, }; diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index b2b5c699ad1..b49bd5c5450 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -1030,7 +1030,7 @@ U_BOOT_DRIVER(sata_mv_driver) = { .name = "sata_mv_blk", .id = UCLASS_BLK, .ops = &sata_mv_blk_ops, - .platdata_auto_alloc_size = sizeof(struct mv_priv), + .platdata_auto = sizeof(struct mv_priv), };

static int sata_mv_probe(struct udevice *dev) diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index d5ba94c1725..4d83f756b2b 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -772,7 +772,7 @@ U_BOOT_DRIVER(sata_sil_driver) = { .name = "sata_sil_blk", .id = UCLASS_BLK, .ops = &sata_sil_blk_ops, - .platdata_auto_alloc_size = sizeof(struct sil_sata_priv), + .platdata_auto = sizeof(struct sil_sata_priv), };

static int sil_unbind_device(struct udevice *dev) @@ -920,7 +920,7 @@ U_BOOT_DRIVER(sil_ahci_pci) = { .ops = &sata_sil_ops, .probe = sil_pci_probe, .remove = sil_pci_remove, - .priv_auto_alloc_size = sizeof(struct sil_sata_priv), + .priv_auto = sizeof(struct sil_sata_priv), };

U_BOOT_PCI_DEVICE(sil_ahci_pci, supported); diff --git a/drivers/axi/ihs_axi.c b/drivers/axi/ihs_axi.c index 39455110907..a7e9761fbfc 100644 --- a/drivers/axi/ihs_axi.c +++ b/drivers/axi/ihs_axi.c @@ -291,6 +291,6 @@ U_BOOT_DRIVER(ihs_axi_bus) = { .id = UCLASS_AXI, .of_match = ihs_axi_ids, .ops = &ihs_axi_ops, - .priv_auto_alloc_size = sizeof(struct ihs_axi_priv), + .priv_auto = sizeof(struct ihs_axi_priv), .probe = ihs_axi_probe, }; diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c index 42bcae6af26..ef349a50b79 100644 --- a/drivers/axi/sandbox_store.c +++ b/drivers/axi/sandbox_store.c @@ -119,7 +119,7 @@ U_BOOT_DRIVER(sandbox_axi_store) = { .id = UCLASS_AXI_EMUL, .of_match = sandbox_store_ids, .ops = &sandbox_store_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_store_priv), + .priv_auto = sizeof(struct sandbox_store_priv), .probe = sandbox_store_probe, .remove = sandbox_store_remove, }; diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index 2fb9f6b765e..714e5d769c3 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -660,5 +660,5 @@ UCLASS_DRIVER(blk) = { .id = UCLASS_BLK, .name = "blk", .post_probe = blk_post_probe, - .per_device_platdata_auto_alloc_size = sizeof(struct blk_desc), + .per_device_platdata_auto = sizeof(struct blk_desc), }; diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c index cca2237136a..e5ef260cf2b 100644 --- a/drivers/block/sandbox.c +++ b/drivers/block/sandbox.c @@ -228,7 +228,7 @@ U_BOOT_DRIVER(sandbox_host_blk) = { .name = "sandbox_host_blk", .id = UCLASS_BLK, .ops = &sandbox_host_blk_ops, - .platdata_auto_alloc_size = sizeof(struct host_block_dev), + .platdata_auto = sizeof(struct host_block_dev), }; #else U_BOOT_LEGACY_BLK(sandbox_host) = { diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index e8db8542f93..343b8a34414 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -136,7 +136,7 @@ static const struct udevice_id bootcount_mem_ids[] = { U_BOOT_DRIVER(bootcount_mem) = { .name = "bootcount-mem", .id = UCLASS_BOOTCOUNT, - .priv_auto_alloc_size = sizeof(struct bootcount_mem_priv), + .priv_auto = sizeof(struct bootcount_mem_priv), .probe = bootcount_mem_probe, .of_match = bootcount_mem_ids, .ops = &bootcount_mem_ops, diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c index a3aa0cf5595..709be094b11 100644 --- a/drivers/bootcount/i2c-eeprom.c +++ b/drivers/bootcount/i2c-eeprom.c @@ -89,7 +89,7 @@ static const struct udevice_id bootcount_i2c_eeprom_ids[] = { U_BOOT_DRIVER(bootcount_spi_flash) = { .name = "bootcount-i2c-eeprom", .id = UCLASS_BOOTCOUNT, - .priv_auto_alloc_size = sizeof(struct bootcount_i2c_eeprom_priv), + .priv_auto = sizeof(struct bootcount_i2c_eeprom_priv), .probe = bootcount_i2c_eeprom_probe, .of_match = bootcount_i2c_eeprom_ids, .ops = &bootcount_i2c_eeprom_ops, diff --git a/drivers/bootcount/rtc.c b/drivers/bootcount/rtc.c index 076a8bb2be8..483caaa80df 100644 --- a/drivers/bootcount/rtc.c +++ b/drivers/bootcount/rtc.c @@ -83,7 +83,7 @@ static const struct udevice_id bootcount_rtc_ids[] = { U_BOOT_DRIVER(bootcount_rtc) = { .name = "bootcount-rtc", .id = UCLASS_BOOTCOUNT, - .priv_auto_alloc_size = sizeof(struct bootcount_rtc_priv), + .priv_auto = sizeof(struct bootcount_rtc_priv), .probe = bootcount_rtc_probe, .of_match = bootcount_rtc_ids, .ops = &bootcount_rtc_ops, diff --git a/drivers/bootcount/spi-flash.c b/drivers/bootcount/spi-flash.c index 7cd388e6616..03050e66613 100644 --- a/drivers/bootcount/spi-flash.c +++ b/drivers/bootcount/spi-flash.c @@ -118,7 +118,7 @@ static const struct udevice_id bootcount_spi_flash_ids[] = { U_BOOT_DRIVER(bootcount_spi_flash) = { .name = "bootcount-spi-flash", .id = UCLASS_BOOTCOUNT, - .priv_auto_alloc_size = sizeof(struct bootcount_spi_flash_priv), + .priv_auto = sizeof(struct bootcount_spi_flash_priv), .probe = bootcount_spi_flash_probe, .of_match = bootcount_spi_flash_ids, .ops = &bootcount_spi_flash_ops, diff --git a/drivers/button/button-gpio.c b/drivers/button/button-gpio.c index 985ae7f5a76..756cd6972b2 100644 --- a/drivers/button/button-gpio.c +++ b/drivers/button/button-gpio.c @@ -105,7 +105,7 @@ U_BOOT_DRIVER(button_gpio) = { .id = UCLASS_BUTTON, .of_match = button_gpio_ids, .ops = &button_gpio_ops, - .priv_auto_alloc_size = sizeof(struct button_gpio_priv), + .priv_auto = sizeof(struct button_gpio_priv), .bind = button_gpio_bind, .probe = button_gpio_probe, .remove = button_gpio_remove, diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c index 1c742c265cf..133f4dead1a 100644 --- a/drivers/button/button-uclass.c +++ b/drivers/button/button-uclass.c @@ -39,5 +39,5 @@ enum button_state_t button_get_state(struct udevice *dev) UCLASS_DRIVER(button) = { .id = UCLASS_BUTTON, .name = "button", - .per_device_platdata_auto_alloc_size = sizeof(struct button_uc_plat), + .per_device_platdata_auto = sizeof(struct button_uc_plat), }; diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c index 51c074bfe23..3d33a51e2e1 100644 --- a/drivers/cache/cache-v5l2.c +++ b/drivers/cache/cache-v5l2.c @@ -182,7 +182,7 @@ U_BOOT_DRIVER(v5l2_cache) = { .of_match = v5l2_cache_ids, .ofdata_to_platdata = v5l2_ofdata_to_platdata, .probe = v5l2_probe, - .platdata_auto_alloc_size = sizeof(struct v5l2_plat), + .platdata_auto = sizeof(struct v5l2_plat), .ops = &v5l2_cache_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c index a539889d5be..8a71e2f8a1d 100644 --- a/drivers/clk/altera/clk-agilex.c +++ b/drivers/clk/altera/clk-agilex.c @@ -658,5 +658,5 @@ U_BOOT_DRIVER(socfpga_agilex_clk) = { .ops = &socfpga_clk_ops, .probe = socfpga_clk_probe, .ofdata_to_platdata = socfpga_clk_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct socfpga_clk_platdata), + .platdata_auto = sizeof(struct socfpga_clk_platdata), }; diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index 732ed4d79b9..1d853cd3003 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -359,5 +359,5 @@ U_BOOT_DRIVER(socfpga_a10_clk) = { .probe = socfpga_a10_clk_probe, .ofdata_to_platdata = socfpga_a10_ofdata_to_platdata,

- .platdata_auto_alloc_size = sizeof(struct socfpga_a10_clk_platdata), + .platdata_auto = sizeof(struct socfpga_a10_clk_platdata), }; diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c index aab7d14deb7..e2e8d49b655 100644 --- a/drivers/clk/aspeed/clk_ast2500.c +++ b/drivers/clk/aspeed/clk_ast2500.c @@ -523,7 +523,7 @@ U_BOOT_DRIVER(aspeed_ast2500_scu) = { .name = "aspeed_ast2500_scu", .id = UCLASS_CLK, .of_match = ast2500_clk_ids, - .priv_auto_alloc_size = sizeof(struct ast2500_clk_priv), + .priv_auto = sizeof(struct ast2500_clk_priv), .ops = &ast2500_clk_ops, .bind = ast2500_clk_bind, .ofdata_to_platdata = ast2500_clk_ofdata_to_platdata, diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index afd67b290d8..1b437117668 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -225,7 +225,7 @@ U_BOOT_DRIVER(at91sam9x5_main_osc_clk) = { .id = UCLASS_CLK, .of_match = main_osc_clk_match, .probe = main_osc_clk_probe, - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &main_osc_clk_ops, };

@@ -266,7 +266,7 @@ U_BOOT_DRIVER(at91_plla_clk) = { .id = UCLASS_CLK, .of_match = plla_clk_match, .probe = plla_clk_probe, - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &plla_clk_ops, };

@@ -340,7 +340,7 @@ U_BOOT_DRIVER(at91_plladiv_clk) = { .id = UCLASS_CLK, .of_match = at91_plladiv_clk_match, .probe = at91_plladiv_clk_probe, - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &at91_plladiv_clk_ops, };

@@ -437,7 +437,7 @@ U_BOOT_DRIVER(system_clk) = { .name = "system-clk", .id = UCLASS_CLK, .probe = at91_clk_probe, - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &system_clk_ops, };

@@ -536,7 +536,7 @@ static struct clk_ops periph_clk_ops = { U_BOOT_DRIVER(clk_periph) = { .name = "periph-clk", .id = UCLASS_CLK, - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .platdata_auto = sizeof(struct pmc_platdata), .probe = at91_clk_probe, .ops = &periph_clk_ops, }; @@ -668,7 +668,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = { .of_match = utmi_clk_match, .probe = utmi_clk_probe, .ofdata_to_platdata = utmi_clk_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &utmi_clk_ops, };

@@ -713,7 +713,7 @@ U_BOOT_DRIVER(sama5d4_h32mx_clk) = { .id = UCLASS_CLK, .of_match = sama5d4_h32mx_clk_match, .probe = sama5d4_h32mx_clk_probe, - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &sama5d4_h32mx_clk_ops, };

@@ -876,8 +876,8 @@ U_BOOT_DRIVER(generic_clk) = { .id = UCLASS_CLK, .probe = at91_clk_probe, .ofdata_to_platdata = generic_clk_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct generic_clk_priv), - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .priv_auto = sizeof(struct generic_clk_priv), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &generic_clk_ops, };

@@ -1012,8 +1012,8 @@ U_BOOT_DRIVER(at91_usb_clk) = { .of_match = at91_usb_clk_match, .probe = at91_usb_clk_probe, .ofdata_to_platdata = at91_usb_clk_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct at91_usb_clk_priv), - .platdata_auto_alloc_size = sizeof(struct pmc_platdata), + .priv_auto = sizeof(struct at91_usb_clk_priv), + .platdata_auto = sizeof(struct pmc_platdata), .ops = &at91_usb_clk_ops, };

diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c index dd62dc5510e..34ce611a98c 100644 --- a/drivers/clk/at91/sckc.c +++ b/drivers/clk/at91/sckc.c @@ -165,7 +165,7 @@ U_BOOT_DRIVER(at91_sckc) = { .name = UBOOT_DM_CLK_AT91_SCKC, .id = UCLASS_CLK, .of_match = sam9x60_sckc_ids, - .priv_auto_alloc_size = sizeof(struct sam9x60_sckc) * 2, + .priv_auto = sizeof(struct sam9x60_sckc) * 2, .ops = &sam9x60_sckc_ops, .probe = at91_sam9x60_sckc_probe, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c index fd47872ab99..6634b7b7995 100644 --- a/drivers/clk/clk-cdce9xx.c +++ b/drivers/clk/clk-cdce9xx.c @@ -251,6 +251,6 @@ U_BOOT_DRIVER(cdce9xx_clk) = { .id = UCLASS_CLK, .of_match = cdce9xx_clk_of_match, .probe = cdce9xx_clk_probe, - .priv_auto_alloc_size = sizeof(struct cdce9xx_clk_data), + .priv_auto = sizeof(struct cdce9xx_clk_data), .ops = &cdce9xx_clk_ops, }; diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c index 3eb93a55fc4..449b430e230 100644 --- a/drivers/clk/clk-hsdk-cgu.c +++ b/drivers/clk/clk-hsdk-cgu.c @@ -774,6 +774,6 @@ U_BOOT_DRIVER(hsdk_cgu_clk) = { .id = UCLASS_CLK, .of_match = hsdk_cgu_clk_id, .probe = hsdk_cgu_clk_probe, - .priv_auto_alloc_size = sizeof(struct hsdk_cgu_clk), + .priv_auto = sizeof(struct hsdk_cgu_clk), .ops = &hsdk_cgu_ops, }; diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c index 7a9a6451374..6f0fdaa111c 100644 --- a/drivers/clk/clk-ti-sci.c +++ b/drivers/clk/clk-ti-sci.c @@ -220,6 +220,6 @@ U_BOOT_DRIVER(ti_sci_clk) = { .id = UCLASS_CLK, .of_match = ti_sci_clk_of_match, .probe = ti_sci_clk_probe, - .priv_auto_alloc_size = sizeof(struct ti_sci_clk_data), + .priv_auto = sizeof(struct ti_sci_clk_data), .ops = &ti_sci_clk_ops, }; diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c index b850b9fc069..8c22ed2f43d 100644 --- a/drivers/clk/clk_bcm6345.c +++ b/drivers/clk/clk_bcm6345.c @@ -70,5 +70,5 @@ U_BOOT_DRIVER(clk_bcm6345) = { .of_match = bcm6345_clk_ids, .ops = &bcm6345_clk_ops, .probe = bcm63xx_clk_probe, - .priv_auto_alloc_size = sizeof(struct bcm6345_clk_priv), + .priv_auto = sizeof(struct bcm6345_clk_priv), }; diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c index 2318dcf6a45..99edaec4b52 100644 --- a/drivers/clk/clk_boston.c +++ b/drivers/clk/clk_boston.c @@ -92,6 +92,6 @@ U_BOOT_DRIVER(clk_boston) = { .id = UCLASS_CLK, .of_match = clk_boston_match, .ofdata_to_platdata = clk_boston_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct clk_boston), + .platdata_auto = sizeof(struct clk_boston), .ops = &clk_boston_ops, }; diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c index cf9c4ae367f..4519e0579b0 100644 --- a/drivers/clk/clk_fixed_factor.c +++ b/drivers/clk/clk_fixed_factor.c @@ -67,6 +67,6 @@ U_BOOT_DRIVER(clk_fixed_factor) = { .id = UCLASS_CLK, .of_match = clk_fixed_factor_match, .ofdata_to_platdata = clk_fixed_factor_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct clk_fixed_factor), + .platdata_auto = sizeof(struct clk_fixed_factor), .ops = &clk_fixed_factor_ops, }; diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c index f86b4a0e924..54e5e09b58c 100644 --- a/drivers/clk/clk_fixed_rate.c +++ b/drivers/clk/clk_fixed_rate.c @@ -51,7 +51,7 @@ U_BOOT_DRIVER(fixed_clock) = { .id = UCLASS_CLK, .of_match = clk_fixed_rate_match, .ofdata_to_platdata = clk_fixed_rate_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct clk_fixed_rate), + .platdata_auto = sizeof(struct clk_fixed_rate), .ops = &clk_fixed_rate_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/clk_octeon.c b/drivers/clk/clk_octeon.c index fd559e05fc7..ce274549da0 100644 --- a/drivers/clk/clk_octeon.c +++ b/drivers/clk/clk_octeon.c @@ -68,5 +68,5 @@ U_BOOT_DRIVER(clk_octeon) = { .of_match = octeon_clk_ids, .ops = &octeon_clk_ops, .probe = octeon_clk_probe, - .priv_auto_alloc_size = sizeof(struct octeon_clk_priv), + .priv_auto = sizeof(struct octeon_clk_priv), }; diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c index dc46de2a7cf..5a10d4640d7 100644 --- a/drivers/clk/clk_pic32.c +++ b/drivers/clk/clk_pic32.c @@ -423,5 +423,5 @@ U_BOOT_DRIVER(pic32_clk) = { .of_match = pic32_clk_ids, .ops = &pic32_pic32_clk_ops, .probe = pic32_clk_probe, - .priv_auto_alloc_size = sizeof(struct pic32_clk_priv), + .priv_auto = sizeof(struct pic32_clk_priv), }; diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c index 0ff1b496338..2c6c0e239f7 100644 --- a/drivers/clk/clk_sandbox.c +++ b/drivers/clk/clk_sandbox.c @@ -130,7 +130,7 @@ U_BOOT_DRIVER(sandbox_clk) = { .of_match = sandbox_clk_ids, .ops = &sandbox_clk_ops, .probe = sandbox_clk_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_clk_priv), + .priv_auto = sizeof(struct sandbox_clk_priv), };

ulong sandbox_clk_query_rate(struct udevice *dev, int id) diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c index 873383856f9..e9eb738684b 100644 --- a/drivers/clk/clk_sandbox_test.c +++ b/drivers/clk/clk_sandbox_test.c @@ -189,5 +189,5 @@ U_BOOT_DRIVER(sandbox_clk_test) = { .id = UCLASS_MISC, .of_match = sandbox_clk_test_ids, .probe = sandbox_clk_test_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_clk_test), + .priv_auto = sizeof(struct sandbox_clk_test), }; diff --git a/drivers/clk/clk_stm32f.c b/drivers/clk/clk_stm32f.c index 93722f74ae4..7e67895ab79 100644 --- a/drivers/clk/clk_stm32f.c +++ b/drivers/clk/clk_stm32f.c @@ -726,6 +726,6 @@ U_BOOT_DRIVER(stm32fx_clk) = { .id = UCLASS_CLK, .ops = &stm32_clk_ops, .probe = stm32_clk_probe, - .priv_auto_alloc_size = sizeof(struct stm32_clk), + .priv_auto = sizeof(struct stm32_clk), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c index 5e6abca56fa..842925f43e2 100644 --- a/drivers/clk/clk_stm32h7.c +++ b/drivers/clk/clk_stm32h7.c @@ -868,6 +868,6 @@ U_BOOT_DRIVER(stm32h7_clk) = { .id = UCLASS_CLK, .ops = &stm32_clk_ops, .probe = stm32_clk_probe, - .priv_auto_alloc_size = sizeof(struct stm32_clk), + .priv_auto = sizeof(struct stm32_clk), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c index c8840b9e5f1..72cbcdf6a21 100644 --- a/drivers/clk/clk_stm32mp1.c +++ b/drivers/clk/clk_stm32mp1.c @@ -2332,6 +2332,6 @@ U_BOOT_DRIVER(stm32mp1_clock) = { .name = "stm32mp1_clk", .id = UCLASS_CLK, .ops = &stm32mp1_clk_ops, - .priv_auto_alloc_size = sizeof(struct stm32mp1_clk_priv), + .priv_auto = sizeof(struct stm32mp1_clk_priv), .probe = stm32mp1_clk_probe, }; diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c index d93b860aed3..908bc7519c4 100644 --- a/drivers/clk/clk_versal.c +++ b/drivers/clk/clk_versal.c @@ -734,5 +734,5 @@ U_BOOT_DRIVER(versal_clk) = { .of_match = versal_clk_ids, .probe = versal_clk_probe, .ops = &versal_clk_ops, - .priv_auto_alloc_size = sizeof(struct versal_clk_priv), + .priv_auto = sizeof(struct versal_clk_priv), }; diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c index b48319bba67..3b1e0208d47 100644 --- a/drivers/clk/clk_vexpress_osc.c +++ b/drivers/clk/clk_vexpress_osc.c @@ -107,6 +107,6 @@ U_BOOT_DRIVER(vexpress_osc_clk) = { .id = UCLASS_CLK, .of_match = vexpress_osc_clk_ids, .ops = &vexpress_osc_clk_ops, - .priv_auto_alloc_size = sizeof(struct vexpress_osc_clk_priv), + .priv_auto = sizeof(struct vexpress_osc_clk_priv), .probe = vexpress_osc_clk_probe, }; diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c index a699a3664c3..bf32d8317ab 100644 --- a/drivers/clk/clk_zynq.c +++ b/drivers/clk/clk_zynq.c @@ -485,6 +485,6 @@ U_BOOT_DRIVER(zynq_clk) = { .id = UCLASS_CLK, .of_match = zynq_clk_ids, .ops = &zynq_clk_ops, - .priv_auto_alloc_size = sizeof(struct zynq_clk_priv), + .priv_auto = sizeof(struct zynq_clk_priv), .probe = zynq_clk_probe, }; diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c index 77951197566..a9988d8f1a8 100644 --- a/drivers/clk/clk_zynqmp.c +++ b/drivers/clk/clk_zynqmp.c @@ -715,5 +715,5 @@ U_BOOT_DRIVER(zynqmp_clk) = { .of_match = zynqmp_clk_ids, .probe = zynqmp_clk_probe, .ops = &zynqmp_clk_ops, - .priv_auto_alloc_size = sizeof(struct zynqmp_clk_priv), + .priv_auto = sizeof(struct zynqmp_clk_priv), }; diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c index 4a023ea736b..7d869eb02b8 100644 --- a/drivers/clk/exynos/clk-exynos7420.c +++ b/drivers/clk/exynos/clk-exynos7420.c @@ -199,7 +199,7 @@ U_BOOT_DRIVER(exynos7420_clk_topc) = { .id = UCLASS_CLK, .of_match = exynos7420_clk_topc_compat, .probe = exynos7420_clk_topc_probe, - .priv_auto_alloc_size = sizeof(struct exynos7420_clk_topc_priv), + .priv_auto = sizeof(struct exynos7420_clk_topc_priv), .ops = &exynos7420_clk_topc_ops, };

@@ -213,7 +213,7 @@ U_BOOT_DRIVER(exynos7420_clk_top0) = { .id = UCLASS_CLK, .of_match = exynos7420_clk_top0_compat, .probe = exynos7420_clk_top0_probe, - .priv_auto_alloc_size = sizeof(struct exynos7420_clk_top0_priv), + .priv_auto = sizeof(struct exynos7420_clk_top0_priv), .ops = &exynos7420_clk_top0_ops, };

diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c index 76b27ad7fd0..6bc1b8ba9d3 100644 --- a/drivers/clk/ics8n3qv01.c +++ b/drivers/clk/ics8n3qv01.c @@ -226,5 +226,5 @@ U_BOOT_DRIVER(ics8n3qv01) = { .ops = &ics8n3qv01_ops, .of_match = ics8n3qv01_ids, .probe = ics8n3qv01_probe, - .priv_auto_alloc_size = sizeof(struct ics8n3qv01_priv), + .priv_auto = sizeof(struct ics8n3qv01_priv), }; diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c index 02461491078..259ea335959 100644 --- a/drivers/clk/mediatek/clk-mt7622.c +++ b/drivers/clk/mediatek/clk-mt7622.c @@ -716,7 +716,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { .id = UCLASS_CLK, .of_match = mt7622_apmixed_compat, .probe = mt7622_apmixedsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_apmixedsys_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -726,7 +726,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .id = UCLASS_CLK, .of_match = mt7622_topckgen_compat, .probe = mt7622_topckgen_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_topckgen_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -736,7 +736,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = { .id = UCLASS_CLK, .of_match = mt7622_infracfg_compat, .probe = mt7622_infracfg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -746,7 +746,7 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = { .id = UCLASS_CLK, .of_match = mt7622_pericfg_compat, .probe = mt7622_pericfg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -757,7 +757,7 @@ U_BOOT_DRIVER(mtk_clk_pciesys) = { .of_match = mt7622_pciesys_compat, .probe = mt7622_pciesys_probe, .bind = mt7622_pciesys_bind, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, };

@@ -767,7 +767,7 @@ U_BOOT_DRIVER(mtk_clk_ethsys) = { .of_match = mt7622_ethsys_compat, .probe = mt7622_ethsys_probe, .bind = mt7622_ethsys_bind, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, };

@@ -776,7 +776,7 @@ U_BOOT_DRIVER(mtk_clk_sgmiisys) = { .id = UCLASS_CLK, .of_match = mt7622_sgmiisys_compat, .probe = mt7622_sgmiisys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, };

@@ -785,6 +785,6 @@ U_BOOT_DRIVER(mtk_clk_ssusbsys) = { .id = UCLASS_CLK, .of_match = mt7622_ssusbsys_compat, .probe = mt7622_ssusbsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, }; diff --git a/drivers/clk/mediatek/clk-mt7623.c b/drivers/clk/mediatek/clk-mt7623.c index a15fb45e8e7..0c7411ee814 100644 --- a/drivers/clk/mediatek/clk-mt7623.c +++ b/drivers/clk/mediatek/clk-mt7623.c @@ -859,7 +859,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { .id = UCLASS_CLK, .of_match = mt7623_apmixed_compat, .probe = mt7623_apmixedsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_apmixedsys_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -869,7 +869,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .id = UCLASS_CLK, .of_match = mt7623_topckgen_compat, .probe = mt7623_topckgen_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_topckgen_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -879,7 +879,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = { .id = UCLASS_CLK, .of_match = mt7623_infracfg_compat, .probe = mt7623_infracfg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -889,7 +889,7 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = { .id = UCLASS_CLK, .of_match = mt7623_pericfg_compat, .probe = mt7623_pericfg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -900,7 +900,7 @@ U_BOOT_DRIVER(mtk_clk_hifsys) = { .of_match = mt7623_hifsys_compat, .probe = mt7623_hifsys_probe, .bind = mt7623_ethsys_hifsys_bind, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, };

@@ -910,6 +910,6 @@ U_BOOT_DRIVER(mtk_clk_ethsys) = { .of_match = mt7623_ethsys_compat, .probe = mt7623_ethsys_probe, .bind = mt7623_ethsys_hifsys_bind, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, }; diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c index 5b2aa5f200a..31b6fa02251 100644 --- a/drivers/clk/mediatek/clk-mt7629.c +++ b/drivers/clk/mediatek/clk-mt7629.c @@ -704,7 +704,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { .id = UCLASS_CLK, .of_match = mt7629_apmixed_compat, .probe = mt7629_apmixedsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_apmixedsys_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -714,7 +714,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .id = UCLASS_CLK, .of_match = mt7629_topckgen_compat, .probe = mt7629_topckgen_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_topckgen_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -724,7 +724,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = { .id = UCLASS_CLK, .of_match = mt7629_infracfg_compat, .probe = mt7629_infracfg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -734,7 +734,7 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = { .id = UCLASS_CLK, .of_match = mt7629_pericfg_compat, .probe = mt7629_pericfg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -745,7 +745,7 @@ U_BOOT_DRIVER(mtk_clk_ethsys) = { .of_match = mt7629_ethsys_compat, .probe = mt7629_ethsys_probe, .bind = mt7629_ethsys_bind, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, };

@@ -754,7 +754,7 @@ U_BOOT_DRIVER(mtk_clk_sgmiisys) = { .id = UCLASS_CLK, .of_match = mt7629_sgmiisys_compat, .probe = mt7629_sgmiisys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, };

@@ -763,6 +763,6 @@ U_BOOT_DRIVER(mtk_clk_ssusbsys) = { .id = UCLASS_CLK, .of_match = mt7629_ssusbsys_compat, .probe = mt7629_ssusbsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, }; diff --git a/drivers/clk/mediatek/clk-mt8512.c b/drivers/clk/mediatek/clk-mt8512.c index ad254d1cce5..193e069cb05 100644 --- a/drivers/clk/mediatek/clk-mt8512.c +++ b/drivers/clk/mediatek/clk-mt8512.c @@ -838,7 +838,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { .id = UCLASS_CLK, .of_match = mt8512_apmixed_compat, .probe = mt8512_apmixedsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_apmixedsys_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -848,7 +848,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .id = UCLASS_CLK, .of_match = mt8512_topckgen_compat, .probe = mt8512_topckgen_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_topckgen_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -858,7 +858,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen_cg) = { .id = UCLASS_CLK, .of_match = mt8512_topckgen_cg_compat, .probe = mt8512_topckgen_cg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -868,7 +868,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = { .id = UCLASS_CLK, .of_match = mt8512_infracfg_compat, .probe = mt8512_infracfg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/mediatek/clk-mt8516.c b/drivers/clk/mediatek/clk-mt8516.c index cd1db257836..29f70620e09 100644 --- a/drivers/clk/mediatek/clk-mt8516.c +++ b/drivers/clk/mediatek/clk-mt8516.c @@ -777,7 +777,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { .id = UCLASS_CLK, .of_match = mt8516_apmixed_compat, .probe = mt8516_apmixedsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_apmixedsys_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -787,7 +787,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .id = UCLASS_CLK, .of_match = mt8516_topckgen_compat, .probe = mt8516_topckgen_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_topckgen_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -797,7 +797,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen_cg) = { .id = UCLASS_CLK, .of_match = mt8516_topckgen_cg_compat, .probe = mt8516_topckgen_cg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/mediatek/clk-mt8518.c b/drivers/clk/mediatek/clk-mt8518.c index 985a0c1de5e..23865148372 100644 --- a/drivers/clk/mediatek/clk-mt8518.c +++ b/drivers/clk/mediatek/clk-mt8518.c @@ -1533,7 +1533,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { .id = UCLASS_CLK, .of_match = mt8518_apmixed_compat, .probe = mt8518_apmixedsys_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_apmixedsys_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -1543,7 +1543,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .id = UCLASS_CLK, .of_match = mt8518_topckgen_compat, .probe = mt8518_topckgen_probe, - .priv_auto_alloc_size = sizeof(struct mtk_clk_priv), + .priv_auto = sizeof(struct mtk_clk_priv), .ops = &mtk_clk_topckgen_ops, .flags = DM_FLAG_PRE_RELOC, }; @@ -1553,7 +1553,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen_cg) = { .id = UCLASS_CLK, .of_match = mt8518_topckgen_cg_compat, .probe = mt8518_topckgen_cg_probe, - .priv_auto_alloc_size = sizeof(struct mtk_cg_priv), + .priv_auto = sizeof(struct mtk_cg_priv), .ops = &mtk_clk_gate_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 6ef8b418d78..82068578ffb 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -320,7 +320,7 @@ U_BOOT_DRIVER(meson_clk_axg) = { .name = "meson_clk_axg", .id = UCLASS_CLK, .of_match = meson_clk_ids, - .priv_auto_alloc_size = sizeof(struct meson_clk), + .priv_auto = sizeof(struct meson_clk), .ops = &meson_clk_ops, .probe = meson_clk_probe, }; diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index bf2f357435a..01b22abc34d 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -1014,7 +1014,7 @@ U_BOOT_DRIVER(meson_clk_g12a) = { .name = "meson_clk_g12a", .id = UCLASS_CLK, .of_match = meson_clk_ids, - .priv_auto_alloc_size = sizeof(struct meson_clk), + .priv_auto = sizeof(struct meson_clk), .ops = &meson_clk_ops, .probe = meson_clk_probe, }; diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index b9353c053eb..2a20541dcb4 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -919,7 +919,7 @@ U_BOOT_DRIVER(meson_clk) = { .name = "meson_clk", .id = UCLASS_CLK, .of_match = meson_clk_ids, - .priv_auto_alloc_size = sizeof(struct meson_clk), + .priv_auto = sizeof(struct meson_clk), .ops = &meson_clk_ops, .probe = meson_clk_probe, }; diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c index 8d96ec767ac..c5ced1f132c 100644 --- a/drivers/clk/mpc83xx_clk.c +++ b/drivers/clk/mpc83xx_clk.c @@ -389,7 +389,7 @@ U_BOOT_DRIVER(mpc83xx_clk) = { .of_match = mpc83xx_clk_match, .ops = &mpc83xx_clk_ops, .probe = mpc83xx_clk_probe, - .priv_auto_alloc_size = sizeof(struct mpc83xx_clk_priv), + .priv_auto = sizeof(struct mpc83xx_clk_priv), .bind = mpc83xx_clk_bind, };

diff --git a/drivers/clk/mtmips/clk-mt7628.c b/drivers/clk/mtmips/clk-mt7628.c index 35780de8c49..4d3ac847d1d 100644 --- a/drivers/clk/mtmips/clk-mt7628.c +++ b/drivers/clk/mtmips/clk-mt7628.c @@ -153,6 +153,6 @@ U_BOOT_DRIVER(mt7628_clk) = { .id = UCLASS_CLK, .of_match = mt7628_clk_ids, .probe = mt7628_clk_probe, - .priv_auto_alloc_size = sizeof(struct mt7628_clk_priv), + .priv_auto = sizeof(struct mt7628_clk_priv), .ops = &mt7628_clk_ops, }; diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c index 223da22c1b6..0132fcb7e61 100644 --- a/drivers/clk/mvebu/armada-37xx-periph.c +++ b/drivers/clk/mvebu/armada-37xx-periph.c @@ -624,6 +624,6 @@ U_BOOT_DRIVER(armada_37xx_periph_clk) = { .id = UCLASS_CLK, .of_match = armada_37xx_periph_clk_ids, .ops = &armada_37xx_periph_clk_ops, - .priv_auto_alloc_size = sizeof(struct a37xx_periphclk), + .priv_auto = sizeof(struct a37xx_periphclk), .probe = armada_37xx_periph_clk_probe, }; diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c index 233926e9b6a..b1c0852e89b 100644 --- a/drivers/clk/mvebu/armada-37xx-tbg.c +++ b/drivers/clk/mvebu/armada-37xx-tbg.c @@ -150,6 +150,6 @@ U_BOOT_DRIVER(armada_37xx_tbg_clk) = { .id = UCLASS_CLK, .of_match = armada_37xx_tbg_clk_ids, .ops = &armada_37xx_tbg_clk_ops, - .priv_auto_alloc_size = sizeof(struct a37xx_tbgclk), + .priv_auto = sizeof(struct a37xx_tbgclk), .probe = armada_37xx_tbg_clk_probe, }; diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c index 1999c87a336..96ab7fed1f3 100644 --- a/drivers/clk/owl/clk_owl.c +++ b/drivers/clk/owl/clk_owl.c @@ -161,6 +161,6 @@ U_BOOT_DRIVER(clk_owl) = { .id = UCLASS_CLK, .of_match = owl_clk_ids, .ops = &owl_clk_ops, - .priv_auto_alloc_size = sizeof(struct owl_clk_priv), + .priv_auto = sizeof(struct owl_clk_priv), .probe = owl_clk_probe, }; diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c index 6997054b304..1c54eca6c0f 100644 --- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c @@ -336,7 +336,7 @@ U_BOOT_DRIVER(clk_r8a774a1) = { .name = "clk_r8a774a1", .id = UCLASS_CLK, .of_match = r8a774a1_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a774b1-cpg-mssr.c b/drivers/clk/renesas/r8a774b1-cpg-mssr.c index 7b6947b5b90..03851d0b5a3 100644 --- a/drivers/clk/renesas/r8a774b1-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774b1-cpg-mssr.c @@ -329,7 +329,7 @@ U_BOOT_DRIVER(clk_r8a774b1) = { .name = "clk_r8a774b1", .id = UCLASS_CLK, .of_match = r8a774b1_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a774c0-cpg-mssr.c b/drivers/clk/renesas/r8a774c0-cpg-mssr.c index c9f0f7221d7..37a7123f73d 100644 --- a/drivers/clk/renesas/r8a774c0-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774c0-cpg-mssr.c @@ -301,7 +301,7 @@ U_BOOT_DRIVER(clk_r8a774c0) = { .name = "clk_r8a774c0", .id = UCLASS_CLK, .of_match = r8a774c0_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a774e1-cpg-mssr.c b/drivers/clk/renesas/r8a774e1-cpg-mssr.c index 6cce007aa13..c969ec68883 100644 --- a/drivers/clk/renesas/r8a774e1-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774e1-cpg-mssr.c @@ -351,7 +351,7 @@ U_BOOT_DRIVER(clk_r8a774e1) = { .name = "clk_r8a774e1", .id = UCLASS_CLK, .of_match = r8a774e1_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a7790-cpg-mssr.c b/drivers/clk/renesas/r8a7790-cpg-mssr.c index 7451f53ba39..09e7dbd3a36 100644 --- a/drivers/clk/renesas/r8a7790-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7790-cpg-mssr.c @@ -283,7 +283,7 @@ U_BOOT_DRIVER(clk_r8a7790) = { .name = "clk_r8a7790", .id = UCLASS_CLK, .of_match = r8a7790_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen2_clk_priv), + .priv_auto = sizeof(struct gen2_clk_priv), .ops = &gen2_clk_ops, .probe = gen2_clk_probe, .remove = gen2_clk_remove, diff --git a/drivers/clk/renesas/r8a7791-cpg-mssr.c b/drivers/clk/renesas/r8a7791-cpg-mssr.c index 25fd4896094..675ac83a61d 100644 --- a/drivers/clk/renesas/r8a7791-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7791-cpg-mssr.c @@ -289,7 +289,7 @@ U_BOOT_DRIVER(clk_r8a7791) = { .name = "clk_r8a7791", .id = UCLASS_CLK, .of_match = r8a7791_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen2_clk_priv), + .priv_auto = sizeof(struct gen2_clk_priv), .ops = &gen2_clk_ops, .probe = gen2_clk_probe, .remove = gen2_clk_remove, diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c index d47ab99e882..d2225a3ff5f 100644 --- a/drivers/clk/renesas/r8a7792-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c @@ -235,7 +235,7 @@ U_BOOT_DRIVER(clk_r8a7792) = { .name = "clk_r8a7792", .id = UCLASS_CLK, .of_match = r8a7792_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen2_clk_priv), + .priv_auto = sizeof(struct gen2_clk_priv), .ops = &gen2_clk_ops, .probe = gen2_clk_probe, .remove = gen2_clk_remove, diff --git a/drivers/clk/renesas/r8a7794-cpg-mssr.c b/drivers/clk/renesas/r8a7794-cpg-mssr.c index 7093e0d42cb..1fcac9b59d8 100644 --- a/drivers/clk/renesas/r8a7794-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7794-cpg-mssr.c @@ -264,7 +264,7 @@ U_BOOT_DRIVER(clk_r8a7794) = { .name = "clk_r8a7794", .id = UCLASS_CLK, .of_match = r8a7794_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen2_clk_priv), + .priv_auto = sizeof(struct gen2_clk_priv), .ops = &gen2_clk_ops, .probe = gen2_clk_probe, .remove = gen2_clk_remove, diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c index dcd96ad0177..101f6583fac 100644 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c @@ -373,7 +373,7 @@ U_BOOT_DRIVER(clk_r8a7795) = { .name = "clk_r8a7795", .id = UCLASS_CLK, .of_match = r8a7795_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c index 89dc141239d..3c17bcbb187 100644 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c @@ -351,7 +351,7 @@ U_BOOT_DRIVER(clk_r8a7796) = { .name = "clk_r8a7796", .id = UCLASS_CLK, .of_match = r8a7796_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c index 6ed88295c98..5f37f6285f3 100644 --- a/drivers/clk/renesas/r8a77965-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c @@ -349,7 +349,7 @@ U_BOOT_DRIVER(clk_r8a77965) = { .name = "clk_r8a77965", .id = UCLASS_CLK, .of_match = r8a77965_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a77970-cpg-mssr.c b/drivers/clk/renesas/r8a77970-cpg-mssr.c index df071201718..bafe4bbb094 100644 --- a/drivers/clk/renesas/r8a77970-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77970-cpg-mssr.c @@ -226,7 +226,7 @@ U_BOOT_DRIVER(clk_r8a77970) = { .name = "clk_r8a77970", .id = UCLASS_CLK, .of_match = r8a77970_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a77980-cpg-mssr.c b/drivers/clk/renesas/r8a77980-cpg-mssr.c index c8d7a9469ba..a202005121b 100644 --- a/drivers/clk/renesas/r8a77980-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77980-cpg-mssr.c @@ -249,7 +249,7 @@ U_BOOT_DRIVER(clk_r8a77980) = { .name = "clk_r8a77980", .id = UCLASS_CLK, .of_match = r8a77980_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c index 357e7b534da..5cc9270869e 100644 --- a/drivers/clk/renesas/r8a77990-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c @@ -308,7 +308,7 @@ U_BOOT_DRIVER(clk_r8a77990) = { .name = "clk_r8a77990", .id = UCLASS_CLK, .of_match = r8a77990_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c index d62aeba635b..eef154bc826 100644 --- a/drivers/clk/renesas/r8a77995-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c @@ -247,7 +247,7 @@ U_BOOT_DRIVER(clk_r8a77995) = { .name = "clk_r8a77995", .id = UCLASS_CLK, .of_match = r8a77995_clk_ids, - .priv_auto_alloc_size = sizeof(struct gen3_clk_priv), + .priv_auto = sizeof(struct gen3_clk_priv), .ops = &gen3_clk_ops, .probe = gen3_clk_probe, .remove = gen3_clk_remove, diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c index 71916dbf3b1..f12b010d5af 100644 --- a/drivers/clk/rockchip/clk_px30.c +++ b/drivers/clk/rockchip/clk_px30.c @@ -1480,7 +1480,7 @@ U_BOOT_DRIVER(rockchip_px30_cru) = { .name = "rockchip_px30_cru", .id = UCLASS_CLK, .of_match = px30_clk_ids, - .priv_auto_alloc_size = sizeof(struct px30_clk_priv), + .priv_auto = sizeof(struct px30_clk_priv), .ofdata_to_platdata = px30_clk_ofdata_to_platdata, .ops = &px30_clk_ops, .bind = px30_clk_bind, @@ -1627,7 +1627,7 @@ U_BOOT_DRIVER(rockchip_px30_pmucru) = { .name = "rockchip_px30_pmucru", .id = UCLASS_CLK, .of_match = px30_pmuclk_ids, - .priv_auto_alloc_size = sizeof(struct px30_pmuclk_priv), + .priv_auto = sizeof(struct px30_pmuclk_priv), .ofdata_to_platdata = px30_pmuclk_ofdata_to_platdata, .ops = &px30_pmuclk_ops, .probe = px30_pmuclk_probe, diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c index 274572f70c1..8d11e242d05 100644 --- a/drivers/clk/rockchip/clk_rk3036.c +++ b/drivers/clk/rockchip/clk_rk3036.c @@ -375,7 +375,7 @@ U_BOOT_DRIVER(rockchip_rk3036_cru) = { .name = "clk_rk3036", .id = UCLASS_CLK, .of_match = rk3036_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3036_clk_priv), + .priv_auto = sizeof(struct rk3036_clk_priv), .ofdata_to_platdata = rk3036_clk_ofdata_to_platdata, .ops = &rk3036_clk_ops, .bind = rk3036_clk_bind, diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c index 61f823e254e..ac44ab442c7 100644 --- a/drivers/clk/rockchip/clk_rk3128.c +++ b/drivers/clk/rockchip/clk_rk3128.c @@ -597,7 +597,7 @@ U_BOOT_DRIVER(rockchip_rk3128_cru) = { .name = "clk_rk3128", .id = UCLASS_CLK, .of_match = rk3128_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3128_clk_priv), + .priv_auto = sizeof(struct rk3128_clk_priv), .ofdata_to_platdata = rk3128_clk_ofdata_to_platdata, .ops = &rk3128_clk_ops, .bind = rk3128_clk_bind, diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c index aacc8cf2d14..5940cb33d47 100644 --- a/drivers/clk/rockchip/clk_rk3188.c +++ b/drivers/clk/rockchip/clk_rk3188.c @@ -616,8 +616,8 @@ U_BOOT_DRIVER(rockchip_rk3188_cru) = { .name = "rockchip_rk3188_cru", .id = UCLASS_CLK, .of_match = rk3188_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3188_clk_priv), - .platdata_auto_alloc_size = sizeof(struct rk3188_clk_plat), + .priv_auto = sizeof(struct rk3188_clk_priv), + .platdata_auto = sizeof(struct rk3188_clk_plat), .ops = &rk3188_clk_ops, .bind = rk3188_clk_bind, .ofdata_to_platdata = rk3188_clk_ofdata_to_platdata, diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c index 054b2fd349b..92e7ff384e1 100644 --- a/drivers/clk/rockchip/clk_rk322x.c +++ b/drivers/clk/rockchip/clk_rk322x.c @@ -532,7 +532,7 @@ U_BOOT_DRIVER(rockchip_rk322x_cru) = { .name = "clk_rk322x", .id = UCLASS_CLK, .of_match = rk322x_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk322x_clk_priv), + .priv_auto = sizeof(struct rk322x_clk_priv), .ofdata_to_platdata = rk322x_clk_ofdata_to_platdata, .ops = &rk322x_clk_ops, .bind = rk322x_clk_bind, diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index a1dd642eefe..7c91e00c685 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -1040,8 +1040,8 @@ U_BOOT_DRIVER(rockchip_rk3288_cru) = { .name = "rockchip_rk3288_cru", .id = UCLASS_CLK, .of_match = rk3288_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3288_clk_priv), - .platdata_auto_alloc_size = sizeof(struct rk3288_clk_plat), + .priv_auto = sizeof(struct rk3288_clk_priv), + .platdata_auto = sizeof(struct rk3288_clk_plat), .ops = &rk3288_clk_ops, .bind = rk3288_clk_bind, .ofdata_to_platdata = rk3288_clk_ofdata_to_platdata, diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c index d3633b69795..c36512b6794 100644 --- a/drivers/clk/rockchip/clk_rk3308.c +++ b/drivers/clk/rockchip/clk_rk3308.c @@ -1067,7 +1067,7 @@ U_BOOT_DRIVER(rockchip_rk3308_cru) = { .name = "rockchip_rk3308_cru", .id = UCLASS_CLK, .of_match = rk3308_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3308_clk_priv), + .priv_auto = sizeof(struct rk3308_clk_priv), .ofdata_to_platdata = rk3308_clk_ofdata_to_platdata, .ops = &rk3308_clk_ops, .bind = rk3308_clk_bind, diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c index bf4f1069ea6..e28e0996c68 100644 --- a/drivers/clk/rockchip/clk_rk3328.c +++ b/drivers/clk/rockchip/clk_rk3328.c @@ -845,7 +845,7 @@ U_BOOT_DRIVER(rockchip_rk3328_cru) = { .name = "rockchip_rk3328_cru", .id = UCLASS_CLK, .of_match = rk3328_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3328_clk_priv), + .priv_auto = sizeof(struct rk3328_clk_priv), .ofdata_to_platdata = rk3328_clk_ofdata_to_platdata, .ops = &rk3328_clk_ops, .bind = rk3328_clk_bind, diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index d1804c6e168..84b55ac6180 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -643,9 +643,9 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = { .name = "rockchip_rk3368_cru", .id = UCLASS_CLK, .of_match = rk3368_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3368_clk_priv), + .priv_auto = sizeof(struct rk3368_clk_priv), #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto_alloc_size = sizeof(struct rk3368_clk_plat), + .platdata_auto = sizeof(struct rk3368_clk_plat), #endif .ofdata_to_platdata = rk3368_clk_ofdata_to_platdata, .ops = &rk3368_clk_ops, diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 3fd863e7bd0..2e2613fd0dc 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1447,13 +1447,13 @@ U_BOOT_DRIVER(clk_rk3399) = { .name = "rockchip_rk3399_cru", .id = UCLASS_CLK, .of_match = rk3399_clk_ids, - .priv_auto_alloc_size = sizeof(struct rk3399_clk_priv), + .priv_auto = sizeof(struct rk3399_clk_priv), .ofdata_to_platdata = rk3399_clk_ofdata_to_platdata, .ops = &rk3399_clk_ops, .bind = rk3399_clk_bind, .probe = rk3399_clk_probe, #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto_alloc_size = sizeof(struct rk3399_clk_plat), + .platdata_auto = sizeof(struct rk3399_clk_plat), #endif };

@@ -1642,12 +1642,12 @@ U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = { .name = "rockchip_rk3399_pmucru", .id = UCLASS_CLK, .of_match = rk3399_pmuclk_ids, - .priv_auto_alloc_size = sizeof(struct rk3399_pmuclk_priv), + .priv_auto = sizeof(struct rk3399_pmuclk_priv), .ofdata_to_platdata = rk3399_pmuclk_ofdata_to_platdata, .ops = &rk3399_pmuclk_ops, .probe = rk3399_pmuclk_probe, .bind = rk3399_pmuclk_bind, #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto_alloc_size = sizeof(struct rk3399_pmuclk_plat), + .platdata_auto = sizeof(struct rk3399_pmuclk_plat), #endif }; diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c index aa1d98ca2a2..efc07a05b1d 100644 --- a/drivers/clk/rockchip/clk_rv1108.c +++ b/drivers/clk/rockchip/clk_rv1108.c @@ -719,7 +719,7 @@ U_BOOT_DRIVER(clk_rv1108) = { .name = "clk_rv1108", .id = UCLASS_CLK, .of_match = rv1108_clk_ids, - .priv_auto_alloc_size = sizeof(struct rv1108_clk_priv), + .priv_auto = sizeof(struct rv1108_clk_priv), .ops = &rv1108_clk_ops, .bind = rv1108_clk_bind, .ofdata_to_platdata = rv1108_clk_ofdata_to_platdata, diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c index 1b4d81d4f06..9a08c148a0d 100644 --- a/drivers/clk/sifive/fu540-prci.c +++ b/drivers/clk/sifive/fu540-prci.c @@ -807,6 +807,6 @@ U_BOOT_DRIVER(sifive_fu540_prci) = { .of_match = sifive_fu540_prci_ids, .probe = sifive_fu540_prci_probe, .ops = &sifive_fu540_prci_ops, - .priv_auto_alloc_size = sizeof(struct __prci_data), + .priv_auto = sizeof(struct __prci_data), .bind = sifive_fu540_clk_bind, }; diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c index 67507c5ab1d..1b5de86e204 100644 --- a/drivers/clk/sunxi/clk_a10.c +++ b/drivers/clk/sunxi/clk_a10.c @@ -79,7 +79,7 @@ U_BOOT_DRIVER(clk_sun4i_a10) = { .name = "sun4i_a10_ccu", .id = UCLASS_CLK, .of_match = a10_ccu_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = a10_clk_bind, diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c index d11a4b5f038..184f61ab234 100644 --- a/drivers/clk/sunxi/clk_a10s.c +++ b/drivers/clk/sunxi/clk_a10s.c @@ -66,7 +66,7 @@ U_BOOT_DRIVER(clk_sun5i_a10s) = { .name = "sun5i_a10s_ccu", .id = UCLASS_CLK, .of_match = a10s_ccu_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = a10s_clk_bind, diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c index 4d562bfe427..5750514a74f 100644 --- a/drivers/clk/sunxi/clk_a23.c +++ b/drivers/clk/sunxi/clk_a23.c @@ -82,7 +82,7 @@ U_BOOT_DRIVER(clk_sun8i_a23) = { .name = "sun8i_a23_ccu", .id = UCLASS_CLK, .of_match = a23_clk_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = a23_clk_bind, diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c index 4a9454eebe7..9226112f4af 100644 --- a/drivers/clk/sunxi/clk_a31.c +++ b/drivers/clk/sunxi/clk_a31.c @@ -99,7 +99,7 @@ U_BOOT_DRIVER(clk_sun6i_a31) = { .name = "sun6i_a31_ccu", .id = UCLASS_CLK, .of_match = a31_clk_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = a31_clk_bind, diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c index d96cb1aac1c..0553ffa4399 100644 --- a/drivers/clk/sunxi/clk_a64.c +++ b/drivers/clk/sunxi/clk_a64.c @@ -87,7 +87,7 @@ U_BOOT_DRIVER(clk_sun50i_a64) = { .name = "sun50i_a64_ccu", .id = UCLASS_CLK, .of_match = a64_ccu_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = a64_clk_bind, diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c index 80d7407037e..68973d528ed 100644 --- a/drivers/clk/sunxi/clk_a80.c +++ b/drivers/clk/sunxi/clk_a80.c @@ -94,7 +94,7 @@ U_BOOT_DRIVER(clk_sun9i_a80) = { .name = "sun9i_a80_ccu", .id = UCLASS_CLK, .of_match = a80_ccu_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = a80_clk_bind, diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c index d6f23ddc778..880c7d75997 100644 --- a/drivers/clk/sunxi/clk_a83t.c +++ b/drivers/clk/sunxi/clk_a83t.c @@ -84,7 +84,7 @@ U_BOOT_DRIVER(clk_sun8i_a83t) = { .name = "sun8i_a83t_ccu", .id = UCLASS_CLK, .of_match = a83t_clk_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = a83t_clk_bind, diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c index 7e844f4ff16..f81633b92d5 100644 --- a/drivers/clk/sunxi/clk_h3.c +++ b/drivers/clk/sunxi/clk_h3.c @@ -102,7 +102,7 @@ U_BOOT_DRIVER(clk_sun8i_h3) = { .name = "sun8i_h3_ccu", .id = UCLASS_CLK, .of_match = h3_ccu_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = h3_clk_bind, diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c index a1cb8952d39..ac8656fe895 100644 --- a/drivers/clk/sunxi/clk_h6.c +++ b/drivers/clk/sunxi/clk_h6.c @@ -95,7 +95,7 @@ U_BOOT_DRIVER(clk_sun50i_h6) = { .name = "sun50i_h6_ccu", .id = UCLASS_CLK, .of_match = h6_ccu_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = h6_clk_bind, diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c index ac360b2bebd..ee1e86d22eb 100644 --- a/drivers/clk/sunxi/clk_r40.c +++ b/drivers/clk/sunxi/clk_r40.c @@ -107,7 +107,7 @@ U_BOOT_DRIVER(clk_sun8i_r40) = { .name = "sun8i_r40_ccu", .id = UCLASS_CLK, .of_match = r40_clk_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = r40_clk_bind, diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c index f3fc06ab31e..29622199fdc 100644 --- a/drivers/clk/sunxi/clk_v3s.c +++ b/drivers/clk/sunxi/clk_v3s.c @@ -65,7 +65,7 @@ U_BOOT_DRIVER(clk_sun8i_v3s) = { .name = "sun8i_v3s_ccu", .id = UCLASS_CLK, .of_match = v3s_clk_ids, - .priv_auto_alloc_size = sizeof(struct ccu_priv), + .priv_auto = sizeof(struct ccu_priv), .ops = &sunxi_clk_ops, .probe = sunxi_clk_probe, .bind = v3s_clk_bind, diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c index 4e25db354e0..c31e59641d9 100644 --- a/drivers/clk/uniphier/clk-uniphier-core.c +++ b/drivers/clk/uniphier/clk-uniphier-core.c @@ -342,6 +342,6 @@ U_BOOT_DRIVER(uniphier_clk) = { .id = UCLASS_CLK, .of_match = uniphier_clk_match, .probe = uniphier_clk_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_clk_priv), + .priv_auto = sizeof(struct uniphier_clk_priv), .ops = &uniphier_clk_ops, }; diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 79e888e1eb7..0b71744d939 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -124,20 +124,20 @@ void device_free(struct udevice *dev) { int size;

- if (dev->driver->priv_auto_alloc_size) { + if (dev->driver->priv_auto) { free(dev->priv); dev->priv = NULL; } - size = dev->uclass->uc_drv->per_device_auto_alloc_size; + size = dev->uclass->uc_drv->per_device_auto; if (size) { free(dev->uclass_priv); dev->uclass_priv = NULL; } if (dev->parent) { - size = dev->parent->driver->per_child_auto_alloc_size; + size = dev->parent->driver->per_child_auto; if (!size) { size = dev->parent->uclass->uc_drv-> - per_child_auto_alloc_size; + per_child_auto; } if (size) { free(dev->parent_priv); diff --git a/drivers/core/device.c b/drivers/core/device.c index bcf437ac231..f74eaa55fa7 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -94,21 +94,19 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, dev->sqq = uclass_find_next_free_seq(uc); }

- if (drv->platdata_auto_alloc_size) { + if (drv->platdata_auto) { bool alloc = !platdata;

if (CONFIG_IS_ENABLED(OF_PLATDATA)) { if (of_platdata_size) { dev->flags |= DM_FLAG_OF_PLATDATA; - if (of_platdata_size < - drv->platdata_auto_alloc_size) + if (of_platdata_size < drv->platdata_auto) alloc = true; } } if (alloc) { dev->flags |= DM_FLAG_ALLOC_PDATA; - dev->platdata = calloc(1, - drv->platdata_auto_alloc_size); + dev->platdata = calloc(1, drv->platdata_auto); if (!dev->platdata) { ret = -ENOMEM; goto fail_alloc1; @@ -120,7 +118,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, } }

- size = uc->uc_drv->per_device_platdata_auto_alloc_size; + size = uc->uc_drv->per_device_platdata_auto; if (size) { dev->flags |= DM_FLAG_ALLOC_UCLASS_PDATA; dev->uclass_platdata = calloc(1, size); @@ -131,10 +129,9 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, }

if (parent) { - size = parent->driver->per_child_platdata_auto_alloc_size; + size = parent->driver->per_child_platdata_auto; if (!size) { - size = parent->uclass->uc_drv-> - per_child_platdata_auto_alloc_size; + size = parent->uclass->uc_drv->per_child_platdata_auto; } if (size) { dev->flags |= DM_FLAG_ALLOC_PARENT_PDATA; @@ -361,15 +358,15 @@ int device_ofdata_to_platdata(struct udevice *dev) assert(drv);

/* Allocate private data if requested and not reentered */ - if (drv->priv_auto_alloc_size && !dev->priv) { - dev->priv = alloc_priv(drv->priv_auto_alloc_size, drv->flags); + if (drv->priv_auto && !dev->priv) { + dev->priv = alloc_priv(drv->priv_auto, drv->flags); if (!dev->priv) { ret = -ENOMEM; goto fail; } } /* Allocate private data if requested and not reentered */ - size = dev->uclass->uc_drv->per_device_auto_alloc_size; + size = dev->uclass->uc_drv->per_device_auto; if (size && !dev->uclass_priv) { dev->uclass_priv = alloc_priv(size, dev->uclass->uc_drv->flags); @@ -381,10 +378,9 @@ int device_ofdata_to_platdata(struct udevice *dev)

/* Allocate parent data for this child */ if (dev->parent) { - size = dev->parent->driver->per_child_auto_alloc_size; + size = dev->parent->driver->per_child_auto; if (!size) { - size = dev->parent->uclass->uc_drv-> - per_child_auto_alloc_size; + size = dev->parent->uclass->uc_drv->per_child_auto; } if (size && !dev->parent_priv) { dev->parent_priv = alloc_priv(size, drv->flags); diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c index 7cc1d46009f..c244b393459 100644 --- a/drivers/core/simple-bus.c +++ b/drivers/core/simple-bus.c @@ -47,7 +47,7 @@ UCLASS_DRIVER(simple_bus) = { .id = UCLASS_SIMPLE_BUS, .name = "simple_bus", .post_bind = simple_bus_post_bind, - .per_device_platdata_auto_alloc_size = sizeof(struct simple_bus_plat), + .per_device_platdata_auto = sizeof(struct simple_bus_plat), };

static const struct udevice_id generic_simple_bus_ids[] = { diff --git a/drivers/core/simple-pm-bus.c b/drivers/core/simple-pm-bus.c index 51dc9b206fd..7a18953cba1 100644 --- a/drivers/core/simple-pm-bus.c +++ b/drivers/core/simple-pm-bus.c @@ -51,6 +51,6 @@ U_BOOT_DRIVER(simple_pm_bus_drv) = { .of_match = simple_pm_bus_ids, .probe = simple_pm_bus_probe, .remove = simple_pm_bus_remove, - .priv_auto_alloc_size = sizeof(struct clk_bulk), + .priv_auto = sizeof(struct clk_bulk), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index 567d0a4b50a..823d0731640 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -174,7 +174,7 @@ void *syscon_get_first_range(ulong driver_data) UCLASS_DRIVER(syscon) = { .id = UCLASS_SYSCON, .name = "syscon", - .per_device_auto_alloc_size = sizeof(struct syscon_uc_info), + .per_device_auto = sizeof(struct syscon_uc_info), .pre_probe = syscon_pre_probe, };

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 8d5e92da288..d3e906640bc 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -71,8 +71,8 @@ static int uclass_add(enum uclass_id id, struct uclass **ucp) uc = calloc(1, sizeof(*uc)); if (!uc) return -ENOMEM; - if (uc_drv->priv_auto_alloc_size) { - uc->priv = calloc(1, uc_drv->priv_auto_alloc_size); + if (uc_drv->priv_auto) { + uc->priv = calloc(1, uc_drv->priv_auto); if (!uc->priv) { ret = -ENOMEM; goto fail_mem; @@ -93,7 +93,7 @@ static int uclass_add(enum uclass_id id, struct uclass **ucp)

return 0; fail: - if (uc_drv->priv_auto_alloc_size) { + if (uc_drv->priv_auto) { free(uc->priv); uc->priv = NULL; } @@ -131,7 +131,7 @@ int uclass_destroy(struct uclass *uc) if (uc_drv->destroy) uc_drv->destroy(uc); list_del(&uc->sibling_node); - if (uc_drv->priv_auto_alloc_size) + if (uc_drv->priv_auto) free(uc->priv); free(uc);

diff --git a/drivers/cpu/at91_cpu.c b/drivers/cpu/at91_cpu.c index 058ae3a8119..07dba7d5601 100644 --- a/drivers/cpu/at91_cpu.c +++ b/drivers/cpu/at91_cpu.c @@ -118,6 +118,6 @@ U_BOOT_DRIVER(cpu_at91_drv) = { .of_match = at91_cpu_ids, .ops = &at91_cpu_ops, .probe = at91_cpu_probe, - .platdata_auto_alloc_size = sizeof(struct at91_cpu_platdata), + .platdata_auto = sizeof(struct at91_cpu_platdata), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index 421cc7a9a4c..0946b95f589 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -489,7 +489,7 @@ U_BOOT_DRIVER(bmips_cpu_drv) = { .of_match = bmips_cpu_ids, .bind = bmips_cpu_bind, .probe = bmips_cpu_probe, - .priv_auto_alloc_size = sizeof(struct bmips_cpu_priv), + .priv_auto = sizeof(struct bmips_cpu_priv), .ops = &bmips_cpu_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c index 37e3cf2d8ff..6f6f90c5581 100644 --- a/drivers/cpu/cpu-uclass.c +++ b/drivers/cpu/cpu-uclass.c @@ -115,7 +115,7 @@ int cpu_get_vendor(const struct udevice *dev, char *buf, int size) U_BOOT_DRIVER(cpu_bus) = { .name = "cpu_bus", .id = UCLASS_SIMPLE_BUS, - .per_child_platdata_auto_alloc_size = sizeof(struct cpu_platdata), + .per_child_platdata_auto = sizeof(struct cpu_platdata), };

static int uclass_cpu_init(struct uclass *uc) diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 502c8ebb433..641322554cc 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -230,6 +230,6 @@ U_BOOT_DRIVER(cpu_imx8_drv) = { .of_match = cpu_imx8_ids, .ops = &cpu_imx8_ops, .probe = imx8_cpu_probe, - .platdata_auto_alloc_size = sizeof(struct cpu_imx_platdata), + .platdata_auto = sizeof(struct cpu_imx_platdata), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c index 5f1592f9ad4..e451c11116a 100644 --- a/drivers/cpu/mpc83xx_cpu.c +++ b/drivers/cpu/mpc83xx_cpu.c @@ -348,7 +348,7 @@ U_BOOT_DRIVER(mpc83xx_cpu) = { .id = UCLASS_CPU, .of_match = mpc83xx_cpu_ids, .probe = mpc83xx_cpu_probe, - .priv_auto_alloc_size = sizeof(struct mpc83xx_cpu_priv), + .priv_auto = sizeof(struct mpc83xx_cpu_priv), .ops = &mpc83xx_cpu_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c index 3c0c2b067f3..06364948052 100644 --- a/drivers/crypto/fsl/rng.c +++ b/drivers/crypto/fsl/rng.c @@ -83,6 +83,6 @@ U_BOOT_DRIVER(caam_rng) = { .id = UCLASS_RNG, .ops = &caam_rng_ops, .probe = caam_rng_probe, - .priv_auto_alloc_size = sizeof(struct caam_rng_priv), + .priv_auto = sizeof(struct caam_rng_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 1360bd0a3b8..4c118f0846a 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -647,9 +647,9 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .of_match = altera_gen5_sdram_ids, .ops = &altera_gen5_sdram_ops, .ofdata_to_platdata = altera_gen5_sdram_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_gen5_sdram_platdata), + .platdata_auto = sizeof(struct altera_gen5_sdram_platdata), .probe = altera_gen5_sdram_probe, - .priv_auto_alloc_size = sizeof(struct altera_gen5_sdram_priv), + .priv_auto = sizeof(struct altera_gen5_sdram_priv), };

#endif /* CONFIG_SPL_BUILD */ diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 8cb75fe02a2..2c44b78bffe 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -304,7 +304,7 @@ U_BOOT_DRIVER(altera_sdram) = { .of_match = altera_sdram_ids, .ops = &altera_sdram_ops, .ofdata_to_platdata = altera_sdram_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_sdram_platdata), + .platdata_auto = sizeof(struct altera_sdram_platdata), .probe = altera_sdram_probe, - .priv_auto_alloc_size = sizeof(struct altera_sdram_priv), + .priv_auto = sizeof(struct altera_sdram_priv), }; diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c index 8686c998457..0f5cda23dd3 100644 --- a/drivers/demo/demo-shape.c +++ b/drivers/demo/demo-shape.c @@ -193,6 +193,6 @@ U_BOOT_DRIVER(demo_shape_drv) = { .ops = &shape_ops, .probe = dm_shape_probe, .remove = dm_shape_remove, - .priv_auto_alloc_size = sizeof(struct shape_data), - .platdata_auto_alloc_size = sizeof(struct dm_demo_pdata), + .priv_auto = sizeof(struct shape_data), + .platdata_auto = sizeof(struct dm_demo_pdata), }; diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index 68972c780f4..bf714660ce6 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -43,5 +43,5 @@ U_BOOT_DRIVER(demo_simple_drv) = { .id = UCLASS_DEMO, .ofdata_to_platdata = demo_shape_ofdata_to_platdata, .ops = &simple_ops, - .platdata_auto_alloc_size = sizeof(struct dm_demo_pdata), + .platdata_auto = sizeof(struct dm_demo_pdata), }; diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c index 91172d483c7..98577601b58 100644 --- a/drivers/dma/bcm6348-iudma.c +++ b/drivers/dma/bcm6348-iudma.c @@ -649,6 +649,6 @@ U_BOOT_DRIVER(bcm6348_iudma) = { .id = UCLASS_DMA, .of_match = bcm6348_iudma_ids, .ops = &bcm6348_iudma_ops, - .priv_auto_alloc_size = sizeof(struct bcm6348_iudma_priv), + .priv_auto = sizeof(struct bcm6348_iudma_priv), .probe = bcm6348_iudma_probe, }; diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index 50403148d6d..a93b0b7ba08 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -254,5 +254,5 @@ UCLASS_DRIVER(dma) = { .id = UCLASS_DMA, .name = "dma", .flags = DM_UC_FLAG_SEQ_ALIAS, - .per_device_auto_alloc_size = sizeof(struct dma_dev_priv), + .per_device_auto = sizeof(struct dma_dev_priv), }; diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c index 838596b24b6..aebf3eef966 100644 --- a/drivers/dma/sandbox-dma-test.c +++ b/drivers/dma/sandbox-dma-test.c @@ -280,5 +280,5 @@ U_BOOT_DRIVER(sandbox_dma) = { .of_match = sandbox_dma_ids, .ops = &sandbox_dma_ops, .probe = sandbox_dma_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_dma_dev), + .priv_auto = sizeof(struct sandbox_dma_dev), }; diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c index 13ab9670890..4272f4cab80 100644 --- a/drivers/dma/ti-edma3.c +++ b/drivers/dma/ti-edma3.c @@ -576,6 +576,6 @@ U_BOOT_DRIVER(ti_edma3) = { .ops = &ti_edma3_ops, .ofdata_to_platdata = ti_edma3_ofdata_to_platdata, .probe = ti_edma3_probe, - .priv_auto_alloc_size = sizeof(struct ti_edma3_priv), + .priv_auto = sizeof(struct ti_edma3_priv), }; #endif /* CONFIG_DMA */ diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 94216045ccc..f3ec827897f 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1933,5 +1933,5 @@ U_BOOT_DRIVER(ti_edma3) = { .of_match = udma_ids, .ops = &udma_ops, .probe = udma_probe, - .priv_auto_alloc_size = sizeof(struct udma_dev), + .priv_auto = sizeof(struct udma_dev), }; diff --git a/drivers/firmware/scmi/mailbox_agent.c b/drivers/firmware/scmi/mailbox_agent.c index a85cff1097e..3f4b04a4ae4 100644 --- a/drivers/firmware/scmi/mailbox_agent.c +++ b/drivers/firmware/scmi/mailbox_agent.c @@ -97,7 +97,7 @@ U_BOOT_DRIVER(scmi_mbox) = { .name = "scmi-over-mailbox", .id = UCLASS_SCMI_AGENT, .of_match = scmi_mbox_ids, - .priv_auto_alloc_size = sizeof(struct scmi_mbox_channel), + .priv_auto = sizeof(struct scmi_mbox_channel), .probe = scmi_mbox_probe, .ops = &scmi_mbox_ops, }; diff --git a/drivers/firmware/scmi/sandbox-scmi_agent.c b/drivers/firmware/scmi/sandbox-scmi_agent.c index 5b6a4232af4..35de68c75d3 100644 --- a/drivers/firmware/scmi/sandbox-scmi_agent.c +++ b/drivers/firmware/scmi/sandbox-scmi_agent.c @@ -403,7 +403,7 @@ U_BOOT_DRIVER(sandbox_scmi_agent) = { .name = "sandbox-scmi_agent", .id = UCLASS_SCMI_AGENT, .of_match = sandbox_scmi_test_ids, - .priv_auto_alloc_size = sizeof(struct sandbox_scmi_agent), + .priv_auto = sizeof(struct sandbox_scmi_agent), .probe = sandbox_scmi_test_probe, .remove = sandbox_scmi_test_remove, .ops = &sandbox_scmi_test_ops, diff --git a/drivers/firmware/scmi/sandbox-scmi_devices.c b/drivers/firmware/scmi/sandbox-scmi_devices.c index c69967bf693..414da6f4df1 100644 --- a/drivers/firmware/scmi/sandbox-scmi_devices.c +++ b/drivers/firmware/scmi/sandbox-scmi_devices.c @@ -107,7 +107,7 @@ U_BOOT_DRIVER(sandbox_scmi_devices) = { .name = "sandbox-scmi_devices", .id = UCLASS_MISC, .of_match = sandbox_scmi_devices_ids, - .priv_auto_alloc_size = sizeof(struct sandbox_scmi_device_priv), + .priv_auto = sizeof(struct sandbox_scmi_device_priv), .remove = sandbox_scmi_devices_remove, .probe = sandbox_scmi_devices_probe, }; diff --git a/drivers/firmware/scmi/smccc_agent.c b/drivers/firmware/scmi/smccc_agent.c index 85dbf9195e0..64d0929f69c 100644 --- a/drivers/firmware/scmi/smccc_agent.c +++ b/drivers/firmware/scmi/smccc_agent.c @@ -83,7 +83,7 @@ U_BOOT_DRIVER(scmi_smccc) = { .name = "scmi-over-smccc", .id = UCLASS_SCMI_AGENT, .of_match = scmi_smccc_ids, - .priv_auto_alloc_size = sizeof(struct scmi_smccc_channel), + .priv_auto = sizeof(struct scmi_smccc_channel), .probe = scmi_smccc_probe, .ops = &scmi_smccc_ops, }; diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index a2beb0079d8..0cdfb0e91a9 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -3166,5 +3166,5 @@ U_BOOT_DRIVER(ti_sci) = { .id = UCLASS_FIRMWARE, .of_match = ti_sci_ids, .probe = ti_sci_probe, - .priv_auto_alloc_size = sizeof(struct ti_sci_info), + .priv_auto = sizeof(struct ti_sci_info), }; diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c index 64717a6780e..0c06301a81c 100644 --- a/drivers/gpio/74x164_gpio.c +++ b/drivers/gpio/74x164_gpio.c @@ -187,6 +187,6 @@ U_BOOT_DRIVER(74x164) = { .id = UCLASS_GPIO, .ops = &gen_74x164_ops, .probe = gen_74x164_probe, - .priv_auto_alloc_size = sizeof(struct gen_74x164_priv), + .priv_auto = sizeof(struct gen_74x164_priv), .of_match = gen_74x164_ids, }; diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 75800d9f31c..cf0785aeb6a 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -117,6 +117,6 @@ U_BOOT_DRIVER(altera_pio) = { .of_match = altera_pio_ids, .ops = &altera_pio_ops, .ofdata_to_platdata = altera_pio_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_pio_platdata), + .platdata_auto = sizeof(struct altera_pio_platdata), .probe = altera_pio_probe, }; diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c index ef7984374b1..90e692c13ed 100644 --- a/drivers/gpio/at91_gpio.c +++ b/drivers/gpio/at91_gpio.c @@ -629,10 +629,10 @@ U_BOOT_DRIVER(atmel_at91rm9200_gpio) = { .id = UCLASS_GPIO, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = at91_gpio_ids, - .platdata_auto_alloc_size = sizeof(struct at91_port_platdata), + .platdata_auto = sizeof(struct at91_port_platdata), #endif .ops = &gpio_at91_ops, .probe = at91_gpio_probe, - .priv_auto_alloc_size = sizeof(struct at91_port_priv), + .priv_auto = sizeof(struct at91_port_priv), }; #endif diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index 18f365fa411..d92c061928d 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -338,7 +338,7 @@ U_BOOT_DRIVER(gpio_atmel_pio4) = { .probe = atmel_pio4_probe, .bind = atmel_pio4_bind, .of_match = atmel_pio4_ids, - .platdata_auto_alloc_size = sizeof(struct atmel_pio4_platdata), + .platdata_auto = sizeof(struct atmel_pio4_platdata), };

#endif diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index 0dff9ac711d..db349cf24bf 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -134,9 +134,9 @@ U_BOOT_DRIVER(gpio_bcm2835) = { .name = "gpio_bcm2835", .id = UCLASS_GPIO, .ofdata_to_platdata = of_match_ptr(bcm2835_gpio_ofdata_to_platdata), - .platdata_auto_alloc_size = sizeof(struct bcm2835_gpio_platdata), + .platdata_auto = sizeof(struct bcm2835_gpio_platdata), .ops = &gpio_bcm2835_ops, .probe = bcm2835_gpio_probe, .flags = DM_FLAG_PRE_RELOC, - .priv_auto_alloc_size = sizeof(struct bcm2835_gpios), + .priv_auto = sizeof(struct bcm2835_gpios), }; diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c index 5da11d988e0..e031f71a784 100644 --- a/drivers/gpio/bcm6345_gpio.c +++ b/drivers/gpio/bcm6345_gpio.c @@ -114,6 +114,6 @@ U_BOOT_DRIVER(bcm6345_gpio) = { .id = UCLASS_GPIO, .of_match = bcm6345_gpio_ids, .ops = &bcm6345_gpio_ops, - .priv_auto_alloc_size = sizeof(struct bcm6345_gpio_priv), + .priv_auto = sizeof(struct bcm6345_gpio_priv), .probe = bcm6345_gpio_probe, }; diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c index 055907c1a1d..72ef523be96 100644 --- a/drivers/gpio/cortina_gpio.c +++ b/drivers/gpio/cortina_gpio.c @@ -107,7 +107,7 @@ U_BOOT_DRIVER(cortina_gpio) = { .id = UCLASS_GPIO, .ops = &gpio_cortina_ops, .probe = ca_gpio_probe, - .priv_auto_alloc_size = sizeof(struct cortina_gpio_bank), + .priv_auto = sizeof(struct cortina_gpio_bank), .of_match = ca_gpio_ids, }; #endif /* CONFIG_DM_GPIO */ diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index f8758885101..507f8b18c21 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -560,9 +560,9 @@ U_BOOT_DRIVER(ti_dm6441_gpio) = { .ofdata_to_platdata = of_match_ptr(davinci_gpio_ofdata_to_platdata), .of_match = davinci_gpio_ids, .bind = dm_scan_fdt_dev, - .platdata_auto_alloc_size = sizeof(struct davinci_gpio_platdata), + .platdata_auto = sizeof(struct davinci_gpio_platdata), .probe = davinci_gpio_probe, - .priv_auto_alloc_size = sizeof(struct davinci_gpio_bank), + .priv_auto = sizeof(struct davinci_gpio_bank), };

#endif diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index cf20a5024e0..3a868844430 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -237,5 +237,5 @@ U_BOOT_DRIVER(gpio_dwapb) = { .bind = gpio_dwapb_bind, .probe = gpio_dwapb_probe, .remove = gpio_dwapb_remove, - .priv_auto_alloc_size = sizeof(struct gpio_dwapb_priv), + .priv_auto = sizeof(struct gpio_dwapb_priv), }; diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index a993fd4d700..beae34f233a 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -189,6 +189,6 @@ U_BOOT_DRIVER(rcar_gpio) = { .id = UCLASS_GPIO, .of_match = rcar_gpio_ids, .ops = &rcar_gpio_ops, - .priv_auto_alloc_size = sizeof(struct rcar_gpio_priv), + .priv_auto = sizeof(struct rcar_gpio_priv), .probe = rcar_gpio_probe, }; diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c index 86804ac2f5f..ee7de4c17e9 100644 --- a/drivers/gpio/gpio-rza1.c +++ b/drivers/gpio/gpio-rza1.c @@ -130,6 +130,6 @@ U_BOOT_DRIVER(r7s72100_gpio) = { .name = "r7s72100-gpio", .id = UCLASS_GPIO, .ops = &r7s72100_gpio_ops, - .priv_auto_alloc_size = sizeof(struct r7s72100_gpio_priv), + .priv_auto = sizeof(struct r7s72100_gpio_priv), .probe = r7s72100_gpio_probe, }; diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 0c01413b587..3fc4cd044fc 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -340,8 +340,8 @@ U_BOOT_DRIVER(gpio_hog) = { .id = UCLASS_NOP, .ofdata_to_platdata = gpio_hog_ofdata_to_platdata, .probe = gpio_hog_probe, - .priv_auto_alloc_size = sizeof(struct gpio_hog_priv), - .platdata_auto_alloc_size = sizeof(struct gpio_hog_data), + .priv_auto = sizeof(struct gpio_hog_priv), + .platdata_auto = sizeof(struct gpio_hog_data), }; #else int gpio_hog_lookup_name(const char *name, struct gpio_desc **desc) @@ -1340,5 +1340,5 @@ UCLASS_DRIVER(gpio) = { .post_probe = gpio_post_probe, .post_bind = gpio_post_bind, .pre_remove = gpio_pre_remove, - .per_device_auto_alloc_size = sizeof(struct gpio_dev_priv), + .per_device_auto = sizeof(struct gpio_dev_priv), }; diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c index 54a38da0f10..61c705b5ac5 100644 --- a/drivers/gpio/gpio-uniphier.c +++ b/drivers/gpio/gpio-uniphier.c @@ -166,6 +166,6 @@ U_BOOT_DRIVER(uniphier_gpio) = { .id = UCLASS_GPIO, .of_match = uniphier_gpio_match, .probe = uniphier_gpio_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_gpio_priv), + .priv_auto = sizeof(struct uniphier_gpio_priv), .ops = &uniphier_gpio_ops, }; diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c index 95de2ae3660..c49dc78baa5 100644 --- a/drivers/gpio/hi6220_gpio.c +++ b/drivers/gpio/hi6220_gpio.c @@ -89,7 +89,7 @@ U_BOOT_DRIVER(gpio_hi6220) = { .id = UCLASS_GPIO, .ops = &gpio_hi6220_ops, .probe = hi6220_gpio_probe, - .priv_auto_alloc_size = sizeof(struct gpio_bank), + .priv_auto = sizeof(struct gpio_bank), };

diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c index 35b114904d5..d40365e82d1 100644 --- a/drivers/gpio/hsdk-creg-gpio.c +++ b/drivers/gpio/hsdk-creg-gpio.c @@ -165,5 +165,5 @@ U_BOOT_DRIVER(gpio_hsdk_creg) = { .ops = &hsdk_creg_gpio_ops, .probe = hsdk_creg_gpio_probe, .of_match = hsdk_creg_gpio_ids, - .platdata_auto_alloc_size = sizeof(struct hsdk_creg_gpio), + .platdata_auto = sizeof(struct hsdk_creg_gpio), }; diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c index 428844db0cc..63170413f32 100644 --- a/drivers/gpio/imx_rgpio2p.c +++ b/drivers/gpio/imx_rgpio2p.c @@ -200,7 +200,7 @@ U_BOOT_DRIVER(imx_rgpio2p) = { .id = UCLASS_GPIO, .ops = &imx_rgpio2p_ops, .probe = imx_rgpio2p_probe, - .priv_auto_alloc_size = sizeof(struct imx_rgpio2p_plat), + .priv_auto = sizeof(struct imx_rgpio2p_plat), .of_match = imx_rgpio2p_ids, .bind = imx_rgpio2p_bind, }; diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index 95f8b2ba6cd..cb217403cd1 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -184,6 +184,6 @@ U_BOOT_DRIVER(gpio_broadwell) = { .ops = &gpio_broadwell_ops, .ofdata_to_platdata = broadwell_gpio_ofdata_to_platdata, .probe = broadwell_gpio_probe, - .priv_auto_alloc_size = sizeof(struct broadwell_bank_priv), - .platdata_auto_alloc_size = sizeof(struct broadwell_bank_platdata), + .priv_auto = sizeof(struct broadwell_bank_priv), + .platdata_auto = sizeof(struct broadwell_bank_platdata), }; diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index 73d98fde554..bba85b37912 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -236,6 +236,6 @@ U_BOOT_DRIVER(gpio_ich6) = { .ops = &gpio_ich6_ops, .ofdata_to_platdata = gpio_ich6_ofdata_to_platdata, .probe = ich6_gpio_probe, - .priv_auto_alloc_size = sizeof(struct ich6_bank_priv), - .platdata_auto_alloc_size = sizeof(struct ich6_bank_platdata), + .priv_auto = sizeof(struct ich6_bank_priv), + .platdata_auto = sizeof(struct ich6_bank_platdata), }; diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c index 2371d0d0d77..6ef9aa2b5fa 100644 --- a/drivers/gpio/iproc_gpio.c +++ b/drivers/gpio/iproc_gpio.c @@ -286,5 +286,5 @@ U_BOOT_DRIVER(iproc_gpio) = { .of_match = iproc_gpio_ids, .ops = &iproc_gpio_ops, .ofdata_to_platdata = iproc_gpio_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct iproc_gpio_platdata), + .platdata_auto = sizeof(struct iproc_gpio_platdata), }; diff --git a/drivers/gpio/lpc32xx_gpio.c b/drivers/gpio/lpc32xx_gpio.c index 1265ee41a60..ffaec32ac2b 100644 --- a/drivers/gpio/lpc32xx_gpio.c +++ b/drivers/gpio/lpc32xx_gpio.c @@ -317,5 +317,5 @@ U_BOOT_DRIVER(gpio_lpc32xx) = { .id = UCLASS_GPIO, .ops = &gpio_lpc32xx_ops, .probe = lpc32xx_gpio_probe, - .priv_auto_alloc_size = sizeof(struct lpc32xx_gpio_priv), + .priv_auto = sizeof(struct lpc32xx_gpio_priv), }; diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index 54dc437e1c4..3020cc9502a 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -141,9 +141,9 @@ U_BOOT_DRIVER(spisel_boot_mpc83xx) = { .ops = &mpc83xx_spisel_boot_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) .ofdata_to_platdata = mpc83xx_spisel_boot_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mpc8xxx_gpio_plat), + .platdata_auto = sizeof(struct mpc8xxx_gpio_plat), .of_match = mpc83xx_spisel_boot_ids, #endif .probe = mpc83xx_spisel_boot_probe, - .priv_auto_alloc_size = sizeof(struct mpc83xx_spisel_boot), + .priv_auto = sizeof(struct mpc83xx_spisel_boot), }; diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index 27881a73224..fa08909b2b9 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -295,9 +295,9 @@ U_BOOT_DRIVER(gpio_mpc8xxx) = { .ops = &gpio_mpc8xxx_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) .ofdata_to_platdata = mpc8xxx_gpio_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mpc8xxx_gpio_plat), + .platdata_auto = sizeof(struct mpc8xxx_gpio_plat), .of_match = mpc8xxx_gpio_ids, #endif .probe = mpc8xxx_gpio_probe, - .priv_auto_alloc_size = sizeof(struct mpc8xxx_gpio_data), + .priv_auto = sizeof(struct mpc8xxx_gpio_data), }; diff --git a/drivers/gpio/mscc_sgpio.c b/drivers/gpio/mscc_sgpio.c index 780d77b2f86..1cbcc43489a 100644 --- a/drivers/gpio/mscc_sgpio.c +++ b/drivers/gpio/mscc_sgpio.c @@ -275,5 +275,5 @@ U_BOOT_DRIVER(gpio_mscc_sgpio) = { .of_match = mscc_sgpio_ids, .ops = &mscc_sgpio_ops, .probe = mscc_sgpio_probe, - .priv_auto_alloc_size = sizeof(struct mscc_sgpio_priv), + .priv_auto = sizeof(struct mscc_sgpio_priv), }; diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c index 416fb56a98d..0feafb30ee3 100644 --- a/drivers/gpio/msm_gpio.c +++ b/drivers/gpio/msm_gpio.c @@ -129,5 +129,5 @@ U_BOOT_DRIVER(gpio_msm) = { .ofdata_to_platdata = msm_gpio_ofdata_to_platdata, .probe = msm_gpio_probe, .ops = &gpio_msm_ops, - .priv_auto_alloc_size = sizeof(struct msm_gpio_bank), + .priv_auto = sizeof(struct msm_gpio_bank), }; diff --git a/drivers/gpio/mvebu_gpio.c b/drivers/gpio/mvebu_gpio.c index 3639388e2f7..4c1c68ee19e 100644 --- a/drivers/gpio/mvebu_gpio.c +++ b/drivers/gpio/mvebu_gpio.c @@ -117,5 +117,5 @@ U_BOOT_DRIVER(gpio_mvebu) = { .of_match = mvebu_gpio_ids, .ops = &mvebu_gpio_ops, .probe = mvebu_gpio_probe, - .priv_auto_alloc_size = sizeof(struct mvebu_gpio_priv), + .priv_auto = sizeof(struct mvebu_gpio_priv), }; diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 28ca57149c1..1e00e23116a 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -339,8 +339,8 @@ U_BOOT_DRIVER(gpio_mxc) = { .ops = &gpio_mxc_ops, .probe = mxc_gpio_probe, .ofdata_to_platdata = mxc_gpio_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mxc_gpio_plat), - .priv_auto_alloc_size = sizeof(struct mxc_bank_info), + .platdata_auto = sizeof(struct mxc_gpio_plat), + .priv_auto = sizeof(struct mxc_bank_info), .of_match = mxc_gpio_ids, .bind = mxc_gpio_bind, }; diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index aaabb0216be..83147b49190 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -298,8 +298,8 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = { .id = UCLASS_GPIO, .ops = &gpio_mxs_ops, .probe = mxs_gpio_probe, - .priv_auto_alloc_size = sizeof(struct mxs_gpio_priv), - .platdata_auto_alloc_size = sizeof(struct mxs_gpio_platdata), + .priv_auto = sizeof(struct mxs_gpio_priv), + .platdata_auto = sizeof(struct mxs_gpio_platdata), #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = mxs_gpio_ids, .ofdata_to_platdata = mxs_ofdata_to_platdata, diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c index 5ec73c43599..1bd12f15686 100644 --- a/drivers/gpio/nx_gpio.c +++ b/drivers/gpio/nx_gpio.c @@ -245,6 +245,6 @@ U_BOOT_DRIVER(nx_gpio) = { .of_match = nx_gpio_ids, .ops = &nx_gpio_ops, .ofdata_to_platdata = nx_gpio_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct nx_gpio_platdata), + .platdata_auto = sizeof(struct nx_gpio_platdata), .probe = nx_gpio_probe, }; diff --git a/drivers/gpio/octeon_gpio.c b/drivers/gpio/octeon_gpio.c index f1c67fd006d..958516d8f8e 100644 --- a/drivers/gpio/octeon_gpio.c +++ b/drivers/gpio/octeon_gpio.c @@ -236,7 +236,7 @@ U_BOOT_DRIVER(octeon_gpio) = { .id = UCLASS_GPIO, .of_match = of_match_ptr(octeon_gpio_ids), .probe = octeon_gpio_probe, - .priv_auto_alloc_size = sizeof(struct octeon_gpio), + .priv_auto = sizeof(struct octeon_gpio), .ops = &octeon_gpio_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 6eaa0a08a26..9e828058cdf 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -363,14 +363,14 @@ U_BOOT_DRIVER(gpio_omap) = { #if !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_gpio_ids, .ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata), - .platdata_auto_alloc_size = sizeof(struct omap_gpio_platdata), + .platdata_auto = sizeof(struct omap_gpio_platdata), #endif #else .bind = omap_gpio_bind, #endif .ops = &gpio_omap_ops, .probe = omap_gpio_probe, - .priv_auto_alloc_size = sizeof(struct gpio_bank), + .priv_auto = sizeof(struct gpio_bank), #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, #endif diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index fd17d1a5910..32d4a836131 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -385,6 +385,6 @@ U_BOOT_DRIVER(pca953x) = { .id = UCLASS_GPIO, .ops = &pca953x_ops, .probe = pca953x_probe, - .platdata_auto_alloc_size = sizeof(struct pca953x_info), + .platdata_auto = sizeof(struct pca953x_info), .of_match = pca953x_ids, }; diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c index 1b9a18fe5dc..7fcadc79c15 100644 --- a/drivers/gpio/pcf8575_gpio.c +++ b/drivers/gpio/pcf8575_gpio.c @@ -177,5 +177,5 @@ U_BOOT_DRIVER(gpio_pcf8575) = { .of_match = pcf8575_gpio_ids, .ofdata_to_platdata = pcf8575_ofdata_platdata, .probe = pcf8575_gpio_probe, - .platdata_auto_alloc_size = sizeof(struct pcf8575_chip), + .platdata_auto = sizeof(struct pcf8575_chip), }; diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c index bb1ad256fac..253a9ba2f84 100644 --- a/drivers/gpio/pic32_gpio.c +++ b/drivers/gpio/pic32_gpio.c @@ -161,5 +161,5 @@ U_BOOT_DRIVER(gpio_pic32) = { .of_match = pic32_gpio_ids, .ops = &gpio_pic32_ops, .probe = pic32_gpio_probe, - .priv_auto_alloc_size = sizeof(struct pic32_gpio_priv), + .priv_auto = sizeof(struct pic32_gpio_priv), }; diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c index 58f044678b7..20d5bd55d00 100644 --- a/drivers/gpio/pm8916_gpio.c +++ b/drivers/gpio/pm8916_gpio.c @@ -212,7 +212,7 @@ U_BOOT_DRIVER(gpio_pm8916) = { .ofdata_to_platdata = pm8916_gpio_ofdata_to_platdata, .probe = pm8916_gpio_probe, .ops = &pm8916_gpio_ops, - .priv_auto_alloc_size = sizeof(struct pm8916_gpio_bank), + .priv_auto = sizeof(struct pm8916_gpio_bank), };

@@ -297,5 +297,5 @@ U_BOOT_DRIVER(pwrkey_pm8941) = { .ofdata_to_platdata = pm8941_pwrkey_ofdata_to_platdata, .probe = pm8941_pwrkey_probe, .ops = &pm8941_pwrkey_ops, - .priv_auto_alloc_size = sizeof(struct pm8916_gpio_bank), + .priv_auto = sizeof(struct pm8916_gpio_bank), }; diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c index 8cc288581c9..68f30157a9a 100644 --- a/drivers/gpio/rk_gpio.c +++ b/drivers/gpio/rk_gpio.c @@ -177,6 +177,6 @@ U_BOOT_DRIVER(rockchip_gpio_bank) = { .id = UCLASS_GPIO, .of_match = rockchip_gpio_ids, .ops = &gpio_rockchip_ops, - .priv_auto_alloc_size = sizeof(struct rockchip_gpio_priv), + .priv_auto = sizeof(struct rockchip_gpio_priv), .probe = rockchip_gpio_probe, }; diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c index ec8d54922d3..3fc436759cc 100644 --- a/drivers/gpio/s5p_gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -365,7 +365,7 @@ U_BOOT_DRIVER(gpio_exynos) = { .of_match = exynos_gpio_ids, .bind = gpio_exynos_bind, .probe = gpio_exynos_probe, - .priv_auto_alloc_size = sizeof(struct exynos_bank_info), + .priv_auto = sizeof(struct exynos_bank_info), .ops = &gpio_exynos_ops, }; #endif diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c index eb2600de311..fa871305baf 100644 --- a/drivers/gpio/sandbox.c +++ b/drivers/gpio/sandbox.c @@ -532,6 +532,6 @@ U_BOOT_DRIVER(sandbox_pinctrl_gpio) = { .ops = &sandbox_pinctrl_gpio_ops, .bind = dm_scan_fdt_dev, .probe = sandbox_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct sb_pinctrl_priv), + .priv_auto = sizeof(struct sb_pinctrl_priv), ACPI_OPS_PTR(&pinctrl_sandbox_acpi_ops) }; diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c index bf3537b76bd..19239f5db91 100644 --- a/drivers/gpio/sifive-gpio.c +++ b/drivers/gpio/sifive-gpio.c @@ -172,7 +172,7 @@ U_BOOT_DRIVER(gpio_sifive) = { .id = UCLASS_GPIO, .of_match = sifive_gpio_match, .ofdata_to_platdata = of_match_ptr(sifive_gpio_ofdata_to_platdata), - .platdata_auto_alloc_size = sizeof(struct sifive_gpio_platdata), + .platdata_auto = sizeof(struct sifive_gpio_platdata), .ops = &sifive_gpio_ops, .probe = sifive_gpio_probe, }; diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c index 51e1efd7014..79d55e812db 100644 --- a/drivers/gpio/stm32_gpio.c +++ b/drivers/gpio/stm32_gpio.c @@ -342,5 +342,5 @@ U_BOOT_DRIVER(gpio_stm32) = { .probe = gpio_stm32_probe, .ops = &gpio_stm32_ops, .flags = DM_UC_FLAG_SEQ_ALIAS, - .priv_auto_alloc_size = sizeof(struct stm32_gpio_priv), + .priv_auto = sizeof(struct stm32_gpio_priv), }; diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index 22d25313227..7583c8d6b26 100644 --- a/drivers/gpio/tegra_gpio.c +++ b/drivers/gpio/tegra_gpio.c @@ -377,6 +377,6 @@ U_BOOT_DRIVER(gpio_tegra) = { .of_match = tegra_gpio_ids, .bind = gpio_tegra_bind, .probe = gpio_tegra_probe, - .priv_auto_alloc_size = sizeof(struct tegra_port_info), + .priv_auto = sizeof(struct tegra_port_info), .ops = &gpio_tegra_ops, }; diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index 0474d2df2da..3ded586238c 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -132,6 +132,6 @@ U_BOOT_DRIVER(gpio_vybrid) = { .of_match = vybrid_gpio_ids, .ofdata_to_platdata = vybrid_gpio_odata_to_platdata, .probe = vybrid_gpio_probe, - .priv_auto_alloc_size = sizeof(struct vybrid_gpios), - .platdata_auto_alloc_size = sizeof(struct vybrid_gpio_platdata), + .priv_auto = sizeof(struct vybrid_gpios), + .platdata_auto = sizeof(struct vybrid_gpio_platdata), }; diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 014f120d609..1bb70b12c92 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -307,6 +307,6 @@ U_BOOT_DRIVER(xilinx_gpio) = { .of_match = xilinx_gpio_ids, .ofdata_to_platdata = xilinx_gpio_ofdata_to_platdata, .probe = xilinx_gpio_probe, - .platdata_auto_alloc_size = sizeof(struct xilinx_gpio_platdata), - .priv_auto_alloc_size = sizeof(struct xilinx_gpio_privdata), + .platdata_auto = sizeof(struct xilinx_gpio_platdata), + .priv_auto = sizeof(struct xilinx_gpio_privdata), }; diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index d0e90b8d633..4ef2985e766 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -407,5 +407,5 @@ U_BOOT_DRIVER(gpio_zynq) = { .of_match = zynq_gpio_ids, .ofdata_to_platdata = zynq_gpio_ofdata_to_platdata, .probe = zynq_gpio_probe, - .platdata_auto_alloc_size = sizeof(struct zynq_gpio_platdata), + .platdata_auto = sizeof(struct zynq_gpio_platdata), }; diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c index 8be585a0c86..fdc1f6fd53e 100644 --- a/drivers/hwspinlock/stm32_hwspinlock.c +++ b/drivers/hwspinlock/stm32_hwspinlock.c @@ -90,5 +90,5 @@ U_BOOT_DRIVER(hwspinlock_stm32mp1) = { .of_match = stm32mp1_hwspinlock_ids, .ops = &stm32mp1_hwspinlock_ops, .probe = stm32mp1_hwspinlock_probe, - .priv_auto_alloc_size = sizeof(struct stm32mp1_hws_priv), + .priv_auto = sizeof(struct stm32mp1_hws_priv), }; diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c index afd4b44100b..a4caba46baf 100644 --- a/drivers/i2c/ast_i2c.c +++ b/drivers/i2c/ast_i2c.c @@ -352,6 +352,6 @@ U_BOOT_DRIVER(ast_i2c) = { .of_match = ast_i2c_ids, .probe = ast_i2c_probe, .ofdata_to_platdata = ast_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct ast_i2c_priv), + .priv_auto = sizeof(struct ast_i2c_priv), .ops = &ast_i2c_ops, }; diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c index 9d6c6d80e2a..db2fbc9d66d 100644 --- a/drivers/i2c/at91_i2c.c +++ b/drivers/i2c/at91_i2c.c @@ -318,7 +318,7 @@ U_BOOT_DRIVER(i2c_at91) = { .of_match = at91_i2c_ids, .probe = at91_i2c_probe, .ofdata_to_platdata = at91_i2c_ofdata_to_platdata, - .per_child_auto_alloc_size = sizeof(struct dm_i2c_chip), - .priv_auto_alloc_size = sizeof(struct at91_i2c_bus), + .per_child_auto = sizeof(struct dm_i2c_chip), + .priv_auto = sizeof(struct at91_i2c_bus), .ops = &at91_i2c_ops, }; diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c index a630817352e..1cc5c0618e5 100644 --- a/drivers/i2c/cros_ec_tunnel.c +++ b/drivers/i2c/cros_ec_tunnel.c @@ -56,6 +56,6 @@ U_BOOT_DRIVER(cros_ec_tunnel) = { .id = UCLASS_I2C, .of_match = cros_ec_i2c_ids, .ofdata_to_platdata = cros_ec_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct cros_ec_i2c_bus), + .priv_auto = sizeof(struct cros_ec_i2c_bus), .ops = &cros_ec_i2c_ops, }; diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c index 478385ad683..7811abad80b 100644 --- a/drivers/i2c/davinci_i2c.c +++ b/drivers/i2c/davinci_i2c.c @@ -504,7 +504,7 @@ U_BOOT_DRIVER(i2c_davinci) = { .id = UCLASS_I2C, .of_match = davinci_i2c_ids, .probe = davinci_i2c_probe, - .priv_auto_alloc_size = sizeof(struct i2c_bus), + .priv_auto = sizeof(struct i2c_bus), .ops = &davinci_i2c_ops, };

diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c index 791f32e971c..c8927ebfeb8 100644 --- a/drivers/i2c/designware_i2c.c +++ b/drivers/i2c/designware_i2c.c @@ -842,7 +842,7 @@ U_BOOT_DRIVER(i2c_designware) = { .of_match = designware_i2c_ids, .ofdata_to_platdata = designware_i2c_ofdata_to_platdata, .probe = designware_i2c_probe, - .priv_auto_alloc_size = sizeof(struct dw_i2c), + .priv_auto = sizeof(struct dw_i2c), .remove = designware_i2c_remove, .flags = DM_FLAG_OS_PREPARE, .ops = &designware_i2c_ops, diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c index 9237726b475..6e7b6a2c063 100644 --- a/drivers/i2c/designware_i2c_pci.c +++ b/drivers/i2c/designware_i2c_pci.c @@ -199,7 +199,7 @@ U_BOOT_DRIVER(i2c_designware_pci) = { .bind = designware_i2c_pci_bind, .ofdata_to_platdata = designware_i2c_pci_ofdata_to_platdata, .probe = designware_i2c_pci_probe, - .priv_auto_alloc_size = sizeof(struct dw_i2c), + .priv_auto = sizeof(struct dw_i2c), .remove = designware_i2c_remove, .flags = DM_FLAG_OS_PREPARE, .ops = &designware_i2c_ops, diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c index 87fc9c19940..da8011029dd 100644 --- a/drivers/i2c/exynos_hs_i2c.c +++ b/drivers/i2c/exynos_hs_i2c.c @@ -558,6 +558,6 @@ U_BOOT_DRIVER(hs_i2c) = { .id = UCLASS_I2C, .of_match = exynos_hs_i2c_ids, .ofdata_to_platdata = s3c_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus), + .priv_auto = sizeof(struct s3c24x0_i2c_bus), .ops = &exynos_hs_i2c_ops, }; diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index da933452f51..f55b4751977 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -650,7 +650,7 @@ U_BOOT_DRIVER(i2c_fsl) = { .of_match = fsl_i2c_ids, .probe = fsl_i2c_probe, .ofdata_to_platdata = fsl_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct fsl_i2c_dev), + .priv_auto = sizeof(struct fsl_i2c_dev), .ops = &fsl_i2c_ops, };

diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c index 7144d39984e..2cf22330e0b 100644 --- a/drivers/i2c/i2c-cdns.c +++ b/drivers/i2c/i2c-cdns.c @@ -504,6 +504,6 @@ U_BOOT_DRIVER(cdns_i2c) = { .id = UCLASS_I2C, .of_match = cdns_i2c_of_match, .ofdata_to_platdata = cdns_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct i2c_cdns_bus), + .priv_auto = sizeof(struct i2c_cdns_bus), .ops = &cdns_i2c_ops, }; diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c index 036fc4282b5..420dfdbab94 100644 --- a/drivers/i2c/i2c-cortina.c +++ b/drivers/i2c/i2c-cortina.c @@ -341,7 +341,7 @@ U_BOOT_DRIVER(i2c_cortina) = { .of_match = ca_i2c_ids, .ofdata_to_platdata = ca_i2c_ofdata_to_platdata, .probe = ca_i2c_probe, - .priv_auto_alloc_size = sizeof(struct ca_i2c), + .priv_auto = sizeof(struct ca_i2c), .ops = &ca_i2c_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index 84b6a219d19..956ebeefb61 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -64,14 +64,14 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp) UCLASS_DRIVER(i2c_emul) = { .id = UCLASS_I2C_EMUL, .name = "i2c_emul", - .per_device_platdata_auto_alloc_size = + .per_device_platdata_auto = sizeof(struct i2c_emul_uc_platdata), };

/* * This uclass is a child of the i2c bus. Its platdata is not defined here so * is defined by its parent, UCLASS_I2C, which uses struct dm_i2c_chip. See - * per_child_platdata_auto_alloc_size in UCLASS_DRIVER(i2c). + * per_child_platdata_auto in UCLASS_DRIVER(i2c). */ UCLASS_DRIVER(i2c_emul_parent) = { .id = UCLASS_I2C_EMUL_PARENT, diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c index 3eb31672bec..0f363da4188 100644 --- a/drivers/i2c/i2c-gpio.c +++ b/drivers/i2c/i2c-gpio.c @@ -372,6 +372,6 @@ U_BOOT_DRIVER(i2c_gpio) = { .of_match = i2c_gpio_ids, .probe = i2c_gpio_drv_probe, .ofdata_to_platdata = i2c_gpio_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct i2c_gpio_bus), + .priv_auto = sizeof(struct i2c_gpio_bus), .ops = &i2c_gpio_ops, }; diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index 2625bd72dc8..3ef0188af27 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -733,11 +733,11 @@ UCLASS_DRIVER(i2c) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .post_bind = i2c_post_bind, .init = i2c_uclass_init, - .priv_auto_alloc_size = sizeof(struct i2c_priv), + .priv_auto = sizeof(struct i2c_priv), .pre_probe = i2c_pre_probe, .post_probe = i2c_post_probe, - .per_device_auto_alloc_size = sizeof(struct dm_i2c_bus), - .per_child_platdata_auto_alloc_size = sizeof(struct dm_i2c_chip), + .per_device_auto = sizeof(struct dm_i2c_bus), + .per_child_platdata_auto = sizeof(struct dm_i2c_chip), .child_post_bind = i2c_child_post_bind, };

@@ -760,7 +760,7 @@ U_BOOT_DRIVER(i2c_generic_chip_drv) = { .of_match = generic_chip_i2c_ids, #if CONFIG_IS_ENABLED(ACPIGEN) .ofdata_to_platdata = acpi_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct acpi_i2c_priv), + .priv_auto = sizeof(struct acpi_i2c_priv), #endif ACPI_OPS_PTR(&acpi_i2c_ops) }; diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c index a110fe9e8d9..9d6f1688cb1 100644 --- a/drivers/i2c/i2c-uniphier-f.c +++ b/drivers/i2c/i2c-uniphier-f.c @@ -326,6 +326,6 @@ U_BOOT_DRIVER(uniphier_fi2c) = { .id = UCLASS_I2C, .of_match = uniphier_fi2c_of_match, .probe = uniphier_fi2c_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_fi2c_priv), + .priv_auto = sizeof(struct uniphier_fi2c_priv), .ops = &uniphier_fi2c_ops, }; diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c index e7f44e14e9c..6eafbeeef4e 100644 --- a/drivers/i2c/i2c-uniphier.c +++ b/drivers/i2c/i2c-uniphier.c @@ -214,6 +214,6 @@ U_BOOT_DRIVER(uniphier_i2c) = { .id = UCLASS_I2C, .of_match = uniphier_i2c_of_match, .probe = uniphier_i2c_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_i2c_priv), + .priv_auto = sizeof(struct uniphier_i2c_priv), .ops = &uniphier_i2c_ops, }; diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c index 69042d54205..0a1a85dfc28 100644 --- a/drivers/i2c/i2c-versatile.c +++ b/drivers/i2c/i2c-versatile.c @@ -272,6 +272,6 @@ U_BOOT_DRIVER(versatile_i2c) = { .id = UCLASS_I2C, .of_match = versatile_i2c_of_match, .probe = versatile_i2c_probe, - .priv_auto_alloc_size = sizeof(struct versatile_i2c_priv), + .priv_auto = sizeof(struct versatile_i2c_priv), .ops = &versatile_i2c_ops, }; diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c index cec38538da4..f91a96a3aa3 100644 --- a/drivers/i2c/ihs_i2c.c +++ b/drivers/i2c/ihs_i2c.c @@ -354,7 +354,7 @@ U_BOOT_DRIVER(i2c_ihs) = { .id = UCLASS_I2C, .of_match = ihs_i2c_ids, .probe = ihs_i2c_probe, - .priv_auto_alloc_size = sizeof(struct ihs_i2c_priv), + .priv_auto = sizeof(struct ihs_i2c_priv), .ops = &ihs_i2c_ops, };

diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index a4e8ab795d4..92c500327b4 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -519,6 +519,6 @@ U_BOOT_DRIVER(imx_lpi2c) = { .id = UCLASS_I2C, .of_match = imx_lpi2c_ids, .probe = imx_lpi2c_probe, - .priv_auto_alloc_size = sizeof(struct imx_lpi2c_bus), + .priv_auto = sizeof(struct imx_lpi2c_bus), .ops = &imx_lpi2c_ops, }; diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c index 66d017a2615..52f7a528efe 100644 --- a/drivers/i2c/intel_i2c.c +++ b/drivers/i2c/intel_i2c.c @@ -296,7 +296,7 @@ U_BOOT_DRIVER(intel_i2c) = { .id = UCLASS_I2C, .of_match = intel_i2c_ids, .ops = &intel_i2c_ops, - .priv_auto_alloc_size = sizeof(struct intel_i2c), + .priv_auto = sizeof(struct intel_i2c), .bind = intel_i2c_bind, .probe = intel_i2c_probe, }; diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c index b7e9ced8983..20e25957330 100644 --- a/drivers/i2c/iproc_i2c.c +++ b/drivers/i2c/iproc_i2c.c @@ -707,7 +707,7 @@ U_BOOT_DRIVER(iproc_i2c) = { .of_match = iproc_i2c_ids, .ofdata_to_platdata = iproc_i2c_ofdata_to_platdata, .probe = iproc_i2c_probe, - .priv_auto_alloc_size = sizeof(struct iproc_i2c), + .priv_auto = sizeof(struct iproc_i2c), .ops = &iproc_i2c_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c index e070caf43f2..434e3461b1d 100644 --- a/drivers/i2c/meson_i2c.c +++ b/drivers/i2c/meson_i2c.c @@ -308,6 +308,6 @@ U_BOOT_DRIVER(i2c_meson) = { .id = UCLASS_I2C, .of_match = meson_i2c_ids, .probe = meson_i2c_probe, - .priv_auto_alloc_size = sizeof(struct meson_i2c), + .priv_auto = sizeof(struct meson_i2c), .ops = &meson_i2c_ops, }; diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c index 584d0a4fef1..928e02b7af1 100644 --- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c +++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c @@ -145,5 +145,5 @@ U_BOOT_DRIVER(i2c_arbitrator) = { .probe = i2c_arbitrator_probe, .remove = i2c_arbitrator_remove, .ops = &i2c_arbitrator_ops, - .priv_auto_alloc_size = sizeof(struct i2c_arbitrator_priv), + .priv_auto = sizeof(struct i2c_arbitrator_priv), }; diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index 83dcb402133..8d6e208a0b8 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -136,5 +136,5 @@ U_BOOT_DRIVER(i2c_mux_gpio) = { .of_match = i2c_mux_gpio_ids, .ops = &i2c_mux_gpio_ops, .probe = i2c_mux_gpio_probe, - .priv_auto_alloc_size = sizeof(struct i2c_mux_gpio_priv), + .priv_auto = sizeof(struct i2c_mux_gpio_priv), }; diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c index 9a8cf8fb172..f40a9c95df1 100644 --- a/drivers/i2c/muxes/i2c-mux-uclass.c +++ b/drivers/i2c/muxes/i2c-mux-uclass.c @@ -220,7 +220,7 @@ UCLASS_DRIVER(i2c_mux) = { .name = "i2c_mux", .post_bind = i2c_mux_post_bind, .post_probe = i2c_mux_post_probe, - .per_device_auto_alloc_size = sizeof(struct i2c_mux), - .per_child_platdata_auto_alloc_size = sizeof(struct i2c_mux_bus), + .per_device_auto = sizeof(struct i2c_mux), + .per_child_platdata_auto = sizeof(struct i2c_mux_bus), .child_post_bind = i2c_mux_child_post_bind, }; diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c index 7360e162eeb..06efe846765 100644 --- a/drivers/i2c/muxes/pca954x.c +++ b/drivers/i2c/muxes/pca954x.c @@ -172,5 +172,5 @@ U_BOOT_DRIVER(pca954x) = { .remove = pca954x_remove, .ops = &pca954x_ops, .ofdata_to_platdata = pca954x_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct pca954x_priv), + .priv_auto = sizeof(struct pca954x_priv), }; diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c index 82e8fdac413..ef1007de142 100644 --- a/drivers/i2c/mv_i2c.c +++ b/drivers/i2c/mv_i2c.c @@ -600,7 +600,7 @@ U_BOOT_DRIVER(i2c_mv) = { .id = UCLASS_I2C, .of_match = mv_i2c_ids, .probe = mv_i2c_probe, - .priv_auto_alloc_size = sizeof(struct mv_i2c_priv), + .priv_auto = sizeof(struct mv_i2c_priv), .ops = &mv_i2c_ops, }; #endif /* CONFIG_DM_I2C */ diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 5cec4d68c90..d29bd78a7a0 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -888,7 +888,7 @@ U_BOOT_DRIVER(i2c_mvtwsi) = { .bind = mvtwsi_i2c_bind, .probe = mvtwsi_i2c_probe, .ofdata_to_platdata = mvtwsi_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct mvtwsi_i2c_dev), + .priv_auto = sizeof(struct mvtwsi_i2c_dev), .ops = &mvtwsi_i2c_ops, }; #endif /* CONFIG_DM_I2C */ diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index d7f8e821aca..cbc2bbf5d39 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -1072,7 +1072,7 @@ U_BOOT_DRIVER(i2c_mxc) = { .id = UCLASS_I2C, .of_match = mxc_i2c_ids, .probe = mxc_i2c_probe, - .priv_auto_alloc_size = sizeof(struct mxc_i2c_bus), + .priv_auto = sizeof(struct mxc_i2c_bus), .ops = &mxc_i2c_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/i2c/nx_i2c.c b/drivers/i2c/nx_i2c.c index 3f0e7124b72..c63a7325576 100644 --- a/drivers/i2c/nx_i2c.c +++ b/drivers/i2c/nx_i2c.c @@ -621,6 +621,6 @@ U_BOOT_DRIVER(i2c_nexell) = { .id = UCLASS_I2C, .of_match = nx_i2c_ids, .probe = nx_i2c_probe, - .priv_auto_alloc_size = sizeof(struct nx_i2c_bus), + .priv_auto = sizeof(struct nx_i2c_bus), .ops = &nx_i2c_ops, }; diff --git a/drivers/i2c/octeon_i2c.c b/drivers/i2c/octeon_i2c.c index 85ad357eca9..ea2cc33f9de 100644 --- a/drivers/i2c/octeon_i2c.c +++ b/drivers/i2c/octeon_i2c.c @@ -834,6 +834,6 @@ U_BOOT_DRIVER(octeon_pci_twsi) = { .id = UCLASS_I2C, .of_match = octeon_i2c_ids, .probe = octeon_i2c_probe, - .priv_auto_alloc_size = sizeof(struct octeon_twsi), + .priv_auto = sizeof(struct octeon_twsi), .ops = &octeon_i2c_ops, }; diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 0af4e333c41..bdb4f079e9d 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -1094,10 +1094,10 @@ U_BOOT_DRIVER(i2c_omap) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_i2c_ids, .ofdata_to_platdata = omap_i2c_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct omap_i2c_platdata), + .platdata_auto = sizeof(struct omap_i2c_platdata), #endif .probe = omap_i2c_probe, - .priv_auto_alloc_size = sizeof(struct omap_i2c), + .priv_auto = sizeof(struct omap_i2c), .ops = &omap_i2c_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index 663c342cd83..14bb6603d59 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -371,6 +371,6 @@ U_BOOT_DRIVER(i2c_rcar) = { .id = UCLASS_I2C, .of_match = rcar_i2c_ids, .probe = rcar_i2c_probe, - .priv_auto_alloc_size = sizeof(struct rcar_i2c_priv), + .priv_auto = sizeof(struct rcar_i2c_priv), .ops = &rcar_i2c_ops, }; diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c index cad0a623d36..f0e50914c68 100644 --- a/drivers/i2c/rcar_iic.c +++ b/drivers/i2c/rcar_iic.c @@ -269,6 +269,6 @@ U_BOOT_DRIVER(iic_rcar) = { .id = UCLASS_I2C, .of_match = rcar_iic_ids, .probe = rcar_iic_probe, - .priv_auto_alloc_size = sizeof(struct rcar_iic_priv), + .priv_auto = sizeof(struct rcar_iic_priv), .ops = &rcar_iic_ops, }; diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index 659461088b7..e9717e530c3 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -491,7 +491,7 @@ U_BOOT_DRIVER(rockchip_rk3066_i2c) = { .of_match = rockchip_i2c_ids, .ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata, .probe = rockchip_i2c_probe, - .priv_auto_alloc_size = sizeof(struct rk_i2c), + .priv_auto = sizeof(struct rk_i2c), .ops = &rockchip_i2c_ops, };

diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 29ba217e709..b4b8e6b1b65 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -343,6 +343,6 @@ U_BOOT_DRIVER(i2c_s3c) = { .id = UCLASS_I2C, .of_match = s3c_i2c_ids, .ofdata_to_platdata = s3c_i2c_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct s3c24x0_i2c_bus), + .priv_auto = sizeof(struct s3c24x0_i2c_bus), .ops = &s3c_i2c_ops, }; diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c index 2cbdaf9cc73..3abd05324af 100644 --- a/drivers/i2c/sandbox_i2c.c +++ b/drivers/i2c/sandbox_i2c.c @@ -98,5 +98,5 @@ U_BOOT_DRIVER(sandbox_i2c) = { .id = UCLASS_I2C, .of_match = sandbox_i2c_ids, .ops = &sandbox_i2c_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_i2c_priv), + .priv_auto = sizeof(struct sandbox_i2c_priv), }; diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c index 2f609115494..483d83409f7 100644 --- a/drivers/i2c/stm32f7_i2c.c +++ b/drivers/i2c/stm32f7_i2c.c @@ -955,6 +955,6 @@ U_BOOT_DRIVER(stm32f7_i2c) = { .of_match = stm32_i2c_of_match, .ofdata_to_platdata = stm32_ofdata_to_platdata, .probe = stm32_i2c_probe, - .priv_auto_alloc_size = sizeof(struct stm32_i2c_priv), + .priv_auto = sizeof(struct stm32_i2c_priv), .ops = &stm32_i2c_ops, }; diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c index 37204718ca1..88e4e9a5c9d 100644 --- a/drivers/i2c/tegra186_bpmp_i2c.c +++ b/drivers/i2c/tegra186_bpmp_i2c.c @@ -122,6 +122,6 @@ U_BOOT_DRIVER(i2c_gpio) = { .id = UCLASS_I2C, .of_match = tegra186_bpmp_i2c_ids, .probe = tegra186_bpmp_i2c_probe, - .priv_auto_alloc_size = sizeof(struct tegra186_bpmp_i2c), + .priv_auto = sizeof(struct tegra186_bpmp_i2c), .ops = &tegra186_bpmp_i2c_ops, }; diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index 19212020e84..1e744845423 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -524,6 +524,6 @@ U_BOOT_DRIVER(i2c_tegra) = { .id = UCLASS_I2C, .of_match = tegra_i2c_ids, .probe = tegra_i2c_probe, - .priv_auto_alloc_size = sizeof(struct i2c_bus), + .priv_auto = sizeof(struct i2c_bus), .ops = &tegra_i2c_ops, }; diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c index 149bd327bdf..72199a62b2d 100644 --- a/drivers/i2c/xilinx_xiic.c +++ b/drivers/i2c/xilinx_xiic.c @@ -348,6 +348,6 @@ U_BOOT_DRIVER(xilinx_xiic) = { .id = UCLASS_I2C, .of_match = xilinx_xiic_ids, .probe = xilinx_xiic_probe, - .priv_auto_alloc_size = sizeof(struct xilinx_xiic_priv), + .priv_auto = sizeof(struct xilinx_xiic_priv), .ops = &xilinx_xiic_ops, }; diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c index 0c0f52205b2..dc3b08c0f66 100644 --- a/drivers/input/cros_ec_keyb.c +++ b/drivers/input/cros_ec_keyb.c @@ -251,5 +251,5 @@ U_BOOT_DRIVER(google_cros_ec_keyb) = { .of_match = cros_ec_kbd_ids, .probe = cros_ec_kbd_probe, .ops = &cros_ec_kbd_ops, - .priv_auto_alloc_size = sizeof(struct cros_ec_keyb_priv), + .priv_auto = sizeof(struct cros_ec_keyb_priv), }; diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 7beaccca2c8..1ea11fd67b4 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -357,5 +357,5 @@ U_BOOT_DRIVER(i8042_kbd) = { .probe = i8042_kbd_probe, .remove = i8042_kbd_remove, .ops = &i8042_kbd_ops, - .priv_auto_alloc_size = sizeof(struct i8042_kbd_priv), + .priv_auto = sizeof(struct i8042_kbd_priv), }; diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c index f19934e6bb6..2c6680337d9 100644 --- a/drivers/input/keyboard-uclass.c +++ b/drivers/input/keyboard-uclass.c @@ -87,5 +87,5 @@ UCLASS_DRIVER(keyboard) = { .id = UCLASS_KEYBOARD, .name = "keyboard", .pre_probe = keyboard_pre_probe, - .per_device_auto_alloc_size = sizeof(struct keyboard_priv), + .per_device_auto = sizeof(struct keyboard_priv), }; diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index f07a51dc307..5113041d3e5 100644 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -350,5 +350,5 @@ U_BOOT_DRIVER(tegra_kbd) = { .of_match = tegra_kbd_ids, .probe = tegra_kbd_probe, .ops = &tegra_kbd_ops, - .priv_auto_alloc_size = sizeof(struct tegra_kbd_priv), + .priv_auto = sizeof(struct tegra_kbd_priv), }; diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 2859475a6b8..d20e28dc616 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -96,5 +96,5 @@ int led_default_state(void) UCLASS_DRIVER(led) = { .id = UCLASS_LED, .name = "led", - .per_device_platdata_auto_alloc_size = sizeof(struct led_uc_plat), + .per_device_platdata_auto = sizeof(struct led_uc_plat), }; diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c index 52946835de3..dbe9ab15a50 100644 --- a/drivers/led/led_bcm6328.c +++ b/drivers/led/led_bcm6328.c @@ -241,5 +241,5 @@ U_BOOT_DRIVER(bcm6328_led) = { .ops = &bcm6328_led_ops, .bind = bcm6328_led_bind, .probe = bcm6328_led_probe, - .priv_auto_alloc_size = sizeof(struct bcm6328_led_priv), + .priv_auto = sizeof(struct bcm6328_led_priv), }; diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c index 307d418a178..4bf4a09a0a5 100644 --- a/drivers/led/led_bcm6358.c +++ b/drivers/led/led_bcm6358.c @@ -210,6 +210,6 @@ U_BOOT_DRIVER(bcm6358_led) = { .of_match = bcm6358_led_ids, .bind = bcm6358_led_bind, .probe = bcm6358_led_probe, - .priv_auto_alloc_size = sizeof(struct bcm6358_led_priv), + .priv_auto = sizeof(struct bcm6358_led_priv), .ops = &bcm6358_led_ops, }; diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c index 511185ffad7..0b1379dfd88 100644 --- a/drivers/led/led_bcm6858.c +++ b/drivers/led/led_bcm6858.c @@ -247,6 +247,6 @@ U_BOOT_DRIVER(bcm6858_led) = { .of_match = bcm6858_led_ids, .bind = bcm6858_led_bind, .probe = bcm6858_led_probe, - .priv_auto_alloc_size = sizeof(struct bcm6858_led_priv), + .priv_auto = sizeof(struct bcm6858_led_priv), .ops = &bcm6858_led_ops, }; diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c index 8fd6fd15396..b8760bef393 100644 --- a/drivers/led/led_cortina.c +++ b/drivers/led/led_cortina.c @@ -292,7 +292,7 @@ U_BOOT_DRIVER(cortina_led) = { .ofdata_to_platdata = ca_led_ofdata_to_platdata, .bind = cortina_led_bind, .probe = cortina_led_probe, - .platdata_auto_alloc_size = sizeof(struct cortina_led_platdata), - .priv_auto_alloc_size = sizeof(struct cortina_led_cfg), + .platdata_auto = sizeof(struct cortina_led_platdata), + .priv_auto = sizeof(struct cortina_led_cfg), .ops = &cortina_led_ops, }; diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c index 2cdb0269f41..fe18ae3eed1 100644 --- a/drivers/led/led_gpio.c +++ b/drivers/led/led_gpio.c @@ -128,7 +128,7 @@ U_BOOT_DRIVER(led_gpio) = { .id = UCLASS_LED, .of_match = led_gpio_ids, .ops = &gpio_led_ops, - .priv_auto_alloc_size = sizeof(struct led_gpio_priv), + .priv_auto = sizeof(struct led_gpio_priv), .bind = led_gpio_bind, .probe = led_gpio_probe, .remove = led_gpio_remove, diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c index 27ccc6eab06..8dd93a3e11e 100644 --- a/drivers/mailbox/k3-sec-proxy.c +++ b/drivers/mailbox/k3-sec-proxy.c @@ -438,6 +438,6 @@ U_BOOT_DRIVER(k3_sec_proxy) = { .of_match = k3_sec_proxy_ids, .probe = k3_sec_proxy_probe, .remove = k3_sec_proxy_remove, - .priv_auto_alloc_size = sizeof(struct k3_sec_proxy_mbox), + .priv_auto = sizeof(struct k3_sec_proxy_mbox), .ops = &k3_sec_proxy_mbox_ops, }; diff --git a/drivers/mailbox/sandbox-mbox-test.c b/drivers/mailbox/sandbox-mbox-test.c index faca8fcc441..ffd4674d1ef 100644 --- a/drivers/mailbox/sandbox-mbox-test.c +++ b/drivers/mailbox/sandbox-mbox-test.c @@ -50,5 +50,5 @@ U_BOOT_DRIVER(sandbox_mbox_test) = { .name = "sandbox_mbox_test", .id = UCLASS_MISC, .of_match = sandbox_mbox_test_ids, - .priv_auto_alloc_size = sizeof(struct sandbox_mbox_test), + .priv_auto = sizeof(struct sandbox_mbox_test), }; diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c index 19704dd5da9..87d38de0cb6 100644 --- a/drivers/mailbox/sandbox-mbox.c +++ b/drivers/mailbox/sandbox-mbox.c @@ -100,6 +100,6 @@ U_BOOT_DRIVER(sandbox_mbox) = { .of_match = sandbox_mbox_ids, .bind = sandbox_mbox_bind, .probe = sandbox_mbox_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_mbox), + .priv_auto = sizeof(struct sandbox_mbox), .ops = &sandbox_mbox_mbox_ops, }; diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c index 81a41159863..093b570414f 100644 --- a/drivers/mailbox/stm32-ipcc.c +++ b/drivers/mailbox/stm32-ipcc.c @@ -163,6 +163,6 @@ U_BOOT_DRIVER(stm32_ipcc) = { .id = UCLASS_MAILBOX, .of_match = stm32_ipcc_ids, .probe = stm32_ipcc_probe, - .priv_auto_alloc_size = sizeof(struct stm32_ipcc), + .priv_auto = sizeof(struct stm32_ipcc), .ops = &stm32_ipcc_mbox_ops, }; diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c index e91dac201d2..1d66d95fe48 100644 --- a/drivers/mailbox/tegra-hsp.c +++ b/drivers/mailbox/tegra-hsp.c @@ -189,6 +189,6 @@ U_BOOT_DRIVER(tegra_hsp) = { .of_match = tegra_hsp_ids, .bind = tegra_hsp_bind, .probe = tegra_hsp_probe, - .priv_auto_alloc_size = sizeof(struct tegra_hsp), + .priv_auto = sizeof(struct tegra_hsp), .ops = &tegra_hsp_mbox_ops, }; diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c index 847a03648b8..959cce923c5 100644 --- a/drivers/mailbox/zynqmp-ipi.c +++ b/drivers/mailbox/zynqmp-ipi.c @@ -137,6 +137,6 @@ U_BOOT_DRIVER(zynqmp_ipi) = { .id = UCLASS_MAILBOX, .of_match = zynqmp_ipi_ids, .probe = zynqmp_ipi_probe, - .priv_auto_alloc_size = sizeof(struct zynqmp_ipi), + .priv_auto = sizeof(struct zynqmp_ipi), .ops = &zynqmp_ipi_mbox_ops, }; diff --git a/drivers/memory/stm32-fmc2-ebi.c b/drivers/memory/stm32-fmc2-ebi.c index d887a1e09d0..f3f48f8b38d 100644 --- a/drivers/memory/stm32-fmc2-ebi.c +++ b/drivers/memory/stm32-fmc2-ebi.c @@ -1051,6 +1051,6 @@ U_BOOT_DRIVER(stm32_fmc2_ebi) = { .id = UCLASS_NOP, .of_match = stm32_fmc2_ebi_match, .probe = stm32_fmc2_ebi_probe, - .priv_auto_alloc_size = sizeof(struct stm32_fmc2_ebi), + .priv_auto = sizeof(struct stm32_fmc2_ebi), .bind = dm_scan_fdt_dev, }; diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index c6502650b75..509fd7eb550 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -94,6 +94,6 @@ U_BOOT_DRIVER(altera_sysid) = { .id = UCLASS_MISC, .of_match = altera_sysid_ids, .ofdata_to_platdata = altera_sysid_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_sysid_platdata), + .platdata_auto = sizeof(struct altera_sysid_platdata), .ops = &altera_sysid_ops, }; diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index 422ea6f3e5a..bacd47e60f1 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -407,5 +407,5 @@ U_BOOT_DRIVER(atsha204) = { .id = UCLASS_MISC, .of_match = atsha204a_ids, .ofdata_to_platdata = atsha204a_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(fdt_addr_t), + .priv_auto = sizeof(fdt_addr_t), }; diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 1b22f1883ee..f03b7d55d64 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -1505,7 +1505,7 @@ int cros_ec_set_lid_shutdown_mask(struct udevice *dev, int enable) UCLASS_DRIVER(cros_ec) = { .id = UCLASS_CROS_EC, .name = "cros-ec", - .per_device_auto_alloc_size = sizeof(struct cros_ec_dev), + .per_device_auto = sizeof(struct cros_ec_dev), .post_bind = dm_scan_fdt_dev, .flags = DM_UC_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c index d72db3eace9..b3bb537c59b 100644 --- a/drivers/misc/cros_ec_sandbox.c +++ b/drivers/misc/cros_ec_sandbox.c @@ -585,6 +585,6 @@ U_BOOT_DRIVER(google_cros_ec_sandbox) = { .id = UCLASS_CROS_EC, .of_match = cros_ec_ids, .probe = cros_ec_probe, - .priv_auto_alloc_size = sizeof(struct ec_state), + .priv_auto = sizeof(struct ec_state), .ops = &cros_ec_ops, }; diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 56406aa1dd2..71e20a49278 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -285,8 +285,8 @@ U_BOOT_DRIVER(fs_loader) = { .of_match = fs_loader_ids, .probe = fs_loader_probe, .ofdata_to_platdata = fs_loader_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct device_platdata), - .priv_auto_alloc_size = sizeof(struct firmware), + .platdata_auto = sizeof(struct device_platdata), + .priv_auto = sizeof(struct firmware), };

UCLASS_DRIVER(fs_loader) = { diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c index 69e16a06a0a..145cfa23c6c 100644 --- a/drivers/misc/gdsys_ioep.c +++ b/drivers/misc/gdsys_ioep.c @@ -206,5 +206,5 @@ U_BOOT_DRIVER(gdsys_ioep) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .of_match = gdsys_ioep_ids, .probe = gdsys_ioep_probe, - .priv_auto_alloc_size = sizeof(struct gdsys_ioep_priv), + .priv_auto = sizeof(struct gdsys_ioep_priv), }; diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c index c56abce4d4c..8f5cbe420f8 100644 --- a/drivers/misc/gdsys_rxaui_ctrl.c +++ b/drivers/misc/gdsys_rxaui_ctrl.c @@ -77,5 +77,5 @@ U_BOOT_DRIVER(gdsys_rxaui_ctrl) = { .ops = &gdsys_rxaui_ctrl_ops, .of_match = gdsys_rxaui_ctrl_ids, .probe = gdsys_rxaui_ctrl_probe, - .priv_auto_alloc_size = sizeof(struct gdsys_rxaui_ctrl_priv), + .priv_auto = sizeof(struct gdsys_rxaui_ctrl_priv), }; diff --git a/drivers/misc/gdsys_soc.c b/drivers/misc/gdsys_soc.c index b4c721c6fe6..27e7dc48327 100644 --- a/drivers/misc/gdsys_soc.c +++ b/drivers/misc/gdsys_soc.c @@ -71,5 +71,5 @@ U_BOOT_DRIVER(gdsys_soc_bus) = { .id = UCLASS_SIMPLE_BUS, .of_match = gdsys_soc_ids, .probe = gdsys_soc_probe, - .priv_auto_alloc_size = sizeof(struct gdsys_soc_priv), + .priv_auto = sizeof(struct gdsys_soc_priv), }; diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 92e18356254..3499114394d 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -284,7 +284,7 @@ U_BOOT_DRIVER(i2c_eeprom_std) = { .bind = i2c_eeprom_std_bind, .probe = i2c_eeprom_std_probe, .ofdata_to_platdata = i2c_eeprom_std_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct i2c_eeprom), + .priv_auto = sizeof(struct i2c_eeprom), .ops = &i2c_eeprom_std_ops, };

@@ -366,7 +366,7 @@ U_BOOT_DRIVER(i2c_eeprom_partition) = { .id = UCLASS_I2C_EEPROM, .probe = i2c_eeprom_partition_probe, .ofdata_to_platdata = i2c_eeprom_partition_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct i2c_eeprom_partition), + .priv_auto = sizeof(struct i2c_eeprom_partition), .ops = &i2c_eeprom_partition_ops, };

diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c index 6be76ad02ef..2089df1e008 100644 --- a/drivers/misc/i2c_eeprom_emul.c +++ b/drivers/misc/i2c_eeprom_emul.c @@ -200,7 +200,7 @@ U_BOOT_DRIVER(sandbox_i2c_emul) = { .ofdata_to_platdata = sandbox_i2c_eeprom_ofdata_to_platdata, .probe = sandbox_i2c_eeprom_probe, .remove = sandbox_i2c_eeprom_remove, - .priv_auto_alloc_size = sizeof(struct sandbox_i2c_flash), - .platdata_auto_alloc_size = sizeof(struct sandbox_i2c_flash_plat_data), + .priv_auto = sizeof(struct sandbox_i2c_flash), + .platdata_auto = sizeof(struct sandbox_i2c_flash_plat_data), .ops = &sandbox_i2c_emul_ops, }; diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c index 00d34a3adc2..a0fece985d8 100644 --- a/drivers/misc/ihs_fpga.c +++ b/drivers/misc/ihs_fpga.c @@ -866,5 +866,5 @@ U_BOOT_DRIVER(ihs_fpga_bus) = { .id = UCLASS_MISC, .of_match = ihs_fpga_ids, .probe = ihs_fpga_probe, - .priv_auto_alloc_size = sizeof(struct ihs_fpga_priv), + .priv_auto = sizeof(struct ihs_fpga_priv), }; diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c index 223aac8518a..5a2a0e6c523 100644 --- a/drivers/misc/imx8/scu.c +++ b/drivers/misc/imx8/scu.c @@ -245,6 +245,6 @@ U_BOOT_DRIVER(imx8_scu) = { .bind = imx8_scu_bind, .remove = imx8_scu_remove, .ops = &imx8_scu_ops, - .platdata_auto_alloc_size = sizeof(struct imx8_scu), + .platdata_auto = sizeof(struct imx8_scu), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/misc/irq_sandbox.c b/drivers/misc/irq_sandbox.c index a2511b32fcd..1f7e62e6614 100644 --- a/drivers/misc/irq_sandbox.c +++ b/drivers/misc/irq_sandbox.c @@ -108,5 +108,5 @@ U_BOOT_DRIVER(sandbox_irq_drv) = { .id = UCLASS_IRQ, .of_match = sandbox_irq_ids, .ops = &sandbox_irq_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_irq_priv), + .priv_auto = sizeof(struct sandbox_irq_priv), }; diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c index 408c89315a9..840148d0900 100644 --- a/drivers/misc/k3_avs.c +++ b/drivers/misc/k3_avs.c @@ -390,5 +390,5 @@ U_BOOT_DRIVER(k3_avs) = { .of_match = k3_avs_ids, .id = UCLASS_MISC, .probe = k3_avs_probe, - .priv_auto_alloc_size = sizeof(struct k3_avs_privdata), + .priv_auto = sizeof(struct k3_avs_privdata), }; diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c index 64cc4ae7b61..43a539e942e 100644 --- a/drivers/misc/microchip_flexcom.c +++ b/drivers/misc/microchip_flexcom.c @@ -62,5 +62,5 @@ U_BOOT_DRIVER(microchip_flexcom) = { .id = UCLASS_MISC, .of_match = microchip_flexcom_ids, .ofdata_to_platdata = microchip_flexcom_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct microchip_flexcom_platdata), + .platdata_auto = sizeof(struct microchip_flexcom_platdata), }; diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c index f7c5b2e25fa..0e4292fd0aa 100644 --- a/drivers/misc/misc_sandbox.c +++ b/drivers/misc/misc_sandbox.c @@ -129,5 +129,5 @@ U_BOOT_DRIVER(misc_sandbox) = { .ops = &misc_sandbox_ops, .of_match = misc_sandbox_ids, .probe = misc_sandbox_probe, - .priv_auto_alloc_size = sizeof(struct misc_sandbox_priv), + .priv_auto = sizeof(struct misc_sandbox_priv), }; diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c index ab1e34e6f46..93c87e998c4 100644 --- a/drivers/misc/mpc83xx_serdes.c +++ b/drivers/misc/mpc83xx_serdes.c @@ -183,5 +183,5 @@ U_BOOT_DRIVER(mpc83xx_serdes) = { .id = UCLASS_MISC, .of_match = mpc83xx_serdes_ids, .probe = mpc83xx_serdes_probe, - .priv_auto_alloc_size = sizeof(struct mpc83xx_serdes_priv), + .priv_auto = sizeof(struct mpc83xx_serdes_priv), }; diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index 12abcff2da4..e41c2cd4814 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -221,9 +221,9 @@ static int p2sb_post_bind(struct udevice *dev) UCLASS_DRIVER(p2sb) = { .id = UCLASS_P2SB, .name = "p2sb", - .per_device_auto_alloc_size = sizeof(struct p2sb_uc_priv), + .per_device_auto = sizeof(struct p2sb_uc_priv), .post_bind = p2sb_post_bind, .child_post_bind = p2sb_child_post_bind, - .per_child_platdata_auto_alloc_size = + .per_child_platdata_auto = sizeof(struct p2sb_child_platdata), }; diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c index a4b6dba5162..acdc2c099b4 100644 --- a/drivers/misc/p2sb_emul.c +++ b/drivers/misc/p2sb_emul.c @@ -262,8 +262,8 @@ U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = { .id = UCLASS_PCI_EMUL, .of_match = sandbox_p2sb_emul_ids, .ops = &sandbox_p2sb_emul_emul_ops, - .priv_auto_alloc_size = sizeof(struct p2sb_emul_priv), - .platdata_auto_alloc_size = sizeof(struct p2sb_emul_platdata), + .priv_auto = sizeof(struct p2sb_emul_priv), + .platdata_auto = sizeof(struct p2sb_emul_platdata), };

static struct pci_device_id sandbox_p2sb_emul_supported[] = { diff --git a/drivers/misc/p2sb_sandbox.c b/drivers/misc/p2sb_sandbox.c index ce50a9732ee..d80bca22a6b 100644 --- a/drivers/misc/p2sb_sandbox.c +++ b/drivers/misc/p2sb_sandbox.c @@ -35,5 +35,5 @@ U_BOOT_DRIVER(p2sb_sandbox) = { .id = UCLASS_P2SB, .of_match = sandbox_p2sb_ids, .probe = sandbox_p2sb_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_p2sb_priv), + .priv_auto = sizeof(struct sandbox_p2sb_priv), }; diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 46ce6305fe6..447b180231d 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -155,6 +155,6 @@ U_BOOT_DRIVER(rockchip_efuse) = { .id = UCLASS_MISC, .of_match = rockchip_efuse_ids, .ofdata_to_platdata = rockchip_efuse_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct rockchip_efuse_platdata), + .platdata_auto = sizeof(struct rockchip_efuse_platdata), .ops = &rockchip_efuse_ops, }; diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c index bdd443b3db9..139855adc4d 100644 --- a/drivers/misc/rockchip-otp.c +++ b/drivers/misc/rockchip-otp.c @@ -172,5 +172,5 @@ U_BOOT_DRIVER(rockchip_otp) = { .of_match = rockchip_otp_ids, .ops = &rockchip_otp_ops, .ofdata_to_platdata = rockchip_otp_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct rockchip_otp_platdata), + .platdata_auto = sizeof(struct rockchip_otp_platdata), }; diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c index df262e62555..fed7ecfb929 100644 --- a/drivers/misc/sandbox_adder.c +++ b/drivers/misc/sandbox_adder.c @@ -56,5 +56,5 @@ U_BOOT_DRIVER(adder_sandbox) = { .of_match = sandbox_adder_ids, .probe = sandbox_adder_probe, .ops = &sandbox_adder_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_adder_priv), + .priv_auto = sizeof(struct sandbox_adder_priv), }; diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c index 92f08dde011..3dab126f3a6 100644 --- a/drivers/misc/sifive-otp.c +++ b/drivers/misc/sifive-otp.c @@ -270,6 +270,6 @@ U_BOOT_DRIVER(sifive_otp) = { .id = UCLASS_MISC, .of_match = sifive_otp_ids, .ofdata_to_platdata = sifive_otp_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct sifive_otp_platdata), + .platdata_auto = sizeof(struct sifive_otp_platdata), .ops = &sifive_otp_ops, }; diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c index 07c67577d54..d75df8e9639 100644 --- a/drivers/misc/swap_case.c +++ b/drivers/misc/swap_case.c @@ -391,8 +391,8 @@ U_BOOT_DRIVER(sandbox_swap_case_emul) = { .id = UCLASS_PCI_EMUL, .of_match = sandbox_swap_case_ids, .ops = &sandbox_swap_case_emul_ops, - .priv_auto_alloc_size = sizeof(struct swap_case_priv), - .platdata_auto_alloc_size = sizeof(struct swap_case_platdata), + .priv_auto = sizeof(struct swap_case_priv), + .platdata_auto = sizeof(struct swap_case_platdata), };

static struct pci_device_id sandbox_swap_case_supported[] = { diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c index 18da138507c..f2366d6592d 100644 --- a/drivers/misc/tegra186_bpmp.c +++ b/drivers/misc/tegra186_bpmp.c @@ -257,5 +257,5 @@ U_BOOT_DRIVER(tegra186_bpmp) = { .probe = tegra186_bpmp_probe, .remove = tegra186_bpmp_remove, .ops = &tegra186_bpmp_ops, - .priv_auto_alloc_size = sizeof(struct tegra186_bpmp), + .priv_auto = sizeof(struct tegra186_bpmp), }; diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c index 82abf484e4f..926fba68638 100644 --- a/drivers/mmc/am654_sdhci.c +++ b/drivers/mmc/am654_sdhci.c @@ -494,6 +494,6 @@ U_BOOT_DRIVER(am654_sdhci_drv) = { .ops = &sdhci_ops, .bind = am654_sdhci_bind, .probe = am654_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct am654_sdhci_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct am654_sdhci_plat), }; diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c index 846622892a9..6c118b48190 100644 --- a/drivers/mmc/arm_pl180_mmci.c +++ b/drivers/mmc/arm_pl180_mmci.c @@ -551,7 +551,7 @@ U_BOOT_DRIVER(arm_pl180_mmc) = { .probe = arm_pl180_mmc_probe, .ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata, .bind = arm_pl180_mmc_bind, - .priv_auto_alloc_size = sizeof(struct pl180_mmc_host), - .platdata_auto_alloc_size = sizeof(struct arm_pl180_mmc_plat), + .priv_auto = sizeof(struct pl180_mmc_host), + .platdata_auto = sizeof(struct arm_pl180_mmc_plat), }; #endif diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c index 543c65a8e35..4bf02c3bb47 100644 --- a/drivers/mmc/aspeed_sdhci.c +++ b/drivers/mmc/aspeed_sdhci.c @@ -86,6 +86,6 @@ U_BOOT_DRIVER(aspeed_sdhci_drv) = { .ops = &sdhci_ops, .bind = aspeed_sdhci_bind, .probe = aspeed_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct aspeed_sdhci_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct aspeed_sdhci_plat), }; diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index f56ae63bc2c..6f3b21b98d2 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -130,7 +130,7 @@ U_BOOT_DRIVER(atmel_sdhci_drv) = { .ops = &sdhci_ops, .bind = atmel_sdhci_bind, .probe = atmel_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct atmel_sdhci_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct atmel_sdhci_plat), }; #endif diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 7a410d1dd36..7beb3b562cf 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -250,7 +250,7 @@ U_BOOT_DRIVER(sdhci_cdns) = { .of_match = bcm2835_sdhci_match, .bind = bcm2835_sdhci_bind, .probe = bcm2835_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct bcm2835_sdhci_host), - .platdata_auto_alloc_size = sizeof(struct bcm2835_sdhci_plat), + .priv_auto = sizeof(struct bcm2835_sdhci_host), + .platdata_auto = sizeof(struct bcm2835_sdhci_plat), .ops = &sdhci_ops, }; diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c index ea8b385d7e1..06bebc27d3b 100644 --- a/drivers/mmc/bcm2835_sdhost.c +++ b/drivers/mmc/bcm2835_sdhost.c @@ -806,7 +806,7 @@ U_BOOT_DRIVER(bcm2835_sdhost) = { .of_match = bcm2835_match, .bind = bcm2835_bind, .probe = bcm2835_probe, - .priv_auto_alloc_size = sizeof(struct bcm2835_host), - .platdata_auto_alloc_size = sizeof(struct bcm2835_plat), + .priv_auto = sizeof(struct bcm2835_host), + .platdata_auto = sizeof(struct bcm2835_plat), .ops = &bcm2835_ops, }; diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c index 5269aa77ceb..a92467f8004 100644 --- a/drivers/mmc/bcmstb_sdhci.c +++ b/drivers/mmc/bcmstb_sdhci.c @@ -100,6 +100,6 @@ U_BOOT_DRIVER(sdhci_bcmstb) = { .ops = &sdhci_ops, .bind = sdhci_bcmstb_bind, .probe = sdhci_bcmstb_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct sdhci_bcmstb_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct sdhci_bcmstb_plat), }; diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index 198c41f451f..98d7f6b0b53 100644 --- a/drivers/mmc/ca_dw_mmc.c +++ b/drivers/mmc/ca_dw_mmc.c @@ -166,6 +166,6 @@ U_BOOT_DRIVER(ca_dwmmc_drv) = { .bind = ca_dwmmc_bind, .ops = &ca_dwmci_dm_ops, .probe = ca_dwmmc_probe, - .priv_auto_alloc_size = sizeof(struct ca_dwmmc_priv_data), - .platdata_auto_alloc_size = sizeof(struct ca_mmc_plat), + .priv_auto = sizeof(struct ca_dwmmc_priv_data), + .platdata_auto = sizeof(struct ca_mmc_plat), }; diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 0a05fb13bc9..0b9669abbc8 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -527,7 +527,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = { .id = UCLASS_MMC, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = davinci_mmc_ids, - .platdata_auto_alloc_size = sizeof(struct davinci_mmc_plat), + .platdata_auto = sizeof(struct davinci_mmc_plat), .ofdata_to_platdata = davinci_mmc_ofdata_to_platdata, #endif #if CONFIG_BLK @@ -535,7 +535,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = { #endif .probe = davinci_mmc_probe, .ops = &davinci_mmc_ops, - .priv_auto_alloc_size = sizeof(struct davinci_mmc_priv), + .priv_auto = sizeof(struct davinci_mmc_priv), #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, #endif diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c index 435ccac5942..63d00a3141f 100644 --- a/drivers/mmc/exynos_dw_mmc.c +++ b/drivers/mmc/exynos_dw_mmc.c @@ -306,7 +306,7 @@ U_BOOT_DRIVER(exynos_dwmmc_drv) = { .bind = exynos_dwmmc_bind, .ops = &dm_dwmci_ops, .probe = exynos_dwmmc_probe, - .priv_auto_alloc_size = sizeof(struct dwmci_exynos_priv_data), - .platdata_auto_alloc_size = sizeof(struct exynos_mmc_plat), + .priv_auto = sizeof(struct dwmci_exynos_priv_data), + .platdata_auto = sizeof(struct exynos_mmc_plat), }; #endif diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 642784e1f35..b259c1a0320 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -1114,7 +1114,7 @@ U_BOOT_DRIVER(fsl_esdhc) = { .ops = &fsl_esdhc_ops, .bind = fsl_esdhc_bind, .probe = fsl_esdhc_probe, - .platdata_auto_alloc_size = sizeof(struct fsl_esdhc_plat), - .priv_auto_alloc_size = sizeof(struct fsl_esdhc_priv), + .platdata_auto = sizeof(struct fsl_esdhc_plat), + .priv_auto = sizeof(struct fsl_esdhc_priv), }; #endif diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 2d4a817a264..c174df6ed29 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1707,8 +1707,8 @@ U_BOOT_DRIVER(fsl_esdhc) = { .bind = fsl_esdhc_bind, #endif .probe = fsl_esdhc_probe, - .platdata_auto_alloc_size = sizeof(struct fsl_esdhc_plat), - .priv_auto_alloc_size = sizeof(struct fsl_esdhc_priv), + .platdata_auto = sizeof(struct fsl_esdhc_plat), + .priv_auto = sizeof(struct fsl_esdhc_priv), };

U_BOOT_DRIVER_ALIAS(fsl_esdhc, fsl_imx6q_usdhc) diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c index bc0d5ffed51..5d312df2b48 100644 --- a/drivers/mmc/ftsdc010_mci.c +++ b/drivers/mmc/ftsdc010_mci.c @@ -477,6 +477,6 @@ U_BOOT_DRIVER(ftsdc010_mmc) = { .ops = &dm_ftsdc010_mmc_ops, .bind = ftsdc010_mmc_bind, .probe = ftsdc010_mmc_probe, - .priv_auto_alloc_size = sizeof(struct ftsdc_priv), - .platdata_auto_alloc_size = sizeof(struct ftsdc010_plat), + .priv_auto = sizeof(struct ftsdc_priv), + .platdata_auto = sizeof(struct ftsdc010_plat), }; diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index 0a347b2fb20..c135ee9b7ca 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -624,8 +624,8 @@ U_BOOT_DRIVER(atmel_mci) = { .of_match = atmel_mci_ids, .bind = atmel_mci_bind, .probe = atmel_mci_probe, - .platdata_auto_alloc_size = sizeof(struct atmel_mci_plat), - .priv_auto_alloc_size = sizeof(struct atmel_mci_priv), + .platdata_auto = sizeof(struct atmel_mci_plat), + .priv_auto = sizeof(struct atmel_mci_priv), .ops = &atmel_mci_mmc_ops, }; #endif diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c index 67d6a05b3b5..cdc9a44e3e6 100644 --- a/drivers/mmc/hi6220_dw_mmc.c +++ b/drivers/mmc/hi6220_dw_mmc.c @@ -112,6 +112,6 @@ U_BOOT_DRIVER(hi6220_dwmmc_drv) = { .ops = &dm_dwmci_ops, .bind = hi6220_dwmmc_bind, .probe = hi6220_dwmmc_probe, - .priv_auto_alloc_size = sizeof(struct hi6220_dwmmc_priv_data), - .platdata_auto_alloc_size = sizeof(struct hi6220_dwmmc_plat), + .priv_auto = sizeof(struct hi6220_dwmmc_priv_data), + .platdata_auto = sizeof(struct hi6220_dwmmc_plat), }; diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c index 9f530638e31..e5c453e2159 100644 --- a/drivers/mmc/iproc_sdhci.c +++ b/drivers/mmc/iproc_sdhci.c @@ -247,6 +247,6 @@ U_BOOT_DRIVER(iproc_sdhci_drv) = { .ops = &sdhci_ops, .bind = iproc_sdhci_bind, .probe = iproc_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct iproc_sdhci_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct iproc_sdhci_plat), }; diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c index b33f0850738..e3a28234463 100644 --- a/drivers/mmc/jz_mmc.c +++ b/drivers/mmc/jz_mmc.c @@ -501,8 +501,8 @@ U_BOOT_DRIVER(jz_mmc_drv) = { .ofdata_to_platdata = jz_mmc_ofdata_to_platdata, .bind = jz_mmc_bind, .probe = jz_mmc_probe, - .priv_auto_alloc_size = sizeof(struct jz_mmc_priv), - .platdata_auto_alloc_size = sizeof(struct jz_mmc_plat), + .priv_auto = sizeof(struct jz_mmc_priv), + .platdata_auto = sizeof(struct jz_mmc_plat), .ops = &jz_msc_ops, }; #endif /* CONFIG_DM_MMC */ diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index a5e9ac5637b..a03a37783da 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -340,7 +340,7 @@ U_BOOT_DRIVER(meson_mmc) = { .probe = meson_mmc_probe, .bind = meson_mmc_bind, .ofdata_to_platdata = meson_mmc_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct meson_mmc_platdata), + .platdata_auto = sizeof(struct meson_mmc_platdata), };

#ifdef CONFIG_PWRSEQ diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 285ac480615..269f31afeee 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -508,5 +508,5 @@ UCLASS_DRIVER(mmc) = { .id = UCLASS_MMC, .name = "mmc", .flags = DM_UC_FLAG_SEQ_ALIAS, - .per_device_auto_alloc_size = sizeof(struct mmc_uclass_priv), + .per_device_auto = sizeof(struct mmc_uclass_priv), }; diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c index 50fcd32674f..31c8f06ca65 100644 --- a/drivers/mmc/mmc_spi.c +++ b/drivers/mmc/mmc_spi.c @@ -468,6 +468,6 @@ U_BOOT_DRIVER(mmc_spi) = { .ops = &mmc_spi_ops, .probe = mmc_spi_probe, .bind = mmc_spi_bind, - .platdata_auto_alloc_size = sizeof(struct mmc_spi_plat), - .priv_auto_alloc_size = sizeof(struct mmc_spi_priv), + .platdata_auto = sizeof(struct mmc_spi_plat), + .priv_auto = sizeof(struct mmc_spi_priv), }; diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 2a1f412278e..049dd33ce4f 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -208,6 +208,6 @@ U_BOOT_DRIVER(msm_sdc_drv) = { .bind = msm_sdc_bind, .probe = msm_sdc_probe, .remove = msm_sdc_remove, - .priv_auto_alloc_size = sizeof(struct msm_sdhc), - .platdata_auto_alloc_size = sizeof(struct msm_sdhc_plat), + .priv_auto = sizeof(struct msm_sdhc), + .platdata_auto = sizeof(struct msm_sdhc_plat), }; diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c index 4f9fa7d0ec3..d701a4cd008 100644 --- a/drivers/mmc/mtk-sd.c +++ b/drivers/mmc/mtk-sd.c @@ -1692,6 +1692,6 @@ U_BOOT_DRIVER(mtk_sd_drv) = { .bind = msdc_drv_bind, .probe = msdc_drv_probe, .ops = &msdc_ops, - .platdata_auto_alloc_size = sizeof(struct msdc_plat), - .priv_auto_alloc_size = sizeof(struct msdc_host), + .platdata_auto = sizeof(struct msdc_plat), + .priv_auto = sizeof(struct msdc_host), }; diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index 9b3dfa13e61..fb803e3be7d 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -151,7 +151,7 @@ U_BOOT_DRIVER(mv_sdhci_drv) = { .bind = mv_sdhci_bind, .probe = mv_sdhci_probe, .ops = &sdhci_ops, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct mv_sdhci_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct mv_sdhci_plat), }; #endif /* CONFIG_DM_MMC */ diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index 2b3a3a992cb..fd43f27ade5 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -718,8 +718,8 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = { .bind = mxsmmc_bind, #endif .probe = mxsmmc_probe, - .priv_auto_alloc_size = sizeof(struct mxsmmc_priv), - .platdata_auto_alloc_size = sizeof(struct mxsmmc_platdata), + .priv_auto = sizeof(struct mxsmmc_priv), + .platdata_auto = sizeof(struct mxsmmc_platdata), };

U_BOOT_DRIVER_ALIAS(fsl_imx23_mmc, fsl_imx28_mmc) diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c index 04627594449..680459bae78 100644 --- a/drivers/mmc/nexell_dw_mmc.c +++ b/drivers/mmc/nexell_dw_mmc.c @@ -232,6 +232,6 @@ U_BOOT_DRIVER(nexell_dwmmc_drv) = { .ops = &dm_dwmci_ops, .bind = nexell_dwmmc_bind, .probe = nexell_dwmmc_probe, - .priv_auto_alloc_size = sizeof(struct nexell_dwmmc_priv), - .platdata_auto_alloc_size = sizeof(struct nexell_mmc_plat), + .priv_auto = sizeof(struct nexell_dwmmc_priv), + .platdata_auto = sizeof(struct nexell_mmc_plat), }; diff --git a/drivers/mmc/octeontx_hsmmc.c b/drivers/mmc/octeontx_hsmmc.c index a91aaf31461..5552342f8d9 100644 --- a/drivers/mmc/octeontx_hsmmc.c +++ b/drivers/mmc/octeontx_hsmmc.c @@ -3881,7 +3881,7 @@ U_BOOT_DRIVER(octeontx_hsmmc_host) = { .id = UCLASS_MISC, .of_match = of_match_ptr(octeontx_hsmmc_host_ids), .probe = octeontx_mmc_host_probe, - .priv_auto_alloc_size = sizeof(struct octeontx_mmc_host), + .priv_auto = sizeof(struct octeontx_mmc_host), .child_pre_probe = octeontx_mmc_host_child_pre_probe, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 715eee0e3e0..31003b3cb78 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -2029,14 +2029,14 @@ U_BOOT_DRIVER(omap_hsmmc) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_hsmmc_ids, .ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct omap_hsmmc_plat), + .platdata_auto = sizeof(struct omap_hsmmc_plat), #endif #ifdef CONFIG_BLK .bind = omap_hsmmc_bind, #endif .ops = &omap_hsmmc_ops, .probe = omap_hsmmc_probe, - .priv_auto_alloc_size = sizeof(struct omap_hsmmc_data), + .priv_auto = sizeof(struct omap_hsmmc_data), #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, #endif diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index 0c45e1b8936..004b3cb7ea5 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -132,8 +132,8 @@ U_BOOT_DRIVER(pci_mmc) = { .ofdata_to_platdata = pci_mmc_ofdata_to_platdata, .probe = pci_mmc_probe, .ops = &sdhci_ops, - .priv_auto_alloc_size = sizeof(struct pci_mmc_priv), - .platdata_auto_alloc_size = sizeof(struct pci_mmc_plat), + .priv_auto = sizeof(struct pci_mmc_priv), + .platdata_auto = sizeof(struct pci_mmc_plat), ACPI_OPS_PTR(&pci_mmc_acpi_ops) };

diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c index e201bdb8f4e..dd10624dbfe 100644 --- a/drivers/mmc/pic32_sdhci.c +++ b/drivers/mmc/pic32_sdhci.c @@ -88,6 +88,6 @@ U_BOOT_DRIVER(pic32_sdhci_drv) = { .ops = &sdhci_ops, .bind = pic32_sdhci_bind, .probe = pic32_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct pic32_sdhci_plat) + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct pic32_sdhci_plat) }; diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index 2c081fdc69f..8be9ed6b550 100644 --- a/drivers/mmc/pxa_mmc_gen.c +++ b/drivers/mmc/pxa_mmc_gen.c @@ -530,7 +530,7 @@ U_BOOT_DRIVER(pxa_mmc) = { .id = UCLASS_MMC, .name = "pxa_mmc", .ops = &pxa_mmc_ops, - .priv_auto_alloc_size = sizeof(struct pxa_mmc_priv), + .priv_auto = sizeof(struct pxa_mmc_priv), .probe = pxa_mmc_probe, }; #endif /* !CONFIG_IS_ENABLED(DM_MMC) */ diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index d80b3fc28f3..211e6904639 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -1014,7 +1014,7 @@ U_BOOT_DRIVER(renesas_sdhi) = { .of_match = renesas_sdhi_match, .bind = tmio_sd_bind, .probe = renesas_sdhi_probe, - .priv_auto_alloc_size = sizeof(struct tmio_sd_priv), - .platdata_auto_alloc_size = sizeof(struct tmio_sd_plat), + .priv_auto = sizeof(struct tmio_sd_priv), + .platdata_auto = sizeof(struct tmio_sd_plat), .ops = &renesas_sdhi_ops, }; diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index f1dafa6ce71..e4c5288876f 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -176,8 +176,8 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = { .ops = &dm_dwmci_ops, .bind = rockchip_dwmmc_bind, .probe = rockchip_dwmmc_probe, - .priv_auto_alloc_size = sizeof(struct rockchip_dwmmc_priv), - .platdata_auto_alloc_size = sizeof(struct rockchip_mmc_plat), + .priv_auto = sizeof(struct rockchip_dwmmc_priv), + .platdata_auto = sizeof(struct rockchip_mmc_plat), };

U_BOOT_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3328_dw_mshc) diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index b073f1a08d4..131c976eaf6 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -114,6 +114,6 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = { .ops = &sdhci_ops, .bind = rockchip_sdhci_bind, .probe = arasan_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct rockchip_sdhc), - .platdata_auto_alloc_size = sizeof(struct rockchip_sdhc_plat), + .priv_auto = sizeof(struct rockchip_sdhc), + .platdata_auto = sizeof(struct rockchip_sdhc_plat), }; diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 24f599e868a..6841be6a145 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -246,7 +246,7 @@ U_BOOT_DRIVER(s5p_sdhci_drv) = { .bind = s5p_sdhci_bind, .ops = &sdhci_ops, .probe = s5p_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct s5p_sdhci_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct s5p_sdhci_plat), }; #endif /* CONFIG_DM_MMC */ diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c index e86ea8fe096..ece0e2d31cb 100644 --- a/drivers/mmc/sandbox_mmc.c +++ b/drivers/mmc/sandbox_mmc.c @@ -148,5 +148,5 @@ U_BOOT_DRIVER(mmc_sandbox) = { .bind = sandbox_mmc_bind, .unbind = sandbox_mmc_unbind, .probe = sandbox_mmc_probe, - .platdata_auto_alloc_size = sizeof(struct sandbox_mmc_plat), + .platdata_auto = sizeof(struct sandbox_mmc_plat), }; diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index cc99bebc305..efc09b91998 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -309,7 +309,7 @@ U_BOOT_DRIVER(sdhci_cdns) = { .of_match = sdhci_cdns_match, .bind = sdhci_cdns_bind, .probe = sdhci_cdns_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct sdhci_cdns_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct sdhci_cdns_plat), .ops = &sdhci_cdns_mmc_ops, }; diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c index ad386909e90..f3d10ac8be6 100644 --- a/drivers/mmc/sh_mmcif.c +++ b/drivers/mmc/sh_mmcif.c @@ -743,8 +743,8 @@ U_BOOT_DRIVER(sh_mmcif_mmc) = { .of_match = sh_mmcif_sd_match, .bind = sh_mmcif_dm_bind, .probe = sh_mmcif_dm_probe, - .priv_auto_alloc_size = sizeof(struct sh_mmcif_host), - .platdata_auto_alloc_size = sizeof(struct sh_mmcif_plat), + .priv_auto = sizeof(struct sh_mmcif_host), + .platdata_auto = sizeof(struct sh_mmcif_plat), .ops = &sh_mmcif_dm_ops, }; #endif diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c index 29f83b65542..04ce521a515 100644 --- a/drivers/mmc/sh_sdhi.c +++ b/drivers/mmc/sh_sdhi.c @@ -902,8 +902,8 @@ U_BOOT_DRIVER(sh_sdhi_mmc) = { .of_match = sh_sdhi_sd_match, .bind = sh_sdhi_dm_bind, .probe = sh_sdhi_dm_probe, - .priv_auto_alloc_size = sizeof(struct sh_sdhi_host), - .platdata_auto_alloc_size = sizeof(struct sh_sdhi_plat), + .priv_auto = sizeof(struct sh_sdhi_host), + .platdata_auto = sizeof(struct sh_sdhi_plat), .ops = &sh_sdhi_dm_ops, }; #endif diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c index 4b468a1f3db..009933de5ef 100644 --- a/drivers/mmc/snps_dw_mmc.c +++ b/drivers/mmc/snps_dw_mmc.c @@ -195,6 +195,6 @@ U_BOOT_DRIVER(snps_dwmmc_drv) = { .ops = &snps_dwmci_dm_ops, .bind = snps_dwmmc_bind, .probe = snps_dwmmc_probe, - .priv_auto_alloc_size = sizeof(struct snps_dwmci_priv_data), - .platdata_auto_alloc_size = sizeof(struct snps_dwmci_plat), + .priv_auto = sizeof(struct snps_dwmci_priv_data), + .platdata_auto = sizeof(struct snps_dwmci_plat), }; diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index 0022f943bd7..80c4d6ed4d4 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -189,6 +189,6 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = { .ops = &dm_dwmci_ops, .bind = socfpga_dwmmc_bind, .probe = socfpga_dwmmc_probe, - .priv_auto_alloc_size = sizeof(struct dwmci_socfpga_priv_data), - .platdata_auto_alloc_size = sizeof(struct socfpga_dwmci_plat), + .priv_auto = sizeof(struct dwmci_socfpga_priv_data), + .platdata_auto = sizeof(struct socfpga_dwmci_plat), }; diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c index 5578feebef7..49ddabcbe5e 100644 --- a/drivers/mmc/sti_sdhci.c +++ b/drivers/mmc/sti_sdhci.c @@ -144,6 +144,6 @@ U_BOOT_DRIVER(sti_mmc) = { .ops = &sdhci_ops, .ofdata_to_platdata = sti_sdhci_ofdata_to_platdata, .probe = sti_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct sti_sdhci_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct sti_sdhci_plat), }; diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 77871d5afc9..80eecb60e8e 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -717,6 +717,6 @@ U_BOOT_DRIVER(stm32_sdmmc2) = { .ops = &stm32_sdmmc2_ops, .probe = stm32_sdmmc2_probe, .bind = stm32_sdmmc_bind, - .priv_auto_alloc_size = sizeof(struct stm32_sdmmc2_priv), - .platdata_auto_alloc_size = sizeof(struct stm32_sdmmc2_plat), + .priv_auto = sizeof(struct stm32_sdmmc2_priv), + .platdata_auto = sizeof(struct stm32_sdmmc2_plat), }; diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 0e03b07ce55..12e8c99076b 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -746,7 +746,7 @@ U_BOOT_DRIVER(sunxi_mmc_drv) = { .bind = sunxi_mmc_bind, .probe = sunxi_mmc_probe, .ops = &sunxi_mmc_ops, - .platdata_auto_alloc_size = sizeof(struct sunxi_mmc_plat), - .priv_auto_alloc_size = sizeof(struct sunxi_mmc_priv), + .platdata_auto = sizeof(struct sunxi_mmc_plat), + .priv_auto = sizeof(struct sunxi_mmc_priv), }; #endif diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c index 879e2c98a21..46e185e3172 100644 --- a/drivers/mmc/tangier_sdhci.c +++ b/drivers/mmc/tangier_sdhci.c @@ -76,6 +76,6 @@ U_BOOT_DRIVER(sdhci_tangier) = { .bind = sdhci_tangier_bind, .probe = sdhci_tangier_probe, .ops = &sdhci_ops, - .priv_auto_alloc_size = sizeof(struct sdhci_host), - .platdata_auto_alloc_size = sizeof(struct sdhci_tangier_plat), + .priv_auto = sizeof(struct sdhci_host), + .platdata_auto = sizeof(struct sdhci_tangier_plat), }; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index cc78a2f2f08..f915c78f5d4 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -771,6 +771,6 @@ U_BOOT_DRIVER(tegra_mmc_drv) = { .bind = tegra_mmc_bind, .probe = tegra_mmc_probe, .ops = &tegra_mmc_ops, - .platdata_auto_alloc_size = sizeof(struct tegra_mmc_plat), - .priv_auto_alloc_size = sizeof(struct tegra_mmc_priv), + .platdata_auto = sizeof(struct tegra_mmc_plat), + .priv_auto = sizeof(struct tegra_mmc_priv), }; diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index 4dbe71fa2e1..ca674272fc0 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -84,7 +84,7 @@ U_BOOT_DRIVER(uniphier_mmc) = { .of_match = uniphier_sd_match, .bind = tmio_sd_bind, .probe = uniphier_sd_probe, - .priv_auto_alloc_size = sizeof(struct tmio_sd_priv), - .platdata_auto_alloc_size = sizeof(struct tmio_sd_plat), + .priv_auto = sizeof(struct tmio_sd_priv), + .platdata_auto = sizeof(struct tmio_sd_plat), .ops = &uniphier_sd_ops, }; diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c index 6ce9d00d0ae..c0897258199 100644 --- a/drivers/mmc/xenon_sdhci.c +++ b/drivers/mmc/xenon_sdhci.c @@ -564,6 +564,6 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = { .ops = &sdhci_ops, .bind = xenon_sdhci_bind, .probe = xenon_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct xenon_sdhci_priv), - .platdata_auto_alloc_size = sizeof(struct xenon_sdhci_plat), + .priv_auto = sizeof(struct xenon_sdhci_priv), + .platdata_auto = sizeof(struct xenon_sdhci_plat), }; diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 147ecc0d708..2ef63976e96 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -659,6 +659,6 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = { .ops = &sdhci_ops, .bind = arasan_sdhci_bind, .probe = arasan_sdhci_probe, - .priv_auto_alloc_size = sizeof(struct arasan_sdhci_priv), - .platdata_auto_alloc_size = sizeof(struct arasan_sdhci_plat), + .priv_auto = sizeof(struct arasan_sdhci_priv), + .platdata_auto = sizeof(struct arasan_sdhci_plat), }; diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index cd4d32959a0..b50d3061741 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -401,6 +401,6 @@ U_BOOT_DRIVER(altera_qspi) = { .id = UCLASS_MTD, .of_match = altera_qspi_ids, .ofdata_to_platdata = altera_qspi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_qspi_platdata), + .platdata_auto = sizeof(struct altera_qspi_platdata), .probe = altera_qspi_probe, }; diff --git a/drivers/mtd/hbmc-am654.c b/drivers/mtd/hbmc-am654.c index 846b0e832b7..c86e504da30 100644 --- a/drivers/mtd/hbmc-am654.c +++ b/drivers/mtd/hbmc-am654.c @@ -102,5 +102,5 @@ U_BOOT_DRIVER(hbmc_am654) = { .of_match = am654_hbmc_dt_ids, .probe = am654_hbmc_probe, .bind = am654_hbmc_bind, - .priv_auto_alloc_size = sizeof(struct am654_hbmc_priv), + .priv_auto = sizeof(struct am654_hbmc_priv), }; diff --git a/drivers/mtd/mtd-uclass.c b/drivers/mtd/mtd-uclass.c index 54182174319..9f5f672ba3f 100644 --- a/drivers/mtd/mtd-uclass.c +++ b/drivers/mtd/mtd-uclass.c @@ -32,5 +32,5 @@ int mtd_probe(struct udevice *dev) UCLASS_DRIVER(mtd) = { .id = UCLASS_MTD, .name = "mtd", - .per_device_auto_alloc_size = sizeof(struct mtd_info), + .per_device_auto = sizeof(struct mtd_info), }; diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c index 0615e503780..d4e8f8df87d 100644 --- a/drivers/mtd/nand/raw/arasan_nfc.c +++ b/drivers/mtd/nand/raw/arasan_nfc.c @@ -1310,7 +1310,7 @@ U_BOOT_DRIVER(arasan_nand) = { .id = UCLASS_MTD, .of_match = arasan_nand_dt_ids, .probe = arasan_probe, - .priv_auto_alloc_size = sizeof(struct arasan_nand_info), + .priv_auto = sizeof(struct arasan_nand_info), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c index 6313403cd65..71682cb6e79 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c @@ -109,7 +109,7 @@ U_BOOT_DRIVER(bcm63158_nand) = { .id = UCLASS_MTD, .of_match = bcm63158_nand_dt_ids, .probe = bcm63158_nand_probe, - .priv_auto_alloc_size = sizeof(struct bcm63158_nand_soc), + .priv_auto = sizeof(struct bcm63158_nand_soc), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c index cd4b24a51a1..f424194ecca 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c @@ -102,7 +102,7 @@ U_BOOT_DRIVER(bcm6368_nand) = { .id = UCLASS_MTD, .of_match = bcm6368_nand_dt_ids, .probe = bcm6368_nand_probe, - .priv_auto_alloc_size = sizeof(struct bcm6368_nand_soc), + .priv_auto = sizeof(struct bcm6368_nand_soc), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c index aa042bef158..47ddde4f9b0 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c @@ -108,7 +108,7 @@ U_BOOT_DRIVER(bcm68360_nand) = { .id = UCLASS_MTD, .of_match = bcm68360_nand_dt_ids, .probe = bcm68360_nand_probe, - .priv_auto_alloc_size = sizeof(struct bcm68360_nand_soc), + .priv_auto = sizeof(struct bcm68360_nand_soc), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c index 07884550906..646495096c2 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c @@ -108,7 +108,7 @@ U_BOOT_DRIVER(bcm6838_nand) = { .id = UCLASS_MTD, .of_match = bcm6838_nand_dt_ids, .probe = bcm6838_nand_probe, - .priv_auto_alloc_size = sizeof(struct bcm6838_nand_soc), + .priv_auto = sizeof(struct bcm6838_nand_soc), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c index 818eae8a7c6..7573cd944ff 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c @@ -109,7 +109,7 @@ U_BOOT_DRIVER(bcm6858_nand) = { .id = UCLASS_MTD, .of_match = bcm6858_nand_dt_ids, .probe = bcm6858_nand_probe, - .priv_auto_alloc_size = sizeof(struct bcm6858_nand_soc), + .priv_auto = sizeof(struct bcm6858_nand_soc), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index 4416b8fa1e6..4645cc16997 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -816,7 +816,7 @@ U_BOOT_DRIVER(davinci_nand) = { .id = UCLASS_MTD, .of_match = davinci_nand_ids, .probe = davinci_nand_probe, - .priv_auto_alloc_size = sizeof(struct nand_chip), + .priv_auto = sizeof(struct nand_chip), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c index 8318ff507f3..140ef7f725e 100644 --- a/drivers/mtd/nand/raw/denali_dt.c +++ b/drivers/mtd/nand/raw/denali_dt.c @@ -172,7 +172,7 @@ U_BOOT_DRIVER(denali_nand_dt) = { .id = UCLASS_MTD, .of_match = denali_nand_dt_ids, .probe = denali_dt_probe, - .priv_auto_alloc_size = sizeof(struct denali_nand_info), + .priv_auto = sizeof(struct denali_nand_info), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index 43dbe9e66ec..78a423dbbf4 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -168,7 +168,7 @@ U_BOOT_DRIVER(mxs_nand_dt) = { .id = UCLASS_MTD, .of_match = mxs_nand_dt_ids, .probe = mxs_nand_dt_probe, - .priv_auto_alloc_size = sizeof(struct mxs_nand_info), + .priv_auto = sizeof(struct mxs_nand_info), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/octeontx_bch.c b/drivers/mtd/nand/raw/octeontx_bch.c index 693706257c9..a41772880f9 100644 --- a/drivers/mtd/nand/raw/octeontx_bch.c +++ b/drivers/mtd/nand/raw/octeontx_bch.c @@ -410,7 +410,7 @@ U_BOOT_DRIVER(octeontx_pci_bchpf) = { .id = UCLASS_MISC, .probe = octeontx_pci_bchpf_probe, .remove = octeontx_pci_bchpf_remove, - .priv_auto_alloc_size = sizeof(struct bch_device), + .priv_auto = sizeof(struct bch_device), .flags = DM_FLAG_OS_PREPARE, };

@@ -418,7 +418,7 @@ U_BOOT_DRIVER(octeontx_pci_bchvf) = { .name = BCHVF_DRIVER_NAME, .id = UCLASS_MISC, .probe = octeontx_pci_bchvf_probe, - .priv_auto_alloc_size = sizeof(struct bch_vf), + .priv_auto = sizeof(struct bch_vf), };

U_BOOT_PCI_DEVICE(octeontx_pci_bchpf, octeontx_bchpf_pci_id_table); diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c index ad219171e9c..cfeca1e6880 100644 --- a/drivers/mtd/nand/raw/octeontx_nand.c +++ b/drivers/mtd/nand/raw/octeontx_nand.c @@ -2219,7 +2219,7 @@ U_BOOT_DRIVER(octeontx_pci_nand) = { .of_match = of_match_ptr(octeontx_nand_ids), .ofdata_to_platdata = octeontx_nand_ofdata_to_platdata, .probe = octeontx_pci_nand_probe, - .priv_auto_alloc_size = sizeof(struct octeontx_nfc), + .priv_auto = sizeof(struct octeontx_nfc), .remove = octeontx_pci_nand_disable, .flags = DM_FLAG_OS_PREPARE, }; diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c index 361a9e32935..e923ce363a0 100644 --- a/drivers/mtd/nand/raw/pxa3xx_nand.c +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c @@ -1937,7 +1937,7 @@ U_BOOT_DRIVER(pxa3xx_nand) = { .id = UCLASS_MTD, .of_match = pxa3xx_nand_dt_ids, .probe = pxa3xx_nand_probe, - .priv_auto_alloc_size = sizeof(struct pxa3xx_nand_info) + + .priv_auto = sizeof(struct pxa3xx_nand_info) + sizeof(struct pxa3xx_nand_host) * CONFIG_SYS_MAX_NAND_DEVICE, };

diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c index 47fe61090da..8fe7ec1343e 100644 --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c @@ -1033,7 +1033,7 @@ U_BOOT_DRIVER(stm32_fmc2_nfc) = { .id = UCLASS_MTD, .of_match = stm32_fmc2_nfc_match, .probe = stm32_fmc2_nfc_probe, - .priv_auto_alloc_size = sizeof(struct stm32_fmc2_nfc), + .priv_auto = sizeof(struct stm32_fmc2_nfc), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c index b9f5bdd9535..797fc230504 100644 --- a/drivers/mtd/nand/raw/tegra_nand.c +++ b/drivers/mtd/nand/raw/tegra_nand.c @@ -990,7 +990,7 @@ U_BOOT_DRIVER(tegra_nand) = { .id = UCLASS_MTD, .of_match = tegra_nand_dt_ids, .probe = tegra_probe, - .priv_auto_alloc_size = sizeof(struct tegra_nand_info), + .priv_auto = sizeof(struct tegra_nand_info), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c index 4e6fdc607ff..422b9c57a88 100644 --- a/drivers/mtd/nand/raw/vf610_nfc.c +++ b/drivers/mtd/nand/raw/vf610_nfc.c @@ -784,7 +784,7 @@ U_BOOT_DRIVER(vf610_nfc_dt) = { .name = "vf610-nfc-dt", .id = UCLASS_MTD, .of_match = vf610_nfc_dt_ids, - .priv_auto_alloc_size = sizeof(struct vf610_nfc), + .priv_auto = sizeof(struct vf610_nfc), .probe = vf610_nfc_dt_probe, };

diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c index 92db2aa19c8..7cf0ccb656c 100644 --- a/drivers/mtd/nand/raw/zynq_nand.c +++ b/drivers/mtd/nand/raw/zynq_nand.c @@ -1286,7 +1286,7 @@ U_BOOT_DRIVER(zynq_nand) = { .id = UCLASS_MTD, .of_match = zynq_nand_dt_ids, .probe = zynq_nand_probe, - .priv_auto_alloc_size = sizeof(struct zynq_nand_info), + .priv_auto = sizeof(struct zynq_nand_info), };

void board_nand_init(void) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 8c7e07d4630..fc9d4edbe04 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -1255,6 +1255,6 @@ U_BOOT_DRIVER(spinand) = { .name = "spi_nand", .id = UCLASS_MTD, .of_match = spinand_ids, - .priv_auto_alloc_size = sizeof(struct spinand_device), + .priv_auto = sizeof(struct spinand_device), .probe = spinand_probe, }; diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 1a362616694..8ac8183b906 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -600,7 +600,7 @@ U_BOOT_DRIVER(sandbox_sf_emul) = { .ofdata_to_platdata = sandbox_sf_ofdata_to_platdata, .probe = sandbox_sf_probe, .remove = sandbox_sf_remove, - .priv_auto_alloc_size = sizeof(struct sandbox_spi_flash), - .platdata_auto_alloc_size = sizeof(struct sandbox_spi_flash_plat_data), + .priv_auto = sizeof(struct sandbox_spi_flash), + .platdata_auto = sizeof(struct sandbox_spi_flash_plat_data), .ops = &sandbox_sf_emul_ops, }; diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 09c11439b08..ed629f1d458 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -100,5 +100,5 @@ UCLASS_DRIVER(spi_flash) = { .id = UCLASS_SPI_FLASH, .name = "spi_flash", .post_bind = spi_flash_post_bind, - .per_device_auto_alloc_size = sizeof(struct spi_flash), + .per_device_auto = sizeof(struct spi_flash), }; diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index 27d847d4218..b59edd152cc 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -693,6 +693,6 @@ U_BOOT_DRIVER(spi_dataflash) = { .id = UCLASS_SPI_FLASH, .of_match = spi_dataflash_ids, .probe = spi_dataflash_probe, - .priv_auto_alloc_size = sizeof(struct dataflash), + .priv_auto = sizeof(struct dataflash), .ops = &spi_dataflash_ops, }; diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index b959e3453a5..c8bcec3c589 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -166,7 +166,7 @@ U_BOOT_DRIVER(jedec_spi_nor) = { .of_match = spi_flash_std_ids, .probe = spi_flash_std_probe, .remove = spi_flash_std_remove, - .priv_auto_alloc_size = sizeof(struct spi_flash), + .priv_auto = sizeof(struct spi_flash), .ops = &spi_flash_std_ops, };

diff --git a/drivers/mux/mux-uclass.c b/drivers/mux/mux-uclass.c index a35c3d9c948..6d28dbe4d14 100644 --- a/drivers/mux/mux-uclass.c +++ b/drivers/mux/mux-uclass.c @@ -331,5 +331,5 @@ UCLASS_DRIVER(mux) = { .id = UCLASS_MUX, .name = "mux", .post_probe = mux_uclass_post_probe, - .per_device_auto_alloc_size = sizeof(struct mux_chip), + .per_device_auto = sizeof(struct mux_chip), }; diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index ccba3947ac5..02565aae7be 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -1291,7 +1291,7 @@ U_BOOT_DRIVER(eth_ag7xxx) = { .probe = ag7xxx_eth_probe, .remove = ag7xxx_eth_remove, .ops = &ag7xxx_eth_ops, - .priv_auto_alloc_size = sizeof(struct ar7xxx_eth_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ar7xxx_eth_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 93b26da3926..7d0c58cd532 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -711,7 +711,7 @@ U_BOOT_DRIVER(altera_tse) = { .of_match = altera_tse_ids, .ops = &altera_tse_ops, .ofdata_to_platdata = altera_tse_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct eth_pdata), - .priv_auto_alloc_size = sizeof(struct altera_tse_priv), + .platdata_auto = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct altera_tse_priv), .probe = altera_tse_probe, }; diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c index 9ddc0f938f2..6d622466781 100644 --- a/drivers/net/bcm6348-eth.c +++ b/drivers/net/bcm6348-eth.c @@ -533,7 +533,7 @@ U_BOOT_DRIVER(bcm6348_eth) = { .id = UCLASS_ETH, .of_match = bcm6348_eth_ids, .ops = &bcm6348_eth_ops, - .platdata_auto_alloc_size = sizeof(struct eth_pdata), - .priv_auto_alloc_size = sizeof(struct bcm6348_eth_priv), + .platdata_auto = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct bcm6348_eth_priv), .probe = bcm6348_eth_probe, }; diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c index 38a2a30fe6c..b0bf0a939d7 100644 --- a/drivers/net/bcm6368-eth.c +++ b/drivers/net/bcm6368-eth.c @@ -637,7 +637,7 @@ U_BOOT_DRIVER(bcm6368_eth) = { .id = UCLASS_ETH, .of_match = bcm6368_eth_ids, .ops = &bcm6368_eth_ops, - .platdata_auto_alloc_size = sizeof(struct eth_pdata), - .priv_auto_alloc_size = sizeof(struct bcm6368_eth_priv), + .platdata_auto = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct bcm6368_eth_priv), .probe = bcm6368_eth_probe, }; diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c index ace13313621..b6ebac220ed 100644 --- a/drivers/net/bcmgenet.c +++ b/drivers/net/bcmgenet.c @@ -732,7 +732,7 @@ U_BOOT_DRIVER(eth_bcmgenet) = { .ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata, .probe = bcmgenet_eth_probe, .ops = &bcmgenet_gmac_eth_ops, - .priv_auto_alloc_size = sizeof(struct bcmgenet_eth_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct bcmgenet_eth_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 9f8c6c58d95..26d2ec09708 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -751,8 +751,8 @@ U_BOOT_DRIVER(eth_dc2114x) = { .bind = dc2114x_bind, .probe = dc2114x_probe, .ops = &dc2114x_ops, - .priv_auto_alloc_size = sizeof(struct dc2114x_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct dc2114x_priv), + .platdata_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_dc2114x, supported); diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 4c19abbaf0c..32b3fc82302 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -873,8 +873,8 @@ U_BOOT_DRIVER(eth_designware) = { .probe = designware_eth_probe, .remove = designware_eth_remove, .ops = &designware_eth_ops, - .priv_auto_alloc_size = sizeof(struct dw_eth_dev), - .platdata_auto_alloc_size = sizeof(struct dw_eth_pdata), + .priv_auto = sizeof(struct dw_eth_dev), + .platdata_auto = sizeof(struct dw_eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index 74893f5e8b1..eb79da29d69 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -2193,6 +2193,6 @@ U_BOOT_DRIVER(eth_eqos) = { .probe = eqos_probe, .remove = eqos_remove, .ops = &eqos_ops, - .priv_auto_alloc_size = sizeof(struct eqos_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct eqos_priv), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c index 9d3f3ac5d93..2edd7a74df5 100644 --- a/drivers/net/dwmac_s700.c +++ b/drivers/net/dwmac_s700.c @@ -61,7 +61,7 @@ U_BOOT_DRIVER(dwmac_s700) = { .ofdata_to_platdata = dwmac_s700_ofdata_to_platdata, .probe = dwmac_s700_probe, .ops = &designware_eth_ops, - .priv_auto_alloc_size = sizeof(struct dw_eth_dev), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct dw_eth_dev), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c index e93561dffa8..9ab2eeb2bcd 100644 --- a/drivers/net/dwmac_socfpga.c +++ b/drivers/net/dwmac_socfpga.c @@ -118,7 +118,7 @@ U_BOOT_DRIVER(dwmac_socfpga) = { .ofdata_to_platdata = dwmac_socfpga_ofdata_to_platdata, .probe = dwmac_socfpga_probe, .ops = &designware_eth_ops, - .priv_auto_alloc_size = sizeof(struct dw_eth_dev), - .platdata_auto_alloc_size = sizeof(struct dwmac_socfpga_platdata), + .priv_auto = sizeof(struct dw_eth_dev), + .platdata_auto = sizeof(struct dwmac_socfpga_platdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 8e6c755f641..87acfa5daa7 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5940,8 +5940,8 @@ U_BOOT_DRIVER(eth_e1000) = { .bind = e1000_eth_bind, .probe = e1000_eth_probe, .ops = &e1000_eth_ops, - .priv_auto_alloc_size = sizeof(struct e1000_hw), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct e1000_hw), + .platdata_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported); diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index feba5327da4..59582b91217 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -1009,8 +1009,8 @@ U_BOOT_DRIVER(eth_eepro100) = { .bind = eepro100_bind, .probe = eepro100_probe, .ops = &eepro100_ops, - .priv_auto_alloc_size = sizeof(struct eepro100_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct eepro100_priv), + .platdata_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_eepro100, supported); diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c index b383f455276..65615f13103 100644 --- a/drivers/net/eth-phy-uclass.c +++ b/drivers/net/eth-phy-uclass.c @@ -113,7 +113,7 @@ int eth_phy_get_addr(struct udevice *dev) UCLASS_DRIVER(eth_phy_generic) = { .id = UCLASS_ETH_PHY, .name = "eth_phy_generic", - .per_device_auto_alloc_size = sizeof(struct eth_phy_device_priv), + .per_device_auto = sizeof(struct eth_phy_device_priv), };

U_BOOT_DRIVER(eth_phy_generic_drv) = { diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index b9d80a5b08a..cb232f68bcf 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -750,8 +750,8 @@ U_BOOT_DRIVER(ethoc) = { .probe = ethoc_probe, .remove = ethoc_remove, .ops = &ethoc_ops, - .priv_auto_alloc_size = sizeof(struct ethoc), - .platdata_auto_alloc_size = sizeof(struct ethoc_eth_pdata), + .priv_auto = sizeof(struct ethoc), + .platdata_auto = sizeof(struct ethoc_eth_pdata), };

#else diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 4560dd80015..8bf585252d1 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1598,7 +1598,7 @@ U_BOOT_DRIVER(fecmxc_gem) = { .probe = fecmxc_probe, .remove = fecmxc_remove, .ops = &fecmxc_ops, - .priv_auto_alloc_size = sizeof(struct fec_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct fec_priv), + .platdata_auto = sizeof(struct eth_pdata), }; #endif diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index 2f433cedd09..3a827a97a88 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -1130,8 +1130,8 @@ U_BOOT_DRIVER(eth_fman) = { .probe = fm_eth_probe, .remove = fm_eth_remove, .ops = &fm_eth_ops, - .priv_auto_alloc_size = sizeof(struct fm_eth), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct fm_eth), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index bbb1738c4bd..7d51be1f723 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -605,7 +605,7 @@ U_BOOT_DRIVER(fman) = { .of_match = fman_ids, .probe = fman_probe, .remove = fman_remove, - .priv_auto_alloc_size = sizeof(struct fman_priv), + .priv_auto = sizeof(struct fman_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c index e15c28d5005..2e97f51c4c3 100644 --- a/drivers/net/fm/memac_phy.c +++ b/drivers/net/fm/memac_phy.c @@ -297,8 +297,8 @@ U_BOOT_DRIVER(fman_mdio) = { .probe = fm_mdio_probe, .remove = fm_mdio_remove, .ops = &fm_mdio_ops, - .priv_auto_alloc_size = sizeof(struct fm_mdio_priv), - .platdata_auto_alloc_size = sizeof(struct mdio_perdev_priv), + .priv_auto = sizeof(struct fm_mdio_priv), + .platdata_auto = sizeof(struct mdio_perdev_priv), }; #endif /* CONFIG_PHYLIB && CONFIG_DM_MDIO */ #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 2929ae72092..07ad44de470 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -677,8 +677,8 @@ U_BOOT_DRIVER(eth_enetc) = { .probe = enetc_probe, .remove = enetc_remove, .ops = &enetc_ops, - .priv_auto_alloc_size = sizeof(struct enetc_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct enetc_priv), + .platdata_auto = sizeof(struct eth_pdata), };

static struct pci_device_id enetc_ids[] = { diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c index 47257a6cf68..4da97b61d17 100644 --- a/drivers/net/fsl_enetc_mdio.c +++ b/drivers/net/fsl_enetc_mdio.c @@ -144,7 +144,7 @@ U_BOOT_DRIVER(enetc_mdio) = { .bind = enetc_mdio_bind, .probe = enetc_mdio_probe, .ops = &enetc_mdio_ops, - .priv_auto_alloc_size = sizeof(struct enetc_mdio_priv), + .priv_auto = sizeof(struct enetc_mdio_priv), };

static struct pci_device_id enetc_mdio_ids[] = { diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c index 6d8332d19ae..6d4e682fdfc 100644 --- a/drivers/net/fsl_ls_mdio.c +++ b/drivers/net/fsl_ls_mdio.c @@ -142,5 +142,5 @@ U_BOOT_DRIVER(fsl_ls_mdio) = { .of_match = fsl_ls_mdio_of_ids, .probe = fsl_ls_mdio_probe, .ops = &fsl_ls_mdio_ops, - .priv_auto_alloc_size = sizeof(struct fsl_ls_mdio_priv), + .priv_auto = sizeof(struct fsl_ls_mdio_priv), }; diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index 6eaa60ac187..1e71064adef 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -594,6 +594,6 @@ U_BOOT_DRIVER(mcffec) = { .probe = mcdmafec_probe, .remove = mcdmafec_remove, .ops = &mcdmafec_ops, - .priv_auto_alloc_size = sizeof(struct fec_info_dma), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct fec_info_dma), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c index 77f1a96a2eb..faeb292e55b 100644 --- a/drivers/net/fsl_mdio.c +++ b/drivers/net/fsl_mdio.c @@ -248,8 +248,8 @@ U_BOOT_DRIVER(tsec_mdio) = { .probe = tsec_mdio_probe, .remove = tsec_mdio_remove, .ops = &tsec_mdio_ops, - .priv_auto_alloc_size = sizeof(struct tsec_mdio_priv), - .platdata_auto_alloc_size = sizeof(struct mdio_perdev_priv), + .priv_auto = sizeof(struct tsec_mdio_priv), + .platdata_auto = sizeof(struct mdio_perdev_priv), }; #endif /* CONFIG_PHYLIB */ #endif /* CONFIG_DM_MDIO */ diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 2ed012d5dd0..97c50cb18ac 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -613,7 +613,7 @@ U_BOOT_DRIVER(ftgmac100) = { .probe = ftgmac100_probe, .remove = ftgmac100_remove, .ops = &ftgmac100_ops, - .priv_auto_alloc_size = sizeof(struct ftgmac100_data), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ftgmac100_data), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 292690de961..20b8e35516b 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -440,8 +440,8 @@ U_BOOT_DRIVER(ftmac100) = { .ofdata_to_platdata = ftmac100_ofdata_to_platdata, .probe = ftmac100_probe, .ops = &ftmac100_ops, - .priv_auto_alloc_size = sizeof(struct ftmac100_data), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ftmac100_data), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 8d95ee15ffd..1b1e7a8f69d 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -759,7 +759,7 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = { .ofdata_to_platdata = gmac_rockchip_ofdata_to_platdata, .probe = gmac_rockchip_probe, .ops = &gmac_rockchip_eth_ops, - .priv_auto_alloc_size = sizeof(struct dw_eth_dev), - .platdata_auto_alloc_size = sizeof(struct gmac_rockchip_platdata), + .priv_auto = sizeof(struct dw_eth_dev), + .platdata_auto = sizeof(struct gmac_rockchip_platdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c index 00c07770290..38f363cd496 100644 --- a/drivers/net/higmacv300.c +++ b/drivers/net/higmacv300.c @@ -598,6 +598,6 @@ U_BOOT_DRIVER(eth_higmac) = { .probe = higmac_probe, .remove = higmac_remove, .ops = &higmac_ops, - .priv_auto_alloc_size = sizeof(struct higmac_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct higmac_priv), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index 58e065cdcc2..6340d6317de 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -698,8 +698,8 @@ U_BOOT_DRIVER(ks8851) = { .ofdata_to_platdata = ks8851_ofdata_to_platdata, .probe = ks8851_probe, .ops = &ks8851_ops, - .priv_auto_alloc_size = sizeof(struct ks_net), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ks_net), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 42eaf49d712..5932b457745 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -1191,8 +1191,8 @@ U_BOOT_DRIVER(ldpaa_eth) = { .bind = ldpaa_eth_bind, .probe = ldpaa_eth_probe, .ops = &ldpaa_eth_ops, - .priv_auto_alloc_size = sizeof(struct ldpaa_eth_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ldpaa_eth_priv), + .platdata_auto = sizeof(struct eth_pdata), };

#else diff --git a/drivers/net/macb.c b/drivers/net/macb.c index b80a259ff75..2ec3039cf81 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1335,8 +1335,8 @@ U_BOOT_DRIVER(eth_macb) = { .probe = macb_eth_probe, .remove = macb_eth_remove, .ops = &macb_eth_ops, - .priv_auto_alloc_size = sizeof(struct macb_device), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct macb_device), + .platdata_auto = sizeof(struct eth_pdata), }; #endif

diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 43b7dbb1a01..72c1827e579 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -614,6 +614,6 @@ U_BOOT_DRIVER(mcffec) = { .probe = mcffec_probe, .remove = mcffec_remove, .ops = &mcffec_ops, - .priv_auto_alloc_size = sizeof(struct fec_info_s), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct fec_info_s), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mdio-ipq4019.c b/drivers/net/mdio-ipq4019.c index bc68e1d5065..13a8856286a 100644 --- a/drivers/net/mdio-ipq4019.c +++ b/drivers/net/mdio-ipq4019.c @@ -142,5 +142,5 @@ U_BOOT_DRIVER(ipq4019_mdio) = { .bind = ipq4019_mdio_bind, .probe = ipq4019_mdio_probe, .ops = &ipq4019_mdio_ops, - .priv_auto_alloc_size = sizeof(struct ipq4019_mdio_priv), + .priv_auto = sizeof(struct ipq4019_mdio_priv), }; diff --git a/drivers/net/mdio_mux_i2creg.c b/drivers/net/mdio_mux_i2creg.c index cc02b5ffd45..f8557dd2c49 100644 --- a/drivers/net/mdio_mux_i2creg.c +++ b/drivers/net/mdio_mux_i2creg.c @@ -105,5 +105,5 @@ U_BOOT_DRIVER(mdio_mux_i2creg) = { .of_match = mdio_mux_i2creg_ids, .probe = mdio_mux_i2creg_probe, .ops = &mdio_mux_i2creg_ops, - .priv_auto_alloc_size = sizeof(struct mdio_mux_i2creg_priv), + .priv_auto = sizeof(struct mdio_mux_i2creg_priv), }; diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c index 3dba4d18a15..fff6ddb2f14 100644 --- a/drivers/net/mdio_mux_sandbox.c +++ b/drivers/net/mdio_mux_sandbox.c @@ -93,5 +93,5 @@ U_BOOT_DRIVER(mdio_mux_sandbox) = { .of_match = mdio_mux_sandbox_ids, .probe = mdio_mux_sandbox_probe, .ops = &mdio_mux_sandbox_ops, - .priv_auto_alloc_size = sizeof(struct mdio_mux_sandbox_priv), + .priv_auto = sizeof(struct mdio_mux_sandbox_priv), }; diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c index b731f60a98a..2b50ffc3acc 100644 --- a/drivers/net/mdio_sandbox.c +++ b/drivers/net/mdio_sandbox.c @@ -90,5 +90,5 @@ U_BOOT_DRIVER(mdio_sandbox) = { .of_match = mdio_sandbox_ids, .probe = mdio_sandbox_probe, .ops = &mdio_sandbox_ops, - .priv_auto_alloc_size = sizeof(struct mdio_sandbox_priv), + .priv_auto = sizeof(struct mdio_sandbox_priv), }; diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c index 1c9a401de81..779377b0db8 100644 --- a/drivers/net/mscc_eswitch/jr2_switch.c +++ b/drivers/net/mscc_eswitch/jr2_switch.c @@ -964,6 +964,6 @@ U_BOOT_DRIVER(jr2) = { .probe = jr2_probe, .remove = jr2_remove, .ops = &jr2_ops, - .priv_auto_alloc_size = sizeof(struct jr2_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct jr2_private), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c index 1d46d0e5e1e..8095f4fabdf 100644 --- a/drivers/net/mscc_eswitch/luton_switch.c +++ b/drivers/net/mscc_eswitch/luton_switch.c @@ -737,6 +737,6 @@ U_BOOT_DRIVER(luton) = { .probe = luton_probe, .remove = luton_remove, .ops = &luton_ops, - .priv_auto_alloc_size = sizeof(struct luton_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct luton_private), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c index 2a48dc6a190..5179b82a637 100644 --- a/drivers/net/mscc_eswitch/ocelot_switch.c +++ b/drivers/net/mscc_eswitch/ocelot_switch.c @@ -651,6 +651,6 @@ U_BOOT_DRIVER(ocelot) = { .probe = ocelot_probe, .remove = ocelot_remove, .ops = &ocelot_ops, - .priv_auto_alloc_size = sizeof(struct ocelot_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ocelot_private), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c index d8ee1a76989..e70f44cc10f 100644 --- a/drivers/net/mscc_eswitch/serval_switch.c +++ b/drivers/net/mscc_eswitch/serval_switch.c @@ -604,6 +604,6 @@ U_BOOT_DRIVER(serval) = { .probe = serval_probe, .remove = serval_remove, .ops = &serval_ops, - .priv_auto_alloc_size = sizeof(struct serval_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct serval_private), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c index 1cf2273142b..88556409385 100644 --- a/drivers/net/mscc_eswitch/servalt_switch.c +++ b/drivers/net/mscc_eswitch/servalt_switch.c @@ -523,6 +523,6 @@ U_BOOT_DRIVER(servalt) = { .probe = servalt_probe, .remove = servalt_remove, .ops = &servalt_ops, - .priv_auto_alloc_size = sizeof(struct servalt_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct servalt_private), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c index 64f1c8c828d..60532111aba 100644 --- a/drivers/net/mt7628-eth.c +++ b/drivers/net/mt7628-eth.c @@ -651,6 +651,6 @@ U_BOOT_DRIVER(mt7628_eth) = { .of_match = mt7628_eth_ids, .probe = mt7628_eth_probe, .ops = &mt7628_eth_ops, - .priv_auto_alloc_size = sizeof(struct mt7628_eth_dev), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct mt7628_eth_dev), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index 5183c08e14c..05fdb44380c 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -1559,10 +1559,10 @@ U_BOOT_DRIVER(mtk_eth) = { .id = UCLASS_ETH, .of_match = mtk_eth_ids, .ofdata_to_platdata = mtk_eth_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .platdata_auto = sizeof(struct eth_pdata), .probe = mtk_eth_probe, .remove = mtk_eth_remove, .ops = &mtk_eth_ops, - .priv_auto_alloc_size = sizeof(struct mtk_eth_priv), + .priv_auto = sizeof(struct mtk_eth_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 2f9464b961a..0be67152ca8 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -1041,7 +1041,7 @@ U_BOOT_DRIVER(mvgbe) = { .ofdata_to_platdata = mvgbe_ofdata_to_platdata, .probe = mvgbe_probe, .ops = &mvgbe_ops, - .priv_auto_alloc_size = sizeof(struct mvgbe_device), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct mvgbe_device), + .platdata_auto = sizeof(struct eth_pdata), }; #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c index a8e93e80fc0..005f28f1b25 100644 --- a/drivers/net/mvmdio.c +++ b/drivers/net/mvmdio.c @@ -232,6 +232,6 @@ U_BOOT_DRIVER(mvmdio) = { .bind = mvmdio_bind, .probe = mvmdio_probe, .ops = &mvmdio_ops, - .priv_auto_alloc_size = sizeof(struct mvmdio_priv), + .priv_auto = sizeof(struct mvmdio_priv), };

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 83f99e5d8ab..a90a631757d 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -1830,6 +1830,6 @@ U_BOOT_DRIVER(mvneta) = { .ofdata_to_platdata = mvneta_ofdata_to_platdata, .probe = mvneta_probe, .ops = &mvneta_ops, - .priv_auto_alloc_size = sizeof(struct mvneta_port), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct mvneta_port), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index c1a78a2918e..c353aa677d0 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -5424,8 +5424,8 @@ static struct driver mvpp2_driver = { .probe = mvpp2_probe, .remove = mvpp2_remove, .ops = &mvpp2_ops, - .priv_auto_alloc_size = sizeof(struct mvpp2_port), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct mvpp2_port), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ACTIVE_DMA, };

@@ -5501,5 +5501,5 @@ U_BOOT_DRIVER(mvpp2_base) = { .id = UCLASS_MISC, .of_match = mvpp2_ids, .bind = mvpp2_base_bind, - .priv_auto_alloc_size = sizeof(struct mvpp2), + .priv_auto = sizeof(struct mvpp2), }; diff --git a/drivers/net/octeontx/bgx.c b/drivers/net/octeontx/bgx.c index fbe2e2c073e..2ea54be84da 100644 --- a/drivers/net/octeontx/bgx.c +++ b/drivers/net/octeontx/bgx.c @@ -1552,7 +1552,7 @@ U_BOOT_DRIVER(octeontx_bgx) = { .id = UCLASS_MISC, .probe = octeontx_bgx_probe, .remove = octeontx_bgx_remove, - .priv_auto_alloc_size = sizeof(struct bgx), + .priv_auto = sizeof(struct bgx), .flags = DM_FLAG_OS_PREPARE, };

diff --git a/drivers/net/octeontx/nic_main.c b/drivers/net/octeontx/nic_main.c index 1a805f7a468..8f05d4e720e 100644 --- a/drivers/net/octeontx/nic_main.c +++ b/drivers/net/octeontx/nic_main.c @@ -766,7 +766,7 @@ U_BOOT_DRIVER(octeontx_nic) = { .name = "octeontx_nic", .id = UCLASS_MISC, .probe = octeontx_nic_probe, - .priv_auto_alloc_size = sizeof(struct nicpf), + .priv_auto = sizeof(struct nicpf), };

static struct pci_device_id octeontx_nic_supported[] = { diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c index 800df8a500b..2d65ff1b5c2 100644 --- a/drivers/net/octeontx/nicvf_main.c +++ b/drivers/net/octeontx/nicvf_main.c @@ -569,8 +569,8 @@ U_BOOT_DRIVER(octeontx_vnic) = { .id = UCLASS_ETH, .probe = octeontx_vnic_probe, .ops = &octeontx_vnic_ops, - .priv_auto_alloc_size = sizeof(struct nicvf), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct nicvf), + .platdata_auto = sizeof(struct eth_pdata), };

static struct pci_device_id octeontx_vnic_supported[] = { diff --git a/drivers/net/octeontx2/cgx.c b/drivers/net/octeontx2/cgx.c index ff2ebc25ce1..189fe7c631a 100644 --- a/drivers/net/octeontx2/cgx.c +++ b/drivers/net/octeontx2/cgx.c @@ -285,7 +285,7 @@ U_BOOT_DRIVER(cgx) = { .id = UCLASS_MISC, .probe = cgx_probe, .remove = cgx_remove, - .priv_auto_alloc_size = sizeof(struct cgx), + .priv_auto = sizeof(struct cgx), };

static struct pci_device_id cgx_supported[] = { diff --git a/drivers/net/octeontx2/rvu_af.c b/drivers/net/octeontx2/rvu_af.c index 7750089a205..d2f96548611 100644 --- a/drivers/net/octeontx2/rvu_af.c +++ b/drivers/net/octeontx2/rvu_af.c @@ -160,7 +160,7 @@ U_BOOT_DRIVER(rvu_af) = { .id = UCLASS_MISC, .probe = rvu_af_probe, .remove = rvu_af_remove, - .priv_auto_alloc_size = sizeof(struct rvu_af), + .priv_auto = sizeof(struct rvu_af), };

static struct pci_device_id rvu_af_supported[] = { diff --git a/drivers/net/octeontx2/rvu_pf.c b/drivers/net/octeontx2/rvu_pf.c index 853914968bb..fbbd2739987 100644 --- a/drivers/net/octeontx2/rvu_pf.c +++ b/drivers/net/octeontx2/rvu_pf.c @@ -104,8 +104,8 @@ U_BOOT_DRIVER(rvu_pf) = { .probe = rvu_pf_probe, .remove = rvu_pf_remove, .ops = &nix_eth_ops, - .priv_auto_alloc_size = sizeof(struct rvu_pf), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct rvu_pf), + .platdata_auto = sizeof(struct eth_pdata), };

static struct pci_device_id rvu_pf_supported[] = { diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index 1daafbe2b9b..b413a4f2491 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -499,8 +499,8 @@ U_BOOT_DRIVER(eth_pch_gbe) = { .probe = pch_gbe_probe, .remove = pch_gbe_remove, .ops = &pch_gbe_ops, - .priv_auto_alloc_size = sizeof(struct pch_gbe_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct pch_gbe_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index ad5ac6618f7..9b27033e792 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -689,8 +689,8 @@ U_BOOT_DRIVER(eth_pcnet) = { .bind = pcnet_bind, .probe = pcnet_probe, .ops = &pcnet_ops, - .priv_auto_alloc_size = sizeof(struct pcnet_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct pcnet_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_UC_FLAG_ALLOC_PRIV_DMA, };

diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c index 3b4ca0393c0..c5713248500 100644 --- a/drivers/net/pfe_eth/pfe_eth.c +++ b/drivers/net/pfe_eth/pfe_eth.c @@ -290,6 +290,6 @@ U_BOOT_DRIVER(pfe_eth) = { .probe = pfe_eth_probe, .remove = pfe_eth_remove, .ops = &pfe_eth_ops, - .priv_auto_alloc_size = sizeof(struct pfe_eth_dev), - .platdata_auto_alloc_size = sizeof(struct pfe_eth_pdata) + .priv_auto = sizeof(struct pfe_eth_dev), + .platdata_auto = sizeof(struct pfe_eth_pdata) }; diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 6a2084947b0..ec491256baa 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -606,6 +606,6 @@ U_BOOT_DRIVER(pic32_ethernet) = { .probe = pic32_eth_probe, .remove = pic32_eth_remove, .ops = &pic32_eth_ops, - .priv_auto_alloc_size = sizeof(struct pic32eth_dev), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct pic32eth_dev), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c index 3482b3ff178..00e01a41ab3 100644 --- a/drivers/net/qe/dm_qe_uec.c +++ b/drivers/net/qe/dm_qe_uec.c @@ -1162,6 +1162,6 @@ U_BOOT_DRIVER(eth_qe_uec) = { .probe = qe_uec_probe, .remove = qe_uec_remove, .ops = &qe_uec_eth_ops, - .priv_auto_alloc_size = sizeof(struct qe_uec_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct qe_uec_priv), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/qe/dm_qe_uec_phy.c b/drivers/net/qe/dm_qe_uec_phy.c index 02ce08edade..038b810460c 100644 --- a/drivers/net/qe/dm_qe_uec_phy.c +++ b/drivers/net/qe/dm_qe_uec_phy.c @@ -159,5 +159,5 @@ U_BOOT_DRIVER(mvmdio) = { .of_match = qe_uec_mdio_ids, .probe = qe_uec_mdio_probe, .ops = &qe_uec_mdio_ops, - .priv_auto_alloc_size = sizeof(struct qe_uec_mdio_priv), + .priv_auto = sizeof(struct qe_uec_mdio_priv), }; diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 98883cd15b4..d1a45ceedce 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -689,7 +689,7 @@ U_BOOT_DRIVER(eth_ravb) = { .probe = ravb_probe, .remove = ravb_remove, .ops = &ravb_ops, - .priv_auto_alloc_size = sizeof(struct ravb_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ravb_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index 71f2aba4c70..934e0c25d4a 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -771,8 +771,8 @@ U_BOOT_DRIVER(eth_rtl8139) = { .bind = rtl8139_bind, .probe = rtl8139_probe, .ops = &rtl8139_ops, - .priv_auto_alloc_size = sizeof(struct rtl8139_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct rtl8139_priv), + .platdata_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_rtl8139, supported); diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 2e1304e44d1..7512f640c2f 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -1248,8 +1248,8 @@ U_BOOT_DRIVER(eth_rtl8169) = { .of_match = rtl8169_eth_ids, .probe = rtl8169_eth_probe, .ops = &rtl8169_eth_ops, - .priv_auto_alloc_size = sizeof(struct rtl8169_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct rtl8169_private), + .platdata_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_rtl8169, supported); diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 4bd94c31031..32f63416b96 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -193,6 +193,6 @@ U_BOOT_DRIVER(eth_sandbox_raw) = { .of_match = sb_eth_raw_ids, .ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata, .ops = &sb_eth_raw_ops, - .priv_auto_alloc_size = sizeof(struct eth_sandbox_raw_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct eth_sandbox_raw_priv), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index 4f7e3d42438..4d007ae0222 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -446,6 +446,6 @@ U_BOOT_DRIVER(eth_sandbox) = { .ofdata_to_platdata = sb_eth_ofdata_to_platdata, .remove = sb_eth_remove, .ops = &sb_eth_ops, - .priv_auto_alloc_size = sizeof(struct eth_sandbox_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct eth_sandbox_priv), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 4cbffb14c51..a5bd4596fd5 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -957,8 +957,8 @@ U_BOOT_DRIVER(eth_sh_ether) = { .probe = sh_ether_probe, .remove = sh_ether_remove, .ops = &sh_ether_ops, - .priv_auto_alloc_size = sizeof(struct sh_ether_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct sh_ether_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 09372d7f6ba..e0083ce8a33 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -639,8 +639,8 @@ U_BOOT_DRIVER(smc911x) = { .ofdata_to_platdata = smc911x_ofdata_to_platdata, .probe = smc911x_probe, .ops = &smc911x_ops, - .priv_auto_alloc_size = sizeof(struct smc911x_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct smc911x_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index 0f7ada8c3e2..301462009b9 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -998,6 +998,6 @@ U_BOOT_DRIVER(ave) = { .remove = ave_remove, .ofdata_to_platdata = ave_ofdata_to_platdata, .ops = &ave_ops, - .priv_auto_alloc_size = sizeof(struct ave_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ave_private), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 4524604126c..0fa8ba97b0f 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -1004,7 +1004,7 @@ U_BOOT_DRIVER(eth_sun8i_emac) = { .ofdata_to_platdata = sun8i_emac_eth_ofdata_to_platdata, .probe = sun8i_emac_eth_probe, .ops = &sun8i_emac_eth_ops, - .priv_auto_alloc_size = sizeof(struct emac_eth_dev), - .platdata_auto_alloc_size = sizeof(struct sun8i_eth_pdata), + .priv_auto = sizeof(struct emac_eth_dev), + .platdata_auto = sizeof(struct sun8i_eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index 8e66ce24611..dfdf3c1f7db 100644 --- a/drivers/net/sunxi_emac.c +++ b/drivers/net/sunxi_emac.c @@ -612,6 +612,6 @@ U_BOOT_DRIVER(eth_sunxi_emac) = { .ofdata_to_platdata = sunxi_emac_eth_ofdata_to_platdata, .probe = sunxi_emac_eth_probe, .ops = &sunxi_emac_eth_ops, - .priv_auto_alloc_size = sizeof(struct emac_eth_dev), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct emac_eth_dev), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index 971bdcdfda9..c8dcefe5e35 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -791,7 +791,7 @@ U_BOOT_DRIVER(am65_cpsw_nuss_slave) = { .of_match = am65_cpsw_nuss_ids, .probe = am65_cpsw_probe_cpsw, .ops = &am65_cpsw_ops, - .priv_auto_alloc_size = sizeof(struct am65_cpsw_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct am65_cpsw_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 1c11257839c..94c10a82340 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -1378,11 +1378,11 @@ U_BOOT_DRIVER(eth_cpsw) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = cpsw_eth_ids, .ofdata_to_platdata = cpsw_eth_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .platdata_auto = sizeof(struct eth_pdata), #endif .probe = cpsw_eth_probe, .ops = &cpsw_eth_ops, - .priv_auto_alloc_size = sizeof(struct cpsw_priv), + .priv_auto = sizeof(struct cpsw_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_PRE_RELOC, }; #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 56ea1fec0af..2f025018aa5 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -865,5 +865,5 @@ U_BOOT_DRIVER(davinci_emac) = { .of_match = davinci_emac_ids, .probe = davinci_emac_probe, .ops = &davinci_emac_ops, - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 50f0d33a83b..62658bc2128 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -804,8 +804,8 @@ U_BOOT_DRIVER(eth_ks2_slave) = { .probe = ks2_eth_probe, .remove = ks2_eth_remove, .ops = &ks2_eth_ops, - .priv_auto_alloc_size = sizeof(struct ks2_eth_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ks2_eth_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

@@ -817,7 +817,7 @@ U_BOOT_DRIVER(eth_ks2) = { .probe = ks2_eth_probe, .remove = ks2_eth_remove, .ops = &ks2_eth_ops, - .priv_auto_alloc_size = sizeof(struct ks2_eth_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ks2_eth_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index c436b8317d9..228820484af 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -904,8 +904,8 @@ U_BOOT_DRIVER(eth_tsec) = { .probe = tsec_probe, .remove = tsec_remove, .ops = &tsec_ops, - .priv_auto_alloc_size = sizeof(struct tsec_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct tsec_private), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 3fe9a617f7b..bb66492ec2a 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -791,6 +791,6 @@ U_BOOT_DRIVER(axi_emac) = { .probe = axi_emac_probe, .remove = axi_emac_remove, .ops = &axi_emac_ops, - .priv_auto_alloc_size = sizeof(struct axidma_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct axidma_priv), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 256d073da4a..818e7f4811e 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -635,6 +635,6 @@ U_BOOT_DRIVER(emaclite) = { .probe = emaclite_probe, .remove = emaclite_remove, .ops = &emaclite_ops, - .priv_auto_alloc_size = sizeof(struct xemaclite), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct xemaclite), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 75a6f8f280b..91adffe5284 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -811,6 +811,6 @@ U_BOOT_DRIVER(zynq_gem) = { .probe = zynq_gem_probe, .remove = zynq_gem_remove, .ops = &zynq_gem_ops, - .priv_auto_alloc_size = sizeof(struct zynq_gem_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct zynq_gem_priv), + .platdata_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index fc64d93ab83..b7855499973 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -795,7 +795,7 @@ U_BOOT_DRIVER(nvme_blk) = { .id = UCLASS_BLK, .probe = nvme_blk_probe, .ops = &nvme_blk_ops, - .priv_auto_alloc_size = sizeof(struct nvme_ns), + .priv_auto = sizeof(struct nvme_ns), };

static int nvme_bind(struct udevice *udev) @@ -869,7 +869,7 @@ U_BOOT_DRIVER(nvme) = { .id = UCLASS_NVME, .bind = nvme_bind, .probe = nvme_probe, - .priv_auto_alloc_size = sizeof(struct nvme_dev), + .priv_auto = sizeof(struct nvme_dev), };

struct pci_device_id nvme_supported[] = { diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c index 76f552527e3..37c368954b4 100644 --- a/drivers/pch/sandbox_pch.c +++ b/drivers/pch/sandbox_pch.c @@ -82,5 +82,5 @@ U_BOOT_DRIVER(sandbox_pch_drv) = { .id = UCLASS_PCH, .of_match = sandbox_pch_ids, .ops = &sandbox_pch_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_pch_priv), + .priv_auto = sizeof(struct sandbox_pch_priv), }; diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c index 0ce60ddf7db..2ce23ec7805 100644 --- a/drivers/pci/pci-aardvark.c +++ b/drivers/pci/pci-aardvark.c @@ -701,5 +701,5 @@ U_BOOT_DRIVER(pcie_advk) = { .probe = pcie_advk_probe, .remove = pcie_advk_remove, .flags = DM_FLAG_OS_PREPARE, - .priv_auto_alloc_size = sizeof(struct pcie_advk), + .priv_auto = sizeof(struct pcie_advk), }; diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index a52064341e0..3ca9a1567c9 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -105,14 +105,14 @@ UCLASS_DRIVER(pci_emul) = { .name = "pci_emul", .post_probe = sandbox_pci_emul_post_probe, .pre_remove = sandbox_pci_emul_pre_remove, - .priv_auto_alloc_size = sizeof(struct sandbox_pci_emul_priv), - .per_device_auto_alloc_size = sizeof(struct pci_emul_uc_priv), + .priv_auto = sizeof(struct sandbox_pci_emul_priv), + .per_device_auto = sizeof(struct pci_emul_uc_priv), };

/* * This uclass is a child of the pci bus. Its platdata is not defined here so * is defined by its parent, UCLASS_PCI, which uses struct pci_child_platdata. - * See per_child_platdata_auto_alloc_size in UCLASS_DRIVER(pci). + * See per_child_platdata_auto in UCLASS_DRIVER(pci). */ UCLASS_DRIVER(pci_emul_parent) = { .id = UCLASS_PCI_EMUL_PARENT, diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c index e76abc1f84c..cff1a41f024 100644 --- a/drivers/pci/pci-rcar-gen2.c +++ b/drivers/pci/pci-rcar-gen2.c @@ -260,5 +260,5 @@ U_BOOT_DRIVER(rcar_gen2_pci) = { .ops = &rcar_gen2_pci_ops, .probe = rcar_gen2_pci_probe, .ofdata_to_platdata = rcar_gen2_pci_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct rcar_gen2_pci_priv), + .priv_auto = sizeof(struct rcar_gen2_pci_priv), }; diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index 1f51854ccc6..f01fcf61062 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -400,5 +400,5 @@ U_BOOT_DRIVER(rcar_gen3_pcie) = { .ops = &rcar_gen3_pcie_ops, .probe = rcar_gen3_pcie_probe, .ofdata_to_platdata = rcar_gen3_pcie_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct rcar_gen3_pcie_priv), + .platdata_auto = sizeof(struct rcar_gen3_pcie_priv), }; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index abc3de84db3..c96a0c844b3 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1788,8 +1788,8 @@ UCLASS_DRIVER(pci) = { .pre_probe = pci_uclass_pre_probe, .post_probe = pci_uclass_post_probe, .child_post_bind = pci_uclass_child_post_bind, - .per_device_auto_alloc_size = sizeof(struct pci_controller), - .per_child_platdata_auto_alloc_size = + .per_device_auto = sizeof(struct pci_controller), + .per_child_platdata_auto = sizeof(struct pci_child_platdata), };

diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c index 6576f53f52a..9cb95da1753 100644 --- a/drivers/pci/pci_mpc85xx.c +++ b/drivers/pci/pci_mpc85xx.c @@ -155,5 +155,5 @@ U_BOOT_DRIVER(mpc85xx_pci) = { .probe = mpc85xx_pci_dm_probe, .remove = mpc85xx_pci_dm_remove, .ofdata_to_platdata = mpc85xx_pci_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct mpc85xx_pci_priv), + .priv_auto = sizeof(struct mpc85xx_pci_priv), }; diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index ba1c139dbc5..207ae336249 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -471,7 +471,7 @@ static struct driver pcie_mvebu_drv = { .ops = &mvebu_pcie_ops, .probe = mvebu_pcie_probe, .ofdata_to_platdata = mvebu_pcie_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mvebu_pcie), + .platdata_auto = sizeof(struct mvebu_pcie), };

/* diff --git a/drivers/pci/pci_octeontx.c b/drivers/pci/pci_octeontx.c index 30537543a0f..d211d22226e 100644 --- a/drivers/pci/pci_octeontx.c +++ b/drivers/pci/pci_octeontx.c @@ -359,6 +359,6 @@ U_BOOT_DRIVER(pci_octeontx) = { .ops = &pci_octeontx_ops, .ofdata_to_platdata = pci_octeontx_ofdata_to_platdata, .probe = pci_octeontx_probe, - .priv_auto_alloc_size = sizeof(struct octeontx_pci), + .priv_auto = sizeof(struct octeontx_pci), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index 8745f286bd4..d318b33d2bd 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -128,10 +128,10 @@ U_BOOT_DRIVER(pci_sandbox) = { .of_match = sandbox_pci_ids, .ops = &sandbox_pci_ops, .probe = sandbox_pci_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_pci_priv), + .priv_auto = sizeof(struct sandbox_pci_priv),

/* Attach an emulator if we can */ .child_post_bind = dm_scan_fdt_dev, - .per_child_platdata_auto_alloc_size = + .per_child_platdata_auto = sizeof(struct pci_child_platdata), }; diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index 82f5c59d917..386b25a77aa 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -1199,5 +1199,5 @@ U_BOOT_DRIVER(pci_tegra) = { .ops = &pci_tegra_ops, .ofdata_to_platdata = pci_tegra_ofdata_to_platdata, .probe = pci_tegra_probe, - .priv_auto_alloc_size = sizeof(struct tegra_pcie), + .priv_auto = sizeof(struct tegra_pcie), }; diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c index dade79e9c86..8f084df4882 100644 --- a/drivers/pci/pcie_brcmstb.c +++ b/drivers/pci/pcie_brcmstb.c @@ -619,5 +619,5 @@ U_BOOT_DRIVER(pcie_brcm_base) = { .of_match = brcm_pcie_ids, .probe = brcm_pcie_probe, .ofdata_to_platdata = brcm_pcie_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct brcm_pcie), + .priv_auto = sizeof(struct brcm_pcie), }; diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c index 8fbc8fb7d0a..cacb5e98e7b 100644 --- a/drivers/pci/pcie_dw_mvebu.c +++ b/drivers/pci/pcie_dw_mvebu.c @@ -580,5 +580,5 @@ U_BOOT_DRIVER(pcie_dw_mvebu) = { .ops = &pcie_dw_mvebu_ops, .ofdata_to_platdata = pcie_dw_mvebu_ofdata_to_platdata, .probe = pcie_dw_mvebu_probe, - .priv_auto_alloc_size = sizeof(struct pcie_dw_mvebu), + .priv_auto = sizeof(struct pcie_dw_mvebu), }; diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c index e0635e07c21..20444d990e1 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -726,5 +726,5 @@ U_BOOT_DRIVER(pcie_dw_ti) = { .ops = &pcie_dw_ti_ops, .ofdata_to_platdata = pcie_dw_ti_ofdata_to_platdata, .probe = pcie_dw_ti_probe, - .priv_auto_alloc_size = sizeof(struct pcie_dw_ti), + .priv_auto = sizeof(struct pcie_dw_ti), }; diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c index 96afa4263df..1e06b7b6e0b 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -168,5 +168,5 @@ U_BOOT_DRIVER(pci_generic_ecam) = { .ops = &pci_generic_ecam_ops, .probe = pci_generic_ecam_probe, .ofdata_to_platdata = pci_generic_ecam_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct generic_ecam_pcie), + .priv_auto = sizeof(struct generic_ecam_pcie), }; diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c index da6a6b15534..7e68c0a9d02 100644 --- a/drivers/pci/pcie_fsl.c +++ b/drivers/pci/pcie_fsl.c @@ -663,5 +663,5 @@ U_BOOT_DRIVER(fsl_pcie) = { .ops = &fsl_pcie_ops, .ofdata_to_platdata = fsl_pcie_ofdata_to_platdata, .probe = fsl_pcie_probe, - .priv_auto_alloc_size = sizeof(struct fsl_pcie), + .priv_auto = sizeof(struct fsl_pcie), }; diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index cbf12371a0f..ebf9b8813da 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -830,7 +830,7 @@ U_BOOT_DRIVER(imx_pcie) = { .probe = imx_pcie_dm_probe, .remove = imx_pcie_dm_remove, .ofdata_to_platdata = imx_pcie_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct imx_pcie_priv), + .priv_auto = sizeof(struct imx_pcie_priv), .flags = DM_FLAG_OS_PREPARE, }; #endif diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c index cafb02195f0..641a770ee56 100644 --- a/drivers/pci/pcie_intel_fpga.c +++ b/drivers/pci/pcie_intel_fpga.c @@ -430,5 +430,5 @@ U_BOOT_DRIVER(pcie_intel_fpga) = { .ops = &pcie_intel_fpga_ops, .ofdata_to_platdata = pcie_intel_fpga_ofdata_to_platdata, .probe = pcie_intel_fpga_probe, - .priv_auto_alloc_size = sizeof(struct intel_fpga_pcie), + .priv_auto = sizeof(struct intel_fpga_pcie), }; diff --git a/drivers/pci/pcie_iproc.c b/drivers/pci/pcie_iproc.c index d77735fcf26..6725ff64372 100644 --- a/drivers/pci/pcie_iproc.c +++ b/drivers/pci/pcie_iproc.c @@ -1282,6 +1282,6 @@ U_BOOT_DRIVER(pci_iproc) = { .ops = &iproc_pcie_ops, .probe = iproc_pcie_probe, .remove = iproc_pcie_remove, - .priv_auto_alloc_size = sizeof(struct iproc_pcie), + .priv_auto = sizeof(struct iproc_pcie), .flags = DM_REMOVE_OS_PREPARE, }; diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c index eba230e3a5f..1503f961e2d 100644 --- a/drivers/pci/pcie_layerscape_ep.c +++ b/drivers/pci/pcie_layerscape_ep.c @@ -328,5 +328,5 @@ U_BOOT_DRIVER(pci_layerscape_ep) = { .ops = &ls_pcie_ep_ops, .probe = ls_pcie_ep_probe, .remove = ls_pcie_ep_remove, - .priv_auto_alloc_size = sizeof(struct ls_pcie_ep), + .priv_auto = sizeof(struct ls_pcie_ep), }; diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c index d6efdd3ed63..62bfbd9a86a 100644 --- a/drivers/pci/pcie_layerscape_gen4.c +++ b/drivers/pci/pcie_layerscape_gen4.c @@ -569,5 +569,5 @@ U_BOOT_DRIVER(pcie_layerscape_gen4) = { .of_match = ls_pcie_g4_ids, .ops = &ls_pcie_g4_ops, .probe = ls_pcie_g4_probe, - .priv_auto_alloc_size = sizeof(struct ls_pcie_g4), + .priv_auto = sizeof(struct ls_pcie_g4), }; diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c index 241acbdc449..c4e6099a597 100644 --- a/drivers/pci/pcie_layerscape_rc.c +++ b/drivers/pci/pcie_layerscape_rc.c @@ -375,5 +375,5 @@ U_BOOT_DRIVER(pci_layerscape) = { .of_match = ls_pcie_ids, .ops = &ls_pcie_ops, .probe = ls_pcie_probe, - .priv_auto_alloc_size = sizeof(struct ls_pcie_rc), + .priv_auto = sizeof(struct ls_pcie_rc), }; diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c index 5bd11661c3c..82770aca4f7 100644 --- a/drivers/pci/pcie_mediatek.c +++ b/drivers/pci/pcie_mediatek.c @@ -728,7 +728,7 @@ U_BOOT_DRIVER(pcie_mediatek_v1) = { .of_match = mtk_pcie_ids, .ops = &mtk_pcie_ops, .probe = mtk_pcie_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pcie), + .priv_auto = sizeof(struct mtk_pcie), };

static const struct udevice_id mtk_pcie_ids_v2[] = { @@ -742,5 +742,5 @@ U_BOOT_DRIVER(pcie_mediatek_v2) = { .of_match = mtk_pcie_ids_v2, .ops = &mtk_pcie_ops_v2, .probe = mtk_pcie_probe_v2, - .priv_auto_alloc_size = sizeof(struct mtk_pcie), + .priv_auto = sizeof(struct mtk_pcie), }; diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c index 51b2171f9fa..cce78714b30 100644 --- a/drivers/pci/pcie_phytium.c +++ b/drivers/pci/pcie_phytium.c @@ -195,5 +195,5 @@ U_BOOT_DRIVER(pci_phytium) = { .of_match = pci_phytium_ids, .ops = &pci_phytium_ops, .ofdata_to_platdata = pci_phytium_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct phytium_pcie), + .priv_auto = sizeof(struct phytium_pcie), }; diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c index 96173b81cc3..027745e42e8 100644 --- a/drivers/pci/pcie_rockchip.c +++ b/drivers/pci/pcie_rockchip.c @@ -565,5 +565,5 @@ U_BOOT_DRIVER(rockchip_pcie) = { .of_match = rockchip_pcie_ids, .ops = &rockchip_pcie_ops, .probe = rockchip_pcie_probe, - .priv_auto_alloc_size = sizeof(struct rockchip_pcie), + .priv_auto = sizeof(struct rockchip_pcie), }; diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c index 713ad49d045..7aaee77662b 100644 --- a/drivers/pci/pcie_xilinx.c +++ b/drivers/pci/pcie_xilinx.c @@ -175,5 +175,5 @@ U_BOOT_DRIVER(pcie_xilinx) = { .of_match = pcie_xilinx_ids, .ops = &pcie_xilinx_ops, .ofdata_to_platdata = pcie_xilinx_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct xilinx_pcie), + .priv_auto = sizeof(struct xilinx_pcie), }; diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c index 74dfdde154e..7313428fe0c 100644 --- a/drivers/pci_endpoint/pcie-cadence-ep.c +++ b/drivers/pci_endpoint/pcie-cadence-ep.c @@ -173,5 +173,5 @@ U_BOOT_DRIVER(cdns_pcie) = { .ops = &cdns_pci_ep_ops, .probe = cdns_pci_ep_probe, .remove = cdns_pci_ep_remove, - .priv_auto_alloc_size = sizeof(struct cdns_pcie), + .priv_auto = sizeof(struct cdns_pcie), }; diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c index 8e05d5ba890..de148cddb91 100644 --- a/drivers/pci_endpoint/sandbox-pci_ep.c +++ b/drivers/pci_endpoint/sandbox-pci_ep.c @@ -175,5 +175,5 @@ U_BOOT_DRIVER(pci_ep_sandbox) = { .of_match = sandbox_pci_ep_ids, .probe = sandbox_pci_ep_probe, .ops = &sandbox_pci_ep_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_pci_ep_priv), + .priv_auto = sizeof(struct sandbox_pci_ep_priv), }; diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 7b9d3eefc5e..aadb2901261 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -646,6 +646,6 @@ U_BOOT_DRIVER(sun4i_usb_phy) = { .of_match = sun4i_usb_phy_ids, .ops = &sun4i_usb_phy_ops, .probe = sun4i_usb_phy_probe, - .platdata_auto_alloc_size = sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]), - .priv_auto_alloc_size = sizeof(struct sun4i_usb_phy_data), + .platdata_auto = sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]), + .priv_auto = sizeof(struct sun4i_usb_phy_data), }; diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c index d29344ddb48..60608a55bc2 100644 --- a/drivers/phy/bcm6318-usbh-phy.c +++ b/drivers/phy/bcm6318-usbh-phy.c @@ -138,6 +138,6 @@ U_BOOT_DRIVER(bcm6318_usbh) = { .id = UCLASS_PHY, .of_match = bcm6318_usbh_ids, .ops = &bcm6318_usbh_ops, - .priv_auto_alloc_size = sizeof(struct bcm6318_usbh_priv), + .priv_auto = sizeof(struct bcm6318_usbh_priv), .probe = bcm6318_usbh_probe, }; diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c index 8d28292726c..1b6b5ad177e 100644 --- a/drivers/phy/bcm6348-usbh-phy.c +++ b/drivers/phy/bcm6348-usbh-phy.c @@ -87,6 +87,6 @@ U_BOOT_DRIVER(bcm6348_usbh) = { .id = UCLASS_PHY, .of_match = bcm6348_usbh_ids, .ops = &bcm6348_usbh_ops, - .priv_auto_alloc_size = sizeof(struct bcm6348_usbh_priv), + .priv_auto = sizeof(struct bcm6348_usbh_priv), .probe = bcm6348_usbh_probe, }; diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c index 501b97f3e21..bfdcfb0d245 100644 --- a/drivers/phy/bcm6358-usbh-phy.c +++ b/drivers/phy/bcm6358-usbh-phy.c @@ -87,6 +87,6 @@ U_BOOT_DRIVER(bcm6358_usbh) = { .id = UCLASS_PHY, .of_match = bcm6358_usbh_ids, .ops = &bcm6358_usbh_ops, - .priv_auto_alloc_size = sizeof(struct bcm6358_usbh_priv), + .priv_auto = sizeof(struct bcm6358_usbh_priv), .probe = bcm6358_usbh_probe, }; diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c index 99fdd33499a..4d3a63faada 100644 --- a/drivers/phy/bcm6368-usbh-phy.c +++ b/drivers/phy/bcm6368-usbh-phy.c @@ -191,6 +191,6 @@ U_BOOT_DRIVER(bcm6368_usbh) = { .id = UCLASS_PHY, .of_match = bcm6368_usbh_ids, .ops = &bcm6368_usbh_ops, - .priv_auto_alloc_size = sizeof(struct bcm6368_usbh_priv), + .priv_auto = sizeof(struct bcm6368_usbh_priv), .probe = bcm6368_usbh_probe, }; diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c index 9faf5010033..12f8a265f77 100644 --- a/drivers/phy/keystone-usb-phy.c +++ b/drivers/phy/keystone-usb-phy.c @@ -130,5 +130,5 @@ U_BOOT_DRIVER(keystone_usb_phy) = { .of_match = keystone_usb_phy_ids, .ops = &keystone_usb_phy_ops, .probe = keystone_usb_phy_probe, - .priv_auto_alloc_size = sizeof(struct keystone_usb_phy), + .priv_auto = sizeof(struct keystone_usb_phy), }; diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c index 5e8ce740cd6..b2203277c41 100644 --- a/drivers/phy/marvell/comphy_core.c +++ b/drivers/phy/marvell/comphy_core.c @@ -189,5 +189,5 @@ U_BOOT_DRIVER(mvebu_comphy) = { .id = UCLASS_MISC, .of_match = comphy_ids, .probe = comphy_probe, - .priv_auto_alloc_size = sizeof(struct chip_serdes_phy_config), + .priv_auto = sizeof(struct chip_serdes_phy_config), }; diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c index 447ce7283db..2fbba7fdae0 100644 --- a/drivers/phy/meson-g12a-usb2.c +++ b/drivers/phy/meson-g12a-usb2.c @@ -215,5 +215,5 @@ U_BOOT_DRIVER(meson_g12a_usb2_phy) = { .of_match = meson_g12a_usb2_phy_ids, .probe = meson_g12a_usb2_phy_probe, .ops = &meson_g12a_usb2_phy_ops, - .priv_auto_alloc_size = sizeof(struct phy_meson_g12a_usb2_priv), + .priv_auto = sizeof(struct phy_meson_g12a_usb2_priv), }; diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c index 4e9696fd590..0433d934743 100644 --- a/drivers/phy/meson-g12a-usb3-pcie.c +++ b/drivers/phy/meson-g12a-usb3-pcie.c @@ -343,5 +343,5 @@ U_BOOT_DRIVER(meson_g12a_usb3_pcie_phy) = { .of_match = meson_g12a_usb3_pcie_phy_ids, .probe = meson_g12a_usb3_pcie_phy_probe, .ops = &meson_g12a_usb3_pcie_phy_ops, - .priv_auto_alloc_size = sizeof(struct phy_g12a_usb3_pcie_priv), + .priv_auto = sizeof(struct phy_g12a_usb3_pcie_priv), }; diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c index d1beebee43e..7a2e3d2739e 100644 --- a/drivers/phy/meson-gxbb-usb2.c +++ b/drivers/phy/meson-gxbb-usb2.c @@ -232,5 +232,5 @@ U_BOOT_DRIVER(meson_gxbb_usb2_phy) = { .probe = meson_gxbb_usb2_phy_probe, .remove = meson_gxbb_usb2_phy_remove, .ops = &meson_gxbb_usb2_phy_ops, - .priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv), + .priv_auto = sizeof(struct phy_meson_gxbb_usb2_priv), }; diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c index 2267bd08c2c..9fb376cec44 100644 --- a/drivers/phy/meson-gxl-usb2.c +++ b/drivers/phy/meson-gxl-usb2.c @@ -251,5 +251,5 @@ U_BOOT_DRIVER(meson_gxl_usb2_phy) = { .of_match = meson_gxl_usb2_phy_ids, .probe = meson_gxl_usb2_phy_probe, .ops = &meson_gxl_usb2_phy_ops, - .priv_auto_alloc_size = sizeof(struct phy_meson_gxl_usb2_priv), + .priv_auto = sizeof(struct phy_meson_gxl_usb2_priv), }; diff --git a/drivers/phy/msm8916-usbh-phy.c b/drivers/phy/msm8916-usbh-phy.c index 4efaddd701c..7c9d030a4d8 100644 --- a/drivers/phy/msm8916-usbh-phy.c +++ b/drivers/phy/msm8916-usbh-phy.c @@ -106,5 +106,5 @@ U_BOOT_DRIVER(msm8916_usbphy) = { .of_match = msm_phy_ids, .ops = &msm_phy_ops, .probe = msm_phy_probe, - .priv_auto_alloc_size = sizeof(struct msm_phy_priv), + .priv_auto = sizeof(struct msm_phy_priv), }; diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c index 4c0818f6e8d..4069208b679 100644 --- a/drivers/phy/mt76x8-usb-phy.c +++ b/drivers/phy/mt76x8-usb-phy.c @@ -248,5 +248,5 @@ U_BOOT_DRIVER(mt76x8_usb_phy) = { .of_match = mt76x8_usb_phy_ids, .ops = &mt76x8_usb_phy_ops, .probe = mt76x8_usb_phy_probe, - .priv_auto_alloc_size = sizeof(struct mt76x8_usb_phy), + .priv_auto = sizeof(struct mt76x8_usb_phy), }; diff --git a/drivers/phy/nop-phy.c b/drivers/phy/nop-phy.c index ba71785fe42..84aac806230 100644 --- a/drivers/phy/nop-phy.c +++ b/drivers/phy/nop-phy.c @@ -56,5 +56,5 @@ U_BOOT_DRIVER(nop_phy) = { .of_match = nop_phy_ids, .ops = &nop_phy_ops, .probe = nop_phy_probe, - .priv_auto_alloc_size = sizeof(struct nop_phy_priv), + .priv_auto = sizeof(struct nop_phy_priv), }; diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c index a981cb2f8d6..cb991437321 100644 --- a/drivers/phy/omap-usb2-phy.c +++ b/drivers/phy/omap-usb2-phy.c @@ -261,5 +261,5 @@ U_BOOT_DRIVER(omap_usb2_phy) = { .of_match = omap_usb2_id_table, .probe = omap_usb2_phy_probe, .ops = &omap_usb2_phy_ops, - .priv_auto_alloc_size = sizeof(struct omap_usb2_phy), + .priv_auto = sizeof(struct omap_usb2_phy), }; diff --git a/drivers/phy/phy-bcm-sr-pcie.c b/drivers/phy/phy-bcm-sr-pcie.c index 36c77c4b639..9f7c983ce42 100644 --- a/drivers/phy/phy-bcm-sr-pcie.c +++ b/drivers/phy/phy-bcm-sr-pcie.c @@ -172,6 +172,6 @@ U_BOOT_DRIVER(sr_pcie_phy) = { .probe = sr_pcie_phy_probe, .of_match = sr_pcie_phy_match_table, .ops = &sr_pcie_phy_ops, - .platdata_auto_alloc_size = sizeof(struct sr_pcie_phy_core), - .priv_auto_alloc_size = sizeof(struct sr_pcie_phy_core), + .platdata_auto = sizeof(struct sr_pcie_phy_core), + .priv_auto = sizeof(struct sr_pcie_phy_core), }; diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c index 3d7b9cd2b12..824244b8528 100644 --- a/drivers/phy/phy-mtk-tphy.c +++ b/drivers/phy/phy-mtk-tphy.c @@ -749,5 +749,5 @@ U_BOOT_DRIVER(mtk_tphy) = { .of_match = mtk_tphy_id_table, .ops = &mtk_tphy_ops, .probe = mtk_tphy_probe, - .priv_auto_alloc_size = sizeof(struct mtk_tphy), + .priv_auto = sizeof(struct mtk_tphy), }; diff --git a/drivers/phy/phy-qcom-ipq4019-usb.c b/drivers/phy/phy-qcom-ipq4019-usb.c index 465f0d3a01e..5808489249f 100644 --- a/drivers/phy/phy-qcom-ipq4019-usb.c +++ b/drivers/phy/phy-qcom-ipq4019-usb.c @@ -75,7 +75,7 @@ U_BOOT_DRIVER(ipq4019_usb_ss_phy) = { .of_match = ipq4019_usb_ss_phy_ids, .ops = &ipq4019_usb_ss_phy_ops, .probe = ipq4019_usb_ss_phy_probe, - .priv_auto_alloc_size = sizeof(struct ipq4019_usb_phy), + .priv_auto = sizeof(struct ipq4019_usb_phy), };

static int ipq4019_hs_phy_power_off(struct phy *_phy) @@ -141,5 +141,5 @@ U_BOOT_DRIVER(ipq4019_usb_hs_phy) = { .of_match = ipq4019_usb_hs_phy_ids, .ops = &ipq4019_usb_hs_phy_ops, .probe = ipq4019_usb_hs_phy_probe, - .priv_auto_alloc_size = sizeof(struct ipq4019_usb_phy), + .priv_auto = sizeof(struct ipq4019_usb_phy), }; diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c index 18da86e4bea..17940959246 100644 --- a/drivers/phy/phy-rcar-gen2.c +++ b/drivers/phy/phy-rcar-gen2.c @@ -189,5 +189,5 @@ U_BOOT_DRIVER(rcar_gen2_phy) = { .ops = &rcar_gen2_phy_phy_ops, .probe = rcar_gen2_phy_probe, .remove = rcar_gen2_phy_remove, - .priv_auto_alloc_size = sizeof(struct rcar_gen2_phy), + .priv_auto = sizeof(struct rcar_gen2_phy), }; diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c index ce39cd8f9e2..8c59631428b 100644 --- a/drivers/phy/phy-rcar-gen3.c +++ b/drivers/phy/phy-rcar-gen3.c @@ -158,5 +158,5 @@ U_BOOT_DRIVER(rcar_gen3_phy) = { .ops = &rcar_gen3_phy_phy_ops, .probe = rcar_gen3_phy_probe, .remove = rcar_gen3_phy_remove, - .priv_auto_alloc_size = sizeof(struct rcar_gen3_phy), + .priv_auto = sizeof(struct rcar_gen3_phy), }; diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c index ab4a913c934..f23aef4fb01 100644 --- a/drivers/phy/phy-stm32-usbphyc.c +++ b/drivers/phy/phy-stm32-usbphyc.c @@ -419,5 +419,5 @@ U_BOOT_DRIVER(stm32_usb_phyc) = { .of_match = stm32_usbphyc_of_match, .ops = &stm32_usbphyc_phy_ops, .probe = stm32_usbphyc_probe, - .priv_auto_alloc_size = sizeof(struct stm32_usbphyc), + .priv_auto = sizeof(struct stm32_usbphyc), }; diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c index cc73760c8be..8e35ea14750 100644 --- a/drivers/phy/phy-ti-am654.c +++ b/drivers/phy/phy-ti-am654.c @@ -187,7 +187,7 @@ U_BOOT_DRIVER(serdes_am654_mux_clk) = { .name = "ti-serdes-am654-mux-clk", .id = UCLASS_CLK, .probe = serdes_am654_mux_clk_probe, - .priv_auto_alloc_size = sizeof(struct serdes_am654_mux_clk_data), + .priv_auto = sizeof(struct serdes_am654_mux_clk_data), .ops = &serdes_am654_mux_clk_ops, };

@@ -412,5 +412,5 @@ U_BOOT_DRIVER(am654_serdes_phy) = { .bind = serdes_am654_bind, .ops = &serdes_am654_phy_ops, .probe = serdes_am654_probe, - .priv_auto_alloc_size = sizeof(struct serdes_am654), + .priv_auto = sizeof(struct serdes_am654), }; diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index c5ea6ca31f1..6744b8b2275 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -308,5 +308,5 @@ U_BOOT_DRIVER(rockchip_usb2phy) = { .of_match = rockchip_usb2phy_ids, .probe = rockchip_usb2phy_probe, .bind = rockchip_usb2phy_bind, - .priv_auto_alloc_size = sizeof(struct rockchip_usb2phy), + .priv_auto = sizeof(struct rockchip_usb2phy), }; diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c index 617943fd821..bc6c0feed04 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -267,5 +267,5 @@ U_BOOT_DRIVER(rockchip_pcie_phy) = { .of_match = rockchip_pcie_phy_ids, .ops = &rockchip_pcie_phy_ops, .probe = rockchip_pcie_phy_probe, - .priv_auto_alloc_size = sizeof(struct rockchip_pcie_phy), + .priv_auto = sizeof(struct rockchip_pcie_phy), }; diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c index da00daa4476..a45a318e474 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c @@ -792,5 +792,5 @@ U_BOOT_DRIVER(rockchip_typec_phy) = { .of_match = rockchip_typec_phy_ids, .probe = rockchip_tcphy_probe, .bind = rockchip_tcphy_bind, - .priv_auto_alloc_size = sizeof(struct rockchip_tcphy), + .priv_auto = sizeof(struct rockchip_tcphy), }; diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c index 5f36da7692b..7b3d988613b 100644 --- a/drivers/phy/sandbox-phy.c +++ b/drivers/phy/sandbox-phy.c @@ -116,5 +116,5 @@ U_BOOT_DRIVER(phy_sandbox) = { .of_match = sandbox_phy_ids, .ops = &sandbox_phy_ops, .probe = sandbox_phy_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_phy_priv), + .priv_auto = sizeof(struct sandbox_phy_priv), }; diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c index 2a20f7601c0..6a7c3565ea3 100644 --- a/drivers/phy/sti_usb_phy.c +++ b/drivers/phy/sti_usb_phy.c @@ -177,5 +177,5 @@ U_BOOT_DRIVER(sti_usb_phy) = { .of_match = sti_usb_phy_ids, .probe = sti_usb_phy_probe, .ops = &sti_usb_phy_ops, - .priv_auto_alloc_size = sizeof(struct sti_usb_phy), + .priv_auto = sizeof(struct sti_usb_phy), }; diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c index 3f49851bcab..98fe6c6fce3 100644 --- a/drivers/phy/ti-pipe3-phy.c +++ b/drivers/phy/ti-pipe3-phy.c @@ -604,5 +604,5 @@ U_BOOT_DRIVER(pipe3_phy) = { .of_match = pipe3_phy_ids, .ops = &pipe3_phy_ops, .probe = pipe3_phy_probe, - .priv_auto_alloc_size = sizeof(struct omap_pipe3), + .priv_auto = sizeof(struct omap_pipe3), }; diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c index 05ef24864f2..3c2e10b88e8 100644 --- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c +++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c @@ -121,7 +121,7 @@ U_BOOT_DRIVER(pinctrl_ast2500) = { .name = "aspeed_ast2500_pinctrl", .id = UCLASS_PINCTRL, .of_match = ast2500_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct ast2500_pinctrl_priv), + .priv_auto = sizeof(struct ast2500_pinctrl_priv), .ops = &ast2500_pinctrl_ops, .probe = ast2500_pinctrl_probe, }; diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c index 61e80818743..14408da2e7e 100644 --- a/drivers/pinctrl/ath79/pinctrl_ar933x.c +++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c @@ -130,7 +130,7 @@ U_BOOT_DRIVER(pinctrl_ar933x) = { .name = "pinctrl_ar933x", .id = UCLASS_PINCTRL, .of_match = ar933x_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct ar933x_pinctrl_priv), + .priv_auto = sizeof(struct ar933x_pinctrl_priv), .ops = &ar933x_pinctrl_ops, .probe = ar933x_pinctrl_probe, }; diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c index 2d5a4a3ab23..b1c78bead3b 100644 --- a/drivers/pinctrl/ath79/pinctrl_qca953x.c +++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c @@ -150,7 +150,7 @@ U_BOOT_DRIVER(pinctrl_qca953x) = { .name = "pinctrl_qca953x", .id = UCLASS_PINCTRL, .of_match = qca953x_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct qca953x_pinctrl_priv), + .priv_auto = sizeof(struct qca953x_pinctrl_priv), .ops = &qca953x_pinctrl_ops, .probe = qca953x_pinctrl_probe, }; diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 5f5f3f3622f..42e05b0e707 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -150,7 +150,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(bcm2835_pinctrl_id), .ofdata_to_platdata = bcm283x_pinctl_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct bcm283x_pinctrl_priv), + .priv_auto = sizeof(struct bcm283x_pinctrl_priv), .ops = &bcm283x_pinctrl_ops, .probe = bcm283x_pinctl_probe, #if CONFIG_IS_ENABLED(OF_BOARD) diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c index 6c8a990f57b..58f28a13709 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c @@ -157,6 +157,6 @@ U_BOOT_DRIVER(bcm6838_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = bcm6838_pinctrl_match, .ops = &bcm6838_pinctrl_ops, - .priv_auto_alloc_size = sizeof(struct bcm6838_pinctrl_priv), + .priv_auto = sizeof(struct bcm6838_pinctrl_priv), .probe = bcm6838_pinctrl_probe, }; diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c index ff6d6c4143f..07870b7f51a 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c +++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c @@ -110,7 +110,7 @@ U_BOOT_DRIVER(pinctrl_exynos7420) = { .name = "pinctrl_exynos7420", .id = UCLASS_PINCTRL, .of_match = exynos7420_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct exynos_pinctrl_priv), + .priv_auto = sizeof(struct exynos_pinctrl_priv), .ops = &exynos7420_pinctrl_ops, .probe = exynos_pinctrl_probe, }; diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c index 727bacfd043..149d5119124 100644 --- a/drivers/pinctrl/intel/pinctrl_apl.c +++ b/drivers/pinctrl/intel/pinctrl_apl.c @@ -184,6 +184,6 @@ U_BOOT_DRIVER(intel_apl_pinctrl) = { .bind = dm_scan_fdt_dev, #endif .ofdata_to_platdata = apl_pinctrl_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct intel_pinctrl_priv), - .platdata_auto_alloc_size = sizeof(struct apl_gpio_platdata), + .priv_auto = sizeof(struct intel_pinctrl_priv), + .platdata_auto = sizeof(struct apl_gpio_platdata), }; diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c index 1aa323c009a..b413a4c7e48 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c @@ -748,7 +748,7 @@ U_BOOT_DRIVER(mt7622_pinctrl) = { .of_match = mt7622_pctrl_match, .ops = &mtk_pinctrl_ops, .probe = mtk_pinctrl_mt7622_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv), + .priv_auto = sizeof(struct mtk_pinctrl_priv), };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7623.c b/drivers/pinctrl/mediatek/pinctrl-mt7623.c index 0f5dcb2c639..2e3ae34b8ba 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt7623.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt7623.c @@ -1411,5 +1411,5 @@ U_BOOT_DRIVER(mt7623_pinctrl) = { .of_match = mt7623_pctrl_match, .ops = &mtk_pinctrl_ops, .probe = mtk_pinctrl_mt7623_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv), + .priv_auto = sizeof(struct mtk_pinctrl_priv), }; diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7629.c b/drivers/pinctrl/mediatek/pinctrl-mt7629.c index 37640dd2b6d..7ce64fde25f 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt7629.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt7629.c @@ -407,5 +407,5 @@ U_BOOT_DRIVER(mt7629_pinctrl) = { .of_match = mt7629_pctrl_match, .ops = &mtk_pinctrl_ops, .probe = mtk_pinctrl_mt7629_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv), + .priv_auto = sizeof(struct mtk_pinctrl_priv), }; diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8512.c b/drivers/pinctrl/mediatek/pinctrl-mt8512.c index bf2a8dd90f0..3d9c0abe36b 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt8512.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt8512.c @@ -383,5 +383,5 @@ U_BOOT_DRIVER(mt8512_pinctrl) = { .of_match = mt8512_pctrl_match, .ops = &mtk_pinctrl_ops, .probe = mtk_pinctrl_mt8512_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv), + .priv_auto = sizeof(struct mtk_pinctrl_priv), }; diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c index 62e339e9310..6f94f762d98 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt8516.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c @@ -389,5 +389,5 @@ U_BOOT_DRIVER(mt8516_pinctrl) = { .of_match = mt8516_pctrl_match, .ops = &mtk_pinctrl_ops, .probe = mtk_pinctrl_mt8516_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv), + .priv_auto = sizeof(struct mtk_pinctrl_priv), }; diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8518.c b/drivers/pinctrl/mediatek/pinctrl-mt8518.c index 91427aed4b9..ed51bd3bbc0 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt8518.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt8518.c @@ -409,5 +409,5 @@ U_BOOT_DRIVER(mt8518_pinctrl) = { .of_match = mt8518_pctrl_match, .ops = &mtk_pinctrl_ops, .probe = mtk_pinctrl_mt8518_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pinctrl_priv), + .priv_auto = sizeof(struct mtk_pinctrl_priv), }; diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c index 11809b29f39..5d234bca3d4 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c @@ -975,6 +975,6 @@ U_BOOT_DRIVER(meson_axg_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(meson_axg_pinctrl_match), .probe = meson_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct meson_pinctrl), + .priv_auto = sizeof(struct meson_pinctrl), .ops = &meson_axg_pinctrl_ops, }; diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c index 115e8b5616d..8bd265ad952 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -1289,6 +1289,6 @@ U_BOOT_DRIVER(meson_axg_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(meson_g12a_pinctrl_match), .probe = meson_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct meson_pinctrl), + .priv_auto = sizeof(struct meson_pinctrl), .ops = &meson_axg_pinctrl_ops, }; diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 9e2e1511645..8c01c739068 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -472,6 +472,6 @@ U_BOOT_DRIVER(meson_gxbb_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(meson_gxbb_pinctrl_match), .probe = meson_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct meson_pinctrl), + .priv_auto = sizeof(struct meson_pinctrl), .ops = &meson_gx_pinctrl_ops, }; diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index 5acc21b9c2e..51a0b4c5cad 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -734,6 +734,6 @@ U_BOOT_DRIVER(meson_gxl_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(meson_gxl_pinctrl_match), .probe = meson_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct meson_pinctrl), + .priv_auto = sizeof(struct meson_pinctrl), .ops = &meson_gx_pinctrl_ops, }; diff --git a/drivers/pinctrl/mscc/pinctrl-jr2.c b/drivers/pinctrl/mscc/pinctrl-jr2.c index 6de7a416f0e..cb340581cc0 100644 --- a/drivers/pinctrl/mscc/pinctrl-jr2.c +++ b/drivers/pinctrl/mscc/pinctrl-jr2.c @@ -318,6 +318,6 @@ U_BOOT_DRIVER(jr2_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(jr2_pinctrl_of_match), .probe = jr2_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mscc_pinctrl), + .priv_auto = sizeof(struct mscc_pinctrl), .ops = &mscc_pinctrl_ops, }; diff --git a/drivers/pinctrl/mscc/pinctrl-luton.c b/drivers/pinctrl/mscc/pinctrl-luton.c index 0adeef9ec67..325c9a9705b 100644 --- a/drivers/pinctrl/mscc/pinctrl-luton.c +++ b/drivers/pinctrl/mscc/pinctrl-luton.c @@ -181,6 +181,6 @@ U_BOOT_DRIVER(luton_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(luton_pinctrl_of_match), .probe = luton_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mscc_pinctrl), + .priv_auto = sizeof(struct mscc_pinctrl), .ops = &mscc_pinctrl_ops, }; diff --git a/drivers/pinctrl/mscc/pinctrl-ocelot.c b/drivers/pinctrl/mscc/pinctrl-ocelot.c index 4df5eef1b10..57e2ef0d7c1 100644 --- a/drivers/pinctrl/mscc/pinctrl-ocelot.c +++ b/drivers/pinctrl/mscc/pinctrl-ocelot.c @@ -197,6 +197,6 @@ U_BOOT_DRIVER(ocelot_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(ocelot_pinctrl_of_match), .probe = ocelot_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mscc_pinctrl), + .priv_auto = sizeof(struct mscc_pinctrl), .ops = &mscc_pinctrl_ops, }; diff --git a/drivers/pinctrl/mscc/pinctrl-serval.c b/drivers/pinctrl/mscc/pinctrl-serval.c index 2cef5df3dc2..a6b9796df81 100644 --- a/drivers/pinctrl/mscc/pinctrl-serval.c +++ b/drivers/pinctrl/mscc/pinctrl-serval.c @@ -228,6 +228,6 @@ U_BOOT_DRIVER(serval_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(serval_pinctrl_of_match), .probe = serval_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mscc_pinctrl), + .priv_auto = sizeof(struct mscc_pinctrl), .ops = &mscc_pinctrl_ops, }; diff --git a/drivers/pinctrl/mscc/pinctrl-servalt.c b/drivers/pinctrl/mscc/pinctrl-servalt.c index 37ce52ce7b8..8e8678580db 100644 --- a/drivers/pinctrl/mscc/pinctrl-servalt.c +++ b/drivers/pinctrl/mscc/pinctrl-servalt.c @@ -264,6 +264,6 @@ U_BOOT_DRIVER(servalt_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(servalt_pinctrl_of_match), .probe = servalt_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mscc_pinctrl), + .priv_auto = sizeof(struct mscc_pinctrl), .ops = &mscc_pinctrl_ops, }; diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c index fc9d8b5ad10..8edab2f9950 100644 --- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c +++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c @@ -581,5 +581,5 @@ U_BOOT_DRIVER(mt7628_pinctrl) = { .ofdata_to_platdata = mt7628_pinctrl_ofdata_to_platdata, .ops = &mt7628_pinctrl_ops, .probe = mt7628_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct mt7628_pinctrl_priv), + .priv_auto = sizeof(struct mt7628_pinctrl_priv), }; diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 17d7603ebdb..4797d3250f9 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -643,6 +643,6 @@ U_BOOT_DRIVER(armada_37xx_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(armada_37xx_pinctrl_of_match), .probe = armada_37xx_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct armada_37xx_pinctrl), + .priv_auto = sizeof(struct armada_37xx_pinctrl), .ops = &armada_37xx_pinctrl_ops, }; diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c index 146f5c6e426..5ced4fea888 100644 --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c @@ -229,7 +229,7 @@ U_BOOT_DRIVER(pinctrl_mvebu) = { .name = "mvebu_pinctrl", .id = UCLASS_PINCTRL, .of_match = mvebu_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct mvebu_pinctrl_priv), + .priv_auto = sizeof(struct mvebu_pinctrl_priv), .ops = &mvebu_pinctrl_ops, .probe = mvebu_pinctl_probe }; diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c index 96a2ed38a05..adc687a3b57 100644 --- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c +++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c @@ -213,7 +213,7 @@ U_BOOT_DRIVER(pinctrl_s5pxx18) = { .name = "pinctrl_s5pxx18", .id = UCLASS_PINCTRL, .of_match = s5pxx18_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct nexell_pinctrl_priv), + .priv_auto = sizeof(struct nexell_pinctrl_priv), .ops = &s5pxx18_pinctrl_ops, .probe = nexell_pinctrl_probe, .flags = DM_FLAG_PRE_RELOC diff --git a/drivers/pinctrl/nxp/pinctrl-imx5.c b/drivers/pinctrl/nxp/pinctrl-imx5.c index 9c3423bef37..71e0c94c96e 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx5.c +++ b/drivers/pinctrl/nxp/pinctrl-imx5.c @@ -38,7 +38,7 @@ U_BOOT_DRIVER(imx5_pinctrl) = { .of_match = of_match_ptr(imx5_pinctrl_match), .probe = imx5_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c index 84004e59212..3cb0bf3b5af 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx6.c +++ b/drivers/pinctrl/nxp/pinctrl-imx6.c @@ -47,7 +47,7 @@ U_BOOT_DRIVER(fsl_imx6q_iomuxc) = { .of_match = of_match_ptr(imx6_pinctrl_match), .probe = imx6_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c index 66b58ba472c..8301413ac7e 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7.c @@ -35,7 +35,7 @@ U_BOOT_DRIVER(imx7_pinctrl) = { .of_match = of_match_ptr(imx7_pinctrl_match), .probe = imx7_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c index 598bbfaf350..da0f6c9ba0e 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c @@ -39,7 +39,7 @@ U_BOOT_DRIVER(imx7ulp_pinctrl) = { .of_match = of_match_ptr(imx7ulp_pinctrl_match), .probe = imx7ulp_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c index c1b0ca438aa..2e5db2c6c2f 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8.c @@ -35,7 +35,7 @@ U_BOOT_DRIVER(imx8_pinctrl) = { .of_match = of_match_ptr(imx8_pinctrl_match), .probe = imx8_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c index 0626fde58f1..99c6d014d6c 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8m.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c @@ -32,7 +32,7 @@ U_BOOT_DRIVER(imx8mq_pinctrl) = { .of_match = of_match_ptr(imx8m_pinctrl_match), .probe = imx8mq_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/nxp/pinctrl-imxrt.c b/drivers/pinctrl/nxp/pinctrl-imxrt.c index 4a939419275..53b70da869e 100644 --- a/drivers/pinctrl/nxp/pinctrl-imxrt.c +++ b/drivers/pinctrl/nxp/pinctrl-imxrt.c @@ -34,7 +34,7 @@ U_BOOT_DRIVER(imxrt_pinctrl) = { .of_match = of_match_ptr(imxrt_pinctrl_match), .probe = imxrt_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c index db463fc04b9..5ada2ac4052 100644 --- a/drivers/pinctrl/nxp/pinctrl-mxs.c +++ b/drivers/pinctrl/nxp/pinctrl-mxs.c @@ -188,7 +188,7 @@ U_BOOT_DRIVER(fsl_imx23_pinctrl) = { #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, #endif - .priv_auto_alloc_size = sizeof(struct mxs_pinctrl_priv), + .priv_auto = sizeof(struct mxs_pinctrl_priv), .ops = &mxs_pinctrl_ops, };

diff --git a/drivers/pinctrl/nxp/pinctrl-vf610.c b/drivers/pinctrl/nxp/pinctrl-vf610.c index e795b5fd8ac..14e2e9d3ee6 100644 --- a/drivers/pinctrl/nxp/pinctrl-vf610.c +++ b/drivers/pinctrl/nxp/pinctrl-vf610.c @@ -34,7 +34,7 @@ U_BOOT_DRIVER(vf610_pinctrl) = { .of_match = of_match_ptr(vf610_pinctrl_match), .probe = vf610_pinctrl_probe, .remove = imx_pinctrl_remove, - .priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv), + .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index bf85cc916a7..afd440729e2 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -178,6 +178,6 @@ U_BOOT_DRIVER(atmel_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = atmel_pinctrl_match, .probe = atmel_pinctrl_probe, - .platdata_auto_alloc_size = sizeof(struct atmel_pio4_platdata), + .platdata_auto = sizeof(struct atmel_pio4_platdata), .ops = &atmel_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index cd7b32ce346..74bfd3c3dca 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -524,7 +524,7 @@ U_BOOT_DRIVER(atmel_sama5d3_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = at91_pinctrl_match, .probe = at91_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct at91_pinctrl_priv), + .priv_auto = sizeof(struct at91_pinctrl_priv), .ops = &at91_pinctrl_ops, };

diff --git a/drivers/pinctrl/pinctrl-kendryte.c b/drivers/pinctrl/pinctrl-kendryte.c index 04162016ccd..09d51ca6769 100644 --- a/drivers/pinctrl/pinctrl-kendryte.c +++ b/drivers/pinctrl/pinctrl-kendryte.c @@ -735,6 +735,6 @@ U_BOOT_DRIVER(pinctrl_k210) = { .id = UCLASS_PINCTRL, .of_match = k210_pc_ids, .probe = k210_pc_probe, - .priv_auto_alloc_size = sizeof(struct k210_pc_priv), + .priv_auto = sizeof(struct k210_pc_priv), .ops = &k210_pc_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c index 85521eabd40..e598797b721 100644 --- a/drivers/pinctrl/pinctrl-qe-io.c +++ b/drivers/pinctrl/pinctrl-qe-io.c @@ -246,7 +246,7 @@ U_BOOT_DRIVER(par_io_pinctrl) = { .of_match = of_match_ptr(par_io_pinctrl_match), .probe = par_io_pinctrl_probe, .ofdata_to_platdata = qe_io_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct qe_io_platdata), + .platdata_auto = sizeof(struct qe_io_platdata), .ops = &par_io_pinctrl_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c index d27f74248d0..77659774509 100644 --- a/drivers/pinctrl/pinctrl-sandbox.c +++ b/drivers/pinctrl/pinctrl-sandbox.c @@ -296,6 +296,6 @@ U_BOOT_DRIVER(sandbox_pinctrl) = { .name = "sandbox_pinctrl", .id = UCLASS_PINCTRL, .of_match = sandbox_pinctrl_match, - .priv_auto_alloc_size = sizeof(struct sandbox_pinctrl_priv), + .priv_auto = sizeof(struct sandbox_pinctrl_priv), .ops = &sandbox_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 738f5bd6364..934be931668 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -191,6 +191,6 @@ U_BOOT_DRIVER(single_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = single_pinctrl_match, .ops = &single_pinctrl_ops, - .platdata_auto_alloc_size = sizeof(struct single_pdata), + .platdata_auto = sizeof(struct single_pdata), .ofdata_to_platdata = single_ofdata_to_platdata, }; diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 8e942a82802..c147863547d 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -316,6 +316,6 @@ U_BOOT_DRIVER(pinctrl_sti) = { .of_match = sti_pinctrl_ids, .ops = &sti_pinctrl_ops, .probe = sti_pinctrl_probe, - .platdata_auto_alloc_size = sizeof(struct sti_pinctrl_platdata), + .platdata_auto = sizeof(struct sti_pinctrl_platdata), .ops = &sti_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c index a62be44d2d8..e3df0bef01e 100644 --- a/drivers/pinctrl/pinctrl-stmfx.c +++ b/drivers/pinctrl/pinctrl-stmfx.c @@ -446,7 +446,7 @@ U_BOOT_DRIVER(stmfx_pinctrl) = { .bind = stmfx_pinctrl_bind, .probe = stmfx_pinctrl_probe, .ops = &stmfx_pinctrl_ops, - .platdata_auto_alloc_size = sizeof(struct stmfx_pinctrl), + .platdata_auto = sizeof(struct stmfx_pinctrl), };

static int stmfx_chip_init(struct udevice *dev) diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c index 899c279975a..a19758d59d7 100644 --- a/drivers/pinctrl/pinctrl_pic32.c +++ b/drivers/pinctrl/pinctrl_pic32.c @@ -381,5 +381,5 @@ U_BOOT_DRIVER(pinctrl_pic32) = { .ops = &pic32_pinctrl_ops, .probe = pic32_pinctrl_probe, .bind = dm_scan_fdt_dev, - .priv_auto_alloc_size = sizeof(struct pic32_pinctrl_priv), + .priv_auto = sizeof(struct pic32_pinctrl_priv), }; diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c index 262b2c3d7e5..591cd1a0ecc 100644 --- a/drivers/pinctrl/pinctrl_stm32.c +++ b/drivers/pinctrl/pinctrl_stm32.c @@ -500,5 +500,5 @@ U_BOOT_DRIVER(pinctrl_stm32) = { .ops = &stm32_pinctrl_ops, .bind = stm32_pinctrl_bind, .probe = stm32_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct stm32_pinctrl_priv), + .priv_auto = sizeof(struct stm32_pinctrl_priv), }; diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c index 9d7814a5f25..c3e6a24de35 100644 --- a/drivers/pinctrl/renesas/pfc-r7s72100.c +++ b/drivers/pinctrl/renesas/pfc-r7s72100.c @@ -142,6 +142,6 @@ U_BOOT_DRIVER(r7s72100_pfc) = { .id = UCLASS_PINCTRL, .of_match = r7s72100_pfc_match, .probe = r7s72100_pfc_probe, - .platdata_auto_alloc_size = sizeof(struct r7s72100_pfc_platdata), + .platdata_auto = sizeof(struct r7s72100_pfc_platdata), .ops = &r7s72100_pfc_ops, }; diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c index fb811a95bc2..8bb7e16f944 100644 --- a/drivers/pinctrl/renesas/pfc.c +++ b/drivers/pinctrl/renesas/pfc.c @@ -990,7 +990,7 @@ U_BOOT_DRIVER(pinctrl_sh_pfc) = { .name = "sh_pfc_pinctrl", .id = UCLASS_PINCTRL, .of_match = sh_pfc_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct sh_pfc_pinctrl_priv), + .priv_auto = sizeof(struct sh_pfc_pinctrl_priv), .ops = &sh_pfc_pinctrl_ops, .probe = sh_pfc_pinctrl_probe, }; diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c index 617721a6264..6058d0f4c13 100644 --- a/drivers/pinctrl/rockchip/pinctrl-px30.c +++ b/drivers/pinctrl/rockchip/pinctrl-px30.c @@ -361,7 +361,7 @@ U_BOOT_DRIVER(pinctrl_px30) = { .name = "rockchip_px30_pinctrl", .id = UCLASS_PINCTRL, .of_match = px30_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c index d49e3007cea..9ccee465b0f 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c @@ -101,7 +101,7 @@ U_BOOT_DRIVER(pinctrl_rockchip) = { .name = "rk3036-pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3036_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c index a175d6c07f1..85c2e611b6b 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c @@ -203,7 +203,7 @@ U_BOOT_DRIVER(pinctrl_rk3128) = { .name = "pinctrl_rk3128", .id = UCLASS_PINCTRL, .of_match = rk3128_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c index 8f197110e5e..06d53e22d27 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c @@ -124,7 +124,7 @@ U_BOOT_DRIVER(rockchip_rk3188_pinctrl) = { .name = "rockchip_rk3188_pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3188_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c index 85bc0ef0f31..fe386933c58 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c @@ -290,7 +290,7 @@ U_BOOT_DRIVER(pinctrl_rk3228) = { .name = "rockchip_rk3228_pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3228_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c index 011ca286ec9..fc2810248ba 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c @@ -246,7 +246,7 @@ U_BOOT_DRIVER(rockchip_rk3288_pinctrl) = { .name = "rockchip_rk3288_pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3288_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c index db2b10a6906..a9b87b74571 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c @@ -457,7 +457,7 @@ U_BOOT_DRIVER(pinctrl_rk3308) = { .name = "rockchip_rk3308_pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3308_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c index 61eb9e0af0c..aa8bd76d6fb 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c @@ -321,7 +321,7 @@ U_BOOT_DRIVER(rockchip_rk3328_pinctrl) = { .name = "rockchip_rk3328_pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3328_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c index d8ccd4de576..18d3e3a9b5c 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c @@ -175,7 +175,7 @@ U_BOOT_DRIVER(rockchip_rk3368_pinctrl) = { .name = "rockchip_rk3368_pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3368_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c index d04c1afb090..0c1adc37946 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c @@ -315,7 +315,7 @@ U_BOOT_DRIVER(pinctrl_rk3399) = { .name = "rockchip_rk3399_pinctrl", .id = UCLASS_PINCTRL, .of_match = rk3399_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c index 22334329ed4..d35425b5fa2 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c +++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c @@ -289,7 +289,7 @@ U_BOOT_DRIVER(pinctrl_rv1108) = { .name = "pinctrl_rv1108", .id = UCLASS_PINCTRL, .of_match = rv1108_pinctrl_ids, - .priv_auto_alloc_size = sizeof(struct rockchip_pinctrl_priv), + .priv_auto = sizeof(struct rockchip_pinctrl_priv), .ops = &rockchip_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c index 5efaa2f66b0..a1a3cd73859 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c @@ -119,6 +119,6 @@ U_BOOT_DRIVER(uniphier_ld11_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_ld11_pinctrl_match), .probe = uniphier_ld11_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, }; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index d3c5833c993..7a92a46c17f 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -152,6 +152,6 @@ U_BOOT_DRIVER(uniphier_ld20_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_ld20_pinctrl_match), .probe = uniphier_ld20_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, }; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c index bf1a9e9e989..d33e4d7dd25 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c @@ -142,6 +142,6 @@ U_BOOT_DRIVER(uniphier_ld4_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_ld4_pinctrl_match), .probe = uniphier_ld4_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, }; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c index f22c046804a..0e3eb131ecf 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c @@ -153,6 +153,6 @@ U_BOOT_DRIVER(uniphier_ld6b_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_ld6b_pinctrl_match), .probe = uniphier_ld6b_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, }; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c index 8bae163a8e9..7ba2266092f 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c @@ -177,7 +177,7 @@ U_BOOT_DRIVER(uniphier_pro4_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_pro4_pinctrl_match), .probe = uniphier_pro4_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c index 1f4931bcf0d..9ce2e2c270e 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c @@ -163,7 +163,7 @@ U_BOOT_DRIVER(uniphier_pro5_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_pro5_pinctrl_match), .probe = uniphier_pro5_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c index 038a7dd7be0..e8c2018097c 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c @@ -157,6 +157,6 @@ U_BOOT_DRIVER(uniphier_pxs2_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_pxs2_pinctrl_match), .probe = uniphier_pxs2_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, }; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c index 452d76d721d..1fc7bdb5c80 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c @@ -144,6 +144,6 @@ U_BOOT_DRIVER(uniphier_pxs3_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_pxs3_pinctrl_match), .probe = uniphier_pxs3_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, }; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c index 1e38ba16f93..04c06fb280e 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c @@ -139,6 +139,6 @@ U_BOOT_DRIVER(uniphier_sld8_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(uniphier_sld8_pinctrl_match), .probe = uniphier_sld8_pinctrl_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv), + .priv_auto = sizeof(struct uniphier_pinctrl_priv), .ops = &uniphier_pinctrl_ops, }; diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c index 828963d8a09..7eeecc0523d 100644 --- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c +++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c @@ -231,5 +231,5 @@ int pmc_ofdata_to_uc_platdata(struct udevice *dev) UCLASS_DRIVER(acpi_pmc) = { .id = UCLASS_ACPI_PMC, .name = "power-mgr", - .per_device_auto_alloc_size = sizeof(struct acpi_pmc_upriv), + .per_device_auto = sizeof(struct acpi_pmc_upriv), }; diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c index 5ed6fcca262..68724308723 100644 --- a/drivers/power/acpi_pmc/pmc_emul.c +++ b/drivers/power/acpi_pmc/pmc_emul.c @@ -235,8 +235,8 @@ U_BOOT_DRIVER(sandbox_pmc_emul_emul) = { .of_match = sandbox_pmc_emul_ids, .ops = &sandbox_pmc_emul_emul_ops, .probe = sandbox_pmc_probe, - .priv_auto_alloc_size = sizeof(struct pmc_emul_priv), - .platdata_auto_alloc_size = sizeof(struct pmc_emul_platdata), + .priv_auto = sizeof(struct pmc_emul_priv), + .platdata_auto = sizeof(struct pmc_emul_platdata), };

static struct pci_device_id sandbox_pmc_emul_supported[] = { diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c index 48a6c663bd2..6cb7af10c20 100644 --- a/drivers/power/acpi_pmc/sandbox.c +++ b/drivers/power/acpi_pmc/sandbox.c @@ -94,5 +94,5 @@ U_BOOT_DRIVER(pmc_sandbox) = { .of_match = sandbox_pmc_ids, .probe = sandbox_pmc_probe, .ops = &sandbox_pmc_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_pmc_priv), + .priv_auto = sizeof(struct sandbox_pmc_priv), }; diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c index a494bfa8c9d..6e720e0798c 100644 --- a/drivers/power/domain/bcm6328-power-domain.c +++ b/drivers/power/domain/bcm6328-power-domain.c @@ -75,6 +75,6 @@ U_BOOT_DRIVER(bcm6328_power_domain) = { .id = UCLASS_POWER_DOMAIN, .of_match = bcm6328_power_domain_ids, .ops = &bcm6328_power_domain_ops, - .priv_auto_alloc_size = sizeof(struct bcm6328_power_domain), + .priv_auto = sizeof(struct bcm6328_power_domain), .probe = bcm6328_power_domain_probe, }; diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c index 889b65a47ff..33dd4cc2f96 100644 --- a/drivers/power/domain/imx8-power-domain-legacy.c +++ b/drivers/power/domain/imx8-power-domain-legacy.c @@ -377,8 +377,8 @@ U_BOOT_DRIVER(imx8_power_domain) = { .bind = imx8_power_domain_bind, .probe = imx8_power_domain_probe, .ofdata_to_platdata = imx8_power_domain_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct imx8_power_domain_platdata), - .priv_auto_alloc_size = sizeof(struct imx8_power_domain_priv), + .platdata_auto = sizeof(struct imx8_power_domain_platdata), + .priv_auto = sizeof(struct imx8_power_domain_priv), .ops = &imx8_power_domain_ops, .flags = DM_FLAG_DEFAULT_PD_CTRL_OFF, }; diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c index 0ef460df8c2..3736019c221 100644 --- a/drivers/power/domain/imx8m-power-domain.c +++ b/drivers/power/domain/imx8m-power-domain.c @@ -137,6 +137,6 @@ U_BOOT_DRIVER(imx8m_power_domain) = { .bind = imx8m_power_domain_bind, .probe = imx8m_power_domain_probe, .ofdata_to_platdata = imx8m_power_domain_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct imx8m_power_domain_platdata), + .platdata_auto = sizeof(struct imx8m_power_domain_platdata), .ops = &imx8m_power_domain_ops, }; diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c index 8349a9c1582..2e7ab671286 100644 --- a/drivers/power/domain/meson-ee-pwrc.c +++ b/drivers/power/domain/meson-ee-pwrc.c @@ -431,5 +431,5 @@ U_BOOT_DRIVER(meson_ee_pwrc) = { .of_match = meson_ee_pwrc_ids, .probe = meson_ee_pwrc_probe, .ops = &meson_ee_pwrc_ops, - .priv_auto_alloc_size = sizeof(struct meson_ee_pwrc_priv), + .priv_auto = sizeof(struct meson_ee_pwrc_priv), }; diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c index a41b230448f..40947c66f31 100644 --- a/drivers/power/domain/meson-gx-pwrc-vpu.c +++ b/drivers/power/domain/meson-gx-pwrc-vpu.c @@ -334,5 +334,5 @@ U_BOOT_DRIVER(meson_gx_pwrc_vpu) = { .of_match = meson_gx_pwrc_vpu_ids, .probe = meson_gx_pwrc_vpu_probe, .ops = &meson_gx_pwrc_vpu_ops, - .priv_auto_alloc_size = sizeof(struct meson_gx_pwrc_vpu_priv), + .priv_auto = sizeof(struct meson_gx_pwrc_vpu_priv), }; diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c index fae4749012b..ca2ded00efa 100644 --- a/drivers/power/domain/mtk-power-domain.c +++ b/drivers/power/domain/mtk-power-domain.c @@ -411,5 +411,5 @@ U_BOOT_DRIVER(mtk_power_domain) = { .ops = &mtk_power_domain_ops, .probe = mtk_power_domain_probe, .of_match = mtk_power_domain_ids, - .priv_auto_alloc_size = sizeof(struct scp_domain), + .priv_auto = sizeof(struct scp_domain), }; diff --git a/drivers/power/domain/sandbox-power-domain-test.c b/drivers/power/domain/sandbox-power-domain-test.c index 2191a941469..1bf52f1d861 100644 --- a/drivers/power/domain/sandbox-power-domain-test.c +++ b/drivers/power/domain/sandbox-power-domain-test.c @@ -51,5 +51,5 @@ U_BOOT_DRIVER(sandbox_power_domain_test) = { .name = "sandbox_power_domain_test", .id = UCLASS_MISC, .of_match = sandbox_power_domain_test_ids, - .priv_auto_alloc_size = sizeof(struct sandbox_power_domain_test), + .priv_auto = sizeof(struct sandbox_power_domain_test), }; diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c index 4d9a2006e66..04a071044f3 100644 --- a/drivers/power/domain/sandbox-power-domain.c +++ b/drivers/power/domain/sandbox-power-domain.c @@ -88,7 +88,7 @@ U_BOOT_DRIVER(sandbox_power_domain) = { .of_match = sandbox_power_domain_ids, .bind = sandbox_power_domain_bind, .probe = sandbox_power_domain_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_power_domain), + .priv_auto = sizeof(struct sandbox_power_domain), .ops = &sandbox_power_domain_ops, };

diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c index 7ee121dfb26..f18e45617a1 100644 --- a/drivers/power/domain/ti-sci-power-domain.c +++ b/drivers/power/domain/ti-sci-power-domain.c @@ -135,6 +135,6 @@ U_BOOT_DRIVER(ti_sci_pm_domains) = { .id = UCLASS_POWER_DOMAIN, .of_match = ti_sci_power_domain_of_match, .probe = ti_sci_power_domain_probe, - .priv_auto_alloc_size = sizeof(struct ti_sci_power_domain_data), + .priv_auto = sizeof(struct ti_sci_power_domain_data), .ops = &ti_sci_power_domain_ops, }; diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c index 404fe008fe6..633ad15b646 100644 --- a/drivers/power/pmic/i2c_pmic_emul.c +++ b/drivers/power/pmic/i2c_pmic_emul.c @@ -161,6 +161,6 @@ U_BOOT_DRIVER(sandbox_i2c_pmic_emul) = { .of_match = sandbox_i2c_pmic_ids, .ofdata_to_platdata = sandbox_i2c_pmic_ofdata_to_platdata, .probe = sandbox_i2c_pmic_probe, - .platdata_auto_alloc_size = sizeof(struct sandbox_i2c_pmic_plat_data), + .platdata_auto = sizeof(struct sandbox_i2c_pmic_plat_data), .ops = &sandbox_i2c_pmic_emul_ops, }; diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c index ddc30604cff..5f4386d4adf 100644 --- a/drivers/power/pmic/pm8916.c +++ b/drivers/power/pmic/pm8916.c @@ -82,5 +82,5 @@ U_BOOT_DRIVER(pmic_pm8916) = { .bind = dm_scan_fdt_dev, .probe = pm8916_probe, .ops = &pm8916_ops, - .priv_auto_alloc_size = sizeof(struct pm8916_priv), + .priv_auto = sizeof(struct pm8916_priv), }; diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c index 7770171917d..79166b8bbcd 100644 --- a/drivers/power/pmic/pmic-uclass.c +++ b/drivers/power/pmic/pmic-uclass.c @@ -196,5 +196,5 @@ UCLASS_DRIVER(pmic) = { .id = UCLASS_PMIC, .name = "pmic", .pre_probe = pmic_pre_probe, - .per_device_auto_alloc_size = sizeof(struct uc_pmic_priv), + .per_device_auto = sizeof(struct uc_pmic_priv), }; diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 148ee29cca0..2f547a314d9 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -190,7 +190,7 @@ U_BOOT_DRIVER(rockchip_rk805) = { #if CONFIG_IS_ENABLED(PMIC_CHILDREN) .bind = rk8xx_bind, #endif - .priv_auto_alloc_size = sizeof(struct rk8xx_priv), + .priv_auto = sizeof(struct rk8xx_priv), .probe = rk8xx_probe, .ops = &rk8xx_ops, }; diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c index 931d753e344..ba32f591902 100644 --- a/drivers/power/regulator/bd71837.c +++ b/drivers/power/regulator/bd71837.c @@ -466,5 +466,5 @@ U_BOOT_DRIVER(bd71837_regulator) = { .id = UCLASS_REGULATOR, .ops = &bd71837_regulator_ops, .probe = bd71837_regulator_probe, - .platdata_auto_alloc_size = sizeof(struct bd71837_platdata), + .platdata_auto = sizeof(struct bd71837_platdata), }; diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c index 5055e39cb79..4ff7f396771 100644 --- a/drivers/power/regulator/da9063.c +++ b/drivers/power/regulator/da9063.c @@ -366,7 +366,7 @@ U_BOOT_DRIVER(da9063_ldo) = { .id = UCLASS_REGULATOR, .ops = &da9063_ldo_ops, .probe = da9063_ldo_probe, - .priv_auto_alloc_size = sizeof(struct da9063_priv), + .priv_auto = sizeof(struct da9063_priv), };

static const struct dm_regulator_ops da9063_buck_ops = { @@ -385,5 +385,5 @@ U_BOOT_DRIVER(da9063_buck) = { .id = UCLASS_REGULATOR, .ops = &da9063_buck_ops, .probe = da9063_buck_probe, - .priv_auto_alloc_size = sizeof(struct da9063_priv), + .priv_auto = sizeof(struct da9063_priv), }; diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index b407f555fe3..70aeef710b4 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -239,7 +239,7 @@ U_BOOT_DRIVER(fan53555_regulator) = { .id = UCLASS_REGULATOR, .ops = &fan53555_regulator_ops, .ofdata_to_platdata = fan53555_regulator_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct fan53555_platdata), - .priv_auto_alloc_size = sizeof(struct fan53555_priv), + .platdata_auto = sizeof(struct fan53555_platdata), + .priv_auto = sizeof(struct fan53555_priv), .probe = fan53555_probe, }; diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index 2fa6c7e6b29..d887c87ed8c 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -89,5 +89,5 @@ U_BOOT_DRIVER(regulator_fixed) = { .ops = &fixed_regulator_ops, .of_match = fixed_regulator_ids, .ofdata_to_platdata = fixed_regulator_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct regulator_common_platdata), + .platdata_auto = sizeof(struct regulator_common_platdata), }; diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 28c9e222e2b..d5998f1d2a2 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -155,5 +155,5 @@ U_BOOT_DRIVER(gpio_regulator) = { .ops = &gpio_regulator_ops, .of_match = gpio_regulator_ids, .ofdata_to_platdata = gpio_regulator_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct gpio_regulator_platdata), + .platdata_auto = sizeof(struct gpio_regulator_platdata), }; diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c index 28a9a1470b1..dc944c9c1d9 100644 --- a/drivers/power/regulator/pbias_regulator.c +++ b/drivers/power/regulator/pbias_regulator.c @@ -130,7 +130,7 @@ U_BOOT_DRIVER(pbias_pmic) = { .bind = pbias_bind, .ops = &pbias_ops, .ofdata_to_platdata = pbias_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct pbias_priv), + .priv_auto = sizeof(struct pbias_priv), };

static const struct pbias_reg_info pbias_mmc_omap2430 = { diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index b56843046f2..8dc517fe410 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -572,5 +572,5 @@ U_BOOT_DRIVER(pfuze100_regulator) = { .id = UCLASS_REGULATOR, .ops = &pfuze100_regulator_ops, .probe = pfuze100_regulator_probe, - .platdata_auto_alloc_size = sizeof(struct pfuze100_regulator_platdata), + .platdata_auto = sizeof(struct pfuze100_regulator_platdata), }; diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c index f8706227058..ebd09e778c7 100644 --- a/drivers/power/regulator/pwm_regulator.c +++ b/drivers/power/regulator/pwm_regulator.c @@ -155,5 +155,5 @@ U_BOOT_DRIVER(pwm_regulator) = { .probe = pwm_regulator_probe, .of_match = pwm_regulator_ids, .ofdata_to_platdata = pwm_regulator_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct pwm_regulator_info), + .priv_auto = sizeof(struct pwm_regulator_info), }; diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index da679a572c2..6192406f6a2 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -500,6 +500,6 @@ UCLASS_DRIVER(regulator) = { .name = "regulator", .post_bind = regulator_post_bind, .pre_probe = regulator_pre_probe, - .per_device_platdata_auto_alloc_size = + .per_device_platdata_auto = sizeof(struct dm_regulator_uclass_platdata), }; diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c index 92136961c2e..c2c5770fa57 100644 --- a/drivers/power/regulator/stm32-vrefbuf.c +++ b/drivers/power/regulator/stm32-vrefbuf.c @@ -165,5 +165,5 @@ U_BOOT_DRIVER(stm32_vrefbuf) = { .of_match = stm32_vrefbuf_ids, .probe = stm32_vrefbuf_probe, .ops = &stm32_vrefbuf_ops, - .priv_auto_alloc_size = sizeof(struct stm32_vrefbuf), + .priv_auto = sizeof(struct stm32_vrefbuf), }; diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c index ce54495490d..57556662f35 100644 --- a/drivers/power/regulator/tps62360_regulator.c +++ b/drivers/power/regulator/tps62360_regulator.c @@ -119,6 +119,6 @@ U_BOOT_DRIVER(tps62360_regulator) = { .id = UCLASS_REGULATOR, .ops = &tps62360_regulator_ops, .of_match = tps62360_regulator_ids, - .platdata_auto_alloc_size = sizeof(struct tps62360_regulator_pdata), + .platdata_auto = sizeof(struct tps62360_regulator_pdata), .probe = tps62360_regulator_probe, }; diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c index 171afd34a5f..467ff3f1355 100644 --- a/drivers/power/regulator/tps65910_regulator.c +++ b/drivers/power/regulator/tps65910_regulator.c @@ -424,7 +424,7 @@ U_BOOT_DRIVER(tps65910_boost) = { .name = TPS65910_BOOST_DRIVER, .id = UCLASS_REGULATOR, .ops = &tps65910_boost_ops, - .platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata), + .platdata_auto = sizeof(struct tps65910_regulator_pdata), .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, };

@@ -439,7 +439,7 @@ U_BOOT_DRIVER(tps65910_buck) = { .name = TPS65910_BUCK_DRIVER, .id = UCLASS_REGULATOR, .ops = &tps65910_buck_ops, - .platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata), + .platdata_auto = sizeof(struct tps65910_regulator_pdata), .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, };

@@ -454,6 +454,6 @@ U_BOOT_DRIVER(tps65910_ldo) = { .name = TPS65910_LDO_DRIVER, .id = UCLASS_REGULATOR, .ops = &tps65910_ldo_ops, - .platdata_auto_alloc_size = sizeof(struct tps65910_regulator_pdata), + .platdata_auto = sizeof(struct tps65910_regulator_pdata), .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, }; diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c index e55fcceafd7..70fbdf89bd0 100644 --- a/drivers/pwm/exynos_pwm.c +++ b/drivers/pwm/exynos_pwm.c @@ -114,5 +114,5 @@ U_BOOT_DRIVER(exynos_pwm) = { .ops = &exynos_pwm_ops, .probe = exynos_pwm_probe, .ofdata_to_platdata = exynos_pwm_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct exynos_pwm_priv), + .priv_auto = sizeof(struct exynos_pwm_priv), }; diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 77a1907fd3b..0b8e82b6fae 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -158,6 +158,6 @@ U_BOOT_DRIVER(imx_pwm) = { .ops = &imx_pwm_ops, .ofdata_to_platdata = imx_pwm_ofdata_to_platdata, .probe = imx_pwm_probe, - .priv_auto_alloc_size = sizeof(struct imx_pwm_priv), + .priv_auto = sizeof(struct imx_pwm_priv), }; #endif diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index cafb571f16f..e538e27e136 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -524,5 +524,5 @@ U_BOOT_DRIVER(meson_pwm) = { .ops = &meson_pwm_ops, .ofdata_to_platdata = meson_pwm_ofdata_to_platdata, .probe = meson_pwm_probe, - .priv_auto_alloc_size = sizeof(struct meson_pwm), + .priv_auto = sizeof(struct meson_pwm), }; diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c index 7bd82518d67..aee1d825a0c 100644 --- a/drivers/pwm/pwm-mtk.c +++ b/drivers/pwm/pwm-mtk.c @@ -184,5 +184,5 @@ U_BOOT_DRIVER(mtk_pwm) = { .of_match = mtk_pwm_ids, .ops = &mtk_pwm_ops, .probe = mtk_pwm_probe, - .priv_auto_alloc_size = sizeof(struct mtk_pwm_priv), + .priv_auto = sizeof(struct mtk_pwm_priv), }; diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c index 77bc659fefe..4731e4a1858 100644 --- a/drivers/pwm/pwm-sifive.c +++ b/drivers/pwm/pwm-sifive.c @@ -168,5 +168,5 @@ U_BOOT_DRIVER(pwm_sifive) = { .ops = &pwm_sifive_ops, .ofdata_to_platdata = pwm_sifive_ofdata_to_platdata, .probe = pwm_sifive_probe, - .priv_auto_alloc_size = sizeof(struct pwm_sifive_priv), + .priv_auto = sizeof(struct pwm_sifive_priv), }; diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c index 911da1d4261..ccd23d88849 100644 --- a/drivers/pwm/rk_pwm.c +++ b/drivers/pwm/rk_pwm.c @@ -215,5 +215,5 @@ U_BOOT_DRIVER(rk_pwm) = { .ops = &rk_pwm_ops, .ofdata_to_platdata = rk_pwm_ofdata_to_platdata, .probe = rk_pwm_probe, - .priv_auto_alloc_size = sizeof(struct rk_pwm_priv), + .priv_auto = sizeof(struct rk_pwm_priv), }; diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c index 28988187e03..318dce7c149 100644 --- a/drivers/pwm/sandbox_pwm.c +++ b/drivers/pwm/sandbox_pwm.c @@ -109,5 +109,5 @@ U_BOOT_DRIVER(warm_pwm_sandbox) = { .id = UCLASS_PWM, .of_match = sandbox_pwm_ids, .ops = &sandbox_pwm_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_pwm_priv), + .priv_auto = sizeof(struct sandbox_pwm_priv), }; diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c index e2ae1a80091..9a35fe02def 100644 --- a/drivers/pwm/sunxi_pwm.c +++ b/drivers/pwm/sunxi_pwm.c @@ -181,5 +181,5 @@ U_BOOT_DRIVER(sunxi_pwm) = { .ops = &sunxi_pwm_ops, .ofdata_to_platdata = sunxi_pwm_ofdata_to_platdata, .probe = sunxi_pwm_probe, - .priv_auto_alloc_size = sizeof(struct sunxi_pwm_priv), + .priv_auto = sizeof(struct sunxi_pwm_priv), }; diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c index 5e98d0fc2c7..29c9ce366c9 100644 --- a/drivers/pwm/tegra_pwm.c +++ b/drivers/pwm/tegra_pwm.c @@ -79,5 +79,5 @@ U_BOOT_DRIVER(tegra_pwm) = { .of_match = tegra_pwm_ids, .ops = &tegra_pwm_ops, .ofdata_to_platdata = tegra_pwm_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct tegra_pwm_priv), + .priv_auto = sizeof(struct tegra_pwm_priv), }; diff --git a/drivers/ram/aspeed/sdram_ast2500.c b/drivers/ram/aspeed/sdram_ast2500.c index 9f4304cb663..e4d01d848ee 100644 --- a/drivers/ram/aspeed/sdram_ast2500.c +++ b/drivers/ram/aspeed/sdram_ast2500.c @@ -435,5 +435,5 @@ U_BOOT_DRIVER(sdrammc_ast2500) = { .ops = &ast2500_sdrammc_ops, .ofdata_to_platdata = ast2500_sdrammc_ofdata_to_platdata, .probe = ast2500_sdrammc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), }; diff --git a/drivers/ram/bmips_ram.c b/drivers/ram/bmips_ram.c index 8f953e79afd..98045248ecf 100644 --- a/drivers/ram/bmips_ram.c +++ b/drivers/ram/bmips_ram.c @@ -172,6 +172,6 @@ U_BOOT_DRIVER(bmips_ram) = { .id = UCLASS_RAM, .of_match = bmips_ram_ids, .probe = bmips_ram_probe, - .priv_auto_alloc_size = sizeof(struct bmips_ram_priv), + .priv_auto = sizeof(struct bmips_ram_priv), .ops = &bmips_ram_ops, }; diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c index b6ee02d2279..da5eb8255ba 100644 --- a/drivers/ram/imxrt_sdram.c +++ b/drivers/ram/imxrt_sdram.c @@ -441,5 +441,5 @@ U_BOOT_DRIVER(imxrt_semc) = { .ops = &imxrt_semc_ops, .ofdata_to_platdata = imxrt_semc_ofdata_to_platdata, .probe = imxrt_semc_probe, - .platdata_auto_alloc_size = sizeof(struct imxrt_sdram_params), + .platdata_auto = sizeof(struct imxrt_sdram_params), }; diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c index 21e5a655295..4ec12bf42eb 100644 --- a/drivers/ram/k3-am654-ddrss.c +++ b/drivers/ram/k3-am654-ddrss.c @@ -1082,5 +1082,5 @@ U_BOOT_DRIVER(am654_ddrss) = { .of_match = am654_ddrss_ids, .ops = &am654_ddrss_ops, .probe = am654_ddrss_probe, - .priv_auto_alloc_size = sizeof(struct am654_ddrss_desc), + .priv_auto = sizeof(struct am654_ddrss_desc), }; diff --git a/drivers/ram/k3-j721e/k3-j721e-ddrss.c b/drivers/ram/k3-j721e/k3-j721e-ddrss.c index d647a8a2090..9fb1eeea454 100644 --- a/drivers/ram/k3-j721e/k3-j721e-ddrss.c +++ b/drivers/ram/k3-j721e/k3-j721e-ddrss.c @@ -371,5 +371,5 @@ U_BOOT_DRIVER(j721e_ddrss) = { .of_match = j721e_ddrss_ids, .ops = &j721e_ddrss_ops, .probe = j721e_ddrss_probe, - .priv_auto_alloc_size = sizeof(struct j721e_ddrss_desc), + .priv_auto = sizeof(struct j721e_ddrss_desc), }; diff --git a/drivers/ram/mediatek/ddr3-mt7629.c b/drivers/ram/mediatek/ddr3-mt7629.c index b3a68cb0787..d12a3b4f436 100644 --- a/drivers/ram/mediatek/ddr3-mt7629.c +++ b/drivers/ram/mediatek/ddr3-mt7629.c @@ -764,5 +764,5 @@ U_BOOT_DRIVER(mediatek_ddr3) = { .of_match = mtk_ddr3_ids, .ops = &mtk_ddr3_ops, .probe = mtk_ddr3_probe, - .priv_auto_alloc_size = sizeof(struct mtk_ddr3_priv), + .priv_auto = sizeof(struct mtk_ddr3_priv), }; diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c index a226bac2cc3..87294430bf9 100644 --- a/drivers/ram/mpc83xx_sdram.c +++ b/drivers/ram/mpc83xx_sdram.c @@ -1095,5 +1095,5 @@ U_BOOT_DRIVER(mpc83xx_sdram) = { .ops = &mpc83xx_sdram_ops, .ofdata_to_platdata = mpc83xx_sdram_ofdata_to_platdata, .probe = mpc83xx_sdram_probe, - .priv_auto_alloc_size = sizeof(struct mpc83xx_sdram_priv), + .priv_auto = sizeof(struct mpc83xx_sdram_priv), }; diff --git a/drivers/ram/octeon/octeon_ddr.c b/drivers/ram/octeon/octeon_ddr.c index 757436b9d37..6225864fd1b 100644 --- a/drivers/ram/octeon/octeon_ddr.c +++ b/drivers/ram/octeon/octeon_ddr.c @@ -2724,5 +2724,5 @@ U_BOOT_DRIVER(octeon_ddr) = { .of_match = octeon_ids, .ops = &octeon_ops, .probe = octeon_ddr_probe, - .platdata_auto_alloc_size = sizeof(struct ddr_priv), + .platdata_auto = sizeof(struct ddr_priv), }; diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index 4fa632152fd..bc9b5dfbe3b 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -998,9 +998,9 @@ U_BOOT_DRIVER(rockchip_rk3368_dmc) = { .of_match = rk3368_dmc_ids, .ops = &rk3368_dmc_ops, .probe = rk3368_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), .ofdata_to_platdata = rk3368_dmc_ofdata_to_platdata, .probe = rk3368_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), - .platdata_auto_alloc_size = sizeof(struct rk3368_sdram_params), + .priv_auto = sizeof(struct dram_info), + .platdata_auto = sizeof(struct rk3368_sdram_params), }; diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c index 2f1f6e9c0c4..c024a0cd633 100644 --- a/drivers/ram/rockchip/sdram_px30.c +++ b/drivers/ram/rockchip/sdram_px30.c @@ -757,6 +757,6 @@ U_BOOT_DRIVER(dmc_px30) = { .of_match = px30_dmc_ids, .ops = &px30_dmc_ops, .probe = px30_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), }; #endif /* CONFIG_TPL_BUILD */ diff --git a/drivers/ram/rockchip/sdram_rk3128.c b/drivers/ram/rockchip/sdram_rk3128.c index 0162955aae0..16cfbf947bd 100644 --- a/drivers/ram/rockchip/sdram_rk3128.c +++ b/drivers/ram/rockchip/sdram_rk3128.c @@ -54,5 +54,5 @@ U_BOOT_DRIVER(dmc_rk3128) = { .of_match = rk3128_dmc_ids, .ops = &rk3128_dmc_ops, .probe = rk3128_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), }; diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index 06f9eba1a5b..38db1119eef 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -954,8 +954,8 @@ U_BOOT_DRIVER(rockchip_rk3188_dmc) = { .ofdata_to_platdata = rk3188_dmc_ofdata_to_platdata, #endif .probe = rk3188_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), #ifdef CONFIG_SPL_BUILD - .platdata_auto_alloc_size = sizeof(struct rk3188_sdram_params), + .platdata_auto = sizeof(struct rk3188_sdram_params), #endif }; diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index 094693ce247..9b39332a32f 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -847,9 +847,9 @@ U_BOOT_DRIVER(dmc_rk322x) = { .ofdata_to_platdata = rk322x_dmc_ofdata_to_platdata, #endif .probe = rk322x_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), #ifdef CONFIG_TPL_BUILD - .platdata_auto_alloc_size = sizeof(struct rk322x_sdram_params), + .platdata_auto = sizeof(struct rk322x_sdram_params), #endif };

diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index 26e8d059b5d..a909502207a 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -1123,9 +1123,9 @@ U_BOOT_DRIVER(rockchip_rk3288_dmc) = { .ofdata_to_platdata = rk3288_dmc_ofdata_to_platdata, #endif .probe = rk3288_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) - .platdata_auto_alloc_size = sizeof(struct rk3288_sdram_params), + .platdata_auto = sizeof(struct rk3288_sdram_params), #endif }; diff --git a/drivers/ram/rockchip/sdram_rk3308.c b/drivers/ram/rockchip/sdram_rk3308.c index 310df79123c..44d7d8a0d9b 100644 --- a/drivers/ram/rockchip/sdram_rk3308.c +++ b/drivers/ram/rockchip/sdram_rk3308.c @@ -51,5 +51,5 @@ U_BOOT_DRIVER(dmc_rk3308) = { .of_match = rk3308_dmc_ids, .ops = &rk3308_dmc_ops, .probe = rk3308_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), }; diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index 98c7feb6cfa..961c95856a0 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -615,8 +615,8 @@ U_BOOT_DRIVER(rockchip_rk3328_dmc) = { .ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata, #endif .probe = rk3328_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), #ifdef CONFIG_TPL_BUILD - .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), + .platdata_auto = sizeof(struct rockchip_dmc_plat), #endif }; diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 530c8a2f401..b36c98250eb 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -3178,9 +3178,9 @@ U_BOOT_DRIVER(dmc_rk3399) = { .ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata, #endif .probe = rk3399_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), + .priv_auto = sizeof(struct dram_info), #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) - .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), + .platdata_auto = sizeof(struct rockchip_dmc_plat), #endif }; diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c index 60d4945f848..f9810936119 100644 --- a/drivers/ram/sifive/fu540_ddr.c +++ b/drivers/ram/sifive/fu540_ddr.c @@ -402,8 +402,8 @@ U_BOOT_DRIVER(fu540_ddr) = { .of_match = fu540_ddr_ids, .ops = &fu540_ddr_ops, .probe = fu540_ddr_probe, - .priv_auto_alloc_size = sizeof(struct fu540_ddr_info), + .priv_auto = sizeof(struct fu540_ddr_info), #if defined(CONFIG_SPL_BUILD) - .platdata_auto_alloc_size = sizeof(struct sifive_dmc_plat), + .platdata_auto = sizeof(struct sifive_dmc_plat), #endif }; diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index 3fddf4df961..82c7e955224 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -409,5 +409,5 @@ U_BOOT_DRIVER(stm32_fmc) = { .ops = &stm32_fmc_ops, .ofdata_to_platdata = stm32_fmc_ofdata_to_platdata, .probe = stm32_fmc_probe, - .platdata_auto_alloc_size = sizeof(struct stm32_sdram_params), + .platdata_auto = sizeof(struct stm32_sdram_params), }; diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c index 9022679703b..0b6d20f5667 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ram.c +++ b/drivers/ram/stm32mp1/stm32mp1_ram.c @@ -235,5 +235,5 @@ U_BOOT_DRIVER(ddr_stm32mp1) = { .of_match = stm32mp1_ddr_ids, .ops = &stm32mp1_ddr_ops, .probe = stm32mp1_ddr_probe, - .priv_auto_alloc_size = sizeof(struct ddr_info), + .priv_auto = sizeof(struct ddr_info), }; diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c index 702d98d1a85..89cb90207dc 100644 --- a/drivers/remoteproc/k3_system_controller.c +++ b/drivers/remoteproc/k3_system_controller.c @@ -322,5 +322,5 @@ U_BOOT_DRIVER(k3_sysctrler) = { .id = UCLASS_REMOTEPROC, .ops = &k3_sysctrler_ops, .probe = k3_sysctrler_probe, - .priv_auto_alloc_size = sizeof(struct k3_sysctrler_privdata), + .priv_auto = sizeof(struct k3_sysctrler_privdata), }; diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index 9640a81e534..41ac001d96c 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -210,7 +210,7 @@ UCLASS_DRIVER(rproc) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .pre_probe = rproc_pre_probe, .post_probe = rproc_post_probe, - .per_device_platdata_auto_alloc_size = + .per_device_platdata_auto = sizeof(struct dm_rproc_uclass_pdata), };

diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c index 2b58b27947c..7126888698c 100644 --- a/drivers/remoteproc/sandbox_testproc.c +++ b/drivers/remoteproc/sandbox_testproc.c @@ -343,7 +343,7 @@ U_BOOT_DRIVER(sandbox_testproc) = { .id = UCLASS_REMOTEPROC, .ops = &sandbox_testproc_ops, .probe = sandbox_testproc_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_test_devdata), + .priv_auto = sizeof(struct sandbox_test_devdata), };

/* TODO(nm@ti.com): Remove this along with non-DT support */ diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c index dc87cb794e4..ec7694dda9e 100644 --- a/drivers/remoteproc/stm32_copro.c +++ b/drivers/remoteproc/stm32_copro.c @@ -222,5 +222,5 @@ U_BOOT_DRIVER(stm32_copro) = { .id = UCLASS_REMOTEPROC, .ops = &stm32_copro_ops, .probe = stm32_copro_probe, - .priv_auto_alloc_size = sizeof(struct stm32_copro_privdata), + .priv_auto = sizeof(struct stm32_copro_privdata), }; diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c index 28c6ddb6919..1041f3805fa 100644 --- a/drivers/remoteproc/ti_k3_arm64_rproc.c +++ b/drivers/remoteproc/ti_k3_arm64_rproc.c @@ -226,6 +226,6 @@ U_BOOT_DRIVER(k3_arm64) = { .id = UCLASS_REMOTEPROC, .ops = &k3_arm64_ops, .probe = k3_arm64_probe, - .priv_auto_alloc_size = sizeof(struct k3_arm64_privdata), + .priv_auto = sizeof(struct k3_arm64_privdata), .flags = DM_FLAG_DEFAULT_PD_CTRL_OFF, }; diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c index 3361555c536..1a2e9dd1f58 100644 --- a/drivers/remoteproc/ti_k3_dsp_rproc.c +++ b/drivers/remoteproc/ti_k3_dsp_rproc.c @@ -456,5 +456,5 @@ U_BOOT_DRIVER(k3_dsp) = { .ops = &k3_dsp_ops, .probe = k3_dsp_probe, .remove = k3_dsp_remove, - .priv_auto_alloc_size = sizeof(struct k3_dsp_privdata), + .priv_auto = sizeof(struct k3_dsp_privdata), }; diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c index 9332a63d219..10bc4e99f0c 100644 --- a/drivers/remoteproc/ti_k3_r5f_rproc.c +++ b/drivers/remoteproc/ti_k3_r5f_rproc.c @@ -866,7 +866,7 @@ U_BOOT_DRIVER(k3_r5f_rproc) = { .ops = &k3_r5f_rproc_ops, .probe = k3_r5f_probe, .remove = k3_r5f_remove, - .priv_auto_alloc_size = sizeof(struct k3_r5f_core), + .priv_auto = sizeof(struct k3_r5f_core), };

static int k3_r5f_cluster_probe(struct udevice *dev) @@ -901,6 +901,6 @@ U_BOOT_DRIVER(k3_r5fss) = { .of_match = k3_r5fss_ids, .id = UCLASS_MISC, .probe = k3_r5f_cluster_probe, - .priv_auto_alloc_size = sizeof(struct k3_r5f_cluster), + .priv_auto = sizeof(struct k3_r5f_cluster), .flags = DM_FLAG_DEFAULT_PD_CTRL_OFF, }; diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c index 350450d1fb4..14bb2d95ba6 100644 --- a/drivers/remoteproc/ti_power_proc.c +++ b/drivers/remoteproc/ti_power_proc.c @@ -177,5 +177,5 @@ U_BOOT_DRIVER(ti_powerproc) = { .id = UCLASS_REMOTEPROC, .ops = &ti_powerproc_ops, .probe = ti_powerproc_probe, - .priv_auto_alloc_size = sizeof(struct ti_powerproc_privdata), + .priv_auto = sizeof(struct ti_powerproc_privdata), }; diff --git a/drivers/reset/reset-ast2500.c b/drivers/reset/reset-ast2500.c index e7b5c7decab..a229d490f36 100644 --- a/drivers/reset/reset-ast2500.c +++ b/drivers/reset/reset-ast2500.c @@ -105,5 +105,5 @@ U_BOOT_DRIVER(ast2500_reset) = { .of_match = ast2500_reset_ids, .probe = ast2500_reset_probe, .ops = &ast2500_reset_ops, - .priv_auto_alloc_size = sizeof(struct ast2500_reset_priv), + .priv_auto = sizeof(struct ast2500_reset_priv), }; diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c index 156703e0843..f69189822bf 100644 --- a/drivers/reset/reset-bcm6345.c +++ b/drivers/reset/reset-bcm6345.c @@ -84,5 +84,5 @@ U_BOOT_DRIVER(bcm6345_reset) = { .of_match = bcm6345_reset_ids, .ops = &bcm6345_reset_reset_ops, .probe = bcm6345_reset_probe, - .priv_auto_alloc_size = sizeof(struct bcm6345_reset_priv), + .priv_auto = sizeof(struct bcm6345_reset_priv), }; diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c index 139bc5d73e0..3f9da8cc8d3 100644 --- a/drivers/reset/reset-hisilicon.c +++ b/drivers/reset/reset-hisilicon.c @@ -102,5 +102,5 @@ U_BOOT_DRIVER(hisi_reset) = { .of_match = hisi_reset_ids, .ops = &hisi_reset_reset_ops, .probe = hisi_reset_probe, - .priv_auto_alloc_size = sizeof(struct hisi_reset_priv), + .priv_auto = sizeof(struct hisi_reset_priv), }; diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c index 0c8f276293d..8318d0a20b4 100644 --- a/drivers/reset/reset-hsdk.c +++ b/drivers/reset/reset-hsdk.c @@ -114,5 +114,5 @@ U_BOOT_DRIVER(hsdk_reset) = { .of_match = hsdk_reset_dt_match, .ops = &hsdk_reset_ops, .probe = hsdk_reset_probe, - .priv_auto_alloc_size = sizeof(struct hsdk_rst), + .priv_auto = sizeof(struct hsdk_rst), }; diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c index 96916b644ad..e5085ae17c4 100644 --- a/drivers/reset/reset-imx7.c +++ b/drivers/reset/reset-imx7.c @@ -312,5 +312,5 @@ U_BOOT_DRIVER(imx7_reset) = { .of_match = imx7_reset_ids, .ops = &imx7_reset_reset_ops, .probe = imx7_reset_probe, - .priv_auto_alloc_size = sizeof(struct imx7_reset_priv), + .priv_auto = sizeof(struct imx7_reset_priv), }; diff --git a/drivers/reset/reset-ipq4019.c b/drivers/reset/reset-ipq4019.c index f216db4ce5c..15858f3cb1e 100644 --- a/drivers/reset/reset-ipq4019.c +++ b/drivers/reset/reset-ipq4019.c @@ -169,5 +169,5 @@ U_BOOT_DRIVER(ipq4019_reset) = { .of_match = ipq4019_reset_ids, .ops = &ipq4019_reset_ops, .probe = ipq4019_reset_probe, - .priv_auto_alloc_size = sizeof(struct ipq4019_reset_priv), + .priv_auto = sizeof(struct ipq4019_reset_priv), }; diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c index 97d3d575927..b97a21f6717 100644 --- a/drivers/reset/reset-mediatek.c +++ b/drivers/reset/reset-mediatek.c @@ -102,5 +102,5 @@ U_BOOT_DRIVER(mediatek_reset) = { .id = UCLASS_RESET, .probe = mediatek_reset_probe, .ops = &mediatek_reset_ops, - .priv_auto_alloc_size = sizeof(struct mediatek_reset_priv), + .priv_auto = sizeof(struct mediatek_reset_priv), }; diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c index 4e3327898e2..d4e0745d0e0 100644 --- a/drivers/reset/reset-meson.c +++ b/drivers/reset/reset-meson.c @@ -89,5 +89,5 @@ U_BOOT_DRIVER(meson_reset) = { .of_match = meson_reset_ids, .probe = meson_reset_probe, .ops = &meson_reset_ops, - .priv_auto_alloc_size = sizeof(struct meson_reset_priv), + .priv_auto = sizeof(struct meson_reset_priv), }; diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c index bc20e3335c5..18a4ecad4f0 100644 --- a/drivers/reset/reset-mtmips.c +++ b/drivers/reset/reset-mtmips.c @@ -80,6 +80,6 @@ U_BOOT_DRIVER(mtmips_reset) = { .of_match = mtmips_reset_ids, .ofdata_to_platdata = mtmips_reset_ofdata_to_platdata, .probe = mtmips_reset_probe, - .priv_auto_alloc_size = sizeof(struct mtmips_reset_priv), + .priv_auto = sizeof(struct mtmips_reset_priv), .ops = &mtmips_reset_ops, }; diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c index 80925556508..e5e9918c0c1 100644 --- a/drivers/reset/reset-rockchip.c +++ b/drivers/reset/reset-rockchip.c @@ -131,5 +131,5 @@ U_BOOT_DRIVER(rockchip_reset) = { .id = UCLASS_RESET, .probe = rockchip_reset_probe, .ops = &rockchip_reset_ops, - .priv_auto_alloc_size = sizeof(struct rockchip_reset_priv), + .priv_auto = sizeof(struct rockchip_reset_priv), }; diff --git a/drivers/reset/reset-sifive.c b/drivers/reset/reset-sifive.c index 527757f8533..f6110d85f9f 100644 --- a/drivers/reset/reset-sifive.c +++ b/drivers/reset/reset-sifive.c @@ -114,5 +114,5 @@ U_BOOT_DRIVER(sifive_reset) = { .id = UCLASS_RESET, .ops = &sifive_reset_ops, .probe = sifive_reset_probe, - .priv_auto_alloc_size = sizeof(struct sifive_reset_priv), + .priv_auto = sizeof(struct sifive_reset_priv), }; diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index 1849db4da9b..c64c9b5917c 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -166,7 +166,7 @@ U_BOOT_DRIVER(socfpga_reset) = { .of_match = socfpga_reset_match, .bind = socfpga_reset_bind, .probe = socfpga_reset_probe, - .priv_auto_alloc_size = sizeof(struct socfpga_reset_data), + .priv_auto = sizeof(struct socfpga_reset_data), .ops = &socfpga_reset_ops, .remove = socfpga_reset_remove, .flags = DM_FLAG_OS_PREPARE, diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c index 05f7f599ce3..1db321ce1fd 100644 --- a/drivers/reset/reset-sunxi.c +++ b/drivers/reset/reset-sunxi.c @@ -123,5 +123,5 @@ U_BOOT_DRIVER(sunxi_reset) = { .id = UCLASS_RESET, .ops = &sunxi_reset_ops, .probe = sunxi_reset_probe, - .priv_auto_alloc_size = sizeof(struct sunxi_reset_priv), + .priv_auto = sizeof(struct sunxi_reset_priv), }; diff --git a/drivers/reset/reset-syscon.c b/drivers/reset/reset-syscon.c index 8520227d551..ff387ab6b22 100644 --- a/drivers/reset/reset-syscon.c +++ b/drivers/reset/reset-syscon.c @@ -76,6 +76,6 @@ U_BOOT_DRIVER(syscon_reset) = { .id = UCLASS_RESET, .of_match = syscon_reset_ids, .probe = syscon_reset_probe, - .priv_auto_alloc_size = sizeof(struct syscon_reset_priv), + .priv_auto = sizeof(struct syscon_reset_priv), .ops = &syscon_reset_ops, }; diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c index 95cd3885876..d8510a4abb2 100644 --- a/drivers/reset/reset-ti-sci.c +++ b/drivers/reset/reset-ti-sci.c @@ -205,6 +205,6 @@ U_BOOT_DRIVER(ti_sci_reset) = { .id = UCLASS_RESET, .of_match = ti_sci_reset_of_match, .probe = ti_sci_reset_probe, - .priv_auto_alloc_size = sizeof(struct ti_sci_reset_data), + .priv_auto = sizeof(struct ti_sci_reset_data), .ops = &ti_sci_reset_ops, }; diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index fe1bd5541bd..2694d130b64 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -372,6 +372,6 @@ U_BOOT_DRIVER(uniphier_reset) = { .id = UCLASS_RESET, .of_match = uniphier_reset_match, .probe = uniphier_reset_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_reset_priv), + .priv_auto = sizeof(struct uniphier_reset_priv), .ops = &uniphier_reset_ops, }; diff --git a/drivers/reset/sandbox-reset-test.c b/drivers/reset/sandbox-reset-test.c index 10e02f10362..51b79810c89 100644 --- a/drivers/reset/sandbox-reset-test.c +++ b/drivers/reset/sandbox-reset-test.c @@ -120,5 +120,5 @@ U_BOOT_DRIVER(sandbox_reset_test) = { .name = "sandbox_reset_test", .id = UCLASS_MISC, .of_match = sandbox_reset_test_ids, - .priv_auto_alloc_size = sizeof(struct sandbox_reset_test), + .priv_auto = sizeof(struct sandbox_reset_test), }; diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c index 08008d875ab..97b1b92e4a6 100644 --- a/drivers/reset/sandbox-reset.c +++ b/drivers/reset/sandbox-reset.c @@ -99,7 +99,7 @@ U_BOOT_DRIVER(sandbox_reset) = { .of_match = sandbox_reset_ids, .bind = sandbox_reset_bind, .probe = sandbox_reset_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_reset), + .priv_auto = sizeof(struct sandbox_reset), .ops = &sandbox_reset_reset_ops, };

diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c index ac3a99f9bff..b03638d34d5 100644 --- a/drivers/reset/sti-reset.c +++ b/drivers/reset/sti-reset.c @@ -336,6 +336,6 @@ U_BOOT_DRIVER(sti_reset) = { .id = UCLASS_RESET, .of_match = sti_reset_ids, .probe = sti_reset_probe, - .priv_auto_alloc_size = sizeof(struct sti_reset), + .priv_auto = sizeof(struct sti_reset), .ops = &sti_reset_ops, }; diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c index 20c36a99eb3..4a05ab65aeb 100644 --- a/drivers/reset/stm32-reset.c +++ b/drivers/reset/stm32-reset.c @@ -100,6 +100,6 @@ U_BOOT_DRIVER(stm32_rcc_reset) = { .name = "stm32_rcc_reset", .id = UCLASS_RESET, .probe = stm32_reset_probe, - .priv_auto_alloc_size = sizeof(struct stm32_reset_priv), + .priv_auto = sizeof(struct stm32_reset_priv), .ops = &stm32_reset_ops, }; diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index 57a5a702a23..fedde65395a 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -116,6 +116,6 @@ U_BOOT_DRIVER(meson_rng) = { .ops = &meson_rng_ops, .probe = meson_rng_probe, .remove = meson_rng_remove, - .platdata_auto_alloc_size = sizeof(struct meson_rng_platdata), + .platdata_auto = sizeof(struct meson_rng_platdata), .ofdata_to_platdata = meson_rng_ofdata_to_platdata, }; diff --git a/drivers/rng/msm_rng.c b/drivers/rng/msm_rng.c index d51119303a6..29e7354ece5 100644 --- a/drivers/rng/msm_rng.c +++ b/drivers/rng/msm_rng.c @@ -139,5 +139,5 @@ U_BOOT_DRIVER(msm_rng) = { .ops = &msm_rng_ops, .probe = msm_rng_probe, .remove = msm_rng_remove, - .priv_auto_alloc_size = sizeof(struct msm_rng_priv), + .priv_auto = sizeof(struct msm_rng_priv), }; diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c index c6a834b67c5..7c4363f7992 100644 --- a/drivers/rng/rockchip_rng.c +++ b/drivers/rng/rockchip_rng.c @@ -221,5 +221,5 @@ U_BOOT_DRIVER(rockchip_rng) = { .ops = &rockchip_rng_ops, .probe = rockchip_rng_probe, .ofdata_to_platdata = rockchip_rng_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct rk_rng_platdata), + .priv_auto = sizeof(struct rk_rng_platdata), }; diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index c1bae180f77..4eed1de8adc 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -160,6 +160,6 @@ U_BOOT_DRIVER(stm32_rng) = { .ops = &stm32_rng_ops, .probe = stm32_rng_probe, .remove = stm32_rng_remove, - .platdata_auto_alloc_size = sizeof(struct stm32_rng_platdata), + .platdata_auto = sizeof(struct stm32_rng_platdata), .ofdata_to_platdata = stm32_rng_ofdata_to_platdata, }; diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c index 0a30e0eabb4..16501cfe5d3 100644 --- a/drivers/rtc/ds3232.c +++ b/drivers/rtc/ds3232.c @@ -272,5 +272,5 @@ U_BOOT_DRIVER(rtc_ds3232) = { .probe = ds3232_probe, .of_match = ds3232_rtc_ids, .ops = &ds3232_rtc_ops, - .priv_auto_alloc_size = sizeof(struct ds3232_priv_data), + .priv_auto = sizeof(struct ds3232_priv_data), }; diff --git a/drivers/rtc/emul_rtc.c b/drivers/rtc/emul_rtc.c index 7e522103fd5..1dc80ca1274 100644 --- a/drivers/rtc/emul_rtc.c +++ b/drivers/rtc/emul_rtc.c @@ -88,7 +88,7 @@ U_BOOT_DRIVER(rtc_emul) = { .id = UCLASS_RTC, .ops = &emul_rtc_ops, .probe = emul_rtc_probe, - .priv_auto_alloc_size = sizeof(struct emul_rtc), + .priv_auto = sizeof(struct emul_rtc), };

U_BOOT_DEVICE(rtc_emul) = { diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c index 7f78ff83cb0..762769d54cc 100644 --- a/drivers/rtc/i2c_rtc_emul.c +++ b/drivers/rtc/i2c_rtc_emul.c @@ -230,7 +230,7 @@ U_BOOT_DRIVER(sandbox_i2c_rtc_emul) = { .id = UCLASS_I2C_EMUL, .of_match = sandbox_i2c_rtc_ids, .bind = sandbox_i2c_rtc_bind, - .priv_auto_alloc_size = sizeof(struct sandbox_i2c_rtc), - .platdata_auto_alloc_size = sizeof(struct sandbox_i2c_rtc_plat_data), + .priv_auto = sizeof(struct sandbox_i2c_rtc), + .platdata_auto = sizeof(struct sandbox_i2c_rtc_plat_data), .ops = &sandbox_i2c_rtc_emul_ops, }; diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index 1b6717232c7..7a6d86d3bfd 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -137,6 +137,6 @@ U_BOOT_DRIVER(rtc_pl031) = { .of_match = pl031_ids, .probe = pl031_probe, .ofdata_to_platdata = pl031_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct pl031_platdata), + .platdata_auto = sizeof(struct pl031_platdata), .ops = &pl031_ops, }; diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c index f9db318af1d..f1d0ea90d3c 100644 --- a/drivers/rtc/stm32_rtc.c +++ b/drivers/rtc/stm32_rtc.c @@ -327,5 +327,5 @@ U_BOOT_DRIVER(rtc_stm32) = { .probe = stm32_rtc_probe, .of_match = stm32_rtc_ids, .ops = &stm32_rtc_ops, - .priv_auto_alloc_size = sizeof(struct stm32_rtc_priv), + .priv_auto = sizeof(struct stm32_rtc_priv), }; diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index acf3b3dc957..2b34d0516e6 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -35,5 +35,5 @@ int scsi_bus_reset(struct udevice *dev) UCLASS_DRIVER(scsi) = { .id = UCLASS_SCSI, .name = "scsi", - .per_device_platdata_auto_alloc_size = sizeof(struct scsi_platdata), + .per_device_platdata_auto = sizeof(struct scsi_platdata), }; diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index 35b76f53f93..173ac240ea6 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -119,7 +119,7 @@ U_BOOT_DRIVER(altera_jtaguart) = { .id = UCLASS_SERIAL, .of_match = altera_jtaguart_ids, .ofdata_to_platdata = altera_jtaguart_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_jtaguart_platdata), + .platdata_auto = sizeof(struct altera_jtaguart_platdata), .probe = altera_jtaguart_probe, .ops = &altera_jtaguart_ops, }; diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index 0be5cd75c85..eec70f60005 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -112,7 +112,7 @@ U_BOOT_DRIVER(altera_uart) = { .id = UCLASS_SERIAL, .of_match = altera_uart_ids, .ofdata_to_platdata = altera_uart_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_uart_platdata), + .platdata_auto = sizeof(struct altera_uart_platdata), .probe = altera_uart_probe, .ops = &altera_uart_ops, }; diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index f759ea8893d..45e6554f593 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -304,14 +304,14 @@ U_BOOT_DRIVER(serial_atmel) = { .id = UCLASS_SERIAL, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = atmel_serial_ids, - .platdata_auto_alloc_size = sizeof(struct atmel_serial_platdata), + .platdata_auto = sizeof(struct atmel_serial_platdata), #endif .probe = atmel_serial_probe, .ops = &atmel_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, #endif - .priv_auto_alloc_size = sizeof(struct atmel_serial_priv), + .priv_auto = sizeof(struct atmel_serial_priv), }; #endif

diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c index 7d31c6d4a14..80b63807d60 100644 --- a/drivers/serial/lpc32xx_hsuart.c +++ b/drivers/serial/lpc32xx_hsuart.c @@ -107,6 +107,6 @@ U_BOOT_DRIVER(lpc32xx_hsuart) = { .id = UCLASS_SERIAL, .probe = lpc32xx_hsuart_probe, .ops = &lpc32xx_hsuart_ops, - .priv_auto_alloc_size = sizeof(struct lpc32xx_hsuart_priv), + .priv_auto = sizeof(struct lpc32xx_hsuart_priv), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 702109b23b6..9b83f88187d 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -611,9 +611,9 @@ U_BOOT_DRIVER(ns16550_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = ns16550_serial_ids, .ofdata_to_platdata = ns16550_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), + .platdata_auto = sizeof(struct ns16550_platdata), #endif - .priv_auto_alloc_size = sizeof(struct NS16550), + .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index db2fbac6295..aea7db6e00f 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -259,8 +259,8 @@ U_BOOT_DRIVER(sandbox_serial) = { .id = UCLASS_SERIAL, .of_match = sandbox_serial_ids, .ofdata_to_platdata = sandbox_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct sandbox_serial_platdata), - .priv_auto_alloc_size = sizeof(struct sandbox_serial_priv), + .platdata_auto = sizeof(struct sandbox_serial_platdata), + .priv_auto = sizeof(struct sandbox_serial_priv), .probe = sandbox_serial_probe, .remove = sandbox_serial_remove, .ops = &sandbox_serial_ops, diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index f3c25d42167..b6457242dea 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -507,6 +507,6 @@ UCLASS_DRIVER(serial) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .post_probe = serial_post_probe, .pre_remove = serial_pre_remove, - .per_device_auto_alloc_size = sizeof(struct serial_dev_priv), + .per_device_auto = sizeof(struct serial_dev_priv), }; #endif diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c index 9de94b69bd0..da06bef97c7 100644 --- a/drivers/serial/serial_ar933x.c +++ b/drivers/serial/serial_ar933x.c @@ -188,7 +188,7 @@ U_BOOT_DRIVER(serial_ar933x) = { .name = "serial_ar933x", .id = UCLASS_SERIAL, .of_match = ar933x_serial_ids, - .priv_auto_alloc_size = sizeof(struct ar933x_serial_priv), + .priv_auto = sizeof(struct ar933x_serial_priv), .probe = ar933x_serial_probe, .ops = &ar933x_serial_ops, }; diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index 04063fbe399..52dce3505e4 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_arc) = { .id = UCLASS_SERIAL, .of_match = arc_serial_ids, .ofdata_to_platdata = arc_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct arc_serial_platdata), + .platdata_auto = sizeof(struct arc_serial_platdata), .probe = arc_serial_probe, .ops = &arc_serial_ops, }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 8a4af87eb64..8cd533f8085 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -194,11 +194,11 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .name = "serial_bcm283x_mu", .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_mu_serial_id), - .platdata_auto_alloc_size = sizeof(struct bcm283x_mu_serial_platdata), + .platdata_auto = sizeof(struct bcm283x_mu_serial_platdata), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif - .priv_auto_alloc_size = sizeof(struct bcm283x_mu_priv), + .priv_auto = sizeof(struct bcm283x_mu_priv), }; diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 923f402fbe9..484a2818119 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -92,10 +92,10 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_pl011_serial_id), .probe = bcm283x_pl011_serial_probe, - .platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata), + .platdata_auto = sizeof(struct pl01x_serial_platdata), .ops = &bcm283x_pl011_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif - .priv_auto_alloc_size = sizeof(struct pl01x_priv), + .priv_auto = sizeof(struct pl01x_priv), }; diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c index 5b963ce45bc..f08e91ff3ba 100644 --- a/drivers/serial/serial_bcm6345.c +++ b/drivers/serial/serial_bcm6345.c @@ -262,7 +262,7 @@ U_BOOT_DRIVER(bcm6345_serial) = { .id = UCLASS_SERIAL, .of_match = bcm6345_serial_ids, .probe = bcm6345_serial_probe, - .priv_auto_alloc_size = sizeof(struct bcm6345_serial_priv), + .priv_auto = sizeof(struct bcm6345_serial_priv), .ops = &bcm6345_serial_ops, };

diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index ccab347514c..08363c4920b 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -37,8 +37,8 @@ U_BOOT_DRIVER(coreboot_uart) = { .name = "coreboot_uart", .id = UCLASS_SERIAL, .of_match = coreboot_serial_ids, - .priv_auto_alloc_size = sizeof(struct NS16550), - .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), + .priv_auto = sizeof(struct NS16550), + .platdata_auto = sizeof(struct ns16550_platdata), .ofdata_to_platdata = coreboot_ofdata_to_platdata, .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c index cc20673efef..a0ae2fe0a4c 100644 --- a/drivers/serial/serial_cortina.c +++ b/drivers/serial/serial_cortina.c @@ -159,7 +159,7 @@ U_BOOT_DRIVER(serial_cortina) = { .id = UCLASS_SERIAL, .of_match = ca_serial_ids, .ofdata_to_platdata = ca_serial_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct ca_uart_priv), + .priv_auto = sizeof(struct ca_uart_priv), .probe = ca_serial_probe, .ops = &ca_serial_ops }; diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c index b152e102587..33ddbd6080c 100644 --- a/drivers/serial/serial_efi.c +++ b/drivers/serial/serial_efi.c @@ -150,7 +150,7 @@ U_BOOT_DRIVER(serial_efi) = { .name = "serial_efi", .id = UCLASS_SERIAL, .of_match = serial_efi_ids, - .priv_auto_alloc_size = sizeof(struct serial_efi_priv), + .priv_auto = sizeof(struct serial_efi_priv), .probe = serial_efi_probe, .ops = &serial_efi_ops, }; diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c index 39bd40e68be..f9281590cd4 100644 --- a/drivers/serial/serial_intel_mid.c +++ b/drivers/serial/serial_intel_mid.c @@ -60,8 +60,8 @@ U_BOOT_DRIVER(serial_intel_mid) = { .id = UCLASS_SERIAL, .of_match = mid_serial_ids, .ofdata_to_platdata = ns16550_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), - .priv_auto_alloc_size = sizeof(struct NS16550), + .platdata_auto = sizeof(struct ns16550_platdata), + .priv_auto = sizeof(struct NS16550), .probe = mid_serial_probe, .ops = &ns16550_serial_ops, }; diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index 83dc96c449c..af7b842927a 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -190,7 +190,7 @@ U_BOOT_DRIVER(serial_linflex) = { .probe = linflex_serial_probe, .ops = &linflex_serial_ops, .flags = DM_FLAG_PRE_RELOC, - .priv_auto_alloc_size = sizeof(struct linflex_serial_priv), + .priv_auto = sizeof(struct linflex_serial_priv), };

#ifdef CONFIG_DEBUG_UART_LINFLEXUART diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 95cbe63b3d1..b26f401cb70 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -567,7 +567,7 @@ U_BOOT_DRIVER(serial_lpuart) = { .id = UCLASS_SERIAL, .of_match = lpuart_serial_ids, .ofdata_to_platdata = lpuart_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct lpuart_serial_platdata), + .platdata_auto = sizeof(struct lpuart_serial_platdata), .probe = lpuart_serial_probe, .ops = &lpuart_serial_ops, }; diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index dee1706a218..d88b9f1b9f0 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -172,7 +172,7 @@ U_BOOT_DRIVER(serial_coldfire) = { .id = UCLASS_SERIAL, .of_match = coldfire_serial_ids, .ofdata_to_platdata = coldfire_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct coldfire_serial_platdata), + .platdata_auto = sizeof(struct coldfire_serial_platdata), .probe = coldfire_serial_probe, .ops = &coldfire_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c index 496a2ca2c35..73a10f89c01 100644 --- a/drivers/serial/serial_meson.c +++ b/drivers/serial/serial_meson.c @@ -169,7 +169,7 @@ U_BOOT_DRIVER(serial_meson) = { .probe = meson_serial_probe, .ops = &meson_serial_ops, .ofdata_to_platdata = meson_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct meson_serial_platdata), + .platdata_auto = sizeof(struct meson_serial_platdata), };

#ifdef CONFIG_DEBUG_UART_MESON diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index c8946c3aae8..3b088b3b23a 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -240,7 +240,7 @@ U_BOOT_DRIVER(serial_msm) = { .id = UCLASS_SERIAL, .of_match = msm_serial_ids, .ofdata_to_platdata = msm_serial_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct msm_serial_data), + .priv_auto = sizeof(struct msm_serial_data), .probe = msm_serial_probe, .ops = &msm_serial_ops, }; diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c index 778a04d87e0..afa6e8c8a96 100644 --- a/drivers/serial/serial_mtk.c +++ b/drivers/serial/serial_mtk.c @@ -268,7 +268,7 @@ U_BOOT_DRIVER(serial_mtk) = { .id = UCLASS_SERIAL, .of_match = mtk_serial_ids, .ofdata_to_platdata = mtk_serial_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct mtk_serial_priv), + .priv_auto = sizeof(struct mtk_serial_priv), .probe = mtk_serial_probe, .ops = &mtk_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index fb43f88eaf6..7756b0d929d 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_mvebu) = { .id = UCLASS_SERIAL, .of_match = mvebu_serial_ids, .ofdata_to_platdata = mvebu_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mvebu_platdata), + .platdata_auto = sizeof(struct mvebu_platdata), .probe = mvebu_serial_probe, .ops = &mvebu_serial_ops, }; diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index de6cefcd3ac..83f2316a64b 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -358,7 +358,7 @@ U_BOOT_DRIVER(serial_mxc) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = mxc_serial_ids, .ofdata_to_platdata = mxc_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mxc_serial_platdata), + .platdata_auto = sizeof(struct mxc_serial_platdata), #endif .probe = mxc_serial_probe, .ops = &mxc_serial_ops, diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c index f7997fc788f..296c5fd45c1 100644 --- a/drivers/serial/serial_omap.c +++ b/drivers/serial/serial_omap.c @@ -158,9 +158,9 @@ U_BOOT_DRIVER(omap_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_serial_ids, .ofdata_to_platdata = omap_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), + .platdata_auto = sizeof(struct ns16550_platdata), #endif - .priv_auto_alloc_size = sizeof(struct NS16550), + .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c index 2651a45a7f3..0e67bc124b0 100644 --- a/drivers/serial/serial_owl.c +++ b/drivers/serial/serial_owl.c @@ -130,7 +130,7 @@ U_BOOT_DRIVER(serial_owl) = { .id = UCLASS_SERIAL, .of_match = owl_serial_ids, .ofdata_to_platdata = owl_serial_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct owl_serial_priv), + .priv_auto = sizeof(struct owl_serial_priv), .probe = owl_serial_probe, .ops = &owl_serial_ops, }; diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c index a492063e39c..5d1dbe7a917 100644 --- a/drivers/serial/serial_pic32.c +++ b/drivers/serial/serial_pic32.c @@ -178,7 +178,7 @@ U_BOOT_DRIVER(pic32_serial) = { .of_match = pic32_uart_ids, .probe = pic32_uart_probe, .ops = &pic32_uart_ops, - .priv_auto_alloc_size = sizeof(struct pic32_uart_priv), + .priv_auto = sizeof(struct pic32_uart_priv), };

#ifdef CONFIG_DEBUG_UART_PIC32 diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index d9e35c6a2b4..4e201287bf0 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -388,11 +388,11 @@ U_BOOT_DRIVER(serial_pl01x) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(pl01x_serial_id), .ofdata_to_platdata = of_match_ptr(pl01x_serial_ofdata_to_platdata), - .platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata), + .platdata_auto = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, .ops = &pl01x_serial_ops, .flags = DM_FLAG_PRE_RELOC, - .priv_auto_alloc_size = sizeof(struct pl01x_priv), + .priv_auto = sizeof(struct pl01x_priv), };

#endif diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index b1718f72d1b..74245f8d5dc 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -42,8 +42,8 @@ static int rockchip_serial_probe(struct udevice *dev) U_BOOT_DRIVER(rockchip_rk3188_uart) = { .name = "rockchip_rk3188_uart", .id = UCLASS_SERIAL, - .priv_auto_alloc_size = sizeof(struct NS16550), - .platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata), + .priv_auto = sizeof(struct NS16550), + .platdata_auto = sizeof(struct rockchip_uart_platdata), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, @@ -52,8 +52,8 @@ U_BOOT_DRIVER(rockchip_rk3188_uart) = { U_BOOT_DRIVER(rockchip_rk3288_uart) = { .name = "rockchip_rk3288_uart", .id = UCLASS_SERIAL, - .priv_auto_alloc_size = sizeof(struct NS16550), - .platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata), + .priv_auto = sizeof(struct NS16550), + .platdata_auto = sizeof(struct rockchip_uart_platdata), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 57eb6963b61..2f15525c487 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -208,7 +208,7 @@ U_BOOT_DRIVER(serial_s5p) = { .id = UCLASS_SERIAL, .of_match = s5p_serial_ids, .ofdata_to_platdata = s5p_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct s5p_serial_platdata), + .platdata_auto = sizeof(struct s5p_serial_platdata), .probe = s5p_serial_probe, .ops = &s5p_serial_ops, }; diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index e27d256574f..4e37ab0c318 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -240,13 +240,13 @@ U_BOOT_DRIVER(serial_sh) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(sh_serial_id), .ofdata_to_platdata = of_match_ptr(sh_serial_ofdata_to_platdata), - .platdata_auto_alloc_size = sizeof(struct sh_serial_platdata), + .platdata_auto = sizeof(struct sh_serial_platdata), .probe = sh_serial_probe, .ops = &sh_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, #endif - .priv_auto_alloc_size = sizeof(struct uart_port), + .priv_auto = sizeof(struct uart_port), };

#else /* CONFIG_DM_SERIAL */ diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index fcc47fb348f..710bb72363f 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -202,7 +202,7 @@ U_BOOT_DRIVER(serial_sifive) = { .id = UCLASS_SERIAL, .of_match = sifive_serial_ids, .ofdata_to_platdata = sifive_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct sifive_uart_platdata), + .platdata_auto = sizeof(struct sifive_uart_platdata), .probe = sifive_serial_probe, .ops = &sifive_serial_ops, }; diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c index 33ff396bff7..ded684abfbb 100644 --- a/drivers/serial/serial_sti_asc.c +++ b/drivers/serial/serial_sti_asc.c @@ -206,6 +206,6 @@ U_BOOT_DRIVER(serial_sti_asc) = { .of_match = sti_serial_of_match, .ops = &sti_asc_serial_ops, .probe = sti_asc_serial_probe, - .priv_auto_alloc_size = sizeof(struct sti_asc_serial), + .priv_auto = sizeof(struct sti_asc_serial), };

diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index cab0db2c96a..a8e03207503 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -241,7 +241,7 @@ U_BOOT_DRIVER(serial_stm32) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(stm32_serial_id), .ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata), - .platdata_auto_alloc_size = sizeof(struct stm32x7_serial_platdata), + .platdata_auto = sizeof(struct stm32x7_serial_platdata), .ops = &stm32_serial_ops, .probe = stm32_serial_probe, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c index a098028ca00..27e4b92c399 100644 --- a/drivers/serial/serial_uniphier.c +++ b/drivers/serial/serial_uniphier.c @@ -172,6 +172,6 @@ U_BOOT_DRIVER(uniphier_serial) = { .id = UCLASS_SERIAL, .of_match = uniphier_uart_of_match, .probe = uniphier_serial_probe, - .priv_auto_alloc_size = sizeof(struct uniphier_serial_priv), + .priv_auto = sizeof(struct uniphier_serial_priv), .ops = &uniphier_serial_ops, }; diff --git a/drivers/serial/serial_xen.c b/drivers/serial/serial_xen.c index ba6504b9479..dbb7b22b51c 100644 --- a/drivers/serial/serial_xen.c +++ b/drivers/serial/serial_xen.c @@ -172,7 +172,7 @@ U_BOOT_DRIVER(serial_xen) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = xen_serial_ids, #endif - .priv_auto_alloc_size = sizeof(struct xen_uart_priv), + .priv_auto = sizeof(struct xen_uart_priv), .probe = xen_serial_probe, .ops = &xen_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index 236ab860ad8..bc039492ef8 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -132,7 +132,7 @@ U_BOOT_DRIVER(serial_uartlite) = { .id = UCLASS_SERIAL, .of_match = uartlite_serial_ids, .ofdata_to_platdata = uartlite_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct uartlite_platdata), + .platdata_auto = sizeof(struct uartlite_platdata), .probe = uartlite_serial_probe, .ops = &uartlite_serial_ops, }; diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 0e71cada1bb..d04c3990198 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -212,7 +212,7 @@ U_BOOT_DRIVER(serial_zynq) = { .id = UCLASS_SERIAL, .of_match = zynq_serial_ids, .ofdata_to_platdata = zynq_serial_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct zynq_uart_platdata), + .platdata_auto = sizeof(struct zynq_uart_platdata), .probe = zynq_serial_probe, .ops = &zynq_serial_ops, }; diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index 94285403ca2..e1cbd6eef89 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -124,5 +124,5 @@ U_BOOT_DRIVER(soc_ti_k3) = { .ops = &soc_ti_k3_ops, .of_match = soc_ti_k3_ids, .probe = soc_ti_k3_probe, - .platdata_auto_alloc_size = sizeof(struct soc_ti_k3_platdata), + .platdata_auto = sizeof(struct soc_ti_k3_platdata), }; diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c index c48e9befe4b..c5099ad084d 100644 --- a/drivers/soc/ti/k3-navss-ringacc.c +++ b/drivers/soc/ti/k3-navss-ringacc.c @@ -1130,5 +1130,5 @@ U_BOOT_DRIVER(k3_navss_ringacc) = { .id = UCLASS_MISC, .of_match = knav_ringacc_ids, .probe = k3_nav_ringacc_probe, - .priv_auto_alloc_size = sizeof(struct k3_nav_ringacc), + .priv_auto = sizeof(struct k3_nav_ringacc), }; diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c index adb0b2b104d..7f754e65676 100644 --- a/drivers/sound/broadwell_i2s.c +++ b/drivers/sound/broadwell_i2s.c @@ -304,5 +304,5 @@ U_BOOT_DRIVER(broadwell_i2s) = { .of_match = broadwell_i2s_ids, .probe = broadwell_i2s_probe, .ops = &broadwell_i2s_ops, - .priv_auto_alloc_size = sizeof(struct broadwell_i2s_priv), + .priv_auto = sizeof(struct broadwell_i2s_priv), }; diff --git a/drivers/sound/hda_codec.c b/drivers/sound/hda_codec.c index 4154d293998..eb92830ad9c 100644 --- a/drivers/sound/hda_codec.c +++ b/drivers/sound/hda_codec.c @@ -539,7 +539,7 @@ U_BOOT_DRIVER(hda_codec) = { .name = "hda_codec", .id = UCLASS_SOUND, .ops = &hda_codec_ops, - .priv_auto_alloc_size = sizeof(struct hda_codec_priv), + .priv_auto = sizeof(struct hda_codec_priv), .probe = hda_codec_init, };

diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c index b741e3952d1..2639c86ea21 100644 --- a/drivers/sound/i2s-uclass.c +++ b/drivers/sound/i2s-uclass.c @@ -21,5 +21,5 @@ int i2s_tx_data(struct udevice *dev, void *data, uint data_size) UCLASS_DRIVER(i2s) = { .id = UCLASS_I2S, .name = "i2s", - .per_device_auto_alloc_size = sizeof(struct i2s_uc_priv), + .per_device_auto = sizeof(struct i2s_uc_priv), }; diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c index bc3c1e85f8c..62207b957cf 100644 --- a/drivers/sound/ivybridge_sound.c +++ b/drivers/sound/ivybridge_sound.c @@ -135,5 +135,5 @@ U_BOOT_DRIVER(bd82x6x_azalia_drv) = { .of_match = bd82x6x_azalia_ids, .probe = bd82x6x_azalia_probe, .ops = &bd82x6x_azalia_ops, - .priv_auto_alloc_size = sizeof(struct hda_codec_priv), + .priv_auto = sizeof(struct hda_codec_priv), }; diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c index 5b4c489f4b1..4bcb7482b20 100644 --- a/drivers/sound/max98088.c +++ b/drivers/sound/max98088.c @@ -421,5 +421,5 @@ U_BOOT_DRIVER(max98088) = { .of_match = max98088_ids, .probe = max98088_probe, .ops = &max98088_ops, - .priv_auto_alloc_size = sizeof(struct maxim_priv), + .priv_auto = sizeof(struct maxim_priv), }; diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c index d23955d6e10..c77a7322778 100644 --- a/drivers/sound/max98090.c +++ b/drivers/sound/max98090.c @@ -368,5 +368,5 @@ U_BOOT_DRIVER(max98090) = { .of_match = max98090_ids, .probe = max98090_probe, .ops = &max98090_ops, - .priv_auto_alloc_size = sizeof(struct maxim_priv), + .priv_auto = sizeof(struct maxim_priv), }; diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c index 5037f9516fa..002dab437fa 100644 --- a/drivers/sound/max98095.c +++ b/drivers/sound/max98095.c @@ -462,5 +462,5 @@ U_BOOT_DRIVER(max98095) = { .of_match = max98095_ids, .probe = max98095_probe, .ops = &max98095_ops, - .priv_auto_alloc_size = sizeof(struct maxim_priv), + .priv_auto = sizeof(struct maxim_priv), }; diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c index 16aa9dfc5b2..b655bb40b64 100644 --- a/drivers/sound/rt5677.c +++ b/drivers/sound/rt5677.c @@ -331,5 +331,5 @@ U_BOOT_DRIVER(rt5677_drv) = { .of_match = rt5677_ids, .ops = &rt5677_ops, .probe = rt5677_probe, - .priv_auto_alloc_size = sizeof(struct rt5677_priv), + .priv_auto = sizeof(struct rt5677_priv), }; diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c index 0686add3c8b..4a2c87a84c6 100644 --- a/drivers/sound/sandbox.c +++ b/drivers/sound/sandbox.c @@ -223,7 +223,7 @@ U_BOOT_DRIVER(sandbox_codec) = { .id = UCLASS_AUDIO_CODEC, .of_match = sandbox_codec_ids, .ops = &sandbox_codec_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_codec_priv), + .priv_auto = sizeof(struct sandbox_codec_priv), };

static const struct i2s_ops sandbox_i2s_ops = { @@ -241,7 +241,7 @@ U_BOOT_DRIVER(sandbox_i2s) = { .of_match = sandbox_i2s_ids, .ops = &sandbox_i2s_ops, .probe = sandbox_i2s_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_i2s_priv), + .priv_auto = sizeof(struct sandbox_i2s_priv), };

static const struct sound_ops sandbox_sound_ops = { @@ -262,6 +262,6 @@ U_BOOT_DRIVER(sandbox_sound) = { .id = UCLASS_SOUND, .of_match = sandbox_sound_ids, .ops = &sandbox_sound_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_sound_priv), + .priv_auto = sizeof(struct sandbox_sound_priv), .probe = sandbox_sound_probe, }; diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c index 92f4b0b924b..0c71e01f337 100644 --- a/drivers/sound/sound-uclass.c +++ b/drivers/sound/sound-uclass.c @@ -172,5 +172,5 @@ int sound_find_codec_i2s(struct udevice *dev) UCLASS_DRIVER(sound) = { .id = UCLASS_SOUND, .name = "sound", - .per_device_auto_alloc_size = sizeof(struct sound_uc_priv), + .per_device_auto = sizeof(struct sound_uc_priv), }; diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c index 26d457255c9..8708fc44a9e 100644 --- a/drivers/sound/tegra_ahub.c +++ b/drivers/sound/tegra_ahub.c @@ -253,5 +253,5 @@ U_BOOT_DRIVER(tegra_ahub) = { .of_match = tegra_ahub_ids, .ops = &tegra_ahub_ops, .probe = tegra_ahub_probe, - .priv_auto_alloc_size = sizeof(struct tegra_ahub_priv), + .priv_auto = sizeof(struct tegra_ahub_priv), }; diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c index 367e1445417..cb1e97d7a5a 100644 --- a/drivers/sound/wm8994.c +++ b/drivers/sound/wm8994.c @@ -873,5 +873,5 @@ U_BOOT_DRIVER(wm8994) = { .of_match = wm8994_ids, .probe = wm8994_probe, .ops = &wm8994_ops, - .priv_auto_alloc_size = sizeof(struct wm8994_priv), + .priv_auto = sizeof(struct wm8994_priv), }; diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 1529002cac1..07bf3c9a0f8 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -203,7 +203,7 @@ U_BOOT_DRIVER(altera_spi) = { .of_match = altera_spi_ids, .ops = &altera_spi_ops, .ofdata_to_platdata = altera_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_spi_platdata), - .priv_auto_alloc_size = sizeof(struct altera_spi_priv), + .platdata_auto = sizeof(struct altera_spi_platdata), + .priv_auto = sizeof(struct altera_spi_priv), .probe = altera_spi_probe, }; diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 39c6e226ba7..82534d9c693 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -409,6 +409,6 @@ U_BOOT_DRIVER(atcspi200_spi) = { .of_match = atcspi200_spi_ids, .ops = &atcspi200_spi_ops, .ofdata_to_platdata = atcspi200_ofdata_to_platadata, - .priv_auto_alloc_size = sizeof(struct nds_spi_slave), + .priv_auto = sizeof(struct nds_spi_slave), .probe = atcspi200_spi_probe, }; diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index 70bedc7fbe3..e5d54faf7df 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -224,6 +224,6 @@ U_BOOT_DRIVER(ath79_spi) = { .id = UCLASS_SPI, .of_match = ath79_spi_ids, .ops = &ath79_spi_ops, - .priv_auto_alloc_size = sizeof(struct ath79_spi_priv), + .priv_auto = sizeof(struct ath79_spi_priv), .probe = ath79_spi_probe, }; diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 9320a8be685..b1a3aa9a297 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -624,6 +624,6 @@ U_BOOT_DRIVER(atmel_qspi) = { .id = UCLASS_SPI, .of_match = atmel_qspi_ids, .ops = &atmel_qspi_ops, - .priv_auto_alloc_size = sizeof(struct atmel_qspi), + .priv_auto = sizeof(struct atmel_qspi), .probe = atmel_qspi_probe, }; diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index c65733c87ac..873f854cc9a 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -388,7 +388,7 @@ U_BOOT_DRIVER(atmel_spi) = { .id = UCLASS_SPI, .of_match = atmel_spi_ids, .ops = &atmel_spi_ops, - .platdata_auto_alloc_size = sizeof(struct atmel_spi_platdata), - .priv_auto_alloc_size = sizeof(struct atmel_spi_priv), + .platdata_auto = sizeof(struct atmel_spi_platdata), + .priv_auto = sizeof(struct atmel_spi_priv), .probe = atmel_spi_probe, }; diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c index f30a8a42bd4..c4a04ba6fd2 100644 --- a/drivers/spi/bcm63xx_hsspi.c +++ b/drivers/spi/bcm63xx_hsspi.c @@ -403,7 +403,7 @@ U_BOOT_DRIVER(bcm63xx_hsspi) = { .id = UCLASS_SPI, .of_match = bcm63xx_hsspi_ids, .ops = &bcm63xx_hsspi_ops, - .priv_auto_alloc_size = sizeof(struct bcm63xx_hsspi_priv), + .priv_auto = sizeof(struct bcm63xx_hsspi_priv), .child_pre_probe = bcm63xx_hsspi_child_pre_probe, .probe = bcm63xx_hsspi_probe, }; diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c index acc1a493c4e..97b72d263ae 100644 --- a/drivers/spi/bcm63xx_spi.c +++ b/drivers/spi/bcm63xx_spi.c @@ -422,7 +422,7 @@ U_BOOT_DRIVER(bcm63xx_spi) = { .id = UCLASS_SPI, .of_match = bcm63xx_spi_ids, .ops = &bcm63xx_spi_ops, - .priv_auto_alloc_size = sizeof(struct bcm63xx_spi_priv), + .priv_auto = sizeof(struct bcm63xx_spi_priv), .child_pre_probe = bcm63xx_spi_child_pre_probe, .probe = bcm63xx_spi_probe, }; diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c index fb1dc46b704..d5ec2bccfb0 100644 --- a/drivers/spi/bcmstb_spi.c +++ b/drivers/spi/bcmstb_spi.c @@ -434,6 +434,6 @@ U_BOOT_DRIVER(bcmstb_spi) = { .ops = &bcmstb_spi_ops, .ofdata_to_platdata = bcmstb_spi_ofdata_to_platdata, .probe = bcmstb_spi_probe, - .platdata_auto_alloc_size = sizeof(struct bcmstb_spi_platdata), - .priv_auto_alloc_size = sizeof(struct bcmstb_spi_priv), + .platdata_auto = sizeof(struct bcmstb_spi_platdata), + .priv_auto = sizeof(struct bcmstb_spi_priv), }; diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 1e857492090..dcee7b77033 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -354,8 +354,8 @@ U_BOOT_DRIVER(cadence_spi) = { .of_match = cadence_spi_ids, .ops = &cadence_spi_ops, .ofdata_to_platdata = cadence_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct cadence_spi_platdata), - .priv_auto_alloc_size = sizeof(struct cadence_spi_priv), + .platdata_auto = sizeof(struct cadence_spi_platdata), + .priv_auto = sizeof(struct cadence_spi_priv), .probe = cadence_spi_probe, .remove = cadence_spi_remove, .flags = DM_FLAG_OS_PREPARE, diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index 8f1c8b8c0fb..0fa61efc23b 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -452,9 +452,9 @@ U_BOOT_DRIVER(coldfire_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = coldfire_spi_ids, .ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct coldfire_spi_platdata), + .platdata_auto = sizeof(struct coldfire_spi_platdata), #endif .probe = coldfire_spi_probe, .ops = &coldfire_spi_ops, - .priv_auto_alloc_size = sizeof(struct coldfire_spi_priv), + .priv_auto = sizeof(struct coldfire_spi_priv), }; diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index a11433db1e9..b69224e9832 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -420,9 +420,9 @@ U_BOOT_DRIVER(davinci_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = davinci_spi_ids, .ofdata_to_platdata = davinci_ofdata_to_platadata, - .platdata_auto_alloc_size = sizeof(struct davinci_spi_platdata), + .platdata_auto = sizeof(struct davinci_spi_platdata), #endif .probe = davinci_spi_probe, .ops = &davinci_spi_ops, - .priv_auto_alloc_size = sizeof(struct davinci_spi_slave), + .priv_auto = sizeof(struct davinci_spi_slave), }; diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 2559aac2e94..8d48e04ed1f 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -560,8 +560,8 @@ U_BOOT_DRIVER(dw_spi) = { .of_match = dw_spi_ids, .ops = &dw_spi_ops, .ofdata_to_platdata = dw_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct dw_spi_platdata), - .priv_auto_alloc_size = sizeof(struct dw_spi_priv), + .platdata_auto = sizeof(struct dw_spi_platdata), + .priv_auto = sizeof(struct dw_spi_priv), .probe = dw_spi_probe, .remove = dw_spi_remove, }; diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index d338ff5a0bd..8a82e60f008 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -427,7 +427,7 @@ U_BOOT_DRIVER(exynos_spi) = { .of_match = exynos_spi_ids, .ops = &exynos_spi_ops, .ofdata_to_platdata = exynos_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct exynos_spi_platdata), - .priv_auto_alloc_size = sizeof(struct exynos_spi_priv), + .platdata_auto = sizeof(struct exynos_spi_platdata), + .priv_auto = sizeof(struct exynos_spi_priv), .probe = exynos_spi_probe, }; diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index 67807b2e109..352a82c0b69 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -660,8 +660,8 @@ U_BOOT_DRIVER(fsl_dspi) = { .of_match = fsl_dspi_ids, .ops = &fsl_dspi_ops, .ofdata_to_platdata = fsl_dspi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct fsl_dspi_platdata), - .priv_auto_alloc_size = sizeof(struct fsl_dspi_priv), + .platdata_auto = sizeof(struct fsl_dspi_platdata), + .priv_auto = sizeof(struct fsl_dspi_priv), .probe = fsl_dspi_probe, .child_pre_probe = fsl_dspi_child_pre_probe, .bind = fsl_dspi_bind, diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index 5cd6577b85a..af9bcfdd7e9 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -576,8 +576,8 @@ U_BOOT_DRIVER(fsl_espi) = { .ofdata_to_platdata = fsl_espi_ofdata_to_platdata, #endif .ops = &fsl_espi_ops, - .platdata_auto_alloc_size = sizeof(struct fsl_espi_platdata), - .priv_auto_alloc_size = sizeof(struct fsl_spi_slave), + .platdata_auto = sizeof(struct fsl_espi_platdata), + .priv_auto = sizeof(struct fsl_spi_slave), .probe = fsl_espi_probe, .child_pre_probe = fsl_espi_child_pre_probe, }; diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 128f95877f2..412d0317043 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -887,6 +887,6 @@ U_BOOT_DRIVER(fsl_qspi) = { .id = UCLASS_SPI, .of_match = fsl_qspi_ids, .ops = &fsl_qspi_ops, - .priv_auto_alloc_size = sizeof(struct fsl_qspi), + .priv_auto = sizeof(struct fsl_qspi), .probe = fsl_qspi_probe, }; diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index a91cb785680..d2fc9e24fad 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -1005,8 +1005,8 @@ U_BOOT_DRIVER(intel_fast_spi) = { .of_match = ich_spi_ids, .ops = &ich_spi_ops, .ofdata_to_platdata = ich_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct ich_spi_platdata), - .priv_auto_alloc_size = sizeof(struct ich_spi_priv), + .platdata_auto = sizeof(struct ich_spi_platdata), + .priv_auto = sizeof(struct ich_spi_priv), .child_pre_probe = ich_spi_child_pre_probe, .probe = ich_spi_probe, .remove = ich_spi_remove, diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index dc7d2bc1f01..22f05409986 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -296,7 +296,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .ofdata_to_platdata = mvebu_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mvebu_spi_platdata), - .priv_auto_alloc_size = sizeof(struct mvebu_spi_priv), + .platdata_auto = sizeof(struct mvebu_spi_platdata), + .priv_auto = sizeof(struct mvebu_spi_priv), .probe = mvebu_spi_probe, }; diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c index 2cdc0186825..d99a151406e 100644 --- a/drivers/spi/meson_spifc.c +++ b/drivers/spi/meson_spifc.c @@ -318,5 +318,5 @@ U_BOOT_DRIVER(meson_spifc) = { .of_match = meson_spifc_ids, .ops = &meson_spifc_ops, .probe = meson_spifc_probe, - .priv_auto_alloc_size = sizeof(struct meson_spifc_priv), + .priv_auto = sizeof(struct meson_spifc_priv), }; diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index ec39c12b3de..378037f993e 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -281,5 +281,5 @@ U_BOOT_DRIVER(mpc8xxx_spi) = { .ops = &mpc8xxx_spi_ops, .ofdata_to_platdata = mpc8xxx_spi_ofdata_to_platdata, .probe = mpc8xxx_spi_probe, - .priv_auto_alloc_size = sizeof(struct mpc8xxx_priv), + .priv_auto = sizeof(struct mpc8xxx_priv), }; diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c index e77447b6556..a1b617246df 100644 --- a/drivers/spi/mscc_bb_spi.c +++ b/drivers/spi/mscc_bb_spi.c @@ -232,6 +232,6 @@ U_BOOT_DRIVER(mscc_bb) = { .id = UCLASS_SPI, .of_match = mscc_bb_ids, .ops = &mscc_bb_ops, - .priv_auto_alloc_size = sizeof(struct mscc_bb_priv), + .priv_auto = sizeof(struct mscc_bb_priv), .probe = mscc_bb_spi_probe, }; diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c index 3a0738eb2b7..eb0931747b7 100644 --- a/drivers/spi/mt7621_spi.c +++ b/drivers/spi/mt7621_spi.c @@ -304,6 +304,6 @@ U_BOOT_DRIVER(mt7621_spi) = { .id = UCLASS_SPI, .of_match = mt7621_spi_ids, .ops = &mt7621_spi_ops, - .priv_auto_alloc_size = sizeof(struct mt7621_spi), + .priv_auto = sizeof(struct mt7621_spi), .probe = mt7621_spi_probe, }; diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c index c30c8f4ff6d..b6ab5fa3ada 100644 --- a/drivers/spi/mtk_snfi_spi.c +++ b/drivers/spi/mtk_snfi_spi.c @@ -313,6 +313,6 @@ U_BOOT_DRIVER(mtk_snfi_spi) = { .id = UCLASS_SPI, .of_match = mtk_snfi_spi_ids, .ops = &mtk_snfi_spi_ops, - .priv_auto_alloc_size = sizeof(struct mtk_snfi_priv), + .priv_auto = sizeof(struct mtk_snfi_priv), .probe = mtk_snfi_spi_probe, }; diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index eb13cf349ef..b9e058acaa1 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -325,7 +325,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .ofdata_to_platdata = mvebu_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct mvebu_spi_platdata), + .platdata_auto = sizeof(struct mvebu_spi_platdata), .probe = mvebu_spi_probe, .remove = mvebu_spi_remove, }; diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index e90a06a66de..f571392e769 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -605,7 +605,7 @@ U_BOOT_DRIVER(mxc_spi) = { .id = UCLASS_SPI, .of_match = mxc_spi_ids, .ops = &mxc_spi_ops, - .platdata_auto_alloc_size = sizeof(struct mxc_spi_slave), + .platdata_auto = sizeof(struct mxc_spi_slave), .probe = mxc_spi_probe, }; #endif diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index fb0af02be08..57e7a2eae67 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -487,9 +487,9 @@ U_BOOT_DRIVER(fsl_imx23_spi) = { .of_match = mxs_spi_ids, .ofdata_to_platdata = mxs_ofdata_to_platdata, #endif - .platdata_auto_alloc_size = sizeof(struct mxs_spi_platdata), + .platdata_auto = sizeof(struct mxs_spi_platdata), .ops = &mxs_spi_ops, - .priv_auto_alloc_size = sizeof(struct mxs_spi_priv), + .priv_auto = sizeof(struct mxs_spi_priv), .probe = mxs_spi_probe, };

diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 9661e9e10d7..96f981a1192 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -994,6 +994,6 @@ U_BOOT_DRIVER(nxp_fspi) = { .of_match = nxp_fspi_ids, .ops = &nxp_fspi_ops, .ofdata_to_platdata = nxp_fspi_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct nxp_fspi), + .priv_auto = sizeof(struct nxp_fspi), .probe = nxp_fspi_probe, }; diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c index 249b9690bea..72cd18526bf 100644 --- a/drivers/spi/octeon_spi.c +++ b/drivers/spi/octeon_spi.c @@ -611,6 +611,6 @@ U_BOOT_DRIVER(octeon_spi) = { .id = UCLASS_SPI, .of_match = octeon_spi_ids, .probe = octeon_spi_probe, - .priv_auto_alloc_size = sizeof(struct octeon_spi), + .priv_auto = sizeof(struct octeon_spi), .ops = &octeon_spi_ops, }; diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 56cb2174868..1beaea77887 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -507,9 +507,9 @@ U_BOOT_DRIVER(omap3_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap3_spi_ids, .ofdata_to_platdata = omap3_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct omap3_spi_plat), + .platdata_auto = sizeof(struct omap3_spi_plat), #endif .probe = omap3_spi_probe, .ops = &omap3_spi_ops, - .priv_auto_alloc_size = sizeof(struct omap3_spi_priv), + .priv_auto = sizeof(struct omap3_spi_priv), }; diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c index 97c2f939c0f..57c6a5d6abb 100644 --- a/drivers/spi/pic32_spi.c +++ b/drivers/spi/pic32_spi.c @@ -444,6 +444,6 @@ U_BOOT_DRIVER(pic32_spi) = { .id = UCLASS_SPI, .of_match = pic32_spi_ids, .ops = &pic32_spi_ops, - .priv_auto_alloc_size = sizeof(struct pic32_spi_priv), + .priv_auto = sizeof(struct pic32_spi_priv), .probe = pic32_spi_probe, }; diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c index 32bb8c8d212..e9fd618562a 100644 --- a/drivers/spi/pl022_spi.c +++ b/drivers/spi/pl022_spi.c @@ -319,7 +319,7 @@ U_BOOT_DRIVER(pl022_spi) = { .ofdata_to_platdata = pl022_spi_ofdata_to_platdata, #endif .ops = &pl022_spi_ops, - .platdata_auto_alloc_size = sizeof(struct pl022_spi_pdata), - .priv_auto_alloc_size = sizeof(struct pl022_spi_slave), + .platdata_auto = sizeof(struct pl022_spi_pdata), + .priv_auto = sizeof(struct pl022_spi_slave), .probe = pl022_spi_probe, }; diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index d0ff918af88..7018814f9cb 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -464,8 +464,8 @@ U_BOOT_DRIVER(rpc_spi) = { .of_match = rpc_spi_ids, .ops = &rpc_spi_ops, .ofdata_to_platdata = rpc_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct rpc_spi_platdata), - .priv_auto_alloc_size = sizeof(struct rpc_spi_priv), + .platdata_auto = sizeof(struct rpc_spi_platdata), + .priv_auto = sizeof(struct rpc_spi_priv), .bind = rpc_spi_bind, .probe = rpc_spi_probe, }; diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index 3f71ec99b11..bccdf4efdfa 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -560,8 +560,8 @@ U_BOOT_DRIVER(rockchip_rk3288_spi) = { .of_match = rockchip_spi_ids, .ops = &rockchip_spi_ops, .ofdata_to_platdata = rockchip_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct rockchip_spi_platdata), - .priv_auto_alloc_size = sizeof(struct rockchip_spi_priv), + .platdata_auto = sizeof(struct rockchip_spi_platdata), + .priv_auto = sizeof(struct rockchip_spi_priv), .probe = rockchip_spi_probe, };

diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c index aa1c03047e2..35381c16b34 100644 --- a/drivers/spi/sh_qspi.c +++ b/drivers/spi/sh_qspi.c @@ -354,7 +354,7 @@ U_BOOT_DRIVER(sh_qspi) = { .of_match = sh_qspi_ids, .ops = &sh_qspi_ops, .ofdata_to_platdata = sh_qspi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct sh_qspi_slave), + .platdata_auto = sizeof(struct sh_qspi_slave), .probe = sh_qspi_probe, }; #endif diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 153bbf8b255..c71357795d3 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -281,7 +281,7 @@ U_BOOT_DRIVER(soft_spi) = { .of_match = soft_spi_ids, .ops = &soft_spi_ops, .ofdata_to_platdata = soft_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct soft_spi_platdata), - .priv_auto_alloc_size = sizeof(struct soft_spi_priv), + .platdata_auto = sizeof(struct soft_spi_platdata), + .priv_auto = sizeof(struct soft_spi_priv), .probe = soft_spi_probe, }; diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 6f8df55fa56..721d65426bc 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -798,6 +798,6 @@ U_BOOT_DRIVER(spi_qup) = { .id = UCLASS_SPI, .of_match = qup_spi_ids, .ops = &qup_spi_ops, - .priv_auto_alloc_size = sizeof(struct qup_spi_priv), + .priv_auto = sizeof(struct qup_spi_priv), .probe = qup_spi_probe, }; diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index c7345d90428..fdbcdb8f43a 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -475,6 +475,6 @@ U_BOOT_DRIVER(sifive_spi) = { .id = UCLASS_SPI, .of_match = sifive_spi_ids, .ops = &sifive_spi_ops, - .priv_auto_alloc_size = sizeof(struct sifive_spi), + .priv_auto = sizeof(struct sifive_spi), .probe = sifive_spi_probe, }; diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index 0844a5a0a6a..84c1ece409b 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -631,7 +631,7 @@ U_BOOT_DRIVER(sun4i_spi) = { .of_match = sun4i_spi_ids, .ops = &sun4i_spi_ops, .ofdata_to_platdata = sun4i_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct sun4i_spi_platdata), - .priv_auto_alloc_size = sizeof(struct sun4i_spi_priv), + .platdata_auto = sizeof(struct sun4i_spi_platdata), + .priv_auto = sizeof(struct sun4i_spi_priv), .probe = sun4i_spi_probe, }; diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 08f165837d2..a03d35b1f8e 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -502,9 +502,9 @@ UCLASS_DRIVER(spi) = { #endif .post_probe = spi_post_probe, .child_pre_probe = spi_child_pre_probe, - .per_device_auto_alloc_size = sizeof(struct dm_spi_bus), - .per_child_auto_alloc_size = sizeof(struct spi_slave), - .per_child_platdata_auto_alloc_size = + .per_device_auto = sizeof(struct dm_spi_bus), + .per_child_auto = sizeof(struct spi_slave), + .per_child_platdata_auto = sizeof(struct dm_spi_slave_platdata), #if !CONFIG_IS_ENABLED(OF_PLATDATA) .child_post_bind = spi_child_post_bind, diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index a53b941410d..44317780eba 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -541,6 +541,6 @@ U_BOOT_DRIVER(stm32_qspi) = { .id = UCLASS_SPI, .of_match = stm32_qspi_ids, .ops = &stm32_qspi_ops, - .priv_auto_alloc_size = sizeof(struct stm32_qspi_priv), + .priv_auto = sizeof(struct stm32_qspi_priv), .probe = stm32_qspi_probe, }; diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c index 4a0833b6fa9..4c7fee6fbb1 100644 --- a/drivers/spi/stm32_spi.c +++ b/drivers/spi/stm32_spi.c @@ -615,7 +615,7 @@ U_BOOT_DRIVER(stm32_spi) = { .id = UCLASS_SPI, .of_match = stm32_spi_ids, .ops = &stm32_spi_ops, - .priv_auto_alloc_size = sizeof(struct stm32_spi_priv), + .priv_auto = sizeof(struct stm32_spi_priv), .probe = stm32_spi_probe, .remove = stm32_spi_remove, }; diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index 0c99dfde201..86fc38e5ece 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -394,7 +394,7 @@ U_BOOT_DRIVER(tegra114_spi) = { .of_match = tegra114_spi_ids, .ops = &tegra114_spi_ops, .ofdata_to_platdata = tegra114_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata), - .priv_auto_alloc_size = sizeof(struct tegra114_spi_priv), + .platdata_auto = sizeof(struct tegra_spi_platdata), + .priv_auto = sizeof(struct tegra114_spi_priv), .probe = tegra114_spi_probe, }; diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 722a1203462..7e0cb2b1f86 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -354,7 +354,7 @@ U_BOOT_DRIVER(tegra20_sflash) = { .of_match = tegra20_sflash_ids, .ops = &tegra20_sflash_ops, .ofdata_to_platdata = tegra20_sflash_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata), - .priv_auto_alloc_size = sizeof(struct tegra20_sflash_priv), + .platdata_auto = sizeof(struct tegra_spi_platdata), + .priv_auto = sizeof(struct tegra20_sflash_priv), .probe = tegra20_sflash_probe, }; diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index d051e93c533..bfb7fd14b2c 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -373,7 +373,7 @@ U_BOOT_DRIVER(tegra30_spi) = { .of_match = tegra30_spi_ids, .ops = &tegra30_spi_ops, .ofdata_to_platdata = tegra30_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata), - .priv_auto_alloc_size = sizeof(struct tegra30_spi_priv), + .platdata_auto = sizeof(struct tegra_spi_platdata), + .priv_auto = sizeof(struct tegra30_spi_priv), .probe = tegra30_spi_probe, }; diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index ce08637c711..d8b2c73a664 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -423,8 +423,8 @@ U_BOOT_DRIVER(tegra210_qspi) = { .of_match = tegra210_qspi_ids, .ops = &tegra210_qspi_ops, .ofdata_to_platdata = tegra210_qspi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct tegra_spi_platdata), - .priv_auto_alloc_size = sizeof(struct tegra210_qspi_priv), - .per_child_auto_alloc_size = sizeof(struct spi_slave), + .platdata_auto = sizeof(struct tegra_spi_platdata), + .priv_auto = sizeof(struct tegra210_qspi_priv), + .per_child_auto = sizeof(struct spi_slave), .probe = tegra210_qspi_probe, }; diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 5fdbb494420..77353ba3752 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -505,6 +505,6 @@ U_BOOT_DRIVER(ti_qspi) = { .of_match = ti_qspi_ids, .ops = &ti_qspi_ops, .ofdata_to_platdata = ti_qspi_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct ti_qspi_priv), + .priv_auto = sizeof(struct ti_qspi_priv), .probe = ti_qspi_probe, }; diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index b6456685f8d..048d74f1f89 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -412,7 +412,7 @@ U_BOOT_DRIVER(uniphier_spi) = { .of_match = uniphier_spi_ids, .ops = &uniphier_spi_ops, .ofdata_to_platdata = uniphier_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct uniphier_spi_platdata), - .priv_auto_alloc_size = sizeof(struct uniphier_spi_priv), + .platdata_auto = sizeof(struct uniphier_spi_platdata), + .priv_auto = sizeof(struct uniphier_spi_priv), .probe = uniphier_spi_probe, }; diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 5b630073401..6c956850c51 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -364,6 +364,6 @@ U_BOOT_DRIVER(xilinx_spi) = { .id = UCLASS_SPI, .of_match = xilinx_spi_ids, .ops = &xilinx_spi_ops, - .priv_auto_alloc_size = sizeof(struct xilinx_spi_priv), + .priv_auto = sizeof(struct xilinx_spi_priv), .probe = xilinx_spi_probe, }; diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index 7e2d4e088ee..81059d3aa27 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -667,7 +667,7 @@ U_BOOT_DRIVER(zynq_qspi) = { .of_match = zynq_qspi_ids, .ops = &zynq_qspi_ops, .ofdata_to_platdata = zynq_qspi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct zynq_qspi_platdata), - .priv_auto_alloc_size = sizeof(struct zynq_qspi_priv), + .platdata_auto = sizeof(struct zynq_qspi_platdata), + .priv_auto = sizeof(struct zynq_qspi_priv), .probe = zynq_qspi_probe, }; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index ad7cec86e44..5623d98bfbd 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -372,7 +372,7 @@ U_BOOT_DRIVER(zynq_spi) = { .of_match = zynq_spi_ids, .ops = &zynq_spi_ops, .ofdata_to_platdata = zynq_spi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct zynq_spi_platdata), - .priv_auto_alloc_size = sizeof(struct zynq_spi_priv), + .platdata_auto = sizeof(struct zynq_spi_platdata), + .priv_auto = sizeof(struct zynq_spi_priv), .probe = zynq_spi_probe, }; diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index e0e66870377..4585222507b 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -728,7 +728,7 @@ U_BOOT_DRIVER(zynqmp_qspi) = { .of_match = zynqmp_qspi_ids, .ops = &zynqmp_qspi_ops, .ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct zynqmp_qspi_platdata), - .priv_auto_alloc_size = sizeof(struct zynqmp_qspi_priv), + .platdata_auto = sizeof(struct zynqmp_qspi_platdata), + .priv_auto = sizeof(struct zynqmp_qspi_priv), .probe = zynqmp_qspi_probe, }; diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c index 2f430aed9cb..7f21443f6ae 100644 --- a/drivers/spmi/spmi-msm.c +++ b/drivers/spmi/spmi-msm.c @@ -194,5 +194,5 @@ U_BOOT_DRIVER(msm_spmi) = { .of_match = msm_spmi_ids, .ops = &msm_spmi_ops, .probe = msm_spmi_probe, - .priv_auto_alloc_size = sizeof(struct msm_spmi_priv), + .priv_auto = sizeof(struct msm_spmi_priv), }; diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c index 0da419c5052..f6772946bca 100644 --- a/drivers/spmi/spmi-sandbox.c +++ b/drivers/spmi/spmi-sandbox.c @@ -151,5 +151,5 @@ U_BOOT_DRIVER(msm_spmi) = { .of_match = sandbox_spmi_ids, .ops = &sandbox_spmi_ops, .probe = sandbox_spmi_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_spmi_priv), + .priv_auto = sizeof(struct sandbox_spmi_priv), }; diff --git a/drivers/sysinfo/gazerbeam.c b/drivers/sysinfo/gazerbeam.c index 9e7a4966554..c1fae6ccf2a 100644 --- a/drivers/sysinfo/gazerbeam.c +++ b/drivers/sysinfo/gazerbeam.c @@ -260,6 +260,6 @@ U_BOOT_DRIVER(sysinfo_gazerbeam) = { .id = UCLASS_SYSINFO, .of_match = sysinfo_gazerbeam_ids, .ops = &sysinfo_gazerbeam_ops, - .priv_auto_alloc_size = sizeof(struct sysinfo_gazerbeam_priv), + .priv_auto = sizeof(struct sysinfo_gazerbeam_priv), .probe = sysinfo_gazerbeam_probe, }; diff --git a/drivers/sysinfo/sandbox.c b/drivers/sysinfo/sandbox.c index 62a1cb4ac65..d270a26aa43 100644 --- a/drivers/sysinfo/sandbox.c +++ b/drivers/sysinfo/sandbox.c @@ -102,6 +102,6 @@ U_BOOT_DRIVER(sysinfo_sandbox) = { .id = UCLASS_SYSINFO, .of_match = sysinfo_sandbox_ids, .ops = &sysinfo_sandbox_ops, - .priv_auto_alloc_size = sizeof(struct sysinfo_sandbox_priv), + .priv_auto = sizeof(struct sysinfo_sandbox_priv), .probe = sysinfo_sandbox_probe, }; diff --git a/drivers/sysreset/poweroff_gpio.c b/drivers/sysreset/poweroff_gpio.c index ac482c37f48..a5c24fd85bc 100644 --- a/drivers/sysreset/poweroff_gpio.c +++ b/drivers/sysreset/poweroff_gpio.c @@ -87,6 +87,6 @@ U_BOOT_DRIVER(poweroff_gpio) = { .id = UCLASS_SYSRESET, .ops = &poweroff_gpio_ops, .probe = poweroff_gpio_probe, - .priv_auto_alloc_size = sizeof(struct poweroff_gpio_info), + .priv_auto = sizeof(struct poweroff_gpio_info), .of_match = poweroff_gpio_ids, }; diff --git a/drivers/sysreset/sysreset-ti-sci.c b/drivers/sysreset/sysreset-ti-sci.c index 7707c72bb5e..81bfd67ad99 100644 --- a/drivers/sysreset/sysreset-ti-sci.c +++ b/drivers/sysreset/sysreset-ti-sci.c @@ -70,6 +70,6 @@ U_BOOT_DRIVER(ti_sci_sysreset) = { .id = UCLASS_SYSRESET, .of_match = ti_sci_sysreset_of_match, .probe = ti_sci_sysreset_probe, - .priv_auto_alloc_size = sizeof(struct ti_sci_sysreset_data), + .priv_auto = sizeof(struct ti_sci_sysreset_data), .ops = &ti_sci_sysreset_ops, }; diff --git a/drivers/sysreset/sysreset_gpio.c b/drivers/sysreset/sysreset_gpio.c index d7280eeda86..680b759eb3c 100644 --- a/drivers/sysreset/sysreset_gpio.c +++ b/drivers/sysreset/sysreset_gpio.c @@ -55,6 +55,6 @@ U_BOOT_DRIVER(gpio_reboot) = { .name = "gpio_restart", .of_match = led_gpio_ids, .ops = &gpio_reboot_ops, - .priv_auto_alloc_size = sizeof(struct gpio_reboot_priv), + .priv_auto = sizeof(struct gpio_reboot_priv), .probe = gpio_reboot_probe, }; diff --git a/drivers/sysreset/sysreset_octeon.c b/drivers/sysreset/sysreset_octeon.c index a05dac3226e..ebdea6ab66e 100644 --- a/drivers/sysreset/sysreset_octeon.c +++ b/drivers/sysreset/sysreset_octeon.c @@ -45,7 +45,7 @@ static const struct udevice_id octeon_sysreset_ids[] = { U_BOOT_DRIVER(sysreset_octeon) = { .id = UCLASS_SYSRESET, .name = "octeon_sysreset", - .priv_auto_alloc_size = sizeof(struct octeon_sysreset_data), + .priv_auto = sizeof(struct octeon_sysreset_data), .ops = &octeon_sysreset, .probe = octeon_sysreset_probe, .of_match = octeon_sysreset_ids, diff --git a/drivers/sysreset/sysreset_resetctl.c b/drivers/sysreset/sysreset_resetctl.c index b8203ba6059..c039521eb43 100644 --- a/drivers/sysreset/sysreset_resetctl.c +++ b/drivers/sysreset/sysreset_resetctl.c @@ -43,6 +43,6 @@ U_BOOT_DRIVER(resetctl_reboot) = { .name = "resetctl_reboot", .of_match = resetctl_reboot_ids, .ops = &resetctl_reboot_ops, - .priv_auto_alloc_size = sizeof(struct resetctl_reboot_priv), + .priv_auto = sizeof(struct resetctl_reboot_priv), .probe = resetctl_reboot_probe, }; diff --git a/drivers/sysreset/sysreset_socfpga.c b/drivers/sysreset/sysreset_socfpga.c index 67cec6563a2..e38296ac3f3 100644 --- a/drivers/sysreset/sysreset_socfpga.c +++ b/drivers/sysreset/sysreset_socfpga.c @@ -51,7 +51,7 @@ static struct sysreset_ops socfpga_sysreset = { U_BOOT_DRIVER(sysreset_socfpga) = { .id = UCLASS_SYSRESET, .name = "socfpga_sysreset", - .priv_auto_alloc_size = sizeof(struct socfpga_sysreset_data), + .priv_auto = sizeof(struct socfpga_sysreset_data), .ops = &socfpga_sysreset, .probe = socfpga_sysreset_probe, }; diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c index 3482d2a0787..2e9b713368a 100644 --- a/drivers/sysreset/sysreset_sti.c +++ b/drivers/sysreset/sysreset_sti.c @@ -79,5 +79,5 @@ U_BOOT_DRIVER(sysreset_sti) = { .ops = &sti_sysreset, .probe = sti_sysreset_probe, .of_match = sti_sysreset_ids, - .priv_auto_alloc_size = sizeof(struct sti_sysreset_priv), + .priv_auto = sizeof(struct sti_sysreset_priv), }; diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c index 1c474866145..28fdfb09781 100644 --- a/drivers/sysreset/sysreset_syscon.c +++ b/drivers/sysreset/sysreset_syscon.c @@ -87,6 +87,6 @@ U_BOOT_DRIVER(syscon_reboot) = { .id = UCLASS_SYSRESET, .of_match = syscon_reboot_ids, .probe = syscon_reboot_probe, - .priv_auto_alloc_size = sizeof(struct syscon_reboot_priv), + .priv_auto = sizeof(struct syscon_reboot_priv), .ops = &syscon_reboot_ops, }; diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c index d500d413261..0dc2d8b9b65 100644 --- a/drivers/sysreset/sysreset_watchdog.c +++ b/drivers/sysreset/sysreset_watchdog.c @@ -54,6 +54,6 @@ U_BOOT_DRIVER(wdt_reboot) = { .id = UCLASS_SYSRESET, .of_match = wdt_reboot_ids, .ops = &wdt_reboot_ops, - .priv_auto_alloc_size = sizeof(struct wdt_reboot_priv), + .priv_auto = sizeof(struct wdt_reboot_priv), .probe = wdt_reboot_probe, }; diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 7682ffbd294..5c3dd35cfb2 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -154,5 +154,5 @@ U_BOOT_DRIVER(x86_reset) = { .of_match = x86_sysreset_ids, .ops = &x86_sysreset_ops, .probe = x86_sysreset_probe, - .platdata_auto_alloc_size = sizeof(struct x86_sysreset_platdata), + .platdata_auto = sizeof(struct x86_sysreset_platdata), }; diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 66ade37cd40..142bf17668a 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -661,6 +661,6 @@ U_BOOT_DRIVER(optee) = { .ofdata_to_platdata = optee_ofdata_to_platdata, .probe = optee_probe, .ops = &optee_ops, - .platdata_auto_alloc_size = sizeof(struct optee_pdata), - .priv_auto_alloc_size = sizeof(struct optee_private), + .platdata_auto = sizeof(struct optee_pdata), + .priv_auto = sizeof(struct optee_private), }; diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c index 4b91e7db1bc..e1ba027fd6e 100644 --- a/drivers/tee/sandbox.c +++ b/drivers/tee/sandbox.c @@ -385,7 +385,7 @@ U_BOOT_DRIVER(sandbox_tee) = { .id = UCLASS_TEE, .of_match = sandbox_tee_match, .ops = &sandbox_tee_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_tee_state), + .priv_auto = sizeof(struct sandbox_tee_state), .probe = sandbox_tee_probe, .remove = sandbox_tee_remove, }; diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c index 112e2168834..2cc6b6c407d 100644 --- a/drivers/tee/tee-uclass.c +++ b/drivers/tee/tee-uclass.c @@ -205,7 +205,7 @@ static int tee_pre_remove(struct udevice *dev) UCLASS_DRIVER(tee) = { .id = UCLASS_TEE, .name = "tee", - .per_device_auto_alloc_size = sizeof(struct tee_uclass_priv), + .per_device_auto = sizeof(struct tee_uclass_priv), .pre_probe = tee_pre_probe, .pre_remove = tee_pre_remove, }; diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c index 83ec753802a..d76a3e01ecb 100644 --- a/drivers/thermal/imx_scu_thermal.c +++ b/drivers/thermal/imx_scu_thermal.c @@ -211,6 +211,6 @@ U_BOOT_DRIVER(imx_sc_thermal) = { .bind = imx_sc_thermal_bind, .probe = imx_sc_thermal_probe, .ofdata_to_platdata = imx_sc_thermal_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct imx_sc_thermal_plat), + .platdata_auto = sizeof(struct imx_sc_thermal_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 101bd5ef2d7..8898268a574 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -274,6 +274,6 @@ U_BOOT_DRIVER(imx_thermal) = { .id = UCLASS_THERMAL, .ops = &imx_thermal_ops, .probe = imx_thermal_probe, - .priv_auto_alloc_size = sizeof(struct thermal_data), + .priv_auto = sizeof(struct thermal_data), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c index 936068c6cba..4c8371771c9 100644 --- a/drivers/thermal/imx_tmu.c +++ b/drivers/thermal/imx_tmu.c @@ -463,6 +463,6 @@ U_BOOT_DRIVER(imx_tmu) = { .of_match = imx_tmu_ids, .bind = imx_tmu_bind, .probe = imx_tmu_probe, - .platdata_auto_alloc_size = sizeof(struct imx_tmu_plat), + .platdata_auto = sizeof(struct imx_tmu_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/thermal/ti-bandgap.c b/drivers/thermal/ti-bandgap.c index 8b332f116c3..0b533d4c420 100644 --- a/drivers/thermal/ti-bandgap.c +++ b/drivers/thermal/ti-bandgap.c @@ -194,5 +194,5 @@ U_BOOT_DRIVER(ti_bandgap_thermal) = { .ops = &ti_thermal_ops, .probe = ti_bandgap_probe, .of_match = of_ti_bandgap_match, - .priv_auto_alloc_size = sizeof(struct ti_bandgap), + .priv_auto = sizeof(struct ti_bandgap), }; diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c index 23ad5b2b67a..f014ed65795 100644 --- a/drivers/timer/ag101p_timer.c +++ b/drivers/timer/ag101p_timer.c @@ -111,7 +111,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = ag101p_timer_ids, .ofdata_to_platdata = atftme_timer_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct atftmr_timer_platdata), + .platdata_auto = sizeof(struct atftmr_timer_platdata), .probe = atftmr_timer_probe, .ops = &ag101p_timer_ops, }; diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index ccc164ee176..ad50380f04d 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -88,7 +88,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = altera_timer_ids, .ofdata_to_platdata = altera_timer_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct altera_timer_platdata), + .platdata_auto = sizeof(struct altera_timer_platdata), .probe = altera_timer_probe, .ops = &altera_timer_ops, }; diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c index 2dea9f40cba..904950457c7 100644 --- a/drivers/timer/arc_timer.c +++ b/drivers/timer/arc_timer.c @@ -105,5 +105,5 @@ U_BOOT_DRIVER(arc_timer) = { .of_match = arc_timer_ids, .probe = arc_timer_probe, .ops = &arc_timer_ops, - .priv_auto_alloc_size = sizeof(struct arc_timer_priv), + .priv_auto = sizeof(struct arc_timer_priv), }; diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c index 35369a4087f..9ad446054ec 100644 --- a/drivers/timer/ast_timer.c +++ b/drivers/timer/ast_timer.c @@ -86,7 +86,7 @@ U_BOOT_DRIVER(ast_timer) = { .id = UCLASS_TIMER, .of_match = ast_timer_ids, .probe = ast_timer_probe, - .priv_auto_alloc_size = sizeof(struct ast_timer_priv), + .priv_auto = sizeof(struct ast_timer_priv), .ofdata_to_platdata = ast_timer_ofdata_to_platdata, .ops = &ast_timer_ops, }; diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c index fcb8a453581..e574eabebc0 100644 --- a/drivers/timer/atcpit100_timer.c +++ b/drivers/timer/atcpit100_timer.c @@ -106,7 +106,7 @@ U_BOOT_DRIVER(atcpit100_timer) = { .id = UCLASS_TIMER, .of_match = atcpit_timer_ids, .ofdata_to_platdata = atcpit_timer_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct atcpit_timer_platdata), + .platdata_auto = sizeof(struct atcpit_timer_platdata), .probe = atcpit_timer_probe, .ops = &atcpit_timer_ops, }; diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index 9f0ad1d703f..a0daf49dad2 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -81,7 +81,7 @@ U_BOOT_DRIVER(atmel_pit) = { .id = UCLASS_TIMER, .of_match = atmel_pit_ids, .ofdata_to_platdata = atmel_pit_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct atmel_pit_platdata), + .platdata_auto = sizeof(struct atmel_pit_platdata), .probe = atmel_pit_probe, .ops = &atmel_pit_ops, }; diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c index bebb2c2e904..7107bf2472a 100644 --- a/drivers/timer/cadence-ttc.c +++ b/drivers/timer/cadence-ttc.c @@ -110,7 +110,7 @@ U_BOOT_DRIVER(cadence_ttc) = { .id = UCLASS_TIMER, .of_match = cadence_ttc_ids, .ofdata_to_platdata = cadence_ttc_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct cadence_ttc_priv), + .priv_auto = sizeof(struct cadence_ttc_priv), .probe = cadence_ttc_probe, .ops = &cadence_ttc_ops, }; diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c index 68bc258131b..8ef36d4c2b6 100644 --- a/drivers/timer/dw-apb-timer.c +++ b/drivers/timer/dw-apb-timer.c @@ -99,5 +99,5 @@ U_BOOT_DRIVER(dw_apb_timer) = { .of_match = dw_apb_timer_ids, .ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata, .remove = dw_apb_timer_remove, - .priv_auto_alloc_size = sizeof(struct dw_apb_timer_priv), + .priv_auto = sizeof(struct dw_apb_timer_priv), }; diff --git a/drivers/timer/mchp-pit64b-timer.c b/drivers/timer/mchp-pit64b-timer.c index ad962098b3d..c9806d7eeeb 100644 --- a/drivers/timer/mchp-pit64b-timer.c +++ b/drivers/timer/mchp-pit64b-timer.c @@ -100,7 +100,7 @@ U_BOOT_DRIVER(mchp_pit64b) = { .name = "mchp-pit64b", .id = UCLASS_TIMER, .of_match = mchp_pit64b_ids, - .priv_auto_alloc_size = sizeof(struct mchp_pit64b_priv), + .priv_auto = sizeof(struct mchp_pit64b_priv), .probe = mchp_pit64b_probe, .ops = &mchp_pit64b_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 6139252a73c..9b1daaadebf 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -244,5 +244,5 @@ U_BOOT_DRIVER(mpc83xx_timer) = { .of_match = mpc83xx_timer_ids, .probe = mpc83xx_timer_probe, .ops = &mpc83xx_timer_ops, - .priv_auto_alloc_size = sizeof(struct mpc83xx_timer_priv), + .priv_auto = sizeof(struct mpc83xx_timer_priv), }; diff --git a/drivers/timer/mtk_timer.c b/drivers/timer/mtk_timer.c index 74e9ea34ffa..448a76a7e1f 100644 --- a/drivers/timer/mtk_timer.c +++ b/drivers/timer/mtk_timer.c @@ -78,7 +78,7 @@ U_BOOT_DRIVER(mtk_timer) = { .name = "mtk_timer", .id = UCLASS_TIMER, .of_match = mtk_timer_ids, - .priv_auto_alloc_size = sizeof(struct mtk_timer_priv), + .priv_auto = sizeof(struct mtk_timer_priv), .probe = mtk_timer_probe, .ops = &mtk_timer_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/timer/nomadik-mtu-timer.c b/drivers/timer/nomadik-mtu-timer.c index d7f7ca4effd..417b419d467 100644 --- a/drivers/timer/nomadik-mtu-timer.c +++ b/drivers/timer/nomadik-mtu-timer.c @@ -107,7 +107,7 @@ U_BOOT_DRIVER(nomadik_mtu) = { .name = "nomadik_mtu", .id = UCLASS_TIMER, .of_match = nomadik_mtu_ids, - .priv_auto_alloc_size = sizeof(struct nomadik_mtu_priv), + .priv_auto = sizeof(struct nomadik_mtu_priv), .probe = nomadik_mtu_probe, .ops = &nomadik_mtu_ops, }; diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c index 4eecb3e64d2..a1029ac5061 100644 --- a/drivers/timer/omap-timer.c +++ b/drivers/timer/omap-timer.c @@ -100,7 +100,7 @@ U_BOOT_DRIVER(omap_timer) = { .id = UCLASS_TIMER, .of_match = omap_timer_ids, .ofdata_to_platdata = omap_timer_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct omap_timer_priv), + .priv_auto = sizeof(struct omap_timer_priv), .probe = omap_timer_probe, .ops = &omap_timer_ops, }; diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c index bb0636a0719..261cac5de38 100644 --- a/drivers/timer/ostm_timer.c +++ b/drivers/timer/ostm_timer.c @@ -88,5 +88,5 @@ U_BOOT_DRIVER(ostm_timer) = { .probe = ostm_probe, .of_match = ostm_ids, .ofdata_to_platdata = ostm_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct ostm_priv), + .priv_auto = sizeof(struct ostm_priv), }; diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c index 53cdf09810d..dab6b12782e 100644 --- a/drivers/timer/rockchip_timer.c +++ b/drivers/timer/rockchip_timer.c @@ -165,9 +165,9 @@ U_BOOT_DRIVER(rockchip_rk3368_timer) = { .of_match = rockchip_timer_ids, .probe = rockchip_timer_probe, .ops = &rockchip_timer_ops, - .priv_auto_alloc_size = sizeof(struct rockchip_timer_priv), + .priv_auto = sizeof(struct rockchip_timer_priv), #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto_alloc_size = sizeof(struct rockchip_timer_plat), + .platdata_auto = sizeof(struct rockchip_timer_plat), #endif .ofdata_to_platdata = rockchip_clk_ofdata_to_platdata, }; diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c index e6843ebb337..1ab183c143c 100644 --- a/drivers/timer/sti-timer.c +++ b/drivers/timer/sti-timer.c @@ -79,7 +79,7 @@ U_BOOT_DRIVER(sti_timer) = { .name = "sti_timer", .id = UCLASS_TIMER, .of_match = sti_timer_ids, - .priv_auto_alloc_size = sizeof(struct sti_timer_priv), + .priv_auto = sizeof(struct sti_timer_priv), .probe = sti_timer_probe, .ops = &sti_timer_ops, }; diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c index f517d5e61f2..1b47e90f8c9 100644 --- a/drivers/timer/stm32_timer.c +++ b/drivers/timer/stm32_timer.c @@ -129,7 +129,7 @@ U_BOOT_DRIVER(stm32_timer) = { .name = "stm32_timer", .id = UCLASS_TIMER, .of_match = stm32_timer_ids, - .priv_auto_alloc_size = sizeof(struct stm32_timer_priv), + .priv_auto = sizeof(struct stm32_timer_priv), .probe = stm32_timer_probe, .ops = &stm32_timer_ops, }; diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 62d0e860e80..f25f5613d4c 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -176,5 +176,5 @@ UCLASS_DRIVER(timer) = { .pre_probe = timer_pre_probe, .flags = DM_UC_FLAG_SEQ_ALIAS, .post_probe = timer_post_probe, - .per_device_auto_alloc_size = sizeof(struct timer_dev_priv), + .per_device_auto = sizeof(struct timer_dev_priv), }; diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c index a761e3d52f1..1dfc5c54f39 100644 --- a/drivers/tpm/cr50_i2c.c +++ b/drivers/tpm/cr50_i2c.c @@ -728,7 +728,7 @@ U_BOOT_DRIVER(cr50_i2c) = { .ofdata_to_platdata = cr50_i2c_ofdata_to_platdata, .probe = cr50_i2c_probe, .remove = cr50_i2c_cleanup, - .priv_auto_alloc_size = sizeof(struct cr50_priv), + .priv_auto = sizeof(struct cr50_priv), ACPI_OPS_PTR(&cr50_acpi_ops) .flags = DM_FLAG_OS_PREPARE, }; diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c index 6ea795bc0c9..beb0fa3f93c 100644 --- a/drivers/tpm/tpm-uclass.c +++ b/drivers/tpm/tpm-uclass.c @@ -141,5 +141,5 @@ UCLASS_DRIVER(tpm) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .post_bind = dm_scan_fdt_dev, #endif - .per_device_auto_alloc_size = sizeof(struct tpm_chip_priv), + .per_device_auto = sizeof(struct tpm_chip_priv), }; diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c index 3197e0ebcd3..53e59f42b4f 100644 --- a/drivers/tpm/tpm2_ftpm_tee.c +++ b/drivers/tpm/tpm2_ftpm_tee.c @@ -247,5 +247,5 @@ U_BOOT_DRIVER(ftpm_tee) = { .probe = ftpm_tee_probe, .remove = ftpm_tee_remove, .flags = DM_FLAG_OS_PREPARE, - .priv_auto_alloc_size = sizeof(struct ftpm_tee_private), + .priv_auto = sizeof(struct ftpm_tee_private), }; diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c index 41a15bd49fb..c74bacfd719 100644 --- a/drivers/tpm/tpm2_tis_sandbox.c +++ b/drivers/tpm/tpm2_tis_sandbox.c @@ -625,5 +625,5 @@ U_BOOT_DRIVER(sandbox_tpm2) = { .of_match = sandbox_tpm2_ids, .ops = &sandbox_tpm2_ops, .probe = sandbox_tpm2_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_tpm2), + .priv_auto = sizeof(struct sandbox_tpm2), }; diff --git a/drivers/tpm/tpm2_tis_spi.c b/drivers/tpm/tpm2_tis_spi.c index 0045bedf0c6..4b33ac8fd3d 100644 --- a/drivers/tpm/tpm2_tis_spi.c +++ b/drivers/tpm/tpm2_tis_spi.c @@ -686,5 +686,5 @@ U_BOOT_DRIVER(tpm_tis_spi) = { .ops = &tpm_tis_spi_ops, .probe = tpm_tis_spi_probe, .remove = tpm_tis_spi_remove, - .priv_auto_alloc_size = sizeof(struct tpm_chip), + .priv_auto = sizeof(struct tpm_chip), }; diff --git a/drivers/tpm/tpm_tis_infineon.c b/drivers/tpm/tpm_tis_infineon.c index f47813e76d0..f414e5657db 100644 --- a/drivers/tpm/tpm_tis_infineon.c +++ b/drivers/tpm/tpm_tis_infineon.c @@ -633,5 +633,5 @@ U_BOOT_DRIVER(tpm_tis_i2c) = { .of_match = tpm_tis_i2c_ids, .ops = &tpm_tis_i2c_ops, .probe = tpm_tis_i2c_probe, - .priv_auto_alloc_size = sizeof(struct tpm_chip), + .priv_auto = sizeof(struct tpm_chip), }; diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c index 2dd374cf77d..003c0d8816d 100644 --- a/drivers/tpm/tpm_tis_lpc.c +++ b/drivers/tpm/tpm_tis_lpc.c @@ -475,5 +475,5 @@ U_BOOT_DRIVER(tpm_tis_lpc) = { .of_match = tpm_tis_lpc_ids, .ops = &tpm_tis_lpc_ops, .probe = tpm_tis_lpc_probe, - .priv_auto_alloc_size = sizeof(struct tpm_tis_lpc_priv), + .priv_auto = sizeof(struct tpm_tis_lpc_priv), }; diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c index e167d0a2fe3..67139cea3be 100644 --- a/drivers/tpm/tpm_tis_sandbox.c +++ b/drivers/tpm/tpm_tis_sandbox.c @@ -361,5 +361,5 @@ U_BOOT_DRIVER(google_sandbox_tpm) = { .of_match = sandbox_tpm_ids, .ops = &sandbox_tpm_ops, .probe = sandbox_tpm_probe, - .priv_auto_alloc_size = sizeof(struct tpm_state), + .priv_auto = sizeof(struct tpm_state), }; diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c index a253ee15027..e0eeabb9337 100644 --- a/drivers/tpm/tpm_tis_st33zp24_i2c.c +++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c @@ -542,5 +542,5 @@ U_BOOT_DRIVER(st33zp24_i2c) = { .probe = st33zp24_i2c_probe, .remove = st33zp24_i2c_remove, .ops = &st33zp24_i2c_tpm_ops, - .priv_auto_alloc_size = sizeof(struct tpm_chip), + .priv_auto = sizeof(struct tpm_chip), }; diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c index ef54e3b7b29..683d49689a3 100644 --- a/drivers/tpm/tpm_tis_st33zp24_spi.c +++ b/drivers/tpm/tpm_tis_st33zp24_spi.c @@ -670,6 +670,6 @@ U_BOOT_DRIVER(st33zp24_spi_spi) = { .probe = st33zp24_spi_probe, .remove = st33zp24_spi_remove, .ops = &st33zp24_spi_tpm_ops, - .priv_auto_alloc_size = sizeof(struct tpm_chip), - .platdata_auto_alloc_size = sizeof(struct st33zp24_spi_phy), + .priv_auto = sizeof(struct tpm_chip), + .platdata_auto = sizeof(struct st33zp24_spi_phy), }; diff --git a/drivers/ufs/ufs-uclass.c b/drivers/ufs/ufs-uclass.c index 920bfa64e19..034d14fd8da 100644 --- a/drivers/ufs/ufs-uclass.c +++ b/drivers/ufs/ufs-uclass.c @@ -12,5 +12,5 @@ UCLASS_DRIVER(ufs) = { .id = UCLASS_UFS, .name = "ufs", - .per_device_auto_alloc_size = sizeof(struct ufs_hba), + .per_device_auto = sizeof(struct ufs_hba), }; diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index cd7b2113ace..d156164761a 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -190,6 +190,6 @@ U_BOOT_DRIVER(cdns_ti) = { .bind = cdns3_bind, .probe = cdns_ti_probe, .remove = cdns_ti_remove, - .platdata_auto_alloc_size = sizeof(struct cdns_ti), + .platdata_auto = sizeof(struct cdns_ti), .flags = DM_FLAG_OS_PREPARE, }; diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c index ea86a250608..e861c82f7e1 100644 --- a/drivers/usb/cdns3/core.c +++ b/drivers/usb/cdns3/core.c @@ -461,7 +461,7 @@ U_BOOT_DRIVER(cdns_usb3_peripheral) = { .of_match = cdns3_ids, .probe = cdns3_gadget_probe, .remove = cdns3_gadget_remove, - .priv_auto_alloc_size = sizeof(struct cdns3_gadget_priv), + .priv_auto = sizeof(struct cdns3_gadget_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif @@ -492,7 +492,7 @@ U_BOOT_DRIVER(cdns_usb3_host) = { .of_match = cdns3_ids, .probe = cdns3_host_probe, .remove = cdns3_host_remove, - .priv_auto_alloc_size = sizeof(struct cdns3_host_priv), + .priv_auto = sizeof(struct cdns3_host_priv), .ops = &xhci_usb_ops, .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index a936f71d2e5..fb09b3ab1ed 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -158,8 +158,8 @@ U_BOOT_DRIVER(dwc3_generic_peripheral) = { .ofdata_to_platdata = dwc3_generic_ofdata_to_platdata, .probe = dwc3_generic_peripheral_probe, .remove = dwc3_generic_peripheral_remove, - .priv_auto_alloc_size = sizeof(struct dwc3_generic_priv), - .platdata_auto_alloc_size = sizeof(struct dwc3_generic_plat), + .priv_auto = sizeof(struct dwc3_generic_priv), + .platdata_auto = sizeof(struct dwc3_generic_plat), }; #endif

@@ -200,8 +200,8 @@ U_BOOT_DRIVER(dwc3_generic_host) = { .ofdata_to_platdata = dwc3_generic_ofdata_to_platdata, .probe = dwc3_generic_host_probe, .remove = dwc3_generic_host_remove, - .priv_auto_alloc_size = sizeof(struct dwc3_generic_host_priv), - .platdata_auto_alloc_size = sizeof(struct dwc3_generic_plat), + .priv_auto = sizeof(struct dwc3_generic_host_priv), + .platdata_auto = sizeof(struct dwc3_generic_plat), .ops = &xhci_usb_ops, .flags = DM_FLAG_ALLOC_PRIV_DMA, }; @@ -459,6 +459,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .bind = dwc3_glue_bind, .probe = dwc3_glue_probe, .remove = dwc3_glue_remove, - .platdata_auto_alloc_size = sizeof(struct dwc3_glue_data), + .platdata_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 6567502cdd1..58d57ee7d1b 100644 --- a/drivers/usb/dwc3/dwc3-meson-g12a.c +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c @@ -469,6 +469,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .of_match = dwc3_meson_g12a_ids, .probe = dwc3_meson_g12a_probe, .remove = dwc3_meson_g12a_remove, - .platdata_auto_alloc_size = sizeof(struct dwc3_meson_g12a), + .platdata_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 92ee0866f7e..6e8c93a0fea 100644 --- a/drivers/usb/dwc3/dwc3-meson-gxl.c +++ b/drivers/usb/dwc3/dwc3-meson-gxl.c @@ -420,6 +420,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .of_match = dwc3_meson_gxl_ids, .probe = dwc3_meson_gxl_probe, .remove = dwc3_meson_gxl_remove, - .platdata_auto_alloc_size = sizeof(struct dwc3_meson_gxl), + .platdata_auto = sizeof(struct dwc3_meson_gxl),

}; diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 9c305f46e94..d63dee41fcd 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -421,6 +421,6 @@ U_BOOT_DRIVER(usb_sandbox_flash) = { .probe = sandbox_flash_probe, .ofdata_to_platdata = sandbox_flash_ofdata_to_platdata, .ops = &sandbox_usb_flash_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_flash_priv), - .platdata_auto_alloc_size = sizeof(struct sandbox_flash_plat), + .priv_auto = sizeof(struct sandbox_flash_priv), + .platdata_auto = sizeof(struct sandbox_flash_plat), }; diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index 21bf3bda48d..3e66ca46988 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -328,8 +328,8 @@ U_BOOT_DRIVER(usb_sandbox_hub) = { .of_match = sandbox_usb_hub_ids, .bind = sandbox_hub_bind, .ops = &sandbox_usb_hub_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_hub_priv), - .per_child_platdata_auto_alloc_size = + .priv_auto = sizeof(struct sandbox_hub_priv), + .per_child_platdata_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 f562fb7eca2..c64ce1feeb5 100644 --- a/drivers/usb/emul/sandbox_keyb.c +++ b/drivers/usb/emul/sandbox_keyb.c @@ -241,6 +241,6 @@ U_BOOT_DRIVER(usb_sandbox_keyb) = { .bind = sandbox_keyb_bind, .probe = sandbox_keyb_probe, .ops = &sandbox_usb_keyb_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_keyb_priv), - .platdata_auto_alloc_size = sizeof(struct sandbox_keyb_plat), + .priv_auto = sizeof(struct sandbox_keyb_priv), + .platdata_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 e3419e2fd47..b3069390429 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -298,7 +298,7 @@ UCLASS_DRIVER(usb_emul) = { .id = UCLASS_USB_EMUL, .name = "usb_emul", .post_bind = dm_scan_fdt_dev, - .per_device_platdata_auto_alloc_size = sizeof(struct usb_emul_platdata), - .per_child_auto_alloc_size = sizeof(struct usb_device), - .per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata), + .per_device_platdata_auto = sizeof(struct usb_emul_platdata), + .per_child_auto = sizeof(struct usb_device), + .per_child_platdata_auto = sizeof(struct usb_dev_platdata), }; diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index ac4a27fff20..7115dcb56fc 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -876,8 +876,8 @@ U_BOOT_DRIVER(asix_eth) = { .id = UCLASS_ETH, .probe = asix_eth_probe, .ops = &asix_eth_ops, - .priv_auto_alloc_size = sizeof(struct asix_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct asix_private), + .platdata_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 c142b8b19bf..ffc90c00ab3 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -902,8 +902,8 @@ U_BOOT_DRIVER(ax88179_eth) = { .id = UCLASS_ETH, .probe = ax88179_eth_probe, .ops = &ax88179_eth_ops, - .priv_auto_alloc_size = sizeof(struct asix_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct asix_private), + .platdata_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 46b92e8d68b..1fa7e534040 100644 --- a/drivers/usb/eth/lan75xx.c +++ b/drivers/usb/eth/lan75xx.c @@ -304,8 +304,8 @@ U_BOOT_DRIVER(lan75xx_eth) = { .probe = lan75xx_eth_probe, .remove = lan7x_eth_remove, .ops = &lan75xx_eth_ops, - .priv_auto_alloc_size = sizeof(struct lan7x_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct lan7x_private), + .platdata_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 e34ad2603fb..3f7e03f51c5 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -466,8 +466,8 @@ U_BOOT_DRIVER(lan78xx_eth) = { .probe = lan78xx_eth_probe, .remove = lan7x_eth_remove, .ops = &lan78xx_eth_ops, - .priv_auto_alloc_size = sizeof(struct lan7x_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct lan7x_private), + .platdata_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 c829a436a34..1746819192c 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -928,8 +928,8 @@ U_BOOT_DRIVER(mcs7830_eth) = { .id = UCLASS_ETH, .probe = mcs7830_eth_probe, .ops = &mcs7830_eth_ops, - .priv_auto_alloc_size = sizeof(struct mcs7830_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct mcs7830_private), + .platdata_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 215bcbbef80..804c331ee1b 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -1842,8 +1842,8 @@ U_BOOT_DRIVER(r8152_eth) = { .id = UCLASS_ETH, .probe = r8152_eth_probe, .ops = &r8152_eth_ops, - .priv_auto_alloc_size = sizeof(struct r8152), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct r8152), + .platdata_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 b293a808a3d..d6863ad89e4 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -1062,8 +1062,8 @@ U_BOOT_DRIVER(smsc95xx_eth) = { .id = UCLASS_ETH, .probe = smsc95xx_eth_probe, .ops = &smsc95xx_eth_ops, - .priv_auto_alloc_size = sizeof(struct smsc95xx_private), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct smsc95xx_private), + .platdata_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 8a8e2179e48..a662d500d39 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -1189,8 +1189,8 @@ U_BOOT_DRIVER(dwc2_udc_otg) = { .ofdata_to_platdata = dwc2_udc_otg_ofdata_to_platdata, .probe = dwc2_udc_otg_probe, .remove = dwc2_udc_otg_remove, - .platdata_auto_alloc_size = sizeof(struct dwc2_plat_otg_data), - .priv_auto_alloc_size = sizeof(struct dwc2_priv_data), + .platdata_auto = sizeof(struct dwc2_plat_otg_data), + .priv_auto = sizeof(struct dwc2_priv_data), };

int dwc2_udc_B_session_valid(struct udevice *dev) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index a8e8bfc04b4..0cce8e24c50 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -2691,8 +2691,8 @@ U_BOOT_DRIVER(eth_usb) = { .id = UCLASS_ETH, .probe = usb_eth_probe, .ops = &usb_eth_ops, - .priv_auto_alloc_size = sizeof(struct ether_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct ether_priv), + .platdata_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 156bb1ebebd..c651eeb5e59 100644 --- a/drivers/usb/gadget/max3420_udc.c +++ b/drivers/usb/gadget/max3420_udc.c @@ -871,5 +871,5 @@ U_BOOT_DRIVER(max3420_generic_udc) = { .of_match = max3420_ids, .probe = max3420_udc_probe, .remove = max3420_udc_remove, - .priv_auto_alloc_size = sizeof(struct max3420_udc), + .priv_auto = sizeof(struct max3420_udc), }; diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index f1d13b1c1df..40d389cbd6a 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -1477,7 +1477,7 @@ U_BOOT_DRIVER(usb_dwc2) = { .probe = dwc2_usb_probe, .remove = dwc2_usb_remove, .ops = &dwc2_usb_ops, - .priv_auto_alloc_size = sizeof(struct dwc2_priv), + .priv_auto = sizeof(struct dwc2_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c index e4abc6f3b9b..6240a453a08 100644 --- a/drivers/usb/host/dwc3-of-simple.c +++ b/drivers/usb/host/dwc3-of-simple.c @@ -102,6 +102,6 @@ U_BOOT_DRIVER(dwc3_of_simple) = { .of_match = dwc3_of_simple_ids, .probe = dwc3_of_simple_probe, .remove = dwc3_of_simple_remove, - .platdata_auto_alloc_size = sizeof(struct dwc3_of_simple), + .platdata_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 3e6c1429d66..ba008bf6866 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -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, - .platdata_auto_alloc_size = sizeof(struct sti_dwc3_glue_platdata), + .platdata_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 3b208e8eb22..955cacdd981 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -124,8 +124,8 @@ U_BOOT_DRIVER(ehci_atmel) = { .probe = ehci_atmel_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_atmel_priv), + .platdata_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 6a37c5d982a..3728b238d4e 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -258,7 +258,7 @@ U_BOOT_DRIVER(usb_ehci) = { .probe = ehci_usb_probe, .remove = ehci_usb_remove, .ops = &ehci_usb_ops, - .priv_auto_alloc_size = sizeof(struct exynos_ehci), - .platdata_auto_alloc_size = sizeof(struct exynos_ehci_platdata), + .priv_auto = sizeof(struct exynos_ehci), + .platdata_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 5423d10abe7..a53493a617d 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -145,8 +145,8 @@ U_BOOT_DRIVER(ehci_fsl) = { .probe = ehci_fsl_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_fsl_priv), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct ehci_fsl_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #else diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index c93a7051a79..4c28a69b989 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -221,6 +221,6 @@ U_BOOT_DRIVER(ehci_generic) = { .probe = ehci_usb_probe, .remove = ehci_usb_remove, .ops = &ehci_usb_ops, - .priv_auto_alloc_size = sizeof(struct generic_ehci), + .priv_auto = sizeof(struct generic_ehci), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 62414bb1102..329593689f4 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -152,8 +152,8 @@ U_BOOT_DRIVER(ehci_mvebu) = { .probe = ehci_mvebu_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_mvebu_priv), + .platdata_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 dd92808ff7b..61ff13e2b8e 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -144,7 +144,7 @@ U_BOOT_DRIVER(usb_ehci) = { .probe = ehci_usb_probe, .remove = ehci_usb_remove, .ops = &ehci_usb_ops, - .priv_auto_alloc_size = sizeof(struct msm_ehci_priv), - .platdata_auto_alloc_size = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct msm_ehci_priv), + .platdata_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 51377487d4b..b1c2e7d3354 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -367,8 +367,8 @@ U_BOOT_DRIVER(usb_mx5) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_mx5_priv_data), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct ehci_mx5_priv_data), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif /* !CONFIG_IS_ENABLED(DM_USB) */ diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index d7a6ee6d0e6..5bc1cf09f53 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -656,8 +656,8 @@ U_BOOT_DRIVER(usb_mx6) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_mx6_priv_data), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct ehci_mx6_priv_data), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index a2c0caf1bcc..1ed640605e3 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -403,8 +403,8 @@ U_BOOT_DRIVER(usb_omap_ehci) = { .of_match = omap_ehci_dt_ids, .probe = omap_ehci_probe, .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_omap_priv_data), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct ehci_omap_priv_data), .remove = ehci_deregister, .ops = &ehci_usb_ops, .flags = DM_FLAG_ALLOC_PRIV_DMA, diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 7dd5c33c13d..7d91846d079 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -163,8 +163,8 @@ U_BOOT_DRIVER(ehci_pci) = { .remove = ehci_pci_remove, .of_match = ehci_pci_ids, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_pci_priv), + .platdata_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 d81f4a03f14..9ffaf0060ab 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -865,7 +865,7 @@ U_BOOT_DRIVER(usb_ehci) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct fdt_usb), + .platdata_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 dd82669b284..12bba263b95 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -353,8 +353,8 @@ U_BOOT_DRIVER(usb_ehci) = { .remove = ehci_deregister, .ops = &ehci_usb_ops, .ofdata_to_platdata = vf_usb_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct ehci_vf_priv_data), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct ehci_vf_priv_data), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c index 80f1d6fd97c..738eed3bfea 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -85,7 +85,7 @@ U_BOOT_DRIVER(ehci_zynq) = { .probe = ehci_zynq_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct zynq_ehci_priv), + .platdata_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-da8xx.c b/drivers/usb/host/ohci-da8xx.c index aa1eba262a9..33c4a911a09 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -174,7 +174,7 @@ U_BOOT_DRIVER(ohci_generic) = { .probe = ohci_da8xx_probe, .remove = ohci_da8xx_remove, .ops = &ohci_usb_ops, - .priv_auto_alloc_size = sizeof(struct da8xx_ohci), + .priv_auto = sizeof(struct da8xx_ohci), .flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_OS_PREPARE, }; #endif diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index ac9b7e1e3c0..163f0ef17b1 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -198,6 +198,6 @@ U_BOOT_DRIVER(ohci_generic) = { .probe = ohci_usb_probe, .remove = ohci_usb_remove, .ops = &ohci_usb_ops, - .priv_auto_alloc_size = sizeof(struct generic_ohci), + .priv_auto = sizeof(struct generic_ohci), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 4c1c7786728..48ffa4af5ed 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -39,8 +39,8 @@ U_BOOT_DRIVER(ohci_pci) = { .remove = ohci_pci_remove, .of_match = ohci_pci_ids, .ops = &ohci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(ohci_t), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(ohci_t), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 37aa2c55f24..7620ac2da79 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -894,6 +894,6 @@ U_BOOT_DRIVER(usb_r8a66597) = { .probe = r8a66597_usb_probe, .remove = r8a66597_usb_remove, .ops = &r8a66597_usb_ops, - .priv_auto_alloc_size = sizeof(struct r8a66597), + .priv_auto = sizeof(struct r8a66597), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c index cc357d9ef40..d7cc92aa544 100644 --- a/drivers/usb/host/usb-sandbox.c +++ b/drivers/usb/host/usb-sandbox.c @@ -155,5 +155,5 @@ U_BOOT_DRIVER(usb_sandbox) = { .of_match = sandbox_usb_ids, .probe = sandbox_usb_probe, .ops = &sandbox_usb_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_usb_ctrl), + .priv_auto = sizeof(struct sandbox_usb_ctrl), }; diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index de8a244625e..831f4935320 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -849,12 +849,12 @@ UCLASS_DRIVER(usb) = { .name = "usb", .flags = DM_UC_FLAG_SEQ_ALIAS, .post_bind = dm_scan_fdt_dev, - .priv_auto_alloc_size = sizeof(struct usb_uclass_priv), - .per_child_auto_alloc_size = sizeof(struct usb_device), - .per_device_auto_alloc_size = sizeof(struct usb_bus_priv), + .priv_auto = sizeof(struct usb_uclass_priv), + .per_child_auto = sizeof(struct usb_device), + .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_alloc_size = sizeof(struct usb_dev_platdata), + .per_child_platdata_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 ee65f51c5d2..f50f069fc74 100644 --- a/drivers/usb/host/xhci-brcm.c +++ b/drivers/usb/host/xhci-brcm.c @@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = { .remove = xhci_brcm_deregister, .ops = &xhci_usb_ops, .of_match = xhci_brcm_ids, - .platdata_auto_alloc_size = sizeof(struct brcm_xhci_platdata), - .priv_auto_alloc_size = sizeof(struct xhci_ctrl), + .platdata_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 045de2ffdec..4dba5699377 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -186,8 +186,8 @@ U_BOOT_DRIVER(xhci_dwc3) = { .probe = xhci_dwc3_probe, .remove = xhci_dwc3_remove, .ops = &xhci_usb_ops, - .priv_auto_alloc_size = sizeof(struct xhci_ctrl), - .platdata_auto_alloc_size = sizeof(struct xhci_dwc3_platdata), + .priv_auto = sizeof(struct xhci_ctrl), + .platdata_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 6fb7a7f6e09..6e1b5f005f0 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -255,7 +255,7 @@ U_BOOT_DRIVER(usb_xhci) = { .probe = xhci_usb_probe, .remove = xhci_usb_remove, .ops = &xhci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct exynos_xhci_platdata), - .priv_auto_alloc_size = sizeof(struct exynos_xhci), + .platdata_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 0a2da70e200..95714d83386 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -169,8 +169,8 @@ U_BOOT_DRIVER(xhci_fsl) = { .probe = xhci_fsl_probe, .remove = xhci_fsl_remove, .ops = &xhci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct xhci_fsl_priv), + .platdata_auto = sizeof(struct usb_platdata), + .priv_auto = sizeof(struct xhci_fsl_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #else diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index f62e232d218..d301acc9a89 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -300,6 +300,6 @@ U_BOOT_DRIVER(usb_xhci) = { .remove = xhci_mtk_remove, .ops = &xhci_usb_ops, .bind = dm_scan_fdt_dev, - .priv_auto_alloc_size = sizeof(struct mtk_xhci), + .priv_auto = sizeof(struct mtk_xhci), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index f2e338f6fbc..6f56cc8384b 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -96,7 +96,7 @@ U_BOOT_DRIVER(usb_xhci) = { .probe = xhci_usb_probe, .remove = xhci_deregister, .ops = &xhci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct mvebu_xhci_platdata), - .priv_auto_alloc_size = sizeof(struct mvebu_xhci), + .platdata_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 9fb6d2f7635..888b17ba4ce 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -59,8 +59,8 @@ U_BOOT_DRIVER(xhci_pci) = { .remove = xhci_deregister, .of_match = xhci_pci_ids, .ops = &xhci_usb_ops, - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct xhci_ctrl), + .platdata_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 5379dba5663..4322fb2e4d4 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -161,7 +161,7 @@ U_BOOT_DRIVER(usb_xhci) = { .ops = &xhci_usb_ops, .of_match = xhci_rcar_ids, .ofdata_to_platdata = xhci_rcar_ofdata_to_platdata, - .platdata_auto_alloc_size = sizeof(struct rcar_xhci_platdata), - .priv_auto_alloc_size = sizeof(struct rcar_xhci), + .platdata_auto = sizeof(struct rcar_xhci_platdata), + .priv_auto = sizeof(struct rcar_xhci), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c index 3795e695e87..c951107b201 100644 --- a/drivers/usb/mtu3/mtu3_plat.c +++ b/drivers/usb/mtu3/mtu3_plat.c @@ -257,7 +257,7 @@ U_BOOT_DRIVER(mtu3_peripheral) = { .of_match = ssusb_of_match, .probe = mtu3_gadget_probe, .remove = mtu3_gadget_remove, - .priv_auto_alloc_size = sizeof(struct mtu3), + .priv_auto = sizeof(struct mtu3), }; #endif

@@ -298,7 +298,7 @@ U_BOOT_DRIVER(mtu3_host) = { .of_match = ssusb_of_match, .probe = mtu3_host_probe, .remove = mtu3_host_remove, - .priv_auto_alloc_size = sizeof(struct mtu3_host), + .priv_auto = sizeof(struct mtu3_host), .ops = &xhci_usb_ops, .flags = DM_FLAG_ALLOC_PRIV_DMA, }; @@ -365,5 +365,5 @@ U_BOOT_DRIVER(mtu3) = { .bind = mtu3_glue_bind, .probe = mtu3_probe, .remove = mtu3_remove, - .priv_auto_alloc_size = sizeof(struct ssusb_mtk), + .priv_auto = sizeof(struct ssusb_mtk), }; diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c index 67488ddb504..6c0d0b8b165 100644 --- a/drivers/usb/musb-new/da8xx.c +++ b/drivers/usb/musb-new/da8xx.c @@ -348,6 +348,6 @@ U_BOOT_DRIVER(da8xx_musb) = { .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), + .platdata_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 8f0561eeba3..8adfa426c49 100644 --- a/drivers/usb/musb-new/mt85xx.c +++ b/drivers/usb/musb-new/mt85xx.c @@ -414,6 +414,6 @@ U_BOOT_DRIVER(mtk_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct mtk_musb_glue), + .platdata_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 da63cc2c224..2e029d84bc8 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -280,8 +280,8 @@ U_BOOT_DRIVER(omap2430_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .platdata_auto_alloc_size = sizeof(struct omap2430_musb_platdata), - .priv_auto_alloc_size = sizeof(struct musb_host_data), + .platdata_auto = sizeof(struct omap2430_musb_platdata), + .priv_auto = sizeof(struct musb_host_data), };

#endif /* CONFIG_IS_ENABLED(DM_USB) */ diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c index 2fbe9bebf17..e45ab20562c 100644 --- a/drivers/usb/musb-new/pic32.c +++ b/drivers/usb/musb-new/pic32.c @@ -288,6 +288,6 @@ U_BOOT_DRIVER(usb_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct pic32_musb_data), + .platdata_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 187db7794b6..10bc3e89560 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -552,6 +552,6 @@ U_BOOT_DRIVER(usb_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .platdata_auto_alloc_size = sizeof(struct usb_platdata), - .priv_auto_alloc_size = sizeof(struct sunxi_glue), + .platdata_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 f4f26d86b3f..34b1a34d2cc 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -204,8 +204,8 @@ U_BOOT_DRIVER(ti_musb_host) = { .probe = ti_musb_host_probe, .remove = ti_musb_host_remove, .ops = &musb_usb_ops, - .platdata_auto_alloc_size = sizeof(struct ti_musb_platdata), - .priv_auto_alloc_size = sizeof(struct musb_host_data), + .platdata_auto = sizeof(struct ti_musb_platdata), + .priv_auto = sizeof(struct musb_host_data), };

#if CONFIG_IS_ENABLED(DM_USB_GADGET) @@ -277,8 +277,8 @@ U_BOOT_DRIVER(ti_musb_peripheral) = { .probe = ti_musb_peripheral_probe, .remove = ti_musb_peripheral_remove, .ops = &musb_usb_ops, - .platdata_auto_alloc_size = sizeof(struct ti_musb_platdata), - .priv_auto_alloc_size = sizeof(struct ti_musb_peripheral), + .platdata_auto = sizeof(struct ti_musb_platdata), + .priv_auto = sizeof(struct ti_musb_peripheral), .flags = DM_FLAG_PRE_RELOC, }; #endif diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c index 2707ff59c7d..6620c793a1c 100644 --- a/drivers/video/am335x-fb.c +++ b/drivers/video/am335x-fb.c @@ -614,7 +614,7 @@ U_BOOT_DRIVER(am335x_fb) = { .ofdata_to_platdata = am335x_fb_ofdata_to_platdata, .probe = am335x_fb_probe, .remove = am335x_fb_remove, - .priv_auto_alloc_size = sizeof(struct am335x_fb_priv), + .priv_auto = sizeof(struct am335x_fb_priv), };

#endif /* CONFIG_DM_VIDEO */ diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 38def2816b2..3eb80c13946 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -562,7 +562,7 @@ U_BOOT_DRIVER(atmel_hlcdfb) = { .bind = atmel_hlcdc_bind, .probe = atmel_hlcdc_probe, .ofdata_to_platdata = atmel_hlcdc_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct atmel_hlcdc_priv), + .priv_auto = sizeof(struct atmel_hlcdc_priv), };

#endif diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index ae8ec26468f..b129309d34b 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -306,7 +306,7 @@ U_BOOT_DRIVER(atmel_fb) = { .bind = atmel_fb_lcd_bind, .ofdata_to_platdata = atmel_fb_ofdata_to_platdata, .probe = atmel_fb_lcd_probe, - .platdata_auto_alloc_size = sizeof(struct atmel_lcd_platdata), - .priv_auto_alloc_size = sizeof(struct atmel_fb_priv), + .platdata_auto = sizeof(struct atmel_lcd_platdata), + .priv_auto = sizeof(struct atmel_fb_priv), }; #endif diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c index 67fed7f224a..8e34022d836 100644 --- a/drivers/video/backlight_gpio.c +++ b/drivers/video/backlight_gpio.c @@ -68,5 +68,5 @@ U_BOOT_DRIVER(gpio_backlight) = { .ops = &gpio_backlight_ops, .ofdata_to_platdata = gpio_backlight_ofdata_to_platdata, .probe = gpio_backlight_probe, - .priv_auto_alloc_size = sizeof(struct gpio_backlight_priv), + .priv_auto = sizeof(struct gpio_backlight_priv), }; diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c index 1c5270ff05c..147cdcc6d58 100644 --- a/drivers/video/bridge/anx6345.c +++ b/drivers/video/bridge/anx6345.c @@ -421,5 +421,5 @@ U_BOOT_DRIVER(analogix_anx6345) = { .of_match = anx6345_ids, .probe = anx6345_probe, .ops = &anx6345_ops, - .priv_auto_alloc_size = sizeof(struct anx6345_priv), + .priv_auto = sizeof(struct anx6345_priv), }; diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c index 389b02cdcba..08d38b244bd 100644 --- a/drivers/video/bridge/video-bridge-uclass.c +++ b/drivers/video/bridge/video-bridge-uclass.c @@ -134,6 +134,6 @@ int video_bridge_set_active(struct udevice *dev, bool active) UCLASS_DRIVER(video_bridge) = { .id = UCLASS_VIDEO_BRIDGE, .name = "video_bridge", - .per_device_auto_alloc_size = sizeof(struct video_bridge_priv), + .per_device_auto = sizeof(struct video_bridge_priv), .pre_probe = video_bridge_pre_probe, }; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index df6a761d2db..bc91e7bda58 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -781,6 +781,6 @@ U_BOOT_DRIVER(broadwell_igd) = { .ofdata_to_platdata = broadwell_igd_ofdata_to_platdata, .bind = broadwell_igd_bind, .probe = broadwell_igd_probe, - .priv_auto_alloc_size = sizeof(struct broadwell_igd_priv), - .platdata_auto_alloc_size = sizeof(struct broadwell_igd_plat), + .priv_auto = sizeof(struct broadwell_igd_priv), + .platdata_auto = sizeof(struct broadwell_igd_plat), }; diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index 8205413d2ab..fa11b3bbefe 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -588,5 +588,5 @@ U_BOOT_DRIVER(vidconsole_truetype) = { .id = UCLASS_VIDEO_CONSOLE, .ops = &console_truetype_ops, .probe = console_truetype_probe, - .priv_auto_alloc_size = sizeof(struct console_tt_priv), + .priv_auto = sizeof(struct console_tt_priv), }; diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c index 1a29ce5d858..5d6f0c17310 100644 --- a/drivers/video/display-uclass.c +++ b/drivers/video/display-uclass.c @@ -79,5 +79,5 @@ bool display_in_use(struct udevice *dev) UCLASS_DRIVER(display) = { .id = UCLASS_DISPLAY, .name = "display", - .per_device_platdata_auto_alloc_size = sizeof(struct display_plat), + .per_device_platdata_auto = sizeof(struct display_plat), }; diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c index 4055ef49b6e..4dde6488144 100644 --- a/drivers/video/dw_mipi_dsi.c +++ b/drivers/video/dw_mipi_dsi.c @@ -845,7 +845,7 @@ U_BOOT_DRIVER(dw_mipi_dsi) = { .id = UCLASS_DSI_HOST, .probe = dw_mipi_dsi_probe, .ops = &dw_mipi_dsi_ops, - .priv_auto_alloc_size = sizeof(struct dw_mipi_dsi), + .priv_auto = sizeof(struct dw_mipi_dsi), };

MODULE_AUTHOR("Chris Zhong zyw@rock-chips.com"); diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c index 999ee1c14af..f18189a1de0 100644 --- a/drivers/video/exynos/exynos_dp.c +++ b/drivers/video/exynos/exynos_dp.c @@ -1081,5 +1081,5 @@ U_BOOT_DRIVER(exynos_dp) = { .of_match = exynos_dp_ids, .ops = &exynos_dp_ops, .ofdata_to_platdata = exynos_dp_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct exynos_dp_priv), + .priv_auto = sizeof(struct exynos_dp_priv), }; diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c index 979b9091827..7022eec4b7a 100644 --- a/drivers/video/exynos/exynos_fb.c +++ b/drivers/video/exynos/exynos_fb.c @@ -716,5 +716,5 @@ U_BOOT_DRIVER(exynos_fb) = { .bind = exynos_fb_bind, .probe = exynos_fb_probe, .ofdata_to_platdata = exynos_fb_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct exynos_fb_priv), + .priv_auto = sizeof(struct exynos_fb_priv), }; diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c index f02fd13d28c..73b8f4bd1c9 100644 --- a/drivers/video/ihs_video_out.c +++ b/drivers/video/ihs_video_out.c @@ -338,5 +338,5 @@ U_BOOT_DRIVER(ihs_video_out_drv) = { .ops = &ihs_video_out_ops, .of_match = ihs_video_out_ids, .probe = ihs_video_out_probe, - .priv_auto_alloc_size = sizeof(struct ihs_video_out_priv), + .priv_auto = sizeof(struct ihs_video_out_priv), }; diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index eb93a4f1fa9..dc8f2cfd800 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -671,6 +671,6 @@ U_BOOT_DRIVER(fsl_imx6q_ipu) = { .of_match = ipuv3_video_ids, .bind = ipuv3_video_bind, .probe = ipuv3_video_probe, - .priv_auto_alloc_size = sizeof(struct ipuv3_video_priv), + .priv_auto = sizeof(struct ipuv3_video_priv), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c index 45df9c13474..73a1add0853 100644 --- a/drivers/video/lg4573.c +++ b/drivers/video/lg4573.c @@ -327,5 +327,5 @@ U_BOOT_DRIVER(lg4573_lcd) = { .of_match = lg4573_ids, .bind = lg4573_bind, .probe = lg4573_probe, - .priv_auto_alloc_size = sizeof(struct lg4573_lcd_priv), + .priv_auto = sizeof(struct lg4573_lcd_priv), }; diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c index 9bc4bbb85d3..624084d38bc 100644 --- a/drivers/video/logicore_dp_tx.c +++ b/drivers/video/logicore_dp_tx.c @@ -2292,6 +2292,6 @@ U_BOOT_DRIVER(logicore_dp_tx) = { .id = UCLASS_DISPLAY, .of_match = logicore_dp_tx_ids, .probe = logicore_dp_tx_probe, - .priv_auto_alloc_size = sizeof(struct dp_tx), + .priv_auto = sizeof(struct dp_tx), .ops = &logicore_dp_tx_ops, }; diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c index 1e6da0e1e25..0ffdd7b98f3 100644 --- a/drivers/video/mali_dp.c +++ b/drivers/video/mali_dp.c @@ -403,6 +403,6 @@ U_BOOT_DRIVER(mali_dp) = { .of_match = malidp_ids, .bind = malidp_bind, .probe = malidp_probe, - .priv_auto_alloc_size = sizeof(struct malidp_priv), + .priv_auto = sizeof(struct malidp_priv), .ops = &malidp_ops, }; diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c index 5d74f7f1a74..e5f28132053 100644 --- a/drivers/video/meson/meson_dw_hdmi.c +++ b/drivers/video/meson/meson_dw_hdmi.c @@ -508,5 +508,5 @@ U_BOOT_DRIVER(meson_dw_hdmi) = { .of_match = meson_dw_hdmi_ids, .ops = &meson_dw_hdmi_ops, .probe = meson_dw_hdmi_probe, - .priv_auto_alloc_size = sizeof(struct meson_dw_hdmi), + .priv_auto = sizeof(struct meson_dw_hdmi), }; diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index 4868839ff7d..23b5ec6ef17 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -211,6 +211,6 @@ U_BOOT_DRIVER(meson_vpu) = { .of_match = meson_vpu_ids, .probe = meson_vpu_probe, .bind = meson_vpu_bind, - .priv_auto_alloc_size = sizeof(struct meson_vpu_priv), + .priv_auto = sizeof(struct meson_vpu_priv), .flags = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON, }; diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c index f3cb2bfb480..af97c711564 100644 --- a/drivers/video/mvebu_lcd.c +++ b/drivers/video/mvebu_lcd.c @@ -594,5 +594,5 @@ U_BOOT_DRIVER(mvebu_video) = { .of_match = mvebu_video_ids, .bind = mvebu_video_bind, .probe = mvebu_video_probe, - .priv_auto_alloc_size = sizeof(struct mvebu_video_priv), + .priv_auto = sizeof(struct mvebu_video_priv), }; diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index 4101e0962a9..d0b89433128 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -643,9 +643,9 @@ U_BOOT_DRIVER(nexell_display) = { .name = "nexell-display", .id = UCLASS_VIDEO, .of_match = nx_display_ids, - .platdata_auto_alloc_size = + .platdata_auto = sizeof(struct nx_display_platdata), .bind = nx_display_bind, .probe = nx_display_probe, - .priv_auto_alloc_size = sizeof(struct nx_display_dev), + .priv_auto = sizeof(struct nx_display_dev), }; diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c index 362bf6a6fe4..bb8c33bfc7a 100644 --- a/drivers/video/orisetech_otm8009a.c +++ b/drivers/video/orisetech_otm8009a.c @@ -366,6 +366,6 @@ U_BOOT_DRIVER(otm8009a_panel) = { .ops = &otm8009a_panel_ops, .ofdata_to_platdata = otm8009a_panel_ofdata_to_platdata, .probe = otm8009a_panel_probe, - .platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat), - .priv_auto_alloc_size = sizeof(struct otm8009a_panel_priv), + .platdata_auto = sizeof(struct mipi_dsi_panel_plat), + .priv_auto = sizeof(struct otm8009a_panel_priv), }; diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index 9519180ceb3..49a3c7a58e8 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -265,5 +265,5 @@ U_BOOT_DRIVER(pwm_backlight) = { .ops = &pwm_backlight_ops, .ofdata_to_platdata = pwm_backlight_ofdata_to_platdata, .probe = pwm_backlight_probe, - .priv_auto_alloc_size = sizeof(struct pwm_backlight_priv), + .priv_auto = sizeof(struct pwm_backlight_priv), }; diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c index 353894503b9..9d103f1f17b 100644 --- a/drivers/video/raydium-rm68200.c +++ b/drivers/video/raydium-rm68200.c @@ -338,6 +338,6 @@ U_BOOT_DRIVER(rm68200_panel) = { .ops = &rm68200_panel_ops, .ofdata_to_platdata = rm68200_panel_ofdata_to_platdata, .probe = rm68200_panel_probe, - .platdata_auto_alloc_size = sizeof(struct mipi_dsi_panel_plat), - .priv_auto_alloc_size = sizeof(struct rm68200_panel_priv), + .platdata_auto = sizeof(struct mipi_dsi_panel_plat), + .priv_auto = sizeof(struct rm68200_panel_priv), }; diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c index f835f4d517a..41f05b7ec6d 100644 --- a/drivers/video/rockchip/rk3288_hdmi.c +++ b/drivers/video/rockchip/rk3288_hdmi.c @@ -113,5 +113,5 @@ U_BOOT_DRIVER(rk3288_hdmi_rockchip) = { .ops = &rk3288_hdmi_ops, .ofdata_to_platdata = rk3288_hdmi_ofdata_to_platdata, .probe = rk3288_hdmi_probe, - .priv_auto_alloc_size = sizeof(struct rk_hdmi_priv), + .priv_auto = sizeof(struct rk_hdmi_priv), }; diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c index 8ac0125b502..ff6f132bab2 100644 --- a/drivers/video/rockchip/rk3288_mipi.c +++ b/drivers/video/rockchip/rk3288_mipi.c @@ -185,5 +185,5 @@ U_BOOT_DRIVER(rk_mipi_dsi) = { .ofdata_to_platdata = rk_mipi_ofdata_to_platdata, .probe = rk_mipi_probe, .ops = &rk_mipi_dsi_ops, - .priv_auto_alloc_size = sizeof(struct rk_mipi_priv), + .priv_auto = sizeof(struct rk_mipi_priv), }; diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c index 9ec33e6e511..3f6ee744871 100644 --- a/drivers/video/rockchip/rk3288_vop.c +++ b/drivers/video/rockchip/rk3288_vop.c @@ -105,5 +105,5 @@ U_BOOT_DRIVER(rockchip_rk3288_vop) = { .bind = rk_vop_bind, .probe = rk3288_vop_probe, .remove = rk_vop_remove, - .priv_auto_alloc_size = sizeof(struct rk_vop_priv), + .priv_auto = sizeof(struct rk_vop_priv), }; diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c index a62be983275..d9f15adc5cf 100644 --- a/drivers/video/rockchip/rk3399_hdmi.c +++ b/drivers/video/rockchip/rk3399_hdmi.c @@ -76,5 +76,5 @@ U_BOOT_DRIVER(rk3399_hdmi_rockchip) = { .ops = &rk3399_hdmi_ops, .ofdata_to_platdata = rk3399_hdmi_ofdata_to_platdata, .probe = rk3399_hdmi_probe, - .priv_auto_alloc_size = sizeof(struct rk_hdmi_priv), + .priv_auto = sizeof(struct rk_hdmi_priv), }; diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c index e5534c36e6e..873f7fdae00 100644 --- a/drivers/video/rockchip/rk3399_mipi.c +++ b/drivers/video/rockchip/rk3399_mipi.c @@ -176,5 +176,5 @@ U_BOOT_DRIVER(rk_mipi_dsi) = { .ofdata_to_platdata = rk_mipi_ofdata_to_platdata, .probe = rk_mipi_probe, .ops = &rk_mipi_dsi_ops, - .priv_auto_alloc_size = sizeof(struct rk_mipi_priv), + .priv_auto = sizeof(struct rk_mipi_priv), }; diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c index 55d1be0411d..30e81b88b69 100644 --- a/drivers/video/rockchip/rk3399_vop.c +++ b/drivers/video/rockchip/rk3399_vop.c @@ -99,5 +99,5 @@ U_BOOT_DRIVER(rk3399_vop) = { .ops = &rk3399_vop_ops, .bind = rk_vop_bind, .probe = rk3399_vop_probe, - .priv_auto_alloc_size = sizeof(struct rk_vop_priv), + .priv_auto = sizeof(struct rk_vop_priv), }; diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index c55f7a4f72a..282fe09fdfb 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1102,5 +1102,5 @@ U_BOOT_DRIVER(dp_rockchip) = { .ofdata_to_platdata = rk_edp_ofdata_to_platdata, .probe = rk_edp_probe, .remove = rk_edp_remove, - .priv_auto_alloc_size = sizeof(struct rk_edp_priv), + .priv_auto = sizeof(struct rk_edp_priv), }; diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c index 04f795a213c..c93b5dfeed3 100644 --- a/drivers/video/rockchip/rk_lvds.c +++ b/drivers/video/rockchip/rk_lvds.c @@ -247,5 +247,5 @@ U_BOOT_DRIVER(lvds_rockchip) = { .ops = &lvds_rockchip_ops, .ofdata_to_platdata = rk_lvds_ofdata_to_platdata, .probe = rk_lvds_probe, - .priv_auto_alloc_size = sizeof(struct rk_lvds_priv), + .priv_auto = sizeof(struct rk_lvds_priv), }; diff --git a/drivers/video/sandbox_dsi_host.c b/drivers/video/sandbox_dsi_host.c index cd644ec0b46..c84a27ee3be 100644 --- a/drivers/video/sandbox_dsi_host.c +++ b/drivers/video/sandbox_dsi_host.c @@ -86,5 +86,5 @@ U_BOOT_DRIVER(sandbox_dsi_host) = { .id = UCLASS_DSI_HOST, .of_match = sandbox_dsi_host_ids, .ops = &sandbox_dsi_host_ops, - .priv_auto_alloc_size = sizeof(struct sandbox_dsi_host_priv), + .priv_auto = sizeof(struct sandbox_dsi_host_priv), }; diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c index 7e722326b3d..2a854d3958b 100644 --- a/drivers/video/sandbox_osd.c +++ b/drivers/video/sandbox_osd.c @@ -158,5 +158,5 @@ U_BOOT_DRIVER(sandbox_osd_drv) = { .ops = &sandbox_osd_ops, .of_match = sandbox_osd_ids, .probe = sandbox_osd_probe, - .priv_auto_alloc_size = sizeof(struct sandbox_osd_priv), + .priv_auto = sizeof(struct sandbox_osd_priv), }; diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c index d806f35debb..c989510640d 100644 --- a/drivers/video/sandbox_sdl.c +++ b/drivers/video/sandbox_sdl.c @@ -78,5 +78,5 @@ U_BOOT_DRIVER(sandbox_lcd_sdl) = { .of_match = sandbox_sdl_ids, .bind = sandbox_sdl_bind, .probe = sandbox_sdl_probe, - .platdata_auto_alloc_size = sizeof(struct sandbox_sdl_plat), + .platdata_auto = sizeof(struct sandbox_sdl_plat), }; diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index 6c624c37699..3be4f25d8b3 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -118,5 +118,5 @@ U_BOOT_DRIVER(simple_panel) = { .ops = &simple_panel_ops, .ofdata_to_platdata = simple_panel_ofdata_to_platdata, .probe = simple_panel_probe, - .priv_auto_alloc_size = sizeof(struct simple_panel_priv), + .priv_auto = sizeof(struct simple_panel_priv), }; diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c index 9d5abacc2bf..9941382a7d6 100644 --- a/drivers/video/stm32/stm32_dsi.c +++ b/drivers/video/stm32/stm32_dsi.c @@ -512,5 +512,5 @@ U_BOOT_DRIVER(stm32_dsi) = { .bind = stm32_dsi_bind, .probe = stm32_dsi_probe, .ops = &stm32_dsi_ops, - .priv_auto_alloc_size = sizeof(struct stm32_dsi_priv), + .priv_auto = sizeof(struct stm32_dsi_priv), }; diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c index 7fff735930b..07a9acbb8ee 100644 --- a/drivers/video/stm32/stm32_ltdc.c +++ b/drivers/video/stm32/stm32_ltdc.c @@ -473,5 +473,5 @@ U_BOOT_DRIVER(stm32_ltdc) = { .of_match = stm32_ltdc_ids, .probe = stm32_ltdc_probe, .bind = stm32_ltdc_bind, - .priv_auto_alloc_size = sizeof(struct stm32_ltdc_priv), + .priv_auto = sizeof(struct stm32_ltdc_priv), }; diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c index 01d4b7a11c9..6b6792a3dd9 100644 --- a/drivers/video/sunxi/sunxi_dw_hdmi.c +++ b/drivers/video/sunxi/sunxi_dw_hdmi.c @@ -395,7 +395,7 @@ U_BOOT_DRIVER(sunxi_dw_hdmi) = { .id = UCLASS_DISPLAY, .ops = &sunxi_dw_hdmi_ops, .probe = sunxi_dw_hdmi_probe, - .priv_auto_alloc_size = sizeof(struct sunxi_dw_hdmi_priv), + .priv_auto = sizeof(struct sunxi_dw_hdmi_priv), };

U_BOOT_DEVICE(sunxi_dw_hdmi) = { diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c index 49bf083a8d1..dd2bb1f5fc5 100644 --- a/drivers/video/sunxi/sunxi_lcd.c +++ b/drivers/video/sunxi/sunxi_lcd.c @@ -142,7 +142,7 @@ U_BOOT_DRIVER(sunxi_lcd) = { .id = UCLASS_DISPLAY, .ops = &sunxi_lcd_ops, .probe = sunxi_lcd_probe, - .priv_auto_alloc_size = sizeof(struct sunxi_lcd_priv), + .priv_auto = sizeof(struct sunxi_lcd_priv), };

#ifdef CONFIG_MACH_SUN50I diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c index 191cda3ce76..24487439045 100644 --- a/drivers/video/tda19988.c +++ b/drivers/video/tda19988.c @@ -651,5 +651,5 @@ U_BOOT_DRIVER(tda19988) = { .of_match = tda19988_ids, .ops = &tda19988_ops, .probe = tda19988_probe, - .priv_auto_alloc_size = sizeof(struct tda19988_priv), + .priv_auto = sizeof(struct tda19988_priv), }; diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index 827ea13d13a..25199333741 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -424,5 +424,5 @@ U_BOOT_DRIVER(tegra_lcd) = { .bind = tegra_lcd_bind, .probe = tegra_lcd_probe, .ofdata_to_platdata = tegra_lcd_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct tegra_lcd_priv), + .priv_auto = sizeof(struct tegra_lcd_priv), }; diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c index 59758eb9361..881923f2292 100644 --- a/drivers/video/tegra124/dp.c +++ b/drivers/video/tegra124/dp.c @@ -1619,6 +1619,6 @@ U_BOOT_DRIVER(dp_tegra) = { .ofdata_to_platdata = tegra_dp_ofdata_to_platdata, .probe = dp_tegra_probe, .ops = &dp_tegra_ops, - .priv_auto_alloc_size = sizeof(struct tegra_dp_priv), - .platdata_auto_alloc_size = sizeof(struct tegra_dp_plat), + .priv_auto = sizeof(struct tegra_dp_priv), + .platdata_auto = sizeof(struct tegra_dp_plat), }; diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c index 49f33c15b5c..83f3aad92cb 100644 --- a/drivers/video/tegra124/sor.c +++ b/drivers/video/tegra124/sor.c @@ -1079,5 +1079,5 @@ U_BOOT_DRIVER(sor_tegra) = { .of_match = tegra_sor_ids, .ofdata_to_platdata = tegra_sor_ofdata_to_platdata, .ops = &tegra_sor_ops, - .priv_auto_alloc_size = sizeof(struct tegra_dc_sor_data), + .priv_auto = sizeof(struct tegra_dc_sor_data), }; diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 9fa124b3c03..ceb4744354a 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -626,7 +626,7 @@ UCLASS_DRIVER(vidconsole) = { .name = "vidconsole0", .pre_probe = vidconsole_pre_probe, .post_probe = vidconsole_post_probe, - .per_device_auto_alloc_size = sizeof(struct vidconsole_priv), + .per_device_auto = sizeof(struct vidconsole_priv), };

#ifdef CONFIG_VIDEO_COPY diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 650891e49dd..925731341cf 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -408,7 +408,7 @@ UCLASS_DRIVER(video) = { .pre_probe = video_pre_probe, .post_probe = video_post_probe, .pre_remove = video_pre_remove, - .priv_auto_alloc_size = sizeof(struct video_uc_priv), - .per_device_auto_alloc_size = sizeof(struct video_priv), - .per_device_platdata_auto_alloc_size = sizeof(struct video_uc_platdata), + .priv_auto = sizeof(struct video_uc_priv), + .per_device_auto = sizeof(struct video_priv), + .per_device_platdata_auto = sizeof(struct video_uc_platdata), }; diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c index 53c17429725..cf2cfaef2cf 100644 --- a/drivers/virtio/virtio-uclass.c +++ b/drivers/virtio/virtio-uclass.c @@ -369,5 +369,5 @@ UCLASS_DRIVER(virtio) = { .child_post_bind = virtio_uclass_child_post_bind, .child_pre_probe = virtio_uclass_child_pre_probe, .child_post_probe = virtio_uclass_child_post_probe, - .per_device_auto_alloc_size = sizeof(struct virtio_dev_priv), + .per_device_auto = sizeof(struct virtio_dev_priv), }; diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c index 1799f5c5eb3..a007a6a33a8 100644 --- a/drivers/virtio/virtio_blk.c +++ b/drivers/virtio/virtio_blk.c @@ -134,6 +134,6 @@ U_BOOT_DRIVER(virtio_blk) = { .bind = virtio_blk_bind, .probe = virtio_blk_probe, .remove = virtio_reset, - .priv_auto_alloc_size = sizeof(struct virtio_blk_priv), + .priv_auto = sizeof(struct virtio_blk_priv), .flags = DM_FLAG_ACTIVE_DMA, }; diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index b951ea3257b..90ee1d4271e 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -412,5 +412,5 @@ U_BOOT_DRIVER(virtio_mmio) = { .ops = &virtio_mmio_ops, .probe = virtio_mmio_probe, .ofdata_to_platdata = virtio_mmio_ofdata_to_platdata, - .priv_auto_alloc_size = sizeof(struct virtio_mmio_priv), + .priv_auto = sizeof(struct virtio_mmio_priv), }; diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c index 0dbbd780230..e1831cf9618 100644 --- a/drivers/virtio/virtio_net.c +++ b/drivers/virtio/virtio_net.c @@ -233,7 +233,7 @@ U_BOOT_DRIVER(virtio_net) = { .probe = virtio_net_probe, .remove = virtio_reset, .ops = &virtio_net_ops, - .priv_auto_alloc_size = sizeof(struct virtio_net_priv), - .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .priv_auto = sizeof(struct virtio_net_priv), + .platdata_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ACTIVE_DMA, }; diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index fa7f2429f1f..0a2431a97fc 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -350,7 +350,7 @@ U_BOOT_DRIVER(virtio_pci_legacy) = { .ops = &virtio_pci_ops, .bind = virtio_pci_bind, .probe = virtio_pci_probe, - .priv_auto_alloc_size = sizeof(struct virtio_pci_priv), + .priv_auto = sizeof(struct virtio_pci_priv), };

static struct pci_device_id virtio_pci_supported[] = { diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 2e5bbade002..8996ac0d6e3 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -539,7 +539,7 @@ U_BOOT_DRIVER(virtio_pci_modern) = { .ops = &virtio_pci_ops, .bind = virtio_pci_bind, .probe = virtio_pci_probe, - .priv_auto_alloc_size = sizeof(struct virtio_pci_priv), + .priv_auto = sizeof(struct virtio_pci_priv), };

static struct pci_device_id virtio_pci_supported[] = { diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c index fc3e19cfaee..9314c0a03ed 100644 --- a/drivers/virtio/virtio_rng.c +++ b/drivers/virtio/virtio_rng.c @@ -84,6 +84,6 @@ U_BOOT_DRIVER(virtio_rng) = { .probe = virtio_rng_probe, .remove = virtio_reset, .ops = &virtio_rng_ops, - .priv_auto_alloc_size = sizeof(struct virtio_rng_priv), + .priv_auto = sizeof(struct virtio_rng_priv), .flags = DM_FLAG_ACTIVE_DMA, }; diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c index 2a2abb9d499..aafb7beb949 100644 --- a/drivers/virtio/virtio_sandbox.c +++ b/drivers/virtio/virtio_sandbox.c @@ -204,7 +204,7 @@ U_BOOT_DRIVER(virtio_sandbox1) = { .ops = &virtio_sandbox1_ops, .probe = virtio_sandbox_probe, .child_post_remove = virtio_sandbox_child_post_remove, - .priv_auto_alloc_size = sizeof(struct virtio_sandbox_priv), + .priv_auto = sizeof(struct virtio_sandbox_priv), };

/* this one without notify op */ @@ -231,5 +231,5 @@ U_BOOT_DRIVER(virtio_sandbox2) = { .of_match = virtio_sandbox2_ids, .ops = &virtio_sandbox2_ops, .probe = virtio_sandbox_probe, - .priv_auto_alloc_size = sizeof(struct virtio_sandbox_priv), + .priv_auto = sizeof(struct virtio_sandbox_priv), }; diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c index 8e6372f0bed..aced1b0e2ed 100644 --- a/drivers/w1/mxc_w1.c +++ b/drivers/w1/mxc_w1.c @@ -230,6 +230,6 @@ U_BOOT_DRIVER(mxc_w1_drv) = { .of_match = mxc_w1_id, .ofdata_to_platdata = mxc_w1_ofdata_to_platdata, .ops = &mxc_w1_ops, - .platdata_auto_alloc_size = sizeof(struct mxc_w1_pdata), + .platdata_auto = sizeof(struct mxc_w1_pdata), .probe = mxc_w1_probe, }; diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c index 45ad47a5d6b..6e48e53ddc3 100644 --- a/drivers/w1/w1-gpio.c +++ b/drivers/w1/w1-gpio.c @@ -174,5 +174,5 @@ U_BOOT_DRIVER(w1_gpio_drv) = { .of_match = w1_gpio_id, .ofdata_to_platdata = w1_gpio_ofdata_to_platdata, .ops = &w1_gpio_ops, - .platdata_auto_alloc_size = sizeof(struct w1_gpio_pdata), + .platdata_auto = sizeof(struct w1_gpio_pdata), }; diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c index 9478c93e9b0..af1fe5fd22f 100644 --- a/drivers/w1/w1-uclass.c +++ b/drivers/w1/w1-uclass.c @@ -230,10 +230,10 @@ UCLASS_DRIVER(w1) = { .name = "w1", .id = UCLASS_W1, .flags = DM_UC_FLAG_SEQ_ALIAS, - .per_device_auto_alloc_size = sizeof(struct w1_bus), + .per_device_auto = sizeof(struct w1_bus), .post_probe = w1_post_probe, #if CONFIG_IS_ENABLED(OF_CONTROL) .post_bind = dm_scan_fdt_dev, #endif - .per_child_platdata_auto_alloc_size = sizeof(struct w1_device), + .per_child_platdata_auto = sizeof(struct w1_device), }; diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c index 5da8e56505f..dd97a17a701 100644 --- a/drivers/watchdog/armada-37xx-wdt.c +++ b/drivers/watchdog/armada-37xx-wdt.c @@ -196,6 +196,6 @@ U_BOOT_DRIVER(a37xx_wdt) = { .id = UCLASS_WDT, .of_match = a37xx_wdt_ids, .probe = a37xx_wdt_probe, - .priv_auto_alloc_size = sizeof(struct a37xx_wdt), + .priv_auto = sizeof(struct a37xx_wdt), .ops = &a37xx_wdt_ops, }; diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c index c9c4a1fdc5f..9e2f484f4a2 100644 --- a/drivers/watchdog/ast_wdt.c +++ b/drivers/watchdog/ast_wdt.c @@ -124,7 +124,7 @@ U_BOOT_DRIVER(ast_wdt) = { .id = UCLASS_WDT, .of_match = ast_wdt_ids, .probe = ast_wdt_probe, - .priv_auto_alloc_size = sizeof(struct ast_wdt_priv), + .priv_auto = sizeof(struct ast_wdt_priv), .ofdata_to_platdata = ast_wdt_ofdata_to_platdata, .ops = &ast_wdt_ops, }; diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 3455a80228d..9e0d89be62d 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -117,7 +117,7 @@ U_BOOT_DRIVER(atmel_at91sam9260_wdt) = { .name = "atmel_at91sam9260_wdt", .id = UCLASS_WDT, .of_match = at91_wdt_ids, - .priv_auto_alloc_size = sizeof(struct at91_wdt_priv), + .priv_auto = sizeof(struct at91_wdt_priv), .ops = &at91_wdt_ops, .probe = at91_wdt_probe, }; diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c index ee77f49a944..677b1347ca7 100644 --- a/drivers/watchdog/bcm6345_wdt.c +++ b/drivers/watchdog/bcm6345_wdt.c @@ -112,6 +112,6 @@ U_BOOT_DRIVER(wdt_bcm6345) = { .id = UCLASS_WDT, .of_match = bcm6345_wdt_ids, .ops = &bcm6345_wdt_ops, - .priv_auto_alloc_size = sizeof(struct bcm6345_wdt_priv), + .priv_auto = sizeof(struct bcm6345_wdt_priv), .probe = bcm6345_wdt_probe, }; diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c index 1e703f07f70..44a9769c5df 100644 --- a/drivers/watchdog/cdns_wdt.c +++ b/drivers/watchdog/cdns_wdt.c @@ -260,7 +260,7 @@ U_BOOT_DRIVER(cdns_wdt) = { .id = UCLASS_WDT, .of_match = cdns_wdt_ids, .probe = cdns_wdt_probe, - .priv_auto_alloc_size = sizeof(struct cdns_wdt_priv), + .priv_auto = sizeof(struct cdns_wdt_priv), .ofdata_to_platdata = cdns_wdt_ofdata_to_platdata, .ops = &cdns_wdt_ops, }; diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 7caa6c550cd..c020324973e 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -168,7 +168,7 @@ U_BOOT_DRIVER(designware_wdt) = { .name = "designware_wdt", .id = UCLASS_WDT, .of_match = designware_wdt_ids, - .priv_auto_alloc_size = sizeof(struct designware_wdt_priv), + .priv_auto = sizeof(struct designware_wdt_priv), .probe = designware_wdt_probe, .ops = &designware_wdt_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index b90c2daecee..5e0a096ce50 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -169,7 +169,7 @@ U_BOOT_DRIVER(imx_wdt) = { .of_match = imx_wdt_ids, .probe = imx_wdt_probe, .ops = &imx_wdt_ops, - .priv_auto_alloc_size = sizeof(struct imx_wdt_priv), + .priv_auto = sizeof(struct imx_wdt_priv), .flags = DM_FLAG_PRE_RELOC, }; #endif diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index 1cd8866ef8d..8b5ed28ebd3 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -98,6 +98,6 @@ U_BOOT_DRIVER(mt762x_wdt) = { .id = UCLASS_WDT, .of_match = mt762x_wdt_ids, .probe = mt762x_wdt_probe, - .priv_auto_alloc_size = sizeof(struct mt762x_wdt), + .priv_auto = sizeof(struct mt762x_wdt), .ops = &mt762x_wdt_ops, }; diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index a636cff354d..b098b2e3cfa 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -152,7 +152,7 @@ U_BOOT_DRIVER(mtk_wdt) = { .name = "mtk_wdt", .id = UCLASS_WDT, .of_match = mtk_wdt_ids, - .priv_auto_alloc_size = sizeof(struct mtk_wdt_priv), + .priv_auto = sizeof(struct mtk_wdt_priv), .probe = mtk_wdt_probe, .ops = &mtk_wdt_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/watchdog/octeontx_wdt.c b/drivers/watchdog/octeontx_wdt.c index 88708dc5e1c..5f586ef6837 100644 --- a/drivers/watchdog/octeontx_wdt.c +++ b/drivers/watchdog/octeontx_wdt.c @@ -137,7 +137,7 @@ U_BOOT_DRIVER(wdt_octeontx) = { .id = UCLASS_WDT, .of_match = octeontx_wdt_ids, .ops = &octeontx_wdt_ops, - .priv_auto_alloc_size = sizeof(struct octeontx_wdt), + .priv_auto = sizeof(struct octeontx_wdt), .probe = octeontx_wdt_probe, .remove = octeontx_wdt_remove, .flags = DM_FLAG_OS_PREPARE, diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 8c87b50c5d2..ca2bc7cfb59 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -263,6 +263,6 @@ U_BOOT_DRIVER(omap3_wdt) = { .of_match = omap3_wdt_ids, .ops = &omap3_wdt_ops, .probe = omap3_wdt_probe, - .priv_auto_alloc_size = sizeof(struct omap3_wdt_priv), + .priv_auto = sizeof(struct omap3_wdt_priv), }; #endif /* !CONFIG_IS_ENABLED(WDT) */ diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index c3576916d32..171d81aec59 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -186,7 +186,7 @@ U_BOOT_DRIVER(orion_wdt) = { .id = UCLASS_WDT, .of_match = orion_wdt_ids, .probe = orion_wdt_probe, - .priv_auto_alloc_size = sizeof(struct orion_wdt_priv), + .priv_auto = sizeof(struct orion_wdt_priv), .ofdata_to_platdata = orion_wdt_ofdata_to_platdata, .ops = &orion_wdt_ops, }; diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index ebe29c74091..f64a39f6579 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -118,6 +118,6 @@ U_BOOT_DRIVER(rti_wdt) = { .of_match = rti_wdt_ids, .ops = &rti_wdt_ops, .probe = rti_wdt_probe, - .priv_auto_alloc_size = sizeof(struct rti_wdt_priv), + .priv_auto = sizeof(struct rti_wdt_priv), .flags = DM_FLAG_REMOVE_WITH_PD_ON, }; diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index e93e0ee3d54..66553e5591b 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c @@ -125,7 +125,7 @@ U_BOOT_DRIVER(sbsa_gwdt) = { .id = UCLASS_WDT, .of_match = sbsa_gwdt_ids, .probe = sbsa_gwdt_probe, - .priv_auto_alloc_size = sizeof(struct sbsa_gwdt_priv), + .priv_auto = sizeof(struct sbsa_gwdt_priv), .ofdata_to_platdata = sbsa_gwdt_ofdata_to_platdata, .ops = &sbsa_gwdt_ops, }; diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index aaf93d545e4..df57917f15a 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -142,7 +142,7 @@ U_BOOT_DRIVER(sp805_wdt) = { .id = UCLASS_WDT, .of_match = sp805_wdt_ids, .probe = sp805_wdt_probe, - .priv_auto_alloc_size = sizeof(struct sp805_wdt_priv), + .priv_auto = sizeof(struct sp805_wdt_priv), .ofdata_to_platdata = sp805_wdt_ofdata_to_platdata, .ops = &sp805_wdt_ops, }; diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c index f673fce327c..53586fdbfc8 100644 --- a/drivers/watchdog/stm32mp_wdt.c +++ b/drivers/watchdog/stm32mp_wdt.c @@ -131,7 +131,7 @@ U_BOOT_DRIVER(stm32mp_wdt) = { .name = "stm32mp-wdt", .id = UCLASS_WDT, .of_match = stm32mp_wdt_match, - .priv_auto_alloc_size = sizeof(struct stm32mp_wdt_priv), + .priv_auto = sizeof(struct stm32mp_wdt_priv), .probe = stm32mp_wdt_probe, .ops = &stm32mp_wdt_ops, }; diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index 721ccdb0f6d..f410a070169 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -123,7 +123,7 @@ U_BOOT_DRIVER(xlnx_wdt) = { .id = UCLASS_WDT, .of_match = xlnx_wdt_ids, .probe = xlnx_wdt_probe, - .platdata_auto_alloc_size = sizeof(struct xlnx_wdt_platdata), + .platdata_auto = sizeof(struct xlnx_wdt_platdata), .ofdata_to_platdata = xlnx_wdt_ofdata_to_platdata, .ops = &xlnx_wdt_ops, }; diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c index df55e088bbf..8f96822b78e 100644 --- a/drivers/watchdog/xilinx_wwdt.c +++ b/drivers/watchdog/xilinx_wwdt.c @@ -172,8 +172,8 @@ U_BOOT_DRIVER(xlnx_wwdt) = { .id = UCLASS_WDT, .of_match = xlnx_wwdt_ids, .probe = xlnx_wwdt_probe, - .priv_auto_alloc_size = sizeof(struct xlnx_wwdt_priv), - .platdata_auto_alloc_size = sizeof(struct xlnx_wwdt_platdata), + .priv_auto = sizeof(struct xlnx_wwdt_priv), + .platdata_auto = sizeof(struct xlnx_wwdt_platdata), .ofdata_to_platdata = xlnx_wwdt_ofdata_to_platdata, .ops = &xlnx_wwdt_ops, }; diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index 1b3325bbe2a..cbb51d26b91 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -723,7 +723,7 @@ U_BOOT_DRIVER(pvblock_blk) = { .bind = pvblock_blk_bind, .probe = pvblock_blk_probe, .remove = pvblock_blk_remove, - .priv_auto_alloc_size = sizeof(struct blkfront_dev), + .priv_auto = sizeof(struct blkfront_dev), .flags = DM_FLAG_OS_PREPARE, };

diff --git a/include/dm/device.h b/include/dm/device.h index b95aa346820..c380eb3a0df 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -111,7 +111,7 @@ enum { * probe method if the device has a device tree node. * * All three of platdata, priv and uclass_priv can be allocated by the - * driver, or you can use the auto_alloc_size members of struct driver and + * driver, or you can use the 'auto' members of struct driver and * struct uclass_driver to have driver model do this automatically. * * @driver: The driver used by this device @@ -231,18 +231,18 @@ struct udevice_id { * memory allocated but it has not yet been probed. * @child_post_remove: Called after a child device is removed. The device * has memory allocated but its device_remove() method has been called. - * @priv_auto_alloc_size: If non-zero this is the size of the private data + * @priv_auto: If non-zero this is the size of the private data * to be allocated in the device's ->priv pointer. If zero, then the driver * is responsible for allocating any data required. - * @platdata_auto_alloc_size: If non-zero this is the size of the + * @platdata_auto: If non-zero this is the size of the * platform data to be allocated in the device's ->platdata pointer. * This is typically only useful for device-tree-aware drivers (those with * an of_match), since drivers which use platdata will have the data * provided in the U_BOOT_DEVICE() instantiation. - * @per_child_auto_alloc_size: Each device can hold private data owned by + * @per_child_auto: Each device can hold private data owned by * its parent. If required this will be automatically allocated if this * value is non-zero. - * @per_child_platdata_auto_alloc_size: A bus likes to store information about + * @per_child_platdata_auto: A bus likes to store information about * its children. If non-zero this is the size of this data, to be allocated * in the child's parent_platdata pointer. * @ops: Driver-specific operations. This is typically a list of function @@ -264,10 +264,10 @@ struct driver { int (*child_post_bind)(struct udevice *dev); int (*child_pre_probe)(struct udevice *dev); int (*child_post_remove)(struct udevice *dev); - int priv_auto_alloc_size; - int platdata_auto_alloc_size; - int per_child_auto_alloc_size; - int per_child_platdata_auto_alloc_size; + int priv_auto; + int platdata_auto; + int per_child_auto; + int per_child_platdata_auto; const void *ops; /* driver-specific operations */ uint32_t flags; #if CONFIG_IS_ENABLED(ACPIGEN) diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 69a073a2733..2d9eae19099 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -65,19 +65,19 @@ struct udevice; * @child_post_probe: Called after a child in this uclass is probed * @init: Called to set up the uclass * @destroy: Called to destroy the uclass - * @priv_auto_alloc_size: If non-zero this is the size of the private data + * @priv_auto: If non-zero this is the size of the private data * to be allocated in the uclass's ->priv pointer. If zero, then the uclass * driver is responsible for allocating any data required. - * @per_device_auto_alloc_size: Each device can hold private data owned + * @per_device_auto: Each device can hold private data owned * by the uclass. If required this will be automatically allocated if this * value is non-zero. - * @per_device_platdata_auto_alloc_size: Each device can hold platform data + * @per_device_platdata_auto: Each device can hold platform data * owned by the uclass as 'dev->uclass_platdata'. If the value is non-zero, * then this will be automatically allocated. - * @per_child_auto_alloc_size: Each child device (of a parent in this + * @per_child_auto: Each child device (of a parent in this * uclass) can hold parent data for the device/uclass. This value is only * used as a fallback if this member is 0 in the driver. - * @per_child_platdata_auto_alloc_size: A bus likes to store information about + * @per_child_platdata_auto: A bus likes to store information about * its children. If non-zero this is the size of this data, to be allocated * in the child device's parent_platdata pointer. This value is only used as * a fallback if this member is 0 in the driver. @@ -98,11 +98,11 @@ struct uclass_driver { int (*child_post_probe)(struct udevice *dev); int (*init)(struct uclass *class); int (*destroy)(struct uclass *class); - int priv_auto_alloc_size; - int per_device_auto_alloc_size; - int per_device_platdata_auto_alloc_size; - int per_child_auto_alloc_size; - int per_child_platdata_auto_alloc_size; + int priv_auto; + int per_device_auto; + int per_device_platdata_auto; + int per_child_auto; + int per_child_platdata_auto; const void *ops; uint32_t flags; }; diff --git a/include/dwmmc.h b/include/dwmmc.h index d8a8355a0ad..c53694654ed 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -256,7 +256,7 @@ static inline u8 dwmci_readb(struct dwmci_host *host, int reg) * ... * * Inside U_BOOT_DRIVER(): - * .platdata_auto_alloc_size = sizeof(struct rockchip_mmc_plat), + * .platdata_auto = sizeof(struct rockchip_mmc_plat), * * To access platform data: * struct rockchip_mmc_plat *plat = dev_get_platdata(dev); diff --git a/include/sdhci.h b/include/sdhci.h index 1fd20ec0860..d04afd53b16 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -440,7 +440,7 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg) * ... * * Inside U_BOOT_DRIVER(): - * .platdata_auto_alloc_size = sizeof(struct msm_sdhc_plat), + * .platdata_auto = sizeof(struct msm_sdhc_plat), * * To access platform data: * struct msm_sdhc_plat *plat = dev_get_platdata(dev); diff --git a/include/spi.h b/include/spi.h index e90110dd13c..a22225d85d0 100644 --- a/include/spi.h +++ b/include/spi.h @@ -102,7 +102,7 @@ enum spi_polarity { * * For driver model this is the per-child data used by the SPI bus. It can * be accessed using dev_get_parent_priv() on the slave device. The SPI uclass - * sets uip per_child_auto_alloc_size to sizeof(struct spi_slave), and the + * sets up per_child_auto to sizeof(struct spi_slave), and the * driver should not override it. Two platform data fields (max_hz and mode) * are copied into this structure to provide an initial value. This allows * them to be changed, since we should never change platform data in drivers. diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 0e72a68bced..fcd6eb87991 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -196,7 +196,7 @@ U_BOOT_DRIVER(efi_blk) = { .name = "efi_blk", .id = UCLASS_BLK, .ops = &efi_blk_ops, - .platdata_auto_alloc_size = sizeof(struct efi_blk_platdata), + .platdata_auto = sizeof(struct efi_blk_platdata), };

/* EFI driver operators */ diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 4b4aaecf366..2c56b140184 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -598,7 +598,7 @@ UCLASS_DRIVER(eth) = { .pre_unbind = eth_pre_unbind, .post_probe = eth_post_probe, .pre_remove = eth_pre_remove, - .priv_auto_alloc_size = sizeof(struct eth_uclass_priv), - .per_device_auto_alloc_size = sizeof(struct eth_device_priv), + .priv_auto = sizeof(struct eth_uclass_priv), + .per_device_auto = sizeof(struct eth_device_priv), .flags = DM_UC_FLAG_SEQ_ALIAS, }; diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c index 6674eb6bee7..3fb41840996 100644 --- a/net/mdio-mux-uclass.c +++ b/net/mdio-mux-uclass.c @@ -228,6 +228,6 @@ UCLASS_DRIVER(mdio_mux) = { .child_post_bind = dm_mdio_mux_child_post_bind, .post_bind = dm_mdio_mux_post_bind, .post_probe = dm_mdio_mux_post_probe, - .per_device_auto_alloc_size = sizeof(struct mdio_mux_perdev_priv), - .per_child_platdata_auto_alloc_size = sizeof(struct mdio_mux_ch_data), + .per_device_auto = sizeof(struct mdio_mux_perdev_priv), + .per_child_platdata_auto = sizeof(struct mdio_mux_ch_data), }; diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index b5e8e465123..d062382c2a9 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -216,5 +216,5 @@ UCLASS_DRIVER(mdio) = { .post_bind = dm_mdio_post_bind, .post_probe = dm_mdio_post_probe, .pre_remove = dm_mdio_pre_remove, - .per_device_auto_alloc_size = sizeof(struct mdio_perdev_priv), + .per_device_auto = sizeof(struct mdio_perdev_priv), }; diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 021f776845e..c4fcdbbf4d4 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -110,7 +110,7 @@ U_BOOT_DRIVER(testacpi_drv) = { .of_match = testacpi_ids, .id = UCLASS_TEST_ACPI, .bind = dm_scan_fdt_dev, - .platdata_auto_alloc_size = sizeof(struct testacpi_platdata), + .platdata_auto = sizeof(struct testacpi_platdata), ACPI_OPS_PTR(&testacpi_ops) };

diff --git a/test/dm/bus.c b/test/dm/bus.c index 27dd066350e..0919b3dba04 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -100,10 +100,10 @@ U_BOOT_DRIVER(testbus_drv) = { .id = UCLASS_TEST_BUS, .probe = testbus_drv_probe, .child_post_bind = testbus_child_post_bind, - .priv_auto_alloc_size = sizeof(struct dm_test_priv), - .platdata_auto_alloc_size = sizeof(struct dm_test_pdata), - .per_child_auto_alloc_size = sizeof(struct dm_test_parent_data), - .per_child_platdata_auto_alloc_size = + .priv_auto = sizeof(struct dm_test_priv), + .platdata_auto = sizeof(struct dm_test_pdata), + .per_child_auto = sizeof(struct dm_test_parent_data), + .per_child_platdata_auto = sizeof(struct dm_test_parent_platdata), .child_pre_probe = testbus_child_pre_probe, .child_post_remove = testbus_child_post_remove, @@ -313,19 +313,19 @@ static int dm_test_bus_parent_data_uclass(struct unit_test_state *uts) /* Set the driver size to 0 so that the uclass size is used */ ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus)); drv = (struct driver *)bus->driver; - size = drv->per_child_auto_alloc_size; + size = drv->per_child_auto;

#ifdef CONFIG_SANDBOX os_mprotect_allow(bus->uclass->uc_drv, sizeof(*bus->uclass->uc_drv)); os_mprotect_allow(drv, sizeof(*drv)); #endif - bus->uclass->uc_drv->per_child_auto_alloc_size = size; - drv->per_child_auto_alloc_size = 0; + bus->uclass->uc_drv->per_child_auto = size; + drv->per_child_auto = 0; ret = test_bus_parent_data(uts); if (ret) return ret; - bus->uclass->uc_drv->per_child_auto_alloc_size = 0; - drv->per_child_auto_alloc_size = size; + bus->uclass->uc_drv->per_child_auto = 0; + drv->per_child_auto = size;

return 0; } @@ -457,18 +457,18 @@ static int dm_test_bus_parent_platdata_uclass(struct unit_test_state *uts) /* Set the driver size to 0 so that the uclass size is used */ ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus)); drv = (struct driver *)bus->driver; - size = drv->per_child_platdata_auto_alloc_size; + size = drv->per_child_platdata_auto; #ifdef CONFIG_SANDBOX os_mprotect_allow(bus->uclass->uc_drv, sizeof(*bus->uclass->uc_drv)); os_mprotect_allow(drv, sizeof(*drv)); #endif - bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = size; - drv->per_child_platdata_auto_alloc_size = 0; + bus->uclass->uc_drv->per_child_platdata_auto = size; + drv->per_child_platdata_auto = 0; ret = test_bus_parent_platdata(uts); if (ret) return ret; - bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = 0; - drv->per_child_platdata_auto_alloc_size = size; + bus->uclass->uc_drv->per_child_platdata_auto = 0; + drv->per_child_platdata_auto = size;

return 0; } diff --git a/test/dm/core.c b/test/dm/core.c index 0514813b817..e9168ec1930 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -154,7 +154,7 @@ static int dm_test_autobind_uclass_pdata_alloc(struct unit_test_state *uts) * Test if test uclass driver requires allocation for the uclass * platform data and then check the dev->uclass_platdata pointer. */ - ut_assert(uc->uc_drv->per_device_platdata_auto_alloc_size); + ut_assert(uc->uc_drv->per_device_platdata_auto);

for (uclass_find_first_device(UCLASS_TEST, &dev); dev; diff --git a/test/dm/mux-emul.c b/test/dm/mux-emul.c index 141fd4d9083..45154cea500 100644 --- a/test/dm/mux-emul.c +++ b/test/dm/mux-emul.c @@ -60,7 +60,7 @@ U_BOOT_DRIVER(emul_mux) = { .of_match = mux_emul_of_match, .ops = &mux_emul_ops, .probe = mux_emul_probe, - .priv_auto_alloc_size = sizeof(struct mux_emul_priv), + .priv_auto = sizeof(struct mux_emul_priv), };

static int dm_test_mux_emul_default_state(struct unit_test_state *uts) diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 2effef3c1c8..22a293096c9 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -280,7 +280,7 @@ U_BOOT_DRIVER(regmap_test) = { .of_match = regmaptest_ids, .id = UCLASS_NOP, .probe = remaptest_probe, - .priv_auto_alloc_size = sizeof(struct regmaptest_priv), + .priv_auto = sizeof(struct regmaptest_priv), };

static int dm_test_devm_regmap(struct unit_test_state *uts) diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 08bdf011946..5c074cdd09f 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -81,7 +81,7 @@ U_BOOT_DRIVER(test_drv) = { .probe = test_probe, .remove = test_remove, .unbind = test_unbind, - .priv_auto_alloc_size = sizeof(struct dm_test_priv), + .priv_auto = sizeof(struct dm_test_priv), };

U_BOOT_DRIVER(test2_drv) = { @@ -92,7 +92,7 @@ U_BOOT_DRIVER(test2_drv) = { .probe = test_probe, .remove = test_remove, .unbind = test_unbind, - .priv_auto_alloc_size = sizeof(struct dm_test_priv), + .priv_auto = sizeof(struct dm_test_priv), };

static int test_manual_drv_ping(struct udevice *dev, int pingval, int *pingret) diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index c4de91da102..d69579846b2 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -86,8 +86,8 @@ U_BOOT_DRIVER(testfdt_drv) = { .ofdata_to_platdata = testfdt_ofdata_to_platdata, .probe = testfdt_drv_probe, .ops = &test_ops, - .priv_auto_alloc_size = sizeof(struct dm_test_priv), - .platdata_auto_alloc_size = sizeof(struct dm_test_pdata), + .priv_auto = sizeof(struct dm_test_priv), + .platdata_auto = sizeof(struct dm_test_pdata), };

static const struct udevice_id testfdt1_ids[] = { @@ -104,8 +104,8 @@ U_BOOT_DRIVER(testfdt1_drv) = { .ofdata_to_platdata = testfdt_ofdata_to_platdata, .probe = testfdt_drv_probe, .ops = &test_ops, - .priv_auto_alloc_size = sizeof(struct dm_test_priv), - .platdata_auto_alloc_size = sizeof(struct dm_test_pdata), + .priv_auto = sizeof(struct dm_test_priv), + .platdata_auto = sizeof(struct dm_test_pdata), .flags = DM_FLAG_PRE_RELOC, };

@@ -147,7 +147,7 @@ U_BOOT_DRIVER(testprobe_drv) = { .of_match = testprobe_ids, .id = UCLASS_TEST_PROBE, .probe = testprobe_drv_probe, - .platdata_auto_alloc_size = sizeof(struct dm_testprobe_pdata), + .platdata_auto = sizeof(struct dm_testprobe_pdata), };

UCLASS_DRIVER(testprobe) = { @@ -204,8 +204,8 @@ U_BOOT_DRIVER(testdevres_drv) = { .bind = testdevres_drv_bind, .ofdata_to_platdata = testdevres_drv_ofdata_to_platdata, .probe = testdevres_drv_probe, - .platdata_auto_alloc_size = sizeof(struct dm_testdevres_pdata), - .priv_auto_alloc_size = sizeof(struct dm_testdevres_priv), + .platdata_auto = sizeof(struct dm_testdevres_pdata), + .priv_auto = sizeof(struct dm_testdevres_priv), };

UCLASS_DRIVER(testdevres) = { diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 760731b0667..94c2753ed95 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -124,8 +124,8 @@ UCLASS_DRIVER(test) = { .pre_remove = test_pre_remove, .init = test_init, .destroy = test_destroy, - .priv_auto_alloc_size = sizeof(struct dm_test_uclass_priv), - .per_device_auto_alloc_size = sizeof(struct dm_test_uclass_perdev_priv), - .per_device_platdata_auto_alloc_size = + .priv_auto = sizeof(struct dm_test_uclass_priv), + .per_device_auto = sizeof(struct dm_test_uclass_perdev_priv), + .per_device_platdata_auto = sizeof(struct dm_test_perdev_uc_pdata), };

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 ---

arch/arm/mach-imx/mx6/soc.c | 2 +- arch/arm/mach-imx/mx7/soc.c | 2 +- arch/arm/mach-omap2/am33xx/board.c | 2 +- arch/arm/mach-rockchip/spl-boot-order.c | 4 +- arch/arm/mach-stm32mp/bsec.c | 2 +- arch/arm/mach-stm32mp/pwr_regulator.c | 12 +-- arch/x86/cpu/apollolake/hostbridge.c | 2 +- arch/x86/cpu/apollolake/pmc.c | 2 +- arch/x86/cpu/apollolake/spl.c | 4 +- arch/x86/cpu/apollolake/uart.c | 6 +- arch/x86/cpu/broadwell/sata.c | 2 +- arch/x86/cpu/cpu_x86.c | 2 +- arch/x86/cpu/intel_common/itss.c | 2 +- arch/x86/cpu/intel_common/p2sb.c | 6 +- arch/x86/cpu/mp_init.c | 4 +- arch/x86/cpu/qfw_cpu.c | 2 +- arch/x86/cpu/slimbootloader/serial.c | 4 +- arch/x86/include/asm/intel_pinctrl.h | 2 +- arch/x86/lib/acpi_table.c | 2 +- arch/x86/lib/fsp/fsp_graphics.c | 4 +- arch/x86/lib/mpspec.c | 2 +- arch/x86/lib/sfi.c | 2 +- board/armltd/integrator/integrator.c | 2 +- board/armltd/total_compute/total_compute.c | 2 +- board/armltd/vexpress64/vexpress64.c | 2 +- board/bluewater/gurnard/gurnard.c | 2 +- board/bluewater/snapper9260/snapper9260.c | 2 +- board/cadence/xtfpga/xtfpga.c | 2 +- board/cavium/thunderx/thunderx.c | 4 +- board/compulab/cm_fx6/cm_fx6.c | 2 +- board/davinci/da8xxevm/omapl138_lcdk.c | 4 +- board/freescale/ls1012afrdm/eth.c | 4 +- board/freescale/ls1012aqds/eth.c | 4 +- board/freescale/ls1012ardb/eth.c | 4 +- board/freescale/lx2160a/lx2160a.c | 4 +- board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/hisilicon/hikey/hikey.c | 2 +- board/hisilicon/hikey960/hikey960.c | 2 +- board/hisilicon/poplar/poplar.c | 2 +- board/lg/sniper/sniper.c | 2 +- board/siemens/corvus/board.c | 2 +- board/st/stv0991/stv0991.c | 2 +- board/sysam/amcore/amcore.c | 2 +- board/ti/am335x/board.c | 8 +- board/toradex/apalis_imx6/apalis_imx6.c | 2 +- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 2 +- board/toradex/colibri_imx6/colibri_imx6.c | 2 +- board/toradex/colibri_pxa270/colibri_pxa270.c | 4 +- cmd/Kconfig | 2 +- cmd/button.c | 2 +- cmd/cpu.c | 2 +- cmd/demo.c | 2 +- cmd/i2c.c | 4 +- cmd/led.c | 2 +- cmd/lsblk.c | 2 +- cmd/pci.c | 2 +- cmd/regulator.c | 32 +++---- cmd/remoteproc.c | 2 +- common/lcd_simplefb.c | 2 +- common/usb_hub.c | 2 +- common/usb_storage.c | 12 +-- doc/driver-model/design.rst | 60 ++++++------ doc/driver-model/ethernet.rst | 6 +- doc/driver-model/of-plat.rst | 14 +-- doc/driver-model/remoteproc-framework.rst | 2 +- doc/driver-model/spi-howto.rst | 10 +- doc/driver-model/usb-info.rst | 4 +- drivers/adc/adc-uclass.c | 32 +++---- drivers/adc/exynos-adc.c | 2 +- drivers/adc/meson-saradc.c | 2 +- drivers/adc/rockchip-saradc.c | 4 +- drivers/adc/sandbox.c | 2 +- drivers/adc/stm32-adc.c | 6 +- drivers/ata/ahci.c | 6 +- drivers/ata/dwc_ahsata.c | 6 +- drivers/ata/fsl_sata.c | 4 +- drivers/ata/sata_mv.c | 6 +- drivers/ata/sata_sil.c | 4 +- drivers/block/blk-uclass.c | 28 +++--- drivers/block/ide.c | 6 +- drivers/block/sandbox.c | 8 +- drivers/button/button-gpio.c | 4 +- drivers/button/button-uclass.c | 4 +- drivers/cache/cache-v5l2.c | 2 +- drivers/clk/altera/clk-agilex.c | 2 +- drivers/clk/altera/clk-arria10.c | 2 +- drivers/clk/at91/compat.c | 18 ++-- drivers/clk/clk_boston.c | 2 +- drivers/clk/clk_fixed_factor.c | 2 +- drivers/clk/clk_fixed_rate.c | 2 +- drivers/clk/rockchip/clk_rk3188.c | 2 +- drivers/clk/rockchip/clk_rk3288.c | 2 +- drivers/clk/rockchip/clk_rk3368.c | 2 +- drivers/clk/rockchip/clk_rk3399.c | 4 +- drivers/core/device-remove.c | 12 +-- drivers/core/device.c | 63 +++++++------ drivers/core/dump.c | 2 +- drivers/core/root.c | 4 +- drivers/core/simple-bus.c | 6 +- drivers/cpu/at91_cpu.c | 2 +- drivers/cpu/bmips_cpu.c | 2 +- drivers/cpu/cpu-uclass.c | 2 +- drivers/cpu/cpu_sandbox.c | 2 +- drivers/cpu/imx8_cpu.c | 2 +- drivers/cpu/riscv_cpu.c | 2 +- drivers/ddr/altera/sdram_agilex.c | 2 +- drivers/ddr/altera/sdram_gen5.c | 6 +- drivers/ddr/altera/sdram_s10.c | 2 +- drivers/ddr/altera/sdram_soc64.c | 4 +- drivers/demo/demo-pdata.c | 10 +- drivers/demo/demo-shape.c | 2 +- drivers/demo/demo-simple.c | 2 +- drivers/gpio/altera_pio.c | 2 +- drivers/gpio/at91_gpio.c | 2 +- drivers/gpio/atmel_pio4.c | 2 +- drivers/gpio/bcm2835_gpio.c | 2 +- drivers/gpio/da8xx_gpio.c | 2 +- drivers/gpio/dwapb_gpio.c | 2 +- drivers/gpio/gpio-uclass.c | 2 +- drivers/gpio/hsdk-creg-gpio.c | 2 +- drivers/gpio/imx_rgpio2p.c | 10 +- drivers/gpio/intel_broadwell_gpio.c | 2 +- drivers/gpio/intel_ich6_gpio.c | 2 +- drivers/gpio/iproc_gpio.c | 2 +- drivers/gpio/mpc83xx_spisel_boot.c | 2 +- drivers/gpio/mpc8xxx_gpio.c | 2 +- drivers/gpio/mt7621_gpio.c | 2 +- drivers/gpio/mxc_gpio.c | 2 +- drivers/gpio/mxs_gpio.c | 4 +- drivers/gpio/nx_gpio.c | 2 +- drivers/gpio/omap_gpio.c | 6 +- drivers/gpio/pca953x_gpio.c | 2 +- drivers/gpio/pcf8575_gpio.c | 6 +- drivers/gpio/s5p_gpio.c | 4 +- drivers/gpio/sifive-gpio.c | 2 +- drivers/gpio/sunxi_gpio.c | 2 +- drivers/gpio/tegra186_gpio.c | 6 +- drivers/gpio/tegra_gpio.c | 4 +- drivers/gpio/vybrid_gpio.c | 2 +- drivers/gpio/xilinx_gpio.c | 92 +++++++++---------- drivers/gpio/zynq_gpio.c | 58 ++++++------ drivers/i2c/Kconfig | 2 +- drivers/i2c/acpi_i2c.c | 2 +- drivers/i2c/i2c-emul-uclass.c | 14 +-- drivers/i2c/i2c-uclass.c | 28 +++--- drivers/i2c/muxes/i2c-mux-uclass.c | 8 +- drivers/i2c/omap24xx_i2c.c | 2 +- drivers/i2c/sandbox_i2c.c | 2 +- drivers/led/led-uclass.c | 4 +- drivers/led/led_bcm6328.c | 4 +- drivers/led/led_bcm6358.c | 4 +- drivers/led/led_bcm6858.c | 4 +- drivers/led/led_cortina.c | 18 ++-- drivers/led/led_gpio.c | 4 +- drivers/misc/altera_sysid.c | 4 +- drivers/misc/cros_ec_i2c.c | 4 +- drivers/misc/fs_loader.c | 8 +- drivers/misc/i2c_eeprom_emul.c | 2 +- drivers/misc/imx8/scu.c | 2 +- drivers/misc/microchip_flexcom.c | 2 +- drivers/misc/p2sb-uclass.c | 14 +-- drivers/misc/p2sb_emul.c | 4 +- drivers/misc/rockchip-efuse.c | 2 +- drivers/misc/rockchip-otp.c | 2 +- drivers/misc/sandbox_adder.c | 2 +- drivers/misc/sifive-otp.c | 2 +- drivers/misc/swap_case.c | 2 +- drivers/mmc/am654_sdhci.c | 2 +- drivers/mmc/arm_pl180_mmci.c | 2 +- drivers/mmc/aspeed_sdhci.c | 2 +- drivers/mmc/atmel_sdhci.c | 2 +- drivers/mmc/bcm2835_sdhci.c | 2 +- drivers/mmc/bcm2835_sdhost.c | 2 +- drivers/mmc/bcmstb_sdhci.c | 2 +- drivers/mmc/ca_dw_mmc.c | 2 +- drivers/mmc/davinci_mmc.c | 2 +- drivers/mmc/exynos_dw_mmc.c | 2 +- drivers/mmc/fsl_esdhc.c | 2 +- drivers/mmc/fsl_esdhc_imx.c | 2 +- drivers/mmc/ftsdc010_mci.c | 2 +- drivers/mmc/gen_atmel_mci.c | 2 +- drivers/mmc/hi6220_dw_mmc.c | 2 +- drivers/mmc/iproc_sdhci.c | 2 +- drivers/mmc/jz_mmc.c | 2 +- drivers/mmc/meson_gx_mmc.c | 2 +- drivers/mmc/mmc-uclass.c | 6 +- drivers/mmc/mmc.c | 2 +- drivers/mmc/mmc_spi.c | 2 +- drivers/mmc/mmc_write.c | 4 +- drivers/mmc/msm_sdhci.c | 2 +- drivers/mmc/mtk-sd.c | 2 +- drivers/mmc/mv_sdhci.c | 2 +- drivers/mmc/mxsmmc.c | 4 +- drivers/mmc/nexell_dw_mmc.c | 2 +- drivers/mmc/omap_hsmmc.c | 2 +- drivers/mmc/pci_mmc.c | 2 +- drivers/mmc/pic32_sdhci.c | 2 +- drivers/mmc/renesas-sdhi.c | 2 +- drivers/mmc/rockchip_dw_mmc.c | 2 +- drivers/mmc/rockchip_sdhci.c | 2 +- drivers/mmc/s5p_sdhci.c | 2 +- drivers/mmc/sandbox_mmc.c | 2 +- drivers/mmc/sdhci-cadence.c | 2 +- drivers/mmc/sh_mmcif.c | 2 +- drivers/mmc/sh_sdhi.c | 2 +- drivers/mmc/snps_dw_mmc.c | 2 +- drivers/mmc/socfpga_dw_mmc.c | 2 +- drivers/mmc/sti_sdhci.c | 2 +- drivers/mmc/stm32_sdmmc2.c | 2 +- drivers/mmc/sunxi_mmc.c | 2 +- drivers/mmc/tangier_sdhci.c | 2 +- drivers/mmc/tegra_mmc.c | 2 +- drivers/mmc/uniphier-sd.c | 2 +- drivers/mmc/xenon_sdhci.c | 2 +- drivers/mmc/zynq_sdhci.c | 2 +- drivers/mtd/altera_qspi.c | 2 +- drivers/mtd/spi/Kconfig | 4 +- drivers/mtd/spi/sandbox.c | 4 +- drivers/net/ag7xxx.c | 2 +- drivers/net/altera_tse.c | 2 +- drivers/net/bcm6348-eth.c | 2 +- drivers/net/bcm6368-eth.c | 2 +- drivers/net/bcmgenet.c | 2 +- drivers/net/dc2114x.c | 2 +- drivers/net/designware.c | 4 +- drivers/net/dwc_eth_qos.c | 2 +- drivers/net/dwmac_s700.c | 2 +- drivers/net/dwmac_socfpga.c | 2 +- drivers/net/e1000.c | 2 +- drivers/net/eepro100.c | 2 +- drivers/net/ethoc.c | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/net/fm/eth.c | 2 +- drivers/net/fm/memac_phy.c | 2 +- drivers/net/fsl_enetc.c | 6 +- drivers/net/fsl_mcdmafec.c | 2 +- drivers/net/fsl_mdio.c | 2 +- drivers/net/ftgmac100.c | 2 +- drivers/net/ftmac100.c | 2 +- drivers/net/gmac_rockchip.c | 2 +- drivers/net/higmacv300.c | 2 +- drivers/net/ks8851_mll.c | 2 +- drivers/net/ldpaa_eth/ldpaa_eth.c | 2 +- drivers/net/macb.c | 2 +- drivers/net/mcffec.c | 2 +- drivers/net/mscc_eswitch/jr2_switch.c | 2 +- drivers/net/mscc_eswitch/luton_switch.c | 2 +- drivers/net/mscc_eswitch/ocelot_switch.c | 2 +- drivers/net/mscc_eswitch/serval_switch.c | 2 +- drivers/net/mscc_eswitch/servalt_switch.c | 2 +- drivers/net/mt7628-eth.c | 2 +- drivers/net/mtk_eth.c | 2 +- drivers/net/mvgbe.c | 2 +- drivers/net/mvneta.c | 2 +- drivers/net/mvpp2.c | 2 +- drivers/net/octeontx/nicvf_main.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 2 +- drivers/net/pch_gbe.c | 2 +- drivers/net/pcnet.c | 2 +- drivers/net/pfe_eth/pfe_eth.c | 2 +- drivers/net/pic32_eth.c | 2 +- drivers/net/qe/dm_qe_uec.c | 2 +- drivers/net/ravb.c | 2 +- drivers/net/rtl8139.c | 2 +- drivers/net/rtl8169.c | 4 +- drivers/net/sandbox-raw.c | 2 +- drivers/net/sandbox.c | 2 +- drivers/net/sh_eth.c | 2 +- drivers/net/smc911x.c | 2 +- drivers/net/sni_ave.c | 2 +- drivers/net/sun8i_emac.c | 2 +- drivers/net/sunxi_emac.c | 2 +- drivers/net/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ti/cpsw.c | 2 +- drivers/net/ti/davinci_emac.c | 2 +- drivers/net/ti/keystone_net.c | 4 +- drivers/net/tsec.c | 2 +- drivers/net/xilinx_axi_emac.c | 2 +- drivers/net/xilinx_emaclite.c | 2 +- drivers/net/zynq_gem.c | 2 +- drivers/nvme/nvme.c | 6 +- drivers/pci/pci-emul-uclass.c | 4 +- drivers/pci/pci-rcar-gen3.c | 2 +- drivers/pci/pci-uclass.c | 24 ++--- drivers/pci/pci_mvebu.c | 2 +- drivers/pci/pci_rom.c | 6 +- drivers/pci/pci_sandbox.c | 2 +- drivers/pci/pcie_mediatek.c | 2 +- drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- drivers/phy/phy-bcm-sr-pcie.c | 2 +- drivers/pinctrl/intel/pinctrl.c | 2 +- drivers/pinctrl/intel/pinctrl_apl.c | 4 +- drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- drivers/pinctrl/pinctrl-qe-io.c | 6 +- drivers/pinctrl/pinctrl-single.c | 8 +- drivers/pinctrl/pinctrl-sti.c | 2 +- drivers/pinctrl/pinctrl-stmfx.c | 4 +- drivers/pinctrl/renesas/pfc-r7s72100.c | 2 +- drivers/power/acpi_pmc/pmc_emul.c | 2 +- .../power/domain/imx8-power-domain-legacy.c | 2 +- drivers/power/domain/imx8m-power-domain.c | 2 +- drivers/power/pmic/i2c_pmic_emul.c | 2 +- drivers/power/regulator/act8846.c | 4 +- drivers/power/regulator/as3722_regulator.c | 8 +- drivers/power/regulator/bd71837.c | 6 +- drivers/power/regulator/da9063.c | 8 +- drivers/power/regulator/fan53555.c | 6 +- drivers/power/regulator/fixed.c | 14 +-- drivers/power/regulator/gpio-regulator.c | 10 +- drivers/power/regulator/lp873x_regulator.c | 24 ++--- drivers/power/regulator/lp87565_regulator.c | 12 +-- drivers/power/regulator/max77686.c | 8 +- drivers/power/regulator/palmas_regulator.c | 28 +++--- drivers/power/regulator/pbias_regulator.c | 4 +- drivers/power/regulator/pfuze100.c | 14 +-- drivers/power/regulator/pwm_regulator.c | 4 +- drivers/power/regulator/regulator-uclass.c | 48 +++++----- drivers/power/regulator/rk8xx.c | 12 +-- drivers/power/regulator/s2mps11_regulator.c | 8 +- drivers/power/regulator/s5m8767.c | 8 +- drivers/power/regulator/sandbox.c | 16 ++-- drivers/power/regulator/stpmic1.c | 28 +++--- drivers/power/regulator/tps62360_regulator.c | 2 +- drivers/power/regulator/tps65090_regulator.c | 4 +- drivers/power/regulator/tps65910_regulator.c | 10 +- drivers/power/regulator/tps65941_regulator.c | 24 ++--- drivers/ram/imxrt_sdram.c | 2 +- drivers/ram/octeon/octeon_ddr.c | 2 +- drivers/ram/rockchip/dmc-rk3368.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 2 +- drivers/ram/rockchip/sdram_rk322x.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/ram/sifive/fu540_ddr.c | 2 +- drivers/ram/stm32_sdram.c | 2 +- drivers/remoteproc/rproc-uclass.c | 14 +-- drivers/remoteproc/sandbox_testproc.c | 18 ++-- drivers/remoteproc/ti_power_proc.c | 6 +- drivers/rng/meson-rng.c | 2 +- drivers/rng/stm32mp1_rng.c | 2 +- drivers/rtc/i2c_rtc_emul.c | 2 +- drivers/rtc/pcf2127.c | 2 +- drivers/rtc/pl031.c | 2 +- drivers/scsi/scsi-uclass.c | 2 +- drivers/scsi/scsi.c | 16 ++-- drivers/serial/altera_jtag_uart.c | 10 +- drivers/serial/altera_uart.c | 10 +- drivers/serial/atmel_usart.c | 4 +- drivers/serial/lpc32xx_hsuart.c | 4 +- drivers/serial/ns16550.c | 8 +- drivers/serial/sandbox.c | 10 +- drivers/serial/serial_arc.c | 10 +- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_bcm283x_pl011.c | 2 +- drivers/serial/serial_coreboot.c | 2 +- drivers/serial/serial_intel_mid.c | 2 +- drivers/serial/serial_linflexuart.c | 2 +- drivers/serial/serial_lpuart.c | 12 +-- drivers/serial/serial_mcf.c | 12 +-- drivers/serial/serial_meson.c | 14 +-- drivers/serial/serial_mvebu_a3700.c | 2 +- drivers/serial/serial_mxc.c | 14 +-- drivers/serial/serial_omap.c | 4 +- drivers/serial/serial_pl01x.c | 2 +- drivers/serial/serial_pxa.c | 10 +- drivers/serial/serial_rockchip.c | 6 +- drivers/serial/serial_s5p.c | 14 +-- drivers/serial/serial_sh.c | 2 +- drivers/serial/serial_sifive.c | 32 +++---- drivers/serial/serial_stm32.c | 2 +- drivers/serial/serial_xuartlite.c | 2 +- drivers/serial/serial_zynq.c | 32 +++---- drivers/soc/soc_ti_k3.c | 2 +- drivers/sound/ivybridge_sound.c | 2 +- drivers/spi/altera_spi.c | 4 +- drivers/spi/atcspi200_spi.c | 2 +- drivers/spi/ath79_spi.c | 2 +- drivers/spi/atmel_spi.c | 8 +- drivers/spi/bcm63xx_hsspi.c | 4 +- drivers/spi/bcm63xx_spi.c | 4 +- drivers/spi/bcmstb_spi.c | 2 +- drivers/spi/cadence_qspi.c | 14 +-- drivers/spi/cf_spi.c | 10 +- drivers/spi/davinci_spi.c | 10 +- drivers/spi/designware_spi.c | 6 +- drivers/spi/exynos_spi.c | 6 +- drivers/spi/fsl_dspi.c | 12 +-- drivers/spi/fsl_espi.c | 6 +- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/ich.c | 6 +- drivers/spi/kirkwood_spi.c | 2 +- drivers/spi/mpc8xxx_spi.c | 16 ++-- drivers/spi/mscc_bb_spi.c | 2 +- drivers/spi/mvebu_a3700_spi.c | 2 +- drivers/spi/mxc_spi.c | 8 +- drivers/spi/mxs_spi.c | 4 +- drivers/spi/nxp_fspi.c | 2 +- drivers/spi/octeon_spi.c | 2 +- drivers/spi/omap3_spi.c | 6 +- drivers/spi/pic32_spi.c | 2 +- drivers/spi/pl022_spi.c | 4 +- drivers/spi/renesas_rpc_spi.c | 2 +- drivers/spi/rk_spi.c | 10 +- drivers/spi/sh_qspi.c | 2 +- drivers/spi/soft_spi.c | 6 +- drivers/spi/spi-qup.c | 2 +- drivers/spi/spi-sifive.c | 2 +- drivers/spi/spi-sunxi.c | 4 +- drivers/spi/spi-uclass.c | 12 +-- drivers/spi/stm32_qspi.c | 2 +- drivers/spi/stm32_spi.c | 2 +- drivers/spi/tegra114_spi.c | 6 +- drivers/spi/tegra20_sflash.c | 6 +- drivers/spi/tegra20_slink.c | 6 +- drivers/spi/tegra210_qspi.c | 6 +- drivers/spi/ti_qspi.c | 8 +- drivers/spi/uniphier_spi.c | 10 +- drivers/spi/xilinx_spi.c | 4 +- drivers/spi/zynq_qspi.c | 8 +- drivers/spi/zynq_spi.c | 12 +-- drivers/spi/zynqmp_gqspi.c | 8 +- drivers/sysreset/sysreset_x86.c | 2 +- drivers/tee/optee/core.c | 2 +- drivers/thermal/imx_scu_thermal.c | 2 +- drivers/thermal/imx_tmu.c | 2 +- drivers/timer/ag101p_timer.c | 6 +- drivers/timer/altera_timer.c | 6 +- drivers/timer/atcpit100_timer.c | 2 +- drivers/timer/atmel_pit_timer.c | 2 +- drivers/timer/rockchip_timer.c | 2 +- drivers/timer/timer-uclass.c | 2 +- drivers/tpm/cr50_i2c.c | 2 +- drivers/tpm/tpm_tis_st33zp24_spi.c | 2 +- drivers/ufs/ufs.c | 2 +- drivers/usb/cdns3/cdns3-ti.c | 2 +- drivers/usb/dwc3/dwc3-generic.c | 6 +- drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- drivers/usb/dwc3/dwc3-meson-gxl.c | 2 +- drivers/usb/emul/sandbox_flash.c | 2 +- drivers/usb/emul/sandbox_hub.c | 8 +- drivers/usb/emul/sandbox_keyb.c | 2 +- drivers/usb/emul/usb-emul-uclass.c | 14 +-- drivers/usb/eth/asix.c | 2 +- drivers/usb/eth/asix88179.c | 2 +- drivers/usb/eth/lan75xx.c | 2 +- drivers/usb/eth/lan78xx.c | 2 +- drivers/usb/eth/mcs7830.c | 2 +- drivers/usb/eth/r8152.c | 2 +- drivers/usb/eth/smsc95xx.c | 2 +- drivers/usb/gadget/dwc2_udc_otg.c | 53 ++++++----- drivers/usb/gadget/ether.c | 2 +- drivers/usb/gadget/max3420_udc.c | 2 +- drivers/usb/host/dwc3-of-simple.c | 2 +- drivers/usb/host/dwc3-sti-glue.c | 2 +- drivers/usb/host/ehci-atmel.c | 2 +- drivers/usb/host/ehci-exynos.c | 2 +- drivers/usb/host/ehci-fsl.c | 2 +- drivers/usb/host/ehci-marvell.c | 2 +- drivers/usb/host/ehci-msm.c | 2 +- drivers/usb/host/ehci-mx5.c | 2 +- drivers/usb/host/ehci-mx6.c | 2 +- drivers/usb/host/ehci-omap.c | 2 +- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ehci-tegra.c | 2 +- drivers/usb/host/ehci-vf.c | 2 +- drivers/usb/host/ehci-zynq.c | 2 +- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/usb-uclass.c | 14 +-- drivers/usb/host/xhci-brcm.c | 2 +- drivers/usb/host/xhci-dwc3.c | 2 +- drivers/usb/host/xhci-exynos5.c | 2 +- drivers/usb/host/xhci-fsl.c | 2 +- drivers/usb/host/xhci-mvebu.c | 2 +- drivers/usb/host/xhci-pci.c | 2 +- drivers/usb/host/xhci-rcar.c | 2 +- drivers/usb/musb-new/da8xx.c | 48 +++++----- drivers/usb/musb-new/mt85xx.c | 2 +- drivers/usb/musb-new/omap2430.c | 67 +++++++------- drivers/usb/musb-new/pic32.c | 2 +- drivers/usb/musb-new/sunxi.c | 2 +- drivers/usb/musb-new/ti-musb.c | 54 +++++------ drivers/video/am335x-fb.c | 6 +- drivers/video/atmel_hlcdfb.c | 4 +- drivers/video/atmel_lcdfb.c | 6 +- drivers/video/bcm2835.c | 2 +- drivers/video/bridge/anx6345.c | 8 +- drivers/video/bridge/ps862x.c | 2 +- drivers/video/broadwell_igd.c | 6 +- drivers/video/coreboot.c | 2 +- drivers/video/display-uclass.c | 6 +- drivers/video/efi.c | 2 +- drivers/video/exynos/exynos_fb.c | 4 +- drivers/video/fsl_dcu_fb.c | 4 +- drivers/video/imx/mxc_ipuv3_fb.c | 6 +- drivers/video/ivybridge_igd.c | 4 +- drivers/video/mali_dp.c | 4 +- drivers/video/meson/meson_plane.c | 2 +- drivers/video/meson/meson_vpu.c | 4 +- drivers/video/mvebu_lcd.c | 4 +- drivers/video/mxsfb.c | 6 +- drivers/video/nexell_display.c | 10 +- drivers/video/orisetech_otm8009a.c | 2 +- drivers/video/pwm_backlight.c | 4 +- drivers/video/raydium-rm68200.c | 2 +- drivers/video/rockchip/rk3288_hdmi.c | 4 +- drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3399_hdmi.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk_edp.c | 2 +- drivers/video/rockchip/rk_lvds.c | 2 +- drivers/video/rockchip/rk_vop.c | 6 +- drivers/video/sandbox_sdl.c | 6 +- drivers/video/simplefb.c | 2 +- drivers/video/stm32/stm32_ltdc.c | 4 +- drivers/video/sunxi/sunxi_de2.c | 8 +- drivers/video/sunxi/sunxi_dw_hdmi.c | 2 +- drivers/video/tegra.c | 4 +- drivers/video/tegra124/display.c | 6 +- drivers/video/tegra124/dp.c | 4 +- drivers/video/vesa.c | 4 +- drivers/video/video-uclass.c | 6 +- drivers/virtio/virtio_blk.c | 4 +- drivers/virtio/virtio_net.c | 2 +- drivers/virtio/virtio_pci_legacy.c | 2 +- drivers/virtio/virtio_pci_modern.c | 2 +- drivers/w1-eeprom/ds24xxx.c | 2 +- drivers/w1-eeprom/ds2502.c | 2 +- drivers/w1-eeprom/w1-eeprom-uclass.c | 4 +- drivers/w1/mxc_w1.c | 2 +- drivers/w1/w1-gpio.c | 2 +- drivers/w1/w1-uclass.c | 6 +- drivers/watchdog/xilinx_tb_wdt.c | 38 ++++---- drivers/watchdog/xilinx_wwdt.c | 14 +-- drivers/xen/pvblock.c | 26 +++--- include/adc.h | 4 +- include/blk.h | 2 +- include/cpu.h | 2 +- include/dm/device-internal.h | 10 +- include/dm/device.h | 56 +++++------ include/dm/lists.h | 2 +- include/dm/pci.h | 2 +- include/dm/platdata.h | 6 +- include/dm/root.h | 2 +- include/dm/uclass.h | 12 +-- include/dwmmc.h | 2 +- include/i2c.h | 2 +- include/net.h | 2 +- include/pci.h | 2 +- include/power/regulator.h | 26 +++--- include/remoteproc.h | 2 +- include/sdhci.h | 2 +- include/spi.h | 10 +- include/usb.h | 4 +- include/video.h | 4 +- lib/acpi/acpi_device.c | 4 +- lib/efi_driver/efi_block_device.c | 20 ++-- lib/efi_loader/efi_device_path.c | 14 +-- lib/efi_loader/efi_disk.c | 2 +- lib/smbios.c | 2 +- net/eth-uclass.c | 10 +- net/mdio-mux-uclass.c | 6 +- test/dm/acpi.c | 2 +- test/dm/adc.c | 2 +- test/dm/blk.c | 2 +- test/dm/bus.c | 56 +++++------ test/dm/core.c | 38 ++++---- test/dm/devres.c | 2 +- test/dm/gpio.c | 2 +- test/dm/ofread.c | 2 +- test/dm/regulator.c | 18 ++-- test/dm/test-fdt.c | 14 +-- test/dm/test-uclass.c | 6 +- tools/dtoc/dtb_platdata.py | 2 +- tools/dtoc/test_dtoc.py | 66 ++++++------- 575 files changed, 1633 insertions(+), 1644 deletions(-)

diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index f43a2460f90..1649f6d9480 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -46,7 +46,7 @@ static const struct imx_thermal_plat imx6_thermal_plat = {

U_BOOT_DEVICE(imx6_thermal) = { .name = "imx_thermal", - .platdata = &imx6_thermal_plat, + .plat = &imx6_thermal_plat, }; #endif

diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index d0385b36e43..13593994f14 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -62,7 +62,7 @@ static const struct imx_thermal_plat imx7_thermal_plat = {

U_BOOT_DEVICE(imx7_thermal) = { .name = "imx_thermal", - .platdata = &imx7_thermal_plat, + .plat = &imx7_thermal_plat, }; #endif

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 2888390d240..4335ee84ec8 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -157,7 +157,7 @@ static const struct omap3_spi_plat omap3_spi_pdata = {

U_BOOT_DEVICE(am33xx_spi) = { .name = "omap3_spi", - .platdata = &omap3_spi_pdata, + .plat = &omap3_spi_pdata, }; #endif #endif diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index 94673f34c9b..8ccd5afb560 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -46,7 +46,7 @@ static int spl_node_to_boot_device(int node) dev; device_find_next_child(&dev)) { if (device_get_uclass_id(dev) == UCLASS_BLK) { - desc = dev_get_uclass_platdata(dev); + desc = dev_get_uclass_plat(dev); break; } } @@ -99,7 +99,7 @@ __weak const char *board_spl_was_booted_from(void)

void board_boot_order(u32 *spl_boot_list) { - /* In case of no fdt (or only platdata), use spl_boot_device() */ + /* In case of no fdt (or only plat), use spl_boot_device() */ if (!CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_PLATDATA)) { spl_boot_list[0] = spl_boot_device(); return; diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index cb9208981e7..a41824cc2fc 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -513,7 +513,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = { .id = UCLASS_MISC, .of_match = stm32mp_bsec_ids, .ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata, - .platdata_auto = sizeof(struct stm32mp_bsec_platdata), + .plat_auto = sizeof(struct stm32mp_bsec_platdata), .ops = &stm32mp_bsec_ops, .probe = stm32mp_bsec_probe, }; diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c index 7985049f9b1..4f468715515 100644 --- a/arch/arm/mach-stm32mp/pwr_regulator.c +++ b/arch/arm/mach-stm32mp/pwr_regulator.c @@ -135,9 +135,9 @@ static const struct stm32mp_pwr_reg_info *stm32mp_pwr_reg_infos[] = { static int stm32mp_pwr_regulator_probe(struct udevice *dev) { const struct stm32mp_pwr_reg_info **p = stm32mp_pwr_reg_infos; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

while (*p) { int rc; @@ -172,9 +172,9 @@ static int stm32mp_pwr_regulator_probe(struct udevice *dev)

static int stm32mp_pwr_regulator_set_value(struct udevice *dev, int uV) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

@@ -188,9 +188,9 @@ static int stm32mp_pwr_regulator_set_value(struct udevice *dev, int uV)

static int stm32mp_pwr_regulator_get_value(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c index 4b627e325ec..cb5a8161a9e 100644 --- a/arch/x86/cpu/apollolake/hostbridge.c +++ b/arch/x86/cpu/apollolake/hostbridge.c @@ -403,7 +403,7 @@ U_BOOT_DRIVER(intel_apl_hostbridge) = { .ofdata_to_platdata = apl_hostbridge_ofdata_to_platdata, .probe = apl_hostbridge_probe, .remove = apl_hostbridge_remove, - .platdata_auto = sizeof(struct apl_hostbridge_platdata), + .plat_auto = sizeof(struct apl_hostbridge_platdata), ACPI_OPS_PTR(&apl_hostbridge_acpi_ops) .flags = DM_FLAG_OS_PREPARE, }; diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index 82e2187c505..10a4b028622 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -224,5 +224,5 @@ U_BOOT_DRIVER(intel_apl_pmc) = { .ofdata_to_platdata = apl_pmc_ofdata_to_uc_platdata, .probe = apl_pmc_probe, .ops = &apl_pmc_ops, - .platdata_auto = sizeof(struct apl_pmc_platdata), + .plat_auto = sizeof(struct apl_pmc_platdata), }; diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index 324dd6c9f1b..4110619a77e 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -85,7 +85,7 @@ static int apl_flash_probe(struct udevice *dev)

/* * Manually set the parent of the SPI flash to SPI, since dtoc doesn't. We also - * need to allocate the parent_platdata since by the time this function is + * need to allocate the parent_plat since by the time this function is * called device_bind() has already gone past that step. */ static int apl_flash_bind(struct udevice *dev) @@ -104,7 +104,7 @@ static int apl_flash_bind(struct udevice *dev) plat = calloc(sizeof(*plat), 1); if (!plat) return -ENOMEM; - dev->parent_platdata = plat; + dev->parent_plat = plat; }

return 0; diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c index 6695234dce7..44eba0ccaa3 100644 --- a/arch/x86/cpu/apollolake/uart.c +++ b/arch/x86/cpu/apollolake/uart.c @@ -92,7 +92,7 @@ static int apl_ns16550_ofdata_to_platdata(struct udevice *dev) struct ns16550_platdata *plat;

/* - * Convert our platdata to the ns16550's platdata, so we can just use + * Convert our plat to the ns16550's plat, so we can just use * that driver */ plat = malloc(sizeof(*plat)); @@ -105,7 +105,7 @@ static int apl_ns16550_ofdata_to_platdata(struct udevice *dev) plat->clock = dtplat->clock_frequency; plat->fcr = UART_FCR_DEFVAL; plat->bdf = pci_ofplat_get_devfn(dtplat->reg[0]); - dev->platdata = plat; + dev->plat = plat; #else int ret;

@@ -126,7 +126,7 @@ U_BOOT_DRIVER(intel_apl_ns16550) = { .name = "intel_apl_ns16550", .id = UCLASS_SERIAL, .of_match = apl_ns16550_serial_ids, - .platdata_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_platdata), .priv_auto = sizeof(struct NS16550), .ops = &ns16550_serial_ops, .ofdata_to_platdata = apl_ns16550_ofdata_to_platdata, diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index a31f5234220..fdb6eec0852 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -266,5 +266,5 @@ U_BOOT_DRIVER(ahci_broadwell_drv) = { .of_match = broadwell_ahci_ids, .ofdata_to_platdata = broadwell_sata_ofdata_to_platdata, .probe = broadwell_sata_probe, - .platdata_auto = sizeof(struct sata_platdata), + .plat_auto = sizeof(struct sata_platdata), }; diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index 7e83051646c..57441c1919b 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR;

int cpu_x86_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev); struct cpuid_result res;

plat->cpu_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c index ed0dad320e1..ea6aa4352eb 100644 --- a/arch/x86/cpu/intel_common/itss.c +++ b/arch/x86/cpu/intel_common/itss.c @@ -242,6 +242,6 @@ U_BOOT_DRIVER(intel_itss) = { .ops = &itss_ops, .bind = itss_bind, .ofdata_to_platdata = itss_ofdata_to_platdata, - .platdata_auto = sizeof(struct itss_platdata), + .plat_auto = sizeof(struct itss_platdata), .priv_auto = sizeof(struct itss_priv), }; diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 40de1d34a3d..5f7ae2dbc31 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -167,7 +167,7 @@ static int p2sb_remove(struct udevice *dev) static int p2sb_child_post_bind(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct p2sb_child_platdata *pplat = dev_get_parent_platdata(dev); + struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); int ret; u32 pid;

@@ -197,8 +197,8 @@ U_BOOT_DRIVER(intel_p2sb) = { .remove = p2sb_remove, .ops = &p2sb_ops, .ofdata_to_platdata = p2sb_ofdata_to_platdata, - .platdata_auto = sizeof(struct p2sb_platdata), - .per_child_platdata_auto = + .plat_auto = sizeof(struct p2sb_platdata), + .per_child_plat_auto = sizeof(struct p2sb_child_platdata), .child_post_bind = p2sb_child_post_bind, .flags = DM_FLAG_OS_PREPARE, diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index 5bb7abdf873..2b0689ac6af 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -221,7 +221,7 @@ static int find_cpu_by_apic_id(int apic_id, struct udevice **devp) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev);

if (plat->cpu_id == apic_id) { *devp = dev; @@ -706,7 +706,7 @@ static int ap_wait_for_instruction(struct udevice *cpu, void *unused)

static int mp_init_cpu(struct udevice *cpu, void *unused) { - struct cpu_platdata *plat = dev_get_parent_platdata(cpu); + struct cpu_platdata *plat = dev_get_parent_plat(cpu);

plat->ucode_version = microcode_read_rev(); plat->device_id = gd->arch.x86_device; diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c index 349bab1583a..a169783e2cf 100644 --- a/arch/x86/cpu/qfw_cpu.c +++ b/arch/x86/cpu/qfw_cpu.c @@ -67,7 +67,7 @@ int qemu_cpu_fixup(void) printf("binding cpu@%d failed: %d\n", cpu_num, ret); return ret; } - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); plat->cpu_id = cpu_num; } return 0; diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c index 5ffce9835d0..34d09ee9c42 100644 --- a/arch/x86/cpu/slimbootloader/serial.c +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -18,7 +18,7 @@ static int slimbootloader_serial_ofdata_to_platdata(struct udevice *dev) { const efi_guid_t guid = SBL_SERIAL_PORT_INFO_GUID; struct sbl_serial_port_info *data; - struct ns16550_platdata *plat = dev->platdata; + struct ns16550_platdata *plat = dev->plat;

if (!gd->arch.hob_list) panic("hob list not found!"); @@ -58,7 +58,7 @@ U_BOOT_DRIVER(serial_slimbootloader) = { .id = UCLASS_SERIAL, .of_match = slimbootloader_serial_ids, .ofdata_to_platdata = slimbootloader_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_platdata), .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h index 00868d17258..fc59a42463e 100644 --- a/arch/x86/include/asm/intel_pinctrl.h +++ b/arch/x86/include/asm/intel_pinctrl.h @@ -162,7 +162,7 @@ extern const struct pinctrl_ops intel_pinctrl_ops; int intel_pinctrl_probe(struct udevice *dev);

/** - * intel_pinctrl_ofdata_to_platdata() - Handle common platdata setup + * intel_pinctrl_ofdata_to_platdata() - Handle common plat setup * * @dev: Pinctrl device * @comm: Pad community for this device diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 4fd8dc8ad9a..796d3689b3f 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -74,7 +74,7 @@ int acpi_create_madt_lapics(u32 current) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev); int length;

length = acpi_create_madt_lapic( diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index 6534b6690bd..e4c43fb76dd 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -80,7 +80,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa)

static int fsp_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct vesa_mode_info *vesa = &mode_info.vesa; int ret; @@ -124,7 +124,7 @@ err:

static int fsp_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ plat->size = 2560 * 1600 * 4; diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index 1c49c41b310..d6f0e9517fa 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -81,7 +81,7 @@ void mp_write_processor(struct mp_config_table *mc) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev); u8 cpuflag = MPC_CPU_EN;

if (!device_active(dev)) diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c index b48bd5d8f36..7de0aa0d702 100644 --- a/arch/x86/lib/sfi.c +++ b/arch/x86/lib/sfi.c @@ -84,7 +84,7 @@ static int sfi_write_cpus(struct table_info *tab) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev);

if (!device_active(dev)) continue; diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 19871bee146..80a5f95e015 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -45,7 +45,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(integrator_serials) = { .name = "serial_pl01x", - .platdata = &serial_platdata, + .plat = &serial_platdata, };

void peripheral_power_enable (void); diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c index 0be6435fe3b..35e8743e495 100644 --- a/board/armltd/total_compute/total_compute.c +++ b/board/armltd/total_compute/total_compute.c @@ -17,7 +17,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(total_compute_serials) = { .name = "serial_pl01x", - .platdata = &serial_platdata, + .plat = &serial_platdata, };

static struct mm_region total_compute_mem_map[] = { diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 52ada0f6bce..89710e0ffa8 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -28,7 +28,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(vexpress_serials) = { .name = "serial_pl01x", - .platdata = &serial_platdata, + .plat = &serial_platdata, };

static struct mm_region vexpress64_mem_map[] = { diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index dc9871d4469..993ba8299f8 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -422,5 +422,5 @@ static struct atmel_serial_platdata at91sam9260_serial_plat = {

U_BOOT_DEVICE(at91sam9260_serial) = { .name = "serial_atmel", - .platdata = &at91sam9260_serial_plat, + .plat = &at91sam9260_serial_plat, }; diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c index 9b0a75ac5df..12fb87441e0 100644 --- a/board/bluewater/snapper9260/snapper9260.c +++ b/board/bluewater/snapper9260/snapper9260.c @@ -149,5 +149,5 @@ static struct atmel_serial_platdata at91sam9260_serial_plat = {

U_BOOT_DEVICE(at91sam9260_serial) = { .name = "serial_atmel", - .platdata = &at91sam9260_serial_plat, + .plat = &at91sam9260_serial_plat, }; diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index 5811c43142c..29db51b0260 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -106,5 +106,5 @@ static struct ethoc_eth_pdata ethoc_pdata = {

U_BOOT_DEVICE(ethoc) = { .name = "ethoc", - .platdata = &ethoc_pdata, + .plat = &ethoc_pdata, }; diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c index f8c2913eace..b8f060b1e8f 100644 --- a/board/cavium/thunderx/thunderx.c +++ b/board/cavium/thunderx/thunderx.c @@ -27,7 +27,7 @@ static const struct pl01x_serial_platdata serial0 = {

U_BOOT_DEVICE(thunderx_serial0) = { .name = "serial_pl01x", - .platdata = &serial0, + .plat = &serial0, };

static const struct pl01x_serial_platdata serial1 = { @@ -39,7 +39,7 @@ static const struct pl01x_serial_platdata serial1 = {

U_BOOT_DEVICE(thunderx_serial1) = { .name = "serial_pl01x", - .platdata = &serial1, + .plat = &serial1, }; #endif

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index e2712680f95..6b3d0345424 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -730,7 +730,7 @@ static struct mxc_serial_platdata cm_fx6_mxc_serial_plat = {

U_BOOT_DEVICE(cm_fx6_serial) = { .name = "serial_mxc", - .platdata = &cm_fx6_mxc_serial_plat, + .plat = &cm_fx6_mxc_serial_plat, };

#if CONFIG_IS_ENABLED(AHCI) diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 6bab7b18d44..cdfe8051e2c 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -365,7 +365,7 @@ static const struct ns16550_platdata serial_pdata = {

U_BOOT_DEVICE(omapl138_uart) = { .name = "ns16550_serial", - .platdata = &serial_pdata, + .plat = &serial_pdata, };

static const struct davinci_mmc_plat mmc_platdata = { @@ -381,7 +381,7 @@ static const struct davinci_mmc_plat mmc_platdata = { }; U_BOOT_DEVICE(omapl138_mmc) = { .name = "ti_da830_mmc", - .platdata = &mmc_platdata, + .plat = &mmc_platdata, };

void spl_board_init(void) diff --git a/board/freescale/ls1012afrdm/eth.c b/board/freescale/ls1012afrdm/eth.c index eaea1c46e48..85104ab22c8 100644 --- a/board/freescale/ls1012afrdm/eth.c +++ b/board/freescale/ls1012afrdm/eth.c @@ -116,10 +116,10 @@ static struct pfe_eth_pdata pfe_pdata1 = {

U_BOOT_DEVICE(ls1012a_pfe0) = { .name = "pfe_eth", - .platdata = &pfe_pdata0, + .plat = &pfe_pdata0, };

U_BOOT_DEVICE(ls1012a_pfe1) = { .name = "pfe_eth", - .platdata = &pfe_pdata1, + .plat = &pfe_pdata1, }; diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c index b4ef60738eb..f6f43d2b137 100644 --- a/board/freescale/ls1012aqds/eth.c +++ b/board/freescale/ls1012aqds/eth.c @@ -300,10 +300,10 @@ static struct pfe_eth_pdata pfe_pdata1 = {

U_BOOT_DEVICE(ls1012a_pfe0) = { .name = "pfe_eth", - .platdata = &pfe_pdata0, + .plat = &pfe_pdata0, };

U_BOOT_DEVICE(ls1012a_pfe1) = { .name = "pfe_eth", - .platdata = &pfe_pdata1, + .plat = &pfe_pdata1, }; diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c index a65ff4dc9c4..5e923e52527 100644 --- a/board/freescale/ls1012ardb/eth.c +++ b/board/freescale/ls1012ardb/eth.c @@ -162,10 +162,10 @@ static struct pfe_eth_pdata pfe_pdata1 = {

U_BOOT_DEVICE(ls1012a_pfe0) = { .name = "pfe_eth", - .platdata = &pfe_pdata0, + .plat = &pfe_pdata0, };

U_BOOT_DEVICE(ls1012a_pfe1) = { .name = "pfe_eth", - .platdata = &pfe_pdata1, + .plat = &pfe_pdata1, }; diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 0ff987eeb4e..457b466a0bb 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -64,7 +64,7 @@ static struct pl01x_serial_platdata serial0 = {

U_BOOT_DEVICE(nxp_serial0) = { .name = "serial_pl01x", - .platdata = &serial0, + .plat = &serial0, };

static struct pl01x_serial_platdata serial1 = { @@ -74,7 +74,7 @@ static struct pl01x_serial_platdata serial1 = {

U_BOOT_DEVICE(nxp_serial1) = { .name = "serial_pl01x", - .platdata = &serial1, + .plat = &serial1, };

int select_i2c_ch_pca9547(u8 ch) diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 9f043d815ab..73577d7b71d 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1377,5 +1377,5 @@ static struct mxc_serial_platdata ventana_mxc_serial_plat = {

U_BOOT_DEVICE(ventana_serial) = { .name = "serial_mxc", - .platdata = &ventana_mxc_serial_plat, + .plat = &ventana_mxc_serial_plat, }; diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index e89ff1a43de..26340da9458 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -91,7 +91,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(hikey_seriala) = { .name = "serial_pl01x", - .platdata = &serial_platdata, + .plat = &serial_platdata, }; #endif

diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c index db485db10a9..75a5fdac5dd 100644 --- a/board/hisilicon/hikey960/hikey960.c +++ b/board/hisilicon/hikey960/hikey960.c @@ -34,7 +34,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(hikey960_serial0) = { .name = "serial_pl01x", - .platdata = &serial_platdata, + .plat = &serial_platdata, }; #endif

diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 371c3c33fc8..8c8015e88b5 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -48,7 +48,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(poplar_serial) = { .name = "serial_pl01x", - .platdata = &serial_platdata, + .plat = &serial_platdata, }; #endif

diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index dff159025b1..372abab7e8f 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -39,7 +39,7 @@ static const struct ns16550_platdata serial_omap_platdata = {

U_BOOT_DEVICE(sniper_serial) = { .name = "ns16550_serial", - .platdata = &serial_omap_platdata + .plat = &serial_omap_platdata };

static struct musb_hdrc_config musb_config = { diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c index eed055aedb3..9efae901936 100644 --- a/board/siemens/corvus/board.c +++ b/board/siemens/corvus/board.c @@ -320,5 +320,5 @@ static struct atmel_serial_platdata at91sam9260_serial_plat = {

U_BOOT_DEVICE(at91sam9260_serial) = { .name = "serial_atmel", - .platdata = &at91sam9260_serial_plat, + .plat = &at91sam9260_serial_plat, }; diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c index 8c827adc2ed..5765e42e12b 100644 --- a/board/st/stv0991/stv0991.c +++ b/board/st/stv0991/stv0991.c @@ -32,7 +32,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(stv09911_serials) = { .name = "serial_pl01x", - .platdata = &serial_platdata, + .plat = &serial_platdata, }; #endif

diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c index 4502005941f..83902061533 100644 --- a/board/sysam/amcore/amcore.c +++ b/board/sysam/amcore/amcore.c @@ -115,5 +115,5 @@ static struct coldfire_serial_platdata mcf5307_serial_plat = {

U_BOOT_DEVICE(coldfire_serial) = { .name = "serial_coldfire", - .platdata = &mcf5307_serial_plat, + .plat = &mcf5307_serial_plat, }; diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 984cc5e3ba5..39be479d157 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -885,7 +885,7 @@ int board_late_init(void) } #endif

-/* CPSW platdata */ +/* CPSW plat */ #if !CONFIG_IS_ENABLED(OF_CONTROL) struct cpsw_slave_data slave_data[] = { { @@ -929,7 +929,7 @@ struct eth_pdata cpsw_pdata = {

U_BOOT_DEVICE(am335x_eth) = { .name = "eth_cpsw", - .platdata = &cpsw_pdata, + .plat = &cpsw_pdata, }; #endif

@@ -974,7 +974,7 @@ static const struct omap_hsmmc_plat am335x_mmc0_platdata = {

U_BOOT_DEVICE(am335x_mmc0) = { .name = "omap_hsmmc", - .platdata = &am335x_mmc0_platdata, + .plat = &am335x_mmc0_platdata, };

static const struct omap_hsmmc_plat am335x_mmc1_platdata = { @@ -988,6 +988,6 @@ static const struct omap_hsmmc_plat am335x_mmc1_platdata = {

U_BOOT_DEVICE(am335x_mmc1) = { .name = "omap_hsmmc", - .platdata = &am335x_mmc1_platdata, + .plat = &am335x_mmc1_platdata, }; #endif diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 3961c4df9e2..a9588c5d604 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -1151,5 +1151,5 @@ static struct mxc_serial_platdata mxc_serial_plat = {

U_BOOT_DEVICE(mxc_serial) = { .name = "serial_mxc", - .platdata = &mxc_serial_plat, + .plat = &mxc_serial_plat, }; diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 45f8da3c42f..9e7f34907f2 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -210,5 +210,5 @@ static struct mxc_serial_platdata mxc_serial_plat = {

U_BOOT_DEVICE(mxc_serial) = { .name = "serial_mxc", - .platdata = &mxc_serial_plat, + .plat = &mxc_serial_plat, }; diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index a416b5e54b3..282de18da3d 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1093,5 +1093,5 @@ static struct mxc_serial_platdata mxc_serial_plat = {

U_BOOT_DEVICE(mxc_serial) = { .name = "serial_mxc", - .platdata = &mxc_serial_plat, + .plat = &mxc_serial_plat, }; diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index 273a17f608d..702a31d8c12 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -135,7 +135,7 @@ static const struct pxa_mmc_plat mmc_platdata = {

U_BOOT_DEVICE(pxa_mmcs) = { .name = "pxa_mmc", - .platdata = &mmc_platdata, + .plat = &mmc_platdata, }; #endif /* !CONFIG_IS_ENABLED(DM_MMC) */ #endif @@ -148,5 +148,5 @@ static const struct pxa_serial_platdata serial_platdata = {

U_BOOT_DEVICE(pxa_serials) = { .name = "serial_pxa", - .platdata = &serial_platdata, + .plat = &serial_platdata, }; diff --git a/cmd/Kconfig b/cmd/Kconfig index 1595de999b5..904c8de1803 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1908,7 +1908,7 @@ config CMD_REGULATOR

The '-f' (force) option can be used for set the value which exceeds the limits, which are found in device-tree and are kept in regulator's - uclass platdata structure. + uclass plat structure.

endmenu

diff --git a/cmd/button.c b/cmd/button.c index 64c5a8fa046..1b45d0a2a03 100644 --- a/cmd/button.c +++ b/cmd/button.c @@ -37,7 +37,7 @@ static int list_buttons(void) for (uclass_find_first_device(UCLASS_BUTTON, &dev); dev; uclass_find_next_device(&dev)) { - struct button_uc_plat *plat = dev_get_uclass_platdata(dev); + struct button_uc_plat *plat = dev_get_uclass_plat(dev);

if (!plat->label) continue; diff --git a/cmd/cpu.c b/cmd/cpu.c index af2a42a6c25..07d6b094584 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -26,7 +26,7 @@ static int print_cpu_list(bool detail) for (uclass_first_device(UCLASS_CPU, &dev); dev; uclass_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev); struct cpu_info info; bool first = true; int ret, i; diff --git a/cmd/demo.c b/cmd/demo.c index 7310aa2907a..90d3cff2936 100644 --- a/cmd/demo.c +++ b/cmd/demo.c @@ -71,7 +71,7 @@ int do_demo_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) for (i = 0, ret = uclass_first_device(UCLASS_DEMO, &dev); dev; ret = uclass_next_device(&dev)) { - printf("entry %d - instance %08x, ops %08x, platdata %08x\n", + printf("entry %d - instance %08x, ops %08x, plat %08x\n", i++, (uint)map_to_sysmem(dev), (uint)map_to_sysmem(dev->driver->ops), (uint)map_to_sysmem(dev_get_platdata(dev))); diff --git a/cmd/i2c.c b/cmd/i2c.c index c5cace6a9c6..aae2dd41fee 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -390,7 +390,7 @@ static int do_i2c_write(struct cmd_tbl *cmdtp, int flag, int argc, ret = i2c_set_chip_offset_len(dev, alen); if (ret) return i2c_report_err(ret, I2C_ERR_WRITE); - i2c_chip = dev_get_parent_platdata(dev); + i2c_chip = dev_get_parent_plat(dev); if (!i2c_chip) return i2c_report_err(ret, I2C_ERR_WRITE); #endif @@ -1707,7 +1707,7 @@ static void show_bus(struct udevice *bus) for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

printf(" %02x: %s, offset len %x, flags %x\n", chip->chip_addr, dev->name, chip->offset_len, diff --git a/cmd/led.c b/cmd/led.c index 9433fa886c2..aa7751933e1 100644 --- a/cmd/led.c +++ b/cmd/led.c @@ -54,7 +54,7 @@ static int list_leds(void) for (uclass_find_first_device(UCLASS_LED, &dev); dev; uclass_find_next_device(&dev)) { - struct led_uc_plat *plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *plat = dev_get_uclass_plat(dev);

if (!plat->label) continue; diff --git a/cmd/lsblk.c b/cmd/lsblk.c index 653dffce041..6a1c8f5ef40 100644 --- a/cmd/lsblk.c +++ b/cmd/lsblk.c @@ -34,7 +34,7 @@ static int do_lsblk(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv uclass_foreach_dev(udev, uc) { if (udev->driver != entry) continue; - desc = dev_get_uclass_platdata(udev); + desc = dev_get_uclass_plat(udev); printf("%c %s %u", i ? ',' : ':', blk_get_if_type_name(desc->if_type), desc->devnum); diff --git a/cmd/pci.c b/cmd/pci.c index 0b08b5d76de..6b367232b3d 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -341,7 +341,7 @@ static void pciinfo(struct udevice *bus, bool short_listing) device_find_next_child(&dev)) { struct pci_child_platdata *pplat;

- pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); if (short_listing) { printf("%02x.%02x.%02x ", dev_seq(bus), PCI_DEV(pplat->devfn), PCI_FUNC(pplat->devfn)); diff --git a/cmd/regulator.c b/cmd/regulator.c index aa06c9a9fc8..3649719539b 100644 --- a/cmd/regulator.c +++ b/cmd/regulator.c @@ -25,7 +25,7 @@ static int failure(int ret)

static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; const char *name; int ret = -ENXIO;

@@ -43,7 +43,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_USAGE; }

- uc_pdata = dev_get_uclass_platdata(currdev); + uc_pdata = dev_get_uclass_plat(currdev); if (!uc_pdata) { printf("%s: no regulator platform data!\n", currdev->name); return failure(ret); @@ -56,7 +56,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) }

static int curr_dev_and_platdata(struct udevice **devp, - struct dm_regulator_uclass_platdata **uc_pdata, + struct dm_regulator_uclass_plat **uc_pdata, bool allow_type_fixed) { *devp = NULL; @@ -69,7 +69,7 @@ static int curr_dev_and_platdata(struct udevice **devp,

*devp = currdev;

- *uc_pdata = dev_get_uclass_platdata(*devp); + *uc_pdata = dev_get_uclass_plat(*devp); if (!*uc_pdata) { pr_err("Regulator: %s - missing platform data!\n", currdev->name); return CMD_RET_FAILURE; @@ -86,7 +86,7 @@ static int curr_dev_and_platdata(struct udevice **devp, static int do_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev; int ret;

@@ -100,7 +100,7 @@ static int do_list(struct cmd_tbl *cmdtp, int flag, int argc, if (ret) continue;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); printf("| %-*.*s| %-*.*s| %s\n", LIMIT_DEVNAME, LIMIT_DEVNAME, dev->name, LIMIT_OFNAME, LIMIT_OFNAME, uc_pdata->name, @@ -143,7 +143,7 @@ static int do_info(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct dm_regulator_mode *modes; const char *parent_uc; int mode_count; @@ -183,7 +183,7 @@ static int do_info(struct cmd_tbl *cmdtp, int flag, int argc, }

static void do_status_detail(struct udevice *dev, - struct dm_regulator_uclass_platdata *uc_pdata) + struct dm_regulator_uclass_plat *uc_pdata) { int current, value, mode; const char *mode_name; @@ -207,12 +207,12 @@ static void do_status_detail(struct udevice *dev,

static void do_status_line(struct udevice *dev) { - struct dm_regulator_uclass_platdata *pdata; + struct dm_regulator_uclass_plat *pdata; int current, value, mode; const char *mode_name; bool enabled;

- pdata = dev_get_uclass_platdata(dev); + pdata = dev_get_uclass_plat(dev); enabled = regulator_get_enable(dev); value = regulator_get_value(dev); current = regulator_get_current(dev); @@ -237,7 +237,7 @@ static void do_status_line(struct udevice *dev) static int do_status(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev; int ret;

@@ -263,7 +263,7 @@ static int do_value(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int value; int force; int ret; @@ -313,7 +313,7 @@ static int do_current(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int current; int ret;

@@ -353,7 +353,7 @@ static int do_mode(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int mode; int ret;

@@ -389,7 +389,7 @@ static int do_enable(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int ret;

ret = curr_dev_and_platdata(&dev, &uc_pdata, true); @@ -409,7 +409,7 @@ static int do_disable(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int ret;

ret = curr_dev_and_platdata(&dev, &uc_pdata, true); diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c index c111ef21756..5f9ba925609 100644 --- a/cmd/remoteproc.c +++ b/cmd/remoteproc.c @@ -32,7 +32,7 @@ static int print_remoteproc_list(void) struct dm_rproc_uclass_pdata *uc_pdata; const struct dm_rproc_ops *ops = rproc_get_ops(dev);

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

/* Do not print if rproc is not probed */ if (!(dev->flags & DM_FLAG_ACTIVATED)) diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index fca600691e9..9cf1668a6ad 100644 --- a/common/lcd_simplefb.c +++ b/common/lcd_simplefb.c @@ -31,7 +31,7 @@ static int lcd_dt_simplefb_configure_node(void *blob, int off) if (ret) return ret; uc_priv = dev_get_uclass_priv(dev); - plat = dev_get_uclass_platdata(dev); + plat = dev_get_uclass_plat(dev); xsize = uc_priv->xsize; ysize = uc_priv->ysize; bpix = uc_priv->bpix; diff --git a/common/usb_hub.c b/common/usb_hub.c index 36bf2abfeec..80666e6496d 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -959,7 +959,7 @@ UCLASS_DRIVER(usb_hub) = { .post_probe = usb_hub_post_probe, .child_pre_probe = usb_child_pre_probe, .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), .per_device_auto = sizeof(struct usb_hub_device), };

diff --git a/common/usb_storage.c b/common/usb_storage.c index 4c8ad1be6d9..7e6db4910bc 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -146,7 +146,7 @@ int usb_stor_info(void) for (blk_first_device(IF_TYPE_USB, &dev); dev; blk_next_device(&dev)) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

printf(" Device %d: ", desc->devnum); dev_print(desc); @@ -203,7 +203,7 @@ static int usb_stor_probe_device(struct usb_device *udev) debug("\n\nProbing for storage\n"); #if CONFIG_IS_ENABLED(BLK) /* - * We store the us_data in the mass storage device's platdata. It + * We store the us_data in the mass storage device's plat. It * is shared by all LUNs (block devices) attached to this mass storage * device. */ @@ -225,7 +225,7 @@ static int usb_stor_probe_device(struct usb_device *udev) return ret; }

- blkdev = dev_get_uclass_platdata(dev); + blkdev = dev_get_uclass_plat(dev); blkdev->target = 0xff; blkdev->lun = lun;

@@ -1147,7 +1147,7 @@ static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr, return 0; /* Setup device */ #if CONFIG_IS_ENABLED(BLK) - block_dev = dev_get_uclass_platdata(dev); + block_dev = dev_get_uclass_plat(dev); udev = dev_get_parent_priv(dev_get_parent(dev)); debug("\nusb_read: udev %d\n", block_dev->devnum); #else @@ -1231,7 +1231,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,

/* Setup device */ #if CONFIG_IS_ENABLED(BLK) - block_dev = dev_get_uclass_platdata(dev); + block_dev = dev_get_uclass_plat(dev); udev = dev_get_parent_priv(dev_get_parent(dev)); debug("\nusb_read: udev %d\n", block_dev->devnum); #else @@ -1529,7 +1529,7 @@ U_BOOT_DRIVER(usb_mass_storage) = { .of_match = usb_mass_storage_ids, .probe = usb_mass_storage_probe, #if CONFIG_IS_ENABLED(BLK) - .platdata_auto = sizeof(struct us_data), + .plat_auto = sizeof(struct us_data), #endif };

diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst index 5c93d0a3f05..f10a851ccf0 100644 --- a/doc/driver-model/design.rst +++ b/doc/driver-model/design.rst @@ -59,7 +59,7 @@ uclass: The demo class is pretty simple, but not trivial. The intention is that it can be used for testing, so it will implement all driver model features and provide good code coverage of them. It does have multiple drivers, it -handles parameter data and platdata (data which tells the driver how +handles parameter data and plat (data which tells the driver how to operate on a particular platform) and it uses private driver data.

To try it, see the example session below:: @@ -333,7 +333,7 @@ Briefly, they are:

* bind - make the driver model aware of a device (bind it to its driver) * unbind - make the driver model forget the device - * ofdata_to_platdata - convert device tree data to platdata - see later + * ofdata_to_platdata - convert device tree data to plat - see later * probe - make a device ready for use * remove - remove a device so it cannot be used until probed again

@@ -396,7 +396,7 @@ The data can be interpreted by the drivers however they like - it is basically a communication scheme between the board-specific code and the generic drivers, which are intended to work on any board.

-Drivers can access their data via dev->info->platdata. Here is +Drivers can access their data via dev->info->plat. Here is the declaration for the platform data, which would normally appear in the board file.

@@ -410,7 +410,7 @@ in the board file. static const struct driver_info info[] = { { .name = "demo_shape_drv", - .platdata = &red_square, + .plat = &red_square, }, };

@@ -420,7 +420,7 @@ in the board file. Device Tree -----------

-While platdata is useful, a more flexible way of providing device data is +While plat is useful, a more flexible way of providing device data is by using device tree. In U-Boot you should use this where possible. Avoid sending patches which make use of the U_BOOT_DEVICE() macro unless strictly necessary. @@ -448,13 +448,13 @@ The easiest way to make this work it to add a few members to the driver:

.. code-block:: c

- .platdata_auto = sizeof(struct dm_test_pdata), + .plat_auto = sizeof(struct dm_test_pdata), .ofdata_to_platdata = testfdt_ofdata_to_platdata,

-The 'auto' feature allowed space for the platdata to be allocated +The 'auto' feature allowed space for the plat to be allocated and zeroed before the driver's ofdata_to_platdata() method is called. The ofdata_to_platdata() method, which the driver write supplies, should parse -the device tree node for this device and place it in dev->platdata. Thus +the device tree node for this device and place it in dev->plat. Thus when the probe method is called later (to set up the device ready for use) the platform data will be present.

@@ -463,8 +463,8 @@ method then it will be called first (during activation). If you provide a probe method it will be called next. See Driver Lifecycle below for more details.

-If you don't want to have the platdata automatically allocated then you -can leave out platdata_auto. In this case you can use malloc +If you don't want to have the plat automatically allocated then you +can leave out plat_auto. In this case you can use malloc in your ofdata_to_platdata (or probe) method to allocate the required memory, and you should free it in the remove method.

@@ -602,9 +602,9 @@ Each of the devices is connected to a different address on the USB bus. The bus device wants to store this address and some other information such as the bus speed for each device.

-To achieve this, the bus device can use dev->parent_platdata in each of its +To achieve this, the bus device can use dev->parent_plat in each of its three children. This can be auto-allocated if the bus driver (or bus uclass) -has a non-zero value for per_child_platdata_auto. If not, then +has a non-zero value for per_child_plat_auto. If not, then the bus device or uclass can allocate the space itself before the child device is probed.

@@ -665,26 +665,26 @@ U-Boot discovers devices using one of these two methods: - Scan the U_BOOT_DEVICE() definitions. U-Boot looks up the name specified by each, to find the appropriate U_BOOT_DRIVER() definition. In this case, there is no path by which driver_data may be provided, but the U_BOOT_DEVICE() - may provide platdata. + may provide plat.

- Scan through the device tree definitions. U-Boot looks at top-level nodes in the the device tree. It looks at the compatible string in each node and uses the of_match table of the U_BOOT_DRIVER() structure to find the right driver for each node. In this case, the of_match table may provide a - driver_data value, but platdata cannot be provided until later. + driver_data value, but plat cannot be provided until later.

For each device that is discovered, U-Boot then calls device_bind() to create a new device, initializes various core fields of the device object such as name, uclass & driver, initializes any optional fields of the device object that are -applicable such as of_offset, driver_data & platdata, and finally calls the +applicable such as of_offset, driver_data & plat, and finally calls the driver's bind() method if one is defined.

At this point all the devices are known, and bound to their drivers. There is a 'struct udevice' allocated for all devices. However, nothing has been activated (except for the root device). Each bound device that was created -from a U_BOOT_DEVICE() declaration will hold the platdata pointer specified +from a U_BOOT_DEVICE() declaration will hold the plat pointer specified in that declaration. For a bound device created from the device tree, -platdata will be NULL, but of_offset will be the offset of the device tree +plat will be NULL, but of_offset will be the offset of the device tree node that caused the device to be created. The uclass is set correctly for the device.

@@ -710,7 +710,7 @@ base address of hardware registers and parameters relating to driver operation. This is called 'ofdata' (Open-Firmware data).

The device's_ofdata_to_platdata() implemnents allocation and reading of -platdata. A parent's ofdata is always read before a child. +plat. A parent's ofdata is always read before a child.

The steps are:

@@ -720,11 +720,11 @@ The steps are: it for run-time information, not platform data (which should be static and known before the device is probed).

- 2. If platdata_auto is non-zero, then the platform data space + 2. If plat_auto is non-zero, then the platform data space is allocated. This is only useful for device tree operation, since otherwise you would have to specific the platform data in the U_BOOT_DEVICE() declaration. The space is allocated for the device and - zeroed. It will be accessible as dev->platdata. + zeroed. It will be accessible as dev->plat.

3. If the device's uclass specifies a non-zero per_device_auto, then this space is allocated and zeroed also. It is allocated for and @@ -741,11 +741,11 @@ The steps are: 5. If the driver provides an ofdata_to_platdata() method, then this is called to convert the device tree data into platform data. This should do various calls like dev_read_u32(dev, ...) to access the node and store - the resulting information into dev->platdata. After this point, the device + the resulting information into dev->plat. After this point, the device works the same way whether it was bound using a device tree node or U_BOOT_DEVICE() structure. In either case, the platform data is now stored - in the platdata structure. Typically you will use the - platdata_auto feature to specify the size of the platform data + in the plat structure. Typically you will use the + plat_auto feature to specify the size of the platform data structure, and U-Boot will automatically allocate and zero it for you before entry to ofdata_to_platdata(). But if not, you can allocate it yourself in ofdata_to_platdata(). Note that it is preferable to do all the device tree @@ -754,7 +754,7 @@ The steps are: that U-Boot will cache platform data for devices which are regularly de/activated).

- 6. The device is marked 'platdata valid'. + 6. The device is marked 'plat valid'.

Note that ofdata reading is always done (for a child and all its parents) before probing starts. Thus devices go through two distinct states when @@ -805,14 +805,14 @@ as above and then following these steps (see device_probe()): hardware and setting up hardware registers to initial values. The code in probe() can access:

- - platform data in dev->platdata (for configuration) + - platform data in dev->plat (for configuration) - private data in dev->priv (for run-time state) - uclass data in dev->uclass_priv (for things the uclass stores about this device)

Note: If you don't use priv_auto then you will need to allocate the priv space here yourself. The same applies also to - platdata_auto. Remember to free them in the remove() method. + plat_auto. Remember to free them in the remove() method.

3. The device is marked 'activated'

@@ -858,10 +858,10 @@ remove it. This performs the probe steps in reverse: be dynamically allocated, and thus needs to be deallocated during the remove() method, either:

- - if the platdata_auto is non-zero, the deallocation + - if the plat_auto is non-zero, the deallocation happens automatically within the driver model core; or

- - when platdata_auto is 0, both the allocation (in probe() + - when plat_auto is 0, both the allocation (in probe() or preferably ofdata_to_platdata()) and the deallocation in remove() are the responsibility of the driver author.

@@ -898,14 +898,14 @@ original patches, but makes at least the following changes: the driver operations structure in the driver, rather than passing it to the driver bind function. - Rename some structures to make them more similar to Linux (struct udevice - instead of struct instance, struct platdata, etc.) + instead of struct instance, struct plat, etc.) - Change the name 'core' to 'uclass', meaning U-Boot class. It seems that this concept relates to a class of drivers (or a subsystem). We shouldn't use 'class' since it is a C++ reserved word, so U-Boot class (uclass) seems better than 'core'. - Remove 'struct driver_instance' and just use a single 'struct udevice'. This removes a level of indirection that doesn't seem necessary. -- Built in device tree support, to avoid the need for platdata +- Built in device tree support, to avoid the need for plat - Removed the concept of driver relocation, and just make it possible for the new driver (created after relocation) to access the old driver data. I feel that relocation is a very special case and will only apply to a few diff --git a/doc/driver-model/ethernet.rst b/doc/driver-model/ethernet.rst index 781644d2e27..2444c5cbd45 100644 --- a/doc/driver-model/ethernet.rst +++ b/doc/driver-model/ethernet.rst @@ -29,7 +29,7 @@ the UCLASS_ETH .id field in the U-Boot driver struct: .probe = eth_ape_probe, .ops = &eth_ape_ops, .priv_auto = sizeof(struct eth_ape_priv), - .platdata_auto = sizeof(struct eth_ape_pdata), + .plat_auto = sizeof(struct eth_ape_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

@@ -43,7 +43,7 @@ struct eth_ape_pdata contains static platform data, like the MMIO base address, a hardware variant, the MAC address. ``struct eth_pdata eth_pdata`` as the first member of this struct helps to avoid duplicated code. If you don't need any more platform data beside the standard member, -just use sizeof(struct eth_pdata) for the platdata_auto. +just use sizeof(struct eth_pdata) for the plat_auto.

PCI devices add a line pointing to supported vendor/device ID pairs:

@@ -96,7 +96,7 @@ operations. You often do things here such as resetting the MAC and/or PHY, and waiting for the link to autonegotiate. You should also take the opportunity to program the device's MAC address with the enetaddr member of the generic struct eth_pdata (which would be the first member of your -own platdata struct). This allows the rest of U-Boot to dynamically change +own plat struct). This allows the rest of U-Boot to dynamically change the MAC address and have the new settings be respected.

The **send** function does what you think -- transmit the specified packet diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst index 2df59edb7cc..a05faf739fd 100644 --- a/doc/driver-model/of-plat.rst +++ b/doc/driver-model/of-plat.rst @@ -157,8 +157,8 @@ and the following device declarations:

U_BOOT_DEVICE(dwmmc_at_ff0c0000) = { .name = "rockchip_rk3288_dw_mshc", - .platdata = &dtv_dwmmc_at_ff0c0000, - .platdata_size = sizeof(dtv_dwmmc_at_ff0c0000), + .plat = &dtv_dwmmc_at_ff0c0000, + .plat_size = sizeof(dtv_dwmmc_at_ff0c0000), .parent_idx = -1, };

@@ -232,7 +232,7 @@ How to structure your driver Drivers should always support device tree as an option. The of-platdata feature is intended as a add-on to existing drivers.

-Your driver should convert the platdata struct in its probe() method. The +Your driver should convert the plat struct in its probe() method. The existing device tree decoding logic should be kept in the ofdata_to_platdata() method and wrapped with #if.

@@ -294,7 +294,7 @@ For example: .ofdata_to_platdata = mmc_ofdata_to_platdata, .probe = mmc_probe, .priv_auto = sizeof(struct mmc_priv), - .platdata_auto = sizeof(struct mmc_platdata), + .plat_auto = sizeof(struct mmc_platdata), };

U_BOOT_DRIVER_ALIAS(mmc_drv, vendor_mmc) /* matches compatible string */ @@ -305,7 +305,7 @@ keep the use of each of-platdata struct to the smallest possible code area. There is just one driver C file for each struct, that can convert from the of-platdata struct to the standard one used by the driver.

-In the case where SPL_OF_PLATDATA is enabled, platdata_auto is +In the case where SPL_OF_PLATDATA is enabled, plat_auto is still used to allocate space for the platform data. This is different from the normal behaviour and is triggered by the use of of-platdata (strictly speaking it is a non-zero platdata_size which triggers this). @@ -336,8 +336,8 @@ Otherwise (such as in U-Boot proper) these structs are not available. This prevents them being used inadvertently. All usage must be bracketed with #if CONFIG_IS_ENABLED(OF_PLATDATA).

-The dt-platdata.c file contains the device declarations and is is built in -spl/dt-platdata.c. It additionally contains the definition of +The dt-plat.c file contains the device declarations and is is built in +spl/dt-plat.c. It additionally contains the definition of dm_populate_phandle_data() which is responsible of filling the phandle information by adding references to U_BOOT_DEVICE by using DM_GET_DEVICE

diff --git a/doc/driver-model/remoteproc-framework.rst b/doc/driver-model/remoteproc-framework.rst index f21de0a10f5..edb09cc1057 100644 --- a/doc/driver-model/remoteproc-framework.rst +++ b/doc/driver-model/remoteproc-framework.rst @@ -127,7 +127,7 @@ a simplified definition of a device is as follows:

U_BOOT_DEVICE(proc_3_demo) = { .name = "sandbox_test_proc", - .platdata = &proc_3_test, + .plat = &proc_3_test, };

There can be additional data that may be desired depending on the diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst index a12d6922e55..6a1aacef0f7 100644 --- a/doc/driver-model/spi-howto.rst +++ b/doc/driver-model/spi-howto.rst @@ -231,7 +231,7 @@ tree, but we need to tell it the size:

U_BOOT_DRIVER(spi_exynos) = { ... - .platdata_auto = sizeof(struct exynos_spi_platdata), + .plat_auto = sizeof(struct exynos_spi_platdata),

Here is a sample function. It gets a pointer to the platform data and @@ -241,7 +241,7 @@ fills in the fields from device tree.

static int exynos_spi_ofdata_to_platdata(struct udevice *bus) { - struct exynos_spi_platdata *plat = bus->platdata; + struct exynos_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -283,7 +283,7 @@ Specify this data in a U_BOOT_DEVICE() declaration in your board file:

U_BOOT_DEVICE(board_spi0) = { .name = "exynos_spi", - .platdata = &platdata_spi0, + .plat = &platdata_spi0, };

You will unfortunately need to put the struct definition into a header file @@ -437,7 +437,7 @@ Here is an example for the speed part:

static int exynos_spi_set_speed(struct udevice *bus, uint speed) { - struct exynos_spi_platdata *plat = bus->platdata; + struct exynos_spi_platdata *plat = bus->plat; struct exynos_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -658,7 +658,7 @@ A little note about SPI uclass features The SPI uclass keeps some information about each device 'dev' on the bus:

struct dm_spi_slave_platdata: - This is device_get_parent_platdata(dev). + This is device_get_parent_plat(dev). This is where the chip select number is stored, along with the default bus speed and mode. It is automatically read from the device tree in spi_child_post_bind(). It must not diff --git a/doc/driver-model/usb-info.rst b/doc/driver-model/usb-info.rst index 5f7cbfce097..ec8f3170a90 100644 --- a/doc/driver-model/usb-info.rst +++ b/doc/driver-model/usb-info.rst @@ -43,7 +43,7 @@ as drivers in the USB uclass. For example: .probe = tegra_ehci_usb_probe, .remove = tegra_ehci_usb_remove, .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, }; @@ -100,7 +100,7 @@ The following primary data structures are in use:

- struct usb_dev_platdata: This holds platform data for a device. You can access it for a - device 'dev' with dev_get_parent_platdata(dev). It holds the device + device 'dev' with dev_get_parent_plat(dev). It holds the device address and speed - anything that can be determined before the device driver is actually set up. When probing the bus this structure is used to provide essential information to the device driver. diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 7d0c8579478..99b83cab47d 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -15,7 +15,7 @@ #include <linux/delay.h> #include <power/regulator.h>

-#define ADC_UCLASS_PLATDATA_SIZE sizeof(struct adc_uclass_platdata) +#define ADC_UCLASS_PLATDATA_SIZE sizeof(struct adc_uclass_plat) #define CHECK_NUMBER true #define CHECK_MASK (!CHECK_NUMBER)

@@ -29,7 +29,7 @@ extern void sdelay(unsigned long loops); static int check_channel(struct udevice *dev, int value, bool number_or_mask, const char *caller_function) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); unsigned mask = number_or_mask ? (1 << value) : value;

/* For the real ADC hardware, some ADC channels can be inactive. @@ -48,7 +48,7 @@ static int check_channel(struct udevice *dev, int value, bool number_or_mask,

static int adc_supply_enable(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); const char *supply_type; int ret = 0;

@@ -70,7 +70,7 @@ static int adc_supply_enable(struct udevice *dev)

int adc_data_mask(struct udevice *dev, unsigned int *data_mask) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);

if (!uc_pdata) return -ENOSYS; @@ -81,7 +81,7 @@ int adc_data_mask(struct udevice *dev, unsigned int *data_mask)

int adc_channel_mask(struct udevice *dev, unsigned int *channel_mask) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);

if (!uc_pdata) return -ENOSYS; @@ -141,7 +141,7 @@ int adc_start_channels(struct udevice *dev, unsigned int channel_mask)

int adc_channel_data(struct udevice *dev, int channel, unsigned int *data) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); const struct adc_ops *ops = dev_get_driver_ops(dev); unsigned int timeout_us = uc_pdata->data_timeout_us; int ret; @@ -168,7 +168,7 @@ int adc_channel_data(struct udevice *dev, int channel, unsigned int *data) int adc_channels_data(struct udevice *dev, unsigned int channel_mask, struct adc_channel *channels) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); unsigned int timeout_us = uc_pdata->multidata_timeout_us; const struct adc_ops *ops = dev_get_driver_ops(dev); int ret; @@ -269,7 +269,7 @@ try_manual:

static int adc_vdd_platdata_update(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret;

/* Warning! @@ -292,7 +292,7 @@ static int adc_vdd_platdata_update(struct udevice *dev)

static int adc_vss_platdata_update(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret;

if (!uc_pdata->vss_supply) @@ -309,7 +309,7 @@ static int adc_vss_platdata_update(struct udevice *dev)

int adc_vdd_value(struct udevice *dev, int *uV) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret, value_sign = uc_pdata->vdd_polarity_negative ? -1 : 1;

/* Update the regulator Value. */ @@ -327,7 +327,7 @@ int adc_vdd_value(struct udevice *dev, int *uV)

int adc_vss_value(struct udevice *dev, int *uV) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret, value_sign = uc_pdata->vss_polarity_negative ? -1 : 1;

/* Update the regulator Value. */ @@ -369,7 +369,7 @@ int adc_raw_to_uV(struct udevice *dev, unsigned int raw, int *uV)

static int adc_vdd_platdata_set(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; char *prop;

@@ -394,7 +394,7 @@ static int adc_vdd_platdata_set(struct udevice *dev)

static int adc_vss_platdata_set(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; char *prop;

@@ -420,12 +420,12 @@ static int adc_pre_probe(struct udevice *dev) { int ret;

- /* Set ADC VDD platdata: polarity, uV, regulator (phandle). */ + /* Set ADC VDD plat: polarity, uV, regulator (phandle). */ ret = adc_vdd_platdata_set(dev); if (ret) pr_err("%s: Can't update Vdd. Error: %d", dev->name, ret);

- /* Set ADC VSS platdata: polarity, uV, regulator (phandle). */ + /* Set ADC VSS plat: polarity, uV, regulator (phandle). */ ret = adc_vss_platdata_set(dev); if (ret) pr_err("%s: Can't update Vss. Error: %d", dev->name, ret); @@ -437,5 +437,5 @@ UCLASS_DRIVER(adc) = { .id = UCLASS_ADC, .name = "adc", .pre_probe = adc_pre_probe, - .per_device_platdata_auto = ADC_UCLASS_PLATDATA_SIZE, + .per_device_plat_auto = ADC_UCLASS_PLATDATA_SIZE, }; diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c index 6bdc45a5fc0..6ae46aed155 100644 --- a/drivers/adc/exynos-adc.c +++ b/drivers/adc/exynos-adc.c @@ -103,7 +103,7 @@ int exynos_adc_probe(struct udevice *dev)

int exynos_adc_ofdata_to_platdata(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct exynos_adc_priv *priv = dev_get_priv(dev);

priv->regs = dev_read_addr_ptr(dev); diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c index 469ab1f178d..ac75742657b 100644 --- a/drivers/adc/meson-saradc.c +++ b/drivers/adc/meson-saradc.c @@ -677,7 +677,7 @@ static int meson_saradc_probe(struct udevice *dev)

int meson_saradc_ofdata_to_platdata(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct meson_saradc_priv *priv = dev_get_priv(dev);

priv->data = (struct meson_saradc_data *)dev_get_driver_data(dev); diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index 1e127209746..4af7416a41f 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -44,7 +44,7 @@ int rockchip_saradc_channel_data(struct udevice *dev, int channel, unsigned int *data) { struct rockchip_saradc_priv *priv = dev_get_priv(dev); - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);

if (channel != priv->active_channel) { pr_err("Requested channel is not active!"); @@ -119,7 +119,7 @@ int rockchip_saradc_probe(struct udevice *dev)

int rockchip_saradc_ofdata_to_platdata(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct rockchip_saradc_priv *priv = dev_get_priv(dev); struct rockchip_saradc_data *data;

diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c index 14f2c2a7ed0..905ce4fc51f 100644 --- a/drivers/adc/sandbox.c +++ b/drivers/adc/sandbox.c @@ -137,7 +137,7 @@ int sandbox_adc_probe(struct udevice *dev)

int sandbox_adc_ofdata_to_platdata(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->data_mask = SANDBOX_ADC_DATA_MASK; uc_pdata->data_format = ADC_DATA_FORMAT_BIN; diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c index 2c6984f2aa3..ad8d1a32cdb 100644 --- a/drivers/adc/stm32-adc.c +++ b/drivers/adc/stm32-adc.c @@ -80,7 +80,7 @@ static int stm32_adc_stop(struct udevice *dev)

static int stm32_adc_start_channel(struct udevice *dev, int channel) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct stm32_adc_common *common = dev_get_priv(dev_get_parent(dev)); struct stm32_adc *adc = dev_get_priv(dev); int ret; @@ -164,7 +164,7 @@ static int stm32_adc_channel_data(struct udevice *dev, int channel,

static int stm32_adc_chan_of_init(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct stm32_adc *adc = dev_get_priv(dev); u32 chans[STM32_ADC_CH_MAX]; unsigned int i, num_channels; @@ -206,7 +206,7 @@ static int stm32_adc_chan_of_init(struct udevice *dev)

static int stm32_adc_probe(struct udevice *dev) { - struct adc_uclass_platdata *uc_pdata = dev_get_uclass_platdata(dev); + struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct stm32_adc_common *common = dev_get_priv(dev_get_parent(dev)); struct stm32_adc *adc = dev_get_priv(dev); int offset; diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 22bc0d3b100..bd8a3bcdd85 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -172,7 +172,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv) #if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI) # ifdef CONFIG_DM_PCI struct udevice *dev = uc_priv->dev; - struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); + struct pci_child_platdata *pplat = dev_get_parent_plat(dev); # else pci_dev_t pdev = uc_priv->dev; unsigned short vendor; @@ -474,7 +474,7 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, pci_dev_t dev) pci_write_config_byte(dev, 0x41, 0xa1); #endif #else - struct scsi_platdata *plat = dev_get_uclass_platdata(dev); + struct scsi_platdata *plat = dev_get_uclass_plat(dev); uc_priv->mmio_base = (void *)plat->base; #endif

@@ -1170,7 +1170,7 @@ int ahci_probe_scsi(struct udevice *ahci_dev, ulong base) device_find_first_child(ahci_dev, &dev); if (!dev) return -ENODEV; - uc_plat = dev_get_uclass_platdata(dev); + uc_plat = dev_get_uclass_plat(dev); uc_plat->base = base; uc_plat->max_lun = 1; uc_plat->max_id = 2; diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c index 562e982e32a..6d42548087b 100644 --- a/drivers/ata/dwc_ahsata.c +++ b/drivers/ata/dwc_ahsata.c @@ -1019,7 +1019,7 @@ int dwc_ahsata_scan(struct udevice *dev) } }

- desc = dev_get_uclass_platdata(blk); + desc = dev_get_uclass_plat(blk); ret = dwc_ahsata_scan_common(uc_priv, desc); if (ret) { debug("%s: Failed to scan bus\n", __func__); @@ -1054,7 +1054,7 @@ int dwc_ahsata_probe(struct udevice *dev) static ulong dwc_ahsata_read(struct udevice *blk, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct blk_desc *desc = dev_get_uclass_platdata(blk); + struct blk_desc *desc = dev_get_uclass_plat(blk); struct udevice *dev = dev_get_parent(blk); struct ahci_uc_priv *uc_priv;

@@ -1065,7 +1065,7 @@ static ulong dwc_ahsata_read(struct udevice *blk, lbaint_t blknr, static ulong dwc_ahsata_write(struct udevice *blk, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct blk_desc *desc = dev_get_uclass_platdata(blk); + struct blk_desc *desc = dev_get_uclass_plat(blk); struct udevice *dev = dev_get_parent(blk); struct ahci_uc_priv *uc_priv;

diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c index 8e4f382fd18..99af1d44753 100644 --- a/drivers/ata/fsl_sata.c +++ b/drivers/ata/fsl_sata.c @@ -808,7 +808,7 @@ int scan_sata(int dev) #else static int scan_sata(struct udevice *dev) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev); struct fsl_ata_priv *priv = dev_get_platdata(dev); fsl_sata_t *sata = priv->fsl_sata; #endif @@ -900,7 +900,7 @@ U_BOOT_DRIVER(sata_fsl_driver) = { .name = "sata_fsl_blk", .id = UCLASS_BLK, .ops = &sata_fsl_blk_ops, - .platdata_auto = sizeof(struct fsl_ata_priv), + .plat_auto = sizeof(struct fsl_ata_priv), };

static int fsl_ata_ofdata_to_platdata(struct udevice *dev) diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index b49bd5c5450..bb17392e5ac 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -727,7 +727,7 @@ static u32 mv_sata_rw_cmd(struct udevice *dev, int port, lbaint_t start, static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr, lbaint_t blkcnt, void *buffer, int is_write) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev); lbaint_t start, blks; u8 *addr; int max_blks; @@ -943,7 +943,7 @@ static int sata_mv_init_sata(struct udevice *dev, int port)

static int sata_mv_scan_sata(struct udevice *dev, int port) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev); struct mv_priv *priv = dev_get_platdata(dev); unsigned char serial[ATA_ID_SERNO_LEN + 1]; unsigned char firmware[ATA_ID_FW_REV_LEN + 1]; @@ -1030,7 +1030,7 @@ U_BOOT_DRIVER(sata_mv_driver) = { .name = "sata_mv_blk", .id = UCLASS_BLK, .ops = &sata_mv_blk_ops, - .platdata_auto = sizeof(struct mv_priv), + .plat_auto = sizeof(struct mv_priv), };

static int sata_mv_probe(struct udevice *dev) diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 4d83f756b2b..2bc3d228b22 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -708,7 +708,7 @@ int scan_sata(int dev) #else static int scan_sata(struct udevice *blk_dev, int dev) { - struct blk_desc *desc = dev_get_uclass_platdata(blk_dev); + struct blk_desc *desc = dev_get_uclass_plat(blk_dev); struct sil_sata_priv *priv = dev_get_platdata(blk_dev); struct sil_sata *sata = priv->sil_sata_desc[dev]; #endif @@ -772,7 +772,7 @@ U_BOOT_DRIVER(sata_sil_driver) = { .name = "sata_sil_blk", .id = UCLASS_BLK, .ops = &sata_sil_blk_ops, - .platdata_auto = sizeof(struct sil_sata_priv), + .plat_auto = sizeof(struct sil_sata_priv), };

static int sil_unbind_device(struct udevice *dev) diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index 714e5d769c3..d0d91db540b 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -79,7 +79,7 @@ struct blk_desc *blk_get_devnum_by_type(enum if_type if_type, int devnum) ret = blk_get_device(if_type, devnum, &dev); if (ret) return NULL; - desc = dev_get_uclass_platdata(dev); + desc = dev_get_uclass_plat(dev);

return desc; } @@ -114,7 +114,7 @@ struct blk_desc *blk_get_devnum_by_typename(const char *if_typename, int devnum) if (ret) return NULL; uclass_foreach_dev(dev, uc) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

debug("%s: if_type=%d, devnum=%d: %s, %d, %d\n", __func__, if_type, devnum, dev->name, desc->if_type, desc->devnum); @@ -154,7 +154,7 @@ struct blk_desc *blk_get_by_device(struct udevice *dev) if (device_get_uclass_id(child_dev) != UCLASS_BLK) continue;

- return dev_get_uclass_platdata(child_dev); + return dev_get_uclass_plat(child_dev); }

debug("%s: No block device found\n", __func__); @@ -184,7 +184,7 @@ static int get_desc(enum if_type if_type, int devnum, struct blk_desc **descp) if (ret) return ret; uclass_foreach_dev(dev, uc) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

debug("%s: if_type=%d, devnum=%d: %s, %d, %d\n", __func__, if_type, devnum, dev->name, desc->if_type, desc->devnum); @@ -368,7 +368,7 @@ int blk_first_device(int if_type, struct udevice **devp) if (!*devp) return -ENODEV; do { - desc = dev_get_uclass_platdata(*devp); + desc = dev_get_uclass_plat(*devp); if (desc->if_type == if_type) return 0; ret = uclass_find_next_device(devp); @@ -384,7 +384,7 @@ int blk_next_device(struct udevice **devp) struct blk_desc *desc; int ret, if_type;

- desc = dev_get_uclass_platdata(*devp); + desc = dev_get_uclass_plat(*devp); if_type = desc->if_type; do { ret = uclass_find_next_device(devp); @@ -392,7 +392,7 @@ int blk_next_device(struct udevice **devp) return ret; if (!*devp) return -ENODEV; - desc = dev_get_uclass_platdata(*devp); + desc = dev_get_uclass_plat(*devp); if (desc->if_type == if_type) return 0; } while (1); @@ -408,7 +408,7 @@ int blk_find_device(int if_type, int devnum, struct udevice **devp) if (ret) return ret; uclass_foreach_dev(dev, uc) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

debug("%s: if_type=%d, devnum=%d: %s, %d, %d\n", __func__, if_type, devnum, dev->name, desc->if_type, desc->devnum); @@ -516,7 +516,7 @@ int blk_find_max_devnum(enum if_type if_type) if (ret) return ret; uclass_foreach_dev(dev, uc) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

if (desc->if_type == if_type && desc->devnum > max_devnum) max_devnum = desc->devnum; @@ -548,7 +548,7 @@ static int blk_claim_devnum(enum if_type if_type, int devnum) if (ret) return ret; uclass_foreach_dev(dev, uc) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

if (desc->if_type == if_type && desc->devnum == devnum) { int next = blk_next_free_devnum(if_type); @@ -583,7 +583,7 @@ int blk_create_device(struct udevice *parent, const char *drv_name, ret = device_bind_driver(parent, drv_name, name, &dev); if (ret) return ret; - desc = dev_get_uclass_platdata(dev); + desc = dev_get_uclass_plat(dev); desc->if_type = if_type; desc->blksz = blksz; desc->log2blksz = LOG2(desc->blksz); @@ -629,7 +629,7 @@ int blk_unbind_all(int if_type) if (ret) return ret; uclass_foreach_dev_safe(dev, next, uc) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

if (desc->if_type == if_type) { ret = device_remove(dev, DM_REMOVE_NORMAL); @@ -648,7 +648,7 @@ static int blk_post_probe(struct udevice *dev) { if (IS_ENABLED(CONFIG_PARTITIONS) && IS_ENABLED(CONFIG_HAVE_BLOCK_DEVICE)) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

part_init(desc); } @@ -660,5 +660,5 @@ UCLASS_DRIVER(blk) = { .id = UCLASS_BLK, .name = "blk", .post_probe = blk_post_probe, - .per_device_platdata_auto = sizeof(struct blk_desc), + .per_device_plat_auto = sizeof(struct blk_desc), }; diff --git a/drivers/block/ide.c b/drivers/block/ide.c index a766b5cf036..43a0776099c 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -940,7 +940,7 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, #endif { #ifdef CONFIG_BLK - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); #endif int device = block_dev->devnum; ulong n = 0; @@ -1067,7 +1067,7 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, #endif { #ifdef CONFIG_BLK - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); #endif int device = block_dev->devnum; ulong n = 0; @@ -1160,7 +1160,7 @@ int ide_device_present(int dev) #ifdef CONFIG_BLK static int ide_blk_probe(struct udevice *udev) { - struct blk_desc *desc = dev_get_uclass_platdata(udev); + struct blk_desc *desc = dev_get_uclass_plat(udev);

/* fill in device vendor/product/rev strings */ strncpy(desc->vendor, ide_dev_desc[desc->devnum].vendor, diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c index e5ef260cf2b..12d320088c0 100644 --- a/drivers/block/sandbox.c +++ b/drivers/block/sandbox.c @@ -35,7 +35,7 @@ static unsigned long host_block_read(struct udevice *dev, void *buffer) { struct host_block_dev *host_dev = dev_get_platdata(dev); - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev);

#else static unsigned long host_block_read(struct blk_desc *block_dev, @@ -66,7 +66,7 @@ static unsigned long host_block_write(struct udevice *dev, const void *buffer) { struct host_block_dev *host_dev = dev_get_platdata(dev); - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); #else static unsigned long host_block_write(struct blk_desc *block_dev, unsigned long start, lbaint_t blkcnt, @@ -202,7 +202,7 @@ int host_get_dev_err(int devnum, struct blk_desc **blk_devp) ret = blk_get_device(IF_TYPE_HOST, devnum, &dev); if (ret) return ret; - *blk_devp = dev_get_uclass_platdata(dev); + *blk_devp = dev_get_uclass_plat(dev); #else struct host_block_dev *host_dev = find_host_device(devnum);

@@ -228,7 +228,7 @@ U_BOOT_DRIVER(sandbox_host_blk) = { .name = "sandbox_host_blk", .id = UCLASS_BLK, .ops = &sandbox_host_blk_ops, - .platdata_auto = sizeof(struct host_block_dev), + .plat_auto = sizeof(struct host_block_dev), }; #else U_BOOT_LEGACY_BLK(sandbox_host) = { diff --git a/drivers/button/button-gpio.c b/drivers/button/button-gpio.c index 756cd6972b2..dbb000622c7 100644 --- a/drivers/button/button-gpio.c +++ b/drivers/button/button-gpio.c @@ -31,7 +31,7 @@ static enum button_state_t button_gpio_get_state(struct udevice *dev)

static int button_gpio_probe(struct udevice *dev) { - struct button_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct button_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct button_gpio_priv *priv = dev_get_priv(dev); int ret;

@@ -83,7 +83,7 @@ static int button_gpio_bind(struct udevice *parent) node, &dev); if (ret) return ret; - uc_plat = dev_get_uclass_platdata(dev); + uc_plat = dev_get_uclass_plat(dev); uc_plat->label = label; }

diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c index 133f4dead1a..e06d3eb7da5 100644 --- a/drivers/button/button-uclass.c +++ b/drivers/button/button-uclass.c @@ -16,7 +16,7 @@ int button_get_by_label(const char *label, struct udevice **devp) struct uclass *uc;

uclass_id_foreach_dev(UCLASS_BUTTON, dev, uc) { - struct button_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct button_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Ignore the top-level button node */ if (uc_plat->label && !strcmp(label, uc_plat->label)) @@ -39,5 +39,5 @@ enum button_state_t button_get_state(struct udevice *dev) UCLASS_DRIVER(button) = { .id = UCLASS_BUTTON, .name = "button", - .per_device_platdata_auto = sizeof(struct button_uc_plat), + .per_device_plat_auto = sizeof(struct button_uc_plat), }; diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c index 3d33a51e2e1..5f6fc1b3b71 100644 --- a/drivers/cache/cache-v5l2.c +++ b/drivers/cache/cache-v5l2.c @@ -182,7 +182,7 @@ U_BOOT_DRIVER(v5l2_cache) = { .of_match = v5l2_cache_ids, .ofdata_to_platdata = v5l2_ofdata_to_platdata, .probe = v5l2_probe, - .platdata_auto = sizeof(struct v5l2_plat), + .plat_auto = sizeof(struct v5l2_plat), .ops = &v5l2_cache_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c index 8a71e2f8a1d..619621fa5b9 100644 --- a/drivers/clk/altera/clk-agilex.c +++ b/drivers/clk/altera/clk-agilex.c @@ -658,5 +658,5 @@ U_BOOT_DRIVER(socfpga_agilex_clk) = { .ops = &socfpga_clk_ops, .probe = socfpga_clk_probe, .ofdata_to_platdata = socfpga_clk_ofdata_to_platdata, - .platdata_auto = sizeof(struct socfpga_clk_platdata), + .plat_auto = sizeof(struct socfpga_clk_platdata), }; diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index 1d853cd3003..bb1b367ca6e 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -359,5 +359,5 @@ U_BOOT_DRIVER(socfpga_a10_clk) = { .probe = socfpga_a10_clk_probe, .ofdata_to_platdata = socfpga_a10_ofdata_to_platdata,

- .platdata_auto = sizeof(struct socfpga_a10_clk_platdata), + .plat_auto = sizeof(struct socfpga_a10_clk_platdata), }; diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index 1b437117668..b56c01f3b06 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -225,7 +225,7 @@ U_BOOT_DRIVER(at91sam9x5_main_osc_clk) = { .id = UCLASS_CLK, .of_match = main_osc_clk_match, .probe = main_osc_clk_probe, - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &main_osc_clk_ops, };

@@ -266,7 +266,7 @@ U_BOOT_DRIVER(at91_plla_clk) = { .id = UCLASS_CLK, .of_match = plla_clk_match, .probe = plla_clk_probe, - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &plla_clk_ops, };

@@ -340,7 +340,7 @@ U_BOOT_DRIVER(at91_plladiv_clk) = { .id = UCLASS_CLK, .of_match = at91_plladiv_clk_match, .probe = at91_plladiv_clk_probe, - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &at91_plladiv_clk_ops, };

@@ -437,7 +437,7 @@ U_BOOT_DRIVER(system_clk) = { .name = "system-clk", .id = UCLASS_CLK, .probe = at91_clk_probe, - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &system_clk_ops, };

@@ -536,7 +536,7 @@ static struct clk_ops periph_clk_ops = { U_BOOT_DRIVER(clk_periph) = { .name = "periph-clk", .id = UCLASS_CLK, - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .probe = at91_clk_probe, .ops = &periph_clk_ops, }; @@ -668,7 +668,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = { .of_match = utmi_clk_match, .probe = utmi_clk_probe, .ofdata_to_platdata = utmi_clk_ofdata_to_platdata, - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &utmi_clk_ops, };

@@ -713,7 +713,7 @@ U_BOOT_DRIVER(sama5d4_h32mx_clk) = { .id = UCLASS_CLK, .of_match = sama5d4_h32mx_clk_match, .probe = sama5d4_h32mx_clk_probe, - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &sama5d4_h32mx_clk_ops, };

@@ -877,7 +877,7 @@ U_BOOT_DRIVER(generic_clk) = { .probe = at91_clk_probe, .ofdata_to_platdata = generic_clk_ofdata_to_platdata, .priv_auto = sizeof(struct generic_clk_priv), - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &generic_clk_ops, };

@@ -1013,7 +1013,7 @@ U_BOOT_DRIVER(at91_usb_clk) = { .probe = at91_usb_clk_probe, .ofdata_to_platdata = at91_usb_clk_ofdata_to_platdata, .priv_auto = sizeof(struct at91_usb_clk_priv), - .platdata_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_platdata), .ops = &at91_usb_clk_ops, };

diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c index 99edaec4b52..75e2e438422 100644 --- a/drivers/clk/clk_boston.c +++ b/drivers/clk/clk_boston.c @@ -92,6 +92,6 @@ U_BOOT_DRIVER(clk_boston) = { .id = UCLASS_CLK, .of_match = clk_boston_match, .ofdata_to_platdata = clk_boston_ofdata_to_platdata, - .platdata_auto = sizeof(struct clk_boston), + .plat_auto = sizeof(struct clk_boston), .ops = &clk_boston_ops, }; diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c index 4519e0579b0..7a9d4234932 100644 --- a/drivers/clk/clk_fixed_factor.c +++ b/drivers/clk/clk_fixed_factor.c @@ -67,6 +67,6 @@ U_BOOT_DRIVER(clk_fixed_factor) = { .id = UCLASS_CLK, .of_match = clk_fixed_factor_match, .ofdata_to_platdata = clk_fixed_factor_ofdata_to_platdata, - .platdata_auto = sizeof(struct clk_fixed_factor), + .plat_auto = sizeof(struct clk_fixed_factor), .ops = &clk_fixed_factor_ops, }; diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c index 54e5e09b58c..3b60434019b 100644 --- a/drivers/clk/clk_fixed_rate.c +++ b/drivers/clk/clk_fixed_rate.c @@ -51,7 +51,7 @@ U_BOOT_DRIVER(fixed_clock) = { .id = UCLASS_CLK, .of_match = clk_fixed_rate_match, .ofdata_to_platdata = clk_fixed_rate_ofdata_to_platdata, - .platdata_auto = sizeof(struct clk_fixed_rate), + .plat_auto = sizeof(struct clk_fixed_rate), .ops = &clk_fixed_rate_ops, .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c index 5940cb33d47..f96aab967e2 100644 --- a/drivers/clk/rockchip/clk_rk3188.c +++ b/drivers/clk/rockchip/clk_rk3188.c @@ -617,7 +617,7 @@ U_BOOT_DRIVER(rockchip_rk3188_cru) = { .id = UCLASS_CLK, .of_match = rk3188_clk_ids, .priv_auto = sizeof(struct rk3188_clk_priv), - .platdata_auto = sizeof(struct rk3188_clk_plat), + .plat_auto = sizeof(struct rk3188_clk_plat), .ops = &rk3188_clk_ops, .bind = rk3188_clk_bind, .ofdata_to_platdata = rk3188_clk_ofdata_to_platdata, diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 7c91e00c685..0263883aa66 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -1041,7 +1041,7 @@ U_BOOT_DRIVER(rockchip_rk3288_cru) = { .id = UCLASS_CLK, .of_match = rk3288_clk_ids, .priv_auto = sizeof(struct rk3288_clk_priv), - .platdata_auto = sizeof(struct rk3288_clk_plat), + .plat_auto = sizeof(struct rk3288_clk_plat), .ops = &rk3288_clk_ops, .bind = rk3288_clk_bind, .ofdata_to_platdata = rk3288_clk_ofdata_to_platdata, diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index 84b55ac6180..d32762ce1e4 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -645,7 +645,7 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = { .of_match = rk3368_clk_ids, .priv_auto = sizeof(struct rk3368_clk_priv), #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto = sizeof(struct rk3368_clk_plat), + .plat_auto = sizeof(struct rk3368_clk_plat), #endif .ofdata_to_platdata = rk3368_clk_ofdata_to_platdata, .ops = &rk3368_clk_ops, diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 2e2613fd0dc..515c8553378 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1453,7 +1453,7 @@ U_BOOT_DRIVER(clk_rk3399) = { .bind = rk3399_clk_bind, .probe = rk3399_clk_probe, #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto = sizeof(struct rk3399_clk_plat), + .plat_auto = sizeof(struct rk3399_clk_plat), #endif };

@@ -1648,6 +1648,6 @@ U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = { .probe = rk3399_pmuclk_probe, .bind = rk3399_pmuclk_bind, #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto = sizeof(struct rk3399_pmuclk_plat), + .plat_auto = sizeof(struct rk3399_pmuclk_plat), #endif }; diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index 0b71744d939..8a5f95806a0 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -89,16 +89,16 @@ int device_unbind(struct udevice *dev) return log_msg_ret("child unbind", ret);

if (dev->flags & DM_FLAG_ALLOC_PDATA) { - free(dev->platdata); - dev->platdata = NULL; + free(dev->plat); + dev->plat = NULL; } if (dev->flags & DM_FLAG_ALLOC_UCLASS_PDATA) { - free(dev->uclass_platdata); - dev->uclass_platdata = NULL; + free(dev->uclass_plat); + dev->uclass_plat = NULL; } if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) { - free(dev->parent_platdata); - dev->parent_platdata = NULL; + free(dev->parent_plat); + dev->parent_plat = NULL; } ret = uclass_unbind_device(dev); if (ret) diff --git a/drivers/core/device.c b/drivers/core/device.c index f74eaa55fa7..a91d7237d4d 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;

static int device_bind_common(struct udevice *parent, const struct driver *drv, - const char *name, void *platdata, + const char *name, void *plat, ulong driver_data, ofnode node, uint of_platdata_size, struct udevice **devp) { @@ -64,7 +64,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, #ifdef CONFIG_DEVRES INIT_LIST_HEAD(&dev->devres_head); #endif - dev->platdata = platdata; + dev->plat = plat; dev->driver_data = driver_data; dev->name = name; dev->node = node; @@ -94,49 +94,49 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, dev->sqq = uclass_find_next_free_seq(uc); }

- if (drv->platdata_auto) { - bool alloc = !platdata; + if (drv->plat_auto) { + bool alloc = !plat;

if (CONFIG_IS_ENABLED(OF_PLATDATA)) { if (of_platdata_size) { dev->flags |= DM_FLAG_OF_PLATDATA; - if (of_platdata_size < drv->platdata_auto) + if (of_platdata_size < drv->plat_auto) alloc = true; } } if (alloc) { dev->flags |= DM_FLAG_ALLOC_PDATA; - dev->platdata = calloc(1, drv->platdata_auto); - if (!dev->platdata) { + dev->plat = calloc(1, drv->plat_auto); + if (!dev->plat) { ret = -ENOMEM; goto fail_alloc1; } - if (CONFIG_IS_ENABLED(OF_PLATDATA) && platdata) { - memcpy(dev->platdata, platdata, + if (CONFIG_IS_ENABLED(OF_PLATDATA) && plat) { + memcpy(dev->plat, plat, of_platdata_size); } } }

- size = uc->uc_drv->per_device_platdata_auto; + size = uc->uc_drv->per_device_plat_auto; if (size) { dev->flags |= DM_FLAG_ALLOC_UCLASS_PDATA; - dev->uclass_platdata = calloc(1, size); - if (!dev->uclass_platdata) { + dev->uclass_plat = calloc(1, size); + if (!dev->uclass_plat) { ret = -ENOMEM; goto fail_alloc2; } }

if (parent) { - size = parent->driver->per_child_platdata_auto; + size = parent->driver->per_child_plat_auto; if (!size) { - size = parent->uclass->uc_drv->per_child_platdata_auto; + size = parent->uclass->uc_drv->per_child_plat_auto; } if (size) { dev->flags |= DM_FLAG_ALLOC_PARENT_PDATA; - dev->parent_platdata = calloc(1, size); - if (!dev->parent_platdata) { + dev->parent_plat = calloc(1, size); + if (!dev->parent_plat) { ret = -ENOMEM; goto fail_alloc3; } @@ -196,19 +196,19 @@ fail_uclass_bind: if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) { list_del(&dev->sibling_node); if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) { - free(dev->parent_platdata); - dev->parent_platdata = NULL; + free(dev->parent_plat); + dev->parent_plat = NULL; } } fail_alloc3: if (dev->flags & DM_FLAG_ALLOC_UCLASS_PDATA) { - free(dev->uclass_platdata); - dev->uclass_platdata = NULL; + free(dev->uclass_plat); + dev->uclass_plat = NULL; } fail_alloc2: if (dev->flags & DM_FLAG_ALLOC_PDATA) { - free(dev->platdata); - dev->platdata = NULL; + free(dev->plat); + dev->plat = NULL; } fail_alloc1: devres_release_all(dev); @@ -228,10 +228,10 @@ int device_bind_with_driver_data(struct udevice *parent, }

int device_bind(struct udevice *parent, const struct driver *drv, - const char *name, void *platdata, ofnode node, + const char *name, void *plat, ofnode node, struct udevice **devp) { - return device_bind_common(parent, drv, name, platdata, 0, node, 0, + return device_bind_common(parent, drv, name, plat, 0, node, 0, devp); }

@@ -251,9 +251,8 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only, #if CONFIG_IS_ENABLED(OF_PLATDATA) platdata_size = info->platdata_size; #endif - ret = device_bind_common(parent, drv, info->name, - (void *)info->platdata, 0, ofnode_null(), - platdata_size, devp); + ret = device_bind_common(parent, drv, info->name, (void *)info->plat, 0, + ofnode_null(), platdata_size, devp); if (ret) return ret;

@@ -515,27 +514,27 @@ void *dev_get_platdata(const struct udevice *dev) return NULL; }

- return dev->platdata; + return dev->plat; }

-void *dev_get_parent_platdata(const struct udevice *dev) +void *dev_get_parent_plat(const struct udevice *dev) { if (!dev) { dm_warn("%s: null device\n", __func__); return NULL; }

- return dev->parent_platdata; + return dev->parent_plat; }

-void *dev_get_uclass_platdata(const struct udevice *dev) +void *dev_get_uclass_plat(const struct udevice *dev) { if (!dev) { dm_warn("%s: null device\n", __func__); return NULL; }

- return dev->uclass_platdata; + return dev->uclass_plat; }

void *dev_get_priv(const struct udevice *dev) diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 83456d7e6e8..20125473212 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -170,6 +170,6 @@ void dm_dump_static_driver_info(void) puts("---------------------------------\n"); for (entry = drv; entry != drv + n_ents; entry++) { printf("%-25.25s @%08lx\n", entry->name, - (ulong)map_to_sysmem(entry->platdata)); + (ulong)map_to_sysmem(entry->plat)); } } diff --git a/drivers/core/root.c b/drivers/core/root.c index 66aabc4b19b..4bdac4f3a6a 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -123,8 +123,8 @@ void fix_devices(void) struct driver_info *entry;

for (entry = dev; entry != dev + n_ents; entry++) { - if (entry->platdata) - entry->platdata += gd->reloc_off; + if (entry->plat) + entry->plat += gd->reloc_off; } }

diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c index c244b393459..c45212a0d3a 100644 --- a/drivers/core/simple-bus.c +++ b/drivers/core/simple-bus.c @@ -14,7 +14,7 @@ struct simple_bus_plat {

fdt_addr_t simple_bus_translate(struct udevice *dev, fdt_addr_t addr) { - struct simple_bus_plat *plat = dev_get_uclass_platdata(dev); + struct simple_bus_plat *plat = dev_get_uclass_plat(dev);

if (addr >= plat->base && addr < plat->base + plat->size) addr = (addr - plat->base) + plat->target; @@ -32,7 +32,7 @@ static int simple_bus_post_bind(struct udevice *dev)

ret = dev_read_u32_array(dev, "ranges", cell, ARRAY_SIZE(cell)); if (!ret) { - struct simple_bus_plat *plat = dev_get_uclass_platdata(dev); + struct simple_bus_plat *plat = dev_get_uclass_plat(dev);

plat->base = cell[0]; plat->target = cell[1]; @@ -47,7 +47,7 @@ UCLASS_DRIVER(simple_bus) = { .id = UCLASS_SIMPLE_BUS, .name = "simple_bus", .post_bind = simple_bus_post_bind, - .per_device_platdata_auto = sizeof(struct simple_bus_plat), + .per_device_plat_auto = sizeof(struct simple_bus_plat), };

static const struct udevice_id generic_simple_bus_ids[] = { diff --git a/drivers/cpu/at91_cpu.c b/drivers/cpu/at91_cpu.c index 07dba7d5601..ff1c406beab 100644 --- a/drivers/cpu/at91_cpu.c +++ b/drivers/cpu/at91_cpu.c @@ -118,6 +118,6 @@ U_BOOT_DRIVER(cpu_at91_drv) = { .of_match = at91_cpu_ids, .ops = &at91_cpu_ops, .probe = at91_cpu_probe, - .platdata_auto = sizeof(struct at91_cpu_platdata), + .plat_auto = sizeof(struct at91_cpu_platdata), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index 0946b95f589..fc2084f1c15 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -425,7 +425,7 @@ static const struct cpu_ops bmips_cpu_ops = { /* BMIPS CPU driver */ int bmips_cpu_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev);

plat->cpu_id = dev_read_u32_default(dev, "reg", -1); plat->device_id = read_c0_prid(); diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c index 6f6f90c5581..55cb172b879 100644 --- a/drivers/cpu/cpu-uclass.c +++ b/drivers/cpu/cpu-uclass.c @@ -115,7 +115,7 @@ int cpu_get_vendor(const struct udevice *dev, char *buf, int size) U_BOOT_DRIVER(cpu_bus) = { .name = "cpu_bus", .id = UCLASS_SIMPLE_BUS, - .per_child_platdata_auto = sizeof(struct cpu_platdata), + .per_child_plat_auto = sizeof(struct cpu_platdata), };

static int uclass_cpu_init(struct uclass *uc) diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c index 4ba0d1b99ef..df8a70220e1 100644 --- a/drivers/cpu/cpu_sandbox.c +++ b/drivers/cpu/cpu_sandbox.c @@ -64,7 +64,7 @@ static const struct cpu_ops cpu_sandbox_ops = { static int cpu_sandbox_bind(struct udevice *dev) { int ret; - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev);

/* first examine the property in current cpu node */ ret = dev_read_u32(dev, "timebase-frequency", &plat->timebase_freq); diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 641322554cc..1df43b88fae 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -230,6 +230,6 @@ U_BOOT_DRIVER(cpu_imx8_drv) = { .of_match = cpu_imx8_ids, .ops = &cpu_imx8_ops, .probe = imx8_cpu_probe, - .platdata_auto = sizeof(struct cpu_imx_platdata), + .plat_auto = sizeof(struct cpu_imx_platdata), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c index 93ce708f652..3899d4dd236 100644 --- a/drivers/cpu/riscv_cpu.c +++ b/drivers/cpu/riscv_cpu.c @@ -91,7 +91,7 @@ static int riscv_cpu_get_count(const struct udevice *dev)

static int riscv_cpu_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpu_platdata *plat = dev_get_parent_plat(dev); struct driver *drv; int ret;

diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c index d6e7a175d0d..497ff7869b7 100644 --- a/drivers/ddr/altera/sdram_agilex.c +++ b/drivers/ddr/altera/sdram_agilex.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;

int sdram_mmr_init_full(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->platdata; + struct altera_sdram_platdata *plat = dev->plat; struct altera_sdram_priv *priv = dev_get_priv(dev); u32 i; int ret; diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 4c118f0846a..e7c9b7a18ab 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -565,7 +565,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl)

static int altera_gen5_sdram_ofdata_to_platdata(struct udevice *dev) { - struct altera_gen5_sdram_platdata *plat = dev->platdata; + struct altera_gen5_sdram_platdata *plat = dev->plat;

plat->sdr = (struct socfpga_sdr *)devfdt_get_addr_index(dev, 0); if (!plat->sdr) @@ -578,7 +578,7 @@ static int altera_gen5_sdram_probe(struct udevice *dev) { int ret; unsigned long sdram_size; - struct altera_gen5_sdram_platdata *plat = dev->platdata; + struct altera_gen5_sdram_platdata *plat = dev->plat; struct altera_gen5_sdram_priv *priv = dev_get_priv(dev); struct socfpga_sdr_ctrl *sdr_ctrl = &plat->sdr->sdr_ctrl; struct reset_ctl_bulk resets; @@ -647,7 +647,7 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .of_match = altera_gen5_sdram_ids, .ops = &altera_gen5_sdram_ops, .ofdata_to_platdata = altera_gen5_sdram_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_gen5_sdram_platdata), + .plat_auto = sizeof(struct altera_gen5_sdram_platdata), .probe = altera_gen5_sdram_probe, .priv_auto = sizeof(struct altera_gen5_sdram_priv), }; diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 2945f1e1df5..8028d89f223 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -70,7 +70,7 @@ int match_ddr_conf(u32 ddr_conf) */ int sdram_mmr_init_full(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->platdata; + struct altera_sdram_platdata *plat = dev->plat; struct altera_sdram_priv *priv = dev_get_priv(dev); u32 update_value, io48_value, ddrioctl; u32 i; diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 2c44b78bffe..081087aa967 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -232,7 +232,7 @@ phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat)

static int altera_sdram_ofdata_to_platdata(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->platdata; + struct altera_sdram_platdata *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr_index(dev, 0); @@ -304,7 +304,7 @@ U_BOOT_DRIVER(altera_sdram) = { .of_match = altera_sdram_ids, .ops = &altera_sdram_ops, .ofdata_to_platdata = altera_sdram_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_sdram_platdata), + .plat_auto = sizeof(struct altera_sdram_platdata), .probe = altera_sdram_probe, .priv_auto = sizeof(struct altera_sdram_priv), }; diff --git a/drivers/demo/demo-pdata.c b/drivers/demo/demo-pdata.c index 2f434f8db01..b504c31373c 100644 --- a/drivers/demo/demo-pdata.c +++ b/drivers/demo/demo-pdata.c @@ -22,25 +22,25 @@ static const struct dm_demo_pdata yellow_hexagon = {

U_BOOT_DEVICE(demo0) = { .name = "demo_shape_drv", - .platdata = &red_square, + .plat = &red_square, };

U_BOOT_DEVICE(demo1) = { .name = "demo_simple_drv", - .platdata = &red_square, + .plat = &red_square, };

U_BOOT_DEVICE(demo2) = { .name = "demo_shape_drv", - .platdata = &green_triangle, + .plat = &green_triangle, };

U_BOOT_DEVICE(demo3) = { .name = "demo_simple_drv", - .platdata = &yellow_hexagon, + .plat = &yellow_hexagon, };

U_BOOT_DEVICE(demo4) = { .name = "demo_shape_drv", - .platdata = &yellow_hexagon, + .plat = &yellow_hexagon, }; diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c index 0f5cda23dd3..cc99f3e8e60 100644 --- a/drivers/demo/demo-shape.c +++ b/drivers/demo/demo-shape.c @@ -194,5 +194,5 @@ U_BOOT_DRIVER(demo_shape_drv) = { .probe = dm_shape_probe, .remove = dm_shape_remove, .priv_auto = sizeof(struct shape_data), - .platdata_auto = sizeof(struct dm_demo_pdata), + .plat_auto = sizeof(struct dm_demo_pdata), }; diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index bf714660ce6..950e286f7f1 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -43,5 +43,5 @@ U_BOOT_DRIVER(demo_simple_drv) = { .id = UCLASS_DEMO, .ofdata_to_platdata = demo_shape_ofdata_to_platdata, .ops = &simple_ops, - .platdata_auto = sizeof(struct dm_demo_pdata), + .plat_auto = sizeof(struct dm_demo_pdata), }; diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index cf0785aeb6a..f4e18e1f145 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -117,6 +117,6 @@ U_BOOT_DRIVER(altera_pio) = { .of_match = altera_pio_ids, .ops = &altera_pio_ops, .ofdata_to_platdata = altera_pio_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_pio_platdata), + .plat_auto = sizeof(struct altera_pio_platdata), .probe = altera_pio_probe, }; diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c index 90e692c13ed..4b25af71c09 100644 --- a/drivers/gpio/at91_gpio.c +++ b/drivers/gpio/at91_gpio.c @@ -629,7 +629,7 @@ U_BOOT_DRIVER(atmel_at91rm9200_gpio) = { .id = UCLASS_GPIO, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = at91_gpio_ids, - .platdata_auto = sizeof(struct at91_port_platdata), + .plat_auto = sizeof(struct at91_port_platdata), #endif .ops = &gpio_at91_ops, .probe = at91_gpio_probe, diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index d92c061928d..7a221b4df15 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -338,7 +338,7 @@ U_BOOT_DRIVER(gpio_atmel_pio4) = { .probe = atmel_pio4_probe, .bind = atmel_pio4_bind, .of_match = atmel_pio4_ids, - .platdata_auto = sizeof(struct atmel_pio4_platdata), + .plat_auto = sizeof(struct atmel_pio4_platdata), };

#endif diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index db349cf24bf..e80830c782d 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -134,7 +134,7 @@ U_BOOT_DRIVER(gpio_bcm2835) = { .name = "gpio_bcm2835", .id = UCLASS_GPIO, .ofdata_to_platdata = of_match_ptr(bcm2835_gpio_ofdata_to_platdata), - .platdata_auto = sizeof(struct bcm2835_gpio_platdata), + .plat_auto = sizeof(struct bcm2835_gpio_platdata), .ops = &gpio_bcm2835_ops, .probe = bcm2835_gpio_probe, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index 507f8b18c21..c8b12ac8a85 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -560,7 +560,7 @@ U_BOOT_DRIVER(ti_dm6441_gpio) = { .ofdata_to_platdata = of_match_ptr(davinci_gpio_ofdata_to_platdata), .of_match = davinci_gpio_ids, .bind = dm_scan_fdt_dev, - .platdata_auto = sizeof(struct davinci_gpio_platdata), + .plat_auto = sizeof(struct davinci_gpio_platdata), .probe = davinci_gpio_probe, .priv_auto = sizeof(struct davinci_gpio_bank), }; diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index 3a868844430..6639e2e0b82 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -141,7 +141,7 @@ static int gpio_dwapb_reset(struct udevice *dev) static int gpio_dwapb_probe(struct udevice *dev) { struct gpio_dev_priv *priv = dev_get_uclass_priv(dev); - struct gpio_dwapb_platdata *plat = dev->platdata; + struct gpio_dwapb_platdata *plat = dev->plat;

if (!plat) { /* Reset on parent device only */ diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 3fc4cd044fc..584d067aaf2 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -341,7 +341,7 @@ U_BOOT_DRIVER(gpio_hog) = { .ofdata_to_platdata = gpio_hog_ofdata_to_platdata, .probe = gpio_hog_probe, .priv_auto = sizeof(struct gpio_hog_priv), - .platdata_auto = sizeof(struct gpio_hog_data), + .plat_auto = sizeof(struct gpio_hog_data), }; #else int gpio_hog_lookup_name(const char *name, struct gpio_desc **desc) diff --git a/drivers/gpio/hsdk-creg-gpio.c b/drivers/gpio/hsdk-creg-gpio.c index d40365e82d1..66f8441840b 100644 --- a/drivers/gpio/hsdk-creg-gpio.c +++ b/drivers/gpio/hsdk-creg-gpio.c @@ -165,5 +165,5 @@ U_BOOT_DRIVER(gpio_hsdk_creg) = { .ops = &hsdk_creg_gpio_ops, .probe = hsdk_creg_gpio_probe, .of_match = hsdk_creg_gpio_ids, - .platdata_auto = sizeof(struct hsdk_creg_gpio), + .plat_auto = sizeof(struct hsdk_creg_gpio), }; diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c index 63170413f32..5d23ebdc5eb 100644 --- a/drivers/gpio/imx_rgpio2p.c +++ b/drivers/gpio/imx_rgpio2p.c @@ -151,12 +151,12 @@ static int imx_rgpio2p_probe(struct udevice *dev)

static int imx_rgpio2p_bind(struct udevice *dev) { - struct imx_rgpio2p_plat *plat = dev->platdata; + struct imx_rgpio2p_plat *plat = dev->plat; fdt_addr_t addr;

/* - * If platdata already exsits, directly return. - * Actually only when DT is not supported, platdata + * If plat already exsits, directly return. + * Actually only when DT is not supported, plat * is statically initialized in U_BOOT_DEVICES.Here * will return. */ @@ -171,7 +171,7 @@ static int imx_rgpio2p_bind(struct udevice *dev) * TODO: * When every board is converted to driver model and DT is supported, * this can be done by auto-alloc feature, but not using calloc - * to alloc memory for platdata. + * to alloc memory for plat. * * For example imx_rgpio2p_plat uses platform data rather than device * tree. @@ -184,7 +184,7 @@ static int imx_rgpio2p_bind(struct udevice *dev)

plat->regs = (struct gpio_regs *)addr; plat->bank_index = dev_seq(dev); - dev->platdata = plat; + dev->plat = plat;

return 0; } diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index cb217403cd1..b05233fe15b 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -185,5 +185,5 @@ U_BOOT_DRIVER(gpio_broadwell) = { .ofdata_to_platdata = broadwell_gpio_ofdata_to_platdata, .probe = broadwell_gpio_probe, .priv_auto = sizeof(struct broadwell_bank_priv), - .platdata_auto = sizeof(struct broadwell_bank_platdata), + .plat_auto = sizeof(struct broadwell_bank_platdata), }; diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index bba85b37912..3fdc9818422 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -237,5 +237,5 @@ U_BOOT_DRIVER(gpio_ich6) = { .ofdata_to_platdata = gpio_ich6_ofdata_to_platdata, .probe = ich6_gpio_probe, .priv_auto = sizeof(struct ich6_bank_priv), - .platdata_auto = sizeof(struct ich6_bank_platdata), + .plat_auto = sizeof(struct ich6_bank_platdata), }; diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c index 6ef9aa2b5fa..bdebeba83d6 100644 --- a/drivers/gpio/iproc_gpio.c +++ b/drivers/gpio/iproc_gpio.c @@ -286,5 +286,5 @@ U_BOOT_DRIVER(iproc_gpio) = { .of_match = iproc_gpio_ids, .ops = &iproc_gpio_ops, .ofdata_to_platdata = iproc_gpio_ofdata_to_platdata, - .platdata_auto = sizeof(struct iproc_gpio_platdata), + .plat_auto = sizeof(struct iproc_gpio_platdata), }; diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index 3020cc9502a..dae94b5ea95 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -141,7 +141,7 @@ U_BOOT_DRIVER(spisel_boot_mpc83xx) = { .ops = &mpc83xx_spisel_boot_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) .ofdata_to_platdata = mpc83xx_spisel_boot_ofdata_to_platdata, - .platdata_auto = sizeof(struct mpc8xxx_gpio_plat), + .plat_auto = sizeof(struct mpc8xxx_gpio_plat), .of_match = mpc83xx_spisel_boot_ids, #endif .probe = mpc83xx_spisel_boot_probe, diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index fa08909b2b9..6b64fc0d1cb 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -295,7 +295,7 @@ U_BOOT_DRIVER(gpio_mpc8xxx) = { .ops = &gpio_mpc8xxx_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) .ofdata_to_platdata = mpc8xxx_gpio_ofdata_to_platdata, - .platdata_auto = sizeof(struct mpc8xxx_gpio_plat), + .plat_auto = sizeof(struct mpc8xxx_gpio_plat), .of_match = mpc8xxx_gpio_ids, #endif .probe = mpc8xxx_gpio_probe, diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c index ea51291e237..3a06d17c923 100644 --- a/drivers/gpio/mt7621_gpio.c +++ b/drivers/gpio/mt7621_gpio.c @@ -130,7 +130,7 @@ static int gpio_mediatek_probe(struct udevice *dev) */ static int gpio_mediatek_bind(struct udevice *parent) { - struct mediatek_gpio_platdata *plat = parent->platdata; + struct mediatek_gpio_platdata *plat = parent->plat; ofnode node; int bank = 0; int ret; diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 1e00e23116a..86329348b9b 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -339,7 +339,7 @@ U_BOOT_DRIVER(gpio_mxc) = { .ops = &gpio_mxc_ops, .probe = mxc_gpio_probe, .ofdata_to_platdata = mxc_gpio_ofdata_to_platdata, - .platdata_auto = sizeof(struct mxc_gpio_plat), + .plat_auto = sizeof(struct mxc_gpio_plat), .priv_auto = sizeof(struct mxc_bank_info), .of_match = mxc_gpio_ids, .bind = mxc_gpio_bind, diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index 83147b49190..581d16125fb 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -264,7 +264,7 @@ static int mxs_gpio_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxs_ofdata_to_platdata(struct udevice *dev) { - struct mxs_gpio_platdata *plat = dev->platdata; + struct mxs_gpio_platdata *plat = dev->plat; struct fdtdec_phandle_args args; int node = dev_of_offset(dev); int ret; @@ -299,7 +299,7 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = { .ops = &gpio_mxs_ops, .probe = mxs_gpio_probe, .priv_auto = sizeof(struct mxs_gpio_priv), - .platdata_auto = sizeof(struct mxs_gpio_platdata), + .plat_auto = sizeof(struct mxs_gpio_platdata), #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = mxs_gpio_ids, .ofdata_to_platdata = mxs_ofdata_to_platdata, diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c index 1bd12f15686..f0bbb9e7108 100644 --- a/drivers/gpio/nx_gpio.c +++ b/drivers/gpio/nx_gpio.c @@ -245,6 +245,6 @@ U_BOOT_DRIVER(nx_gpio) = { .of_match = nx_gpio_ids, .ops = &nx_gpio_ops, .ofdata_to_platdata = nx_gpio_ofdata_to_platdata, - .platdata_auto = sizeof(struct nx_gpio_platdata), + .plat_auto = sizeof(struct nx_gpio_platdata), .probe = nx_gpio_probe, }; diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 9e828058cdf..7be1beb243a 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -316,7 +316,7 @@ static int omap_gpio_bind(struct udevice *dev) * TODO: * When every board is converted to driver model and DT is * supported, this can be done by auto-alloc feature, but - * not using calloc to alloc memory for platdata. + * not using calloc to alloc memory for plat. * * For example am33xx_gpio uses platform data rather than device tree. * @@ -328,7 +328,7 @@ static int omap_gpio_bind(struct udevice *dev)

plat->base = base_addr; plat->port_name = fdt_get_name(gd->fdt_blob, dev_of_offset(dev), NULL); - dev->platdata = plat; + dev->plat = plat;

return 0; } @@ -363,7 +363,7 @@ U_BOOT_DRIVER(gpio_omap) = { #if !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_gpio_ids, .ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata), - .platdata_auto = sizeof(struct omap_gpio_platdata), + .plat_auto = sizeof(struct omap_gpio_platdata), #endif #else .bind = omap_gpio_bind, diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index 32d4a836131..239c0f7456b 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -385,6 +385,6 @@ U_BOOT_DRIVER(pca953x) = { .id = UCLASS_GPIO, .ops = &pca953x_ops, .probe = pca953x_probe, - .platdata_auto = sizeof(struct pca953x_info), + .plat_auto = sizeof(struct pca953x_info), .of_match = pca953x_ids, }; diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c index 7fcadc79c15..d0ff8817651 100644 --- a/drivers/gpio/pcf8575_gpio.c +++ b/drivers/gpio/pcf8575_gpio.c @@ -55,7 +55,7 @@ struct pcf8575_chip {

static int pcf8575_i2c_write_le16(struct udevice *dev, unsigned int word) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); u8 buf[2] = { word & 0xff, word >> 8, }; int ret;

@@ -69,7 +69,7 @@ static int pcf8575_i2c_write_le16(struct udevice *dev, unsigned int word)

static int pcf8575_i2c_read_le16(struct udevice *dev) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); u8 buf[2]; int ret;

@@ -177,5 +177,5 @@ U_BOOT_DRIVER(gpio_pcf8575) = { .of_match = pcf8575_gpio_ids, .ofdata_to_platdata = pcf8575_ofdata_platdata, .probe = pcf8575_gpio_probe, - .platdata_auto = sizeof(struct pcf8575_chip), + .plat_auto = sizeof(struct pcf8575_chip), }; diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c index 3fc436759cc..6202e4841f8 100644 --- a/drivers/gpio/s5p_gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -287,7 +287,7 @@ static int gpio_exynos_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct exynos_bank_info *priv = dev->priv; - struct exynos_gpio_platdata *plat = dev->platdata; + struct exynos_gpio_platdata *plat = dev->plat;

/* Only child devices have ports */ if (!plat) @@ -307,7 +307,7 @@ static int gpio_exynos_probe(struct udevice *dev) */ static int gpio_exynos_bind(struct udevice *parent) { - struct exynos_gpio_platdata *plat = parent->platdata; + struct exynos_gpio_platdata *plat = parent->plat; struct s5p_gpio_bank *bank, *base; const void *blob = gd->fdt_blob; int node; diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c index 19239f5db91..4be8d4f69ea 100644 --- a/drivers/gpio/sifive-gpio.c +++ b/drivers/gpio/sifive-gpio.c @@ -172,7 +172,7 @@ U_BOOT_DRIVER(gpio_sifive) = { .id = UCLASS_GPIO, .of_match = sifive_gpio_match, .ofdata_to_platdata = of_match_ptr(sifive_gpio_ofdata_to_platdata), - .platdata_auto = sizeof(struct sifive_gpio_platdata), + .plat_auto = sizeof(struct sifive_gpio_platdata), .ops = &sifive_gpio_ops, .probe = sifive_gpio_probe, }; diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index dea71a7f340..62d584a810c 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -285,7 +285,7 @@ static int gpio_sunxi_bind(struct udevice *parent) { struct sunxi_gpio_soc_data *soc_data = (struct sunxi_gpio_soc_data *)dev_get_driver_data(parent); - struct sunxi_gpio_platdata *plat = parent->platdata; + struct sunxi_gpio_platdata *plat = parent->plat; struct sunxi_gpio_reg *ctlr; int bank, ret;

diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c index ad97e13a1cb..14c9d90bfdf 100644 --- a/drivers/gpio/tegra186_gpio.c +++ b/drivers/gpio/tegra186_gpio.c @@ -34,7 +34,7 @@ struct tegra186_gpio_platdata { static uint32_t *tegra186_gpio_reg(struct udevice *dev, uint32_t reg, uint32_t gpio) { - struct tegra186_gpio_platdata *plat = dev->platdata; + struct tegra186_gpio_platdata *plat = dev->plat; uint32_t index = (reg + (gpio * TEGRA186_GPIO_PER_GPIO_STRIDE)) / 4;

return &(plat->regs[index]); @@ -166,7 +166,7 @@ static const struct dm_gpio_ops tegra186_gpio_ops = { */ static int tegra186_gpio_bind(struct udevice *parent) { - struct tegra186_gpio_platdata *parent_plat = parent->platdata; + struct tegra186_gpio_platdata *parent_plat = parent->plat; struct tegra186_gpio_ctlr_data *ctlr_data = (struct tegra186_gpio_ctlr_data *)dev_get_driver_data(parent); uint32_t *regs; @@ -201,7 +201,7 @@ static int tegra186_gpio_bind(struct udevice *parent)

static int tegra186_gpio_probe(struct udevice *dev) { - struct tegra186_gpio_platdata *plat = dev->platdata; + struct tegra186_gpio_platdata *plat = dev->plat; struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

/* Only child devices have ports */ diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index 7583c8d6b26..862a63fbf6c 100644 --- a/drivers/gpio/tegra_gpio.c +++ b/drivers/gpio/tegra_gpio.c @@ -292,7 +292,7 @@ static int gpio_tegra_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct tegra_port_info *priv = dev->priv; - struct tegra_gpio_platdata *plat = dev->platdata; + struct tegra_gpio_platdata *plat = dev->plat;

/* Only child devices have ports */ if (!plat) @@ -313,7 +313,7 @@ static int gpio_tegra_probe(struct udevice *dev) */ static int gpio_tegra_bind(struct udevice *parent) { - struct tegra_gpio_platdata *plat = parent->platdata; + struct tegra_gpio_platdata *plat = parent->plat; struct gpio_ctlr *ctlr; int bank_count; int bank; diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index 3ded586238c..2d05909409f 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -133,5 +133,5 @@ U_BOOT_DRIVER(gpio_vybrid) = { .ofdata_to_platdata = vybrid_gpio_odata_to_platdata, .probe = vybrid_gpio_probe, .priv_auto = sizeof(struct vybrid_gpios), - .platdata_auto = sizeof(struct vybrid_gpio_platdata), + .plat_auto = sizeof(struct vybrid_gpio_platdata), }; diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 1bb70b12c92..6de08e1d080 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -36,13 +36,13 @@ struct xilinx_gpio_privdata { static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, u32 *bank_pin_num, struct udevice *dev) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); u32 bank, max_pins; /* the first gpio is 0 not 1 */ u32 pin_num = offset;

for (bank = 0; bank < XILINX_GPIO_MAX_BANK; bank++) { - max_pins = platdata->bank_max[bank]; + max_pins = plat->bank_max[bank]; if (pin_num < max_pins) { debug("%s: found at bank 0x%x pin 0x%x\n", __func__, bank, pin_num); @@ -59,7 +59,7 @@ static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -71,14 +71,14 @@ static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset, val = priv->output_val[bank];

debug("%s: regs: %lx, value: %x, gpio: %x, bank %x, pin %x, out %x\n", - __func__, (ulong)platdata->regs, value, offset, bank, pin, val); + __func__, (ulong)plat->regs, value, offset, bank, pin, val);

if (value) val = val | (1 << pin); else val = val & ~(1 << pin);

- writel(val, &platdata->regs->gpiodata + bank * 2); + writel(val, &plat->regs->gpiodata + bank * 2);

priv->output_val[bank] = val;

@@ -87,7 +87,7 @@ static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset,

static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -97,14 +97,14 @@ static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset) return ret;

debug("%s: regs: %lx, gpio: %x, bank %x, pin %x\n", __func__, - (ulong)platdata->regs, offset, bank, pin); + (ulong)plat->regs, offset, bank, pin);

- if (platdata->bank_output[bank]) { + if (plat->bank_output[bank]) { debug("%s: Read saved output value\n", __func__); val = priv->output_val[bank]; } else { debug("%s: Read input value from reg\n", __func__); - val = readl(&platdata->regs->gpiodata + bank * 2); + val = readl(&plat->regs->gpiodata + bank * 2); }

val = !!(val & (1 << pin)); @@ -114,7 +114,7 @@ static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset)

static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); int val, ret; u32 bank, pin;

@@ -123,15 +123,15 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) return ret;

/* Check if all pins are inputs */ - if (platdata->bank_input[bank]) + if (plat->bank_input[bank]) return GPIOF_INPUT;

/* Check if all pins are outputs */ - if (platdata->bank_output[bank]) + if (plat->bank_output[bank]) return GPIOF_OUTPUT;

/* FIXME test on dual */ - val = readl(&platdata->regs->gpiodir + bank * 2); + val = readl(&plat->regs->gpiodir + bank * 2); val = !(val & (1 << pin));

/* input is 1 in reg but GPIOF_INPUT is 0 */ @@ -143,7 +143,7 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); int val, ret; u32 bank, pin;

@@ -152,15 +152,15 @@ static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset, return ret;

/* can't change it if all is input by default */ - if (platdata->bank_input[bank]) + if (plat->bank_input[bank]) return -EINVAL;

xilinx_gpio_set_value(dev, offset, value);

- if (!platdata->bank_output[bank]) { - val = readl(&platdata->regs->gpiodir + bank * 2); + if (!plat->bank_output[bank]) { + val = readl(&plat->regs->gpiodir + bank * 2); val = val & ~(1 << pin); - writel(val, &platdata->regs->gpiodir + bank * 2); + writel(val, &plat->regs->gpiodir + bank * 2); }

return 0; @@ -168,7 +168,7 @@ static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset,

static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); int val, ret; u32 bank, pin;

@@ -177,16 +177,16 @@ static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) return ret;

/* Already input */ - if (platdata->bank_input[bank]) + if (plat->bank_input[bank]) return 0;

/* can't change it if all is output by default */ - if (platdata->bank_output[bank]) + if (plat->bank_output[bank]) return -EINVAL;

- val = readl(&platdata->regs->gpiodir + bank * 2); + val = readl(&plat->regs->gpiodir + bank * 2); val = val | (1 << pin); - writel(val, &platdata->regs->gpiodir + bank * 2); + writel(val, &plat->regs->gpiodir + bank * 2);

return 0; } @@ -194,7 +194,7 @@ static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) static int xilinx_gpio_xlate(struct udevice *dev, struct gpio_desc *desc, struct ofnode_phandle_args *args) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev);

desc->offset = args->args[0];

@@ -209,13 +209,13 @@ static int xilinx_gpio_xlate(struct udevice *dev, struct gpio_desc *desc, * add amount of pins in second channel if present. */ if (args->args[1]) { - if (!platdata->bank_max[1]) { + if (!plat->bank_max[1]) { printf("%s: %s has no second channel\n", __func__, dev->name); return -EINVAL; }

- desc->offset += platdata->bank_max[0]; + desc->offset += plat->bank_max[0]; }

/* The third cell is optional */ @@ -239,7 +239,7 @@ static const struct dm_gpio_ops xilinx_gpio_ops = {

static int xilinx_gpio_probe(struct udevice *dev) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr; @@ -253,42 +253,38 @@ static int xilinx_gpio_probe(struct udevice *dev) uc_priv->bank_name = dev->name; }

- uc_priv->gpio_count = platdata->bank_max[0] + platdata->bank_max[1]; + uc_priv->gpio_count = plat->bank_max[0] + plat->bank_max[1];

- priv->output_val[0] = platdata->dout_default[0]; + priv->output_val[0] = plat->dout_default[0];

- if (platdata->bank_max[1]) - priv->output_val[1] = platdata->dout_default[1]; + if (plat->bank_max[1]) + priv->output_val[1] = plat->dout_default[1];

return 0; }

static int xilinx_gpio_ofdata_to_platdata(struct udevice *dev) { - struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); int is_dual;

- platdata->regs = (struct gpio_regs *)dev_read_addr(dev); + plat->regs = (struct gpio_regs *)dev_read_addr(dev);

- platdata->bank_max[0] = dev_read_u32_default(dev, - "xlnx,gpio-width", 0); - platdata->bank_input[0] = dev_read_u32_default(dev, - "xlnx,all-inputs", 0); - platdata->bank_output[0] = dev_read_u32_default(dev, - "xlnx,all-outputs", 0); - platdata->dout_default[0] = dev_read_u32_default(dev, - "xlnx,dout-default", - 0); + plat->bank_max[0] = dev_read_u32_default(dev, "xlnx,gpio-width", 0); + plat->bank_input[0] = dev_read_u32_default(dev, "xlnx,all-inputs", 0); + plat->bank_output[0] = dev_read_u32_default(dev, "xlnx,all-outputs", 0); + plat->dout_default[0] = dev_read_u32_default(dev, "xlnx,dout-default", + 0);

is_dual = dev_read_u32_default(dev, "xlnx,is-dual", 0); if (is_dual) { - platdata->bank_max[1] = dev_read_u32_default(dev, - "xlnx,gpio2-width", 0); - platdata->bank_input[1] = dev_read_u32_default(dev, + plat->bank_max[1] = dev_read_u32_default(dev, + "xlnx,gpio2-width", 0); + plat->bank_input[1] = dev_read_u32_default(dev, "xlnx,all-inputs-2", 0); - platdata->bank_output[1] = dev_read_u32_default(dev, + plat->bank_output[1] = dev_read_u32_default(dev, "xlnx,all-outputs-2", 0); - platdata->dout_default[1] = dev_read_u32_default(dev, + plat->dout_default[1] = dev_read_u32_default(dev, "xlnx,dout-default-2", 0); }

@@ -307,6 +303,6 @@ U_BOOT_DRIVER(xilinx_gpio) = { .of_match = xilinx_gpio_ids, .ofdata_to_platdata = xilinx_gpio_ofdata_to_platdata, .probe = xilinx_gpio_probe, - .platdata_auto = sizeof(struct xilinx_gpio_platdata), + .plat_auto = sizeof(struct xilinx_gpio_platdata), .priv_auto = sizeof(struct xilinx_gpio_privdata), }; diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index 4ef2985e766..cfe35674b78 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -193,20 +193,20 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num, unsigned int *bank_pin_num, struct udevice *dev) { - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev); u32 bank;

- for (bank = 0; bank < platdata->p_data->max_bank; bank++) { - if (pin_num >= platdata->p_data->bank_min[bank] && - pin_num <= platdata->p_data->bank_max[bank]) { + for (bank = 0; bank < plat->p_data->max_bank; bank++) { + if (pin_num >= plat->p_data->bank_min[bank] && + pin_num <= plat->p_data->bank_max[bank]) { *bank_num = bank; *bank_pin_num = pin_num - - platdata->p_data->bank_min[bank]; + plat->p_data->bank_min[bank]; return; } }

- if (bank >= platdata->p_data->max_bank) { + if (bank >= plat->p_data->max_bank) { printf("Invalid bank and pin num\n"); *bank_num = 0; *bank_pin_num = 0; @@ -215,9 +215,9 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num,

static int gpio_is_valid(unsigned gpio, struct udevice *dev) { - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev);

- return gpio < platdata->p_data->ngpio; + return gpio < plat->p_data->ngpio; }

static int check_gpio(unsigned gpio, struct udevice *dev) @@ -233,14 +233,14 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) { u32 data; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev);

if (check_gpio(gpio, dev) < 0) return -1;

zynq_gpio_get_bank_pin(gpio, &bank_num, &bank_pin_num, dev);

- data = readl(platdata->base + + data = readl(plat->base + ZYNQ_GPIO_DATA_RO_OFFSET(bank_num));

return (data >> bank_pin_num) & 1; @@ -249,7 +249,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value) { unsigned int reg_offset, bank_num, bank_pin_num; - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -272,7 +272,7 @@ static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value) value = ~(1 << (bank_pin_num + ZYNQ_GPIO_MID_PIN_NUM)) & ((value << bank_pin_num) | ZYNQ_GPIO_UPPER_MASK);

- writel(value, platdata->base + reg_offset); + writel(value, plat->base + reg_offset);

return 0; } @@ -281,7 +281,7 @@ static int zynq_gpio_direction_input(struct udevice *dev, unsigned gpio) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -293,9 +293,9 @@ static int zynq_gpio_direction_input(struct udevice *dev, unsigned gpio) return -1;

/* clear the bit in direction mode reg to set the pin as input */ - reg = readl(platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); + reg = readl(plat->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); reg &= ~BIT(bank_pin_num); - writel(reg, platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); + writel(reg, plat->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num));

return 0; } @@ -305,7 +305,7 @@ static int zynq_gpio_direction_output(struct udevice *dev, unsigned gpio, { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -313,14 +313,14 @@ static int zynq_gpio_direction_output(struct udevice *dev, unsigned gpio, zynq_gpio_get_bank_pin(gpio, &bank_num, &bank_pin_num, dev);

/* set the GPIO pin as output */ - reg = readl(platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); + reg = readl(plat->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); reg |= BIT(bank_pin_num); - writel(reg, platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); + writel(reg, plat->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num));

/* configure the output enable reg for the pin */ - reg = readl(platdata->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num)); + reg = readl(plat->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num)); reg |= BIT(bank_pin_num); - writel(reg, platdata->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num)); + writel(reg, plat->base + ZYNQ_GPIO_OUTEN_OFFSET(bank_num));

/* set the state of the pin */ zynq_gpio_set_value(dev, gpio, value); @@ -331,7 +331,7 @@ static int zynq_gpio_get_function(struct udevice *dev, unsigned offset) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev);

if (check_gpio(offset, dev) < 0) return -1; @@ -339,7 +339,7 @@ static int zynq_gpio_get_function(struct udevice *dev, unsigned offset) zynq_gpio_get_bank_pin(offset, &bank_num, &bank_pin_num, dev);

/* set the GPIO pin as output */ - reg = readl(platdata->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); + reg = readl(plat->base + ZYNQ_GPIO_DIRM_OFFSET(bank_num)); reg &= BIT(bank_pin_num); if (reg) return GPIOF_OUTPUT; @@ -369,7 +369,7 @@ static const struct udevice_id zynq_gpio_ids[] = {

static int zynq_gpio_probe(struct udevice *dev) { - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr;

@@ -382,19 +382,19 @@ static int zynq_gpio_probe(struct udevice *dev) uc_priv->bank_name = dev->name; }

- if (platdata->p_data) - uc_priv->gpio_count = platdata->p_data->ngpio; + if (plat->p_data) + uc_priv->gpio_count = plat->p_data->ngpio;

return 0; }

static int zynq_gpio_ofdata_to_platdata(struct udevice *dev) { - struct zynq_gpio_platdata *platdata = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_platdata(dev);

- platdata->base = (phys_addr_t)dev_read_addr(dev); + plat->base = (phys_addr_t)dev_read_addr(dev);

- platdata->p_data = + plat->p_data = (struct zynq_platform_data *)dev_get_driver_data(dev);

return 0; @@ -407,5 +407,5 @@ U_BOOT_DRIVER(gpio_zynq) = { .of_match = zynq_gpio_ids, .ofdata_to_platdata = zynq_gpio_ofdata_to_platdata, .probe = zynq_gpio_probe, - .platdata_auto = sizeof(struct zynq_gpio_platdata), + .plat_auto = sizeof(struct zynq_gpio_platdata), }; diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 8ae54e1e93b..2815e52c94a 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -11,7 +11,7 @@ config DM_I2C Enable driver model for I2C. The I2C uclass interface: probe, read, write and speed, is implemented with the bus drivers operations, which provide methods for bus setting and data transfer. Each chip - device (bus child) info is kept as parent platdata. The interface + device (bus child) info is kept as parent plat. The interface is defined in include/i2c.h.

config I2C_CROS_EC_TUNNEL diff --git a/drivers/i2c/acpi_i2c.c b/drivers/i2c/acpi_i2c.c index 57d29683cbf..ef12789e7ff 100644 --- a/drivers/i2c/acpi_i2c.c +++ b/drivers/i2c/acpi_i2c.c @@ -210,7 +210,7 @@ int acpi_i2c_ofdata_to_platdata(struct udevice *dev) /* Use name specified in priv or build one from I2C address */ static int acpi_i2c_get_name(const struct udevice *dev, char *out_name) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct acpi_i2c_priv *priv = dev_get_priv(dev);

snprintf(out_name, ACPI_NAME_MAX, diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index 956ebeefb61..83f0f90831d 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -14,7 +14,7 @@ * i2c emulation works using an 'emul' node at the bus level. Each device in * that node is in the UCLASS_I2C_EMUL uclass, and emulates one i2c device. A * pointer to the device it emulates is in the 'dev' property of the emul device - * uclass platdata (struct i2c_emul_platdata), put there by i2c_emul_find(). + * uclass plat (struct i2c_emul_platdata), put there by i2c_emul_find(). * When sandbox wants an emulator for a device, it calls i2c_emul_find() which * searches for the emulator with the correct address. To find the device for an * emulator, call i2c_emul_get_device(). @@ -27,7 +27,7 @@ * struct i2c_emul_uc_platdata - information about the emulator for this device * * This is used by devices in UCLASS_I2C_EMUL to record information about the - * device being emulated. It is accessible with dev_get_uclass_platdata() + * device being emulated. It is accessible with dev_get_uclass_plat() * * @dev: Device being emulated */ @@ -37,7 +37,7 @@ struct i2c_emul_uc_platdata {

struct udevice *i2c_emul_get_device(struct udevice *emul) { - struct i2c_emul_uc_platdata *uc_plat = dev_get_uclass_platdata(emul); + struct i2c_emul_uc_platdata *uc_plat = dev_get_uclass_plat(emul);

return uc_plat->dev; } @@ -54,7 +54,7 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp) log_err("No emulators for device '%s'\n", dev->name); return ret; } - uc_plat = dev_get_uclass_platdata(emul); + uc_plat = dev_get_uclass_plat(emul); uc_plat->dev = dev; *emulp = emul;

@@ -64,14 +64,14 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp) UCLASS_DRIVER(i2c_emul) = { .id = UCLASS_I2C_EMUL, .name = "i2c_emul", - .per_device_platdata_auto = + .per_device_plat_auto = sizeof(struct i2c_emul_uc_platdata), };

/* - * This uclass is a child of the i2c bus. Its platdata is not defined here so + * This uclass is a child of the i2c bus. Its plat is not defined here so * is defined by its parent, UCLASS_I2C, which uses struct dm_i2c_chip. See - * per_child_platdata_auto in UCLASS_DRIVER(i2c). + * per_child_plat_auto in UCLASS_DRIVER(i2c). */ UCLASS_DRIVER(i2c_emul_parent) = { .id = UCLASS_I2C_EMUL_PARENT, diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index 3ef0188af27..58172f787b6 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -79,7 +79,7 @@ static int i2c_setup_offset(struct dm_i2c_chip *chip, uint offset, static int i2c_read_bytewise(struct udevice *dev, uint offset, uint8_t *buffer, int len) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); struct dm_i2c_ops *ops = i2c_get_ops(bus); struct i2c_msg msg[2], *ptr; @@ -108,7 +108,7 @@ static int i2c_read_bytewise(struct udevice *dev, uint offset, static int i2c_write_bytewise(struct udevice *dev, uint offset, const uint8_t *buffer, int len) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); struct dm_i2c_ops *ops = i2c_get_ops(bus); struct i2c_msg msg[1]; @@ -131,7 +131,7 @@ static int i2c_write_bytewise(struct udevice *dev, uint offset,

int dm_i2c_read(struct udevice *dev, uint offset, uint8_t *buffer, int len) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); struct dm_i2c_ops *ops = i2c_get_ops(bus); struct i2c_msg msg[2], *ptr; @@ -162,7 +162,7 @@ int dm_i2c_read(struct udevice *dev, uint offset, uint8_t *buffer, int len) int dm_i2c_write(struct udevice *dev, uint offset, const uint8_t *buffer, int len) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); struct dm_i2c_ops *ops = i2c_get_ops(bus); struct i2c_msg msg[1]; @@ -297,7 +297,7 @@ static int i2c_bind_driver(struct udevice *bus, uint chip_addr, uint offset_len, goto err_bind;

/* Tell the device what we know about it */ - chip = dev_get_parent_platdata(dev); + chip = dev_get_parent_plat(dev); chip->chip_addr = chip_addr; chip->offset_len = offset_len; ret = device_probe(dev); @@ -328,7 +328,7 @@ int i2c_get_chip(struct udevice *bus, uint chip_addr, uint offset_len, bus->name, chip_addr); for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); int ret;

if (chip->chip_addr == (chip_addr & @@ -433,7 +433,7 @@ int dm_i2c_get_bus_speed(struct udevice *bus) int i2c_set_chip_flags(struct udevice *dev, uint flags) { struct udevice *bus = dev->parent; - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct dm_i2c_ops *ops = i2c_get_ops(bus); int ret;

@@ -449,7 +449,7 @@ int i2c_set_chip_flags(struct udevice *dev, uint flags)

int i2c_get_chip_flags(struct udevice *dev, uint *flagsp) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

*flagsp = chip->flags;

@@ -458,7 +458,7 @@ int i2c_get_chip_flags(struct udevice *dev, uint *flagsp)

int i2c_set_chip_offset_len(struct udevice *dev, uint offset_len) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

if (offset_len > I2C_MAX_OFFSET_LEN) return log_ret(-EINVAL); @@ -469,14 +469,14 @@ int i2c_set_chip_offset_len(struct udevice *dev, uint offset_len)

int i2c_get_chip_offset_len(struct udevice *dev) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

return chip->offset_len; }

int i2c_set_chip_addr_offset_mask(struct udevice *dev, uint mask) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

chip->chip_addr_offset_mask = mask;

@@ -485,7 +485,7 @@ int i2c_set_chip_addr_offset_mask(struct udevice *dev, uint mask)

uint i2c_get_chip_addr_offset_mask(struct udevice *dev) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

return chip->chip_addr_offset_mask; } @@ -676,7 +676,7 @@ static int i2c_post_probe(struct udevice *dev) static int i2c_child_post_bind(struct udevice *dev) { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) - struct dm_i2c_chip *plat = dev_get_parent_platdata(dev); + struct dm_i2c_chip *plat = dev_get_parent_plat(dev);

if (!dev_of_valid(dev)) return 0; @@ -737,7 +737,7 @@ UCLASS_DRIVER(i2c) = { .pre_probe = i2c_pre_probe, .post_probe = i2c_post_probe, .per_device_auto = sizeof(struct dm_i2c_bus), - .per_child_platdata_auto = sizeof(struct dm_i2c_chip), + .per_child_plat_auto = sizeof(struct dm_i2c_chip), .child_post_bind = i2c_child_post_bind, };

diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c index f40a9c95df1..dbca409ee3a 100644 --- a/drivers/i2c/muxes/i2c-mux-uclass.c +++ b/drivers/i2c/muxes/i2c-mux-uclass.c @@ -36,7 +36,7 @@ struct i2c_mux_bus { /* Find out the mux channel number */ static int i2c_mux_child_post_bind(struct udevice *dev) { - struct i2c_mux_bus *plat = dev_get_parent_platdata(dev); + struct i2c_mux_bus *plat = dev_get_parent_plat(dev); int channel;

channel = dev_read_u32_default(dev, "reg", -1); @@ -126,7 +126,7 @@ static int i2c_mux_post_probe(struct udevice *mux)

int i2c_mux_select(struct udevice *dev) { - struct i2c_mux_bus *plat = dev_get_parent_platdata(dev); + struct i2c_mux_bus *plat = dev_get_parent_plat(dev); struct udevice *mux = dev->parent; struct i2c_mux_ops *ops = i2c_mux_get_ops(mux);

@@ -138,7 +138,7 @@ int i2c_mux_select(struct udevice *dev)

int i2c_mux_deselect(struct udevice *dev) { - struct i2c_mux_bus *plat = dev_get_parent_platdata(dev); + struct i2c_mux_bus *plat = dev_get_parent_plat(dev); struct udevice *mux = dev->parent; struct i2c_mux_ops *ops = i2c_mux_get_ops(mux);

@@ -221,6 +221,6 @@ UCLASS_DRIVER(i2c_mux) = { .post_bind = i2c_mux_post_bind, .post_probe = i2c_mux_post_probe, .per_device_auto = sizeof(struct i2c_mux), - .per_child_platdata_auto = sizeof(struct i2c_mux_bus), + .per_child_plat_auto = sizeof(struct i2c_mux_bus), .child_post_bind = i2c_mux_child_post_bind, }; diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index bdb4f079e9d..ea9e93327dd 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -1094,7 +1094,7 @@ U_BOOT_DRIVER(i2c_omap) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_i2c_ids, .ofdata_to_platdata = omap_i2c_ofdata_to_platdata, - .platdata_auto = sizeof(struct omap_i2c_platdata), + .plat_auto = sizeof(struct omap_i2c_platdata), #endif .probe = omap_i2c_probe, .priv_auto = sizeof(struct omap_i2c), diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c index 3abd05324af..a61dfc096b3 100644 --- a/drivers/i2c/sandbox_i2c.c +++ b/drivers/i2c/sandbox_i2c.c @@ -27,7 +27,7 @@ static int get_emul(struct udevice *dev, struct udevice **devp,

*devp = NULL; *opsp = NULL; - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); if (!plat->emul) { ret = i2c_emul_find(dev, &plat->emul); if (ret) diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index d20e28dc616..e15a2967ffe 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -22,7 +22,7 @@ int led_get_by_label(const char *label, struct udevice **devp) if (ret) return ret; uclass_foreach_dev(dev, uc) { - struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Ignore the top-level LED node */ if (uc_plat->label && !strcmp(label, uc_plat->label)) @@ -96,5 +96,5 @@ int led_default_state(void) UCLASS_DRIVER(led) = { .id = UCLASS_LED, .name = "led", - .per_device_platdata_auto = sizeof(struct led_uc_plat), + .per_device_plat_auto = sizeof(struct led_uc_plat), }; diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c index dbe9ab15a50..bf8207d638d 100644 --- a/drivers/led/led_bcm6328.c +++ b/drivers/led/led_bcm6328.c @@ -147,7 +147,7 @@ static const struct led_ops bcm6328_led_ops = {

static int bcm6328_led_probe(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Top-level LED node */ if (!uc_plat->label) { @@ -222,7 +222,7 @@ static int bcm6328_led_bind(struct udevice *parent) if (ret) return ret;

- uc_plat = dev_get_uclass_platdata(dev); + uc_plat = dev_get_uclass_plat(dev); uc_plat->label = label; }

diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c index 4bf4a09a0a5..3e57cdfd17d 100644 --- a/drivers/led/led_bcm6358.c +++ b/drivers/led/led_bcm6358.c @@ -113,7 +113,7 @@ static const struct led_ops bcm6358_led_ops = {

static int bcm6358_led_probe(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Top-level LED node */ if (!uc_plat->label) { @@ -192,7 +192,7 @@ static int bcm6358_led_bind(struct udevice *parent) if (ret) return ret;

- uc_plat = dev_get_uclass_platdata(dev); + uc_plat = dev_get_uclass_plat(dev); uc_plat->label = label; }

diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c index 0b1379dfd88..fbf46a114c5 100644 --- a/drivers/led/led_bcm6858.c +++ b/drivers/led/led_bcm6858.c @@ -154,7 +154,7 @@ static const struct led_ops bcm6858_led_ops = {

static int bcm6858_led_probe(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Top-level LED node */ if (!uc_plat->label) { @@ -229,7 +229,7 @@ static int bcm6858_led_bind(struct udevice *parent) if (ret) return ret;

- uc_plat = dev_get_uclass_platdata(dev); + uc_plat = dev_get_uclass_plat(dev); uc_plat->label = label; }

diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c index b8760bef393..f9e497f915e 100644 --- a/drivers/led/led_cortina.c +++ b/drivers/led/led_cortina.c @@ -132,7 +132,7 @@ static const struct led_ops cortina_led_ops = {

static int ca_led_ofdata_to_platdata(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Top-level LED node */ if (!uc_plat->label) { @@ -165,22 +165,22 @@ static int ca_led_ofdata_to_platdata(struct udevice *dev)

static int cortina_led_probe(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Top-level LED node */ if (!uc_plat->label) { - struct cortina_led_platdata *platdata = dev_get_platdata(dev); + struct cortina_led_platdata *plat = dev_get_platdata(dev); u32 reg_value, val; u16 rate1, rate2;

- if (!platdata->ctrl_regs) + if (!plat->ctrl_regs) return -EINVAL;

reg_value = 0; reg_value |= LED_CLK_POLARITY;

- rate1 = platdata->rate1; - rate2 = platdata->rate2; + rate1 = plat->rate1; + rate2 = plat->rate2;

val = rate1 / 16 - 1; rate1 = val > LED_MAX_HW_BLINK ? @@ -194,7 +194,7 @@ static int cortina_led_probe(struct udevice *dev) reg_value |= (rate2 & LED_BLINK_RATE2_MASK) << LED_BLINK_RATE2_SHIFT;

- cortina_led_write(platdata->ctrl_regs, reg_value); + cortina_led_write(plat->ctrl_regs, reg_value);

} else { struct cortina_led_cfg *priv = dev_get_priv(dev); @@ -273,7 +273,7 @@ static int cortina_led_bind(struct udevice *parent) node, &dev); if (ret) return ret; - uc_plat = dev_get_uclass_platdata(dev); + uc_plat = dev_get_uclass_plat(dev); uc_plat->label = label; }

@@ -292,7 +292,7 @@ U_BOOT_DRIVER(cortina_led) = { .ofdata_to_platdata = ca_led_ofdata_to_platdata, .bind = cortina_led_bind, .probe = cortina_led_probe, - .platdata_auto = sizeof(struct cortina_led_platdata), + .plat_auto = sizeof(struct cortina_led_platdata), .priv_auto = sizeof(struct cortina_led_cfg), .ops = &cortina_led_ops, }; diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c index fe18ae3eed1..67ece3cbcd0 100644 --- a/drivers/led/led_gpio.c +++ b/drivers/led/led_gpio.c @@ -57,7 +57,7 @@ static enum led_state_t gpio_led_get_state(struct udevice *dev)

static int led_gpio_probe(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct led_gpio_priv *priv = dev_get_priv(dev); int ret;

@@ -106,7 +106,7 @@ static int led_gpio_bind(struct udevice *parent) node, &dev); if (ret) return ret; - uc_plat = dev_get_uclass_platdata(dev); + uc_plat = dev_get_uclass_plat(dev); uc_plat->label = label; }

diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index 509fd7eb550..2bb520f0661 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -59,7 +59,7 @@ U_BOOT_CMD( static int altera_sysid_read(struct udevice *dev, int offset, void *buf, int size) { - struct altera_sysid_platdata *plat = dev->platdata; + struct altera_sysid_platdata *plat = dev->plat; struct altera_sysid_regs *const regs = plat->regs; u32 *sysid = buf;

@@ -94,6 +94,6 @@ U_BOOT_DRIVER(altera_sysid) = { .id = UCLASS_MISC, .of_match = altera_sysid_ids, .ofdata_to_platdata = altera_sysid_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_sysid_platdata), + .plat_auto = sizeof(struct altera_sysid_platdata), .ops = &altera_sysid_ops, }; diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c index 664bd2b9385..a1b78a3045d 100644 --- a/drivers/misc/cros_ec_i2c.c +++ b/drivers/misc/cros_ec_i2c.c @@ -52,7 +52,7 @@ struct ec_host_response_i2c { static int cros_ec_i2c_packet(struct udevice *udev, int out_bytes, int in_bytes) { struct cros_ec_dev *dev = dev_get_uclass_priv(udev); - struct dm_i2c_chip *chip = dev_get_parent_platdata(udev); + struct dm_i2c_chip *chip = dev_get_parent_plat(udev); struct ec_host_request_i2c *ec_request_i2c = (struct ec_host_request_i2c *)dev->dout; struct ec_host_response_i2c *ec_response_i2c = @@ -112,7 +112,7 @@ static int cros_ec_i2c_command(struct udevice *udev, uint8_t cmd, int dout_len, uint8_t **dinp, int din_len) { struct cros_ec_dev *dev = dev_get_uclass_priv(udev); - struct dm_i2c_chip *chip = dev_get_parent_platdata(udev); + struct dm_i2c_chip *chip = dev_get_parent_plat(udev); struct i2c_msg i2c_msg[2]; /* version8, cmd8, arglen8, out8[dout_len], csum8 */ int out_bytes = dout_len + 4; diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 71e20a49278..b149a27b082 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -161,7 +161,7 @@ static int fw_get_filesystem_firmware(struct udevice *dev) else ret = -ENODEV; } else { - ret = select_fs_dev(dev->platdata); + ret = select_fs_dev(dev->plat); }

if (ret) @@ -228,7 +228,7 @@ static int fs_loader_ofdata_to_platdata(struct udevice *dev) if (ofnode_valid(fs_loader_node)) { struct device_platdata *plat;

- plat = dev->platdata; + plat = dev->plat; if (!ofnode_read_u32_array(fs_loader_node, "phandlepart", phandlepart, 2)) { @@ -250,7 +250,7 @@ static int fs_loader_probe(struct udevice *dev) { #if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK) int ret; - struct device_platdata *plat = dev->platdata; + struct device_platdata *plat = dev->plat;

if (plat->phandlepart.phandle) { ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); @@ -285,7 +285,7 @@ U_BOOT_DRIVER(fs_loader) = { .of_match = fs_loader_ids, .probe = fs_loader_probe, .ofdata_to_platdata = fs_loader_ofdata_to_platdata, - .platdata_auto = sizeof(struct device_platdata), + .plat_auto = sizeof(struct device_platdata), .priv_auto = sizeof(struct firmware), };

diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c index 2089df1e008..65db9c808fc 100644 --- a/drivers/misc/i2c_eeprom_emul.c +++ b/drivers/misc/i2c_eeprom_emul.c @@ -201,6 +201,6 @@ U_BOOT_DRIVER(sandbox_i2c_emul) = { .probe = sandbox_i2c_eeprom_probe, .remove = sandbox_i2c_eeprom_remove, .priv_auto = sizeof(struct sandbox_i2c_flash), - .platdata_auto = sizeof(struct sandbox_i2c_flash_plat_data), + .plat_auto = sizeof(struct sandbox_i2c_flash_plat_data), .ops = &sandbox_i2c_emul_ops, }; diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c index 5a2a0e6c523..65e34d53206 100644 --- a/drivers/misc/imx8/scu.c +++ b/drivers/misc/imx8/scu.c @@ -245,6 +245,6 @@ U_BOOT_DRIVER(imx8_scu) = { .bind = imx8_scu_bind, .remove = imx8_scu_remove, .ops = &imx8_scu_ops, - .platdata_auto = sizeof(struct imx8_scu), + .plat_auto = sizeof(struct imx8_scu), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c index 43a539e942e..1d9ca82b95b 100644 --- a/drivers/misc/microchip_flexcom.c +++ b/drivers/misc/microchip_flexcom.c @@ -62,5 +62,5 @@ U_BOOT_DRIVER(microchip_flexcom) = { .id = UCLASS_MISC, .of_match = microchip_flexcom_ids, .ofdata_to_platdata = microchip_flexcom_ofdata_to_platdata, - .platdata_auto = sizeof(struct microchip_flexcom_platdata), + .plat_auto = sizeof(struct microchip_flexcom_platdata), }; diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index e41c2cd4814..ce5630fd3ee 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -30,7 +30,7 @@ int p2sb_set_hide(struct udevice *dev, bool hide)

void *pcr_reg_address(struct udevice *dev, uint offset) { - struct p2sb_child_platdata *pplat = dev_get_parent_platdata(dev); + struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); struct udevice *p2sb = dev_get_parent(dev); struct p2sb_uc_priv *upriv = dev_get_uclass_priv(p2sb); uintptr_t reg_addr; @@ -161,7 +161,7 @@ void pcr_clrsetbits8(struct udevice *dev, uint offset, uint clr, uint set)

int p2sb_get_port_id(struct udevice *dev) { - struct p2sb_child_platdata *pplat = dev_get_parent_platdata(dev); + struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev);

return pplat->pid; } @@ -184,11 +184,11 @@ int p2sb_set_port_id(struct udevice *dev, int portid) * We must allocate this, since when the device was bound it did * not have a parent. */ - dev->parent_platdata = malloc(sizeof(*pplat)); - if (!dev->parent_platdata) + dev->parent_plat = malloc(sizeof(*pplat)); + if (!dev->parent_plat) return -ENOMEM; } - pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); pplat->pid = portid;

return 0; @@ -197,7 +197,7 @@ int p2sb_set_port_id(struct udevice *dev, int portid) static int p2sb_child_post_bind(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct p2sb_child_platdata *pplat = dev_get_parent_platdata(dev); + struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); int ret; u32 pid;

@@ -224,6 +224,6 @@ UCLASS_DRIVER(p2sb) = { .per_device_auto = sizeof(struct p2sb_uc_priv), .post_bind = p2sb_post_bind, .child_post_bind = p2sb_child_post_bind, - .per_child_platdata_auto = + .per_child_plat_auto = sizeof(struct p2sb_child_platdata), }; diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c index acdc2c099b4..642e94f1ecc 100644 --- a/drivers/misc/p2sb_emul.c +++ b/drivers/misc/p2sb_emul.c @@ -198,7 +198,7 @@ static int find_p2sb_channel(struct udevice *emul, uint offset,

device_foreach_child(dev, p2sb) { struct p2sb_child_platdata *pplat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev);

log_debug(" - child %s, pid %d, want %d\n", dev->name, pplat->pid, pid); @@ -263,7 +263,7 @@ U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = { .of_match = sandbox_p2sb_emul_ids, .ops = &sandbox_p2sb_emul_emul_ops, .priv_auto = sizeof(struct p2sb_emul_priv), - .platdata_auto = sizeof(struct p2sb_emul_platdata), + .plat_auto = sizeof(struct p2sb_emul_platdata), };

static struct pci_device_id sandbox_p2sb_emul_supported[] = { diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 447b180231d..d3aa5b9d6f9 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -155,6 +155,6 @@ U_BOOT_DRIVER(rockchip_efuse) = { .id = UCLASS_MISC, .of_match = rockchip_efuse_ids, .ofdata_to_platdata = rockchip_efuse_ofdata_to_platdata, - .platdata_auto = sizeof(struct rockchip_efuse_platdata), + .plat_auto = sizeof(struct rockchip_efuse_platdata), .ops = &rockchip_efuse_ops, }; diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c index 139855adc4d..be666bc6238 100644 --- a/drivers/misc/rockchip-otp.c +++ b/drivers/misc/rockchip-otp.c @@ -172,5 +172,5 @@ U_BOOT_DRIVER(rockchip_otp) = { .of_match = rockchip_otp_ids, .ops = &rockchip_otp_ops, .ofdata_to_platdata = rockchip_otp_ofdata_to_platdata, - .platdata_auto = sizeof(struct rockchip_otp_platdata), + .plat_auto = sizeof(struct rockchip_otp_platdata), }; diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c index fed7ecfb929..94eaf234ae7 100644 --- a/drivers/misc/sandbox_adder.c +++ b/drivers/misc/sandbox_adder.c @@ -21,7 +21,7 @@ struct sandbox_adder_priv { int sandbox_adder_read(struct udevice *dev, ulong address, void *data, enum axi_size_t size) { - struct p2sb_child_platdata *pplat = dev_get_parent_platdata(dev); + struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); u32 *val = data;

*val = pplat->pid << 24 | address; diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c index 3dab126f3a6..33c0d684614 100644 --- a/drivers/misc/sifive-otp.c +++ b/drivers/misc/sifive-otp.c @@ -270,6 +270,6 @@ U_BOOT_DRIVER(sifive_otp) = { .id = UCLASS_MISC, .of_match = sifive_otp_ids, .ofdata_to_platdata = sifive_otp_ofdata_to_platdata, - .platdata_auto = sizeof(struct sifive_otp_platdata), + .plat_auto = sizeof(struct sifive_otp_platdata), .ops = &sifive_otp_ops, }; diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c index d75df8e9639..5de78410e66 100644 --- a/drivers/misc/swap_case.c +++ b/drivers/misc/swap_case.c @@ -392,7 +392,7 @@ U_BOOT_DRIVER(sandbox_swap_case_emul) = { .of_match = sandbox_swap_case_ids, .ops = &sandbox_swap_case_emul_ops, .priv_auto = sizeof(struct swap_case_priv), - .platdata_auto = sizeof(struct swap_case_platdata), + .plat_auto = sizeof(struct swap_case_platdata), };

static struct pci_device_id sandbox_swap_case_supported[] = { diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c index 926fba68638..2015e31b724 100644 --- a/drivers/mmc/am654_sdhci.c +++ b/drivers/mmc/am654_sdhci.c @@ -495,5 +495,5 @@ U_BOOT_DRIVER(am654_sdhci_drv) = { .bind = am654_sdhci_bind, .probe = am654_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct am654_sdhci_plat), + .plat_auto = sizeof(struct am654_sdhci_plat), }; diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c index 6c118b48190..6d983d0b020 100644 --- a/drivers/mmc/arm_pl180_mmci.c +++ b/drivers/mmc/arm_pl180_mmci.c @@ -552,6 +552,6 @@ U_BOOT_DRIVER(arm_pl180_mmc) = { .ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata, .bind = arm_pl180_mmc_bind, .priv_auto = sizeof(struct pl180_mmc_host), - .platdata_auto = sizeof(struct arm_pl180_mmc_plat), + .plat_auto = sizeof(struct arm_pl180_mmc_plat), }; #endif diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c index 4bf02c3bb47..1e340f82a10 100644 --- a/drivers/mmc/aspeed_sdhci.c +++ b/drivers/mmc/aspeed_sdhci.c @@ -87,5 +87,5 @@ U_BOOT_DRIVER(aspeed_sdhci_drv) = { .bind = aspeed_sdhci_bind, .probe = aspeed_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct aspeed_sdhci_plat), + .plat_auto = sizeof(struct aspeed_sdhci_plat), }; diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index 6f3b21b98d2..ee5d0dc4d70 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -131,6 +131,6 @@ U_BOOT_DRIVER(atmel_sdhci_drv) = { .bind = atmel_sdhci_bind, .probe = atmel_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct atmel_sdhci_plat), + .plat_auto = sizeof(struct atmel_sdhci_plat), }; #endif diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 7beb3b562cf..958129ca2a5 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -251,6 +251,6 @@ U_BOOT_DRIVER(sdhci_cdns) = { .bind = bcm2835_sdhci_bind, .probe = bcm2835_sdhci_probe, .priv_auto = sizeof(struct bcm2835_sdhci_host), - .platdata_auto = sizeof(struct bcm2835_sdhci_plat), + .plat_auto = sizeof(struct bcm2835_sdhci_plat), .ops = &sdhci_ops, }; diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c index 06bebc27d3b..8531f54c522 100644 --- a/drivers/mmc/bcm2835_sdhost.c +++ b/drivers/mmc/bcm2835_sdhost.c @@ -807,6 +807,6 @@ U_BOOT_DRIVER(bcm2835_sdhost) = { .bind = bcm2835_bind, .probe = bcm2835_probe, .priv_auto = sizeof(struct bcm2835_host), - .platdata_auto = sizeof(struct bcm2835_plat), + .plat_auto = sizeof(struct bcm2835_plat), .ops = &bcm2835_ops, }; diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c index a92467f8004..e8041eb30fd 100644 --- a/drivers/mmc/bcmstb_sdhci.c +++ b/drivers/mmc/bcmstb_sdhci.c @@ -101,5 +101,5 @@ U_BOOT_DRIVER(sdhci_bcmstb) = { .bind = sdhci_bcmstb_bind, .probe = sdhci_bcmstb_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct sdhci_bcmstb_plat), + .plat_auto = sizeof(struct sdhci_bcmstb_plat), }; diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index 98d7f6b0b53..f295c541344 100644 --- a/drivers/mmc/ca_dw_mmc.c +++ b/drivers/mmc/ca_dw_mmc.c @@ -167,5 +167,5 @@ U_BOOT_DRIVER(ca_dwmmc_drv) = { .ops = &ca_dwmci_dm_ops, .probe = ca_dwmmc_probe, .priv_auto = sizeof(struct ca_dwmmc_priv_data), - .platdata_auto = sizeof(struct ca_mmc_plat), + .plat_auto = sizeof(struct ca_mmc_plat), }; diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 0b9669abbc8..d3562c39a98 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -527,7 +527,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = { .id = UCLASS_MMC, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = davinci_mmc_ids, - .platdata_auto = sizeof(struct davinci_mmc_plat), + .plat_auto = sizeof(struct davinci_mmc_plat), .ofdata_to_platdata = davinci_mmc_ofdata_to_platdata, #endif #if CONFIG_BLK diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c index 63d00a3141f..5cc28c53c20 100644 --- a/drivers/mmc/exynos_dw_mmc.c +++ b/drivers/mmc/exynos_dw_mmc.c @@ -307,6 +307,6 @@ U_BOOT_DRIVER(exynos_dwmmc_drv) = { .ops = &dm_dwmci_ops, .probe = exynos_dwmmc_probe, .priv_auto = sizeof(struct dwmci_exynos_priv_data), - .platdata_auto = sizeof(struct exynos_mmc_plat), + .plat_auto = sizeof(struct exynos_mmc_plat), }; #endif diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index b259c1a0320..4d2db929e60 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -1114,7 +1114,7 @@ U_BOOT_DRIVER(fsl_esdhc) = { .ops = &fsl_esdhc_ops, .bind = fsl_esdhc_bind, .probe = fsl_esdhc_probe, - .platdata_auto = sizeof(struct fsl_esdhc_plat), + .plat_auto = sizeof(struct fsl_esdhc_plat), .priv_auto = sizeof(struct fsl_esdhc_priv), }; #endif diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index c174df6ed29..2dea849e37d 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1707,7 +1707,7 @@ U_BOOT_DRIVER(fsl_esdhc) = { .bind = fsl_esdhc_bind, #endif .probe = fsl_esdhc_probe, - .platdata_auto = sizeof(struct fsl_esdhc_plat), + .plat_auto = sizeof(struct fsl_esdhc_plat), .priv_auto = sizeof(struct fsl_esdhc_priv), };

diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c index 5d312df2b48..196c52776e3 100644 --- a/drivers/mmc/ftsdc010_mci.c +++ b/drivers/mmc/ftsdc010_mci.c @@ -478,5 +478,5 @@ U_BOOT_DRIVER(ftsdc010_mmc) = { .bind = ftsdc010_mmc_bind, .probe = ftsdc010_mmc_probe, .priv_auto = sizeof(struct ftsdc_priv), - .platdata_auto = sizeof(struct ftsdc010_plat), + .plat_auto = sizeof(struct ftsdc010_plat), }; diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index c135ee9b7ca..6f056aecb6d 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -624,7 +624,7 @@ U_BOOT_DRIVER(atmel_mci) = { .of_match = atmel_mci_ids, .bind = atmel_mci_bind, .probe = atmel_mci_probe, - .platdata_auto = sizeof(struct atmel_mci_plat), + .plat_auto = sizeof(struct atmel_mci_plat), .priv_auto = sizeof(struct atmel_mci_priv), .ops = &atmel_mci_mmc_ops, }; diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c index cdc9a44e3e6..ae9f5a03102 100644 --- a/drivers/mmc/hi6220_dw_mmc.c +++ b/drivers/mmc/hi6220_dw_mmc.c @@ -113,5 +113,5 @@ U_BOOT_DRIVER(hi6220_dwmmc_drv) = { .bind = hi6220_dwmmc_bind, .probe = hi6220_dwmmc_probe, .priv_auto = sizeof(struct hi6220_dwmmc_priv_data), - .platdata_auto = sizeof(struct hi6220_dwmmc_plat), + .plat_auto = sizeof(struct hi6220_dwmmc_plat), }; diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c index e5c453e2159..a85697cfa83 100644 --- a/drivers/mmc/iproc_sdhci.c +++ b/drivers/mmc/iproc_sdhci.c @@ -248,5 +248,5 @@ U_BOOT_DRIVER(iproc_sdhci_drv) = { .bind = iproc_sdhci_bind, .probe = iproc_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct iproc_sdhci_plat), + .plat_auto = sizeof(struct iproc_sdhci_plat), }; diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c index e3a28234463..99f2c2f40dd 100644 --- a/drivers/mmc/jz_mmc.c +++ b/drivers/mmc/jz_mmc.c @@ -502,7 +502,7 @@ U_BOOT_DRIVER(jz_mmc_drv) = { .bind = jz_mmc_bind, .probe = jz_mmc_probe, .priv_auto = sizeof(struct jz_mmc_priv), - .platdata_auto = sizeof(struct jz_mmc_plat), + .plat_auto = sizeof(struct jz_mmc_plat), .ops = &jz_msc_ops, }; #endif /* CONFIG_DM_MMC */ diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index a03a37783da..6a9662f69ab 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -340,7 +340,7 @@ U_BOOT_DRIVER(meson_mmc) = { .probe = meson_mmc_probe, .bind = meson_mmc_bind, .ofdata_to_platdata = meson_mmc_ofdata_to_platdata, - .platdata_auto = sizeof(struct meson_mmc_platdata), + .plat_auto = sizeof(struct meson_mmc_platdata), };

#ifdef CONFIG_PWRSEQ diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 269f31afeee..53eabc9e612 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -321,7 +321,7 @@ struct blk_desc *mmc_get_blk_desc(struct mmc *mmc) device_find_first_child(mmc->dev, &dev); if (!dev) return NULL; - desc = dev_get_uclass_platdata(dev); + desc = dev_get_uclass_plat(dev);

return desc; } @@ -399,7 +399,7 @@ int mmc_bind(struct udevice *dev, struct mmc *mmc, const struct mmc_config *cfg) debug("Cannot create block device\n"); return ret; } - bdesc = dev_get_uclass_platdata(bdev); + bdesc = dev_get_uclass_plat(bdev); mmc->cfg = cfg; mmc->priv = dev;

@@ -435,7 +435,7 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart) { struct udevice *mmc_dev = dev_get_parent(bdev); struct mmc *mmc = mmc_get_mmc_dev(mmc_dev); - struct blk_desc *desc = dev_get_uclass_platdata(bdev); + struct blk_desc *desc = dev_get_uclass_plat(bdev); int ret;

if (desc->hwpart == hwpart) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index a47700e313c..5b2e1a044be 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -432,7 +432,7 @@ ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, #endif { #if CONFIG_IS_ENABLED(BLK) - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); #endif int dev_num = block_dev->devnum; int err; diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c index 31c8f06ca65..d0c439729fe 100644 --- a/drivers/mmc/mmc_spi.c +++ b/drivers/mmc/mmc_spi.c @@ -468,6 +468,6 @@ U_BOOT_DRIVER(mmc_spi) = { .ops = &mmc_spi_ops, .probe = mmc_spi_probe, .bind = mmc_spi_bind, - .platdata_auto = sizeof(struct mmc_spi_plat), + .plat_auto = sizeof(struct mmc_spi_plat), .priv_auto = sizeof(struct mmc_spi_priv), }; diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c index 6a4453ca02e..d23b7d9729f 100644 --- a/drivers/mmc/mmc_write.c +++ b/drivers/mmc/mmc_write.c @@ -73,7 +73,7 @@ ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt) #endif { #if CONFIG_IS_ENABLED(BLK) - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); #endif int dev_num = block_dev->devnum; int err = 0; @@ -193,7 +193,7 @@ ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt, #endif { #if CONFIG_IS_ENABLED(BLK) - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); #endif int dev_num = block_dev->devnum; lbaint_t cur, blocks_todo = blkcnt; diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 049dd33ce4f..45bf269a534 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -209,5 +209,5 @@ U_BOOT_DRIVER(msm_sdc_drv) = { .probe = msm_sdc_probe, .remove = msm_sdc_remove, .priv_auto = sizeof(struct msm_sdhc), - .platdata_auto = sizeof(struct msm_sdhc_plat), + .plat_auto = sizeof(struct msm_sdhc_plat), }; diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c index d701a4cd008..59217e59b05 100644 --- a/drivers/mmc/mtk-sd.c +++ b/drivers/mmc/mtk-sd.c @@ -1692,6 +1692,6 @@ U_BOOT_DRIVER(mtk_sd_drv) = { .bind = msdc_drv_bind, .probe = msdc_drv_probe, .ops = &msdc_ops, - .platdata_auto = sizeof(struct msdc_plat), + .plat_auto = sizeof(struct msdc_plat), .priv_auto = sizeof(struct msdc_host), }; diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index fb803e3be7d..4cc16131c28 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -152,6 +152,6 @@ U_BOOT_DRIVER(mv_sdhci_drv) = { .probe = mv_sdhci_probe, .ops = &sdhci_ops, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct mv_sdhci_plat), + .plat_auto = sizeof(struct mv_sdhci_plat), }; #endif /* CONFIG_DM_MMC */ diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index fd43f27ade5..a313791586d 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -668,7 +668,7 @@ static const struct dm_mmc_ops mxsmmc_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxsmmc_ofdata_to_platdata(struct udevice *bus) { - struct mxsmmc_platdata *plat = bus->platdata; + struct mxsmmc_platdata *plat = bus->plat; u32 prop[2]; int ret;

@@ -719,7 +719,7 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = { #endif .probe = mxsmmc_probe, .priv_auto = sizeof(struct mxsmmc_priv), - .platdata_auto = sizeof(struct mxsmmc_platdata), + .plat_auto = sizeof(struct mxsmmc_platdata), };

U_BOOT_DRIVER_ALIAS(fsl_imx23_mmc, fsl_imx28_mmc) diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c index 680459bae78..d03d589ac66 100644 --- a/drivers/mmc/nexell_dw_mmc.c +++ b/drivers/mmc/nexell_dw_mmc.c @@ -233,5 +233,5 @@ U_BOOT_DRIVER(nexell_dwmmc_drv) = { .bind = nexell_dwmmc_bind, .probe = nexell_dwmmc_probe, .priv_auto = sizeof(struct nexell_dwmmc_priv), - .platdata_auto = sizeof(struct nexell_mmc_plat), + .plat_auto = sizeof(struct nexell_mmc_plat), }; diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 31003b3cb78..658fd928304 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -2029,7 +2029,7 @@ U_BOOT_DRIVER(omap_hsmmc) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_hsmmc_ids, .ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata, - .platdata_auto = sizeof(struct omap_hsmmc_plat), + .plat_auto = sizeof(struct omap_hsmmc_plat), #endif #ifdef CONFIG_BLK .bind = omap_hsmmc_bind, diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index 004b3cb7ea5..d2cc58fa30e 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -133,7 +133,7 @@ U_BOOT_DRIVER(pci_mmc) = { .probe = pci_mmc_probe, .ops = &sdhci_ops, .priv_auto = sizeof(struct pci_mmc_priv), - .platdata_auto = sizeof(struct pci_mmc_plat), + .plat_auto = sizeof(struct pci_mmc_plat), ACPI_OPS_PTR(&pci_mmc_acpi_ops) };

diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c index dd10624dbfe..04eece59252 100644 --- a/drivers/mmc/pic32_sdhci.c +++ b/drivers/mmc/pic32_sdhci.c @@ -89,5 +89,5 @@ U_BOOT_DRIVER(pic32_sdhci_drv) = { .bind = pic32_sdhci_bind, .probe = pic32_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct pic32_sdhci_plat) + .plat_auto = sizeof(struct pic32_sdhci_plat) }; diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 211e6904639..37c80ef1af1 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -1015,6 +1015,6 @@ U_BOOT_DRIVER(renesas_sdhi) = { .bind = tmio_sd_bind, .probe = renesas_sdhi_probe, .priv_auto = sizeof(struct tmio_sd_priv), - .platdata_auto = sizeof(struct tmio_sd_plat), + .plat_auto = sizeof(struct tmio_sd_plat), .ops = &renesas_sdhi_ops, }; diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index e4c5288876f..67eb89b2a3e 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -177,7 +177,7 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = { .bind = rockchip_dwmmc_bind, .probe = rockchip_dwmmc_probe, .priv_auto = sizeof(struct rockchip_dwmmc_priv), - .platdata_auto = sizeof(struct rockchip_mmc_plat), + .plat_auto = sizeof(struct rockchip_mmc_plat), };

U_BOOT_DRIVER_ALIAS(rockchip_rk3288_dw_mshc, rockchip_rk3328_dw_mshc) diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index 131c976eaf6..427d41ec62a 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -115,5 +115,5 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = { .bind = rockchip_sdhci_bind, .probe = arasan_sdhci_probe, .priv_auto = sizeof(struct rockchip_sdhc), - .platdata_auto = sizeof(struct rockchip_sdhc_plat), + .plat_auto = sizeof(struct rockchip_sdhc_plat), }; diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 6841be6a145..82aff9caaf5 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -247,6 +247,6 @@ U_BOOT_DRIVER(s5p_sdhci_drv) = { .ops = &sdhci_ops, .probe = s5p_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct s5p_sdhci_plat), + .plat_auto = sizeof(struct s5p_sdhci_plat), }; #endif /* CONFIG_DM_MMC */ diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c index ece0e2d31cb..17c6cea1dc1 100644 --- a/drivers/mmc/sandbox_mmc.c +++ b/drivers/mmc/sandbox_mmc.c @@ -148,5 +148,5 @@ U_BOOT_DRIVER(mmc_sandbox) = { .bind = sandbox_mmc_bind, .unbind = sandbox_mmc_unbind, .probe = sandbox_mmc_probe, - .platdata_auto = sizeof(struct sandbox_mmc_plat), + .plat_auto = sizeof(struct sandbox_mmc_plat), }; diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index efc09b91998..ffbac448cd9 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -310,6 +310,6 @@ U_BOOT_DRIVER(sdhci_cdns) = { .bind = sdhci_cdns_bind, .probe = sdhci_cdns_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct sdhci_cdns_plat), + .plat_auto = sizeof(struct sdhci_cdns_plat), .ops = &sdhci_cdns_mmc_ops, }; diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c index f3d10ac8be6..723e3e3862c 100644 --- a/drivers/mmc/sh_mmcif.c +++ b/drivers/mmc/sh_mmcif.c @@ -744,7 +744,7 @@ U_BOOT_DRIVER(sh_mmcif_mmc) = { .bind = sh_mmcif_dm_bind, .probe = sh_mmcif_dm_probe, .priv_auto = sizeof(struct sh_mmcif_host), - .platdata_auto = sizeof(struct sh_mmcif_plat), + .plat_auto = sizeof(struct sh_mmcif_plat), .ops = &sh_mmcif_dm_ops, }; #endif diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c index 04ce521a515..9fcd0e0e9cc 100644 --- a/drivers/mmc/sh_sdhi.c +++ b/drivers/mmc/sh_sdhi.c @@ -903,7 +903,7 @@ U_BOOT_DRIVER(sh_sdhi_mmc) = { .bind = sh_sdhi_dm_bind, .probe = sh_sdhi_dm_probe, .priv_auto = sizeof(struct sh_sdhi_host), - .platdata_auto = sizeof(struct sh_sdhi_plat), + .plat_auto = sizeof(struct sh_sdhi_plat), .ops = &sh_sdhi_dm_ops, }; #endif diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c index 009933de5ef..0533bc2ff63 100644 --- a/drivers/mmc/snps_dw_mmc.c +++ b/drivers/mmc/snps_dw_mmc.c @@ -196,5 +196,5 @@ U_BOOT_DRIVER(snps_dwmmc_drv) = { .bind = snps_dwmmc_bind, .probe = snps_dwmmc_probe, .priv_auto = sizeof(struct snps_dwmci_priv_data), - .platdata_auto = sizeof(struct snps_dwmci_plat), + .plat_auto = sizeof(struct snps_dwmci_plat), }; diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index 80c4d6ed4d4..2d5efb912b8 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -190,5 +190,5 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = { .bind = socfpga_dwmmc_bind, .probe = socfpga_dwmmc_probe, .priv_auto = sizeof(struct dwmci_socfpga_priv_data), - .platdata_auto = sizeof(struct socfpga_dwmci_plat), + .plat_auto = sizeof(struct socfpga_dwmci_plat), }; diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c index 49ddabcbe5e..1da569c75d2 100644 --- a/drivers/mmc/sti_sdhci.c +++ b/drivers/mmc/sti_sdhci.c @@ -145,5 +145,5 @@ U_BOOT_DRIVER(sti_mmc) = { .ofdata_to_platdata = sti_sdhci_ofdata_to_platdata, .probe = sti_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct sti_sdhci_plat), + .plat_auto = sizeof(struct sti_sdhci_plat), }; diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 80eecb60e8e..df5bb781c88 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -718,5 +718,5 @@ U_BOOT_DRIVER(stm32_sdmmc2) = { .probe = stm32_sdmmc2_probe, .bind = stm32_sdmmc_bind, .priv_auto = sizeof(struct stm32_sdmmc2_priv), - .platdata_auto = sizeof(struct stm32_sdmmc2_plat), + .plat_auto = sizeof(struct stm32_sdmmc2_plat), }; diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 12e8c99076b..7490e86960a 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -746,7 +746,7 @@ U_BOOT_DRIVER(sunxi_mmc_drv) = { .bind = sunxi_mmc_bind, .probe = sunxi_mmc_probe, .ops = &sunxi_mmc_ops, - .platdata_auto = sizeof(struct sunxi_mmc_plat), + .plat_auto = sizeof(struct sunxi_mmc_plat), .priv_auto = sizeof(struct sunxi_mmc_priv), }; #endif diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c index 46e185e3172..1a2a0ffd43c 100644 --- a/drivers/mmc/tangier_sdhci.c +++ b/drivers/mmc/tangier_sdhci.c @@ -77,5 +77,5 @@ U_BOOT_DRIVER(sdhci_tangier) = { .probe = sdhci_tangier_probe, .ops = &sdhci_ops, .priv_auto = sizeof(struct sdhci_host), - .platdata_auto = sizeof(struct sdhci_tangier_plat), + .plat_auto = sizeof(struct sdhci_tangier_plat), }; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index f915c78f5d4..8a32156b801 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -771,6 +771,6 @@ U_BOOT_DRIVER(tegra_mmc_drv) = { .bind = tegra_mmc_bind, .probe = tegra_mmc_probe, .ops = &tegra_mmc_ops, - .platdata_auto = sizeof(struct tegra_mmc_plat), + .plat_auto = sizeof(struct tegra_mmc_plat), .priv_auto = sizeof(struct tegra_mmc_priv), }; diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index ca674272fc0..75003a0113e 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -85,6 +85,6 @@ U_BOOT_DRIVER(uniphier_mmc) = { .bind = tmio_sd_bind, .probe = uniphier_sd_probe, .priv_auto = sizeof(struct tmio_sd_priv), - .platdata_auto = sizeof(struct tmio_sd_plat), + .plat_auto = sizeof(struct tmio_sd_plat), .ops = &uniphier_sd_ops, }; diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c index c0897258199..9925513c01f 100644 --- a/drivers/mmc/xenon_sdhci.c +++ b/drivers/mmc/xenon_sdhci.c @@ -565,5 +565,5 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = { .bind = xenon_sdhci_bind, .probe = xenon_sdhci_probe, .priv_auto = sizeof(struct xenon_sdhci_priv), - .platdata_auto = sizeof(struct xenon_sdhci_plat), + .plat_auto = sizeof(struct xenon_sdhci_plat), }; diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 2ef63976e96..919e5d77baa 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -660,5 +660,5 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = { .bind = arasan_sdhci_bind, .probe = arasan_sdhci_probe, .priv_auto = sizeof(struct arasan_sdhci_priv), - .platdata_auto = sizeof(struct arasan_sdhci_plat), + .plat_auto = sizeof(struct arasan_sdhci_plat), }; diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index b50d3061741..82d41170292 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -401,6 +401,6 @@ U_BOOT_DRIVER(altera_qspi) = { .id = UCLASS_MTD, .of_match = altera_qspi_ids, .ofdata_to_platdata = altera_qspi_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_qspi_platdata), + .plat_auto = sizeof(struct altera_qspi_platdata), .probe = altera_qspi_probe, }; diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 018e8c597eb..ea444436ad4 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -63,7 +63,7 @@ config SF_DEFAULT_MODE to handle the common case when only a single serial flash is present on the system. Not used for boot with device tree; the SPI driver reads - speed and mode from platdata values computed from + speed and mode from plat values computed from available node.

config SF_DEFAULT_SPEED @@ -75,7 +75,7 @@ config SF_DEFAULT_SPEED to handle the common case when only a single serial flash is present on the system. Not used for boot with device tree; the SPI driver reads - speed and mode from platdata values computed from + speed and mode from plat values computed from available node.

if SPI_FLASH diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 8ac8183b906..1c7290d159b 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -138,7 +138,7 @@ static int sandbox_sf_probe(struct udevice *dev) dev->name); return ret; } - slave_plat = dev_get_parent_platdata(dev); + slave_plat = dev_get_parent_plat(dev); cs = slave_plat->cs; debug("found at cs %d\n", cs);

@@ -601,6 +601,6 @@ U_BOOT_DRIVER(sandbox_sf_emul) = { .probe = sandbox_sf_probe, .remove = sandbox_sf_remove, .priv_auto = sizeof(struct sandbox_spi_flash), - .platdata_auto = sizeof(struct sandbox_spi_flash_plat_data), + .plat_auto = sizeof(struct sandbox_spi_flash_plat_data), .ops = &sandbox_sf_emul_ops, }; diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index 02565aae7be..adcc20723f7 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -1292,6 +1292,6 @@ U_BOOT_DRIVER(eth_ag7xxx) = { .remove = ag7xxx_eth_remove, .ops = &ag7xxx_eth_ops, .priv_auto = sizeof(struct ar7xxx_eth_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 7d0c58cd532..becc6a69e1d 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -711,7 +711,7 @@ U_BOOT_DRIVER(altera_tse) = { .of_match = altera_tse_ids, .ops = &altera_tse_ops, .ofdata_to_platdata = altera_tse_ofdata_to_platdata, - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .priv_auto = sizeof(struct altera_tse_priv), .probe = altera_tse_probe, }; diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c index 6d622466781..7c79e9ad152 100644 --- a/drivers/net/bcm6348-eth.c +++ b/drivers/net/bcm6348-eth.c @@ -533,7 +533,7 @@ U_BOOT_DRIVER(bcm6348_eth) = { .id = UCLASS_ETH, .of_match = bcm6348_eth_ids, .ops = &bcm6348_eth_ops, - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .priv_auto = sizeof(struct bcm6348_eth_priv), .probe = bcm6348_eth_probe, }; diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c index b0bf0a939d7..6e6548add67 100644 --- a/drivers/net/bcm6368-eth.c +++ b/drivers/net/bcm6368-eth.c @@ -637,7 +637,7 @@ U_BOOT_DRIVER(bcm6368_eth) = { .id = UCLASS_ETH, .of_match = bcm6368_eth_ids, .ops = &bcm6368_eth_ops, - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .priv_auto = sizeof(struct bcm6368_eth_priv), .probe = bcm6368_eth_probe, }; diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c index b6ebac220ed..9fcb28a344f 100644 --- a/drivers/net/bcmgenet.c +++ b/drivers/net/bcmgenet.c @@ -733,6 +733,6 @@ U_BOOT_DRIVER(eth_bcmgenet) = { .probe = bcmgenet_eth_probe, .ops = &bcmgenet_gmac_eth_ops, .priv_auto = sizeof(struct bcmgenet_eth_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 26d2ec09708..66d16187735 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -752,7 +752,7 @@ U_BOOT_DRIVER(eth_dc2114x) = { .probe = dc2114x_probe, .ops = &dc2114x_ops, .priv_auto = sizeof(struct dc2114x_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_dc2114x, supported); diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 32b3fc82302..83b31fa6bf9 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -740,7 +740,7 @@ int designware_eth_probe(struct udevice *dev) #ifdef CONFIG_DM_PCI /* * If we are on PCI bus, either directly attached to a PCI root port, - * or via a PCI bridge, fill in platdata before we probe the hardware. + * or via a PCI bridge, fill in plat before we probe the hardware. */ if (device_is_on_pci_bus(dev)) { dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase); @@ -874,7 +874,7 @@ U_BOOT_DRIVER(eth_designware) = { .remove = designware_eth_remove, .ops = &designware_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .platdata_auto = sizeof(struct dw_eth_pdata), + .plat_auto = sizeof(struct dw_eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index eb79da29d69..b6fbc6bf934 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -2194,5 +2194,5 @@ U_BOOT_DRIVER(eth_eqos) = { .remove = eqos_remove, .ops = &eqos_ops, .priv_auto = sizeof(struct eqos_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c index 2edd7a74df5..adb865d02b8 100644 --- a/drivers/net/dwmac_s700.c +++ b/drivers/net/dwmac_s700.c @@ -62,6 +62,6 @@ U_BOOT_DRIVER(dwmac_s700) = { .probe = dwmac_s700_probe, .ops = &designware_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c index 9ab2eeb2bcd..ebbbcacfa3a 100644 --- a/drivers/net/dwmac_socfpga.c +++ b/drivers/net/dwmac_socfpga.c @@ -119,6 +119,6 @@ U_BOOT_DRIVER(dwmac_socfpga) = { .probe = dwmac_socfpga_probe, .ops = &designware_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .platdata_auto = sizeof(struct dwmac_socfpga_platdata), + .plat_auto = sizeof(struct dwmac_socfpga_platdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 87acfa5daa7..49e6be31d1d 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5941,7 +5941,7 @@ U_BOOT_DRIVER(eth_e1000) = { .probe = e1000_eth_probe, .ops = &e1000_eth_ops, .priv_auto = sizeof(struct e1000_hw), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported); diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 59582b91217..f47caf1f318 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -1010,7 +1010,7 @@ U_BOOT_DRIVER(eth_eepro100) = { .probe = eepro100_probe, .ops = &eepro100_ops, .priv_auto = sizeof(struct eepro100_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_eepro100, supported); diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index cb232f68bcf..640db112e52 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -751,7 +751,7 @@ U_BOOT_DRIVER(ethoc) = { .remove = ethoc_remove, .ops = &ethoc_ops, .priv_auto = sizeof(struct ethoc), - .platdata_auto = sizeof(struct ethoc_eth_pdata), + .plat_auto = sizeof(struct ethoc_eth_pdata), };

#else diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 8bf585252d1..b85ee9a4534 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1599,6 +1599,6 @@ U_BOOT_DRIVER(fecmxc_gem) = { .remove = fecmxc_remove, .ops = &fecmxc_ops, .priv_auto = sizeof(struct fec_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; #endif diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index 3a827a97a88..f5fb513a157 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -1131,7 +1131,7 @@ U_BOOT_DRIVER(eth_fman) = { .remove = fm_eth_remove, .ops = &fm_eth_ops, .priv_auto = sizeof(struct fm_eth), - .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/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c index 2e97f51c4c3..8bd32b0ab75 100644 --- a/drivers/net/fm/memac_phy.c +++ b/drivers/net/fm/memac_phy.c @@ -298,7 +298,7 @@ U_BOOT_DRIVER(fman_mdio) = { .remove = fm_mdio_remove, .ops = &fm_mdio_ops, .priv_auto = sizeof(struct fm_mdio_priv), - .platdata_auto = sizeof(struct mdio_perdev_priv), + .plat_auto = sizeof(struct mdio_perdev_priv), }; #endif /* CONFIG_PHYLIB && CONFIG_DM_MDIO */ #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 07ad44de470..e988fb0205f 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -69,7 +69,7 @@ void fdt_fixup_enetc_mac(void *blob) continue;

pdata = dev_get_platdata(dev); - ppdata = dev_get_parent_platdata(dev); + ppdata = dev_get_parent_plat(dev); devfn = PCI_FUNC(ppdata->devfn);

enetc_set_ierb_primary_mac(dev, devfn, pdata->enetaddr); @@ -365,7 +365,7 @@ static int enetc_remove(struct udevice *dev)

static int enetc_ls1028a_write_hwaddr(struct udevice *dev) { - struct pci_child_platdata *ppdata = dev_get_parent_platdata(dev); + struct pci_child_platdata *ppdata = dev_get_parent_plat(dev); const int devfn_to_pf[] = {0, 1, 2, -1, -1, -1, 3}; struct eth_pdata *plat = dev_get_platdata(dev); int devfn = PCI_FUNC(ppdata->devfn); @@ -678,7 +678,7 @@ U_BOOT_DRIVER(eth_enetc) = { .remove = enetc_remove, .ops = &enetc_ops, .priv_auto = sizeof(struct enetc_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

static struct pci_device_id enetc_ids[] = { diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index 1e71064adef..1b85f255e9a 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -595,5 +595,5 @@ U_BOOT_DRIVER(mcffec) = { .remove = mcdmafec_remove, .ops = &mcdmafec_ops, .priv_auto = sizeof(struct fec_info_dma), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c index faeb292e55b..5fd11db05f5 100644 --- a/drivers/net/fsl_mdio.c +++ b/drivers/net/fsl_mdio.c @@ -249,7 +249,7 @@ U_BOOT_DRIVER(tsec_mdio) = { .remove = tsec_mdio_remove, .ops = &tsec_mdio_ops, .priv_auto = sizeof(struct tsec_mdio_priv), - .platdata_auto = sizeof(struct mdio_perdev_priv), + .plat_auto = sizeof(struct mdio_perdev_priv), }; #endif /* CONFIG_PHYLIB */ #endif /* CONFIG_DM_MDIO */ diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 97c50cb18ac..1d118ed0836 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -614,6 +614,6 @@ U_BOOT_DRIVER(ftgmac100) = { .remove = ftgmac100_remove, .ops = &ftgmac100_ops, .priv_auto = sizeof(struct ftgmac100_data), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 20b8e35516b..de7ec4d1fcf 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -441,7 +441,7 @@ U_BOOT_DRIVER(ftmac100) = { .probe = ftmac100_probe, .ops = &ftmac100_ops, .priv_auto = sizeof(struct ftmac100_data), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 1b1e7a8f69d..0bd1da58e43 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -760,6 +760,6 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = { .probe = gmac_rockchip_probe, .ops = &gmac_rockchip_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .platdata_auto = sizeof(struct gmac_rockchip_platdata), + .plat_auto = sizeof(struct gmac_rockchip_platdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c index 38f363cd496..f81e7fe1925 100644 --- a/drivers/net/higmacv300.c +++ b/drivers/net/higmacv300.c @@ -599,5 +599,5 @@ U_BOOT_DRIVER(eth_higmac) = { .remove = higmac_remove, .ops = &higmac_ops, .priv_auto = sizeof(struct higmac_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index 6340d6317de..b0e66851752 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -699,7 +699,7 @@ U_BOOT_DRIVER(ks8851) = { .probe = ks8851_probe, .ops = &ks8851_ops, .priv_auto = sizeof(struct ks_net), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 5932b457745..02935f642bd 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -1192,7 +1192,7 @@ U_BOOT_DRIVER(ldpaa_eth) = { .probe = ldpaa_eth_probe, .ops = &ldpaa_eth_ops, .priv_auto = sizeof(struct ldpaa_eth_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

#else diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 2ec3039cf81..4ad37fdc28e 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1336,7 +1336,7 @@ U_BOOT_DRIVER(eth_macb) = { .remove = macb_eth_remove, .ops = &macb_eth_ops, .priv_auto = sizeof(struct macb_device), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; #endif

diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 72c1827e579..bb90a9ba7b6 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -615,5 +615,5 @@ U_BOOT_DRIVER(mcffec) = { .remove = mcffec_remove, .ops = &mcffec_ops, .priv_auto = sizeof(struct fec_info_s), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c index 779377b0db8..f0ea6ea4d88 100644 --- a/drivers/net/mscc_eswitch/jr2_switch.c +++ b/drivers/net/mscc_eswitch/jr2_switch.c @@ -965,5 +965,5 @@ U_BOOT_DRIVER(jr2) = { .remove = jr2_remove, .ops = &jr2_ops, .priv_auto = sizeof(struct jr2_private), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c index 8095f4fabdf..1dfd86aa49e 100644 --- a/drivers/net/mscc_eswitch/luton_switch.c +++ b/drivers/net/mscc_eswitch/luton_switch.c @@ -738,5 +738,5 @@ U_BOOT_DRIVER(luton) = { .remove = luton_remove, .ops = &luton_ops, .priv_auto = sizeof(struct luton_private), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c index 5179b82a637..18e11ec2a92 100644 --- a/drivers/net/mscc_eswitch/ocelot_switch.c +++ b/drivers/net/mscc_eswitch/ocelot_switch.c @@ -652,5 +652,5 @@ U_BOOT_DRIVER(ocelot) = { .remove = ocelot_remove, .ops = &ocelot_ops, .priv_auto = sizeof(struct ocelot_private), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c index e70f44cc10f..e274ee5a06a 100644 --- a/drivers/net/mscc_eswitch/serval_switch.c +++ b/drivers/net/mscc_eswitch/serval_switch.c @@ -605,5 +605,5 @@ U_BOOT_DRIVER(serval) = { .remove = serval_remove, .ops = &serval_ops, .priv_auto = sizeof(struct serval_private), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c index 88556409385..59c0d85c4e9 100644 --- a/drivers/net/mscc_eswitch/servalt_switch.c +++ b/drivers/net/mscc_eswitch/servalt_switch.c @@ -524,5 +524,5 @@ U_BOOT_DRIVER(servalt) = { .remove = servalt_remove, .ops = &servalt_ops, .priv_auto = sizeof(struct servalt_private), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c index 60532111aba..c94d3dd4dc8 100644 --- a/drivers/net/mt7628-eth.c +++ b/drivers/net/mt7628-eth.c @@ -652,5 +652,5 @@ U_BOOT_DRIVER(mt7628_eth) = { .probe = mt7628_eth_probe, .ops = &mt7628_eth_ops, .priv_auto = sizeof(struct mt7628_eth_dev), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index 05fdb44380c..31e8547d16b 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -1559,7 +1559,7 @@ U_BOOT_DRIVER(mtk_eth) = { .id = UCLASS_ETH, .of_match = mtk_eth_ids, .ofdata_to_platdata = mtk_eth_ofdata_to_platdata, - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .probe = mtk_eth_probe, .remove = mtk_eth_remove, .ops = &mtk_eth_ops, diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 0be67152ca8..0e4e88e42a8 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -1042,6 +1042,6 @@ U_BOOT_DRIVER(mvgbe) = { .probe = mvgbe_probe, .ops = &mvgbe_ops, .priv_auto = sizeof(struct mvgbe_device), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; #endif /* CONFIG_DM_ETH */ diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index a90a631757d..4c478b9b955 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -1831,5 +1831,5 @@ U_BOOT_DRIVER(mvneta) = { .probe = mvneta_probe, .ops = &mvneta_ops, .priv_auto = sizeof(struct mvneta_port), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index c353aa677d0..326f91caad4 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -5425,7 +5425,7 @@ static struct driver mvpp2_driver = { .remove = mvpp2_remove, .ops = &mvpp2_ops, .priv_auto = sizeof(struct mvpp2_port), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ACTIVE_DMA, };

diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c index 2d65ff1b5c2..a8eaa429516 100644 --- a/drivers/net/octeontx/nicvf_main.c +++ b/drivers/net/octeontx/nicvf_main.c @@ -570,7 +570,7 @@ U_BOOT_DRIVER(octeontx_vnic) = { .probe = octeontx_vnic_probe, .ops = &octeontx_vnic_ops, .priv_auto = sizeof(struct nicvf), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

static struct pci_device_id octeontx_vnic_supported[] = { diff --git a/drivers/net/octeontx2/rvu_pf.c b/drivers/net/octeontx2/rvu_pf.c index fbbd2739987..7d786872595 100644 --- a/drivers/net/octeontx2/rvu_pf.c +++ b/drivers/net/octeontx2/rvu_pf.c @@ -105,7 +105,7 @@ U_BOOT_DRIVER(rvu_pf) = { .remove = rvu_pf_remove, .ops = &nix_eth_ops, .priv_auto = sizeof(struct rvu_pf), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

static struct pci_device_id rvu_pf_supported[] = { diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index b413a4f2491..3829ccc4440 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -500,7 +500,7 @@ U_BOOT_DRIVER(eth_pch_gbe) = { .remove = pch_gbe_remove, .ops = &pch_gbe_ops, .priv_auto = sizeof(struct pch_gbe_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index 9b27033e792..ff9506f3912 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -690,7 +690,7 @@ U_BOOT_DRIVER(eth_pcnet) = { .probe = pcnet_probe, .ops = &pcnet_ops, .priv_auto = sizeof(struct pcnet_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_UC_FLAG_ALLOC_PRIV_DMA, };

diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c index c5713248500..53a08dfcd28 100644 --- a/drivers/net/pfe_eth/pfe_eth.c +++ b/drivers/net/pfe_eth/pfe_eth.c @@ -291,5 +291,5 @@ U_BOOT_DRIVER(pfe_eth) = { .remove = pfe_eth_remove, .ops = &pfe_eth_ops, .priv_auto = sizeof(struct pfe_eth_dev), - .platdata_auto = sizeof(struct pfe_eth_pdata) + .plat_auto = sizeof(struct pfe_eth_pdata) }; diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index ec491256baa..94c296e8f47 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -607,5 +607,5 @@ U_BOOT_DRIVER(pic32_ethernet) = { .remove = pic32_eth_remove, .ops = &pic32_eth_ops, .priv_auto = sizeof(struct pic32eth_dev), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c index 00e01a41ab3..b4052c78d77 100644 --- a/drivers/net/qe/dm_qe_uec.c +++ b/drivers/net/qe/dm_qe_uec.c @@ -1163,5 +1163,5 @@ U_BOOT_DRIVER(eth_qe_uec) = { .remove = qe_uec_remove, .ops = &qe_uec_eth_ops, .priv_auto = sizeof(struct qe_uec_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index d1a45ceedce..48530c44998 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -690,6 +690,6 @@ U_BOOT_DRIVER(eth_ravb) = { .remove = ravb_remove, .ops = &ravb_ops, .priv_auto = sizeof(struct ravb_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index 934e0c25d4a..c171e54e8cf 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -772,7 +772,7 @@ U_BOOT_DRIVER(eth_rtl8139) = { .probe = rtl8139_probe, .ops = &rtl8139_ops, .priv_auto = sizeof(struct rtl8139_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_rtl8139, supported); diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 7512f640c2f..dc3405e4c4e 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -1187,7 +1187,7 @@ int rtl8169_initialize(struct bd_info *bis) #ifdef CONFIG_DM_ETH static int rtl8169_eth_probe(struct udevice *dev) { - struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); + struct pci_child_platdata *pplat = dev_get_parent_plat(dev); struct rtl8169_private *priv = dev_get_priv(dev); struct eth_pdata *plat = dev_get_platdata(dev); u32 iobase; @@ -1249,7 +1249,7 @@ U_BOOT_DRIVER(eth_rtl8169) = { .probe = rtl8169_eth_probe, .ops = &rtl8169_eth_ops, .priv_auto = sizeof(struct rtl8169_private), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), };

U_BOOT_PCI_DEVICE(eth_rtl8169, supported); diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 32f63416b96..76a424ec949 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -194,5 +194,5 @@ U_BOOT_DRIVER(eth_sandbox_raw) = { .ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata, .ops = &sb_eth_raw_ops, .priv_auto = sizeof(struct eth_sandbox_raw_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index 4d007ae0222..846b802cfaa 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -447,5 +447,5 @@ U_BOOT_DRIVER(eth_sandbox) = { .remove = sb_eth_remove, .ops = &sb_eth_ops, .priv_auto = sizeof(struct eth_sandbox_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index a5bd4596fd5..b1b8731f16f 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -958,7 +958,7 @@ U_BOOT_DRIVER(eth_sh_ether) = { .remove = sh_ether_remove, .ops = &sh_ether_ops, .priv_auto = sizeof(struct sh_ether_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index e0083ce8a33..648932d8bca 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -640,7 +640,7 @@ U_BOOT_DRIVER(smc911x) = { .probe = smc911x_probe, .ops = &smc911x_ops, .priv_auto = sizeof(struct smc911x_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index 301462009b9..60153c0141d 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -999,5 +999,5 @@ U_BOOT_DRIVER(ave) = { .ofdata_to_platdata = ave_ofdata_to_platdata, .ops = &ave_ops, .priv_auto = sizeof(struct ave_private), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 0fa8ba97b0f..3430b229a80 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -1005,6 +1005,6 @@ U_BOOT_DRIVER(eth_sun8i_emac) = { .probe = sun8i_emac_eth_probe, .ops = &sun8i_emac_eth_ops, .priv_auto = sizeof(struct emac_eth_dev), - .platdata_auto = sizeof(struct sun8i_eth_pdata), + .plat_auto = sizeof(struct sun8i_eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index dfdf3c1f7db..0770a6bfc74 100644 --- a/drivers/net/sunxi_emac.c +++ b/drivers/net/sunxi_emac.c @@ -613,5 +613,5 @@ U_BOOT_DRIVER(eth_sunxi_emac) = { .probe = sunxi_emac_eth_probe, .ops = &sunxi_emac_eth_ops, .priv_auto = sizeof(struct emac_eth_dev), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index c8dcefe5e35..ce891fc58e1 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -792,6 +792,6 @@ U_BOOT_DRIVER(am65_cpsw_nuss_slave) = { .probe = am65_cpsw_probe_cpsw, .ops = &am65_cpsw_ops, .priv_auto = sizeof(struct am65_cpsw_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 94c10a82340..62348919b60 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -1378,7 +1378,7 @@ U_BOOT_DRIVER(eth_cpsw) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = cpsw_eth_ids, .ofdata_to_platdata = cpsw_eth_ofdata_to_platdata, - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), #endif .probe = cpsw_eth_probe, .ops = &cpsw_eth_ops, diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 2f025018aa5..9cf7e6cc64d 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -865,5 +865,5 @@ U_BOOT_DRIVER(davinci_emac) = { .of_match = davinci_emac_ids, .probe = davinci_emac_probe, .ops = &davinci_emac_ops, - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 62658bc2128..b67981e74f3 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -805,7 +805,7 @@ U_BOOT_DRIVER(eth_ks2_slave) = { .remove = ks2_eth_remove, .ops = &ks2_eth_ops, .priv_auto = sizeof(struct ks2_eth_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

@@ -818,6 +818,6 @@ U_BOOT_DRIVER(eth_ks2) = { .remove = ks2_eth_remove, .ops = &ks2_eth_ops, .priv_auto = sizeof(struct ks2_eth_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 228820484af..8c53059ae2a 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -905,7 +905,7 @@ U_BOOT_DRIVER(eth_tsec) = { .remove = tsec_remove, .ops = &tsec_ops, .priv_auto = sizeof(struct tsec_private), - .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/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index bb66492ec2a..8f761cb7c08 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -792,5 +792,5 @@ U_BOOT_DRIVER(axi_emac) = { .remove = axi_emac_remove, .ops = &axi_emac_ops, .priv_auto = sizeof(struct axidma_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 818e7f4811e..11eee65e665 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -636,5 +636,5 @@ U_BOOT_DRIVER(emaclite) = { .remove = emaclite_remove, .ops = &emaclite_ops, .priv_auto = sizeof(struct xemaclite), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 91adffe5284..0d3b0d0c686 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -812,5 +812,5 @@ U_BOOT_DRIVER(zynq_gem) = { .remove = zynq_gem_remove, .ops = &zynq_gem_ops, .priv_auto = sizeof(struct zynq_gem_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), }; diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index b7855499973..cee3f57c875 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -673,7 +673,7 @@ int nvme_scan_namespace(void) static int nvme_blk_probe(struct udevice *udev) { struct nvme_dev *ndev = dev_get_priv(udev->parent); - struct blk_desc *desc = dev_get_uclass_platdata(udev); + struct blk_desc *desc = dev_get_uclass_plat(udev); struct nvme_ns *ns = dev_get_priv(udev); u8 flbas; struct pci_child_platdata *pplat; @@ -704,7 +704,7 @@ static int nvme_blk_probe(struct udevice *udev) desc->log2blksz = ns->lba_shift; desc->blksz = 1 << ns->lba_shift; desc->bdev = udev; - pplat = dev_get_parent_platdata(udev->parent); + pplat = dev_get_parent_plat(udev->parent); sprintf(desc->vendor, "0x%.4x", pplat->vendor); memcpy(desc->product, ndev->serial, sizeof(ndev->serial)); memcpy(desc->revision, ndev->firmware_rev, sizeof(ndev->firmware_rev)); @@ -719,7 +719,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr, struct nvme_ns *ns = dev_get_priv(udev); struct nvme_dev *dev = ns->dev; struct nvme_command c; - struct blk_desc *desc = dev_get_uclass_platdata(udev); + struct blk_desc *desc = dev_get_uclass_plat(udev); int status; u64 prp2; u64 total_len = blkcnt << desc->log2blksz; diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index 3ca9a1567c9..f71ba42c389 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -110,9 +110,9 @@ UCLASS_DRIVER(pci_emul) = { };

/* - * This uclass is a child of the pci bus. Its platdata is not defined here so + * This uclass is a child of the pci bus. Its plat is not defined here so * is defined by its parent, UCLASS_PCI, which uses struct pci_child_platdata. - * See per_child_platdata_auto in UCLASS_DRIVER(pci). + * See per_child_plat_auto in UCLASS_DRIVER(pci). */ UCLASS_DRIVER(pci_emul_parent) = { .id = UCLASS_PCI_EMUL_PARENT, diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index f01fcf61062..3a0a4b5ada8 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -400,5 +400,5 @@ U_BOOT_DRIVER(rcar_gen3_pcie) = { .ops = &rcar_gen3_pcie_ops, .probe = rcar_gen3_pcie_probe, .ofdata_to_platdata = rcar_gen3_pcie_ofdata_to_platdata, - .platdata_auto = sizeof(struct rcar_gen3_pcie_priv), + .plat_auto = sizeof(struct rcar_gen3_pcie_priv), }; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index c96a0c844b3..f6e3b3863a1 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -49,7 +49,7 @@ struct udevice *pci_get_controller(struct udevice *dev)

pci_dev_t dm_pci_get_bdf(const struct udevice *dev) { - struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); + struct pci_child_platdata *pplat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent;

/* @@ -138,7 +138,7 @@ int pci_bus_find_devfn(const struct udevice *bus, pci_dev_t find_devfn, device_find_next_child(&dev)) { struct pci_child_platdata *pplat;

- pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); if (pplat && pplat->devfn == find_devfn) { *devp = dev; return 0; @@ -165,7 +165,7 @@ static int pci_device_matches_ids(struct udevice *dev, struct pci_child_platdata *pplat; int i;

- pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); if (!pplat) return -EINVAL; for (i = 0; ids[i].vendor != 0; i++) { @@ -224,7 +224,7 @@ static int dm_pci_bus_find_device(struct udevice *bus, unsigned int vendor, for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); if (pplat->vendor == vendor && pplat->device == device) { if (!(*indexp)--) { *devp = dev; @@ -261,7 +261,7 @@ int dm_pci_find_class(uint find_class, int index, struct udevice **devp) for (pci_find_first_device(&dev); dev; pci_find_next_device(&dev)) { - struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); + struct pci_child_platdata *pplat = dev_get_parent_plat(dev);

if (pplat->class == find_class && !index--) { *devp = dev; @@ -548,7 +548,7 @@ int pci_auto_config_devices(struct udevice *bus) max_bus = ret; sub_bus = max(sub_bus, max_bus);

- pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); if (pplat->class == (PCI_CLASS_DISPLAY_VGA << 8)) set_vga_bridge_bits(dev); } @@ -736,7 +736,7 @@ static int pci_find_and_bind_driver(struct udevice *parent,

/* * 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 @@ -860,7 +860,7 @@ int pci_bind_bus_devices(struct udevice *bus) return ret;

/* Update the platform data */ - pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); pplat->devfn = PCI_MASK_BUS(bdf); pplat->vendor = vendor; pplat->device = device; @@ -1077,7 +1077,7 @@ static int pci_uclass_child_post_bind(struct udevice *dev) if (!dev_of_valid(dev)) return 0;

- pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev);

/* Extract vendor id and device id if available */ ofnode_read_pci_vendev(dev_ofnode(dev), &pplat->vendor, &pplat->device); @@ -1515,7 +1515,7 @@ static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags,

void *dm_pci_map_bar(struct udevice *dev, int bar, int flags) { - struct pci_child_platdata *pdata = dev_get_parent_platdata(dev); + struct pci_child_platdata *pdata = dev_get_parent_plat(dev); struct udevice *udev = dev; pci_addr_t pci_bus_addr; u32 bar_response; @@ -1745,7 +1745,7 @@ int pci_sriov_init(struct udevice *pdev, int vf_en) }

/* Update the platform data */ - pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); pplat->devfn = PCI_MASK_BUS(bdf); pplat->vendor = vendor; pplat->device = device; @@ -1789,7 +1789,7 @@ UCLASS_DRIVER(pci) = { .post_probe = pci_uclass_post_probe, .child_post_bind = pci_uclass_child_post_bind, .per_device_auto = sizeof(struct pci_controller), - .per_child_platdata_auto = + .per_child_plat_auto = sizeof(struct pci_child_platdata), };

diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index 207ae336249..7deb15fc529 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -471,7 +471,7 @@ static struct driver pcie_mvebu_drv = { .ops = &mvebu_pcie_ops, .probe = mvebu_pcie_probe, .ofdata_to_platdata = mvebu_pcie_ofdata_to_platdata, - .platdata_auto = sizeof(struct mvebu_pcie), + .plat_auto = sizeof(struct mvebu_pcie), };

/* diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index fa29d69e859..9c98496d7a3 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -68,7 +68,7 @@ __weak uint32_t board_map_oprom_vendev(uint32_t vendev)

static int pci_rom_probe(struct udevice *dev, struct pci_rom_header **hdrp) { - struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); + struct pci_child_platdata *pplat = dev_get_parent_plat(dev); struct pci_rom_header *rom_header; struct pci_rom_data *rom_data; u16 rom_vendor, rom_device; @@ -236,7 +236,7 @@ void setup_video(struct screen_info *screen_info) int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), int exec_method) { - struct pci_child_platdata *pplat = dev_get_parent_platdata(dev); + struct pci_child_platdata *pplat = dev_get_parent_plat(dev); struct pci_rom_header *rom = NULL, *ram = NULL; int vesa_mode = -1; bool emulate, alloced; @@ -363,7 +363,7 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa,

int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); int ret;

diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index d318b33d2bd..6de9af9937e 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -132,6 +132,6 @@ U_BOOT_DRIVER(pci_sandbox) = {

/* Attach an emulator if we can */ .child_post_bind = dm_scan_fdt_dev, - .per_child_platdata_auto = + .per_child_plat_auto = sizeof(struct pci_child_platdata), }; diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c index 82770aca4f7..fc83ca3ab1c 100644 --- a/drivers/pci/pcie_mediatek.c +++ b/drivers/pci/pcie_mediatek.c @@ -264,7 +264,7 @@ static struct mtk_pcie_port *mtk_pcie_find_port(const struct udevice *bus, while (dev_seq(dev->parent) != 0) dev = dev->parent;

- pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); }

list_for_each_entry(port, &pcie->ports, list) { diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index aadb2901261..f5ed96914bd 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -646,6 +646,6 @@ U_BOOT_DRIVER(sun4i_usb_phy) = { .of_match = sun4i_usb_phy_ids, .ops = &sun4i_usb_phy_ops, .probe = sun4i_usb_phy_probe, - .platdata_auto = sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]), + .plat_auto = sizeof(struct sun4i_usb_phy_plat[MAX_PHYS]), .priv_auto = sizeof(struct sun4i_usb_phy_data), }; diff --git a/drivers/phy/phy-bcm-sr-pcie.c b/drivers/phy/phy-bcm-sr-pcie.c index 9f7c983ce42..f0e795333b9 100644 --- a/drivers/phy/phy-bcm-sr-pcie.c +++ b/drivers/phy/phy-bcm-sr-pcie.c @@ -172,6 +172,6 @@ U_BOOT_DRIVER(sr_pcie_phy) = { .probe = sr_pcie_phy_probe, .of_match = sr_pcie_phy_match_table, .ops = &sr_pcie_phy_ops, - .platdata_auto = sizeof(struct sr_pcie_phy_core), + .plat_auto = sizeof(struct sr_pcie_phy_core), .priv_auto = sizeof(struct sr_pcie_phy_core), }; diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c index e3d24646344..576e1b4728a 100644 --- a/drivers/pinctrl/intel/pinctrl.c +++ b/drivers/pinctrl/intel/pinctrl.c @@ -617,7 +617,7 @@ int intel_pinctrl_ofdata_to_platdata(struct udevice *dev, const struct pad_community *comm, int num_cfgs) { - struct p2sb_child_platdata *pplat = dev_get_parent_platdata(dev); + struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); struct intel_pinctrl_priv *priv = dev_get_priv(dev);

if (!comm) { diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c index 149d5119124..a4f46e626de 100644 --- a/drivers/pinctrl/intel/pinctrl_apl.c +++ b/drivers/pinctrl/intel/pinctrl_apl.c @@ -160,7 +160,7 @@ static int apl_pinctrl_ofdata_to_platdata(struct udevice *dev) return log_msg_ret("Could not set port id", ret); #endif /* Attach this device to its community structure */ - pplat = dev_get_parent_platdata(dev); + pplat = dev_get_parent_plat(dev); for (i = 0; i < ARRAY_SIZE(apl_gpio_communities); i++) { if (apl_gpio_communities[i].port == pplat->pid) comm = &apl_gpio_communities[i]; @@ -185,5 +185,5 @@ U_BOOT_DRIVER(intel_apl_pinctrl) = { #endif .ofdata_to_platdata = apl_pinctrl_ofdata_to_platdata, .priv_auto = sizeof(struct intel_pinctrl_priv), - .platdata_auto = sizeof(struct apl_gpio_platdata), + .plat_auto = sizeof(struct apl_gpio_platdata), }; diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index afd440729e2..3bc16bb2546 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -178,6 +178,6 @@ U_BOOT_DRIVER(atmel_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = atmel_pinctrl_match, .probe = atmel_pinctrl_probe, - .platdata_auto = sizeof(struct atmel_pio4_platdata), + .plat_auto = sizeof(struct atmel_pio4_platdata), .ops = &atmel_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c index e598797b721..4f7cfaa0785 100644 --- a/drivers/pinctrl/pinctrl-qe-io.c +++ b/drivers/pinctrl/pinctrl-qe-io.c @@ -122,7 +122,7 @@ void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign) #else static int qe_io_ofdata_to_platdata(struct udevice *dev) { - struct qe_io_platdata *plat = dev->platdata; + struct qe_io_platdata *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -143,7 +143,7 @@ static int qe_io_ofdata_to_platdata(struct udevice *dev) */ static int par_io_of_config_node(struct udevice *dev, ofnode pio) { - struct qe_io_platdata *plat = dev->platdata; + struct qe_io_platdata *plat = dev->plat; qepio83xx_t *par_io = plat->base; const unsigned int *pio_map; int pio_map_len; @@ -246,7 +246,7 @@ U_BOOT_DRIVER(par_io_pinctrl) = { .of_match = of_match_ptr(par_io_pinctrl_match), .probe = par_io_pinctrl_probe, .ofdata_to_platdata = qe_io_ofdata_to_platdata, - .platdata_auto = sizeof(struct qe_io_platdata), + .plat_auto = sizeof(struct qe_io_platdata), .ops = &par_io_pinctrl_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 934be931668..0a3319cce86 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -47,7 +47,7 @@ static int single_configure_pins(struct udevice *dev, const struct single_fdt_pin_cfg *pins, int size) { - struct single_pdata *pdata = dev->platdata; + struct single_pdata *pdata = dev->plat; int count = size / sizeof(struct single_fdt_pin_cfg); phys_addr_t n, reg; u32 val; @@ -81,7 +81,7 @@ static int single_configure_bits(struct udevice *dev, const struct single_fdt_bits_cfg *pins, int size) { - struct single_pdata *pdata = dev->platdata; + struct single_pdata *pdata = dev->plat; int count = size / sizeof(struct single_fdt_bits_cfg); phys_addr_t n, reg; u32 val, mask; @@ -153,7 +153,7 @@ static int single_ofdata_to_platdata(struct udevice *dev) fdt_addr_t addr; u32 of_reg[2]; int res; - struct single_pdata *pdata = dev->platdata; + struct single_pdata *pdata = dev->plat;

pdata->width = dev_read_u32_default(dev, "pinctrl-single,register-width", 0); @@ -191,6 +191,6 @@ U_BOOT_DRIVER(single_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = single_pinctrl_match, .ops = &single_pinctrl_ops, - .platdata_auto = sizeof(struct single_pdata), + .plat_auto = sizeof(struct single_pdata), .ofdata_to_platdata = single_ofdata_to_platdata, }; diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index c147863547d..de208d4d7d6 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -316,6 +316,6 @@ U_BOOT_DRIVER(pinctrl_sti) = { .of_match = sti_pinctrl_ids, .ops = &sti_pinctrl_ops, .probe = sti_pinctrl_probe, - .platdata_auto = sizeof(struct sti_pinctrl_platdata), + .plat_auto = sizeof(struct sti_pinctrl_platdata), .ops = &sti_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c index e3df0bef01e..21c7dc4b76e 100644 --- a/drivers/pinctrl/pinctrl-stmfx.c +++ b/drivers/pinctrl/pinctrl-stmfx.c @@ -446,7 +446,7 @@ U_BOOT_DRIVER(stmfx_pinctrl) = { .bind = stmfx_pinctrl_bind, .probe = stmfx_pinctrl_probe, .ops = &stmfx_pinctrl_ops, - .platdata_auto = sizeof(struct stmfx_pinctrl), + .plat_auto = sizeof(struct stmfx_pinctrl), };

static int stmfx_chip_init(struct udevice *dev) @@ -454,7 +454,7 @@ static int stmfx_chip_init(struct udevice *dev) u8 id; u8 version[2]; int ret; - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

ret = dm_i2c_reg_read(dev, STMFX_REG_CHIP_ID); if (ret < 0) { diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c index c3e6a24de35..ec55caa2514 100644 --- a/drivers/pinctrl/renesas/pfc-r7s72100.c +++ b/drivers/pinctrl/renesas/pfc-r7s72100.c @@ -142,6 +142,6 @@ U_BOOT_DRIVER(r7s72100_pfc) = { .id = UCLASS_PINCTRL, .of_match = r7s72100_pfc_match, .probe = r7s72100_pfc_probe, - .platdata_auto = sizeof(struct r7s72100_pfc_platdata), + .plat_auto = sizeof(struct r7s72100_pfc_platdata), .ops = &r7s72100_pfc_ops, }; diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c index 68724308723..9ce8c16304d 100644 --- a/drivers/power/acpi_pmc/pmc_emul.c +++ b/drivers/power/acpi_pmc/pmc_emul.c @@ -236,7 +236,7 @@ U_BOOT_DRIVER(sandbox_pmc_emul_emul) = { .ops = &sandbox_pmc_emul_emul_ops, .probe = sandbox_pmc_probe, .priv_auto = sizeof(struct pmc_emul_priv), - .platdata_auto = sizeof(struct pmc_emul_platdata), + .plat_auto = sizeof(struct pmc_emul_platdata), };

static struct pci_device_id sandbox_pmc_emul_supported[] = { diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c index 33dd4cc2f96..ed88fd7efaf 100644 --- a/drivers/power/domain/imx8-power-domain-legacy.c +++ b/drivers/power/domain/imx8-power-domain-legacy.c @@ -377,7 +377,7 @@ U_BOOT_DRIVER(imx8_power_domain) = { .bind = imx8_power_domain_bind, .probe = imx8_power_domain_probe, .ofdata_to_platdata = imx8_power_domain_ofdata_to_platdata, - .platdata_auto = sizeof(struct imx8_power_domain_platdata), + .plat_auto = sizeof(struct imx8_power_domain_platdata), .priv_auto = sizeof(struct imx8_power_domain_priv), .ops = &imx8_power_domain_ops, .flags = DM_FLAG_DEFAULT_PD_CTRL_OFF, diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c index 3736019c221..7e2d232f702 100644 --- a/drivers/power/domain/imx8m-power-domain.c +++ b/drivers/power/domain/imx8m-power-domain.c @@ -137,6 +137,6 @@ U_BOOT_DRIVER(imx8m_power_domain) = { .bind = imx8m_power_domain_bind, .probe = imx8m_power_domain_probe, .ofdata_to_platdata = imx8m_power_domain_ofdata_to_platdata, - .platdata_auto = sizeof(struct imx8m_power_domain_platdata), + .plat_auto = sizeof(struct imx8m_power_domain_platdata), .ops = &imx8m_power_domain_ops, }; diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c index 633ad15b646..168b8a5ed7f 100644 --- a/drivers/power/pmic/i2c_pmic_emul.c +++ b/drivers/power/pmic/i2c_pmic_emul.c @@ -161,6 +161,6 @@ U_BOOT_DRIVER(sandbox_i2c_pmic_emul) = { .of_match = sandbox_i2c_pmic_ids, .ofdata_to_platdata = sandbox_i2c_pmic_ofdata_to_platdata, .probe = sandbox_i2c_pmic_probe, - .platdata_auto = sizeof(struct sandbox_i2c_pmic_plat_data), + .plat_auto = sizeof(struct sandbox_i2c_pmic_plat_data), .ops = &sandbox_i2c_pmic_emul_ops, }; diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c index 1783813a158..bdce97365dd 100644 --- a/drivers/power/regulator/act8846.c +++ b/drivers/power/regulator/act8846.c @@ -128,10 +128,10 @@ static int reg_get_enable(struct udevice *dev)

static int act8846_reg_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int reg = dev->driver_data;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = reg <= 4 ? REGULATOR_TYPE_BUCK : REGULATOR_TYPE_LDO; uc_pdata->mode_count = 0; diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c index 0fee9bf00b6..ec0776b440b 100644 --- a/drivers/power/regulator/as3722_regulator.c +++ b/drivers/power/regulator/as3722_regulator.c @@ -114,9 +114,9 @@ static int ldo_get_enable(struct udevice *dev)

static int as3722_stepdown_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK;

@@ -125,9 +125,9 @@ static int as3722_stepdown_probe(struct udevice *dev)

static int as3722_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_LDO;

diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c index ba32f591902..c9d966fdebf 100644 --- a/drivers/power/regulator/bd71837.c +++ b/drivers/power/regulator/bd71837.c @@ -401,7 +401,7 @@ static int bd71837_regulator_probe(struct udevice *dev) { struct bd71837_platdata *plat = dev_get_platdata(dev); int i, ret; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int type; struct bd71837_platdata *init_data; int data_amnt; @@ -433,7 +433,7 @@ static int bd71837_regulator_probe(struct udevice *dev) * the initial state matches dt flags and then * write the SEL bit */ - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ret = bd71837_set_enable(dev, !!(uc_pdata->boot_on || uc_pdata->always_on)); @@ -466,5 +466,5 @@ U_BOOT_DRIVER(bd71837_regulator) = { .id = UCLASS_REGULATOR, .ops = &bd71837_regulator_ops, .probe = bd71837_regulator_probe, - .platdata_auto = sizeof(struct bd71837_platdata), + .plat_auto = sizeof(struct bd71837_platdata), }; diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c index 4ff7f396771..32be59e49e9 100644 --- a/drivers/power/regulator/da9063.c +++ b/drivers/power/regulator/da9063.c @@ -309,7 +309,7 @@ static int buck_set_current_limit(struct udevice *dev, int uA)

static int da9063_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct da9063_priv *priv = dev->priv;

/* LDOs are named numerically in DT so can directly index */ @@ -318,7 +318,7 @@ static int da9063_ldo_probe(struct udevice *dev) return -EINVAL; priv->reg_info = &da9063_ldo_info[dev->driver_data - 1];

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_LDO; uc_pdata->mode = da9063_ldo_modes; uc_pdata->mode_count = ARRAY_SIZE(da9063_ldo_modes); @@ -328,7 +328,7 @@ static int da9063_ldo_probe(struct udevice *dev)

static int da9063_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct da9063_priv *priv = dev->priv; int i;

@@ -344,7 +344,7 @@ static int da9063_buck_probe(struct udevice *dev) if (!priv->reg_info) return -ENODEV;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode = da9063_buck_modes; uc_pdata->mode_count = ARRAY_SIZE(da9063_buck_modes); diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index 70aeef710b4..709cc632498 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -103,8 +103,8 @@ struct fan53555_priv { static int fan53555_regulator_ofdata_to_platdata(struct udevice *dev) { struct fan53555_platdata *dev_pdata = dev_get_platdata(dev); - struct dm_regulator_uclass_platdata *uc_pdata = - dev_get_uclass_platdata(dev); + struct dm_regulator_uclass_plat *uc_pdata = + dev_get_uclass_plat(dev); u32 sleep_vsel;

/* This is a buck regulator */ @@ -239,7 +239,7 @@ U_BOOT_DRIVER(fan53555_regulator) = { .id = UCLASS_REGULATOR, .ops = &fan53555_regulator_ops, .ofdata_to_platdata = fan53555_regulator_ofdata_to_platdata, - .platdata_auto = sizeof(struct fan53555_platdata), + .plat_auto = sizeof(struct fan53555_platdata), .priv_auto = sizeof(struct fan53555_priv), .probe = fan53555_probe, }; diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index d887c87ed8c..ed27ffc0056 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -16,11 +16,11 @@

static int fixed_regulator_ofdata_to_platdata(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct regulator_common_platdata *dev_pdata;

dev_pdata = dev_get_platdata(dev); - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

@@ -31,9 +31,9 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)

static int fixed_regulator_get_value(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

@@ -47,9 +47,9 @@ static int fixed_regulator_get_value(struct udevice *dev)

static int fixed_regulator_get_current(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

@@ -89,5 +89,5 @@ U_BOOT_DRIVER(regulator_fixed) = { .ops = &fixed_regulator_ops, .of_match = fixed_regulator_ids, .ofdata_to_platdata = fixed_regulator_ofdata_to_platdata, - .platdata_auto = sizeof(struct regulator_common_platdata), + .plat_auto = sizeof(struct regulator_common_platdata), }; diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index d5998f1d2a2..39b0f081e86 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -27,14 +27,14 @@ struct gpio_regulator_platdata {

static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct gpio_regulator_platdata *dev_pdata; struct gpio_desc *gpio; int ret, count, i, j; u32 states_array[GPIO_REGULATOR_MAX_STATES * 2];

dev_pdata = dev_get_platdata(dev); - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

@@ -79,14 +79,14 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)

static int gpio_regulator_get_value(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); int enable;

if (!dev_pdata->gpio.dev) return -ENOSYS;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (uc_pdata->min_uV > uc_pdata->max_uV) { debug("Invalid constraints for: %s\n", uc_pdata->name); return -EINVAL; @@ -155,5 +155,5 @@ U_BOOT_DRIVER(gpio_regulator) = { .ops = &gpio_regulator_ops, .of_match = gpio_regulator_ids, .ofdata_to_platdata = gpio_regulator_ofdata_to_platdata, - .platdata_auto = sizeof(struct gpio_regulator_platdata), + .plat_auto = sizeof(struct gpio_regulator_platdata), }; diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c index 5b73f54172c..ec1037d7a5f 100644 --- a/drivers/power/regulator/lp873x_regulator.c +++ b/drivers/power/regulator/lp873x_regulator.c @@ -24,9 +24,9 @@ static int lp873x_buck_enable(struct udevice *dev, int op, bool *enable) { int ret; unsigned int adr; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); adr = uc_pdata->ctrl_reg;

ret = pmic_reg_read(dev->parent, adr); @@ -87,9 +87,9 @@ static int lp873x_buck_val(struct udevice *dev, int op, int *uV) { unsigned int hex, adr; int ret; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

if (op == PMIC_OP_GET) *uV = 0; @@ -126,9 +126,9 @@ static int lp873x_ldo_enable(struct udevice *dev, int op, bool *enable) { int ret; unsigned int adr; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); adr = uc_pdata->ctrl_reg;

ret = pmic_reg_read(dev->parent, adr); @@ -182,12 +182,12 @@ static int lp873x_ldo_val(struct udevice *dev, int op, int *uV) unsigned int hex, adr; int ret;

- struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

if (op == PMIC_OP_GET) *uV = 0;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

adr = uc_pdata->volt_reg;

@@ -219,9 +219,9 @@ static int lp873x_ldo_val(struct udevice *dev, int op, int *uV)

static int lp873x_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_LDO;

int idx = dev->driver_data; @@ -272,10 +272,10 @@ static int ldo_set_enable(struct udevice *dev, bool enable)

static int lp873x_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int idx;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_BUCK;

idx = dev->driver_data; diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c index 4ea6c346d7c..7214dc1b824 100644 --- a/drivers/power/regulator/lp87565_regulator.c +++ b/drivers/power/regulator/lp87565_regulator.c @@ -23,9 +23,9 @@ static int lp87565_buck_enable(struct udevice *dev, int op, bool *enable) { int ret; unsigned int adr; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); adr = uc_pdata->ctrl_reg;

ret = pmic_reg_read(dev->parent, adr); @@ -86,9 +86,9 @@ static int lp87565_buck_val(struct udevice *dev, int op, int *uV) { unsigned int hex, adr; int ret; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

if (op == PMIC_OP_GET) *uV = 0; @@ -123,10 +123,10 @@ static int lp87565_buck_val(struct udevice *dev, int op, int *uV)

static int lp87565_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int idx;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_BUCK;

idx = dev->driver_data; diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c index 752dc88c401..f05d791b7cb 100644 --- a/drivers/power/regulator/max77686.c +++ b/drivers/power/regulator/max77686.c @@ -657,9 +657,9 @@ static int max77686_buck_enable(struct udevice *dev, int op, bool *enable)

static int max77686_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_LDO; uc_pdata->mode_count = max77686_ldo_modes(dev->driver_data, @@ -721,9 +721,9 @@ static int ldo_set_mode(struct udevice *dev, int mode)

static int max77686_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode_count = max77686_buck_modes(dev->driver_data, diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c index 78909f70189..aaa5f3cfc62 100644 --- a/drivers/power/regulator/palmas_regulator.c +++ b/drivers/power/regulator/palmas_regulator.c @@ -51,9 +51,9 @@ static int palmas_smps_enable(struct udevice *dev, int op, bool *enable) { int ret; unsigned int adr; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); adr = uc_pdata->ctrl_reg;

ret = pmic_reg_read(dev->parent, adr); @@ -120,9 +120,9 @@ static int palmas_smps_val(struct udevice *dev, int op, int *uV) unsigned int hex, adr; int ret; bool range; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

if (op == PMIC_OP_GET) *uV = 0; @@ -163,7 +163,7 @@ static int palmas_smps_val(struct udevice *dev, int op, int *uV) static int palmas_ldo_bypass_enable(struct udevice *dev, bool enabled) { int type = dev_get_driver_data(dev_get_parent(dev)); - struct dm_regulator_uclass_platdata *p; + struct dm_regulator_uclass_plat *p; unsigned int adr; int reg;

@@ -177,7 +177,7 @@ static int palmas_ldo_bypass_enable(struct udevice *dev, bool enabled) return -ENOTSUPP; }

- p = dev_get_uclass_platdata(dev); + p = dev_get_uclass_plat(dev); adr = p->ctrl_reg;

reg = pmic_reg_read(dev->parent, adr); @@ -196,9 +196,9 @@ static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) { int ret; unsigned int adr; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); adr = uc_pdata->ctrl_reg;

ret = pmic_reg_read(dev->parent, adr); @@ -256,12 +256,12 @@ static int palmas_ldo_val(struct udevice *dev, int op, int *uV) unsigned int hex, adr; int ret;

- struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

if (op == PMIC_OP_GET) *uV = 0;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

adr = uc_pdata->volt_reg;

@@ -292,10 +292,10 @@ static int palmas_ldo_val(struct udevice *dev, int op, int *uV)

static int palmas_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *parent;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

parent = dev_get_parent(dev); int type = dev_get_driver_data(parent); @@ -356,11 +356,11 @@ static int ldo_set_enable(struct udevice *dev, bool enable)

static int palmas_smps_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *parent; int idx;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

parent = dev_get_parent(dev); int type = dev_get_driver_data(parent); diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c index dc944c9c1d9..c01c19efbe6 100644 --- a/drivers/power/regulator/pbias_regulator.c +++ b/drivers/power/regulator/pbias_regulator.c @@ -179,9 +179,9 @@ static const struct pbias_reg_info *pbias_reg_infos[] = { static int pbias_regulator_probe(struct udevice *dev) { const struct pbias_reg_info **p = pbias_reg_infos; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

while (*p) { int rc; diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index 8dc517fe410..ebf355c2755 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -260,7 +260,7 @@ static struct pfuze100_regulator_desc *se_desc(struct pfuze100_regulator_desc *d

static int pfuze100_regulator_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct pfuze100_regulator_platdata *plat = dev_get_platdata(dev); struct pfuze100_regulator_desc *desc;

@@ -290,7 +290,7 @@ static int pfuze100_regulator_probe(struct udevice *dev) }

plat->desc = desc; - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = desc->type; if (uc_pdata->type == REGULATOR_TYPE_BUCK) { @@ -386,8 +386,8 @@ static int pfuze100_regulator_enable(struct udevice *dev, int op, bool *enable) { int val; int ret, on_off; - struct dm_regulator_uclass_platdata *uc_pdata = - dev_get_uclass_platdata(dev); + struct dm_regulator_uclass_plat *uc_pdata = + dev_get_uclass_plat(dev);

if (op == PMIC_OP_GET) { if (!strcmp(dev->name, "vrefddr")) { @@ -451,8 +451,8 @@ static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV) int val; struct pfuze100_regulator_platdata *plat = dev_get_platdata(dev); struct pfuze100_regulator_desc *desc = plat->desc; - struct dm_regulator_uclass_platdata *uc_pdata = - dev_get_uclass_platdata(dev); + struct dm_regulator_uclass_plat *uc_pdata = + dev_get_uclass_plat(dev);

if (op == PMIC_OP_GET) { *uV = 0; @@ -572,5 +572,5 @@ U_BOOT_DRIVER(pfuze100_regulator) = { .id = UCLASS_REGULATOR, .ops = &pfuze100_regulator_ops, .probe = pfuze100_regulator_probe, - .platdata_auto = sizeof(struct pfuze100_regulator_platdata), + .plat_auto = sizeof(struct pfuze100_regulator_platdata), }; diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c index ebd09e778c7..9435cc3162f 100644 --- a/drivers/power/regulator/pwm_regulator.c +++ b/drivers/power/regulator/pwm_regulator.c @@ -122,9 +122,9 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev) static int pwm_regulator_probe(struct udevice *dev) { struct pwm_regulator_info *priv = dev_get_priv(dev); - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode_count = 0; diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 6192406f6a2..7267a89b30c 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -15,11 +15,11 @@

int regulator_mode(struct udevice *dev, struct dm_regulator_mode **modep) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

*modep = NULL;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

@@ -51,10 +51,10 @@ static void regulator_set_value_ramp_delay(struct udevice *dev, int old_uV, int regulator_set_value(struct udevice *dev, int uV) { const struct dm_regulator_ops *ops = dev_get_driver_ops(dev); - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int ret, old_uV = uV, is_enabled = 0;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (uc_pdata->min_uV != -ENODATA && uV < uc_pdata->min_uV) return -EINVAL; if (uc_pdata->max_uV != -ENODATA && uV > uc_pdata->max_uV) @@ -82,9 +82,9 @@ int regulator_set_value(struct udevice *dev, int uV) int regulator_set_suspend_value(struct udevice *dev, int uV) { const struct dm_regulator_ops *ops = dev_get_driver_ops(dev); - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (uc_pdata->min_uV != -ENODATA && uV < uc_pdata->min_uV) return -EINVAL; if (uc_pdata->max_uV != -ENODATA && uV > uc_pdata->max_uV) @@ -133,9 +133,9 @@ int regulator_get_current(struct udevice *dev) int regulator_set_current(struct udevice *dev, int uA) { const struct dm_regulator_ops *ops = dev_get_driver_ops(dev); - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (uc_pdata->min_uA != -ENODATA && uA < uc_pdata->min_uA) return -EINVAL; if (uc_pdata->max_uA != -ENODATA && uA > uc_pdata->max_uA) @@ -160,13 +160,13 @@ int regulator_get_enable(struct udevice *dev) int regulator_set_enable(struct udevice *dev, bool enable) { const struct dm_regulator_ops *ops = dev_get_driver_ops(dev); - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int ret, old_enable = 0;

if (!ops || !ops->set_enable) return -ENOSYS;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!enable && uc_pdata->always_on) return -EACCES;

@@ -241,7 +241,7 @@ int regulator_set_mode(struct udevice *dev, int mode)

int regulator_get_by_platname(const char *plat_name, struct udevice **devp) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev; int ret;

@@ -254,7 +254,7 @@ int regulator_get_by_platname(const char *plat_name, struct udevice **devp) continue; }

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata || strcmp(plat_name, uc_pdata->name)) continue;

@@ -280,10 +280,10 @@ int device_get_supply_regulator(struct udevice *dev, const char *supply_name,

int regulator_autoset(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int ret = 0;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ret = regulator_set_suspend_enable(dev, uc_pdata->suspend_on); if (!ret && uc_pdata->suspend_on) { @@ -313,9 +313,9 @@ int regulator_autoset(struct udevice *dev)

static void regulator_show(struct udevice *dev, int ret) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

printf("%s@%s: ", dev->name, uc_pdata->name); if (uc_pdata->flags & REGULATOR_FLAG_AUTOSET_UV) @@ -370,7 +370,7 @@ int regulator_list_autoset(const char *list_platname[], static bool regulator_name_is_unique(struct udevice *check_dev, const char *check_name) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev; int check_len = strlen(check_name); int ret; @@ -381,7 +381,7 @@ static bool regulator_name_is_unique(struct udevice *check_dev, if (ret || dev == check_dev) continue;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); len = strlen(uc_pdata->name); if (len != check_len) continue; @@ -395,10 +395,10 @@ static bool regulator_name_is_unique(struct udevice *check_dev,

static int regulator_post_bind(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; const char *property = "regulator-name";

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

/* Regulator's mandatory constraint */ uc_pdata->name = dev_read_string(dev, property); @@ -421,10 +421,10 @@ static int regulator_post_bind(struct udevice *dev)

static int regulator_pre_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; ofnode node;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO;

@@ -500,6 +500,6 @@ UCLASS_DRIVER(regulator) = { .name = "regulator", .post_bind = regulator_post_bind, .pre_probe = regulator_pre_probe, - .per_device_platdata_auto = - sizeof(struct dm_regulator_uclass_platdata), + .per_device_plat_auto = + sizeof(struct dm_regulator_uclass_plat), }; diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c index a08e2151f93..0ee07ad299d 100644 --- a/drivers/power/regulator/rk8xx.c +++ b/drivers/power/regulator/rk8xx.c @@ -1034,9 +1034,9 @@ static int switch_set_value(struct udevice *dev, int uvolt)

static int rk8xx_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode_count = 0; @@ -1046,9 +1046,9 @@ static int rk8xx_buck_probe(struct udevice *dev)

static int rk8xx_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_LDO; uc_pdata->mode_count = 0; @@ -1058,9 +1058,9 @@ static int rk8xx_ldo_probe(struct udevice *dev)

static int rk8xx_switch_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_FIXED; uc_pdata->mode_count = 0; diff --git a/drivers/power/regulator/s2mps11_regulator.c b/drivers/power/regulator/s2mps11_regulator.c index a6b4f158ef7..1c6d8358d5b 100644 --- a/drivers/power/regulator/s2mps11_regulator.c +++ b/drivers/power/regulator/s2mps11_regulator.c @@ -305,9 +305,9 @@ static int buck_set_mode(struct udevice *dev, int mode)

static int s2mps11_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode = s2mps11_buck_modes; @@ -581,9 +581,9 @@ static int ldo_set_mode(struct udevice *dev, int mode)

static int s2mps11_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_LDO; uc_pdata->mode = s2mps11_ldo_modes; uc_pdata->mode_count = ARRAY_SIZE(s2mps11_ldo_modes); diff --git a/drivers/power/regulator/s5m8767.c b/drivers/power/regulator/s5m8767.c index b46a2a486ec..ad0b98621ce 100644 --- a/drivers/power/regulator/s5m8767.c +++ b/drivers/power/regulator/s5m8767.c @@ -130,9 +130,9 @@ static int reg_set_value(struct udevice *dev, const struct s5m8767_para *param,

static int s5m8767_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_LDO; uc_pdata->mode_count = 0; @@ -199,9 +199,9 @@ static int ldo_set_enable(struct udevice *dev, bool enable)

static int s5m8767_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode_count = 0; diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c index 9893a6b5f3d..c52fe3d1083 100644 --- a/drivers/power/regulator/sandbox.c +++ b/drivers/power/regulator/sandbox.c @@ -140,13 +140,13 @@ static int out_set_value(struct udevice *dev, int output_count, int reg_type,

static int out_get_mode(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; uint8_t reg_val; uint reg; int ret; int i;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

reg = (dev->driver_data - 1) * OUT_REG_COUNT + OUT_REG_OM; ret = pmic_read(dev->parent, reg, &reg_val, 1); @@ -166,13 +166,13 @@ static int out_get_mode(struct udevice *dev)

static int out_set_mode(struct udevice *dev, int mode) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int reg_val = -1; uint reg; int ret; int i;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

if (mode >= uc_pdata->mode_count) return -EINVAL; @@ -246,9 +246,9 @@ static int buck_set_enable(struct udevice *dev, bool enable)

static int sandbox_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode = sandbox_buck_modes; @@ -322,9 +322,9 @@ static int ldo_set_enable(struct udevice *dev, bool enable)

static int sandbox_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_LDO; uc_pdata->mode = sandbox_ldo_modes; diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c index 3e342f48086..4839d834316 100644 --- a/drivers/power/regulator/stpmic1.c +++ b/drivers/power/regulator/stpmic1.c @@ -184,7 +184,7 @@ static int stpmic1_buck_get_enable(struct udevice *dev)

static int stpmic1_buck_set_enable(struct udevice *dev, bool enable) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int delay = enable ? STPMIC1_DEFAULT_START_UP_DELAY_MS : STPMIC1_DEFAULT_STOP_DELAY_MS; int ret, uv; @@ -194,7 +194,7 @@ static int stpmic1_buck_set_enable(struct udevice *dev, bool enable) return 0;

if (enable) { - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uv = stpmic1_buck_get_value(dev); if (uv < uc_pdata->min_uV || uv > uc_pdata->max_uV) stpmic1_buck_set_value(dev, uc_pdata->min_uV); @@ -231,12 +231,12 @@ static int stpmic1_buck_set_mode(struct udevice *dev, int mode)

static int stpmic1_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

if (!dev->driver_data || dev->driver_data > STPMIC1_MAX_BUCK) return -EINVAL;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_BUCK; uc_pdata->mode = (struct dm_regulator_mode *)buck_modes; @@ -363,7 +363,7 @@ static int stpmic1_ldo_get_enable(struct udevice *dev)

static int stpmic1_ldo_set_enable(struct udevice *dev, bool enable) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int delay = enable ? STPMIC1_DEFAULT_START_UP_DELAY_MS : STPMIC1_DEFAULT_STOP_DELAY_MS; int ret, uv; @@ -373,7 +373,7 @@ static int stpmic1_ldo_set_enable(struct udevice *dev, bool enable) return 0;

if (enable) { - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uv = stpmic1_ldo_get_value(dev); if (uv < uc_pdata->min_uV || uv > uc_pdata->max_uV) stpmic1_ldo_set_value(dev, uc_pdata->min_uV); @@ -437,12 +437,12 @@ static int stpmic1_ldo_set_mode(struct udevice *dev, int mode)

static int stpmic1_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

if (!dev->driver_data || dev->driver_data > STPMIC1_MAX_LDO) return -EINVAL;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_LDO; if (dev->driver_data - 1 == STPMIC1_LDO3) { @@ -511,9 +511,9 @@ static int stpmic1_vref_ddr_set_enable(struct udevice *dev, bool enable)

static int stpmic1_vref_ddr_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_FIXED; uc_pdata->mode_count = 0; @@ -575,9 +575,9 @@ static int stpmic1_boost_set_enable(struct udevice *dev, bool enable)

static int stpmic1_boost_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_FIXED; uc_pdata->mode_count = 0; @@ -648,12 +648,12 @@ static int stpmic1_pwr_sw_set_enable(struct udevice *dev, bool enable)

static int stpmic1_pwr_sw_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

if (!dev->driver_data || dev->driver_data > STPMIC1_MAX_PWR_SW) return -EINVAL;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_FIXED; uc_pdata->mode_count = 0; diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c index 57556662f35..e44c6bb17f5 100644 --- a/drivers/power/regulator/tps62360_regulator.c +++ b/drivers/power/regulator/tps62360_regulator.c @@ -119,6 +119,6 @@ U_BOOT_DRIVER(tps62360_regulator) = { .id = UCLASS_REGULATOR, .ops = &tps62360_regulator_ops, .of_match = tps62360_regulator_ids, - .platdata_auto = sizeof(struct tps62360_regulator_pdata), + .plat_auto = sizeof(struct tps62360_regulator_pdata), .probe = tps62360_regulator_probe, }; diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c index 9e45627a742..174ee58d030 100644 --- a/drivers/power/regulator/tps65090_regulator.c +++ b/drivers/power/regulator/tps65090_regulator.c @@ -14,9 +14,9 @@

static int tps65090_fet_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

uc_pdata->type = REGULATOR_TYPE_OTHER; uc_pdata->mode_count = 0; diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c index 467ff3f1355..3c211a1b3a1 100644 --- a/drivers/power/regulator/tps65910_regulator.c +++ b/drivers/power/regulator/tps65910_regulator.c @@ -323,7 +323,7 @@ static int buck_set_vdd1_vdd2_value(struct udevice *dev, int uV) { int ret, reg_vdd, gain; int val; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev);

switch (pdata->unit) { @@ -336,7 +336,7 @@ static int buck_set_vdd1_vdd2_value(struct udevice *dev, int uV) default: return -EINVAL; } - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

/* check setpoint is within limits */ if (uV < uc_pdata->min_uV) { @@ -424,7 +424,7 @@ U_BOOT_DRIVER(tps65910_boost) = { .name = TPS65910_BOOST_DRIVER, .id = UCLASS_REGULATOR, .ops = &tps65910_boost_ops, - .platdata_auto = sizeof(struct tps65910_regulator_pdata), + .plat_auto = sizeof(struct tps65910_regulator_pdata), .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, };

@@ -439,7 +439,7 @@ U_BOOT_DRIVER(tps65910_buck) = { .name = TPS65910_BUCK_DRIVER, .id = UCLASS_REGULATOR, .ops = &tps65910_buck_ops, - .platdata_auto = sizeof(struct tps65910_regulator_pdata), + .plat_auto = sizeof(struct tps65910_regulator_pdata), .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, };

@@ -454,6 +454,6 @@ U_BOOT_DRIVER(tps65910_ldo) = { .name = TPS65910_LDO_DRIVER, .id = UCLASS_REGULATOR, .ops = &tps65910_ldo_ops, - .platdata_auto = sizeof(struct tps65910_regulator_pdata), + .plat_auto = sizeof(struct tps65910_regulator_pdata), .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, }; diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c index 150c72d7ec4..d73f8324832 100644 --- a/drivers/power/regulator/tps65941_regulator.c +++ b/drivers/power/regulator/tps65941_regulator.c @@ -30,9 +30,9 @@ static int tps65941_buck_enable(struct udevice *dev, int op, bool *enable) { int ret; unsigned int adr; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); adr = uc_pdata->ctrl_reg;

ret = pmic_reg_read(dev->parent, adr); @@ -121,9 +121,9 @@ static int tps65941_buck_val(struct udevice *dev, int op, int *uV) { unsigned int hex, adr; int ret, delta, uwait, slew; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

if (op == PMIC_OP_GET) *uV = 0; @@ -182,9 +182,9 @@ static int tps65941_ldo_enable(struct udevice *dev, int op, bool *enable) { int ret; unsigned int adr; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); adr = uc_pdata->ctrl_reg;

ret = pmic_reg_read(dev->parent, adr); @@ -227,9 +227,9 @@ static int tps65941_ldo_val(struct udevice *dev, int op, int *uV) { unsigned int hex, adr; int ret; - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

if (op == PMIC_OP_GET) *uV = 0; @@ -264,10 +264,10 @@ static int tps65941_ldo_val(struct udevice *dev, int op, int *uV)

static int tps65941_ldo_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int idx;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_LDO;

idx = dev->driver_data; @@ -286,10 +286,10 @@ static int tps65941_ldo_probe(struct udevice *dev)

static int tps65941_buck_probe(struct udevice *dev) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; int idx;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); uc_pdata->type = REGULATOR_TYPE_BUCK;

idx = dev->driver_data; diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c index da5eb8255ba..03d0d88fc94 100644 --- a/drivers/ram/imxrt_sdram.c +++ b/drivers/ram/imxrt_sdram.c @@ -441,5 +441,5 @@ U_BOOT_DRIVER(imxrt_semc) = { .ops = &imxrt_semc_ops, .ofdata_to_platdata = imxrt_semc_ofdata_to_platdata, .probe = imxrt_semc_probe, - .platdata_auto = sizeof(struct imxrt_sdram_params), + .plat_auto = sizeof(struct imxrt_sdram_params), }; diff --git a/drivers/ram/octeon/octeon_ddr.c b/drivers/ram/octeon/octeon_ddr.c index 6225864fd1b..98dfbab7e92 100644 --- a/drivers/ram/octeon/octeon_ddr.c +++ b/drivers/ram/octeon/octeon_ddr.c @@ -2724,5 +2724,5 @@ U_BOOT_DRIVER(octeon_ddr) = { .of_match = octeon_ids, .ops = &octeon_ops, .probe = octeon_ddr_probe, - .platdata_auto = sizeof(struct ddr_priv), + .plat_auto = sizeof(struct ddr_priv), }; diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index bc9b5dfbe3b..4e586309bd9 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -1002,5 +1002,5 @@ U_BOOT_DRIVER(rockchip_rk3368_dmc) = { .ofdata_to_platdata = rk3368_dmc_ofdata_to_platdata, .probe = rk3368_dmc_probe, .priv_auto = sizeof(struct dram_info), - .platdata_auto = sizeof(struct rk3368_sdram_params), + .plat_auto = sizeof(struct rk3368_sdram_params), }; diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index 38db1119eef..9b9ef9c9e04 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -956,6 +956,6 @@ U_BOOT_DRIVER(rockchip_rk3188_dmc) = { .probe = rk3188_dmc_probe, .priv_auto = sizeof(struct dram_info), #ifdef CONFIG_SPL_BUILD - .platdata_auto = sizeof(struct rk3188_sdram_params), + .plat_auto = sizeof(struct rk3188_sdram_params), #endif }; diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index 9b39332a32f..459d3a4cb5e 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -849,7 +849,7 @@ U_BOOT_DRIVER(dmc_rk322x) = { .probe = rk322x_dmc_probe, .priv_auto = sizeof(struct dram_info), #ifdef CONFIG_TPL_BUILD - .platdata_auto = sizeof(struct rk322x_sdram_params), + .plat_auto = sizeof(struct rk322x_sdram_params), #endif };

diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index a909502207a..e034054ee3c 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -1126,6 +1126,6 @@ U_BOOT_DRIVER(rockchip_rk3288_dmc) = { .priv_auto = sizeof(struct dram_info), #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) - .platdata_auto = sizeof(struct rk3288_sdram_params), + .plat_auto = sizeof(struct rk3288_sdram_params), #endif }; diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index 961c95856a0..634fd419f36 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -617,6 +617,6 @@ U_BOOT_DRIVER(rockchip_rk3328_dmc) = { .probe = rk3328_dmc_probe, .priv_auto = sizeof(struct dram_info), #ifdef CONFIG_TPL_BUILD - .platdata_auto = sizeof(struct rockchip_dmc_plat), + .plat_auto = sizeof(struct rockchip_dmc_plat), #endif }; diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index b36c98250eb..b1d1f92253d 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -3181,6 +3181,6 @@ U_BOOT_DRIVER(dmc_rk3399) = { .priv_auto = sizeof(struct dram_info), #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) - .platdata_auto = sizeof(struct rockchip_dmc_plat), + .plat_auto = sizeof(struct rockchip_dmc_plat), #endif }; diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c index f9810936119..97e32f383bf 100644 --- a/drivers/ram/sifive/fu540_ddr.c +++ b/drivers/ram/sifive/fu540_ddr.c @@ -404,6 +404,6 @@ U_BOOT_DRIVER(fu540_ddr) = { .probe = fu540_ddr_probe, .priv_auto = sizeof(struct fu540_ddr_info), #if defined(CONFIG_SPL_BUILD) - .platdata_auto = sizeof(struct sifive_dmc_plat), + .plat_auto = sizeof(struct sifive_dmc_plat), #endif }; diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index 82c7e955224..ce3ea033a0e 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -409,5 +409,5 @@ U_BOOT_DRIVER(stm32_fmc) = { .ops = &stm32_fmc_ops, .ofdata_to_platdata = stm32_fmc_ofdata_to_platdata, .probe = stm32_fmc_probe, - .platdata_auto = sizeof(struct stm32_sdram_params), + .plat_auto = sizeof(struct stm32_sdram_params), }; diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index 41ac001d96c..cc640b311be 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -42,7 +42,7 @@ static int for_each_remoteproc_device(int (*fn) (struct udevice *dev, ret = uclass_find_next_device(&dev)) { if (ret || dev == skip_dev) continue; - uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ret = fn(dev, uc_pdata, data); if (ret) return ret; @@ -111,11 +111,11 @@ static int rproc_pre_probe(struct udevice *dev) struct dm_rproc_uclass_pdata *uc_pdata; const struct dm_rproc_ops *ops;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

/* See if we need to populate via fdt */

- if (!dev->platdata) { + if (!dev->plat) { #if CONFIG_IS_ENABLED(OF_CONTROL) int node = dev_of_offset(dev); const void *blob = gd->fdt_blob; @@ -140,7 +140,7 @@ static int rproc_pre_probe(struct udevice *dev) #endif

} else { - struct dm_rproc_uclass_pdata *pdata = dev->platdata; + struct dm_rproc_uclass_pdata *pdata = dev->plat;

debug("'%s': using legacy data\n", dev->name); if (pdata->name) @@ -210,7 +210,7 @@ UCLASS_DRIVER(rproc) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .pre_probe = rproc_pre_probe, .post_probe = rproc_post_probe, - .per_device_platdata_auto = + .per_device_plat_auto = sizeof(struct dm_rproc_uclass_pdata), };

@@ -306,7 +306,7 @@ int rproc_load(int id, ulong addr, ulong size) return ret; }

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ops = rproc_get_ops(dev); if (!ops) { @@ -366,7 +366,7 @@ static int _rproc_ops_wrapper(int id, enum rproc_ops op) return ret; }

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ops = rproc_get_ops(dev); if (!ops) { diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c index 7126888698c..ee2ee730712 100644 --- a/drivers/remoteproc/sandbox_testproc.c +++ b/drivers/remoteproc/sandbox_testproc.c @@ -128,7 +128,7 @@ static int sandbox_testproc_probe(struct udevice *dev) struct sandbox_test_devdata *ddata; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ddata = dev_get_priv(dev); if (!ddata) { debug("%s: platform private data missing\n", uc_pdata->name); @@ -151,7 +151,7 @@ static int sandbox_testproc_init(struct udevice *dev) struct dm_rproc_uclass_pdata *uc_pdata; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ret = sandbox_dev_move_to_state(dev, sb_init);

@@ -173,7 +173,7 @@ static int sandbox_testproc_reset(struct udevice *dev) struct dm_rproc_uclass_pdata *uc_pdata; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ret = sandbox_dev_move_to_state(dev, sb_reset);

@@ -197,7 +197,7 @@ static int sandbox_testproc_load(struct udevice *dev, ulong addr, ulong size) struct dm_rproc_uclass_pdata *uc_pdata; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ret = sandbox_dev_move_to_state(dev, sb_loaded);

@@ -220,7 +220,7 @@ static int sandbox_testproc_start(struct udevice *dev) struct dm_rproc_uclass_pdata *uc_pdata; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ret = sandbox_dev_move_to_state(dev, sb_running);

@@ -242,7 +242,7 @@ static int sandbox_testproc_stop(struct udevice *dev) struct dm_rproc_uclass_pdata *uc_pdata; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev);

ret = sandbox_dev_move_to_state(dev, sb_init);

@@ -265,7 +265,7 @@ static int sandbox_testproc_is_running(struct udevice *dev) struct sandbox_test_devdata *ddata; int ret = 1;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ddata = dev_get_priv(dev);

if (ddata->current_state == sb_running) @@ -287,7 +287,7 @@ static int sandbox_testproc_ping(struct udevice *dev) struct sandbox_test_devdata *ddata; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ddata = dev_get_priv(dev);

if (ddata->current_state == sb_running) @@ -354,5 +354,5 @@ static struct dm_rproc_uclass_pdata proc_3_test = {

U_BOOT_DEVICE(proc_3_demo) = { .name = "sandbox_test_proc", - .platdata = &proc_3_test, + .plat = &proc_3_test, }; diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c index 14bb2d95ba6..9dbbb44e955 100644 --- a/drivers/remoteproc/ti_power_proc.c +++ b/drivers/remoteproc/ti_power_proc.c @@ -71,7 +71,7 @@ static int ti_powerproc_probe(struct udevice *dev) struct ti_powerproc_privdata *priv; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); priv = dev_get_priv(dev);

ret = ti_of_to_priv(dev, priv); @@ -96,7 +96,7 @@ static int ti_powerproc_load(struct udevice *dev, ulong addr, ulong size) struct ti_powerproc_privdata *priv; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) { debug("%s: no uc pdata!\n", dev->name); return -EINVAL; @@ -131,7 +131,7 @@ static int ti_powerproc_start(struct udevice *dev) struct ti_powerproc_privdata *priv; int ret;

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) { debug("%s: no uc pdata!\n", dev->name); return -EINVAL; diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index fedde65395a..e7febc42cd9 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -116,6 +116,6 @@ U_BOOT_DRIVER(meson_rng) = { .ops = &meson_rng_ops, .probe = meson_rng_probe, .remove = meson_rng_remove, - .platdata_auto = sizeof(struct meson_rng_platdata), + .plat_auto = sizeof(struct meson_rng_platdata), .ofdata_to_platdata = meson_rng_ofdata_to_platdata, }; diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index 4eed1de8adc..abfcbab6630 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -160,6 +160,6 @@ U_BOOT_DRIVER(stm32_rng) = { .ops = &stm32_rng_ops, .probe = stm32_rng_probe, .remove = stm32_rng_remove, - .platdata_auto = sizeof(struct stm32_rng_platdata), + .plat_auto = sizeof(struct stm32_rng_platdata), .ofdata_to_platdata = stm32_rng_ofdata_to_platdata, }; diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c index 762769d54cc..59043a72309 100644 --- a/drivers/rtc/i2c_rtc_emul.c +++ b/drivers/rtc/i2c_rtc_emul.c @@ -231,6 +231,6 @@ U_BOOT_DRIVER(sandbox_i2c_rtc_emul) = { .of_match = sandbox_i2c_rtc_ids, .bind = sandbox_i2c_rtc_bind, .priv_auto = sizeof(struct sandbox_i2c_rtc), - .platdata_auto = sizeof(struct sandbox_i2c_rtc_plat_data), + .plat_auto = sizeof(struct sandbox_i2c_rtc_plat_data), .ops = &sandbox_i2c_rtc_emul_ops, }; diff --git a/drivers/rtc/pcf2127.c b/drivers/rtc/pcf2127.c index 88ff8c52c35..57f86401d37 100644 --- a/drivers/rtc/pcf2127.c +++ b/drivers/rtc/pcf2127.c @@ -25,7 +25,7 @@

static int pcf2127_rtc_read(struct udevice *dev, uint offset, u8 *buffer, uint len) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct i2c_msg msg; int ret;

diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index 7a6d86d3bfd..93d5a6a3857 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -137,6 +137,6 @@ U_BOOT_DRIVER(rtc_pl031) = { .of_match = pl031_ids, .probe = pl031_probe, .ofdata_to_platdata = pl031_ofdata_to_platdata, - .platdata_auto = sizeof(struct pl031_platdata), + .plat_auto = sizeof(struct pl031_platdata), .ops = &pl031_ops, }; diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index 2b34d0516e6..e9970a7e333 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -35,5 +35,5 @@ int scsi_bus_reset(struct udevice *dev) UCLASS_DRIVER(scsi) = { .id = UCLASS_SCSI, .name = "scsi", - .per_device_platdata_auto = sizeof(struct scsi_platdata), + .per_device_plat_auto = sizeof(struct scsi_platdata), }; diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 0ab1d441f40..6e291e4799e 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -149,9 +149,9 @@ static void scsi_setup_write_ext(struct scsi_cmd *pccb, lbaint_t start, static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_platdata(bdev); + struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks = 0; @@ -219,9 +219,9 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct blk_desc *block_dev = dev_get_uclass_platdata(dev); + struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_platdata(bdev); + struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks; @@ -586,7 +586,7 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose) return ret; }

- bdesc = dev_get_uclass_platdata(bdev); + bdesc = dev_get_uclass_plat(bdev); bdesc->target = id; bdesc->lun = lun; bdesc->removable = bd.removable; @@ -604,7 +604,7 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose)

int scsi_scan_dev(struct udevice *dev, bool verbose) { - struct scsi_platdata *uc_plat; /* scsi controller platdata */ + struct scsi_platdata *uc_plat; /* scsi controller plat */ int ret; int i; int lun; @@ -614,8 +614,8 @@ int scsi_scan_dev(struct udevice *dev, bool verbose) if (ret) return ret;

- /* Get controller platdata */ - uc_plat = dev_get_uclass_platdata(dev); + /* Get controller plat */ + uc_plat = dev_get_uclass_plat(dev);

for (i = 0; i < uc_plat->max_id; i++) for (lun = 0; lun < uc_plat->max_lun; lun++) diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index 173ac240ea6..01dc41ebc0d 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -37,7 +37,7 @@ static int altera_jtaguart_setbrg(struct udevice *dev, int baudrate)

static int altera_jtaguart_putc(struct udevice *dev, const char ch) { - struct altera_jtaguart_platdata *plat = dev->platdata; + struct altera_jtaguart_platdata *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 st = readl(&regs->control);

@@ -56,7 +56,7 @@ static int altera_jtaguart_putc(struct udevice *dev, const char ch)

static int altera_jtaguart_pending(struct udevice *dev, bool input) { - struct altera_jtaguart_platdata *plat = dev->platdata; + struct altera_jtaguart_platdata *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 st = readl(&regs->control);

@@ -68,7 +68,7 @@ static int altera_jtaguart_pending(struct udevice *dev, bool input)

static int altera_jtaguart_getc(struct udevice *dev) { - struct altera_jtaguart_platdata *plat = dev->platdata; + struct altera_jtaguart_platdata *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 val;

@@ -83,7 +83,7 @@ static int altera_jtaguart_getc(struct udevice *dev) static int altera_jtaguart_probe(struct udevice *dev) { #ifdef CONFIG_ALTERA_JTAG_UART_BYPASS - struct altera_jtaguart_platdata *plat = dev->platdata; + struct altera_jtaguart_platdata *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs;

writel(ALTERA_JTAG_AC, &regs->control); /* clear AC flag */ @@ -119,7 +119,7 @@ U_BOOT_DRIVER(altera_jtaguart) = { .id = UCLASS_SERIAL, .of_match = altera_jtaguart_ids, .ofdata_to_platdata = altera_jtaguart_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_jtaguart_platdata), + .plat_auto = sizeof(struct altera_jtaguart_platdata), .probe = altera_jtaguart_probe, .ops = &altera_jtaguart_ops, }; diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index eec70f60005..68169d51a3e 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -32,7 +32,7 @@ struct altera_uart_platdata {

static int altera_uart_setbrg(struct udevice *dev, int baudrate) { - struct altera_uart_platdata *plat = dev->platdata; + struct altera_uart_platdata *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; u32 div;

@@ -44,7 +44,7 @@ static int altera_uart_setbrg(struct udevice *dev, int baudrate)

static int altera_uart_putc(struct udevice *dev, const char ch) { - struct altera_uart_platdata *plat = dev->platdata; + struct altera_uart_platdata *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs;

if (!(readl(&regs->status) & ALTERA_UART_TRDY)) @@ -57,7 +57,7 @@ static int altera_uart_putc(struct udevice *dev, const char ch)

static int altera_uart_pending(struct udevice *dev, bool input) { - struct altera_uart_platdata *plat = dev->platdata; + struct altera_uart_platdata *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; u32 st = readl(&regs->status);

@@ -69,7 +69,7 @@ static int altera_uart_pending(struct udevice *dev, bool input)

static int altera_uart_getc(struct udevice *dev) { - struct altera_uart_platdata *plat = dev->platdata; + struct altera_uart_platdata *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs;

if (!(readl(&regs->status) & ALTERA_UART_RRDY)) @@ -112,7 +112,7 @@ U_BOOT_DRIVER(altera_uart) = { .id = UCLASS_SERIAL, .of_match = altera_uart_ids, .ofdata_to_platdata = altera_uart_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_uart_platdata), + .plat_auto = sizeof(struct altera_uart_platdata), .probe = altera_uart_probe, .ops = &altera_uart_ops, }; diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 45e6554f593..463bedef23c 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -262,7 +262,7 @@ static int atmel_serial_enable_clk(struct udevice *dev)

static int atmel_serial_probe(struct udevice *dev) { - struct atmel_serial_platdata *plat = dev->platdata; + struct atmel_serial_platdata *plat = dev->plat; struct atmel_serial_priv *priv = dev_get_priv(dev); int ret; #if CONFIG_IS_ENABLED(OF_CONTROL) @@ -304,7 +304,7 @@ U_BOOT_DRIVER(serial_atmel) = { .id = UCLASS_SERIAL, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = atmel_serial_ids, - .platdata_auto = sizeof(struct atmel_serial_platdata), + .plat_auto = sizeof(struct atmel_serial_platdata), #endif .probe = atmel_serial_probe, .ops = &atmel_serial_ops, diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c index 80b63807d60..6b7bf3f1c53 100644 --- a/drivers/serial/lpc32xx_hsuart.c +++ b/drivers/serial/lpc32xx_hsuart.c @@ -85,10 +85,10 @@ static int lpc32xx_serial_init(struct hsuart_regs *hsuart)

static int lpc32xx_hsuart_probe(struct udevice *dev) { - struct lpc32xx_hsuart_platdata *platdata = dev_get_platdata(dev); + struct lpc32xx_hsuart_platdata *plat = dev_get_platdata(dev); struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);

- priv->hsuart = (struct hsuart_regs *)platdata->base; + priv->hsuart = (struct hsuart_regs *)plat->base;

lpc32xx_serial_init(priv->hsuart);

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 9b83f88187d..88a486aab8b 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -498,7 +498,7 @@ static int ns16550_serial_assign_base(struct ns16550_platdata *plat, ulong base)

int ns16550_serial_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev->platdata; + struct ns16550_platdata *plat = dev->plat; struct NS16550 *const com_port = dev_get_priv(dev); struct reset_ctl_bulk reset_bulk; fdt_addr_t addr; @@ -506,7 +506,7 @@ int ns16550_serial_probe(struct udevice *dev)

/* * If we are on PCI bus, either directly attached to a PCI root port, - * or via a PCI bridge, assign platdata->base before probing hardware. + * or via a PCI bridge, assign plat->base before probing hardware. */ if (device_is_on_pci_bus(dev)) { addr = devfdt_get_addr_pci(dev); @@ -535,7 +535,7 @@ enum { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) int ns16550_serial_ofdata_to_platdata(struct udevice *dev) { - struct ns16550_platdata *plat = dev->platdata; + struct ns16550_platdata *plat = dev->plat; const u32 port_type = dev_get_driver_data(dev); fdt_addr_t addr; struct clk clk; @@ -611,7 +611,7 @@ U_BOOT_DRIVER(ns16550_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = ns16550_serial_ids, .ofdata_to_platdata = ns16550_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_platdata), #endif .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index aea7db6e00f..541a1ef970c 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -80,7 +80,7 @@ static int sandbox_serial_probe(struct udevice *dev)

static int sandbox_serial_remove(struct udevice *dev) { - struct sandbox_serial_platdata *plat = dev->platdata; + struct sandbox_serial_platdata *plat = dev->plat;

if (plat->colour != -1) output_ansi_reset(); @@ -91,7 +91,7 @@ static int sandbox_serial_remove(struct udevice *dev) static int sandbox_serial_putc(struct udevice *dev, const char ch) { struct sandbox_serial_priv *priv = dev_get_priv(dev); - struct sandbox_serial_platdata *plat = dev->platdata; + struct sandbox_serial_platdata *plat = dev->plat;

/* With of-platdata we don't real the colour correctly, so disable it */ if (!CONFIG_IS_ENABLED(OF_PLATDATA) && priv->start_of_line && @@ -219,7 +219,7 @@ static const char * const ansi_colour[] = {

static int sandbox_serial_ofdata_to_platdata(struct udevice *dev) { - struct sandbox_serial_platdata *plat = dev->platdata; + struct sandbox_serial_platdata *plat = dev->plat; const char *colour; int i;

@@ -259,7 +259,7 @@ U_BOOT_DRIVER(sandbox_serial) = { .id = UCLASS_SERIAL, .of_match = sandbox_serial_ids, .ofdata_to_platdata = sandbox_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct sandbox_serial_platdata), + .plat_auto = sizeof(struct sandbox_serial_platdata), .priv_auto = sizeof(struct sandbox_serial_priv), .probe = sandbox_serial_probe, .remove = sandbox_serial_remove, @@ -274,7 +274,7 @@ static const struct sandbox_serial_platdata platdata_non_fdt = {

U_BOOT_DEVICE(serial_sandbox_non_fdt) = { .name = "sandbox_serial", - .platdata = &platdata_non_fdt, + .plat = &platdata_non_fdt, }; #endif

diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index 52dce3505e4..0c7418f5bc8 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -37,7 +37,7 @@ struct arc_serial_platdata {

static int arc_serial_setbrg(struct udevice *dev, int baudrate) { - struct arc_serial_platdata *plat = dev->platdata; + struct arc_serial_platdata *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; int arc_console_baud = gd->cpu_clk / (baudrate * 4) - 1;

@@ -49,7 +49,7 @@ static int arc_serial_setbrg(struct udevice *dev, int baudrate)

static int arc_serial_putc(struct udevice *dev, const char c) { - struct arc_serial_platdata *plat = dev->platdata; + struct arc_serial_platdata *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg;

while (!(readb(&regs->status) & UART_TXEMPTY)) @@ -67,7 +67,7 @@ static int arc_serial_tstc(struct arc_serial_regs *const regs)

static int arc_serial_pending(struct udevice *dev, bool input) { - struct arc_serial_platdata *plat = dev->platdata; + struct arc_serial_platdata *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; uint32_t status = readb(&regs->status);

@@ -79,7 +79,7 @@ static int arc_serial_pending(struct udevice *dev, bool input)

static int arc_serial_getc(struct udevice *dev) { - struct arc_serial_platdata *plat = dev->platdata; + struct arc_serial_platdata *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg;

while (!arc_serial_tstc(regs)) @@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_arc) = { .id = UCLASS_SERIAL, .of_match = arc_serial_ids, .ofdata_to_platdata = arc_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct arc_serial_platdata), + .plat_auto = sizeof(struct arc_serial_platdata), .probe = arc_serial_probe, .ops = &arc_serial_ops, }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 8cd533f8085..d11bdd4ebbb 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -194,7 +194,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .name = "serial_bcm283x_mu", .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_mu_serial_id), - .platdata_auto = sizeof(struct bcm283x_mu_serial_platdata), + .plat_auto = sizeof(struct bcm283x_mu_serial_platdata), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 484a2818119..8d2f249b33c 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -92,7 +92,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_pl011_serial_id), .probe = bcm283x_pl011_serial_probe, - .platdata_auto = sizeof(struct pl01x_serial_platdata), + .plat_auto = sizeof(struct pl01x_serial_platdata), .ops = &bcm283x_pl011_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index 08363c4920b..17072e42b2a 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -38,7 +38,7 @@ U_BOOT_DRIVER(coreboot_uart) = { .id = UCLASS_SERIAL, .of_match = coreboot_serial_ids, .priv_auto = sizeof(struct NS16550), - .platdata_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_platdata), .ofdata_to_platdata = coreboot_ofdata_to_platdata, .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c index f9281590cd4..26c6867180f 100644 --- a/drivers/serial/serial_intel_mid.c +++ b/drivers/serial/serial_intel_mid.c @@ -60,7 +60,7 @@ U_BOOT_DRIVER(serial_intel_mid) = { .id = UCLASS_SERIAL, .of_match = mid_serial_ids, .ofdata_to_platdata = ns16550_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_platdata), .priv_auto = sizeof(struct NS16550), .probe = mid_serial_probe, .ops = &ns16550_serial_ops, diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index af7b842927a..4f8867ab7be 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -168,7 +168,7 @@ static void linflex_serial_init_internal(struct linflex_fsl *lfuart)

static int linflex_serial_probe(struct udevice *dev) { - struct linflex_serial_platdata *plat = dev->platdata; + struct linflex_serial_platdata *plat = dev->plat; struct linflex_serial_priv *priv = dev_get_priv(dev);

priv->lfuart = (struct linflex_fsl *)plat->base_addr; diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index b26f401cb70..e6e1b1def63 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -138,7 +138,7 @@ static inline int get_lpuart_clk_rate(struct udevice *dev, u32 *clk)

static bool is_lpuart32(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->platdata; + struct lpuart_serial_platdata *plat = dev->plat;

return plat->flags & LPUART_FLAG_REGMAP_32BIT_REG; } @@ -445,7 +445,7 @@ static int lpuart_serial_setbrg(struct udevice *dev, int baudrate)

static int lpuart_serial_getc(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->platdata; + struct lpuart_serial_platdata *plat = dev->plat;

if (is_lpuart32(dev)) return _lpuart32_serial_getc(plat); @@ -455,7 +455,7 @@ static int lpuart_serial_getc(struct udevice *dev)

static int lpuart_serial_putc(struct udevice *dev, const char c) { - struct lpuart_serial_platdata *plat = dev->platdata; + struct lpuart_serial_platdata *plat = dev->plat;

if (is_lpuart32(dev)) _lpuart32_serial_putc(plat, c); @@ -467,7 +467,7 @@ static int lpuart_serial_putc(struct udevice *dev, const char c)

static int lpuart_serial_pending(struct udevice *dev, bool input) { - struct lpuart_serial_platdata *plat = dev->platdata; + struct lpuart_serial_platdata *plat = dev->plat; struct lpuart_fsl *reg = plat->reg; struct lpuart_fsl_reg32 *reg32 = plat->reg; u32 stat; @@ -513,7 +513,7 @@ static int lpuart_serial_probe(struct udevice *dev)

static int lpuart_serial_ofdata_to_platdata(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->platdata; + struct lpuart_serial_platdata *plat = dev->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); fdt_addr_t addr; @@ -567,7 +567,7 @@ U_BOOT_DRIVER(serial_lpuart) = { .id = UCLASS_SERIAL, .of_match = lpuart_serial_ids, .ofdata_to_platdata = lpuart_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct lpuart_serial_platdata), + .plat_auto = sizeof(struct lpuart_serial_platdata), .probe = lpuart_serial_probe, .ops = &lpuart_serial_ops, }; diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index d88b9f1b9f0..820a3e05bb0 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -83,7 +83,7 @@ static void mcf_serial_setbrg_common(uart_t *uart, int baudrate)

static int coldfire_serial_probe(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev->platdata; + struct coldfire_serial_platdata *plat = dev->plat;

plat->port = dev_seq(dev);

@@ -93,7 +93,7 @@ static int coldfire_serial_probe(struct udevice *dev)

static int coldfire_serial_putc(struct udevice *dev, const char ch) { - struct coldfire_serial_platdata *plat = dev->platdata; + struct coldfire_serial_platdata *plat = dev->plat; uart_t *uart = (uart_t *)plat->base;

/* Wait for last character to go. */ @@ -107,7 +107,7 @@ static int coldfire_serial_putc(struct udevice *dev, const char ch)

static int coldfire_serial_getc(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev->platdata; + struct coldfire_serial_platdata *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base);

/* Wait for a character to arrive. */ @@ -119,7 +119,7 @@ static int coldfire_serial_getc(struct udevice *dev)

int coldfire_serial_setbrg(struct udevice *dev, int baudrate) { - struct coldfire_serial_platdata *plat = dev->platdata; + struct coldfire_serial_platdata *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base);

mcf_serial_setbrg_common(uart, baudrate); @@ -129,7 +129,7 @@ int coldfire_serial_setbrg(struct udevice *dev, int baudrate)

static int coldfire_serial_pending(struct udevice *dev, bool input) { - struct coldfire_serial_platdata *plat = dev->platdata; + struct coldfire_serial_platdata *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base);

if (input) @@ -172,7 +172,7 @@ U_BOOT_DRIVER(serial_coldfire) = { .id = UCLASS_SERIAL, .of_match = coldfire_serial_ids, .ofdata_to_platdata = coldfire_ofdata_to_platdata, - .platdata_auto = sizeof(struct coldfire_serial_platdata), + .plat_auto = sizeof(struct coldfire_serial_platdata), .probe = coldfire_serial_probe, .ops = &coldfire_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c index 73a10f89c01..997426d56d1 100644 --- a/drivers/serial/serial_meson.c +++ b/drivers/serial/serial_meson.c @@ -57,7 +57,7 @@ static void meson_serial_init(struct meson_uart *uart)

static int meson_serial_probe(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->platdata; + struct meson_serial_platdata *plat = dev->plat; struct meson_uart *const uart = plat->reg;

meson_serial_init(uart); @@ -67,7 +67,7 @@ static int meson_serial_probe(struct udevice *dev)

static void meson_serial_rx_error(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->platdata; + struct meson_serial_platdata *plat = dev->plat; struct meson_uart *const uart = plat->reg; u32 val = readl(&uart->control);

@@ -83,7 +83,7 @@ static void meson_serial_rx_error(struct udevice *dev)

static int meson_serial_getc(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->platdata; + struct meson_serial_platdata *plat = dev->plat; struct meson_uart *const uart = plat->reg; uint32_t status = readl(&uart->status);

@@ -100,7 +100,7 @@ static int meson_serial_getc(struct udevice *dev)

static int meson_serial_putc(struct udevice *dev, const char ch) { - struct meson_serial_platdata *plat = dev->platdata; + struct meson_serial_platdata *plat = dev->plat; struct meson_uart *const uart = plat->reg;

if (readl(&uart->status) & AML_UART_TX_FULL) @@ -113,7 +113,7 @@ static int meson_serial_putc(struct udevice *dev, const char ch)

static int meson_serial_pending(struct udevice *dev, bool input) { - struct meson_serial_platdata *plat = dev->platdata; + struct meson_serial_platdata *plat = dev->plat; struct meson_uart *const uart = plat->reg; uint32_t status = readl(&uart->status);

@@ -138,7 +138,7 @@ static int meson_serial_pending(struct udevice *dev, bool input)

static int meson_serial_ofdata_to_platdata(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->platdata; + struct meson_serial_platdata *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -169,7 +169,7 @@ U_BOOT_DRIVER(serial_meson) = { .probe = meson_serial_probe, .ops = &meson_serial_ops, .ofdata_to_platdata = meson_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct meson_serial_platdata), + .plat_auto = sizeof(struct meson_serial_platdata), };

#ifdef CONFIG_DEBUG_UART_MESON diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index 7756b0d929d..690b7c69c8a 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_mvebu) = { .id = UCLASS_SERIAL, .of_match = mvebu_serial_ids, .ofdata_to_platdata = mvebu_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct mvebu_platdata), + .plat_auto = sizeof(struct mvebu_platdata), .probe = mvebu_serial_probe, .ops = &mvebu_serial_ops, }; diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 83f2316a64b..a228bc4c9ef 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -264,7 +264,7 @@ __weak struct serial_device *default_serial_console(void)

int mxc_serial_setbrg(struct udevice *dev, int baudrate) { - struct mxc_serial_platdata *plat = dev->platdata; + struct mxc_serial_platdata *plat = dev->plat; u32 clk = imx_get_uartclk();

_mxc_serial_setbrg(plat->reg, clk, baudrate, plat->use_dte); @@ -274,7 +274,7 @@ int mxc_serial_setbrg(struct udevice *dev, int baudrate)

static int mxc_serial_probe(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->platdata; + struct mxc_serial_platdata *plat = dev->plat;

_mxc_serial_init(plat->reg, plat->use_dte);

@@ -283,7 +283,7 @@ static int mxc_serial_probe(struct udevice *dev)

static int mxc_serial_getc(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->platdata; + struct mxc_serial_platdata *plat = dev->plat; struct mxc_uart *const uart = plat->reg;

if (readl(&uart->ts) & UTS_RXEMPTY) @@ -294,7 +294,7 @@ static int mxc_serial_getc(struct udevice *dev)

static int mxc_serial_putc(struct udevice *dev, const char ch) { - struct mxc_serial_platdata *plat = dev->platdata; + struct mxc_serial_platdata *plat = dev->plat; struct mxc_uart *const uart = plat->reg;

if (!(readl(&uart->ts) & UTS_TXEMPTY)) @@ -307,7 +307,7 @@ static int mxc_serial_putc(struct udevice *dev, const char ch)

static int mxc_serial_pending(struct udevice *dev, bool input) { - struct mxc_serial_platdata *plat = dev->platdata; + struct mxc_serial_platdata *plat = dev->plat; struct mxc_uart *const uart = plat->reg; uint32_t sr2 = readl(&uart->sr2);

@@ -327,7 +327,7 @@ static const struct dm_serial_ops mxc_serial_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) static int mxc_serial_ofdata_to_platdata(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->platdata; + struct mxc_serial_platdata *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -358,7 +358,7 @@ U_BOOT_DRIVER(serial_mxc) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = mxc_serial_ids, .ofdata_to_platdata = mxc_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct mxc_serial_platdata), + .plat_auto = sizeof(struct mxc_serial_platdata), #endif .probe = mxc_serial_probe, .ops = &mxc_serial_ops, diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c index 296c5fd45c1..26e03b8620b 100644 --- a/drivers/serial/serial_omap.c +++ b/drivers/serial/serial_omap.c @@ -101,7 +101,7 @@ DEBUG_UART_FUNCS #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int omap_serial_ofdata_to_platdata(struct udevice *dev) { - struct ns16550_platdata *plat = dev->platdata; + struct ns16550_platdata *plat = dev->plat; fdt_addr_t addr; struct clk clk; int err; @@ -158,7 +158,7 @@ U_BOOT_DRIVER(omap_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_serial_ids, .ofdata_to_platdata = omap_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_platdata), #endif .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 4e201287bf0..3a876fe2f2a 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -388,7 +388,7 @@ U_BOOT_DRIVER(serial_pl01x) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(pl01x_serial_id), .ofdata_to_platdata = of_match_ptr(pl01x_serial_ofdata_to_platdata), - .platdata_auto = sizeof(struct pl01x_serial_platdata), + .plat_auto = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, .ops = &pl01x_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index 6f8f7e1198a..232218dcdcc 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -268,7 +268,7 @@ void pxa_serial_initialize(void) #ifdef CONFIG_DM_SERIAL static int pxa_serial_probe(struct udevice *dev) { - struct pxa_serial_platdata *plat = dev->platdata; + struct pxa_serial_platdata *plat = dev->plat;

pxa_setbrg_common((struct pxa_uart_regs *)plat->base, plat->port, plat->baudrate); @@ -277,7 +277,7 @@ static int pxa_serial_probe(struct udevice *dev)

static int pxa_serial_putc(struct udevice *dev, const char ch) { - struct pxa_serial_platdata *plat = dev->platdata; + struct pxa_serial_platdata *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base;

/* Wait for last character to go. */ @@ -291,7 +291,7 @@ static int pxa_serial_putc(struct udevice *dev, const char ch)

static int pxa_serial_getc(struct udevice *dev) { - struct pxa_serial_platdata *plat = dev->platdata; + struct pxa_serial_platdata *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base;

/* Wait for a character to arrive. */ @@ -303,7 +303,7 @@ static int pxa_serial_getc(struct udevice *dev)

int pxa_serial_setbrg(struct udevice *dev, int baudrate) { - struct pxa_serial_platdata *plat = dev->platdata; + struct pxa_serial_platdata *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base; int port = plat->port;

@@ -314,7 +314,7 @@ int pxa_serial_setbrg(struct udevice *dev, int baudrate)

static int pxa_serial_pending(struct udevice *dev, bool input) { - struct pxa_serial_platdata *plat = dev->platdata; + struct pxa_serial_platdata *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base;

if (input) diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index 74245f8d5dc..e00df4b21ad 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -34,7 +34,7 @@ static int rockchip_serial_probe(struct udevice *dev) plat->plat.reg_shift = plat->dtplat.reg_shift; plat->plat.clock = plat->dtplat.clock_frequency; plat->plat.fcr = UART_FCR_DEFVAL; - dev->platdata = &plat->plat; + dev->plat = &plat->plat;

return ns16550_serial_probe(dev); } @@ -43,7 +43,7 @@ U_BOOT_DRIVER(rockchip_rk3188_uart) = { .name = "rockchip_rk3188_uart", .id = UCLASS_SERIAL, .priv_auto = sizeof(struct NS16550), - .platdata_auto = sizeof(struct rockchip_uart_platdata), + .plat_auto = sizeof(struct rockchip_uart_platdata), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, @@ -53,7 +53,7 @@ U_BOOT_DRIVER(rockchip_rk3288_uart) = { .name = "rockchip_rk3288_uart", .id = UCLASS_SERIAL, .priv_auto = sizeof(struct NS16550), - .platdata_auto = sizeof(struct rockchip_uart_platdata), + .plat_auto = sizeof(struct rockchip_uart_platdata), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 2f15525c487..4323f61392d 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -88,7 +88,7 @@ static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, uint uclk, #ifndef CONFIG_SPL_BUILD int s5p_serial_setbrg(struct udevice *dev, int baudrate) { - struct s5p_serial_platdata *plat = dev->platdata; + struct s5p_serial_platdata *plat = dev->plat; struct s5p_uart *const uart = plat->reg; u32 uclk;

@@ -111,7 +111,7 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate)

static int s5p_serial_probe(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->platdata; + struct s5p_serial_platdata *plat = dev->plat; struct s5p_uart *const uart = plat->reg;

s5p_serial_init(uart); @@ -140,7 +140,7 @@ static int serial_err_check(const struct s5p_uart *const uart, int op)

static int s5p_serial_getc(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->platdata; + struct s5p_serial_platdata *plat = dev->plat; struct s5p_uart *const uart = plat->reg;

if (!(readl(&uart->ufstat) & RX_FIFO_COUNT_MASK)) @@ -152,7 +152,7 @@ static int s5p_serial_getc(struct udevice *dev)

static int s5p_serial_putc(struct udevice *dev, const char ch) { - struct s5p_serial_platdata *plat = dev->platdata; + struct s5p_serial_platdata *plat = dev->plat; struct s5p_uart *const uart = plat->reg;

if (readl(&uart->ufstat) & TX_FIFO_FULL) @@ -166,7 +166,7 @@ static int s5p_serial_putc(struct udevice *dev, const char ch)

static int s5p_serial_pending(struct udevice *dev, bool input) { - struct s5p_serial_platdata *plat = dev->platdata; + struct s5p_serial_platdata *plat = dev->plat; struct s5p_uart *const uart = plat->reg; uint32_t ufstat = readl(&uart->ufstat);

@@ -178,7 +178,7 @@ static int s5p_serial_pending(struct udevice *dev, bool input)

static int s5p_serial_ofdata_to_platdata(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->platdata; + struct s5p_serial_platdata *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -208,7 +208,7 @@ U_BOOT_DRIVER(serial_s5p) = { .id = UCLASS_SERIAL, .of_match = s5p_serial_ids, .ofdata_to_platdata = s5p_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct s5p_serial_platdata), + .plat_auto = sizeof(struct s5p_serial_platdata), .probe = s5p_serial_probe, .ops = &s5p_serial_ops, }; diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index 4e37ab0c318..0cac2b97404 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -240,7 +240,7 @@ U_BOOT_DRIVER(serial_sh) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(sh_serial_id), .ofdata_to_platdata = of_match_ptr(sh_serial_ofdata_to_platdata), - .platdata_auto = sizeof(struct sh_serial_platdata), + .plat_auto = sizeof(struct sh_serial_platdata), .probe = sh_serial_probe, .ops = &sh_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index 710bb72363f..276f0902dbf 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -105,7 +105,7 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate) { int ret; struct clk clk; - struct sifive_uart_platdata *platdata = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_platdata(dev); u32 clock = 0;

ret = clk_get_by_index(dev, 0, &clk); @@ -123,21 +123,21 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate) return 0; } } - platdata->clock = clock; - _sifive_serial_setbrg(platdata->regs, platdata->clock, baudrate); + plat->clock = clock; + _sifive_serial_setbrg(plat->regs, plat->clock, baudrate);

return 0; }

static int sifive_serial_probe(struct udevice *dev) { - struct sifive_uart_platdata *platdata = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_platdata(dev);

/* No need to reinitialize the UART after relocation */ if (gd->flags & GD_FLG_RELOC) return 0;

- _sifive_serial_init(platdata->regs); + _sifive_serial_init(plat->regs);

return 0; } @@ -145,8 +145,8 @@ static int sifive_serial_probe(struct udevice *dev) static int sifive_serial_getc(struct udevice *dev) { int c; - struct sifive_uart_platdata *platdata = dev_get_platdata(dev); - struct uart_sifive *regs = platdata->regs; + struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct uart_sifive *regs = plat->regs;

while ((c = _sifive_serial_getc(regs)) == -EAGAIN) ;

@@ -156,17 +156,17 @@ static int sifive_serial_getc(struct udevice *dev) static int sifive_serial_putc(struct udevice *dev, const char ch) { int rc; - struct sifive_uart_platdata *platdata = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_platdata(dev);

- while ((rc = _sifive_serial_putc(platdata->regs, ch)) == -EAGAIN) ; + while ((rc = _sifive_serial_putc(plat->regs, ch)) == -EAGAIN) ;

return rc; }

static int sifive_serial_pending(struct udevice *dev, bool input) { - struct sifive_uart_platdata *platdata = dev_get_platdata(dev); - struct uart_sifive *regs = platdata->regs; + struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct uart_sifive *regs = plat->regs;

if (input) return (readl(&regs->ip) & UART_IP_RXWM); @@ -176,11 +176,11 @@ static int sifive_serial_pending(struct udevice *dev, bool input)

static int sifive_serial_ofdata_to_platdata(struct udevice *dev) { - struct sifive_uart_platdata *platdata = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_platdata(dev);

- platdata->regs = (struct uart_sifive *)dev_read_addr(dev); - if (IS_ERR(platdata->regs)) - return PTR_ERR(platdata->regs); + plat->regs = (struct uart_sifive *)dev_read_addr(dev); + if (IS_ERR(plat->regs)) + return PTR_ERR(plat->regs);

return 0; } @@ -202,7 +202,7 @@ U_BOOT_DRIVER(serial_sifive) = { .id = UCLASS_SERIAL, .of_match = sifive_serial_ids, .ofdata_to_platdata = sifive_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct sifive_uart_platdata), + .plat_auto = sizeof(struct sifive_uart_platdata), .probe = sifive_serial_probe, .ops = &sifive_serial_ops, }; diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index a8e03207503..210b5b51394 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -241,7 +241,7 @@ U_BOOT_DRIVER(serial_stm32) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(stm32_serial_id), .ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata), - .platdata_auto = sizeof(struct stm32x7_serial_platdata), + .plat_auto = sizeof(struct stm32x7_serial_platdata), .ops = &stm32_serial_ops, .probe = stm32_serial_probe, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index bc039492ef8..eb76c7800e2 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -132,7 +132,7 @@ U_BOOT_DRIVER(serial_uartlite) = { .id = UCLASS_SERIAL, .of_match = uartlite_serial_ids, .ofdata_to_platdata = uartlite_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct uartlite_platdata), + .plat_auto = sizeof(struct uartlite_platdata), .probe = uartlite_serial_probe, .ops = &uartlite_serial_ops, }; diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index d04c3990198..7984b61ce13 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -107,7 +107,7 @@ static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c)

static int zynq_serial_setbrg(struct udevice *dev, int baudrate) { - struct zynq_uart_platdata *platdata = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_platdata(dev); unsigned long clock;

int ret; @@ -132,15 +132,15 @@ static int zynq_serial_setbrg(struct udevice *dev, int baudrate) return ret; }

- _uart_zynq_serial_setbrg(platdata->regs, clock, baudrate); + _uart_zynq_serial_setbrg(plat->regs, clock, baudrate);

return 0; }

static int zynq_serial_probe(struct udevice *dev) { - struct zynq_uart_platdata *platdata = dev_get_platdata(dev); - struct uart_zynq *regs = platdata->regs; + struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct uart_zynq *regs = plat->regs; u32 val;

/* No need to reinitialize the UART if TX already enabled */ @@ -148,15 +148,15 @@ static int zynq_serial_probe(struct udevice *dev) if (val & ZYNQ_UART_CR_TX_EN) return 0;

- _uart_zynq_serial_init(platdata->regs); + _uart_zynq_serial_init(plat->regs);

return 0; }

static int zynq_serial_getc(struct udevice *dev) { - struct zynq_uart_platdata *platdata = dev_get_platdata(dev); - struct uart_zynq *regs = platdata->regs; + struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct uart_zynq *regs = plat->regs;

if (readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY) return -EAGAIN; @@ -166,15 +166,15 @@ static int zynq_serial_getc(struct udevice *dev)

static int zynq_serial_putc(struct udevice *dev, const char ch) { - struct zynq_uart_platdata *platdata = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_platdata(dev);

- return _uart_zynq_serial_putc(platdata->regs, ch); + return _uart_zynq_serial_putc(plat->regs, ch); }

static int zynq_serial_pending(struct udevice *dev, bool input) { - struct zynq_uart_platdata *platdata = dev_get_platdata(dev); - struct uart_zynq *regs = platdata->regs; + struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct uart_zynq *regs = plat->regs;

if (input) return !(readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY); @@ -184,11 +184,11 @@ static int zynq_serial_pending(struct udevice *dev, bool input)

static int zynq_serial_ofdata_to_platdata(struct udevice *dev) { - struct zynq_uart_platdata *platdata = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_platdata(dev);

- platdata->regs = (struct uart_zynq *)dev_read_addr(dev); - if (IS_ERR(platdata->regs)) - return PTR_ERR(platdata->regs); + plat->regs = (struct uart_zynq *)dev_read_addr(dev); + if (IS_ERR(plat->regs)) + return PTR_ERR(plat->regs);

return 0; } @@ -212,7 +212,7 @@ U_BOOT_DRIVER(serial_zynq) = { .id = UCLASS_SERIAL, .of_match = zynq_serial_ids, .ofdata_to_platdata = zynq_serial_ofdata_to_platdata, - .platdata_auto = sizeof(struct zynq_uart_platdata), + .plat_auto = sizeof(struct zynq_uart_platdata), .probe = zynq_serial_probe, .ops = &zynq_serial_ops, }; diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index e1cbd6eef89..2ea91629779 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -124,5 +124,5 @@ U_BOOT_DRIVER(soc_ti_k3) = { .ops = &soc_ti_k3_ops, .of_match = soc_ti_k3_ids, .probe = soc_ti_k3_probe, - .platdata_auto = sizeof(struct soc_ti_k3_platdata), + .plat_auto = sizeof(struct soc_ti_k3_platdata), }; diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c index 62207b957cf..d8d128a9206 100644 --- a/drivers/sound/ivybridge_sound.c +++ b/drivers/sound/ivybridge_sound.c @@ -71,7 +71,7 @@ static int bd82x6x_azalia_probe(struct udevice *dev) dm_pci_clrset_config32(dev, 0xd0, 1U << 31, 0);

/* Additional step on Panther Point */ - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); if (plat->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_HDA) dm_pci_clrset_config32(dev, 0xc4, 0, 1 << 17);

diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 07bf3c9a0f8..8dbee04d11f 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -89,7 +89,7 @@ static int altera_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct altera_spi_priv *priv = dev_get_priv(bus); struct altera_spi_regs *const regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

/* assume spi core configured to do 8 bit transfers */ unsigned int bytes = bitlen / 8; @@ -203,7 +203,7 @@ U_BOOT_DRIVER(altera_spi) = { .of_match = altera_spi_ids, .ops = &altera_spi_ops, .ofdata_to_platdata = altera_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_spi_platdata), + .plat_auto = sizeof(struct altera_spi_platdata), .priv_auto = sizeof(struct altera_spi_priv), .probe = altera_spi_probe, }; diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 82534d9c693..f62387cf9b4 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -310,7 +310,7 @@ static int atcspi200_spi_set_mode(struct udevice *bus, uint mode) static int atcspi200_spi_claim_bus(struct udevice *dev) { struct dm_spi_slave_platdata *slave_plat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct nds_spi_slave *ns = dev_get_priv(bus);

diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index e5d54faf7df..ad2c7ff69cf 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -59,7 +59,7 @@ static int ath79_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct ath79_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); u8 *rx = din; const u8 *tx = dout; u8 curbyte, curbitlen, restbits; diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 873f854cc9a..a192f935872 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -123,7 +123,7 @@ static int atmel_spi_claim_bus(struct udevice *dev) struct udevice *bus = dev_get_parent(dev); struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); struct at91_spi *reg_base = bus_plat->regs; u32 cs = slave_plat->cs; u32 freq = priv->freq; @@ -173,7 +173,7 @@ static void atmel_spi_cs_activate(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_GPIO) struct udevice *bus = dev_get_parent(dev); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs;

if (!dm_gpio_is_valid(&priv->cs_gpios[cs])) @@ -188,7 +188,7 @@ static void atmel_spi_cs_deactivate(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_GPIO) struct udevice *bus = dev_get_parent(dev); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs;

if (!dm_gpio_is_valid(&priv->cs_gpios[cs])) @@ -388,7 +388,7 @@ U_BOOT_DRIVER(atmel_spi) = { .id = UCLASS_SPI, .of_match = atmel_spi_ids, .ops = &atmel_spi_ops, - .platdata_auto = sizeof(struct atmel_spi_platdata), + .plat_auto = sizeof(struct atmel_spi_platdata), .priv_auto = sizeof(struct atmel_spi_priv), .probe = atmel_spi_probe, }; diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c index c4a04ba6fd2..6d7d1696598 100644 --- a/drivers/spi/bcm63xx_hsspi.c +++ b/drivers/spi/bcm63xx_hsspi.c @@ -217,7 +217,7 @@ static int bcm63xx_hsspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct bcm63xx_hsspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); size_t data_bytes = bitlen / 8; size_t step_size = HSSPI_FIFO_SIZE; uint16_t opcode = 0; @@ -316,7 +316,7 @@ static const struct udevice_id bcm63xx_hsspi_ids[] = { static int bcm63xx_hsspi_child_pre_probe(struct udevice *dev) { struct bcm63xx_hsspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev);

/* check cs */ if (plat->cs >= priv->num_cs) { diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c index 97b72d263ae..fe5fe5b716d 100644 --- a/drivers/spi/bcm63xx_spi.c +++ b/drivers/spi/bcm63xx_spi.c @@ -237,7 +237,7 @@ static int bcm63xx_spi_xfer(struct udevice *dev, unsigned int bitlen,

if (flags & SPI_XFER_END) { struct dm_spi_slave_platdata *plat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev); uint16_t val, cmd; int ret;

@@ -351,7 +351,7 @@ static int bcm63xx_spi_child_pre_probe(struct udevice *dev) struct bcm63xx_spi_priv *priv = dev_get_priv(dev->parent); const unsigned long *regs = priv->regs; struct spi_slave *slave = dev_get_parent_priv(dev); - struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev);

/* check cs */ if (plat->cs >= priv->num_cs) { diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c index d5ec2bccfb0..da874760b73 100644 --- a/drivers/spi/bcmstb_spi.c +++ b/drivers/spi/bcmstb_spi.c @@ -434,6 +434,6 @@ U_BOOT_DRIVER(bcmstb_spi) = { .ops = &bcmstb_spi_ops, .ofdata_to_platdata = bcmstb_spi_ofdata_to_platdata, .probe = bcmstb_spi_probe, - .platdata_auto = sizeof(struct bcmstb_spi_platdata), + .plat_auto = sizeof(struct bcmstb_spi_platdata), .priv_auto = sizeof(struct bcmstb_spi_priv), }; diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index dcee7b77033..f097fc17a57 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -27,7 +27,7 @@

static int cadence_spi_write_speed(struct udevice *bus, uint hz) { - struct cadence_spi_platdata *plat = bus->platdata; + struct cadence_spi_platdata *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus);

cadence_qspi_apb_config_baudrate_div(priv->regbase, @@ -130,7 +130,7 @@ static int spi_calibration(struct udevice *bus, uint hz)

static int cadence_spi_set_speed(struct udevice *bus, uint hz) { - struct cadence_spi_platdata *plat = bus->platdata; + struct cadence_spi_platdata *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); int err;

@@ -165,7 +165,7 @@ static int cadence_spi_set_speed(struct udevice *bus, uint hz)

static int cadence_spi_probe(struct udevice *bus) { - struct cadence_spi_platdata *plat = bus->platdata; + struct cadence_spi_platdata *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); struct clk clk; int ret; @@ -212,7 +212,7 @@ static int cadence_spi_remove(struct udevice *dev)

static int cadence_spi_set_mode(struct udevice *bus, uint mode) { - struct cadence_spi_platdata *plat = bus->platdata; + struct cadence_spi_platdata *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus);

/* Disable QSPI */ @@ -235,7 +235,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi, const struct spi_mem_op *op) { struct udevice *bus = spi->dev->parent; - struct cadence_spi_platdata *plat = bus->platdata; + struct cadence_spi_platdata *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); void *base = priv->regbase; int err = 0; @@ -284,7 +284,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi,

static int cadence_spi_ofdata_to_platdata(struct udevice *bus) { - struct cadence_spi_platdata *plat = bus->platdata; + struct cadence_spi_platdata *plat = bus->plat; ofnode subnode;

plat->regbase = (void *)devfdt_get_addr_index(bus, 0); @@ -354,7 +354,7 @@ U_BOOT_DRIVER(cadence_spi) = { .of_match = cadence_spi_ids, .ops = &cadence_spi_ops, .ofdata_to_platdata = cadence_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct cadence_spi_platdata), + .plat_auto = sizeof(struct cadence_spi_platdata), .priv_auto = sizeof(struct cadence_spi_priv), .probe = cadence_spi_probe, .remove = cadence_spi_remove, diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index 0fa61efc23b..e17c37916f7 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -115,7 +115,7 @@ static int coldfire_spi_claim_bus(struct udevice *dev) struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; struct dm_spi_slave_platdata *slave_plat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev);

if ((in_be32(&dspi->sr) & DSPI_SR_TXRXS) != DSPI_SR_TXRXS) return -1; @@ -134,7 +134,7 @@ static int coldfire_spi_release_bus(struct udevice *dev) struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; struct dm_spi_slave_platdata *slave_plat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev);

/* Clear FIFO */ clrbits_be32(&dspi->mcr, DSPI_MCR_CTXF | DSPI_MCR_CRXF); @@ -150,7 +150,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct coldfire_spi_priv *cfspi = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); u16 *spi_rd16 = NULL, *spi_wr16 = NULL; u8 *spi_rd = NULL, *spi_wr = NULL; static u32 ctrl; @@ -387,7 +387,7 @@ static int coldfire_spi_probe(struct udevice *bus) static int coldfire_dspi_ofdata_to_platdata(struct udevice *bus) { fdt_addr_t addr; - struct coldfire_spi_platdata *plat = bus->platdata; + struct coldfire_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); int *ctar, len; @@ -452,7 +452,7 @@ U_BOOT_DRIVER(coldfire_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = coldfire_spi_ids, .ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata, - .platdata_auto = sizeof(struct coldfire_spi_platdata), + .plat_auto = sizeof(struct coldfire_spi_platdata), #endif .probe = coldfire_spi_probe, .ops = &coldfire_spi_ops, diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index b69224e9832..c60f2fedf3b 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -334,7 +334,7 @@ static int davinci_spi_set_mode(struct udevice *bus, uint mode) static int davinci_spi_claim_bus(struct udevice *dev) { struct dm_spi_slave_platdata *slave_plat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct davinci_spi_slave *ds = dev_get_priv(bus);

@@ -359,7 +359,7 @@ static int davinci_spi_xfer(struct udevice *dev, unsigned int bitlen, unsigned long flags) { struct dm_spi_slave_platdata *slave = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct davinci_spi_slave *ds = dev_get_priv(bus);

@@ -383,7 +383,7 @@ static const struct dm_spi_ops davinci_spi_ops = { static int davinci_spi_probe(struct udevice *bus) { struct davinci_spi_slave *ds = dev_get_priv(bus); - struct davinci_spi_platdata *plat = bus->platdata; + struct davinci_spi_platdata *plat = bus->plat; ds->regs = plat->regs; ds->num_cs = plat->num_cs;

@@ -393,7 +393,7 @@ static int davinci_spi_probe(struct udevice *bus) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int davinci_ofdata_to_platadata(struct udevice *bus) { - struct davinci_spi_platdata *plat = bus->platdata; + struct davinci_spi_platdata *plat = bus->plat; fdt_addr_t addr;

addr = dev_read_addr(bus); @@ -420,7 +420,7 @@ U_BOOT_DRIVER(davinci_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = davinci_spi_ids, .ofdata_to_platdata = davinci_ofdata_to_platadata, - .platdata_auto = sizeof(struct davinci_spi_platdata), + .plat_auto = sizeof(struct davinci_spi_platdata), #endif .probe = davinci_spi_probe, .ops = &davinci_spi_ops, diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 8d48e04ed1f..390fbcf4b6e 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -155,7 +155,7 @@ static int request_gpio_cs(struct udevice *bus)

static int dw_spi_ofdata_to_platdata(struct udevice *bus) { - struct dw_spi_platdata *plat = bus->platdata; + struct dw_spi_platdata *plat = bus->plat;

plat->regs = dev_read_addr_ptr(bus);

@@ -478,7 +478,7 @@ static int dw_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int dw_spi_set_speed(struct udevice *bus, uint speed) { - struct dw_spi_platdata *plat = bus->platdata; + struct dw_spi_platdata *plat = bus->plat; struct dw_spi_priv *priv = dev_get_priv(bus); u16 clk_div;

@@ -560,7 +560,7 @@ U_BOOT_DRIVER(dw_spi) = { .of_match = dw_spi_ids, .ops = &dw_spi_ops, .ofdata_to_platdata = dw_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct dw_spi_platdata), + .plat_auto = sizeof(struct dw_spi_platdata), .priv_auto = sizeof(struct dw_spi_priv), .probe = dw_spi_probe, .remove = dw_spi_remove, diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 8a82e60f008..2d1602c9cb0 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -253,7 +253,7 @@ static void spi_cs_deactivate(struct udevice *dev)

static int exynos_spi_ofdata_to_platdata(struct udevice *bus) { - struct exynos_spi_platdata *plat = bus->platdata; + struct exynos_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -368,7 +368,7 @@ static int exynos_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int exynos_spi_set_speed(struct udevice *bus, uint speed) { - struct exynos_spi_platdata *plat = bus->platdata; + struct exynos_spi_platdata *plat = bus->plat; struct exynos_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -427,7 +427,7 @@ U_BOOT_DRIVER(exynos_spi) = { .of_match = exynos_spi_ids, .ops = &exynos_spi_ops, .ofdata_to_platdata = exynos_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct exynos_spi_platdata), + .plat_auto = sizeof(struct exynos_spi_platdata), .priv_auto = sizeof(struct exynos_spi_priv), .probe = exynos_spi_probe, }; diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index 352a82c0b69..fe10ad4f8d1 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -448,7 +448,7 @@ static int fsl_dspi_cfg_speed(struct fsl_dspi_priv *priv, uint speed)

static int fsl_dspi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); struct fsl_dspi_priv *priv = dev_get_priv(dev->parent); u32 cs_sck_delay = 0, sck_cs_delay = 0; unsigned char pcssck = 0, cssck = 0; @@ -522,7 +522,7 @@ static int fsl_dspi_claim_bus(struct udevice *dev) struct fsl_dspi_priv *priv; struct udevice *bus = dev->parent; struct dm_spi_slave_platdata *slave_plat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev);

priv = dev_get_priv(bus);

@@ -553,7 +553,7 @@ static int fsl_dspi_release_bus(struct udevice *dev) struct udevice *bus = dev->parent; struct fsl_dspi_priv *priv = dev_get_priv(bus); struct dm_spi_slave_platdata *slave_plat = - dev_get_parent_platdata(dev); + dev_get_parent_plat(dev);

/* halt module */ dspi_halt(priv, 1); @@ -576,7 +576,7 @@ static int fsl_dspi_bind(struct udevice *bus) static int fsl_dspi_ofdata_to_platdata(struct udevice *bus) { fdt_addr_t addr; - struct fsl_dspi_platdata *plat = bus->platdata; + struct fsl_dspi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -608,7 +608,7 @@ static int fsl_dspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct fsl_dspi_priv *priv; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); struct udevice *bus;

bus = dev->parent; @@ -660,7 +660,7 @@ U_BOOT_DRIVER(fsl_dspi) = { .of_match = fsl_dspi_ids, .ops = &fsl_dspi_ops, .ofdata_to_platdata = fsl_dspi_ofdata_to_platdata, - .platdata_auto = sizeof(struct fsl_dspi_platdata), + .plat_auto = sizeof(struct fsl_dspi_platdata), .priv_auto = sizeof(struct fsl_dspi_priv), .probe = fsl_dspi_probe, .child_pre_probe = fsl_dspi_child_pre_probe, diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index af9bcfdd7e9..43bf8d557c3 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -508,7 +508,7 @@ static int fsl_espi_set_mode(struct udevice *bus, uint mode)

static int fsl_espi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct fsl_spi_slave *fsl = dev_get_priv(bus);

@@ -544,7 +544,7 @@ static const struct dm_spi_ops fsl_espi_ops = { static int fsl_espi_ofdata_to_platdata(struct udevice *bus) { fdt_addr_t addr; - struct fsl_espi_platdata *plat = bus->platdata; + struct fsl_espi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -576,7 +576,7 @@ U_BOOT_DRIVER(fsl_espi) = { .ofdata_to_platdata = fsl_espi_ofdata_to_platdata, #endif .ops = &fsl_espi_ops, - .platdata_auto = sizeof(struct fsl_espi_platdata), + .plat_auto = sizeof(struct fsl_espi_platdata), .priv_auto = sizeof(struct fsl_spi_slave), .probe = fsl_espi_probe, .child_pre_probe = fsl_espi_child_pre_probe, diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 412d0317043..089c2d802d5 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -516,7 +516,7 @@ static void fsl_qspi_invalidate(struct fsl_qspi *q) static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_slave *slave) { struct dm_spi_slave_platdata *plat = - dev_get_parent_platdata(slave->dev); + dev_get_parent_plat(slave->dev);

if (q->selected == plat->cs) return; diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index d2fc9e24fad..0ee691de2b1 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -667,7 +667,7 @@ static int ich_spi_get_basics(struct udevice *bus, bool can_probe, * 1. Using of-platdata, in which case we have the BDF and can access the * registers by reading the BAR * 2. Not using of-platdata, but still with a SPI controller that is on its own - * PCI PDF. In this case we read the BDF from the parent platdata and again get + * PCI PDF. In this case we read the BDF from the parent plat and again get * the registers by reading the BAR * 3. Using a SPI controller that is a child of the PCH, in which case we try * to find the registers by asking the PCH. This only works if the PCH has @@ -687,7 +687,7 @@ static int ich_get_mmap_bus(struct udevice *bus, ulong *map_basep, if (device_is_on_pci_bus(bus)) { struct pci_child_platdata *pplat;

- pplat = dev_get_parent_platdata(bus); + pplat = dev_get_parent_plat(bus); spi_bdf = pplat->devfn; } else { enum ich_version ich_version; @@ -1005,7 +1005,7 @@ U_BOOT_DRIVER(intel_fast_spi) = { .of_match = ich_spi_ids, .ops = &ich_spi_ops, .ofdata_to_platdata = ich_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct ich_spi_platdata), + .plat_auto = sizeof(struct ich_spi_platdata), .priv_auto = sizeof(struct ich_spi_priv), .child_pre_probe = ich_spi_child_pre_probe, .probe = ich_spi_probe, diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index 22f05409986..e8617f4a9c7 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -296,7 +296,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .ofdata_to_platdata = mvebu_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct mvebu_spi_platdata), + .plat_auto = sizeof(struct mvebu_spi_platdata), .priv_auto = sizeof(struct mvebu_spi_priv), .probe = mvebu_spi_probe, }; diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 378037f993e..74ff56d816a 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -107,17 +107,17 @@ static int mpc8xxx_spi_probe(struct udevice *dev) static void mpc8xxx_spi_cs_activate(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *platdata = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev);

- dm_gpio_set_value(&priv->gpios[platdata->cs], 1); + dm_gpio_set_value(&priv->gpios[plat->cs], 1); }

static void mpc8xxx_spi_cs_deactivate(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *platdata = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev);

- dm_gpio_set_value(&priv->gpios[platdata->cs], 0); + dm_gpio_set_value(&priv->gpios[plat->cs], 0); }

static int mpc8xxx_spi_xfer(struct udevice *dev, uint bitlen, @@ -126,16 +126,16 @@ static int mpc8xxx_spi_xfer(struct udevice *dev, uint bitlen, struct udevice *bus = dev->parent; struct mpc8xxx_priv *priv = dev_get_priv(bus); spi8xxx_t *spi = priv->spi; - struct dm_spi_slave_platdata *platdata = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); u32 tmpdin = 0, tmpdout = 0, n; const u8 *cout = dout; u8 *cin = din;

debug("%s: slave %s:%u dout %08X din %08X bitlen %u\n", __func__, - bus->name, platdata->cs, (uint)dout, (uint)din, bitlen); - if (platdata->cs >= priv->cs_count) { + bus->name, plat->cs, (uint)dout, (uint)din, bitlen); + if (plat->cs >= priv->cs_count) { dev_err(dev, "chip select index %d too large (cs_count=%d)\n", - platdata->cs, priv->cs_count); + plat->cs, priv->cs_count); return -EINVAL; } if (bitlen % 8) { diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c index a1b617246df..e5de49a013e 100644 --- a/drivers/spi/mscc_bb_spi.c +++ b/drivers/spi/mscc_bb_spi.c @@ -117,7 +117,7 @@ int mscc_bb_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); struct mscc_bb_priv *priv = dev_get_priv(bus); u32 i, count; const u8 *txd = dout; diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index b9e058acaa1..eddb0114802 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -325,7 +325,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .ofdata_to_platdata = mvebu_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct mvebu_spi_platdata), + .plat_auto = sizeof(struct mvebu_spi_platdata), .probe = mvebu_spi_probe, .remove = mvebu_spi_remove, }; diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index f571392e769..fcac5a570e3 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -69,7 +69,7 @@ static void mxc_spi_cs_activate(struct mxc_spi_slave *mxcs) { #if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev = mxcs->dev; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

u32 cs = slave_plat->cs;

@@ -87,7 +87,7 @@ static void mxc_spi_cs_deactivate(struct mxc_spi_slave *mxcs) { #if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev = mxcs->dev; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

u32 cs = slave_plat->cs;

@@ -559,7 +559,7 @@ static int mxc_spi_xfer(struct udevice *dev, unsigned int bitlen, static int mxc_spi_claim_bus(struct udevice *dev) { struct mxc_spi_slave *mxcs = dev_get_platdata(dev->parent); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

mxcs->dev = dev;

@@ -605,7 +605,7 @@ U_BOOT_DRIVER(mxc_spi) = { .id = UCLASS_SPI, .of_match = mxc_spi_ids, .ops = &mxc_spi_ops, - .platdata_auto = sizeof(struct mxc_spi_slave), + .plat_auto = sizeof(struct mxc_spi_slave), .probe = mxc_spi_probe, }; #endif diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 57e7a2eae67..06ab1072899 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -443,7 +443,7 @@ static const struct dm_spi_ops mxs_spi_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxs_ofdata_to_platdata(struct udevice *bus) { - struct mxs_spi_platdata *plat = bus->platdata; + struct mxs_spi_platdata *plat = bus->plat; u32 prop[2]; int ret;

@@ -487,7 +487,7 @@ U_BOOT_DRIVER(fsl_imx23_spi) = { .of_match = mxs_spi_ids, .ofdata_to_platdata = mxs_ofdata_to_platdata, #endif - .platdata_auto = sizeof(struct mxs_spi_platdata), + .plat_auto = sizeof(struct mxs_spi_platdata), .ops = &mxs_spi_ops, .priv_auto = sizeof(struct mxs_spi_priv), .probe = mxs_spi_probe, diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 96f981a1192..f41134172cc 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -887,7 +887,7 @@ static int nxp_fspi_claim_bus(struct udevice *dev) { struct nxp_fspi *f; struct udevice *bus; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

bus = dev->parent; f = dev_get_priv(bus); diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c index 72cd18526bf..42fee1350e8 100644 --- a/drivers/spi/octeon_spi.c +++ b/drivers/spi/octeon_spi.c @@ -81,7 +81,7 @@ struct octeon_spi {

static u64 octeon_spi_set_mpicfg(struct udevice *dev) { - struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); struct octeon_spi *priv = dev_get_priv(bus); u64 mpi_cfg; diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 1beaea77887..dc277aae01b 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -378,7 +378,7 @@ static int omap3_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev->parent; struct omap3_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

priv->cs = slave_plat->cs; priv->freq = slave_plat->max_hz; @@ -402,7 +402,7 @@ static int omap3_spi_set_wordlen(struct udevice *dev, unsigned int wordlen) { struct udevice *bus = dev->parent; struct omap3_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

priv->cs = slave_plat->cs; priv->wordlen = wordlen; @@ -507,7 +507,7 @@ U_BOOT_DRIVER(omap3_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap3_spi_ids, .ofdata_to_platdata = omap3_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct omap3_spi_plat), + .plat_auto = sizeof(struct omap3_spi_plat), #endif .probe = omap3_spi_probe, .ops = &omap3_spi_ops, diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c index 57c6a5d6abb..f7d2aea9132 100644 --- a/drivers/spi/pic32_spi.c +++ b/drivers/spi/pic32_spi.c @@ -244,7 +244,7 @@ static int pic32_spi_xfer(struct udevice *slave, unsigned int bitlen, ulong tbase;

priv = dev_get_priv(bus); - slave_plat = dev_get_parent_platdata(slave); + slave_plat = dev_get_parent_plat(slave);

debug("spi_xfer: bus:%i cs:%i flags:%lx\n", dev_seq(bus), slave_plat->cs, flags); diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c index e9fd618562a..712385bcc9f 100644 --- a/drivers/spi/pl022_spi.c +++ b/drivers/spi/pl022_spi.c @@ -288,7 +288,7 @@ static const struct dm_spi_ops pl022_spi_ops = { #if !CONFIG_IS_ENABLED(OF_PLATDATA) static int pl022_spi_ofdata_to_platdata(struct udevice *bus) { - struct pl022_spi_pdata *plat = bus->platdata; + struct pl022_spi_pdata *plat = bus->plat; const void *fdt = gd->fdt_blob; int node = dev_of_offset(bus); struct clk clkdev; @@ -319,7 +319,7 @@ U_BOOT_DRIVER(pl022_spi) = { .ofdata_to_platdata = pl022_spi_ofdata_to_platdata, #endif .ops = &pl022_spi_ops, - .platdata_auto = sizeof(struct pl022_spi_pdata), + .plat_auto = sizeof(struct pl022_spi_pdata), .priv_auto = sizeof(struct pl022_spi_slave), .probe = pl022_spi_probe, }; diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 7018814f9cb..275fa431036 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -464,7 +464,7 @@ U_BOOT_DRIVER(rpc_spi) = { .of_match = rpc_spi_ids, .ops = &rpc_spi_ops, .ofdata_to_platdata = rpc_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct rpc_spi_platdata), + .plat_auto = sizeof(struct rpc_spi_platdata), .priv_auto = sizeof(struct rpc_spi_priv), .bind = rpc_spi_bind, .probe = rpc_spi_probe, diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index bccdf4efdfa..aed1db35dfc 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -135,7 +135,7 @@ static int rkspi_wait_till_not_busy(struct rockchip_spi *regs) static void spi_cs_activate(struct udevice *dev, uint cs) { struct udevice *bus = dev->parent; - struct rockchip_spi_platdata *plat = bus->platdata; + struct rockchip_spi_platdata *plat = bus->plat; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs;

@@ -161,7 +161,7 @@ static void spi_cs_activate(struct udevice *dev, uint cs) static void spi_cs_deactivate(struct udevice *dev, uint cs) { struct udevice *bus = dev->parent; - struct rockchip_spi_platdata *plat = bus->platdata; + struct rockchip_spi_platdata *plat = bus->plat; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs;

@@ -176,7 +176,7 @@ static void spi_cs_deactivate(struct udevice *dev, uint cs) #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) { - struct rockchip_spi_platdata *plat = dev->platdata; + struct rockchip_spi_platdata *plat = dev->plat; struct dtd_rockchip_rk3288_spi *dtplat = &plat->of_plat; struct rockchip_spi_priv *priv = dev_get_priv(dev); int ret; @@ -431,7 +431,7 @@ static int rockchip_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); int len = bitlen >> 3; const u8 *out = dout; u8 *in = din; @@ -560,7 +560,7 @@ U_BOOT_DRIVER(rockchip_rk3288_spi) = { .of_match = rockchip_spi_ids, .ops = &rockchip_spi_ops, .ofdata_to_platdata = rockchip_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct rockchip_spi_platdata), + .plat_auto = sizeof(struct rockchip_spi_platdata), .priv_auto = sizeof(struct rockchip_spi_priv), .probe = rockchip_spi_probe, }; diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c index 35381c16b34..5908e287e5c 100644 --- a/drivers/spi/sh_qspi.c +++ b/drivers/spi/sh_qspi.c @@ -354,7 +354,7 @@ U_BOOT_DRIVER(sh_qspi) = { .of_match = sh_qspi_ids, .ops = &sh_qspi_ops, .ofdata_to_platdata = sh_qspi_ofdata_to_platdata, - .platdata_auto = sizeof(struct sh_qspi_slave), + .plat_auto = sizeof(struct sh_qspi_slave), .probe = sh_qspi_probe, }; #endif diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index c71357795d3..c7ed23aa5dd 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -228,7 +228,7 @@ static const struct dm_spi_ops soft_spi_ops = {

static int soft_spi_ofdata_to_platdata(struct udevice *dev) { - struct soft_spi_platdata *plat = dev->platdata; + struct soft_spi_platdata *plat = dev->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(dev);

@@ -240,7 +240,7 @@ static int soft_spi_ofdata_to_platdata(struct udevice *dev) static int soft_spi_probe(struct udevice *dev) { struct spi_slave *slave = dev_get_parent_priv(dev); - struct soft_spi_platdata *plat = dev->platdata; + struct soft_spi_platdata *plat = dev->plat; int cs_flags, clk_flags; int ret;

@@ -281,7 +281,7 @@ U_BOOT_DRIVER(soft_spi) = { .of_match = soft_spi_ids, .ops = &soft_spi_ops, .ofdata_to_platdata = soft_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct soft_spi_platdata), + .plat_auto = sizeof(struct soft_spi_platdata), .priv_auto = sizeof(struct soft_spi_priv), .probe = soft_spi_probe, }; diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 721d65426bc..a549b66639b 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -701,7 +701,7 @@ static int qup_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); unsigned int len; const u8 *txp = dout; u8 *rxp = din; diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index fdbcdb8f43a..81cdfc0e104 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -212,7 +212,7 @@ static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct sifive_spi *spi = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); const u8 *tx_ptr = dout; u8 *rx_ptr = din; u32 remaining_len; diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index 84c1ece409b..5b6c7202ba8 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -339,7 +339,7 @@ static int sun4i_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct sun4i_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

u32 len = bitlen / 8; u32 rx_fifocnt; @@ -631,7 +631,7 @@ U_BOOT_DRIVER(sun4i_spi) = { .of_match = sun4i_spi_ids, .ops = &sun4i_spi_ops, .ofdata_to_platdata = sun4i_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct sun4i_spi_platdata), + .plat_auto = sizeof(struct sun4i_spi_platdata), .priv_auto = sizeof(struct sun4i_spi_priv), .probe = sun4i_spi_probe, }; diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index a03d35b1f8e..6d3802c97c4 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -153,7 +153,7 @@ int spi_write_then_read(struct spi_slave *slave, const u8 *opcode, #if !CONFIG_IS_ENABLED(OF_PLATDATA) static int spi_child_post_bind(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev);

if (!dev_of_valid(dev)) return 0; @@ -197,7 +197,7 @@ static int spi_post_probe(struct udevice *bus)

static int spi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); struct spi_slave *slave = dev_get_parent_priv(dev);

/* @@ -218,7 +218,7 @@ static int spi_child_pre_probe(struct udevice *dev)

int spi_chip_select(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev);

return plat ? plat->cs : -ENOENT; } @@ -256,7 +256,7 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp) device_find_next_child(&dev)) { struct dm_spi_slave_platdata *plat;

- plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); debug("%s: plat=%p, cs=%d\n", __func__, plat, plat->cs); if (plat->cs == cs) { *devp = dev; @@ -353,7 +353,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, ret); return ret; } - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); plat->cs = cs; if (speed) { plat->max_hz = speed; @@ -504,7 +504,7 @@ UCLASS_DRIVER(spi) = { .child_pre_probe = spi_child_pre_probe, .per_device_auto = sizeof(struct dm_spi_bus), .per_child_auto = sizeof(struct spi_slave), - .per_child_platdata_auto = + .per_child_plat_auto = sizeof(struct dm_spi_slave_platdata), #if !CONFIG_IS_ENABLED(OF_PLATDATA) .child_post_bind = spi_child_post_bind, diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index 44317780eba..4d67e9ba46a 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -400,7 +400,7 @@ static int stm32_qspi_probe(struct udevice *bus) static int stm32_qspi_claim_bus(struct udevice *dev) { struct stm32_qspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); int slave_cs = slave_plat->cs;

if (slave_cs >= STM32_QSPI_MAX_CHIP) diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c index 4c7fee6fbb1..d2c2262dc74 100644 --- a/drivers/spi/stm32_spi.c +++ b/drivers/spi/stm32_spi.c @@ -407,7 +407,7 @@ static int stm32_spi_xfer(struct udevice *slave, unsigned int bitlen, debug("%s: priv->tx_len=%d priv->rx_len=%d\n", __func__, priv->tx_len, priv->rx_len);

- slave_plat = dev_get_parent_platdata(slave); + slave_plat = dev_get_parent_plat(slave); if (flags & SPI_XFER_BEGIN) stm32_spi_set_cs(bus, slave_plat->cs, false);

diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index 86fc38e5ece..ed80126cebf 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -99,7 +99,7 @@ struct tegra114_spi_priv {

static int tegra114_spi_ofdata_to_platdata(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat;

plat->base = dev_read_addr(bus); plat->periph_id = clock_decode_periph_id(bus); @@ -352,7 +352,7 @@ static int tegra114_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra114_spi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat; struct tegra114_spi_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -394,7 +394,7 @@ U_BOOT_DRIVER(tegra114_spi) = { .of_match = tegra114_spi_ids, .ops = &tegra114_spi_ops, .ofdata_to_platdata = tegra114_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra114_spi_priv), .probe = tegra114_spi_probe, }; diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 7e0cb2b1f86..5303c34af5d 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -89,7 +89,7 @@ int tegra20_sflash_cs_info(struct udevice *bus, unsigned int cs,

static int tegra20_sflash_ofdata_to_platdata(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -314,7 +314,7 @@ static int tegra20_sflash_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra20_sflash_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat; struct tegra20_sflash_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -354,7 +354,7 @@ U_BOOT_DRIVER(tegra20_sflash) = { .of_match = tegra20_sflash_ids, .ops = &tegra20_sflash_ops, .ofdata_to_platdata = tegra20_sflash_ofdata_to_platdata, - .platdata_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra20_sflash_priv), .probe = tegra20_sflash_probe, }; diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index bfb7fd14b2c..a54990d0e13 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -95,7 +95,7 @@ struct tegra_spi_slave {

static int tegra30_spi_ofdata_to_platdata(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -314,7 +314,7 @@ static int tegra30_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra30_spi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat; struct tegra30_spi_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -373,7 +373,7 @@ U_BOOT_DRIVER(tegra30_spi) = { .of_match = tegra30_spi_ids, .ops = &tegra30_spi_ops, .ofdata_to_platdata = tegra30_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra30_spi_priv), .probe = tegra30_spi_probe, }; diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index d8b2c73a664..9579275698e 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -99,7 +99,7 @@ struct tegra210_qspi_priv {

static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat;

plat->base = dev_read_addr(bus); plat->periph_id = clock_decode_periph_id(bus); @@ -380,7 +380,7 @@ static int tegra210_qspi_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra210_qspi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->platdata; + struct tegra_spi_platdata *plat = bus->plat; struct tegra210_qspi_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -423,7 +423,7 @@ U_BOOT_DRIVER(tegra210_qspi) = { .of_match = tegra210_qspi_ids, .ops = &tegra210_qspi_ops, .ofdata_to_platdata = tegra210_qspi_ofdata_to_platdata, - .platdata_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra210_qspi_priv), .per_child_auto = sizeof(struct spi_slave), .probe = tegra210_qspi_probe, diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 77353ba3752..20fe581934c 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -154,7 +154,7 @@ static void ti_qspi_ctrl_mode_mmap(void *ctrl_mod_mmap, int cs, bool enable) static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus; uint words = bitlen >> 3; /* fixed 8-bit word length */ @@ -331,7 +331,7 @@ static int ti_qspi_exec_mem_op(struct spi_slave *slave,

bus = slave->dev->parent; priv = dev_get_priv(bus); - slave_plat = dev_get_parent_platdata(slave->dev); + slave_plat = dev_get_parent_plat(slave->dev);

/* Only optimize read path. */ if (!op->data.nbytes || op->data.dir != SPI_MEM_DATA_IN || @@ -355,7 +355,7 @@ static int ti_qspi_exec_mem_op(struct spi_slave *slave,

static int ti_qspi_claim_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus;

@@ -384,7 +384,7 @@ static int ti_qspi_claim_bus(struct udevice *dev)

static int ti_qspi_release_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus;

diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index 048d74f1f89..02bcc0a7dac 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -113,7 +113,7 @@ static void uniphier_spi_regdump(struct uniphier_spi_priv *priv) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct uniphier_spi_platdata *plat = bus->platdata; + struct uniphier_spi_platdata *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); ulong delay_us; /* The delay completed so far */ u32 val; @@ -139,7 +139,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct uniphier_spi_platdata *plat = bus->platdata; + struct uniphier_spi_platdata *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); u32 val;

@@ -279,7 +279,7 @@ static int uniphier_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int uniphier_spi_set_speed(struct udevice *bus, uint speed) { - struct uniphier_spi_platdata *plat = bus->platdata; + struct uniphier_spi_platdata *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); u32 val, ckdiv;

@@ -364,7 +364,7 @@ static int uniphier_spi_set_mode(struct udevice *bus, uint mode)

static int uniphier_spi_ofdata_to_platdata(struct udevice *bus) { - struct uniphier_spi_platdata *plat = bus->platdata; + struct uniphier_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -412,7 +412,7 @@ U_BOOT_DRIVER(uniphier_spi) = { .of_match = uniphier_spi_ids, .ops = &uniphier_spi_ops, .ofdata_to_platdata = uniphier_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct uniphier_spi_platdata), + .plat_auto = sizeof(struct uniphier_spi_platdata), .priv_auto = sizeof(struct uniphier_spi_priv), .probe = uniphier_spi_probe, }; diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 6c956850c51..294810e97b2 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -211,7 +211,7 @@ static void xilinx_spi_startup_block(struct udevice *dev, unsigned int bytes, struct udevice *bus = dev_get_parent(dev); struct xilinx_spi_priv *priv = dev_get_priv(bus); struct xilinx_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); const unsigned char *txp = dout; unsigned char *rxp = din; u32 reg; @@ -244,7 +244,7 @@ static int xilinx_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev_get_parent(dev); struct xilinx_spi_priv *priv = dev_get_priv(bus); struct xilinx_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); /* assume spi core configured to do 8 bit transfers */ unsigned int bytes = bitlen / XILSPI_MAX_XFER_BITS; const unsigned char *txp = dout; diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index 81059d3aa27..c2d9b8938bc 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -100,7 +100,7 @@ struct zynq_qspi_priv {

static int zynq_qspi_ofdata_to_platdata(struct udevice *bus) { - struct zynq_qspi_platdata *plat = bus->platdata; + struct zynq_qspi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -560,7 +560,7 @@ static int zynq_qspi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct zynq_qspi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

priv->cs = slave_plat->cs; priv->tx_buf = dout; @@ -592,7 +592,7 @@ static int zynq_qspi_xfer(struct udevice *dev, unsigned int bitlen,

static int zynq_qspi_set_speed(struct udevice *bus, uint speed) { - struct zynq_qspi_platdata *plat = bus->platdata; + struct zynq_qspi_platdata *plat = bus->plat; struct zynq_qspi_priv *priv = dev_get_priv(bus); struct zynq_qspi_regs *regs = priv->regs; uint32_t confr; @@ -667,7 +667,7 @@ U_BOOT_DRIVER(zynq_qspi) = { .of_match = zynq_qspi_ids, .ops = &zynq_qspi_ops, .ofdata_to_platdata = zynq_qspi_ofdata_to_platdata, - .platdata_auto = sizeof(struct zynq_qspi_platdata), + .plat_auto = sizeof(struct zynq_qspi_platdata), .priv_auto = sizeof(struct zynq_qspi_priv), .probe = zynq_qspi_probe, }; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index 5623d98bfbd..daecaa75e60 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -75,7 +75,7 @@ struct zynq_spi_priv {

static int zynq_spi_ofdata_to_platdata(struct udevice *bus) { - struct zynq_spi_platdata *plat = bus->platdata; + struct zynq_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -162,7 +162,7 @@ static int zynq_spi_probe(struct udevice *bus) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct zynq_spi_platdata *plat = bus->platdata; + struct zynq_spi_platdata *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; u32 cr; @@ -193,7 +193,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct zynq_spi_platdata *plat = bus->platdata; + struct zynq_spi_platdata *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs;

@@ -234,7 +234,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); u32 len = bitlen / 8; u32 tx_len = len, rx_len = len, tx_tvl; const u8 *tx_buf = dout; @@ -296,7 +296,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int zynq_spi_set_speed(struct udevice *bus, uint speed) { - struct zynq_spi_platdata *plat = bus->platdata; + struct zynq_spi_platdata *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; uint32_t confr; @@ -372,7 +372,7 @@ U_BOOT_DRIVER(zynq_spi) = { .of_match = zynq_spi_ids, .ops = &zynq_spi_ops, .ofdata_to_platdata = zynq_spi_ofdata_to_platdata, - .platdata_auto = sizeof(struct zynq_spi_platdata), + .plat_auto = sizeof(struct zynq_spi_platdata), .priv_auto = sizeof(struct zynq_spi_priv), .probe = zynq_spi_probe, }; diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index 4585222507b..e4ab5d622cc 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -177,7 +177,7 @@ struct zynqmp_qspi_priv {

static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus) { - struct zynqmp_qspi_platdata *plat = bus->platdata; + struct zynqmp_qspi_platdata *plat = bus->plat;

debug("%s\n", __func__);

@@ -255,7 +255,7 @@ static void zynqmp_qspi_chipselect(struct zynqmp_qspi_priv *priv, int is_on)

void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval) { - struct zynqmp_qspi_platdata *plat = bus->platdata; + struct zynqmp_qspi_platdata *plat = bus->plat; struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct zynqmp_qspi_regs *regs = priv->regs; u32 tapdlybypass = 0, lpbkdlyadj = 0, datadlyadj = 0, clk_rate; @@ -295,7 +295,7 @@ void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval)

static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed) { - struct zynqmp_qspi_platdata *plat = bus->platdata; + struct zynqmp_qspi_platdata *plat = bus->plat; struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct zynqmp_qspi_regs *regs = priv->regs; u32 confr; @@ -728,7 +728,7 @@ U_BOOT_DRIVER(zynqmp_qspi) = { .of_match = zynqmp_qspi_ids, .ops = &zynqmp_qspi_ops, .ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata, - .platdata_auto = sizeof(struct zynqmp_qspi_platdata), + .plat_auto = sizeof(struct zynqmp_qspi_platdata), .priv_auto = sizeof(struct zynqmp_qspi_priv), .probe = zynqmp_qspi_probe, }; diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 5c3dd35cfb2..768a0d1a0fa 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -154,5 +154,5 @@ U_BOOT_DRIVER(x86_reset) = { .of_match = x86_sysreset_ids, .ops = &x86_sysreset_ops, .probe = x86_sysreset_probe, - .platdata_auto = sizeof(struct x86_sysreset_platdata), + .plat_auto = sizeof(struct x86_sysreset_platdata), }; diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 142bf17668a..378df936d27 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -661,6 +661,6 @@ U_BOOT_DRIVER(optee) = { .ofdata_to_platdata = optee_ofdata_to_platdata, .probe = optee_probe, .ops = &optee_ops, - .platdata_auto = sizeof(struct optee_pdata), + .plat_auto = sizeof(struct optee_pdata), .priv_auto = sizeof(struct optee_private), }; diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c index d76a3e01ecb..0c2a8ea244e 100644 --- a/drivers/thermal/imx_scu_thermal.c +++ b/drivers/thermal/imx_scu_thermal.c @@ -211,6 +211,6 @@ U_BOOT_DRIVER(imx_sc_thermal) = { .bind = imx_sc_thermal_bind, .probe = imx_sc_thermal_probe, .ofdata_to_platdata = imx_sc_thermal_ofdata_to_platdata, - .platdata_auto = sizeof(struct imx_sc_thermal_plat), + .plat_auto = sizeof(struct imx_sc_thermal_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c index 4c8371771c9..77e3b3c201a 100644 --- a/drivers/thermal/imx_tmu.c +++ b/drivers/thermal/imx_tmu.c @@ -463,6 +463,6 @@ U_BOOT_DRIVER(imx_tmu) = { .of_match = imx_tmu_ids, .bind = imx_tmu_bind, .probe = imx_tmu_probe, - .platdata_auto = sizeof(struct imx_tmu_plat), + .plat_auto = sizeof(struct imx_tmu_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c index f014ed65795..a73a8c09b59 100644 --- a/drivers/timer/ag101p_timer.c +++ b/drivers/timer/ag101p_timer.c @@ -64,7 +64,7 @@ struct atftmr_timer_platdata {

static u64 atftmr_timer_get_count(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev->platdata; + struct atftmr_timer_platdata *plat = dev->plat; struct atftmr_timer_regs *const regs = plat->regs; u32 val; val = readl(&regs->t3_counter); @@ -73,7 +73,7 @@ static u64 atftmr_timer_get_count(struct udevice *dev)

static int atftmr_timer_probe(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev->platdata; + struct atftmr_timer_platdata *plat = dev->plat; struct atftmr_timer_regs *const regs = plat->regs; u32 cr; writel(0, &regs->t3_load); @@ -111,7 +111,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = ag101p_timer_ids, .ofdata_to_platdata = atftme_timer_ofdata_to_platdata, - .platdata_auto = sizeof(struct atftmr_timer_platdata), + .plat_auto = sizeof(struct atftmr_timer_platdata), .probe = atftmr_timer_probe, .ops = &ag101p_timer_ops, }; diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index ad50380f04d..4579717ee5d 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -34,7 +34,7 @@ struct altera_timer_platdata {

static u64 altera_timer_get_count(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->platdata; + struct altera_timer_platdata *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; u32 val;

@@ -49,7 +49,7 @@ static u64 altera_timer_get_count(struct udevice *dev)

static int altera_timer_probe(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->platdata; + struct altera_timer_platdata *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs;

writel(0, &regs->status); @@ -88,7 +88,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = altera_timer_ids, .ofdata_to_platdata = altera_timer_ofdata_to_platdata, - .platdata_auto = sizeof(struct altera_timer_platdata), + .plat_auto = sizeof(struct altera_timer_platdata), .probe = altera_timer_probe, .ops = &altera_timer_ops, }; diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c index e574eabebc0..61a04fc9fc0 100644 --- a/drivers/timer/atcpit100_timer.c +++ b/drivers/timer/atcpit100_timer.c @@ -106,7 +106,7 @@ U_BOOT_DRIVER(atcpit100_timer) = { .id = UCLASS_TIMER, .of_match = atcpit_timer_ids, .ofdata_to_platdata = atcpit_timer_ofdata_to_platdata, - .platdata_auto = sizeof(struct atcpit_timer_platdata), + .plat_auto = sizeof(struct atcpit_timer_platdata), .probe = atcpit_timer_probe, .ops = &atcpit_timer_ops, }; diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index a0daf49dad2..226c680a797 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -81,7 +81,7 @@ U_BOOT_DRIVER(atmel_pit) = { .id = UCLASS_TIMER, .of_match = atmel_pit_ids, .ofdata_to_platdata = atmel_pit_ofdata_to_platdata, - .platdata_auto = sizeof(struct atmel_pit_platdata), + .plat_auto = sizeof(struct atmel_pit_platdata), .probe = atmel_pit_probe, .ops = &atmel_pit_ops, }; diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c index dab6b12782e..51ce52f72b6 100644 --- a/drivers/timer/rockchip_timer.c +++ b/drivers/timer/rockchip_timer.c @@ -167,7 +167,7 @@ U_BOOT_DRIVER(rockchip_rk3368_timer) = { .ops = &rockchip_timer_ops, .priv_auto = sizeof(struct rockchip_timer_priv), #if CONFIG_IS_ENABLED(OF_PLATDATA) - .platdata_auto = sizeof(struct rockchip_timer_plat), + .plat_auto = sizeof(struct rockchip_timer_plat), #endif .ofdata_to_platdata = rockchip_clk_ofdata_to_platdata, }; diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index f25f5613d4c..a15198c1fe3 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -103,7 +103,7 @@ int timer_timebase_fallback(struct udevice *dev) if (!cpu) return -ENODEV;

- cpu_plat = dev_get_parent_platdata(cpu); + cpu_plat = dev_get_parent_plat(cpu); if (!cpu_plat) return -ENODEV;

diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c index 1dfc5c54f39..71edfbfaefd 100644 --- a/drivers/tpm/cr50_i2c.c +++ b/drivers/tpm/cr50_i2c.c @@ -547,7 +547,7 @@ static int claim_locality(struct udevice *dev, int loc)

static int cr50_i2c_get_desc(struct udevice *dev, char *buf, int size) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct cr50_priv *priv = dev_get_priv(dev);

return snprintf(buf, size, "cr50 TPM 2.0 (i2c %02x id %x) irq=%d", diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c index 683d49689a3..b9dbe825215 100644 --- a/drivers/tpm/tpm_tis_st33zp24_spi.c +++ b/drivers/tpm/tpm_tis_st33zp24_spi.c @@ -671,5 +671,5 @@ U_BOOT_DRIVER(st33zp24_spi_spi) = { .remove = st33zp24_spi_remove, .ops = &st33zp24_spi_tpm_ops, .priv_auto = sizeof(struct tpm_chip), - .platdata_auto = sizeof(struct st33zp24_spi_phy), + .plat_auto = sizeof(struct st33zp24_spi_phy), }; diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index 92b7e9fd7cf..fe43f1b7f37 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -1873,7 +1873,7 @@ int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops) if (!scsi_dev) return -ENODEV;

- scsi_plat = dev_get_uclass_platdata(scsi_dev); + scsi_plat = dev_get_uclass_plat(scsi_dev); scsi_plat->max_id = UFSHCD_MAX_ID; scsi_plat->max_lun = UFS_MAX_LUNS; scsi_plat->max_bytes_per_req = UFS_MAX_BYTES; diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index d156164761a..75f40e1249f 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -190,6 +190,6 @@ U_BOOT_DRIVER(cdns_ti) = { .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 fb09b3ab1ed..1755289473b 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -159,7 +159,7 @@ U_BOOT_DRIVER(dwc3_generic_peripheral) = { .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 @@ U_BOOT_DRIVER(dwc3_generic_host) = { .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 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .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 58d57ee7d1b..5be8bc8f6cc 100644 --- a/drivers/usb/dwc3/dwc3-meson-g12a.c +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c @@ -469,6 +469,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .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 6e8c93a0fea..1c7bfe83ab6 100644 --- a/drivers/usb/dwc3/dwc3-meson-gxl.c +++ b/drivers/usb/dwc3/dwc3-meson-gxl.c @@ -420,6 +420,6 @@ U_BOOT_DRIVER(dwc3_generic_wrapper) = { .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 d63dee41fcd..62c8166cae2 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -422,5 +422,5 @@ U_BOOT_DRIVER(usb_sandbox_flash) = { .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 3e66ca46988..91158e5c6d3 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -131,7 +131,7 @@ static struct udevice *hub_find_device(struct udevice *hub, int port, 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_hub_bind(struct udevice *dev)

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 @@ U_BOOT_DRIVER(usb_sandbox_hub) = { .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 c64ce1feeb5..16c59457f7e 100644 --- a/drivers/usb/emul/sandbox_keyb.c +++ b/drivers/usb/emul/sandbox_keyb.c @@ -242,5 +242,5 @@ U_BOOT_DRIVER(usb_sandbox_keyb) = { .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 b3069390429..1b7e1ea7c15 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -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_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 @@ static int usb_emul_find_devnum(int devnum, int port1, struct udevice **emulp) 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(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_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 usb_emul_control(struct udevice *emul, struct usb_device *udev, 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_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_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 @@ UCLASS_DRIVER(usb_emul) = { .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 7115dcb56fc..be69952184d 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -877,7 +877,7 @@ U_BOOT_DRIVER(asix_eth) = { .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 ffc90c00ab3..8abcf138817 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -903,7 +903,7 @@ U_BOOT_DRIVER(ax88179_eth) = { .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 1fa7e534040..d5e4c6a9e8e 100644 --- a/drivers/usb/eth/lan75xx.c +++ b/drivers/usb/eth/lan75xx.c @@ -305,7 +305,7 @@ U_BOOT_DRIVER(lan75xx_eth) = { .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 3f7e03f51c5..cc02e4d523a 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -467,7 +467,7 @@ U_BOOT_DRIVER(lan78xx_eth) = { .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 1746819192c..d83517029dd 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -929,7 +929,7 @@ U_BOOT_DRIVER(mcs7830_eth) = { .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 804c331ee1b..600e9f5dadf 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -1843,7 +1843,7 @@ U_BOOT_DRIVER(r8152_eth) = { .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 d6863ad89e4..836b534bbcf 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -1063,7 +1063,7 @@ U_BOOT_DRIVER(smsc95xx_eth) = { .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 a662d500d39..93b1c608301 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -982,7 +982,7 @@ static void dwc2_phy_shutdown(struct udevice *dev, struct phy_bulk *phys)

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 @@ static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) 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_clk_init(struct udevice *dev,

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 @@ static int dwc2_udc_otg_probe(struct udevice *dev) 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 @@ static int dwc2_udc_otg_probe(struct udevice *dev) } }

- 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 @@ static int dwc2_udc_otg_probe(struct udevice *dev) 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 @@ static int dwc2_udc_otg_probe(struct udevice *dev) } }

- ret = dwc2_udc_probe(platdata); + ret = dwc2_udc_probe(plat); if (ret) return ret;

@@ -1189,15 +1188,15 @@ U_BOOT_DRIVER(dwc2_udc_otg) = { .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 0cce8e24c50..9d4bb9dfaca 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -2692,7 +2692,7 @@ U_BOOT_DRIVER(eth_usb) = { .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 c651eeb5e59..e2391510d83 100644 --- a/drivers/usb/gadget/max3420_udc.c +++ b/drivers/usb/gadget/max3420_udc.c @@ -826,7 +826,7 @@ static int max3420_udc_probe(struct udevice *dev) 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 6240a453a08..9b1edcd7008 100644 --- a/drivers/usb/host/dwc3-of-simple.c +++ b/drivers/usb/host/dwc3-of-simple.c @@ -102,6 +102,6 @@ U_BOOT_DRIVER(dwc3_of_simple) = { .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 ba008bf6866..e9ebe2ef7c2 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -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, - .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 955cacdd981..22a35a52802 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -124,7 +124,7 @@ U_BOOT_DRIVER(ehci_atmel) = { .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 3728b238d4e..d1ff3f4ce1a 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -259,6 +259,6 @@ U_BOOT_DRIVER(usb_ehci) = { .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 a53493a617d..9824b7b190b 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -145,7 +145,7 @@ U_BOOT_DRIVER(ehci_fsl) = { .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 329593689f4..f9e24b99a0a 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -152,7 +152,7 @@ U_BOOT_DRIVER(ehci_mvebu) = { .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 61ff13e2b8e..13ee268e8de 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -145,6 +145,6 @@ U_BOOT_DRIVER(usb_ehci) = { .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 b1c2e7d3354..dec89c6a5d6 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -367,7 +367,7 @@ U_BOOT_DRIVER(usb_mx5) = { .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 5bc1cf09f53..02d7d29a34f 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -656,7 +656,7 @@ U_BOOT_DRIVER(usb_mx6) = { .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 1ed640605e3..1b05dca0d97 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -403,7 +403,7 @@ U_BOOT_DRIVER(usb_omap_ehci) = { .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 7d91846d079..61f5a6ce61e 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -163,7 +163,7 @@ U_BOOT_DRIVER(ehci_pci) = { .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 9ffaf0060ab..c76e9c3b296 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -865,7 +865,7 @@ U_BOOT_DRIVER(usb_ehci) = { .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 12bba263b95..c728a4de6b1 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -353,7 +353,7 @@ U_BOOT_DRIVER(usb_ehci) = { .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 738eed3bfea..df7ea0a4842 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -85,7 +85,7 @@ U_BOOT_DRIVER(ehci_zynq) = { .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 48ffa4af5ed..c53b6f58e3c 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -39,7 +39,7 @@ U_BOOT_DRIVER(ohci_pci) = { .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 831f4935320..0beb91294e7 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -575,7 +575,7 @@ static int usb_find_and_bind_driver(struct udevice *parent, 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 @@ static int usb_find_and_bind_driver(struct udevice *parent, 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 @@ 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_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 @@ int usb_scan_device(struct udevice *parent, int port, 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 @@ int usb_detect_change(void)

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 @@ 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_platdata(dev); + struct usb_dev_platdata *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_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 f50f069fc74..cc20cf0b6c1 100644 --- a/drivers/usb/host/xhci-brcm.c +++ b/drivers/usb/host/xhci-brcm.c @@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = { .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 4dba5699377..a57762f2462 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -187,7 +187,7 @@ U_BOOT_DRIVER(xhci_dwc3) = { .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 6e1b5f005f0..39e651e2fd1 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -255,7 +255,7 @@ U_BOOT_DRIVER(usb_xhci) = { .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 95714d83386..e54db0f8e28 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -169,7 +169,7 @@ U_BOOT_DRIVER(xhci_fsl) = { .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 6f56cc8384b..1762bbb34b6 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -96,7 +96,7 @@ U_BOOT_DRIVER(usb_xhci) = { .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 888b17ba4ce..96d1de67d90 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -59,7 +59,7 @@ U_BOOT_DRIVER(xhci_pci) = { .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 4322fb2e4d4..2ef072b60ee 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -161,7 +161,7 @@ U_BOOT_DRIVER(usb_xhci) = { .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 6c0d0b8b165..2889e855ab0 100644 --- a/drivers/usb/musb-new/da8xx.c +++ b/drivers/usb/musb-new/da8xx.c @@ -258,43 +258,43 @@ struct da8xx_musb_platdata {

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 @@ 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 +321,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; } @@ -348,6 +348,6 @@ U_BOOT_DRIVER(da8xx_musb) = { .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 8adfa426c49..4847b2c80db 100644 --- a/drivers/usb/musb-new/mt85xx.c +++ b/drivers/usb/musb-new/mt85xx.c @@ -414,6 +414,6 @@ U_BOOT_DRIVER(mtk_musb) = { #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 2e029d84bc8..9150c4d7456 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -151,67 +151,63 @@ struct omap2430_musb_platdata {

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 @@ static int omap2430_musb_probe(struct udevice *dev) #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 @@ static int omap2430_musb_probe(struct udevice *dev)

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 @@ U_BOOT_DRIVER(omap2430_musb) = { #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 e45ab20562c..7970d1620f0 100644 --- a/drivers/usb/musb-new/pic32.c +++ b/drivers/usb/musb-new/pic32.c @@ -288,6 +288,6 @@ U_BOOT_DRIVER(usb_musb) = { #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 10bc3e89560..1337e5260b2 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -552,6 +552,6 @@ U_BOOT_DRIVER(usb_musb) = { #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 34b1a34d2cc..29a06320e6f 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, }; diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c index 6620c793a1c..26c6a46d5b7 100644 --- a/drivers/video/am335x-fb.c +++ b/drivers/video/am335x-fb.c @@ -368,7 +368,7 @@ struct am335x_fb_priv {

static int am335x_fb_remove(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

uc_plat->base -= 0x20; uc_plat->size += 0x20; @@ -377,7 +377,7 @@ static int am335x_fb_remove(struct udevice *dev)

static int am335x_fb_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct am335x_fb_priv *priv = dev_get_priv(dev); struct am335x_lcdhw *regs = priv->regs; @@ -592,7 +592,7 @@ static int am335x_fb_ofdata_to_platdata(struct udevice *dev)

static int am335x_fb_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = ((LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP)) >> 3) + 0x20; diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 3eb80c13946..0930d195d00 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -293,7 +293,7 @@ static int at91_hlcdc_enable_clk(struct udevice *dev)

static void atmel_hlcdc_init(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct atmel_hlcdc_priv *priv = dev_get_priv(dev); struct atmel_hlcd_regs *regs = priv->regs; struct display_timing *timing = &priv->timing; @@ -539,7 +539,7 @@ static int atmel_hlcdc_ofdata_to_platdata(struct udevice *dev)

static int atmel_hlcdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index b129309d34b..3af3ea4da27 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -245,7 +245,7 @@ ulong calc_fbsize(void) #ifdef CONFIG_DM_VIDEO static int atmel_fb_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct atmel_fb_priv *priv = dev_get_priv(dev); struct display_timing *timing = &priv->timing; @@ -285,7 +285,7 @@ static int atmel_fb_ofdata_to_platdata(struct udevice *dev)

static int atmel_fb_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP16) / 8; @@ -306,7 +306,7 @@ U_BOOT_DRIVER(atmel_fb) = { .bind = atmel_fb_lcd_bind, .ofdata_to_platdata = atmel_fb_ofdata_to_platdata, .probe = atmel_fb_lcd_probe, - .platdata_auto = sizeof(struct atmel_lcd_platdata), + .plat_auto = sizeof(struct atmel_lcd_platdata), .priv_auto = sizeof(struct atmel_fb_priv), }; #endif diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 0888cb00197..95662f14b88 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -13,7 +13,7 @@

static int bcm2835_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); int ret; int w, h, pitch; diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c index 147cdcc6d58..93fa25f16e3 100644 --- a/drivers/video/bridge/anx6345.c +++ b/drivers/video/bridge/anx6345.c @@ -74,7 +74,7 @@ static int anx6345_read(struct udevice *dev, unsigned int addr_off, static int anx6345_write_r0(struct udevice *dev, unsigned char reg_addr, unsigned char value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

return anx6345_write(dev, chip->chip_addr, reg_addr, value); } @@ -82,7 +82,7 @@ static int anx6345_write_r0(struct udevice *dev, unsigned char reg_addr, static int anx6345_read_r0(struct udevice *dev, unsigned char reg_addr, unsigned char *value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

return anx6345_read(dev, chip->chip_addr, reg_addr, value); } @@ -90,7 +90,7 @@ static int anx6345_read_r0(struct udevice *dev, unsigned char reg_addr, static int anx6345_write_r1(struct udevice *dev, unsigned char reg_addr, unsigned char value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

return anx6345_write(dev, chip->chip_addr + 1, reg_addr, value); } @@ -98,7 +98,7 @@ static int anx6345_write_r1(struct udevice *dev, unsigned char reg_addr, static int anx6345_read_r1(struct udevice *dev, unsigned char reg_addr, unsigned char *value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev);

return anx6345_read(dev, chip->chip_addr + 1, reg_addr, value); } diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c index 8399c6f74cf..76115b7bc56 100644 --- a/drivers/video/bridge/ps862x.c +++ b/drivers/video/bridge/ps862x.c @@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR; static int ps8622_write(struct udevice *dev, unsigned addr_off, unsigned char reg_addr, unsigned char value) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); uint8_t buf[2]; struct i2c_msg msg; int ret; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index bc91e7bda58..94d94707513 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -661,7 +661,7 @@ static int broadwell_igd_int15_handler(void)

static int broadwell_igd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); bool is_broadwell; ulong fbbase; @@ -756,7 +756,7 @@ static int broadwell_igd_ofdata_to_platdata(struct udevice *dev)

static int broadwell_igd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; @@ -782,5 +782,5 @@ U_BOOT_DRIVER(broadwell_igd) = { .bind = broadwell_igd_bind, .probe = broadwell_igd_probe, .priv_auto = sizeof(struct broadwell_igd_priv), - .platdata_auto = sizeof(struct broadwell_igd_plat), + .plat_auto = sizeof(struct broadwell_igd_plat), }; diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c index c8797a0d9c4..043cc627a79 100644 --- a/drivers/video/coreboot.c +++ b/drivers/video/coreboot.c @@ -38,7 +38,7 @@ static int save_vesa_mode(struct cb_framebuffer *fb,

static int coreboot_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct cb_framebuffer *fb = lib_sysinfo.framebuffer; struct vesa_mode_info *vesa = &mode_info.vesa; diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c index 5d6f0c17310..068108e9155 100644 --- a/drivers/video/display-uclass.c +++ b/drivers/video/display-uclass.c @@ -31,7 +31,7 @@ int display_enable(struct udevice *dev, int panel_bpp, if (ret) return ret;

- disp_uc_plat = dev_get_uclass_platdata(dev); + disp_uc_plat = dev_get_uclass_plat(dev); disp_uc_plat->in_use = true;

return 0; @@ -71,7 +71,7 @@ int display_read_timing(struct udevice *dev, struct display_timing *timing)

bool display_in_use(struct udevice *dev) { - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev);

return disp_uc_plat->in_use; } @@ -79,5 +79,5 @@ bool display_in_use(struct udevice *dev) UCLASS_DRIVER(display) = { .id = UCLASS_DISPLAY, .name = "display", - .per_device_platdata_auto = sizeof(struct display_plat), + .per_device_plat_auto = sizeof(struct display_plat), }; diff --git a/drivers/video/efi.c b/drivers/video/efi.c index 47441a35a64..ceb6f85d25a 100644 --- a/drivers/video/efi.c +++ b/drivers/video/efi.c @@ -110,7 +110,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa)

static int efi_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct vesa_mode_info *vesa = &mode_info.vesa; int ret; diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c index 7022eec4b7a..64bc8478845 100644 --- a/drivers/video/exynos/exynos_fb.c +++ b/drivers/video/exynos/exynos_fb.c @@ -377,7 +377,7 @@ void exynos_fimd_disable_sysmmu(void) void exynos_fimd_lcd_init(struct udevice *dev) { struct exynos_fb_priv *priv = dev_get_priv(dev); - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct exynos_fb *reg = priv->reg; unsigned int cfg = 0, rgb_mode; unsigned int offset; @@ -692,7 +692,7 @@ static int exynos_fb_probe(struct udevice *dev)

static int exynos_fb_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

/* This is the maximum panel size we expect to see */ plat->size = 1920 * 1080 * 2; diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c index e9d05c93946..9224347ab11 100644 --- a/drivers/video/fsl_dcu_fb.c +++ b/drivers/video/fsl_dcu_fb.c @@ -484,7 +484,7 @@ void *video_hw_init(void)

static int fsl_dcu_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct fb_info fbinfo = { 0 }; unsigned int win_x; @@ -516,7 +516,7 @@ static int fsl_dcu_video_probe(struct udevice *dev)

static int fsl_dcu_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); unsigned int win_x; unsigned int win_y; unsigned int depth = 0, freq = 0; diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index dc8f2cfd800..0bbd974c2a7 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -383,7 +383,7 @@ static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int mxcfb_map_video_memory(struct fb_info *fbi) { struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par; - struct video_uc_platdata *plat = dev_get_uclass_platdata(mxc_fbi->udev); + struct video_uc_platdata *plat = dev_get_uclass_plat(mxc_fbi->udev);

if (fbi->fix.smem_len < fbi->var.yres_virtual * fbi->fix.line_length) { fbi->fix.smem_len = fbi->var.yres_virtual * @@ -586,7 +586,7 @@ enum {

static int ipuv3_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); #if defined(CONFIG_DISPLAY) struct udevice *disp_dev; @@ -647,7 +647,7 @@ struct ipuv3_video_priv {

static int ipuv3_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP32) / 8; diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c index 2587f53ac1d..9f10689ce31 100644 --- a/drivers/video/ivybridge_igd.c +++ b/drivers/video/ivybridge_igd.c @@ -753,7 +753,7 @@ static int gma_func0_init(struct udevice *dev)

static int bd82x6x_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); ulong fbbase; void *gtt_bar; int ret, rev; @@ -781,7 +781,7 @@ static int bd82x6x_video_probe(struct udevice *dev)

static int bd82x6x_video_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c index 0ffdd7b98f3..6c73bd2d62f 100644 --- a/drivers/video/mali_dp.c +++ b/drivers/video/mali_dp.c @@ -260,7 +260,7 @@ static int malidp_update_timings_from_edid(struct udevice *dev, static int malidp_probe(struct udevice *dev) { struct video_priv *uc_priv = dev_get_uclass_priv(dev); - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); ofnode framebuffer = ofnode_find_subnode(dev_ofnode(dev), "framebuffer"); struct malidp_priv *priv = dev_get_priv(dev); struct display_timing timings; @@ -382,7 +382,7 @@ fail_aclk:

static int malidp_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

/* choose max possible size: 2K x 2K, XRGB888 framebuffer */ uc_plat->size = 4 * 2048 * 2048; diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c index b367276f237..313c013a7d8 100644 --- a/drivers/video/meson/meson_plane.c +++ b/drivers/video/meson/meson_plane.c @@ -100,7 +100,7 @@ meson_vpp_disable_interlace_vscaler_osd1(struct meson_vpu_priv *priv)

void meson_vpu_setup_plane(struct udevice *dev, bool is_interlaced) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct meson_vpu_priv *priv = dev_get_priv(dev); u32 osd1_ctrl_stat; diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index 23b5ec6ef17..b5614fafe8e 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -43,7 +43,7 @@ bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,

static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct display_timing timing; bool is_cvbs = false; @@ -138,7 +138,7 @@ static int meson_vpu_probe(struct udevice *dev)

static int meson_vpu_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

plat->size = VPU_MAX_WIDTH * VPU_MAX_HEIGHT * (1 << VPU_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c index af97c711564..bc789ecc7ba 100644 --- a/drivers/video/mvebu_lcd.c +++ b/drivers/video/mvebu_lcd.c @@ -526,7 +526,7 @@ static void mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info,

static int mvebu_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct mvebu_video_priv *priv = dev_get_priv(dev); struct mvebu_lcd_info lcd_info; @@ -575,7 +575,7 @@ static int mvebu_video_probe(struct udevice *dev)

static int mvebu_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 6589a2a09d2..5b770a7a0bd 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -356,7 +356,7 @@ static int mxs_of_get_timings(struct udevice *dev,

static int mxs_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev);

struct display_timing timings; @@ -409,7 +409,7 @@ static int mxs_video_probe(struct udevice *dev)

static int mxs_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct display_timing timings; u32 bpp = 0; u32 bytes_pp = 0; @@ -443,7 +443,7 @@ static int mxs_video_bind(struct udevice *dev)

static int mxs_video_remove(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

mxs_remove_common(plat->base);

diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index d0b89433128..b1f8134ca43 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -404,9 +404,9 @@ static struct nx_display_dev *nx_display_setup(void) __func__); return NULL; } - plat = dev_get_uclass_platdata(dev); + plat = dev_get_uclass_plat(dev); if (!dev) { - debug("%s(): dev_get_uclass_platdata(dev) == NULL --> return NULL\n", + debug("%s(): dev_get_uclass_plat(dev) == NULL --> return NULL\n", __func__); return NULL; } @@ -534,7 +534,7 @@ __weak void lcd_enable(void)

static int nx_display_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct nx_display_platdata *plat = dev_get_platdata(dev); static GraphicDevice *graphic_device; @@ -619,7 +619,7 @@ static int nx_display_probe(struct udevice *dev)

static int nx_display_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

debug("%s()\n", __func__);

@@ -643,7 +643,7 @@ U_BOOT_DRIVER(nexell_display) = { .name = "nexell-display", .id = UCLASS_VIDEO, .of_match = nx_display_ids, - .platdata_auto = + .plat_auto = sizeof(struct nx_display_platdata), .bind = nx_display_bind, .probe = nx_display_probe, diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c index bb8c33bfc7a..190bb551643 100644 --- a/drivers/video/orisetech_otm8009a.c +++ b/drivers/video/orisetech_otm8009a.c @@ -366,6 +366,6 @@ U_BOOT_DRIVER(otm8009a_panel) = { .ops = &otm8009a_panel_ops, .ofdata_to_platdata = otm8009a_panel_ofdata_to_platdata, .probe = otm8009a_panel_probe, - .platdata_auto = sizeof(struct mipi_dsi_panel_plat), + .plat_auto = sizeof(struct mipi_dsi_panel_plat), .priv_auto = sizeof(struct otm8009a_panel_priv), }; diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index 49a3c7a58e8..d1407977aa0 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -84,10 +84,10 @@ static int enable_sequence(struct udevice *dev, int seq) switch (seq) { case 0: if (priv->reg) { - __maybe_unused struct dm_regulator_uclass_platdata + __maybe_unused struct dm_regulator_uclass_plat *plat;

- plat = dev_get_uclass_platdata(priv->reg); + plat = dev_get_uclass_plat(priv->reg); log_debug("Enable '%s', regulator '%s'/'%s'\n", dev->name, priv->reg->name, plat->name); ret = regulator_set_enable(priv->reg, true); diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c index 9d103f1f17b..82e8f04d8f0 100644 --- a/drivers/video/raydium-rm68200.c +++ b/drivers/video/raydium-rm68200.c @@ -338,6 +338,6 @@ U_BOOT_DRIVER(rm68200_panel) = { .ops = &rm68200_panel_ops, .ofdata_to_platdata = rm68200_panel_ofdata_to_platdata, .probe = rm68200_panel_probe, - .platdata_auto = sizeof(struct mipi_dsi_panel_plat), + .plat_auto = sizeof(struct mipi_dsi_panel_plat), .priv_auto = sizeof(struct rm68200_panel_priv), }; diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c index 41f05b7ec6d..a25b40c37f1 100644 --- a/drivers/video/rockchip/rk3288_hdmi.c +++ b/drivers/video/rockchip/rk3288_hdmi.c @@ -25,7 +25,7 @@ static int rk3288_hdmi_enable(struct udevice *dev, int panel_bpp, const struct display_timing *edid) { struct rk_hdmi_priv *priv = dev_get_priv(dev); - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); int vop_id = uc_plat->source_id; struct rk3288_grf *grf = priv->grf;

@@ -58,7 +58,7 @@ static int rk3288_hdmi_ofdata_to_platdata(struct udevice *dev)

static int rk3288_clk_config(struct udevice *dev) { - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); struct clk clk; int ret;

diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c index ff6f132bab2..f8b83a99dcd 100644 --- a/drivers/video/rockchip/rk3288_mipi.c +++ b/drivers/video/rockchip/rk3288_mipi.c @@ -31,7 +31,7 @@ static int rk_mipi_dsi_source_select(struct udevice *dev) { struct rk_mipi_priv *priv = dev_get_priv(dev); struct rk3288_grf *grf = priv->grf; - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev);

/* Select the video source */ switch (disp_uc_plat->source_id) { diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c index d9f15adc5cf..39f0c323f3a 100644 --- a/drivers/video/rockchip/rk3399_hdmi.c +++ b/drivers/video/rockchip/rk3399_hdmi.c @@ -23,7 +23,7 @@ static int rk3399_hdmi_enable(struct udevice *dev, int panel_bpp, const struct display_timing *edid) { struct rk_hdmi_priv *priv = dev_get_priv(dev); - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); int vop_id = uc_plat->source_id; struct rk3399_grf_regs *grf = priv->grf;

diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c index 873f7fdae00..3b8ac3f730e 100644 --- a/drivers/video/rockchip/rk3399_mipi.c +++ b/drivers/video/rockchip/rk3399_mipi.c @@ -29,7 +29,7 @@ static int rk_mipi_dsi_source_select(struct udevice *dev) { struct rk_mipi_priv *priv = dev_get_priv(dev); struct rk3399_grf_regs *grf = priv->grf; - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev);

/* Select the video source */ switch (disp_uc_plat->source_id) { diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 282fe09fdfb..30fe8cee3c3 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1026,7 +1026,7 @@ static int rk_edp_remove(struct udevice *dev)

static int rk_edp_probe(struct udevice *dev) { - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); struct rk_edp_priv *priv = dev_get_priv(dev); struct rk3288_edp *regs = priv->regs; struct clk clk; diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c index c93b5dfeed3..74a1d3071dd 100644 --- a/drivers/video/rockchip/rk_lvds.c +++ b/drivers/video/rockchip/rk_lvds.c @@ -53,7 +53,7 @@ int rk_lvds_enable(struct udevice *dev, int panel_bpp, const struct display_timing *edid) { struct rk_lvds_priv *priv = dev_get_priv(dev); - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); int ret = 0; unsigned int val = 0;

diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c index 6475b3e2aff..c20d158c9fe 100644 --- a/drivers/video/rockchip/rk_vop.c +++ b/drivers/video/rockchip/rk_vop.c @@ -283,7 +283,7 @@ static int rk_display_init(struct udevice *dev, ulong fbbase, ofnode ep_node) break; };

- disp_uc_plat = dev_get_uclass_platdata(disp); + disp_uc_plat = dev_get_uclass_plat(disp); debug("Found device '%s', disp_uc_priv=%p\n", disp->name, disp_uc_plat); if (display_in_use(disp)) { debug(" - device in use\n"); @@ -364,7 +364,7 @@ void rk_vop_probe_regulators(struct udevice *dev,

int rk_vop_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct rk_vop_priv *priv = dev_get_priv(dev); int ret = 0; ofnode port, node; @@ -406,7 +406,7 @@ int rk_vop_probe(struct udevice *dev)

int rk_vop_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

plat->size = 4 * (CONFIG_VIDEO_ROCKCHIP_MAX_XRES * CONFIG_VIDEO_ROCKCHIP_MAX_YRES); diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c index c989510640d..cf1446e2e71 100644 --- a/drivers/video/sandbox_sdl.c +++ b/drivers/video/sandbox_sdl.c @@ -23,7 +23,7 @@ enum {

static int sandbox_sdl_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_platdata(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct sandbox_state *state = state_get_current(); @@ -49,7 +49,7 @@ static int sandbox_sdl_probe(struct udevice *dev)

static int sandbox_sdl_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_platdata(dev); int ret = 0;

@@ -78,5 +78,5 @@ U_BOOT_DRIVER(sandbox_lcd_sdl) = { .of_match = sandbox_sdl_ids, .bind = sandbox_sdl_bind, .probe = sandbox_sdl_probe, - .platdata_auto = sizeof(struct sandbox_sdl_plat), + .plat_auto = sizeof(struct sandbox_sdl_plat), }; diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c index 0c5b40c30b8..7f940187872 100644 --- a/drivers/video/simplefb.c +++ b/drivers/video/simplefb.c @@ -12,7 +12,7 @@

static int simple_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); const void *blob = gd->fdt_blob; const int node = dev_of_offset(dev); diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c index 07a9acbb8ee..ff28bdba57e 100644 --- a/drivers/video/stm32/stm32_ltdc.c +++ b/drivers/video/stm32/stm32_ltdc.c @@ -329,7 +329,7 @@ static void stm32_ltdc_set_layer1(struct stm32_ltdc_priv *priv, ulong fb_addr)

static int stm32_ltdc_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct stm32_ltdc_priv *priv = dev_get_priv(dev); struct udevice *bridge = NULL; @@ -452,7 +452,7 @@ static int stm32_ltdc_probe(struct udevice *dev)

static int stm32_ltdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES * CONFIG_VIDEO_STM32_MAX_YRES * diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index b657e163f06..5540e70fa0c 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -189,7 +189,7 @@ static int sunxi_de2_init(struct udevice *dev, ulong fbbase, struct display_plat *disp_uc_plat; int ret;

- disp_uc_plat = dev_get_uclass_platdata(disp); + disp_uc_plat = dev_get_uclass_plat(disp); debug("Using device '%s', disp_uc_priv=%p\n", disp->name, disp_uc_plat); if (display_in_use(disp)) { debug(" - device in use\n"); @@ -237,7 +237,7 @@ static int sunxi_de2_init(struct udevice *dev, ulong fbbase,

static int sunxi_de2_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct udevice *disp; int ret;

@@ -299,7 +299,7 @@ static int sunxi_de2_probe(struct udevice *dev)

static int sunxi_de2_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev);

plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; @@ -383,7 +383,7 @@ int sunxi_simplefb_setup(void *blob) }

de2_priv = dev_get_uclass_priv(de2); - de2_plat = dev_get_uclass_platdata(de2); + de2_plat = dev_get_uclass_plat(de2);

offset = sunxi_simplefb_fdt_match(blob, pipeline); if (offset < 0) { diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c index 6b6792a3dd9..3e8d71538f2 100644 --- a/drivers/video/sunxi/sunxi_dw_hdmi.c +++ b/drivers/video/sunxi/sunxi_dw_hdmi.c @@ -340,7 +340,7 @@ static int sunxi_dw_hdmi_enable(struct udevice *dev, int panel_bpp,

static int sunxi_dw_hdmi_probe(struct udevice *dev) { - struct display_plat *uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *uc_plat = dev_get_uclass_plat(dev); struct sunxi_dw_hdmi_priv *priv = dev_get_priv(dev); struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index 25199333741..10b834ca76d 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -299,7 +299,7 @@ static int tegra_display_probe(const void *blob, struct tegra_lcd_priv *priv,

static int tegra_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct tegra_lcd_priv *priv = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -393,7 +393,7 @@ static int tegra_lcd_ofdata_to_platdata(struct udevice *dev)

static int tegra_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); int rgb; diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index 6c279322639..f834bd9f59e 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -351,7 +351,7 @@ static int display_init(struct udevice *dev, void *lcdbase, return ret; }

- disp_uc_plat = dev_get_uclass_platdata(dp_dev); + disp_uc_plat = dev_get_uclass_plat(dp_dev); debug("Found device '%s', disp_uc_priv=%p\n", dp_dev->name, disp_uc_plat); disp_uc_plat->src_dev = dev; @@ -465,7 +465,7 @@ static int tegra124_lcd_init(struct udevice *dev, void *lcdbase,

static int tegra124_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); ulong start; int ret;

@@ -482,7 +482,7 @@ static int tegra124_lcd_probe(struct udevice *dev)

static int tegra124_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP16) / 8; diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c index 881923f2292..8519b534a28 100644 --- a/drivers/video/tegra124/dp.c +++ b/drivers/video/tegra124/dp.c @@ -1596,7 +1596,7 @@ static int dp_tegra_probe(struct udevice *dev) { struct tegra_dp_plat *plat = dev_get_platdata(dev); struct tegra_dp_priv *priv = dev_get_priv(dev); - struct display_plat *disp_uc_plat = dev_get_uclass_platdata(dev); + struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev);

priv->regs = (struct dpaux_ctlr *)plat->base; priv->enabled = false; @@ -1620,5 +1620,5 @@ U_BOOT_DRIVER(dp_tegra) = { .probe = dp_tegra_probe, .ops = &dp_tegra_ops, .priv_auto = sizeof(struct tegra_dp_priv), - .platdata_auto = sizeof(struct tegra_dp_plat), + .plat_auto = sizeof(struct tegra_dp_plat), }; diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c index 9656326bdb1..e370cddda97 100644 --- a/drivers/video/vesa.c +++ b/drivers/video/vesa.c @@ -13,7 +13,7 @@

static int vesa_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); ulong fbbase; int ret;

@@ -31,7 +31,7 @@ static int vesa_video_probe(struct udevice *dev)

static int vesa_video_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 925731341cf..2cd0d947f0e 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -68,7 +68,7 @@ void video_set_flush_dcache(struct udevice *dev, bool flush)

static ulong alloc_fb(struct udevice *dev, ulong *addrp) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); ulong base, align, size;

if (!plat->size) @@ -301,7 +301,7 @@ static int video_pre_remove(struct udevice *dev) /* Set up the display ready for use */ static int video_post_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); + struct video_uc_platdata *plat = dev_get_uclass_plat(dev); struct video_priv *priv = dev_get_uclass_priv(dev); char name[30], drv[15], *str; const char *drv_name = drv; @@ -410,5 +410,5 @@ UCLASS_DRIVER(video) = { .pre_remove = video_pre_remove, .priv_auto = sizeof(struct video_uc_priv), .per_device_auto = sizeof(struct video_priv), - .per_device_platdata_auto = sizeof(struct video_uc_platdata), + .per_device_plat_auto = sizeof(struct video_uc_platdata), }; diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c index a007a6a33a8..3ff74f4a975 100644 --- a/drivers/virtio/virtio_blk.c +++ b/drivers/virtio/virtio_blk.c @@ -72,7 +72,7 @@ static ulong virtio_blk_write(struct udevice *dev, lbaint_t start, static int virtio_blk_bind(struct udevice *dev) { struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(dev->parent); - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev); int devnum;

desc->if_type = IF_TYPE_VIRTIO; @@ -106,7 +106,7 @@ static int virtio_blk_bind(struct udevice *dev) static int virtio_blk_probe(struct udevice *dev) { struct virtio_blk_priv *priv = dev_get_priv(dev); - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev); u64 cap; int ret;

diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c index e1831cf9618..b32ce3c1b18 100644 --- a/drivers/virtio/virtio_net.c +++ b/drivers/virtio/virtio_net.c @@ -234,6 +234,6 @@ U_BOOT_DRIVER(virtio_net) = { .remove = virtio_reset, .ops = &virtio_net_ops, .priv_auto = sizeof(struct virtio_net_priv), - .platdata_auto = sizeof(struct eth_pdata), + .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ACTIVE_DMA, }; diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index 0a2431a97fc..8aaa44983e8 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -292,7 +292,7 @@ static int virtio_pci_bind(struct udevice *udev)

static int virtio_pci_probe(struct udevice *udev) { - struct pci_child_platdata *pplat = dev_get_parent_platdata(udev); + struct pci_child_platdata *pplat = dev_get_parent_plat(udev); struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev); struct virtio_pci_priv *priv = dev_get_priv(udev); u16 subvendor, subdevice; diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 8996ac0d6e3..620d094b789 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -456,7 +456,7 @@ static int virtio_pci_bind(struct udevice *udev)

static int virtio_pci_probe(struct udevice *udev) { - struct pci_child_platdata *pplat = dev_get_parent_platdata(udev); + struct pci_child_platdata *pplat = dev_get_parent_plat(udev); struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev); struct virtio_pci_priv *priv = dev_get_priv(udev); u16 subvendor; diff --git a/drivers/w1-eeprom/ds24xxx.c b/drivers/w1-eeprom/ds24xxx.c index 0967accdf00..d12fd5754e3 100644 --- a/drivers/w1-eeprom/ds24xxx.c +++ b/drivers/w1-eeprom/ds24xxx.c @@ -31,7 +31,7 @@ static int ds24xxx_probe(struct udevice *dev) { struct w1_device *w1;

- w1 = dev_get_parent_platdata(dev); + w1 = dev_get_parent_plat(dev); w1->id = 0; return 0; } diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c index 19ee4b17ea5..b3d68d7f058 100644 --- a/drivers/w1-eeprom/ds2502.c +++ b/drivers/w1-eeprom/ds2502.c @@ -222,7 +222,7 @@ static int ds2502_probe(struct udevice *dev) { struct w1_device *w1;

- w1 = dev_get_parent_platdata(dev); + w1 = dev_get_parent_plat(dev); w1->id = 0; return 0; } diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c index d515b4c5366..97a9d43b03a 100644 --- a/drivers/w1-eeprom/w1-eeprom-uclass.c +++ b/drivers/w1-eeprom/w1-eeprom-uclass.c @@ -53,7 +53,7 @@ int w1_eeprom_register_new_device(u64 id) if (dev_get_driver_data(dev) == family) { struct w1_device *w1;

- w1 = dev_get_parent_platdata(dev); + w1 = dev_get_parent_plat(dev); if (w1->id) /* device already in use */ continue; w1->id = id; @@ -70,7 +70,7 @@ int w1_eeprom_register_new_device(u64 id)

int w1_eeprom_get_id(struct udevice *dev, u64 *id) { - struct w1_device *w1 = dev_get_parent_platdata(dev); + struct w1_device *w1 = dev_get_parent_plat(dev);

if (!w1) return -ENODEV; diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c index aced1b0e2ed..d8cbff7b495 100644 --- a/drivers/w1/mxc_w1.c +++ b/drivers/w1/mxc_w1.c @@ -230,6 +230,6 @@ U_BOOT_DRIVER(mxc_w1_drv) = { .of_match = mxc_w1_id, .ofdata_to_platdata = mxc_w1_ofdata_to_platdata, .ops = &mxc_w1_ops, - .platdata_auto = sizeof(struct mxc_w1_pdata), + .plat_auto = sizeof(struct mxc_w1_pdata), .probe = mxc_w1_probe, }; diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c index 6e48e53ddc3..2e5064fcc54 100644 --- a/drivers/w1/w1-gpio.c +++ b/drivers/w1/w1-gpio.c @@ -174,5 +174,5 @@ U_BOOT_DRIVER(w1_gpio_drv) = { .of_match = w1_gpio_id, .ofdata_to_platdata = w1_gpio_ofdata_to_platdata, .ops = &w1_gpio_ops, - .platdata_auto = sizeof(struct w1_gpio_pdata), + .plat_auto = sizeof(struct w1_gpio_pdata), }; diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c index af1fe5fd22f..8bc6cb13f49 100644 --- a/drivers/w1/w1-uclass.c +++ b/drivers/w1/w1-uclass.c @@ -130,14 +130,14 @@ int w1_get_bus(int busnum, struct udevice **busp)

u8 w1_get_device_family(struct udevice *dev) { - struct w1_device *w1 = dev_get_parent_platdata(dev); + struct w1_device *w1 = dev_get_parent_plat(dev);

return w1->id & 0xff; }

int w1_reset_select(struct udevice *dev) { - struct w1_device *w1 = dev_get_parent_platdata(dev); + struct w1_device *w1 = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); const struct w1_ops *ops = device_get_ops(bus); int i; @@ -235,5 +235,5 @@ UCLASS_DRIVER(w1) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .post_bind = dm_scan_fdt_dev, #endif - .per_child_platdata_auto = sizeof(struct w1_device), + .per_child_plat_auto = sizeof(struct w1_device), }; diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index f410a070169..8aa771ad806 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -34,16 +34,16 @@ struct xlnx_wdt_platdata { static int xlnx_wdt_reset(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *platdata = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_platdata(dev);

debug("%s ", __func__);

/* Read the current contents of TCSR0 */ - reg = readl(&platdata->regs->twcsr0); + reg = readl(&plat->regs->twcsr0);

/* Clear the watchdog WDS bit */ if (reg & (XWT_CSR0_EWDT1_MASK | XWT_CSRX_EWDT2_MASK)) - writel(reg | XWT_CSR0_WDS_MASK, &platdata->regs->twcsr0); + writel(reg | XWT_CSR0_WDS_MASK, &plat->regs->twcsr0);

return 0; } @@ -51,18 +51,18 @@ static int xlnx_wdt_reset(struct udevice *dev) static int xlnx_wdt_stop(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *platdata = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_platdata(dev);

- if (platdata->enable_once) { + if (plat->enable_once) { debug("Can't stop Xilinx watchdog.\n"); return -EBUSY; }

/* Read the current contents of TCSR0 */ - reg = readl(&platdata->regs->twcsr0); + reg = readl(&plat->regs->twcsr0);

- writel(reg & ~XWT_CSR0_EWDT1_MASK, &platdata->regs->twcsr0); - writel(~XWT_CSRX_EWDT2_MASK, &platdata->regs->twcsr1); + writel(reg & ~XWT_CSR0_EWDT1_MASK, &plat->regs->twcsr0); + writel(~XWT_CSRX_EWDT2_MASK, &plat->regs->twcsr1);

debug("Watchdog disabled!\n");

@@ -71,14 +71,14 @@ static int xlnx_wdt_stop(struct udevice *dev)

static int xlnx_wdt_start(struct udevice *dev, u64 timeout, ulong flags) { - struct xlnx_wdt_platdata *platdata = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_platdata(dev);

debug("%s:\n", __func__);

writel((XWT_CSR0_WRS_MASK | XWT_CSR0_WDS_MASK | XWT_CSR0_EWDT1_MASK), - &platdata->regs->twcsr0); + &plat->regs->twcsr0);

- writel(XWT_CSRX_EWDT2_MASK, &platdata->regs->twcsr1); + writel(XWT_CSRX_EWDT2_MASK, &plat->regs->twcsr1);

return 0; } @@ -92,16 +92,16 @@ static int xlnx_wdt_probe(struct udevice *dev)

static int xlnx_wdt_ofdata_to_platdata(struct udevice *dev) { - struct xlnx_wdt_platdata *platdata = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_platdata(dev);

- platdata->regs = (struct watchdog_regs *)dev_read_addr(dev); - if (IS_ERR(platdata->regs)) - return PTR_ERR(platdata->regs); + plat->regs = (struct watchdog_regs *)dev_read_addr(dev); + if (IS_ERR(plat->regs)) + return PTR_ERR(plat->regs);

- platdata->enable_once = dev_read_u32_default(dev, - "xlnx,wdt-enable-once", 0); + plat->enable_once = dev_read_u32_default(dev, "xlnx,wdt-enable-once", + 0);

- debug("%s: wdt-enable-once %d\n", __func__, platdata->enable_once); + debug("%s: wdt-enable-once %d\n", __func__, plat->enable_once);

return 0; } @@ -123,7 +123,7 @@ U_BOOT_DRIVER(xlnx_wdt) = { .id = UCLASS_WDT, .of_match = xlnx_wdt_ids, .probe = xlnx_wdt_probe, - .platdata_auto = sizeof(struct xlnx_wdt_platdata), + .plat_auto = sizeof(struct xlnx_wdt_platdata), .ofdata_to_platdata = xlnx_wdt_ofdata_to_platdata, .ops = &xlnx_wdt_ops, }; diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c index 8f96822b78e..172908c795d 100644 --- a/drivers/watchdog/xilinx_wwdt.c +++ b/drivers/watchdog/xilinx_wwdt.c @@ -125,7 +125,7 @@ static int xlnx_wwdt_start(struct udevice *dev, u64 timeout, ulong flags) static int xlnx_wwdt_probe(struct udevice *dev) { int ret; - struct xlnx_wwdt_platdata *platdata = dev_get_platdata(dev); + struct xlnx_wwdt_platdata *plat = dev_get_platdata(dev); struct xlnx_wwdt_priv *wdt = dev_get_priv(dev);

dev_dbg(dev, "%s: Probing wdt%u\n", __func__, dev_seq(dev)); @@ -136,7 +136,7 @@ static int xlnx_wwdt_probe(struct udevice *dev) return ret; }

- wdt->enable_once = platdata->enable_once; + wdt->enable_once = plat->enable_once;

ret = clk_get_by_index(dev, 0, &wdt->clk); if (ret < 0) @@ -147,11 +147,11 @@ static int xlnx_wwdt_probe(struct udevice *dev)

static int xlnx_wwdt_ofdata_to_platdata(struct udevice *dev) { - struct xlnx_wwdt_platdata *platdata = dev_get_platdata(dev); + struct xlnx_wwdt_platdata *plat = dev_get_platdata(dev);

- platdata->enable_once = dev_read_u32_default(dev, - "xlnx,wdt-enable-once", 0); - dev_dbg(dev, "wdt-enable-once %d\n", platdata->enable_once); + plat->enable_once = dev_read_u32_default(dev, "xlnx,wdt-enable-once", + 0); + dev_dbg(dev, "wdt-enable-once %d\n", plat->enable_once);

return 0; } @@ -173,7 +173,7 @@ U_BOOT_DRIVER(xlnx_wwdt) = { .of_match = xlnx_wwdt_ids, .probe = xlnx_wwdt_probe, .priv_auto = sizeof(struct xlnx_wwdt_priv), - .platdata_auto = sizeof(struct xlnx_wwdt_platdata), + .plat_auto = sizeof(struct xlnx_wwdt_platdata), .ofdata_to_platdata = xlnx_wwdt_ofdata_to_platdata, .ops = &xlnx_wwdt_ops, }; diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index cbb51d26b91..b0c93d6cf68 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -600,7 +600,7 @@ static ulong pvblock_iop(struct udevice *udev, lbaint_t blknr, lbaint_t blkcnt, void *buffer, int write) { struct blkfront_dev *blk_dev = dev_get_priv(udev); - struct blk_desc *desc = dev_get_uclass_platdata(udev); + struct blk_desc *desc = dev_get_uclass_plat(udev); struct blkfront_aiocb aiocb; lbaint_t blocks_todo; bool unaligned; @@ -658,7 +658,7 @@ ulong pvblock_blk_write(struct udevice *udev, lbaint_t blknr, lbaint_t blkcnt,

static int pvblock_blk_bind(struct udevice *udev) { - struct blk_desc *desc = dev_get_uclass_platdata(udev); + struct blk_desc *desc = dev_get_uclass_plat(udev); int devnum;

desc->if_type = IF_TYPE_PVBLOCK; @@ -685,12 +685,12 @@ static int pvblock_blk_bind(struct udevice *udev) static int pvblock_blk_probe(struct udevice *udev) { struct blkfront_dev *blk_dev = dev_get_priv(udev); - struct blkfront_platdata *platdata = dev_get_platdata(udev); - struct blk_desc *desc = dev_get_uclass_platdata(udev); + struct blkfront_platdata *plat = dev_get_platdata(udev); + struct blk_desc *desc = dev_get_uclass_plat(udev); int ret, devid;

- devid = platdata->devid; - free(platdata); + devid = plat->devid; + free(plat);

ret = init_blkfront(devid, blk_dev); if (ret < 0) @@ -737,27 +737,27 @@ static int on_new_vbd(struct udevice *parent, unsigned int devid) { struct driver_info info; struct udevice *udev; - struct blkfront_platdata *platdata; + struct blkfront_platdata *plat; int ret;

debug("New " DRV_NAME_BLK ", device ID %d\n", devid);

- platdata = malloc(sizeof(struct blkfront_platdata)); - if (!platdata) { + plat = malloc(sizeof(struct blkfront_platdata)); + if (!plat) { printf("Failed to allocate platform data\n"); return -ENOMEM; }

- platdata->devid = devid; + plat->devid = devid;

info.name = DRV_NAME_BLK; - info.platdata = platdata; + info.plat = plat;

ret = device_bind_by_name(parent, false, &info, &udev); if (ret < 0) { printf("Failed to bind " DRV_NAME_BLK " to device with ID %d, ret: %d\n", devid, ret); - free(platdata); + free(plat); } return ret; } @@ -802,7 +802,7 @@ static void print_pvblock_devices(void) class_name = uclass_get_name(UCLASS_PVBLOCK); for (blk_first_device(IF_TYPE_PVBLOCK, &udev); udev; blk_next_device(&udev), first = false) { - struct blk_desc *desc = dev_get_uclass_platdata(udev); + struct blk_desc *desc = dev_get_uclass_plat(udev);

if (!first) puts(", "); diff --git a/include/adc.h b/include/adc.h index 5841dfb54b9..0d1a666908f 100644 --- a/include/adc.h +++ b/include/adc.h @@ -40,7 +40,7 @@ struct adc_channel { };

/** - * struct adc_uclass_platdata - basic ADC info + * struct adc_uclass_plat - basic ADC info * * Note: The positive/negative reference Voltage is only a name and it doesn't * provide an information about the value polarity. It is possible, for both @@ -71,7 +71,7 @@ struct adc_channel { * @vdd_microvolts - positive reference Voltage value * @vss_microvolts - negative reference Voltage value */ -struct adc_uclass_platdata { +struct adc_uclass_plat { int data_format; unsigned int data_mask; unsigned int data_timeout_us; diff --git a/include/blk.h b/include/blk.h index 9ee10fb80e7..c4401b00253 100644 --- a/include/blk.h +++ b/include/blk.h @@ -56,7 +56,7 @@ enum sig_type {

/* * With driver model (CONFIG_BLK) this is uclass platform data, accessible - * with dev_get_uclass_platdata(dev) + * with dev_get_uclass_plat(dev) */ struct blk_desc { /* diff --git a/include/cpu.h b/include/cpu.h index 78e88b9ed09..1d53308f7a4 100644 --- a/include/cpu.h +++ b/include/cpu.h @@ -17,7 +17,7 @@ * @timebase_freq: the current frequency at which the cpu timer timebase * registers are updated (in Hz) * - * This can be accessed with dev_get_parent_platdata() for any UCLASS_CPU + * This can be accessed with dev_get_parent_plat() for any UCLASS_CPU * device. */ struct cpu_platdata { diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index 578a483497e..2e9c1d5ef9c 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -19,8 +19,8 @@ struct udevice; * device_bind() - Create a device and bind it to a driver * * Called to set up a new device attached to a driver. The device will either - * have platdata, or a device tree node which can be used to create the - * platdata. + * have plat, or a device tree node which can be used to create the + * plat. * * Once bound a device exists but is not yet active until device_probe() is * called. @@ -28,7 +28,7 @@ struct udevice; * @parent: Pointer to device's parent, under which this driver will exist * @drv: Device's driver * @name: Name of device (e.g. device tree node name) - * @platdata: Pointer to data for this device - the structure is device- + * @plat: Pointer to data for this device - the structure is device- * specific but may include the device's I/O address, etc.. This is NULL for * devices which use device tree. * @ofnode: Devicetree node for this device. This is ofnode_null() for @@ -37,7 +37,7 @@ struct udevice; * @return 0 if OK, -ve on error */ int device_bind(struct udevice *parent, const struct driver *drv, - const char *name, void *platdata, ofnode node, + const char *name, void *plat, ofnode node, struct udevice **devp);

/** @@ -72,7 +72,7 @@ int device_bind_with_driver_data(struct udevice *parent, * @parent: Pointer to device's parent * @pre_reloc_only: If true, bind the driver only if its DM_FLAG_PRE_RELOC flag * is set. If false bind the driver always. - * @info: Name and platdata for this device + * @info: Name and plat for this device * @devp: if non-NULL, returns a pointer to the bound device * @return 0 if OK, -ve on error */ diff --git a/include/dm/device.h b/include/dm/device.h index c380eb3a0df..f8e7642dfb5 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -23,16 +23,16 @@ struct driver_info; /* Driver is active (probed). Cleared when it is removed */ #define DM_FLAG_ACTIVATED (1 << 0)

-/* DM is responsible for allocating and freeing platdata */ +/* DM is responsible for allocating and freeing plat */ #define DM_FLAG_ALLOC_PDATA (1 << 1)

/* DM should init this device prior to relocation */ #define DM_FLAG_PRE_RELOC (1 << 2)

-/* DM is responsible for allocating and freeing parent_platdata */ +/* DM is responsible for allocating and freeing parent_plat */ #define DM_FLAG_ALLOC_PARENT_PDATA (1 << 3)

-/* DM is responsible for allocating and freeing uclass_platdata */ +/* DM is responsible for allocating and freeing uclass_plat */ #define DM_FLAG_ALLOC_UCLASS_PDATA (1 << 4)

/* Allocate driver private data on a DMA boundary */ @@ -64,7 +64,7 @@ struct driver_info; /* DM does not enable/disable the power domains corresponding to this device */ #define DM_FLAG_DEFAULT_PD_CTRL_OFF (1 << 11)

-/* Driver platdata has been read. Cleared when the device is removed */ +/* Driver plat has been read. Cleared when the device is removed */ #define DM_FLAG_PLATDATA_VALID (1 << 12)

/* @@ -104,21 +104,21 @@ enum { * particular port or peripheral (essentially a driver instance). * * A device will come into existence through a 'bind' call, either due to - * a U_BOOT_DEVICE() macro (in which case platdata is non-NULL) or a node + * a U_BOOT_DEVICE() macro (in which case plat is non-NULL) or a node * in the device tree (in which case of_offset is >= 0). In the latter case - * we translate the device tree information into platdata in a function + * we translate the device tree information into plat in a function * implemented by the driver ofdata_to_platdata method (called just before the * probe method if the device has a device tree node. * - * All three of platdata, priv and uclass_priv can be allocated by the - * driver, or you can use the 'auto' members of struct driver and + * All three of plat, priv and uclass_priv can be allocated by the + * driver, or you can use the auto_alloc_size members of struct driver and * struct uclass_driver to have driver model do this automatically. * * @driver: The driver used by this device * @name: Name of device, typically the FDT node name - * @platdata: Configuration data for this device - * @parent_platdata: The parent bus's configuration data for this device - * @uclass_platdata: The uclass's configuration data for this device + * @plat: Configuration data for this device + * @parent_plat: The parent bus's configuration data for this device + * @uclass_plat: The uclass's configuration data for this device * @node: Reference to device tree node for this device * @driver_data: Driver data word for the entry that matched this device with * its driver @@ -144,9 +144,9 @@ enum { struct udevice { const struct driver *driver; const char *name; - void *platdata; - void *parent_platdata; - void *uclass_platdata; + void *plat; + void *parent_plat; + void *uclass_plat; ofnode node; ulong driver_data; struct udevice *parent; @@ -209,7 +209,7 @@ struct udevice_id { * * This holds methods for setting up a new device, and also removing it. * The device needs information to set itself up - this is provided either - * by platdata or a device tree node (which we find by looking up + * by plat or a device tree node (which we find by looking up * matching compatible strings with of_match). * * Drivers all belong to a uclass, representing a class of devices of the @@ -234,17 +234,17 @@ struct udevice_id { * @priv_auto: If non-zero this is the size of the private data * to be allocated in the device's ->priv pointer. If zero, then the driver * is responsible for allocating any data required. - * @platdata_auto: If non-zero this is the size of the - * platform data to be allocated in the device's ->platdata pointer. + * @plat_auto: If non-zero this is the size of the + * platform data to be allocated in the device's ->plat pointer. * This is typically only useful for device-tree-aware drivers (those with - * an of_match), since drivers which use platdata will have the data + * an of_match), since drivers which use plat will have the data * provided in the U_BOOT_DEVICE() instantiation. * @per_child_auto: Each device can hold private data owned by * its parent. If required this will be automatically allocated if this * value is non-zero. - * @per_child_platdata_auto: A bus likes to store information about + * @per_child_plat_auto: A bus likes to store information about * its children. If non-zero this is the size of this data, to be allocated - * in the child's parent_platdata pointer. + * in the child's parent_plat pointer. * @ops: Driver-specific operations. This is typically a list of function * pointers defined by the driver, to implement driver functions required by * the uclass. @@ -265,9 +265,9 @@ struct driver { int (*child_pre_probe)(struct udevice *dev); int (*child_post_remove)(struct udevice *dev); int priv_auto; - int platdata_auto; + int plat_auto; int per_child_auto; - int per_child_platdata_auto; + int per_child_plat_auto; const void *ops; /* driver-specific operations */ uint32_t flags; #if CONFIG_IS_ENABLED(ACPIGEN) @@ -301,24 +301,24 @@ struct driver { void *dev_get_platdata(const struct udevice *dev);

/** - * dev_get_parent_platdata() - Get the parent platform data for a device + * dev_get_parent_plat() - Get the parent platform data for a device * * This checks that dev is not NULL, but no other checks for now * * @dev Device to check * @return parent's platform data, or NULL if none */ -void *dev_get_parent_platdata(const struct udevice *dev); +void *dev_get_parent_plat(const struct udevice *dev);

/** - * dev_get_uclass_platdata() - Get the uclass platform data for a device + * dev_get_uclass_plat() - Get the uclass platform data for a device * * This checks that dev is not NULL, but no other checks for now * * @dev Device to check * @return uclass's platform data, or NULL if none */ -void *dev_get_uclass_platdata(const struct udevice *dev); +void *dev_get_uclass_plat(const struct udevice *dev);

/** * dev_get_priv() - Get the private data for a device @@ -620,7 +620,7 @@ int device_find_child_by_name(const struct udevice *parent, const char *name, struct udevice **devp);

/** - * device_first_child_ofdata_err() - Find the first child and reads its platdata + * device_first_child_ofdata_err() - Find the first child and reads its plat * * The ofdata_to_platdata() method is called on the child before it is returned, * but the child is not probed. @@ -633,7 +633,7 @@ int device_first_child_ofdata_err(struct udevice *parent, struct udevice **devp);

/* - * device_next_child_ofdata_err() - Find the next child and read its platdata + * device_next_child_ofdata_err() - Find the next child and read its plat * * The ofdata_to_platdata() method is called on the child before it is returned, * but the child is not probed. diff --git a/include/dm/lists.h b/include/dm/lists.h index 810e244d9ef..070bc9c19f6 100644 --- a/include/dm/lists.h +++ b/include/dm/lists.h @@ -16,7 +16,7 @@ * lists_driver_lookup_name() - Return u_boot_driver corresponding to name * * This function returns a pointer to a driver given its name. This is used - * for binding a driver given its name and platdata. + * for binding a driver given its name and plat. * * @name: Name of driver to look up * @return pointer to driver, or NULL if not found diff --git a/include/dm/pci.h b/include/dm/pci.h index 10f9fd9e378..bddacbf5997 100644 --- a/include/dm/pci.h +++ b/include/dm/pci.h @@ -30,7 +30,7 @@ int pci_get_devfn(struct udevice *dev); * * This returns an int to avoid a dependency on pci.h * - * @reg: reg value from dt-platdata.c array (first member). This is not a + * @reg: reg value from dt-plat.c array (first member). This is not a * pointer type, since the caller may use fdt32_t or fdt64_t depending on * the address sizes. * @return device/function for that device (pci_dev_t format) diff --git a/include/dm/platdata.h b/include/dm/platdata.h index 216efa8ef77..6094b663f8b 100644 --- a/include/dm/platdata.h +++ b/include/dm/platdata.h @@ -20,13 +20,13 @@ * available). U-Boot's driver model uses device tree for configuration. * * @name: Driver name - * @platdata: Driver-specific platform data + * @plat: Driver-specific platform data * @platdata_size: Size of platform data structure * @parent_idx: Index of the parent driver_info structure */ struct driver_info { const char *name; - const void *platdata; + const void *plat; #if CONFIG_IS_ENABLED(OF_PLATDATA) unsigned short platdata_size; short parent_idx; @@ -57,7 +57,7 @@ struct driver_rt { * available). U-Boot's driver model uses device tree for configuration. * * When of-platdata is in use, U_BOOT_DEVICE() cannot be used outside of the - * dt-platdata.c file created by dtoc + * dt-plat.c file created by dtoc */ #if CONFIG_IS_ENABLED(OF_PLATDATA) && !defined(DT_PLATDATA_C) #define U_BOOT_DEVICE(__name) _Static_assert(false, \ diff --git a/include/dm/root.h b/include/dm/root.h index 830e31312df..113e92ec783 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -33,7 +33,7 @@ void dm_fixup_for_gd_move(struct global_data *new_gd); /** * dm_scan_platdata() - Scan all platform data and bind drivers * - * This scans all available platdata and creates drivers for each + * This scans all available plat and creates drivers for each * * @pre_reloc_only: If true, bind only drivers with the DM_FLAG_PRE_RELOC * flag. If false bind all drivers. diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 2d9eae19099..e8220f65cd3 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -71,15 +71,15 @@ struct udevice; * @per_device_auto: Each device can hold private data owned * by the uclass. If required this will be automatically allocated if this * value is non-zero. - * @per_device_platdata_auto: Each device can hold platform data - * owned by the uclass as 'dev->uclass_platdata'. If the value is non-zero, + * @per_device_plat_auto: Each device can hold platform data + * owned by the uclass as 'dev->uclass_plat'. If the value is non-zero, * then this will be automatically allocated. * @per_child_auto: Each child device (of a parent in this * uclass) can hold parent data for the device/uclass. This value is only * used as a fallback if this member is 0 in the driver. - * @per_child_platdata_auto: A bus likes to store information about + * @per_child_plat_auto: A bus likes to store information about * its children. If non-zero this is the size of this data, to be allocated - * in the child device's parent_platdata pointer. This value is only used as + * in the child device's parent_plat pointer. This value is only used as * a fallback if this member is 0 in the driver. * @ops: Uclass operations, providing the consistent interface to devices * within the uclass. @@ -100,9 +100,9 @@ struct uclass_driver { int (*destroy)(struct uclass *class); int priv_auto; int per_device_auto; - int per_device_platdata_auto; + int per_device_plat_auto; int per_child_auto; - int per_child_platdata_auto; + int per_child_plat_auto; const void *ops; uint32_t flags; }; diff --git a/include/dwmmc.h b/include/dwmmc.h index c53694654ed..4515a44dc27 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -256,7 +256,7 @@ static inline u8 dwmci_readb(struct dwmci_host *host, int reg) * ... * * Inside U_BOOT_DRIVER(): - * .platdata_auto = sizeof(struct rockchip_mmc_plat), + * .plat_auto = sizeof(struct rockchip_mmc_plat), * * To access platform data: * struct rockchip_mmc_plat *plat = dev_get_platdata(dev); diff --git a/include/i2c.h b/include/i2c.h index 880aa8032b7..d0a390141b8 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -71,7 +71,7 @@ struct udevice; * An I2C chip is a device on the I2C bus. It sits at a particular address * and normally supports 7-bit or 10-bit addressing. * - * To obtain this structure, use dev_get_parent_platdata(dev) where dev is + * To obtain this structure, use dev_get_parent_plat(dev) where dev is * the chip to examine. * * @chip_addr: Chip address on bus diff --git a/include/net.h b/include/net.h index aff6674bb3e..13da69b7c14 100644 --- a/include/net.h +++ b/include/net.h @@ -115,7 +115,7 @@ enum eth_state_t { * @enetaddr: The Ethernet MAC address that is loaded from EEPROM or env * @phy_interface: PHY interface to use - see PHY_INTERFACE_MODE_... * @max_speed: Maximum speed of Ethernet connection supported by MAC - * @priv_pdata: device specific platdata + * @priv_pdata: device specific plat */ struct eth_pdata { phys_addr_t iobase; diff --git a/include/pci.h b/include/pci.h index f8dadf9d5ad..0e9fcebde51 100644 --- a/include/pci.h +++ b/include/pci.h @@ -903,7 +903,7 @@ struct udevice; * * Every device on a PCI bus has this per-child data. * - * It can be accessed using dev_get_parent_platdata(dev) if dev->parent is a + * It can be accessed using dev_get_parent_plat(dev) if dev->parent is a * PCI bus (i.e. UCLASS_PCI) * * @devfn: Encoded device and function index - see PCI_DEVFN() diff --git a/include/power/regulator.h b/include/power/regulator.h index 7f278e8c7dc..19a3b7b502a 100644 --- a/include/power/regulator.h +++ b/include/power/regulator.h @@ -16,15 +16,15 @@ * 'UCLASS_REGULATOR' and the regulator driver API. * * The regulator uclass - is based on uclass platform data which is allocated, - * automatically for each regulator device on bind and 'dev->uclass_platdata' - * points to it. The data type is: 'struct dm_regulator_uclass_platdata'. + * automatically for each regulator device on bind and 'dev->uclass_plat' + * points to it. The data type is: 'struct dm_regulator_uclass_plat'. * The uclass file: 'drivers/power/regulator/regulator-uclass.c' * * The regulator device - is based on driver's model 'struct udevice'. * The API can use regulator name in two meanings: * - devname - the regulator device's name: 'dev->name' - * - platname - the device's platdata's name. So in the code it looks like: - * 'uc_pdata = dev->uclass_platdata'; 'name = uc_pdata->name'. + * - platname - the device's plat's name. So in the code it looks like: + * 'uc_pdata = dev->uclass_plat'; 'name = uc_pdata->name'. * * The regulator device driver - provide an implementation of uclass operations * pointed by 'dev->driver->ops' as a struct of type 'struct dm_regulator_ops'. @@ -135,7 +135,7 @@ enum regulator_flag { };

/** - * struct dm_regulator_uclass_platdata - pointed by dev->uclass_platdata, and + * struct dm_regulator_uclass_plat - pointed by dev->uclass_plat, and * allocated on each regulator bind. This structure holds an information * about each regulator's constraints and supported operation modes. * There is no "step" voltage value - so driver should take care of this. @@ -162,7 +162,7 @@ enum regulator_flag { * The constraints: type, mode, mode_count, can be set by device driver, e.g. * by the driver '.probe' method. */ -struct dm_regulator_uclass_platdata { +struct dm_regulator_uclass_plat { enum regulator_type type; struct dm_regulator_mode *mode; int mode_count; @@ -422,7 +422,7 @@ int regulators_enable_boot_on(bool verbose); * regulator_autoset: setup the voltage/current on a regulator * * The setup depends on constraints found in device's uclass's platform data - * (struct dm_regulator_uclass_platdata): + * (struct dm_regulator_uclass_plat): * * - Enable - will set - if any of: 'always_on' or 'boot_on' is set to true, * or if both are unset, then the function returns @@ -431,7 +431,7 @@ int regulators_enable_boot_on(bool verbose); * * The function returns on the first-encountered error. * - * @platname - expected string for dm_regulator_uclass_platdata .name field + * @platname - expected string for dm_regulator_uclass_plat .name field * @devp - returned pointer to the regulator device - if non-NULL passed * @return: 0 on success or negative value of errno. */ @@ -440,7 +440,7 @@ int regulator_autoset(struct udevice *dev); /** * regulator_autoset_by_name: setup the regulator given by its uclass's * platform data name field. The setup depends on constraints found in device's - * uclass's platform data (struct dm_regulator_uclass_platdata): + * uclass's platform data (struct dm_regulator_uclass_plat): * - Enable - will set - if any of: 'always_on' or 'boot_on' is set to true, * or if both are unset, then the function returns * - Voltage value - will set - if '.min_uV' and '.max_uV' values are equal @@ -448,7 +448,7 @@ int regulator_autoset(struct udevice *dev); * * The function returns on first encountered error. * - * @platname - expected string for dm_regulator_uclass_platdata .name field + * @platname - expected string for dm_regulator_uclass_plat .name field * @devp - returned pointer to the regulator device - if non-NULL passed * @return: 0 on success or negative value of errno. * @@ -464,7 +464,7 @@ int regulator_autoset_by_name(const char *platname, struct udevice **devp); * regulator_autoset_by_name() for each name from the list. * * @list_platname - an array of expected strings for .name field of each - * regulator's uclass platdata + * regulator's uclass plat * @list_devp - an array of returned pointers to the successfully setup * regulator devices if non-NULL passed * @verbose - (true/false) print each regulator setup info, or be quiet @@ -499,9 +499,9 @@ int regulator_get_by_devname(const char *devname, struct udevice **devp);

/** * regulator_get_by_platname: returns the pointer to the pmic regulator device. - * Search by name, found in regulator uclass platdata. + * Search by name, found in regulator uclass plat. * - * @platname - expected string for uc_pdata->name of regulator uclass platdata + * @platname - expected string for uc_pdata->name of regulator uclass plat * @devp - returns pointer to the regulator device or NULL on error * @return 0 on success or negative value of errno. * diff --git a/include/remoteproc.h b/include/remoteproc.h index 74d01723f6a..089131f65fd 100644 --- a/include/remoteproc.h +++ b/include/remoteproc.h @@ -34,7 +34,7 @@ enum rproc_mem_type { * @mem_type: one of 'enum rproc_mem_type' * @driver_plat_data: driver specific platform data that may be needed. * - * This can be accessed with dev_get_uclass_platdata() for any UCLASS_REMOTEPROC + * This can be accessed with dev_get_uclass_plat() for any UCLASS_REMOTEPROC * device. * */ diff --git a/include/sdhci.h b/include/sdhci.h index d04afd53b16..69c2087c10c 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -440,7 +440,7 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg) * ... * * Inside U_BOOT_DRIVER(): - * .platdata_auto = sizeof(struct msm_sdhc_plat), + * .plat_auto = sizeof(struct msm_sdhc_plat), * * To access platform data: * struct msm_sdhc_plat *plat = dev_get_platdata(dev); diff --git a/include/spi.h b/include/spi.h index a22225d85d0..96be27690f7 100644 --- a/include/spi.h +++ b/include/spi.h @@ -48,8 +48,8 @@ struct dm_spi_bus { * struct dm_spi_platdata - platform data for all SPI slaves * * This describes a SPI slave, a child device of the SPI bus. To obtain this - * struct from a spi_slave, use dev_get_parent_platdata(dev) or - * dev_get_parent_platdata(slave->dev). + * struct from a spi_slave, use dev_get_parent_plat(dev) or + * dev_get_parent_plat(slave->dev). * * This data is immuatable. Each time the device is probed, @max_hz and @mode * will be copied to struct spi_slave. @@ -566,12 +566,12 @@ int spi_find_bus_and_cs(int busnum, int cs, struct udevice **busp, * is automatically bound on this chip select with requested speed and mode. * * Ths new slave device is probed ready for use with the speed and mode - * from platdata when available or the requested values. + * from plat when available or the requested values. * * @busnum: SPI bus number * @cs: Chip select to look for - * @speed: SPI speed to use for this slave when not available in platdata - * @mode: SPI mode to use for this slave when not available in platdata + * @speed: SPI speed to use for this slave when not available in plat + * @mode: SPI mode to use for this slave when not available in plat * @drv_name: Name of driver to attach to this chip select * @dev_name: Name of the new device thus created * @busp: Returns bus device diff --git a/include/usb.h b/include/usb.h index 5a7af882fb6..a3323f58018 100644 --- a/include/usb.h +++ b/include/usb.h @@ -608,7 +608,7 @@ struct usb_platdata { /** * struct usb_dev_platdata - Platform data about a USB device * - * Given a USB device dev this structure is dev_get_parent_platdata(dev). + * Given a USB device dev this structure is dev_get_parent_plat(dev). * This is used by sandbox to provide emulation data also. * * @id: ID used to match this device @@ -662,7 +662,7 @@ struct usb_bus_priv { * struct usb_emul_platdata - platform data about the USB emulator * * Given a USB emulator (UCLASS_USB_EMUL) 'dev', this is - * dev_get_uclass_platdata(dev). + * dev_get_uclass_plat(dev). * * @port1: USB emulator device port number on the parent hub */ diff --git a/include/video.h b/include/video.h index 9d09d2409af..31a12bd7996 100644 --- a/include/video.h +++ b/include/video.h @@ -21,7 +21,7 @@ struct udevice; * struct video_uc_platdata - uclass platform data for a video device * * This holds information that the uclass needs to know about each device. It - * is accessed using dev_get_uclass_platdata(dev). See 'Theory of operation' at + * is accessed using dev_get_uclass_plat(dev). See 'Theory of operation' at * the top of video-uclass.c for details on how this information is set. * * @align: Frame-buffer alignment, indicating the memory boundary the frame @@ -125,7 +125,7 @@ struct video_ops { * * Note: This function is for internal use. * - * This uses the uclass platdata's @size and @align members to figure out + * This uses the uclass plat's @size and @align members to figure out * a size and position for each frame buffer as part of the pre-relocation * process of determining the post-relocation memory layout. * diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c index ba0e6bf9ea8..65fb41268ed 100644 --- a/lib/acpi/acpi_device.c +++ b/lib/acpi/acpi_device.c @@ -602,7 +602,7 @@ static void acpi_device_write_i2c(struct acpi_ctx *ctx, static int acpi_device_set_i2c(const struct udevice *dev, struct acpi_i2c *i2c, const char *scope) { - struct dm_i2c_chip *chip = dev_get_parent_platdata(dev); + struct dm_i2c_chip *chip = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev);

memset(i2c, '\0', sizeof(*i2c)); @@ -727,7 +727,7 @@ static int acpi_device_set_spi(const struct udevice *dev, struct acpi_spi *spi, struct dm_spi_slave_platdata *plat; struct spi_slave *slave = dev_get_parent_priv(dev);

- plat = dev_get_parent_platdata(slave->dev); + plat = dev_get_parent_plat(slave->dev); memset(spi, '\0', sizeof(*spi)); spi->device_select = plat->cs; spi->device_select_polarity = SPI_POLARITY_LOW; diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index fcd6eb87991..830fdabe387 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -59,8 +59,8 @@ struct efi_blk_platdata { static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct efi_blk_platdata *platdata = dev_get_platdata(dev); - struct efi_block_io *io = platdata->io; + struct efi_blk_platdata *plat = dev_get_platdata(dev); + struct efi_block_io *io = plat->io; efi_status_t ret;

EFI_PRINT("%s: read '%s', from block " LBAFU ", " LBAFU " blocks\n", @@ -88,8 +88,8 @@ static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, static ulong efi_bl_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct efi_blk_platdata *platdata = dev_get_platdata(dev); - struct efi_block_io *io = platdata->io; + struct efi_blk_platdata *plat = dev_get_platdata(dev); + struct efi_block_io *io = plat->io; efi_status_t ret;

EFI_PRINT("%s: write '%s', from block " LBAFU ", " LBAFU " blocks\n", @@ -118,7 +118,7 @@ static int efi_bl_bind_partitions(efi_handle_t handle, struct udevice *dev) struct blk_desc *desc; const char *if_typename;

- desc = dev_get_uclass_platdata(dev); + desc = dev_get_uclass_plat(dev); if_typename = blk_get_if_type_name(desc->if_type);

return efi_disk_create_partitions(handle, desc, if_typename, @@ -140,7 +140,7 @@ static int efi_bl_bind(efi_handle_t handle, void *interface) struct efi_object *obj = efi_search_obj(handle); struct efi_block_io *io = interface; int disks; - struct efi_blk_platdata *platdata; + struct efi_blk_platdata *plat;

EFI_PRINT("%s: handle %p, interface %p\n", __func__, handle, io);

@@ -169,9 +169,9 @@ static int efi_bl_bind(efi_handle_t handle, void *interface) /* Set the DM_FLAG_NAME_ALLOCED flag to avoid a memory leak */ device_set_name_alloced(bdev);

- platdata = dev_get_platdata(bdev); - platdata->handle = handle; - platdata->io = interface; + plat = dev_get_platdata(bdev); + plat->handle = handle; + plat->io = interface;

ret = device_probe(bdev); if (ret) @@ -196,7 +196,7 @@ U_BOOT_DRIVER(efi_blk) = { .name = "efi_blk", .id = UCLASS_BLK, .ops = &efi_blk_ops, - .platdata_auto = sizeof(struct efi_blk_platdata), + .plat_auto = sizeof(struct efi_blk_platdata), };

/* EFI driver operators */ diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 2726c5e42fd..99b50780063 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -531,7 +531,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) case UCLASS_ETH: { struct efi_device_path_mac_addr *dp = dp_fill(buf, dev->parent); - struct eth_pdata *pdata = dev->platdata; + struct eth_pdata *pdata = dev->plat;

dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; dp->dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_MAC_ADDR; @@ -551,7 +551,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) case UCLASS_ROOT: { /* stop traversing parents at this point: */ struct efi_device_path_vendor *dp; - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

dp_fill(buf, dev->parent); dp = buf; @@ -568,7 +568,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #ifdef CONFIG_VIRTIO_BLK case UCLASS_VIRTIO: { struct efi_device_path_vendor *dp; - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

dp_fill(buf, dev->parent); dp = buf; @@ -586,7 +586,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) case UCLASS_IDE: { struct efi_device_path_atapi *dp = dp_fill(buf, dev->parent); - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; dp->dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_ATAPI; @@ -603,7 +603,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) case UCLASS_SCSI: { struct efi_device_path_scsi *dp = dp_fill(buf, dev->parent); - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; dp->dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_SCSI; @@ -617,7 +617,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) case UCLASS_MMC: { struct efi_device_path_sd_mmc_path *sddp = dp_fill(buf, dev->parent); - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

sddp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; sddp->dp.sub_type = is_sd(desc) ? @@ -632,7 +632,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) case UCLASS_AHCI: { struct efi_device_path_sata *dp = dp_fill(buf, dev->parent); - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev);

dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; dp->dp.sub_type = DEVICE_PATH_SUB_TYPE_MSG_SATA; diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 7bd1ccec450..75fa9c9b064 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -527,7 +527,7 @@ efi_status_t efi_disk_register(void)

for (uclass_first_device_check(UCLASS_BLK, &dev); dev; uclass_next_device_check(&dev)) { - struct blk_desc *desc = dev_get_uclass_platdata(dev); + struct blk_desc *desc = dev_get_uclass_plat(dev); const char *if_typename = blk_get_if_type_name(desc->if_type);

/* Add block device for the full device */ diff --git a/lib/smbios.c b/lib/smbios.c index 485a812c776..4bd16556e36 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -229,7 +229,7 @@ static void smbios_write_type4_dm(struct smbios_type4 *t, ofnode node)

uclass_find_first_device(UCLASS_CPU, &cpu); if (cpu) { - struct cpu_platdata *plat = dev_get_parent_platdata(cpu); + struct cpu_platdata *plat = dev_get_parent_plat(cpu);

if (plat->family) processor_family = plat->family; diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 2c56b140184..e2d6731975a 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -146,7 +146,7 @@ unsigned char *eth_get_ethaddr(void) struct eth_pdata *pdata;

if (eth_get_dev()) { - pdata = eth_get_dev()->platdata; + pdata = eth_get_dev()->plat; return pdata->enetaddr; }

@@ -200,7 +200,7 @@ static int eth_write_hwaddr(struct udevice *dev)

/* seq is valid since the device is active */ if (eth_get_ops(dev)->write_hwaddr && !eth_mac_skip(dev_seq(dev))) { - pdata = dev->platdata; + pdata = dev->plat; if (!is_valid_ethaddr(pdata->enetaddr)) { printf("\nError: %s address %pM illegal value\n", dev->name, pdata->enetaddr); @@ -234,7 +234,7 @@ static int on_ethaddr(const char *name, const char *value, enum env_op op,

retval = uclass_find_device_by_seq(UCLASS_ETH, index, &dev); if (!retval) { - struct eth_pdata *pdata = dev->platdata; + struct eth_pdata *pdata = dev->plat; switch (op) { case env_op_create: case env_op_overwrite: @@ -503,7 +503,7 @@ static bool eth_dev_get_mac_address(struct udevice *dev, u8 mac[ARP_HLEN]) static int eth_post_probe(struct udevice *dev) { struct eth_device_priv *priv = dev->uclass_priv; - struct eth_pdata *pdata = dev->platdata; + struct eth_pdata *pdata = dev->plat; unsigned char env_enetaddr[ARP_HLEN]; char *source = "DT";

@@ -581,7 +581,7 @@ static int eth_post_probe(struct udevice *dev)

static int eth_pre_remove(struct udevice *dev) { - struct eth_pdata *pdata = dev->platdata; + struct eth_pdata *pdata = dev->plat;

eth_get_ops(dev)->stop(dev);

diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c index 3fb41840996..5f38f9fde41 100644 --- a/net/mdio-mux-uclass.c +++ b/net/mdio-mux-uclass.c @@ -65,7 +65,7 @@ static int mmux_change_sel(struct udevice *ch, bool sel) struct udevice *mux = ch->parent; struct mdio_mux_perdev_priv *priv = dev_get_uclass_priv(mux); struct mdio_mux_ops *ops = mdio_mux_get_ops(mux); - struct mdio_mux_ch_data *ch_data = dev_get_parent_platdata(ch); + struct mdio_mux_ch_data *ch_data = dev_get_parent_plat(ch); int err = 0;

if (sel) { @@ -147,7 +147,7 @@ static int mmux_reset(struct udevice *ch) /* Picks up the mux selection value for each child */ static int dm_mdio_mux_child_post_bind(struct udevice *ch) { - struct mdio_mux_ch_data *ch_data = dev_get_parent_platdata(ch); + struct mdio_mux_ch_data *ch_data = dev_get_parent_plat(ch);

ch_data->sel = dev_read_u32_default(ch, "reg", MDIO_MUX_SELECT_NONE);

@@ -229,5 +229,5 @@ UCLASS_DRIVER(mdio_mux) = { .post_bind = dm_mdio_mux_post_bind, .post_probe = dm_mdio_mux_post_probe, .per_device_auto = sizeof(struct mdio_mux_perdev_priv), - .per_child_platdata_auto = sizeof(struct mdio_mux_ch_data), + .per_child_plat_auto = sizeof(struct mdio_mux_ch_data), }; diff --git a/test/dm/acpi.c b/test/dm/acpi.c index c4fcdbbf4d4..12bdc29bd1f 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -110,7 +110,7 @@ U_BOOT_DRIVER(testacpi_drv) = { .of_match = testacpi_ids, .id = UCLASS_TEST_ACPI, .bind = dm_scan_fdt_dev, - .platdata_auto = sizeof(struct testacpi_platdata), + .plat_auto = sizeof(struct testacpi_platdata), ACPI_OPS_PTR(&testacpi_ops) };

diff --git a/test/dm/adc.c b/test/dm/adc.c index 8c6e4b0604e..740167e16b8 100644 --- a/test/dm/adc.c +++ b/test/dm/adc.c @@ -67,7 +67,7 @@ static int dm_test_adc_supply(struct unit_test_state *uts) ut_assertok(regulator_set_value(supply, SANDBOX_BUCK2_SET_UV)); ut_asserteq(SANDBOX_BUCK2_SET_UV, regulator_get_value(supply));

- /* Update ADC platdata and get new Vdd value */ + /* Update ADC plat and get new Vdd value */ ut_assertok(adc_vdd_value(dev, &uV)); ut_asserteq(SANDBOX_BUCK2_SET_UV, uV);

diff --git a/test/dm/blk.c b/test/dm/blk.c index ea5e0955d98..a39a1ebd289 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -136,7 +136,7 @@ static int dm_test_blk_devnum(struct unit_test_state *uts) * Check that the block device devnum matches its parent's * sequence number */ - desc = dev_get_uclass_platdata(dev); + desc = dev_get_uclass_plat(dev); ut_asserteq(desc->devnum, i); }

diff --git a/test/dm/bus.c b/test/dm/bus.c index 0919b3dba04..0adf1383226 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -19,7 +19,7 @@

DECLARE_GLOBAL_DATA_PTR;

-struct dm_test_parent_platdata { +struct dm_test_parent_plat { int count; int bind_flag; int uclass_bind_flag; @@ -39,9 +39,9 @@ static int testbus_drv_probe(struct udevice *dev)

static int testbus_child_post_bind(struct udevice *dev) { - struct dm_test_parent_platdata *plat; + struct dm_test_parent_plat *plat;

- plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); plat->bind_flag = 1; plat->uclass_bind_flag = 2;

@@ -101,10 +101,10 @@ U_BOOT_DRIVER(testbus_drv) = { .probe = testbus_drv_probe, .child_post_bind = testbus_child_post_bind, .priv_auto = sizeof(struct dm_test_priv), - .platdata_auto = sizeof(struct dm_test_pdata), + .plat_auto = sizeof(struct dm_test_pdata), .per_child_auto = sizeof(struct dm_test_parent_data), - .per_child_platdata_auto = - sizeof(struct dm_test_parent_platdata), + .per_child_plat_auto = + sizeof(struct dm_test_parent_plat), .child_pre_probe = testbus_child_pre_probe, .child_post_remove = testbus_child_post_remove, }; @@ -371,9 +371,9 @@ static int dm_test_bus_parent_ops(struct unit_test_state *uts) } DM_TEST(dm_test_bus_parent_ops, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);

-static int test_bus_parent_platdata(struct unit_test_state *uts) +static int test_bus_parent_plat(struct unit_test_state *uts) { - struct dm_test_parent_platdata *plat; + struct dm_test_parent_plat *plat; struct udevice *bus, *dev;

/* Check that the bus has no children */ @@ -387,7 +387,7 @@ static int test_bus_parent_platdata(struct unit_test_state *uts) dev; device_find_next_child(&dev)) { /* Check that platform data is allocated */ - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); ut_assert(plat != NULL);

/* @@ -399,7 +399,7 @@ static int test_bus_parent_platdata(struct unit_test_state *uts) device_probe(dev); device_remove(dev, DM_REMOVE_NORMAL);

- ut_asserteq_ptr(plat, dev_get_parent_platdata(dev)); + ut_asserteq_ptr(plat, dev_get_parent_plat(dev)); ut_asserteq(1, plat->count); ut_assertok(device_probe(dev)); } @@ -411,7 +411,7 @@ static int test_bus_parent_platdata(struct unit_test_state *uts) dev; device_find_next_child(&dev)) { /* Check that platform data is allocated */ - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); ut_assert(plat != NULL); ut_asserteq(1, plat->count); } @@ -424,13 +424,13 @@ static int test_bus_parent_platdata(struct unit_test_state *uts) device_unbind(dev); } while (dev);

- /* Now the child platdata should be removed and re-added */ + /* Now the child plat should be removed and re-added */ device_probe(bus); for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { /* Check that platform data is allocated */ - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); ut_assert(plat != NULL); ut_asserteq(0, plat->count); } @@ -440,14 +440,14 @@ static int test_bus_parent_platdata(struct unit_test_state *uts) }

/* Test that the bus can store platform data about each child */ -static int dm_test_bus_parent_platdata(struct unit_test_state *uts) +static int dm_test_bus_parent_plat(struct unit_test_state *uts) { - return test_bus_parent_platdata(uts); + return test_bus_parent_plat(uts); } -DM_TEST(dm_test_bus_parent_platdata, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); +DM_TEST(dm_test_bus_parent_plat, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);

/* As above but the size is controlled by the uclass */ -static int dm_test_bus_parent_platdata_uclass(struct unit_test_state *uts) +static int dm_test_bus_parent_plat_uclass(struct unit_test_state *uts) { struct udevice *bus; struct driver *drv; @@ -457,28 +457,28 @@ static int dm_test_bus_parent_platdata_uclass(struct unit_test_state *uts) /* Set the driver size to 0 so that the uclass size is used */ ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus)); drv = (struct driver *)bus->driver; - size = drv->per_child_platdata_auto; + size = drv->per_child_plat_auto; #ifdef CONFIG_SANDBOX os_mprotect_allow(bus->uclass->uc_drv, sizeof(*bus->uclass->uc_drv)); os_mprotect_allow(drv, sizeof(*drv)); #endif - bus->uclass->uc_drv->per_child_platdata_auto = size; - drv->per_child_platdata_auto = 0; - ret = test_bus_parent_platdata(uts); + bus->uclass->uc_drv->per_child_plat_auto = size; + drv->per_child_plat_auto = 0; + ret = test_bus_parent_plat(uts); if (ret) return ret; - bus->uclass->uc_drv->per_child_platdata_auto = 0; - drv->per_child_platdata_auto = size; + bus->uclass->uc_drv->per_child_plat_auto = 0; + drv->per_child_plat_auto = size;

return 0; } -DM_TEST(dm_test_bus_parent_platdata_uclass, +DM_TEST(dm_test_bus_parent_plat_uclass, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);

/* Test that the child post_bind method is called */ static int dm_test_bus_child_post_bind(struct unit_test_state *uts) { - struct dm_test_parent_platdata *plat; + struct dm_test_parent_plat *plat; struct udevice *bus, *dev;

ut_assertok(uclass_get_device(UCLASS_TEST_BUS, 0, &bus)); @@ -486,7 +486,7 @@ static int dm_test_bus_child_post_bind(struct unit_test_state *uts) dev; device_find_next_child(&dev)) { /* Check that platform data is allocated */ - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); ut_assert(plat != NULL); ut_asserteq(1, plat->bind_flag); } @@ -499,7 +499,7 @@ DM_TEST(dm_test_bus_child_post_bind, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); /* Test that the child post_bind method is called */ static int dm_test_bus_child_post_bind_uclass(struct unit_test_state *uts) { - struct dm_test_parent_platdata *plat; + struct dm_test_parent_plat *plat; struct udevice *bus, *dev;

ut_assertok(uclass_get_device(UCLASS_TEST_BUS, 0, &bus)); @@ -507,7 +507,7 @@ static int dm_test_bus_child_post_bind_uclass(struct unit_test_state *uts) dev; device_find_next_child(&dev)) { /* Check that platform data is allocated */ - plat = dev_get_parent_platdata(dev); + plat = dev_get_parent_plat(dev); ut_assert(plat != NULL); ut_asserteq(2, plat->uclass_bind_flag); } diff --git a/test/dm/core.c b/test/dm/core.c index e9168ec1930..5bdcab56504 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -45,27 +45,27 @@ static const struct dm_test_pdata test_pdata_pre_reloc = {

U_BOOT_DEVICE(dm_test_info1) = { .name = "test_drv", - .platdata = &test_pdata[0], + .plat = &test_pdata[0], };

U_BOOT_DEVICE(dm_test_info2) = { .name = "test_drv", - .platdata = &test_pdata[1], + .plat = &test_pdata[1], };

U_BOOT_DEVICE(dm_test_info3) = { .name = "test_drv", - .platdata = &test_pdata[2], + .plat = &test_pdata[2], };

static struct driver_info driver_info_manual = { .name = "test_manual_drv", - .platdata = &test_pdata_manual, + .plat = &test_pdata_manual, };

static struct driver_info driver_info_pre_reloc = { .name = "test_pre_reloc_drv", - .platdata = &test_pdata_pre_reloc, + .plat = &test_pdata_pre_reloc, };

static struct driver_info driver_info_act_dma = { @@ -105,7 +105,7 @@ int dm_leak_check_end(struct unit_test_state *uts) return 0; }

-/* Test that binding with platdata occurs correctly */ +/* Test that binding with plat occurs correctly */ static int dm_test_autobind(struct unit_test_state *uts) { struct dm_test_state *dms = uts->priv; @@ -140,7 +140,7 @@ static int dm_test_autobind(struct unit_test_state *uts) } DM_TEST(dm_test_autobind, 0);

-/* Test that binding with uclass platdata allocation occurs correctly */ +/* Test that binding with uclass plat allocation occurs correctly */ static int dm_test_autobind_uclass_pdata_alloc(struct unit_test_state *uts) { struct dm_test_perdev_uc_pdata *uc_pdata; @@ -152,16 +152,16 @@ static int dm_test_autobind_uclass_pdata_alloc(struct unit_test_state *uts)

/** * Test if test uclass driver requires allocation for the uclass - * platform data and then check the dev->uclass_platdata pointer. + * platform data and then check the dev->uclass_plat pointer. */ - ut_assert(uc->uc_drv->per_device_platdata_auto); + ut_assert(uc->uc_drv->per_device_plat_auto);

for (uclass_find_first_device(UCLASS_TEST, &dev); dev; uclass_find_next_device(&dev)) { ut_assertnonnull(dev);

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ut_assert(uc_pdata); }

@@ -169,7 +169,7 @@ static int dm_test_autobind_uclass_pdata_alloc(struct unit_test_state *uts) } DM_TEST(dm_test_autobind_uclass_pdata_alloc, UT_TESTF_SCAN_PDATA);

-/* Test that binding with uclass platdata setting occurs correctly */ +/* Test that binding with uclass plat setting occurs correctly */ static int dm_test_autobind_uclass_pdata_valid(struct unit_test_state *uts) { struct dm_test_perdev_uc_pdata *uc_pdata; @@ -184,7 +184,7 @@ static int dm_test_autobind_uclass_pdata_valid(struct unit_test_state *uts) uclass_find_next_device(&dev)) { ut_assertnonnull(dev);

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ut_assert(uc_pdata); ut_assert(uc_pdata->intval1 == TEST_UC_PDATA_INTVAL1); ut_assert(uc_pdata->intval2 == TEST_UC_PDATA_INTVAL2); @@ -255,7 +255,7 @@ static int dm_test_autoprobe(struct unit_test_state *uts) ut_assert(priv); ut_asserteq(expected_base_add, priv->base_add);

- pdata = dev->platdata; + pdata = dev->plat; expected_base_add += pdata->ping_add; }

@@ -263,7 +263,7 @@ static int dm_test_autoprobe(struct unit_test_state *uts) } DM_TEST(dm_test_autoprobe, UT_TESTF_SCAN_PDATA);

-/* Check that we see the correct platdata in each device */ +/* Check that we see the correct plat in each device */ static int dm_test_platdata(struct unit_test_state *uts) { const struct dm_test_pdata *pdata; @@ -273,7 +273,7 @@ static int dm_test_platdata(struct unit_test_state *uts) for (i = 0; i < 3; i++) { ut_assertok(uclass_find_device(UCLASS_TEST, i, &dev)); ut_assert(dev); - pdata = dev->platdata; + pdata = dev->plat; ut_assert(pdata->ping_add == test_pdata[i].ping_add); }

@@ -400,10 +400,10 @@ int dm_check_operations(struct unit_test_state *uts, struct udevice *dev, int expected; int pingret;

- /* Getting the child device should allocate platdata / priv */ + /* Getting the child device should allocate plat / priv */ ut_assertok(testfdt_ping(dev, 10, &pingret)); ut_assert(dev->priv); - ut_assert(dev->platdata); + ut_assert(dev->plat);

expected = 10 + base; ut_asserteq(expected, pingret); @@ -438,7 +438,7 @@ static int dm_test_operations(struct unit_test_state *uts)

/* * Get the 'reg' property, which tells us what the ping add - * should be. We don't use the platdata because we want + * should be. We don't use the plat because we want * to test the code that sets that up (testfdt_drv_probe()). */ base = test_pdata[i].ping_add; @@ -547,7 +547,7 @@ static int create_children(struct unit_test_state *uts, struct udevice *parent, &driver_info_manual, &dev)); pdata = calloc(1, sizeof(*pdata)); pdata->ping_add = key + i; - dev->platdata = pdata; + dev->plat = pdata; if (child) child[i] = dev; } diff --git a/test/dm/devres.c b/test/dm/devres.c index e1e088a3cac..00edbd0e9c0 100644 --- a/test/dm/devres.c +++ b/test/dm/devres.c @@ -158,7 +158,7 @@ static int dm_test_devres_phase(struct unit_test_state *uts) ut_asserteq(1, stats.allocs); ut_asserteq(TEST_DEVRES_SIZE, stats.total_size);

- /* Getting platdata should add one allocation */ + /* Getting plat should add one allocation */ ut_assertok(device_ofdata_to_platdata(dev)); devres_get_stats(dev, &stats); ut_asserteq(2, stats.allocs); diff --git a/test/dm/gpio.c b/test/dm/gpio.c index 54e960b1857..d7b85e74ce5 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -30,7 +30,7 @@ static int dm_test_gpio(struct unit_test_state *uts)

/* * We expect to get 4 banks. One is anonymous (just numbered) and - * comes from platdata. The other are named a (20 gpios), + * comes from plat. The other are named a (20 gpios), * b (10 gpios) and c (10 gpios) and come from the device tree. See * test/dm/test.dts. */ diff --git a/test/dm/ofread.c b/test/dm/ofread.c index 9064426e213..8c7dd825136 100644 --- a/test/dm/ofread.c +++ b/test/dm/ofread.c @@ -33,7 +33,7 @@ static int dm_test_ofnode_get_property_by_prop(struct unit_test_state *uts) ut_asserteq(4, len); break; case 3: - /* only for platdata */ + /* only for plat */ ut_asserteq_str("name", propname); ut_asserteq(6, len); ut_asserteq_str("flash", value); diff --git a/test/dm/regulator.c b/test/dm/regulator.c index 0e7a232a708..86f4862d9dd 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -50,7 +50,7 @@ static const char *regulator_names[OUTPUT_COUNT][OUTPUT_NAME_COUNT] = { /* Test regulator get method */ static int dm_test_power_regulator_get(struct unit_test_state *uts) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev_by_devname; struct udevice *dev_by_platname; const char *devname; @@ -77,7 +77,7 @@ static int dm_test_power_regulator_get(struct unit_test_state *uts) * a device with the name equal to the requested one. */ ut_assertok(regulator_get_by_platname(platname, &dev_by_platname)); - uc_pdata = dev_get_uclass_platdata(dev_by_platname); + uc_pdata = dev_get_uclass_plat(dev_by_platname); ut_assert(uc_pdata); ut_asserteq_str(platname, uc_pdata->name);

@@ -95,7 +95,7 @@ DM_TEST(dm_test_power_regulator_get, UT_TESTF_SCAN_FDT); /* Test regulator set and get Voltage method */ static int dm_test_power_regulator_set_get_voltage(struct unit_test_state *uts) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev; const char *platname; int val_set, val_get; @@ -104,7 +104,7 @@ static int dm_test_power_regulator_set_get_voltage(struct unit_test_state *uts) platname = regulator_names[BUCK1][PLATNAME]; ut_assertok(regulator_get_by_platname(platname, &dev));

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ut_assert(uc_pdata);

val_set = uc_pdata->min_uV; @@ -122,7 +122,7 @@ DM_TEST(dm_test_power_regulator_set_get_voltage, UT_TESTF_SCAN_FDT); /* Test regulator set and get Current method */ static int dm_test_power_regulator_set_get_current(struct unit_test_state *uts) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev; const char *platname; int val_set, val_get; @@ -131,7 +131,7 @@ static int dm_test_power_regulator_set_get_current(struct unit_test_state *uts) platname = regulator_names[LDO1][PLATNAME]; ut_assertok(regulator_get_by_platname(platname, &dev));

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ut_assert(uc_pdata);

val_set = uc_pdata->min_uA; @@ -146,7 +146,7 @@ static int dm_test_power_regulator_set_get_current(struct unit_test_state *uts) platname = regulator_names[LDO2][PLATNAME]; ut_assertok(regulator_get_by_platname(platname, &dev));

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ut_assert(uc_pdata); ut_asserteq(-ENODATA, uc_pdata->min_uA); ut_asserteq(-ENODATA, uc_pdata->max_uA); @@ -220,7 +220,7 @@ DM_TEST(dm_test_power_regulator_set_get_mode, UT_TESTF_SCAN_FDT); /* Test regulator set and get suspend Voltage method */ static int dm_test_power_regulator_set_get_suspend_voltage(struct unit_test_state *uts) { - struct dm_regulator_uclass_platdata *uc_pdata; + struct dm_regulator_uclass_plat *uc_pdata; const struct dm_regulator_ops *ops; struct udevice *dev; const char *platname; @@ -230,7 +230,7 @@ static int dm_test_power_regulator_set_get_suspend_voltage(struct unit_test_stat platname = regulator_names[BUCK1][PLATNAME]; ut_assertok(regulator_get_by_platname(platname, &dev));

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ut_assert(uc_pdata);

ops = dev_get_driver_ops(dev); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index d69579846b2..3f61f93386b 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;

static int testfdt_drv_ping(struct udevice *dev, int pingval, int *pingret) { - const struct dm_test_pdata *pdata = dev->platdata; + const struct dm_test_pdata *pdata = dev->plat; struct dm_test_priv *priv = dev_get_priv(dev);

*pingret = pingval + pdata->ping_add; @@ -87,7 +87,7 @@ U_BOOT_DRIVER(testfdt_drv) = { .probe = testfdt_drv_probe, .ops = &test_ops, .priv_auto = sizeof(struct dm_test_priv), - .platdata_auto = sizeof(struct dm_test_pdata), + .plat_auto = sizeof(struct dm_test_pdata), };

static const struct udevice_id testfdt1_ids[] = { @@ -105,7 +105,7 @@ U_BOOT_DRIVER(testfdt1_drv) = { .probe = testfdt_drv_probe, .ops = &test_ops, .priv_auto = sizeof(struct dm_test_priv), - .platdata_auto = sizeof(struct dm_test_pdata), + .plat_auto = sizeof(struct dm_test_pdata), .flags = DM_FLAG_PRE_RELOC, };

@@ -147,7 +147,7 @@ U_BOOT_DRIVER(testprobe_drv) = { .of_match = testprobe_ids, .id = UCLASS_TEST_PROBE, .probe = testprobe_drv_probe, - .platdata_auto = sizeof(struct dm_testprobe_pdata), + .plat_auto = sizeof(struct dm_testprobe_pdata), };

UCLASS_DRIVER(testprobe) = { @@ -204,7 +204,7 @@ U_BOOT_DRIVER(testdevres_drv) = { .bind = testdevres_drv_bind, .ofdata_to_platdata = testdevres_drv_ofdata_to_platdata, .probe = testdevres_drv_probe, - .platdata_auto = sizeof(struct dm_testdevres_pdata), + .plat_auto = sizeof(struct dm_testdevres_pdata), .priv_auto = sizeof(struct dm_testdevres_priv), };

@@ -232,7 +232,7 @@ int dm_check_devices(struct unit_test_state *uts, int num_devices)

/* * Get the 'ping-expect' property, which tells us what the - * ping add should be. We don't use the platdata because we + * ping add should be. We don't use the plat because we * want to test the code that sets that up * (testfdt_drv_probe()). */ @@ -271,7 +271,7 @@ static int dm_test_fdt(struct unit_test_state *uts) ret = uclass_find_device(UCLASS_TEST_FDT, i, &dev); ut_assert(!ret); ut_assert(!dev_get_priv(dev)); - ut_assert(dev->platdata); + ut_assert(dev->plat); }

ut_assertok(dm_check_devices(uts, num_devices)); diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 94c2753ed95..378fc1e536a 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -36,7 +36,7 @@ static int test_post_bind(struct udevice *dev) dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++; ut_assert(!device_active(dev));

- uc_pdata = dev_get_uclass_platdata(dev); + uc_pdata = dev_get_uclass_plat(dev); ut_assert(uc_pdata);

uc_pdata->intval1 = TEST_UC_PDATA_INTVAL1; @@ -82,7 +82,7 @@ static int test_post_probe(struct udevice *dev) if (&prev->uclass_node != &uc->dev_head) { struct dm_test_uclass_perdev_priv *prev_uc_priv = dev_get_uclass_priv(prev); - struct dm_test_pdata *pdata = prev->platdata; + struct dm_test_pdata *pdata = prev->plat;

ut_assert(pdata); ut_assert(prev_uc_priv); @@ -126,6 +126,6 @@ UCLASS_DRIVER(test) = { .destroy = test_destroy, .priv_auto = sizeof(struct dm_test_uclass_priv), .per_device_auto = sizeof(struct dm_test_uclass_perdev_priv), - .per_device_platdata_auto = + .per_device_plat_auto = sizeof(struct dm_test_perdev_uc_pdata), }; diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index b0d3c27720c..2f3413cf20c 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -659,7 +659,7 @@ class DtbPlatdata(object): # Add a device declaration self.buf('U_BOOT_DEVICE(%s) = {\n' % var_name) self.buf('\t.name\t\t= "%s",\n' % struct_name) - self.buf('\t.platdata\t= &%s%s,\n' % (VAL_PREFIX, var_name)) + self.buf('\t.plat\t= &%s%s,\n' % (VAL_PREFIX, var_name)) self.buf('\t.platdata_size\t= sizeof(%s%s),\n' % (VAL_PREFIX, var_name)) idx = -1 if node.parent and node.parent in self._valid_nodes: diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 6dd8a5ca473..6992a66c884 100755 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -217,7 +217,7 @@ static struct dtd_sandbox_i2c_test dtv_i2c_at_0 = { }; U_BOOT_DEVICE(i2c_at_0) = { \t.name\t\t= "sandbox_i2c_test", -\t.platdata\t= &dtv_i2c_at_0, +\t.plat\t= &dtv_i2c_at_0, \t.platdata_size\t= sizeof(dtv_i2c_at_0), \t.parent_idx\t= -1, }; @@ -229,7 +229,7 @@ static struct dtd_sandbox_pmic_test dtv_pmic_at_9 = { }; U_BOOT_DEVICE(pmic_at_9) = { \t.name\t\t= "sandbox_pmic_test", -\t.platdata\t= &dtv_pmic_at_9, +\t.plat\t= &dtv_pmic_at_9, \t.platdata_size\t= sizeof(dtv_pmic_at_9), \t.parent_idx\t= 0, }; @@ -249,7 +249,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test = { }; U_BOOT_DEVICE(spl_test) = { \t.name\t\t= "sandbox_spl_test", -\t.platdata\t= &dtv_spl_test, +\t.plat\t= &dtv_spl_test, \t.platdata_size\t= sizeof(dtv_spl_test), \t.parent_idx\t= -1, }; @@ -268,7 +268,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test2 = { }; U_BOOT_DEVICE(spl_test2) = { \t.name\t\t= "sandbox_spl_test", -\t.platdata\t= &dtv_spl_test2, +\t.plat\t= &dtv_spl_test2, \t.platdata_size\t= sizeof(dtv_spl_test2), \t.parent_idx\t= -1, }; @@ -281,7 +281,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test3 = { }; U_BOOT_DEVICE(spl_test3) = { \t.name\t\t= "sandbox_spl_test", -\t.platdata\t= &dtv_spl_test3, +\t.plat\t= &dtv_spl_test3, \t.platdata_size\t= sizeof(dtv_spl_test3), \t.parent_idx\t= -1, }; @@ -291,7 +291,7 @@ static struct dtd_sandbox_spl_test_2 dtv_spl_test4 = { }; U_BOOT_DEVICE(spl_test4) = { \t.name\t\t= "sandbox_spl_test_2", -\t.platdata\t= &dtv_spl_test4, +\t.plat\t= &dtv_spl_test4, \t.platdata_size\t= sizeof(dtv_spl_test4), \t.parent_idx\t= -1, }; @@ -325,7 +325,7 @@ static struct dtd_sandbox_gpio dtv_gpios_at_0 = { }; U_BOOT_DEVICE(gpios_at_0) = { \t.name\t\t= "sandbox_gpio", -\t.platdata\t= &dtv_gpios_at_0, +\t.plat\t= &dtv_gpios_at_0, \t.platdata_size\t= sizeof(dtv_gpios_at_0), \t.parent_idx\t= -1, }; @@ -357,7 +357,7 @@ static struct dtd_invalid dtv_spl_test = { }; U_BOOT_DEVICE(spl_test) = { \t.name\t\t= "invalid", -\t.platdata\t= &dtv_spl_test, +\t.plat\t= &dtv_spl_test, \t.platdata_size\t= sizeof(dtv_spl_test), \t.parent_idx\t= -1, }; @@ -392,7 +392,7 @@ static struct dtd_target dtv_phandle2_target = { }; U_BOOT_DEVICE(phandle2_target) = { \t.name\t\t= "target", -\t.platdata\t= &dtv_phandle2_target, +\t.plat\t= &dtv_phandle2_target, \t.platdata_size\t= sizeof(dtv_phandle2_target), \t.parent_idx\t= -1, }; @@ -403,7 +403,7 @@ static struct dtd_target dtv_phandle3_target = { }; U_BOOT_DEVICE(phandle3_target) = { \t.name\t\t= "target", -\t.platdata\t= &dtv_phandle3_target, +\t.plat\t= &dtv_phandle3_target, \t.platdata_size\t= sizeof(dtv_phandle3_target), \t.parent_idx\t= -1, }; @@ -414,7 +414,7 @@ static struct dtd_target dtv_phandle_target = { }; U_BOOT_DEVICE(phandle_target) = { \t.name\t\t= "target", -\t.platdata\t= &dtv_phandle_target, +\t.plat\t= &dtv_phandle_target, \t.platdata_size\t= sizeof(dtv_phandle_target), \t.parent_idx\t= -1, }; @@ -429,7 +429,7 @@ static struct dtd_source dtv_phandle_source = { }; U_BOOT_DEVICE(phandle_source) = { \t.name\t\t= "source", -\t.platdata\t= &dtv_phandle_source, +\t.plat\t= &dtv_phandle_source, \t.platdata_size\t= sizeof(dtv_phandle_source), \t.parent_idx\t= -1, }; @@ -441,7 +441,7 @@ static struct dtd_source dtv_phandle_source2 = { }; U_BOOT_DEVICE(phandle_source2) = { \t.name\t\t= "source", -\t.platdata\t= &dtv_phandle_source2, +\t.plat\t= &dtv_phandle_source2, \t.platdata_size\t= sizeof(dtv_phandle_source2), \t.parent_idx\t= -1, }; @@ -479,7 +479,7 @@ static struct dtd_target dtv_phandle_target = { }; U_BOOT_DEVICE(phandle_target) = { \t.name\t\t= "target", -\t.platdata\t= &dtv_phandle_target, +\t.plat\t= &dtv_phandle_target, \t.platdata_size\t= sizeof(dtv_phandle_target), \t.parent_idx\t= -1, }; @@ -491,7 +491,7 @@ static struct dtd_source dtv_phandle_source2 = { }; U_BOOT_DEVICE(phandle_source2) = { \t.name\t\t= "source", -\t.platdata\t= &dtv_phandle_source2, +\t.plat\t= &dtv_phandle_source2, \t.platdata_size\t= sizeof(dtv_phandle_source2), \t.parent_idx\t= -1, }; @@ -514,7 +514,7 @@ static struct dtd_target dtv_phandle2_target = { }; U_BOOT_DEVICE(phandle2_target) = { \t.name\t\t= "target", -\t.platdata\t= &dtv_phandle2_target, +\t.plat\t= &dtv_phandle2_target, \t.platdata_size\t= sizeof(dtv_phandle2_target), \t.parent_idx\t= -1, }; @@ -525,7 +525,7 @@ static struct dtd_target dtv_phandle3_target = { }; U_BOOT_DEVICE(phandle3_target) = { \t.name\t\t= "target", -\t.platdata\t= &dtv_phandle3_target, +\t.plat\t= &dtv_phandle3_target, \t.platdata_size\t= sizeof(dtv_phandle3_target), \t.parent_idx\t= -1, }; @@ -536,7 +536,7 @@ static struct dtd_target dtv_phandle_target = { }; U_BOOT_DEVICE(phandle_target) = { \t.name\t\t= "target", -\t.platdata\t= &dtv_phandle_target, +\t.plat\t= &dtv_phandle_target, \t.platdata_size\t= sizeof(dtv_phandle_target), \t.parent_idx\t= -1, }; @@ -551,7 +551,7 @@ static struct dtd_source dtv_phandle_source = { }; U_BOOT_DEVICE(phandle_source) = { \t.name\t\t= "source", -\t.platdata\t= &dtv_phandle_source, +\t.plat\t= &dtv_phandle_source, \t.platdata_size\t= sizeof(dtv_phandle_source), \t.parent_idx\t= -1, }; @@ -563,7 +563,7 @@ static struct dtd_source dtv_phandle_source2 = { }; U_BOOT_DEVICE(phandle_source2) = { \t.name\t\t= "source", -\t.platdata\t= &dtv_phandle_source2, +\t.plat\t= &dtv_phandle_source2, \t.platdata_size\t= sizeof(dtv_phandle_source2), \t.parent_idx\t= -1, }; @@ -621,7 +621,7 @@ static struct dtd_test1 dtv_test1 = { }; U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", -\t.platdata\t= &dtv_test1, +\t.plat\t= &dtv_test1, \t.platdata_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, }; @@ -632,7 +632,7 @@ static struct dtd_test2 dtv_test2 = { }; U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", -\t.platdata\t= &dtv_test2, +\t.plat\t= &dtv_test2, \t.platdata_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, }; @@ -643,7 +643,7 @@ static struct dtd_test3 dtv_test3 = { }; U_BOOT_DEVICE(test3) = { \t.name\t\t= "test3", -\t.platdata\t= &dtv_test3, +\t.plat\t= &dtv_test3, \t.platdata_size\t= sizeof(dtv_test3), \t.parent_idx\t= -1, }; @@ -676,7 +676,7 @@ static struct dtd_test1 dtv_test1 = { }; U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", -\t.platdata\t= &dtv_test1, +\t.plat\t= &dtv_test1, \t.platdata_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, }; @@ -687,7 +687,7 @@ static struct dtd_test2 dtv_test2 = { }; U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", -\t.platdata\t= &dtv_test2, +\t.plat\t= &dtv_test2, \t.platdata_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, }; @@ -723,7 +723,7 @@ static struct dtd_test1 dtv_test1 = { }; U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", -\t.platdata\t= &dtv_test1, +\t.plat\t= &dtv_test1, \t.platdata_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, }; @@ -734,7 +734,7 @@ static struct dtd_test2 dtv_test2 = { }; U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", -\t.platdata\t= &dtv_test2, +\t.plat\t= &dtv_test2, \t.platdata_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, }; @@ -745,7 +745,7 @@ static struct dtd_test3 dtv_test3 = { }; U_BOOT_DEVICE(test3) = { \t.name\t\t= "test3", -\t.platdata\t= &dtv_test3, +\t.plat\t= &dtv_test3, \t.platdata_size\t= sizeof(dtv_test3), \t.parent_idx\t= -1, }; @@ -781,7 +781,7 @@ static struct dtd_test1 dtv_test1 = { }; U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", -\t.platdata\t= &dtv_test1, +\t.plat\t= &dtv_test1, \t.platdata_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, }; @@ -792,7 +792,7 @@ static struct dtd_test2 dtv_test2 = { }; U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", -\t.platdata\t= &dtv_test2, +\t.plat\t= &dtv_test2, \t.platdata_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, }; @@ -803,7 +803,7 @@ static struct dtd_test3 dtv_test3 = { }; U_BOOT_DEVICE(test3) = { \t.name\t\t= "test3", -\t.platdata\t= &dtv_test3, +\t.plat\t= &dtv_test3, \t.platdata_size\t= sizeof(dtv_test3), \t.parent_idx\t= -1, }; @@ -854,7 +854,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test = { }; U_BOOT_DEVICE(spl_test) = { \t.name\t\t= "sandbox_spl_test", -\t.platdata\t= &dtv_spl_test, +\t.plat\t= &dtv_spl_test, \t.platdata_size\t= sizeof(dtv_spl_test), \t.parent_idx\t= -1, }; @@ -865,7 +865,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test2 = { }; U_BOOT_DEVICE(spl_test2) = { \t.name\t\t= "sandbox_spl_test", -\t.platdata\t= &dtv_spl_test2, +\t.plat\t= &dtv_spl_test2, \t.platdata_size\t= sizeof(dtv_spl_test2), \t.parent_idx\t= -1, };

Rename this to be consistent with the change from 'platdata'.

Signed-off-by: Simon Glass sjg@chromium.org ---

doc/driver-model/of-plat.rst | 2 +- drivers/core/device.c | 15 ++++---- include/dm/platdata.h | 4 +-- tools/dtoc/dtb_platdata.py | 2 +- tools/dtoc/test_dtoc.py | 66 ++++++++++++++++++------------------ 5 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst index a05faf739fd..8c2bfb4099c 100644 --- a/doc/driver-model/of-plat.rst +++ b/doc/driver-model/of-plat.rst @@ -308,7 +308,7 @@ of-platdata struct to the standard one used by the driver. In the case where SPL_OF_PLATDATA is enabled, plat_auto is still used to allocate space for the platform data. This is different from the normal behaviour and is triggered by the use of of-platdata (strictly -speaking it is a non-zero platdata_size which triggers this). +speaking it is a non-zero plat_size which triggers this).

The of-platdata struct contents is copied from the C structure data to the start of the newly allocated area. In the case where device tree is used, diff --git a/drivers/core/device.c b/drivers/core/device.c index a91d7237d4d..5f6f99770d4 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -36,7 +36,7 @@ DECLARE_GLOBAL_DATA_PTR; static int device_bind_common(struct udevice *parent, const struct driver *drv, const char *name, void *plat, ulong driver_data, ofnode node, - uint of_platdata_size, struct udevice **devp) + uint of_plat_size, struct udevice **devp) { struct udevice *dev; struct uclass *uc; @@ -98,9 +98,9 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, bool alloc = !plat;

if (CONFIG_IS_ENABLED(OF_PLATDATA)) { - if (of_platdata_size) { + if (of_plat_size) { dev->flags |= DM_FLAG_OF_PLATDATA; - if (of_platdata_size < drv->plat_auto) + if (of_plat_size < drv->plat_auto) alloc = true; } } @@ -112,8 +112,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, goto fail_alloc1; } if (CONFIG_IS_ENABLED(OF_PLATDATA) && plat) { - memcpy(dev->plat, plat, - of_platdata_size); + memcpy(dev->plat, plat, of_plat_size); } } } @@ -239,7 +238,7 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only, const struct driver_info *info, struct udevice **devp) { struct driver *drv; - uint platdata_size = 0; + uint plat_size = 0; int ret;

drv = lists_driver_lookup_name(info->name); @@ -249,10 +248,10 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only, return -EPERM;

#if CONFIG_IS_ENABLED(OF_PLATDATA) - platdata_size = info->platdata_size; + plat_size = info->plat_size; #endif ret = device_bind_common(parent, drv, info->name, (void *)info->plat, 0, - ofnode_null(), platdata_size, devp); + ofnode_null(), plat_size, devp); if (ret) return ret;

diff --git a/include/dm/platdata.h b/include/dm/platdata.h index 6094b663f8b..d650fb39190 100644 --- a/include/dm/platdata.h +++ b/include/dm/platdata.h @@ -21,14 +21,14 @@ * * @name: Driver name * @plat: Driver-specific platform data - * @platdata_size: Size of platform data structure + * @plat_size: Size of platform data structure * @parent_idx: Index of the parent driver_info structure */ struct driver_info { const char *name; const void *plat; #if CONFIG_IS_ENABLED(OF_PLATDATA) - unsigned short platdata_size; + unsigned short plat_size; short parent_idx; #endif }; diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index 2f3413cf20c..82671138a9a 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -660,7 +660,7 @@ class DtbPlatdata(object): self.buf('U_BOOT_DEVICE(%s) = {\n' % var_name) self.buf('\t.name\t\t= "%s",\n' % struct_name) self.buf('\t.plat\t= &%s%s,\n' % (VAL_PREFIX, var_name)) - self.buf('\t.platdata_size\t= sizeof(%s%s),\n' % (VAL_PREFIX, var_name)) + self.buf('\t.plat_size\t= sizeof(%s%s),\n' % (VAL_PREFIX, var_name)) idx = -1 if node.parent and node.parent in self._valid_nodes: idx = node.parent.idx diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 6992a66c884..4913d950218 100755 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -218,7 +218,7 @@ static struct dtd_sandbox_i2c_test dtv_i2c_at_0 = { U_BOOT_DEVICE(i2c_at_0) = { \t.name\t\t= "sandbox_i2c_test", \t.plat\t= &dtv_i2c_at_0, -\t.platdata_size\t= sizeof(dtv_i2c_at_0), +\t.plat_size\t= sizeof(dtv_i2c_at_0), \t.parent_idx\t= -1, };

@@ -230,7 +230,7 @@ static struct dtd_sandbox_pmic_test dtv_pmic_at_9 = { U_BOOT_DEVICE(pmic_at_9) = { \t.name\t\t= "sandbox_pmic_test", \t.plat\t= &dtv_pmic_at_9, -\t.platdata_size\t= sizeof(dtv_pmic_at_9), +\t.plat_size\t= sizeof(dtv_pmic_at_9), \t.parent_idx\t= 0, };

@@ -250,7 +250,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test = { U_BOOT_DEVICE(spl_test) = { \t.name\t\t= "sandbox_spl_test", \t.plat\t= &dtv_spl_test, -\t.platdata_size\t= sizeof(dtv_spl_test), +\t.plat_size\t= sizeof(dtv_spl_test), \t.parent_idx\t= -1, };

@@ -269,7 +269,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test2 = { U_BOOT_DEVICE(spl_test2) = { \t.name\t\t= "sandbox_spl_test", \t.plat\t= &dtv_spl_test2, -\t.platdata_size\t= sizeof(dtv_spl_test2), +\t.plat_size\t= sizeof(dtv_spl_test2), \t.parent_idx\t= -1, };

@@ -282,7 +282,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test3 = { U_BOOT_DEVICE(spl_test3) = { \t.name\t\t= "sandbox_spl_test", \t.plat\t= &dtv_spl_test3, -\t.platdata_size\t= sizeof(dtv_spl_test3), +\t.plat_size\t= sizeof(dtv_spl_test3), \t.parent_idx\t= -1, };

@@ -292,7 +292,7 @@ static struct dtd_sandbox_spl_test_2 dtv_spl_test4 = { U_BOOT_DEVICE(spl_test4) = { \t.name\t\t= "sandbox_spl_test_2", \t.plat\t= &dtv_spl_test4, -\t.platdata_size\t= sizeof(dtv_spl_test4), +\t.plat_size\t= sizeof(dtv_spl_test4), \t.parent_idx\t= -1, };

@@ -326,7 +326,7 @@ static struct dtd_sandbox_gpio dtv_gpios_at_0 = { U_BOOT_DEVICE(gpios_at_0) = { \t.name\t\t= "sandbox_gpio", \t.plat\t= &dtv_gpios_at_0, -\t.platdata_size\t= sizeof(dtv_gpios_at_0), +\t.plat_size\t= sizeof(dtv_gpios_at_0), \t.parent_idx\t= -1, };

@@ -358,7 +358,7 @@ static struct dtd_invalid dtv_spl_test = { U_BOOT_DEVICE(spl_test) = { \t.name\t\t= "invalid", \t.plat\t= &dtv_spl_test, -\t.platdata_size\t= sizeof(dtv_spl_test), +\t.plat_size\t= sizeof(dtv_spl_test), \t.parent_idx\t= -1, };

@@ -393,7 +393,7 @@ static struct dtd_target dtv_phandle2_target = { U_BOOT_DEVICE(phandle2_target) = { \t.name\t\t= "target", \t.plat\t= &dtv_phandle2_target, -\t.platdata_size\t= sizeof(dtv_phandle2_target), +\t.plat_size\t= sizeof(dtv_phandle2_target), \t.parent_idx\t= -1, };

@@ -404,7 +404,7 @@ static struct dtd_target dtv_phandle3_target = { U_BOOT_DEVICE(phandle3_target) = { \t.name\t\t= "target", \t.plat\t= &dtv_phandle3_target, -\t.platdata_size\t= sizeof(dtv_phandle3_target), +\t.plat_size\t= sizeof(dtv_phandle3_target), \t.parent_idx\t= -1, };

@@ -415,7 +415,7 @@ static struct dtd_target dtv_phandle_target = { U_BOOT_DEVICE(phandle_target) = { \t.name\t\t= "target", \t.plat\t= &dtv_phandle_target, -\t.platdata_size\t= sizeof(dtv_phandle_target), +\t.plat_size\t= sizeof(dtv_phandle_target), \t.parent_idx\t= -1, };

@@ -430,7 +430,7 @@ static struct dtd_source dtv_phandle_source = { U_BOOT_DEVICE(phandle_source) = { \t.name\t\t= "source", \t.plat\t= &dtv_phandle_source, -\t.platdata_size\t= sizeof(dtv_phandle_source), +\t.plat_size\t= sizeof(dtv_phandle_source), \t.parent_idx\t= -1, };

@@ -442,7 +442,7 @@ static struct dtd_source dtv_phandle_source2 = { U_BOOT_DEVICE(phandle_source2) = { \t.name\t\t= "source", \t.plat\t= &dtv_phandle_source2, -\t.platdata_size\t= sizeof(dtv_phandle_source2), +\t.plat_size\t= sizeof(dtv_phandle_source2), \t.parent_idx\t= -1, };

@@ -480,7 +480,7 @@ static struct dtd_target dtv_phandle_target = { U_BOOT_DEVICE(phandle_target) = { \t.name\t\t= "target", \t.plat\t= &dtv_phandle_target, -\t.platdata_size\t= sizeof(dtv_phandle_target), +\t.plat_size\t= sizeof(dtv_phandle_target), \t.parent_idx\t= -1, };

@@ -492,7 +492,7 @@ static struct dtd_source dtv_phandle_source2 = { U_BOOT_DEVICE(phandle_source2) = { \t.name\t\t= "source", \t.plat\t= &dtv_phandle_source2, -\t.platdata_size\t= sizeof(dtv_phandle_source2), +\t.plat_size\t= sizeof(dtv_phandle_source2), \t.parent_idx\t= -1, };

@@ -515,7 +515,7 @@ static struct dtd_target dtv_phandle2_target = { U_BOOT_DEVICE(phandle2_target) = { \t.name\t\t= "target", \t.plat\t= &dtv_phandle2_target, -\t.platdata_size\t= sizeof(dtv_phandle2_target), +\t.plat_size\t= sizeof(dtv_phandle2_target), \t.parent_idx\t= -1, };

@@ -526,7 +526,7 @@ static struct dtd_target dtv_phandle3_target = { U_BOOT_DEVICE(phandle3_target) = { \t.name\t\t= "target", \t.plat\t= &dtv_phandle3_target, -\t.platdata_size\t= sizeof(dtv_phandle3_target), +\t.plat_size\t= sizeof(dtv_phandle3_target), \t.parent_idx\t= -1, };

@@ -537,7 +537,7 @@ static struct dtd_target dtv_phandle_target = { U_BOOT_DEVICE(phandle_target) = { \t.name\t\t= "target", \t.plat\t= &dtv_phandle_target, -\t.platdata_size\t= sizeof(dtv_phandle_target), +\t.plat_size\t= sizeof(dtv_phandle_target), \t.parent_idx\t= -1, };

@@ -552,7 +552,7 @@ static struct dtd_source dtv_phandle_source = { U_BOOT_DEVICE(phandle_source) = { \t.name\t\t= "source", \t.plat\t= &dtv_phandle_source, -\t.platdata_size\t= sizeof(dtv_phandle_source), +\t.plat_size\t= sizeof(dtv_phandle_source), \t.parent_idx\t= -1, };

@@ -564,7 +564,7 @@ static struct dtd_source dtv_phandle_source2 = { U_BOOT_DEVICE(phandle_source2) = { \t.name\t\t= "source", \t.plat\t= &dtv_phandle_source2, -\t.platdata_size\t= sizeof(dtv_phandle_source2), +\t.plat_size\t= sizeof(dtv_phandle_source2), \t.parent_idx\t= -1, };

@@ -622,7 +622,7 @@ static struct dtd_test1 dtv_test1 = { U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", \t.plat\t= &dtv_test1, -\t.platdata_size\t= sizeof(dtv_test1), +\t.plat_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, };

@@ -633,7 +633,7 @@ static struct dtd_test2 dtv_test2 = { U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", \t.plat\t= &dtv_test2, -\t.platdata_size\t= sizeof(dtv_test2), +\t.plat_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, };

@@ -644,7 +644,7 @@ static struct dtd_test3 dtv_test3 = { U_BOOT_DEVICE(test3) = { \t.name\t\t= "test3", \t.plat\t= &dtv_test3, -\t.platdata_size\t= sizeof(dtv_test3), +\t.plat_size\t= sizeof(dtv_test3), \t.parent_idx\t= -1, };

@@ -677,7 +677,7 @@ static struct dtd_test1 dtv_test1 = { U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", \t.plat\t= &dtv_test1, -\t.platdata_size\t= sizeof(dtv_test1), +\t.plat_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, };

@@ -688,7 +688,7 @@ static struct dtd_test2 dtv_test2 = { U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", \t.plat\t= &dtv_test2, -\t.platdata_size\t= sizeof(dtv_test2), +\t.plat_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, };

@@ -724,7 +724,7 @@ static struct dtd_test1 dtv_test1 = { U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", \t.plat\t= &dtv_test1, -\t.platdata_size\t= sizeof(dtv_test1), +\t.plat_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, };

@@ -735,7 +735,7 @@ static struct dtd_test2 dtv_test2 = { U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", \t.plat\t= &dtv_test2, -\t.platdata_size\t= sizeof(dtv_test2), +\t.plat_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, };

@@ -746,7 +746,7 @@ static struct dtd_test3 dtv_test3 = { U_BOOT_DEVICE(test3) = { \t.name\t\t= "test3", \t.plat\t= &dtv_test3, -\t.platdata_size\t= sizeof(dtv_test3), +\t.plat_size\t= sizeof(dtv_test3), \t.parent_idx\t= -1, };

@@ -782,7 +782,7 @@ static struct dtd_test1 dtv_test1 = { U_BOOT_DEVICE(test1) = { \t.name\t\t= "test1", \t.plat\t= &dtv_test1, -\t.platdata_size\t= sizeof(dtv_test1), +\t.plat_size\t= sizeof(dtv_test1), \t.parent_idx\t= -1, };

@@ -793,7 +793,7 @@ static struct dtd_test2 dtv_test2 = { U_BOOT_DEVICE(test2) = { \t.name\t\t= "test2", \t.plat\t= &dtv_test2, -\t.platdata_size\t= sizeof(dtv_test2), +\t.plat_size\t= sizeof(dtv_test2), \t.parent_idx\t= -1, };

@@ -804,7 +804,7 @@ static struct dtd_test3 dtv_test3 = { U_BOOT_DEVICE(test3) = { \t.name\t\t= "test3", \t.plat\t= &dtv_test3, -\t.platdata_size\t= sizeof(dtv_test3), +\t.plat_size\t= sizeof(dtv_test3), \t.parent_idx\t= -1, };

@@ -855,7 +855,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test = { U_BOOT_DEVICE(spl_test) = { \t.name\t\t= "sandbox_spl_test", \t.plat\t= &dtv_spl_test, -\t.platdata_size\t= sizeof(dtv_spl_test), +\t.plat_size\t= sizeof(dtv_spl_test), \t.parent_idx\t= -1, };

@@ -866,7 +866,7 @@ static struct dtd_sandbox_spl_test dtv_spl_test2 = { U_BOOT_DEVICE(spl_test2) = { \t.name\t\t= "sandbox_spl_test", \t.plat\t= &dtv_spl_test2, -\t.platdata_size\t= sizeof(dtv_spl_test2), +\t.plat_size\t= sizeof(dtv_spl_test2), \t.parent_idx\t= -1, };

Rename this to be consistent with the change from 'platdata'.

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-stm32mp/bsec.c | 16 ++++---- arch/x86/cpu/apollolake/hostbridge.c | 6 +-- arch/x86/cpu/apollolake/pmc.c | 4 +- arch/x86/cpu/apollolake/uart.c | 4 +- arch/x86/cpu/broadwell/sata.c | 6 +-- arch/x86/cpu/intel_common/itss.c | 2 +- arch/x86/cpu/intel_common/p2sb.c | 4 +- board/bluewater/gurnard/gurnard.c | 2 +- cmd/demo.c | 2 +- cmd/host.c | 2 +- common/usb_storage.c | 2 +- doc/driver-model/design.rst | 2 +- doc/driver-model/of-plat.rst | 6 +-- doc/driver-model/spi-howto.rst | 4 +- drivers/ata/fsl_sata.c | 8 ++-- drivers/ata/sata_mv.c | 40 +++++++++---------- drivers/ata/sata_sil.c | 8 ++-- drivers/block/sandbox.c | 6 +-- drivers/cache/cache-v5l2.c | 8 ++-- drivers/clk/altera/clk-agilex.c | 6 +-- drivers/clk/altera/clk-arria10.c | 14 +++---- drivers/clk/at91/compat.c | 30 +++++++------- drivers/clk/clk_boston.c | 4 +- drivers/clk/clk_fixed_factor.c | 2 +- drivers/clk/rockchip/clk_rk3188.c | 2 +- drivers/clk/rockchip/clk_rk3288.c | 2 +- drivers/clk/rockchip/clk_rk3368.c | 2 +- drivers/clk/rockchip/clk_rk3399.c | 4 +- drivers/core/device.c | 2 +- drivers/core/syscon-uclass.c | 2 +- drivers/cpu/at91_cpu.c | 6 +-- drivers/cpu/imx8_cpu.c | 12 +++--- drivers/demo/demo-shape.c | 4 +- drivers/demo/demo-simple.c | 2 +- drivers/demo/demo-uclass.c | 2 +- drivers/gpio/altera_pio.c | 12 +++--- drivers/gpio/at91_gpio.c | 2 +- drivers/gpio/atmel_pio4.c | 4 +- drivers/gpio/bcm2835_gpio.c | 4 +- drivers/gpio/da8xx_gpio.c | 4 +- drivers/gpio/dwapb_gpio.c | 14 +++---- drivers/gpio/gpio-uclass.c | 4 +- drivers/gpio/hi6220_gpio.c | 2 +- drivers/gpio/imx_rgpio2p.c | 2 +- drivers/gpio/intel_broadwell_gpio.c | 4 +- drivers/gpio/intel_ich6_gpio.c | 4 +- drivers/gpio/iproc_gpio.c | 16 ++++---- drivers/gpio/mpc83xx_spisel_boot.c | 4 +- drivers/gpio/mpc8xxx_gpio.c | 4 +- drivers/gpio/mt7621_gpio.c | 12 +++--- drivers/gpio/mxc_gpio.c | 4 +- drivers/gpio/mxs_gpio.c | 2 +- drivers/gpio/nx_gpio.c | 26 ++++++------ drivers/gpio/omap_gpio.c | 6 +-- drivers/gpio/pca953x_gpio.c | 16 ++++---- drivers/gpio/pcf8575_gpio.c | 6 +-- drivers/gpio/sifive-gpio.c | 14 +++---- drivers/gpio/sunxi_gpio.c | 12 +++--- drivers/gpio/vybrid_gpio.c | 4 +- drivers/gpio/xilinx_gpio.c | 18 ++++----- drivers/gpio/zynq_gpio.c | 18 ++++----- drivers/i2c/lpc32xx_i2c.c | 10 ++--- drivers/i2c/omap24xx_i2c.c | 4 +- drivers/led/led_cortina.c | 4 +- drivers/misc/altera_sysid.c | 2 +- drivers/misc/i2c_eeprom_emul.c | 12 +++--- drivers/misc/imx8/scu.c | 4 +- drivers/misc/microchip_flexcom.c | 2 +- drivers/misc/p2sb_emul.c | 6 +-- drivers/misc/rockchip-efuse.c | 4 +- drivers/misc/rockchip-otp.c | 4 +- drivers/misc/sifive-otp.c | 6 +-- drivers/misc/swap_case.c | 6 +-- drivers/mmc/am654_sdhci.c | 14 +++---- drivers/mmc/arm_pl180_mmci.c | 4 +- drivers/mmc/aspeed_sdhci.c | 4 +- drivers/mmc/atmel_sdhci.c | 4 +- drivers/mmc/bcm2835_sdhci.c | 4 +- drivers/mmc/bcm2835_sdhost.c | 4 +- drivers/mmc/bcmstb_sdhci.c | 4 +- drivers/mmc/ca_dw_mmc.c | 4 +- drivers/mmc/davinci_mmc.c | 6 +-- drivers/mmc/exynos_dw_mmc.c | 4 +- drivers/mmc/fsl_esdhc.c | 14 +++---- drivers/mmc/fsl_esdhc_imx.c | 10 ++--- drivers/mmc/ftsdc010_mci.c | 4 +- drivers/mmc/gen_atmel_mci.c | 14 +++---- drivers/mmc/hi6220_dw_mmc.c | 4 +- drivers/mmc/iproc_sdhci.c | 4 +- drivers/mmc/jz_mmc.c | 6 +-- drivers/mmc/meson_gx_mmc.c | 6 +-- drivers/mmc/mmc_spi.c | 4 +- drivers/mmc/msm_sdhci.c | 4 +- drivers/mmc/mtk-sd.c | 18 ++++----- drivers/mmc/mv_sdhci.c | 4 +- drivers/mmc/mxsmmc.c | 10 ++--- drivers/mmc/nexell_dw_mmc.c | 4 +- drivers/mmc/omap_hsmmc.c | 8 ++-- drivers/mmc/pci_mmc.c | 4 +- drivers/mmc/pic32_sdhci.c | 4 +- drivers/mmc/pxa_mmc_gen.c | 8 ++-- drivers/mmc/renesas-sdhi.c | 2 +- drivers/mmc/rockchip_dw_mmc.c | 4 +- drivers/mmc/rockchip_sdhci.c | 4 +- drivers/mmc/s5p_sdhci.c | 4 +- drivers/mmc/sandbox_mmc.c | 4 +- drivers/mmc/sdhci-cadence.c | 8 ++-- drivers/mmc/sh_mmcif.c | 4 +- drivers/mmc/sh_sdhi.c | 4 +- drivers/mmc/snps_dw_mmc.c | 4 +- drivers/mmc/socfpga_dw_mmc.c | 4 +- drivers/mmc/sti_sdhci.c | 6 +-- drivers/mmc/stm32_sdmmc2.c | 4 +- drivers/mmc/sunxi_mmc.c | 8 ++-- drivers/mmc/tangier_sdhci.c | 4 +- drivers/mmc/tegra_mmc.c | 4 +- drivers/mmc/tmio-common.c | 4 +- drivers/mmc/xenon_sdhci.c | 4 +- drivers/mmc/zynq_sdhci.c | 4 +- drivers/mtd/altera_qspi.c | 18 ++++----- drivers/mtd/spi/sandbox.c | 4 +- drivers/net/ag7xxx.c | 6 +-- drivers/net/altera_tse.c | 6 +-- drivers/net/bcm6348-eth.c | 6 +-- drivers/net/bcm6368-eth.c | 2 +- drivers/net/bcmgenet.c | 6 +-- drivers/net/dc2114x.c | 4 +- drivers/net/designware.c | 10 ++--- drivers/net/dwc_eth_qos.c | 4 +- drivers/net/dwmac_socfpga.c | 4 +- drivers/net/e1000.c | 6 +-- drivers/net/eepro100.c | 4 +- drivers/net/ethoc.c | 6 +-- drivers/net/fec_mxc.c | 8 ++-- drivers/net/fm/eth.c | 2 +- drivers/net/fsl-mc/mc.c | 2 +- drivers/net/fsl_enetc.c | 6 +-- drivers/net/fsl_mcdmafec.c | 4 +- drivers/net/ftgmac100.c | 8 ++-- drivers/net/ftmac100.c | 6 +-- drivers/net/gmac_rockchip.c | 8 ++-- drivers/net/higmacv300.c | 2 +- drivers/net/ks8851_mll.c | 6 +-- drivers/net/ldpaa_eth/ldpaa_eth.c | 2 +- drivers/net/macb.c | 6 +-- drivers/net/mcffec.c | 4 +- drivers/net/mscc_eswitch/jr2_switch.c | 4 +- drivers/net/mscc_eswitch/luton_switch.c | 4 +- drivers/net/mscc_eswitch/ocelot_switch.c | 4 +- drivers/net/mscc_eswitch/serval_switch.c | 4 +- drivers/net/mscc_eswitch/servalt_switch.c | 4 +- drivers/net/mt7628-eth.c | 2 +- drivers/net/mtk_eth.c | 6 +-- drivers/net/mvgbe.c | 8 ++-- drivers/net/mvneta.c | 8 ++-- drivers/net/mvpp2.c | 2 +- drivers/net/octeontx/nicvf_main.c | 8 ++-- drivers/net/octeontx2/nix.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 2 +- drivers/net/pch_gbe.c | 6 +-- drivers/net/pcnet.c | 4 +- drivers/net/pfe_eth/pfe_eth.c | 6 +-- drivers/net/pic32_eth.c | 4 +- drivers/net/qe/dm_qe_uec.c | 8 ++-- drivers/net/ravb.c | 10 ++--- drivers/net/rtl8139.c | 6 +-- drivers/net/rtl8169.c | 6 +-- drivers/net/sandbox-raw.c | 8 ++-- drivers/net/sandbox.c | 4 +- drivers/net/sh_eth.c | 10 ++--- drivers/net/smc911x.c | 6 +-- drivers/net/sni_ave.c | 8 ++-- drivers/net/sun8i_emac.c | 8 ++-- drivers/net/sunxi_emac.c | 6 +-- drivers/net/ti/am65-cpsw-nuss.c | 10 ++--- drivers/net/ti/cpsw.c | 8 ++-- drivers/net/ti/davinci_emac.c | 2 +- drivers/net/ti/keystone_net.c | 8 ++-- drivers/net/tsec.c | 4 +- drivers/net/xilinx_axi_emac.c | 4 +- drivers/net/xilinx_emaclite.c | 4 +- drivers/net/zynq_gem.c | 6 +-- drivers/pci/pci-rcar-gen3.c | 16 ++++---- drivers/pci/pci_mvebu.c | 8 ++-- drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- drivers/pinctrl/intel/pinctrl_apl.c | 2 +- drivers/pinctrl/pinctrl-at91-pio4.c | 4 +- drivers/pinctrl/pinctrl-sti.c | 6 +-- drivers/pinctrl/pinctrl-stmfx.c | 10 ++--- drivers/pinctrl/renesas/pfc-r7s72100.c | 4 +- drivers/power/acpi_pmc/pmc_emul.c | 6 +-- .../power/domain/imx8-power-domain-legacy.c | 8 ++-- drivers/power/domain/imx8m-power-domain.c | 6 +-- drivers/power/pmic/i2c_pmic_emul.c | 8 ++-- drivers/power/regulator/bd71837.c | 10 ++--- drivers/power/regulator/fan53555.c | 6 +-- drivers/power/regulator/fixed.c | 6 +-- drivers/power/regulator/gpio-regulator.c | 10 ++--- drivers/power/regulator/pfuze100.c | 6 +-- drivers/power/regulator/tps62360_regulator.c | 6 +-- drivers/power/regulator/tps65910_regulator.c | 22 +++++----- drivers/ram/imxrt_sdram.c | 6 +-- drivers/ram/rockchip/dmc-rk3368.c | 12 +++--- drivers/ram/rockchip/sdram_rk3188.c | 8 ++-- drivers/ram/rockchip/sdram_rk322x.c | 6 +-- drivers/ram/rockchip/sdram_rk3288.c | 8 ++-- drivers/ram/rockchip/sdram_rk3328.c | 6 +-- drivers/ram/rockchip/sdram_rk3399.c | 6 +-- drivers/ram/sifive/fu540_ddr.c | 2 +- drivers/ram/stm32_sdram.c | 6 +-- drivers/rng/meson-rng.c | 8 ++-- drivers/rng/stm32mp1_rng.c | 8 ++-- drivers/rtc/i2c_rtc_emul.c | 16 ++++---- drivers/rtc/mvrtc.c | 8 ++-- drivers/rtc/pl031.c | 6 +-- drivers/serial/altera_jtag_uart.c | 2 +- drivers/serial/altera_uart.c | 2 +- drivers/serial/lpc32xx_hsuart.c | 2 +- drivers/serial/ns16550.c | 2 +- drivers/serial/serial_arc.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 4 +- drivers/serial/serial_bcm283x_pl011.c | 2 +- drivers/serial/serial_coreboot.c | 2 +- drivers/serial/serial_intel_mid.c | 2 +- drivers/serial/serial_lpuart.c | 12 +++--- drivers/serial/serial_mcf.c | 2 +- drivers/serial/serial_mvebu_a3700.c | 12 +++--- drivers/serial/serial_pl01x.c | 6 +-- drivers/serial/serial_rockchip.c | 2 +- drivers/serial/serial_sh.c | 6 +-- drivers/serial/serial_sifive.c | 12 +++--- drivers/serial/serial_stm32.c | 14 +++---- drivers/serial/serial_xuartlite.c | 10 ++--- drivers/serial/serial_zynq.c | 12 +++--- drivers/soc/soc_ti_k3.c | 6 +-- drivers/spi/altera_spi.c | 4 +- drivers/spi/atmel_spi.c | 8 ++-- drivers/spi/bcmstb_spi.c | 4 +- drivers/spi/cf_spi.c | 2 +- drivers/spi/designware_spi.c | 2 +- drivers/spi/exynos_spi.c | 6 +-- drivers/spi/fsl_dspi.c | 2 +- drivers/spi/fsl_espi.c | 2 +- drivers/spi/ich.c | 16 ++++---- drivers/spi/kirkwood_spi.c | 14 +++---- drivers/spi/mvebu_a3700_spi.c | 12 +++--- drivers/spi/mxc_spi.c | 8 ++-- drivers/spi/mxs_spi.c | 2 +- drivers/spi/omap3_spi.c | 4 +- drivers/spi/pl022_spi.c | 2 +- drivers/spi/renesas_rpc_spi.c | 4 +- drivers/spi/rk_spi.c | 4 +- drivers/spi/sh_qspi.c | 6 +-- drivers/spi/soft_spi.c | 10 ++--- drivers/spi/spi-sunxi.c | 6 +-- drivers/spi/tegra114_spi.c | 6 +-- drivers/spi/tegra20_sflash.c | 6 +-- drivers/spi/tegra20_slink.c | 6 +-- drivers/spi/tegra210_qspi.c | 6 +-- drivers/spi/uniphier_spi.c | 2 +- drivers/spi/zynq_qspi.c | 2 +- drivers/spi/zynq_spi.c | 2 +- drivers/spi/zynqmp_gqspi.c | 2 +- drivers/sysreset/sysreset_x86.c | 4 +- drivers/tee/optee/core.c | 6 +-- drivers/thermal/imx_scu_thermal.c | 8 ++-- drivers/thermal/imx_thermal.c | 4 +- drivers/thermal/imx_tmu.c | 18 ++++----- drivers/timer/ag101p_timer.c | 2 +- drivers/timer/altera_timer.c | 2 +- drivers/timer/atcpit100_timer.c | 6 +-- drivers/timer/atmel_pit_timer.c | 6 +-- drivers/timer/rockchip_timer.c | 2 +- drivers/tpm/tpm_tis_st33zp24_spi.c | 8 ++-- drivers/usb/cdns3/cdns3-ti.c | 4 +- drivers/usb/dwc3/dwc3-generic.c | 12 +++--- drivers/usb/dwc3/dwc3-meson-g12a.c | 6 +-- drivers/usb/dwc3/dwc3-meson-gxl.c | 6 +-- drivers/usb/emul/sandbox_flash.c | 8 ++-- drivers/usb/emul/sandbox_keyb.c | 2 +- drivers/usb/eth/asix.c | 6 +-- drivers/usb/eth/asix88179.c | 4 +- drivers/usb/eth/lan75xx.c | 6 +-- drivers/usb/eth/lan78xx.c | 6 +-- drivers/usb/eth/mcs7830.c | 4 +- drivers/usb/eth/r8152.c | 6 +-- drivers/usb/eth/smsc95xx.c | 6 +-- drivers/usb/gadget/dwc2_udc_otg.c | 6 +-- drivers/usb/gadget/ether.c | 4 +- drivers/usb/host/dwc3-of-simple.c | 4 +- drivers/usb/host/dwc3-sti-glue.c | 8 ++-- drivers/usb/host/ehci-exynos.c | 4 +- drivers/usb/host/ehci-msm.c | 2 +- drivers/usb/host/ehci-mx5.c | 4 +- drivers/usb/host/ehci-mx6.c | 6 +-- drivers/usb/host/ehci-omap.c | 4 +- drivers/usb/host/ehci-tegra.c | 2 +- drivers/usb/host/ehci-vf.c | 2 +- drivers/usb/host/ehci-zynq.c | 2 +- drivers/usb/host/usb-uclass.c | 2 +- drivers/usb/host/xhci-brcm.c | 4 +- drivers/usb/host/xhci-dwc3.c | 4 +- drivers/usb/host/xhci-exynos5.c | 4 +- drivers/usb/host/xhci-mvebu.c | 4 +- drivers/usb/host/xhci-rcar.c | 6 +-- drivers/usb/musb-new/da8xx.c | 4 +- drivers/usb/musb-new/omap2430.c | 4 +- drivers/usb/musb-new/ti-musb.c | 12 +++--- drivers/video/atmel_lcdfb.c | 2 +- drivers/video/broadwell_igd.c | 10 ++--- drivers/video/nexell_display.c | 2 +- drivers/video/orisetech_otm8009a.c | 10 ++--- drivers/video/raydium-rm68200.c | 8 ++-- drivers/video/sandbox_sdl.c | 4 +- drivers/video/stm32/stm32_dsi.c | 2 +- drivers/video/tegra124/dp.c | 4 +- drivers/virtio/virtio_net.c | 4 +- drivers/w1/mxc_w1.c | 12 +++--- drivers/w1/w1-gpio.c | 8 ++-- drivers/watchdog/xilinx_tb_wdt.c | 8 ++-- drivers/watchdog/xilinx_wwdt.c | 4 +- drivers/xen/pvblock.c | 2 +- include/dm/device.h | 4 +- include/dwmmc.h | 2 +- include/linux/clk-provider.h | 2 +- include/sdhci.h | 2 +- include/usb.h | 2 +- lib/efi_driver/efi_block_device.c | 6 +-- test/dm/acpi.c | 6 +-- test/dm/of_platdata.c | 10 ++--- test/dm/test-driver.c | 2 +- test/dm/test-fdt.c | 18 ++++----- test/dm/video.c | 8 ++-- 333 files changed, 1009 insertions(+), 1009 deletions(-)

diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index a41824cc2fc..17d2dd660dc 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -295,7 +295,7 @@ static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp) STM32_SMC_READ_OTP, otp, 0, val);

- plat = dev_get_platdata(dev); + plat = dev_get_plat(dev);

/* read current shadow value */ ret = bsec_read_shadow(plat->base, &tmp_data, otp); @@ -326,14 +326,14 @@ static int stm32mp_bsec_read_shadow(struct udevice *dev, u32 *val, u32 otp) STM32_SMC_READ_SHADOW, otp, 0, val);

- plat = dev_get_platdata(dev); + plat = dev_get_plat(dev);

return bsec_read_shadow(plat->base, val, otp); }

static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp) { - struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev); + struct stm32mp_bsec_platdata *plat = dev_get_plat(dev);

/* return OTP permanent write lock status */ *val = bsec_read_lock(plat->base + BSEC_WRLOCK_OFF, otp); @@ -350,7 +350,7 @@ static int stm32mp_bsec_write_otp(struct udevice *dev, u32 val, u32 otp) STM32_SMC_PROG_OTP, otp, val);

- plat = dev_get_platdata(dev); + plat = dev_get_plat(dev);

return bsec_program_otp(plat->base, val, otp);

@@ -365,7 +365,7 @@ static int stm32mp_bsec_write_shadow(struct udevice *dev, u32 val, u32 otp) STM32_SMC_WRITE_SHADOW, otp, val);

- plat = dev_get_platdata(dev); + plat = dev_get_plat(dev);

return bsec_write_shadow(plat->base, val, otp); } @@ -475,7 +475,7 @@ static const struct misc_ops stm32mp_bsec_ops = {

static int stm32mp_bsec_ofdata_to_platdata(struct udevice *dev) { - struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev); + struct stm32mp_bsec_platdata *plat = dev_get_plat(dev);

plat->base = (u32)dev_read_addr_ptr(dev);

@@ -493,7 +493,7 @@ static int stm32mp_bsec_probe(struct udevice *dev) */

if (!IS_ENABLED(CONFIG_TFABOOT) && !IS_ENABLED(CONFIG_SPL_BUILD)) { - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev);

for (otp = 57; otp <= BSEC_OTP_MAX_VALUE; otp++) if (!bsec_read_SR_lock(plat->base, otp)) @@ -531,7 +531,7 @@ bool bsec_dbgswenable(void) return false; }

- plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); if (readl(plat->base + BSEC_DENABLE_OFF) & BSEC_DENABLE_DBGSWENABLE) return true;

diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c index cb5a8161a9e..a8ae6e48291 100644 --- a/arch/x86/cpu/apollolake/hostbridge.c +++ b/arch/x86/cpu/apollolake/hostbridge.c @@ -158,7 +158,7 @@ static const struct nhlt_endp_descriptor dmic_4ch_descriptors[] = {

static int apl_hostbridge_early_init_pinctrl(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_platdata(dev); + struct apl_hostbridge_platdata *plat = dev_get_plat(dev); struct udevice *pinctrl; int ret;

@@ -172,7 +172,7 @@ static int apl_hostbridge_early_init_pinctrl(struct udevice *dev)

static int apl_hostbridge_early_init(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_platdata(dev); + struct apl_hostbridge_platdata *plat = dev_get_plat(dev); u32 region_size; ulong base; u32 reg; @@ -223,7 +223,7 @@ static int apl_hostbridge_early_init(struct udevice *dev)

static int apl_hostbridge_ofdata_to_platdata(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_platdata(dev); + struct apl_hostbridge_platdata *plat = dev_get_plat(dev); struct udevice *pinctrl; int ret;

diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index 10a4b028622..f186c504b3f 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -111,7 +111,7 @@ static int apl_global_reset_set_enable(struct udevice *dev, bool enable) int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); - struct apl_pmc_platdata *plat = dev_get_platdata(dev); + struct apl_pmc_platdata *plat = dev_get_plat(dev);

#if !CONFIG_IS_ENABLED(OF_PLATDATA) u32 base[6]; @@ -169,7 +169,7 @@ int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) static int enable_pmcbar(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); - struct apl_pmc_platdata *priv = dev_get_platdata(dev); + struct apl_pmc_platdata *priv = dev_get_plat(dev); pci_dev_t pmc = priv->bdf;

/* diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c index 44eba0ccaa3..bb6da0311f9 100644 --- a/arch/x86/cpu/apollolake/uart.c +++ b/arch/x86/cpu/apollolake/uart.c @@ -77,7 +77,7 @@ void apl_uart_init(pci_dev_t bdf, ulong base)

static int apl_ns16550_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_platdata(dev); + struct ns16550_platdata *plat = dev_get_plat(dev);

if (!CONFIG_IS_ENABLED(PCI)) apl_uart_init(plat->bdf, plat->base); @@ -88,7 +88,7 @@ static int apl_ns16550_probe(struct udevice *dev) static int apl_ns16550_ofdata_to_platdata(struct udevice *dev) { #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct dtd_intel_apl_ns16550 *dtplat = dev_get_platdata(dev); + struct dtd_intel_apl_ns16550 *dtplat = dev_get_plat(dev); struct ns16550_platdata *plat;

/* diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index fdb6eec0852..829751ee8a7 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -41,7 +41,7 @@ struct sata_platdata {

static void broadwell_sata_init(struct udevice *dev) { - struct sata_platdata *plat = dev_get_platdata(dev); + struct sata_platdata *plat = dev_get_plat(dev); u32 reg32; u8 *abar; u16 reg16; @@ -211,7 +211,7 @@ static void broadwell_sata_init(struct udevice *dev)

static int broadwell_sata_enable(struct udevice *dev) { - struct sata_platdata *plat = dev_get_platdata(dev); + struct sata_platdata *plat = dev_get_plat(dev); struct gpio_desc desc; u16 map; int ret; @@ -234,7 +234,7 @@ static int broadwell_sata_enable(struct udevice *dev)

static int broadwell_sata_ofdata_to_platdata(struct udevice *dev) { - struct sata_platdata *plat = dev_get_platdata(dev); + struct sata_platdata *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev);

diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c index ea6aa4352eb..9f354ed2b5a 100644 --- a/arch/x86/cpu/intel_common/itss.c +++ b/arch/x86/cpu/intel_common/itss.c @@ -184,7 +184,7 @@ static int itss_ofdata_to_platdata(struct udevice *dev) int ret;

#if CONFIG_IS_ENABLED(OF_PLATDATA) - struct itss_platdata *plat = dev_get_platdata(dev); + struct itss_platdata *plat = dev_get_plat(dev); struct dtd_intel_itss *dtplat = &plat->dtplat;

/* diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 5f7ae2dbc31..804835aa025 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -57,7 +57,7 @@ struct p2sb_platdata { */ static int p2sb_early_init(struct udevice *dev) { - struct p2sb_platdata *plat = dev_get_platdata(dev); + struct p2sb_platdata *plat = dev_get_plat(dev); pci_dev_t pdev = plat->bdf;

/* @@ -93,7 +93,7 @@ static int p2sb_spl_init(struct udevice *dev) int p2sb_ofdata_to_platdata(struct udevice *dev) { struct p2sb_uc_priv *upriv = dev_get_uclass_priv(dev); - struct p2sb_platdata *plat = dev_get_platdata(dev); + struct p2sb_platdata *plat = dev_get_plat(dev);

#if !CONFIG_IS_ENABLED(OF_PLATDATA) int ret; diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index 993ba8299f8..6c54910861e 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -348,7 +348,7 @@ int board_init(void)

uclass_find_first_device(UCLASS_VIDEO, &dev); if (dev) { - struct atmel_lcd_platdata *plat = dev_get_platdata(dev); + struct atmel_lcd_platdata *plat = dev_get_plat(dev);

plat->timing_index = 1; } diff --git a/cmd/demo.c b/cmd/demo.c index 90d3cff2936..78a55f72b60 100644 --- a/cmd/demo.c +++ b/cmd/demo.c @@ -74,7 +74,7 @@ int do_demo_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) printf("entry %d - instance %08x, ops %08x, plat %08x\n", i++, (uint)map_to_sysmem(dev), (uint)map_to_sysmem(dev->driver->ops), - (uint)map_to_sysmem(dev_get_platdata(dev))); + (uint)map_to_sysmem(dev_get_plat(dev))); }

return cmd_process_error(cmdtp, ret); diff --git a/cmd/host.c b/cmd/host.c index ff119da7389..1d21f796ac3 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -91,7 +91,7 @@ static int do_host_info(struct cmd_tbl *cmdtp, int flag, int argc, struct host_block_dev *host_dev;

#ifdef CONFIG_BLK - host_dev = dev_get_platdata(blk_dev->bdev); + host_dev = dev_get_plat(blk_dev->bdev); #else host_dev = blk_dev->priv; #endif diff --git a/common/usb_storage.c b/common/usb_storage.c index 7e6db4910bc..5d6f704fbcd 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -207,7 +207,7 @@ static int usb_stor_probe_device(struct usb_device *udev) * is shared by all LUNs (block devices) attached to this mass storage * device. */ - data = dev_get_platdata(udev->dev); + data = dev_get_plat(udev->dev); if (!usb_storage_probe(udev, 0, data)) return 0; max_lun = usb_get_max_lun(data); diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst index f10a851ccf0..98fa20a08c3 100644 --- a/doc/driver-model/design.rst +++ b/doc/driver-model/design.rst @@ -282,7 +282,7 @@ in drivers/demo/demo-simple.c:

static int simple_hello(struct udevice *dev, int ch) { - const struct dm_demo_pdata *pdata = dev_get_platdata(dev); + const struct dm_demo_pdata *pdata = dev_get_plat(dev);

printf("Hello from %08x: %s %d\n", map_to_sysmem(dev), pdata->colour, pdata->sides); diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst index 8c2bfb4099c..b9976ac72d4 100644 --- a/doc/driver-model/of-plat.rst +++ b/doc/driver-model/of-plat.rst @@ -171,7 +171,7 @@ accessed using: .. code-block:: c

struct udevice *dev; - struct dtd_rockchip_rk3288_dw_mshc *plat = dev_get_platdata(dev); + struct dtd_rockchip_rk3288_dw_mshc *plat = dev_get_plat(dev);

This avoids the code overhead of converting the device tree data to platform data in the driver. The ofdata_to_platdata() method should @@ -258,7 +258,7 @@ For example: { #if !CONFIG_IS_ENABLED(OF_PLATDATA) /* Decode the device tree data */ - struct mmc_platdata *plat = dev_get_platdata(dev); + struct mmc_platdata *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev);

@@ -270,7 +270,7 @@ For example:

static int mmc_probe(struct udevice *dev) { - struct mmc_platdata *plat = dev_get_platdata(dev); + struct mmc_platdata *plat = dev_get_plat(dev);

#if CONFIG_IS_ENABLED(OF_PLATDATA) /* Decode the of-platdata from the C structures */ diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst index 6a1aacef0f7..b3b719f572c 100644 --- a/doc/driver-model/spi-howto.rst +++ b/doc/driver-model/spi-howto.rst @@ -357,7 +357,7 @@ what you can copy out to set things up.

static int exynos_spi_probe(struct udevice *bus) { - struct exynos_spi_platdata *plat = dev_get_platdata(bus); + struct exynos_spi_platdata *plat = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->regs; @@ -585,7 +585,7 @@ The new version looks like this: static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_platdata(bus); + struct exynos_spi_platdata *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c index 99af1d44753..9c4171117f2 100644 --- a/drivers/ata/fsl_sata.c +++ b/drivers/ata/fsl_sata.c @@ -746,7 +746,7 @@ ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer) static ulong sata_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct fsl_ata_priv *priv = dev_get_platdata(dev); + struct fsl_ata_priv *priv = dev_get_plat(dev); fsl_sata_t *sata = priv->fsl_sata; #endif u32 rc; @@ -768,7 +768,7 @@ ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer) static ulong sata_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct fsl_ata_priv *priv = dev_get_platdata(dev); + struct fsl_ata_priv *priv = dev_get_plat(dev); fsl_sata_t *sata = priv->fsl_sata; #endif u32 rc; @@ -809,7 +809,7 @@ int scan_sata(int dev) static int scan_sata(struct udevice *dev) { struct blk_desc *desc = dev_get_uclass_plat(dev); - struct fsl_ata_priv *priv = dev_get_platdata(dev); + struct fsl_ata_priv *priv = dev_get_plat(dev); fsl_sata_t *sata = priv->fsl_sata; #endif

@@ -969,7 +969,7 @@ static int fsl_ata_probe(struct udevice *dev) continue; }

- blk_priv = dev_get_platdata(blk); + blk_priv = dev_get_plat(blk); blk_priv->fsl_sata = priv->fsl_sata; /* Scan SATA port */ ret = scan_sata(blk); diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index bb17392e5ac..b78e311fc3b 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -290,7 +290,7 @@ static int ata_wait_register(u32 *addr, u32 mask, u32 val, u32 timeout_msec) /* Cut from sata_mv in linux kernel */ static int mv_stop_edma_engine(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); int i;

/* Disable eDMA. The disable bit auto clears. */ @@ -311,7 +311,7 @@ static int mv_stop_edma_engine(struct udevice *dev, int port)

static int mv_start_edma_engine(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); u32 tmp;

/* Check preconditions */ @@ -363,7 +363,7 @@ static int mv_start_edma_engine(struct udevice *dev, int port)

static int mv_reset_channel(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev);

/* Make sure edma is stopped */ mv_stop_edma_engine(dev, port); @@ -378,7 +378,7 @@ static int mv_reset_channel(struct udevice *dev, int port)

static void mv_reset_port(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev);

mv_reset_channel(dev, port);

@@ -404,7 +404,7 @@ static void mv_reset_one_hc(void)

static int probe_port(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); int tries, tries2, set15 = 0; u32 tmp;

@@ -467,7 +467,7 @@ static int probe_port(struct udevice *dev, int port) /* Get request queue in pointer */ static int get_reqip(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); u32 tmp;

tmp = in_le32(priv->regbase + EDMA_RQIPR) & EDMA_RQIPR_IPMASK; @@ -478,7 +478,7 @@ static int get_reqip(struct udevice *dev, int port)

static void set_reqip(struct udevice *dev, int port, int reqin) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); u32 tmp;

tmp = in_le32(priv->regbase + EDMA_RQIPR) & ~EDMA_RQIPR_IPMASK; @@ -497,7 +497,7 @@ static int get_next_reqip(struct udevice *dev, int port) /* Get response queue in pointer */ static int get_rspip(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); u32 tmp;

tmp = in_le32(priv->regbase + EDMA_RSIPR) & EDMA_RSIPR_IPMASK; @@ -509,7 +509,7 @@ static int get_rspip(struct udevice *dev, int port) /* Get response queue out pointer */ static int get_rspop(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); u32 tmp;

tmp = in_le32(priv->regbase + EDMA_RSOPR) & EDMA_RSOPR_OPMASK; @@ -526,7 +526,7 @@ static int get_next_rspop(struct udevice *dev, int port) /* Set response queue pointer */ static void set_rspop(struct udevice *dev, int port, int reqin) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); u32 tmp;

tmp = in_le32(priv->regbase + EDMA_RSOPR) & ~EDMA_RSOPR_OPMASK; @@ -552,7 +552,7 @@ static int wait_dma_completion(struct udevice *dev, int port, int index, static void process_responses(struct udevice *dev, int port) { #ifdef DEBUG - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); #endif u32 tmp; u32 outind = get_rspop(dev, port); @@ -580,7 +580,7 @@ static int mv_ata_exec_ata_cmd(struct udevice *dev, int port, struct sata_fis_h2d *cfis, u8 *buffer, u32 len, u32 iswrite) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); struct crqb *req; int slot; u32 start; @@ -772,7 +772,7 @@ static int mv_ata_exec_ata_cmd_nondma(struct udevice *dev, int port, struct sata_fis_h2d *cfis, u8 *buffer, u32 len, u32 iswrite) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); int i; u16 *tp;

@@ -823,7 +823,7 @@ static int mv_sata_identify(struct udevice *dev, int port, u16 *id)

static void mv_sata_xfer_mode(struct udevice *dev, int port, u16 *id) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev);

priv->pio = id[ATA_ID_PIO_MODES]; priv->mwdma = id[ATA_ID_MWDMA_MODES]; @@ -834,7 +834,7 @@ static void mv_sata_xfer_mode(struct udevice *dev, int port, u16 *id)

static void mv_sata_set_features(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); struct sata_fis_h2d cfis; u8 udma_cap;

@@ -886,7 +886,7 @@ static void mvsata_ide_conf_mbus_windows(void)

static int sata_mv_init_sata(struct udevice *dev, int port) { - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev);

debug("Initialize sata dev: %d\n", port);

@@ -944,7 +944,7 @@ static int sata_mv_init_sata(struct udevice *dev, int port) static int sata_mv_scan_sata(struct udevice *dev, int port) { struct blk_desc *desc = dev_get_uclass_plat(dev); - struct mv_priv *priv = dev_get_platdata(dev); + struct mv_priv *priv = dev_get_plat(dev); unsigned char serial[ATA_ID_SERNO_LEN + 1]; unsigned char firmware[ATA_ID_FW_REV_LEN + 1]; unsigned char product[ATA_ID_PROD_LEN + 1]; @@ -1006,7 +1006,7 @@ static int sata_mv_scan_sata(struct udevice *dev, int port) static ulong sata_mv_read(struct udevice *blk, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct mv_priv *priv = dev_get_platdata(blk); + struct mv_priv *priv = dev_get_plat(blk);

return ata_low_level_rw(blk, priv->dev_nr, blknr, blkcnt, buffer, READ_CMD); @@ -1015,7 +1015,7 @@ static ulong sata_mv_read(struct udevice *blk, lbaint_t blknr, static ulong sata_mv_write(struct udevice *blk, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct mv_priv *priv = dev_get_platdata(blk); + struct mv_priv *priv = dev_get_plat(blk);

return ata_low_level_rw(blk, priv->dev_nr, blknr, blkcnt, (void *)buffer, WRITE_CMD); @@ -1055,7 +1055,7 @@ static int sata_mv_probe(struct udevice *dev) return ret; }

- priv = dev_get_platdata(blk); + priv = dev_get_plat(blk); priv->dev_nr = i;

/* Init SATA port */ diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 2bc3d228b22..7e4e97d803e 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -492,7 +492,7 @@ ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer) static ulong sata_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct sil_sata_priv *priv = dev_get_platdata(dev); + struct sil_sata_priv *priv = dev_get_plat(dev); int port_number = priv->port_num; struct sil_sata *sata = priv->sil_sata_desc[port_number]; #endif @@ -517,7 +517,7 @@ ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer) ulong sata_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct sil_sata_priv *priv = dev_get_platdata(dev); + struct sil_sata_priv *priv = dev_get_plat(dev); int port_number = priv->port_num; struct sil_sata *sata = priv->sil_sata_desc[port_number]; #endif @@ -542,7 +542,7 @@ static int sil_init_sata(int dev) #else static int sil_init_sata(struct udevice *uc_dev, int dev) { - struct sil_sata_priv *priv = dev_get_platdata(uc_dev); + struct sil_sata_priv *priv = dev_get_plat(uc_dev); #endif struct sil_sata *sata; void *port; @@ -709,7 +709,7 @@ int scan_sata(int dev) static int scan_sata(struct udevice *blk_dev, int dev) { struct blk_desc *desc = dev_get_uclass_plat(blk_dev); - struct sil_sata_priv *priv = dev_get_platdata(blk_dev); + struct sil_sata_priv *priv = dev_get_plat(blk_dev); struct sil_sata *sata = priv->sil_sata_desc[dev]; #endif unsigned char serial[ATA_ID_SERNO_LEN + 1]; diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c index 12d320088c0..34c26cda47e 100644 --- a/drivers/block/sandbox.c +++ b/drivers/block/sandbox.c @@ -34,7 +34,7 @@ static unsigned long host_block_read(struct udevice *dev, unsigned long start, lbaint_t blkcnt, void *buffer) { - struct host_block_dev *host_dev = dev_get_platdata(dev); + struct host_block_dev *host_dev = dev_get_plat(dev); struct blk_desc *block_dev = dev_get_uclass_plat(dev);

#else @@ -65,7 +65,7 @@ static unsigned long host_block_write(struct udevice *dev, unsigned long start, lbaint_t blkcnt, const void *buffer) { - struct host_block_dev *host_dev = dev_get_platdata(dev); + struct host_block_dev *host_dev = dev_get_plat(dev); struct blk_desc *block_dev = dev_get_uclass_plat(dev); #else static unsigned long host_block_write(struct blk_desc *block_dev, @@ -133,7 +133,7 @@ int host_dev_bind(int devnum, char *filename) if (ret) goto err_file;

- host_dev = dev_get_platdata(dev); + host_dev = dev_get_plat(dev); host_dev->fd = fd; host_dev->filename = fname;

diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c index 5f6fc1b3b71..5b9ced98e2f 100644 --- a/drivers/cache/cache-v5l2.c +++ b/drivers/cache/cache-v5l2.c @@ -73,7 +73,7 @@ struct v5l2_plat {

static int v5l2_enable(struct udevice *dev) { - struct v5l2_plat *plat = dev_get_platdata(dev); + struct v5l2_plat *plat = dev_get_plat(dev); volatile struct l2cache *regs = plat->regs;

if (regs) @@ -84,7 +84,7 @@ static int v5l2_enable(struct udevice *dev)

static int v5l2_disable(struct udevice *dev) { - struct v5l2_plat *plat = dev_get_platdata(dev); + struct v5l2_plat *plat = dev_get_plat(dev); volatile struct l2cache *regs = plat->regs; u8 hart = gd->arch.boot_hart; void __iomem *cctlcmd = (void __iomem *)CCTL_CMD_REG(regs, hart); @@ -106,7 +106,7 @@ static int v5l2_disable(struct udevice *dev)

static int v5l2_ofdata_to_platdata(struct udevice *dev) { - struct v5l2_plat *plat = dev_get_platdata(dev); + struct v5l2_plat *plat = dev_get_plat(dev); struct l2cache *regs;

regs = (struct l2cache *)dev_read_addr(dev); @@ -130,7 +130,7 @@ static int v5l2_ofdata_to_platdata(struct udevice *dev)

static int v5l2_probe(struct udevice *dev) { - struct v5l2_plat *plat = dev_get_platdata(dev); + struct v5l2_plat *plat = dev_get_plat(dev); struct l2cache *regs = plat->regs; u32 ctl_val;

diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c index 619621fa5b9..c67155c03f5 100644 --- a/drivers/clk/altera/clk-agilex.c +++ b/drivers/clk/altera/clk-agilex.c @@ -236,7 +236,7 @@ static u32 calc_vocalib_pll(u32 pllm, u32 pllglob) static void clk_basic_init(struct udevice *dev, const struct cm_config * const cfg) { - struct socfpga_clk_platdata *plat = dev_get_platdata(dev); + struct socfpga_clk_platdata *plat = dev_get_plat(dev); u32 vcocalib;

if (!cfg) @@ -585,7 +585,7 @@ static u32 clk_get_emac_clk_hz(struct socfpga_clk_platdata *plat, u32 emac_id)

static ulong socfpga_clk_get_rate(struct clk *clk) { - struct socfpga_clk_platdata *plat = dev_get_platdata(clk->dev); + struct socfpga_clk_platdata *plat = dev_get_plat(clk->dev);

switch (clk->id) { case AGILEX_MPU_CLK: @@ -630,7 +630,7 @@ static int socfpga_clk_probe(struct udevice *dev)

static int socfpga_clk_ofdata_to_platdata(struct udevice *dev) { - struct socfpga_clk_platdata *plat = dev_get_platdata(dev); + struct socfpga_clk_platdata *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index bb1b367ca6e..11f10c51028 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -43,7 +43,7 @@ struct socfpga_a10_clk_platdata {

static int socfpga_a10_clk_get_upstream(struct clk *clk, struct clk **upclk) { - struct socfpga_a10_clk_platdata *plat = dev_get_platdata(clk->dev); + struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); u32 reg, maxval;

if (plat->clks.count == 0) @@ -84,7 +84,7 @@ static int socfpga_a10_clk_get_upstream(struct clk *clk, struct clk **upclk)

static int socfpga_a10_clk_endisable(struct clk *clk, bool enable) { - struct socfpga_a10_clk_platdata *plat = dev_get_platdata(clk->dev); + struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); struct clk *upclk = NULL; int ret;

@@ -120,7 +120,7 @@ static int socfpga_a10_clk_disable(struct clk *clk)

static ulong socfpga_a10_clk_get_rate(struct clk *clk) { - struct socfpga_a10_clk_platdata *plat = dev_get_platdata(clk->dev); + struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); struct clk *upclk = NULL; ulong rate = 0, reg, numer, denom; int ret; @@ -190,7 +190,7 @@ static struct clk_ops socfpga_a10_clk_ops = { */ static void socfpga_a10_handoff_workaround(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_platdata(dev); + struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; struct clk_bulk *bulk = &plat->clks; int i, ret, offset = dev_of_offset(dev); @@ -274,7 +274,7 @@ static int socfpga_a10_clk_bind(struct udevice *dev)

static int socfpga_a10_clk_probe(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_platdata(dev); + struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); struct socfpga_a10_clk_platdata *pplat; struct udevice *pdev; const void *fdt = gd->fdt_blob; @@ -291,7 +291,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev) if (!pdev) return -ENODEV;

- pplat = dev_get_platdata(pdev); + pplat = dev_get_plat(pdev); if (!pplat) return -EINVAL;

@@ -321,7 +321,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev)

static int socfpga_a10_ofdata_to_platdata(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_platdata(dev); + struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); unsigned int divreg[3], gatereg[2]; int ret;

diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index b56c01f3b06..71375249585 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -45,7 +45,7 @@ U_BOOT_DRIVER(at91_pmc) = {

static int at91_pmc_core_probe(struct udevice *dev) { - struct pmc_platdata *plat = dev_get_platdata(dev); + struct pmc_platdata *plat = dev_get_plat(dev);

dev = dev_get_parent(dev);

@@ -115,7 +115,7 @@ int at91_clk_of_xlate(struct clk *clk, struct ofnode_phandle_args *args) int at91_clk_probe(struct udevice *dev) { struct udevice *dev_periph_container, *dev_pmc; - struct pmc_platdata *plat = dev_get_platdata(dev); + struct pmc_platdata *plat = dev_get_plat(dev);

dev_periph_container = dev_get_parent(dev); dev_pmc = dev_get_parent(dev_periph_container); @@ -191,7 +191,7 @@ U_BOOT_DRIVER(at91_master_clk) = { /* Main osc clock specific code. */ static int main_osc_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base;

if (readl(&pmc->sr) & AT91_PMC_MOSCSELS) @@ -232,7 +232,7 @@ U_BOOT_DRIVER(at91sam9x5_main_osc_clk) = { /* PLLA clock specific code. */ static int plla_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base;

if (readl(&pmc->sr) & AT91_PMC_LOCKA) @@ -278,7 +278,7 @@ static int at91_plladiv_clk_enable(struct clk *clk)

static ulong at91_plladiv_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; ulong clk_rate; @@ -297,7 +297,7 @@ static ulong at91_plladiv_clk_get_rate(struct clk *clk)

static ulong at91_plladiv_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; ulong parent_rate; @@ -401,7 +401,7 @@ static ulong system_clk_set_rate(struct clk *clk, ulong rate)

static int system_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; u32 mask;

@@ -483,7 +483,7 @@ U_BOOT_DRIVER(sam9x5_periph_clk) = {

static int periph_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; enum periph_clk_type clk_type; void *addr; @@ -552,7 +552,7 @@ U_BOOT_DRIVER(clk_periph) = {

static int utmi_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk clk_dev; ulong clk_rate; @@ -640,7 +640,7 @@ static struct clk_ops utmi_clk_ops = {

static int utmi_clk_ofdata_to_platdata(struct udevice *dev) { - struct pmc_platdata *plat = dev_get_platdata(dev); + struct pmc_platdata *plat = dev_get_plat(dev); struct udevice *syscon;

uclass_get_device_by_phandle(UCLASS_SYSCON, dev, @@ -681,7 +681,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = {

static ulong sama5d4_h32mx_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; ulong rate = gd->arch.mck_rate_hz;

@@ -754,7 +754,7 @@ struct generic_clk_priv {

static ulong generic_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk parent; ulong clk_rate; @@ -782,7 +782,7 @@ static ulong generic_clk_get_rate(struct clk *clk)

static ulong generic_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct generic_clk_priv *priv = dev_get_priv(clk->dev); struct clk parent, best_parent; @@ -895,7 +895,7 @@ struct at91_usb_clk_priv {

static ulong at91_usb_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; u32 tmp, usbdiv; @@ -916,7 +916,7 @@ static ulong at91_usb_clk_get_rate(struct clk *clk)

static ulong at91_usb_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_platdata(clk->dev); + struct pmc_platdata *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct at91_usb_clk_priv *priv = dev_get_priv(clk->dev); struct clk source, best_source; diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c index 75e2e438422..374fc9ac76b 100644 --- a/drivers/clk/clk_boston.c +++ b/drivers/clk/clk_boston.c @@ -28,7 +28,7 @@ static uint32_t ext_field(uint32_t val, uint32_t mask)

static ulong clk_boston_get_rate(struct clk *clk) { - struct clk_boston *state = dev_get_platdata(clk->dev); + struct clk_boston *state = dev_get_plat(clk->dev); uint32_t in_rate, mul, div; uint mmcmdiv; int err; @@ -60,7 +60,7 @@ const struct clk_ops clk_boston_ops = {

static int clk_boston_ofdata_to_platdata(struct udevice *dev) { - struct clk_boston *state = dev_get_platdata(dev); + struct clk_boston *state = dev_get_plat(dev); struct udevice *syscon; int err;

diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c index 7a9d4234932..d68f79d4f39 100644 --- a/drivers/clk/clk_fixed_factor.c +++ b/drivers/clk/clk_fixed_factor.c @@ -18,7 +18,7 @@ struct clk_fixed_factor { };

#define to_clk_fixed_factor(dev) \ - ((struct clk_fixed_factor *)dev_get_platdata(dev)) + ((struct clk_fixed_factor *)dev_get_plat(dev))

static ulong clk_fixed_factor_get_rate(struct clk *clk) { diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c index f96aab967e2..4c4bd68f5d8 100644 --- a/drivers/clk/rockchip/clk_rk3188.c +++ b/drivers/clk/rockchip/clk_rk3188.c @@ -561,7 +561,7 @@ static int rk3188_clk_probe(struct udevice *dev)

#ifdef CONFIG_SPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3188_clk_plat *plat = dev_get_platdata(dev); + struct rk3188_clk_plat *plat = dev_get_plat(dev);

priv->cru = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]); #endif diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 0263883aa66..588cfcc2327 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -975,7 +975,7 @@ static int rk3288_clk_probe(struct udevice *dev) return PTR_ERR(priv->grf); #ifdef CONFIG_SPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3288_clk_plat *plat = dev_get_platdata(dev); + struct rk3288_clk_plat *plat = dev_get_plat(dev);

priv->cru = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]); #endif diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index d32762ce1e4..08c98e01ce0 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -582,7 +582,7 @@ static int rk3368_clk_probe(struct udevice *dev) { struct rk3368_clk_priv __maybe_unused *priv = dev_get_priv(dev); #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3368_clk_plat *plat = dev_get_platdata(dev); + struct rk3368_clk_plat *plat = dev_get_plat(dev);

priv->cru = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]); #endif diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 515c8553378..2c0ff3b65b2 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1378,7 +1378,7 @@ static int rk3399_clk_probe(struct udevice *dev) bool init_clocks = false;

#if CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3399_clk_plat *plat = dev_get_platdata(dev); + struct rk3399_clk_plat *plat = dev_get_plat(dev);

priv->cru = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]); #endif @@ -1599,7 +1599,7 @@ static int rk3399_pmuclk_probe(struct udevice *dev) #endif

#if CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3399_pmuclk_plat *plat = dev_get_platdata(dev); + struct rk3399_pmuclk_plat *plat = dev_get_plat(dev);

priv->pmucru = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]); #endif diff --git a/drivers/core/device.c b/drivers/core/device.c index 5f6f99770d4..b9515364405 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -506,7 +506,7 @@ fail: return ret; }

-void *dev_get_platdata(const struct udevice *dev) +void *dev_get_plat(const struct udevice *dev) { if (!dev) { dm_warn("%s: null device\n", __func__); diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index 823d0731640..5de462221f1 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -56,7 +56,7 @@ static int syscon_pre_probe(struct udevice *dev) * using OF_PLATDATA will need to ensure that this is true. */ #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct syscon_base_platdata *plat = dev_get_platdata(dev); + struct syscon_base_platdata *plat = dev_get_plat(dev);

return regmap_init_mem_platdata(dev, plat->reg, ARRAY_SIZE(plat->reg), &priv->regmap); diff --git a/drivers/cpu/at91_cpu.c b/drivers/cpu/at91_cpu.c index ff1c406beab..bd81efde298 100644 --- a/drivers/cpu/at91_cpu.c +++ b/drivers/cpu/at91_cpu.c @@ -27,7 +27,7 @@ const char *at91_cpu_get_name(void)

int at91_cpu_get_desc(const struct udevice *dev, char *buf, int size) { - struct at91_cpu_platdata *plat = dev_get_platdata(dev); + struct at91_cpu_platdata *plat = dev_get_plat(dev);

snprintf(buf, size, "%s\n" "Crystal frequency: %8lu MHz\n" @@ -41,7 +41,7 @@ int at91_cpu_get_desc(const struct udevice *dev, char *buf, int size)

static int at91_cpu_get_info(const struct udevice *dev, struct cpu_info *info) { - struct at91_cpu_platdata *plat = dev_get_platdata(dev); + struct at91_cpu_platdata *plat = dev_get_plat(dev);

info->cpu_freq = plat->cpufreq_mhz * 1000000; info->features = BIT(CPU_FEAT_L1_CACHE); @@ -75,7 +75,7 @@ static const struct udevice_id at91_cpu_ids[] = {

static int at91_cpu_probe(struct udevice *dev) { - struct at91_cpu_platdata *plat = dev_get_platdata(dev); + struct at91_cpu_platdata *plat = dev_get_plat(dev); struct clk clk; ulong rate; int ret; diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 1df43b88fae..c9f7449e579 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -55,7 +55,7 @@ const char *get_imx8_rev(u32 rev)

static void set_core_data(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_platdata *plat = dev_get_plat(dev);

if (device_is_compatible(dev, "arm,cortex-a35")) { plat->cpu_rsrc = SC_R_A35; @@ -102,7 +102,7 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat)

int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_platdata *plat = dev_get_plat(dev); int ret, temp;

if (size < 100) @@ -128,7 +128,7 @@ int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size)

static int cpu_imx_get_info(const struct udevice *dev, struct cpu_info *info) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_platdata *plat = dev_get_plat(dev);

info->cpu_freq = plat->freq_mhz * 1000; info->features = BIT(CPU_FEAT_L1_CACHE) | BIT(CPU_FEAT_MMU); @@ -165,7 +165,7 @@ static int cpu_imx_get_vendor(const struct udevice *dev, char *buf, int size)

static int cpu_imx_is_current(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_platdata *plat = dev_get_plat(dev);

if (plat->mpidr == (read_mpidr() & 0xffff)) return 1; @@ -190,7 +190,7 @@ static const struct udevice_id cpu_imx8_ids[] = {

static ulong imx8_get_cpu_rate(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_platdata *plat = dev_get_plat(dev); ulong rate; int ret;

@@ -206,7 +206,7 @@ static ulong imx8_get_cpu_rate(struct udevice *dev)

static int imx8_cpu_probe(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_platdata(dev); + struct cpu_imx_platdata *plat = dev_get_plat(dev); u32 cpurev;

set_core_data(dev); diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c index cc99f3e8e60..b13a4ee4e8a 100644 --- a/drivers/demo/demo-shape.c +++ b/drivers/demo/demo-shape.c @@ -28,7 +28,7 @@ struct shape_data { /* Crazy little function to draw shapes on the console */ static int shape_hello(struct udevice *dev, int ch) { - const struct dm_demo_pdata *pdata = dev_get_platdata(dev); + const struct dm_demo_pdata *pdata = dev_get_plat(dev); struct shape_data *data = dev_get_priv(dev); static const struct shape { int start; @@ -142,7 +142,7 @@ static const struct demo_ops shape_ops = {

static int shape_ofdata_to_platdata(struct udevice *dev) { - struct dm_demo_pdata *pdata = dev_get_platdata(dev); + struct dm_demo_pdata *pdata = dev_get_plat(dev); int ret;

/* Parse the data that is common with all demo devices */ diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index 950e286f7f1..39b370cd9b5 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -14,7 +14,7 @@

static int simple_hello(struct udevice *dev, int ch) { - const struct dm_demo_pdata *pdata = dev_get_platdata(dev); + const struct dm_demo_pdata *pdata = dev_get_plat(dev);

printf("Hello from %08x: %s %d\n", (uint)map_to_sysmem(dev), pdata->colour, pdata->sides); diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c index 6c36f03254f..a020ecb24fa 100644 --- a/drivers/demo/demo-uclass.c +++ b/drivers/demo/demo-uclass.c @@ -65,7 +65,7 @@ int demo_set_light(struct udevice *dev, int light)

int demo_parse_dt(struct udevice *dev) { - struct dm_demo_pdata *pdata = dev_get_platdata(dev); + struct dm_demo_pdata *pdata = dev_get_plat(dev); int dn = dev_of_offset(dev);

pdata->sides = fdtdec_get_int(gd->fdt_blob, dn, "sides", 0); diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index f4e18e1f145..0b1861a2609 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -27,7 +27,7 @@ struct altera_pio_platdata {

static int altera_pio_direction_input(struct udevice *dev, unsigned pin) { - struct altera_pio_platdata *plat = dev_get_platdata(dev); + struct altera_pio_platdata *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

clrbits_le32(&regs->direction, 1 << pin); @@ -38,7 +38,7 @@ static int altera_pio_direction_input(struct udevice *dev, unsigned pin) static int altera_pio_direction_output(struct udevice *dev, unsigned pin, int val) { - struct altera_pio_platdata *plat = dev_get_platdata(dev); + struct altera_pio_platdata *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

if (val) @@ -53,7 +53,7 @@ static int altera_pio_direction_output(struct udevice *dev, unsigned pin,

static int altera_pio_get_value(struct udevice *dev, unsigned pin) { - struct altera_pio_platdata *plat = dev_get_platdata(dev); + struct altera_pio_platdata *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

return !!(readl(&regs->data) & (1 << pin)); @@ -62,7 +62,7 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin)

static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) { - struct altera_pio_platdata *plat = dev_get_platdata(dev); + struct altera_pio_platdata *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

if (val) @@ -76,7 +76,7 @@ static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) static int altera_pio_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - struct altera_pio_platdata *plat = dev_get_platdata(dev); + struct altera_pio_platdata *plat = dev_get_plat(dev);

uc_priv->gpio_count = plat->gpio_count; uc_priv->bank_name = plat->bank_name; @@ -86,7 +86,7 @@ static int altera_pio_probe(struct udevice *dev)

static int altera_pio_ofdata_to_platdata(struct udevice *dev) { - struct altera_pio_platdata *plat = dev_get_platdata(dev); + struct altera_pio_platdata *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_pio_regs), diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c index 4b25af71c09..7b604e4e825 100644 --- a/drivers/gpio/at91_gpio.c +++ b/drivers/gpio/at91_gpio.c @@ -590,7 +590,7 @@ static const struct dm_gpio_ops gpio_at91_ops = { static int at91_gpio_probe(struct udevice *dev) { struct at91_port_priv *port = dev_get_priv(dev); - struct at91_port_platdata *plat = dev_get_platdata(dev); + struct at91_port_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct clk clk; int ret; diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index 7a221b4df15..e25115f8a29 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -183,7 +183,7 @@ struct atmel_pio4_platdata { static struct atmel_pio4_port *atmel_pio4_bank_base(struct udevice *dev, u32 bank) { - struct atmel_pio4_platdata *plat = dev_get_platdata(dev); + struct atmel_pio4_platdata *plat = dev_get_plat(dev); struct atmel_pio4_port *port_base = (struct atmel_pio4_port *)((u32)plat->reg_base + ATMEL_PIO_BANK_OFFSET * bank); @@ -281,7 +281,7 @@ static int atmel_pio4_bind(struct udevice *dev)

static int atmel_pio4_probe(struct udevice *dev) { - struct atmel_pio4_platdata *plat = dev_get_platdata(dev); + struct atmel_pio4_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct atmel_pioctrl_data *pioctrl_data; struct clk clk; diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index e80830c782d..7c3f24e6734 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -102,7 +102,7 @@ static const struct dm_gpio_ops gpio_bcm2835_ops = { static int bcm2835_gpio_probe(struct udevice *dev) { struct bcm2835_gpios *gpios = dev_get_priv(dev); - struct bcm2835_gpio_platdata *plat = dev_get_platdata(dev); + struct bcm2835_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

uc_priv->bank_name = "GPIO"; @@ -118,7 +118,7 @@ static int bcm2835_gpio_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev) { - struct bcm2835_gpio_platdata *plat = dev_get_platdata(dev); + struct bcm2835_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index c8b12ac8a85..ff61a4cb11e 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -522,7 +522,7 @@ static const struct dm_gpio_ops gpio_davinci_ops = { static int davinci_gpio_probe(struct udevice *dev) { struct davinci_gpio_bank *bank = dev_get_priv(dev); - struct davinci_gpio_platdata *plat = dev_get_platdata(dev); + struct davinci_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); @@ -542,7 +542,7 @@ static const struct udevice_id davinci_gpio_ids[] = {

static int davinci_gpio_ofdata_to_platdata(struct udevice *dev) { - struct davinci_gpio_platdata *plat = dev_get_platdata(dev); + struct davinci_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index 6639e2e0b82..42158bd84a4 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -45,7 +45,7 @@ struct gpio_dwapb_platdata {

static int dwapb_gpio_direction_input(struct udevice *dev, unsigned pin) { - struct gpio_dwapb_platdata *plat = dev_get_platdata(dev); + struct gpio_dwapb_platdata *plat = dev_get_plat(dev);

clrbits_le32(plat->base + GPIO_SWPORT_DDR(plat->bank), 1 << pin); return 0; @@ -54,7 +54,7 @@ static int dwapb_gpio_direction_input(struct udevice *dev, unsigned pin) static int dwapb_gpio_direction_output(struct udevice *dev, unsigned pin, int val) { - struct gpio_dwapb_platdata *plat = dev_get_platdata(dev); + struct gpio_dwapb_platdata *plat = dev_get_plat(dev);

setbits_le32(plat->base + GPIO_SWPORT_DDR(plat->bank), 1 << pin);

@@ -68,7 +68,7 @@ static int dwapb_gpio_direction_output(struct udevice *dev, unsigned pin,

static int dwapb_gpio_set_value(struct udevice *dev, unsigned pin, int val) { - struct gpio_dwapb_platdata *plat = dev_get_platdata(dev); + struct gpio_dwapb_platdata *plat = dev_get_plat(dev);

if (val) setbits_le32(plat->base + GPIO_SWPORT_DR(plat->bank), 1 << pin); @@ -80,7 +80,7 @@ static int dwapb_gpio_set_value(struct udevice *dev, unsigned pin, int val)

static int dwapb_gpio_get_function(struct udevice *dev, unsigned offset) { - struct gpio_dwapb_platdata *plat = dev_get_platdata(dev); + struct gpio_dwapb_platdata *plat = dev_get_plat(dev); u32 gpio;

gpio = readl(plat->base + GPIO_SWPORT_DDR(plat->bank)); @@ -93,7 +93,7 @@ static int dwapb_gpio_get_function(struct udevice *dev, unsigned offset)

static int dwapb_gpio_get_value(struct udevice *dev, unsigned pin) { - struct gpio_dwapb_platdata *plat = dev_get_platdata(dev); + struct gpio_dwapb_platdata *plat = dev_get_plat(dev); u32 value;

if (dwapb_gpio_get_function(dev, pin) == GPIOF_OUTPUT) @@ -156,7 +156,7 @@ static int gpio_dwapb_probe(struct udevice *dev)

static int gpio_dwapb_bind(struct udevice *dev) { - struct gpio_dwapb_platdata *plat = dev_get_platdata(dev); + struct gpio_dwapb_platdata *plat = dev_get_plat(dev); struct udevice *subdev; fdt_addr_t base; int ret, bank = 0; @@ -215,7 +215,7 @@ static int gpio_dwapb_bind(struct udevice *dev)

static int gpio_dwapb_remove(struct udevice *dev) { - struct gpio_dwapb_platdata *plat = dev_get_platdata(dev); + struct gpio_dwapb_platdata *plat = dev_get_plat(dev); struct gpio_dwapb_priv *priv = dev_get_priv(dev);

if (!plat && priv) diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 584d067aaf2..3140a3fd092 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -241,7 +241,7 @@ struct gpio_hog_data {

static int gpio_hog_ofdata_to_platdata(struct udevice *dev) { - struct gpio_hog_data *plat = dev_get_platdata(dev); + struct gpio_hog_data *plat = dev_get_plat(dev); const char *nodename; int ret;

@@ -272,7 +272,7 @@ static int gpio_hog_ofdata_to_platdata(struct udevice *dev)

static int gpio_hog_probe(struct udevice *dev) { - struct gpio_hog_data *plat = dev_get_platdata(dev); + struct gpio_hog_data *plat = dev_get_plat(dev); struct gpio_hog_priv *priv = dev_get_priv(dev); int ret;

diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c index c49dc78baa5..02a37829c0a 100644 --- a/drivers/gpio/hi6220_gpio.c +++ b/drivers/gpio/hi6220_gpio.c @@ -66,7 +66,7 @@ static const struct dm_gpio_ops gpio_hi6220_ops = { static int hi6220_gpio_probe(struct udevice *dev) { struct gpio_bank *bank = dev_get_priv(dev); - struct hikey_gpio_platdata *plat = dev_get_platdata(dev); + struct hikey_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev->uclass_priv; char name[18], *str;

diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c index 5d23ebdc5eb..17edd40c5c5 100644 --- a/drivers/gpio/imx_rgpio2p.c +++ b/drivers/gpio/imx_rgpio2p.c @@ -132,7 +132,7 @@ static const struct dm_gpio_ops imx_rgpio2p_ops = { static int imx_rgpio2p_probe(struct udevice *dev) { struct imx_rgpio2p_data *bank = dev_get_priv(dev); - struct imx_rgpio2p_plat *plat = dev_get_platdata(dev); + struct imx_rgpio2p_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int banknum; char name[18], *str; diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index b05233fe15b..2b9e1a284a3 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -117,7 +117,7 @@ static int broadwell_gpio_get_function(struct udevice *dev, unsigned offset)

static int broadwell_gpio_probe(struct udevice *dev) { - struct broadwell_bank_platdata *plat = dev_get_platdata(dev); + struct broadwell_bank_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct broadwell_bank_priv *priv = dev_get_priv(dev); struct udevice *pinctrl; @@ -141,7 +141,7 @@ static int broadwell_gpio_probe(struct udevice *dev)

static int broadwell_gpio_ofdata_to_platdata(struct udevice *dev) { - struct broadwell_bank_platdata *plat = dev_get_platdata(dev); + struct broadwell_bank_platdata *plat = dev_get_plat(dev); u32 gpiobase; int bank; int ret; diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index 3fdc9818422..cfb2ddab78b 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -95,7 +95,7 @@ static int _ich6_gpio_set_direction(uint16_t base, unsigned offset, int dir)

static int gpio_ich6_ofdata_to_platdata(struct udevice *dev) { - struct ich6_bank_platdata *plat = dev_get_platdata(dev); + struct ich6_bank_platdata *plat = dev_get_plat(dev); u32 gpiobase; int offset; int ret; @@ -119,7 +119,7 @@ static int gpio_ich6_ofdata_to_platdata(struct udevice *dev)

static int ich6_gpio_probe(struct udevice *dev) { - struct ich6_bank_platdata *plat = dev_get_platdata(dev); + struct ich6_bank_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct ich6_bank_priv *bank = dev_get_priv(dev); const void *prop; diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c index bdebeba83d6..32a849e2708 100644 --- a/drivers/gpio/iproc_gpio.c +++ b/drivers/gpio/iproc_gpio.c @@ -127,7 +127,7 @@ static u32 iproc_get_pctrl_from_gpio(struct iproc_gpio_platdata *plat, u32 gpio) */ static int iproc_get_gpio_pctrl_mapping(struct udevice *dev) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev); struct iproc_gpio_pctrl_map *range = NULL; struct ofnode_phandle_args args; int index = 0, ret; @@ -153,7 +153,7 @@ static int iproc_get_gpio_pctrl_mapping(struct udevice *dev)

static int iproc_gpio_request(struct udevice *dev, u32 gpio, const char *label) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev); u32 pctrl;

/* nothing to do if there is no corresponding pinctrl device */ @@ -167,7 +167,7 @@ static int iproc_gpio_request(struct udevice *dev, u32 gpio, const char *label)

static int iproc_gpio_direction_input(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev);

iproc_gpio_set_bit(plat, OUT_EN_OFFSET, gpio, false); dev_dbg(dev, "gpio:%u set input\n", gpio); @@ -177,7 +177,7 @@ static int iproc_gpio_direction_input(struct udevice *dev, u32 gpio)

static int iproc_gpio_direction_output(struct udevice *dev, u32 gpio, int value) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev);

iproc_gpio_set_bit(plat, OUT_EN_OFFSET, gpio, true); iproc_gpio_set_bit(plat, DATA_OUT_OFFSET, gpio, value); @@ -188,7 +188,7 @@ static int iproc_gpio_direction_output(struct udevice *dev, u32 gpio, int value)

static int iproc_gpio_get_value(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev); int value;

value = iproc_gpio_get_bit(plat, DATA_IN_OFFSET, gpio); @@ -199,7 +199,7 @@ static int iproc_gpio_get_value(struct udevice *dev, u32 gpio)

static int iproc_gpio_set_value(struct udevice *dev, u32 gpio, int value) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev);

if (iproc_gpio_get_bit(plat, OUT_EN_OFFSET, gpio)) iproc_gpio_set_bit(plat, DATA_OUT_OFFSET, gpio, value); @@ -210,7 +210,7 @@ static int iproc_gpio_set_value(struct udevice *dev, u32 gpio, int value)

static int iproc_gpio_get_function(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev);

if (iproc_gpio_get_bit(plat, OUT_EN_OFFSET, gpio)) return GPIOF_OUTPUT; @@ -220,7 +220,7 @@ static int iproc_gpio_get_function(struct udevice *dev, u32 gpio)

static int iproc_gpio_ofdata_to_platdata(struct udevice *dev) { - struct iproc_gpio_platdata *plat = dev_get_platdata(dev); + struct iproc_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int ret; char name[10]; diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index dae94b5ea95..245b43f5351 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -63,7 +63,7 @@ static int mpc83xx_spisel_boot_get_function(struct udevice *dev, uint gpio) #if CONFIG_IS_ENABLED(OF_CONTROL) static int mpc83xx_spisel_boot_ofdata_to_platdata(struct udevice *dev) { - struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev); + struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr; u32 reg[2];

@@ -81,7 +81,7 @@ static int mpc83xx_spisel_boot_ofdata_to_platdata(struct udevice *dev) static int mpc83xx_spisel_boot_platdata_to_priv(struct udevice *dev) { struct mpc83xx_spisel_boot *priv = dev_get_priv(dev); - struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev); + struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); unsigned long size = plat->size; ulong driver_data = dev_get_driver_data(dev);

diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index 6b64fc0d1cb..0933b900b8e 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -185,7 +185,7 @@ static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio) #if CONFIG_IS_ENABLED(OF_CONTROL) static int mpc8xxx_gpio_ofdata_to_platdata(struct udevice *dev) { - struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev); + struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); struct mpc8xxx_gpio_data *data = dev_get_priv(dev); fdt_addr_t addr; u32 i; @@ -222,7 +222,7 @@ static int mpc8xxx_gpio_ofdata_to_platdata(struct udevice *dev) static int mpc8xxx_gpio_platdata_to_priv(struct udevice *dev) { struct mpc8xxx_gpio_data *priv = dev_get_priv(dev); - struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev); + struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); unsigned long size = plat->size; ulong driver_data = dev_get_driver_data(dev);

diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c index 3a06d17c923..e48ddb53e68 100644 --- a/drivers/gpio/mt7621_gpio.c +++ b/drivers/gpio/mt7621_gpio.c @@ -51,7 +51,7 @@ static u32 reg_offs(struct mediatek_gpio_platdata *plat, int reg)

static int mediatek_gpio_get_value(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_platdata(dev); + struct mediatek_gpio_platdata *plat = dev_get_plat(dev);

return !!(ioread32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_DATA)) & BIT(offset)); @@ -60,7 +60,7 @@ static int mediatek_gpio_get_value(struct udevice *dev, unsigned int offset) static int mediatek_gpio_set_value(struct udevice *dev, unsigned int offset, int value) { - struct mediatek_gpio_platdata *plat = dev_get_platdata(dev); + struct mediatek_gpio_platdata *plat = dev_get_plat(dev);

iowrite32(BIT(offset), mediatek_gpio_membase + reg_offs(plat, value ? GPIO_REG_DSET : GPIO_REG_DCLR)); @@ -70,7 +70,7 @@ static int mediatek_gpio_set_value(struct udevice *dev, unsigned int offset,

static int mediatek_gpio_direction_input(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_platdata(dev); + struct mediatek_gpio_platdata *plat = dev_get_plat(dev);

clrbits_le32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL), BIT(offset)); @@ -81,7 +81,7 @@ static int mediatek_gpio_direction_input(struct udevice *dev, unsigned int offse static int mediatek_gpio_direction_output(struct udevice *dev, unsigned int offset, int value) { - struct mediatek_gpio_platdata *plat = dev_get_platdata(dev); + struct mediatek_gpio_platdata *plat = dev_get_plat(dev);

setbits_le32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL), BIT(offset)); @@ -92,7 +92,7 @@ static int mediatek_gpio_direction_output(struct udevice *dev, unsigned int offs

static int mediatek_gpio_get_function(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_platdata(dev); + struct mediatek_gpio_platdata *plat = dev_get_plat(dev); u32 t;

t = ioread32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL)); @@ -112,7 +112,7 @@ static const struct dm_gpio_ops gpio_mediatek_ops = {

static int gpio_mediatek_probe(struct udevice *dev) { - struct mediatek_gpio_platdata *plat = dev_get_platdata(dev); + struct mediatek_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

/* Tell the uclass how many GPIOs we have */ diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 86329348b9b..ecdeaec2b12 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -281,7 +281,7 @@ static const struct dm_gpio_ops gpio_mxc_ops = { static int mxc_gpio_probe(struct udevice *dev) { struct mxc_bank_info *bank = dev_get_priv(dev); - struct mxc_gpio_plat *plat = dev_get_platdata(dev); + struct mxc_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int banknum; char name[18], *str; @@ -309,7 +309,7 @@ static int mxc_gpio_probe(struct udevice *dev)

static int mxc_gpio_ofdata_to_platdata(struct udevice *dev) { - struct mxc_gpio_plat *plat = dev_get_platdata(dev); + struct mxc_gpio_plat *plat = dev_get_plat(dev); if (!CONFIG_IS_ENABLED(OF_PLATDATA)) { fdt_addr_t addr; addr = dev_read_addr(dev); diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index 581d16125fb..7ef34c65584 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -235,7 +235,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_platdata(dev); + struct mxs_gpio_platdata *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; diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c index f0bbb9e7108..d69a22aff76 100644 --- a/drivers/gpio/nx_gpio.c +++ b/drivers/gpio/nx_gpio.c @@ -44,7 +44,7 @@ struct nx_gpio_platdata {

static int nx_alive_gpio_is_check(struct udevice *dev) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); const char *bank_name = plat->bank_name;

if (!strcmp(bank_name, "gpio_alv")) @@ -55,7 +55,7 @@ static int nx_alive_gpio_is_check(struct udevice *dev)

static int nx_alive_gpio_direction_input(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs;

setbits_le32(&regs->outputenb_reset, 1 << pin); @@ -66,7 +66,7 @@ static int nx_alive_gpio_direction_input(struct udevice *dev, unsigned int pin) static int nx_alive_gpio_direction_output(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs;

if (val) @@ -81,7 +81,7 @@ static int nx_alive_gpio_direction_output(struct udevice *dev, unsigned int pin,

static int nx_alive_gpio_get_value(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; unsigned int mask = 1UL << pin; unsigned int value; @@ -94,7 +94,7 @@ static int nx_alive_gpio_get_value(struct udevice *dev, unsigned int pin) static int nx_alive_gpio_set_value(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs;

if (val) @@ -107,7 +107,7 @@ static int nx_alive_gpio_set_value(struct udevice *dev, unsigned int pin,

static int nx_alive_gpio_get_function(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; unsigned int mask = (1UL << pin); unsigned int output; @@ -122,7 +122,7 @@ static int nx_alive_gpio_get_function(struct udevice *dev, unsigned int pin)

static int nx_gpio_direction_input(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs;

if (nx_alive_gpio_is_check(dev)) @@ -136,7 +136,7 @@ static int nx_gpio_direction_input(struct udevice *dev, unsigned int pin) static int nx_gpio_direction_output(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs;

if (nx_alive_gpio_is_check(dev)) @@ -154,7 +154,7 @@ static int nx_gpio_direction_output(struct udevice *dev, unsigned int pin,

static int nx_gpio_get_value(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; unsigned int mask = 1UL << pin; unsigned int value; @@ -169,7 +169,7 @@ static int nx_gpio_get_value(struct udevice *dev, unsigned int pin)

static int nx_gpio_set_value(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs;

if (nx_alive_gpio_is_check(dev)) @@ -185,7 +185,7 @@ static int nx_gpio_set_value(struct udevice *dev, unsigned int pin, int val)

static int nx_gpio_get_function(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; unsigned int mask = (1UL << pin); unsigned int output; @@ -204,7 +204,7 @@ static int nx_gpio_get_function(struct udevice *dev, unsigned int pin) static int nx_gpio_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev);

uc_priv->gpio_count = plat->gpio_count; uc_priv->bank_name = plat->bank_name; @@ -214,7 +214,7 @@ static int nx_gpio_probe(struct udevice *dev)

static int nx_gpio_ofdata_to_platdata(struct udevice *dev) { - struct nx_gpio_platdata *plat = dev_get_platdata(dev); + struct nx_gpio_platdata *plat = dev_get_plat(dev);

plat->regs = map_physmem(devfdt_get_addr(dev), sizeof(struct nx_gpio_regs), diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 7be1beb243a..6581dca6735 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -285,7 +285,7 @@ static const struct dm_gpio_ops gpio_omap_ops = { static int omap_gpio_probe(struct udevice *dev) { struct gpio_bank *bank = dev_get_priv(dev); - struct omap_gpio_platdata *plat = dev_get_platdata(dev); + struct omap_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[18], *str;

@@ -302,7 +302,7 @@ static int omap_gpio_probe(struct udevice *dev) #if !CONFIG_IS_ENABLED(OF_CONTROL) static int omap_gpio_bind(struct udevice *dev) { - struct omap_gpio_platdata *plat = dev_get_platdata(dev); + struct omap_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t base_addr;

if (plat) @@ -344,7 +344,7 @@ static const struct udevice_id omap_gpio_ids[] = {

static int omap_gpio_ofdata_to_platdata(struct udevice *dev) { - struct omap_gpio_platdata *plat = dev_get_platdata(dev); + struct omap_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index 239c0f7456b..dc8911a8eb9 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -76,7 +76,7 @@ struct pca953x_info { static int pca953x_write_single(struct udevice *dev, int reg, u8 val, int offset) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev); int bank_shift = fls((info->gpio_count - 1) / BANK_SZ); int off = offset / BANK_SZ; int ret = 0; @@ -93,7 +93,7 @@ static int pca953x_write_single(struct udevice *dev, int reg, u8 val, static int pca953x_read_single(struct udevice *dev, int reg, u8 *val, int offset) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev); int bank_shift = fls((info->gpio_count - 1) / BANK_SZ); int off = offset / BANK_SZ; int ret; @@ -112,7 +112,7 @@ static int pca953x_read_single(struct udevice *dev, int reg, u8 *val,

static int pca953x_read_regs(struct udevice *dev, int reg, u8 *val) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev); int ret = 0;

if (info->gpio_count <= 8) { @@ -137,7 +137,7 @@ static int pca953x_read_regs(struct udevice *dev, int reg, u8 *val)

static int pca953x_write_regs(struct udevice *dev, int reg, u8 *val) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev); int ret = 0;

if (info->gpio_count <= 8) { @@ -160,7 +160,7 @@ static int pca953x_write_regs(struct udevice *dev, int reg, u8 *val)

static int pca953x_is_output(struct udevice *dev, int offset) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev);

int bank = offset / BANK_SZ; int off = offset % BANK_SZ; @@ -185,7 +185,7 @@ static int pca953x_get_value(struct udevice *dev, uint offset)

static int pca953x_set_value(struct udevice *dev, uint offset, int value) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev); int bank = offset / BANK_SZ; int off = offset % BANK_SZ; u8 val; @@ -207,7 +207,7 @@ static int pca953x_set_value(struct udevice *dev, uint offset, int value)

static int pca953x_set_direction(struct udevice *dev, uint offset, int dir) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev); int bank = offset / BANK_SZ; int off = offset % BANK_SZ; u8 val; @@ -271,7 +271,7 @@ static const struct dm_gpio_ops pca953x_ops = {

static int pca953x_probe(struct udevice *dev) { - struct pca953x_info *info = dev_get_platdata(dev); + struct pca953x_info *info = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[32], label[8], *str; int addr; diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c index d0ff8817651..570486fc484 100644 --- a/drivers/gpio/pcf8575_gpio.c +++ b/drivers/gpio/pcf8575_gpio.c @@ -85,7 +85,7 @@ static int pcf8575_i2c_read_le16(struct udevice *dev)

static int pcf8575_direction_input(struct udevice *dev, unsigned offset) { - struct pcf8575_chip *plat = dev_get_platdata(dev); + struct pcf8575_chip *plat = dev_get_plat(dev); int status;

plat->out |= BIT(offset); @@ -97,7 +97,7 @@ static int pcf8575_direction_input(struct udevice *dev, unsigned offset) static int pcf8575_direction_output(struct udevice *dev, unsigned int offset, int value) { - struct pcf8575_chip *plat = dev_get_platdata(dev); + struct pcf8575_chip *plat = dev_get_plat(dev); int ret;

if (value) @@ -127,7 +127,7 @@ static int pcf8575_set_value(struct udevice *dev, unsigned int offset,

static int pcf8575_ofdata_platdata(struct udevice *dev) { - struct pcf8575_chip *plat = dev_get_platdata(dev); + struct pcf8575_chip *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

int n_latch; diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c index 4be8d4f69ea..79d3ed49e30 100644 --- a/drivers/gpio/sifive-gpio.c +++ b/drivers/gpio/sifive-gpio.c @@ -15,7 +15,7 @@

static int sifive_gpio_probe(struct udevice *dev) { - struct sifive_gpio_platdata *plat = dev_get_platdata(dev); + struct sifive_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[18], *str;

@@ -49,7 +49,7 @@ static void sifive_update_gpio_reg(void *bptr, u32 offset, bool value)

static int sifive_gpio_direction_input(struct udevice *dev, u32 offset) { - struct sifive_gpio_platdata *plat = dev_get_platdata(dev); + struct sifive_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

if (offset > uc_priv->gpio_count) @@ -65,7 +65,7 @@ static int sifive_gpio_direction_input(struct udevice *dev, u32 offset) static int sifive_gpio_direction_output(struct udevice *dev, u32 offset, int value) { - struct sifive_gpio_platdata *plat = dev_get_platdata(dev); + struct sifive_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

if (offset > uc_priv->gpio_count) @@ -83,7 +83,7 @@ static int sifive_gpio_direction_output(struct udevice *dev, u32 offset,

static int sifive_gpio_get_value(struct udevice *dev, u32 offset) { - struct sifive_gpio_platdata *plat = dev_get_platdata(dev); + struct sifive_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int val; int dir; @@ -104,7 +104,7 @@ static int sifive_gpio_get_value(struct udevice *dev, u32 offset)

static int sifive_gpio_set_value(struct udevice *dev, u32 offset, int value) { - struct sifive_gpio_platdata *plat = dev_get_platdata(dev); + struct sifive_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

if (offset > uc_priv->gpio_count) @@ -117,7 +117,7 @@ static int sifive_gpio_set_value(struct udevice *dev, u32 offset, int value)

static int sifive_gpio_get_function(struct udevice *dev, unsigned int offset) { - struct sifive_gpio_platdata *plat = dev_get_platdata(dev); + struct sifive_gpio_platdata *plat = dev_get_plat(dev); u32 outdir, indir, val; struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

@@ -156,7 +156,7 @@ static const struct dm_gpio_ops sifive_gpio_ops = {

static int sifive_gpio_ofdata_to_platdata(struct udevice *dev) { - struct sifive_gpio_platdata *plat = dev_get_platdata(dev); + struct sifive_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 62d584a810c..567bd647ff6 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -158,7 +158,7 @@ int sunxi_name_to_gpio(const char *name)

static int sunxi_gpio_direction_input(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_platdata(dev); + struct sunxi_gpio_platdata *plat = dev_get_plat(dev);

sunxi_gpio_set_cfgbank(plat->regs, offset, SUNXI_GPIO_INPUT);

@@ -168,7 +168,7 @@ static int sunxi_gpio_direction_input(struct udevice *dev, unsigned offset) static int sunxi_gpio_direction_output(struct udevice *dev, unsigned offset, int value) { - struct sunxi_gpio_platdata *plat = dev_get_platdata(dev); + struct sunxi_gpio_platdata *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset);

sunxi_gpio_set_cfgbank(plat->regs, offset, SUNXI_GPIO_OUTPUT); @@ -179,7 +179,7 @@ static int sunxi_gpio_direction_output(struct udevice *dev, unsigned offset,

static int sunxi_gpio_get_value(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_platdata(dev); + struct sunxi_gpio_platdata *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset); unsigned dat;

@@ -192,7 +192,7 @@ static int sunxi_gpio_get_value(struct udevice *dev, unsigned offset) static int sunxi_gpio_set_value(struct udevice *dev, unsigned offset, int value) { - struct sunxi_gpio_platdata *plat = dev_get_platdata(dev); + struct sunxi_gpio_platdata *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset);

clrsetbits_le32(&plat->regs->dat, 1 << num, value ? (1 << num) : 0); @@ -201,7 +201,7 @@ static int sunxi_gpio_set_value(struct udevice *dev, unsigned offset,

static int sunxi_gpio_get_function(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_platdata(dev); + struct sunxi_gpio_platdata *plat = dev_get_plat(dev); int func;

func = sunxi_gpio_get_cfgbank(plat->regs, offset); @@ -260,7 +260,7 @@ static char *gpio_bank_name(int bank)

static int gpio_sunxi_probe(struct udevice *dev) { - struct sunxi_gpio_platdata *plat = dev_get_platdata(dev); + struct sunxi_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

/* Tell the uclass how many GPIOs we have */ diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index 2d05909409f..bd0623bcfa7 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -93,7 +93,7 @@ static const struct dm_gpio_ops gpio_vybrid_ops = { static int vybrid_gpio_probe(struct udevice *dev) { struct vybrid_gpios *gpios = dev_get_priv(dev); - struct vybrid_gpio_platdata *plat = dev_get_platdata(dev); + struct vybrid_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

uc_priv->bank_name = plat->port_name; @@ -106,7 +106,7 @@ static int vybrid_gpio_probe(struct udevice *dev)

static int vybrid_gpio_odata_to_platdata(struct udevice *dev) { - struct vybrid_gpio_platdata *plat = dev_get_platdata(dev); + struct vybrid_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t base_addr;

base_addr = dev_read_addr(dev); diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 6de08e1d080..847f399dafb 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -36,7 +36,7 @@ struct xilinx_gpio_privdata { static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, u32 *bank_pin_num, struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); u32 bank, max_pins; /* the first gpio is 0 not 1 */ u32 pin_num = offset; @@ -59,7 +59,7 @@ static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -87,7 +87,7 @@ static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset,

static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -114,7 +114,7 @@ static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset)

static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); int val, ret; u32 bank, pin;

@@ -143,7 +143,7 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); int val, ret; u32 bank, pin;

@@ -168,7 +168,7 @@ static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset,

static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); int val, ret; u32 bank, pin;

@@ -194,7 +194,7 @@ static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) static int xilinx_gpio_xlate(struct udevice *dev, struct gpio_desc *desc, struct ofnode_phandle_args *args) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev);

desc->offset = args->args[0];

@@ -239,7 +239,7 @@ static const struct dm_gpio_ops xilinx_gpio_ops = {

static int xilinx_gpio_probe(struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr; @@ -265,7 +265,7 @@ static int xilinx_gpio_probe(struct udevice *dev)

static int xilinx_gpio_ofdata_to_platdata(struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_platdata(dev); + struct xilinx_gpio_platdata *plat = dev_get_plat(dev); int is_dual;

plat->regs = (struct gpio_regs *)dev_read_addr(dev); diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index cfe35674b78..a273aff6e0e 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -193,7 +193,7 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num, unsigned int *bank_pin_num, struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev); u32 bank;

for (bank = 0; bank < plat->p_data->max_bank; bank++) { @@ -215,7 +215,7 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num,

static int gpio_is_valid(unsigned gpio, struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev);

return gpio < plat->p_data->ngpio; } @@ -233,7 +233,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) { u32 data; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -249,7 +249,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value) { unsigned int reg_offset, bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -281,7 +281,7 @@ static int zynq_gpio_direction_input(struct udevice *dev, unsigned gpio) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -305,7 +305,7 @@ static int zynq_gpio_direction_output(struct udevice *dev, unsigned gpio, { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -331,7 +331,7 @@ static int zynq_gpio_get_function(struct udevice *dev, unsigned offset) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev);

if (check_gpio(offset, dev) < 0) return -1; @@ -369,7 +369,7 @@ static const struct udevice_id zynq_gpio_ids[] = {

static int zynq_gpio_probe(struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr;

@@ -390,7 +390,7 @@ static int zynq_gpio_probe(struct udevice *dev)

static int zynq_gpio_ofdata_to_platdata(struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_platdata(dev); + struct zynq_gpio_platdata *plat = dev_get_plat(dev);

plat->base = (phys_addr_t)dev_read_addr(dev);

diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c index 4858479b142..ad11e978ccd 100644 --- a/drivers/i2c/lpc32xx_i2c.c +++ b/drivers/i2c/lpc32xx_i2c.c @@ -281,7 +281,7 @@ U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_2, lpc32xx_i2c_init, NULL, #else /* CONFIG_DM_I2C */ static int lpc32xx_i2c_probe(struct udevice *bus) { - struct lpc32xx_i2c_dev *dev = dev_get_platdata(bus); + struct lpc32xx_i2c_dev *dev = dev_get_plat(bus);

/* * FIXME: This is not permitted @@ -295,14 +295,14 @@ static int lpc32xx_i2c_probe(struct udevice *bus) static int lpc32xx_i2c_probe_chip(struct udevice *bus, u32 chip_addr, u32 chip_flags) { - struct lpc32xx_i2c_dev *dev = dev_get_platdata(bus); + struct lpc32xx_i2c_dev *dev = dev_get_plat(bus); return __i2c_probe_chip(dev->base, chip_addr); }

static int lpc32xx_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) { - struct lpc32xx_i2c_dev *dev = dev_get_platdata(bus); + struct lpc32xx_i2c_dev *dev = dev_get_plat(bus); struct i2c_msg *dmsg, *omsg, dummy; uint i = 0, address = 0;

@@ -334,13 +334,13 @@ static int lpc32xx_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,

static int lpc32xx_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) { - struct lpc32xx_i2c_dev *dev = dev_get_platdata(bus); + struct lpc32xx_i2c_dev *dev = dev_get_plat(bus); return __i2c_set_bus_speed(dev->base, speed, dev->index); }

static int lpc32xx_i2c_reset(struct udevice *bus) { - struct lpc32xx_i2c_dev *dev = dev_get_platdata(bus); + struct lpc32xx_i2c_dev *dev = dev_get_plat(bus);

__i2c_init(dev->base, dev->speed, 0, dev->index); return 0; diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index ea9e93327dd..9d05a1f7021 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -1049,7 +1049,7 @@ static int omap_i2c_probe_chip(struct udevice *bus, uint chip_addr, static int omap_i2c_probe(struct udevice *bus) { struct omap_i2c *priv = dev_get_priv(bus); - struct omap_i2c_platdata *plat = dev_get_platdata(bus); + struct omap_i2c_platdata *plat = dev_get_plat(bus);

priv->speed = plat->speed; priv->regs = map_physmem(plat->base, sizeof(void *), @@ -1065,7 +1065,7 @@ static int omap_i2c_probe(struct udevice *bus) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int omap_i2c_ofdata_to_platdata(struct udevice *bus) { - struct omap_i2c_platdata *plat = dev_get_platdata(bus); + struct omap_i2c_platdata *plat = dev_get_plat(bus);

plat->base = dev_read_addr(bus); plat->speed = dev_read_u32_default(bus, "clock-frequency", diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c index f9e497f915e..c705eba61bd 100644 --- a/drivers/led/led_cortina.c +++ b/drivers/led/led_cortina.c @@ -136,7 +136,7 @@ static int ca_led_ofdata_to_platdata(struct udevice *dev)

/* Top-level LED node */ if (!uc_plat->label) { - struct cortina_led_platdata *plt = dev_get_platdata(dev); + struct cortina_led_platdata *plt = dev_get_plat(dev);

plt->rate1 = dev_read_u32_default(dev, "Cortina,blink-rate1", 256); @@ -169,7 +169,7 @@ static int cortina_led_probe(struct udevice *dev)

/* Top-level LED node */ if (!uc_plat->label) { - struct cortina_led_platdata *plat = dev_get_platdata(dev); + struct cortina_led_platdata *plat = dev_get_plat(dev); u32 reg_value, val; u16 rate1, rate2;

diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index 2bb520f0661..31684d7e810 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -71,7 +71,7 @@ static int altera_sysid_read(struct udevice *dev,

static int altera_sysid_ofdata_to_platdata(struct udevice *dev) { - struct altera_sysid_platdata *plat = dev_get_platdata(dev); + struct altera_sysid_platdata *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_sysid_regs), diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c index 65db9c808fc..92b2f277a52 100644 --- a/drivers/misc/i2c_eeprom_emul.c +++ b/drivers/misc/i2c_eeprom_emul.c @@ -36,14 +36,14 @@ struct sandbox_i2c_flash { void sandbox_i2c_eeprom_set_test_mode(struct udevice *dev, enum sandbox_i2c_eeprom_test_mode mode) { - struct sandbox_i2c_flash_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(dev);

plat->test_mode = mode; }

void sandbox_i2c_eeprom_set_offset_len(struct udevice *dev, int offset_len) { - struct sandbox_i2c_flash_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(dev);

plat->offset_len = offset_len; } @@ -51,7 +51,7 @@ void sandbox_i2c_eeprom_set_offset_len(struct udevice *dev, int offset_len) void sandbox_i2c_eeprom_set_chip_addr_offset_mask(struct udevice *dev, uint mask) { - struct sandbox_i2c_flash_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(dev);

plat->chip_addr_offset_mask = mask; } @@ -74,7 +74,7 @@ static int sandbox_i2c_eeprom_xfer(struct udevice *emul, struct i2c_msg *msg, int nmsgs) { struct sandbox_i2c_flash *priv = dev_get_priv(emul); - struct sandbox_i2c_flash_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(emul); uint offset = msg->addr & plat->chip_addr_offset_mask;

debug("\n%s\n", __func__); @@ -151,7 +151,7 @@ struct dm_i2c_ops sandbox_i2c_emul_ops = {

static int sandbox_i2c_eeprom_ofdata_to_platdata(struct udevice *dev) { - struct sandbox_i2c_flash_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(dev);

plat->size = dev_read_u32_default(dev, "sandbox,size", 32); plat->filename = dev_read_string(dev, "sandbox,filename"); @@ -169,7 +169,7 @@ static int sandbox_i2c_eeprom_ofdata_to_platdata(struct udevice *dev)

static int sandbox_i2c_eeprom_probe(struct udevice *dev) { - struct sandbox_i2c_flash_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(dev); struct sandbox_i2c_flash *priv = dev_get_priv(dev);

priv->data = calloc(1, plat->size); diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c index 65e34d53206..72a34732637 100644 --- a/drivers/misc/imx8/scu.c +++ b/drivers/misc/imx8/scu.c @@ -158,7 +158,7 @@ static int sc_ipc_write(struct mu_type *base, void *data) static int imx8_scu_call(struct udevice *dev, int no_resp, void *tx_msg, int tx_size, void *rx_msg, int rx_size) { - struct imx8_scu *plat = dev_get_platdata(dev); + struct imx8_scu *plat = dev_get_plat(dev); sc_err_t result; int ret;

@@ -182,7 +182,7 @@ static int imx8_scu_call(struct udevice *dev, int no_resp, void *tx_msg,

static int imx8_scu_probe(struct udevice *dev) { - struct imx8_scu *plat = dev_get_platdata(dev); + struct imx8_scu *plat = dev_get_plat(dev); fdt_addr_t addr;

debug("%s(dev=%p) (plat=%p)\n", __func__, dev, plat); diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c index 1d9ca82b95b..a95d9cbaf96 100644 --- a/drivers/misc/microchip_flexcom.c +++ b/drivers/misc/microchip_flexcom.c @@ -23,7 +23,7 @@ struct microchip_flexcom_platdata {

static int microchip_flexcom_ofdata_to_platdata(struct udevice *dev) { - struct microchip_flexcom_platdata *plat = dev_get_platdata(dev); + struct microchip_flexcom_platdata *plat = dev_get_plat(dev); int ret;

plat->regs = map_physmem(dev_read_addr(dev), diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c index 642e94f1ecc..5c70ca87f49 100644 --- a/drivers/misc/p2sb_emul.c +++ b/drivers/misc/p2sb_emul.c @@ -53,7 +53,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_platdata(emul); + struct p2sb_emul_platdata *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -106,7 +106,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_platdata(emul); + struct p2sb_emul_platdata *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -134,7 +134,7 @@ static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, static int sandbox_p2sb_emul_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct p2sb_emul_platdata *plat = dev_get_platdata(emul); + struct p2sb_emul_platdata *plat = dev_get_plat(emul); int barnum;

for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index d3aa5b9d6f9..4659d4eb87f 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -86,7 +86,7 @@ U_BOOT_CMD( static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, void *buf, int size) { - struct rockchip_efuse_platdata *plat = dev_get_platdata(dev); + struct rockchip_efuse_platdata *plat = dev_get_plat(dev); struct rockchip_efuse_regs *efuse = (struct rockchip_efuse_regs *)plat->base;

@@ -139,7 +139,7 @@ static const struct misc_ops rockchip_efuse_ops = {

static int rockchip_efuse_ofdata_to_platdata(struct udevice *dev) { - struct rockchip_efuse_platdata *plat = dev_get_platdata(dev); + struct rockchip_efuse_platdata *plat = dev_get_plat(dev);

plat->base = dev_read_addr_ptr(dev); return 0; diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c index be666bc6238..b56eb663286 100644 --- a/drivers/misc/rockchip-otp.c +++ b/drivers/misc/rockchip-otp.c @@ -102,7 +102,7 @@ static int rockchip_otp_ecc_enable(struct rockchip_otp_platdata *otp, static int rockchip_px30_otp_read(struct udevice *dev, int offset, void *buf, int size) { - struct rockchip_otp_platdata *otp = dev_get_platdata(dev); + struct rockchip_otp_platdata *otp = dev_get_plat(dev); u8 *buffer = buf; int ret = 0;

@@ -147,7 +147,7 @@ static const struct misc_ops rockchip_otp_ops = {

static int rockchip_otp_ofdata_to_platdata(struct udevice *dev) { - struct rockchip_otp_platdata *otp = dev_get_platdata(dev); + struct rockchip_otp_platdata *otp = dev_get_plat(dev);

otp->base = dev_read_addr_ptr(dev);

diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c index 33c0d684614..1f0bd1dce0e 100644 --- a/drivers/misc/sifive-otp.c +++ b/drivers/misc/sifive-otp.c @@ -100,7 +100,7 @@ struct sifive_otp_platdata { static int sifive_otp_read(struct udevice *dev, int offset, void *buf, int size) { - struct sifive_otp_platdata *plat = dev_get_platdata(dev); + struct sifive_otp_platdata *plat = dev_get_plat(dev); struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs;

/* Check if offset and size are multiple of BYTES_PER_FUSE */ @@ -162,7 +162,7 @@ static int sifive_otp_read(struct udevice *dev, int offset, static int sifive_otp_write(struct udevice *dev, int offset, const void *buf, int size) { - struct sifive_otp_platdata *plat = dev_get_platdata(dev); + struct sifive_otp_platdata *plat = dev_get_plat(dev); struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs;

/* Check if offset and size are multiple of BYTES_PER_FUSE */ @@ -241,7 +241,7 @@ static int sifive_otp_write(struct udevice *dev, int offset,

static int sifive_otp_ofdata_to_platdata(struct udevice *dev) { - struct sifive_otp_platdata *plat = dev_get_platdata(dev); + struct sifive_otp_platdata *plat = dev_get_plat(dev); int ret;

plat->regs = dev_read_addr_ptr(dev); diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c index 5de78410e66..9dd3b06f81b 100644 --- a/drivers/misc/swap_case.c +++ b/drivers/misc/swap_case.c @@ -100,7 +100,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct swap_case_platdata *plat = dev_get_platdata(emul); + struct swap_case_platdata *plat = dev_get_plat(emul);

/* * The content of the EA capability structure is handled elsewhere to @@ -200,7 +200,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul, static int sandbox_swap_case_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct swap_case_platdata *plat = dev_get_platdata(emul); + struct swap_case_platdata *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -228,7 +228,7 @@ static int sandbox_swap_case_write_config(struct udevice *emul, uint offset, static int sandbox_swap_case_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct swap_case_platdata *plat = dev_get_platdata(emul); + struct swap_case_platdata *plat = dev_get_plat(emul); int barnum;

for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c index 2015e31b724..1fca3e6dd9d 100644 --- a/drivers/mmc/am654_sdhci.c +++ b/drivers/mmc/am654_sdhci.c @@ -129,7 +129,7 @@ static void am654_sdhci_set_control_reg(struct sdhci_host *host) static int am654_sdhci_set_ios_post(struct sdhci_host *host) { struct udevice *dev = host->mmc->dev; - struct am654_sdhci_plat *plat = dev_get_platdata(dev); + struct am654_sdhci_plat *plat = dev_get_plat(dev); unsigned int speed = host->mmc->clock; int sel50, sel100, freqsel; u32 otap_del_sel; @@ -269,7 +269,7 @@ int am654_sdhci_init(struct am654_sdhci_plat *plat) static int am654_sdhci_deferred_probe(struct sdhci_host *host) { struct udevice *dev = host->mmc->dev; - struct am654_sdhci_plat *plat = dev_get_platdata(dev); + struct am654_sdhci_plat *plat = dev_get_plat(dev); unsigned long start; int val;

@@ -311,7 +311,7 @@ const struct am654_driver_data j721e_8bit_drv_data = { static int j721e_4bit_sdhci_set_ios_post(struct sdhci_host *host) { struct udevice *dev = host->mmc->dev; - struct am654_sdhci_plat *plat = dev_get_platdata(dev); + struct am654_sdhci_plat *plat = dev_get_plat(dev); u32 otap_del_sel, mask, val;

otap_del_sel = plat->otap_del_sel[host->mmc->selected_mode]; @@ -335,7 +335,7 @@ const struct am654_driver_data j721e_4bit_drv_data = { static int sdhci_am654_get_otap_delay(struct udevice *dev, struct mmc_config *cfg) { - struct am654_sdhci_plat *plat = dev_get_platdata(dev); + struct am654_sdhci_plat *plat = dev_get_plat(dev); int ret; int i;

@@ -367,7 +367,7 @@ static int am654_sdhci_probe(struct udevice *dev) { struct am654_driver_data *drv_data = (struct am654_driver_data *)dev_get_driver_data(dev); - struct am654_sdhci_plat *plat = dev_get_platdata(dev); + struct am654_sdhci_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct sdhci_host *host = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg; @@ -410,7 +410,7 @@ static int am654_sdhci_probe(struct udevice *dev)

static int am654_sdhci_ofdata_to_platdata(struct udevice *dev) { - struct am654_sdhci_plat *plat = dev_get_platdata(dev); + struct am654_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg; u32 drv_strength; @@ -463,7 +463,7 @@ static int am654_sdhci_bind(struct udevice *dev) { struct am654_driver_data *drv_data = (struct am654_driver_data *)dev_get_driver_data(dev); - struct am654_sdhci_plat *plat = dev_get_platdata(dev); + struct am654_sdhci_plat *plat = dev_get_plat(dev);

plat->flags = drv_data->flags;

diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c index 6d983d0b020..7dc23ca2266 100644 --- a/drivers/mmc/arm_pl180_mmci.c +++ b/drivers/mmc/arm_pl180_mmci.c @@ -418,7 +418,7 @@ static void arm_pl180_mmc_init(struct pl180_mmc_host *host)

static int arm_pl180_mmc_probe(struct udevice *dev) { - struct arm_pl180_mmc_plat *pdata = dev_get_platdata(dev); + struct arm_pl180_mmc_plat *pdata = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct mmc *mmc = &pdata->mmc; struct pl180_mmc_host *host = dev->priv; @@ -486,7 +486,7 @@ static int arm_pl180_mmc_probe(struct udevice *dev)

int arm_pl180_mmc_bind(struct udevice *dev) { - struct arm_pl180_mmc_plat *plat = dev_get_platdata(dev); + struct arm_pl180_mmc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c index 1e340f82a10..45373157198 100644 --- a/drivers/mmc/aspeed_sdhci.c +++ b/drivers/mmc/aspeed_sdhci.c @@ -19,7 +19,7 @@ struct aspeed_sdhci_plat { static int aspeed_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct aspeed_sdhci_plat *plat = dev_get_platdata(dev); + struct aspeed_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); u32 max_clk; struct clk clk; @@ -67,7 +67,7 @@ free:

static int aspeed_sdhci_bind(struct udevice *dev) { - struct aspeed_sdhci_plat *plat = dev_get_platdata(dev); + struct aspeed_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index ee5d0dc4d70..2de8eb83e78 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -54,7 +54,7 @@ struct atmel_sdhci_plat { static int atmel_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct atmel_sdhci_plat *plat = dev_get_platdata(dev); + struct atmel_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); u32 max_clk; struct clk clk; @@ -111,7 +111,7 @@ static int atmel_sdhci_probe(struct udevice *dev)

static int atmel_sdhci_bind(struct udevice *dev) { - struct atmel_sdhci_plat *plat = dev_get_platdata(dev); + struct atmel_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 958129ca2a5..5e48394fd0f 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -166,7 +166,7 @@ static const struct sdhci_ops bcm2835_ops = {

static int bcm2835_sdhci_bind(struct udevice *dev) { - struct bcm2835_sdhci_plat *plat = dev_get_platdata(dev); + struct bcm2835_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } @@ -174,7 +174,7 @@ static int bcm2835_sdhci_bind(struct udevice *dev) static int bcm2835_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct bcm2835_sdhci_plat *plat = dev_get_platdata(dev); + struct bcm2835_sdhci_plat *plat = dev_get_plat(dev); struct bcm2835_sdhci_host *priv = dev_get_priv(dev); struct sdhci_host *host = &priv->host; fdt_addr_t base; diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c index 8531f54c522..894dbdd6861 100644 --- a/drivers/mmc/bcm2835_sdhost.c +++ b/drivers/mmc/bcm2835_sdhost.c @@ -755,7 +755,7 @@ static void bcm2835_add_host(struct bcm2835_host *host)

static int bcm2835_probe(struct udevice *dev) { - struct bcm2835_plat *plat = dev_get_platdata(dev); + struct bcm2835_plat *plat = dev_get_plat(dev); struct bcm2835_host *host = dev_get_priv(dev); struct mmc *mmc = mmc_get_mmc_dev(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); @@ -795,7 +795,7 @@ static const struct dm_mmc_ops bcm2835_ops = {

static int bcm2835_bind(struct udevice *dev) { - struct bcm2835_plat *plat = dev_get_platdata(dev); + struct bcm2835_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c index e8041eb30fd..dc96818cff4 100644 --- a/drivers/mmc/bcmstb_sdhci.c +++ b/drivers/mmc/bcmstb_sdhci.c @@ -49,7 +49,7 @@ struct sdhci_bcmstb_plat {

static int sdhci_bcmstb_bind(struct udevice *dev) { - struct sdhci_bcmstb_plat *plat = dev_get_platdata(dev); + struct sdhci_bcmstb_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } @@ -57,7 +57,7 @@ static int sdhci_bcmstb_bind(struct udevice *dev) static int sdhci_bcmstb_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct sdhci_bcmstb_plat *plat = dev_get_platdata(dev); + struct sdhci_bcmstb_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); fdt_addr_t base; int ret; diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index f295c541344..5b08d09912d 100644 --- a/drivers/mmc/ca_dw_mmc.c +++ b/drivers/mmc/ca_dw_mmc.c @@ -124,7 +124,7 @@ struct dm_mmc_ops ca_dwmci_dm_ops;

static int ca_dwmmc_probe(struct udevice *dev) { - struct ca_mmc_plat *plat = dev_get_platdata(dev); + struct ca_mmc_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct ca_dwmmc_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -148,7 +148,7 @@ static int ca_dwmmc_probe(struct udevice *dev)

static int ca_dwmmc_bind(struct udevice *dev) { - struct ca_mmc_plat *plat = dev_get_platdata(dev); + struct ca_mmc_plat *plat = dev_get_plat(dev);

return dwmci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index d3562c39a98..975a6bec061 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -478,7 +478,7 @@ int davinci_mmc_init(struct bd_info *bis, struct davinci_mmc *host) static int davinci_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct davinci_mmc_plat *plat = dev_get_platdata(dev); + struct davinci_mmc_plat *plat = dev_get_plat(dev); struct davinci_mmc_priv *priv = dev_get_priv(dev);

priv->reg_base = plat->reg_base; @@ -495,7 +495,7 @@ static int davinci_mmc_probe(struct udevice *dev)

static int davinci_mmc_bind(struct udevice *dev) { - struct davinci_mmc_plat *plat = dev_get_platdata(dev); + struct davinci_mmc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } @@ -503,7 +503,7 @@ static int davinci_mmc_bind(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) static int davinci_mmc_ofdata_to_platdata(struct udevice *dev) { - struct davinci_mmc_plat *plat = dev_get_platdata(dev); + struct davinci_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg = &plat->cfg;

plat->reg_base = (struct davinci_mmc_regs *)dev_read_addr(dev); diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c index 5cc28c53c20..3aa9fb3c89f 100644 --- a/drivers/mmc/exynos_dw_mmc.c +++ b/drivers/mmc/exynos_dw_mmc.c @@ -263,7 +263,7 @@ int exynos_dwmmc_init(const void *blob) #ifdef CONFIG_DM_MMC static int exynos_dwmmc_probe(struct udevice *dev) { - struct exynos_mmc_plat *plat = dev_get_platdata(dev); + struct exynos_mmc_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct dwmci_exynos_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -288,7 +288,7 @@ static int exynos_dwmmc_probe(struct udevice *dev)

static int exynos_dwmmc_bind(struct udevice *dev) { - struct exynos_mmc_plat *plat = dev_get_platdata(dev); + struct exynos_mmc_plat *plat = dev_get_plat(dev);

return dwmci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 4d2db929e60..5d8a534ba3b 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -933,7 +933,7 @@ int fsl_esdhc_mmc_init(struct bd_info *bis) static int fsl_esdhc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev); u32 caps, hostver; fdt_addr_t addr; @@ -1000,7 +1000,7 @@ static int fsl_esdhc_probe(struct udevice *dev)

static int fsl_esdhc_get_cd(struct udevice *dev) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev);

if (plat->cfg.host_caps & MMC_CAP_NONREMOVABLE) @@ -1012,7 +1012,7 @@ static int fsl_esdhc_get_cd(struct udevice *dev) static int fsl_esdhc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev);

return esdhc_send_cmd_common(priv, &plat->mmc, cmd, data); @@ -1020,7 +1020,7 @@ static int fsl_esdhc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,

static int fsl_esdhc_set_ios(struct udevice *dev) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev);

return esdhc_set_ios_common(priv, &plat->mmc); @@ -1028,7 +1028,7 @@ static int fsl_esdhc_set_ios(struct udevice *dev)

static int fsl_esdhc_reinit(struct udevice *dev) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev);

return esdhc_init_common(priv, &plat->mmc); @@ -1037,7 +1037,7 @@ static int fsl_esdhc_reinit(struct udevice *dev) #ifdef MMC_SUPPORTS_TUNING static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev); struct fsl_esdhc *regs = priv->esdhc_regs; u32 val, irqstaten; @@ -1102,7 +1102,7 @@ static const struct udevice_id fsl_esdhc_ids[] = {

static int fsl_esdhc_bind(struct udevice *dev) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 2dea849e37d..1b63315eeba 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -851,7 +851,7 @@ static void esdhc_stop_tuning(struct mmc *mmc)

static int fsl_esdhc_execute_tuning(struct udevice *dev, uint32_t opcode) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev); struct fsl_esdhc *regs = priv->esdhc_regs; struct mmc *mmc = &plat->mmc; @@ -1474,7 +1474,7 @@ static int fsl_esdhc_ofdata_to_platdata(struct udevice *dev) static int fsl_esdhc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev); struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data(dev); @@ -1617,7 +1617,7 @@ static int fsl_esdhc_get_cd(struct udevice *dev) static int fsl_esdhc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev);

return esdhc_send_cmd_common(priv, &plat->mmc, cmd, data); @@ -1625,7 +1625,7 @@ static int fsl_esdhc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,

static int fsl_esdhc_set_ios(struct udevice *dev) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev);

return esdhc_set_ios_common(priv, &plat->mmc); @@ -1691,7 +1691,7 @@ static const struct udevice_id fsl_esdhc_ids[] = { #if CONFIG_IS_ENABLED(BLK) static int fsl_esdhc_bind(struct udevice *dev) { - struct fsl_esdhc_plat *plat = dev_get_platdata(dev); + struct fsl_esdhc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c index 196c52776e3..1c318742353 100644 --- a/drivers/mmc/ftsdc010_mci.c +++ b/drivers/mmc/ftsdc010_mci.c @@ -424,7 +424,7 @@ static int ftsdc010_mmc_ofdata_to_platdata(struct udevice *dev)

static int ftsdc010_mmc_probe(struct udevice *dev) { - struct ftsdc010_plat *plat = dev_get_platdata(dev); + struct ftsdc010_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct ftsdc_priv *priv = dev_get_priv(dev); struct ftsdc010_chip *chip = &priv->chip; @@ -459,7 +459,7 @@ static int ftsdc010_mmc_probe(struct udevice *dev)

int ftsdc010_mmc_bind(struct udevice *dev) { - struct ftsdc010_plat *plat = dev_get_platdata(dev); + struct ftsdc010_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index 6f056aecb6d..da81425038d 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -91,7 +91,7 @@ static inline void mci_set_blklen(atmel_mci_t *mci, int blklen) #ifdef CONFIG_DM_MMC static void mci_set_mode(struct udevice *dev, u32 hz, u32 blklen) { - struct atmel_mci_plat *plat = dev_get_platdata(dev); + struct atmel_mci_plat *plat = dev_get_plat(dev); struct atmel_mci_priv *priv = dev_get_priv(dev); struct mmc *mmc = &plat->mmc; u32 bus_hz = priv->bus_clk_rate; @@ -242,7 +242,7 @@ io_fail: static int atmel_mci_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct atmel_mci_plat *plat = dev_get_platdata(dev); + struct atmel_mci_plat *plat = dev_get_plat(dev); struct atmel_mci_priv *priv = dev_get_priv(dev); atmel_mci_t *mci = plat->mci; #else @@ -373,7 +373,7 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) #ifdef CONFIG_DM_MMC static int atmel_mci_set_ios(struct udevice *dev) { - struct atmel_mci_plat *plat = dev_get_platdata(dev); + struct atmel_mci_plat *plat = dev_get_plat(dev); struct mmc *mmc = mmc_get_mmc_dev(dev); atmel_mci_t *mci = plat->mci; #else @@ -424,7 +424,7 @@ static int mci_set_ios(struct mmc *mmc) #ifdef CONFIG_DM_MMC static int atmel_mci_hw_init(struct udevice *dev) { - struct atmel_mci_plat *plat = dev_get_platdata(dev); + struct atmel_mci_plat *plat = dev_get_plat(dev); atmel_mci_t *mci = plat->mci; #else /* Entered into mmc structure during driver init */ @@ -525,7 +525,7 @@ static const struct dm_mmc_ops atmel_mci_mmc_ops = {

static void atmel_mci_setup_cfg(struct udevice *dev) { - struct atmel_mci_plat *plat = dev_get_platdata(dev); + struct atmel_mci_plat *plat = dev_get_plat(dev); struct atmel_mci_priv *priv = dev_get_priv(dev); struct mmc_config *cfg; u32 version; @@ -584,7 +584,7 @@ failed: static int atmel_mci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct atmel_mci_plat *plat = dev_get_platdata(dev); + struct atmel_mci_plat *plat = dev_get_plat(dev); struct mmc *mmc; int ret;

@@ -608,7 +608,7 @@ static int atmel_mci_probe(struct udevice *dev)

static int atmel_mci_bind(struct udevice *dev) { - struct atmel_mci_plat *plat = dev_get_platdata(dev); + struct atmel_mci_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c index ae9f5a03102..5fd71b8a401 100644 --- a/drivers/mmc/hi6220_dw_mmc.c +++ b/drivers/mmc/hi6220_dw_mmc.c @@ -50,7 +50,7 @@ static int hi6220_dwmmc_ofdata_to_platdata(struct udevice *dev)

static int hi6220_dwmmc_probe(struct udevice *dev) { - struct hi6220_dwmmc_plat *plat = dev_get_platdata(dev); + struct hi6220_dwmmc_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct hi6220_dwmmc_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -74,7 +74,7 @@ static int hi6220_dwmmc_probe(struct udevice *dev)

static int hi6220_dwmmc_bind(struct udevice *dev) { - struct hi6220_dwmmc_plat *plat = dev_get_platdata(dev); + struct hi6220_dwmmc_plat *plat = dev_get_plat(dev); int ret;

ret = dwmci_bind(dev, &plat->mmc, &plat->cfg); diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c index a85697cfa83..f931e4b3c1d 100644 --- a/drivers/mmc/iproc_sdhci.c +++ b/drivers/mmc/iproc_sdhci.c @@ -172,7 +172,7 @@ struct iproc_sdhci_plat { static int iproc_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct iproc_sdhci_plat *plat = dev_get_platdata(dev); + struct iproc_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); struct sdhci_iproc_host *iproc_host; int node = dev_of_offset(dev); @@ -230,7 +230,7 @@ static int iproc_sdhci_probe(struct udevice *dev)

static int iproc_sdhci_bind(struct udevice *dev) { - struct iproc_sdhci_plat *plat = dev_get_platdata(dev); + struct iproc_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c index 99f2c2f40dd..edcfbfbce96 100644 --- a/drivers/mmc/jz_mmc.c +++ b/drivers/mmc/jz_mmc.c @@ -446,7 +446,7 @@ static const struct dm_mmc_ops jz_msc_ops = { static int jz_mmc_ofdata_to_platdata(struct udevice *dev) { struct jz_mmc_priv *priv = dev_get_priv(dev); - struct jz_mmc_plat *plat = dev_get_platdata(dev); + struct jz_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg; int ret;

@@ -473,7 +473,7 @@ static int jz_mmc_ofdata_to_platdata(struct udevice *dev)

static int jz_mmc_bind(struct udevice *dev) { - struct jz_mmc_plat *plat = dev_get_platdata(dev); + struct jz_mmc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } @@ -482,7 +482,7 @@ static int jz_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct jz_mmc_priv *priv = dev_get_priv(dev); - struct jz_mmc_plat *plat = dev_get_platdata(dev); + struct jz_mmc_plat *plat = dev_get_plat(dev);

plat->mmc.priv = priv; upriv->mmc = &plat->mmc; diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 6a9662f69ab..ab10d7c5093 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -243,7 +243,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = {

static int meson_mmc_ofdata_to_platdata(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_platdata(dev); + struct meson_mmc_platdata *pdata = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -257,7 +257,7 @@ static int meson_mmc_ofdata_to_platdata(struct udevice *dev)

static int meson_mmc_probe(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_platdata(dev); + struct meson_mmc_platdata *pdata = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct mmc *mmc = &pdata->mmc; struct mmc_config *cfg = &pdata->cfg; @@ -320,7 +320,7 @@ static int meson_mmc_probe(struct udevice *dev)

int meson_mmc_bind(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_platdata(dev); + struct meson_mmc_platdata *pdata = dev_get_plat(dev);

return mmc_bind(dev, &pdata->mmc, &pdata->cfg); } diff --git a/drivers/mmc/mmc_spi.c b/drivers/mmc/mmc_spi.c index d0c439729fe..51b1aa4372e 100644 --- a/drivers/mmc/mmc_spi.c +++ b/drivers/mmc/mmc_spi.c @@ -411,7 +411,7 @@ done: static int mmc_spi_probe(struct udevice *dev) { struct mmc_spi_priv *priv = dev_get_priv(dev); - struct mmc_spi_plat *plat = dev_get_platdata(dev); + struct mmc_spi_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); char *name;

@@ -446,7 +446,7 @@ static int mmc_spi_probe(struct udevice *dev)

static int mmc_spi_bind(struct udevice *dev) { - struct mmc_spi_plat *plat = dev_get_platdata(dev); + struct mmc_spi_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 45bf269a534..da4cecd7604 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -87,7 +87,7 @@ static int msm_sdc_clk_init(struct udevice *dev) static int msm_sdc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct msm_sdhc_plat *plat = dev_get_platdata(dev); + struct msm_sdhc_plat *plat = dev_get_plat(dev); struct msm_sdhc *prv = dev_get_priv(dev); struct sdhci_host *host = &prv->host; u32 core_version, core_minor, core_major; @@ -189,7 +189,7 @@ static int msm_ofdata_to_platdata(struct udevice *dev)

static int msm_sdc_bind(struct udevice *dev) { - struct msm_sdhc_plat *plat = dev_get_platdata(dev); + struct msm_sdhc_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c index 59217e59b05..cc9d68546f8 100644 --- a/drivers/mmc/mtk-sd.c +++ b/drivers/mmc/mtk-sd.c @@ -885,7 +885,7 @@ static void msdc_set_mclk(struct udevice *dev,

static int msdc_ops_set_ios(struct udevice *dev) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc *mmc = &plat->mmc; uint clock = mmc->clock; @@ -1031,7 +1031,7 @@ static inline void msdc_set_data_delay(struct msdc_host *host, u32 value)

static int hs400_tune_response(struct udevice *dev, u32 opcode) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc *mmc = &plat->mmc; u32 cmd_delay = 0; @@ -1081,7 +1081,7 @@ static int hs400_tune_response(struct udevice *dev, u32 opcode)

static int msdc_tune_response(struct udevice *dev, u32 opcode) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc *mmc = &plat->mmc; u32 rise_delay = 0, fall_delay = 0; @@ -1185,7 +1185,7 @@ skip_internal:

static int msdc_tune_data(struct udevice *dev, u32 opcode) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc *mmc = &plat->mmc; u32 rise_delay = 0, fall_delay = 0; @@ -1276,7 +1276,7 @@ skip_fall: */ static int msdc_tune_together(struct udevice *dev, u32 opcode) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc *mmc = &plat->mmc; u32 rise_delay = 0, fall_delay = 0; @@ -1334,7 +1334,7 @@ skip_fall:

static int msdc_execute_tuning(struct udevice *dev, uint opcode) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc *mmc = &plat->mmc; int ret = 0; @@ -1511,7 +1511,7 @@ static void msdc_ungate_clock(struct msdc_host *host) static int msdc_drv_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg;

@@ -1547,7 +1547,7 @@ static int msdc_drv_probe(struct udevice *dev)

static int msdc_ofdata_to_platdata(struct udevice *dev) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg; fdt_addr_t base, top_base; @@ -1598,7 +1598,7 @@ static int msdc_ofdata_to_platdata(struct udevice *dev)

static int msdc_drv_bind(struct udevice *dev) { - struct msdc_plat *plat = dev_get_platdata(dev); + struct msdc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index 4cc16131c28..556dd380466 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -107,7 +107,7 @@ struct mv_sdhci_plat { static int mv_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct mv_sdhci_plat *plat = dev_get_platdata(dev); + struct mv_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); int ret;

@@ -134,7 +134,7 @@ static int mv_sdhci_probe(struct udevice *dev)

static int mv_sdhci_bind(struct udevice *dev) { - struct mv_sdhci_plat *plat = dev_get_platdata(dev); + struct mv_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index a313791586d..dcf6c7c03f8 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -310,7 +310,7 @@ mxsmmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) static int mxsmmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct mxsmmc_platdata *plat = dev_get_platdata(dev); + struct mxsmmc_platdata *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs; struct mmc *mmc = &plat->mmc; @@ -490,7 +490,7 @@ mxsmmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data)

static int mxsmmc_get_cd(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_platdata(dev); + struct mxsmmc_platdata *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs;

@@ -502,7 +502,7 @@ static int mxsmmc_get_cd(struct udevice *dev)

static int mxsmmc_set_ios(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_platdata(dev); + struct mxsmmc_platdata *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs; struct mmc *mmc = &plat->mmc; @@ -567,7 +567,7 @@ static int mxsmmc_init(struct udevice *dev) static int mxsmmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct mxsmmc_platdata *plat = dev_get_platdata(dev); + struct mxsmmc_platdata *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct blk_desc *bdesc; struct mmc *mmc; @@ -653,7 +653,7 @@ static int mxsmmc_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(BLK) static int mxsmmc_bind(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_platdata(dev); + struct mxsmmc_platdata *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c index d03d589ac66..537be0d0d75 100644 --- a/drivers/mmc/nexell_dw_mmc.c +++ b/drivers/mmc/nexell_dw_mmc.c @@ -179,7 +179,7 @@ static int nexell_dwmmc_ofdata_to_platdata(struct udevice *dev)

static int nexell_dwmmc_probe(struct udevice *dev) { - struct nexell_mmc_plat *plat = dev_get_platdata(dev); + struct nexell_mmc_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct nexell_dwmmc_priv *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -214,7 +214,7 @@ static int nexell_dwmmc_probe(struct udevice *dev)

static int nexell_dwmmc_bind(struct udevice *dev) { - struct nexell_mmc_plat *plat = dev_get_platdata(dev); + struct nexell_mmc_plat *plat = dev_get_plat(dev);

return dwmci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 658fd928304..c4e9e82b193 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -180,7 +180,7 @@ static inline struct omap_hsmmc_data *omap_hsmmc_get_data(struct mmc *mmc) static inline struct mmc_config *omap_hsmmc_get_cfg(struct mmc *mmc) { #if CONFIG_IS_ENABLED(DM_MMC) - struct omap_hsmmc_plat *plat = dev_get_platdata(mmc->dev); + struct omap_hsmmc_plat *plat = dev_get_plat(mmc->dev); return &plat->cfg; #else return &((struct omap_hsmmc_data *)mmc->priv)->cfg; @@ -1900,7 +1900,7 @@ __weak const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr)

static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) { - struct omap_hsmmc_plat *plat = dev_get_platdata(dev); + struct omap_hsmmc_plat *plat = dev_get_plat(dev); struct omap_mmc_of_data *of_data = (void *)dev_get_driver_data(dev);

struct mmc_config *cfg = &plat->cfg; @@ -1949,14 +1949,14 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev)

static int omap_hsmmc_bind(struct udevice *dev) { - struct omap_hsmmc_plat *plat = dev_get_platdata(dev); + struct omap_hsmmc_plat *plat = dev_get_plat(dev); plat->mmc = calloc(1, sizeof(struct mmc)); return mmc_bind(dev, plat->mmc, &plat->cfg); } #endif static int omap_hsmmc_probe(struct udevice *dev) { - struct omap_hsmmc_plat *plat = dev_get_platdata(dev); + struct omap_hsmmc_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct omap_hsmmc_data *priv = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg; diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index d2cc58fa30e..0aec3f7de74 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -31,7 +31,7 @@ struct pci_mmc_priv { static int pci_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct pci_mmc_plat *plat = dev_get_platdata(dev); + struct pci_mmc_plat *plat = dev_get_plat(dev); struct pci_mmc_priv *priv = dev_get_priv(dev); struct sdhci_host *host = &priv->host; int ret; @@ -61,7 +61,7 @@ static int pci_mmc_ofdata_to_platdata(struct udevice *dev)

static int pci_mmc_bind(struct udevice *dev) { - struct pci_mmc_plat *plat = dev_get_platdata(dev); + struct pci_mmc_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c index 04eece59252..fb37c6756c4 100644 --- a/drivers/mmc/pic32_sdhci.c +++ b/drivers/mmc/pic32_sdhci.c @@ -18,7 +18,7 @@ struct pic32_sdhci_plat { static int pic32_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct pic32_sdhci_plat *plat = dev_get_platdata(dev); + struct pic32_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev);

struct clk clk; @@ -71,7 +71,7 @@ static int pic32_sdhci_probe(struct udevice *dev)

static int pic32_sdhci_bind(struct udevice *dev) { - struct pic32_sdhci_plat *plat = dev_get_platdata(dev); + struct pic32_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index 8be9ed6b550..2b45549a143 100644 --- a/drivers/mmc/pxa_mmc_gen.c +++ b/drivers/mmc/pxa_mmc_gen.c @@ -459,7 +459,7 @@ err0: static int pxa_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg = &plat->cfg; struct mmc *mmc = &plat->mmc; struct pxa_mmc_priv *priv = dev_get_priv(dev); @@ -494,7 +494,7 @@ static int pxa_mmc_probe(struct udevice *dev) static int pxa_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev); struct pxa_mmc_priv *priv = dev_get_priv(dev);

return pxa_mmc_send_cmd_common(priv, &plat->mmc, cmd, data); @@ -502,7 +502,7 @@ static int pxa_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,

static int pxa_mmc_set_ios(struct udevice *dev) { - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev); struct pxa_mmc_priv *priv = dev_get_priv(dev);

return pxa_mmc_set_ios_common(priv, &plat->mmc); @@ -517,7 +517,7 @@ static const struct dm_mmc_ops pxa_mmc_ops = { #if CONFIG_IS_ENABLED(BLK) static int pxa_mmc_bind(struct udevice *dev) { - struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 37c80ef1af1..24130e620bf 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -865,7 +865,7 @@ static void renesas_sdhi_filter_caps(struct udevice *dev) #if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) - struct tmio_sd_plat *plat = dev_get_platdata(dev); + struct tmio_sd_plat *plat = dev_get_plat(dev);

/* HS400 is not supported on H3 ES1.x and M3W ES1.0, ES1.1 */ if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) && diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index 67eb89b2a3e..51a6b4dd1b6 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -101,7 +101,7 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)

static int rockchip_dwmmc_probe(struct udevice *dev) { - struct rockchip_mmc_plat *plat = dev_get_platdata(dev); + struct rockchip_mmc_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct rockchip_dwmmc_priv *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -157,7 +157,7 @@ static int rockchip_dwmmc_probe(struct udevice *dev)

static int rockchip_dwmmc_bind(struct udevice *dev) { - struct rockchip_mmc_plat *plat = dev_get_platdata(dev); + struct rockchip_mmc_plat *plat = dev_get_plat(dev);

return dwmci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index 427d41ec62a..939b2344f94 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -34,7 +34,7 @@ struct rockchip_sdhc { static int arasan_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct rockchip_sdhc_plat *plat = dev_get_platdata(dev); + struct rockchip_sdhc_plat *plat = dev_get_plat(dev); struct rockchip_sdhc *prv = dev_get_priv(dev); struct sdhci_host *host = &prv->host; int max_frequency, ret; @@ -96,7 +96,7 @@ static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)

static int rockchip_sdhci_bind(struct udevice *dev) { - struct rockchip_sdhc_plat *plat = dev_get_platdata(dev); + struct rockchip_sdhc_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 82aff9caaf5..3cf56e0ac40 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -192,7 +192,7 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host) #ifdef CONFIG_DM_MMC static int s5p_sdhci_probe(struct udevice *dev) { - struct s5p_sdhci_plat *plat = dev_get_platdata(dev); + struct s5p_sdhci_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct sdhci_host *host = dev_get_priv(dev); int ret; @@ -224,7 +224,7 @@ static int s5p_sdhci_probe(struct udevice *dev)

static int s5p_sdhci_bind(struct udevice *dev) { - struct s5p_sdhci_plat *plat = dev_get_platdata(dev); + struct s5p_sdhci_plat *plat = dev_get_plat(dev); int ret;

ret = sdhci_bind(dev, &plat->mmc, &plat->cfg); diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c index 17c6cea1dc1..8a2391d6510 100644 --- a/drivers/mmc/sandbox_mmc.c +++ b/drivers/mmc/sandbox_mmc.c @@ -108,14 +108,14 @@ static const struct dm_mmc_ops sandbox_mmc_ops = {

int sandbox_mmc_probe(struct udevice *dev) { - struct sandbox_mmc_plat *plat = dev_get_platdata(dev); + struct sandbox_mmc_plat *plat = dev_get_plat(dev);

return mmc_init(&plat->mmc); }

int sandbox_mmc_bind(struct udevice *dev) { - struct sandbox_mmc_plat *plat = dev_get_platdata(dev); + struct sandbox_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg = &plat->cfg;

cfg->name = dev->name; diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index ffbac448cd9..2b726c26b87 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -135,7 +135,7 @@ static int sdhci_cdns_phy_init(struct sdhci_cdns_plat *plat, static void sdhci_cdns_set_control_reg(struct sdhci_host *host) { struct mmc *mmc = host->mmc; - struct sdhci_cdns_plat *plat = dev_get_platdata(mmc->dev); + struct sdhci_cdns_plat *plat = dev_get_plat(mmc->dev); unsigned int clock = mmc->clock; u32 mode, tmp;

@@ -203,7 +203,7 @@ static int sdhci_cdns_set_tune_val(struct sdhci_cdns_plat *plat, static int __maybe_unused sdhci_cdns_execute_tuning(struct udevice *dev, unsigned int opcode) { - struct sdhci_cdns_plat *plat = dev_get_platdata(dev); + struct sdhci_cdns_plat *plat = dev_get_plat(dev); struct mmc *mmc = &plat->mmc; int cur_streak = 0; int max_streak = 0; @@ -246,7 +246,7 @@ static struct dm_mmc_ops sdhci_cdns_mmc_ops;

static int sdhci_cdns_bind(struct udevice *dev) { - struct sdhci_cdns_plat *plat = dev_get_platdata(dev); + struct sdhci_cdns_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } @@ -255,7 +255,7 @@ static int sdhci_cdns_probe(struct udevice *dev) { DECLARE_GLOBAL_DATA_PTR; struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct sdhci_cdns_plat *plat = dev_get_platdata(dev); + struct sdhci_cdns_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); fdt_addr_t base; int ret; diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c index 723e3e3862c..af342f2c290 100644 --- a/drivers/mmc/sh_mmcif.c +++ b/drivers/mmc/sh_mmcif.c @@ -666,14 +666,14 @@ static const struct dm_mmc_ops sh_mmcif_dm_ops = {

static int sh_mmcif_dm_bind(struct udevice *dev) { - struct sh_mmcif_plat *plat = dev_get_platdata(dev); + struct sh_mmcif_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); }

static int sh_mmcif_dm_probe(struct udevice *dev) { - struct sh_mmcif_plat *plat = dev_get_platdata(dev); + struct sh_mmcif_plat *plat = dev_get_plat(dev); struct sh_mmcif_host *host = dev_get_priv(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct clk sh_mmcif_clk; diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c index 9fcd0e0e9cc..b8865b1ca6e 100644 --- a/drivers/mmc/sh_sdhi.c +++ b/drivers/mmc/sh_sdhi.c @@ -818,14 +818,14 @@ static const struct dm_mmc_ops sh_sdhi_dm_ops = {

static int sh_sdhi_dm_bind(struct udevice *dev) { - struct sh_sdhi_plat *plat = dev_get_platdata(dev); + struct sh_sdhi_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); }

static int sh_sdhi_dm_probe(struct udevice *dev) { - struct sh_sdhi_plat *plat = dev_get_platdata(dev); + struct sh_sdhi_plat *plat = dev_get_plat(dev); struct sh_sdhi_host *host = dev_get_priv(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct clk sh_sdhi_clk; diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c index 0533bc2ff63..ad274f5af72 100644 --- a/drivers/mmc/snps_dw_mmc.c +++ b/drivers/mmc/snps_dw_mmc.c @@ -132,7 +132,7 @@ struct dm_mmc_ops snps_dwmci_dm_ops; static int snps_dwmmc_probe(struct udevice *dev) { #ifdef CONFIG_BLK - struct snps_dwmci_plat *plat = dev_get_platdata(dev); + struct snps_dwmci_plat *plat = dev_get_plat(dev); #endif struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct snps_dwmci_priv_data *priv = dev_get_priv(dev); @@ -171,7 +171,7 @@ static int snps_dwmmc_probe(struct udevice *dev) static int snps_dwmmc_bind(struct udevice *dev) { #ifdef CONFIG_BLK - struct snps_dwmci_plat *plat = dev_get_platdata(dev); + struct snps_dwmci_plat *plat = dev_get_plat(dev); int ret;

ret = dwmci_bind(dev, &plat->mmc, &plat->cfg); diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index 2d5efb912b8..84f8b8db2b4 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -133,7 +133,7 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev) static int socfpga_dwmmc_probe(struct udevice *dev) { #ifdef CONFIG_BLK - struct socfpga_dwmci_plat *plat = dev_get_platdata(dev); + struct socfpga_dwmci_plat *plat = dev_get_plat(dev); #endif struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev); @@ -165,7 +165,7 @@ static int socfpga_dwmmc_probe(struct udevice *dev) static int socfpga_dwmmc_bind(struct udevice *dev) { #ifdef CONFIG_BLK - struct socfpga_dwmci_plat *plat = dev_get_platdata(dev); + struct socfpga_dwmci_plat *plat = dev_get_plat(dev); int ret;

ret = dwmci_bind(dev, &plat->mmc, &plat->cfg); diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c index 1da569c75d2..4ad408a2a32 100644 --- a/drivers/mmc/sti_sdhci.c +++ b/drivers/mmc/sti_sdhci.c @@ -35,7 +35,7 @@ struct sti_sdhci_plat { */ static int sti_mmc_core_config(struct udevice *dev) { - struct sti_sdhci_plat *plat = dev_get_platdata(dev); + struct sti_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); int ret;

@@ -71,7 +71,7 @@ static int sti_mmc_core_config(struct udevice *dev) static int sti_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct sti_sdhci_plat *plat = dev_get_platdata(dev); + struct sti_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); int ret;

@@ -126,7 +126,7 @@ static int sti_sdhci_ofdata_to_platdata(struct udevice *dev)

static int sti_sdhci_bind(struct udevice *dev) { - struct sti_sdhci_plat *plat = dev_get_platdata(dev); + struct sti_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index df5bb781c88..76a6a07b1b1 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -644,7 +644,7 @@ static const struct dm_mmc_ops stm32_sdmmc2_ops = { static int stm32_sdmmc2_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct stm32_sdmmc2_plat *plat = dev_get_platdata(dev); + struct stm32_sdmmc2_plat *plat = dev_get_plat(dev); struct stm32_sdmmc2_priv *priv = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg; int ret; @@ -700,7 +700,7 @@ clk_free:

static int stm32_sdmmc_bind(struct udevice *dev) { - struct stm32_sdmmc2_plat *plat = dev_get_platdata(dev); + struct stm32_sdmmc2_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 7490e86960a..b33f80b9da6 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -572,7 +572,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)

static int sunxi_mmc_set_ios(struct udevice *dev) { - struct sunxi_mmc_plat *plat = dev_get_platdata(dev); + struct sunxi_mmc_plat *plat = dev_get_plat(dev); struct sunxi_mmc_priv *priv = dev_get_priv(dev);

return sunxi_mmc_set_ios_common(priv, &plat->mmc); @@ -581,7 +581,7 @@ static int sunxi_mmc_set_ios(struct udevice *dev) static int sunxi_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct sunxi_mmc_plat *plat = dev_get_platdata(dev); + struct sunxi_mmc_plat *plat = dev_get_plat(dev); struct sunxi_mmc_priv *priv = dev_get_priv(dev);

return sunxi_mmc_send_cmd_common(priv, &plat->mmc, cmd, data); @@ -608,7 +608,7 @@ static const struct dm_mmc_ops sunxi_mmc_ops = { static int sunxi_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct sunxi_mmc_plat *plat = dev_get_platdata(dev); + struct sunxi_mmc_plat *plat = dev_get_plat(dev); struct sunxi_mmc_priv *priv = dev_get_priv(dev); struct reset_ctl_bulk reset_bulk; struct clk gate_clk; @@ -682,7 +682,7 @@ static int sunxi_mmc_probe(struct udevice *dev)

static int sunxi_mmc_bind(struct udevice *dev) { - struct sunxi_mmc_plat *plat = dev_get_platdata(dev); + struct sunxi_mmc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c index 1a2a0ffd43c..11564273324 100644 --- a/drivers/mmc/tangier_sdhci.c +++ b/drivers/mmc/tangier_sdhci.c @@ -22,7 +22,7 @@ struct sdhci_tangier_plat {

static int sdhci_tangier_bind(struct udevice *dev) { - struct sdhci_tangier_plat *plat = dev_get_platdata(dev); + struct sdhci_tangier_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } @@ -30,7 +30,7 @@ static int sdhci_tangier_bind(struct udevice *dev) static int sdhci_tangier_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct sdhci_tangier_plat *plat = dev_get_platdata(dev); + struct sdhci_tangier_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); fdt_addr_t base; int ret; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 8a32156b801..760eca40590 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -680,7 +680,7 @@ static const struct dm_mmc_ops tegra_mmc_ops = { static int tegra_mmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct tegra_mmc_plat *plat = dev_get_platdata(dev); + struct tegra_mmc_plat *plat = dev_get_plat(dev); struct tegra_mmc_priv *priv = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg; int bus_width, ret; @@ -749,7 +749,7 @@ static int tegra_mmc_probe(struct udevice *dev)

static int tegra_mmc_bind(struct udevice *dev) { - struct tegra_mmc_plat *plat = dev_get_platdata(dev); + struct tegra_mmc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index c6539736766..2c528689bd3 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -708,14 +708,14 @@ static void tmio_sd_host_init(struct tmio_sd_priv *priv)

int tmio_sd_bind(struct udevice *dev) { - struct tmio_sd_plat *plat = dev_get_platdata(dev); + struct tmio_sd_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); }

int tmio_sd_probe(struct udevice *dev, u32 quirks) { - struct tmio_sd_plat *plat = dev_get_platdata(dev); + struct tmio_sd_plat *plat = dev_get_plat(dev); struct tmio_sd_priv *priv = dev_get_priv(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); fdt_addr_t base; diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c index 9925513c01f..5062397a792 100644 --- a/drivers/mmc/xenon_sdhci.c +++ b/drivers/mmc/xenon_sdhci.c @@ -442,7 +442,7 @@ static const struct sdhci_ops xenon_sdhci_ops = {

static int xenon_sdhci_probe(struct udevice *dev) { - struct xenon_sdhci_plat *plat = dev_get_platdata(dev); + struct xenon_sdhci_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct xenon_sdhci_priv *priv = dev_get_priv(dev); struct sdhci_host *host = dev_get_priv(dev); @@ -545,7 +545,7 @@ static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev)

static int xenon_sdhci_bind(struct udevice *dev) { - struct xenon_sdhci_plat *plat = dev_get_platdata(dev); + struct xenon_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 919e5d77baa..29850a435bc 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -552,7 +552,7 @@ const struct sdhci_ops arasan_ops = {

static int arasan_sdhci_probe(struct udevice *dev) { - struct arasan_sdhci_plat *plat = dev_get_platdata(dev); + struct arasan_sdhci_plat *plat = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct arasan_sdhci_priv *priv = dev_get_priv(dev); struct sdhci_host *host; @@ -641,7 +641,7 @@ static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev)

static int arasan_sdhci_bind(struct udevice *dev) { - struct arasan_sdhci_plat *plat = dev_get_platdata(dev); + struct arasan_sdhci_plat *plat = dev_get_plat(dev);

return sdhci_bind(dev, &plat->mmc, &plat->cfg); } diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index 82d41170292..9a3a21f2e35 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -106,7 +106,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { struct mtd_info *mtd = info->mtd; struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); ulong base = (ulong)pdata->base; loff_t to = addr - base; size_t retlen; @@ -135,7 +135,7 @@ unsigned long flash_init(void) static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; size_t addr = instr->addr; size_t len = instr->len; @@ -197,7 +197,7 @@ static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev);

memcpy_fromio(buf, pdata->base + from, len); *retlen = len; @@ -209,7 +209,7 @@ static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 stat;

@@ -235,7 +235,7 @@ static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, uint64_t *len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; int shift0 = ffs(QUADSPI_SR_BP2_0) - 1; int shift3 = ffs(QUADSPI_SR_BP3) - 1 - 3; @@ -257,7 +257,7 @@ static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, static int altera_qspi_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 sector_start, sector_end; u32 num_sectors; @@ -291,7 +291,7 @@ static int altera_qspi_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) static int altera_qspi_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 mem_op;

@@ -304,7 +304,7 @@ static int altera_qspi_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

static int altera_qspi_probe(struct udevice *dev) { - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; unsigned long base = (unsigned long)pdata->base; struct mtd_info *mtd; @@ -348,7 +348,7 @@ static int altera_qspi_probe(struct udevice *dev)

static int altera_qspi_ofdata_to_platdata(struct udevice *dev) { - struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_platdata *pdata = dev_get_plat(dev); void *blob = (void *)gd->fdt_blob; int node = dev_of_offset(dev); const char *list, *end; diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 1c7290d159b..44fb25a482b 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -122,7 +122,7 @@ static int sandbox_sf_probe(struct udevice *dev) struct sandbox_spi_flash *sbsf = dev_get_priv(dev); size_t len, idname_len; const struct flash_info *data; - struct sandbox_spi_flash_plat_data *pdata = dev_get_platdata(dev); + struct sandbox_spi_flash_plat_data *pdata = dev_get_plat(dev); struct sandbox_state *state = state_get_current(); struct dm_spi_slave_platdata *slave_plat; struct udevice *bus = dev->parent; @@ -500,7 +500,7 @@ static int sandbox_sf_xfer(struct udevice *dev, unsigned int bitlen,

int sandbox_sf_ofdata_to_platdata(struct udevice *dev) { - struct sandbox_spi_flash_plat_data *pdata = dev_get_platdata(dev); + struct sandbox_spi_flash_plat_data *pdata = dev_get_plat(dev);

pdata->filename = dev_read_string(dev, "sandbox,filename"); pdata->device_name = dev_read_string(dev, "compatible"); diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index adcc20723f7..5176efaa808 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -588,7 +588,7 @@ static void ag7xxx_eth_stop(struct udevice *dev) */ static int ag7xxx_eth_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ar7xxx_eth_priv *priv = dev_get_priv(dev); unsigned char *mac = pdata->enetaddr; u32 macid_lo, macid_hi; @@ -1197,7 +1197,7 @@ static int ag7xxx_get_phy_iface_offset(struct udevice *dev)

static int ag7xxx_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ar7xxx_eth_priv *priv = dev_get_priv(dev); void __iomem *iobase, *phyiobase; int ret, phyreg; @@ -1252,7 +1252,7 @@ static const struct eth_ops ag7xxx_eth_ops = {

static int ag7xxx_eth_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; int ret;

diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index becc6a69e1d..b7ed69413fe 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -453,7 +453,7 @@ static int altera_tse_write_hwaddr(struct udevice *dev) { struct altera_tse_priv *priv = dev_get_priv(dev); struct alt_tse_mac *mac_dev = priv->mac_dev; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); u8 *hwaddr = pdata->enetaddr; u32 mac_lo, mac_hi;

@@ -575,7 +575,7 @@ static const struct tse_ops tse_msgdma_ops = {

static int altera_tse_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct altera_tse_priv *priv = dev_get_priv(dev); void *blob = (void *)gd->fdt_blob; int node = dev_of_offset(dev); @@ -674,7 +674,7 @@ static int altera_tse_probe(struct udevice *dev)

static int altera_tse_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode;

pdata->phy_interface = -1; diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c index 7c79e9ad152..aad7b612134 100644 --- a/drivers/net/bcm6348-eth.c +++ b/drivers/net/bcm6348-eth.c @@ -264,7 +264,7 @@ static void bcm6348_eth_stop(struct udevice *dev)

static int bcm6348_eth_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct bcm6348_eth_priv *priv = dev_get_priv(dev); bool running = false;

@@ -380,7 +380,7 @@ static int bcm6348_mdio_init(const char *name, void __iomem *base)

static int bcm6348_phy_init(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct bcm6348_eth_priv *priv = dev_get_priv(dev); struct mii_dev *bus;

@@ -412,7 +412,7 @@ static int bcm6348_phy_init(struct udevice *dev)

static int bcm6348_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct bcm6348_eth_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args phy; const char *phy_mode; diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c index 6e6548add67..29abe7fc969 100644 --- a/drivers/net/bcm6368-eth.c +++ b/drivers/net/bcm6368-eth.c @@ -506,7 +506,7 @@ static int bcm6368_mdio_init(const char *name, struct bcm6368_eth_priv *priv)

static int bcm6368_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct bcm6368_eth_priv *priv = dev_get_priv(dev); int num_ports, ret, i; ofnode node; diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c index 9fcb28a344f..1627e933368 100644 --- a/drivers/net/bcmgenet.c +++ b/drivers/net/bcmgenet.c @@ -236,7 +236,7 @@ static void bcmgenet_umac_reset(struct bcmgenet_eth_priv *priv) static int bcmgenet_gmac_write_hwaddr(struct udevice *dev) { struct bcmgenet_eth_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); uchar *addr = pdata->enetaddr; u32 reg;

@@ -619,7 +619,7 @@ static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv)

static int bcmgenet_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct bcmgenet_eth_priv *priv = dev_get_priv(dev); ofnode mdio_node; const char *name; @@ -687,7 +687,7 @@ static const struct eth_ops bcmgenet_gmac_eth_ops = {

static int bcmgenet_eth_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct bcmgenet_eth_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args phy_node; const char *phy_mode; diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 66d16187735..deedfe76e43 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -625,7 +625,7 @@ int dc21x4x_initialize(struct bd_info *bis) #else /* DM_ETH */ static int dc2114x_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct dc2114x_priv *priv = dev_get_priv(dev);

memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -709,7 +709,7 @@ static int dc2114x_bind(struct udevice *dev)

static int dc2114x_probe(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct dc2114x_priv *priv = dev_get_priv(dev); u16 command, status; u32 iobase; diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 83b31fa6bf9..c0e5c0b4f08 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -93,7 +93,7 @@ static int dw_mdio_reset(struct mii_dev *bus) { struct udevice *dev = bus->priv; struct dw_eth_dev *priv = dev_get_priv(dev); - struct dw_eth_pdata *pdata = dev_get_platdata(dev); + struct dw_eth_pdata *pdata = dev_get_plat(dev); int ret;

if (!dm_gpio_is_valid(&priv->reset_gpio)) @@ -610,7 +610,7 @@ int designware_initialize(ulong base_addr, u32 interface) #ifdef CONFIG_DM_ETH static int designware_eth_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct dw_eth_dev *priv = dev_get_priv(dev); int ret;

@@ -654,7 +654,7 @@ void designware_eth_stop(struct udevice *dev)

int designware_eth_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct dw_eth_dev *priv = dev_get_priv(dev);

return _dw_write_hwaddr(priv, pdata->enetaddr); @@ -678,7 +678,7 @@ static int designware_eth_bind(struct udevice *dev)

int designware_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct dw_eth_dev *priv = dev_get_priv(dev); u32 iobase = pdata->iobase; ulong ioaddr; @@ -813,7 +813,7 @@ const struct eth_ops designware_eth_ops = {

int designware_eth_ofdata_to_platdata(struct udevice *dev) { - struct dw_eth_pdata *dw_pdata = dev_get_platdata(dev); + struct dw_eth_pdata *dw_pdata = dev_get_plat(dev); #if CONFIG_IS_ENABLED(DM_GPIO) struct dw_eth_dev *priv = dev_get_priv(dev); #endif diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index b6fbc6bf934..45a1648ad50 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -1108,7 +1108,7 @@ static int eqos_adjust_link(struct udevice *dev)

static int eqos_write_hwaddr(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct eqos_priv *eqos = dev_get_priv(dev); uint32_t val;

@@ -1152,7 +1152,7 @@ static int eqos_write_hwaddr(struct udevice *dev)

static int eqos_read_rom_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

#ifdef CONFIG_ARCH_IMX8M imx_get_mac_from_fuse(dev_seq(dev), pdata->enetaddr); diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c index ebbbcacfa3a..a3cd4d50cd8 100644 --- a/drivers/net/dwmac_socfpga.c +++ b/drivers/net/dwmac_socfpga.c @@ -27,7 +27,7 @@ struct dwmac_socfpga_platdata {

static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev) { - struct dwmac_socfpga_platdata *pdata = dev_get_platdata(dev); + struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev); struct regmap *regmap; struct ofnode_phandle_args args; void *range; @@ -66,7 +66,7 @@ static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev)

static int dwmac_socfpga_probe(struct udevice *dev) { - struct dwmac_socfpga_platdata *pdata = dev_get_platdata(dev); + struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev); struct eth_pdata *edata = &pdata->dw_eth_pdata.eth_pdata; struct reset_ctl_bulk reset_bulk; int ret; diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 49e6be31d1d..3b3dd104cde 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5795,7 +5795,7 @@ static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc, e1000_name(name, cardnum); ret = uclass_get_device_by_name(UCLASS_ETH, name, &dev); if (!ret) { - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); mac = plat->enetaddr; } #else @@ -5844,7 +5844,7 @@ U_BOOT_CMD( #ifdef CONFIG_DM_ETH static int e1000_eth_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct e1000_hw *hw = dev_get_priv(dev);

return _e1000_init(hw, plat->enetaddr); @@ -5890,7 +5890,7 @@ static int e1000_free_pkt(struct udevice *dev, uchar *packet, int length)

static int e1000_eth_probe(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct e1000_hw *hw = dev_get_priv(dev); int ret;

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index f47caf1f318..934b881219e 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -900,7 +900,7 @@ int eepro100_initialize(struct bd_info *bis) #else /* DM_ETH */ static int eepro100_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct eepro100_priv *priv = dev_get_priv(dev);

memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -962,7 +962,7 @@ static int eepro100_bind(struct udevice *dev)

static int eepro100_probe(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct eepro100_priv *priv = dev_get_priv(dev); u16 command, status; u32 iobase; diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 640db112e52..53c2d23cd18 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -647,7 +647,7 @@ static inline int ethoc_phy_init(struct ethoc *priv, void *dev)

static int ethoc_write_hwaddr(struct udevice *dev) { - struct ethoc_eth_pdata *pdata = dev_get_platdata(dev); + struct ethoc_eth_pdata *pdata = dev_get_plat(dev); struct ethoc *priv = dev_get_priv(dev); u8 *mac = pdata->eth_pdata.enetaddr;

@@ -687,7 +687,7 @@ static void ethoc_stop(struct udevice *dev)

static int ethoc_ofdata_to_platdata(struct udevice *dev) { - struct ethoc_eth_pdata *pdata = dev_get_platdata(dev); + struct ethoc_eth_pdata *pdata = dev_get_plat(dev); fdt_addr_t addr;

pdata->eth_pdata.iobase = dev_read_addr(dev); @@ -699,7 +699,7 @@ static int ethoc_ofdata_to_platdata(struct udevice *dev)

static int ethoc_probe(struct udevice *dev) { - struct ethoc_eth_pdata *pdata = dev_get_platdata(dev); + struct ethoc_eth_pdata *pdata = dev_get_plat(dev); struct ethoc *priv = dev_get_priv(dev);

priv->iobase = ioremap(pdata->eth_pdata.iobase, ETHOC_IOSIZE); diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index b85ee9a4534..d3d71480478 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -415,7 +415,7 @@ static int fec_set_hwaddr(struct eth_device *dev) { #ifdef CONFIG_DM_ETH struct fec_priv *fec = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); uchar *mac = pdata->enetaddr; #else uchar *mac = dev->enetaddr; @@ -1272,7 +1272,7 @@ int fecmxc_register_mii_postcall(struct eth_device *dev, int (*cb)(int)) static int fecmxc_read_rom_hwaddr(struct udevice *dev) { struct fec_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

return fec_get_hwaddr(priv->dev_id, pdata->enetaddr); } @@ -1351,7 +1351,7 @@ static void fec_gpio_reset(struct fec_priv *priv)

static int fecmxc_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct fec_priv *priv = dev_get_priv(dev); struct mii_dev *bus = NULL; uint32_t start; @@ -1531,7 +1531,7 @@ static int fecmxc_remove(struct udevice *dev) static int fecmxc_ofdata_to_platdata(struct udevice *dev) { int ret = 0; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct fec_priv *priv = dev_get_priv(dev); const char *phy_mode;

diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index f5fb513a157..02ccf1efc3b 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -472,7 +472,7 @@ static int fm_eth_open(struct udevice *dev) #ifndef CONFIG_DM_ETH struct fm_eth *fm_eth = dev->priv; #else - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct fm_eth *fm_eth = dev_get_priv(dev); #endif unsigned char *enetaddr; diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 7497e9b735e..5bfe3781a17 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -185,7 +185,7 @@ static int mc_fixup_mac_addr(void *blob, int nodeoffset, enum mc_fixup_type type) { #ifdef CONFIG_DM_ETH - struct eth_pdata *plat = dev_get_platdata(eth_dev); + struct eth_pdata *plat = dev_get_plat(eth_dev); unsigned char *enetaddr = plat->enetaddr; int eth_index = dev_seq(eth_dev); #else diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index e988fb0205f..765385c41d3 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -68,7 +68,7 @@ void fdt_fixup_enetc_mac(void *blob) strcmp(dev->driver->name, ENETC_DRIVER_NAME)) continue;

- pdata = dev_get_platdata(dev); + pdata = dev_get_plat(dev); ppdata = dev_get_parent_plat(dev); devfn = PCI_FUNC(ppdata->devfn);

@@ -367,7 +367,7 @@ static int enetc_ls1028a_write_hwaddr(struct udevice *dev) { struct pci_child_platdata *ppdata = dev_get_parent_plat(dev); const int devfn_to_pf[] = {0, 1, 2, -1, -1, -1, 3}; - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); int devfn = PCI_FUNC(ppdata->devfn); u8 *addr = plat->enetaddr; u32 lower, upper; @@ -391,7 +391,7 @@ static int enetc_ls1028a_write_hwaddr(struct udevice *dev)

static int enetc_write_hwaddr(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct enetc_priv *priv = dev_get_priv(dev); u8 *addr = plat->enetaddr;

diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index 1b85f255e9a..b71675f065d 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -497,7 +497,7 @@ static const struct eth_ops mcdmafec_ops = { static int mcdmafec_probe(struct udevice *dev) { struct fec_info_dma *info = dev->priv; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int node = dev_of_offset(dev); int retval; const u32 *val; @@ -567,7 +567,7 @@ static int mcdmafec_remove(struct udevice *dev) */ static int mcdmafec_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const u32 *val;

pdata->iobase = dev_read_addr(dev); diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 1d118ed0836..805e3f7bfae 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -287,7 +287,7 @@ static void ftgmac100_stop(struct udevice *dev)

static int ftgmac100_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct ftgmac100_data *priv = dev_get_priv(dev); struct ftgmac100 *ftgmac100 = priv->iobase; struct phy_device *phydev = priv->phydev; @@ -505,7 +505,7 @@ static int ftgmac100_send(struct udevice *dev, void *packet, int length)

static int ftgmac100_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ftgmac100_data *priv = dev_get_priv(dev);

return ftgmac100_set_mac(priv, pdata->enetaddr); @@ -513,7 +513,7 @@ static int ftgmac100_write_hwaddr(struct udevice *dev)

static int ftgmac100_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ftgmac100_data *priv = dev_get_priv(dev); const char *phy_mode;

@@ -542,7 +542,7 @@ static int ftgmac100_ofdata_to_platdata(struct udevice *dev)

static int ftgmac100_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ftgmac100_data *priv = dev_get_priv(dev); int ret;

diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index de7ec4d1fcf..5c2887ec8ae 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -318,7 +318,7 @@ out: #ifdef CONFIG_DM_ETH static int ftmac100_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct ftmac100_data *priv = dev_get_priv(dev);

return _ftmac100_init(priv, plat->enetaddr); @@ -360,7 +360,7 @@ static int ftmac100_free_pkt(struct udevice *dev, uchar *packet, int length)

int ftmac100_read_rom_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); eth_env_get_enetaddr("ethaddr", pdata->enetaddr); return 0; } @@ -396,7 +396,7 @@ static const char *dtbmacaddr(u32 ifno) static int ftmac100_ofdata_to_platdata(struct udevice *dev) { struct ftmac100_data *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const char *mac; pdata->iobase = dev_read_addr(dev); priv->iobase = pdata->iobase; diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 0bd1da58e43..2d94223c857 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -55,7 +55,7 @@ struct rk_gmac_ops {

static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev) { - struct gmac_rockchip_platdata *pdata = dev_get_platdata(dev); + struct gmac_rockchip_platdata *pdata = dev_get_plat(dev); const char *string;

string = dev_read_string(dev, "clock_in_out"); @@ -555,10 +555,10 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)

static int gmac_rockchip_probe(struct udevice *dev) { - struct gmac_rockchip_platdata *pdata = dev_get_platdata(dev); + struct gmac_rockchip_platdata *pdata = dev_get_plat(dev); struct rk_gmac_ops *ops = (struct rk_gmac_ops *)dev_get_driver_data(dev); - struct dw_eth_pdata *dw_pdata = dev_get_platdata(dev); + struct dw_eth_pdata *dw_pdata = dev_get_plat(dev); struct eth_pdata *eth_pdata = &dw_pdata->eth_pdata; struct clk clk; ulong rate; @@ -664,7 +664,7 @@ static int gmac_rockchip_probe(struct udevice *dev)

static int gmac_rockchip_eth_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct dw_eth_dev *priv = dev_get_priv(dev); struct rk_gmac_ops *ops = (struct rk_gmac_ops *)dev_get_driver_data(dev); diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c index f81e7fe1925..e11335f54fb 100644 --- a/drivers/net/higmacv300.c +++ b/drivers/net/higmacv300.c @@ -128,7 +128,7 @@ struct higmac_priv {

static int higmac_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct higmac_priv *priv = dev_get_priv(dev); unsigned char *mac = pdata->enetaddr; u32 val; diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index b0e66851752..05ef1abd5d5 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -615,7 +615,7 @@ static int ks8851_recv(struct udevice *dev, int flags, uchar **packetp) static int ks8851_write_hwaddr(struct udevice *dev) { struct ks_net *ks = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

ks8851_mll_write_hwaddr_common(ks, pdata->enetaddr);

@@ -625,7 +625,7 @@ static int ks8851_write_hwaddr(struct udevice *dev) static int ks8851_read_rom_hwaddr(struct udevice *dev) { struct ks_net *ks = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); u16 addrl, addrm, addrh;

/* No EEPROM means no valid MAC address. */ @@ -668,7 +668,7 @@ static int ks8851_probe(struct udevice *dev) static int ks8851_ofdata_to_platdata(struct udevice *dev) { struct ks_net *ks = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

pdata->iobase = dev_read_addr(dev); ks->iobase = pdata->iobase; diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 02935f642bd..cd2e4e01dcd 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -511,7 +511,7 @@ static int ldpaa_get_dpmac_state(struct ldpaa_eth_priv *priv, #ifdef CONFIG_DM_ETH static int ldpaa_eth_open(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct ldpaa_eth_priv *priv = dev_get_priv(dev); #else static int ldpaa_eth_open(struct eth_device *net_dev, struct bd_info *bd) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 4ad37fdc28e..dd23591e03a 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1169,7 +1169,7 @@ static void macb_stop(struct udevice *dev)

static int macb_write_hwaddr(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct macb_device *macb = dev_get_priv(dev);

return _macb_write_hwaddr(macb, plat->enetaddr); @@ -1222,7 +1222,7 @@ static const struct macb_config default_gem_config = {

static int macb_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct macb_device *macb = dev_get_priv(dev); const char *phy_mode; int ret; @@ -1295,7 +1295,7 @@ int __weak macb_late_eth_ofdata_to_platdata(struct udevice *dev)

static int macb_eth_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

pdata->iobase = (phys_addr_t)dev_remap_addr(dev); if (!pdata->iobase) diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index bb90a9ba7b6..42752a76fa3 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -518,7 +518,7 @@ static const struct eth_ops mcffec_ops = { */ static int mcffec_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct fec_info_s *info = dev->priv; int node = dev_of_offset(dev); int retval, fec_idx; @@ -586,7 +586,7 @@ static int mcffec_remove(struct udevice *dev) */ static int mcffec_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const u32 *val;

pdata->iobase = dev_read_addr(dev); diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c index f0ea6ea4d88..128d7f21ce0 100644 --- a/drivers/net/mscc_eswitch/jr2_switch.c +++ b/drivers/net/mscc_eswitch/jr2_switch.c @@ -726,7 +726,7 @@ static int jr2_mac_table_add(struct jr2_private *priv, static int jr2_write_hwaddr(struct udevice *dev) { struct jr2_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

return jr2_mac_table_add(priv, pdata->enetaddr, PGID_UNICAST); } @@ -755,7 +755,7 @@ static void serdes_setup(struct jr2_private *priv) static int jr2_start(struct udevice *dev) { struct jr2_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const unsigned char mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; int ret; diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c index 1dfd86aa49e..54afa14c9dd 100644 --- a/drivers/net/mscc_eswitch/luton_switch.c +++ b/drivers/net/mscc_eswitch/luton_switch.c @@ -497,7 +497,7 @@ static int luton_initialize(struct luton_private *priv) static int luton_write_hwaddr(struct udevice *dev) { struct luton_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

mscc_mac_table_add(priv->regs[ANA], luton_regs_ana_table, pdata->enetaddr, PGID_UNICAST); @@ -510,7 +510,7 @@ static int luton_write_hwaddr(struct udevice *dev) static int luton_start(struct udevice *dev) { struct luton_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const unsigned char mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; int ret; diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c index 18e11ec2a92..19e725c6f92 100644 --- a/drivers/net/mscc_eswitch/ocelot_switch.c +++ b/drivers/net/mscc_eswitch/ocelot_switch.c @@ -420,7 +420,7 @@ static int ocelot_initialize(struct ocelot_private *priv) static int ocelot_write_hwaddr(struct udevice *dev) { struct ocelot_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

mscc_mac_table_add(priv->regs[ANA], ocelot_regs_ana_table, pdata->enetaddr, PGID_UNICAST); @@ -433,7 +433,7 @@ static int ocelot_write_hwaddr(struct udevice *dev) static int ocelot_start(struct udevice *dev) { struct ocelot_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const unsigned char mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; int ret; diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c index e274ee5a06a..09ce33452dd 100644 --- a/drivers/net/mscc_eswitch/serval_switch.c +++ b/drivers/net/mscc_eswitch/serval_switch.c @@ -373,7 +373,7 @@ static int serval_initialize(struct serval_private *priv) static int serval_write_hwaddr(struct udevice *dev) { struct serval_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

mscc_mac_table_add(priv->regs[ANA], serval_regs_ana_table, pdata->enetaddr, PGID_UNICAST); @@ -386,7 +386,7 @@ static int serval_write_hwaddr(struct udevice *dev) static int serval_start(struct udevice *dev) { struct serval_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const unsigned char mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; int ret; diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c index 59c0d85c4e9..4a4e9e40543 100644 --- a/drivers/net/mscc_eswitch/servalt_switch.c +++ b/drivers/net/mscc_eswitch/servalt_switch.c @@ -323,7 +323,7 @@ static int servalt_mac_table_add(struct servalt_private *priv, static int servalt_write_hwaddr(struct udevice *dev) { struct servalt_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

return servalt_mac_table_add(priv, pdata->enetaddr, PGID_UNICAST); } @@ -331,7 +331,7 @@ static int servalt_write_hwaddr(struct udevice *dev) static int servalt_start(struct udevice *dev) { struct servalt_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const unsigned char mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; int ret; diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c index c94d3dd4dc8..50d066a8ba2 100644 --- a/drivers/net/mt7628-eth.c +++ b/drivers/net/mt7628-eth.c @@ -361,7 +361,7 @@ static int mt7628_eth_write_hwaddr(struct udevice *dev) { struct mt7628_eth_dev *priv = dev_get_priv(dev); void __iomem *base = priv->base; - u8 *addr = ((struct eth_pdata *)dev_get_platdata(dev))->enetaddr; + u8 *addr = ((struct eth_pdata *)dev_get_plat(dev))->enetaddr; u32 val;

/* Set MAC address. */ diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index 31e8547d16b..2741439b54f 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -1278,7 +1278,7 @@ static void mtk_eth_stop(struct udevice *dev)

static int mtk_eth_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mtk_eth_priv *priv = dev_get_priv(dev); unsigned char *mac = pdata->enetaddr; u32 macaddr_lsb, macaddr_msb; @@ -1358,7 +1358,7 @@ static int mtk_eth_free_pkt(struct udevice *dev, uchar *packet, int length)

static int mtk_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mtk_eth_priv *priv = dev_get_priv(dev); ulong iobase = pdata->iobase; int ret; @@ -1409,7 +1409,7 @@ static int mtk_eth_remove(struct udevice *dev)

static int mtk_eth_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mtk_eth_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args args; struct regmap *regmap; diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 0e4e88e42a8..bf800a80642 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -554,7 +554,7 @@ static int mvgbe_halt(struct eth_device *dev) #ifdef CONFIG_DM_ETH static int mvgbe_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

port_uc_addr_set(dev_get_priv(dev), pdata->enetaddr);

@@ -906,7 +906,7 @@ static int mvgbe_port_is_fixed_link(struct mvgbe_device *dmvgbe)

static int mvgbe_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mvgbe_device *dmvgbe = dev_get_priv(dev); int ret;

@@ -948,7 +948,7 @@ static void mvgbe_stop(struct udevice *dev)

static int mvgbe_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mvgbe_device *dmvgbe = dev_get_priv(dev); struct mii_dev *bus; int ret; @@ -988,7 +988,7 @@ static const struct eth_ops mvgbe_ops = {

static int mvgbe_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mvgbe_device *dmvgbe = dev_get_priv(dev); void *blob = (void *)gd->fdt_blob; int node = dev_of_offset(dev); diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 4c478b9b955..84426ef8ccd 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -896,7 +896,7 @@ static void mvneta_mac_addr_set(struct mvneta_port *pp, unsigned char *addr, static int mvneta_write_hwaddr(struct udevice *dev) { mvneta_mac_addr_set(dev_get_priv(dev), - ((struct eth_pdata *)dev_get_platdata(dev))->enetaddr, + ((struct eth_pdata *)dev_get_plat(dev))->enetaddr, rxq_def);

return 0; @@ -1397,7 +1397,7 @@ static int mvneta_port_power_up(struct mvneta_port *pp, int phy_mode) /* Device initialization routine */ static int mvneta_init(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mvneta_port *pp = dev_get_priv(dev); int err;

@@ -1690,7 +1690,7 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)

static int mvneta_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mvneta_port *pp = dev_get_priv(dev); void *blob = (void *)gd->fdt_blob; int node = dev_of_offset(dev); @@ -1797,7 +1797,7 @@ static const struct eth_ops mvneta_ops = {

static int mvneta_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode;

pdata->iobase = dev_read_addr(dev); diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 326f91caad4..d266e6d0f37 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -5186,7 +5186,7 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length)

static int mvpp2_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct mvpp2_port *port = dev_get_priv(dev);

/* Load current MAC address */ diff --git a/drivers/net/octeontx/nicvf_main.c b/drivers/net/octeontx/nicvf_main.c index a8eaa429516..c30ba49c27c 100644 --- a/drivers/net/octeontx/nicvf_main.c +++ b/drivers/net/octeontx/nicvf_main.c @@ -105,7 +105,7 @@ static int nicvf_check_pf_ready(struct nicvf *nic) static void nicvf_handle_mbx_intr(struct nicvf *nic) { union nic_mbx mbx = {}; - struct eth_pdata *pdata = dev_get_platdata(nic->dev); + struct eth_pdata *pdata = dev_get_plat(nic->dev); u64 *mbx_data; u64 mbx_addr; int i; @@ -165,7 +165,7 @@ static void nicvf_handle_mbx_intr(struct nicvf *nic) static int nicvf_hw_set_mac_addr(struct nicvf *nic, struct udevice *dev) { union nic_mbx mbx = {}; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

mbx.mac.msg = NIC_MBOX_MSG_SET_MAC; mbx.mac.vf_id = nic->vf_id; @@ -445,7 +445,7 @@ int nicvf_open(struct udevice *dev) int nicvf_write_hwaddr(struct udevice *dev) { unsigned char ethaddr[ARP_HLEN]; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct nicvf *nic = dev_get_priv(dev);

/* If lower level firmware fails to set proper MAC @@ -485,7 +485,7 @@ static void nicvf_probe_mdio_devices(void) int nicvf_initialize(struct udevice *dev) { struct nicvf *nicvf = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret = 0, bgx, lmac; char name[16]; unsigned char ethaddr[ARP_HLEN]; diff --git a/drivers/net/octeontx2/nix.c b/drivers/net/octeontx2/nix.c index 54e1875ce19..039c44b6540 100644 --- a/drivers/net/octeontx2/nix.c +++ b/drivers/net/octeontx2/nix.c @@ -727,7 +727,7 @@ int nix_lf_setup_mac(struct udevice *dev) { struct rvu_pf *rvu = dev_get_priv(dev); struct nix *nix = rvu->nix; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

/* If lower level firmware fails to set proper MAC * u-boot framework updates MAC to random address. diff --git a/drivers/net/octeontx2/rvu_pf.c b/drivers/net/octeontx2/rvu_pf.c index 7d786872595..4b00178989c 100644 --- a/drivers/net/octeontx2/rvu_pf.c +++ b/drivers/net/octeontx2/rvu_pf.c @@ -20,7 +20,7 @@ extern struct udevice *rvu_af_dev; int rvu_pf_init(struct rvu_pf *rvu) { struct nix *nix; - struct eth_pdata *pdata = dev_get_platdata(rvu->dev); + struct eth_pdata *pdata = dev_get_plat(rvu->dev);

debug("%s: Allocating nix lf\n", __func__); nix = nix_lf_alloc(rvu->dev); diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index 3829ccc4440..fabcf85c0de 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -68,7 +68,7 @@ static int pch_gbe_mac_write(struct pch_gbe_regs *mac_regs, u8 *addr) static int pch_gbe_reset(struct udevice *dev) { struct pch_gbe_priv *priv = dev_get_priv(dev); - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct pch_gbe_regs *mac_regs = priv->mac_regs; ulong start;

@@ -412,7 +412,7 @@ static int pch_gbe_mdio_init(const char *name, struct pch_gbe_regs *mac_regs) static int pch_gbe_phy_init(struct udevice *dev) { struct pch_gbe_priv *priv = dev_get_priv(dev); - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct phy_device *phydev; int mask = 0xffffffff;

@@ -436,7 +436,7 @@ static int pch_gbe_phy_init(struct udevice *dev) static int pch_gbe_probe(struct udevice *dev) { struct pch_gbe_priv *priv; - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); void *iobase; int err;

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index ff9506f3912..59ef1043349 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -585,7 +585,7 @@ int pcnet_initialize(struct bd_info *bis) #else /* DM_ETH */ static int pcnet_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct pcnet_priv *priv = dev_get_priv(dev);

memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -638,7 +638,7 @@ static int pcnet_bind(struct udevice *dev)

static int pcnet_probe(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct pcnet_priv *lp = dev_get_priv(dev); u16 command, status; u32 iobase; diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c index 53a08dfcd28..3d145711147 100644 --- a/drivers/net/pfe_eth/pfe_eth.c +++ b/drivers/net/pfe_eth/pfe_eth.c @@ -87,7 +87,7 @@ static int pfe_eth_write_hwaddr(struct udevice *dev) { struct pfe_eth_dev *priv = dev_get_priv(dev); struct gemac_s *gem = priv->gem; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); uchar *mac = pdata->enetaddr;

writel((mac[0] << 24) + (mac[1] << 16) + (mac[2] << 8) + mac[3], @@ -215,7 +215,7 @@ static int pfe_eth_probe(struct udevice *dev) { struct pfe_eth_dev *priv = dev_get_priv(dev); struct pfe_ddr_address pfe_addr; - struct pfe_eth_pdata *pdata = dev_get_platdata(dev); + struct pfe_eth_pdata *pdata = dev_get_plat(dev); int ret = 0; static int init_done;

@@ -266,7 +266,7 @@ static int pfe_eth_probe(struct udevice *dev)

static int pfe_eth_bind(struct udevice *dev) { - struct pfe_eth_pdata *pdata = dev_get_platdata(dev); + struct pfe_eth_pdata *pdata = dev_get_plat(dev); char name[20];

sprintf(name, "pfe_eth%u", pdata->pfe_eth_pdata_mac.phy_interface); diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 94c296e8f47..9eba55affb1 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -326,7 +326,7 @@ static void pic32_rx_desc_init(struct pic32eth_dev *priv)

static int pic32_eth_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct pic32eth_dev *priv = dev_get_priv(dev);

/* controller */ @@ -531,7 +531,7 @@ static const struct eth_ops pic32_eth_ops = {

static int pic32_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct pic32eth_dev *priv = dev_get_priv(dev); const char *phy_mode; void __iomem *iobase; diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c index b4052c78d77..372926e1a4b 100644 --- a/drivers/net/qe/dm_qe_uec.c +++ b/drivers/net/qe/dm_qe_uec.c @@ -416,7 +416,7 @@ static void qe_uec_stop(struct udevice *dev) static int qe_uec_set_hwaddr(struct udevice *dev) { struct qe_uec_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct uec_priv *uec = priv->uec; uec_t *uec_regs = uec->uec_regs; uchar *mac = pdata->enetaddr; @@ -982,7 +982,7 @@ static void qe_uec_set_eth_type(struct udevice *dev) static int qe_uec_set_uec_info(struct udevice *dev) { struct qe_uec_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct uec_priv *uec = priv->uec; struct uec_inf *uec_info; struct ucc_fast_inf *uf_info; @@ -1086,7 +1086,7 @@ out: static int qe_uec_probe(struct udevice *dev) { struct qe_uec_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct uec_priv *uec; int ret;

@@ -1131,7 +1131,7 @@ static int qe_uec_remove(struct udevice *dev)

static int qe_uec_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode;

pdata->iobase = (phys_addr_t)devfdt_get_addr(dev); diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 48530c44998..692cd57f687 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -306,7 +306,7 @@ static void ravb_rx_desc_init(struct ravb_priv *eth) static int ravb_phy_config(struct udevice *dev) { struct ravb_priv *eth = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct phy_device *phydev; int mask = 0xffffffff, reg;

@@ -346,7 +346,7 @@ static int ravb_phy_config(struct udevice *dev) static int ravb_write_hwaddr(struct udevice *dev) { struct ravb_priv *eth = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); unsigned char *mac = pdata->enetaddr;

writel((mac[0] << 24) | (mac[1] << 16) | (mac[2] << 8) | mac[3], @@ -373,7 +373,7 @@ static int ravb_mac_init(struct ravb_priv *eth) static int ravb_dmac_init(struct udevice *dev) { struct ravb_priv *eth = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret = 0;

/* Set CONFIG mode */ @@ -474,7 +474,7 @@ static void ravb_stop(struct udevice *dev)

static int ravb_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ravb_priv *eth = dev_get_priv(dev); struct ofnode_phandle_args phandle_args; struct mii_dev *mdiodev; @@ -644,7 +644,7 @@ static const struct eth_ops ravb_ops = {

int ravb_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; const fdt32_t *cell; int ret = 0; diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index c171e54e8cf..feeea930fbe 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -660,7 +660,7 @@ int rtl8139_initialize(struct bd_info *bis) #else /* DM_ETH */ static int rtl8139_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct rtl8139_priv *priv = dev_get_priv(dev);

memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -704,7 +704,7 @@ static int rtl8139_free_pkt(struct udevice *dev, uchar *packet, int length)

static int rtl8139_write_hwaddr(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct rtl8139_priv *priv = dev_get_priv(dev);

memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -735,7 +735,7 @@ static int rtl8139_bind(struct udevice *dev)

static int rtl8139_probe(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct rtl8139_priv *priv = dev_get_priv(dev); u32 iobase;

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index dc3405e4c4e..7aac8a9132b 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -890,7 +890,7 @@ static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr, #ifdef CONFIG_DM_ETH static int rtl8169_eth_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct rtl8169_private *priv = dev_get_priv(dev);

rtl8169_common_start(dev, plat->enetaddr, priv->iobase); @@ -953,7 +953,7 @@ static void rtl_halt(struct eth_device *dev) #ifdef CONFIG_DM_ETH static int rtl8169_write_hwaddr(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); unsigned int i;

RTL_W8(Cfg9346, Cfg9346_Unlock); @@ -1189,7 +1189,7 @@ static int rtl8169_eth_probe(struct udevice *dev) { struct pci_child_platdata *pplat = dev_get_parent_plat(dev); struct rtl8169_private *priv = dev_get_priv(dev); - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); u32 iobase; int region; int ret; diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 76a424ec949..7a8bc1584e0 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -22,7 +22,7 @@ static struct in_addr arp_ip; static int sb_eth_raw_start(struct udevice *dev) { struct eth_sandbox_raw_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret;

debug("eth_sandbox_raw: Start\n"); @@ -65,7 +65,7 @@ static int sb_eth_raw_send(struct udevice *dev, void *packet, int length)

static int sb_eth_raw_recv(struct udevice *dev, int flags, uchar **packetp) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct eth_sandbox_raw_priv *priv = dev_get_priv(dev); int retval = 0; int length; @@ -134,7 +134,7 @@ static void sb_eth_raw_stop(struct udevice *dev)

static int sb_eth_raw_read_rom_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

net_random_ethaddr(pdata->enetaddr);

@@ -151,7 +151,7 @@ static const struct eth_ops sb_eth_raw_ops = {

static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct eth_sandbox_raw_priv *priv = dev_get_priv(dev); const char *ifname; int ret; diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index 846b802cfaa..a672333c266 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -393,7 +393,7 @@ static void sb_eth_stop(struct udevice *dev)

static int sb_eth_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

debug("eth_sandbox %s: Write HW ADDR - %pM\n", dev->name, pdata->enetaddr); @@ -416,7 +416,7 @@ static int sb_eth_remove(struct udevice *dev)

static int sb_eth_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct eth_sandbox_priv *priv = dev_get_priv(dev); const u8 *mac;

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index b1b8731f16f..147b36e177a 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -744,7 +744,7 @@ static int sh_ether_write_hwaddr(struct udevice *dev) struct sh_ether_priv *priv = dev_get_priv(dev); struct sh_eth_dev *eth = &priv->shdev; struct sh_eth_info *port_info = &eth->port_info[eth->port]; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

sh_eth_write_hwaddr(port_info, pdata->enetaddr);

@@ -754,7 +754,7 @@ static int sh_ether_write_hwaddr(struct udevice *dev) static int sh_eth_phy_config(struct udevice *dev) { struct sh_ether_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct sh_eth_dev *eth = &priv->shdev; int ret = 0; struct sh_eth_info *port_info = &eth->port_info[eth->port]; @@ -776,7 +776,7 @@ static int sh_eth_phy_config(struct udevice *dev) static int sh_ether_start(struct udevice *dev) { struct sh_ether_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct sh_eth_dev *eth = &priv->shdev; int ret;

@@ -808,7 +808,7 @@ static void sh_ether_stop(struct udevice *dev)

static int sh_ether_probe(struct udevice *udev) { - struct eth_pdata *pdata = dev_get_platdata(udev); + struct eth_pdata *pdata = dev_get_plat(udev); struct sh_ether_priv *priv = dev_get_priv(udev); struct sh_eth_dev *eth = &priv->shdev; struct ofnode_phandle_args phandle_args; @@ -913,7 +913,7 @@ static const struct eth_ops sh_ether_ops = {

int sh_ether_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; const fdt32_t *cell; int ret = 0; diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 648932d8bca..e3057a9156e 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -536,7 +536,7 @@ err_detect:

static int smc911x_start(struct udevice *dev) { - struct eth_pdata *plat = dev_get_platdata(dev); + struct eth_pdata *plat = dev_get_plat(dev); struct smc911x_priv *priv = dev_get_priv(dev);

memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr)); @@ -577,7 +577,7 @@ static int smc911x_recv(struct udevice *dev, int flags, uchar **packetp) static int smc911x_read_rom_hwaddr(struct udevice *dev) { struct smc911x_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

if (!smc911x_read_mac_address(priv)) return -ENODEV; @@ -610,7 +610,7 @@ static int smc911x_probe(struct udevice *dev) static int smc911x_ofdata_to_platdata(struct udevice *dev) { struct smc911x_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

pdata->iobase = dev_read_addr(dev); priv->iobase = pdata->iobase; diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index 60153c0141d..9a1b2eb7124 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -299,7 +299,7 @@ static int ave_mdiobus_write(struct mii_dev *bus, static int ave_adjust_link(struct ave_private *priv) { struct phy_device *phydev = priv->phydev; - struct eth_pdata *pdata = dev_get_platdata(phydev->dev); + struct eth_pdata *pdata = dev_get_plat(phydev->dev); u32 val, txcr, rxcr, rxcr_org; u16 rmt_adv = 0, lcl_adv = 0; u8 cap; @@ -516,7 +516,7 @@ static int ave_start(struct udevice *dev) static int ave_write_hwaddr(struct udevice *dev) { struct ave_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); u8 *mac = pdata->enetaddr;

writel(mac[0] | mac[1] << 8 | mac[2] << 16 | mac[3] << 24, @@ -734,7 +734,7 @@ static int ave_pxs3_get_pinmode(struct ave_private *priv)

static int ave_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ave_private *priv = dev_get_priv(dev); struct ofnode_phandle_args args; const char *phy_mode; @@ -826,7 +826,7 @@ out_clk_free:

static int ave_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ave_private *priv = dev_get_priv(dev); int ret, nc, nr;

diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 3430b229a80..a9d04ebedd2 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -255,7 +255,7 @@ static int sun8i_mdio_write(struct mii_dev *bus, int addr, int devad, int reg, static int sun8i_eth_write_hwaddr(struct udevice *dev) { struct emac_eth_dev *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); uchar *mac_id = pdata->enetaddr; u32 macid_lo, macid_hi;

@@ -712,7 +712,7 @@ static int sun8i_mdio_reset(struct mii_dev *bus) { struct udevice *dev = bus->priv; struct emac_eth_dev *priv = dev_get_priv(dev); - struct sun8i_eth_pdata *pdata = dev_get_platdata(dev); + struct sun8i_eth_pdata *pdata = dev_get_plat(dev); int ret;

if (!dm_gpio_is_valid(&priv->reset_gpio)) @@ -799,7 +799,7 @@ static void sun8i_emac_eth_stop(struct udevice *dev)

static int sun8i_emac_eth_probe(struct udevice *dev) { - struct sun8i_eth_pdata *sun8i_pdata = dev_get_platdata(dev); + struct sun8i_eth_pdata *sun8i_pdata = dev_get_plat(dev); struct eth_pdata *pdata = &sun8i_pdata->eth_pdata; struct emac_eth_dev *priv = dev_get_priv(dev); int ret; @@ -863,7 +863,7 @@ static int sun8i_handle_internal_phy(struct udevice *dev, struct emac_eth_dev *p

static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) { - struct sun8i_eth_pdata *sun8i_pdata = dev_get_platdata(dev); + struct sun8i_eth_pdata *sun8i_pdata = dev_get_plat(dev); struct eth_pdata *pdata = &sun8i_pdata->eth_pdata; struct emac_eth_dev *priv = dev_get_priv(dev); const char *phy_mode; diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index 0770a6bfc74..1b01a4765c9 100644 --- a/drivers/net/sunxi_emac.c +++ b/drivers/net/sunxi_emac.c @@ -535,7 +535,7 @@ static int sunxi_emac_board_setup(struct udevice *dev,

static int sunxi_emac_eth_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

return _sunxi_emac_eth_init(dev->priv, pdata->enetaddr); } @@ -565,7 +565,7 @@ static void sunxi_emac_eth_stop(struct udevice *dev)

static int sunxi_emac_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct emac_eth_dev *priv = dev_get_priv(dev); int ret;

@@ -593,7 +593,7 @@ static const struct eth_ops sunxi_emac_eth_ops = {

static int sunxi_emac_eth_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

pdata->iobase = dev_read_addr(dev);

diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index ce891fc58e1..e6954b64b79 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -281,7 +281,7 @@ static void am65_cpsw_gmii_sel_k3(struct am65_cpsw_priv *priv,

static int am65_cpsw_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct am65_cpsw_priv *priv = dev_get_priv(dev); struct am65_cpsw_common *common = priv->cpsw_common; struct am65_cpsw_port *port = &common->ports[priv->port_id]; @@ -514,7 +514,7 @@ static int am65_cpsw_read_rom_hwaddr(struct udevice *dev) { struct am65_cpsw_priv *priv = dev_get_priv(dev); struct am65_cpsw_common *common = priv->cpsw_common; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); u32 mac_hi, mac_lo;

if (common->mac_efuse == FDT_ADDR_T_NONE) @@ -563,7 +563,7 @@ static int am65_cpsw_phy_init(struct udevice *dev) { struct am65_cpsw_priv *priv = dev_get_priv(dev); struct am65_cpsw_common *cpsw_common = priv->cpsw_common; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct phy_device *phydev; u32 supported = PHY_GBIT_FEATURES; int ret; @@ -599,7 +599,7 @@ static int am65_cpsw_phy_init(struct udevice *dev)

static int am65_cpsw_ofdata_parse_phy(struct udevice *dev, ofnode port_np) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct am65_cpsw_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args out_args; const char *phy_mode; @@ -649,7 +649,7 @@ out: static int am65_cpsw_probe_cpsw(struct udevice *dev) { struct am65_cpsw_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct am65_cpsw_common *cpsw_common; ofnode ports_np, node; int ret, i; diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 62348919b60..9aa1858625e 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -456,7 +456,7 @@ static void cpsw_set_slave_mac(struct cpsw_slave *slave, struct cpsw_priv *priv) { #ifdef CONFIG_DM_ETH - struct eth_pdata *pdata = dev_get_platdata(priv->dev); + struct eth_pdata *pdata = dev_get_plat(priv->dev);

writel(mac_hi(pdata->enetaddr), &slave->regs->sa_hi); writel(mac_lo(pdata->enetaddr), &slave->regs->sa_lo); @@ -1014,7 +1014,7 @@ int cpsw_register(struct cpsw_platform_data *data) #else static int cpsw_eth_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct cpsw_priv *priv = dev_get_priv(dev);

return _cpsw_init(priv, pdata->enetaddr); @@ -1176,7 +1176,7 @@ static void cpsw_phy_sel(struct cpsw_priv *priv, const char *compat, static int cpsw_eth_probe(struct udevice *dev) { struct cpsw_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

priv->dev = dev; priv->data = pdata->priv_pdata; @@ -1225,7 +1225,7 @@ static void cpsw_eth_of_parse_slave(struct cpsw_platform_data *data,

static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct cpsw_platform_data *data; struct gpio_desc *mode_gpios; int slave_index = 0; diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 9cf7e6cc64d..bfe1b84cd56 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -112,7 +112,7 @@ phy_t phy[CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT];

static int davinci_emac_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); unsigned long mac_hi; unsigned long mac_lo;

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index b67981e74f3..8e9eca19f3b 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -496,7 +496,7 @@ static void ks2_eth_stop(struct udevice *dev) int ks2_eth_read_rom_hwaddr(struct udevice *dev) { struct ks2_eth_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); u32 maca = 0; u32 macb = 0;

@@ -519,7 +519,7 @@ int ks2_eth_read_rom_hwaddr(struct udevice *dev) int ks2_eth_write_hwaddr(struct udevice *dev) { struct ks2_eth_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

writel(mac_hi(pdata->enetaddr), DEVICE_EMACSW_BASE(pdata->iobase, priv->slave_port - 1) + @@ -750,7 +750,7 @@ static int ks2_eth_parse_slave_interface(int netcp, int slave, static int ks2_sl_eth_ofdata_to_platdata(struct udevice *dev) { struct ks2_eth_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int slave = dev_of_offset(dev); int interfaces; @@ -773,7 +773,7 @@ static int ks2_sl_eth_ofdata_to_platdata(struct udevice *dev) static int ks2_eth_ofdata_to_platdata(struct udevice *dev) { struct ks2_eth_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int gbe_0 = -ENODEV; int netcp_devices; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 8c53059ae2a..2271eb82516 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -562,7 +562,7 @@ static int tsec_init(struct udevice *dev) { struct tsec_private *priv = (struct tsec_private *)dev->priv; #ifdef CONFIG_DM_ETH - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); #else struct eth_device *pdata = dev; #endif @@ -799,7 +799,7 @@ int tsec_standard_init(struct bd_info *bis) #else /* CONFIG_DM_ETH */ int tsec_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct tsec_private *priv = dev_get_priv(dev); struct ofnode_phandle_args phandle_args; u32 tbiaddr = CONFIG_SYS_TBIPA_VALUE; diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 8f761cb7c08..3057fba604d 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -425,7 +425,7 @@ static int axi_ethernet_init(struct axidma_priv *priv)

static int axiemac_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct axidma_priv *priv = dev_get_priv(dev); struct axi_regs *regs = priv->iobase;

@@ -728,7 +728,7 @@ static const struct eth_ops axi_emac_ops = {

static int axi_emac_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct axidma_priv *priv = dev_get_priv(dev); int node = dev_of_offset(dev); int offset = 0; diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 11eee65e665..c0d73bc9747 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -322,7 +322,7 @@ static int setup_phy(struct udevice *dev) static int emaclite_start(struct udevice *dev) { struct xemaclite *emaclite = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct emaclite_regs *regs = emaclite->regs;

debug("EmacLite Initialization Started\n"); @@ -595,7 +595,7 @@ static const struct eth_ops emaclite_ops = {

static int emaclite_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct xemaclite *emaclite = dev_get_priv(dev); int offset = 0;

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 0d3b0d0c686..103f2940b45 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -270,7 +270,7 @@ static int phywrite(struct zynq_gem_priv *priv, u32 phy_addr, static int zynq_gem_setup_mac(struct udevice *dev) { u32 i, macaddrlow, macaddrhigh; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct zynq_gem_priv *priv = dev_get_priv(dev); struct zynq_gem_regs *regs = priv->iobase;

@@ -635,7 +635,7 @@ __weak int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)

static int zynq_gem_read_rom_mac(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

if (!pdata) return -ENOSYS; @@ -745,7 +745,7 @@ static const struct eth_ops zynq_gem_ops = {

static int zynq_gem_ofdata_to_platdata(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct zynq_gem_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args phandle_args; const char *phy_mode; diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index 3a0a4b5ada8..9ef6314462b 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -129,7 +129,7 @@ struct rcar_gen3_pcie_priv {

static void rcar_rmw32(struct udevice *dev, int where, u32 mask, u32 data) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(dev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev); int shift = 8 * (where & 3);

clrsetbits_le32(priv->regs + (where & ~3), @@ -138,7 +138,7 @@ static void rcar_rmw32(struct udevice *dev, int where, u32 mask, u32 data)

static u32 rcar_read_conf(const struct udevice *dev, int where) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(dev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev); int shift = 8 * (where & 3);

return readl(priv->regs + (where & ~3)) >> shift; @@ -148,7 +148,7 @@ static int rcar_pcie_config_access(const struct udevice *udev, unsigned char access_type, pci_dev_t bdf, int where, ulong *data) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(udev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(udev); u32 reg = where & ~3;

/* Clear errors */ @@ -241,7 +241,7 @@ static int rcar_gen3_pcie_write_config(struct udevice *dev, pci_dev_t bdf,

static int rcar_gen3_pcie_wait_for_phyrdy(struct udevice *dev) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(dev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev);

return wait_for_bit_le32((void *)priv->regs + PCIEPHYSR, PHYRDY, true, 50, false); @@ -249,7 +249,7 @@ static int rcar_gen3_pcie_wait_for_phyrdy(struct udevice *dev)

static int rcar_gen3_pcie_wait_for_dl(struct udevice *dev) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(dev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev);

return wait_for_bit_le32((void *)priv->regs + PCIETSTR, DATA_LINK_ACTIVE, true, 50, false); @@ -257,7 +257,7 @@ static int rcar_gen3_pcie_wait_for_dl(struct udevice *dev)

static int rcar_gen3_pcie_hw_init(struct udevice *dev) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(dev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev); int ret;

/* Begin initialization */ @@ -313,7 +313,7 @@ static int rcar_gen3_pcie_hw_init(struct udevice *dev)

static int rcar_gen3_pcie_probe(struct udevice *dev) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(dev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev); struct pci_controller *hose = dev_get_uclass_priv(dev); struct clk pci_clk; u32 mask; @@ -374,7 +374,7 @@ static int rcar_gen3_pcie_probe(struct udevice *dev)

static int rcar_gen3_pcie_ofdata_to_platdata(struct udevice *dev) { - struct rcar_gen3_pcie_priv *priv = dev_get_platdata(dev); + struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev);

priv->regs = devfdt_get_addr_index(dev, 0); if (!priv->regs) diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index 7deb15fc529..f2d6222bd8a 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -143,7 +143,7 @@ static int mvebu_pcie_read_config(const struct udevice *bus, pci_dev_t bdf, uint offset, ulong *valuep, enum pci_size_t size) { - struct mvebu_pcie *pcie = dev_get_platdata(bus); + struct mvebu_pcie *pcie = dev_get_plat(bus); int local_bus = PCI_BUS(pcie->dev); int local_dev = PCI_DEV(pcie->dev); u32 reg; @@ -187,7 +187,7 @@ static int mvebu_pcie_write_config(struct udevice *bus, pci_dev_t bdf, uint offset, ulong value, enum pci_size_t size) { - struct mvebu_pcie *pcie = dev_get_platdata(bus); + struct mvebu_pcie *pcie = dev_get_plat(bus); int local_bus = PCI_BUS(pcie->dev); int local_dev = PCI_DEV(pcie->dev); u32 data; @@ -277,7 +277,7 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie *pcie)

static int mvebu_pcie_probe(struct udevice *dev) { - struct mvebu_pcie *pcie = dev_get_platdata(dev); + struct mvebu_pcie *pcie = dev_get_plat(dev); struct udevice *ctlr = pci_get_controller(dev); struct pci_controller *hose = dev_get_uclass_priv(ctlr); static int bus; @@ -412,7 +412,7 @@ static int mvebu_get_tgt_attr(ofnode node, int devfn,

static int mvebu_pcie_ofdata_to_platdata(struct udevice *dev) { - struct mvebu_pcie *pcie = dev_get_platdata(dev); + struct mvebu_pcie *pcie = dev_get_plat(dev); int ret = 0;

/* Get port number, lane number and memory target / attr */ diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index f5ed96914bd..5723c980323 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -428,7 +428,7 @@ static struct phy_ops sun4i_usb_phy_ops = {

static int sun4i_usb_phy_probe(struct udevice *dev) { - struct sun4i_usb_phy_plat *plat = dev_get_platdata(dev); + struct sun4i_usb_phy_plat *plat = dev_get_plat(dev); struct sun4i_usb_phy_data *data = dev_get_priv(dev); int i, ret;

diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c index a4f46e626de..b34cae60044 100644 --- a/drivers/pinctrl/intel/pinctrl_apl.c +++ b/drivers/pinctrl/intel/pinctrl_apl.c @@ -143,7 +143,7 @@ static int apl_pinctrl_ofdata_to_platdata(struct udevice *dev) int i;

#if CONFIG_IS_ENABLED(OF_PLATDATA) - struct apl_gpio_platdata *plat = dev_get_platdata(dev); + struct apl_gpio_platdata *plat = dev_get_plat(dev); int ret;

/* diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 3bc16bb2546..9a25cfa95d2 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -95,7 +95,7 @@ static u32 atmel_pinctrl_get_pinconf(const void *blob, int node) static inline struct atmel_pio4_port *atmel_pio4_bank_base(struct udevice *dev, u32 bank) { - struct atmel_pio4_platdata *plat = dev_get_platdata(dev); + struct atmel_pio4_platdata *plat = dev_get_plat(dev); struct atmel_pio4_port *bank_base = (struct atmel_pio4_port *)((u32)plat->reg_base + ATMEL_PIO_BANK_OFFSET * bank); @@ -154,7 +154,7 @@ const struct pinctrl_ops atmel_pinctrl_ops = {

static int atmel_pinctrl_probe(struct udevice *dev) { - struct atmel_pio4_platdata *plat = dev_get_platdata(dev); + struct atmel_pio4_platdata *plat = dev_get_plat(dev); fdt_addr_t addr_base;

dev = dev_get_parent(dev); diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index de208d4d7d6..1ea869a82b6 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -57,7 +57,7 @@ struct sti_pin_desc { */ void sti_alternate_select(struct udevice *dev, struct sti_pin_desc *pin_desc) { - struct sti_pinctrl_platdata *plat = dev_get_platdata(dev); + struct sti_pinctrl_platdata *plat = dev_get_plat(dev); unsigned long sysconf, *sysconfreg; int alt = pin_desc->alt; int bank = pin_desc->bank; @@ -91,7 +91,7 @@ void sti_alternate_select(struct udevice *dev, struct sti_pin_desc *pin_desc) /* pin configuration */ void sti_pin_configure(struct udevice *dev, struct sti_pin_desc *pin_desc) { - struct sti_pinctrl_platdata *plat = dev_get_platdata(dev); + struct sti_pinctrl_platdata *plat = dev_get_plat(dev); int bit; int oe = 0, pu = 0, od = 0; unsigned long *sysconfreg; @@ -277,7 +277,7 @@ static int sti_pinctrl_set_state(struct udevice *dev, struct udevice *config)

static int sti_pinctrl_probe(struct udevice *dev) { - struct sti_pinctrl_platdata *plat = dev_get_platdata(dev); + struct sti_pinctrl_platdata *plat = dev_get_plat(dev); struct udevice *syscon; int err;

diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c index 21c7dc4b76e..7cf08dbddd1 100644 --- a/drivers/pinctrl/pinctrl-stmfx.c +++ b/drivers/pinctrl/pinctrl-stmfx.c @@ -293,7 +293,7 @@ static int stmfx_pinctrl_conf_set(struct udevice *dev, unsigned int pin, unsigned int param, unsigned int arg) { int ret, dir; - struct stmfx_pinctrl *plat = dev_get_platdata(dev); + struct stmfx_pinctrl *plat = dev_get_plat(dev);

dir = stmfx_gpio_get_function(plat->gpio, pin);

@@ -334,7 +334,7 @@ static int stmfx_pinctrl_conf_set(struct udevice *dev, unsigned int pin,

static int stmfx_pinctrl_get_pins_count(struct udevice *dev) { - struct stmfx_pinctrl *plat = dev_get_platdata(dev); + struct stmfx_pinctrl *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv;

uc_priv = dev_get_uclass_priv(plat->gpio); @@ -390,7 +390,7 @@ static int stmfx_pinctrl_get_pin_muxing(struct udevice *dev, unsigned int selector, char *buf, int size) { - struct stmfx_pinctrl *plat = dev_get_platdata(dev); + struct stmfx_pinctrl *plat = dev_get_plat(dev); int func;

func = stmfx_gpio_get_function(plat->gpio, selector); @@ -406,7 +406,7 @@ static int stmfx_pinctrl_get_pin_muxing(struct udevice *dev,

static int stmfx_pinctrl_bind(struct udevice *dev) { - struct stmfx_pinctrl *plat = dev_get_platdata(dev); + struct stmfx_pinctrl *plat = dev_get_plat(dev);

/* subnode name is not explicit: use father name */ device_set_name(dev, dev->parent->name); @@ -418,7 +418,7 @@ static int stmfx_pinctrl_bind(struct udevice *dev)

static int stmfx_pinctrl_probe(struct udevice *dev) { - struct stmfx_pinctrl *plat = dev_get_platdata(dev); + struct stmfx_pinctrl *plat = dev_get_plat(dev);

return device_probe(plat->gpio); }; diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c index ec55caa2514..bc816842a19 100644 --- a/drivers/pinctrl/renesas/pfc-r7s72100.c +++ b/drivers/pinctrl/renesas/pfc-r7s72100.c @@ -39,7 +39,7 @@ struct r7s72100_pfc_platdata { static void r7s72100_pfc_set_function(struct udevice *dev, u16 bank, u16 line, u16 func, u16 inbuf, u16 bidir) { - struct r7s72100_pfc_platdata *plat = dev_get_platdata(dev); + struct r7s72100_pfc_platdata *plat = dev_get_plat(dev);

clrsetbits_le16(plat->base + PFCAE(bank), BIT(line), (func & BIT(2)) ? BIT(line) : 0); @@ -108,7 +108,7 @@ const struct pinctrl_ops r7s72100_pfc_ops = {

static int r7s72100_pfc_probe(struct udevice *dev) { - struct r7s72100_pfc_platdata *plat = dev_get_platdata(dev); + struct r7s72100_pfc_platdata *plat = dev_get_plat(dev); fdt_addr_t addr_base; ofnode node;

diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c index 9ce8c16304d..0a72afdccbf 100644 --- a/drivers/power/acpi_pmc/pmc_emul.c +++ b/drivers/power/acpi_pmc/pmc_emul.c @@ -46,7 +46,7 @@ struct pmc_emul_priv { static int sandbox_pmc_emul_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct pmc_emul_platdata *plat = dev_get_platdata(emul); + struct pmc_emul_platdata *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -99,7 +99,7 @@ static int sandbox_pmc_emul_read_config(const struct udevice *emul, uint offset, static int sandbox_pmc_emul_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct pmc_emul_platdata *plat = dev_get_platdata(emul); + struct pmc_emul_platdata *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -127,7 +127,7 @@ static int sandbox_pmc_emul_write_config(struct udevice *emul, uint offset, static int sandbox_pmc_emul_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct pmc_emul_platdata *plat = dev_get_platdata(emul); + struct pmc_emul_platdata *plat = dev_get_plat(emul); int barnum;

for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c index ed88fd7efaf..c97dfbb1c2e 100644 --- a/drivers/power/domain/imx8-power-domain-legacy.c +++ b/drivers/power/domain/imx8-power-domain-legacy.c @@ -116,7 +116,7 @@ static int imx8_power_domain_on(struct power_domain *power_domain) return err; }

- pdata = (struct imx8_power_domain_platdata *)dev_get_platdata(dev); + pdata = (struct imx8_power_domain_platdata *)dev_get_plat(dev); ppriv = (struct imx8_power_domain_priv *)dev_get_priv(dev);

debug("%s(power_domain=%s) resource_id %d\n", __func__, dev->name, @@ -155,7 +155,7 @@ static int imx8_power_domain_off_node(struct power_domain *power_domain) sc_err_t ret;

ppriv = dev_get_priv(dev); - pdata = dev_get_platdata(dev); + pdata = dev_get_plat(dev);

debug("%s, %s, state_on %d\n", __func__, dev->name, ppriv->state_on);

@@ -208,7 +208,7 @@ static int imx8_power_domain_off_parentnodes(struct power_domain *power_domain)

if (device_get_uclass_id(parent) == UCLASS_POWER_DOMAIN) { pdata = - (struct imx8_power_domain_platdata *)dev_get_platdata(parent); + (struct imx8_power_domain_platdata *)dev_get_plat(parent); ppriv = (struct imx8_power_domain_priv *)dev_get_priv(parent);

debug("%s, %s, state_on %d\n", __func__, parent->name, @@ -343,7 +343,7 @@ static int imx8_power_domain_probe(struct udevice *dev) static int imx8_power_domain_ofdata_to_platdata(struct udevice *dev) { int reg; - struct imx8_power_domain_platdata *pdata = dev_get_platdata(dev); + struct imx8_power_domain_platdata *pdata = dev_get_plat(dev);

reg = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1); if (reg == -1) { diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c index 7e2d232f702..1248f937eb4 100644 --- a/drivers/power/domain/imx8m-power-domain.c +++ b/drivers/power/domain/imx8m-power-domain.c @@ -32,7 +32,7 @@ static int imx8m_power_domain_on(struct power_domain *power_domain) struct udevice *dev = power_domain->dev; struct imx8m_power_domain_platdata *pdata;

- pdata = dev_get_platdata(dev); + pdata = dev_get_plat(dev);

if (pdata->resource_id < 0) return -EINVAL; @@ -50,7 +50,7 @@ static int imx8m_power_domain_off(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; struct imx8m_power_domain_platdata *pdata; - pdata = dev_get_platdata(dev); + pdata = dev_get_plat(dev);

if (pdata->resource_id < 0) return -EINVAL; @@ -106,7 +106,7 @@ static int imx8m_power_domain_probe(struct udevice *dev)

static int imx8m_power_domain_ofdata_to_platdata(struct udevice *dev) { - struct imx8m_power_domain_platdata *pdata = dev_get_platdata(dev); + struct imx8m_power_domain_platdata *pdata = dev_get_plat(dev);

pdata->resource_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1); diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c index 168b8a5ed7f..a85de822b3c 100644 --- a/drivers/power/pmic/i2c_pmic_emul.c +++ b/drivers/power/pmic/i2c_pmic_emul.c @@ -30,7 +30,7 @@ struct sandbox_i2c_pmic_plat_data { static int sandbox_i2c_pmic_read_data(struct udevice *emul, uchar chip, uchar *buffer, int len) { - struct sandbox_i2c_pmic_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_pmic_plat_data *plat = dev_get_plat(emul);

if (plat->rw_idx + len > plat->buf_size) { pr_err("Request exceeds PMIC register range! Max register: %#x", @@ -50,7 +50,7 @@ static int sandbox_i2c_pmic_write_data(struct udevice *emul, uchar chip, uchar *buffer, int len, bool next_is_read) { - struct sandbox_i2c_pmic_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_pmic_plat_data *plat = dev_get_plat(emul);

/* Probe only */ if (!len) @@ -105,7 +105,7 @@ static int sandbox_i2c_pmic_xfer(struct udevice *emul, struct i2c_msg *msg,

static int sandbox_i2c_pmic_ofdata_to_platdata(struct udevice *emul) { - struct sandbox_i2c_pmic_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_pmic_plat_data *plat = dev_get_plat(emul); struct udevice *pmic_dev = i2c_emul_get_device(emul);

debug("%s:%d Setting PMIC default registers\n", __func__, __LINE__); @@ -116,7 +116,7 @@ static int sandbox_i2c_pmic_ofdata_to_platdata(struct udevice *emul)

static int sandbox_i2c_pmic_probe(struct udevice *emul) { - struct sandbox_i2c_pmic_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_pmic_plat_data *plat = dev_get_plat(emul); struct udevice *pmic_dev = i2c_emul_get_device(emul); struct uc_pmic_priv *upriv = dev_get_uclass_priv(pmic_dev); const u8 *reg_defaults; diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c index c9d966fdebf..1637a2d018a 100644 --- a/drivers/power/regulator/bd71837.c +++ b/drivers/power/regulator/bd71837.c @@ -274,7 +274,7 @@ static int vrange_find_selector(struct bd71837_vrange *r, int val, static int bd71837_get_enable(struct udevice *dev) { int val; - struct bd71837_platdata *plat = dev_get_platdata(dev); + struct bd71837_platdata *plat = dev_get_plat(dev);

/* * boot critical regulators on bd71837 must not be controlled by sw @@ -298,7 +298,7 @@ static int bd71837_get_enable(struct udevice *dev) static int bd71837_set_enable(struct udevice *dev, bool enable) { int val = 0; - struct bd71837_platdata *plat = dev_get_platdata(dev); + struct bd71837_platdata *plat = dev_get_plat(dev);

/* * boot critical regulators on bd71837 must not be controlled by sw @@ -321,7 +321,7 @@ static int bd71837_set_value(struct udevice *dev, int uvolt) unsigned int range; int i; int found = 0; - struct bd71837_platdata *plat = dev_get_platdata(dev); + struct bd71837_platdata *plat = dev_get_plat(dev);

/* * An under/overshooting may occur if voltage is changed for other @@ -369,7 +369,7 @@ static int bd71837_get_value(struct udevice *dev) { unsigned int reg, range; unsigned int tmp; - struct bd71837_platdata *plat = dev_get_platdata(dev); + struct bd71837_platdata *plat = dev_get_plat(dev); int i;

reg = pmic_reg_read(dev->parent, plat->volt_reg); @@ -399,7 +399,7 @@ static int bd71837_get_value(struct udevice *dev)

static int bd71837_regulator_probe(struct udevice *dev) { - struct bd71837_platdata *plat = dev_get_platdata(dev); + struct bd71837_platdata *plat = dev_get_plat(dev); int i, ret; struct dm_regulator_uclass_plat *uc_pdata; int type; diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index 709cc632498..02a08b58b06 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -102,7 +102,7 @@ struct fan53555_priv {

static int fan53555_regulator_ofdata_to_platdata(struct udevice *dev) { - struct fan53555_platdata *dev_pdata = dev_get_platdata(dev); + struct fan53555_platdata *dev_pdata = dev_get_plat(dev); struct dm_regulator_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); u32 sleep_vsel; @@ -136,7 +136,7 @@ static int fan53555_regulator_ofdata_to_platdata(struct udevice *dev)

static int fan53555_regulator_get_value(struct udevice *dev) { - struct fan53555_platdata *pdata = dev_get_platdata(dev); + struct fan53555_platdata *pdata = dev_get_plat(dev); struct fan53555_priv *priv = dev_get_priv(dev); int reg; int voltage; @@ -153,7 +153,7 @@ static int fan53555_regulator_get_value(struct udevice *dev)

static int fan53555_regulator_set_value(struct udevice *dev, int uV) { - struct fan53555_platdata *pdata = dev_get_platdata(dev); + struct fan53555_platdata *pdata = dev_get_plat(dev); struct fan53555_priv *priv = dev_get_priv(dev); u8 vol;

diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index ed27ffc0056..4967b7051b3 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -19,7 +19,7 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev) struct dm_regulator_uclass_plat *uc_pdata; struct regulator_common_platdata *dev_pdata;

- dev_pdata = dev_get_platdata(dev); + dev_pdata = dev_get_plat(dev); uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO; @@ -63,12 +63,12 @@ static int fixed_regulator_get_current(struct udevice *dev)

static int fixed_regulator_get_enable(struct udevice *dev) { - return regulator_common_get_enable(dev, dev_get_platdata(dev)); + return regulator_common_get_enable(dev, dev_get_plat(dev)); }

static int fixed_regulator_set_enable(struct udevice *dev, bool enable) { - return regulator_common_set_enable(dev, dev_get_platdata(dev), enable); + return regulator_common_set_enable(dev, dev_get_plat(dev), enable); }

static const struct dm_regulator_ops fixed_regulator_ops = { diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 39b0f081e86..80a6949e6b3 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -33,7 +33,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) int ret, count, i, j; u32 states_array[GPIO_REGULATOR_MAX_STATES * 2];

- dev_pdata = dev_get_platdata(dev); + dev_pdata = dev_get_plat(dev); uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO; @@ -80,7 +80,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) static int gpio_regulator_get_value(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); int enable;

if (!dev_pdata->gpio.dev) @@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct udevice *dev)

static int gpio_regulator_set_value(struct udevice *dev, int uV) { - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); int ret; bool enable;

@@ -127,13 +127,13 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV)

static int gpio_regulator_get_enable(struct udevice *dev) { - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); return regulator_common_get_enable(dev, &dev_pdata->common); }

static int gpio_regulator_set_enable(struct udevice *dev, bool enable) { - struct gpio_regulator_platdata *dev_pdata = dev_get_platdata(dev); + struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); return regulator_common_set_enable(dev, &dev_pdata->common, enable); }

diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index ebf355c2755..d75ea7c1ed1 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -261,7 +261,7 @@ static struct pfuze100_regulator_desc *se_desc(struct pfuze100_regulator_desc *d static int pfuze100_regulator_probe(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct pfuze100_regulator_platdata *plat = dev_get_platdata(dev); + struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc;

switch (dev_get_driver_data(dev_get_parent(dev))) { @@ -315,7 +315,7 @@ static int pfuze100_regulator_probe(struct udevice *dev) static int pfuze100_regulator_mode(struct udevice *dev, int op, int *opmode) { int val; - struct pfuze100_regulator_platdata *plat = dev_get_platdata(dev); + struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc = plat->desc;

if (op == PMIC_OP_GET) { @@ -449,7 +449,7 @@ static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV) { int i; int val; - struct pfuze100_regulator_platdata *plat = dev_get_platdata(dev); + struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc = plat->desc; struct dm_regulator_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c index e44c6bb17f5..b9f4504539e 100644 --- a/drivers/power/regulator/tps62360_regulator.c +++ b/drivers/power/regulator/tps62360_regulator.c @@ -43,7 +43,7 @@ static struct tps62360_regulator_config tps62361_data = {

static int tps62360_regulator_set_value(struct udevice *dev, int uV) { - struct tps62360_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps62360_regulator_pdata *pdata = dev_get_plat(dev); u8 regval;

if (uV < pdata->config->vmin || uV > pdata->config->vmax) @@ -66,7 +66,7 @@ static int tps62360_regulator_get_value(struct udevice *dev) { u8 regval; int ret; - struct tps62360_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps62360_regulator_pdata *pdata = dev_get_plat(dev);

ret = dm_i2c_read(pdata->i2c, TPS62360_REG_SET0 + pdata->vsel_offset, &regval, 1); @@ -80,7 +80,7 @@ static int tps62360_regulator_get_value(struct udevice *dev)

static int tps62360_regulator_probe(struct udevice *dev) { - struct tps62360_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps62360_regulator_pdata *pdata = dev_get_plat(dev); u8 vsel0; u8 vsel1; int ret; diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c index 3c211a1b3a1..9fb13d6a551 100644 --- a/drivers/power/regulator/tps65910_regulator.c +++ b/drivers/power/regulator/tps65910_regulator.c @@ -141,7 +141,7 @@ static int tps65910_regulator_get_value(struct udevice *dev, const struct regulator_props *rgp) { int sel, val, vout; - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev); int vin = pdata->supply;

val = pmic_reg_read(dev->parent, rgp->reg); @@ -156,7 +156,7 @@ static int tps65910_regulator_get_value(struct udevice *dev,

static int tps65910_ldo_get_value(struct udevice *dev) { - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev); int vin;

if (!pdata) @@ -194,7 +194,7 @@ static int tps65910_regulator_set_value(struct udevice *dev, { int val; int sel = 0; - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

do { /* we only allow exact voltage matches */ @@ -216,7 +216,7 @@ static int tps65910_regulator_set_value(struct udevice *dev,

static int tps65910_ldo_set_value(struct udevice *dev, int uV) { - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev); int vin = pdata->supply;

switch (pdata->unit) { @@ -249,7 +249,7 @@ static int tps65910_ldo_set_value(struct udevice *dev, int uV) static int tps65910_get_enable(struct udevice *dev) { int reg, val; - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

reg = get_ctrl_reg_from_unit_addr(pdata->unit); if (reg < 0) @@ -267,7 +267,7 @@ static int tps65910_set_enable(struct udevice *dev, bool enable) { int reg; uint clr, set; - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

reg = get_ctrl_reg_from_unit_addr(pdata->unit); if (reg < 0) @@ -305,7 +305,7 @@ static int buck_get_vdd1_vdd2_value(struct udevice *dev, int reg_vdd)

static int tps65910_buck_get_value(struct udevice *dev) { - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

switch (pdata->unit) { case TPS65910_UNIT_VIO: @@ -324,7 +324,7 @@ static int buck_set_vdd1_vdd2_value(struct udevice *dev, int uV) int ret, reg_vdd, gain; int val; struct dm_regulator_uclass_plat *uc_pdata; - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

switch (pdata->unit) { case TPS65910_UNIT_VDD1: @@ -369,7 +369,7 @@ static int buck_set_vdd1_vdd2_value(struct udevice *dev, int uV)

static int tps65910_buck_set_value(struct udevice *dev, int uV) { - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

if (pdata->unit == TPS65910_UNIT_VIO) return tps65910_regulator_set_value(dev, &smps_props_vio, uV); @@ -380,7 +380,7 @@ static int tps65910_buck_set_value(struct udevice *dev, int uV) static int tps65910_boost_get_value(struct udevice *dev) { int vout; - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

vout = (pdata->supply >= 3000000) ? 5000000 : 0; return vout; @@ -391,7 +391,7 @@ static int tps65910_regulator_ofdata_to_platdata(struct udevice *dev) struct udevice *supply; int ret; const char *supply_name; - struct tps65910_regulator_pdata *pdata = dev_get_platdata(dev); + struct tps65910_regulator_pdata *pdata = dev_get_plat(dev);

pdata->unit = dev_get_driver_data(dev); if (pdata->unit > TPS65910_UNIT_VMMC) diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c index 03d0d88fc94..6a5d96ff724 100644 --- a/drivers/ram/imxrt_sdram.c +++ b/drivers/ram/imxrt_sdram.c @@ -224,7 +224,7 @@ static int imxrt_sdram_ipcmd(struct imxrt_semc_regs *regs, u32 mem_addr,

int imxrt_sdram_init(struct udevice *dev) { - struct imxrt_sdram_params *params = dev_get_platdata(dev); + struct imxrt_sdram_params *params = dev_get_plat(dev); struct imxrt_sdram_mux *mux = params->sdram_mux; struct imxrt_sdram_control *ctrl = params->sdram_control; struct imxrt_sdram_timing *time = params->sdram_timing; @@ -304,7 +304,7 @@ int imxrt_sdram_init(struct udevice *dev)

static int imxrt_semc_ofdata_to_platdata(struct udevice *dev) { - struct imxrt_sdram_params *params = dev_get_platdata(dev); + struct imxrt_sdram_params *params = dev_get_plat(dev); ofnode bank_node; u8 bank = 0;

@@ -389,7 +389,7 @@ static int imxrt_semc_ofdata_to_platdata(struct udevice *dev)

static int imxrt_semc_probe(struct udevice *dev) { - struct imxrt_sdram_params *params = dev_get_platdata(dev); + struct imxrt_sdram_params *params = dev_get_plat(dev); int ret; fdt_addr_t addr;

diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index 4e586309bd9..1a19964b8fe 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -604,7 +604,7 @@ static int ddrphy_data_training(struct rk3368_ddr_pctl *pctl, static int sdram_col_row_detect(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); - struct rk3368_sdram_params *params = dev_get_platdata(dev); + struct rk3368_sdram_params *params = dev_get_plat(dev); struct rk3368_ddr_pctl *pctl = priv->pctl; struct rk3368_msch *msch = priv->msch; const u32 test_pattern = 0x5aa5f00f; @@ -774,7 +774,7 @@ static void dram_all_config(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); struct rk3368_pmu_grf *pmugrf = priv->pmugrf; - struct rk3368_sdram_params *params = dev_get_platdata(dev); + struct rk3368_sdram_params *params = dev_get_plat(dev); const struct rk3288_sdram_channel *info = &params->chan; u32 sys_reg = 0; const int chan = 0; @@ -798,7 +798,7 @@ static void dram_all_config(struct udevice *dev) static int setup_sdram(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); - struct rk3368_sdram_params *params = dev_get_platdata(dev); + struct rk3368_sdram_params *params = dev_get_plat(dev);

struct rk3368_ddr_pctl *pctl = priv->pctl; struct rk3368_ddrphy *ddrphy = priv->phy; @@ -884,7 +884,7 @@ static int rk3368_dmc_ofdata_to_platdata(struct udevice *dev) int ret = 0;

#if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3368_sdram_params *plat = dev_get_platdata(dev); + struct rk3368_sdram_params *plat = dev_get_plat(dev);

ret = regmap_init_mem(dev_ofnode(dev), &plat->map); if (ret) @@ -897,7 +897,7 @@ static int rk3368_dmc_ofdata_to_platdata(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) { - struct rk3368_sdram_params *plat = dev_get_platdata(dev); + struct rk3368_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3368_dmc *of_plat = &plat->of_plat;

plat->ddr_freq = of_plat->rockchip_ddr_frequency; @@ -911,7 +911,7 @@ static int conv_of_platdata(struct udevice *dev) static int rk3368_dmc_probe(struct udevice *dev) { #ifdef CONFIG_TPL_BUILD - struct rk3368_sdram_params *plat = dev_get_platdata(dev); + struct rk3368_sdram_params *plat = dev_get_plat(dev); struct rk3368_ddr_pctl *pctl; struct rk3368_ddrphy *ddrphy; struct rk3368_cru *cru; diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index 9b9ef9c9e04..e7ba0b98358 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -809,7 +809,7 @@ error: static int setup_sdram(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); - struct rk3188_sdram_params *params = dev_get_platdata(dev); + struct rk3188_sdram_params *params = dev_get_plat(dev);

return sdram_init(priv, params); } @@ -817,7 +817,7 @@ static int setup_sdram(struct udevice *dev) static int rk3188_dmc_ofdata_to_platdata(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3188_sdram_params *params = dev_get_platdata(dev); + struct rk3188_sdram_params *params = dev_get_plat(dev); int ret;

/* rk3188 supports only one-channel */ @@ -855,7 +855,7 @@ static int rk3188_dmc_ofdata_to_platdata(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) { - struct rk3188_sdram_params *plat = dev_get_platdata(dev); + struct rk3188_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3188_dmc *of_plat = &plat->of_plat; int ret;

@@ -879,7 +879,7 @@ static int conv_of_platdata(struct udevice *dev) static int rk3188_dmc_probe(struct udevice *dev) { #ifdef CONFIG_SPL_BUILD - struct rk3188_sdram_params *plat = dev_get_platdata(dev); + struct rk3188_sdram_params *plat = dev_get_plat(dev); struct regmap *map; struct udevice *dev_clk; int ret; diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index 459d3a4cb5e..763c8509c52 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -716,7 +716,7 @@ out: static int rk322x_dmc_ofdata_to_platdata(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk322x_sdram_params *params = dev_get_platdata(dev); + struct rk322x_sdram_params *params = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); int ret; @@ -756,7 +756,7 @@ static int rk322x_dmc_ofdata_to_platdata(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) { - struct rk322x_sdram_params *plat = dev_get_platdata(dev); + struct rk322x_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk322x_dmc *of_plat = &plat->of_plat; int ret;

@@ -780,7 +780,7 @@ static int conv_of_platdata(struct udevice *dev) static int rk322x_dmc_probe(struct udevice *dev) { #ifdef CONFIG_TPL_BUILD - struct rk322x_sdram_params *plat = dev_get_platdata(dev); + struct rk322x_sdram_params *plat = dev_get_plat(dev); int ret; struct udevice *dev_clk; #endif diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index e034054ee3c..44ad28ab755 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -956,7 +956,7 @@ static int veyron_init(struct dram_info *priv) static int setup_sdram(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); - struct rk3288_sdram_params *params = dev_get_platdata(dev); + struct rk3288_sdram_params *params = dev_get_plat(dev);

# ifdef CONFIG_ROCKCHIP_FAST_SPL if (priv->is_veyron) { @@ -974,7 +974,7 @@ static int setup_sdram(struct udevice *dev) static int rk3288_dmc_ofdata_to_platdata(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rk3288_sdram_params *params = dev_get_platdata(dev); + struct rk3288_sdram_params *params = dev_get_plat(dev); int ret;

/* Rk3288 supports dual-channel, set default channel num to 2 */ @@ -1017,7 +1017,7 @@ static int rk3288_dmc_ofdata_to_platdata(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) { - struct rk3288_sdram_params *plat = dev_get_platdata(dev); + struct rk3288_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3288_dmc *of_plat = &plat->of_plat; int ret;

@@ -1042,7 +1042,7 @@ static int rk3288_dmc_probe(struct udevice *dev) { #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) - struct rk3288_sdram_params *plat = dev_get_platdata(dev); + struct rk3288_sdram_params *plat = dev_get_plat(dev); struct udevice *dev_clk; struct regmap *map; int ret; diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index 634fd419f36..994a948f342 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -50,7 +50,7 @@ struct rockchip_dmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) { - struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct rockchip_dmc_plat *plat = dev_get_plat(dev); struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; int ret;

@@ -515,7 +515,7 @@ static int sdram_init_detect(struct dram_info *dram, static int rk3328_dmc_init(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); - struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct rockchip_dmc_plat *plat = dev_get_plat(dev); int ret;

#if !CONFIG_IS_ENABLED(OF_PLATDATA) @@ -551,7 +551,7 @@ static int rk3328_dmc_init(struct udevice *dev) static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct rockchip_dmc_plat *plat = dev_get_plat(dev); int ret;

ret = dev_read_u32_array(dev, "rockchip,sdram-params", diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index b1d1f92253d..07977bc1d40 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -3014,7 +3014,7 @@ static int sdram_init(struct dram_info *dram, static int rk3399_dmc_ofdata_to_platdata(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct rockchip_dmc_plat *plat = dev_get_plat(dev); int ret;

ret = dev_read_u32_array(dev, "rockchip,sdram-params", @@ -3036,7 +3036,7 @@ static int rk3399_dmc_ofdata_to_platdata(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) { - struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct rockchip_dmc_plat *plat = dev_get_plat(dev); struct dtd_rockchip_rk3399_dmc *dtplat = &plat->dtplat; int ret;

@@ -3067,7 +3067,7 @@ static const struct sdram_rk3399_ops rk3399_ops = { static int rk3399_dmc_init(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); - struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct rockchip_dmc_plat *plat = dev_get_plat(dev); int ret; #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3399_sdram_params *params = &plat->sdram_params; diff --git a/drivers/ram/sifive/fu540_ddr.c b/drivers/ram/sifive/fu540_ddr.c index 97e32f383bf..5a7484ce488 100644 --- a/drivers/ram/sifive/fu540_ddr.c +++ b/drivers/ram/sifive/fu540_ddr.c @@ -230,7 +230,7 @@ static u32 fu540_ddr_get_dram_class(volatile u32 *ctl) static int fu540_ddr_setup(struct udevice *dev) { struct fu540_ddr_info *priv = dev_get_priv(dev); - struct sifive_dmc_plat *plat = dev_get_platdata(dev); + struct sifive_dmc_plat *plat = dev_get_plat(dev); struct fu540_ddr_params *params = &plat->ddr_params; volatile u32 *denali_ctl = priv->ctl->denali_ctl; volatile u32 *denali_phy = priv->phy->denali_phy; diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index ce3ea033a0e..da25d37a0c2 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -161,7 +161,7 @@ struct stm32_sdram_params {

int stm32_sdram_init(struct udevice *dev) { - struct stm32_sdram_params *params = dev_get_platdata(dev); + struct stm32_sdram_params *params = dev_get_plat(dev); struct stm32_sdram_control *control; struct stm32_sdram_timing *timing; struct stm32_fmc_regs *regs = params->base; @@ -258,7 +258,7 @@ int stm32_sdram_init(struct udevice *dev)

static int stm32_fmc_ofdata_to_platdata(struct udevice *dev) { - struct stm32_sdram_params *params = dev_get_platdata(dev); + struct stm32_sdram_params *params = dev_get_plat(dev); struct bank_params *bank_params; struct ofnode_phandle_args args; u32 *syscfg_base; @@ -355,7 +355,7 @@ static int stm32_fmc_ofdata_to_platdata(struct udevice *dev)

static int stm32_fmc_probe(struct udevice *dev) { - struct stm32_sdram_params *params = dev_get_platdata(dev); + struct stm32_sdram_params *params = dev_get_plat(dev); int ret; fdt_addr_t addr;

diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index e7febc42cd9..1d0b540b7b4 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -26,7 +26,7 @@ struct meson_rng_platdata { */ static int meson_rng_read(struct udevice *dev, void *data, size_t len) { - struct meson_rng_platdata *pdata = dev_get_platdata(dev); + struct meson_rng_platdata *pdata = dev_get_plat(dev); char *buffer = (char *)data;

while (len) { @@ -52,7 +52,7 @@ static int meson_rng_read(struct udevice *dev, void *data, size_t len) */ static int meson_rng_probe(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_platdata(dev); + struct meson_rng_platdata *pdata = dev_get_plat(dev); int err;

err = clk_enable(&pdata->clk); @@ -70,7 +70,7 @@ static int meson_rng_probe(struct udevice *dev) */ static int meson_rng_remove(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_platdata(dev); + struct meson_rng_platdata *pdata = dev_get_plat(dev);

return clk_disable(&pdata->clk); } @@ -83,7 +83,7 @@ static int meson_rng_remove(struct udevice *dev) */ static int meson_rng_ofdata_to_platdata(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_platdata(dev); + struct meson_rng_platdata *pdata = dev_get_plat(dev); int err;

pdata->base = dev_read_addr(dev); diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index abfcbab6630..34281d39464 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -41,7 +41,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) int retval, i; u32 sr, count, reg; size_t increment; - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev);

while (len > 0) { retval = readl_poll_timeout(pdata->base + RNG_SR, sr, @@ -106,7 +106,7 @@ static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata)

static int stm32_rng_probe(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev);

reset_assert(&pdata->rst); udelay(20); @@ -117,14 +117,14 @@ static int stm32_rng_probe(struct udevice *dev)

static int stm32_rng_remove(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev);

return stm32_rng_cleanup(pdata); }

static int stm32_rng_ofdata_to_platdata(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_platdata(dev); + struct stm32_rng_platdata *pdata = dev_get_plat(dev); int err;

pdata->base = dev_read_addr(dev); diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c index 59043a72309..5a2a154e653 100644 --- a/drivers/rtc/i2c_rtc_emul.c +++ b/drivers/rtc/i2c_rtc_emul.c @@ -50,7 +50,7 @@ struct sandbox_i2c_rtc { long sandbox_i2c_rtc_set_offset(struct udevice *dev, bool use_system_time, int offset) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev); long old_offset;

old_offset = plat->offset; @@ -63,7 +63,7 @@ long sandbox_i2c_rtc_set_offset(struct udevice *dev, bool use_system_time,

long sandbox_i2c_rtc_get_set_base_time(struct udevice *dev, long base_time) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev); long old_base_time;

old_base_time = plat->base_time; @@ -75,7 +75,7 @@ long sandbox_i2c_rtc_get_set_base_time(struct udevice *dev, long base_time)

static void reset_time(struct udevice *dev) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev); struct rtc_time now;

os_localtime(&now); @@ -86,7 +86,7 @@ static void reset_time(struct udevice *dev)

static int sandbox_i2c_rtc_get(struct udevice *dev, struct rtc_time *time) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev); struct rtc_time tm_now; long now;

@@ -104,7 +104,7 @@ static int sandbox_i2c_rtc_get(struct udevice *dev, struct rtc_time *time)

static int sandbox_i2c_rtc_set(struct udevice *dev, const struct rtc_time *time) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(dev); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(dev); struct rtc_time tm_now; long now;

@@ -122,7 +122,7 @@ static int sandbox_i2c_rtc_set(struct udevice *dev, const struct rtc_time *time) /* Update the current time in the registers */ static int sandbox_i2c_rtc_prepare_read(struct udevice *emul) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(emul); struct rtc_time time; int ret;

@@ -143,7 +143,7 @@ static int sandbox_i2c_rtc_prepare_read(struct udevice *emul)

static int sandbox_i2c_rtc_complete_write(struct udevice *emul) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(emul); struct rtc_time time; int ret;

@@ -165,7 +165,7 @@ static int sandbox_i2c_rtc_complete_write(struct udevice *emul) static int sandbox_i2c_rtc_xfer(struct udevice *emul, struct i2c_msg *msg, int nmsgs) { - struct sandbox_i2c_rtc_plat_data *plat = dev_get_platdata(emul); + struct sandbox_i2c_rtc_plat_data *plat = dev_get_plat(emul); uint offset = 0; int ret;

diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c index ed057f7bc4e..731ce8d0592 100644 --- a/drivers/rtc/mvrtc.c +++ b/drivers/rtc/mvrtc.c @@ -133,7 +133,7 @@ void rtc_reset(void) #ifdef CONFIG_DM_RTC static int mv_rtc_get(struct udevice *dev, struct rtc_time *tm) { - struct mvrtc_pdata *pdata = dev_get_platdata(dev); + struct mvrtc_pdata *pdata = dev_get_plat(dev); struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;

return __mv_rtc_get(regs, tm); @@ -141,7 +141,7 @@ static int mv_rtc_get(struct udevice *dev, struct rtc_time *tm)

static int mv_rtc_set(struct udevice *dev, const struct rtc_time *tm) { - struct mvrtc_pdata *pdata = dev_get_platdata(dev); + struct mvrtc_pdata *pdata = dev_get_plat(dev); struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;

return __mv_rtc_set(regs, tm); @@ -149,7 +149,7 @@ static int mv_rtc_set(struct udevice *dev, const struct rtc_time *tm)

static int mv_rtc_reset(struct udevice *dev) { - struct mvrtc_pdata *pdata = dev_get_platdata(dev); + struct mvrtc_pdata *pdata = dev_get_plat(dev); struct mvrtc_registers *regs = (struct mvrtc_registers *)pdata->iobase;

__mv_rtc_reset(regs); @@ -170,7 +170,7 @@ static const struct udevice_id mv_rtc_ids[] = {

static int mv_rtc_ofdata_to_platdata(struct udevice *dev) { - struct mvrtc_pdata *pdata = dev_get_platdata(dev); + struct mvrtc_pdata *pdata = dev_get_plat(dev);

pdata->iobase = dev_read_addr(dev); return 0; diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index 93d5a6a3857..df79c1fb88f 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -35,14 +35,14 @@ struct pl031_platdata {

static inline u32 pl031_read_reg(struct udevice *dev, int reg) { - struct pl031_platdata *pdata = dev_get_platdata(dev); + struct pl031_platdata *pdata = dev_get_plat(dev);

return readl(pdata->base + reg); }

static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value) { - struct pl031_platdata *pdata = dev_get_platdata(dev); + struct pl031_platdata *pdata = dev_get_plat(dev);

return writel(value, pdata->base + reg); } @@ -124,7 +124,7 @@ static const struct udevice_id pl031_ids[] = {

static int pl031_ofdata_to_platdata(struct udevice *dev) { - struct pl031_platdata *pdata = dev_get_platdata(dev); + struct pl031_platdata *pdata = dev_get_plat(dev);

pdata->base = dev_read_addr(dev);

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index 01dc41ebc0d..e855ca472c7 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -93,7 +93,7 @@ static int altera_jtaguart_probe(struct udevice *dev)

static int altera_jtaguart_ofdata_to_platdata(struct udevice *dev) { - struct altera_jtaguart_platdata *plat = dev_get_platdata(dev); + struct altera_jtaguart_platdata *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_jtaguart_regs), diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index 68169d51a3e..8d27382ee33 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -85,7 +85,7 @@ static int altera_uart_probe(struct udevice *dev)

static int altera_uart_ofdata_to_platdata(struct udevice *dev) { - struct altera_uart_platdata *plat = dev_get_platdata(dev); + struct altera_uart_platdata *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_uart_regs), diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c index 6b7bf3f1c53..4e34643b4a9 100644 --- a/drivers/serial/lpc32xx_hsuart.c +++ b/drivers/serial/lpc32xx_hsuart.c @@ -85,7 +85,7 @@ static int lpc32xx_serial_init(struct hsuart_regs *hsuart)

static int lpc32xx_hsuart_probe(struct udevice *dev) { - struct lpc32xx_hsuart_platdata *plat = dev_get_platdata(dev); + struct lpc32xx_hsuart_platdata *plat = dev_get_plat(dev); struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);

priv->hsuart = (struct hsuart_regs *)plat->base; diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 88a486aab8b..6bc8c994351 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -519,7 +519,7 @@ int ns16550_serial_probe(struct udevice *dev) if (!ret) reset_deassert_bulk(&reset_bulk);

- com_port->plat = dev_get_platdata(dev); + com_port->plat = dev_get_plat(dev); NS16550_init(com_port, -1);

return 0; diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index 0c7418f5bc8..8964fa75fc2 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -111,7 +111,7 @@ static const struct udevice_id arc_serial_ids[] = {

static int arc_serial_ofdata_to_platdata(struct udevice *dev) { - struct arc_serial_platdata *plat = dev_get_platdata(dev); + struct arc_serial_platdata *plat = dev_get_plat(dev); DECLARE_GLOBAL_DATA_PTR;

plat->reg = dev_read_addr_ptr(dev); diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index d11bdd4ebbb..1d64496bf02 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -55,7 +55,7 @@ static int bcm283x_mu_serial_getc(struct udevice *dev);

static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) { - struct bcm283x_mu_serial_platdata *plat = dev_get_platdata(dev); + struct bcm283x_mu_serial_platdata *plat = dev_get_plat(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); struct bcm283x_mu_regs *regs = priv->regs; u32 divider; @@ -158,7 +158,7 @@ static bool bcm283x_is_serial_muxed(void)

static int bcm283x_mu_serial_probe(struct udevice *dev) { - struct bcm283x_mu_serial_platdata *plat = dev_get_platdata(dev); + struct bcm283x_mu_serial_platdata *plat = dev_get_plat(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); fdt_addr_t addr;

diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 8d2f249b33c..6d7a87cf652 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -35,7 +35,7 @@ static bool bcm283x_is_serial_muxed(void)

static int bcm283x_pl011_serial_probe(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_platdata(dev); + struct pl01x_serial_platdata *plat = dev_get_plat(dev); int ret;

/* Don't spawn the device if it's not muxed */ diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index 17072e42b2a..dba0ae45fb4 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -13,7 +13,7 @@

static int coreboot_ofdata_to_platdata(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_platdata(dev); + struct ns16550_platdata *plat = dev_get_plat(dev); struct cb_serial *cb_info = lib_sysinfo.serial;

plat->base = cb_info->baseaddr; diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c index 26c6867180f..2ee7e2d5de5 100644 --- a/drivers/serial/serial_intel_mid.c +++ b/drivers/serial/serial_intel_mid.c @@ -33,7 +33,7 @@ static void mid_writel(struct ns16550_platdata *plat, int offset, int value)

static int mid_serial_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_platdata(dev); + struct ns16550_platdata *plat = dev_get_plat(dev);

/* * Initialize fractional divider correctly for Intel Edison diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index e6e1b1def63..e6b73e133e0 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -146,7 +146,7 @@ static bool is_lpuart32(struct udevice *dev) static void _lpuart_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_platdata(dev); + struct lpuart_serial_platdata *plat = dev_get_plat(dev); struct lpuart_fsl *base = plat->reg; u32 clk; u16 sbr; @@ -206,7 +206,7 @@ static int _lpuart_serial_tstc(struct lpuart_serial_platdata *plat) */ static int _lpuart_serial_init(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev_get_platdata(dev); + struct lpuart_serial_platdata *plat = dev_get_plat(dev); struct lpuart_fsl *base = (struct lpuart_fsl *)plat->reg; u8 ctrl;

@@ -235,7 +235,7 @@ static int _lpuart_serial_init(struct udevice *dev) static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_platdata(dev); + struct lpuart_serial_platdata *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = plat->reg; u32 sbr, osr, baud_diff, tmp_osr, tmp_sbr, tmp_diff, tmp; u32 clk; @@ -304,7 +304,7 @@ static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, static void _lpuart32_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_platdata(dev); + struct lpuart_serial_platdata *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = plat->reg; u32 clk; u32 sbr; @@ -386,7 +386,7 @@ static int _lpuart32_serial_tstc(struct lpuart_serial_platdata *plat) */ static int _lpuart32_serial_init(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev_get_platdata(dev); + struct lpuart_serial_platdata *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = (struct lpuart_fsl_reg32 *)plat->reg; u32 val, tx_fifo_size;

@@ -428,7 +428,7 @@ static int _lpuart32_serial_init(struct udevice *dev)

static int lpuart_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_platdata(dev); + struct lpuart_serial_platdata *plat = dev_get_plat(dev);

if (is_lpuart32(dev)) { if (plat->devtype == DEV_MX7ULP || plat->devtype == DEV_IMX8 || diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index 820a3e05bb0..24b37fb6498 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -142,7 +142,7 @@ static int coldfire_serial_pending(struct udevice *dev, bool input)

static int coldfire_ofdata_to_platdata(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev_get_platdata(dev); + struct coldfire_serial_platdata *plat = dev_get_plat(dev); fdt_addr_t addr_base;

addr_base = dev_read_addr(dev); diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index 690b7c69c8a..b1da8746450 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -32,7 +32,7 @@ struct mvebu_platdata {

static int mvebu_serial_putc(struct udevice *dev, const char ch) { - struct mvebu_platdata *plat = dev_get_platdata(dev); + struct mvebu_platdata *plat = dev_get_plat(dev); void __iomem *base = plat->base;

while (readl(base + UART_STATUS_REG) & UART_STATUS_TXFIFO_FULL) @@ -45,7 +45,7 @@ static int mvebu_serial_putc(struct udevice *dev, const char ch)

static int mvebu_serial_getc(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_platdata(dev); + struct mvebu_platdata *plat = dev_get_plat(dev); void __iomem *base = plat->base;

while (!(readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)) @@ -56,7 +56,7 @@ static int mvebu_serial_getc(struct udevice *dev)

static int mvebu_serial_pending(struct udevice *dev, bool input) { - struct mvebu_platdata *plat = dev_get_platdata(dev); + struct mvebu_platdata *plat = dev_get_plat(dev); void __iomem *base = plat->base;

if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY) @@ -67,7 +67,7 @@ static int mvebu_serial_pending(struct udevice *dev, bool input)

static int mvebu_serial_setbrg(struct udevice *dev, int baudrate) { - struct mvebu_platdata *plat = dev_get_platdata(dev); + struct mvebu_platdata *plat = dev_get_plat(dev); void __iomem *base = plat->base;

/* @@ -87,7 +87,7 @@ static int mvebu_serial_setbrg(struct udevice *dev, int baudrate)

static int mvebu_serial_probe(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_platdata(dev); + struct mvebu_platdata *plat = dev_get_plat(dev); void __iomem *base = plat->base;

/* reset FIFOs */ @@ -102,7 +102,7 @@ static int mvebu_serial_probe(struct udevice *dev)

static int mvebu_serial_ofdata_to_platdata(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_platdata(dev); + struct mvebu_platdata *plat = dev_get_plat(dev);

plat->base = dev_read_addr_ptr(dev);

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 3a876fe2f2a..5ca1c07b9d5 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -281,7 +281,7 @@ __weak struct serial_device *default_serial_console(void)

int pl01x_serial_setbrg(struct udevice *dev, int baudrate) { - struct pl01x_serial_platdata *plat = dev_get_platdata(dev); + struct pl01x_serial_platdata *plat = dev_get_plat(dev); struct pl01x_priv *priv = dev_get_priv(dev);

if (!plat->skip_init) { @@ -294,7 +294,7 @@ int pl01x_serial_setbrg(struct udevice *dev, int baudrate)

int pl01x_serial_probe(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_platdata(dev); + struct pl01x_serial_platdata *plat = dev_get_plat(dev); struct pl01x_priv *priv = dev_get_priv(dev);

priv->regs = (struct pl01x_regs *)plat->base; @@ -350,7 +350,7 @@ static const struct udevice_id pl01x_serial_id[] ={

int pl01x_serial_ofdata_to_platdata(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_platdata(dev); + struct pl01x_serial_platdata *plat = dev_get_plat(dev); struct clk clk; fdt_addr_t addr; int ret; diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index e00df4b21ad..930103a42cb 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -27,7 +27,7 @@ struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat;

static int rockchip_serial_probe(struct udevice *dev) { - struct rockchip_uart_platdata *plat = dev_get_platdata(dev); + struct rockchip_uart_platdata *plat = dev_get_plat(dev);

/* Create some new platform data for the standard driver */ plat->plat.base = plat->dtplat.reg[0]; diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index 0cac2b97404..d1f24bb27a2 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -169,7 +169,7 @@ static int sh_serial_getc(struct udevice *dev)

static int sh_serial_setbrg(struct udevice *dev, int baudrate) { - struct sh_serial_platdata *plat = dev_get_platdata(dev); + struct sh_serial_platdata *plat = dev_get_plat(dev); struct uart_port *priv = dev_get_priv(dev);

sh_serial_setbrg_generic(priv, plat->clk, baudrate); @@ -179,7 +179,7 @@ static int sh_serial_setbrg(struct udevice *dev, int baudrate)

static int sh_serial_probe(struct udevice *dev) { - struct sh_serial_platdata *plat = dev_get_platdata(dev); + struct sh_serial_platdata *plat = dev_get_plat(dev); struct uart_port *priv = dev_get_priv(dev);

priv->membase = (unsigned char *)plat->base; @@ -209,7 +209,7 @@ static const struct udevice_id sh_serial_id[] ={

static int sh_serial_ofdata_to_platdata(struct udevice *dev) { - struct sh_serial_platdata *plat = dev_get_platdata(dev); + struct sh_serial_platdata *plat = dev_get_plat(dev); struct clk sh_serial_clk; fdt_addr_t addr; int ret; diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index 276f0902dbf..e9d4d91b45f 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -105,7 +105,7 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate) { int ret; struct clk clk; - struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_plat(dev); u32 clock = 0;

ret = clk_get_by_index(dev, 0, &clk); @@ -131,7 +131,7 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate)

static int sifive_serial_probe(struct udevice *dev) { - struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_plat(dev);

/* No need to reinitialize the UART after relocation */ if (gd->flags & GD_FLG_RELOC) @@ -145,7 +145,7 @@ static int sifive_serial_probe(struct udevice *dev) static int sifive_serial_getc(struct udevice *dev) { int c; - struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_plat(dev); struct uart_sifive *regs = plat->regs;

while ((c = _sifive_serial_getc(regs)) == -EAGAIN) ; @@ -156,7 +156,7 @@ static int sifive_serial_getc(struct udevice *dev) static int sifive_serial_putc(struct udevice *dev, const char ch) { int rc; - struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_plat(dev);

while ((rc = _sifive_serial_putc(plat->regs, ch)) == -EAGAIN) ;

@@ -165,7 +165,7 @@ static int sifive_serial_putc(struct udevice *dev, const char ch)

static int sifive_serial_pending(struct udevice *dev, bool input) { - struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_plat(dev); struct uart_sifive *regs = plat->regs;

if (input) @@ -176,7 +176,7 @@ static int sifive_serial_pending(struct udevice *dev, bool input)

static int sifive_serial_ofdata_to_platdata(struct udevice *dev) { - struct sifive_uart_platdata *plat = dev_get_platdata(dev); + struct sifive_uart_platdata *plat = dev_get_plat(dev);

plat->regs = (struct uart_sifive *)dev_read_addr(dev); if (IS_ERR(plat->regs)) diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index 210b5b51394..9b56b2439ca 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -44,7 +44,7 @@ static void _stm32_serial_setbrg(fdt_addr_t base,

static int stm32_serial_setbrg(struct udevice *dev, int baudrate) { - struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); + struct stm32x7_serial_platdata *plat = dev_get_plat(dev);

_stm32_serial_setbrg(plat->base, plat->uart_info, plat->clock_rate, baudrate); @@ -54,7 +54,7 @@ static int stm32_serial_setbrg(struct udevice *dev, int baudrate)

static int stm32_serial_setconfig(struct udevice *dev, uint serial_config) { - struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); + struct stm32x7_serial_platdata *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; u8 uart_enable_bit = plat->uart_info->uart_enable_bit; u32 cr1 = plat->base + CR1_OFFSET(stm32f4); @@ -102,7 +102,7 @@ static int stm32_serial_setconfig(struct udevice *dev, uint serial_config)

static int stm32_serial_getc(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); + struct stm32x7_serial_platdata *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; fdt_addr_t base = plat->base; u32 isr = readl(base + ISR_OFFSET(stm32f4)); @@ -139,14 +139,14 @@ static int _stm32_serial_putc(fdt_addr_t base,

static int stm32_serial_putc(struct udevice *dev, const char c) { - struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); + struct stm32x7_serial_platdata *plat = dev_get_plat(dev);

return _stm32_serial_putc(plat->base, plat->uart_info, c); }

static int stm32_serial_pending(struct udevice *dev, bool input) { - struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); + struct stm32x7_serial_platdata *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; fdt_addr_t base = plat->base;

@@ -175,7 +175,7 @@ static void _stm32_serial_init(fdt_addr_t base,

static int stm32_serial_probe(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); + struct stm32x7_serial_platdata *plat = dev_get_plat(dev); struct clk clk; struct reset_ctl reset; int ret; @@ -219,7 +219,7 @@ static const struct udevice_id stm32_serial_id[] = {

static int stm32_serial_ofdata_to_platdata(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); + struct stm32x7_serial_platdata *plat = dev_get_plat(dev);

plat->base = dev_read_addr(dev); if (plat->base == FDT_ADDR_T_NONE) diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index eb76c7800e2..ea90fdbf384 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -54,7 +54,7 @@ static void uart_out32(void __iomem *addr, u32 val)

static int uartlite_serial_putc(struct udevice *dev, const char ch) { - struct uartlite_platdata *plat = dev_get_platdata(dev); + struct uartlite_platdata *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs;

if (uart_in32(&regs->status) & SR_TX_FIFO_FULL) @@ -67,7 +67,7 @@ static int uartlite_serial_putc(struct udevice *dev, const char ch)

static int uartlite_serial_getc(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_platdata(dev); + struct uartlite_platdata *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs;

if (!(uart_in32(&regs->status) & SR_RX_FIFO_VALID_DATA)) @@ -78,7 +78,7 @@ static int uartlite_serial_getc(struct udevice *dev)

static int uartlite_serial_pending(struct udevice *dev, bool input) { - struct uartlite_platdata *plat = dev_get_platdata(dev); + struct uartlite_platdata *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs;

if (input) @@ -89,7 +89,7 @@ static int uartlite_serial_pending(struct udevice *dev, bool input)

static int uartlite_serial_probe(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_platdata(dev); + struct uartlite_platdata *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs; int ret;

@@ -108,7 +108,7 @@ static int uartlite_serial_probe(struct udevice *dev)

static int uartlite_serial_ofdata_to_platdata(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_platdata(dev); + struct uartlite_platdata *plat = dev_get_plat(dev);

plat->regs = dev_read_addr_ptr(dev);

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 7984b61ce13..1bcdf8cb10b 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -107,7 +107,7 @@ static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c)

static int zynq_serial_setbrg(struct udevice *dev, int baudrate) { - struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_plat(dev); unsigned long clock;

int ret; @@ -139,7 +139,7 @@ static int zynq_serial_setbrg(struct udevice *dev, int baudrate)

static int zynq_serial_probe(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs; u32 val;

@@ -155,7 +155,7 @@ static int zynq_serial_probe(struct udevice *dev)

static int zynq_serial_getc(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs;

if (readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY) @@ -166,14 +166,14 @@ static int zynq_serial_getc(struct udevice *dev)

static int zynq_serial_putc(struct udevice *dev, const char ch) { - struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_plat(dev);

return _uart_zynq_serial_putc(plat->regs, ch); }

static int zynq_serial_pending(struct udevice *dev, bool input) { - struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs;

if (input) @@ -184,7 +184,7 @@ static int zynq_serial_pending(struct udevice *dev, bool input)

static int zynq_serial_ofdata_to_platdata(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_platdata(dev); + struct zynq_uart_platdata *plat = dev_get_plat(dev);

plat->regs = (struct uart_zynq *)dev_read_addr(dev); if (IS_ERR(plat->regs)) diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index 2ea91629779..cd7cf5b4fec 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -74,7 +74,7 @@ static const char *get_rev_string(u32 idreg)

static int soc_ti_k3_get_family(struct udevice *dev, char *buf, int size) { - struct soc_ti_k3_platdata *plat = dev_get_platdata(dev); + struct soc_ti_k3_platdata *plat = dev_get_plat(dev);

snprintf(buf, size, "%s", plat->family);

@@ -83,7 +83,7 @@ static int soc_ti_k3_get_family(struct udevice *dev, char *buf, int size)

static int soc_ti_k3_get_revision(struct udevice *dev, char *buf, int size) { - struct soc_ti_k3_platdata *plat = dev_get_platdata(dev); + struct soc_ti_k3_platdata *plat = dev_get_plat(dev);

snprintf(buf, size, "SR%s", plat->revision);

@@ -97,7 +97,7 @@ static const struct soc_ops soc_ti_k3_ops = {

int soc_ti_k3_probe(struct udevice *dev) { - struct soc_ti_k3_platdata *plat = dev_get_platdata(dev); + struct soc_ti_k3_platdata *plat = dev_get_plat(dev); u32 idreg; void *idreg_addr;

diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 8dbee04d11f..a4a29f80737 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -161,7 +161,7 @@ static int altera_spi_set_mode(struct udevice *bus, uint mode)

static int altera_spi_probe(struct udevice *bus) { - struct altera_spi_platdata *plat = dev_get_platdata(bus); + struct altera_spi_platdata *plat = dev_get_plat(bus); struct altera_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->regs; @@ -171,7 +171,7 @@ static int altera_spi_probe(struct udevice *bus)

static int altera_spi_ofdata_to_platdata(struct udevice *bus) { - struct altera_spi_platdata *plat = dev_get_platdata(bus); + struct altera_spi_platdata *plat = dev_get_plat(bus);

plat->regs = map_physmem(dev_read_addr(bus), sizeof(struct altera_spi_regs), diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index a192f935872..9795972993a 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -121,7 +121,7 @@ struct atmel_spi_priv { static int atmel_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); struct atmel_spi_priv *priv = dev_get_priv(bus); struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); struct at91_spi *reg_base = bus_plat->regs; @@ -161,7 +161,7 @@ static int atmel_spi_claim_bus(struct udevice *dev) static int atmel_spi_release_bus(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + struct atmel_spi_platdata *bus_plat = dev_get_plat(bus);

writel(ATMEL_SPI_CR_SPIDIS, &bus_plat->regs->cr);

@@ -202,7 +202,7 @@ static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); struct at91_spi *reg_base = bus_plat->regs;

u32 len_tx, len_rx, len; @@ -344,7 +344,7 @@ static int atmel_spi_enable_clk(struct udevice *bus)

static int atmel_spi_probe(struct udevice *bus) { - struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); + struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); int ret;

ret = atmel_spi_enable_clk(bus); diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c index da874760b73..83ca649f129 100644 --- a/drivers/spi/bcmstb_spi.c +++ b/drivers/spi/bcmstb_spi.c @@ -96,7 +96,7 @@ struct bcmstb_spi_priv {

static int bcmstb_spi_ofdata_to_platdata(struct udevice *bus) { - struct bcmstb_spi_platdata *plat = dev_get_platdata(bus); + struct bcmstb_spi_platdata *plat = dev_get_plat(bus); const void *fdt = gd->fdt_blob; int node = dev_of_offset(bus); int ret = 0; @@ -159,7 +159,7 @@ static void bcmstb_spi_clear_interrupt(void *base, u32 mask)

static int bcmstb_spi_probe(struct udevice *bus) { - struct bcmstb_spi_platdata *plat = dev_get_platdata(bus); + struct bcmstb_spi_platdata *plat = dev_get_plat(bus); struct bcmstb_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->base[HIF_MSPI]; diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index e17c37916f7..68dec34afc4 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -343,7 +343,7 @@ static int coldfire_spi_set_mode(struct udevice *bus, uint mode)

static int coldfire_spi_probe(struct udevice *bus) { - struct coldfire_spi_platdata *plat = dev_get_platdata(bus); + struct coldfire_spi_platdata *plat = dev_get_plat(bus); struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; int i; diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 390fbcf4b6e..99069097497 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -263,7 +263,7 @@ static int dw_spi_reset(struct udevice *bus)

static int dw_spi_probe(struct udevice *bus) { - struct dw_spi_platdata *plat = dev_get_platdata(bus); + struct dw_spi_platdata *plat = dev_get_plat(bus); struct dw_spi_priv *priv = dev_get_priv(bus); int ret;

diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 2d1602c9cb0..04737368bd4 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -213,7 +213,7 @@ static int spi_rx_tx(struct exynos_spi_priv *priv, int todo, static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_platdata(bus); + struct exynos_spi_platdata *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -239,7 +239,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_platdata(bus); + struct exynos_spi_platdata *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

setbits_le32(&priv->regs->cs_reg, SPI_SLAVE_SIG_INACT); @@ -280,7 +280,7 @@ static int exynos_spi_ofdata_to_platdata(struct udevice *bus)

static int exynos_spi_probe(struct udevice *bus) { - struct exynos_spi_platdata *plat = dev_get_platdata(bus); + struct exynos_spi_platdata *plat = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->regs; diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index fe10ad4f8d1..c91530cd930 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -481,7 +481,7 @@ static int fsl_dspi_child_pre_probe(struct udevice *dev)

static int fsl_dspi_probe(struct udevice *bus) { - struct fsl_dspi_platdata *plat = dev_get_platdata(bus); + struct fsl_dspi_platdata *plat = dev_get_plat(bus); struct fsl_dspi_priv *priv = dev_get_priv(bus); struct dm_spi_bus *dm_spi_bus; uint mcr_cfg_val; diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index 43bf8d557c3..7061bd23494 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -520,7 +520,7 @@ static int fsl_espi_child_pre_probe(struct udevice *dev)

static int fsl_espi_probe(struct udevice *bus) { - struct fsl_espi_platdata *plat = dev_get_platdata(bus); + struct fsl_espi_platdata *plat = dev_get_plat(bus); struct fsl_spi_slave *fsl = dev_get_priv(bus);

fsl->espi = (ccsr_espi_t *)((u32)plat->regs_addr); diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 0ee691de2b1..b42b536ac31 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -264,7 +264,7 @@ static int ich_spi_exec_op_swseq(struct spi_slave *slave, const struct spi_mem_op *op) { struct udevice *bus = dev_get_parent(slave->dev); - struct ich_spi_platdata *plat = dev_get_platdata(bus); + struct ich_spi_platdata *plat = dev_get_plat(bus); struct ich_spi_priv *ctlr = dev_get_priv(bus); uint16_t control; int16_t opcode_index; @@ -602,7 +602,7 @@ static int ich_spi_exec_op_hwseq(struct spi_slave *slave, static int ich_spi_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) { struct udevice *bus = dev_get_parent(slave->dev); - struct ich_spi_platdata *plat = dev_get_platdata(bus); + struct ich_spi_platdata *plat = dev_get_plat(bus); int ret;

bootstage_start(BOOTSTAGE_ID_ACCUM_SPI, "fast_spi"); @@ -706,7 +706,7 @@ static int ich_get_mmap_bus(struct udevice *bus, ulong *map_basep, offsetp); } #else - struct ich_spi_platdata *plat = dev_get_platdata(bus); + struct ich_spi_platdata *plat = dev_get_plat(bus);

/* * We cannot rely on plat->bdf being set up yet since this method can @@ -758,7 +758,7 @@ static int ich_spi_adjust_size(struct spi_slave *slave, struct spi_mem_op *op)

static int ich_protect_lockdown(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_platdata(dev); + struct ich_spi_platdata *plat = dev_get_plat(dev); struct ich_spi_priv *priv = dev_get_priv(dev); int ret = -ENOSYS;

@@ -792,7 +792,7 @@ static int ich_init_controller(struct udevice *dev, struct ich_spi_priv *ctlr) { if (spl_phase() == PHASE_TPL) { - struct ich_spi_platdata *plat = dev_get_platdata(dev); + struct ich_spi_platdata *plat = dev_get_plat(dev); int ret;

ret = fast_spi_early_init(plat->bdf, plat->mmio_base); @@ -871,7 +871,7 @@ static int ich_cache_bios_region(struct udevice *dev)

static int ich_spi_probe(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_platdata(dev); + struct ich_spi_platdata *plat = dev_get_plat(dev); struct ich_spi_priv *priv = dev_get_priv(dev); int ret;

@@ -924,7 +924,7 @@ static int ich_spi_set_mode(struct udevice *bus, uint mode) static int ich_spi_child_pre_probe(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct ich_spi_platdata *plat = dev_get_platdata(bus); + struct ich_spi_platdata *plat = dev_get_plat(bus); struct ich_spi_priv *priv = dev_get_priv(bus); struct spi_slave *slave = dev_get_parent_priv(dev);

@@ -947,7 +947,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev)

static int ich_spi_ofdata_to_platdata(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_platdata(dev); + struct ich_spi_platdata *plat = dev_get_plat(dev);

#if !CONFIG_IS_ENABLED(OF_PLATDATA) struct ich_spi_priv *priv = dev_get_priv(dev); diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index e8617f4a9c7..9e0a1bb83c6 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -109,7 +109,7 @@ static int _spi_xfer(struct kwspi_registers *reg, unsigned int bitlen,

static int mvebu_spi_set_speed(struct udevice *bus, uint hz) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data;

@@ -127,7 +127,7 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz)

static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data;

@@ -160,7 +160,7 @@ static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode)

static int mvebu_spi_set_mode(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data = readl(&reg->cfg);

@@ -185,7 +185,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus);

return _spi_xfer(plat->spireg, bitlen, dout, din, flags); } @@ -198,7 +198,7 @@ __attribute__((weak)) int mvebu_board_spi_claim_bus(struct udevice *dev) static int mvebu_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus);

/* Configure the chip-select in the CTRL register */ clrsetbits_le32(&plat->spireg->ctrl, @@ -220,7 +220,7 @@ static int mvebu_spi_release_bus(struct udevice *dev)

static int mvebu_spi_probe(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg;

writel(KWSPI_SMEMRDY, &reg->ctrl); @@ -232,7 +232,7 @@ static int mvebu_spi_probe(struct udevice *bus)

static int mvebu_spi_ofdata_to_platdata(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); const struct mvebu_spi_dev *drvdata = (struct mvebu_spi_dev *)dev_get_driver_data(bus);

diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index eddb0114802..3c4523a5085 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -146,7 +146,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; unsigned int bytelen; int ret; @@ -186,7 +186,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int mvebu_spi_set_speed(struct udevice *bus, uint hz) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; u32 data, prescale;

@@ -207,7 +207,7 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz)

static int mvebu_spi_set_mode(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg;

/* @@ -229,7 +229,7 @@ static int mvebu_spi_set_mode(struct udevice *bus, uint mode)

static int mvebu_spi_probe(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; u32 data; int ret; @@ -281,7 +281,7 @@ static int mvebu_spi_probe(struct udevice *bus)

static int mvebu_spi_ofdata_to_platdata(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus); int ret;

plat->spireg = dev_read_addr_ptr(bus); @@ -297,7 +297,7 @@ static int mvebu_spi_ofdata_to_platdata(struct udevice *bus)

static int mvebu_spi_remove(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_platdata(bus); + struct mvebu_spi_platdata *plat = dev_get_plat(bus);

clk_free(&plat->clk);

diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index fcac5a570e3..af476c8c996 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -512,7 +512,7 @@ void spi_release_bus(struct spi_slave *slave)

static int mxc_spi_probe(struct udevice *bus) { - struct mxc_spi_slave *mxcs = dev_get_platdata(bus); + struct mxc_spi_slave *mxcs = dev_get_plat(bus); int node = dev_of_offset(bus); const void *blob = gd->fdt_blob; int ret; @@ -550,7 +550,7 @@ static int mxc_spi_probe(struct udevice *bus) static int mxc_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct mxc_spi_slave *mxcs = dev_get_platdata(dev->parent); + struct mxc_spi_slave *mxcs = dev_get_plat(dev->parent);

return mxc_spi_xfer_internal(mxcs, bitlen, dout, din, flags); @@ -558,7 +558,7 @@ static int mxc_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int mxc_spi_claim_bus(struct udevice *dev) { - struct mxc_spi_slave *mxcs = dev_get_platdata(dev->parent); + struct mxc_spi_slave *mxcs = dev_get_plat(dev->parent); struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev);

mxcs->dev = dev; @@ -579,7 +579,7 @@ static int mxc_spi_set_speed(struct udevice *bus, uint speed)

static int mxc_spi_set_mode(struct udevice *bus, uint mode) { - struct mxc_spi_slave *mxcs = dev_get_platdata(bus); + struct mxc_spi_slave *mxcs = dev_get_plat(bus);

mxcs->mode = mode; mxcs->ss_pol = (mode & SPI_CS_HIGH) ? 1 : 0; diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 06ab1072899..3f7aade81f0 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -311,7 +311,7 @@ int mxs_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int mxs_spi_probe(struct udevice *bus) { - struct mxs_spi_platdata *plat = dev_get_platdata(bus); + struct mxs_spi_platdata *plat = dev_get_plat(bus); struct mxs_spi_priv *priv = dev_get_priv(bus); int ret;

diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index dc277aae01b..ea722e47604 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -414,7 +414,7 @@ static int omap3_spi_set_wordlen(struct udevice *dev, unsigned int wordlen) static int omap3_spi_probe(struct udevice *dev) { struct omap3_spi_priv *priv = dev_get_priv(dev); - struct omap3_spi_plat *plat = dev_get_platdata(dev); + struct omap3_spi_plat *plat = dev_get_plat(dev);

priv->regs = plat->regs; priv->pin_dir = plat->pin_dir; @@ -482,7 +482,7 @@ static int omap3_spi_ofdata_to_platdata(struct udevice *dev) { struct omap2_mcspi_platform_config *data = (struct omap2_mcspi_platform_config *)dev_get_driver_data(dev); - struct omap3_spi_plat *plat = dev_get_platdata(dev); + struct omap3_spi_plat *plat = dev_get_plat(dev);

plat->regs = (struct mcspi *)(dev_read_addr(dev) + data->regs_offset);

diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c index 712385bcc9f..3d1420381d9 100644 --- a/drivers/spi/pl022_spi.c +++ b/drivers/spi/pl022_spi.c @@ -89,7 +89,7 @@ static int pl022_is_supported(struct pl022_spi_slave *ps)

static int pl022_spi_probe(struct udevice *bus) { - struct pl022_spi_pdata *plat = dev_get_platdata(bus); + struct pl022_spi_pdata *plat = dev_get_plat(bus); struct pl022_spi_slave *ps = dev_get_priv(bus);

ps->base = ioremap(plat->addr, plat->size); diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 275fa431036..87d6e4897fe 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -406,7 +406,7 @@ static int rpc_spi_bind(struct udevice *parent)

static int rpc_spi_probe(struct udevice *dev) { - struct rpc_spi_platdata *plat = dev_get_platdata(dev); + struct rpc_spi_platdata *plat = dev_get_plat(dev); struct rpc_spi_priv *priv = dev_get_priv(dev);

priv->regs = plat->regs; @@ -419,7 +419,7 @@ static int rpc_spi_probe(struct udevice *dev)

static int rpc_spi_ofdata_to_platdata(struct udevice *bus) { - struct rpc_spi_platdata *plat = dev_get_platdata(bus); + struct rpc_spi_platdata *plat = dev_get_plat(bus);

plat->regs = dev_read_addr_index(bus, 0); plat->extr = dev_read_addr_index(bus, 1); diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index aed1db35dfc..697f50f408f 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -194,7 +194,7 @@ static int conv_of_platdata(struct udevice *dev) static int rockchip_spi_ofdata_to_platdata(struct udevice *bus) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rockchip_spi_platdata *plat = dev_get_platdata(bus); + struct rockchip_spi_platdata *plat = dev_get_plat(bus); struct rockchip_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -252,7 +252,7 @@ static int rockchip_spi_calc_modclk(ulong max_freq)

static int rockchip_spi_probe(struct udevice *bus) { - struct rockchip_spi_platdata *plat = dev_get_platdata(bus); + struct rockchip_spi_platdata *plat = dev_get_plat(bus); struct rockchip_spi_priv *priv = dev_get_priv(bus); int ret;

diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c index 5908e287e5c..dd732dcc2f4 100644 --- a/drivers/spi/sh_qspi.c +++ b/drivers/spi/sh_qspi.c @@ -302,7 +302,7 @@ static int sh_qspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev->parent; - struct sh_qspi_slave *ss = dev_get_platdata(bus); + struct sh_qspi_slave *ss = dev_get_plat(bus);

return sh_qspi_xfer_common(ss, bitlen, dout, din, flags); } @@ -321,7 +321,7 @@ static int sh_qspi_set_mode(struct udevice *dev, uint mode)

static int sh_qspi_probe(struct udevice *dev) { - struct sh_qspi_slave *ss = dev_get_platdata(dev); + struct sh_qspi_slave *ss = dev_get_plat(dev);

sh_qspi_init(ss);

@@ -330,7 +330,7 @@ static int sh_qspi_probe(struct udevice *dev)

static int sh_qspi_ofdata_to_platdata(struct udevice *dev) { - struct sh_qspi_slave *plat = dev_get_platdata(dev); + struct sh_qspi_slave *plat = dev_get_plat(dev);

plat->regs = (struct sh_qspi_regs *)dev_read_addr(dev);

diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index c7ed23aa5dd..1967134d418 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -41,7 +41,7 @@ struct soft_spi_priv { static int soft_spi_scl(struct udevice *dev, int bit) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_platdata(bus); + struct soft_spi_platdata *plat = dev_get_plat(bus);

dm_gpio_set_value(&plat->sclk, bit);

@@ -51,7 +51,7 @@ static int soft_spi_scl(struct udevice *dev, int bit) static int soft_spi_sda(struct udevice *dev, int bit) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_platdata(bus); + struct soft_spi_platdata *plat = dev_get_plat(bus);

dm_gpio_set_value(&plat->mosi, bit);

@@ -62,7 +62,7 @@ static int soft_spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); struct soft_spi_priv *priv = dev_get_priv(bus); - struct soft_spi_platdata *plat = dev_get_platdata(bus); + struct soft_spi_platdata *plat = dev_get_plat(bus); int cidle = !!(priv->mode & SPI_CPOL);

dm_gpio_set_value(&plat->cs, 0); @@ -75,7 +75,7 @@ static int soft_spi_cs_activate(struct udevice *dev) static int soft_spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_platdata(bus); + struct soft_spi_platdata *plat = dev_get_plat(bus);

dm_gpio_set_value(&plat->cs, 0);

@@ -117,7 +117,7 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct soft_spi_priv *priv = dev_get_priv(bus); - struct soft_spi_platdata *plat = dev_get_platdata(bus); + struct soft_spi_platdata *plat = dev_get_plat(bus); uchar tmpdin = 0; uchar tmpdout = 0; const u8 *txd = dout; diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index 5b6c7202ba8..8ee8c90d276 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -407,7 +407,7 @@ static int sun4i_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int sun4i_spi_set_speed(struct udevice *dev, uint speed) { - struct sun4i_spi_platdata *plat = dev_get_platdata(dev); + struct sun4i_spi_platdata *plat = dev_get_plat(dev); struct sun4i_spi_priv *priv = dev_get_priv(dev); unsigned int div; u32 reg; @@ -483,7 +483,7 @@ static const struct dm_spi_ops sun4i_spi_ops = {

static int sun4i_spi_probe(struct udevice *bus) { - struct sun4i_spi_platdata *plat = dev_get_platdata(bus); + struct sun4i_spi_platdata *plat = dev_get_plat(bus); struct sun4i_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -516,7 +516,7 @@ static int sun4i_spi_probe(struct udevice *bus)

static int sun4i_spi_ofdata_to_platdata(struct udevice *bus) { - struct sun4i_spi_platdata *plat = dev_get_platdata(bus); + struct sun4i_spi_platdata *plat = dev_get_plat(bus); int node = dev_of_offset(bus);

plat->base = dev_read_addr(bus); diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index ed80126cebf..e6cca9ad898 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -124,7 +124,7 @@ static int tegra114_spi_ofdata_to_platdata(struct udevice *bus)

static int tegra114_spi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_platdata(bus); + struct tegra_spi_platdata *plat = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus); struct spi_regs *regs; ulong rate; @@ -181,7 +181,7 @@ static int tegra114_spi_probe(struct udevice *bus) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -205,7 +205,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus);

setbits_le32(&priv->regs->command1, SPI_CMD1_CS_SW_VAL); diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 5303c34af5d..4360459792d 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -116,7 +116,7 @@ static int tegra20_sflash_ofdata_to_platdata(struct udevice *bus)

static int tegra20_sflash_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_platdata(bus); + struct tegra_spi_platdata *plat = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus);

priv->regs = (struct spi_regs *)plat->base; @@ -173,7 +173,7 @@ static int tegra20_sflash_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -192,7 +192,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus);

/* CS is negated on Tegra, so drive a 0 to get a 1 */ diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index a54990d0e13..2bb387ff243 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -122,7 +122,7 @@ static int tegra30_spi_ofdata_to_platdata(struct udevice *bus)

static int tegra30_spi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_platdata(bus); + struct tegra_spi_platdata *plat = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus);

priv->regs = (struct spi_regs *)plat->base; @@ -167,7 +167,7 @@ static int tegra30_spi_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -186,7 +186,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus);

/* CS is negated on Tegra, so drive a 0 to get a 1 */ diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 9579275698e..2107d69f183 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -125,7 +125,7 @@ static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus)

static int tegra210_qspi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_platdata(bus); + struct tegra_spi_platdata *plat = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus);

priv->regs = (struct qspi_regs *)plat->base; @@ -174,7 +174,7 @@ static int tegra210_qspi_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -198,7 +198,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_platdata(bus); + struct tegra_spi_platdata *pdata = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus);

setbits_le32(&priv->regs->command1, QSPI_CMD1_CS_SW_VAL); diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index 02bcc0a7dac..6d9fd3fbd8b 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -383,7 +383,7 @@ static int uniphier_spi_ofdata_to_platdata(struct udevice *bus)

static int uniphier_spi_probe(struct udevice *bus) { - struct uniphier_spi_platdata *plat = dev_get_platdata(bus); + struct uniphier_spi_platdata *plat = dev_get_plat(bus); struct uniphier_spi_priv *priv = dev_get_priv(bus);

priv->base = plat->base; diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index c2d9b8938bc..ec873e12fc4 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -171,7 +171,7 @@ static void zynq_qspi_init_hw(struct zynq_qspi_priv *priv)

static int zynq_qspi_probe(struct udevice *bus) { - struct zynq_qspi_platdata *plat = dev_get_platdata(bus); + struct zynq_qspi_platdata *plat = dev_get_plat(bus); struct zynq_qspi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index daecaa75e60..fb61a9a2564 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -121,7 +121,7 @@ static void zynq_spi_init_hw(struct zynq_spi_priv *priv)

static int zynq_spi_probe(struct udevice *bus) { - struct zynq_spi_platdata *plat = dev_get_platdata(bus); + struct zynq_spi_platdata *plat = dev_get_plat(bus); struct zynq_spi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index e4ab5d622cc..07e84da50d4 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -333,7 +333,7 @@ static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed)

static int zynqmp_qspi_probe(struct udevice *bus) { - struct zynqmp_qspi_platdata *plat = dev_get_platdata(bus); + struct zynqmp_qspi_platdata *plat = dev_get_plat(bus); struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 768a0d1a0fa..e51ce1be59f 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -30,7 +30,7 @@ struct x86_sysreset_platdata { */ int pch_sysreset_power_off(struct udevice *dev) { - struct x86_sysreset_platdata *plat = dev_get_platdata(dev); + struct x86_sysreset_platdata *plat = dev_get_plat(dev); struct pch_pmbase_info pm; u32 reg32; int ret; @@ -130,7 +130,7 @@ void __efi_runtime EFIAPI efi_reset_system(

static int x86_sysreset_probe(struct udevice *dev) { - struct x86_sysreset_platdata *plat = dev_get_platdata(dev); + struct x86_sysreset_platdata *plat = dev_get_plat(dev);

/* Locate the PCH if there is one. It isn't essential */ uclass_first_device(UCLASS_PCH, &plat->pch); diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 378df936d27..61af5ac0acf 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -297,7 +297,7 @@ static u32 call_err_to_res(u32 call_err)

static u32 do_call_with_arg(struct udevice *dev, struct optee_msg_arg *arg) { - struct optee_pdata *pdata = dev_get_platdata(dev); + struct optee_pdata *pdata = dev_get_plat(dev); struct rpc_param param = { .a0 = OPTEE_SMC_CALL_WITH_ARG }; void *page_list = NULL;

@@ -609,7 +609,7 @@ static optee_invoke_fn *get_invoke_func(struct udevice *dev)

static int optee_ofdata_to_platdata(struct udevice *dev) { - struct optee_pdata *pdata = dev_get_platdata(dev); + struct optee_pdata *pdata = dev_get_plat(dev);

pdata->invoke_fn = get_invoke_func(dev); if (IS_ERR(pdata->invoke_fn)) @@ -620,7 +620,7 @@ static int optee_ofdata_to_platdata(struct udevice *dev)

static int optee_probe(struct udevice *dev) { - struct optee_pdata *pdata = dev_get_platdata(dev); + struct optee_pdata *pdata = dev_get_plat(dev); u32 sec_caps;

if (!is_optee_api(pdata->invoke_fn)) { diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c index 0c2a8ea244e..00058002019 100644 --- a/drivers/thermal/imx_scu_thermal.c +++ b/drivers/thermal/imx_scu_thermal.c @@ -33,7 +33,7 @@ static int read_temperature(struct udevice *dev, int *temp)

sc_rsrc_t *sensor_rsrc = (sc_rsrc_t *)dev_get_driver_data(dev);

- struct imx_sc_thermal_plat *pdata = dev_get_platdata(dev); + struct imx_sc_thermal_plat *pdata = dev_get_plat(dev);

if (!temp) return -EINVAL; @@ -52,7 +52,7 @@ static int read_temperature(struct udevice *dev, int *temp)

int imx_sc_thermal_get_temp(struct udevice *dev, int *temp) { - struct imx_sc_thermal_plat *pdata = dev_get_platdata(dev); + struct imx_sc_thermal_plat *pdata = dev_get_plat(dev); int cpu_temp = 0; int ret;

@@ -89,7 +89,7 @@ static int imx_sc_thermal_probe(struct udevice *dev)

static int imx_sc_thermal_bind(struct udevice *dev) { - struct imx_sc_thermal_plat *pdata = dev_get_platdata(dev); + struct imx_sc_thermal_plat *pdata = dev_get_plat(dev); int reg, ret; int offset; const char *name; @@ -128,7 +128,7 @@ static int imx_sc_thermal_bind(struct udevice *dev)

static int imx_sc_thermal_ofdata_to_platdata(struct udevice *dev) { - struct imx_sc_thermal_plat *pdata = dev_get_platdata(dev); + struct imx_sc_thermal_plat *pdata = dev_get_plat(dev); struct fdtdec_phandle_args args; const char *type; int ret; diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 8898268a574..2f6343e7a18 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -52,7 +52,7 @@ static int read_cpu_temperature(struct udevice *dev) { int temperature; unsigned int reg, n_meas; - const struct imx_thermal_plat *pdata = dev_get_platdata(dev); + const struct imx_thermal_plat *pdata = dev_get_plat(dev); struct anatop_regs *anatop = (struct anatop_regs *)pdata->regs; struct thermal_data *priv = dev_get_priv(dev); u32 fuse = priv->fuse; @@ -237,7 +237,7 @@ static int imx_thermal_probe(struct udevice *dev) { unsigned int fuse = ~0;

- const struct imx_thermal_plat *pdata = dev_get_platdata(dev); + const struct imx_thermal_plat *pdata = dev_get_plat(dev); struct thermal_data *priv = dev_get_priv(dev);

/* Read Temperature calibration data fuse */ diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c index 77e3b3c201a..1bd0340410a 100644 --- a/drivers/thermal/imx_tmu.c +++ b/drivers/thermal/imx_tmu.c @@ -126,7 +126,7 @@ struct imx_tmu_plat {

static int read_temperature(struct udevice *dev, int *temp) { - struct imx_tmu_plat *pdata = dev_get_platdata(dev); + struct imx_tmu_plat *pdata = dev_get_plat(dev); ulong drv_data = dev_get_driver_data(dev); u32 val; u32 retry = 10; @@ -175,7 +175,7 @@ static int read_temperature(struct udevice *dev, int *temp)

int imx_tmu_get_temp(struct udevice *dev, int *temp) { - struct imx_tmu_plat *pdata = dev_get_platdata(dev); + struct imx_tmu_plat *pdata = dev_get_plat(dev); int cpu_tmp = 0; int ret;

@@ -206,7 +206,7 @@ static int imx_tmu_calibration(struct udevice *dev) int i, val, len, ret; u32 range[4]; const fdt32_t *calibration; - struct imx_tmu_plat *pdata = dev_get_platdata(dev); + struct imx_tmu_plat *pdata = dev_get_plat(dev); ulong drv_data = dev_get_driver_data(dev);

debug("%s\n", __func__); @@ -248,7 +248,7 @@ void __weak imx_tmu_arch_init(void *reg_base)

static void imx_tmu_init(struct udevice *dev) { - struct imx_tmu_plat *pdata = dev_get_platdata(dev); + struct imx_tmu_plat *pdata = dev_get_plat(dev); ulong drv_data = dev_get_driver_data(dev);

debug("%s\n", __func__); @@ -282,7 +282,7 @@ static void imx_tmu_init(struct udevice *dev)

static int imx_tmu_enable_msite(struct udevice *dev) { - struct imx_tmu_plat *pdata = dev_get_platdata(dev); + struct imx_tmu_plat *pdata = dev_get_plat(dev); ulong drv_data = dev_get_driver_data(dev); u32 reg;

@@ -338,7 +338,7 @@ static int imx_tmu_enable_msite(struct udevice *dev)

static int imx_tmu_bind(struct udevice *dev) { - struct imx_tmu_plat *pdata = dev_get_platdata(dev); + struct imx_tmu_plat *pdata = dev_get_plat(dev); int ret; ofnode node, offset; const char *name; @@ -370,7 +370,7 @@ static int imx_tmu_bind(struct udevice *dev)

static int imx_tmu_parse_fdt(struct udevice *dev) { - struct imx_tmu_plat *pdata = dev_get_platdata(dev), *p_parent_data; + struct imx_tmu_plat *pdata = dev_get_plat(dev), *p_parent_data; struct ofnode_phandle_args args; ofnode trips_np; int ret; @@ -385,7 +385,7 @@ static int imx_tmu_parse_fdt(struct udevice *dev) return 0; }

- p_parent_data = dev_get_platdata(dev->parent); + p_parent_data = dev_get_plat(dev->parent); if (p_parent_data->zone_node) pdata->regs = p_parent_data->regs;

@@ -430,7 +430,7 @@ static int imx_tmu_parse_fdt(struct udevice *dev)

static int imx_tmu_probe(struct udevice *dev) { - struct imx_tmu_plat *pdata = dev_get_platdata(dev); + struct imx_tmu_plat *pdata = dev_get_plat(dev); int ret;

ret = imx_tmu_parse_fdt(dev); diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c index a73a8c09b59..d500ba1101d 100644 --- a/drivers/timer/ag101p_timer.c +++ b/drivers/timer/ag101p_timer.c @@ -90,7 +90,7 @@ static int atftmr_timer_probe(struct udevice *dev)

static int atftme_timer_ofdata_to_platdata(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev_get_platdata(dev); + struct atftmr_timer_platdata *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct atftmr_timer_regs), MAP_NOCACHE); diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index 4579717ee5d..1daa0eac5c1 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -65,7 +65,7 @@ static int altera_timer_probe(struct udevice *dev)

static int altera_timer_ofdata_to_platdata(struct udevice *dev) { - struct altera_timer_platdata *plat = dev_get_platdata(dev); + struct altera_timer_platdata *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_timer_regs), diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c index 61a04fc9fc0..47185a8fd26 100644 --- a/drivers/timer/atcpit100_timer.c +++ b/drivers/timer/atcpit100_timer.c @@ -70,7 +70,7 @@ struct atcpit_timer_platdata {

static u64 atcpit_timer_get_count(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_platdata(dev); + struct atcpit_timer_platdata *plat = dev_get_plat(dev); u32 val; val = ~(REG32_TMR(CH_CNT(1))+0xffffffff); return timer_conv_64(val); @@ -78,7 +78,7 @@ static u64 atcpit_timer_get_count(struct udevice *dev)

static int atcpit_timer_probe(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_platdata(dev); + struct atcpit_timer_platdata *plat = dev_get_plat(dev); REG32_TMR(CH_REL(1)) = 0xffffffff; REG32_TMR(CH_CTL(1)) = APB_CLK|TMR_32; REG32_TMR(CH_EN) |= CH_TMR_EN(1 , 0); @@ -87,7 +87,7 @@ static int atcpit_timer_probe(struct udevice *dev)

static int atcpit_timer_ofdata_to_platdata(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_platdata(dev); + struct atcpit_timer_platdata *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), 0x100 , MAP_NOCACHE); return 0; } diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index 226c680a797..d88a05a201f 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -27,7 +27,7 @@ struct atmel_pit_platdata {

static u64 atmel_pit_get_count(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_platdata(dev); + struct atmel_pit_platdata *plat = dev_get_plat(dev); struct atmel_pit_regs *const regs = plat->regs; u32 val = readl(&regs->value_image);

@@ -36,7 +36,7 @@ static u64 atmel_pit_get_count(struct udevice *dev)

static int atmel_pit_probe(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_platdata(dev); + struct atmel_pit_platdata *plat = dev_get_plat(dev); struct atmel_pit_regs *const regs = plat->regs; struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct clk clk; @@ -60,7 +60,7 @@ static int atmel_pit_probe(struct udevice *dev)

static int atmel_pit_ofdata_to_platdata(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_platdata(dev); + struct atmel_pit_platdata *plat = dev_get_plat(dev);

plat->regs = dev_read_addr_ptr(dev);

diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c index 51ce52f72b6..8b727b652a2 100644 --- a/drivers/timer/rockchip_timer.c +++ b/drivers/timer/rockchip_timer.c @@ -139,7 +139,7 @@ static int rockchip_timer_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct rockchip_timer_priv *priv = dev_get_priv(dev); - struct rockchip_timer_plat *plat = dev_get_platdata(dev); + struct rockchip_timer_plat *plat = dev_get_plat(dev);

priv->timer = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]); uc_priv->clock_rate = plat->dtd.clock_frequency; diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c index b9dbe825215..f0de8a65b09 100644 --- a/drivers/tpm/tpm_tis_st33zp24_spi.c +++ b/drivers/tpm/tpm_tis_st33zp24_spi.c @@ -116,7 +116,7 @@ static int st33zp24_spi_write(struct udevice *dev, u8 tpm_register, { int total_length = 0, ret; struct spi_slave *slave = dev_get_parent_priv(dev); - struct st33zp24_spi_phy *phy = dev_get_platdata(dev); + struct st33zp24_spi_phy *phy = dev_get_plat(dev);

u8 *tx_buf = (u8 *)phy->tx_buf; u8 *rx_buf = phy->rx_buf; @@ -167,7 +167,7 @@ static u8 st33zp24_spi_read8_reg(struct udevice *dev, u8 tpm_register, { int total_length = 0, ret; struct spi_slave *slave = dev_get_parent_priv(dev); - struct st33zp24_spi_phy *phy = dev_get_platdata(dev); + struct st33zp24_spi_phy *phy = dev_get_plat(dev);

u8 *tx_buf = (u8 *)phy->tx_buf; u8 *rx_buf = phy->rx_buf; @@ -223,7 +223,7 @@ static int st33zp24_spi_evaluate_latency(struct udevice *dev) { int latency = 1, status = 0; u8 data = 0; - struct st33zp24_spi_phy *phy = dev_get_platdata(dev); + struct st33zp24_spi_phy *phy = dev_get_plat(dev);

while (!status && latency < MAX_SPI_LATENCY) { phy->latency = latency; @@ -562,7 +562,7 @@ static int st33zp24_spi_cleanup(struct udevice *dev) static int st33zp24_spi_init(struct udevice *dev) { struct tpm_chip *chip = dev_get_priv(dev); - struct st33zp24_spi_phy *phy = dev_get_platdata(dev); + struct st33zp24_spi_phy *phy = dev_get_plat(dev);

chip->is_open = 1;

diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index 75f40e1249f..7b205c56567 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -87,7 +87,7 @@ static inline void cdns_ti_writel(struct cdns_ti *data, u32 offset, u32 value)

static int cdns_ti_probe(struct udevice *dev) { - struct cdns_ti *data = dev_get_platdata(dev); + struct cdns_ti *data = dev_get_plat(dev); struct clk usb2_refclk; int modestrap_mode; unsigned long rate; @@ -167,7 +167,7 @@ static int cdns_ti_probe(struct udevice *dev)

static int cdns_ti_remove(struct udevice *dev) { - struct cdns_ti *data = dev_get_platdata(dev); + struct cdns_ti *data = dev_get_plat(dev); u32 reg;

/* put device back to RESET*/ diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 1755289473b..0bfdaa0b075 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -53,9 +53,9 @@ static int dwc3_generic_probe(struct udevice *dev, struct dwc3_generic_priv *priv) { int rc; - struct dwc3_generic_plat *plat = dev_get_platdata(dev); + struct dwc3_generic_plat *plat = dev_get_plat(dev); struct dwc3 *dwc3 = &priv->dwc3; - struct dwc3_glue_data *glue = dev_get_platdata(dev->parent); + struct dwc3_glue_data *glue = dev_get_plat(dev->parent);

dwc3->dev = dev; dwc3->maximum_speed = plat->maximum_speed; @@ -107,7 +107,7 @@ static int dwc3_generic_remove(struct udevice *dev,

static int dwc3_generic_ofdata_to_platdata(struct udevice *dev) { - struct dwc3_generic_plat *plat = dev_get_platdata(dev); + struct dwc3_generic_plat *plat = dev_get_plat(dev); ofnode node = dev->node;

plat->base = dev_read_addr(dev); @@ -238,7 +238,7 @@ enum dwc3_omap_utmi_mode { u32 utmi_mode; u32 utmi_status_offset = USBOTGSS_UTMI_OTG_STATUS;

- struct dwc3_glue_data *glue = dev_get_platdata(dev); + struct dwc3_glue_data *glue = dev_get_plat(dev); void *base = map_physmem(glue->regs, 0x10000, MAP_NOCACHE);

if (device_is_compatible(dev, "ti,am437x-dwc3")) @@ -390,7 +390,7 @@ static int dwc3_glue_clk_init(struct udevice *dev, static int dwc3_glue_probe(struct udevice *dev) { struct dwc3_glue_ops *ops = (struct dwc3_glue_ops *)dev_get_driver_data(dev); - struct dwc3_glue_data *glue = dev_get_platdata(dev); + struct dwc3_glue_data *glue = dev_get_plat(dev); struct udevice *child = NULL; int index = 0; int ret; @@ -430,7 +430,7 @@ static int dwc3_glue_probe(struct udevice *dev)

static int dwc3_glue_remove(struct udevice *dev) { - struct dwc3_glue_data *glue = dev_get_platdata(dev); + struct dwc3_glue_data *glue = dev_get_plat(dev);

reset_release_bulk(&glue->resets);

diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c index 5be8bc8f6cc..acc7866b64a 100644 --- a/drivers/usb/dwc3/dwc3-meson-g12a.c +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c @@ -258,7 +258,7 @@ static int dwc3_meson_g12a_usb_init(struct dwc3_meson_g12a *priv)

int dwc3_meson_g12a_force_mode(struct udevice *dev, enum usb_dr_mode mode) { - struct dwc3_meson_g12a *priv = dev_get_platdata(dev); + struct dwc3_meson_g12a *priv = dev_get_plat(dev);

if (!priv) return -EINVAL; @@ -359,7 +359,7 @@ static int dwc3_meson_g12a_clk_init(struct dwc3_meson_g12a *priv)

static int dwc3_meson_g12a_probe(struct udevice *dev) { - struct dwc3_meson_g12a *priv = dev_get_platdata(dev); + struct dwc3_meson_g12a *priv = dev_get_plat(dev); int ret, i;

priv->dev = dev; @@ -434,7 +434,7 @@ err_phy_init:

static int dwc3_meson_g12a_remove(struct udevice *dev) { - struct dwc3_meson_g12a *priv = dev_get_platdata(dev); + struct dwc3_meson_g12a *priv = dev_get_plat(dev); int i;

reset_release_all(&priv->reset, 1); diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c index 1c7bfe83ab6..b63cc235f7e 100644 --- a/drivers/usb/dwc3/dwc3-meson-gxl.c +++ b/drivers/usb/dwc3/dwc3-meson-gxl.c @@ -196,7 +196,7 @@ static int dwc3_meson_gxl_usb_init(struct dwc3_meson_gxl *priv)

int dwc3_meson_gxl_force_mode(struct udevice *dev, enum usb_dr_mode mode) { - struct dwc3_meson_gxl *priv = dev_get_platdata(dev); + struct dwc3_meson_gxl *priv = dev_get_plat(dev);

if (!priv) return -EINVAL; @@ -295,7 +295,7 @@ static int dwc3_meson_gxl_clk_init(struct dwc3_meson_gxl *priv)

static int dwc3_meson_gxl_probe(struct udevice *dev) { - struct dwc3_meson_gxl *priv = dev_get_platdata(dev); + struct dwc3_meson_gxl *priv = dev_get_plat(dev); int ret, i;

priv->dev = dev; @@ -384,7 +384,7 @@ err_phy_init:

static int dwc3_meson_gxl_remove(struct udevice *dev) { - struct dwc3_meson_gxl *priv = dev_get_platdata(dev); + struct dwc3_meson_gxl *priv = dev_get_plat(dev); int i;

reset_release_all(&priv->reset, 1); diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 62c8166cae2..67c23200dda 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -297,7 +297,7 @@ static int handle_ufi_command(struct sandbox_flash_plat *plat, static int sandbox_flash_bulk(struct udevice *dev, struct usb_device *udev, unsigned long pipe, void *buff, int len) { - struct sandbox_flash_plat *plat = dev_get_platdata(dev); + struct sandbox_flash_plat *plat = dev_get_plat(dev); struct sandbox_flash_priv *priv = dev_get_priv(dev); int ep = usb_pipeendpoint(pipe); struct umass_bbb_cbw *cbw = buff; @@ -368,7 +368,7 @@ err:

static int sandbox_flash_ofdata_to_platdata(struct udevice *dev) { - struct sandbox_flash_plat *plat = dev_get_platdata(dev); + struct sandbox_flash_plat *plat = dev_get_plat(dev);

plat->pathname = dev_read_string(dev, "sandbox,filepath");

@@ -377,7 +377,7 @@ static int sandbox_flash_ofdata_to_platdata(struct udevice *dev)

static int sandbox_flash_bind(struct udevice *dev) { - struct sandbox_flash_plat *plat = dev_get_platdata(dev); + struct sandbox_flash_plat *plat = dev_get_plat(dev); struct usb_string *fs;

fs = plat->flash_strings; @@ -393,7 +393,7 @@ static int sandbox_flash_bind(struct udevice *dev)

static int sandbox_flash_probe(struct udevice *dev) { - struct sandbox_flash_plat *plat = dev_get_platdata(dev); + struct sandbox_flash_plat *plat = dev_get_plat(dev); struct sandbox_flash_priv *priv = dev_get_priv(dev);

priv->fd = os_open(plat->pathname, OS_O_RDONLY); diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c index 16c59457f7e..5ec1e98e4ed 100644 --- a/drivers/usb/emul/sandbox_keyb.c +++ b/drivers/usb/emul/sandbox_keyb.c @@ -202,7 +202,7 @@ static int sandbox_keyb_interrupt(struct udevice *dev, struct usb_device *udev,

static int sandbox_keyb_bind(struct udevice *dev) { - struct sandbox_keyb_plat *plat = dev_get_platdata(dev); + struct sandbox_keyb_plat *plat = dev_get_plat(dev); struct usb_string *fs;

fs = plat->keyb_strings; diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index be69952184d..674f78e214d 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -743,7 +743,7 @@ int asix_eth_get_info(struct usb_device *dev, struct ueth_data *ss, #ifdef CONFIG_DM_ETH static int asix_eth_start(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct asix_private *priv = dev_get_priv(dev);

return asix_init_common(&priv->ueth, pdata->enetaddr); @@ -825,7 +825,7 @@ static int asix_free_pkt(struct udevice *dev, uchar *packet, int packet_len)

int asix_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct asix_private *priv = dev_get_priv(dev);

if (priv->flags & FLAG_TYPE_AX88172) @@ -836,7 +836,7 @@ int asix_write_hwaddr(struct udevice *dev)

static int asix_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct asix_private *priv = dev_get_priv(dev); struct ueth_data *ss = &priv->ueth; int ret; diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 8abcf138817..4742a95af93 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -857,7 +857,7 @@ static int ax88179_free_pkt(struct udevice *dev, uchar *packet, int packet_len)

int ax88179_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct asix_private *priv = dev_get_priv(dev); struct ueth_data *ueth = &priv->ueth;

@@ -866,7 +866,7 @@ int ax88179_write_hwaddr(struct udevice *dev)

static int ax88179_eth_probe(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct asix_private *priv = dev_get_priv(dev); struct usb_device *usb_dev; int ret; diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c index d5e4c6a9e8e..4effbc5c87f 100644 --- a/drivers/usb/eth/lan75xx.c +++ b/drivers/usb/eth/lan75xx.c @@ -133,7 +133,7 @@ static int lan75xx_basic_reset(struct usb_device *udev, int lan75xx_write_hwaddr(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); unsigned char *enetaddr = pdata->enetaddr; u32 addr_lo = get_unaligned_le32(&enetaddr[0]); u32 addr_hi = (u32)get_unaligned_le16(&enetaddr[4]); @@ -242,7 +242,7 @@ static int lan75xx_eth_start(struct udevice *dev) int lan75xx_read_rom_hwaddr(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret;

/* @@ -261,7 +261,7 @@ static int lan75xx_eth_probe(struct udevice *dev) struct usb_device *udev = dev_get_parent_priv(dev); struct lan7x_private *priv = dev_get_priv(dev); struct ueth_data *ueth = &priv->ueth; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret;

/* Do a reset in order to get the MAC address from HW */ diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c index cc02e4d523a..37912a1d040 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -306,7 +306,7 @@ static int lan78xx_basic_reset(struct usb_device *udev, int lan78xx_write_hwaddr(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); unsigned char *enetaddr = pdata->enetaddr; u32 addr_lo = get_unaligned_le32(&enetaddr[0]); u32 addr_hi = (u32)get_unaligned_le16(&enetaddr[4]); @@ -410,7 +410,7 @@ static int lan78xx_eth_start(struct udevice *dev) int lan78xx_read_rom_hwaddr(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct lan7x_private *priv = dev_get_priv(dev); int ret;

@@ -426,7 +426,7 @@ static int lan78xx_eth_probe(struct udevice *dev) struct usb_device *udev = dev_get_parent_priv(dev); struct lan7x_private *priv = dev_get_priv(dev); struct ueth_data *ueth = &priv->ueth; - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret;

/* Do a reset in order to get the MAC address from HW */ diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index d83517029dd..783ab62f6b7 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -893,7 +893,7 @@ static int mcs7830_free_pkt(struct udevice *dev, uchar *packet, int packet_len) int mcs7830_write_hwaddr(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

return mcs7830_write_mac_common(udev, pdata->enetaddr); } @@ -902,7 +902,7 @@ static int mcs7830_eth_probe(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); struct mcs7830_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct ueth_data *ueth = &priv->ueth;

if (mcs7830_basic_reset(udev, priv)) diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index 600e9f5dadf..e20cf69c764 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -1774,7 +1774,7 @@ static int r8152_free_pkt(struct udevice *dev, uchar *packet, int packet_len)

static int r8152_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct r8152 *tp = dev_get_priv(dev);

unsigned char enetaddr[8] = { 0 }; @@ -1792,7 +1792,7 @@ static int r8152_write_hwaddr(struct udevice *dev)

int r8152_read_rom_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct r8152 *tp = dev_get_priv(dev);

debug("** %s (%d)\n", __func__, __LINE__); @@ -1803,7 +1803,7 @@ int r8152_read_rom_hwaddr(struct udevice *dev) static int r8152_eth_probe(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct r8152 *tp = dev_get_priv(dev); struct ueth_data *ueth = &tp->ueth; int ret; diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 836b534bbcf..283c52c16ac 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -937,7 +937,7 @@ static int smsc95xx_eth_start(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); struct smsc95xx_private *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

/* Driver-model Ethernet ensures we have this */ priv->have_hwaddr = 1; @@ -1020,7 +1020,7 @@ static int smsc95xx_free_pkt(struct udevice *dev, uchar *packet, int packet_len) int smsc95xx_write_hwaddr(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); struct smsc95xx_private *priv = dev_get_priv(dev);

return smsc95xx_write_hwaddr_common(udev, priv, pdata->enetaddr); @@ -1029,7 +1029,7 @@ int smsc95xx_write_hwaddr(struct udevice *dev) int smsc95xx_read_rom_hwaddr(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int ret;

ret = smsc95xx_init_mac_address(pdata->enetaddr, udev); diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 93b1c608301..2d5b7dc83f4 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -982,7 +982,7 @@ static void dwc2_phy_shutdown(struct udevice *dev, struct phy_bulk *phys)

static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) { - struct dwc2_plat_otg_data *plat = dev_get_platdata(dev); + struct dwc2_plat_otg_data *plat = dev_get_plat(dev); ulong drvdata; void (*set_params)(struct dwc2_plat_otg_data *data); int ret; @@ -1090,7 +1090,7 @@ static int dwc2_udc_otg_clk_init(struct udevice *dev,

static int dwc2_udc_otg_probe(struct udevice *dev) { - struct dwc2_plat_otg_data *plat = dev_get_platdata(dev); + struct dwc2_plat_otg_data *plat = dev_get_plat(dev); struct dwc2_priv_data *priv = dev_get_priv(dev); struct dwc2_usbotg_reg *usbotg_reg = (struct dwc2_usbotg_reg *)plat->regs_otg; @@ -1194,7 +1194,7 @@ U_BOOT_DRIVER(dwc2_udc_otg) = {

int dwc2_udc_B_session_valid(struct udevice *dev) { - struct dwc2_plat_otg_data *plat = dev_get_platdata(dev); + struct dwc2_plat_otg_data *plat = dev_get_plat(dev); struct dwc2_usbotg_reg *usbotg_reg = (struct dwc2_usbotg_reg *)plat->regs_otg;

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 9d4bb9dfaca..7830a4aee94 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -2009,7 +2009,7 @@ static int eth_bind(struct usb_gadget *gadget) int gcnum; u8 tmp[7]; #ifdef CONFIG_DM_ETH - struct eth_pdata *pdata = dev_get_platdata(l_priv->netdev); + struct eth_pdata *pdata = dev_get_plat(l_priv->netdev); #endif

/* these flags are only ever cleared; compiler take note */ @@ -2646,7 +2646,7 @@ static void usb_eth_stop(struct udevice *dev) static int usb_eth_probe(struct udevice *dev) { struct ether_priv *priv = dev_get_priv(dev); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

priv->netdev = dev; l_priv = priv; diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c index 9b1edcd7008..66b3e96b007 100644 --- a/drivers/usb/host/dwc3-of-simple.c +++ b/drivers/usb/host/dwc3-of-simple.c @@ -64,7 +64,7 @@ static int dwc3_of_simple_clk_init(struct udevice *dev,

static int dwc3_of_simple_probe(struct udevice *dev) { - struct dwc3_of_simple *simple = dev_get_platdata(dev); + struct dwc3_of_simple *simple = dev_get_plat(dev); int ret;

ret = dwc3_of_simple_clk_init(dev, simple); @@ -80,7 +80,7 @@ static int dwc3_of_simple_probe(struct udevice *dev)

static int dwc3_of_simple_remove(struct udevice *dev) { - struct dwc3_of_simple *simple = dev_get_platdata(dev); + struct dwc3_of_simple *simple = dev_get_plat(dev);

reset_release_bulk(&simple->resets);

diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index e9ebe2ef7c2..90266c725f0 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -102,7 +102,7 @@ static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat)

static int sti_dwc3_glue_ofdata_to_platdata(struct udevice *dev) { - struct sti_dwc3_glue_platdata *plat = dev_get_platdata(dev); + struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); struct udevice *syscon; struct regmap *regmap; int ret; @@ -150,7 +150,7 @@ static int sti_dwc3_glue_ofdata_to_platdata(struct udevice *dev)

static int sti_dwc3_glue_bind(struct udevice *dev) { - struct sti_dwc3_glue_platdata *plat = dev_get_platdata(dev); + struct sti_dwc3_glue_platdata *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_platdata(dev); + struct sti_dwc3_glue_platdata *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_platdata(dev); + struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); int ret;

/* assert both powerdown and softreset */ diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index d1ff3f4ce1a..0a3983b429f 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -45,7 +45,7 @@ struct exynos_ehci {

static int ehci_usb_ofdata_to_platdata(struct udevice *dev) { - struct exynos_ehci_platdata *plat = dev_get_platdata(dev); + struct exynos_ehci_platdata *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_platdata(dev); + struct exynos_ehci_platdata *plat = dev_get_plat(dev); struct exynos_ehci *ctx = dev_get_priv(dev); struct ehci_hcor *hcor;

diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 13ee268e8de..6143de22668 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -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_platdata(dev); + struct usb_platdata *plat = dev_get_plat(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; int ret; diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index dec89c6a5d6..abefdfafac4 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -287,7 +287,7 @@ static const struct ehci_ops mx5_ehci_ops = {

static int ehci_usb_ofdata_to_platdata(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *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_ofdata_to_platdata(struct udevice *dev)

static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *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; diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 02d7d29a34f..8b8513d3a9a 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -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_platdata(dev); + struct usb_platdata *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_ofdata_to_platdata(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *plat = dev_get_plat(dev); enum usb_dr_mode dr_mode;

dr_mode = usb_get_dr_mode(dev->node); @@ -585,7 +585,7 @@ static int ehci_usb_bind(struct udevice *dev)

static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *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; diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 1b05dca0d97..48de33c5df3 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -368,7 +368,7 @@ struct ehci_omap_priv_data {

static int ehci_usb_ofdata_to_platdata(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *plat = dev_get_plat(dev);

plat->init_type = USB_INIT_HOST;

@@ -377,7 +377,7 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev)

static int omap_ehci_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *plat = dev_get_plat(dev); struct ehci_omap_priv_data *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index c76e9c3b296..68a49046e77 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -828,7 +828,7 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev)

static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *plat = dev_get_plat(dev); struct fdt_usb *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index c728a4de6b1..bd01ea07508 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -310,7 +310,7 @@ static int vf_usb_bind(struct udevice *dev)

static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *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; diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c index df7ea0a4842..7a7cfaa44de 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -34,7 +34,7 @@ static int ehci_zynq_ofdata_to_platdata(struct udevice *dev)

static int ehci_zynq_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_platdata(dev); + struct usb_platdata *plat = dev_get_plat(dev); struct zynq_ehci_priv *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index 0beb91294e7..7e10c5486f6 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -401,7 +401,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) if (ret) return ret;

- plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); plat->init_type = USB_INIT_DEVICE; ret = device_probe(dev); if (ret) diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c index cc20cf0b6c1..31e4265a818 100644 --- a/drivers/usb/host/xhci-brcm.c +++ b/drivers/usb/host/xhci-brcm.c @@ -30,7 +30,7 @@ struct brcm_xhci_platdata {

static int xhci_brcm_probe(struct udevice *dev) { - struct brcm_xhci_platdata *plat = dev_get_platdata(dev); + struct brcm_xhci_platdata *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_platdata(dev); + struct brcm_xhci_platdata *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); diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index a57762f2462..f6534a2ea9e 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -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_platdata(dev); + struct xhci_dwc3_platdata *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_platdata(dev); + struct xhci_dwc3_platdata *plat = dev_get_plat(dev);

dwc3_shutdown_phy(dev, &plat->phys);

diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index 39e651e2fd1..4d3dd360bf6 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -54,7 +54,7 @@ struct exynos_xhci {

static int xhci_usb_ofdata_to_platdata(struct udevice *dev) { - struct exynos_xhci_platdata *plat = dev_get_platdata(dev); + struct exynos_xhci_platdata *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_platdata(dev); + struct exynos_xhci_platdata *plat = dev_get_plat(dev); struct exynos_xhci *ctx = dev_get_priv(dev); struct xhci_hcor *hcor; int ret; diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index 1762bbb34b6..ffecfc28ef6 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -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_platdata(dev); + struct mvebu_xhci_platdata *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_ofdata_to_platdata(struct udevice *dev) { - struct mvebu_xhci_platdata *plat = dev_get_platdata(dev); + struct mvebu_xhci_platdata *plat = dev_get_plat(dev);

/* * Get the base address for XHCI controller from the device node diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 2ef072b60ee..22dfaf49b7d 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -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_platdata(dev); + struct rcar_xhci_platdata *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_platdata(dev); + struct rcar_xhci_platdata *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_ofdata_to_platdata(struct udevice *dev) { - struct rcar_xhci_platdata *plat = dev_get_platdata(dev); + struct rcar_xhci_platdata *plat = dev_get_plat(dev);

plat->hcd_base = dev_read_addr(dev); if (plat->hcd_base == FDT_ADDR_T_NONE) { diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c index 2889e855ab0..d9591b97c39 100644 --- a/drivers/usb/musb-new/da8xx.c +++ b/drivers/usb/musb-new/da8xx.c @@ -258,7 +258,7 @@ struct da8xx_musb_platdata {

static int da8xx_musb_ofdata_to_platdata(struct udevice *dev) { - struct da8xx_musb_platdata *plat = dev_get_platdata(dev); + struct da8xx_musb_platdata *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_ofdata_to_platdata(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_platdata(dev); + struct da8xx_musb_platdata *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; diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 9150c4d7456..b09f0d499da 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -151,7 +151,7 @@ struct omap2430_musb_platdata {

static int omap2430_musb_ofdata_to_platdata(struct udevice *dev) { - struct omap2430_musb_platdata *plat = dev_get_platdata(dev); + struct omap2430_musb_platdata *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_platdata(dev); + struct omap2430_musb_platdata *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; diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 29a06320e6f..716e820557d 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -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_platdata(dev); + struct ti_musb_platdata *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_ofdata_to_platdata(struct udevice *dev) { - struct ti_musb_platdata *plat = dev_get_platdata(dev); + struct ti_musb_platdata *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_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 *plat = dev_get_platdata(dev); + struct ti_musb_platdata *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_ofdata_to_platdata(struct udevice *dev) { - struct ti_musb_platdata *plat = dev_get_platdata(dev); + struct ti_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int ret; @@ -216,7 +216,7 @@ 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 *plat = dev_get_platdata(dev); + struct ti_musb_platdata *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_platdata(dev); + struct ti_musb_platdata *plat = dev_get_plat(dev); int ret;

priv->periph = musb_init_controller(&plat->plat, diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 3af3ea4da27..83367c4b451 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -269,7 +269,7 @@ static int atmel_fb_lcd_probe(struct udevice *dev)

static int atmel_fb_ofdata_to_platdata(struct udevice *dev) { - struct atmel_lcd_platdata *plat = dev_get_platdata(dev); + struct atmel_lcd_platdata *plat = dev_get_plat(dev); struct atmel_fb_priv *priv = dev_get_priv(dev); struct display_timing *timing = &priv->timing; const void *blob = gd->fdt_blob; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index 94d94707513..69bf2ee317f 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -356,7 +356,7 @@ static int gtt_poll(struct broadwell_igd_priv *priv, u32 reg, u32 mask,

static void igd_setup_panel(struct udevice *dev) { - struct broadwell_igd_plat *plat = dev_get_platdata(dev); + struct broadwell_igd_plat *plat = dev_get_plat(dev); struct broadwell_igd_priv *priv = dev_get_priv(dev); u32 reg32;

@@ -398,7 +398,7 @@ static void igd_setup_panel(struct udevice *dev)

static int igd_cdclk_init_haswell(struct udevice *dev) { - struct broadwell_igd_plat *plat = dev_get_platdata(dev); + struct broadwell_igd_plat *plat = dev_get_plat(dev); struct broadwell_igd_priv *priv = dev_get_priv(dev); int cdclk = plat->cdclk; u16 devid; @@ -472,7 +472,7 @@ err:

static int igd_cdclk_init_broadwell(struct udevice *dev) { - struct broadwell_igd_plat *plat = dev_get_platdata(dev); + struct broadwell_igd_plat *plat = dev_get_plat(dev); struct broadwell_igd_priv *priv = dev_get_priv(dev); int cdclk = plat->cdclk; u32 dpdiv, lpcll, pwctl, cdset; @@ -567,7 +567,7 @@ u8 systemagent_revision(struct udevice *bus)

static int igd_pre_init(struct udevice *dev, bool is_broadwell) { - struct broadwell_igd_plat *plat = dev_get_platdata(dev); + struct broadwell_igd_plat *plat = dev_get_plat(dev); struct broadwell_igd_priv *priv = dev_get_priv(dev); u32 rp1_gfx_freq; int ret; @@ -708,7 +708,7 @@ static int broadwell_igd_probe(struct udevice *dev)

static int broadwell_igd_ofdata_to_platdata(struct udevice *dev) { - struct broadwell_igd_plat *plat = dev_get_platdata(dev); + struct broadwell_igd_plat *plat = dev_get_plat(dev); struct broadwell_igd_priv *priv = dev_get_priv(dev); int node = dev_of_offset(dev); const void *blob = gd->fdt_blob; diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index b1f8134ca43..ef0fdf65e31 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -536,7 +536,7 @@ static int nx_display_probe(struct udevice *dev) { struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); - struct nx_display_platdata *plat = dev_get_platdata(dev); + struct nx_display_platdata *plat = dev_get_plat(dev); static GraphicDevice *graphic_device; char addr[64];

diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c index 190bb551643..39c1c337c65 100644 --- a/drivers/video/orisetech_otm8009a.c +++ b/drivers/video/orisetech_otm8009a.c @@ -79,7 +79,7 @@ static const struct display_timing default_timing = { static void otm8009a_dcs_write_buf(struct udevice *dev, const void *data, size_t len) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device;

if (mipi_dsi_dcs_write_buffer(device, data, len) < 0) @@ -89,7 +89,7 @@ static void otm8009a_dcs_write_buf(struct udevice *dev, const void *data, static void otm8009a_dcs_write_buf_hs(struct udevice *dev, const void *data, size_t len) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device;

/* data will be sent in dsi hs mode (ie. no lpm) */ @@ -124,7 +124,7 @@ static void otm8009a_dcs_write_buf_hs(struct udevice *dev, const void *data,

static int otm8009a_init_sequence(struct udevice *dev) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device; int ret;

@@ -255,7 +255,7 @@ static int otm8009a_init_sequence(struct udevice *dev)

static int otm8009a_panel_enable_backlight(struct udevice *dev) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device; int ret;

@@ -323,7 +323,7 @@ static int otm8009a_panel_ofdata_to_platdata(struct udevice *dev) static int otm8009a_panel_probe(struct udevice *dev) { struct otm8009a_panel_priv *priv = dev_get_priv(dev); - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); int ret;

if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) { diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c index 82e8f04d8f0..a370cd99e09 100644 --- a/drivers/video/raydium-rm68200.c +++ b/drivers/video/raydium-rm68200.c @@ -92,7 +92,7 @@ static const struct display_timing default_timing = { static void rm68200_dcs_write_buf(struct udevice *dev, const void *data, size_t len) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device; int err;

@@ -103,7 +103,7 @@ static void rm68200_dcs_write_buf(struct udevice *dev, const void *data,

static void rm68200_dcs_write_cmd(struct udevice *dev, u8 cmd, u8 value) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device; int err;

@@ -223,7 +223,7 @@ static void rm68200_init_sequence(struct udevice *dev)

static int rm68200_panel_enable_backlight(struct udevice *dev) { - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); struct mipi_dsi_device *device = plat->device; struct rm68200_panel_priv *priv = dev_get_priv(dev); int ret; @@ -296,7 +296,7 @@ static int rm68200_panel_ofdata_to_platdata(struct udevice *dev) static int rm68200_panel_probe(struct udevice *dev) { struct rm68200_panel_priv *priv = dev_get_priv(dev); - struct mipi_dsi_panel_plat *plat = dev_get_platdata(dev); + struct mipi_dsi_panel_plat *plat = dev_get_plat(dev); int ret;

if (IS_ENABLED(CONFIG_DM_REGULATOR) && priv->reg) { diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c index cf1446e2e71..3e231e8c551 100644 --- a/drivers/video/sandbox_sdl.c +++ b/drivers/video/sandbox_sdl.c @@ -24,7 +24,7 @@ enum { static int sandbox_sdl_probe(struct udevice *dev) { struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); - struct sandbox_sdl_plat *plat = dev_get_platdata(dev); + struct sandbox_sdl_plat *plat = dev_get_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct sandbox_state *state = state_get_current(); int ret; @@ -50,7 +50,7 @@ static int sandbox_sdl_probe(struct udevice *dev) static int sandbox_sdl_bind(struct udevice *dev) { struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); - struct sandbox_sdl_plat *plat = dev_get_platdata(dev); + struct sandbox_sdl_plat *plat = dev_get_plat(dev); int ret = 0;

plat->xres = dev_read_u32_default(dev, "xres", LCD_MAX_WIDTH); diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c index 9941382a7d6..266623b8766 100644 --- a/drivers/video/stm32/stm32_dsi.c +++ b/drivers/video/stm32/stm32_dsi.c @@ -351,7 +351,7 @@ static int stm32_dsi_attach(struct udevice *dev) return ret; }

- mplat = dev_get_platdata(priv->panel); + mplat = dev_get_plat(priv->panel); mplat->device = &priv->device; device->lanes = mplat->lanes; device->format = mplat->format; diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c index 8519b534a28..d9599ee950a 100644 --- a/drivers/video/tegra124/dp.c +++ b/drivers/video/tegra124/dp.c @@ -1568,7 +1568,7 @@ error_enable:

static int tegra_dp_ofdata_to_platdata(struct udevice *dev) { - struct tegra_dp_plat *plat = dev_get_platdata(dev); + struct tegra_dp_plat *plat = dev_get_plat(dev);

plat->base = dev_read_addr(dev);

@@ -1594,7 +1594,7 @@ static const struct dm_display_ops dp_tegra_ops = {

static int dp_tegra_probe(struct udevice *dev) { - struct tegra_dp_plat *plat = dev_get_platdata(dev); + struct tegra_dp_plat *plat = dev_get_plat(dev); struct tegra_dp_priv *priv = dev_get_priv(dev); struct display_plat *disp_uc_plat = dev_get_uclass_plat(dev);

diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c index b32ce3c1b18..1794f73a8de 100644 --- a/drivers/virtio/virtio_net.c +++ b/drivers/virtio/virtio_net.c @@ -145,7 +145,7 @@ static void virtio_net_stop(struct udevice *dev) static int virtio_net_write_hwaddr(struct udevice *dev) { struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(dev->parent); - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev); int i;

/* @@ -166,7 +166,7 @@ static int virtio_net_write_hwaddr(struct udevice *dev)

static int virtio_net_read_rom_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev_get_platdata(dev); + struct eth_pdata *pdata = dev_get_plat(dev);

if (!pdata) return -ENOSYS; diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c index d8cbff7b495..99fb9603e69 100644 --- a/drivers/w1/mxc_w1.c +++ b/drivers/w1/mxc_w1.c @@ -79,7 +79,7 @@ static u8 mxc_w1_touch_bit(struct mxc_w1_pdata *pdata, u8 bit)

static u8 mxc_w1_read_byte(struct udevice *dev) { - struct mxc_w1_pdata *pdata = dev_get_platdata(dev); + struct mxc_w1_pdata *pdata = dev_get_plat(dev); struct mxc_w1_regs *regs = pdata->regs; u16 status;

@@ -106,7 +106,7 @@ static u8 mxc_w1_read_byte(struct udevice *dev)

static void mxc_w1_write_byte(struct udevice *dev, u8 byte) { - struct mxc_w1_pdata *pdata = dev_get_platdata(dev); + struct mxc_w1_pdata *pdata = dev_get_plat(dev); struct mxc_w1_regs *regs = pdata->regs; u16 status;

@@ -130,7 +130,7 @@ static void mxc_w1_write_byte(struct udevice *dev, u8 byte)

static bool mxc_w1_reset(struct udevice *dev) { - struct mxc_w1_pdata *pdata = dev_get_platdata(dev); + struct mxc_w1_pdata *pdata = dev_get_plat(dev); u16 reg_val;

writew(MXC_W1_CONTROL_RPP, &pdata->regs->control); @@ -144,7 +144,7 @@ static bool mxc_w1_reset(struct udevice *dev)

static u8 mxc_w1_triplet(struct udevice *dev, bool bdir) { - struct mxc_w1_pdata *pdata = dev_get_platdata(dev); + struct mxc_w1_pdata *pdata = dev_get_plat(dev); u8 id_bit = mxc_w1_touch_bit(pdata, 1); u8 comp_bit = mxc_w1_touch_bit(pdata, 1); u8 retval; @@ -168,7 +168,7 @@ static u8 mxc_w1_triplet(struct udevice *dev, bool bdir)

static int mxc_w1_ofdata_to_platdata(struct udevice *dev) { - struct mxc_w1_pdata *pdata = dev_get_platdata(dev); + struct mxc_w1_pdata *pdata = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -182,7 +182,7 @@ static int mxc_w1_ofdata_to_platdata(struct udevice *dev)

static int mxc_w1_probe(struct udevice *dev) { - struct mxc_w1_pdata *pdata = dev_get_platdata(dev); + struct mxc_w1_pdata *pdata = dev_get_plat(dev); unsigned int clkrate = mxc_get_clock(MXC_IPG_PERCLK); unsigned int clkdiv;

diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c index 2e5064fcc54..fe4ebe21a57 100644 --- a/drivers/w1/w1-gpio.c +++ b/drivers/w1/w1-gpio.c @@ -33,7 +33,7 @@ struct w1_gpio_pdata {

static bool w1_gpio_read_bit(struct udevice *dev) { - struct w1_gpio_pdata *pdata = dev_get_platdata(dev); + struct w1_gpio_pdata *pdata = dev_get_plat(dev); int val;

dm_gpio_set_dir_flags(&pdata->gpio, GPIOD_IS_OUT); @@ -63,7 +63,7 @@ static u8 w1_gpio_read_byte(struct udevice *dev)

static void w1_gpio_write_bit(struct udevice *dev, bool bit) { - struct w1_gpio_pdata *pdata = dev_get_platdata(dev); + struct w1_gpio_pdata *pdata = dev_get_plat(dev);

dm_gpio_set_dir_flags(&pdata->gpio, GPIOD_IS_OUT);

@@ -84,7 +84,7 @@ static void w1_gpio_write_byte(struct udevice *dev, u8 byte)

static bool w1_gpio_reset(struct udevice *dev) { - struct w1_gpio_pdata *pdata = dev_get_platdata(dev); + struct w1_gpio_pdata *pdata = dev_get_plat(dev); int val;

/* initiate the reset pulse. first we must pull the bus to low */ @@ -153,7 +153,7 @@ static const struct w1_ops w1_gpio_ops = {

static int w1_gpio_ofdata_to_platdata(struct udevice *dev) { - struct w1_gpio_pdata *pdata = dev_get_platdata(dev); + struct w1_gpio_pdata *pdata = dev_get_plat(dev); int ret;

ret = gpio_request_by_name(dev, "gpios", 0, &pdata->gpio, 0); diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index 8aa771ad806..ce094436745 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -34,7 +34,7 @@ struct xlnx_wdt_platdata { static int xlnx_wdt_reset(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *plat = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_plat(dev);

debug("%s ", __func__);

@@ -51,7 +51,7 @@ static int xlnx_wdt_reset(struct udevice *dev) static int xlnx_wdt_stop(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *plat = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_plat(dev);

if (plat->enable_once) { debug("Can't stop Xilinx watchdog.\n"); @@ -71,7 +71,7 @@ static int xlnx_wdt_stop(struct udevice *dev)

static int xlnx_wdt_start(struct udevice *dev, u64 timeout, ulong flags) { - struct xlnx_wdt_platdata *plat = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_plat(dev);

debug("%s:\n", __func__);

@@ -92,7 +92,7 @@ static int xlnx_wdt_probe(struct udevice *dev)

static int xlnx_wdt_ofdata_to_platdata(struct udevice *dev) { - struct xlnx_wdt_platdata *plat = dev_get_platdata(dev); + struct xlnx_wdt_platdata *plat = dev_get_plat(dev);

plat->regs = (struct watchdog_regs *)dev_read_addr(dev); if (IS_ERR(plat->regs)) diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c index 172908c795d..064caa0e87f 100644 --- a/drivers/watchdog/xilinx_wwdt.c +++ b/drivers/watchdog/xilinx_wwdt.c @@ -125,7 +125,7 @@ static int xlnx_wwdt_start(struct udevice *dev, u64 timeout, ulong flags) static int xlnx_wwdt_probe(struct udevice *dev) { int ret; - struct xlnx_wwdt_platdata *plat = dev_get_platdata(dev); + struct xlnx_wwdt_platdata *plat = dev_get_plat(dev); struct xlnx_wwdt_priv *wdt = dev_get_priv(dev);

dev_dbg(dev, "%s: Probing wdt%u\n", __func__, dev_seq(dev)); @@ -147,7 +147,7 @@ static int xlnx_wwdt_probe(struct udevice *dev)

static int xlnx_wwdt_ofdata_to_platdata(struct udevice *dev) { - struct xlnx_wwdt_platdata *plat = dev_get_platdata(dev); + struct xlnx_wwdt_platdata *plat = dev_get_plat(dev);

plat->enable_once = dev_read_u32_default(dev, "xlnx,wdt-enable-once", 0); diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index b0c93d6cf68..0f722416924 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -685,7 +685,7 @@ static int pvblock_blk_bind(struct udevice *udev) static int pvblock_blk_probe(struct udevice *udev) { struct blkfront_dev *blk_dev = dev_get_priv(udev); - struct blkfront_platdata *plat = dev_get_platdata(udev); + struct blkfront_platdata *plat = dev_get_plat(udev); struct blk_desc *desc = dev_get_uclass_plat(udev); int ret, devid;

diff --git a/include/dm/device.h b/include/dm/device.h index f8e7642dfb5..a9af9326498 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -291,14 +291,14 @@ struct driver { #define U_BOOT_DRIVER_ALIAS(__name, __alias)

/** - * dev_get_platdata() - Get the platform data for a device + * dev_get_plat() - Get the platform data for a device * * This checks that dev is not NULL, but no other checks for now * * @dev Device to check * @return platform data, or NULL if none */ -void *dev_get_platdata(const struct udevice *dev); +void *dev_get_plat(const struct udevice *dev);

/** * dev_get_parent_plat() - Get the parent platform data for a device diff --git a/include/dwmmc.h b/include/dwmmc.h index 4515a44dc27..51ab74ead35 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -259,7 +259,7 @@ static inline u8 dwmci_readb(struct dwmci_host *host, int reg) * .plat_auto = sizeof(struct rockchip_mmc_plat), * * To access platform data: - * struct rockchip_mmc_plat *plat = dev_get_platdata(dev); + * struct rockchip_mmc_plat *plat = dev_get_plat(dev); * * See rockchip_dw_mmc.c for an example. * diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 79dce8f0ad6..75b16353dad 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -144,7 +144,7 @@ struct clk_fixed_rate { unsigned long fixed_rate; };

-#define to_clk_fixed_rate(dev) ((struct clk_fixed_rate *)dev_get_platdata(dev)) +#define to_clk_fixed_rate(dev) ((struct clk_fixed_rate *)dev_get_plat(dev))

struct clk_composite { struct clk clk; diff --git a/include/sdhci.h b/include/sdhci.h index 69c2087c10c..3e5a6498185 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -443,7 +443,7 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg) * .plat_auto = sizeof(struct msm_sdhc_plat), * * To access platform data: - * struct msm_sdhc_plat *plat = dev_get_platdata(dev); + * struct msm_sdhc_plat *plat = dev_get_plat(dev); * * See msm_sdhci.c for an example. * diff --git a/include/usb.h b/include/usb.h index a3323f58018..9e1ec534eca 100644 --- a/include/usb.h +++ b/include/usb.h @@ -599,7 +599,7 @@ struct usb_hub_device { /** * struct usb_platdata - Platform data about a USB controller * - * Given a USB controller (UCLASS_USB) dev this is dev_get_platdata(dev) + * Given a USB controller (UCLASS_USB) dev this is dev_get_plat(dev) */ struct usb_platdata { enum usb_init_type init_type; diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 830fdabe387..5cccc0ce4da 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -59,7 +59,7 @@ struct efi_blk_platdata { static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct efi_blk_platdata *plat = dev_get_platdata(dev); + struct efi_blk_platdata *plat = dev_get_plat(dev); struct efi_block_io *io = plat->io; efi_status_t ret;

@@ -88,7 +88,7 @@ static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, static ulong efi_bl_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct efi_blk_platdata *plat = dev_get_platdata(dev); + struct efi_blk_platdata *plat = dev_get_plat(dev); struct efi_block_io *io = plat->io; efi_status_t ret;

@@ -169,7 +169,7 @@ static int efi_bl_bind(efi_handle_t handle, void *interface) /* Set the DM_FLAG_NAME_ALLOCED flag to avoid a memory leak */ device_set_name_alloced(bdev);

- plat = dev_get_platdata(bdev); + plat = dev_get_plat(bdev); plat->handle = handle; plat->io = interface;

diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 12bdc29bd1f..adc9cd513d7 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -53,7 +53,7 @@ static int testacpi_write_tables(const struct udevice *dev,

static int testacpi_get_name(const struct udevice *dev, char *out_name) { - struct testacpi_platdata *plat = dev_get_platdata(dev); + struct testacpi_platdata *plat = dev_get_plat(dev);

if (plat->return_error) return -EINVAL; @@ -438,13 +438,13 @@ static int dm_test_acpi_device_path(struct unit_test_state *uts) buf);

/* Test handling of a device which doesn't produce a name */ - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); plat->no_name = true; ut_assertok(acpi_device_path(child, buf, sizeof(buf))); ut_asserteq_str("\_SB." ACPI_TEST_CHILD_NAME, buf);

/* Test handling of a device which returns an error */ - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); plat->return_error = true; ut_asserteq(-EINVAL, acpi_device_path(child, buf, sizeof(buf)));

diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c index 4f3cc159d03..afa7c2c3f31 100644 --- a/test/dm/of_platdata.c +++ b/test/dm/of_platdata.c @@ -31,7 +31,7 @@ static int dm_test_of_platdata_props(struct unit_test_state *uts) ut_asserteq_str("sandbox_clk_test", dev->name);

ut_assertok(uclass_next_device_err(&dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); ut_assert(plat->boolval); ut_asserteq(1, plat->intval); ut_asserteq(4, ARRAY_SIZE(plat->intarray)); @@ -54,7 +54,7 @@ static int dm_test_of_platdata_props(struct unit_test_state *uts) ut_asserteq_str("", plat->stringarray[2]);

ut_assertok(uclass_next_device_err(&dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); ut_assert(!plat->boolval); ut_asserteq(3, plat->intval); ut_asserteq(5, plat->intarray[0]); @@ -74,14 +74,14 @@ static int dm_test_of_platdata_props(struct unit_test_state *uts) ut_asserteq_str("message", plat->stringarray[2]);

ut_assertok(uclass_next_device_err(&dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); ut_assert(!plat->boolval); ut_asserteq_str("one", plat->stringarray[0]); ut_asserteq_str("", plat->stringarray[1]); ut_asserteq_str("", plat->stringarray[2]);

ut_assertok(uclass_next_device_err(&dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); ut_assert(!plat->boolval); ut_asserteq_str("spl", plat->stringarray[0]);

@@ -181,7 +181,7 @@ static int dm_test_of_platdata_phandle(struct unit_test_state *uts)

ut_assertok(uclass_first_device_err(UCLASS_MISC, &dev)); ut_asserteq_str("sandbox_clk_test", dev->name); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev);

ut_assertok(device_get_by_driver_info_idx(plat->clocks[0].idx, &clk)); ut_asserteq_str("fixed_clock", clk->name); diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 5c074cdd09f..b9f49de10a6 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -21,7 +21,7 @@ static struct unit_test_state *uts = &global_dm_test_state;

static int testdrv_ping(struct udevice *dev, int pingval, int *pingret) { - const struct dm_test_pdata *pdata = dev_get_platdata(dev); + const struct dm_test_pdata *pdata = dev_get_plat(dev); struct dm_test_priv *priv = dev_get_priv(dev);

*pingret = pingval + pdata->ping_add; diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 3f61f93386b..f3299bb3a84 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -40,7 +40,7 @@ static const struct test_ops test_ops = {

static int testfdt_ofdata_to_platdata(struct udevice *dev) { - struct dm_test_pdata *pdata = dev_get_platdata(dev); + struct dm_test_pdata *pdata = dev_get_plat(dev);

pdata->ping_add = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "ping-add", -1); @@ -132,7 +132,7 @@ struct dm_testprobe_pdata {

static int testprobe_drv_probe(struct udevice *dev) { - struct dm_testprobe_pdata *pdata = dev_get_platdata(dev); + struct dm_testprobe_pdata *pdata = dev_get_plat(dev);

return pdata->probe_err; } @@ -167,7 +167,7 @@ struct dm_testdevres_priv {

static int testdevres_drv_bind(struct udevice *dev) { - struct dm_testdevres_pdata *pdata = dev_get_platdata(dev); + struct dm_testdevres_pdata *pdata = dev_get_plat(dev);

pdata->ptr = devm_kmalloc(dev, TEST_DEVRES_SIZE, 0);

@@ -467,7 +467,7 @@ static int dm_test_first_next_device(struct unit_test_state *uts)

/* Remove them and try again, with an error on the second one */ ut_assertok(uclass_get_device(UCLASS_TEST_PROBE, 1, &dev)); - pdata = dev_get_platdata(dev); + pdata = dev_get_plat(dev); pdata->probe_err = -ENOMEM; device_remove(parent, DM_REMOVE_NORMAL); ut_assertok(uclass_first_device(UCLASS_TEST_PROBE, &dev)); @@ -476,7 +476,7 @@ static int dm_test_first_next_device(struct unit_test_state *uts)

/* Now an error on the first one */ ut_assertok(uclass_get_device(UCLASS_TEST_PROBE, 0, &dev)); - pdata = dev_get_platdata(dev); + pdata = dev_get_plat(dev); pdata->probe_err = -ENOENT; device_remove(parent, DM_REMOVE_NORMAL); ut_asserteq(-ENOENT, uclass_first_device(UCLASS_TEST_PROBE, &dev)); @@ -563,21 +563,21 @@ static int dm_test_first_next_ok_device(struct unit_test_state *uts) ut_assertok(check_devices(uts, devlist, 0));

/* Remove them and try again, with an error on the second one */ - pdata = dev_get_platdata(devlist[1]); + pdata = dev_get_plat(devlist[1]); pdata->probe_err = -ENOENT - 1; device_remove(parent, DM_REMOVE_NORMAL); ut_assertok(check_devices(uts, devlist, 1 << 1));

/* Now an error on the first one */ - pdata = dev_get_platdata(devlist[0]); + pdata = dev_get_plat(devlist[0]); pdata->probe_err = -ENOENT - 0; device_remove(parent, DM_REMOVE_NORMAL); ut_assertok(check_devices(uts, devlist, 3 << 0));

/* Now errors on all */ - pdata = dev_get_platdata(devlist[2]); + pdata = dev_get_plat(devlist[2]); pdata->probe_err = -ENOENT - 2; - pdata = dev_get_platdata(devlist[3]); + pdata = dev_get_plat(devlist[3]); pdata->probe_err = -ENOENT - 3; device_remove(parent, DM_REMOVE_NORMAL); ut_assertok(check_devices(uts, devlist, 0xf << 0)); diff --git a/test/dm/video.c b/test/dm/video.c index 1af948dca3e..da0ae3622f7 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -107,7 +107,7 @@ static int select_vidconsole(struct unit_test_state *uts, const char *drv_name)

ut_assertok(uclass_find_device(UCLASS_VIDEO, 0, &dev)); ut_assert(!device_active(dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); plat->vidconsole_drv_name = "vidconsole0";

return 0; @@ -217,7 +217,7 @@ static int check_vidconsole_output(struct unit_test_state *uts, int rot,

ut_assertok(uclass_find_device(UCLASS_VIDEO, 0, &dev)); ut_assert(!device_active(dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); plat->rot = rot;

ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev)); @@ -359,7 +359,7 @@ static int dm_test_video_truetype_scroll(struct unit_test_state *uts)

ut_assertok(uclass_find_device(UCLASS_VIDEO, 0, &dev)); ut_assert(!device_active(dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); plat->font_size = 100;

ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev)); @@ -380,7 +380,7 @@ static int dm_test_video_truetype_bs(struct unit_test_state *uts)

ut_assertok(uclass_find_device(UCLASS_VIDEO, 0, &dev)); ut_assert(!device_active(dev)); - plat = dev_get_platdata(dev); + plat = dev_get_plat(dev); plat->font_size = 100;

ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev));

This name is far too long. Rename it to remove the 'data' bits. This makes it consistent with the platdata->plat rename.

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-stm32mp/bsec.c | 4 +-- arch/arm/mach-stm32mp/pwr_regulator.c | 4 +-- arch/x86/cpu/acpi_gpe.c | 4 +-- arch/x86/cpu/apollolake/hostbridge.c | 4 +-- arch/x86/cpu/apollolake/pmc.c | 2 +- arch/x86/cpu/apollolake/uart.c | 8 ++--- arch/x86/cpu/broadwell/adsp.c | 4 +-- arch/x86/cpu/broadwell/sata.c | 4 +-- arch/x86/cpu/intel_common/itss.c | 4 +-- arch/x86/cpu/intel_common/p2sb.c | 4 +-- arch/x86/cpu/slimbootloader/serial.c | 4 +-- arch/x86/include/asm/intel_pinctrl.h | 7 ++-- board/intel/galileo/galileo.c | 2 +- doc/driver-model/debugging.rst | 2 +- doc/driver-model/design.rst | 36 +++++++++---------- doc/driver-model/ethernet.rst | 2 +- doc/driver-model/of-plat.rst | 12 +++---- doc/driver-model/spi-howto.rst | 8 ++--- doc/driver-model/usb-info.rst | 4 +-- drivers/adc/exynos-adc.c | 4 +-- drivers/adc/meson-saradc.c | 4 +-- drivers/adc/rockchip-saradc.c | 4 +-- drivers/adc/sandbox.c | 4 +-- drivers/ata/dwc_ahci.c | 4 +-- drivers/ata/fsl_sata.c | 4 +-- drivers/ata/mtk_ahci.c | 4 +-- drivers/ata/sata_ceva.c | 4 +-- drivers/cache/cache-v5l2.c | 4 +-- drivers/clk/altera/clk-agilex.c | 4 +-- drivers/clk/altera/clk-arria10.c | 4 +-- drivers/clk/aspeed/clk_ast2500.c | 4 +-- drivers/clk/at91/compat.c | 12 +++---- drivers/clk/clk_boston.c | 4 +-- drivers/clk/clk_fixed_factor.c | 4 +-- drivers/clk/clk_fixed_rate.c | 4 +-- drivers/clk/rockchip/clk_px30.c | 8 ++--- drivers/clk/rockchip/clk_rk3036.c | 4 +-- drivers/clk/rockchip/clk_rk3128.c | 4 +-- drivers/clk/rockchip/clk_rk3188.c | 4 +-- drivers/clk/rockchip/clk_rk322x.c | 4 +-- drivers/clk/rockchip/clk_rk3288.c | 4 +-- drivers/clk/rockchip/clk_rk3308.c | 4 +-- drivers/clk/rockchip/clk_rk3328.c | 4 +-- drivers/clk/rockchip/clk_rk3368.c | 4 +-- drivers/clk/rockchip/clk_rk3399.c | 8 ++--- drivers/clk/rockchip/clk_rv1108.c | 4 +-- drivers/core/acpi.c | 2 +- drivers/core/device.c | 14 ++++---- drivers/core/devres.c | 2 +- drivers/core/root.c | 4 +-- drivers/ddr/altera/sdram_gen5.c | 4 +-- drivers/ddr/altera/sdram_soc64.c | 4 +-- drivers/demo/demo-shape.c | 4 +-- drivers/demo/demo-simple.c | 4 +-- drivers/dma/ti-edma3.c | 4 +-- drivers/gpio/altera_pio.c | 4 +-- drivers/gpio/bcm2835_gpio.c | 4 +-- drivers/gpio/da8xx_gpio.c | 4 +-- drivers/gpio/gpio-uclass.c | 4 +-- drivers/gpio/intel_broadwell_gpio.c | 4 +-- drivers/gpio/intel_gpio.c | 4 +-- drivers/gpio/intel_ich6_gpio.c | 4 +-- drivers/gpio/iproc_gpio.c | 4 +-- drivers/gpio/mpc83xx_spisel_boot.c | 4 +-- drivers/gpio/mpc8xxx_gpio.c | 4 +-- drivers/gpio/msm_gpio.c | 4 +-- drivers/gpio/mxc_gpio.c | 4 +-- drivers/gpio/mxs_gpio.c | 4 +-- drivers/gpio/nx_gpio.c | 4 +-- drivers/gpio/omap_gpio.c | 4 +-- drivers/gpio/pcf8575_gpio.c | 2 +- drivers/gpio/pm8916_gpio.c | 8 ++--- drivers/gpio/sandbox.c | 4 +-- drivers/gpio/sifive-gpio.c | 4 +-- drivers/gpio/vybrid_gpio.c | 2 +- drivers/gpio/xilinx_gpio.c | 4 +-- drivers/gpio/zynq_gpio.c | 4 +-- drivers/i2c/acpi_i2c.c | 2 +- drivers/i2c/acpi_i2c.h | 2 +- drivers/i2c/ast_i2c.c | 4 +-- drivers/i2c/at91_i2c.c | 4 +-- drivers/i2c/cros_ec_tunnel.c | 4 +-- drivers/i2c/designware_i2c.c | 4 +-- drivers/i2c/designware_i2c.h | 2 +- drivers/i2c/designware_i2c_pci.c | 6 ++-- drivers/i2c/exynos_hs_i2c.c | 4 +-- drivers/i2c/fsl_i2c.c | 4 +-- drivers/i2c/i2c-cdns.c | 4 +-- drivers/i2c/i2c-cortina.c | 4 +-- drivers/i2c/i2c-gpio.c | 4 +-- drivers/i2c/i2c-uclass.c | 6 ++-- drivers/i2c/iproc_i2c.c | 4 +-- drivers/i2c/muxes/pca954x.c | 4 +-- drivers/i2c/mvtwsi.c | 4 +-- drivers/i2c/omap24xx_i2c.c | 4 +-- drivers/i2c/rk_i2c.c | 4 +-- drivers/i2c/s3c24x0_i2c.c | 4 +-- drivers/i2c/stm32f7_i2c.c | 4 +-- drivers/led/led_cortina.c | 4 +-- drivers/misc/altera_sysid.c | 4 +-- drivers/misc/atsha204a-i2c.c | 4 +-- drivers/misc/fs_loader.c | 4 +-- drivers/misc/i2c_eeprom.c | 8 ++--- drivers/misc/i2c_eeprom_emul.c | 4 +-- drivers/misc/microchip_flexcom.c | 4 +-- drivers/misc/rockchip-efuse.c | 4 +-- drivers/misc/rockchip-otp.c | 4 +-- drivers/misc/sifive-otp.c | 4 +-- drivers/mmc/am654_sdhci.c | 4 +-- drivers/mmc/arm_pl180_mmci.c | 4 +-- drivers/mmc/ca_dw_mmc.c | 4 +-- drivers/mmc/davinci_mmc.c | 4 +-- drivers/mmc/fsl_esdhc_imx.c | 4 +-- drivers/mmc/ftsdc010_mci.c | 4 +-- drivers/mmc/hi6220_dw_mmc.c | 4 +-- drivers/mmc/jz_mmc.c | 4 +-- drivers/mmc/meson_gx_mmc.c | 4 +-- drivers/mmc/msm_sdhci.c | 4 +-- drivers/mmc/mtk-sd.c | 4 +-- drivers/mmc/mxsmmc.c | 4 +-- drivers/mmc/nexell_dw_mmc.c | 4 +-- drivers/mmc/omap_hsmmc.c | 4 +-- drivers/mmc/pci_mmc.c | 4 +-- drivers/mmc/rockchip_dw_mmc.c | 4 +-- drivers/mmc/rockchip_sdhci.c | 4 +-- drivers/mmc/snps_dw_mmc.c | 4 +-- drivers/mmc/socfpga_dw_mmc.c | 4 +-- drivers/mmc/sti_sdhci.c | 4 +-- drivers/mmc/xenon_sdhci.c | 4 +-- drivers/mmc/zynq_sdhci.c | 4 +-- drivers/mtd/altera_qspi.c | 4 +-- drivers/mtd/nand/raw/octeontx_nand.c | 4 +-- drivers/mtd/spi/sandbox.c | 4 +-- drivers/net/ag7xxx.c | 4 +-- drivers/net/altera_tse.c | 4 +-- drivers/net/bcmgenet.c | 4 +-- drivers/net/designware.c | 4 +-- drivers/net/designware.h | 2 +- drivers/net/dwmac_s700.c | 6 ++-- drivers/net/dwmac_socfpga.c | 6 ++-- drivers/net/ethoc.c | 4 +-- drivers/net/fec_mxc.c | 4 +-- drivers/net/fsl_mcdmafec.c | 6 ++-- drivers/net/ftgmac100.c | 4 +-- drivers/net/ftmac100.c | 4 +-- drivers/net/gmac_rockchip.c | 6 ++-- drivers/net/higmacv300.c | 4 +-- drivers/net/ks8851_mll.c | 4 +-- drivers/net/ldpaa_eth/ldpaa_eth.c | 4 +-- drivers/net/macb.c | 10 +++--- drivers/net/mcffec.c | 6 ++-- drivers/net/mtk_eth.c | 4 +-- drivers/net/mvgbe.c | 4 +-- drivers/net/mvneta.c | 6 ++-- drivers/net/qe/dm_qe_uec.c | 4 +-- drivers/net/ravb.c | 4 +-- drivers/net/sandbox-raw.c | 4 +-- drivers/net/sandbox.c | 4 +-- drivers/net/sh_eth.c | 4 +-- drivers/net/smc911x.c | 4 +-- drivers/net/sni_ave.c | 4 +-- drivers/net/sun8i_emac.c | 4 +-- drivers/net/sunxi_emac.c | 4 +-- drivers/net/ti/cpsw.c | 4 +-- drivers/net/ti/keystone_net.c | 8 ++--- drivers/net/xilinx_axi_emac.c | 4 +-- drivers/net/xilinx_emaclite.c | 4 +-- drivers/net/zynq_gem.c | 4 +-- drivers/pci/pci-aardvark.c | 6 ++-- drivers/pci/pci-rcar-gen2.c | 4 +-- drivers/pci/pci-rcar-gen3.c | 4 +-- drivers/pci/pci-uclass.c | 2 +- drivers/pci/pci_mpc85xx.c | 4 +-- drivers/pci/pci_mvebu.c | 4 +-- drivers/pci/pci_octeontx.c | 4 +-- drivers/pci/pci_tegra.c | 4 +-- drivers/pci/pcie_brcmstb.c | 4 +-- drivers/pci/pcie_dw_mvebu.c | 6 ++-- drivers/pci/pcie_dw_ti.c | 6 ++-- drivers/pci/pcie_ecam_generic.c | 6 ++-- drivers/pci/pcie_fsl.c | 4 +-- drivers/pci/pcie_imx.c | 4 +-- drivers/pci/pcie_intel_fpga.c | 4 +-- drivers/pci/pcie_phytium.c | 6 ++-- drivers/pci/pcie_xilinx.c | 6 ++-- drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 4 +-- drivers/pinctrl/intel/pinctrl.c | 7 ++-- drivers/pinctrl/intel/pinctrl_apl.c | 6 ++-- drivers/pinctrl/mtmips/pinctrl-mt7628.c | 4 +-- drivers/pinctrl/pinctrl-qe-io.c | 4 +-- drivers/pinctrl/pinctrl-single.c | 4 +-- .../power/domain/imx8-power-domain-legacy.c | 4 +-- drivers/power/domain/imx8m-power-domain.c | 4 +-- drivers/power/pmic/i2c_pmic_emul.c | 4 +-- drivers/power/regulator/fan53555.c | 4 +-- drivers/power/regulator/fixed.c | 6 ++-- drivers/power/regulator/gpio-regulator.c | 6 ++-- drivers/power/regulator/pbias_regulator.c | 4 +-- drivers/power/regulator/pwm_regulator.c | 4 +-- drivers/power/regulator/regulator_common.c | 5 +-- drivers/power/regulator/regulator_common.h | 5 +-- drivers/power/regulator/tps65910_regulator.c | 8 ++--- drivers/pwm/exynos_pwm.c | 4 +-- drivers/pwm/pwm-imx.c | 4 +-- drivers/pwm/pwm-meson.c | 4 +-- drivers/pwm/pwm-sifive.c | 4 +-- drivers/pwm/rk_pwm.c | 4 +-- drivers/pwm/sunxi_pwm.c | 4 +-- drivers/pwm/tegra_pwm.c | 4 +-- drivers/ram/aspeed/sdram_ast2500.c | 4 +-- drivers/ram/imxrt_sdram.c | 4 +-- drivers/ram/mpc83xx_sdram.c | 4 +-- drivers/ram/rockchip/dmc-rk3368.c | 4 +-- drivers/ram/rockchip/sdram_rk3188.c | 4 +-- drivers/ram/rockchip/sdram_rk322x.c | 4 +-- drivers/ram/rockchip/sdram_rk3288.c | 4 +-- drivers/ram/rockchip/sdram_rk3328.c | 4 +-- drivers/ram/rockchip/sdram_rk3399.c | 4 +-- drivers/ram/stm32_sdram.c | 4 +-- drivers/reset/reset-mtmips.c | 4 +-- drivers/rng/meson-rng.c | 6 ++-- drivers/rng/rockchip_rng.c | 4 +-- drivers/rng/stm32mp1_rng.c | 4 +-- drivers/rtc/mvrtc.c | 4 +-- drivers/rtc/pl031.c | 4 +-- drivers/serial/altera_jtag_uart.c | 4 +-- drivers/serial/altera_uart.c | 4 +-- drivers/serial/ns16550.c | 4 +-- drivers/serial/sandbox.c | 4 +-- drivers/serial/serial_arc.c | 4 +-- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_bcm283x_pl011.c | 4 +-- drivers/serial/serial_coreboot.c | 4 +-- drivers/serial/serial_cortina.c | 4 +-- drivers/serial/serial_intel_mid.c | 2 +- drivers/serial/serial_lpuart.c | 4 +-- drivers/serial/serial_mcf.c | 4 +-- drivers/serial/serial_meson.c | 4 +-- drivers/serial/serial_msm.c | 4 +-- drivers/serial/serial_mtk.c | 4 +-- drivers/serial/serial_mvebu_a3700.c | 4 +-- drivers/serial/serial_mxc.c | 4 +-- drivers/serial/serial_omap.c | 4 +-- drivers/serial/serial_owl.c | 4 +-- drivers/serial/serial_pl01x.c | 4 +-- drivers/serial/serial_pl01x_internal.h | 2 +- drivers/serial/serial_s5p.c | 4 +-- drivers/serial/serial_sh.c | 4 +-- drivers/serial/serial_sifive.c | 4 +-- drivers/serial/serial_stm32.c | 4 +-- drivers/serial/serial_xuartlite.c | 4 +-- drivers/serial/serial_zynq.c | 4 +-- drivers/sound/max98357a.c | 4 +-- drivers/sound/samsung-i2s.c | 4 +-- drivers/spi/altera_spi.c | 4 +-- drivers/spi/atcspi200_spi.c | 2 +- drivers/spi/bcmstb_spi.c | 4 +-- drivers/spi/cadence_qspi.c | 4 +-- drivers/spi/cf_spi.c | 4 +-- drivers/spi/davinci_spi.c | 2 +- drivers/spi/designware_spi.c | 4 +-- drivers/spi/exynos_spi.c | 4 +-- drivers/spi/fsl_dspi.c | 4 +-- drivers/spi/fsl_espi.c | 4 +-- drivers/spi/ich.c | 4 +-- drivers/spi/kirkwood_spi.c | 4 +-- drivers/spi/mpc8xxx_spi.c | 4 +-- drivers/spi/mvebu_a3700_spi.c | 4 +-- drivers/spi/mxs_spi.c | 4 +-- drivers/spi/nxp_fspi.c | 4 +-- drivers/spi/omap3_spi.c | 4 +-- drivers/spi/pl022_spi.c | 4 +-- drivers/spi/renesas_rpc_spi.c | 4 +-- drivers/spi/rk_spi.c | 4 +-- drivers/spi/sh_qspi.c | 4 +-- drivers/spi/soft_spi.c | 4 +-- drivers/spi/spi-sunxi.c | 4 +-- drivers/spi/spi-uclass.c | 6 ++-- drivers/spi/tegra114_spi.c | 4 +-- drivers/spi/tegra20_sflash.c | 4 +-- drivers/spi/tegra20_slink.c | 4 +-- drivers/spi/tegra210_qspi.c | 4 +-- drivers/spi/ti_qspi.c | 4 +-- drivers/spi/uniphier_spi.c | 4 +-- drivers/spi/zynq_qspi.c | 4 +-- drivers/spi/zynq_spi.c | 4 +-- drivers/spi/zynqmp_gqspi.c | 4 +-- drivers/tee/optee/core.c | 4 +-- drivers/thermal/imx_scu_thermal.c | 4 +-- drivers/timer/ag101p_timer.c | 4 +-- drivers/timer/altera_timer.c | 4 +-- drivers/timer/ast_timer.c | 4 +-- drivers/timer/atcpit100_timer.c | 4 +-- drivers/timer/atmel_pit_timer.c | 4 +-- drivers/timer/cadence-ttc.c | 4 +-- drivers/timer/dw-apb-timer.c | 4 +-- drivers/timer/omap-timer.c | 4 +-- drivers/timer/ostm_timer.c | 4 +-- drivers/timer/rockchip_timer.c | 4 +-- drivers/tpm/cr50_i2c.c | 4 +-- drivers/usb/dwc3/dwc3-generic.c | 6 ++-- drivers/usb/emul/sandbox_flash.c | 4 +-- drivers/usb/gadget/dwc2_udc_otg.c | 4 +-- drivers/usb/host/dwc2.c | 4 +-- drivers/usb/host/dwc3-sti-glue.c | 4 +-- drivers/usb/host/ehci-exynos.c | 4 +-- drivers/usb/host/ehci-fsl.c | 4 +-- drivers/usb/host/ehci-msm.c | 4 +-- drivers/usb/host/ehci-mx5.c | 4 +-- drivers/usb/host/ehci-mx6.c | 4 +-- drivers/usb/host/ehci-omap.c | 4 +-- drivers/usb/host/ehci-tegra.c | 4 +-- drivers/usb/host/ehci-vf.c | 4 +-- drivers/usb/host/ehci-zynq.c | 4 +-- drivers/usb/host/r8a66597-hcd.c | 4 +-- drivers/usb/host/xhci-exynos5.c | 4 +-- drivers/usb/host/xhci-mvebu.c | 4 +-- drivers/usb/host/xhci-rcar.c | 4 +-- drivers/usb/musb-new/da8xx.c | 4 +-- drivers/usb/musb-new/omap2430.c | 4 +-- drivers/usb/musb-new/ti-musb.c | 14 ++++---- drivers/video/am335x-fb.c | 4 +-- drivers/video/atmel_hlcdfb.c | 4 +-- drivers/video/atmel_lcdfb.c | 4 +-- drivers/video/backlight_gpio.c | 4 +-- drivers/video/broadwell_igd.c | 4 +-- drivers/video/exynos/exynos_dp.c | 4 +-- drivers/video/exynos/exynos_fb.c | 4 +-- drivers/video/lg4573.c | 4 +-- drivers/video/orisetech_otm8009a.c | 4 +-- drivers/video/pwm_backlight.c | 4 +-- drivers/video/raydium-rm68200.c | 4 +-- drivers/video/rockchip/rk3288_hdmi.c | 6 ++-- drivers/video/rockchip/rk3288_mipi.c | 4 +-- drivers/video/rockchip/rk3399_hdmi.c | 6 ++-- drivers/video/rockchip/rk3399_mipi.c | 4 +-- drivers/video/rockchip/rk_edp.c | 4 +-- drivers/video/rockchip/rk_hdmi.c | 2 +- drivers/video/rockchip/rk_hdmi.h | 4 +-- drivers/video/rockchip/rk_lvds.c | 4 +-- drivers/video/simple_panel.c | 4 +-- drivers/video/tegra.c | 4 +-- drivers/video/tegra124/dp.c | 4 +-- drivers/video/tegra124/sor.c | 4 +-- drivers/virtio/virtio_mmio.c | 4 +-- drivers/w1/mxc_w1.c | 4 +-- drivers/w1/w1-gpio.c | 4 +-- drivers/watchdog/ast_wdt.c | 4 +-- drivers/watchdog/cdns_wdt.c | 4 +-- drivers/watchdog/orion_wdt.c | 4 +-- drivers/watchdog/sbsa_gwdt.c | 4 +-- drivers/watchdog/sp805_wdt.c | 4 +-- drivers/watchdog/xilinx_tb_wdt.c | 4 +-- drivers/watchdog/xilinx_wwdt.c | 4 +-- include/dm/device-internal.h | 4 +-- include/dm/device.h | 16 ++++----- include/dm/platform_data/spi_pl022.h | 2 +- include/i2c.h | 10 +++--- include/ns16550.h | 4 +-- include/spi.h | 6 ++-- test/dm/devres.c | 2 +- test/dm/test-fdt.c | 14 ++++---- 362 files changed, 797 insertions(+), 797 deletions(-)

diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index 17d2dd660dc..3e9c1f3b33c 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -473,7 +473,7 @@ static const struct misc_ops stm32mp_bsec_ops = { .write = stm32mp_bsec_write, };

-static int stm32mp_bsec_ofdata_to_platdata(struct udevice *dev) +static int stm32mp_bsec_of_to_plat(struct udevice *dev) { struct stm32mp_bsec_platdata *plat = dev_get_plat(dev);

@@ -512,7 +512,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = { .name = "stm32mp_bsec", .id = UCLASS_MISC, .of_match = stm32mp_bsec_ids, - .ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata, + .of_to_plat = stm32mp_bsec_of_to_plat, .plat_auto = sizeof(struct stm32mp_bsec_platdata), .ops = &stm32mp_bsec_ops, .probe = stm32mp_bsec_probe, diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c index 4f468715515..74a5df59487 100644 --- a/arch/arm/mach-stm32mp/pwr_regulator.c +++ b/arch/arm/mach-stm32mp/pwr_regulator.c @@ -59,7 +59,7 @@ static int stm32mp_pwr_read(struct udevice *dev, uint reg, uint8_t *buff, return 0; }

-static int stm32mp_pwr_ofdata_to_platdata(struct udevice *dev) +static int stm32mp_pwr_of_to_plat(struct udevice *dev) { struct stm32mp_pwr_priv *priv = dev_get_priv(dev);

@@ -103,7 +103,7 @@ U_BOOT_DRIVER(stm32mp_pwr_pmic) = { .of_match = stm32mp_pwr_ids, .bind = stm32mp_pwr_bind, .ops = &stm32mp_pwr_ops, - .ofdata_to_platdata = stm32mp_pwr_ofdata_to_platdata, + .of_to_plat = stm32mp_pwr_of_to_plat, .priv_auto = sizeof(struct stm32mp_pwr_priv), };

diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c index 6ff80e5d312..83128c33c2c 100644 --- a/arch/x86/cpu/acpi_gpe.c +++ b/arch/x86/cpu/acpi_gpe.c @@ -51,7 +51,7 @@ static int acpi_gpe_read_and_clear(struct irq *irq) return ret; }

-static int acpi_gpe_ofdata_to_platdata(struct udevice *dev) +static int acpi_gpe_of_to_plat(struct udevice *dev) { struct acpi_gpe_priv *priv = dev_get_priv(dev);

@@ -107,6 +107,6 @@ U_BOOT_DRIVER(acpi_gpe_drv) = { .id = UCLASS_IRQ, .of_match = acpi_gpe_ids, .ops = &acpi_gpe_ops, - .ofdata_to_platdata = acpi_gpe_ofdata_to_platdata, + .of_to_plat = acpi_gpe_of_to_plat, .priv_auto = sizeof(struct acpi_gpe_priv), }; diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c index a8ae6e48291..16f90a484d0 100644 --- a/arch/x86/cpu/apollolake/hostbridge.c +++ b/arch/x86/cpu/apollolake/hostbridge.c @@ -221,7 +221,7 @@ static int apl_hostbridge_early_init(struct udevice *dev) return 0; }

-static int apl_hostbridge_ofdata_to_platdata(struct udevice *dev) +static int apl_hostbridge_of_to_plat(struct udevice *dev) { struct apl_hostbridge_platdata *plat = dev_get_plat(dev); struct udevice *pinctrl; @@ -400,7 +400,7 @@ U_BOOT_DRIVER(intel_apl_hostbridge) = { .name = "intel_apl_hostbridge", .id = UCLASS_NORTHBRIDGE, .of_match = apl_hostbridge_ids, - .ofdata_to_platdata = apl_hostbridge_ofdata_to_platdata, + .of_to_plat = apl_hostbridge_of_to_plat, .probe = apl_hostbridge_probe, .remove = apl_hostbridge_remove, .plat_auto = sizeof(struct apl_hostbridge_platdata), diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index f186c504b3f..931f3399cbf 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -221,7 +221,7 @@ U_BOOT_DRIVER(intel_apl_pmc) = { .name = "intel_apl_pmc", .id = UCLASS_ACPI_PMC, .of_match = apl_pmc_ids, - .ofdata_to_platdata = apl_pmc_ofdata_to_uc_platdata, + .of_to_plat = apl_pmc_ofdata_to_uc_platdata, .probe = apl_pmc_probe, .ops = &apl_pmc_ops, .plat_auto = sizeof(struct apl_pmc_platdata), diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c index bb6da0311f9..b70299b1dd4 100644 --- a/arch/x86/cpu/apollolake/uart.c +++ b/arch/x86/cpu/apollolake/uart.c @@ -72,7 +72,7 @@ void apl_uart_init(pci_dev_t bdf, ulong base) * * When running with of-platdata (generally TPL), the platdata is converted to * something that ns16550 expects. When running withoutof-platdata (SPL, U-Boot - * proper), we use ns16550's ofdata_to_platdata routine. + * proper), we use ns16550's of_to_plat routine. */

static int apl_ns16550_probe(struct udevice *dev) @@ -85,7 +85,7 @@ static int apl_ns16550_probe(struct udevice *dev) return ns16550_serial_probe(dev); }

-static int apl_ns16550_ofdata_to_platdata(struct udevice *dev) +static int apl_ns16550_of_to_plat(struct udevice *dev) { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_apl_ns16550 *dtplat = dev_get_plat(dev); @@ -109,7 +109,7 @@ static int apl_ns16550_ofdata_to_platdata(struct udevice *dev) #else int ret;

- ret = ns16550_serial_ofdata_to_platdata(dev); + ret = ns16550_serial_of_to_plat(dev); if (ret) return ret; #endif /* OF_PLATDATA */ @@ -129,6 +129,6 @@ U_BOOT_DRIVER(intel_apl_ns16550) = { .plat_auto = sizeof(struct ns16550_platdata), .priv_auto = sizeof(struct NS16550), .ops = &ns16550_serial_ops, - .ofdata_to_platdata = apl_ns16550_ofdata_to_platdata, + .of_to_plat = apl_ns16550_of_to_plat, .probe = apl_ns16550_probe, }; diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c index 41f7d5d4d1a..1fa18237809 100644 --- a/arch/x86/cpu/broadwell/adsp.c +++ b/arch/x86/cpu/broadwell/adsp.c @@ -122,7 +122,7 @@ static int broadwell_adsp_probe(struct udevice *dev) return 0; }

-static int broadwell_adsp_ofdata_to_platdata(struct udevice *dev) +static int broadwell_adsp_of_to_plat(struct udevice *dev) { struct broadwell_adsp_priv *priv = dev_get_priv(dev);

@@ -142,7 +142,7 @@ static const struct udevice_id broadwell_adsp_ids[] = { U_BOOT_DRIVER(broadwell_adsp_drv) = { .name = "adsp", .id = UCLASS_SYSCON, - .ofdata_to_platdata = broadwell_adsp_ofdata_to_platdata, + .of_to_plat = broadwell_adsp_of_to_plat, .of_match = broadwell_adsp_ids, .bind = dm_scan_fdt_dev, .probe = broadwell_adsp_probe, diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index 829751ee8a7..c33116a0ff0 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -232,7 +232,7 @@ static int broadwell_sata_enable(struct udevice *dev) return 0; }

-static int broadwell_sata_ofdata_to_platdata(struct udevice *dev) +static int broadwell_sata_of_to_plat(struct udevice *dev) { struct sata_platdata *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; @@ -264,7 +264,7 @@ U_BOOT_DRIVER(ahci_broadwell_drv) = { .name = "ahci_broadwell", .id = UCLASS_AHCI, .of_match = broadwell_ahci_ids, - .ofdata_to_platdata = broadwell_sata_ofdata_to_platdata, + .of_to_plat = broadwell_sata_of_to_plat, .probe = broadwell_sata_probe, .plat_auto = sizeof(struct sata_platdata), }; diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c index 9f354ed2b5a..b9ea968a96d 100644 --- a/arch/x86/cpu/intel_common/itss.c +++ b/arch/x86/cpu/intel_common/itss.c @@ -178,7 +178,7 @@ static int itss_bind(struct udevice *dev) return 0; }

-static int itss_ofdata_to_platdata(struct udevice *dev) +static int itss_of_to_plat(struct udevice *dev) { struct itss_priv *priv = dev_get_priv(dev); int ret; @@ -241,7 +241,7 @@ U_BOOT_DRIVER(intel_itss) = { .of_match = itss_ids, .ops = &itss_ops, .bind = itss_bind, - .ofdata_to_platdata = itss_ofdata_to_platdata, + .of_to_plat = itss_of_to_plat, .plat_auto = sizeof(struct itss_platdata), .priv_auto = sizeof(struct itss_priv), }; diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 804835aa025..39e47090a3a 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -90,7 +90,7 @@ static int p2sb_spl_init(struct udevice *dev) return 0; }

-int p2sb_ofdata_to_platdata(struct udevice *dev) +int p2sb_of_to_plat(struct udevice *dev) { struct p2sb_uc_priv *upriv = dev_get_uclass_priv(dev); struct p2sb_platdata *plat = dev_get_plat(dev); @@ -196,7 +196,7 @@ U_BOOT_DRIVER(intel_p2sb) = { .probe = p2sb_probe, .remove = p2sb_remove, .ops = &p2sb_ops, - .ofdata_to_platdata = p2sb_ofdata_to_platdata, + .of_to_plat = p2sb_of_to_plat, .plat_auto = sizeof(struct p2sb_platdata), .per_child_plat_auto = sizeof(struct p2sb_child_platdata), diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c index 34d09ee9c42..a285e4d202d 100644 --- a/arch/x86/cpu/slimbootloader/serial.c +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -14,7 +14,7 @@ * The serial port info hob is generated by Slim Bootloader, so eligible for * Slim Bootloader based boards only. */ -static int slimbootloader_serial_ofdata_to_platdata(struct udevice *dev) +static int slimbootloader_serial_of_to_plat(struct udevice *dev) { const efi_guid_t guid = SBL_SERIAL_PORT_INFO_GUID; struct sbl_serial_port_info *data; @@ -57,7 +57,7 @@ U_BOOT_DRIVER(serial_slimbootloader) = { .name = "serial_slimbootloader", .id = UCLASS_SERIAL, .of_match = slimbootloader_serial_ids, - .ofdata_to_platdata = slimbootloader_serial_ofdata_to_platdata, + .of_to_plat = slimbootloader_serial_of_to_plat, .plat_auto = sizeof(struct ns16550_platdata), .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, diff --git a/arch/x86/include/asm/intel_pinctrl.h b/arch/x86/include/asm/intel_pinctrl.h index fc59a42463e..44eedc205c3 100644 --- a/arch/x86/include/asm/intel_pinctrl.h +++ b/arch/x86/include/asm/intel_pinctrl.h @@ -162,16 +162,15 @@ extern const struct pinctrl_ops intel_pinctrl_ops; int intel_pinctrl_probe(struct udevice *dev);

/** - * intel_pinctrl_ofdata_to_platdata() - Handle common plat setup + * intel_pinctrl_of_to_plat() - Handle common plat setup * * @dev: Pinctrl device * @comm: Pad community for this device * @num_cfgs: Number of configuration words for each pad * @return 0 if OK, -EDOM if @comm is NULL, other -ve value on other error */ -int intel_pinctrl_ofdata_to_platdata(struct udevice *dev, - const struct pad_community *comm, - int num_cfgs); +int intel_pinctrl_of_to_plat(struct udevice *dev, + const struct pad_community *comm, int num_cfgs);

/** * pinctrl_route_gpe() - set GPIO groups for the general-purpose-event blocks diff --git a/board/intel/galileo/galileo.c b/board/intel/galileo/galileo.c index 720350d0f7f..341b627a65f 100644 --- a/board/intel/galileo/galileo.c +++ b/board/intel/galileo/galileo.c @@ -12,7 +12,7 @@ * Intel Galileo gen2 board uses GPIO Resume Well bank pin0 as the PERST# pin. * * We cannot use any public GPIO APIs in <asm-generic/gpio.h> to control this - * pin, as these APIs will eventually call into gpio_ich6_ofdata_to_platdata() + * pin, as these APIs will eventually call into gpio_ich6_of_to_plat() * in the Intel ICH6 GPIO driver where it calls PCI configuration space access * APIs which will trigger PCI enumeration process. * diff --git a/doc/driver-model/debugging.rst b/doc/driver-model/debugging.rst index c59bf6763bd..bbb2794340f 100644 --- a/doc/driver-model/debugging.rst +++ b/doc/driver-model/debugging.rst @@ -46,7 +46,7 @@ to see errors. Common ones are: going. - -EINVAL which typically indicates that something was missing or wrong in the device tree node. Check that everything is correct and look at the - ofdata_to_platdata() method in the driver. + of_to_plat() method in the driver.

If there is no error, you should check if the device is actually bound. Call dm_dump_all() just before you locate the device to make sure it exists. diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst index 98fa20a08c3..13c4b44aeac 100644 --- a/doc/driver-model/design.rst +++ b/doc/driver-model/design.rst @@ -333,11 +333,11 @@ Briefly, they are:

* bind - make the driver model aware of a device (bind it to its driver) * unbind - make the driver model forget the device - * ofdata_to_platdata - convert device tree data to plat - see later + * of_to_plat - convert device tree data to plat - see later * probe - make a device ready for use * remove - remove a device so it cannot be used until probed again

-The sequence to get a device to work is bind, ofdata_to_platdata (if using +The sequence to get a device to work is bind, of_to_plat (if using device tree) and probe.

@@ -449,23 +449,23 @@ The easiest way to make this work it to add a few members to the driver: .. code-block:: c

.plat_auto = sizeof(struct dm_test_pdata), - .ofdata_to_platdata = testfdt_ofdata_to_platdata, + .of_to_plat = testfdt_of_to_plat,

The 'auto' feature allowed space for the plat to be allocated -and zeroed before the driver's ofdata_to_platdata() method is called. The -ofdata_to_platdata() method, which the driver write supplies, should parse +and zeroed before the driver's of_to_plat() method is called. The +of_to_plat() method, which the driver write supplies, should parse the device tree node for this device and place it in dev->plat. Thus when the probe method is called later (to set up the device ready for use) the platform data will be present.

-Note that both methods are optional. If you provide an ofdata_to_platdata +Note that both methods are optional. If you provide an of_to_plat method then it will be called first (during activation). If you provide a probe method it will be called next. See Driver Lifecycle below for more details.

If you don't want to have the plat automatically allocated then you can leave out plat_auto. In this case you can use malloc -in your ofdata_to_platdata (or probe) method to allocate the required memory, +in your of_to_plat (or probe) method to allocate the required memory, and you should free it in the remove method.

The driver model tree is intended to mirror that of the device tree. The @@ -709,7 +709,7 @@ Most devices have data in the device tree which they can read to find out the base address of hardware registers and parameters relating to driver operation. This is called 'ofdata' (Open-Firmware data).

-The device's_ofdata_to_platdata() implemnents allocation and reading of +The device's of_to_plat() implemnents allocation and reading of plat. A parent's ofdata is always read before a child.

The steps are: @@ -738,7 +738,7 @@ The steps are: space. The controller can hold information about the USB state of each of its children.

- 5. If the driver provides an ofdata_to_platdata() method, then this is + 5. If the driver provides an of_to_plat() method, then this is called to convert the device tree data into platform data. This should do various calls like dev_read_u32(dev, ...) to access the node and store the resulting information into dev->plat. After this point, the device @@ -747,9 +747,9 @@ The steps are: in the plat structure. Typically you will use the plat_auto feature to specify the size of the platform data structure, and U-Boot will automatically allocate and zero it for you before - entry to ofdata_to_platdata(). But if not, you can allocate it yourself in - ofdata_to_platdata(). Note that it is preferable to do all the device tree - decoding in ofdata_to_platdata() rather than in probe(). (Apart from the + entry to of_to_plat(). But if not, you can allocate it yourself in + of_to_plat(). Note that it is preferable to do all the device tree + decoding in of_to_plat() rather than in probe(). (Apart from the ugliness of mixing configuration and run-time data, one day it is possible that U-Boot will cache platform data for devices which are regularly de/activated). @@ -763,7 +763,7 @@ the device up.

Having probing separate from ofdata-reading helps deal with of-platdata, where the probe() method is common to both DT/of-platdata operation, but the -ofdata_to_platdata() method is implemented differently. +of_to_plat() method is implemented differently.

Another case has come up where this separate is useful. Generation of ACPI tables uses the of-platdata but does not want to probe the device. Probing @@ -774,18 +774,18 @@ even be possible to probe the device - e.g. an SD card which is not present will cause an error on probe, yet we still must tell Linux about the SD card connector in case it is used while Linux is running.

-It is important that the ofdata_to_platdata() method does not actually probe +It is important that the of_to_plat() method does not actually probe the device itself. However there are cases where other devices must be probed -in the ofdata_to_platdata() method. An example is where a device requires a +in the of_to_plat() method. An example is where a device requires a GPIO for it to operate. To select a GPIO obviously requires that the GPIO device is probed. This is OK when used by common, core devices such as GPIO, clock, interrupts, reset and the like.

If your device relies on its parent setting up a suitable address space, so that dev_read_addr() works correctly, then make sure that the parent device -has its setup code in ofdata_to_platdata(). If it has it in the probe method, +has its setup code in of_to_plat(). If it has it in the probe method, then you cannot call dev_read_addr() from the child device's -ofdata_to_platdata() method. Move it to probe() instead. Buses like PCI can +of_to_plat() method. Move it to probe() instead. Buses like PCI can fall afoul of this rule.

Activation/probe @@ -862,7 +862,7 @@ remove it. This performs the probe steps in reverse: happens automatically within the driver model core; or

- when plat_auto is 0, both the allocation (in probe() - or preferably ofdata_to_platdata()) and the deallocation in remove() + or preferably of_to_plat()) and the deallocation in remove() are the responsibility of the driver author.

5. The device is marked inactive. Note that it is still bound, so the diff --git a/doc/driver-model/ethernet.rst b/doc/driver-model/ethernet.rst index 2444c5cbd45..cdbccca34d6 100644 --- a/doc/driver-model/ethernet.rst +++ b/doc/driver-model/ethernet.rst @@ -25,7 +25,7 @@ the UCLASS_ETH .id field in the U-Boot driver struct: .name = "eth_ape", .id = UCLASS_ETH, .of_match = eth_ape_ids, - .ofdata_to_platdata = eth_ape_ofdata_to_platdata, + .of_to_plat = eth_ape_of_to_plat, .probe = eth_ape_probe, .ops = &eth_ape_ops, .priv_auto = sizeof(struct eth_ape_priv), diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst index b9976ac72d4..4436c4a2721 100644 --- a/doc/driver-model/of-plat.rst +++ b/doc/driver-model/of-plat.rst @@ -174,7 +174,7 @@ accessed using: struct dtd_rockchip_rk3288_dw_mshc *plat = dev_get_plat(dev);

This avoids the code overhead of converting the device tree data to -platform data in the driver. The ofdata_to_platdata() method should +platform data in the driver. The of_to_plat() method should therefore do nothing in such a driver.

Note that for the platform data to be matched with a driver, the 'name' @@ -222,7 +222,7 @@ all the limitations metioned in caveats above.

Therefore it is recommended that the of-platdata structure should be used only in the probe() method of your driver. It cannot be used in the -ofdata_to_platdata() method since this is not called when platform data is +of_to_plat() method since this is not called when platform data is already present.

@@ -234,7 +234,7 @@ feature is intended as a add-on to existing drivers.

Your driver should convert the plat struct in its probe() method. The existing device tree decoding logic should be kept in the -ofdata_to_platdata() method and wrapped with #if. +of_to_plat() method and wrapped with #if.

For example:

@@ -254,7 +254,7 @@ For example: int fifo_depth; };

- static int mmc_ofdata_to_platdata(struct udevice *dev) + static int mmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) /* Decode the device tree data */ @@ -291,7 +291,7 @@ For example: .name = "mmc_drv", .id = UCLASS_MMC, .of_match = mmc_ids, - .ofdata_to_platdata = mmc_ofdata_to_platdata, + .of_to_plat = mmc_of_to_plat, .probe = mmc_probe, .priv_auto = sizeof(struct mmc_priv), .plat_auto = sizeof(struct mmc_platdata), @@ -313,7 +313,7 @@ speaking it is a non-zero plat_size which triggers this). The of-platdata struct contents is copied from the C structure data to the start of the newly allocated area. In the case where device tree is used, the platform data is allocated, and starts zeroed. In this case the -ofdata_to_platdata() method should still set up the platform data (and the +of_to_plat() method should still set up the platform data (and the of-platdata struct will not be present).

SPL must use either of-platdata or device tree. Drivers cannot use both at diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst index b3b719f572c..0770a09f0b7 100644 --- a/doc/driver-model/spi-howto.rst +++ b/doc/driver-model/spi-howto.rst @@ -69,7 +69,7 @@ Put this code at the bottom of your existing driver file: return NULL; }

- static int exynos_spi_ofdata_to_platdata(struct udevice *dev) + static int exynos_spi_of_to_plat(struct udevice *dev) { return -ENODEV; } @@ -138,7 +138,7 @@ Put this code at the bottom of your existing driver file: .id = UCLASS_SPI, .of_match = exynos_spi_ids, .ops = &exynos_spi_ops, - .ofdata_to_platdata = exynos_spi_ofdata_to_platdata, + .of_to_plat = exynos_spi_of_to_plat, .probe = exynos_spi_probe, .remove = exynos_spi_remove, }; @@ -217,7 +217,7 @@ DM tells you. The name is not quite right. So in this case we would use: };

-Write ofdata_to_platdata() [for device tree only] +Write of_to_plat() [for device tree only] -------------------------------------------------

This method will convert information in the device tree node into a C @@ -239,7 +239,7 @@ fills in the fields from device tree.

.. code-block:: c

- static int exynos_spi_ofdata_to_platdata(struct udevice *bus) + static int exynos_spi_of_to_plat(struct udevice *bus) { struct exynos_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; diff --git a/doc/driver-model/usb-info.rst b/doc/driver-model/usb-info.rst index ec8f3170a90..e9fe9d2904c 100644 --- a/doc/driver-model/usb-info.rst +++ b/doc/driver-model/usb-info.rst @@ -39,7 +39,7 @@ as drivers in the USB uclass. For example: .name = "ehci_tegra", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = tegra_ehci_usb_probe, .remove = tegra_ehci_usb_remove, .ops = &ehci_usb_ops, @@ -51,7 +51,7 @@ as drivers in the USB uclass. For example: Here ehci_usb_ids is used to list the controllers that the driver supports. Each has its own data value. Controllers must be in the UCLASS_USB uclass.

-The ofdata_to_platdata() method allows the controller driver to grab any +The of_to_plat() method allows the controller driver to grab any necessary settings from the device tree.

The ops here are ehci_usb_ops. All EHCI drivers will use these same ops in diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c index 6ae46aed155..65898170858 100644 --- a/drivers/adc/exynos-adc.c +++ b/drivers/adc/exynos-adc.c @@ -101,7 +101,7 @@ int exynos_adc_probe(struct udevice *dev) return 0; }

-int exynos_adc_ofdata_to_platdata(struct udevice *dev) +int exynos_adc_of_to_plat(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct exynos_adc_priv *priv = dev_get_priv(dev); @@ -139,6 +139,6 @@ U_BOOT_DRIVER(exynos_adc) = { .of_match = exynos_adc_ids, .ops = &exynos_adc_ops, .probe = exynos_adc_probe, - .ofdata_to_platdata = exynos_adc_ofdata_to_platdata, + .of_to_plat = exynos_adc_of_to_plat, .priv_auto = sizeof(struct exynos_adc_priv), }; diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c index ac75742657b..13a8f49dc50 100644 --- a/drivers/adc/meson-saradc.c +++ b/drivers/adc/meson-saradc.c @@ -675,7 +675,7 @@ static int meson_saradc_probe(struct udevice *dev) return 0; }

-int meson_saradc_ofdata_to_platdata(struct udevice *dev) +int meson_saradc_of_to_plat(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct meson_saradc_priv *priv = dev_get_priv(dev); @@ -720,6 +720,6 @@ U_BOOT_DRIVER(meson_saradc) = { .of_match = meson_saradc_ids, .ops = &meson_saradc_ops, .probe = meson_saradc_probe, - .ofdata_to_platdata = meson_saradc_ofdata_to_platdata, + .of_to_plat = meson_saradc_of_to_plat, .priv_auto = sizeof(struct meson_saradc_priv), }; diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index 4af7416a41f..e464d33f226 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -117,7 +117,7 @@ int rockchip_saradc_probe(struct udevice *dev) return 0; }

-int rockchip_saradc_ofdata_to_platdata(struct udevice *dev) +int rockchip_saradc_of_to_plat(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); struct rockchip_saradc_priv *priv = dev_get_priv(dev); @@ -179,6 +179,6 @@ U_BOOT_DRIVER(rockchip_saradc) = { .of_match = rockchip_saradc_ids, .ops = &rockchip_saradc_ops, .probe = rockchip_saradc_probe, - .ofdata_to_platdata = rockchip_saradc_ofdata_to_platdata, + .of_to_plat = rockchip_saradc_of_to_plat, .priv_auto = sizeof(struct rockchip_saradc_priv), }; diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c index 905ce4fc51f..6e435462ab8 100644 --- a/drivers/adc/sandbox.c +++ b/drivers/adc/sandbox.c @@ -135,7 +135,7 @@ int sandbox_adc_probe(struct udevice *dev) return 0; }

-int sandbox_adc_ofdata_to_platdata(struct udevice *dev) +int sandbox_adc_of_to_plat(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev);

@@ -168,6 +168,6 @@ U_BOOT_DRIVER(sandbox_adc) = { .of_match = sandbox_adc_ids, .ops = &sandbox_adc_ops, .probe = sandbox_adc_probe, - .ofdata_to_platdata = sandbox_adc_ofdata_to_platdata, + .of_to_plat = sandbox_adc_of_to_plat, .priv_auto = sizeof(struct sandbox_adc_priv), }; diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c index a865bcbcf9e..826fea71cc5 100644 --- a/drivers/ata/dwc_ahci.c +++ b/drivers/ata/dwc_ahci.c @@ -29,7 +29,7 @@ static int dwc_ahci_bind(struct udevice *dev) return ahci_bind_scsi(dev, &scsi_dev); }

-static int dwc_ahci_ofdata_to_platdata(struct udevice *dev) +static int dwc_ahci_of_to_plat(struct udevice *dev) { struct dwc_ahci_priv *priv = dev_get_priv(dev); fdt_addr_t addr; @@ -92,7 +92,7 @@ U_BOOT_DRIVER(dwc_ahci) = { .id = UCLASS_AHCI, .of_match = dwc_ahci_ids, .bind = dwc_ahci_bind, - .ofdata_to_platdata = dwc_ahci_ofdata_to_platdata, + .of_to_plat = dwc_ahci_of_to_plat, .ops = &scsi_ops, .probe = dwc_ahci_probe, .priv_auto = sizeof(struct dwc_ahci_priv), diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c index 9c4171117f2..e44db0a3745 100644 --- a/drivers/ata/fsl_sata.c +++ b/drivers/ata/fsl_sata.c @@ -903,7 +903,7 @@ U_BOOT_DRIVER(sata_fsl_driver) = { .plat_auto = sizeof(struct fsl_ata_priv), };

-static int fsl_ata_ofdata_to_platdata(struct udevice *dev) +static int fsl_ata_of_to_plat(struct udevice *dev) { struct fsl_ata_priv *priv = dev_get_priv(dev);

@@ -1026,7 +1026,7 @@ U_BOOT_DRIVER(fsl_ahci) = { .id = UCLASS_AHCI, .of_match = fsl_ata_ids, .ops = &sata_fsl_ahci_ops, - .ofdata_to_platdata = fsl_ata_ofdata_to_platdata, + .of_to_plat = fsl_ata_of_to_plat, .probe = fsl_ata_probe, .remove = fsl_ata_remove, .priv_auto = sizeof(struct fsl_ata_priv), diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c index ac7fa493b2f..cd28e0cae37 100644 --- a/drivers/ata/mtk_ahci.c +++ b/drivers/ata/mtk_ahci.c @@ -40,7 +40,7 @@ static int mtk_ahci_bind(struct udevice *dev) return ahci_bind_scsi(dev, &scsi_dev); }

-static int mtk_ahci_ofdata_to_platdata(struct udevice *dev) +static int mtk_ahci_of_to_plat(struct udevice *dev) { struct mtk_ahci_priv *priv = dev_get_priv(dev);

@@ -121,7 +121,7 @@ U_BOOT_DRIVER(mtk_ahci) = { .id = UCLASS_AHCI, .of_match = mtk_ahci_ids, .bind = mtk_ahci_bind, - .ofdata_to_platdata = mtk_ahci_ofdata_to_platdata, + .of_to_plat = mtk_ahci_of_to_plat, .ops = &scsi_ops, .probe = mtk_ahci_probe, .priv_auto = sizeof(struct mtk_ahci_priv), diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index 9a77725ae61..87e6a90f74e 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -199,7 +199,7 @@ static const struct udevice_id sata_ceva_ids[] = { { } };

-static int sata_ceva_ofdata_to_platdata(struct udevice *dev) +static int sata_ceva_of_to_plat(struct udevice *dev) { struct ceva_sata_priv *priv = dev_get_priv(dev); struct resource res_regs; @@ -235,5 +235,5 @@ U_BOOT_DRIVER(ceva_host_blk) = { .ops = &scsi_ops, .priv_auto = sizeof(struct ceva_sata_priv), .probe = sata_ceva_probe, - .ofdata_to_platdata = sata_ceva_ofdata_to_platdata, + .of_to_plat = sata_ceva_of_to_plat, }; diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c index 5b9ced98e2f..cb9ebbb4f9c 100644 --- a/drivers/cache/cache-v5l2.c +++ b/drivers/cache/cache-v5l2.c @@ -104,7 +104,7 @@ static int v5l2_disable(struct udevice *dev) return 0; }

-static int v5l2_ofdata_to_platdata(struct udevice *dev) +static int v5l2_of_to_plat(struct udevice *dev) { struct v5l2_plat *plat = dev_get_plat(dev); struct l2cache *regs; @@ -180,7 +180,7 @@ U_BOOT_DRIVER(v5l2_cache) = { .name = "v5l2_cache", .id = UCLASS_CACHE, .of_match = v5l2_cache_ids, - .ofdata_to_platdata = v5l2_ofdata_to_platdata, + .of_to_plat = v5l2_of_to_plat, .probe = v5l2_probe, .plat_auto = sizeof(struct v5l2_plat), .ops = &v5l2_cache_ops, diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c index c67155c03f5..e0f43a264c5 100644 --- a/drivers/clk/altera/clk-agilex.c +++ b/drivers/clk/altera/clk-agilex.c @@ -628,7 +628,7 @@ static int socfpga_clk_probe(struct udevice *dev) return 0; }

-static int socfpga_clk_ofdata_to_platdata(struct udevice *dev) +static int socfpga_clk_of_to_plat(struct udevice *dev) { struct socfpga_clk_platdata *plat = dev_get_plat(dev); fdt_addr_t addr; @@ -657,6 +657,6 @@ U_BOOT_DRIVER(socfpga_agilex_clk) = { .of_match = socfpga_clk_match, .ops = &socfpga_clk_ops, .probe = socfpga_clk_probe, - .ofdata_to_platdata = socfpga_clk_ofdata_to_platdata, + .of_to_plat = socfpga_clk_of_to_plat, .plat_auto = sizeof(struct socfpga_clk_platdata), }; diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index 11f10c51028..e1e4876025d 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -319,7 +319,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev) return 0; }

-static int socfpga_a10_ofdata_to_platdata(struct udevice *dev) +static int socfpga_a10_of_to_plat(struct udevice *dev) { struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); unsigned int divreg[3], gatereg[2]; @@ -357,7 +357,7 @@ U_BOOT_DRIVER(socfpga_a10_clk) = { .ops = &socfpga_a10_clk_ops, .bind = socfpga_a10_clk_bind, .probe = socfpga_a10_clk_probe, - .ofdata_to_platdata = socfpga_a10_ofdata_to_platdata, + .of_to_plat = socfpga_a10_of_to_plat,

.plat_auto = sizeof(struct socfpga_a10_clk_platdata), }; diff --git a/drivers/clk/aspeed/clk_ast2500.c b/drivers/clk/aspeed/clk_ast2500.c index e2e8d49b655..a0906716250 100644 --- a/drivers/clk/aspeed/clk_ast2500.c +++ b/drivers/clk/aspeed/clk_ast2500.c @@ -491,7 +491,7 @@ struct clk_ops ast2500_clk_ops = { .enable = ast2500_clk_enable, };

-static int ast2500_clk_ofdata_to_platdata(struct udevice *dev) +static int ast2500_clk_of_to_plat(struct udevice *dev) { struct ast2500_clk_priv *priv = dev_get_priv(dev);

@@ -526,5 +526,5 @@ U_BOOT_DRIVER(aspeed_ast2500_scu) = { .priv_auto = sizeof(struct ast2500_clk_priv), .ops = &ast2500_clk_ops, .bind = ast2500_clk_bind, - .ofdata_to_platdata = ast2500_clk_ofdata_to_platdata, + .of_to_plat = ast2500_clk_of_to_plat, }; diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index 71375249585..89283e6e36c 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -638,7 +638,7 @@ static struct clk_ops utmi_clk_ops = { .get_rate = utmi_clk_get_rate, };

-static int utmi_clk_ofdata_to_platdata(struct udevice *dev) +static int utmi_clk_of_to_plat(struct udevice *dev) { struct pmc_platdata *plat = dev_get_plat(dev); struct udevice *syscon; @@ -667,7 +667,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = { .id = UCLASS_CLK, .of_match = utmi_clk_match, .probe = utmi_clk_probe, - .ofdata_to_platdata = utmi_clk_ofdata_to_platdata, + .of_to_plat = utmi_clk_of_to_plat, .plat_auto = sizeof(struct pmc_platdata), .ops = &utmi_clk_ops, }; @@ -853,7 +853,7 @@ static struct clk_ops generic_clk_ops = { .set_rate = generic_clk_set_rate, };

-static int generic_clk_ofdata_to_platdata(struct udevice *dev) +static int generic_clk_of_to_plat(struct udevice *dev) { struct generic_clk_priv *priv = dev_get_priv(dev); u32 cells[GENERATED_SOURCE_MAX]; @@ -875,7 +875,7 @@ U_BOOT_DRIVER(generic_clk) = { .name = "generic-clk", .id = UCLASS_CLK, .probe = at91_clk_probe, - .ofdata_to_platdata = generic_clk_ofdata_to_platdata, + .of_to_plat = generic_clk_of_to_plat, .priv_auto = sizeof(struct generic_clk_priv), .plat_auto = sizeof(struct pmc_platdata), .ops = &generic_clk_ops, @@ -977,7 +977,7 @@ static struct clk_ops at91_usb_clk_ops = { .set_rate = at91_usb_clk_set_rate, };

-static int at91_usb_clk_ofdata_to_platdata(struct udevice *dev) +static int at91_usb_clk_of_to_plat(struct udevice *dev) { struct at91_usb_clk_priv *priv = dev_get_priv(dev); u32 cells[AT91_USB_CLK_SOURCE_MAX]; @@ -1011,7 +1011,7 @@ U_BOOT_DRIVER(at91_usb_clk) = { .id = UCLASS_CLK, .of_match = at91_usb_clk_match, .probe = at91_usb_clk_probe, - .ofdata_to_platdata = at91_usb_clk_ofdata_to_platdata, + .of_to_plat = at91_usb_clk_of_to_plat, .priv_auto = sizeof(struct at91_usb_clk_priv), .plat_auto = sizeof(struct pmc_platdata), .ops = &at91_usb_clk_ops, diff --git a/drivers/clk/clk_boston.c b/drivers/clk/clk_boston.c index 374fc9ac76b..2e81777b703 100644 --- a/drivers/clk/clk_boston.c +++ b/drivers/clk/clk_boston.c @@ -58,7 +58,7 @@ const struct clk_ops clk_boston_ops = { .get_rate = clk_boston_get_rate, };

-static int clk_boston_ofdata_to_platdata(struct udevice *dev) +static int clk_boston_of_to_plat(struct udevice *dev) { struct clk_boston *state = dev_get_plat(dev); struct udevice *syscon; @@ -91,7 +91,7 @@ U_BOOT_DRIVER(clk_boston) = { .name = "boston_clock", .id = UCLASS_CLK, .of_match = clk_boston_match, - .ofdata_to_platdata = clk_boston_ofdata_to_platdata, + .of_to_plat = clk_boston_of_to_plat, .plat_auto = sizeof(struct clk_boston), .ops = &clk_boston_ops, }; diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c index d68f79d4f39..e51f94a9371 100644 --- a/drivers/clk/clk_fixed_factor.c +++ b/drivers/clk/clk_fixed_factor.c @@ -38,7 +38,7 @@ const struct clk_ops clk_fixed_factor_ops = { .get_rate = clk_fixed_factor_get_rate, };

-static int clk_fixed_factor_ofdata_to_platdata(struct udevice *dev) +static int clk_fixed_factor_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) int err; @@ -66,7 +66,7 @@ U_BOOT_DRIVER(clk_fixed_factor) = { .name = "fixed_factor_clock", .id = UCLASS_CLK, .of_match = clk_fixed_factor_match, - .ofdata_to_platdata = clk_fixed_factor_ofdata_to_platdata, + .of_to_plat = clk_fixed_factor_of_to_plat, .plat_auto = sizeof(struct clk_fixed_factor), .ops = &clk_fixed_factor_ops, }; diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c index 3b60434019b..12d81a7ff7a 100644 --- a/drivers/clk/clk_fixed_rate.c +++ b/drivers/clk/clk_fixed_rate.c @@ -24,7 +24,7 @@ const struct clk_ops clk_fixed_rate_ops = { .enable = dummy_enable, };

-static int clk_fixed_rate_ofdata_to_platdata(struct udevice *dev) +static int clk_fixed_rate_of_to_plat(struct udevice *dev) { struct clk *clk = &to_clk_fixed_rate(dev)->clk; #if !CONFIG_IS_ENABLED(OF_PLATDATA) @@ -50,7 +50,7 @@ U_BOOT_DRIVER(fixed_clock) = { .name = "fixed_clock", .id = UCLASS_CLK, .of_match = clk_fixed_rate_match, - .ofdata_to_platdata = clk_fixed_rate_ofdata_to_platdata, + .of_to_plat = clk_fixed_rate_of_to_plat, .plat_auto = sizeof(struct clk_fixed_rate), .ops = &clk_fixed_rate_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c index f12b010d5af..355362dd678 100644 --- a/drivers/clk/rockchip/clk_px30.c +++ b/drivers/clk/rockchip/clk_px30.c @@ -1432,7 +1432,7 @@ static int px30_clk_probe(struct udevice *dev) return 0; }

-static int px30_clk_ofdata_to_platdata(struct udevice *dev) +static int px30_clk_of_to_plat(struct udevice *dev) { struct px30_clk_priv *priv = dev_get_priv(dev);

@@ -1481,7 +1481,7 @@ U_BOOT_DRIVER(rockchip_px30_cru) = { .id = UCLASS_CLK, .of_match = px30_clk_ids, .priv_auto = sizeof(struct px30_clk_priv), - .ofdata_to_platdata = px30_clk_ofdata_to_platdata, + .of_to_plat = px30_clk_of_to_plat, .ops = &px30_clk_ops, .bind = px30_clk_bind, .probe = px30_clk_probe, @@ -1609,7 +1609,7 @@ static int px30_pmuclk_probe(struct udevice *dev) return 0; }

-static int px30_pmuclk_ofdata_to_platdata(struct udevice *dev) +static int px30_pmuclk_of_to_plat(struct udevice *dev) { struct px30_pmuclk_priv *priv = dev_get_priv(dev);

@@ -1628,7 +1628,7 @@ U_BOOT_DRIVER(rockchip_px30_pmucru) = { .id = UCLASS_CLK, .of_match = px30_pmuclk_ids, .priv_auto = sizeof(struct px30_pmuclk_priv), - .ofdata_to_platdata = px30_pmuclk_ofdata_to_platdata, + .of_to_plat = px30_pmuclk_of_to_plat, .ops = &px30_pmuclk_ops, .probe = px30_pmuclk_probe, }; diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c index 8d11e242d05..07ef6133f29 100644 --- a/drivers/clk/rockchip/clk_rk3036.c +++ b/drivers/clk/rockchip/clk_rk3036.c @@ -318,7 +318,7 @@ static struct clk_ops rk3036_clk_ops = { .set_rate = rk3036_clk_set_rate, };

-static int rk3036_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3036_clk_of_to_plat(struct udevice *dev) { struct rk3036_clk_priv *priv = dev_get_priv(dev);

@@ -376,7 +376,7 @@ U_BOOT_DRIVER(rockchip_rk3036_cru) = { .id = UCLASS_CLK, .of_match = rk3036_clk_ids, .priv_auto = sizeof(struct rk3036_clk_priv), - .ofdata_to_platdata = rk3036_clk_ofdata_to_platdata, + .of_to_plat = rk3036_clk_of_to_plat, .ops = &rk3036_clk_ops, .bind = rk3036_clk_bind, .probe = rk3036_clk_probe, diff --git a/drivers/clk/rockchip/clk_rk3128.c b/drivers/clk/rockchip/clk_rk3128.c index ac44ab442c7..9349e14830e 100644 --- a/drivers/clk/rockchip/clk_rk3128.c +++ b/drivers/clk/rockchip/clk_rk3128.c @@ -546,7 +546,7 @@ static struct clk_ops rk3128_clk_ops = { .set_rate = rk3128_clk_set_rate, };

-static int rk3128_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3128_clk_of_to_plat(struct udevice *dev) { struct rk3128_clk_priv *priv = dev_get_priv(dev);

@@ -598,7 +598,7 @@ U_BOOT_DRIVER(rockchip_rk3128_cru) = { .id = UCLASS_CLK, .of_match = rk3128_clk_ids, .priv_auto = sizeof(struct rk3128_clk_priv), - .ofdata_to_platdata = rk3128_clk_ofdata_to_platdata, + .of_to_plat = rk3128_clk_of_to_plat, .ops = &rk3128_clk_ops, .bind = rk3128_clk_bind, .probe = rk3128_clk_probe, diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c index 4c4bd68f5d8..48bfe09b11f 100644 --- a/drivers/clk/rockchip/clk_rk3188.c +++ b/drivers/clk/rockchip/clk_rk3188.c @@ -538,7 +538,7 @@ static struct clk_ops rk3188_clk_ops = { .set_rate = rk3188_clk_set_rate, };

-static int rk3188_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3188_clk_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3188_clk_priv *priv = dev_get_priv(dev); @@ -620,6 +620,6 @@ U_BOOT_DRIVER(rockchip_rk3188_cru) = { .plat_auto = sizeof(struct rk3188_clk_plat), .ops = &rk3188_clk_ops, .bind = rk3188_clk_bind, - .ofdata_to_platdata = rk3188_clk_ofdata_to_platdata, + .of_to_plat = rk3188_clk_of_to_plat, .probe = rk3188_clk_probe, }; diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c index 92e7ff384e1..c2f5fc0fd75 100644 --- a/drivers/clk/rockchip/clk_rk322x.c +++ b/drivers/clk/rockchip/clk_rk322x.c @@ -475,7 +475,7 @@ static struct clk_ops rk322x_clk_ops = { .set_parent = rk322x_clk_set_parent, };

-static int rk322x_clk_ofdata_to_platdata(struct udevice *dev) +static int rk322x_clk_of_to_plat(struct udevice *dev) { struct rk322x_clk_priv *priv = dev_get_priv(dev);

@@ -533,7 +533,7 @@ U_BOOT_DRIVER(rockchip_rk322x_cru) = { .id = UCLASS_CLK, .of_match = rk322x_clk_ids, .priv_auto = sizeof(struct rk322x_clk_priv), - .ofdata_to_platdata = rk322x_clk_ofdata_to_platdata, + .of_to_plat = rk322x_clk_of_to_plat, .ops = &rk322x_clk_ops, .bind = rk322x_clk_bind, .probe = rk322x_clk_probe, diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 588cfcc2327..e87fdfc54dd 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -954,7 +954,7 @@ static struct clk_ops rk3288_clk_ops = { #endif };

-static int rk3288_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3288_clk_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3288_clk_priv *priv = dev_get_priv(dev); @@ -1044,6 +1044,6 @@ U_BOOT_DRIVER(rockchip_rk3288_cru) = { .plat_auto = sizeof(struct rk3288_clk_plat), .ops = &rk3288_clk_ops, .bind = rk3288_clk_bind, - .ofdata_to_platdata = rk3288_clk_ofdata_to_platdata, + .of_to_plat = rk3288_clk_of_to_plat, .probe = rk3288_clk_probe, }; diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c index c36512b6794..30589512ecc 100644 --- a/drivers/clk/rockchip/clk_rk3308.c +++ b/drivers/clk/rockchip/clk_rk3308.c @@ -1019,7 +1019,7 @@ static int rk3308_clk_probe(struct udevice *dev) return ret; }

-static int rk3308_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3308_clk_of_to_plat(struct udevice *dev) { struct rk3308_clk_priv *priv = dev_get_priv(dev);

@@ -1068,7 +1068,7 @@ U_BOOT_DRIVER(rockchip_rk3308_cru) = { .id = UCLASS_CLK, .of_match = rk3308_clk_ids, .priv_auto = sizeof(struct rk3308_clk_priv), - .ofdata_to_platdata = rk3308_clk_ofdata_to_platdata, + .of_to_plat = rk3308_clk_of_to_plat, .ops = &rk3308_clk_ops, .bind = rk3308_clk_bind, .probe = rk3308_clk_probe, diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c index e28e0996c68..e2df71290f4 100644 --- a/drivers/clk/rockchip/clk_rk3328.c +++ b/drivers/clk/rockchip/clk_rk3328.c @@ -797,7 +797,7 @@ static int rk3328_clk_probe(struct udevice *dev) return 0; }

-static int rk3328_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3328_clk_of_to_plat(struct udevice *dev) { struct rk3328_clk_priv *priv = dev_get_priv(dev);

@@ -846,7 +846,7 @@ U_BOOT_DRIVER(rockchip_rk3328_cru) = { .id = UCLASS_CLK, .of_match = rk3328_clk_ids, .priv_auto = sizeof(struct rk3328_clk_priv), - .ofdata_to_platdata = rk3328_clk_ofdata_to_platdata, + .of_to_plat = rk3328_clk_of_to_plat, .ops = &rk3328_clk_ops, .bind = rk3328_clk_bind, .probe = rk3328_clk_probe, diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index 08c98e01ce0..9267cac6bcd 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -593,7 +593,7 @@ static int rk3368_clk_probe(struct udevice *dev) return 0; }

-static int rk3368_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3368_clk_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3368_clk_priv *priv = dev_get_priv(dev); @@ -647,7 +647,7 @@ U_BOOT_DRIVER(rockchip_rk3368_cru) = { #if CONFIG_IS_ENABLED(OF_PLATDATA) .plat_auto = sizeof(struct rk3368_clk_plat), #endif - .ofdata_to_platdata = rk3368_clk_ofdata_to_platdata, + .of_to_plat = rk3368_clk_of_to_plat, .ops = &rk3368_clk_ops, .bind = rk3368_clk_bind, .probe = rk3368_clk_probe, diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 2c0ff3b65b2..68d5dbb581c 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1398,7 +1398,7 @@ static int rk3399_clk_probe(struct udevice *dev) return 0; }

-static int rk3399_clk_ofdata_to_platdata(struct udevice *dev) +static int rk3399_clk_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3399_clk_priv *priv = dev_get_priv(dev); @@ -1448,7 +1448,7 @@ U_BOOT_DRIVER(clk_rk3399) = { .id = UCLASS_CLK, .of_match = rk3399_clk_ids, .priv_auto = sizeof(struct rk3399_clk_priv), - .ofdata_to_platdata = rk3399_clk_ofdata_to_platdata, + .of_to_plat = rk3399_clk_of_to_plat, .ops = &rk3399_clk_ops, .bind = rk3399_clk_bind, .probe = rk3399_clk_probe, @@ -1610,7 +1610,7 @@ static int rk3399_pmuclk_probe(struct udevice *dev) return 0; }

-static int rk3399_pmuclk_ofdata_to_platdata(struct udevice *dev) +static int rk3399_pmuclk_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3399_pmuclk_priv *priv = dev_get_priv(dev); @@ -1643,7 +1643,7 @@ U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = { .id = UCLASS_CLK, .of_match = rk3399_pmuclk_ids, .priv_auto = sizeof(struct rk3399_pmuclk_priv), - .ofdata_to_platdata = rk3399_pmuclk_ofdata_to_platdata, + .of_to_plat = rk3399_pmuclk_of_to_plat, .ops = &rk3399_pmuclk_ops, .probe = rk3399_pmuclk_probe, .bind = rk3399_pmuclk_bind, diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c index efc07a05b1d..62bcf5a2ab3 100644 --- a/drivers/clk/rockchip/clk_rv1108.c +++ b/drivers/clk/rockchip/clk_rv1108.c @@ -662,7 +662,7 @@ static void rkclk_init(struct rv1108_cru *cru) aclk_bus, aclk_peri, hclk_peri, pclk_peri); }

-static int rv1108_clk_ofdata_to_platdata(struct udevice *dev) +static int rv1108_clk_of_to_plat(struct udevice *dev) { struct rv1108_clk_priv *priv = dev_get_priv(dev);

@@ -722,6 +722,6 @@ U_BOOT_DRIVER(clk_rv1108) = { .priv_auto = sizeof(struct rv1108_clk_priv), .ops = &rv1108_clk_ops, .bind = rv1108_clk_bind, - .ofdata_to_platdata = rv1108_clk_ofdata_to_platdata, + .of_to_plat = rv1108_clk_of_to_plat, .probe = rv1108_clk_probe, }; diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c index 63a791f335e..0901b9260a1 100644 --- a/drivers/core/acpi.c +++ b/drivers/core/acpi.c @@ -269,7 +269,7 @@ int acpi_recurse_method(struct acpi_ctx *ctx, struct udevice *parent, void *start = ctx->current;

log_debug("- method %d, %s %p\n", method, parent->name, func); - ret = device_ofdata_to_platdata(parent); + ret = device_of_to_plat(parent); if (ret) return log_msg_ret("ofdata", ret); ret = func(parent, ctx); diff --git a/drivers/core/device.c b/drivers/core/device.c index b9515364405..7e36689cbd7 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -324,7 +324,7 @@ static void *alloc_priv(int size, uint flags) return priv; }

-int device_ofdata_to_platdata(struct udevice *dev) +int device_of_to_plat(struct udevice *dev) { const struct driver *drv; int size = 0; @@ -338,7 +338,7 @@ int device_ofdata_to_platdata(struct udevice *dev)

/* Ensure all parents have ofdata */ if (dev->parent) { - ret = device_ofdata_to_platdata(dev->parent); + ret = device_of_to_plat(dev->parent); if (ret) goto fail;

@@ -389,9 +389,9 @@ int device_ofdata_to_platdata(struct udevice *dev) } }

- if (drv->ofdata_to_platdata && + if (drv->of_to_plat && (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { - ret = drv->ofdata_to_platdata(dev); + ret = drv->of_to_plat(dev); if (ret) goto fail; } @@ -419,7 +419,7 @@ int device_probe(struct udevice *dev) drv = dev->driver; assert(drv);

- ret = device_ofdata_to_platdata(dev); + ret = device_of_to_plat(dev); if (ret) goto fail;

@@ -861,7 +861,7 @@ int device_first_child_ofdata_err(struct udevice *parent, struct udevice **devp) if (!dev) return -ENODEV;

- ret = device_ofdata_to_platdata(dev); + ret = device_of_to_plat(dev); if (ret) return ret;

@@ -879,7 +879,7 @@ int device_next_child_ofdata_err(struct udevice **devp) if (!dev) return -ENODEV;

- ret = device_ofdata_to_platdata(dev); + ret = device_of_to_plat(dev); if (ret) return ret;

diff --git a/drivers/core/devres.c b/drivers/core/devres.c index 88244698b0c..522b07d613f 100644 --- a/drivers/core/devres.c +++ b/drivers/core/devres.c @@ -23,7 +23,7 @@ /** enum devres_phase - Shows where resource was allocated * * DEVRES_PHASE_BIND: In the bind() method - * DEVRES_PHASE_OFDATA: In the ofdata_to_platdata() method + * DEVRES_PHASE_OFDATA: In the of_to_plat() method * DEVRES_PHASE_PROBE: In the probe() method */ enum devres_phase { diff --git a/drivers/core/root.c b/drivers/core/root.c index 4bdac4f3a6a..4fa98f05081 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -69,8 +69,8 @@ void fix_drivers(void) entry->remove += gd->reloc_off; if (entry->unbind) entry->unbind += gd->reloc_off; - if (entry->ofdata_to_platdata) - entry->ofdata_to_platdata += gd->reloc_off; + if (entry->of_to_plat) + entry->of_to_plat += gd->reloc_off; if (entry->child_post_bind) entry->child_post_bind += gd->reloc_off; if (entry->child_pre_probe) diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index e7c9b7a18ab..286961ca336 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -563,7 +563,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl) return temp; }

-static int altera_gen5_sdram_ofdata_to_platdata(struct udevice *dev) +static int altera_gen5_sdram_of_to_plat(struct udevice *dev) { struct altera_gen5_sdram_platdata *plat = dev->plat;

@@ -646,7 +646,7 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .id = UCLASS_RAM, .of_match = altera_gen5_sdram_ids, .ops = &altera_gen5_sdram_ops, - .ofdata_to_platdata = altera_gen5_sdram_ofdata_to_platdata, + .of_to_plat = altera_gen5_sdram_of_to_plat, .plat_auto = sizeof(struct altera_gen5_sdram_platdata), .probe = altera_gen5_sdram_probe, .priv_auto = sizeof(struct altera_gen5_sdram_priv), diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 081087aa967..0bd40c2a0da 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -230,7 +230,7 @@ phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat) return size; }

-static int altera_sdram_ofdata_to_platdata(struct udevice *dev) +static int altera_sdram_of_to_plat(struct udevice *dev) { struct altera_sdram_platdata *plat = dev->plat; fdt_addr_t addr; @@ -303,7 +303,7 @@ U_BOOT_DRIVER(altera_sdram) = { .id = UCLASS_RAM, .of_match = altera_sdram_ids, .ops = &altera_sdram_ops, - .ofdata_to_platdata = altera_sdram_ofdata_to_platdata, + .of_to_plat = altera_sdram_of_to_plat, .plat_auto = sizeof(struct altera_sdram_platdata), .probe = altera_sdram_probe, .priv_auto = sizeof(struct altera_sdram_priv), diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c index b13a4ee4e8a..8129317ba1b 100644 --- a/drivers/demo/demo-shape.c +++ b/drivers/demo/demo-shape.c @@ -140,7 +140,7 @@ static const struct demo_ops shape_ops = { .set_light = set_light, };

-static int shape_ofdata_to_platdata(struct udevice *dev) +static int shape_of_to_plat(struct udevice *dev) { struct dm_demo_pdata *pdata = dev_get_plat(dev); int ret; @@ -189,7 +189,7 @@ U_BOOT_DRIVER(demo_shape_drv) = { .name = "demo_shape_drv", .of_match = demo_shape_id, .id = UCLASS_DEMO, - .ofdata_to_platdata = shape_ofdata_to_platdata, + .of_to_plat = shape_of_to_plat, .ops = &shape_ops, .probe = dm_shape_probe, .remove = dm_shape_remove, diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index 39b370cd9b5..28b271f7791 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -26,7 +26,7 @@ static const struct demo_ops simple_ops = { .hello = simple_hello, };

-static int demo_shape_ofdata_to_platdata(struct udevice *dev) +static int demo_shape_of_to_plat(struct udevice *dev) { /* Parse the data that is common with all demo devices */ return demo_parse_dt(dev); @@ -41,7 +41,7 @@ U_BOOT_DRIVER(demo_simple_drv) = { .name = "demo_simple_drv", .of_match = demo_shape_id, .id = UCLASS_DEMO, - .ofdata_to_platdata = demo_shape_ofdata_to_platdata, + .of_to_plat = demo_shape_of_to_plat, .ops = &simple_ops, .plat_auto = sizeof(struct dm_demo_pdata), }; diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c index 4272f4cab80..ec3dc62d2f3 100644 --- a/drivers/dma/ti-edma3.c +++ b/drivers/dma/ti-edma3.c @@ -542,7 +542,7 @@ static int ti_edma3_transfer(struct udevice *dev, int direction, void *dst, return 0; }

-static int ti_edma3_ofdata_to_platdata(struct udevice *dev) +static int ti_edma3_of_to_plat(struct udevice *dev) { struct ti_edma3_priv *priv = dev_get_priv(dev);

@@ -574,7 +574,7 @@ U_BOOT_DRIVER(ti_edma3) = { .id = UCLASS_DMA, .of_match = ti_edma3_ids, .ops = &ti_edma3_ops, - .ofdata_to_platdata = ti_edma3_ofdata_to_platdata, + .of_to_plat = ti_edma3_of_to_plat, .probe = ti_edma3_probe, .priv_auto = sizeof(struct ti_edma3_priv), }; diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 0b1861a2609..24e047e66a8 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -84,7 +84,7 @@ static int altera_pio_probe(struct udevice *dev) return 0; }

-static int altera_pio_ofdata_to_platdata(struct udevice *dev) +static int altera_pio_of_to_plat(struct udevice *dev) { struct altera_pio_platdata *plat = dev_get_plat(dev);

@@ -116,7 +116,7 @@ U_BOOT_DRIVER(altera_pio) = { .id = UCLASS_GPIO, .of_match = altera_pio_ids, .ops = &altera_pio_ops, - .ofdata_to_platdata = altera_pio_ofdata_to_platdata, + .of_to_plat = altera_pio_of_to_plat, .plat_auto = sizeof(struct altera_pio_platdata), .probe = altera_pio_probe, }; diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index 7c3f24e6734..a348c68a7ef 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -116,7 +116,7 @@ static int bcm2835_gpio_probe(struct udevice *dev) }

#if CONFIG_IS_ENABLED(OF_CONTROL) -static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev) +static int bcm2835_gpio_of_to_plat(struct udevice *dev) { struct bcm2835_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr; @@ -133,7 +133,7 @@ static int bcm2835_gpio_ofdata_to_platdata(struct udevice *dev) U_BOOT_DRIVER(gpio_bcm2835) = { .name = "gpio_bcm2835", .id = UCLASS_GPIO, - .ofdata_to_platdata = of_match_ptr(bcm2835_gpio_ofdata_to_platdata), + .of_to_plat = of_match_ptr(bcm2835_gpio_of_to_plat), .plat_auto = sizeof(struct bcm2835_gpio_platdata), .ops = &gpio_bcm2835_ops, .probe = bcm2835_gpio_probe, diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index ff61a4cb11e..b47d65d4df2 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -540,7 +540,7 @@ static const struct udevice_id davinci_gpio_ids[] = { { } };

-static int davinci_gpio_ofdata_to_platdata(struct udevice *dev) +static int davinci_gpio_of_to_plat(struct udevice *dev) { struct davinci_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr; @@ -557,7 +557,7 @@ U_BOOT_DRIVER(ti_dm6441_gpio) = { .name = "ti_dm6441_gpio", .id = UCLASS_GPIO, .ops = &gpio_davinci_ops, - .ofdata_to_platdata = of_match_ptr(davinci_gpio_ofdata_to_platdata), + .of_to_plat = of_match_ptr(davinci_gpio_of_to_plat), .of_match = davinci_gpio_ids, .bind = dm_scan_fdt_dev, .plat_auto = sizeof(struct davinci_gpio_platdata), diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 3140a3fd092..cd0b9cab07d 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -239,7 +239,7 @@ struct gpio_hog_data { u32 val[2]; };

-static int gpio_hog_ofdata_to_platdata(struct udevice *dev) +static int gpio_hog_of_to_plat(struct udevice *dev) { struct gpio_hog_data *plat = dev_get_plat(dev); const char *nodename; @@ -338,7 +338,7 @@ int gpio_hog_lookup_name(const char *name, struct gpio_desc **desc) U_BOOT_DRIVER(gpio_hog) = { .name = "gpio_hog", .id = UCLASS_NOP, - .ofdata_to_platdata = gpio_hog_ofdata_to_platdata, + .of_to_plat = gpio_hog_of_to_plat, .probe = gpio_hog_probe, .priv_auto = sizeof(struct gpio_hog_priv), .plat_auto = sizeof(struct gpio_hog_data), diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index 2b9e1a284a3..9cd0745625e 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -139,7 +139,7 @@ static int broadwell_gpio_probe(struct udevice *dev) return 0; }

-static int broadwell_gpio_ofdata_to_platdata(struct udevice *dev) +static int broadwell_gpio_of_to_plat(struct udevice *dev) { struct broadwell_bank_platdata *plat = dev_get_plat(dev); u32 gpiobase; @@ -182,7 +182,7 @@ U_BOOT_DRIVER(gpio_broadwell) = { .id = UCLASS_GPIO, .of_match = intel_broadwell_gpio_ids, .ops = &gpio_broadwell_ops, - .ofdata_to_platdata = broadwell_gpio_ofdata_to_platdata, + .of_to_plat = broadwell_gpio_of_to_plat, .probe = broadwell_gpio_probe, .priv_auto = sizeof(struct broadwell_bank_priv), .plat_auto = sizeof(struct broadwell_bank_platdata), diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c index c3b67f24d8f..41540d8ebc6 100644 --- a/drivers/gpio/intel_gpio.c +++ b/drivers/gpio/intel_gpio.c @@ -164,7 +164,7 @@ static int intel_gpio_probe(struct udevice *dev) return 0; }

-static int intel_gpio_ofdata_to_platdata(struct udevice *dev) +static int intel_gpio_of_to_plat(struct udevice *dev) { struct gpio_dev_priv *upriv = dev_get_uclass_priv(dev); struct intel_pinctrl_priv *pinctrl_priv = dev_get_priv(dev->parent); @@ -198,6 +198,6 @@ U_BOOT_DRIVER(intel_gpio) = { .id = UCLASS_GPIO, .of_match = intel_intel_gpio_ids, .ops = &gpio_intel_ops, - .ofdata_to_platdata = intel_gpio_ofdata_to_platdata, + .of_to_plat = intel_gpio_of_to_plat, .probe = intel_gpio_probe, }; diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index cfb2ddab78b..add13d89a71 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -93,7 +93,7 @@ static int _ich6_gpio_set_direction(uint16_t base, unsigned offset, int dir) return 0; }

-static int gpio_ich6_ofdata_to_platdata(struct udevice *dev) +static int gpio_ich6_of_to_plat(struct udevice *dev) { struct ich6_bank_platdata *plat = dev_get_plat(dev); u32 gpiobase; @@ -234,7 +234,7 @@ U_BOOT_DRIVER(gpio_ich6) = { .id = UCLASS_GPIO, .of_match = intel_ich6_gpio_ids, .ops = &gpio_ich6_ops, - .ofdata_to_platdata = gpio_ich6_ofdata_to_platdata, + .of_to_plat = gpio_ich6_of_to_plat, .probe = ich6_gpio_probe, .priv_auto = sizeof(struct ich6_bank_priv), .plat_auto = sizeof(struct ich6_bank_platdata), diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c index 32a849e2708..8bc8783f62c 100644 --- a/drivers/gpio/iproc_gpio.c +++ b/drivers/gpio/iproc_gpio.c @@ -218,7 +218,7 @@ static int iproc_gpio_get_function(struct udevice *dev, u32 gpio) return GPIOF_INPUT; }

-static int iproc_gpio_ofdata_to_platdata(struct udevice *dev) +static int iproc_gpio_of_to_plat(struct udevice *dev) { struct iproc_gpio_platdata *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); @@ -285,6 +285,6 @@ U_BOOT_DRIVER(iproc_gpio) = { .id = UCLASS_GPIO, .of_match = iproc_gpio_ids, .ops = &iproc_gpio_ops, - .ofdata_to_platdata = iproc_gpio_ofdata_to_platdata, + .of_to_plat = iproc_gpio_of_to_plat, .plat_auto = sizeof(struct iproc_gpio_platdata), }; diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index 245b43f5351..a35e4de761f 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -61,7 +61,7 @@ static int mpc83xx_spisel_boot_get_function(struct udevice *dev, uint gpio) }

#if CONFIG_IS_ENABLED(OF_CONTROL) -static int mpc83xx_spisel_boot_ofdata_to_platdata(struct udevice *dev) +static int mpc83xx_spisel_boot_of_to_plat(struct udevice *dev) { struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr; @@ -140,7 +140,7 @@ U_BOOT_DRIVER(spisel_boot_mpc83xx) = { .id = UCLASS_GPIO, .ops = &mpc83xx_spisel_boot_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) - .ofdata_to_platdata = mpc83xx_spisel_boot_ofdata_to_platdata, + .of_to_plat = mpc83xx_spisel_boot_of_to_plat, .plat_auto = sizeof(struct mpc8xxx_gpio_plat), .of_match = mpc83xx_spisel_boot_ids, #endif diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index 0933b900b8e..dfc1dc67d59 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -183,7 +183,7 @@ static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio) }

#if CONFIG_IS_ENABLED(OF_CONTROL) -static int mpc8xxx_gpio_ofdata_to_platdata(struct udevice *dev) +static int mpc8xxx_gpio_of_to_plat(struct udevice *dev) { struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); struct mpc8xxx_gpio_data *data = dev_get_priv(dev); @@ -294,7 +294,7 @@ U_BOOT_DRIVER(gpio_mpc8xxx) = { .id = UCLASS_GPIO, .ops = &gpio_mpc8xxx_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) - .ofdata_to_platdata = mpc8xxx_gpio_ofdata_to_platdata, + .of_to_plat = mpc8xxx_gpio_of_to_plat, .plat_auto = sizeof(struct mpc8xxx_gpio_plat), .of_match = mpc8xxx_gpio_ids, #endif diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c index 0feafb30ee3..af6c8383aa6 100644 --- a/drivers/gpio/msm_gpio.c +++ b/drivers/gpio/msm_gpio.c @@ -101,7 +101,7 @@ static int msm_gpio_probe(struct udevice *dev) return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0; }

-static int msm_gpio_ofdata_to_platdata(struct udevice *dev) +static int msm_gpio_of_to_plat(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

@@ -126,7 +126,7 @@ U_BOOT_DRIVER(gpio_msm) = { .name = "gpio_msm", .id = UCLASS_GPIO, .of_match = msm_gpio_ids, - .ofdata_to_platdata = msm_gpio_ofdata_to_platdata, + .of_to_plat = msm_gpio_of_to_plat, .probe = msm_gpio_probe, .ops = &gpio_msm_ops, .priv_auto = sizeof(struct msm_gpio_bank), diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index ecdeaec2b12..9fc217ae6ae 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -307,7 +307,7 @@ static int mxc_gpio_probe(struct udevice *dev) return 0; }

-static int mxc_gpio_ofdata_to_platdata(struct udevice *dev) +static int mxc_gpio_of_to_plat(struct udevice *dev) { struct mxc_gpio_plat *plat = dev_get_plat(dev); if (!CONFIG_IS_ENABLED(OF_PLATDATA)) { @@ -338,7 +338,7 @@ U_BOOT_DRIVER(gpio_mxc) = { .id = UCLASS_GPIO, .ops = &gpio_mxc_ops, .probe = mxc_gpio_probe, - .ofdata_to_platdata = mxc_gpio_ofdata_to_platdata, + .of_to_plat = mxc_gpio_of_to_plat, .plat_auto = sizeof(struct mxc_gpio_plat), .priv_auto = sizeof(struct mxc_bank_info), .of_match = mxc_gpio_ids, diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index 7ef34c65584..30daf4a74e0 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -262,7 +262,7 @@ static int mxs_gpio_probe(struct udevice *dev) }

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int mxs_ofdata_to_platdata(struct udevice *dev) +static int mxs_of_to_plat(struct udevice *dev) { struct mxs_gpio_platdata *plat = dev->plat; struct fdtdec_phandle_args args; @@ -302,7 +302,7 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = { .plat_auto = sizeof(struct mxs_gpio_platdata), #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = mxs_gpio_ids, - .ofdata_to_platdata = mxs_ofdata_to_platdata, + .of_to_plat = mxs_of_to_plat, #endif };

diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c index d69a22aff76..8c5fd670758 100644 --- a/drivers/gpio/nx_gpio.c +++ b/drivers/gpio/nx_gpio.c @@ -212,7 +212,7 @@ static int nx_gpio_probe(struct udevice *dev) return 0; }

-static int nx_gpio_ofdata_to_platdata(struct udevice *dev) +static int nx_gpio_of_to_plat(struct udevice *dev) { struct nx_gpio_platdata *plat = dev_get_plat(dev);

@@ -244,7 +244,7 @@ U_BOOT_DRIVER(nx_gpio) = { .id = UCLASS_GPIO, .of_match = nx_gpio_ids, .ops = &nx_gpio_ops, - .ofdata_to_platdata = nx_gpio_ofdata_to_platdata, + .of_to_plat = nx_gpio_of_to_plat, .plat_auto = sizeof(struct nx_gpio_platdata), .probe = nx_gpio_probe, }; diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 6581dca6735..665f46d555a 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -342,7 +342,7 @@ static const struct udevice_id omap_gpio_ids[] = { { } };

-static int omap_gpio_ofdata_to_platdata(struct udevice *dev) +static int omap_gpio_of_to_plat(struct udevice *dev) { struct omap_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr; @@ -362,7 +362,7 @@ U_BOOT_DRIVER(gpio_omap) = { #if CONFIG_IS_ENABLED(OF_CONTROL) #if !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_gpio_ids, - .ofdata_to_platdata = of_match_ptr(omap_gpio_ofdata_to_platdata), + .of_to_plat = of_match_ptr(omap_gpio_of_to_plat), .plat_auto = sizeof(struct omap_gpio_platdata), #endif #else diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c index 570486fc484..3eed9e93c2c 100644 --- a/drivers/gpio/pcf8575_gpio.c +++ b/drivers/gpio/pcf8575_gpio.c @@ -175,7 +175,7 @@ U_BOOT_DRIVER(gpio_pcf8575) = { .id = UCLASS_GPIO, .ops = &pcf8575_gpio_ops, .of_match = pcf8575_gpio_ids, - .ofdata_to_platdata = pcf8575_ofdata_platdata, + .of_to_plat = pcf8575_ofdata_platdata, .probe = pcf8575_gpio_probe, .plat_auto = sizeof(struct pcf8575_chip), }; diff --git a/drivers/gpio/pm8916_gpio.c b/drivers/gpio/pm8916_gpio.c index 20d5bd55d00..40b0f2578b9 100644 --- a/drivers/gpio/pm8916_gpio.c +++ b/drivers/gpio/pm8916_gpio.c @@ -187,7 +187,7 @@ static int pm8916_gpio_probe(struct udevice *dev) return 0; }

-static int pm8916_gpio_ofdata_to_platdata(struct udevice *dev) +static int pm8916_gpio_of_to_plat(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

@@ -209,7 +209,7 @@ U_BOOT_DRIVER(gpio_pm8916) = { .name = "gpio_pm8916", .id = UCLASS_GPIO, .of_match = pm8916_gpio_ids, - .ofdata_to_platdata = pm8916_gpio_ofdata_to_platdata, + .of_to_plat = pm8916_gpio_of_to_plat, .probe = pm8916_gpio_probe, .ops = &pm8916_gpio_ops, .priv_auto = sizeof(struct pm8916_gpio_bank), @@ -272,7 +272,7 @@ static int pm8941_pwrkey_probe(struct udevice *dev) return 0; }

-static int pm8941_pwrkey_ofdata_to_platdata(struct udevice *dev) +static int pm8941_pwrkey_of_to_plat(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

@@ -294,7 +294,7 @@ U_BOOT_DRIVER(pwrkey_pm8941) = { .name = "pwrkey_pm8916", .id = UCLASS_GPIO, .of_match = pm8941_pwrkey_ids, - .ofdata_to_platdata = pm8941_pwrkey_ofdata_to_platdata, + .of_to_plat = pm8941_pwrkey_of_to_plat, .probe = pm8941_pwrkey_probe, .ops = &pm8941_pwrkey_ops, .priv_auto = sizeof(struct pm8916_gpio_bank), diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c index fa871305baf..2708838adf6 100644 --- a/drivers/gpio/sandbox.c +++ b/drivers/gpio/sandbox.c @@ -278,7 +278,7 @@ static const struct dm_gpio_ops gpio_sandbox_ops = { #endif };

-static int sandbox_gpio_ofdata_to_platdata(struct udevice *dev) +static int sandbox_gpio_of_to_plat(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

@@ -318,7 +318,7 @@ U_BOOT_DRIVER(sandbox_gpio) = { .name = "sandbox_gpio", .id = UCLASS_GPIO, .of_match = sandbox_gpio_ids, - .ofdata_to_platdata = sandbox_gpio_ofdata_to_platdata, + .of_to_plat = sandbox_gpio_of_to_plat, .probe = gpio_sandbox_probe, .remove = gpio_sandbox_remove, .ops = &gpio_sandbox_ops, diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c index 79d3ed49e30..933cace5bec 100644 --- a/drivers/gpio/sifive-gpio.c +++ b/drivers/gpio/sifive-gpio.c @@ -154,7 +154,7 @@ static const struct dm_gpio_ops sifive_gpio_ops = { .get_function = sifive_gpio_get_function, };

-static int sifive_gpio_ofdata_to_platdata(struct udevice *dev) +static int sifive_gpio_of_to_plat(struct udevice *dev) { struct sifive_gpio_platdata *plat = dev_get_plat(dev); fdt_addr_t addr; @@ -171,7 +171,7 @@ U_BOOT_DRIVER(gpio_sifive) = { .name = "gpio_sifive", .id = UCLASS_GPIO, .of_match = sifive_gpio_match, - .ofdata_to_platdata = of_match_ptr(sifive_gpio_ofdata_to_platdata), + .of_to_plat = of_match_ptr(sifive_gpio_of_to_plat), .plat_auto = sizeof(struct sifive_gpio_platdata), .ops = &sifive_gpio_ops, .probe = sifive_gpio_probe, diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index bd0623bcfa7..d2e526d7ab8 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -130,7 +130,7 @@ U_BOOT_DRIVER(gpio_vybrid) = { .id = UCLASS_GPIO, .ops = &gpio_vybrid_ops, .of_match = vybrid_gpio_ids, - .ofdata_to_platdata = vybrid_gpio_odata_to_platdata, + .of_to_plat = vybrid_gpio_odata_to_platdata, .probe = vybrid_gpio_probe, .priv_auto = sizeof(struct vybrid_gpios), .plat_auto = sizeof(struct vybrid_gpio_platdata), diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 847f399dafb..7bc758b1669 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -263,7 +263,7 @@ static int xilinx_gpio_probe(struct udevice *dev) return 0; }

-static int xilinx_gpio_ofdata_to_platdata(struct udevice *dev) +static int xilinx_gpio_of_to_plat(struct udevice *dev) { struct xilinx_gpio_platdata *plat = dev_get_plat(dev); int is_dual; @@ -301,7 +301,7 @@ U_BOOT_DRIVER(xilinx_gpio) = { .id = UCLASS_GPIO, .ops = &xilinx_gpio_ops, .of_match = xilinx_gpio_ids, - .ofdata_to_platdata = xilinx_gpio_ofdata_to_platdata, + .of_to_plat = xilinx_gpio_of_to_plat, .probe = xilinx_gpio_probe, .plat_auto = sizeof(struct xilinx_gpio_platdata), .priv_auto = sizeof(struct xilinx_gpio_privdata), diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index a273aff6e0e..ffbe7b47080 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -388,7 +388,7 @@ static int zynq_gpio_probe(struct udevice *dev) return 0; }

-static int zynq_gpio_ofdata_to_platdata(struct udevice *dev) +static int zynq_gpio_of_to_plat(struct udevice *dev) { struct zynq_gpio_platdata *plat = dev_get_plat(dev);

@@ -405,7 +405,7 @@ U_BOOT_DRIVER(gpio_zynq) = { .id = UCLASS_GPIO, .ops = &gpio_zynq_ops, .of_match = zynq_gpio_ids, - .ofdata_to_platdata = zynq_gpio_ofdata_to_platdata, + .of_to_plat = zynq_gpio_of_to_plat, .probe = zynq_gpio_probe, .plat_auto = sizeof(struct zynq_gpio_platdata), }; diff --git a/drivers/i2c/acpi_i2c.c b/drivers/i2c/acpi_i2c.c index ef12789e7ff..142f41178c1 100644 --- a/drivers/i2c/acpi_i2c.c +++ b/drivers/i2c/acpi_i2c.c @@ -174,7 +174,7 @@ int acpi_i2c_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx) return 0; }

-int acpi_i2c_ofdata_to_platdata(struct udevice *dev) +int acpi_i2c_of_to_plat(struct udevice *dev) { struct acpi_i2c_priv *priv = dev_get_priv(dev);

diff --git a/drivers/i2c/acpi_i2c.h b/drivers/i2c/acpi_i2c.h index 1f4be296016..fc6616ade66 100644 --- a/drivers/i2c/acpi_i2c.h +++ b/drivers/i2c/acpi_i2c.h @@ -10,6 +10,6 @@

extern struct acpi_ops acpi_i2c_ops;

-int acpi_i2c_ofdata_to_platdata(struct udevice *dev); +int acpi_i2c_of_to_plat(struct udevice *dev);

#endif diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c index a4caba46baf..2d3fecaa14e 100644 --- a/drivers/i2c/ast_i2c.c +++ b/drivers/i2c/ast_i2c.c @@ -87,7 +87,7 @@ static void ast_i2c_init_bus(struct udevice *dev) | I2CD_INTR_ABNORMAL, &priv->regs->icr); }

-static int ast_i2c_ofdata_to_platdata(struct udevice *dev) +static int ast_i2c_of_to_plat(struct udevice *dev) { struct ast_i2c_priv *priv = dev_get_priv(dev); int ret; @@ -351,7 +351,7 @@ U_BOOT_DRIVER(ast_i2c) = { .id = UCLASS_I2C, .of_match = ast_i2c_ids, .probe = ast_i2c_probe, - .ofdata_to_platdata = ast_i2c_ofdata_to_platdata, + .of_to_plat = ast_i2c_of_to_plat, .priv_auto = sizeof(struct ast_i2c_priv), .ops = &ast_i2c_ops, }; diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c index db2fbc9d66d..3eb6db4878d 100644 --- a/drivers/i2c/at91_i2c.c +++ b/drivers/i2c/at91_i2c.c @@ -219,7 +219,7 @@ int at91_i2c_get_bus_speed(struct udevice *dev) return bus->speed; }

-static int at91_i2c_ofdata_to_platdata(struct udevice *dev) +static int at91_i2c_of_to_plat(struct udevice *dev) { const void *blob = gd->fdt_blob; struct at91_i2c_bus *bus = dev_get_priv(dev); @@ -317,7 +317,7 @@ U_BOOT_DRIVER(i2c_at91) = { .id = UCLASS_I2C, .of_match = at91_i2c_ids, .probe = at91_i2c_probe, - .ofdata_to_platdata = at91_i2c_ofdata_to_platdata, + .of_to_plat = at91_i2c_of_to_plat, .per_child_auto = sizeof(struct dm_i2c_chip), .priv_auto = sizeof(struct at91_i2c_bus), .ops = &at91_i2c_ops, diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c index 1cc5c0618e5..970b91cfd30 100644 --- a/drivers/i2c/cros_ec_tunnel.c +++ b/drivers/i2c/cros_ec_tunnel.c @@ -29,7 +29,7 @@ static int cros_ec_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, return cros_ec_i2c_tunnel(dev->parent, i2c_bus->remote_bus, msg, nmsgs); }

-static int cros_ec_i2c_ofdata_to_platdata(struct udevice *dev) +static int cros_ec_i2c_of_to_plat(struct udevice *dev) { struct cros_ec_i2c_bus *i2c_bus = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -55,7 +55,7 @@ U_BOOT_DRIVER(cros_ec_tunnel) = { .name = "cros_ec_tunnel", .id = UCLASS_I2C, .of_match = cros_ec_i2c_ids, - .ofdata_to_platdata = cros_ec_i2c_ofdata_to_platdata, + .of_to_plat = cros_ec_i2c_of_to_plat, .priv_auto = sizeof(struct cros_ec_i2c_bus), .ops = &cros_ec_i2c_ops, }; diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c index c8927ebfeb8..39c45e032ff 100644 --- a/drivers/i2c/designware_i2c.c +++ b/drivers/i2c/designware_i2c.c @@ -762,7 +762,7 @@ static int designware_i2c_probe_chip(struct udevice *bus, uint chip_addr, return ret; }

-int designware_i2c_ofdata_to_platdata(struct udevice *bus) +int designware_i2c_of_to_plat(struct udevice *bus) { struct dw_i2c *priv = dev_get_priv(bus); int ret; @@ -840,7 +840,7 @@ U_BOOT_DRIVER(i2c_designware) = { .name = "i2c_designware", .id = UCLASS_I2C, .of_match = designware_i2c_ids, - .ofdata_to_platdata = designware_i2c_ofdata_to_platdata, + .of_to_plat = designware_i2c_of_to_plat, .probe = designware_i2c_probe, .priv_auto = sizeof(struct dw_i2c), .remove = designware_i2c_remove, diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h index 18acf4e841b..9b2349a0a2c 100644 --- a/drivers/i2c/designware_i2c.h +++ b/drivers/i2c/designware_i2c.h @@ -212,7 +212,7 @@ extern const struct dm_i2c_ops designware_i2c_ops;

int designware_i2c_probe(struct udevice *bus); int designware_i2c_remove(struct udevice *dev); -int designware_i2c_ofdata_to_platdata(struct udevice *bus); +int designware_i2c_of_to_plat(struct udevice *bus);

/** * dw_i2c_gen_speed_config() - Calculate config info from requested speed diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c index 6e7b6a2c063..18eef625f0f 100644 --- a/drivers/i2c/designware_i2c_pci.c +++ b/drivers/i2c/designware_i2c_pci.c @@ -34,7 +34,7 @@ static struct dw_scl_sda_cfg byt_config = { /* Have a weak function for now - possibly should be a new uclass */ __weak void lpss_reset_release(void *regs);

-static int designware_i2c_pci_ofdata_to_platdata(struct udevice *dev) +static int designware_i2c_pci_of_to_plat(struct udevice *dev) { struct dw_i2c *priv = dev_get_priv(dev);

@@ -71,7 +71,7 @@ static int designware_i2c_pci_ofdata_to_platdata(struct udevice *dev) if (dev_get_driver_data(dev) == INTEL_APL) priv->has_spk_cnt = true;

- return designware_i2c_ofdata_to_platdata(dev); + return designware_i2c_of_to_plat(dev); }

static int designware_i2c_pci_probe(struct udevice *dev) @@ -197,7 +197,7 @@ U_BOOT_DRIVER(i2c_designware_pci) = { .id = UCLASS_I2C, .of_match = designware_i2c_pci_ids, .bind = designware_i2c_pci_bind, - .ofdata_to_platdata = designware_i2c_pci_ofdata_to_platdata, + .of_to_plat = designware_i2c_pci_of_to_plat, .probe = designware_i2c_pci_probe, .priv_auto = sizeof(struct dw_i2c), .remove = designware_i2c_remove, diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c index da8011029dd..879ddc67b69 100644 --- a/drivers/i2c/exynos_hs_i2c.c +++ b/drivers/i2c/exynos_hs_i2c.c @@ -517,7 +517,7 @@ static int s3c24x0_i2c_probe(struct udevice *dev, uint chip, uint chip_flags) return ret != I2C_OK; }

-static int s3c_i2c_ofdata_to_platdata(struct udevice *dev) +static int s3c_i2c_of_to_plat(struct udevice *dev) { const void *blob = gd->fdt_blob; struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev); @@ -557,7 +557,7 @@ U_BOOT_DRIVER(hs_i2c) = { .name = "i2c_s3c_hs", .id = UCLASS_I2C, .of_match = exynos_hs_i2c_ids, - .ofdata_to_platdata = s3c_i2c_ofdata_to_platdata, + .of_to_plat = s3c_i2c_of_to_plat, .priv_auto = sizeof(struct s3c24x0_i2c_bus), .ops = &exynos_hs_i2c_ops, }; diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index f55b4751977..875d30762e3 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -573,7 +573,7 @@ static int fsl_i2c_set_bus_speed(struct udevice *bus, uint speed) return __i2c_set_bus_speed(dev->base, speed, dev->i2c_clk); }

-static int fsl_i2c_ofdata_to_platdata(struct udevice *bus) +static int fsl_i2c_of_to_plat(struct udevice *bus) { struct fsl_i2c_dev *dev = dev_get_priv(bus); struct clk clock; @@ -649,7 +649,7 @@ U_BOOT_DRIVER(i2c_fsl) = { .id = UCLASS_I2C, .of_match = fsl_i2c_ids, .probe = fsl_i2c_probe, - .ofdata_to_platdata = fsl_i2c_ofdata_to_platdata, + .of_to_plat = fsl_i2c_of_to_plat, .priv_auto = sizeof(struct fsl_i2c_dev), .ops = &fsl_i2c_ops, }; diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c index 2cf22330e0b..db3c04fa6e7 100644 --- a/drivers/i2c/i2c-cdns.c +++ b/drivers/i2c/i2c-cdns.c @@ -460,7 +460,7 @@ static int cdns_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, return ret; }

-static int cdns_i2c_ofdata_to_platdata(struct udevice *dev) +static int cdns_i2c_of_to_plat(struct udevice *dev) { struct i2c_cdns_bus *i2c_bus = dev_get_priv(dev); struct cdns_i2c_platform_data *pdata = @@ -503,7 +503,7 @@ U_BOOT_DRIVER(cdns_i2c) = { .name = "i2c_cdns", .id = UCLASS_I2C, .of_match = cdns_i2c_of_match, - .ofdata_to_platdata = cdns_i2c_ofdata_to_platdata, + .of_to_plat = cdns_i2c_of_to_plat, .priv_auto = sizeof(struct i2c_cdns_bus), .ops = &cdns_i2c_ops, }; diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c index 420dfdbab94..960ae8c700f 100644 --- a/drivers/i2c/i2c-cortina.c +++ b/drivers/i2c/i2c-cortina.c @@ -322,7 +322,7 @@ static int ca_i2c_probe(struct udevice *bus) return 0; }

-static int ca_i2c_ofdata_to_platdata(struct udevice *bus) +static int ca_i2c_of_to_plat(struct udevice *bus) { struct ca_i2c *priv = dev_get_priv(bus);

@@ -339,7 +339,7 @@ U_BOOT_DRIVER(i2c_cortina) = { .name = "i2c_cortina", .id = UCLASS_I2C, .of_match = ca_i2c_ids, - .ofdata_to_platdata = ca_i2c_ofdata_to_platdata, + .of_to_plat = ca_i2c_of_to_plat, .probe = ca_i2c_probe, .priv_auto = sizeof(struct ca_i2c), .ops = &ca_i2c_ops, diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c index 0f363da4188..387f00b2cde 100644 --- a/drivers/i2c/i2c-gpio.c +++ b/drivers/i2c/i2c-gpio.c @@ -329,7 +329,7 @@ static int i2c_gpio_drv_probe(struct udevice *dev) return 0; }

-static int i2c_gpio_ofdata_to_platdata(struct udevice *dev) +static int i2c_gpio_of_to_plat(struct udevice *dev) { struct i2c_gpio_bus *bus = dev_get_priv(dev); int ret; @@ -371,7 +371,7 @@ U_BOOT_DRIVER(i2c_gpio) = { .id = UCLASS_I2C, .of_match = i2c_gpio_ids, .probe = i2c_gpio_drv_probe, - .ofdata_to_platdata = i2c_gpio_ofdata_to_platdata, + .of_to_plat = i2c_gpio_of_to_plat, .priv_auto = sizeof(struct i2c_gpio_bus), .ops = &i2c_gpio_ops, }; diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index 58172f787b6..5930c6bea34 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -617,7 +617,7 @@ int i2c_deblock(struct udevice *bus) }

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip) +int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip) { int addr;

@@ -680,7 +680,7 @@ static int i2c_child_post_bind(struct udevice *dev)

if (!dev_of_valid(dev)) return 0; - return i2c_chip_ofdata_to_platdata(dev, plat); + return i2c_chip_of_to_plat(dev, plat); #else return 0; #endif @@ -759,7 +759,7 @@ U_BOOT_DRIVER(i2c_generic_chip_drv) = { .id = UCLASS_I2C_GENERIC, .of_match = generic_chip_i2c_ids, #if CONFIG_IS_ENABLED(ACPIGEN) - .ofdata_to_platdata = acpi_i2c_ofdata_to_platdata, + .of_to_plat = acpi_i2c_of_to_plat, .priv_auto = sizeof(struct acpi_i2c_priv), #endif ACPI_OPS_PTR(&acpi_i2c_ops) diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c index 20e25957330..83301bbf1b3 100644 --- a/drivers/i2c/iproc_i2c.c +++ b/drivers/i2c/iproc_i2c.c @@ -672,7 +672,7 @@ static int iproc_i2c_probe(struct udevice *bus) return iproc_i2c_init(bus); }

-static int iproc_i2c_ofdata_to_platdata(struct udevice *bus) +static int iproc_i2c_of_to_plat(struct udevice *bus) { struct iproc_i2c *bus_prvdata = dev_get_priv(bus); int node = dev_of_offset(bus); @@ -705,7 +705,7 @@ U_BOOT_DRIVER(iproc_i2c) = { .name = "iproc_i2c", .id = UCLASS_I2C, .of_match = iproc_i2c_ids, - .ofdata_to_platdata = iproc_i2c_ofdata_to_platdata, + .of_to_plat = iproc_i2c_of_to_plat, .probe = iproc_i2c_probe, .priv_auto = sizeof(struct iproc_i2c), .ops = &iproc_i2c_ops, diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c index 06efe846765..d21a84c4fa8 100644 --- a/drivers/i2c/muxes/pca954x.c +++ b/drivers/i2c/muxes/pca954x.c @@ -108,7 +108,7 @@ static const struct udevice_id pca954x_ids[] = { { } };

-static int pca954x_ofdata_to_platdata(struct udevice *dev) +static int pca954x_of_to_plat(struct udevice *dev) { struct pca954x_priv *priv = dev_get_priv(dev); const struct chip_desc *chip = &chips[dev_get_driver_data(dev)]; @@ -171,6 +171,6 @@ U_BOOT_DRIVER(pca954x) = { .probe = pca954x_probe, .remove = pca954x_remove, .ops = &pca954x_ops, - .ofdata_to_platdata = pca954x_ofdata_to_platdata, + .of_to_plat = pca954x_of_to_plat, .priv_auto = sizeof(struct pca954x_priv), }; diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index d29bd78a7a0..10224405929 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -794,7 +794,7 @@ static int mvtwsi_i2c_set_bus_speed(struct udevice *bus, uint speed) return 0; }

-static int mvtwsi_i2c_ofdata_to_platdata(struct udevice *bus) +static int mvtwsi_i2c_of_to_plat(struct udevice *bus) { struct mvtwsi_i2c_dev *dev = dev_get_priv(bus);

@@ -887,7 +887,7 @@ U_BOOT_DRIVER(i2c_mvtwsi) = { .of_match = mvtwsi_i2c_ids, .bind = mvtwsi_i2c_bind, .probe = mvtwsi_i2c_probe, - .ofdata_to_platdata = mvtwsi_i2c_ofdata_to_platdata, + .of_to_plat = mvtwsi_i2c_of_to_plat, .priv_auto = sizeof(struct mvtwsi_i2c_dev), .ops = &mvtwsi_i2c_ops, }; diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 9d05a1f7021..322d72132b8 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -1063,7 +1063,7 @@ static int omap_i2c_probe(struct udevice *bus) }

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int omap_i2c_ofdata_to_platdata(struct udevice *bus) +static int omap_i2c_of_to_plat(struct udevice *bus) { struct omap_i2c_platdata *plat = dev_get_plat(bus);

@@ -1093,7 +1093,7 @@ U_BOOT_DRIVER(i2c_omap) = { .id = UCLASS_I2C, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_i2c_ids, - .ofdata_to_platdata = omap_i2c_ofdata_to_platdata, + .of_to_plat = omap_i2c_of_to_plat, .plat_auto = sizeof(struct omap_i2c_platdata), #endif .probe = omap_i2c_probe, diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index e9717e530c3..704bafe2389 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -375,7 +375,7 @@ int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) return 0; }

-static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus) +static int rockchip_i2c_of_to_plat(struct udevice *bus) { struct rk_i2c *priv = dev_get_priv(bus); int ret; @@ -489,7 +489,7 @@ U_BOOT_DRIVER(rockchip_rk3066_i2c) = { .name = "rockchip_rk3066_i2c", .id = UCLASS_I2C, .of_match = rockchip_i2c_ids, - .ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata, + .of_to_plat = rockchip_i2c_of_to_plat, .probe = rockchip_i2c_probe, .priv_auto = sizeof(struct rk_i2c), .ops = &rockchip_i2c_ops, diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index b4b8e6b1b65..0c8915605db 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -302,7 +302,7 @@ static int s3c24x0_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, return ret ? -EREMOTEIO : 0; }

-static int s3c_i2c_ofdata_to_platdata(struct udevice *dev) +static int s3c_i2c_of_to_plat(struct udevice *dev) { const void *blob = gd->fdt_blob; struct s3c24x0_i2c_bus *i2c_bus = dev_get_priv(dev); @@ -342,7 +342,7 @@ U_BOOT_DRIVER(i2c_s3c) = { .name = "i2c_s3c", .id = UCLASS_I2C, .of_match = s3c_i2c_ids, - .ofdata_to_platdata = s3c_i2c_ofdata_to_platdata, + .of_to_plat = s3c_i2c_of_to_plat, .priv_auto = sizeof(struct s3c24x0_i2c_bus), .ops = &s3c_i2c_ops, }; diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c index 483d83409f7..6553bdc6106 100644 --- a/drivers/i2c/stm32f7_i2c.c +++ b/drivers/i2c/stm32f7_i2c.c @@ -901,7 +901,7 @@ clk_free: return ret; }

-static int stm32_ofdata_to_platdata(struct udevice *dev) +static int stm32_of_to_plat(struct udevice *dev) { struct stm32_i2c_priv *i2c_priv = dev_get_priv(dev); u32 rise_time, fall_time; @@ -953,7 +953,7 @@ U_BOOT_DRIVER(stm32f7_i2c) = { .name = "stm32f7-i2c", .id = UCLASS_I2C, .of_match = stm32_i2c_of_match, - .ofdata_to_platdata = stm32_ofdata_to_platdata, + .of_to_plat = stm32_of_to_plat, .probe = stm32_i2c_probe, .priv_auto = sizeof(struct stm32_i2c_priv), .ops = &stm32_i2c_ops, diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c index c705eba61bd..971bbcf987c 100644 --- a/drivers/led/led_cortina.c +++ b/drivers/led/led_cortina.c @@ -130,7 +130,7 @@ static const struct led_ops cortina_led_ops = { .set_state = cortina_led_set_state, };

-static int ca_led_ofdata_to_platdata(struct udevice *dev) +static int ca_led_of_to_plat(struct udevice *dev) { struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);

@@ -289,7 +289,7 @@ U_BOOT_DRIVER(cortina_led) = { .name = "ca-leds", .id = UCLASS_LED, .of_match = ca_led_ids, - .ofdata_to_platdata = ca_led_ofdata_to_platdata, + .of_to_plat = ca_led_of_to_plat, .bind = cortina_led_bind, .probe = cortina_led_probe, .plat_auto = sizeof(struct cortina_led_platdata), diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index 31684d7e810..091f055ec01 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -69,7 +69,7 @@ static int altera_sysid_read(struct udevice *dev, return 0; }

-static int altera_sysid_ofdata_to_platdata(struct udevice *dev) +static int altera_sysid_of_to_plat(struct udevice *dev) { struct altera_sysid_platdata *plat = dev_get_plat(dev);

@@ -93,7 +93,7 @@ U_BOOT_DRIVER(altera_sysid) = { .name = "altera_sysid", .id = UCLASS_MISC, .of_match = altera_sysid_ids, - .ofdata_to_platdata = altera_sysid_ofdata_to_platdata, + .of_to_plat = altera_sysid_of_to_plat, .plat_auto = sizeof(struct altera_sysid_platdata), .ops = &altera_sysid_ops, }; diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index bacd47e60f1..90f9cd246a0 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -382,7 +382,7 @@ int atsha204a_get_random(struct udevice *dev, u8 *buffer, size_t max) return 0; }

-static int atsha204a_ofdata_to_platdata(struct udevice *dev) +static int atsha204a_of_to_plat(struct udevice *dev) { fdt_addr_t *priv = dev_get_priv(dev); fdt_addr_t addr; @@ -406,6 +406,6 @@ U_BOOT_DRIVER(atsha204) = { .name = "atsha204", .id = UCLASS_MISC, .of_match = atsha204a_ids, - .ofdata_to_platdata = atsha204a_ofdata_to_platdata, + .of_to_plat = atsha204a_of_to_plat, .priv_auto = sizeof(fdt_addr_t), }; diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index b149a27b082..c228e84fa1f 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -219,7 +219,7 @@ int request_firmware_into_buf(struct udevice *dev, return ret; }

-static int fs_loader_ofdata_to_platdata(struct udevice *dev) +static int fs_loader_of_to_plat(struct udevice *dev) { u32 phandlepart[2];

@@ -284,7 +284,7 @@ U_BOOT_DRIVER(fs_loader) = { .id = UCLASS_FS_FIRMWARE_LOADER, .of_match = fs_loader_ids, .probe = fs_loader_probe, - .ofdata_to_platdata = fs_loader_ofdata_to_platdata, + .of_to_plat = fs_loader_of_to_plat, .plat_auto = sizeof(struct device_platdata), .priv_auto = sizeof(struct firmware), }; diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 3499114394d..9ffd28f597d 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -93,7 +93,7 @@ static const struct i2c_eeprom_ops i2c_eeprom_std_ops = { .size = i2c_eeprom_std_size, };

-static int i2c_eeprom_std_ofdata_to_platdata(struct udevice *dev) +static int i2c_eeprom_std_of_to_plat(struct udevice *dev) { struct i2c_eeprom *priv = dev_get_priv(dev); struct i2c_eeprom_drv_data *data = @@ -283,7 +283,7 @@ U_BOOT_DRIVER(i2c_eeprom_std) = { .of_match = i2c_eeprom_std_ids, .bind = i2c_eeprom_std_bind, .probe = i2c_eeprom_std_probe, - .ofdata_to_platdata = i2c_eeprom_std_ofdata_to_platdata, + .of_to_plat = i2c_eeprom_std_of_to_plat, .priv_auto = sizeof(struct i2c_eeprom), .ops = &i2c_eeprom_std_ops, }; @@ -298,7 +298,7 @@ static int i2c_eeprom_partition_probe(struct udevice *dev) return 0; }

-static int i2c_eeprom_partition_ofdata_to_platdata(struct udevice *dev) +static int i2c_eeprom_partition_of_to_plat(struct udevice *dev) { struct i2c_eeprom_partition *priv = dev_get_priv(dev); u32 reg[2]; @@ -365,7 +365,7 @@ U_BOOT_DRIVER(i2c_eeprom_partition) = { .name = "i2c_eeprom_partition", .id = UCLASS_I2C_EEPROM, .probe = i2c_eeprom_partition_probe, - .ofdata_to_platdata = i2c_eeprom_partition_ofdata_to_platdata, + .of_to_plat = i2c_eeprom_partition_of_to_plat, .priv_auto = sizeof(struct i2c_eeprom_partition), .ops = &i2c_eeprom_partition_ops, }; diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c index 92b2f277a52..85b127c406c 100644 --- a/drivers/misc/i2c_eeprom_emul.c +++ b/drivers/misc/i2c_eeprom_emul.c @@ -149,7 +149,7 @@ struct dm_i2c_ops sandbox_i2c_emul_ops = { .xfer = sandbox_i2c_eeprom_xfer, };

-static int sandbox_i2c_eeprom_ofdata_to_platdata(struct udevice *dev) +static int sandbox_i2c_eeprom_of_to_plat(struct udevice *dev) { struct sandbox_i2c_flash_plat_data *plat = dev_get_plat(dev);

@@ -197,7 +197,7 @@ U_BOOT_DRIVER(sandbox_i2c_emul) = { .name = "sandbox_i2c_eeprom_emul", .id = UCLASS_I2C_EMUL, .of_match = sandbox_i2c_ids, - .ofdata_to_platdata = sandbox_i2c_eeprom_ofdata_to_platdata, + .of_to_plat = sandbox_i2c_eeprom_of_to_plat, .probe = sandbox_i2c_eeprom_probe, .remove = sandbox_i2c_eeprom_remove, .priv_auto = sizeof(struct sandbox_i2c_flash), diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c index a95d9cbaf96..d0ef2ef96ca 100644 --- a/drivers/misc/microchip_flexcom.c +++ b/drivers/misc/microchip_flexcom.c @@ -21,7 +21,7 @@ struct microchip_flexcom_platdata { u32 flexcom_mode; };

-static int microchip_flexcom_ofdata_to_platdata(struct udevice *dev) +static int microchip_flexcom_of_to_plat(struct udevice *dev) { struct microchip_flexcom_platdata *plat = dev_get_plat(dev); int ret; @@ -61,6 +61,6 @@ U_BOOT_DRIVER(microchip_flexcom) = { .name = "microchip_flexcom", .id = UCLASS_MISC, .of_match = microchip_flexcom_ids, - .ofdata_to_platdata = microchip_flexcom_ofdata_to_platdata, + .of_to_plat = microchip_flexcom_of_to_plat, .plat_auto = sizeof(struct microchip_flexcom_platdata), }; diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 4659d4eb87f..08e30bae06c 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -137,7 +137,7 @@ static const struct misc_ops rockchip_efuse_ops = { .read = rockchip_efuse_read, };

-static int rockchip_efuse_ofdata_to_platdata(struct udevice *dev) +static int rockchip_efuse_of_to_plat(struct udevice *dev) { struct rockchip_efuse_platdata *plat = dev_get_plat(dev);

@@ -154,7 +154,7 @@ U_BOOT_DRIVER(rockchip_efuse) = { .name = "rockchip_efuse", .id = UCLASS_MISC, .of_match = rockchip_efuse_ids, - .ofdata_to_platdata = rockchip_efuse_ofdata_to_platdata, + .of_to_plat = rockchip_efuse_of_to_plat, .plat_auto = sizeof(struct rockchip_efuse_platdata), .ops = &rockchip_efuse_ops, }; diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c index b56eb663286..9707750355a 100644 --- a/drivers/misc/rockchip-otp.c +++ b/drivers/misc/rockchip-otp.c @@ -145,7 +145,7 @@ static const struct misc_ops rockchip_otp_ops = { .read = rockchip_otp_read, };

-static int rockchip_otp_ofdata_to_platdata(struct udevice *dev) +static int rockchip_otp_of_to_plat(struct udevice *dev) { struct rockchip_otp_platdata *otp = dev_get_plat(dev);

@@ -171,6 +171,6 @@ U_BOOT_DRIVER(rockchip_otp) = { .id = UCLASS_MISC, .of_match = rockchip_otp_ids, .ops = &rockchip_otp_ops, - .ofdata_to_platdata = rockchip_otp_ofdata_to_platdata, + .of_to_plat = rockchip_otp_of_to_plat, .plat_auto = sizeof(struct rockchip_otp_platdata), }; diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c index 1f0bd1dce0e..e1f59716426 100644 --- a/drivers/misc/sifive-otp.c +++ b/drivers/misc/sifive-otp.c @@ -239,7 +239,7 @@ static int sifive_otp_write(struct udevice *dev, int offset, return size; }

-static int sifive_otp_ofdata_to_platdata(struct udevice *dev) +static int sifive_otp_of_to_plat(struct udevice *dev) { struct sifive_otp_platdata *plat = dev_get_plat(dev); int ret; @@ -269,7 +269,7 @@ U_BOOT_DRIVER(sifive_otp) = { .name = "sifive_otp", .id = UCLASS_MISC, .of_match = sifive_otp_ids, - .ofdata_to_platdata = sifive_otp_ofdata_to_platdata, + .of_to_plat = sifive_otp_of_to_plat, .plat_auto = sizeof(struct sifive_otp_platdata), .ops = &sifive_otp_ops, }; diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c index 1fca3e6dd9d..baa935e0d5b 100644 --- a/drivers/mmc/am654_sdhci.c +++ b/drivers/mmc/am654_sdhci.c @@ -408,7 +408,7 @@ static int am654_sdhci_probe(struct udevice *dev) return 0; }

-static int am654_sdhci_ofdata_to_platdata(struct udevice *dev) +static int am654_sdhci_of_to_plat(struct udevice *dev) { struct am654_sdhci_plat *plat = dev_get_plat(dev); struct sdhci_host *host = dev_get_priv(dev); @@ -490,7 +490,7 @@ U_BOOT_DRIVER(am654_sdhci_drv) = { .name = "am654_sdhci", .id = UCLASS_MMC, .of_match = am654_sdhci_ids, - .ofdata_to_platdata = am654_sdhci_ofdata_to_platdata, + .of_to_plat = am654_sdhci_of_to_plat, .ops = &sdhci_ops, .bind = am654_sdhci_bind, .probe = am654_sdhci_probe, diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c index 7dc23ca2266..fe406fe4ad7 100644 --- a/drivers/mmc/arm_pl180_mmci.c +++ b/drivers/mmc/arm_pl180_mmci.c @@ -523,7 +523,7 @@ static const struct dm_mmc_ops arm_pl180_dm_mmc_ops = { .get_cd = dm_mmc_getcd, };

-static int arm_pl180_mmc_ofdata_to_platdata(struct udevice *dev) +static int arm_pl180_mmc_of_to_plat(struct udevice *dev) { struct pl180_mmc_host *host = dev->priv; fdt_addr_t addr; @@ -549,7 +549,7 @@ U_BOOT_DRIVER(arm_pl180_mmc) = { .of_match = arm_pl180_mmc_match, .ops = &arm_pl180_dm_mmc_ops, .probe = arm_pl180_mmc_probe, - .ofdata_to_platdata = arm_pl180_mmc_ofdata_to_platdata, + .of_to_plat = arm_pl180_mmc_of_to_plat, .bind = arm_pl180_mmc_bind, .priv_auto = sizeof(struct pl180_mmc_host), .plat_auto = sizeof(struct arm_pl180_mmc_plat), diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index 5b08d09912d..fad2ff5aaf6 100644 --- a/drivers/mmc/ca_dw_mmc.c +++ b/drivers/mmc/ca_dw_mmc.c @@ -87,7 +87,7 @@ unsigned int ca_dwmci_get_mmc_clock(struct dwmci_host *host, uint freq) return SD_SCLK_MAX / clk_div / (host->div + 1); }

-static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev) +static int ca_dwmmc_of_to_plat(struct udevice *dev) { struct ca_dwmmc_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -162,7 +162,7 @@ U_BOOT_DRIVER(ca_dwmmc_drv) = { .name = "cortina_dwmmc", .id = UCLASS_MMC, .of_match = ca_dwmmc_ids, - .ofdata_to_platdata = ca_dwmmc_ofdata_to_platdata, + .of_to_plat = ca_dwmmc_of_to_plat, .bind = ca_dwmmc_bind, .ops = &ca_dwmci_dm_ops, .probe = ca_dwmmc_probe, diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 975a6bec061..05ca3612809 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -501,7 +501,7 @@ static int davinci_mmc_bind(struct udevice *dev) }

#if CONFIG_IS_ENABLED(OF_CONTROL) -static int davinci_mmc_ofdata_to_platdata(struct udevice *dev) +static int davinci_mmc_of_to_plat(struct udevice *dev) { struct davinci_mmc_plat *plat = dev_get_plat(dev); struct mmc_config *cfg = &plat->cfg; @@ -528,7 +528,7 @@ U_BOOT_DRIVER(ti_da830_mmc) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = davinci_mmc_ids, .plat_auto = sizeof(struct davinci_mmc_plat), - .ofdata_to_platdata = davinci_mmc_ofdata_to_platdata, + .of_to_plat = davinci_mmc_of_to_plat, #endif #if CONFIG_BLK .bind = davinci_mmc_bind, diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 1b63315eeba..34c2dceb188 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1384,7 +1384,7 @@ __weak void init_clk_usdhc(u32 index) { }

-static int fsl_esdhc_ofdata_to_platdata(struct udevice *dev) +static int fsl_esdhc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct fsl_esdhc_priv *priv = dev_get_priv(dev); @@ -1701,7 +1701,7 @@ U_BOOT_DRIVER(fsl_esdhc) = { .name = "fsl_esdhc", .id = UCLASS_MMC, .of_match = fsl_esdhc_ids, - .ofdata_to_platdata = fsl_esdhc_ofdata_to_platdata, + .of_to_plat = fsl_esdhc_of_to_plat, .ops = &fsl_esdhc_ops, #if CONFIG_IS_ENABLED(BLK) .bind = fsl_esdhc_bind, diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c index 1c318742353..fa6181d85fa 100644 --- a/drivers/mmc/ftsdc010_mci.c +++ b/drivers/mmc/ftsdc010_mci.c @@ -389,7 +389,7 @@ static void ftsdc_setup_cfg(struct mmc_config *cfg, const char *name, int buswid cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; }

-static int ftsdc010_mmc_ofdata_to_platdata(struct udevice *dev) +static int ftsdc010_mmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct ftsdc_priv *priv = dev_get_priv(dev); @@ -473,7 +473,7 @@ U_BOOT_DRIVER(ftsdc010_mmc) = { .name = "ftsdc010_mmc", .id = UCLASS_MMC, .of_match = ftsdc010_mmc_ids, - .ofdata_to_platdata = ftsdc010_mmc_ofdata_to_platdata, + .of_to_plat = ftsdc010_mmc_of_to_plat, .ops = &dm_ftsdc010_mmc_ops, .bind = ftsdc010_mmc_bind, .probe = ftsdc010_mmc_probe, diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c index 5fd71b8a401..bb5d0922beb 100644 --- a/drivers/mmc/hi6220_dw_mmc.c +++ b/drivers/mmc/hi6220_dw_mmc.c @@ -27,7 +27,7 @@ struct hisi_mmc_data { bool use_fifo; };

-static int hi6220_dwmmc_ofdata_to_platdata(struct udevice *dev) +static int hi6220_dwmmc_of_to_plat(struct udevice *dev) { struct hi6220_dwmmc_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -108,7 +108,7 @@ U_BOOT_DRIVER(hi6220_dwmmc_drv) = { .name = "hi6220_dwmmc", .id = UCLASS_MMC, .of_match = hi6220_dwmmc_ids, - .ofdata_to_platdata = hi6220_dwmmc_ofdata_to_platdata, + .of_to_plat = hi6220_dwmmc_of_to_plat, .ops = &dm_dwmci_ops, .bind = hi6220_dwmmc_bind, .probe = hi6220_dwmmc_probe, diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c index edcfbfbce96..ae3af3927db 100644 --- a/drivers/mmc/jz_mmc.c +++ b/drivers/mmc/jz_mmc.c @@ -443,7 +443,7 @@ static const struct dm_mmc_ops jz_msc_ops = { .set_ios = jz_mmc_dm_set_ios, };

-static int jz_mmc_ofdata_to_platdata(struct udevice *dev) +static int jz_mmc_of_to_plat(struct udevice *dev) { struct jz_mmc_priv *priv = dev_get_priv(dev); struct jz_mmc_plat *plat = dev_get_plat(dev); @@ -498,7 +498,7 @@ U_BOOT_DRIVER(jz_mmc_drv) = { .name = "jz_mmc", .id = UCLASS_MMC, .of_match = jz_mmc_ids, - .ofdata_to_platdata = jz_mmc_ofdata_to_platdata, + .of_to_plat = jz_mmc_of_to_plat, .bind = jz_mmc_bind, .probe = jz_mmc_probe, .priv_auto = sizeof(struct jz_mmc_priv), diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index ab10d7c5093..518e24e0410 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -241,7 +241,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = { .set_ios = meson_dm_mmc_set_ios, };

-static int meson_mmc_ofdata_to_platdata(struct udevice *dev) +static int meson_mmc_of_to_plat(struct udevice *dev) { struct meson_mmc_platdata *pdata = dev_get_plat(dev); fdt_addr_t addr; @@ -339,7 +339,7 @@ U_BOOT_DRIVER(meson_mmc) = { .ops = &meson_dm_mmc_ops, .probe = meson_mmc_probe, .bind = meson_mmc_bind, - .ofdata_to_platdata = meson_mmc_ofdata_to_platdata, + .of_to_plat = meson_mmc_of_to_plat, .plat_auto = sizeof(struct meson_mmc_platdata), };

diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index da4cecd7604..bfbba46c5dc 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -167,7 +167,7 @@ static int msm_sdc_remove(struct udevice *dev) return 0; }

-static int msm_ofdata_to_platdata(struct udevice *dev) +static int msm_of_to_plat(struct udevice *dev) { struct udevice *parent = dev->parent; struct msm_sdhc *priv = dev_get_priv(dev); @@ -203,7 +203,7 @@ U_BOOT_DRIVER(msm_sdc_drv) = { .name = "msm_sdc", .id = UCLASS_MMC, .of_match = msm_mmc_ids, - .ofdata_to_platdata = msm_ofdata_to_platdata, + .of_to_plat = msm_of_to_plat, .ops = &sdhci_ops, .bind = msm_sdc_bind, .probe = msm_sdc_probe, diff --git a/drivers/mmc/mtk-sd.c b/drivers/mmc/mtk-sd.c index cc9d68546f8..95dc9daee96 100644 --- a/drivers/mmc/mtk-sd.c +++ b/drivers/mmc/mtk-sd.c @@ -1545,7 +1545,7 @@ static int msdc_drv_probe(struct udevice *dev) return 0; }

-static int msdc_ofdata_to_platdata(struct udevice *dev) +static int msdc_of_to_plat(struct udevice *dev) { struct msdc_plat *plat = dev_get_plat(dev); struct msdc_host *host = dev_get_priv(dev); @@ -1688,7 +1688,7 @@ U_BOOT_DRIVER(mtk_sd_drv) = { .name = "mtk_sd", .id = UCLASS_MMC, .of_match = msdc_ids, - .ofdata_to_platdata = msdc_ofdata_to_platdata, + .of_to_plat = msdc_of_to_plat, .bind = msdc_drv_bind, .probe = msdc_drv_probe, .ops = &msdc_ops, diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index dcf6c7c03f8..c96334f96b7 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -666,7 +666,7 @@ static const struct dm_mmc_ops mxsmmc_ops = { };

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int mxsmmc_ofdata_to_platdata(struct udevice *bus) +static int mxsmmc_of_to_plat(struct udevice *bus) { struct mxsmmc_platdata *plat = bus->plat; u32 prop[2]; @@ -711,7 +711,7 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = { .id = UCLASS_MMC, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = mxsmmc_ids, - .ofdata_to_platdata = mxsmmc_ofdata_to_platdata, + .of_to_plat = mxsmmc_of_to_plat, #endif .ops = &mxsmmc_ops, #if CONFIG_IS_ENABLED(BLK) diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c index 537be0d0d75..753c89d278c 100644 --- a/drivers/mmc/nexell_dw_mmc.c +++ b/drivers/mmc/nexell_dw_mmc.c @@ -139,7 +139,7 @@ static unsigned long nx_dw_mmc_set_clk(struct dwmci_host *host, return rate; }

-static int nexell_dwmmc_ofdata_to_platdata(struct udevice *dev) +static int nexell_dwmmc_of_to_plat(struct udevice *dev) { struct nexell_dwmmc_priv *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -228,7 +228,7 @@ U_BOOT_DRIVER(nexell_dwmmc_drv) = { .name = "nexell_dwmmc", .id = UCLASS_MMC, .of_match = nexell_dwmmc_ids, - .ofdata_to_platdata = nexell_dwmmc_ofdata_to_platdata, + .of_to_plat = nexell_dwmmc_of_to_plat, .ops = &dm_dwmci_ops, .bind = nexell_dwmmc_bind, .probe = nexell_dwmmc_probe, diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index c4e9e82b193..52f044e37a1 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -1898,7 +1898,7 @@ __weak const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr) } #endif

-static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) +static int omap_hsmmc_of_to_plat(struct udevice *dev) { struct omap_hsmmc_plat *plat = dev_get_plat(dev); struct omap_mmc_of_data *of_data = (void *)dev_get_driver_data(dev); @@ -2028,7 +2028,7 @@ U_BOOT_DRIVER(omap_hsmmc) = { .id = UCLASS_MMC, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_hsmmc_ids, - .ofdata_to_platdata = omap_hsmmc_ofdata_to_platdata, + .of_to_plat = omap_hsmmc_of_to_plat, .plat_auto = sizeof(struct omap_hsmmc_plat), #endif #ifdef CONFIG_BLK diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index 0aec3f7de74..fc09ad99e5e 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -50,7 +50,7 @@ static int pci_mmc_probe(struct udevice *dev) return sdhci_probe(dev); }

-static int pci_mmc_ofdata_to_platdata(struct udevice *dev) +static int pci_mmc_of_to_plat(struct udevice *dev) { struct pci_mmc_priv *priv = dev_get_priv(dev);

@@ -129,7 +129,7 @@ U_BOOT_DRIVER(pci_mmc) = { .id = UCLASS_MMC, .of_match = pci_mmc_match, .bind = pci_mmc_bind, - .ofdata_to_platdata = pci_mmc_ofdata_to_platdata, + .of_to_plat = pci_mmc_of_to_plat, .probe = pci_mmc_probe, .ops = &sdhci_ops, .priv_auto = sizeof(struct pci_mmc_priv), diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index 51a6b4dd1b6..75db81ba4ca 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -50,7 +50,7 @@ static uint rockchip_dwmmc_get_mmc_clk(struct dwmci_host *host, uint freq) return freq; }

-static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev) +static int rockchip_dwmmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_dwmmc_priv *priv = dev_get_priv(dev); @@ -172,7 +172,7 @@ U_BOOT_DRIVER(rockchip_rk3288_dw_mshc) = { .name = "rockchip_rk3288_dw_mshc", .id = UCLASS_MMC, .of_match = rockchip_dwmmc_ids, - .ofdata_to_platdata = rockchip_dwmmc_ofdata_to_platdata, + .of_to_plat = rockchip_dwmmc_of_to_plat, .ops = &dm_dwmci_ops, .bind = rockchip_dwmmc_bind, .probe = rockchip_dwmmc_probe, diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index 939b2344f94..d95f8b2a15b 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -81,7 +81,7 @@ static int arasan_sdhci_probe(struct udevice *dev) return sdhci_probe(dev); }

-static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev) +static int arasan_sdhci_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct sdhci_host *host = dev_get_priv(dev); @@ -110,7 +110,7 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = { .name = "rockchip_rk3399_sdhci_5_1", .id = UCLASS_MMC, .of_match = arasan_sdhci_ids, - .ofdata_to_platdata = arasan_sdhci_ofdata_to_platdata, + .of_to_plat = arasan_sdhci_of_to_plat, .ops = &sdhci_ops, .bind = rockchip_sdhci_bind, .probe = arasan_sdhci_probe, diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c index ad274f5af72..50a8805e736 100644 --- a/drivers/mmc/snps_dw_mmc.c +++ b/drivers/mmc/snps_dw_mmc.c @@ -76,7 +76,7 @@ clk_err: return ret; }

-static int snps_dwmmc_ofdata_to_platdata(struct udevice *dev) +static int snps_dwmmc_of_to_plat(struct udevice *dev) { struct snps_dwmci_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -191,7 +191,7 @@ U_BOOT_DRIVER(snps_dwmmc_drv) = { .name = "snps_dw_mmc", .id = UCLASS_MMC, .of_match = snps_dwmmc_ids, - .ofdata_to_platdata = snps_dwmmc_ofdata_to_platdata, + .of_to_plat = snps_dwmmc_of_to_plat, .ops = &snps_dwmci_dm_ops, .bind = snps_dwmmc_bind, .probe = snps_dwmmc_probe, diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index 84f8b8db2b4..dc008c5e2f0 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -95,7 +95,7 @@ static int socfpga_dwmmc_get_clk_rate(struct udevice *dev) return 0; }

-static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev) +static int socfpga_dwmmc_of_to_plat(struct udevice *dev) { struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev); struct dwmci_host *host = &priv->host; @@ -185,7 +185,7 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = { .name = "socfpga_dwmmc", .id = UCLASS_MMC, .of_match = socfpga_dwmmc_ids, - .ofdata_to_platdata = socfpga_dwmmc_ofdata_to_platdata, + .of_to_plat = socfpga_dwmmc_of_to_plat, .ops = &dm_dwmci_ops, .bind = socfpga_dwmmc_bind, .probe = socfpga_dwmmc_probe, diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c index 4ad408a2a32..a09534255b4 100644 --- a/drivers/mmc/sti_sdhci.c +++ b/drivers/mmc/sti_sdhci.c @@ -111,7 +111,7 @@ static int sti_sdhci_probe(struct udevice *dev) return sdhci_probe(dev); }

-static int sti_sdhci_ofdata_to_platdata(struct udevice *dev) +static int sti_sdhci_of_to_plat(struct udevice *dev) { struct sdhci_host *host = dev_get_priv(dev);

@@ -142,7 +142,7 @@ U_BOOT_DRIVER(sti_mmc) = { .of_match = sti_sdhci_ids, .bind = sti_sdhci_bind, .ops = &sdhci_ops, - .ofdata_to_platdata = sti_sdhci_ofdata_to_platdata, + .of_to_plat = sti_sdhci_of_to_plat, .probe = sti_sdhci_probe, .priv_auto = sizeof(struct sdhci_host), .plat_auto = sizeof(struct sti_sdhci_plat), diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c index 5062397a792..b8e833e6a3c 100644 --- a/drivers/mmc/xenon_sdhci.c +++ b/drivers/mmc/xenon_sdhci.c @@ -515,7 +515,7 @@ static int xenon_sdhci_probe(struct udevice *dev) return ret; }

-static int xenon_sdhci_ofdata_to_platdata(struct udevice *dev) +static int xenon_sdhci_of_to_plat(struct udevice *dev) { struct sdhci_host *host = dev_get_priv(dev); struct xenon_sdhci_priv *priv = dev_get_priv(dev); @@ -560,7 +560,7 @@ U_BOOT_DRIVER(xenon_sdhci_drv) = { .name = "xenon_sdhci", .id = UCLASS_MMC, .of_match = xenon_sdhci_ids, - .ofdata_to_platdata = xenon_sdhci_ofdata_to_platdata, + .of_to_plat = xenon_sdhci_of_to_plat, .ops = &sdhci_ops, .bind = xenon_sdhci_bind, .probe = xenon_sdhci_probe, diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 29850a435bc..d9ad0ff199d 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -613,7 +613,7 @@ static int arasan_sdhci_probe(struct udevice *dev) return sdhci_probe(dev); }

-static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev) +static int arasan_sdhci_of_to_plat(struct udevice *dev) { struct arasan_sdhci_priv *priv = dev_get_priv(dev);

@@ -655,7 +655,7 @@ U_BOOT_DRIVER(arasan_sdhci_drv) = { .name = "arasan_sdhci", .id = UCLASS_MMC, .of_match = arasan_sdhci_ids, - .ofdata_to_platdata = arasan_sdhci_ofdata_to_platdata, + .of_to_plat = arasan_sdhci_of_to_plat, .ops = &sdhci_ops, .bind = arasan_sdhci_bind, .probe = arasan_sdhci_probe, diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index 9a3a21f2e35..250fb4f75f0 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -346,7 +346,7 @@ static int altera_qspi_probe(struct udevice *dev) return 0; }

-static int altera_qspi_ofdata_to_platdata(struct udevice *dev) +static int altera_qspi_of_to_plat(struct udevice *dev) { struct altera_qspi_platdata *pdata = dev_get_plat(dev); void *blob = (void *)gd->fdt_blob; @@ -400,7 +400,7 @@ U_BOOT_DRIVER(altera_qspi) = { .name = "altera_qspi", .id = UCLASS_MTD, .of_match = altera_qspi_ids, - .ofdata_to_platdata = altera_qspi_ofdata_to_platdata, + .of_to_plat = altera_qspi_of_to_plat, .plat_auto = sizeof(struct altera_qspi_platdata), .probe = altera_qspi_probe, }; diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c index cfeca1e6880..b1ed4d910a7 100644 --- a/drivers/mtd/nand/raw/octeontx_nand.c +++ b/drivers/mtd/nand/raw/octeontx_nand.c @@ -2203,7 +2203,7 @@ static const struct pci_device_id octeontx_nfc_pci_id_table[] = { {} };

-static int octeontx_nand_ofdata_to_platdata(struct udevice *dev) +static int octeontx_nand_of_to_plat(struct udevice *dev) { return 0; } @@ -2217,7 +2217,7 @@ U_BOOT_DRIVER(octeontx_pci_nand) = { .name = OCTEONTX_NAND_DRIVER_NAME, .id = UCLASS_MTD, .of_match = of_match_ptr(octeontx_nand_ids), - .ofdata_to_platdata = octeontx_nand_ofdata_to_platdata, + .of_to_plat = octeontx_nand_of_to_plat, .probe = octeontx_pci_nand_probe, .priv_auto = sizeof(struct octeontx_nfc), .remove = octeontx_pci_nand_disable, diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 44fb25a482b..d59953b6e3c 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -498,7 +498,7 @@ static int sandbox_sf_xfer(struct udevice *dev, unsigned int bitlen, return pos == bytes ? 0 : -EIO; }

-int sandbox_sf_ofdata_to_platdata(struct udevice *dev) +int sandbox_sf_of_to_plat(struct udevice *dev) { struct sandbox_spi_flash_plat_data *pdata = dev_get_plat(dev);

@@ -597,7 +597,7 @@ U_BOOT_DRIVER(sandbox_sf_emul) = { .name = "sandbox_sf_emul", .id = UCLASS_SPI_EMUL, .of_match = sandbox_sf_ids, - .ofdata_to_platdata = sandbox_sf_ofdata_to_platdata, + .of_to_plat = sandbox_sf_of_to_plat, .probe = sandbox_sf_probe, .remove = sandbox_sf_remove, .priv_auto = sizeof(struct sandbox_spi_flash), diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index 5176efaa808..c16dff959b1 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -1250,7 +1250,7 @@ static const struct eth_ops ag7xxx_eth_ops = { .write_hwaddr = ag7xxx_eth_write_hwaddr, };

-static int ag7xxx_eth_ofdata_to_platdata(struct udevice *dev) +static int ag7xxx_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; @@ -1287,7 +1287,7 @@ U_BOOT_DRIVER(eth_ag7xxx) = { .name = "eth_ag7xxx", .id = UCLASS_ETH, .of_match = ag7xxx_eth_ids, - .ofdata_to_platdata = ag7xxx_eth_ofdata_to_platdata, + .of_to_plat = ag7xxx_eth_of_to_plat, .probe = ag7xxx_eth_probe, .remove = ag7xxx_eth_remove, .ops = &ag7xxx_eth_ops, diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index b7ed69413fe..456b7b98e91 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -672,7 +672,7 @@ static int altera_tse_probe(struct udevice *dev) return ret; }

-static int altera_tse_ofdata_to_platdata(struct udevice *dev) +static int altera_tse_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; @@ -710,7 +710,7 @@ U_BOOT_DRIVER(altera_tse) = { .id = UCLASS_ETH, .of_match = altera_tse_ids, .ops = &altera_tse_ops, - .ofdata_to_platdata = altera_tse_ofdata_to_platdata, + .of_to_plat = altera_tse_of_to_plat, .plat_auto = sizeof(struct eth_pdata), .priv_auto = sizeof(struct altera_tse_priv), .probe = altera_tse_probe, diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c index 1627e933368..67839563dbe 100644 --- a/drivers/net/bcmgenet.c +++ b/drivers/net/bcmgenet.c @@ -685,7 +685,7 @@ static const struct eth_ops bcmgenet_gmac_eth_ops = { .stop = bcmgenet_gmac_eth_stop, };

-static int bcmgenet_eth_ofdata_to_platdata(struct udevice *dev) +static int bcmgenet_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct bcmgenet_eth_priv *priv = dev_get_priv(dev); @@ -729,7 +729,7 @@ U_BOOT_DRIVER(eth_bcmgenet) = { .name = "eth_bcmgenet", .id = UCLASS_ETH, .of_match = bcmgenet_eth_ids, - .ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata, + .of_to_plat = bcmgenet_eth_of_to_plat, .probe = bcmgenet_eth_probe, .ops = &bcmgenet_gmac_eth_ops, .priv_auto = sizeof(struct bcmgenet_eth_priv), diff --git a/drivers/net/designware.c b/drivers/net/designware.c index c0e5c0b4f08..9dba55adaa7 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -811,7 +811,7 @@ const struct eth_ops designware_eth_ops = { .write_hwaddr = designware_eth_write_hwaddr, };

-int designware_eth_ofdata_to_platdata(struct udevice *dev) +int designware_eth_of_to_plat(struct udevice *dev) { struct dw_eth_pdata *dw_pdata = dev_get_plat(dev); #if CONFIG_IS_ENABLED(DM_GPIO) @@ -868,7 +868,7 @@ U_BOOT_DRIVER(eth_designware) = { .name = "eth_designware", .id = UCLASS_ETH, .of_match = designware_eth_ids, - .ofdata_to_platdata = designware_eth_ofdata_to_platdata, + .of_to_plat = designware_eth_of_to_plat, .bind = designware_eth_bind, .probe = designware_eth_probe, .remove = designware_eth_remove, diff --git a/drivers/net/designware.h b/drivers/net/designware.h index ffaf5a14d07..a82afb99cab 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -251,7 +251,7 @@ struct dw_eth_dev { };

#ifdef CONFIG_DM_ETH -int designware_eth_ofdata_to_platdata(struct udevice *dev); +int designware_eth_of_to_plat(struct udevice *dev); int designware_eth_probe(struct udevice *dev); extern const struct eth_ops designware_eth_ops;

diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c index adb865d02b8..efe3d1dade6 100644 --- a/drivers/net/dwmac_s700.c +++ b/drivers/net/dwmac_s700.c @@ -44,9 +44,9 @@ static int dwmac_s700_probe(struct udevice *dev) return designware_eth_probe(dev); }

-static int dwmac_s700_ofdata_to_platdata(struct udevice *dev) +static int dwmac_s700_of_to_plat(struct udevice *dev) { - return designware_eth_ofdata_to_platdata(dev); + return designware_eth_of_to_plat(dev); }

static const struct udevice_id dwmac_s700_ids[] = { @@ -58,7 +58,7 @@ U_BOOT_DRIVER(dwmac_s700) = { .name = "dwmac_s700", .id = UCLASS_ETH, .of_match = dwmac_s700_ids, - .ofdata_to_platdata = dwmac_s700_ofdata_to_platdata, + .of_to_plat = dwmac_s700_of_to_plat, .probe = dwmac_s700_probe, .ops = &designware_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c index a3cd4d50cd8..6171dadedf4 100644 --- a/drivers/net/dwmac_socfpga.c +++ b/drivers/net/dwmac_socfpga.c @@ -25,7 +25,7 @@ struct dwmac_socfpga_platdata { u32 reg_shift; };

-static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev) +static int dwmac_socfpga_of_to_plat(struct udevice *dev) { struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev); struct regmap *regmap; @@ -61,7 +61,7 @@ static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev) pdata->phy_intf = range + args.args[0]; pdata->reg_shift = args.args[1];

- return designware_eth_ofdata_to_platdata(dev); + return designware_eth_of_to_plat(dev); }

static int dwmac_socfpga_probe(struct udevice *dev) @@ -115,7 +115,7 @@ U_BOOT_DRIVER(dwmac_socfpga) = { .name = "dwmac_socfpga", .id = UCLASS_ETH, .of_match = dwmac_socfpga_ids, - .ofdata_to_platdata = dwmac_socfpga_ofdata_to_platdata, + .of_to_plat = dwmac_socfpga_of_to_plat, .probe = dwmac_socfpga_probe, .ops = &designware_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 53c2d23cd18..7f146d4c8b4 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -685,7 +685,7 @@ static void ethoc_stop(struct udevice *dev) ethoc_stop_common(dev_get_priv(dev)); }

-static int ethoc_ofdata_to_platdata(struct udevice *dev) +static int ethoc_of_to_plat(struct udevice *dev) { struct ethoc_eth_pdata *pdata = dev_get_plat(dev); fdt_addr_t addr; @@ -746,7 +746,7 @@ U_BOOT_DRIVER(ethoc) = { .name = "ethoc", .id = UCLASS_ETH, .of_match = ethoc_ids, - .ofdata_to_platdata = ethoc_ofdata_to_platdata, + .of_to_plat = ethoc_of_to_plat, .probe = ethoc_probe, .remove = ethoc_remove, .ops = &ethoc_ops, diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index d3d71480478..e3b29a9c3e7 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1528,7 +1528,7 @@ static int fecmxc_remove(struct udevice *dev) return 0; }

-static int fecmxc_ofdata_to_platdata(struct udevice *dev) +static int fecmxc_of_to_plat(struct udevice *dev) { int ret = 0; struct eth_pdata *pdata = dev_get_plat(dev); @@ -1594,7 +1594,7 @@ U_BOOT_DRIVER(fecmxc_gem) = { .name = "fecmxc", .id = UCLASS_ETH, .of_match = fecmxc_ids, - .ofdata_to_platdata = fecmxc_ofdata_to_platdata, + .of_to_plat = fecmxc_of_to_plat, .probe = fecmxc_probe, .remove = fecmxc_remove, .ops = &fecmxc_ops, diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index b71675f065d..0196462beb4 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -491,7 +491,7 @@ static const struct eth_ops mcdmafec_ops = { };

/* - * Boot sequence, called just after mcffec_ofdata_to_platdata, + * Boot sequence, called just after mcffec_of_to_plat, * as DM way, it replaces old mcffec_initialize. */ static int mcdmafec_probe(struct udevice *dev) @@ -565,7 +565,7 @@ static int mcdmafec_remove(struct udevice *dev) /* * Boot sequence, called 1st */ -static int mcdmafec_ofdata_to_platdata(struct udevice *dev) +static int mcdmafec_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const u32 *val; @@ -590,7 +590,7 @@ U_BOOT_DRIVER(mcffec) = { .name = "mcdmafec", .id = UCLASS_ETH, .of_match = mcdmafec_ids, - .ofdata_to_platdata = mcdmafec_ofdata_to_platdata, + .of_to_plat = mcdmafec_of_to_plat, .probe = mcdmafec_probe, .remove = mcdmafec_remove, .ops = &mcdmafec_ops, diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 805e3f7bfae..69e299d6a3d 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -511,7 +511,7 @@ static int ftgmac100_write_hwaddr(struct udevice *dev) return ftgmac100_set_mac(priv, pdata->enetaddr); }

-static int ftgmac100_ofdata_to_platdata(struct udevice *dev) +static int ftgmac100_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct ftgmac100_data *priv = dev_get_priv(dev); @@ -609,7 +609,7 @@ U_BOOT_DRIVER(ftgmac100) = { .name = "ftgmac100", .id = UCLASS_ETH, .of_match = ftgmac100_ids, - .ofdata_to_platdata = ftgmac100_ofdata_to_platdata, + .of_to_plat = ftgmac100_of_to_plat, .probe = ftgmac100_probe, .remove = ftgmac100_remove, .ops = &ftgmac100_ops, diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 5c2887ec8ae..0d672374fda 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -393,7 +393,7 @@ static const char *dtbmacaddr(u32 ifno) return NULL; }

-static int ftmac100_ofdata_to_platdata(struct udevice *dev) +static int ftmac100_of_to_plat(struct udevice *dev) { struct ftmac100_data *priv = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_plat(dev); @@ -437,7 +437,7 @@ U_BOOT_DRIVER(ftmac100) = { .id = UCLASS_ETH, .of_match = ftmac100_ids, .bind = ftmac100_bind, - .ofdata_to_platdata = ftmac100_ofdata_to_platdata, + .of_to_plat = ftmac100_of_to_plat, .probe = ftmac100_probe, .ops = &ftmac100_ops, .priv_auto = sizeof(struct ftmac100_data), diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 2d94223c857..0073cb3bb13 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -53,7 +53,7 @@ struct rk_gmac_ops { };

-static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev) +static int gmac_rockchip_of_to_plat(struct udevice *dev) { struct gmac_rockchip_platdata *pdata = dev_get_plat(dev); const char *string; @@ -74,7 +74,7 @@ static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev) if (pdata->rx_delay == -ENOENT) pdata->rx_delay = dev_read_u32_default(dev, "rx-delay", 0x10);

- return designware_eth_ofdata_to_platdata(dev); + return designware_eth_of_to_plat(dev); }

static int px30_gmac_fix_mac_speed(struct dw_eth_dev *priv) @@ -756,7 +756,7 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = { .name = "gmac_rockchip", .id = UCLASS_ETH, .of_match = rockchip_gmac_ids, - .ofdata_to_platdata = gmac_rockchip_ofdata_to_platdata, + .of_to_plat = gmac_rockchip_of_to_plat, .probe = gmac_rockchip_probe, .ops = &gmac_rockchip_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c index e11335f54fb..aa79d6eda81 100644 --- a/drivers/net/higmacv300.c +++ b/drivers/net/higmacv300.c @@ -558,7 +558,7 @@ static int higmac_remove(struct udevice *dev) return 0; }

-static int higmac_ofdata_to_platdata(struct udevice *dev) +static int higmac_of_to_plat(struct udevice *dev) { struct higmac_priv *priv = dev_get_priv(dev); int phyintf = PHY_INTERFACE_MODE_NONE; @@ -594,7 +594,7 @@ U_BOOT_DRIVER(eth_higmac) = { .name = "eth_higmac", .id = UCLASS_ETH, .of_match = higmac_ids, - .ofdata_to_platdata = higmac_ofdata_to_platdata, + .of_to_plat = higmac_of_to_plat, .probe = higmac_probe, .remove = higmac_remove, .ops = &higmac_ops, diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index 05ef1abd5d5..91c2d10ffc8 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -665,7 +665,7 @@ static int ks8851_probe(struct udevice *dev) return 0; }

-static int ks8851_ofdata_to_platdata(struct udevice *dev) +static int ks8851_of_to_plat(struct udevice *dev) { struct ks_net *ks = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_plat(dev); @@ -695,7 +695,7 @@ U_BOOT_DRIVER(ks8851) = { .id = UCLASS_ETH, .of_match = ks8851_ids, .bind = ks8851_bind, - .ofdata_to_platdata = ks8851_ofdata_to_platdata, + .of_to_plat = ks8851_of_to_plat, .probe = ks8851_probe, .ops = &ks8851_ops, .priv_auto = sizeof(struct ks_net), diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index cd2e4e01dcd..ef013c9c97e 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -1160,7 +1160,7 @@ static int ldpaa_eth_bind(struct udevice *dev) return 0; }

-static int ldpaa_eth_ofdata_to_platdata(struct udevice *dev) +static int ldpaa_eth_of_to_plat(struct udevice *dev) { struct ldpaa_eth_priv *priv = dev_get_priv(dev); const char *phy_mode_str; @@ -1187,7 +1187,7 @@ U_BOOT_DRIVER(ldpaa_eth) = { .name = "ldpaa_eth", .id = UCLASS_ETH, .of_match = ldpaa_eth_of_ids, - .ofdata_to_platdata = ldpaa_eth_ofdata_to_platdata, + .of_to_plat = ldpaa_eth_of_to_plat, .bind = ldpaa_eth_bind, .probe = ldpaa_eth_probe, .ops = &ldpaa_eth_ops, diff --git a/drivers/net/macb.c b/drivers/net/macb.c index dd23591e03a..e287c29e69f 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1283,17 +1283,17 @@ static int macb_eth_remove(struct udevice *dev) }

/** - * macb_late_eth_ofdata_to_platdata + * macb_late_eth_of_to_plat * @dev: udevice struct * Returns 0 when operation success and negative errno number * when operation failed. */ -int __weak macb_late_eth_ofdata_to_platdata(struct udevice *dev) +int __weak macb_late_eth_of_to_plat(struct udevice *dev) { return 0; }

-static int macb_eth_ofdata_to_platdata(struct udevice *dev) +static int macb_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev);

@@ -1301,7 +1301,7 @@ static int macb_eth_ofdata_to_platdata(struct udevice *dev) if (!pdata->iobase) return -EINVAL;

- return macb_late_eth_ofdata_to_platdata(dev); + return macb_late_eth_of_to_plat(dev); }

static const struct macb_config sama5d4_config = { @@ -1331,7 +1331,7 @@ U_BOOT_DRIVER(eth_macb) = { .name = "eth_macb", .id = UCLASS_ETH, .of_match = macb_eth_ids, - .ofdata_to_platdata = macb_eth_ofdata_to_platdata, + .of_to_plat = macb_eth_of_to_plat, .probe = macb_eth_probe, .remove = macb_eth_remove, .ops = &macb_eth_ops, diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 42752a76fa3..4fa71360cf4 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -513,7 +513,7 @@ static const struct eth_ops mcffec_ops = { };

/* - * Boot sequence, called just after mcffec_ofdata_to_platdata, + * Boot sequence, called just after mcffec_of_to_plat, * as DM way, it replaces old mcffec_initialize. */ static int mcffec_probe(struct udevice *dev) @@ -584,7 +584,7 @@ static int mcffec_remove(struct udevice *dev) /* * Boot sequence, called 1st */ -static int mcffec_ofdata_to_platdata(struct udevice *dev) +static int mcffec_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const u32 *val; @@ -610,7 +610,7 @@ U_BOOT_DRIVER(mcffec) = { .name = "mcffec", .id = UCLASS_ETH, .of_match = mcffec_ids, - .ofdata_to_platdata = mcffec_ofdata_to_platdata, + .of_to_plat = mcffec_of_to_plat, .probe = mcffec_probe, .remove = mcffec_remove, .ops = &mcffec_ops, diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index 2741439b54f..26f02847a2e 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -1407,7 +1407,7 @@ static int mtk_eth_remove(struct udevice *dev) return 0; }

-static int mtk_eth_ofdata_to_platdata(struct udevice *dev) +static int mtk_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct mtk_eth_priv *priv = dev_get_priv(dev); @@ -1558,7 +1558,7 @@ U_BOOT_DRIVER(mtk_eth) = { .name = "mtk-eth", .id = UCLASS_ETH, .of_match = mtk_eth_ids, - .ofdata_to_platdata = mtk_eth_ofdata_to_platdata, + .of_to_plat = mtk_eth_of_to_plat, .plat_auto = sizeof(struct eth_pdata), .probe = mtk_eth_probe, .remove = mtk_eth_remove, diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index bf800a80642..2452859f814 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -986,7 +986,7 @@ static const struct eth_ops mvgbe_ops = { .write_hwaddr = mvgbe_write_hwaddr, };

-static int mvgbe_ofdata_to_platdata(struct udevice *dev) +static int mvgbe_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct mvgbe_device *dmvgbe = dev_get_priv(dev); @@ -1038,7 +1038,7 @@ U_BOOT_DRIVER(mvgbe) = { .name = "mvgbe", .id = UCLASS_ETH, .of_match = mvgbe_ids, - .ofdata_to_platdata = mvgbe_ofdata_to_platdata, + .of_to_plat = mvgbe_of_to_plat, .probe = mvgbe_probe, .ops = &mvgbe_ops, .priv_auto = sizeof(struct mvgbe_device), diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 84426ef8ccd..3192cf55091 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -1732,7 +1732,7 @@ static int mvneta_probe(struct udevice *dev) else mvneta_conf_mbus_windows(pp);

- /* PHY interface is already decoded in mvneta_ofdata_to_platdata() */ + /* PHY interface is already decoded in mvneta_of_to_plat() */ pp->phy_interface = pdata->phy_interface;

/* fetch 'fixed-link' property from 'neta' node */ @@ -1795,7 +1795,7 @@ static const struct eth_ops mvneta_ops = { .write_hwaddr = mvneta_write_hwaddr, };

-static int mvneta_ofdata_to_platdata(struct udevice *dev) +static int mvneta_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; @@ -1827,7 +1827,7 @@ U_BOOT_DRIVER(mvneta) = { .name = "mvneta", .id = UCLASS_ETH, .of_match = mvneta_ids, - .ofdata_to_platdata = mvneta_ofdata_to_platdata, + .of_to_plat = mvneta_of_to_plat, .probe = mvneta_probe, .ops = &mvneta_ops, .priv_auto = sizeof(struct mvneta_port), diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c index 372926e1a4b..a33068cc706 100644 --- a/drivers/net/qe/dm_qe_uec.c +++ b/drivers/net/qe/dm_qe_uec.c @@ -1129,7 +1129,7 @@ static int qe_uec_remove(struct udevice *dev) return 0; }

-static int qe_uec_ofdata_to_platdata(struct udevice *dev) +static int qe_uec_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; @@ -1158,7 +1158,7 @@ U_BOOT_DRIVER(eth_qe_uec) = { .name = QE_UEC_DRIVER_NAME, .id = UCLASS_ETH, .of_match = qe_uec_ids, - .ofdata_to_platdata = qe_uec_ofdata_to_platdata, + .of_to_plat = qe_uec_of_to_plat, .probe = qe_uec_probe, .remove = qe_uec_remove, .ops = &qe_uec_eth_ops, diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 692cd57f687..34e2b8f9e96 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -642,7 +642,7 @@ static const struct eth_ops ravb_ops = { .write_hwaddr = ravb_write_hwaddr, };

-int ravb_ofdata_to_platdata(struct udevice *dev) +int ravb_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; @@ -685,7 +685,7 @@ U_BOOT_DRIVER(eth_ravb) = { .name = "ravb", .id = UCLASS_ETH, .of_match = ravb_ids, - .ofdata_to_platdata = ravb_ofdata_to_platdata, + .of_to_plat = ravb_of_to_plat, .probe = ravb_probe, .remove = ravb_remove, .ops = &ravb_ops, diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 7a8bc1584e0..8273f73c911 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -149,7 +149,7 @@ static const struct eth_ops sb_eth_raw_ops = { .read_rom_hwaddr = sb_eth_raw_read_rom_hwaddr, };

-static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev) +static int sb_eth_raw_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct eth_sandbox_raw_priv *priv = dev_get_priv(dev); @@ -191,7 +191,7 @@ U_BOOT_DRIVER(eth_sandbox_raw) = { .name = "eth_sandbox_raw", .id = UCLASS_ETH, .of_match = sb_eth_raw_ids, - .ofdata_to_platdata = sb_eth_raw_ofdata_to_platdata, + .of_to_plat = sb_eth_raw_of_to_plat, .ops = &sb_eth_raw_ops, .priv_auto = sizeof(struct eth_sandbox_raw_priv), .plat_auto = sizeof(struct eth_pdata), diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index a672333c266..a389e2bd0d1 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -414,7 +414,7 @@ static int sb_eth_remove(struct udevice *dev) return 0; }

-static int sb_eth_ofdata_to_platdata(struct udevice *dev) +static int sb_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct eth_sandbox_priv *priv = dev_get_priv(dev); @@ -443,7 +443,7 @@ U_BOOT_DRIVER(eth_sandbox) = { .name = "eth_sandbox", .id = UCLASS_ETH, .of_match = sb_eth_ids, - .ofdata_to_platdata = sb_eth_ofdata_to_platdata, + .of_to_plat = sb_eth_of_to_plat, .remove = sb_eth_remove, .ops = &sb_eth_ops, .priv_auto = sizeof(struct eth_sandbox_priv), diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 147b36e177a..1666a8cdb21 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -911,7 +911,7 @@ static const struct eth_ops sh_ether_ops = { .write_hwaddr = sh_ether_write_hwaddr, };

-int sh_ether_ofdata_to_platdata(struct udevice *dev) +int sh_ether_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); const char *phy_mode; @@ -953,7 +953,7 @@ U_BOOT_DRIVER(eth_sh_ether) = { .name = "sh_ether", .id = UCLASS_ETH, .of_match = sh_ether_ids, - .ofdata_to_platdata = sh_ether_ofdata_to_platdata, + .of_to_plat = sh_ether_of_to_plat, .probe = sh_ether_probe, .remove = sh_ether_remove, .ops = &sh_ether_ops, diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index e3057a9156e..7b79831c281 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -607,7 +607,7 @@ static int smc911x_probe(struct udevice *dev) return 0; }

-static int smc911x_ofdata_to_platdata(struct udevice *dev) +static int smc911x_of_to_plat(struct udevice *dev) { struct smc911x_priv *priv = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_plat(dev); @@ -636,7 +636,7 @@ U_BOOT_DRIVER(smc911x) = { .id = UCLASS_ETH, .of_match = smc911x_ids, .bind = smc911x_bind, - .ofdata_to_platdata = smc911x_ofdata_to_platdata, + .of_to_plat = smc911x_of_to_plat, .probe = smc911x_probe, .ops = &smc911x_ops, .priv_auto = sizeof(struct smc911x_priv), diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index 9a1b2eb7124..0ebe86a333b 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -732,7 +732,7 @@ static int ave_pxs3_get_pinmode(struct ave_private *priv) return 0; }

-static int ave_ofdata_to_platdata(struct udevice *dev) +static int ave_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct ave_private *priv = dev_get_priv(dev); @@ -996,7 +996,7 @@ U_BOOT_DRIVER(ave) = { .of_match = ave_ids, .probe = ave_probe, .remove = ave_remove, - .ofdata_to_platdata = ave_ofdata_to_platdata, + .of_to_plat = ave_of_to_plat, .ops = &ave_ops, .priv_auto = sizeof(struct ave_private), .plat_auto = sizeof(struct eth_pdata), diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index a9d04ebedd2..cf15e9f475b 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -861,7 +861,7 @@ static int sun8i_handle_internal_phy(struct udevice *dev, struct emac_eth_dev *p return 0; }

-static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) +static int sun8i_emac_eth_of_to_plat(struct udevice *dev) { struct sun8i_eth_pdata *sun8i_pdata = dev_get_plat(dev); struct eth_pdata *pdata = &sun8i_pdata->eth_pdata; @@ -1001,7 +1001,7 @@ U_BOOT_DRIVER(eth_sun8i_emac) = { .name = "eth_sun8i_emac", .id = UCLASS_ETH, .of_match = sun8i_emac_eth_ids, - .ofdata_to_platdata = sun8i_emac_eth_ofdata_to_platdata, + .of_to_plat = sun8i_emac_eth_of_to_plat, .probe = sun8i_emac_eth_probe, .ops = &sun8i_emac_eth_ops, .priv_auto = sizeof(struct emac_eth_dev), diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index 1b01a4765c9..7c6ae3cb814 100644 --- a/drivers/net/sunxi_emac.c +++ b/drivers/net/sunxi_emac.c @@ -591,7 +591,7 @@ static const struct eth_ops sunxi_emac_eth_ops = { .stop = sunxi_emac_eth_stop, };

-static int sunxi_emac_eth_ofdata_to_platdata(struct udevice *dev) +static int sunxi_emac_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev);

@@ -609,7 +609,7 @@ U_BOOT_DRIVER(eth_sunxi_emac) = { .name = "eth_sunxi_emac", .id = UCLASS_ETH, .of_match = sunxi_emac_eth_ids, - .ofdata_to_platdata = sunxi_emac_eth_ofdata_to_platdata, + .of_to_plat = sunxi_emac_eth_of_to_plat, .probe = sunxi_emac_eth_probe, .ops = &sunxi_emac_eth_ops, .priv_auto = sizeof(struct emac_eth_dev), diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 9aa1858625e..68f4191fe97 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -1223,7 +1223,7 @@ static void cpsw_eth_of_parse_slave(struct cpsw_platform_data *data, "max-speed", 0); }

-static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) +static int cpsw_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct cpsw_platform_data *data; @@ -1377,7 +1377,7 @@ U_BOOT_DRIVER(eth_cpsw) = { .id = UCLASS_ETH, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = cpsw_eth_ids, - .ofdata_to_platdata = cpsw_eth_ofdata_to_platdata, + .of_to_plat = cpsw_eth_of_to_plat, .plat_auto = sizeof(struct eth_pdata), #endif .probe = cpsw_eth_probe, diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 8e9eca19f3b..35b796c9136 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -747,7 +747,7 @@ static int ks2_eth_parse_slave_interface(int netcp, int slave, return 0; }

-static int ks2_sl_eth_ofdata_to_platdata(struct udevice *dev) +static int ks2_sl_eth_of_to_plat(struct udevice *dev) { struct ks2_eth_priv *priv = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_plat(dev); @@ -770,7 +770,7 @@ static int ks2_sl_eth_ofdata_to_platdata(struct udevice *dev) return 0; }

-static int ks2_eth_ofdata_to_platdata(struct udevice *dev) +static int ks2_eth_of_to_plat(struct udevice *dev) { struct ks2_eth_priv *priv = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_plat(dev); @@ -800,7 +800,7 @@ static const struct udevice_id ks2_eth_ids[] = { U_BOOT_DRIVER(eth_ks2_slave) = { .name = "eth_ks2_sl", .id = UCLASS_ETH, - .ofdata_to_platdata = ks2_sl_eth_ofdata_to_platdata, + .of_to_plat = ks2_sl_eth_of_to_plat, .probe = ks2_eth_probe, .remove = ks2_eth_remove, .ops = &ks2_eth_ops, @@ -813,7 +813,7 @@ U_BOOT_DRIVER(eth_ks2) = { .name = "eth_ks2", .id = UCLASS_ETH, .of_match = ks2_eth_ids, - .ofdata_to_platdata = ks2_eth_ofdata_to_platdata, + .of_to_plat = ks2_eth_of_to_plat, .probe = ks2_eth_probe, .remove = ks2_eth_remove, .ops = &ks2_eth_ops, diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 3057fba604d..343ab69d194 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -726,7 +726,7 @@ static const struct eth_ops axi_emac_ops = { .write_hwaddr = axiemac_write_hwaddr, };

-static int axi_emac_ofdata_to_platdata(struct udevice *dev) +static int axi_emac_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct axidma_priv *priv = dev_get_priv(dev); @@ -787,7 +787,7 @@ U_BOOT_DRIVER(axi_emac) = { .name = "axi_emac", .id = UCLASS_ETH, .of_match = axi_emac_ids, - .ofdata_to_platdata = axi_emac_ofdata_to_platdata, + .of_to_plat = axi_emac_of_to_plat, .probe = axi_emac_probe, .remove = axi_emac_remove, .ops = &axi_emac_ops, diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index c0d73bc9747..5c768875199 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -593,7 +593,7 @@ static const struct eth_ops emaclite_ops = { .stop = emaclite_stop, };

-static int emaclite_ofdata_to_platdata(struct udevice *dev) +static int emaclite_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct xemaclite *emaclite = dev_get_priv(dev); @@ -631,7 +631,7 @@ U_BOOT_DRIVER(emaclite) = { .name = "emaclite", .id = UCLASS_ETH, .of_match = emaclite_ids, - .ofdata_to_platdata = emaclite_ofdata_to_platdata, + .of_to_plat = emaclite_of_to_plat, .probe = emaclite_probe, .remove = emaclite_remove, .ops = &emaclite_ops, diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 103f2940b45..5cb02bb3a7d 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -743,7 +743,7 @@ static const struct eth_ops zynq_gem_ops = { .read_rom_hwaddr = zynq_gem_read_rom_mac, };

-static int zynq_gem_ofdata_to_platdata(struct udevice *dev) +static int zynq_gem_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct zynq_gem_priv *priv = dev_get_priv(dev); @@ -807,7 +807,7 @@ U_BOOT_DRIVER(zynq_gem) = { .name = "zynq_gem", .id = UCLASS_ETH, .of_match = zynq_gem_ids, - .ofdata_to_platdata = zynq_gem_ofdata_to_platdata, + .of_to_plat = zynq_gem_of_to_plat, .probe = zynq_gem_probe, .remove = zynq_gem_remove, .ops = &zynq_gem_ops, diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c index 2ce23ec7805..a9ca5c2d7b1 100644 --- a/drivers/pci/pci-aardvark.c +++ b/drivers/pci/pci-aardvark.c @@ -660,7 +660,7 @@ static int pcie_advk_remove(struct udevice *dev) }

/** - * pcie_advk_ofdata_to_platdata() - Translate from DT to device state + * pcie_advk_of_to_plat() - Translate from DT to device state * * @dev: A pointer to the device being operated on * @@ -670,7 +670,7 @@ static int pcie_advk_remove(struct udevice *dev) * * Return: 0 on success, else -EINVAL */ -static int pcie_advk_ofdata_to_platdata(struct udevice *dev) +static int pcie_advk_of_to_plat(struct udevice *dev) { struct pcie_advk *pcie = dev_get_priv(dev);

@@ -697,7 +697,7 @@ U_BOOT_DRIVER(pcie_advk) = { .id = UCLASS_PCI, .of_match = pcie_advk_ids, .ops = &pcie_advk_ops, - .ofdata_to_platdata = pcie_advk_ofdata_to_platdata, + .of_to_plat = pcie_advk_of_to_plat, .probe = pcie_advk_probe, .remove = pcie_advk_remove, .flags = DM_FLAG_OS_PREPARE, diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c index cff1a41f024..dc114027814 100644 --- a/drivers/pci/pci-rcar-gen2.c +++ b/drivers/pci/pci-rcar-gen2.c @@ -231,7 +231,7 @@ static int rcar_gen2_pci_probe(struct udevice *dev) return 0; }

-static int rcar_gen2_pci_ofdata_to_platdata(struct udevice *dev) +static int rcar_gen2_pci_of_to_plat(struct udevice *dev) { struct rcar_gen2_pci_priv *priv = dev_get_priv(dev);

@@ -259,6 +259,6 @@ U_BOOT_DRIVER(rcar_gen2_pci) = { .of_match = rcar_gen2_pci_ids, .ops = &rcar_gen2_pci_ops, .probe = rcar_gen2_pci_probe, - .ofdata_to_platdata = rcar_gen2_pci_ofdata_to_platdata, + .of_to_plat = rcar_gen2_pci_of_to_plat, .priv_auto = sizeof(struct rcar_gen2_pci_priv), }; diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index 9ef6314462b..0d5b01f9f81 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -372,7 +372,7 @@ static int rcar_gen3_pcie_probe(struct udevice *dev) return 0; }

-static int rcar_gen3_pcie_ofdata_to_platdata(struct udevice *dev) +static int rcar_gen3_pcie_of_to_plat(struct udevice *dev) { struct rcar_gen3_pcie_priv *priv = dev_get_plat(dev);

@@ -399,6 +399,6 @@ U_BOOT_DRIVER(rcar_gen3_pcie) = { .of_match = rcar_gen3_pcie_ids, .ops = &rcar_gen3_pcie_ops, .probe = rcar_gen3_pcie_probe, - .ofdata_to_platdata = rcar_gen3_pcie_ofdata_to_platdata, + .of_to_plat = rcar_gen3_pcie_of_to_plat, .plat_auto = sizeof(struct rcar_gen3_pcie_priv), }; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index f6e3b3863a1..229d1c8002e 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -58,7 +58,7 @@ pci_dev_t dm_pci_get_bdf(const struct udevice *dev) * will produce a bad BDF> * * A common cause of this problem is that this function is called in the - * ofdata_to_platdata() method of @dev. Accessing the PCI bus in that + * of_to_plat() method of @dev. Accessing the PCI bus in that * method is not allowed, since it has not yet been probed. To fix this, * move that access to the probe() method of @dev instead. */ diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c index 9cb95da1753..ab6ff45a511 100644 --- a/drivers/pci/pci_mpc85xx.c +++ b/drivers/pci/pci_mpc85xx.c @@ -122,7 +122,7 @@ static int mpc85xx_pci_dm_remove(struct udevice *dev) return 0; }

-static int mpc85xx_pci_ofdata_to_platdata(struct udevice *dev) +static int mpc85xx_pci_of_to_plat(struct udevice *dev) { struct mpc85xx_pci_priv *priv = dev_get_priv(dev); fdt_addr_t addr; @@ -154,6 +154,6 @@ U_BOOT_DRIVER(mpc85xx_pci) = { .ops = &mpc85xx_pci_ops, .probe = mpc85xx_pci_dm_probe, .remove = mpc85xx_pci_dm_remove, - .ofdata_to_platdata = mpc85xx_pci_ofdata_to_platdata, + .of_to_plat = mpc85xx_pci_of_to_plat, .priv_auto = sizeof(struct mpc85xx_pci_priv), }; diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index f2d6222bd8a..cf6e0a2e7cb 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -410,7 +410,7 @@ static int mvebu_get_tgt_attr(ofnode node, int devfn, return -ENOENT; }

-static int mvebu_pcie_ofdata_to_platdata(struct udevice *dev) +static int mvebu_pcie_of_to_plat(struct udevice *dev) { struct mvebu_pcie *pcie = dev_get_plat(dev); int ret = 0; @@ -470,7 +470,7 @@ static struct driver pcie_mvebu_drv = { .id = UCLASS_PCI, .ops = &mvebu_pcie_ops, .probe = mvebu_pcie_probe, - .ofdata_to_platdata = mvebu_pcie_ofdata_to_platdata, + .of_to_plat = mvebu_pcie_of_to_plat, .plat_auto = sizeof(struct mvebu_pcie), };

diff --git a/drivers/pci/pci_octeontx.c b/drivers/pci/pci_octeontx.c index d211d22226e..16932839a58 100644 --- a/drivers/pci/pci_octeontx.c +++ b/drivers/pci/pci_octeontx.c @@ -311,7 +311,7 @@ int pci_octeontx_write_config(struct udevice *bus, pci_dev_t bdf, return ret; }

-static int pci_octeontx_ofdata_to_platdata(struct udevice *dev) +static int pci_octeontx_of_to_plat(struct udevice *dev) { return 0; } @@ -357,7 +357,7 @@ U_BOOT_DRIVER(pci_octeontx) = { .id = UCLASS_PCI, .of_match = pci_octeontx_ids, .ops = &pci_octeontx_ops, - .ofdata_to_platdata = pci_octeontx_ofdata_to_platdata, + .of_to_plat = pci_octeontx_of_to_plat, .probe = pci_octeontx_probe, .priv_auto = sizeof(struct octeontx_pci), .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index 386b25a77aa..9cb4414836f 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -1092,7 +1092,7 @@ static const struct tegra_pcie_soc pci_tegra_soc[] = { }, };

-static int pci_tegra_ofdata_to_platdata(struct udevice *dev) +static int pci_tegra_of_to_plat(struct udevice *dev) { struct tegra_pcie *pcie = dev_get_priv(dev); enum tegra_pci_id id; @@ -1197,7 +1197,7 @@ U_BOOT_DRIVER(pci_tegra) = { .id = UCLASS_PCI, .of_match = pci_tegra_ids, .ops = &pci_tegra_ops, - .ofdata_to_platdata = pci_tegra_ofdata_to_platdata, + .of_to_plat = pci_tegra_of_to_plat, .probe = pci_tegra_probe, .priv_auto = sizeof(struct tegra_pcie), }; diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c index 8f084df4882..dd2a4ef629b 100644 --- a/drivers/pci/pcie_brcmstb.c +++ b/drivers/pci/pcie_brcmstb.c @@ -579,7 +579,7 @@ static int brcm_pcie_probe(struct udevice *dev) return 0; }

-static int brcm_pcie_ofdata_to_platdata(struct udevice *dev) +static int brcm_pcie_of_to_plat(struct udevice *dev) { struct brcm_pcie *pcie = dev_get_priv(dev); ofnode dn = dev_ofnode(dev); @@ -618,6 +618,6 @@ U_BOOT_DRIVER(pcie_brcm_base) = { .ops = &brcm_pcie_ops, .of_match = brcm_pcie_ids, .probe = brcm_pcie_probe, - .ofdata_to_platdata = brcm_pcie_ofdata_to_platdata, + .of_to_plat = brcm_pcie_of_to_plat, .priv_auto = sizeof(struct brcm_pcie), }; diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c index cacb5e98e7b..7ec149d178c 100644 --- a/drivers/pci/pcie_dw_mvebu.c +++ b/drivers/pci/pcie_dw_mvebu.c @@ -535,7 +535,7 @@ static int pcie_dw_mvebu_probe(struct udevice *dev) }

/** - * pcie_dw_mvebu_ofdata_to_platdata() - Translate from DT to device state + * pcie_dw_mvebu_of_to_plat() - Translate from DT to device state * * @dev: A pointer to the device being operated on * @@ -545,7 +545,7 @@ static int pcie_dw_mvebu_probe(struct udevice *dev) * * Return: 0 on success, else -EINVAL */ -static int pcie_dw_mvebu_ofdata_to_platdata(struct udevice *dev) +static int pcie_dw_mvebu_of_to_plat(struct udevice *dev) { struct pcie_dw_mvebu *pcie = dev_get_priv(dev);

@@ -578,7 +578,7 @@ U_BOOT_DRIVER(pcie_dw_mvebu) = { .id = UCLASS_PCI, .of_match = pcie_dw_mvebu_ids, .ops = &pcie_dw_mvebu_ops, - .ofdata_to_platdata = pcie_dw_mvebu_ofdata_to_platdata, + .of_to_plat = pcie_dw_mvebu_of_to_plat, .probe = pcie_dw_mvebu_probe, .priv_auto = sizeof(struct pcie_dw_mvebu), }; diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c index 20444d990e1..5e00fcda97a 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -671,7 +671,7 @@ static int pcie_dw_ti_probe(struct udevice *dev) }

/** - * pcie_dw_ti_ofdata_to_platdata() - Translate from DT to device state + * pcie_dw_ti_of_to_plat() - Translate from DT to device state * * @dev: A pointer to the device being operated on * @@ -681,7 +681,7 @@ static int pcie_dw_ti_probe(struct udevice *dev) * * Return: 0 on success, else -EINVAL */ -static int pcie_dw_ti_ofdata_to_platdata(struct udevice *dev) +static int pcie_dw_ti_of_to_plat(struct udevice *dev) { struct pcie_dw_ti *pcie = dev_get_priv(dev);

@@ -724,7 +724,7 @@ U_BOOT_DRIVER(pcie_dw_ti) = { .id = UCLASS_PCI, .of_match = pcie_dw_ti_ids, .ops = &pcie_dw_ti_ops, - .ofdata_to_platdata = pcie_dw_ti_ofdata_to_platdata, + .of_to_plat = pcie_dw_ti_of_to_plat, .probe = pcie_dw_ti_probe, .priv_auto = sizeof(struct pcie_dw_ti), }; diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c index 1e06b7b6e0b..7d1f13d637c 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -113,7 +113,7 @@ static int pci_generic_ecam_write_config(struct udevice *bus, pci_dev_t bdf, }

/** - * pci_generic_ecam_ofdata_to_platdata() - Translate from DT to device state + * pci_generic_ecam_of_to_plat() - Translate from DT to device state * @dev: A pointer to the device being operated on * * Translate relevant data from the device tree pertaining to device @dev into @@ -122,7 +122,7 @@ static int pci_generic_ecam_write_config(struct udevice *bus, pci_dev_t bdf, * * Return: 0 on success, else -EINVAL */ -static int pci_generic_ecam_ofdata_to_platdata(struct udevice *dev) +static int pci_generic_ecam_of_to_plat(struct udevice *dev) { struct generic_ecam_pcie *pcie = dev_get_priv(dev); struct fdt_resource reg_res; @@ -167,6 +167,6 @@ U_BOOT_DRIVER(pci_generic_ecam) = { .of_match = pci_generic_ecam_ids, .ops = &pci_generic_ecam_ops, .probe = pci_generic_ecam_probe, - .ofdata_to_platdata = pci_generic_ecam_ofdata_to_platdata, + .of_to_plat = pci_generic_ecam_of_to_plat, .priv_auto = sizeof(struct generic_ecam_pcie), }; diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c index 7e68c0a9d02..b061b31cae5 100644 --- a/drivers/pci/pcie_fsl.c +++ b/drivers/pci/pcie_fsl.c @@ -593,7 +593,7 @@ static int fsl_pcie_probe(struct udevice *dev) return 0; }

-static int fsl_pcie_ofdata_to_platdata(struct udevice *dev) +static int fsl_pcie_of_to_plat(struct udevice *dev) { struct fsl_pcie *pcie = dev_get_priv(dev); struct fsl_pcie_data *info; @@ -661,7 +661,7 @@ U_BOOT_DRIVER(fsl_pcie) = { .id = UCLASS_PCI, .of_match = fsl_pcie_ids, .ops = &fsl_pcie_ops, - .ofdata_to_platdata = fsl_pcie_ofdata_to_platdata, + .of_to_plat = fsl_pcie_of_to_plat, .probe = fsl_pcie_probe, .priv_auto = sizeof(struct fsl_pcie), }; diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index ebf9b8813da..d9c2325a221 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -799,7 +799,7 @@ static int imx_pcie_dm_remove(struct udevice *dev) return 0; }

-static int imx_pcie_ofdata_to_platdata(struct udevice *dev) +static int imx_pcie_of_to_plat(struct udevice *dev) { struct imx_pcie_priv *priv = dev_get_priv(dev);

@@ -829,7 +829,7 @@ U_BOOT_DRIVER(imx_pcie) = { .ops = &imx_pcie_ops, .probe = imx_pcie_dm_probe, .remove = imx_pcie_dm_remove, - .ofdata_to_platdata = imx_pcie_ofdata_to_platdata, + .of_to_plat = imx_pcie_of_to_plat, .priv_auto = sizeof(struct imx_pcie_priv), .flags = DM_FLAG_OS_PREPARE, }; diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c index 641a770ee56..b4964757c78 100644 --- a/drivers/pci/pcie_intel_fpga.c +++ b/drivers/pci/pcie_intel_fpga.c @@ -379,7 +379,7 @@ static int pcie_intel_fpga_probe(struct udevice *dev) return 0; }

-static int pcie_intel_fpga_ofdata_to_platdata(struct udevice *dev) +static int pcie_intel_fpga_of_to_plat(struct udevice *dev) { struct intel_fpga_pcie *pcie = dev_get_priv(dev); struct fdt_resource reg_res; @@ -428,7 +428,7 @@ U_BOOT_DRIVER(pcie_intel_fpga) = { .id = UCLASS_PCI, .of_match = pcie_intel_fpga_ids, .ops = &pcie_intel_fpga_ops, - .ofdata_to_platdata = pcie_intel_fpga_ofdata_to_platdata, + .of_to_plat = pcie_intel_fpga_of_to_plat, .probe = pcie_intel_fpga_probe, .priv_auto = sizeof(struct intel_fpga_pcie), }; diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c index cce78714b30..03ea04ceaa9 100644 --- a/drivers/pci/pcie_phytium.c +++ b/drivers/pci/pcie_phytium.c @@ -147,7 +147,7 @@ static int pci_phytium_write_config(struct udevice *bus, pci_dev_t bdf, }

/** - * pci_phytium_ofdata_to_platdata() - Translate from DT to device state + * pci_phytium_of_to_plat() - Translate from DT to device state * @dev: A pointer to the device being operated on * * Translate relevant data from the device tree pertaining to device @dev into @@ -156,7 +156,7 @@ static int pci_phytium_write_config(struct udevice *bus, pci_dev_t bdf, * * Return: 0 on success, else -EINVAL */ -static int pci_phytium_ofdata_to_platdata(struct udevice *dev) +static int pci_phytium_of_to_plat(struct udevice *dev) { struct phytium_pcie *pcie = dev_get_priv(dev); struct fdt_resource reg_res; @@ -194,6 +194,6 @@ U_BOOT_DRIVER(pci_phytium) = { .id = UCLASS_PCI, .of_match = pci_phytium_ids, .ops = &pci_phytium_ops, - .ofdata_to_platdata = pci_phytium_ofdata_to_platdata, + .of_to_plat = pci_phytium_of_to_plat, .priv_auto = sizeof(struct phytium_pcie), }; diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c index 7aaee77662b..00879a2d729 100644 --- a/drivers/pci/pcie_xilinx.c +++ b/drivers/pci/pcie_xilinx.c @@ -129,7 +129,7 @@ static int pcie_xilinx_write_config(struct udevice *bus, pci_dev_t bdf, }

/** - * pcie_xilinx_ofdata_to_platdata() - Translate from DT to device state + * pcie_xilinx_of_to_plat() - Translate from DT to device state * @dev: A pointer to the device being operated on * * Translate relevant data from the device tree pertaining to device @dev into @@ -138,7 +138,7 @@ static int pcie_xilinx_write_config(struct udevice *bus, pci_dev_t bdf, * * Return: 0 on success, else -EINVAL */ -static int pcie_xilinx_ofdata_to_platdata(struct udevice *dev) +static int pcie_xilinx_of_to_plat(struct udevice *dev) { struct xilinx_pcie *pcie = dev_get_priv(dev); struct fdt_resource reg_res; @@ -174,6 +174,6 @@ U_BOOT_DRIVER(pcie_xilinx) = { .id = UCLASS_PCI, .of_match = pcie_xilinx_ids, .ops = &pcie_xilinx_ops, - .ofdata_to_platdata = pcie_xilinx_ofdata_to_platdata, + .of_to_plat = pcie_xilinx_of_to_plat, .priv_auto = sizeof(struct xilinx_pcie), }; diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 42e05b0e707..44a310f83de 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -104,7 +104,7 @@ static const struct udevice_id bcm2835_pinctrl_id[] = { {} };

-int bcm283x_pinctl_ofdata_to_platdata(struct udevice *dev) +int bcm283x_pinctl_of_to_plat(struct udevice *dev) { struct bcm283x_pinctrl_priv *priv;

@@ -149,7 +149,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = { .name = "bcm283x_pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(bcm2835_pinctrl_id), - .ofdata_to_platdata = bcm283x_pinctl_ofdata_to_platdata, + .of_to_plat = bcm283x_pinctl_of_to_plat, .priv_auto = sizeof(struct bcm283x_pinctrl_priv), .ops = &bcm283x_pinctrl_ops, .probe = bcm283x_pinctl_probe, diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c index 576e1b4728a..64cde5e329c 100644 --- a/drivers/pinctrl/intel/pinctrl.c +++ b/drivers/pinctrl/intel/pinctrl.c @@ -143,7 +143,7 @@ static int pinctrl_get_device(uint pad, struct udevice **devp)

/* * We have to probe each one of these since the community link is only - * attached in intel_pinctrl_ofdata_to_platdata(). + * attached in intel_pinctrl_of_to_plat(). */ uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) { struct intel_pinctrl_priv *priv = dev_get_priv(dev); @@ -613,9 +613,8 @@ int pinctrl_config_pads_for_node(struct udevice *dev, ofnode node) return 0; }

-int intel_pinctrl_ofdata_to_platdata(struct udevice *dev, - const struct pad_community *comm, - int num_cfgs) +int intel_pinctrl_of_to_plat(struct udevice *dev, + const struct pad_community *comm, int num_cfgs) { struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); struct intel_pinctrl_priv *priv = dev_get_priv(dev); diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c index b34cae60044..2432f3f363f 100644 --- a/drivers/pinctrl/intel/pinctrl_apl.c +++ b/drivers/pinctrl/intel/pinctrl_apl.c @@ -136,7 +136,7 @@ static const struct pad_community apl_gpio_communities[] = { }, };

-static int apl_pinctrl_ofdata_to_platdata(struct udevice *dev) +static int apl_pinctrl_of_to_plat(struct udevice *dev) { struct p2sb_child_platdata *pplat; const struct pad_community *comm = NULL; @@ -166,7 +166,7 @@ static int apl_pinctrl_ofdata_to_platdata(struct udevice *dev) comm = &apl_gpio_communities[i]; }

- return intel_pinctrl_ofdata_to_platdata(dev, comm, 2); + return intel_pinctrl_of_to_plat(dev, comm, 2); }

static const struct udevice_id apl_gpio_ids[] = { @@ -183,7 +183,7 @@ U_BOOT_DRIVER(intel_apl_pinctrl) = { #if !CONFIG_IS_ENABLED(OF_PLATDATA) .bind = dm_scan_fdt_dev, #endif - .ofdata_to_platdata = apl_pinctrl_ofdata_to_platdata, + .of_to_plat = apl_pinctrl_of_to_plat, .priv_auto = sizeof(struct intel_pinctrl_priv), .plat_auto = sizeof(struct apl_gpio_platdata), }; diff --git a/drivers/pinctrl/mtmips/pinctrl-mt7628.c b/drivers/pinctrl/mtmips/pinctrl-mt7628.c index 8edab2f9950..c15da6be0ea 100644 --- a/drivers/pinctrl/mtmips/pinctrl-mt7628.c +++ b/drivers/pinctrl/mtmips/pinctrl-mt7628.c @@ -534,7 +534,7 @@ static int mt7628_pinctrl_probe(struct udevice *dev) return ret; }

-static int mt7628_pinctrl_ofdata_to_platdata(struct udevice *dev) +static int mt7628_pinctrl_of_to_plat(struct udevice *dev) { struct mt7628_pinctrl_priv *priv = dev_get_priv(dev);

@@ -578,7 +578,7 @@ U_BOOT_DRIVER(mt7628_pinctrl) = { .name = "mt7628-pinctrl", .id = UCLASS_PINCTRL, .of_match = mt7628_pinctrl_ids, - .ofdata_to_platdata = mt7628_pinctrl_ofdata_to_platdata, + .of_to_plat = mt7628_pinctrl_of_to_plat, .ops = &mt7628_pinctrl_ops, .probe = mt7628_pinctrl_probe, .priv_auto = sizeof(struct mt7628_pinctrl_priv), diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c index 4f7cfaa0785..5093a52017e 100644 --- a/drivers/pinctrl/pinctrl-qe-io.c +++ b/drivers/pinctrl/pinctrl-qe-io.c @@ -120,7 +120,7 @@ void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign) qe_cfg_iopin(par_io, port, pin, dir, open_drain, assign); } #else -static int qe_io_ofdata_to_platdata(struct udevice *dev) +static int qe_io_of_to_plat(struct udevice *dev) { struct qe_io_platdata *plat = dev->plat; fdt_addr_t addr; @@ -245,7 +245,7 @@ U_BOOT_DRIVER(par_io_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(par_io_pinctrl_match), .probe = par_io_pinctrl_probe, - .ofdata_to_platdata = qe_io_ofdata_to_platdata, + .of_to_plat = qe_io_of_to_plat, .plat_auto = sizeof(struct qe_io_platdata), .ops = &par_io_pinctrl_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 0a3319cce86..25d646a26f7 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -148,7 +148,7 @@ static int single_set_state(struct udevice *dev, return len; }

-static int single_ofdata_to_platdata(struct udevice *dev) +static int single_of_to_plat(struct udevice *dev) { fdt_addr_t addr; u32 of_reg[2]; @@ -192,5 +192,5 @@ U_BOOT_DRIVER(single_pinctrl) = { .of_match = single_pinctrl_match, .ops = &single_pinctrl_ops, .plat_auto = sizeof(struct single_pdata), - .ofdata_to_platdata = single_ofdata_to_platdata, + .of_to_plat = single_of_to_plat, }; diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c index c97dfbb1c2e..cf6e068f324 100644 --- a/drivers/power/domain/imx8-power-domain-legacy.c +++ b/drivers/power/domain/imx8-power-domain-legacy.c @@ -340,7 +340,7 @@ static int imx8_power_domain_probe(struct udevice *dev) return 0; }

-static int imx8_power_domain_ofdata_to_platdata(struct udevice *dev) +static int imx8_power_domain_of_to_plat(struct udevice *dev) { int reg; struct imx8_power_domain_platdata *pdata = dev_get_plat(dev); @@ -376,7 +376,7 @@ U_BOOT_DRIVER(imx8_power_domain) = { .of_match = imx8_power_domain_ids, .bind = imx8_power_domain_bind, .probe = imx8_power_domain_probe, - .ofdata_to_platdata = imx8_power_domain_ofdata_to_platdata, + .of_to_plat = imx8_power_domain_of_to_plat, .plat_auto = sizeof(struct imx8_power_domain_platdata), .priv_auto = sizeof(struct imx8_power_domain_priv), .ops = &imx8_power_domain_ops, diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c index 1248f937eb4..499788967c9 100644 --- a/drivers/power/domain/imx8m-power-domain.c +++ b/drivers/power/domain/imx8m-power-domain.c @@ -104,7 +104,7 @@ static int imx8m_power_domain_probe(struct udevice *dev) return 0; }

-static int imx8m_power_domain_ofdata_to_platdata(struct udevice *dev) +static int imx8m_power_domain_of_to_plat(struct udevice *dev) { struct imx8m_power_domain_platdata *pdata = dev_get_plat(dev);

@@ -136,7 +136,7 @@ U_BOOT_DRIVER(imx8m_power_domain) = { .of_match = imx8m_power_domain_ids, .bind = imx8m_power_domain_bind, .probe = imx8m_power_domain_probe, - .ofdata_to_platdata = imx8m_power_domain_ofdata_to_platdata, + .of_to_plat = imx8m_power_domain_of_to_plat, .plat_auto = sizeof(struct imx8m_power_domain_platdata), .ops = &imx8m_power_domain_ops, }; diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c index a85de822b3c..abe3a1051f1 100644 --- a/drivers/power/pmic/i2c_pmic_emul.c +++ b/drivers/power/pmic/i2c_pmic_emul.c @@ -103,7 +103,7 @@ static int sandbox_i2c_pmic_xfer(struct udevice *emul, struct i2c_msg *msg, return ret; }

-static int sandbox_i2c_pmic_ofdata_to_platdata(struct udevice *emul) +static int sandbox_i2c_pmic_of_to_plat(struct udevice *emul) { struct sandbox_i2c_pmic_plat_data *plat = dev_get_plat(emul); struct udevice *pmic_dev = i2c_emul_get_device(emul); @@ -159,7 +159,7 @@ U_BOOT_DRIVER(sandbox_i2c_pmic_emul) = { .name = "sandbox_i2c_pmic_emul", .id = UCLASS_I2C_EMUL, .of_match = sandbox_i2c_pmic_ids, - .ofdata_to_platdata = sandbox_i2c_pmic_ofdata_to_platdata, + .of_to_plat = sandbox_i2c_pmic_of_to_plat, .probe = sandbox_i2c_pmic_probe, .plat_auto = sizeof(struct sandbox_i2c_pmic_plat_data), .ops = &sandbox_i2c_pmic_emul_ops, diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index 02a08b58b06..fcd1d5292cc 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -100,7 +100,7 @@ struct fan53555_priv { unsigned int sleep_vol_cache; };

-static int fan53555_regulator_ofdata_to_platdata(struct udevice *dev) +static int fan53555_regulator_of_to_plat(struct udevice *dev) { struct fan53555_platdata *dev_pdata = dev_get_plat(dev); struct dm_regulator_uclass_plat *uc_pdata = @@ -238,7 +238,7 @@ U_BOOT_DRIVER(fan53555_regulator) = { .name = "fan53555_regulator", .id = UCLASS_REGULATOR, .ops = &fan53555_regulator_ops, - .ofdata_to_platdata = fan53555_regulator_ofdata_to_platdata, + .of_to_plat = fan53555_regulator_of_to_plat, .plat_auto = sizeof(struct fan53555_platdata), .priv_auto = sizeof(struct fan53555_priv), .probe = fan53555_probe, diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index 4967b7051b3..efe2ec9a164 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -14,7 +14,7 @@

#include "regulator_common.h"

-static int fixed_regulator_ofdata_to_platdata(struct udevice *dev) +static int fixed_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; struct regulator_common_platdata *dev_pdata; @@ -26,7 +26,7 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)

uc_pdata->type = REGULATOR_TYPE_FIXED;

- return regulator_common_ofdata_to_platdata(dev, dev_pdata, "gpio"); + return regulator_common_of_to_plat(dev, dev_pdata, "gpio"); }

static int fixed_regulator_get_value(struct udevice *dev) @@ -88,6 +88,6 @@ U_BOOT_DRIVER(regulator_fixed) = { .id = UCLASS_REGULATOR, .ops = &fixed_regulator_ops, .of_match = fixed_regulator_ids, - .ofdata_to_platdata = fixed_regulator_ofdata_to_platdata, + .of_to_plat = fixed_regulator_of_to_plat, .plat_auto = sizeof(struct regulator_common_platdata), }; diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 80a6949e6b3..2565c4416a8 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -25,7 +25,7 @@ struct gpio_regulator_platdata { int voltages[GPIO_REGULATOR_MAX_STATES]; };

-static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) +static int gpio_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; struct gpio_regulator_platdata *dev_pdata; @@ -74,7 +74,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev) j++; }

- return regulator_common_ofdata_to_platdata(dev, &dev_pdata->common, "enable-gpios"); + return regulator_common_of_to_plat(dev, &dev_pdata->common, "enable-gpios"); }

static int gpio_regulator_get_value(struct udevice *dev) @@ -154,6 +154,6 @@ U_BOOT_DRIVER(gpio_regulator) = { .id = UCLASS_REGULATOR, .ops = &gpio_regulator_ops, .of_match = gpio_regulator_ids, - .ofdata_to_platdata = gpio_regulator_ofdata_to_platdata, + .of_to_plat = gpio_regulator_of_to_plat, .plat_auto = sizeof(struct gpio_regulator_platdata), }; diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c index c01c19efbe6..c3df156749f 100644 --- a/drivers/power/regulator/pbias_regulator.c +++ b/drivers/power/regulator/pbias_regulator.c @@ -64,7 +64,7 @@ static int pbias_read(struct udevice *dev, uint reg, uint8_t *buff, int len) return regmap_read(priv->regmap, priv->offset, (u32 *)buff); }

-static int pbias_ofdata_to_platdata(struct udevice *dev) +static int pbias_of_to_plat(struct udevice *dev) { struct pbias_priv *priv = dev_get_priv(dev); struct udevice *syscon; @@ -129,7 +129,7 @@ U_BOOT_DRIVER(pbias_pmic) = { .of_match = pbias_ids, .bind = pbias_bind, .ops = &pbias_ops, - .ofdata_to_platdata = pbias_ofdata_to_platdata, + .of_to_plat = pbias_of_to_plat, .priv_auto = sizeof(struct pbias_priv), };

diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c index 9435cc3162f..18e57db0763 100644 --- a/drivers/power/regulator/pwm_regulator.c +++ b/drivers/power/regulator/pwm_regulator.c @@ -89,7 +89,7 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt) return ret; }

-static int pwm_regulator_ofdata_to_platdata(struct udevice *dev) +static int pwm_regulator_of_to_plat(struct udevice *dev) { struct pwm_regulator_info *priv = dev_get_priv(dev); struct ofnode_phandle_args args; @@ -154,6 +154,6 @@ U_BOOT_DRIVER(pwm_regulator) = { .ops = &pwm_regulator_ops, .probe = pwm_regulator_probe, .of_match = pwm_regulator_ids, - .ofdata_to_platdata = pwm_regulator_ofdata_to_platdata, + .of_to_plat = pwm_regulator_of_to_plat, .priv_auto = sizeof(struct pwm_regulator_info), }; diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 13906b9c6e2..d307a1948a0 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -12,8 +12,9 @@

#include "regulator_common.h"

-int regulator_common_ofdata_to_platdata(struct udevice *dev, - struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name) +int regulator_common_of_to_plat(struct udevice *dev, + struct regulator_common_platdata *dev_pdata, + const char *enable_gpio_name) { struct gpio_desc *gpio; int flags = GPIOD_IS_OUT; diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index bf80439c786..5ae0b9aa40b 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -15,8 +15,9 @@ struct regulator_common_platdata { unsigned int off_on_delay_us; };

-int regulator_common_ofdata_to_platdata(struct udevice *dev, - struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name); +int regulator_common_of_to_plat(struct udevice *dev, + struct regulator_common_platdata *dev_pdata, + const char *enable_gpio_name); int regulator_common_get_enable(const struct udevice *dev, struct regulator_common_platdata *dev_pdata); int regulator_common_set_enable(const struct udevice *dev, diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c index 9fb13d6a551..0ed4952a1e0 100644 --- a/drivers/power/regulator/tps65910_regulator.c +++ b/drivers/power/regulator/tps65910_regulator.c @@ -386,7 +386,7 @@ static int tps65910_boost_get_value(struct udevice *dev) return vout; }

-static int tps65910_regulator_ofdata_to_platdata(struct udevice *dev) +static int tps65910_regulator_of_to_plat(struct udevice *dev) { struct udevice *supply; int ret; @@ -425,7 +425,7 @@ U_BOOT_DRIVER(tps65910_boost) = { .id = UCLASS_REGULATOR, .ops = &tps65910_boost_ops, .plat_auto = sizeof(struct tps65910_regulator_pdata), - .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, + .of_to_plat = tps65910_regulator_of_to_plat, };

static const struct dm_regulator_ops tps65910_buck_ops = { @@ -440,7 +440,7 @@ U_BOOT_DRIVER(tps65910_buck) = { .id = UCLASS_REGULATOR, .ops = &tps65910_buck_ops, .plat_auto = sizeof(struct tps65910_regulator_pdata), - .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, + .of_to_plat = tps65910_regulator_of_to_plat, };

static const struct dm_regulator_ops tps65910_ldo_ops = { @@ -455,5 +455,5 @@ U_BOOT_DRIVER(tps65910_ldo) = { .id = UCLASS_REGULATOR, .ops = &tps65910_ldo_ops, .plat_auto = sizeof(struct tps65910_regulator_pdata), - .ofdata_to_platdata = tps65910_regulator_ofdata_to_platdata, + .of_to_plat = tps65910_regulator_of_to_plat, }; diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c index 70fbdf89bd0..1afaf784dab 100644 --- a/drivers/pwm/exynos_pwm.c +++ b/drivers/pwm/exynos_pwm.c @@ -88,7 +88,7 @@ static int exynos_pwm_probe(struct udevice *dev) return 0; }

-static int exynos_pwm_ofdata_to_platdata(struct udevice *dev) +static int exynos_pwm_of_to_plat(struct udevice *dev) { struct exynos_pwm_priv *priv = dev_get_priv(dev);

@@ -113,6 +113,6 @@ U_BOOT_DRIVER(exynos_pwm) = { .of_match = exynos_channels, .ops = &exynos_pwm_ops, .probe = exynos_pwm_probe, - .ofdata_to_platdata = exynos_pwm_ofdata_to_platdata, + .of_to_plat = exynos_pwm_of_to_plat, .priv_auto = sizeof(struct exynos_pwm_priv), }; diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 0b8e82b6fae..2008c1520e6 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -126,7 +126,7 @@ static int imx_pwm_set_enable(struct udevice *dev, uint channel, bool enable) return 0; };

-static int imx_pwm_ofdata_to_platdata(struct udevice *dev) +static int imx_pwm_of_to_plat(struct udevice *dev) { struct imx_pwm_priv *priv = dev_get_priv(dev);

@@ -156,7 +156,7 @@ U_BOOT_DRIVER(imx_pwm) = { .id = UCLASS_PWM, .of_match = imx_pwm_ids, .ops = &imx_pwm_ops, - .ofdata_to_platdata = imx_pwm_ofdata_to_platdata, + .of_to_plat = imx_pwm_of_to_plat, .probe = imx_pwm_probe, .priv_auto = sizeof(struct imx_pwm_priv), }; diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index e538e27e136..58b7469f977 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -249,7 +249,7 @@ static int meson_pwm_set_invert(struct udevice *dev, uint channeln, bool polarit return meson_pwm_set_config(dev, channeln, channel->period_ns, channel->duty_ns); }

-static int meson_pwm_ofdata_to_platdata(struct udevice *dev) +static int meson_pwm_of_to_plat(struct udevice *dev) { struct meson_pwm *priv = dev_get_priv(dev);

@@ -522,7 +522,7 @@ U_BOOT_DRIVER(meson_pwm) = { .id = UCLASS_PWM, .of_match = meson_pwm_ids, .ops = &meson_pwm_ops, - .ofdata_to_platdata = meson_pwm_ofdata_to_platdata, + .of_to_plat = meson_pwm_of_to_plat, .probe = meson_pwm_probe, .priv_auto = sizeof(struct meson_pwm), }; diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c index 4731e4a1858..30c30430bea 100644 --- a/drivers/pwm/pwm-sifive.c +++ b/drivers/pwm/pwm-sifive.c @@ -115,7 +115,7 @@ static int pwm_sifive_set_enable(struct udevice *dev, uint channel, bool enable) return 0; }

-static int pwm_sifive_ofdata_to_platdata(struct udevice *dev) +static int pwm_sifive_of_to_plat(struct udevice *dev) { struct pwm_sifive_priv *priv = dev_get_priv(dev);

@@ -166,7 +166,7 @@ U_BOOT_DRIVER(pwm_sifive) = { .id = UCLASS_PWM, .of_match = pwm_sifive_ids, .ops = &pwm_sifive_ops, - .ofdata_to_platdata = pwm_sifive_ofdata_to_platdata, + .of_to_plat = pwm_sifive_of_to_plat, .probe = pwm_sifive_probe, .priv_auto = sizeof(struct pwm_sifive_priv), }; diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c index ccd23d88849..a64fc4a0527 100644 --- a/drivers/pwm/rk_pwm.c +++ b/drivers/pwm/rk_pwm.c @@ -121,7 +121,7 @@ static int rk_pwm_set_enable(struct udevice *dev, uint channel, bool enable) return 0; }

-static int rk_pwm_ofdata_to_platdata(struct udevice *dev) +static int rk_pwm_of_to_plat(struct udevice *dev) { struct rk_pwm_priv *priv = dev_get_priv(dev);

@@ -213,7 +213,7 @@ U_BOOT_DRIVER(rk_pwm) = { .id = UCLASS_PWM, .of_match = rk_pwm_ids, .ops = &rk_pwm_ops, - .ofdata_to_platdata = rk_pwm_ofdata_to_platdata, + .of_to_plat = rk_pwm_of_to_plat, .probe = rk_pwm_probe, .priv_auto = sizeof(struct rk_pwm_priv), }; diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c index 9a35fe02def..614635526fe 100644 --- a/drivers/pwm/sunxi_pwm.c +++ b/drivers/pwm/sunxi_pwm.c @@ -148,7 +148,7 @@ static int sunxi_pwm_set_enable(struct udevice *dev, uint channel, bool enable) return 0; }

-static int sunxi_pwm_ofdata_to_platdata(struct udevice *dev) +static int sunxi_pwm_of_to_plat(struct udevice *dev) { struct sunxi_pwm_priv *priv = dev_get_priv(dev);

@@ -179,7 +179,7 @@ U_BOOT_DRIVER(sunxi_pwm) = { .id = UCLASS_PWM, .of_match = sunxi_pwm_ids, .ops = &sunxi_pwm_ops, - .ofdata_to_platdata = sunxi_pwm_ofdata_to_platdata, + .of_to_plat = sunxi_pwm_of_to_plat, .probe = sunxi_pwm_probe, .priv_auto = sizeof(struct sunxi_pwm_priv), }; diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c index 29c9ce366c9..36c35c608b2 100644 --- a/drivers/pwm/tegra_pwm.c +++ b/drivers/pwm/tegra_pwm.c @@ -53,7 +53,7 @@ static int tegra_pwm_set_enable(struct udevice *dev, uint channel, bool enable) return 0; }

-static int tegra_pwm_ofdata_to_platdata(struct udevice *dev) +static int tegra_pwm_of_to_plat(struct udevice *dev) { struct tegra_pwm_priv *priv = dev_get_priv(dev);

@@ -78,6 +78,6 @@ U_BOOT_DRIVER(tegra_pwm) = { .id = UCLASS_PWM, .of_match = tegra_pwm_ids, .ops = &tegra_pwm_ops, - .ofdata_to_platdata = tegra_pwm_ofdata_to_platdata, + .of_to_plat = tegra_pwm_of_to_plat, .priv_auto = sizeof(struct tegra_pwm_priv), }; diff --git a/drivers/ram/aspeed/sdram_ast2500.c b/drivers/ram/aspeed/sdram_ast2500.c index e4d01d848ee..905ef304e25 100644 --- a/drivers/ram/aspeed/sdram_ast2500.c +++ b/drivers/ram/aspeed/sdram_ast2500.c @@ -386,7 +386,7 @@ static int ast2500_sdrammc_probe(struct udevice *dev) return 0; }

-static int ast2500_sdrammc_ofdata_to_platdata(struct udevice *dev) +static int ast2500_sdrammc_of_to_plat(struct udevice *dev) { struct dram_info *priv = dev_get_priv(dev); struct regmap *map; @@ -433,7 +433,7 @@ U_BOOT_DRIVER(sdrammc_ast2500) = { .id = UCLASS_RAM, .of_match = ast2500_sdrammc_ids, .ops = &ast2500_sdrammc_ops, - .ofdata_to_platdata = ast2500_sdrammc_ofdata_to_platdata, + .of_to_plat = ast2500_sdrammc_of_to_plat, .probe = ast2500_sdrammc_probe, .priv_auto = sizeof(struct dram_info), }; diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c index 6a5d96ff724..ca2eec767d7 100644 --- a/drivers/ram/imxrt_sdram.c +++ b/drivers/ram/imxrt_sdram.c @@ -302,7 +302,7 @@ int imxrt_sdram_init(struct udevice *dev) return 0; }

-static int imxrt_semc_ofdata_to_platdata(struct udevice *dev) +static int imxrt_semc_of_to_plat(struct udevice *dev) { struct imxrt_sdram_params *params = dev_get_plat(dev); ofnode bank_node; @@ -439,7 +439,7 @@ U_BOOT_DRIVER(imxrt_semc) = { .id = UCLASS_RAM, .of_match = imxrt_semc_ids, .ops = &imxrt_semc_ops, - .ofdata_to_platdata = imxrt_semc_ofdata_to_platdata, + .of_to_plat = imxrt_semc_of_to_plat, .probe = imxrt_semc_probe, .plat_auto = sizeof(struct imxrt_sdram_params), }; diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c index 87294430bf9..783834c9f57 100644 --- a/drivers/ram/mpc83xx_sdram.c +++ b/drivers/ram/mpc83xx_sdram.c @@ -305,7 +305,7 @@ static int mpc83xx_sdram_spd_init(ofnode node, u32 cs, u32 mapaddr, u32 size) return 0; }

-static int mpc83xx_sdram_ofdata_to_platdata(struct udevice *dev) +static int mpc83xx_sdram_of_to_plat(struct udevice *dev) { return 0; } @@ -1093,7 +1093,7 @@ U_BOOT_DRIVER(mpc83xx_sdram) = { .id = UCLASS_RAM, .of_match = mpc83xx_sdram_ids, .ops = &mpc83xx_sdram_ops, - .ofdata_to_platdata = mpc83xx_sdram_ofdata_to_platdata, + .of_to_plat = mpc83xx_sdram_of_to_plat, .probe = mpc83xx_sdram_probe, .priv_auto = sizeof(struct mpc83xx_sdram_priv), }; diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index 1a19964b8fe..0e677f3ec78 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -879,7 +879,7 @@ error: } #endif

-static int rk3368_dmc_ofdata_to_platdata(struct udevice *dev) +static int rk3368_dmc_of_to_plat(struct udevice *dev) { int ret = 0;

@@ -999,7 +999,7 @@ U_BOOT_DRIVER(rockchip_rk3368_dmc) = { .ops = &rk3368_dmc_ops, .probe = rk3368_dmc_probe, .priv_auto = sizeof(struct dram_info), - .ofdata_to_platdata = rk3368_dmc_ofdata_to_platdata, + .of_to_plat = rk3368_dmc_of_to_plat, .probe = rk3368_dmc_probe, .priv_auto = sizeof(struct dram_info), .plat_auto = sizeof(struct rk3368_sdram_params), diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index e7ba0b98358..d0b0601fbe6 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -814,7 +814,7 @@ static int setup_sdram(struct udevice *dev) return sdram_init(priv, params); }

-static int rk3188_dmc_ofdata_to_platdata(struct udevice *dev) +static int rk3188_dmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3188_sdram_params *params = dev_get_plat(dev); @@ -951,7 +951,7 @@ U_BOOT_DRIVER(rockchip_rk3188_dmc) = { .of_match = rk3188_dmc_ids, .ops = &rk3188_dmc_ops, #ifdef CONFIG_SPL_BUILD - .ofdata_to_platdata = rk3188_dmc_ofdata_to_platdata, + .of_to_plat = rk3188_dmc_of_to_plat, #endif .probe = rk3188_dmc_probe, .priv_auto = sizeof(struct dram_info), diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index 763c8509c52..bdc463c1d76 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -713,7 +713,7 @@ out: return ret; }

-static int rk322x_dmc_ofdata_to_platdata(struct udevice *dev) +static int rk322x_dmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk322x_sdram_params *params = dev_get_plat(dev); @@ -844,7 +844,7 @@ U_BOOT_DRIVER(dmc_rk322x) = { .of_match = rk322x_dmc_ids, .ops = &rk322x_dmc_ops, #ifdef CONFIG_TPL_BUILD - .ofdata_to_platdata = rk322x_dmc_ofdata_to_platdata, + .of_to_plat = rk322x_dmc_of_to_plat, #endif .probe = rk322x_dmc_probe, .priv_auto = sizeof(struct dram_info), diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index 44ad28ab755..094ae36c884 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -971,7 +971,7 @@ static int setup_sdram(struct udevice *dev) return sdram_init(priv, params); }

-static int rk3288_dmc_ofdata_to_platdata(struct udevice *dev) +static int rk3288_dmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3288_sdram_params *params = dev_get_plat(dev); @@ -1120,7 +1120,7 @@ U_BOOT_DRIVER(rockchip_rk3288_dmc) = { .ops = &rk3288_dmc_ops, #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) - .ofdata_to_platdata = rk3288_dmc_ofdata_to_platdata, + .of_to_plat = rk3288_dmc_of_to_plat, #endif .probe = rk3288_dmc_probe, .priv_auto = sizeof(struct dram_info), diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index 994a948f342..cfd351501a3 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -548,7 +548,7 @@ static int rk3328_dmc_init(struct udevice *dev) return 0; }

-static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev) +static int rk3328_dmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_dmc_plat *plat = dev_get_plat(dev); @@ -612,7 +612,7 @@ U_BOOT_DRIVER(rockchip_rk3328_dmc) = { .of_match = rk3328_dmc_ids, .ops = &rk3328_dmc_ops, #ifdef CONFIG_TPL_BUILD - .ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata, + .of_to_plat = rk3328_dmc_of_to_plat, #endif .probe = rk3328_dmc_probe, .priv_auto = sizeof(struct dram_info), diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 07977bc1d40..261ded0760e 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -3011,7 +3011,7 @@ static int sdram_init(struct dram_info *dram, return 0; }

-static int rk3399_dmc_ofdata_to_platdata(struct udevice *dev) +static int rk3399_dmc_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_dmc_plat *plat = dev_get_plat(dev); @@ -3175,7 +3175,7 @@ U_BOOT_DRIVER(dmc_rk3399) = { .ops = &rk3399_dmc_ops, #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) - .ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata, + .of_to_plat = rk3399_dmc_of_to_plat, #endif .probe = rk3399_dmc_probe, .priv_auto = sizeof(struct dram_info), diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index da25d37a0c2..4003db0e503 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -256,7 +256,7 @@ int stm32_sdram_init(struct udevice *dev) return 0; }

-static int stm32_fmc_ofdata_to_platdata(struct udevice *dev) +static int stm32_fmc_of_to_plat(struct udevice *dev) { struct stm32_sdram_params *params = dev_get_plat(dev); struct bank_params *bank_params; @@ -407,7 +407,7 @@ U_BOOT_DRIVER(stm32_fmc) = { .id = UCLASS_RAM, .of_match = stm32_fmc_ids, .ops = &stm32_fmc_ops, - .ofdata_to_platdata = stm32_fmc_ofdata_to_platdata, + .of_to_plat = stm32_fmc_of_to_plat, .probe = stm32_fmc_probe, .plat_auto = sizeof(struct stm32_sdram_params), }; diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c index 18a4ecad4f0..848425afbcb 100644 --- a/drivers/reset/reset-mtmips.c +++ b/drivers/reset/reset-mtmips.c @@ -58,7 +58,7 @@ static int mtmips_reset_probe(struct udevice *dev) return 0; }

-static int mtmips_reset_ofdata_to_platdata(struct udevice *dev) +static int mtmips_reset_of_to_plat(struct udevice *dev) { struct mtmips_reset_priv *priv = dev_get_priv(dev);

@@ -78,7 +78,7 @@ U_BOOT_DRIVER(mtmips_reset) = { .name = "mtmips-reset", .id = UCLASS_RESET, .of_match = mtmips_reset_ids, - .ofdata_to_platdata = mtmips_reset_ofdata_to_platdata, + .of_to_plat = mtmips_reset_of_to_plat, .probe = mtmips_reset_probe, .priv_auto = sizeof(struct mtmips_reset_priv), .ops = &mtmips_reset_ops, diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index 1d0b540b7b4..bebfce40a63 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -76,12 +76,12 @@ static int meson_rng_remove(struct udevice *dev) }

/** - * meson_rng_ofdata_to_platdata() - transfer device tree data to plaform data + * meson_rng_of_to_plat() - transfer device tree data to plaform data * * @dev: device * Return: 0 if ok */ -static int meson_rng_ofdata_to_platdata(struct udevice *dev) +static int meson_rng_of_to_plat(struct udevice *dev) { struct meson_rng_platdata *pdata = dev_get_plat(dev); int err; @@ -117,5 +117,5 @@ U_BOOT_DRIVER(meson_rng) = { .probe = meson_rng_probe, .remove = meson_rng_remove, .plat_auto = sizeof(struct meson_rng_platdata), - .ofdata_to_platdata = meson_rng_ofdata_to_platdata, + .of_to_plat = meson_rng_of_to_plat, }; diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c index 7c4363f7992..ec233d13211 100644 --- a/drivers/rng/rockchip_rng.c +++ b/drivers/rng/rockchip_rng.c @@ -168,7 +168,7 @@ exit: return ret; }

-static int rockchip_rng_ofdata_to_platdata(struct udevice *dev) +static int rockchip_rng_of_to_plat(struct udevice *dev) { struct rk_rng_platdata *pdata = dev_get_priv(dev);

@@ -220,6 +220,6 @@ U_BOOT_DRIVER(rockchip_rng) = { .of_match = rockchip_rng_match, .ops = &rockchip_rng_ops, .probe = rockchip_rng_probe, - .ofdata_to_platdata = rockchip_rng_ofdata_to_platdata, + .of_to_plat = rockchip_rng_of_to_plat, .priv_auto = sizeof(struct rk_rng_platdata), }; diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index 34281d39464..30505ee7fc6 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -122,7 +122,7 @@ static int stm32_rng_remove(struct udevice *dev) return stm32_rng_cleanup(pdata); }

-static int stm32_rng_ofdata_to_platdata(struct udevice *dev) +static int stm32_rng_of_to_plat(struct udevice *dev) { struct stm32_rng_platdata *pdata = dev_get_plat(dev); int err; @@ -161,5 +161,5 @@ U_BOOT_DRIVER(stm32_rng) = { .probe = stm32_rng_probe, .remove = stm32_rng_remove, .plat_auto = sizeof(struct stm32_rng_platdata), - .ofdata_to_platdata = stm32_rng_ofdata_to_platdata, + .of_to_plat = stm32_rng_of_to_plat, }; diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c index 731ce8d0592..50240d57fa9 100644 --- a/drivers/rtc/mvrtc.c +++ b/drivers/rtc/mvrtc.c @@ -168,7 +168,7 @@ static const struct udevice_id mv_rtc_ids[] = { { } };

-static int mv_rtc_ofdata_to_platdata(struct udevice *dev) +static int mv_rtc_of_to_plat(struct udevice *dev) { struct mvrtc_pdata *pdata = dev_get_plat(dev);

@@ -179,7 +179,7 @@ static int mv_rtc_ofdata_to_platdata(struct udevice *dev) U_BOOT_DRIVER(rtc_mv) = { .name = "rtc-mv", .id = UCLASS_RTC, - .ofdata_to_platdata = mv_rtc_ofdata_to_platdata, + .of_to_plat = mv_rtc_of_to_plat, .of_match = mv_rtc_ids, .ops = &mv_rtc_ops, }; diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index df79c1fb88f..b9797f312ad 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -122,7 +122,7 @@ static const struct udevice_id pl031_ids[] = { { } };

-static int pl031_ofdata_to_platdata(struct udevice *dev) +static int pl031_of_to_plat(struct udevice *dev) { struct pl031_platdata *pdata = dev_get_plat(dev);

@@ -136,7 +136,7 @@ U_BOOT_DRIVER(rtc_pl031) = { .id = UCLASS_RTC, .of_match = pl031_ids, .probe = pl031_probe, - .ofdata_to_platdata = pl031_ofdata_to_platdata, + .of_to_plat = pl031_of_to_plat, .plat_auto = sizeof(struct pl031_platdata), .ops = &pl031_ops, }; diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index e855ca472c7..af7fe39e20b 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -91,7 +91,7 @@ static int altera_jtaguart_probe(struct udevice *dev) return 0; }

-static int altera_jtaguart_ofdata_to_platdata(struct udevice *dev) +static int altera_jtaguart_of_to_plat(struct udevice *dev) { struct altera_jtaguart_platdata *plat = dev_get_plat(dev);

@@ -118,7 +118,7 @@ U_BOOT_DRIVER(altera_jtaguart) = { .name = "altera_jtaguart", .id = UCLASS_SERIAL, .of_match = altera_jtaguart_ids, - .ofdata_to_platdata = altera_jtaguart_ofdata_to_platdata, + .of_to_plat = altera_jtaguart_of_to_plat, .plat_auto = sizeof(struct altera_jtaguart_platdata), .probe = altera_jtaguart_probe, .ops = &altera_jtaguart_ops, diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index 8d27382ee33..fe6550551da 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -83,7 +83,7 @@ static int altera_uart_probe(struct udevice *dev) return 0; }

-static int altera_uart_ofdata_to_platdata(struct udevice *dev) +static int altera_uart_of_to_plat(struct udevice *dev) { struct altera_uart_platdata *plat = dev_get_plat(dev);

@@ -111,7 +111,7 @@ U_BOOT_DRIVER(altera_uart) = { .name = "altera_uart", .id = UCLASS_SERIAL, .of_match = altera_uart_ids, - .ofdata_to_platdata = altera_uart_ofdata_to_platdata, + .of_to_plat = altera_uart_of_to_plat, .plat_auto = sizeof(struct altera_uart_platdata), .probe = altera_uart_probe, .ops = &altera_uart_ops, diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 6bc8c994351..6f80e02a0a6 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -533,7 +533,7 @@ enum { #endif

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -int ns16550_serial_ofdata_to_platdata(struct udevice *dev) +int ns16550_serial_of_to_plat(struct udevice *dev) { struct ns16550_platdata *plat = dev->plat; const u32 port_type = dev_get_driver_data(dev); @@ -610,7 +610,7 @@ U_BOOT_DRIVER(ns16550_serial) = { .id = UCLASS_SERIAL, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = ns16550_serial_ids, - .ofdata_to_platdata = ns16550_serial_ofdata_to_platdata, + .of_to_plat = ns16550_serial_of_to_plat, .plat_auto = sizeof(struct ns16550_platdata), #endif .priv_auto = sizeof(struct NS16550), diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 541a1ef970c..48c44c24c61 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -217,7 +217,7 @@ static const char * const ansi_colour[] = { "white", };

-static int sandbox_serial_ofdata_to_platdata(struct udevice *dev) +static int sandbox_serial_of_to_plat(struct udevice *dev) { struct sandbox_serial_platdata *plat = dev->plat; const char *colour; @@ -258,7 +258,7 @@ U_BOOT_DRIVER(sandbox_serial) = { .name = "sandbox_serial", .id = UCLASS_SERIAL, .of_match = sandbox_serial_ids, - .ofdata_to_platdata = sandbox_serial_ofdata_to_platdata, + .of_to_plat = sandbox_serial_of_to_plat, .plat_auto = sizeof(struct sandbox_serial_platdata), .priv_auto = sizeof(struct sandbox_serial_priv), .probe = sandbox_serial_probe, diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index 8964fa75fc2..dae55ea6f4b 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -109,7 +109,7 @@ static const struct udevice_id arc_serial_ids[] = { { } };

-static int arc_serial_ofdata_to_platdata(struct udevice *dev) +static int arc_serial_of_to_plat(struct udevice *dev) { struct arc_serial_platdata *plat = dev_get_plat(dev); DECLARE_GLOBAL_DATA_PTR; @@ -125,7 +125,7 @@ U_BOOT_DRIVER(serial_arc) = { .name = "serial_arc", .id = UCLASS_SERIAL, .of_match = arc_serial_ids, - .ofdata_to_platdata = arc_serial_ofdata_to_platdata, + .of_to_plat = arc_serial_of_to_plat, .plat_auto = sizeof(struct arc_serial_platdata), .probe = arc_serial_probe, .ops = &arc_serial_ops, diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 1d64496bf02..a53288dc917 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -167,7 +167,7 @@ static int bcm283x_mu_serial_probe(struct udevice *dev) return -ENODEV;

/* - * Read the ofdata here rather than in an ofdata_to_platdata() method + * Read the ofdata here rather than in an of_to_plat() method * since we need the soc simple-bus to be probed so that the 'ranges' * property is used. */ diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 6d7a87cf652..967f8421abc 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -43,11 +43,11 @@ static int bcm283x_pl011_serial_probe(struct udevice *dev) return -ENODEV;

/* - * Read the ofdata here rather than in an ofdata_to_platdata() method + * Read the ofdata here rather than in an of_to_plat() method * since we need the soc simple-bus to be probed so that the 'ranges' * property is used. */ - ret = pl01x_serial_ofdata_to_platdata(dev); + ret = pl01x_serial_of_to_plat(dev); if (ret) return ret;

diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index dba0ae45fb4..ece27aca888 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -11,7 +11,7 @@ #include <serial.h> #include <asm/arch/sysinfo.h>

-static int coreboot_ofdata_to_platdata(struct udevice *dev) +static int coreboot_of_to_plat(struct udevice *dev) { struct ns16550_platdata *plat = dev_get_plat(dev); struct cb_serial *cb_info = lib_sysinfo.serial; @@ -39,7 +39,7 @@ U_BOOT_DRIVER(coreboot_uart) = { .of_match = coreboot_serial_ids, .priv_auto = sizeof(struct NS16550), .plat_auto = sizeof(struct ns16550_platdata), - .ofdata_to_platdata = coreboot_ofdata_to_platdata, + .of_to_plat = coreboot_of_to_plat, .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c index a0ae2fe0a4c..6dc81a775d3 100644 --- a/drivers/serial/serial_cortina.c +++ b/drivers/serial/serial_cortina.c @@ -131,7 +131,7 @@ static int ca_serial_probe(struct udevice *dev) return 0; }

-static int ca_serial_ofdata_to_platdata(struct udevice *dev) +static int ca_serial_of_to_plat(struct udevice *dev) { struct ca_uart_priv *priv = dev_get_priv(dev);

@@ -158,7 +158,7 @@ U_BOOT_DRIVER(serial_cortina) = { .name = "serial_cortina", .id = UCLASS_SERIAL, .of_match = ca_serial_ids, - .ofdata_to_platdata = ca_serial_ofdata_to_platdata, + .of_to_plat = ca_serial_of_to_plat, .priv_auto = sizeof(struct ca_uart_priv), .probe = ca_serial_probe, .ops = &ca_serial_ops diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c index 2ee7e2d5de5..55da805b8e0 100644 --- a/drivers/serial/serial_intel_mid.c +++ b/drivers/serial/serial_intel_mid.c @@ -59,7 +59,7 @@ U_BOOT_DRIVER(serial_intel_mid) = { .name = "serial_intel_mid", .id = UCLASS_SERIAL, .of_match = mid_serial_ids, - .ofdata_to_platdata = ns16550_serial_ofdata_to_platdata, + .of_to_plat = ns16550_serial_of_to_plat, .plat_auto = sizeof(struct ns16550_platdata), .priv_auto = sizeof(struct NS16550), .probe = mid_serial_probe, diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index e6b73e133e0..56362339be5 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -511,7 +511,7 @@ static int lpuart_serial_probe(struct udevice *dev) return _lpuart_serial_init(dev); }

-static int lpuart_serial_ofdata_to_platdata(struct udevice *dev) +static int lpuart_serial_of_to_plat(struct udevice *dev) { struct lpuart_serial_platdata *plat = dev->plat; const void *blob = gd->fdt_blob; @@ -566,7 +566,7 @@ U_BOOT_DRIVER(serial_lpuart) = { .name = "serial_lpuart", .id = UCLASS_SERIAL, .of_match = lpuart_serial_ids, - .ofdata_to_platdata = lpuart_serial_ofdata_to_platdata, + .of_to_plat = lpuart_serial_of_to_plat, .plat_auto = sizeof(struct lpuart_serial_platdata), .probe = lpuart_serial_probe, .ops = &lpuart_serial_ops, diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index 24b37fb6498..9b167c3c474 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -140,7 +140,7 @@ static int coldfire_serial_pending(struct udevice *dev, bool input) return 0; }

-static int coldfire_ofdata_to_platdata(struct udevice *dev) +static int coldfire_of_to_plat(struct udevice *dev) { struct coldfire_serial_platdata *plat = dev_get_plat(dev); fdt_addr_t addr_base; @@ -171,7 +171,7 @@ U_BOOT_DRIVER(serial_coldfire) = { .name = "serial_coldfire", .id = UCLASS_SERIAL, .of_match = coldfire_serial_ids, - .ofdata_to_platdata = coldfire_ofdata_to_platdata, + .of_to_plat = coldfire_of_to_plat, .plat_auto = sizeof(struct coldfire_serial_platdata), .probe = coldfire_serial_probe, .ops = &coldfire_serial_ops, diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c index 997426d56d1..ac3727d1c29 100644 --- a/drivers/serial/serial_meson.c +++ b/drivers/serial/serial_meson.c @@ -136,7 +136,7 @@ static int meson_serial_pending(struct udevice *dev, bool input) } }

-static int meson_serial_ofdata_to_platdata(struct udevice *dev) +static int meson_serial_of_to_plat(struct udevice *dev) { struct meson_serial_platdata *plat = dev->plat; fdt_addr_t addr; @@ -168,7 +168,7 @@ U_BOOT_DRIVER(serial_meson) = { .of_match = meson_serial_ids, .probe = meson_serial_probe, .ops = &meson_serial_ops, - .ofdata_to_platdata = meson_serial_ofdata_to_platdata, + .of_to_plat = meson_serial_of_to_plat, .plat_auto = sizeof(struct meson_serial_platdata), };

diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index 3b088b3b23a..024c2c956e4 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -216,7 +216,7 @@ static int msm_serial_probe(struct udevice *dev) return 0; }

-static int msm_serial_ofdata_to_platdata(struct udevice *dev) +static int msm_serial_of_to_plat(struct udevice *dev) { struct msm_serial_data *priv = dev_get_priv(dev);

@@ -239,7 +239,7 @@ U_BOOT_DRIVER(serial_msm) = { .name = "serial_msm", .id = UCLASS_SERIAL, .of_match = msm_serial_ids, - .ofdata_to_platdata = msm_serial_ofdata_to_platdata, + .of_to_plat = msm_serial_of_to_plat, .priv_auto = sizeof(struct msm_serial_data), .probe = msm_serial_probe, .ops = &msm_serial_ops, diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c index afa6e8c8a96..665b2aa3b2c 100644 --- a/drivers/serial/serial_mtk.c +++ b/drivers/serial/serial_mtk.c @@ -216,7 +216,7 @@ static int mtk_serial_probe(struct udevice *dev) return 0; }

-static int mtk_serial_ofdata_to_platdata(struct udevice *dev) +static int mtk_serial_of_to_plat(struct udevice *dev) { struct mtk_serial_priv *priv = dev_get_priv(dev); fdt_addr_t addr; @@ -267,7 +267,7 @@ U_BOOT_DRIVER(serial_mtk) = { .name = "serial_mtk", .id = UCLASS_SERIAL, .of_match = mtk_serial_ids, - .ofdata_to_platdata = mtk_serial_ofdata_to_platdata, + .of_to_plat = mtk_serial_of_to_plat, .priv_auto = sizeof(struct mtk_serial_priv), .probe = mtk_serial_probe, .ops = &mtk_serial_ops, diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index b1da8746450..f4676f0b8e0 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -100,7 +100,7 @@ static int mvebu_serial_probe(struct udevice *dev) return 0; }

-static int mvebu_serial_ofdata_to_platdata(struct udevice *dev) +static int mvebu_serial_of_to_plat(struct udevice *dev) { struct mvebu_platdata *plat = dev_get_plat(dev);

@@ -125,7 +125,7 @@ U_BOOT_DRIVER(serial_mvebu) = { .name = "serial_mvebu", .id = UCLASS_SERIAL, .of_match = mvebu_serial_ids, - .ofdata_to_platdata = mvebu_serial_ofdata_to_platdata, + .of_to_plat = mvebu_serial_of_to_plat, .plat_auto = sizeof(struct mvebu_platdata), .probe = mvebu_serial_probe, .ops = &mvebu_serial_ops, diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index a228bc4c9ef..9602ddc7e04 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -325,7 +325,7 @@ static const struct dm_serial_ops mxc_serial_ops = { };

#if CONFIG_IS_ENABLED(OF_CONTROL) -static int mxc_serial_ofdata_to_platdata(struct udevice *dev) +static int mxc_serial_of_to_plat(struct udevice *dev) { struct mxc_serial_platdata *plat = dev->plat; fdt_addr_t addr; @@ -357,7 +357,7 @@ U_BOOT_DRIVER(serial_mxc) = { .id = UCLASS_SERIAL, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = mxc_serial_ids, - .ofdata_to_platdata = mxc_serial_ofdata_to_platdata, + .of_to_plat = mxc_serial_of_to_plat, .plat_auto = sizeof(struct mxc_serial_platdata), #endif .probe = mxc_serial_probe, diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c index 26e03b8620b..2b0a3e4d06d 100644 --- a/drivers/serial/serial_omap.c +++ b/drivers/serial/serial_omap.c @@ -99,7 +99,7 @@ DEBUG_UART_FUNCS #if CONFIG_IS_ENABLED(DM_SERIAL)

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int omap_serial_ofdata_to_platdata(struct udevice *dev) +static int omap_serial_of_to_plat(struct udevice *dev) { struct ns16550_platdata *plat = dev->plat; fdt_addr_t addr; @@ -157,7 +157,7 @@ U_BOOT_DRIVER(omap_serial) = { .id = UCLASS_SERIAL, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_serial_ids, - .ofdata_to_platdata = omap_serial_ofdata_to_platdata, + .of_to_plat = omap_serial_of_to_plat, .plat_auto = sizeof(struct ns16550_platdata), #endif .priv_auto = sizeof(struct NS16550), diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c index 0e67bc124b0..3b795785f78 100644 --- a/drivers/serial/serial_owl.c +++ b/drivers/serial/serial_owl.c @@ -102,7 +102,7 @@ static int owl_serial_probe(struct udevice *dev) return 0; }

-static int owl_serial_ofdata_to_platdata(struct udevice *dev) +static int owl_serial_of_to_plat(struct udevice *dev) { struct owl_serial_priv *priv = dev_get_priv(dev);

@@ -129,7 +129,7 @@ U_BOOT_DRIVER(serial_owl) = { .name = "serial_owl", .id = UCLASS_SERIAL, .of_match = owl_serial_ids, - .ofdata_to_platdata = owl_serial_ofdata_to_platdata, + .of_to_plat = owl_serial_of_to_plat, .priv_auto = sizeof(struct owl_serial_priv), .probe = owl_serial_probe, .ops = &owl_serial_ops, diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 5ca1c07b9d5..45bc1de0593 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -348,7 +348,7 @@ static const struct udevice_id pl01x_serial_id[] ={ #define CONFIG_PL011_CLOCK 0 #endif

-int pl01x_serial_ofdata_to_platdata(struct udevice *dev) +int pl01x_serial_of_to_plat(struct udevice *dev) { struct pl01x_serial_platdata *plat = dev_get_plat(dev); struct clk clk; @@ -387,7 +387,7 @@ U_BOOT_DRIVER(serial_pl01x) = { .name = "serial_pl01x", .id = UCLASS_SERIAL, .of_match = of_match_ptr(pl01x_serial_id), - .ofdata_to_platdata = of_match_ptr(pl01x_serial_ofdata_to_platdata), + .of_to_plat = of_match_ptr(pl01x_serial_of_to_plat), .plat_auto = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, .ops = &pl01x_serial_ops, diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h index c5c706b153e..dfd95a0b77c 100644 --- a/drivers/serial/serial_pl01x_internal.h +++ b/drivers/serial/serial_pl01x_internal.h @@ -40,7 +40,7 @@ struct pl01x_regs {

#ifdef CONFIG_DM_SERIAL

-int pl01x_serial_ofdata_to_platdata(struct udevice *dev); +int pl01x_serial_of_to_plat(struct udevice *dev); int pl01x_serial_probe(struct udevice *dev);

/* Needed for external pl01x_serial_ops drivers */ diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 4323f61392d..b8ba5da5f18 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -176,7 +176,7 @@ static int s5p_serial_pending(struct udevice *dev, bool input) return (ufstat & TX_FIFO_COUNT_MASK) >> TX_FIFO_COUNT_SHIFT; }

-static int s5p_serial_ofdata_to_platdata(struct udevice *dev) +static int s5p_serial_of_to_plat(struct udevice *dev) { struct s5p_serial_platdata *plat = dev->plat; fdt_addr_t addr; @@ -207,7 +207,7 @@ U_BOOT_DRIVER(serial_s5p) = { .name = "serial_s5p", .id = UCLASS_SERIAL, .of_match = s5p_serial_ids, - .ofdata_to_platdata = s5p_serial_ofdata_to_platdata, + .of_to_plat = s5p_serial_of_to_plat, .plat_auto = sizeof(struct s5p_serial_platdata), .probe = s5p_serial_probe, .ops = &s5p_serial_ops, diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index d1f24bb27a2..a961ead1d4d 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -207,7 +207,7 @@ static const struct udevice_id sh_serial_id[] ={ {} };

-static int sh_serial_ofdata_to_platdata(struct udevice *dev) +static int sh_serial_of_to_plat(struct udevice *dev) { struct sh_serial_platdata *plat = dev_get_plat(dev); struct clk sh_serial_clk; @@ -239,7 +239,7 @@ U_BOOT_DRIVER(serial_sh) = { .name = "serial_sh", .id = UCLASS_SERIAL, .of_match = of_match_ptr(sh_serial_id), - .ofdata_to_platdata = of_match_ptr(sh_serial_ofdata_to_platdata), + .of_to_plat = of_match_ptr(sh_serial_of_to_plat), .plat_auto = sizeof(struct sh_serial_platdata), .probe = sh_serial_probe, .ops = &sh_serial_ops, diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index e9d4d91b45f..5248c6814c4 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -174,7 +174,7 @@ static int sifive_serial_pending(struct udevice *dev, bool input) return !!(readl(&regs->txfifo) & UART_TXFIFO_FULL); }

-static int sifive_serial_ofdata_to_platdata(struct udevice *dev) +static int sifive_serial_of_to_plat(struct udevice *dev) { struct sifive_uart_platdata *plat = dev_get_plat(dev);

@@ -201,7 +201,7 @@ U_BOOT_DRIVER(serial_sifive) = { .name = "serial_sifive", .id = UCLASS_SERIAL, .of_match = sifive_serial_ids, - .ofdata_to_platdata = sifive_serial_ofdata_to_platdata, + .of_to_plat = sifive_serial_of_to_plat, .plat_auto = sizeof(struct sifive_uart_platdata), .probe = sifive_serial_probe, .ops = &sifive_serial_ops, diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index 9b56b2439ca..63344b34186 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -217,7 +217,7 @@ static const struct udevice_id stm32_serial_id[] = { {} };

-static int stm32_serial_ofdata_to_platdata(struct udevice *dev) +static int stm32_serial_of_to_plat(struct udevice *dev) { struct stm32x7_serial_platdata *plat = dev_get_plat(dev);

@@ -240,7 +240,7 @@ U_BOOT_DRIVER(serial_stm32) = { .name = "serial_stm32", .id = UCLASS_SERIAL, .of_match = of_match_ptr(stm32_serial_id), - .ofdata_to_platdata = of_match_ptr(stm32_serial_ofdata_to_platdata), + .of_to_plat = of_match_ptr(stm32_serial_of_to_plat), .plat_auto = sizeof(struct stm32x7_serial_platdata), .ops = &stm32_serial_ops, .probe = stm32_serial_probe, diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index ea90fdbf384..df4877a0b91 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -106,7 +106,7 @@ static int uartlite_serial_probe(struct udevice *dev) return 0; }

-static int uartlite_serial_ofdata_to_platdata(struct udevice *dev) +static int uartlite_serial_of_to_plat(struct udevice *dev) { struct uartlite_platdata *plat = dev_get_plat(dev);

@@ -131,7 +131,7 @@ U_BOOT_DRIVER(serial_uartlite) = { .name = "serial_uartlite", .id = UCLASS_SERIAL, .of_match = uartlite_serial_ids, - .ofdata_to_platdata = uartlite_serial_ofdata_to_platdata, + .of_to_plat = uartlite_serial_of_to_plat, .plat_auto = sizeof(struct uartlite_platdata), .probe = uartlite_serial_probe, .ops = &uartlite_serial_ops, diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 1bcdf8cb10b..1d748e16ee9 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -182,7 +182,7 @@ static int zynq_serial_pending(struct udevice *dev, bool input) return !!(readl(&regs->channel_sts) & ZYNQ_UART_SR_TXACTIVE); }

-static int zynq_serial_ofdata_to_platdata(struct udevice *dev) +static int zynq_serial_of_to_plat(struct udevice *dev) { struct zynq_uart_platdata *plat = dev_get_plat(dev);

@@ -211,7 +211,7 @@ U_BOOT_DRIVER(serial_zynq) = { .name = "serial_zynq", .id = UCLASS_SERIAL, .of_match = zynq_serial_ids, - .ofdata_to_platdata = zynq_serial_ofdata_to_platdata, + .of_to_plat = zynq_serial_of_to_plat, .plat_auto = sizeof(struct zynq_uart_platdata), .probe = zynq_serial_probe, .ops = &zynq_serial_ops, diff --git a/drivers/sound/max98357a.c b/drivers/sound/max98357a.c index b3d27a3616e..a2088f03014 100644 --- a/drivers/sound/max98357a.c +++ b/drivers/sound/max98357a.c @@ -25,7 +25,7 @@ struct max98357a_priv { struct gpio_desc sdmode_gpio; };

-static int max98357a_ofdata_to_platdata(struct udevice *dev) +static int max98357a_of_to_plat(struct udevice *dev) { struct max98357a_priv *priv = dev_get_priv(dev); int ret; @@ -155,7 +155,7 @@ U_BOOT_DRIVER(max98357a) = { .name = "max98357a", .id = UCLASS_AUDIO_CODEC, .of_match = max98357a_ids, - .ofdata_to_platdata = max98357a_ofdata_to_platdata, + .of_to_plat = max98357a_of_to_plat, .ops = &max98357a_ops, ACPI_OPS_PTR(&max98357a_acpi_ops) }; diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c index aa1d6bb209b..d3d75c046eb 100644 --- a/drivers/sound/samsung-i2s.c +++ b/drivers/sound/samsung-i2s.c @@ -385,7 +385,7 @@ static int samsung_i2s_probe(struct udevice *dev) return i2s_tx_init(priv); }

-static int samsung_i2s_ofdata_to_platdata(struct udevice *dev) +static int samsung_i2s_of_to_plat(struct udevice *dev) { struct i2s_uc_priv *priv = dev_get_uclass_priv(dev); ulong base; @@ -451,6 +451,6 @@ U_BOOT_DRIVER(samsung_i2s) = { .id = UCLASS_I2S, .of_match = samsung_i2s_ids, .probe = samsung_i2s_probe, - .ofdata_to_platdata = samsung_i2s_ofdata_to_platdata, + .of_to_plat = samsung_i2s_of_to_plat, .ops = &samsung_i2s_ops, }; diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index a4a29f80737..187f2394b74 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -169,7 +169,7 @@ static int altera_spi_probe(struct udevice *bus) return 0; }

-static int altera_spi_ofdata_to_platdata(struct udevice *bus) +static int altera_spi_of_to_plat(struct udevice *bus) { struct altera_spi_platdata *plat = dev_get_plat(bus);

@@ -202,7 +202,7 @@ U_BOOT_DRIVER(altera_spi) = { .id = UCLASS_SPI, .of_match = altera_spi_ids, .ops = &altera_spi_ops, - .ofdata_to_platdata = altera_spi_ofdata_to_platdata, + .of_to_plat = altera_spi_of_to_plat, .plat_auto = sizeof(struct altera_spi_platdata), .priv_auto = sizeof(struct altera_spi_priv), .probe = altera_spi_probe, diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index f62387cf9b4..9917b5414a6 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -408,7 +408,7 @@ U_BOOT_DRIVER(atcspi200_spi) = { .id = UCLASS_SPI, .of_match = atcspi200_spi_ids, .ops = &atcspi200_spi_ops, - .ofdata_to_platdata = atcspi200_ofdata_to_platadata, + .of_to_plat = atcspi200_ofdata_to_platadata, .priv_auto = sizeof(struct nds_spi_slave), .probe = atcspi200_spi_probe, }; diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c index 83ca649f129..3afc051d21d 100644 --- a/drivers/spi/bcmstb_spi.c +++ b/drivers/spi/bcmstb_spi.c @@ -94,7 +94,7 @@ struct bcmstb_spi_priv { void *saved_din_addr; };

-static int bcmstb_spi_ofdata_to_platdata(struct udevice *bus) +static int bcmstb_spi_of_to_plat(struct udevice *bus) { struct bcmstb_spi_platdata *plat = dev_get_plat(bus); const void *fdt = gd->fdt_blob; @@ -432,7 +432,7 @@ U_BOOT_DRIVER(bcmstb_spi) = { .id = UCLASS_SPI, .of_match = bcmstb_spi_id, .ops = &bcmstb_spi_ops, - .ofdata_to_platdata = bcmstb_spi_ofdata_to_platdata, + .of_to_plat = bcmstb_spi_of_to_plat, .probe = bcmstb_spi_probe, .plat_auto = sizeof(struct bcmstb_spi_platdata), .priv_auto = sizeof(struct bcmstb_spi_priv), diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index f097fc17a57..2317d365596 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -282,7 +282,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi, return err; }

-static int cadence_spi_ofdata_to_platdata(struct udevice *bus) +static int cadence_spi_of_to_plat(struct udevice *bus) { struct cadence_spi_platdata *plat = bus->plat; ofnode subnode; @@ -353,7 +353,7 @@ U_BOOT_DRIVER(cadence_spi) = { .id = UCLASS_SPI, .of_match = cadence_spi_ids, .ops = &cadence_spi_ops, - .ofdata_to_platdata = cadence_spi_ofdata_to_platdata, + .of_to_plat = cadence_spi_of_to_plat, .plat_auto = sizeof(struct cadence_spi_platdata), .priv_auto = sizeof(struct cadence_spi_priv), .probe = cadence_spi_probe, diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index 68dec34afc4..ab0332a77a6 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -384,7 +384,7 @@ static int coldfire_spi_probe(struct udevice *bus) }

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int coldfire_dspi_ofdata_to_platdata(struct udevice *bus) +static int coldfire_dspi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; struct coldfire_spi_platdata *plat = bus->plat; @@ -451,7 +451,7 @@ U_BOOT_DRIVER(coldfire_spi) = { .id = UCLASS_SPI, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = coldfire_spi_ids, - .ofdata_to_platdata = coldfire_dspi_ofdata_to_platdata, + .of_to_plat = coldfire_dspi_of_to_plat, .plat_auto = sizeof(struct coldfire_spi_platdata), #endif .probe = coldfire_spi_probe, diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index c60f2fedf3b..0f887ed649a 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -419,7 +419,7 @@ U_BOOT_DRIVER(davinci_spi) = { .id = UCLASS_SPI, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = davinci_spi_ids, - .ofdata_to_platdata = davinci_ofdata_to_platadata, + .of_to_plat = davinci_ofdata_to_platadata, .plat_auto = sizeof(struct davinci_spi_platdata), #endif .probe = davinci_spi_probe, diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 99069097497..5429ac776ed 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -153,7 +153,7 @@ static int request_gpio_cs(struct udevice *bus) return 0; }

-static int dw_spi_ofdata_to_platdata(struct udevice *bus) +static int dw_spi_of_to_plat(struct udevice *bus) { struct dw_spi_platdata *plat = bus->plat;

@@ -559,7 +559,7 @@ U_BOOT_DRIVER(dw_spi) = { .id = UCLASS_SPI, .of_match = dw_spi_ids, .ops = &dw_spi_ops, - .ofdata_to_platdata = dw_spi_ofdata_to_platdata, + .of_to_plat = dw_spi_of_to_plat, .plat_auto = sizeof(struct dw_spi_platdata), .priv_auto = sizeof(struct dw_spi_priv), .probe = dw_spi_probe, diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 04737368bd4..9505d88ff06 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -251,7 +251,7 @@ static void spi_cs_deactivate(struct udevice *dev) debug("Deactivate CS, bus '%s'\n", bus->name); }

-static int exynos_spi_ofdata_to_platdata(struct udevice *bus) +static int exynos_spi_of_to_plat(struct udevice *bus) { struct exynos_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; @@ -426,7 +426,7 @@ U_BOOT_DRIVER(exynos_spi) = { .id = UCLASS_SPI, .of_match = exynos_spi_ids, .ops = &exynos_spi_ops, - .ofdata_to_platdata = exynos_spi_ofdata_to_platdata, + .of_to_plat = exynos_spi_of_to_plat, .plat_auto = sizeof(struct exynos_spi_platdata), .priv_auto = sizeof(struct exynos_spi_priv), .probe = exynos_spi_probe, diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index c91530cd930..56da67024e0 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -573,7 +573,7 @@ static int fsl_dspi_bind(struct udevice *bus) return 0; }

-static int fsl_dspi_ofdata_to_platdata(struct udevice *bus) +static int fsl_dspi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; struct fsl_dspi_platdata *plat = bus->plat; @@ -659,7 +659,7 @@ U_BOOT_DRIVER(fsl_dspi) = { .id = UCLASS_SPI, .of_match = fsl_dspi_ids, .ops = &fsl_dspi_ops, - .ofdata_to_platdata = fsl_dspi_ofdata_to_platdata, + .of_to_plat = fsl_dspi_of_to_plat, .plat_auto = sizeof(struct fsl_dspi_platdata), .priv_auto = sizeof(struct fsl_dspi_priv), .probe = fsl_dspi_probe, diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index 7061bd23494..b41d3d83fe6 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -541,7 +541,7 @@ static const struct dm_spi_ops fsl_espi_ops = { };

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int fsl_espi_ofdata_to_platdata(struct udevice *bus) +static int fsl_espi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; struct fsl_espi_platdata *plat = bus->plat; @@ -573,7 +573,7 @@ U_BOOT_DRIVER(fsl_espi) = { .id = UCLASS_SPI, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = fsl_espi_ids, - .ofdata_to_platdata = fsl_espi_ofdata_to_platdata, + .of_to_plat = fsl_espi_of_to_plat, #endif .ops = &fsl_espi_ops, .plat_auto = sizeof(struct fsl_espi_platdata), diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index b42b536ac31..4c01ec86e03 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -945,7 +945,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev) return 0; }

-static int ich_spi_ofdata_to_platdata(struct udevice *dev) +static int ich_spi_of_to_plat(struct udevice *dev) { struct ich_spi_platdata *plat = dev_get_plat(dev);

@@ -1004,7 +1004,7 @@ U_BOOT_DRIVER(intel_fast_spi) = { .id = UCLASS_SPI, .of_match = ich_spi_ids, .ops = &ich_spi_ops, - .ofdata_to_platdata = ich_spi_ofdata_to_platdata, + .of_to_plat = ich_spi_of_to_plat, .plat_auto = sizeof(struct ich_spi_platdata), .priv_auto = sizeof(struct ich_spi_priv), .child_pre_probe = ich_spi_child_pre_probe, diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index 9e0a1bb83c6..669a44ce088 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -230,7 +230,7 @@ static int mvebu_spi_probe(struct udevice *bus) return 0; }

-static int mvebu_spi_ofdata_to_platdata(struct udevice *bus) +static int mvebu_spi_of_to_plat(struct udevice *bus) { struct mvebu_spi_platdata *plat = dev_get_plat(bus); const struct mvebu_spi_dev *drvdata = @@ -295,7 +295,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .id = UCLASS_SPI, .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, - .ofdata_to_platdata = mvebu_spi_ofdata_to_platdata, + .of_to_plat = mvebu_spi_of_to_plat, .plat_auto = sizeof(struct mvebu_spi_platdata), .priv_auto = sizeof(struct mvebu_spi_priv), .probe = mvebu_spi_probe, diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 74ff56d816a..02f8219ca1f 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -48,7 +48,7 @@ struct mpc8xxx_priv {

#define SPI_TIMEOUT 1000

-static int mpc8xxx_spi_ofdata_to_platdata(struct udevice *dev) +static int mpc8xxx_spi_of_to_plat(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev); struct clk clk; @@ -279,7 +279,7 @@ U_BOOT_DRIVER(mpc8xxx_spi) = { .id = UCLASS_SPI, .of_match = mpc8xxx_spi_ids, .ops = &mpc8xxx_spi_ops, - .ofdata_to_platdata = mpc8xxx_spi_ofdata_to_platdata, + .of_to_plat = mpc8xxx_spi_of_to_plat, .probe = mpc8xxx_spi_probe, .priv_auto = sizeof(struct mpc8xxx_priv), }; diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index 3c4523a5085..32a26d40413 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -279,7 +279,7 @@ static int mvebu_spi_probe(struct udevice *bus) return 0; }

-static int mvebu_spi_ofdata_to_platdata(struct udevice *bus) +static int mvebu_spi_of_to_plat(struct udevice *bus) { struct mvebu_spi_platdata *plat = dev_get_plat(bus); int ret; @@ -324,7 +324,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .id = UCLASS_SPI, .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, - .ofdata_to_platdata = mvebu_spi_ofdata_to_platdata, + .of_to_plat = mvebu_spi_of_to_plat, .plat_auto = sizeof(struct mvebu_spi_platdata), .probe = mvebu_spi_probe, .remove = mvebu_spi_remove, diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 3f7aade81f0..0973d511f12 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -441,7 +441,7 @@ static const struct dm_spi_ops mxs_spi_ops = { };

#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -static int mxs_ofdata_to_platdata(struct udevice *bus) +static int mxs_of_to_plat(struct udevice *bus) { struct mxs_spi_platdata *plat = bus->plat; u32 prop[2]; @@ -485,7 +485,7 @@ U_BOOT_DRIVER(fsl_imx23_spi) = { .id = UCLASS_SPI, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = mxs_spi_ids, - .ofdata_to_platdata = mxs_ofdata_to_platdata, + .of_to_plat = mxs_of_to_plat, #endif .plat_auto = sizeof(struct mxs_spi_platdata), .ops = &mxs_spi_ops, diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index f41134172cc..04a296a5ba5 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -922,7 +922,7 @@ static int nxp_fspi_set_mode(struct udevice *bus, uint mode) return 0; }

-static int nxp_fspi_ofdata_to_platdata(struct udevice *bus) +static int nxp_fspi_of_to_plat(struct udevice *bus) { struct nxp_fspi *f = dev_get_priv(bus); #if CONFIG_IS_ENABLED(CLK) @@ -993,7 +993,7 @@ U_BOOT_DRIVER(nxp_fspi) = { .id = UCLASS_SPI, .of_match = nxp_fspi_ids, .ops = &nxp_fspi_ops, - .ofdata_to_platdata = nxp_fspi_ofdata_to_platdata, + .of_to_plat = nxp_fspi_of_to_plat, .priv_auto = sizeof(struct nxp_fspi), .probe = nxp_fspi_probe, }; diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index ea722e47604..0594a9c14af 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -478,7 +478,7 @@ static struct omap2_mcspi_platform_config omap4_pdata = { .regs_offset = OMAP4_MCSPI_REG_OFFSET, };

-static int omap3_spi_ofdata_to_platdata(struct udevice *dev) +static int omap3_spi_of_to_plat(struct udevice *dev) { struct omap2_mcspi_platform_config *data = (struct omap2_mcspi_platform_config *)dev_get_driver_data(dev); @@ -506,7 +506,7 @@ U_BOOT_DRIVER(omap3_spi) = { .flags = DM_FLAG_PRE_RELOC, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap3_spi_ids, - .ofdata_to_platdata = omap3_spi_ofdata_to_platdata, + .of_to_plat = omap3_spi_of_to_plat, .plat_auto = sizeof(struct omap3_spi_plat), #endif .probe = omap3_spi_probe, diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c index 3d1420381d9..179582cad7d 100644 --- a/drivers/spi/pl022_spi.c +++ b/drivers/spi/pl022_spi.c @@ -286,7 +286,7 @@ static const struct dm_spi_ops pl022_spi_ops = { };

#if !CONFIG_IS_ENABLED(OF_PLATDATA) -static int pl022_spi_ofdata_to_platdata(struct udevice *bus) +static int pl022_spi_of_to_plat(struct udevice *bus) { struct pl022_spi_pdata *plat = bus->plat; const void *fdt = gd->fdt_blob; @@ -316,7 +316,7 @@ U_BOOT_DRIVER(pl022_spi) = { .id = UCLASS_SPI, #if !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = pl022_spi_ids, - .ofdata_to_platdata = pl022_spi_ofdata_to_platdata, + .of_to_plat = pl022_spi_of_to_plat, #endif .ops = &pl022_spi_ops, .plat_auto = sizeof(struct pl022_spi_pdata), diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 87d6e4897fe..7a030b11416 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -417,7 +417,7 @@ static int rpc_spi_probe(struct udevice *dev) return 0; }

-static int rpc_spi_ofdata_to_platdata(struct udevice *bus) +static int rpc_spi_of_to_plat(struct udevice *bus) { struct rpc_spi_platdata *plat = dev_get_plat(bus);

@@ -463,7 +463,7 @@ U_BOOT_DRIVER(rpc_spi) = { .id = UCLASS_SPI, .of_match = rpc_spi_ids, .ops = &rpc_spi_ops, - .ofdata_to_platdata = rpc_spi_ofdata_to_platdata, + .of_to_plat = rpc_spi_of_to_plat, .plat_auto = sizeof(struct rpc_spi_platdata), .priv_auto = sizeof(struct rpc_spi_priv), .bind = rpc_spi_bind, diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index 697f50f408f..56cf7642ea7 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -191,7 +191,7 @@ static int conv_of_platdata(struct udevice *dev) } #endif

-static int rockchip_spi_ofdata_to_platdata(struct udevice *bus) +static int rockchip_spi_of_to_plat(struct udevice *bus) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_spi_platdata *plat = dev_get_plat(bus); @@ -559,7 +559,7 @@ U_BOOT_DRIVER(rockchip_rk3288_spi) = { .id = UCLASS_SPI, .of_match = rockchip_spi_ids, .ops = &rockchip_spi_ops, - .ofdata_to_platdata = rockchip_spi_ofdata_to_platdata, + .of_to_plat = rockchip_spi_of_to_plat, .plat_auto = sizeof(struct rockchip_spi_platdata), .priv_auto = sizeof(struct rockchip_spi_priv), .probe = rockchip_spi_probe, diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c index dd732dcc2f4..5ba8a8ea79f 100644 --- a/drivers/spi/sh_qspi.c +++ b/drivers/spi/sh_qspi.c @@ -328,7 +328,7 @@ static int sh_qspi_probe(struct udevice *dev) return 0; }

-static int sh_qspi_ofdata_to_platdata(struct udevice *dev) +static int sh_qspi_of_to_plat(struct udevice *dev) { struct sh_qspi_slave *plat = dev_get_plat(dev);

@@ -353,7 +353,7 @@ U_BOOT_DRIVER(sh_qspi) = { .id = UCLASS_SPI, .of_match = sh_qspi_ids, .ops = &sh_qspi_ops, - .ofdata_to_platdata = sh_qspi_ofdata_to_platdata, + .of_to_plat = sh_qspi_of_to_plat, .plat_auto = sizeof(struct sh_qspi_slave), .probe = sh_qspi_probe, }; diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 1967134d418..d4a886ad405 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -226,7 +226,7 @@ static const struct dm_spi_ops soft_spi_ops = { .set_mode = soft_spi_set_mode, };

-static int soft_spi_ofdata_to_platdata(struct udevice *dev) +static int soft_spi_of_to_plat(struct udevice *dev) { struct soft_spi_platdata *plat = dev->plat; const void *blob = gd->fdt_blob; @@ -280,7 +280,7 @@ U_BOOT_DRIVER(soft_spi) = { .id = UCLASS_SPI, .of_match = soft_spi_ids, .ops = &soft_spi_ops, - .ofdata_to_platdata = soft_spi_ofdata_to_platdata, + .of_to_plat = soft_spi_of_to_plat, .plat_auto = sizeof(struct soft_spi_platdata), .priv_auto = sizeof(struct soft_spi_priv), .probe = soft_spi_probe, diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index 8ee8c90d276..00703f921df 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -514,7 +514,7 @@ static int sun4i_spi_probe(struct udevice *bus) return 0; }

-static int sun4i_spi_ofdata_to_platdata(struct udevice *bus) +static int sun4i_spi_of_to_plat(struct udevice *bus) { struct sun4i_spi_platdata *plat = dev_get_plat(bus); int node = dev_of_offset(bus); @@ -630,7 +630,7 @@ U_BOOT_DRIVER(sun4i_spi) = { .id = UCLASS_SPI, .of_match = sun4i_spi_ids, .ops = &sun4i_spi_ops, - .ofdata_to_platdata = sun4i_spi_ofdata_to_platdata, + .of_to_plat = sun4i_spi_of_to_plat, .plat_auto = sizeof(struct sun4i_spi_platdata), .priv_auto = sizeof(struct sun4i_spi_priv), .probe = sun4i_spi_probe, diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 6d3802c97c4..d6f67b28bdb 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -158,7 +158,7 @@ static int spi_child_post_bind(struct udevice *dev) if (!dev_of_valid(dev)) return 0;

- return spi_slave_ofdata_to_platdata(dev, plat); + return spi_slave_of_to_plat(dev, plat); } #endif

@@ -431,8 +431,8 @@ void spi_free_slave(struct spi_slave *slave) slave->dev = NULL; }

-int spi_slave_ofdata_to_platdata(struct udevice *dev, - struct dm_spi_slave_platdata *plat) +int spi_slave_of_to_plat(struct udevice *dev, + struct dm_spi_slave_platdata *plat) { int mode = 0; int value; diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index e6cca9ad898..3df7521771a 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -97,7 +97,7 @@ struct tegra114_spi_priv { int last_transaction_us; };

-static int tegra114_spi_ofdata_to_platdata(struct udevice *bus) +static int tegra114_spi_of_to_plat(struct udevice *bus) { struct tegra_spi_platdata *plat = bus->plat;

@@ -393,7 +393,7 @@ U_BOOT_DRIVER(tegra114_spi) = { .id = UCLASS_SPI, .of_match = tegra114_spi_ids, .ops = &tegra114_spi_ops, - .ofdata_to_platdata = tegra114_spi_ofdata_to_platdata, + .of_to_plat = tegra114_spi_of_to_plat, .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra114_spi_priv), .probe = tegra114_spi_probe, diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 4360459792d..7fab2b7504e 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -87,7 +87,7 @@ int tegra20_sflash_cs_info(struct udevice *bus, unsigned int cs, return 0; }

-static int tegra20_sflash_ofdata_to_platdata(struct udevice *bus) +static int tegra20_sflash_of_to_plat(struct udevice *bus) { struct tegra_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; @@ -353,7 +353,7 @@ U_BOOT_DRIVER(tegra20_sflash) = { .id = UCLASS_SPI, .of_match = tegra20_sflash_ids, .ops = &tegra20_sflash_ops, - .ofdata_to_platdata = tegra20_sflash_ofdata_to_platdata, + .of_to_plat = tegra20_sflash_of_to_plat, .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra20_sflash_priv), .probe = tegra20_sflash_probe, diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index 2bb387ff243..0d7c79bf07b 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -93,7 +93,7 @@ struct tegra_spi_slave { struct tegra30_spi_priv *ctrl; };

-static int tegra30_spi_ofdata_to_platdata(struct udevice *bus) +static int tegra30_spi_of_to_plat(struct udevice *bus) { struct tegra_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; @@ -372,7 +372,7 @@ U_BOOT_DRIVER(tegra30_spi) = { .id = UCLASS_SPI, .of_match = tegra30_spi_ids, .ops = &tegra30_spi_ops, - .ofdata_to_platdata = tegra30_spi_ofdata_to_platdata, + .of_to_plat = tegra30_spi_of_to_plat, .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra30_spi_priv), .probe = tegra30_spi_probe, diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 2107d69f183..6902d953637 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -97,7 +97,7 @@ struct tegra210_qspi_priv { int last_transaction_us; };

-static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus) +static int tegra210_qspi_of_to_plat(struct udevice *bus) { struct tegra_spi_platdata *plat = bus->plat;

@@ -422,7 +422,7 @@ U_BOOT_DRIVER(tegra210_qspi) = { .id = UCLASS_SPI, .of_match = tegra210_qspi_ids, .ops = &tegra210_qspi_ops, - .ofdata_to_platdata = tegra210_qspi_ofdata_to_platdata, + .of_to_plat = tegra210_qspi_of_to_plat, .plat_auto = sizeof(struct tegra_spi_platdata), .priv_auto = sizeof(struct tegra210_qspi_priv), .per_child_auto = sizeof(struct spi_slave), diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 20fe581934c..f1511c08034 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -452,7 +452,7 @@ static void *map_syscon_chipselects(struct udevice *bus) #endif }

-static int ti_qspi_ofdata_to_platdata(struct udevice *bus) +static int ti_qspi_of_to_plat(struct udevice *bus) { struct ti_qspi_priv *priv = dev_get_priv(bus); const void *blob = gd->fdt_blob; @@ -504,7 +504,7 @@ U_BOOT_DRIVER(ti_qspi) = { .id = UCLASS_SPI, .of_match = ti_qspi_ids, .ops = &ti_qspi_ops, - .ofdata_to_platdata = ti_qspi_ofdata_to_platdata, + .of_to_plat = ti_qspi_of_to_plat, .priv_auto = sizeof(struct ti_qspi_priv), .probe = ti_qspi_probe, }; diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index 6d9fd3fbd8b..b6083e6ffca 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -362,7 +362,7 @@ static int uniphier_spi_set_mode(struct udevice *bus, uint mode) return 0; }

-static int uniphier_spi_ofdata_to_platdata(struct udevice *bus) +static int uniphier_spi_of_to_plat(struct udevice *bus) { struct uniphier_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; @@ -411,7 +411,7 @@ U_BOOT_DRIVER(uniphier_spi) = { .id = UCLASS_SPI, .of_match = uniphier_spi_ids, .ops = &uniphier_spi_ops, - .ofdata_to_platdata = uniphier_spi_ofdata_to_platdata, + .of_to_plat = uniphier_spi_of_to_plat, .plat_auto = sizeof(struct uniphier_spi_platdata), .priv_auto = sizeof(struct uniphier_spi_priv), .probe = uniphier_spi_probe, diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index ec873e12fc4..8c2fde542dc 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -98,7 +98,7 @@ struct zynq_qspi_priv { unsigned cs_change:1; };

-static int zynq_qspi_ofdata_to_platdata(struct udevice *bus) +static int zynq_qspi_of_to_plat(struct udevice *bus) { struct zynq_qspi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; @@ -666,7 +666,7 @@ U_BOOT_DRIVER(zynq_qspi) = { .id = UCLASS_SPI, .of_match = zynq_qspi_ids, .ops = &zynq_qspi_ops, - .ofdata_to_platdata = zynq_qspi_ofdata_to_platdata, + .of_to_plat = zynq_qspi_of_to_plat, .plat_auto = sizeof(struct zynq_qspi_platdata), .priv_auto = sizeof(struct zynq_qspi_priv), .probe = zynq_qspi_probe, diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index fb61a9a2564..3cdd011c0c7 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -73,7 +73,7 @@ struct zynq_spi_priv { u32 freq; /* required frequency */ };

-static int zynq_spi_ofdata_to_platdata(struct udevice *bus) +static int zynq_spi_of_to_plat(struct udevice *bus) { struct zynq_spi_platdata *plat = bus->plat; const void *blob = gd->fdt_blob; @@ -371,7 +371,7 @@ U_BOOT_DRIVER(zynq_spi) = { .id = UCLASS_SPI, .of_match = zynq_spi_ids, .ops = &zynq_spi_ops, - .ofdata_to_platdata = zynq_spi_ofdata_to_platdata, + .of_to_plat = zynq_spi_of_to_plat, .plat_auto = sizeof(struct zynq_spi_platdata), .priv_auto = sizeof(struct zynq_spi_priv), .probe = zynq_spi_probe, diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index 07e84da50d4..e3bfc6e74e0 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -175,7 +175,7 @@ struct zynqmp_qspi_priv { unsigned int cs_change:1; };

-static int zynqmp_qspi_ofdata_to_platdata(struct udevice *bus) +static int zynqmp_qspi_of_to_plat(struct udevice *bus) { struct zynqmp_qspi_platdata *plat = bus->plat;

@@ -727,7 +727,7 @@ U_BOOT_DRIVER(zynqmp_qspi) = { .id = UCLASS_SPI, .of_match = zynqmp_qspi_ids, .ops = &zynqmp_qspi_ops, - .ofdata_to_platdata = zynqmp_qspi_ofdata_to_platdata, + .of_to_plat = zynqmp_qspi_of_to_plat, .plat_auto = sizeof(struct zynqmp_qspi_platdata), .priv_auto = sizeof(struct zynqmp_qspi_priv), .probe = zynqmp_qspi_probe, diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 61af5ac0acf..7c38d6e0527 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -607,7 +607,7 @@ static optee_invoke_fn *get_invoke_func(struct udevice *dev) return ERR_PTR(-EINVAL); }

-static int optee_ofdata_to_platdata(struct udevice *dev) +static int optee_of_to_plat(struct udevice *dev) { struct optee_pdata *pdata = dev_get_plat(dev);

@@ -658,7 +658,7 @@ U_BOOT_DRIVER(optee) = { .name = "optee", .id = UCLASS_TEE, .of_match = optee_match, - .ofdata_to_platdata = optee_ofdata_to_platdata, + .of_to_plat = optee_of_to_plat, .probe = optee_probe, .ops = &optee_ops, .plat_auto = sizeof(struct optee_pdata), diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c index 00058002019..b785be7bd05 100644 --- a/drivers/thermal/imx_scu_thermal.c +++ b/drivers/thermal/imx_scu_thermal.c @@ -126,7 +126,7 @@ static int imx_sc_thermal_bind(struct udevice *dev) return 0; }

-static int imx_sc_thermal_ofdata_to_platdata(struct udevice *dev) +static int imx_sc_thermal_of_to_plat(struct udevice *dev) { struct imx_sc_thermal_plat *pdata = dev_get_plat(dev); struct fdtdec_phandle_args args; @@ -210,7 +210,7 @@ U_BOOT_DRIVER(imx_sc_thermal) = { .of_match = imx_sc_thermal_ids, .bind = imx_sc_thermal_bind, .probe = imx_sc_thermal_probe, - .ofdata_to_platdata = imx_sc_thermal_ofdata_to_platdata, + .of_to_plat = imx_sc_thermal_of_to_plat, .plat_auto = sizeof(struct imx_sc_thermal_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c index d500ba1101d..bc99fdeac93 100644 --- a/drivers/timer/ag101p_timer.c +++ b/drivers/timer/ag101p_timer.c @@ -88,7 +88,7 @@ static int atftmr_timer_probe(struct udevice *dev) return 0; }

-static int atftme_timer_ofdata_to_platdata(struct udevice *dev) +static int atftme_timer_of_to_plat(struct udevice *dev) { struct atftmr_timer_platdata *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), @@ -110,7 +110,7 @@ U_BOOT_DRIVER(altera_timer) = { .name = "ag101p_timer", .id = UCLASS_TIMER, .of_match = ag101p_timer_ids, - .ofdata_to_platdata = atftme_timer_ofdata_to_platdata, + .of_to_plat = atftme_timer_of_to_plat, .plat_auto = sizeof(struct atftmr_timer_platdata), .probe = atftmr_timer_probe, .ops = &ag101p_timer_ops, diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index 1daa0eac5c1..a8d6ba53b89 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -63,7 +63,7 @@ static int altera_timer_probe(struct udevice *dev) return 0; }

-static int altera_timer_ofdata_to_platdata(struct udevice *dev) +static int altera_timer_of_to_plat(struct udevice *dev) { struct altera_timer_platdata *plat = dev_get_plat(dev);

@@ -87,7 +87,7 @@ U_BOOT_DRIVER(altera_timer) = { .name = "altera_timer", .id = UCLASS_TIMER, .of_match = altera_timer_ids, - .ofdata_to_platdata = altera_timer_ofdata_to_platdata, + .of_to_plat = altera_timer_of_to_plat, .plat_auto = sizeof(struct altera_timer_platdata), .probe = altera_timer_probe, .ops = &altera_timer_ops, diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c index 9ad446054ec..78adc96cc59 100644 --- a/drivers/timer/ast_timer.c +++ b/drivers/timer/ast_timer.c @@ -58,7 +58,7 @@ static u64 ast_timer_get_count(struct udevice *dev) return AST_TMC_RELOAD_VAL - readl(&priv->tmc->status); }

-static int ast_timer_ofdata_to_platdata(struct udevice *dev) +static int ast_timer_of_to_plat(struct udevice *dev) { struct ast_timer_priv *priv = dev_get_priv(dev);

@@ -87,6 +87,6 @@ U_BOOT_DRIVER(ast_timer) = { .of_match = ast_timer_ids, .probe = ast_timer_probe, .priv_auto = sizeof(struct ast_timer_priv), - .ofdata_to_platdata = ast_timer_ofdata_to_platdata, + .of_to_plat = ast_timer_of_to_plat, .ops = &ast_timer_ops, }; diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c index 47185a8fd26..16d03c41efe 100644 --- a/drivers/timer/atcpit100_timer.c +++ b/drivers/timer/atcpit100_timer.c @@ -85,7 +85,7 @@ static int atcpit_timer_probe(struct udevice *dev) return 0; }

-static int atcpit_timer_ofdata_to_platdata(struct udevice *dev) +static int atcpit_timer_of_to_plat(struct udevice *dev) { struct atcpit_timer_platdata *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), 0x100 , MAP_NOCACHE); @@ -105,7 +105,7 @@ U_BOOT_DRIVER(atcpit100_timer) = { .name = "atcpit100_timer", .id = UCLASS_TIMER, .of_match = atcpit_timer_ids, - .ofdata_to_platdata = atcpit_timer_ofdata_to_platdata, + .of_to_plat = atcpit_timer_of_to_plat, .plat_auto = sizeof(struct atcpit_timer_platdata), .probe = atcpit_timer_probe, .ops = &atcpit_timer_ops, diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index d88a05a201f..7b445dfe062 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -58,7 +58,7 @@ static int atmel_pit_probe(struct udevice *dev) return 0; }

-static int atmel_pit_ofdata_to_platdata(struct udevice *dev) +static int atmel_pit_of_to_plat(struct udevice *dev) { struct atmel_pit_platdata *plat = dev_get_plat(dev);

@@ -80,7 +80,7 @@ U_BOOT_DRIVER(atmel_pit) = { .name = "atmel_pit", .id = UCLASS_TIMER, .of_match = atmel_pit_ids, - .ofdata_to_platdata = atmel_pit_ofdata_to_platdata, + .of_to_plat = atmel_pit_of_to_plat, .plat_auto = sizeof(struct atmel_pit_platdata), .probe = atmel_pit_probe, .ops = &atmel_pit_ops, diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c index 7107bf2472a..3cac2ec4220 100644 --- a/drivers/timer/cadence-ttc.c +++ b/drivers/timer/cadence-ttc.c @@ -84,7 +84,7 @@ static int cadence_ttc_probe(struct udevice *dev) return 0; }

-static int cadence_ttc_ofdata_to_platdata(struct udevice *dev) +static int cadence_ttc_of_to_plat(struct udevice *dev) { struct cadence_ttc_priv *priv = dev_get_priv(dev);

@@ -109,7 +109,7 @@ U_BOOT_DRIVER(cadence_ttc) = { .name = "cadence_ttc", .id = UCLASS_TIMER, .of_match = cadence_ttc_ids, - .ofdata_to_platdata = cadence_ttc_ofdata_to_platdata, + .of_to_plat = cadence_ttc_of_to_plat, .priv_auto = sizeof(struct cadence_ttc_priv), .probe = cadence_ttc_probe, .ops = &cadence_ttc_ops, diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c index 8ef36d4c2b6..9aed5dd217a 100644 --- a/drivers/timer/dw-apb-timer.c +++ b/drivers/timer/dw-apb-timer.c @@ -66,7 +66,7 @@ static int dw_apb_timer_probe(struct udevice *dev) return 0; }

-static int dw_apb_timer_ofdata_to_platdata(struct udevice *dev) +static int dw_apb_timer_of_to_plat(struct udevice *dev) { struct dw_apb_timer_priv *priv = dev_get_priv(dev);

@@ -97,7 +97,7 @@ U_BOOT_DRIVER(dw_apb_timer) = { .ops = &dw_apb_timer_ops, .probe = dw_apb_timer_probe, .of_match = dw_apb_timer_ids, - .ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata, + .of_to_plat = dw_apb_timer_of_to_plat, .remove = dw_apb_timer_remove, .priv_auto = sizeof(struct dw_apb_timer_priv), }; diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c index a1029ac5061..7ac20d78dd8 100644 --- a/drivers/timer/omap-timer.c +++ b/drivers/timer/omap-timer.c @@ -73,7 +73,7 @@ static int omap_timer_probe(struct udevice *dev) return 0; }

-static int omap_timer_ofdata_to_platdata(struct udevice *dev) +static int omap_timer_of_to_plat(struct udevice *dev) { struct omap_timer_priv *priv = dev_get_priv(dev);

@@ -99,7 +99,7 @@ U_BOOT_DRIVER(omap_timer) = { .name = "omap_timer", .id = UCLASS_TIMER, .of_match = omap_timer_ids, - .ofdata_to_platdata = omap_timer_ofdata_to_platdata, + .of_to_plat = omap_timer_of_to_plat, .priv_auto = sizeof(struct omap_timer_priv), .probe = omap_timer_probe, .ops = &omap_timer_ops, diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c index 261cac5de38..99bd36f9f25 100644 --- a/drivers/timer/ostm_timer.c +++ b/drivers/timer/ostm_timer.c @@ -63,7 +63,7 @@ static int ostm_probe(struct udevice *dev) return 0; }

-static int ostm_ofdata_to_platdata(struct udevice *dev) +static int ostm_of_to_plat(struct udevice *dev) { struct ostm_priv *priv = dev_get_priv(dev);

@@ -87,6 +87,6 @@ U_BOOT_DRIVER(ostm_timer) = { .ops = &ostm_ops, .probe = ostm_probe, .of_match = ostm_ids, - .ofdata_to_platdata = ostm_ofdata_to_platdata, + .of_to_plat = ostm_of_to_plat, .priv_auto = sizeof(struct ostm_priv), }; diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c index 8b727b652a2..8d3eceb8d8d 100644 --- a/drivers/timer/rockchip_timer.c +++ b/drivers/timer/rockchip_timer.c @@ -97,7 +97,7 @@ static u64 rockchip_timer_get_count(struct udevice *dev) return ~0ull - cntr; }

-static int rockchip_clk_ofdata_to_platdata(struct udevice *dev) +static int rockchip_clk_of_to_plat(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct rockchip_timer_priv *priv = dev_get_priv(dev); @@ -169,5 +169,5 @@ U_BOOT_DRIVER(rockchip_rk3368_timer) = { #if CONFIG_IS_ENABLED(OF_PLATDATA) .plat_auto = sizeof(struct rockchip_timer_plat), #endif - .ofdata_to_platdata = rockchip_clk_ofdata_to_platdata, + .of_to_plat = rockchip_clk_of_to_plat, }; diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c index 71edfbfaefd..ce61b72d222 100644 --- a/drivers/tpm/cr50_i2c.c +++ b/drivers/tpm/cr50_i2c.c @@ -637,7 +637,7 @@ enum { LONG_TIMEOUT_MS = 2000, };

-static int cr50_i2c_ofdata_to_platdata(struct udevice *dev) +static int cr50_i2c_of_to_plat(struct udevice *dev) { struct tpm_chip_priv *upriv = dev_get_uclass_priv(dev); struct cr50_priv *priv = dev_get_priv(dev); @@ -725,7 +725,7 @@ U_BOOT_DRIVER(cr50_i2c) = { .id = UCLASS_TPM, .of_match = cr50_i2c_ids, .ops = &cr50_i2c_ops, - .ofdata_to_platdata = cr50_i2c_ofdata_to_platdata, + .of_to_plat = cr50_i2c_of_to_plat, .probe = cr50_i2c_probe, .remove = cr50_i2c_cleanup, .priv_auto = sizeof(struct cr50_priv), diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 0bfdaa0b075..459add80c58 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -105,7 +105,7 @@ static int dwc3_generic_remove(struct udevice *dev, return 0; }

-static int dwc3_generic_ofdata_to_platdata(struct udevice *dev) +static int dwc3_generic_of_to_plat(struct udevice *dev) { struct dwc3_generic_plat *plat = dev_get_plat(dev); ofnode node = dev->node; @@ -155,7 +155,7 @@ static int dwc3_generic_peripheral_remove(struct udevice *dev) U_BOOT_DRIVER(dwc3_generic_peripheral) = { .name = "dwc3-generic-peripheral", .id = UCLASS_USB_GADGET_GENERIC, - .ofdata_to_platdata = dwc3_generic_ofdata_to_platdata, + .of_to_plat = dwc3_generic_of_to_plat, .probe = dwc3_generic_peripheral_probe, .remove = dwc3_generic_peripheral_remove, .priv_auto = sizeof(struct dwc3_generic_priv), @@ -197,7 +197,7 @@ static int dwc3_generic_host_remove(struct udevice *dev) U_BOOT_DRIVER(dwc3_generic_host) = { .name = "dwc3-generic-host", .id = UCLASS_USB, - .ofdata_to_platdata = dwc3_generic_ofdata_to_platdata, + .of_to_plat = dwc3_generic_of_to_plat, .probe = dwc3_generic_host_probe, .remove = dwc3_generic_host_remove, .priv_auto = sizeof(struct dwc3_generic_host_priv), diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 67c23200dda..edabc1b3a7a 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -366,7 +366,7 @@ err: return 0; }

-static int sandbox_flash_ofdata_to_platdata(struct udevice *dev) +static int sandbox_flash_of_to_plat(struct udevice *dev) { struct sandbox_flash_plat *plat = dev_get_plat(dev);

@@ -419,7 +419,7 @@ U_BOOT_DRIVER(usb_sandbox_flash) = { .of_match = sandbox_usb_flash_ids, .bind = sandbox_flash_bind, .probe = sandbox_flash_probe, - .ofdata_to_platdata = sandbox_flash_ofdata_to_platdata, + .of_to_plat = sandbox_flash_of_to_plat, .ops = &sandbox_usb_flash_ops, .priv_auto = sizeof(struct sandbox_flash_priv), .plat_auto = sizeof(struct sandbox_flash_plat), diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 2d5b7dc83f4..4771b1e9312 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -980,7 +980,7 @@ static void dwc2_phy_shutdown(struct udevice *dev, struct phy_bulk *phys) generic_phy_exit_bulk(phys); }

-static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) +static int dwc2_udc_otg_of_to_plat(struct udevice *dev) { struct dwc2_plat_otg_data *plat = dev_get_plat(dev); ulong drvdata; @@ -1185,7 +1185,7 @@ U_BOOT_DRIVER(dwc2_udc_otg) = { .name = "dwc2-udc-otg", .id = UCLASS_USB_GADGET_GENERIC, .of_match = dwc2_udc_otg_ids, - .ofdata_to_platdata = dwc2_udc_otg_ofdata_to_platdata, + .of_to_plat = dwc2_udc_otg_of_to_plat, .probe = dwc2_udc_otg_probe, .remove = dwc2_udc_otg_remove, .plat_auto = sizeof(struct dwc2_plat_otg_data), diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 40d389cbd6a..ec643e9f45b 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -1326,7 +1326,7 @@ static int dwc2_submit_int_msg(struct udevice *dev, struct usb_device *udev, nonblock); }

-static int dwc2_usb_ofdata_to_platdata(struct udevice *dev) +static int dwc2_usb_of_to_plat(struct udevice *dev) { struct dwc2_priv *priv = dev_get_priv(dev);

@@ -1473,7 +1473,7 @@ U_BOOT_DRIVER(usb_dwc2) = { .name = "dwc2_usb", .id = UCLASS_USB, .of_match = dwc2_usb_ids, - .ofdata_to_platdata = dwc2_usb_ofdata_to_platdata, + .of_to_plat = dwc2_usb_of_to_plat, .probe = dwc2_usb_probe, .remove = dwc2_usb_remove, .ops = &dwc2_usb_ops, diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index 90266c725f0..660a145e4db 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -100,7 +100,7 @@ static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat) setbits_le32(plat->glue_base + CLKRST_CTRL, SW_PIPEW_RESET_N); }

-static int sti_dwc3_glue_ofdata_to_platdata(struct udevice *dev) +static int sti_dwc3_glue_of_to_plat(struct udevice *dev) { struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); struct udevice *syscon; @@ -242,7 +242,7 @@ U_BOOT_DRIVER(dwc3_sti_glue) = { .name = "dwc3_sti_glue", .id = UCLASS_NOP, .of_match = sti_dwc3_glue_ids, - .ofdata_to_platdata = sti_dwc3_glue_ofdata_to_platdata, + .of_to_plat = sti_dwc3_glue_of_to_plat, .probe = sti_dwc3_glue_probe, .remove = sti_dwc3_glue_remove, .bind = sti_dwc3_glue_bind, diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 0a3983b429f..690a96c5bd2 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -43,7 +43,7 @@ struct exynos_ehci { struct ehci_hccr *hcd; };

-static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct exynos_ehci_platdata *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; @@ -254,7 +254,7 @@ U_BOOT_DRIVER(usb_ehci) = { .name = "ehci_exynos", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_usb_remove, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 9824b7b190b..dfeca8915bf 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -58,7 +58,7 @@ static int usb_phy_clk_valid(struct usb_ehci *ehci) }

#if CONFIG_IS_ENABLED(DM_USB) -static int ehci_fsl_ofdata_to_platdata(struct udevice *dev) +static int ehci_fsl_of_to_plat(struct udevice *dev) { struct ehci_fsl_priv *priv = dev_get_priv(dev); const void *prop; @@ -141,7 +141,7 @@ U_BOOT_DRIVER(ehci_fsl) = { .name = "ehci_fsl", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_fsl_ofdata_to_platdata, + .of_to_plat = ehci_fsl_of_to_plat, .probe = ehci_fsl_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 6143de22668..a3405d02e5c 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -101,7 +101,7 @@ static int ehci_usb_remove(struct udevice *dev) return 0; }

-static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct msm_ehci_priv *priv = dev_get_priv(dev);

@@ -140,7 +140,7 @@ U_BOOT_DRIVER(usb_ehci) = { .name = "ehci_msm", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_usb_remove, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index abefdfafac4..b21a953d706 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -285,7 +285,7 @@ static const struct ehci_ops mx5_ehci_ops = { .powerup_fixup = mx5_ehci_powerup_fixup, };

-static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct usb_platdata *plat = dev_get_plat(dev); const char *mode; @@ -363,7 +363,7 @@ U_BOOT_DRIVER(usb_mx5) = { .name = "ehci_mx5", .id = UCLASS_USB, .of_match = mx5_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 8b8513d3a9a..3d3bd0e1145 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -518,7 +518,7 @@ static int ehci_usb_phy_mode(struct udevice *dev) return 0; }

-static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct usb_platdata *plat = dev_get_plat(dev); enum usb_dr_mode dr_mode; @@ -651,7 +651,7 @@ U_BOOT_DRIVER(usb_mx6) = { .name = "ehci_mx6", .id = UCLASS_USB, .of_match = mx6_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .bind = ehci_usb_bind, .probe = ehci_usb_probe, .remove = ehci_deregister, diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 48de33c5df3..49845c1ee9e 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -366,7 +366,7 @@ struct ehci_omap_priv_data { int nports; };

-static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct usb_platdata *plat = dev_get_plat(dev);

@@ -402,7 +402,7 @@ U_BOOT_DRIVER(usb_omap_ehci) = { .id = UCLASS_USB, .of_match = omap_ehci_dt_ids, .probe = omap_ehci_probe, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .plat_auto = sizeof(struct usb_platdata), .priv_auto = sizeof(struct ehci_omap_priv_data), .remove = ehci_deregister, diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 68a49046e77..c16eec3558e 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -812,7 +812,7 @@ static const struct ehci_ops tegra_ehci_ops = { .powerup_fixup = tegra_ehci_powerup_fixup, };

-static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +static int ehci_usb_of_to_plat(struct udevice *dev) { struct fdt_usb *priv = dev_get_priv(dev); int ret; @@ -861,7 +861,7 @@ U_BOOT_DRIVER(usb_ehci) = { .name = "ehci_tegra", .id = UCLASS_USB, .of_match = ehci_usb_ids, - .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .of_to_plat = ehci_usb_of_to_plat, .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index bd01ea07508..e1a4b3438fc 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -215,7 +215,7 @@ struct ehci_vf_priv_data { u32 portnr; };

-static int vf_usb_ofdata_to_platdata(struct udevice *dev) +static int vf_usb_of_to_plat(struct udevice *dev) { struct ehci_vf_priv_data *priv = dev_get_priv(dev); const void *dt_blob = gd->fdt_blob; @@ -352,7 +352,7 @@ U_BOOT_DRIVER(usb_ehci) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .ofdata_to_platdata = vf_usb_ofdata_to_platdata, + .of_to_plat = vf_usb_of_to_plat, .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 7a7cfaa44de..6756465d647 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -21,7 +21,7 @@ struct zynq_ehci_priv { struct usb_ehci *ehci; };

-static int ehci_zynq_ofdata_to_platdata(struct udevice *dev) +static int ehci_zynq_of_to_plat(struct udevice *dev) { struct zynq_ehci_priv *priv = dev_get_priv(dev);

@@ -81,7 +81,7 @@ U_BOOT_DRIVER(ehci_zynq) = { .name = "ehci_zynq", .id = UCLASS_USB, .of_match = ehci_zynq_ids, - .ofdata_to_platdata = ehci_zynq_ofdata_to_platdata, + .of_to_plat = ehci_zynq_of_to_plat, .probe = ehci_zynq_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 7620ac2da79..f1fc93f3d40 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -805,7 +805,7 @@ static int r8a66597_submit_bulk_msg(struct udevice *udev, return ret; }

-static int r8a66597_usb_ofdata_to_platdata(struct udevice *dev) +static int r8a66597_usb_of_to_plat(struct udevice *dev) { struct r8a66597 *priv = dev_get_priv(dev); fdt_addr_t addr; @@ -890,7 +890,7 @@ U_BOOT_DRIVER(usb_r8a66597) = { .name = "r8a66597_usb", .id = UCLASS_USB, .of_match = r8a66597_usb_ids, - .ofdata_to_platdata = r8a66597_usb_ofdata_to_platdata, + .of_to_plat = r8a66597_usb_of_to_plat, .probe = r8a66597_usb_probe, .remove = r8a66597_usb_remove, .ops = &r8a66597_usb_ops, diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index 4d3dd360bf6..fe804a0dfe2 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -52,7 +52,7 @@ struct exynos_xhci { struct dwc3 *dwc3_reg; };

-static int xhci_usb_ofdata_to_platdata(struct udevice *dev) +static int xhci_usb_of_to_plat(struct udevice *dev) { struct exynos_xhci_platdata *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; @@ -251,7 +251,7 @@ U_BOOT_DRIVER(usb_xhci) = { .name = "xhci_exynos", .id = UCLASS_USB, .of_match = xhci_usb_ids, - .ofdata_to_platdata = xhci_usb_ofdata_to_platdata, + .of_to_plat = xhci_usb_of_to_plat, .probe = xhci_usb_probe, .remove = xhci_usb_remove, .ops = &xhci_usb_ops, diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index ffecfc28ef6..017f99b6293 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -65,7 +65,7 @@ static int xhci_usb_probe(struct udevice *dev) return xhci_register(dev, ctx->hcd, hcor); }

-static int xhci_usb_ofdata_to_platdata(struct udevice *dev) +static int xhci_usb_of_to_plat(struct udevice *dev) { struct mvebu_xhci_platdata *plat = dev_get_plat(dev);

@@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = { .name = "xhci_mvebu", .id = UCLASS_USB, .of_match = xhci_usb_ids, - .ofdata_to_platdata = xhci_usb_ofdata_to_platdata, + .of_to_plat = xhci_usb_of_to_plat, .probe = xhci_usb_probe, .remove = xhci_deregister, .ops = &xhci_usb_ops, diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 22dfaf49b7d..dc941a2068c 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -132,7 +132,7 @@ static int xhci_rcar_deregister(struct udevice *dev) return ret; }

-static int xhci_rcar_ofdata_to_platdata(struct udevice *dev) +static int xhci_rcar_of_to_plat(struct udevice *dev) { struct rcar_xhci_platdata *plat = dev_get_plat(dev);

@@ -160,7 +160,7 @@ U_BOOT_DRIVER(usb_xhci) = { .remove = xhci_rcar_deregister, .ops = &xhci_usb_ops, .of_match = xhci_rcar_ids, - .ofdata_to_platdata = xhci_rcar_ofdata_to_platdata, + .of_to_plat = xhci_rcar_of_to_plat, .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 d9591b97c39..c59ca544373 100644 --- a/drivers/usb/musb-new/da8xx.c +++ b/drivers/usb/musb-new/da8xx.c @@ -256,7 +256,7 @@ 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 *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; @@ -344,7 +344,7 @@ 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, diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index b09f0d499da..b9bba22a657 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -149,7 +149,7 @@ struct omap2430_musb_platdata { struct omap_musb_board_data otg_board_data; };

-static int omap2430_musb_ofdata_to_platdata(struct udevice *dev) +static int omap2430_musb_of_to_plat(struct udevice *dev) { struct omap2430_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; @@ -269,7 +269,7 @@ U_BOOT_DRIVER(omap2430_musb) = { .id = UCLASS_USB_GADGET_GENERIC, #endif .of_match = omap2430_musb_ids, - .ofdata_to_platdata = omap2430_musb_ofdata_to_platdata, + .of_to_plat = omap2430_musb_of_to_plat, .probe = omap2430_musb_probe, .remove = omap2430_musb_remove, #ifdef CONFIG_USB_MUSB_HOST diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 716e820557d..b0ee57ad8a0 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -77,7 +77,7 @@ static int ti_musb_get_usb_index(int node) return -ENOENT; }

-static int ti_musb_ofdata_to_platdata(struct udevice *dev) +static int ti_musb_of_to_plat(struct udevice *dev) { struct ti_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; @@ -176,14 +176,14 @@ 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) +static int ti_musb_host_of_to_plat(struct udevice *dev) { struct ti_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int ret;

- ret = ti_musb_ofdata_to_platdata(dev); + ret = ti_musb_of_to_plat(dev); if (ret) { pr_err("plat dt parse error\n"); return ret; @@ -199,7 +199,7 @@ U_BOOT_DRIVER(ti_musb_host) = { .name = "ti-musb-host", .id = UCLASS_USB, #if CONFIG_IS_ENABLED(OF_CONTROL) - .ofdata_to_platdata = ti_musb_host_ofdata_to_platdata, + .of_to_plat = ti_musb_host_of_to_plat, #endif .probe = ti_musb_host_probe, .remove = ti_musb_host_remove, @@ -214,14 +214,14 @@ struct ti_musb_peripheral { };

#if CONFIG_IS_ENABLED(OF_CONTROL) -static int ti_musb_peripheral_ofdata_to_platdata(struct udevice *dev) +static int ti_musb_peripheral_of_to_plat(struct udevice *dev) { struct ti_musb_platdata *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int ret;

- ret = ti_musb_ofdata_to_platdata(dev); + ret = ti_musb_of_to_plat(dev); if (ret) { pr_err("plat dt parse error\n"); return ret; @@ -272,7 +272,7 @@ U_BOOT_DRIVER(ti_musb_peripheral) = { .name = "ti-musb-peripheral", .id = UCLASS_USB_GADGET_GENERIC, #if CONFIG_IS_ENABLED(OF_CONTROL) - .ofdata_to_platdata = ti_musb_peripheral_ofdata_to_platdata, + .of_to_plat = ti_musb_peripheral_of_to_plat, #endif .probe = ti_musb_peripheral_probe, .remove = ti_musb_peripheral_remove, diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c index 26c6a46d5b7..e0d5f445901 100644 --- a/drivers/video/am335x-fb.c +++ b/drivers/video/am335x-fb.c @@ -498,7 +498,7 @@ static int am335x_fb_probe(struct udevice *dev) return 0; }

-static int am335x_fb_ofdata_to_platdata(struct udevice *dev) +static int am335x_fb_of_to_plat(struct udevice *dev) { struct am335x_fb_priv *priv = dev_get_priv(dev); struct tilcdc_panel_info *panel = &priv->panel; @@ -611,7 +611,7 @@ U_BOOT_DRIVER(am335x_fb) = { .id = UCLASS_VIDEO, .of_match = am335x_fb_ids, .bind = am335x_fb_bind, - .ofdata_to_platdata = am335x_fb_ofdata_to_platdata, + .of_to_plat = am335x_fb_of_to_plat, .probe = am335x_fb_probe, .remove = am335x_fb_remove, .priv_auto = sizeof(struct am335x_fb_priv), diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 0930d195d00..2d0d0d4f9c9 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -501,7 +501,7 @@ static int atmel_hlcdc_probe(struct udevice *dev) return 0; }

-static int atmel_hlcdc_ofdata_to_platdata(struct udevice *dev) +static int atmel_hlcdc_of_to_plat(struct udevice *dev) { struct atmel_hlcdc_priv *priv = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -561,7 +561,7 @@ U_BOOT_DRIVER(atmel_hlcdfb) = { .of_match = atmel_hlcdc_ids, .bind = atmel_hlcdc_bind, .probe = atmel_hlcdc_probe, - .ofdata_to_platdata = atmel_hlcdc_ofdata_to_platdata, + .of_to_plat = atmel_hlcdc_of_to_plat, .priv_auto = sizeof(struct atmel_hlcdc_priv), };

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 83367c4b451..f836a9a82ff 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -267,7 +267,7 @@ static int atmel_fb_lcd_probe(struct udevice *dev) return 0; }

-static int atmel_fb_ofdata_to_platdata(struct udevice *dev) +static int atmel_fb_of_to_plat(struct udevice *dev) { struct atmel_lcd_platdata *plat = dev_get_plat(dev); struct atmel_fb_priv *priv = dev_get_priv(dev); @@ -304,7 +304,7 @@ U_BOOT_DRIVER(atmel_fb) = { .id = UCLASS_VIDEO, .of_match = atmel_fb_lcd_ids, .bind = atmel_fb_lcd_bind, - .ofdata_to_platdata = atmel_fb_ofdata_to_platdata, + .of_to_plat = atmel_fb_of_to_plat, .probe = atmel_fb_lcd_probe, .plat_auto = sizeof(struct atmel_lcd_platdata), .priv_auto = sizeof(struct atmel_fb_priv), diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c index 8e34022d836..af1f058cf67 100644 --- a/drivers/video/backlight_gpio.c +++ b/drivers/video/backlight_gpio.c @@ -24,7 +24,7 @@ static int gpio_backlight_enable(struct udevice *dev) return 0; }

-static int gpio_backlight_ofdata_to_platdata(struct udevice *dev) +static int gpio_backlight_of_to_plat(struct udevice *dev) { struct gpio_backlight_priv *priv = dev_get_priv(dev); int ret; @@ -66,7 +66,7 @@ U_BOOT_DRIVER(gpio_backlight) = { .id = UCLASS_PANEL_BACKLIGHT, .of_match = gpio_backlight_ids, .ops = &gpio_backlight_ops, - .ofdata_to_platdata = gpio_backlight_ofdata_to_platdata, + .of_to_plat = gpio_backlight_of_to_plat, .probe = gpio_backlight_probe, .priv_auto = sizeof(struct gpio_backlight_priv), }; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index 69bf2ee317f..8e5c6cf866a 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -706,7 +706,7 @@ static int broadwell_igd_probe(struct udevice *dev) return 0; }

-static int broadwell_igd_ofdata_to_platdata(struct udevice *dev) +static int broadwell_igd_of_to_plat(struct udevice *dev) { struct broadwell_igd_plat *plat = dev_get_plat(dev); struct broadwell_igd_priv *priv = dev_get_priv(dev); @@ -778,7 +778,7 @@ U_BOOT_DRIVER(broadwell_igd) = { .id = UCLASS_VIDEO, .of_match = broadwell_igd_ids, .ops = &broadwell_igd_ops, - .ofdata_to_platdata = broadwell_igd_ofdata_to_platdata, + .of_to_plat = broadwell_igd_of_to_plat, .bind = broadwell_igd_bind, .probe = broadwell_igd_probe, .priv_auto = sizeof(struct broadwell_igd_priv), diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c index f18189a1de0..63b5b8e61a2 100644 --- a/drivers/video/exynos/exynos_dp.c +++ b/drivers/video/exynos/exynos_dp.c @@ -877,7 +877,7 @@ static unsigned int exynos_dp_config_video(struct exynos_dp *regs, return ret; }

-static int exynos_dp_ofdata_to_platdata(struct udevice *dev) +static int exynos_dp_of_to_plat(struct udevice *dev) { struct exynos_dp_priv *priv = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -1080,6 +1080,6 @@ U_BOOT_DRIVER(exynos_dp) = { .id = UCLASS_DISPLAY, .of_match = exynos_dp_ids, .ops = &exynos_dp_ops, - .ofdata_to_platdata = exynos_dp_ofdata_to_platdata, + .of_to_plat = exynos_dp_of_to_plat, .priv_auto = sizeof(struct exynos_dp_priv), }; diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c index 64bc8478845..cd7767fb6e7 100644 --- a/drivers/video/exynos/exynos_fb.c +++ b/drivers/video/exynos/exynos_fb.c @@ -479,7 +479,7 @@ unsigned long exynos_fimd_calc_fbsize(struct exynos_fb_priv *priv) return priv->vl_col * priv->vl_row * (VNBITS(priv->vl_bpix) / 8); }

-int exynos_fb_ofdata_to_platdata(struct udevice *dev) +int exynos_fb_of_to_plat(struct udevice *dev) { struct exynos_fb_priv *priv = dev_get_priv(dev); unsigned int node = dev_of_offset(dev); @@ -715,6 +715,6 @@ U_BOOT_DRIVER(exynos_fb) = { .ops = &exynos_fb_ops, .bind = exynos_fb_bind, .probe = exynos_fb_probe, - .ofdata_to_platdata = exynos_fb_ofdata_to_platdata, + .of_to_plat = exynos_fb_of_to_plat, .priv_auto = sizeof(struct exynos_fb_priv), }; diff --git a/drivers/video/lg4573.c b/drivers/video/lg4573.c index 73a1add0853..abf40bddfbe 100644 --- a/drivers/video/lg4573.c +++ b/drivers/video/lg4573.c @@ -294,7 +294,7 @@ static const struct dm_display_ops lg4573_lcd_ops = { .enable = lg4573_lcd_enable, };

-static int lg4573_ofdata_to_platdata(struct udevice *dev) +static int lg4573_of_to_plat(struct udevice *dev) { struct lg4573_lcd_priv *priv = dev_get_priv(dev); int ret; @@ -323,7 +323,7 @@ U_BOOT_DRIVER(lg4573_lcd) = { .name = "lg4573", .id = UCLASS_DISPLAY, .ops = &lg4573_lcd_ops, - .ofdata_to_platdata = lg4573_ofdata_to_platdata, + .of_to_plat = lg4573_of_to_plat, .of_match = lg4573_ids, .bind = lg4573_bind, .probe = lg4573_probe, diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c index 39c1c337c65..95738e34bf6 100644 --- a/drivers/video/orisetech_otm8009a.c +++ b/drivers/video/orisetech_otm8009a.c @@ -295,7 +295,7 @@ static int otm8009a_panel_get_display_timing(struct udevice *dev, return 0; }

-static int otm8009a_panel_ofdata_to_platdata(struct udevice *dev) +static int otm8009a_panel_of_to_plat(struct udevice *dev) { struct otm8009a_panel_priv *priv = dev_get_priv(dev); int ret; @@ -364,7 +364,7 @@ U_BOOT_DRIVER(otm8009a_panel) = { .id = UCLASS_PANEL, .of_match = otm8009a_panel_ids, .ops = &otm8009a_panel_ops, - .ofdata_to_platdata = otm8009a_panel_ofdata_to_platdata, + .of_to_plat = otm8009a_panel_of_to_plat, .probe = otm8009a_panel_probe, .plat_auto = sizeof(struct mipi_dsi_panel_plat), .priv_auto = sizeof(struct otm8009a_panel_priv), diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index d1407977aa0..9e32bc47cff 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -182,7 +182,7 @@ static int pwm_backlight_set_brightness(struct udevice *dev, int percent) return 0; }

-static int pwm_backlight_ofdata_to_platdata(struct udevice *dev) +static int pwm_backlight_of_to_plat(struct udevice *dev) { struct pwm_backlight_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args args; @@ -263,7 +263,7 @@ U_BOOT_DRIVER(pwm_backlight) = { .id = UCLASS_PANEL_BACKLIGHT, .of_match = pwm_backlight_ids, .ops = &pwm_backlight_ops, - .ofdata_to_platdata = pwm_backlight_ofdata_to_platdata, + .of_to_plat = pwm_backlight_of_to_plat, .probe = pwm_backlight_probe, .priv_auto = sizeof(struct pwm_backlight_priv), }; diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c index a370cd99e09..373668d28bf 100644 --- a/drivers/video/raydium-rm68200.c +++ b/drivers/video/raydium-rm68200.c @@ -261,7 +261,7 @@ static int rm68200_panel_get_display_timing(struct udevice *dev, return 0; }

-static int rm68200_panel_ofdata_to_platdata(struct udevice *dev) +static int rm68200_panel_of_to_plat(struct udevice *dev) { struct rm68200_panel_priv *priv = dev_get_priv(dev); int ret; @@ -336,7 +336,7 @@ U_BOOT_DRIVER(rm68200_panel) = { .id = UCLASS_PANEL, .of_match = rm68200_panel_ids, .ops = &rm68200_panel_ops, - .ofdata_to_platdata = rm68200_panel_ofdata_to_platdata, + .of_to_plat = rm68200_panel_of_to_plat, .probe = rm68200_panel_probe, .plat_auto = sizeof(struct mipi_dsi_panel_plat), .priv_auto = sizeof(struct rm68200_panel_priv), diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c index a25b40c37f1..327ae787125 100644 --- a/drivers/video/rockchip/rk3288_hdmi.c +++ b/drivers/video/rockchip/rk3288_hdmi.c @@ -38,7 +38,7 @@ static int rk3288_hdmi_enable(struct udevice *dev, int panel_bpp, return dw_hdmi_enable(&priv->hdmi, edid); }

-static int rk3288_hdmi_ofdata_to_platdata(struct udevice *dev) +static int rk3288_hdmi_of_to_plat(struct udevice *dev) { struct rk_hdmi_priv *priv = dev_get_priv(dev); struct dw_hdmi *hdmi = &priv->hdmi; @@ -53,7 +53,7 @@ static int rk3288_hdmi_ofdata_to_platdata(struct udevice *dev) hdmi->i2c_clk_high = 0x0d; hdmi->i2c_clk_low = 0x0d;

- return rk_hdmi_ofdata_to_platdata(dev); + return rk_hdmi_of_to_plat(dev); }

static int rk3288_clk_config(struct udevice *dev) @@ -111,7 +111,7 @@ U_BOOT_DRIVER(rk3288_hdmi_rockchip) = { .id = UCLASS_DISPLAY, .of_match = rk3288_hdmi_ids, .ops = &rk3288_hdmi_ops, - .ofdata_to_platdata = rk3288_hdmi_ofdata_to_platdata, + .of_to_plat = rk3288_hdmi_of_to_plat, .probe = rk3288_hdmi_probe, .priv_auto = sizeof(struct rk_hdmi_priv), }; diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c index f8b83a99dcd..7e48dd83466 100644 --- a/drivers/video/rockchip/rk3288_mipi.c +++ b/drivers/video/rockchip/rk3288_mipi.c @@ -129,7 +129,7 @@ static int rk_mipi_enable(struct udevice *dev, int panel_bpp, return 0; }

-static int rk_mipi_ofdata_to_platdata(struct udevice *dev) +static int rk_mipi_of_to_plat(struct udevice *dev) { struct rk_mipi_priv *priv = dev_get_priv(dev);

@@ -182,7 +182,7 @@ U_BOOT_DRIVER(rk_mipi_dsi) = { .name = "rk_mipi_dsi", .id = UCLASS_DISPLAY, .of_match = rk_mipi_dsi_ids, - .ofdata_to_platdata = rk_mipi_ofdata_to_platdata, + .of_to_plat = rk_mipi_of_to_plat, .probe = rk_mipi_probe, .ops = &rk_mipi_dsi_ops, .priv_auto = sizeof(struct rk_mipi_priv), diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c index 39f0c323f3a..3041360c6ed 100644 --- a/drivers/video/rockchip/rk3399_hdmi.c +++ b/drivers/video/rockchip/rk3399_hdmi.c @@ -34,7 +34,7 @@ static int rk3399_hdmi_enable(struct udevice *dev, int panel_bpp, return dw_hdmi_enable(&priv->hdmi, edid); }

-static int rk3399_hdmi_ofdata_to_platdata(struct udevice *dev) +static int rk3399_hdmi_of_to_plat(struct udevice *dev) { struct rk_hdmi_priv *priv = dev_get_priv(dev); struct dw_hdmi *hdmi = &priv->hdmi; @@ -42,7 +42,7 @@ static int rk3399_hdmi_ofdata_to_platdata(struct udevice *dev) hdmi->i2c_clk_high = 0x7a; hdmi->i2c_clk_low = 0x8d;

- return rk_hdmi_ofdata_to_platdata(dev); + return rk_hdmi_of_to_plat(dev); }

static const char * const rk3399_regulator_names[] = { @@ -74,7 +74,7 @@ U_BOOT_DRIVER(rk3399_hdmi_rockchip) = { .id = UCLASS_DISPLAY, .of_match = rk3399_hdmi_ids, .ops = &rk3399_hdmi_ops, - .ofdata_to_platdata = rk3399_hdmi_ofdata_to_platdata, + .of_to_plat = rk3399_hdmi_of_to_plat, .probe = rk3399_hdmi_probe, .priv_auto = sizeof(struct rk_hdmi_priv), }; diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c index 3b8ac3f730e..91733504831 100644 --- a/drivers/video/rockchip/rk3399_mipi.c +++ b/drivers/video/rockchip/rk3399_mipi.c @@ -121,7 +121,7 @@ static int rk_display_enable(struct udevice *dev, int panel_bpp, return 0; }

-static int rk_mipi_ofdata_to_platdata(struct udevice *dev) +static int rk_mipi_of_to_plat(struct udevice *dev) { struct rk_mipi_priv *priv = dev_get_priv(dev);

@@ -173,7 +173,7 @@ U_BOOT_DRIVER(rk_mipi_dsi) = { .name = "rk_mipi_dsi", .id = UCLASS_DISPLAY, .of_match = rk_mipi_dsi_ids, - .ofdata_to_platdata = rk_mipi_ofdata_to_platdata, + .of_to_plat = rk_mipi_of_to_plat, .probe = rk_mipi_probe, .ops = &rk_mipi_dsi_ops, .priv_auto = sizeof(struct rk_mipi_priv), diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 30fe8cee3c3..0be60e169e3 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1001,7 +1001,7 @@ done: return edid_size; }

-static int rk_edp_ofdata_to_platdata(struct udevice *dev) +static int rk_edp_of_to_plat(struct udevice *dev) { struct rk_edp_priv *priv = dev_get_priv(dev);

@@ -1099,7 +1099,7 @@ U_BOOT_DRIVER(dp_rockchip) = { .id = UCLASS_DISPLAY, .of_match = rockchip_dp_ids, .ops = &dp_rockchip_ops, - .ofdata_to_platdata = rk_edp_ofdata_to_platdata, + .of_to_plat = rk_edp_of_to_plat, .probe = rk_edp_probe, .remove = rk_edp_remove, .priv_auto = sizeof(struct rk_edp_priv), diff --git a/drivers/video/rockchip/rk_hdmi.c b/drivers/video/rockchip/rk_hdmi.c index f27cdf8ed4b..8dcd4d59645 100644 --- a/drivers/video/rockchip/rk_hdmi.c +++ b/drivers/video/rockchip/rk_hdmi.c @@ -78,7 +78,7 @@ int rk_hdmi_read_edid(struct udevice *dev, u8 *buf, int buf_size) return dw_hdmi_read_edid(&priv->hdmi, buf, buf_size); }

-int rk_hdmi_ofdata_to_platdata(struct udevice *dev) +int rk_hdmi_of_to_plat(struct udevice *dev) { struct rk_hdmi_priv *priv = dev_get_priv(dev); struct dw_hdmi *hdmi = &priv->hdmi; diff --git a/drivers/video/rockchip/rk_hdmi.h b/drivers/video/rockchip/rk_hdmi.h index 5767ef14437..859a0b9ff3f 100644 --- a/drivers/video/rockchip/rk_hdmi.h +++ b/drivers/video/rockchip/rk_hdmi.h @@ -52,12 +52,12 @@ int rk_hdmi_read_edid(struct udevice *dev, u8 *buf, int buf_size); void rk_hdmi_probe_regulators(struct udevice *dev, const char * const *names, int cnt); /** - * rk_hdmi_ofdata_to_platdata() - common ofdata_to_platdata implementation + * rk_hdmi_of_to_plat() - common of_to_plat implementation * * @dev: device * @return 0 if OK, -ve if something went wrong */ -int rk_hdmi_ofdata_to_platdata(struct udevice *dev); +int rk_hdmi_of_to_plat(struct udevice *dev);

/** * rk_hdmi_probe() - common probe implementation diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c index 74a1d3071dd..03c8257a357 100644 --- a/drivers/video/rockchip/rk_lvds.c +++ b/drivers/video/rockchip/rk_lvds.c @@ -170,7 +170,7 @@ int rk_lvds_read_timing(struct udevice *dev, struct display_timing *timing) return 0; }

-static int rk_lvds_ofdata_to_platdata(struct udevice *dev) +static int rk_lvds_of_to_plat(struct udevice *dev) { struct rk_lvds_priv *priv = dev_get_priv(dev); int ret; @@ -245,7 +245,7 @@ U_BOOT_DRIVER(lvds_rockchip) = { .id = UCLASS_DISPLAY, .of_match = rockchip_lvds_ids, .ops = &lvds_rockchip_ops, - .ofdata_to_platdata = rk_lvds_ofdata_to_platdata, + .of_to_plat = rk_lvds_of_to_plat, .probe = rk_lvds_probe, .priv_auto = sizeof(struct rk_lvds_priv), }; diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index 3be4f25d8b3..59e17f8f10f 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -48,7 +48,7 @@ static int simple_panel_set_backlight(struct udevice *dev, int percent) return 0; }

-static int simple_panel_ofdata_to_platdata(struct udevice *dev) +static int simple_panel_of_to_plat(struct udevice *dev) { struct simple_panel_priv *priv = dev_get_priv(dev); int ret; @@ -116,7 +116,7 @@ U_BOOT_DRIVER(simple_panel) = { .id = UCLASS_PANEL, .of_match = simple_panel_ids, .ops = &simple_panel_ops, - .ofdata_to_platdata = simple_panel_ofdata_to_platdata, + .of_to_plat = simple_panel_of_to_plat, .probe = simple_panel_probe, .priv_auto = sizeof(struct simple_panel_priv), }; diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index 10b834ca76d..d185096db01 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -336,7 +336,7 @@ static int tegra_lcd_probe(struct udevice *dev) return 0; }

-static int tegra_lcd_ofdata_to_platdata(struct udevice *dev) +static int tegra_lcd_of_to_plat(struct udevice *dev) { struct tegra_lcd_priv *priv = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -423,6 +423,6 @@ U_BOOT_DRIVER(tegra_lcd) = { .ops = &tegra_lcd_ops, .bind = tegra_lcd_bind, .probe = tegra_lcd_probe, - .ofdata_to_platdata = tegra_lcd_ofdata_to_platdata, + .of_to_plat = tegra_lcd_of_to_plat, .priv_auto = sizeof(struct tegra_lcd_priv), }; diff --git a/drivers/video/tegra124/dp.c b/drivers/video/tegra124/dp.c index d9599ee950a..8f5116fe7c8 100644 --- a/drivers/video/tegra124/dp.c +++ b/drivers/video/tegra124/dp.c @@ -1566,7 +1566,7 @@ error_enable: return 0; }

-static int tegra_dp_ofdata_to_platdata(struct udevice *dev) +static int tegra_dp_of_to_plat(struct udevice *dev) { struct tegra_dp_plat *plat = dev_get_plat(dev);

@@ -1616,7 +1616,7 @@ U_BOOT_DRIVER(dp_tegra) = { .name = "dpaux_tegra", .id = UCLASS_DISPLAY, .of_match = tegra_dp_ids, - .ofdata_to_platdata = tegra_dp_ofdata_to_platdata, + .of_to_plat = tegra_dp_of_to_plat, .probe = dp_tegra_probe, .ops = &dp_tegra_ops, .priv_auto = sizeof(struct tegra_dp_priv), diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c index 83f3aad92cb..95976ee5735 100644 --- a/drivers/video/tegra124/sor.c +++ b/drivers/video/tegra124/sor.c @@ -1042,7 +1042,7 @@ static int tegra_sor_set_backlight(struct udevice *dev, int percent) return 0; }

-static int tegra_sor_ofdata_to_platdata(struct udevice *dev) +static int tegra_sor_of_to_plat(struct udevice *dev) { struct tegra_dc_sor_data *priv = dev_get_priv(dev); int ret; @@ -1077,7 +1077,7 @@ U_BOOT_DRIVER(sor_tegra) = { .name = "sor_tegra", .id = UCLASS_VIDEO_BRIDGE, .of_match = tegra_sor_ids, - .ofdata_to_platdata = tegra_sor_ofdata_to_platdata, + .of_to_plat = tegra_sor_of_to_plat, .ops = &tegra_sor_ops, .priv_auto = sizeof(struct tegra_dc_sor_data), }; diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 90ee1d4271e..78c15c821b4 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -334,7 +334,7 @@ static int virtio_mmio_notify(struct udevice *udev, struct virtqueue *vq) return 0; }

-static int virtio_mmio_ofdata_to_platdata(struct udevice *udev) +static int virtio_mmio_of_to_plat(struct udevice *udev) { struct virtio_mmio_priv *priv = dev_get_priv(udev);

@@ -411,6 +411,6 @@ U_BOOT_DRIVER(virtio_mmio) = { .of_match = virtio_mmio_ids, .ops = &virtio_mmio_ops, .probe = virtio_mmio_probe, - .ofdata_to_platdata = virtio_mmio_ofdata_to_platdata, + .of_to_plat = virtio_mmio_of_to_plat, .priv_auto = sizeof(struct virtio_mmio_priv), }; diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c index 99fb9603e69..3637febc0c5 100644 --- a/drivers/w1/mxc_w1.c +++ b/drivers/w1/mxc_w1.c @@ -166,7 +166,7 @@ static u8 mxc_w1_triplet(struct udevice *dev, bool bdir) return retval; }

-static int mxc_w1_ofdata_to_platdata(struct udevice *dev) +static int mxc_w1_of_to_plat(struct udevice *dev) { struct mxc_w1_pdata *pdata = dev_get_plat(dev); fdt_addr_t addr; @@ -228,7 +228,7 @@ U_BOOT_DRIVER(mxc_w1_drv) = { .id = UCLASS_W1, .name = "mxc_w1_drv", .of_match = mxc_w1_id, - .ofdata_to_platdata = mxc_w1_ofdata_to_platdata, + .of_to_plat = mxc_w1_of_to_plat, .ops = &mxc_w1_ops, .plat_auto = sizeof(struct mxc_w1_pdata), .probe = mxc_w1_probe, diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c index fe4ebe21a57..3b0ead6f6dc 100644 --- a/drivers/w1/w1-gpio.c +++ b/drivers/w1/w1-gpio.c @@ -151,7 +151,7 @@ static const struct w1_ops w1_gpio_ops = { .write_byte = w1_gpio_write_byte, };

-static int w1_gpio_ofdata_to_platdata(struct udevice *dev) +static int w1_gpio_of_to_plat(struct udevice *dev) { struct w1_gpio_pdata *pdata = dev_get_plat(dev); int ret; @@ -172,7 +172,7 @@ U_BOOT_DRIVER(w1_gpio_drv) = { .id = UCLASS_W1, .name = "w1_gpio_drv", .of_match = w1_gpio_id, - .ofdata_to_platdata = w1_gpio_ofdata_to_platdata, + .of_to_plat = w1_gpio_of_to_plat, .ops = &w1_gpio_ops, .plat_auto = sizeof(struct w1_gpio_pdata), }; diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c index 9e2f484f4a2..f7b5a1adc10 100644 --- a/drivers/watchdog/ast_wdt.c +++ b/drivers/watchdog/ast_wdt.c @@ -86,7 +86,7 @@ static int ast_wdt_expire_now(struct udevice *dev, ulong flags) return ast_wdt_stop(dev); }

-static int ast_wdt_ofdata_to_platdata(struct udevice *dev) +static int ast_wdt_of_to_plat(struct udevice *dev) { struct ast_wdt_priv *priv = dev_get_priv(dev);

@@ -125,6 +125,6 @@ U_BOOT_DRIVER(ast_wdt) = { .of_match = ast_wdt_ids, .probe = ast_wdt_probe, .priv_auto = sizeof(struct ast_wdt_priv), - .ofdata_to_platdata = ast_wdt_ofdata_to_platdata, + .of_to_plat = ast_wdt_of_to_plat, .ops = &ast_wdt_ops, }; diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c index 44a9769c5df..966d010e40d 100644 --- a/drivers/watchdog/cdns_wdt.c +++ b/drivers/watchdog/cdns_wdt.c @@ -228,7 +228,7 @@ static int cdns_wdt_probe(struct udevice *dev) return 0; }

-static int cdns_wdt_ofdata_to_platdata(struct udevice *dev) +static int cdns_wdt_of_to_plat(struct udevice *dev) { struct cdns_wdt_priv *priv = dev_get_priv(dev);

@@ -261,6 +261,6 @@ U_BOOT_DRIVER(cdns_wdt) = { .of_match = cdns_wdt_ids, .probe = cdns_wdt_probe, .priv_auto = sizeof(struct cdns_wdt_priv), - .ofdata_to_platdata = cdns_wdt_ofdata_to_platdata, + .of_to_plat = cdns_wdt_of_to_plat, .ops = &cdns_wdt_ops, }; diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 171d81aec59..167af904dc2 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -133,7 +133,7 @@ static inline bool save_reg_from_ofdata(struct udevice *dev, int index, return true; }

-static int orion_wdt_ofdata_to_platdata(struct udevice *dev) +static int orion_wdt_of_to_plat(struct udevice *dev) { struct orion_wdt_priv *priv = dev_get_priv(dev);

@@ -187,6 +187,6 @@ U_BOOT_DRIVER(orion_wdt) = { .of_match = orion_wdt_ids, .probe = orion_wdt_probe, .priv_auto = sizeof(struct orion_wdt_priv), - .ofdata_to_platdata = orion_wdt_ofdata_to_platdata, + .of_to_plat = orion_wdt_of_to_plat, .ops = &orion_wdt_ops, }; diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 66553e5591b..df68adbd6a1 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c @@ -93,7 +93,7 @@ static int sbsa_gwdt_probe(struct udevice *dev) return 0; }

-static int sbsa_gwdt_ofdata_to_platdata(struct udevice *dev) +static int sbsa_gwdt_of_to_plat(struct udevice *dev) { struct sbsa_gwdt_priv *priv = dev_get_priv(dev);

@@ -126,6 +126,6 @@ U_BOOT_DRIVER(sbsa_gwdt) = { .of_match = sbsa_gwdt_ids, .probe = sbsa_gwdt_probe, .priv_auto = sizeof(struct sbsa_gwdt_priv), - .ofdata_to_platdata = sbsa_gwdt_ofdata_to_platdata, + .of_to_plat = sbsa_gwdt_of_to_plat, .ops = &sbsa_gwdt_ops, }; diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index df57917f15a..291aad75701 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -110,7 +110,7 @@ static int sp805_wdt_probe(struct udevice *dev) return 0; }

-static int sp805_wdt_ofdata_to_platdata(struct udevice *dev) +static int sp805_wdt_of_to_plat(struct udevice *dev) { struct sp805_wdt_priv *priv = dev_get_priv(dev); struct clk clk; @@ -143,6 +143,6 @@ U_BOOT_DRIVER(sp805_wdt) = { .of_match = sp805_wdt_ids, .probe = sp805_wdt_probe, .priv_auto = sizeof(struct sp805_wdt_priv), - .ofdata_to_platdata = sp805_wdt_ofdata_to_platdata, + .of_to_plat = sp805_wdt_of_to_plat, .ops = &sp805_wdt_ops, }; diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index ce094436745..b7b10dd11f6 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -90,7 +90,7 @@ static int xlnx_wdt_probe(struct udevice *dev) return 0; }

-static int xlnx_wdt_ofdata_to_platdata(struct udevice *dev) +static int xlnx_wdt_of_to_plat(struct udevice *dev) { struct xlnx_wdt_platdata *plat = dev_get_plat(dev);

@@ -124,6 +124,6 @@ U_BOOT_DRIVER(xlnx_wdt) = { .of_match = xlnx_wdt_ids, .probe = xlnx_wdt_probe, .plat_auto = sizeof(struct xlnx_wdt_platdata), - .ofdata_to_platdata = xlnx_wdt_ofdata_to_platdata, + .of_to_plat = xlnx_wdt_of_to_plat, .ops = &xlnx_wdt_ops, }; diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c index 064caa0e87f..8345b9086e8 100644 --- a/drivers/watchdog/xilinx_wwdt.c +++ b/drivers/watchdog/xilinx_wwdt.c @@ -145,7 +145,7 @@ static int xlnx_wwdt_probe(struct udevice *dev) return ret; }

-static int xlnx_wwdt_ofdata_to_platdata(struct udevice *dev) +static int xlnx_wwdt_of_to_plat(struct udevice *dev) { struct xlnx_wwdt_platdata *plat = dev_get_plat(dev);

@@ -174,6 +174,6 @@ U_BOOT_DRIVER(xlnx_wwdt) = { .probe = xlnx_wwdt_probe, .priv_auto = sizeof(struct xlnx_wwdt_priv), .plat_auto = sizeof(struct xlnx_wwdt_platdata), - .ofdata_to_platdata = xlnx_wwdt_ofdata_to_platdata, + .of_to_plat = xlnx_wwdt_of_to_plat, .ops = &xlnx_wwdt_ops, }; diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index 2e9c1d5ef9c..af3b6b2b054 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -89,7 +89,7 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only, int device_reparent(struct udevice *dev, struct udevice *new_parent);

/** - * device_ofdata_to_platdata() - Read platform data for a device + * device_of_to_plat() - Read platform data for a device * * Read platform data for a device (typically from the device tree) so that * the information needed to probe the device is present. @@ -102,7 +102,7 @@ int device_reparent(struct udevice *dev, struct udevice *new_parent); * @dev: Pointer to device to process * @return 0 if OK, -ve on error */ -int device_ofdata_to_platdata(struct udevice *dev); +int device_of_to_plat(struct udevice *dev);

/** * device_probe() - Probe a device, activating it diff --git a/include/dm/device.h b/include/dm/device.h index a9af9326498..30fc98dc345 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -107,7 +107,7 @@ enum { * a U_BOOT_DEVICE() macro (in which case plat is non-NULL) or a node * in the device tree (in which case of_offset is >= 0). In the latter case * we translate the device tree information into plat in a function - * implemented by the driver ofdata_to_platdata method (called just before the + * implemented by the driver of_to_plat method (called just before the * probe method if the device has a device tree node. * * All three of plat, priv and uclass_priv can be allocated by the @@ -225,7 +225,7 @@ struct udevice_id { * @probe: Called to probe a device, i.e. activate it * @remove: Called to remove a device, i.e. de-activate it * @unbind: Called to unbind a device from its driver - * @ofdata_to_platdata: Called before probe to decode device tree data + * @of_to_plat: Called before probe to decode device tree data * @child_post_bind: Called after a new child has been bound * @child_pre_probe: Called before a child device is probed. The device has * memory allocated but it has not yet been probed. @@ -260,7 +260,7 @@ struct driver { int (*probe)(struct udevice *dev); int (*remove)(struct udevice *dev); int (*unbind)(struct udevice *dev); - int (*ofdata_to_platdata)(struct udevice *dev); + int (*of_to_plat)(struct udevice *dev); int (*child_post_bind)(struct udevice *dev); int (*child_pre_probe)(struct udevice *dev); int (*child_post_remove)(struct udevice *dev); @@ -622,7 +622,7 @@ int device_find_child_by_name(const struct udevice *parent, const char *name, /** * device_first_child_ofdata_err() - Find the first child and reads its plat * - * The ofdata_to_platdata() method is called on the child before it is returned, + * The of_to_plat() method is called on the child before it is returned, * but the child is not probed. * * @parent: Parent to check @@ -635,7 +635,7 @@ int device_first_child_ofdata_err(struct udevice *parent, /* * device_next_child_ofdata_err() - Find the next child and read its plat * - * The ofdata_to_platdata() method is called on the child before it is returned, + * The of_to_plat() method is called on the child before it is returned, * but the child is not probed. * * @devp: On entry, points to the previous child; on exit returns the child that @@ -796,19 +796,19 @@ static inline bool device_is_on_pci_bus(const struct udevice *dev) list_for_each_entry(pos, &parent->child_head, sibling_node)

/** - * device_foreach_child_ofdata_to_platdata() - iterate through children + * device_foreach_child_of_to_plat() - iterate through children * * This stops when it gets an error, with @pos set to the device that failed to * read ofdata.

* This creates a for() loop which works through the available children of * a device in order from start to end. Device ofdata is read by calling - * device_ofdata_to_platdata() on each one. The devices are not probed. + * device_of_to_plat() on each one. The devices are not probed. * * @pos: struct udevice * for the current device * @parent: parent device to scan */ -#define device_foreach_child_ofdata_to_platdata(pos, parent) \ +#define device_foreach_child_of_to_plat(pos, parent) \ for (int _ret = device_first_child_ofdata_err(parent, &dev); !_ret; \ _ret = device_next_child_ofdata_err(&dev))

diff --git a/include/dm/platform_data/spi_pl022.h b/include/dm/platform_data/spi_pl022.h index 63a58ee4535..c5aa3212915 100644 --- a/include/dm/platform_data/spi_pl022.h +++ b/include/dm/platform_data/spi_pl022.h @@ -4,7 +4,7 @@ * Quentin Schulz, Bootlin, quentin.schulz@bootlin.com * * Structure for use with U_BOOT_DEVICE for pl022 SPI devices or to use - * in ofdata_to_platdata. + * in of_to_plat. */

#ifndef __spi_pl022_h diff --git a/include/i2c.h b/include/i2c.h index d0a390141b8..e45e33f5037 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -521,17 +521,17 @@ int i2c_get_chip_for_busnum(int busnum, int chip_addr, uint offset_len, struct udevice **devp);

/** - * i2c_chip_ofdata_to_platdata() - Decode standard I2C platform data + * i2c_chip_of_to_plat() - Decode standard I2C platform data * * This decodes the chip address from a device tree node and puts it into * its dm_i2c_chip structure. This should be called in your driver's - * ofdata_to_platdata() method. + * of_to_plat() method. * * @blob: Device tree blob * @node: Node offset to read from * @spi: Place to put the decoded information */ -int i2c_chip_ofdata_to_platdata(struct udevice *dev, struct dm_i2c_chip *chip); +int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip);

/** * i2c_dump_msgs() - Dump a list of I2C messages @@ -568,7 +568,7 @@ struct udevice *i2c_emul_get_device(struct udevice *emul); extern struct acpi_ops i2c_acpi_ops;

/** - * acpi_i2c_ofdata_to_platdata() - Read properties intended for ACPI + * acpi_i2c_of_to_plat() - Read properties intended for ACPI * * This reads the generic I2C properties from the device tree, so that these * can be used to create ACPI information for the device. @@ -579,7 +579,7 @@ extern struct acpi_ops i2c_acpi_ops; * @dev: I2C device to process * @return 0 if OK, -EINVAL if acpi,hid is not present */ -int acpi_i2c_ofdata_to_platdata(struct udevice *dev); +int acpi_i2c_of_to_plat(struct udevice *dev);

#ifndef CONFIG_DM_I2C

diff --git a/include/ns16550.h b/include/ns16550.h index 18c9077755b..08e933ffe79 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -241,7 +241,7 @@ void NS16550_reinit(NS16550_t com_port, int baud_divisor); int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate);

/** - * ns16550_serial_ofdata_to_platdata() - convert DT to platform data + * ns16550_serial_of_to_plat() - convert DT to platform data * * Decode a device tree node for an ns16550 device. This includes the * register base address and register shift properties. The caller must set @@ -250,7 +250,7 @@ int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate); * @dev: dev to decode platform data for * @return: 0 if OK, -EINVAL on error */ -int ns16550_serial_ofdata_to_platdata(struct udevice *dev); +int ns16550_serial_of_to_plat(struct udevice *dev);

/** * ns16550_serial_probe() - probe a serial port diff --git a/include/spi.h b/include/spi.h index 96be27690f7..8c131c96bed 100644 --- a/include/spi.h +++ b/include/spi.h @@ -601,7 +601,7 @@ int spi_chip_select(struct udevice *slave); int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp);

/** - * spi_slave_ofdata_to_platdata() - decode standard SPI platform data + * spi_slave_of_to_plat() - decode standard SPI platform data * * This decodes the speed and mode for a slave from a device tree node * @@ -609,8 +609,8 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp); * @node: Node offset to read from * @plat: Place to put the decoded information */ -int spi_slave_ofdata_to_platdata(struct udevice *dev, - struct dm_spi_slave_platdata *plat); +int spi_slave_of_to_plat(struct udevice *dev, + struct dm_spi_slave_platdata *plat);

/** * spi_cs_info() - Check information on a chip select diff --git a/test/dm/devres.c b/test/dm/devres.c index 00edbd0e9c0..4f959d11da9 100644 --- a/test/dm/devres.c +++ b/test/dm/devres.c @@ -159,7 +159,7 @@ static int dm_test_devres_phase(struct unit_test_state *uts) ut_asserteq(TEST_DEVRES_SIZE, stats.total_size);

/* Getting plat should add one allocation */ - ut_assertok(device_ofdata_to_platdata(dev)); + ut_assertok(device_of_to_plat(dev)); devres_get_stats(dev, &stats); ut_asserteq(2, stats.allocs); ut_asserteq(TEST_DEVRES_SIZE + TEST_DEVRES_SIZE3, stats.total_size); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index f3299bb3a84..1f0248ac679 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -38,7 +38,7 @@ static const struct test_ops test_ops = { .ping = testfdt_drv_ping, };

-static int testfdt_ofdata_to_platdata(struct udevice *dev) +static int testfdt_of_to_plat(struct udevice *dev) { struct dm_test_pdata *pdata = dev_get_plat(dev);

@@ -83,7 +83,7 @@ U_BOOT_DRIVER(testfdt_drv) = { .name = "testfdt_drv", .of_match = testfdt_ids, .id = UCLASS_TEST_FDT, - .ofdata_to_platdata = testfdt_ofdata_to_platdata, + .of_to_plat = testfdt_of_to_plat, .probe = testfdt_drv_probe, .ops = &test_ops, .priv_auto = sizeof(struct dm_test_priv), @@ -101,7 +101,7 @@ U_BOOT_DRIVER(testfdt1_drv) = { .name = "testfdt1_drv", .of_match = testfdt1_ids, .id = UCLASS_TEST_FDT, - .ofdata_to_platdata = testfdt_ofdata_to_platdata, + .of_to_plat = testfdt_of_to_plat, .probe = testfdt_drv_probe, .ops = &test_ops, .priv_auto = sizeof(struct dm_test_priv), @@ -174,7 +174,7 @@ static int testdevres_drv_bind(struct udevice *dev) return 0; }

-static int testdevres_drv_ofdata_to_platdata(struct udevice *dev) +static int testdevres_drv_of_to_plat(struct udevice *dev) { struct dm_testdevres_priv *priv = dev_get_priv(dev);

@@ -202,7 +202,7 @@ U_BOOT_DRIVER(testdevres_drv) = { .of_match = testdevres_ids, .id = UCLASS_TEST_DEVRES, .bind = testdevres_drv_bind, - .ofdata_to_platdata = testdevres_drv_ofdata_to_platdata, + .of_to_plat = testdevres_drv_of_to_plat, .probe = testdevres_drv_probe, .plat_auto = sizeof(struct dm_testdevres_pdata), .priv_auto = sizeof(struct dm_testdevres_priv), @@ -1084,7 +1084,7 @@ static int dm_test_child_ofdata(struct unit_test_state *uts)

ut_assertok(uclass_first_device_err(UCLASS_TEST_BUS, &bus)); count = 0; - device_foreach_child_ofdata_to_platdata(dev, bus) { + device_foreach_child_of_to_plat(dev, bus) { ut_assert(dev->flags & DM_FLAG_PLATDATA_VALID); ut_assert(!(dev->flags & DM_FLAG_ACTIVATED)); count++; @@ -1128,7 +1128,7 @@ static int dm_test_ofdata_order(struct unit_test_state *uts) ut_assert(!(dev->flags & DM_FLAG_PLATDATA_VALID));

/* read the child's ofdata which should cause the parent's to be read */ - ut_assertok(device_ofdata_to_platdata(dev)); + ut_assertok(device_of_to_plat(dev)); ut_assert(dev->flags & DM_FLAG_PLATDATA_VALID); ut_assert(bus->flags & DM_FLAG_PLATDATA_VALID);

Fix up the code style for those declarations that should now fit onto one line, which is all of them that currently do not.

This is needed for dtoc to detect the structs correctly, at present.

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/x86/cpu/intel_common/p2sb.c | 3 +-- drivers/i2c/i2c-emul-uclass.c | 3 +-- drivers/misc/p2sb-uclass.c | 3 +-- drivers/pci/pci-uclass.c | 3 +-- drivers/pci/pci_sandbox.c | 3 +-- drivers/power/regulator/regulator-uclass.c | 3 +-- drivers/remoteproc/rproc-uclass.c | 3 +-- drivers/spi/spi-uclass.c | 3 +-- drivers/usb/emul/sandbox_hub.c | 3 +-- drivers/video/nexell_display.c | 3 +-- test/dm/bus.c | 3 +-- test/dm/test-uclass.c | 3 +-- 12 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 39e47090a3a..098b6f00ae3 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -198,8 +198,7 @@ U_BOOT_DRIVER(intel_p2sb) = { .ops = &p2sb_ops, .of_to_plat = p2sb_of_to_plat, .plat_auto = sizeof(struct p2sb_platdata), - .per_child_plat_auto = - sizeof(struct p2sb_child_platdata), + .per_child_plat_auto = sizeof(struct p2sb_child_platdata), .child_post_bind = p2sb_child_post_bind, .flags = DM_FLAG_OS_PREPARE, }; diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index 83f0f90831d..4fbf20e2759 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -64,8 +64,7 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp) UCLASS_DRIVER(i2c_emul) = { .id = UCLASS_I2C_EMUL, .name = "i2c_emul", - .per_device_plat_auto = - sizeof(struct i2c_emul_uc_platdata), + .per_device_plat_auto = sizeof(struct i2c_emul_uc_platdata), };

/* diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index ce5630fd3ee..3267e50a313 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -224,6 +224,5 @@ UCLASS_DRIVER(p2sb) = { .per_device_auto = sizeof(struct p2sb_uc_priv), .post_bind = p2sb_post_bind, .child_post_bind = p2sb_child_post_bind, - .per_child_plat_auto = - sizeof(struct p2sb_child_platdata), + .per_child_plat_auto = sizeof(struct p2sb_child_platdata), }; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 229d1c8002e..f82a6bea242 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1789,8 +1789,7 @@ UCLASS_DRIVER(pci) = { .post_probe = pci_uclass_post_probe, .child_post_bind = pci_uclass_child_post_bind, .per_device_auto = sizeof(struct pci_controller), - .per_child_plat_auto = - sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_platdata), };

static const struct dm_pci_ops pci_bridge_ops = { diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index 6de9af9937e..e2924105bd1 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -132,6 +132,5 @@ U_BOOT_DRIVER(pci_sandbox) = {

/* Attach an emulator if we can */ .child_post_bind = dm_scan_fdt_dev, - .per_child_plat_auto = - sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_platdata), }; diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 7267a89b30c..4d2e730271f 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -500,6 +500,5 @@ UCLASS_DRIVER(regulator) = { .name = "regulator", .post_bind = regulator_post_bind, .pre_probe = regulator_pre_probe, - .per_device_plat_auto = - sizeof(struct dm_regulator_uclass_plat), + .per_device_plat_auto = sizeof(struct dm_regulator_uclass_plat), }; diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index cc640b311be..ccc910e7c74 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -210,8 +210,7 @@ UCLASS_DRIVER(rproc) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .pre_probe = rproc_pre_probe, .post_probe = rproc_post_probe, - .per_device_plat_auto = - sizeof(struct dm_rproc_uclass_pdata), + .per_device_plat_auto = sizeof(struct dm_rproc_uclass_pdata), };

/* Remoteproc subsystem access functions */ diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index d6f67b28bdb..bcbbd061789 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -504,8 +504,7 @@ UCLASS_DRIVER(spi) = { .child_pre_probe = spi_child_pre_probe, .per_device_auto = sizeof(struct dm_spi_bus), .per_child_auto = sizeof(struct spi_slave), - .per_child_plat_auto = - sizeof(struct dm_spi_slave_platdata), + .per_child_plat_auto = sizeof(struct dm_spi_slave_platdata), #if !CONFIG_IS_ENABLED(OF_PLATDATA) .child_post_bind = spi_child_post_bind, #endif diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index 91158e5c6d3..396923ac782 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -329,7 +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_platdata), .child_post_bind = sandbox_child_post_bind, }; diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index ef0fdf65e31..da11e9d2e12 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -643,8 +643,7 @@ U_BOOT_DRIVER(nexell_display) = { .name = "nexell-display", .id = UCLASS_VIDEO, .of_match = nx_display_ids, - .plat_auto = - sizeof(struct nx_display_platdata), + .plat_auto = sizeof(struct nx_display_platdata), .bind = nx_display_bind, .probe = nx_display_probe, .priv_auto = sizeof(struct nx_display_dev), diff --git a/test/dm/bus.c b/test/dm/bus.c index 0adf1383226..60ddb1d6b14 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -103,8 +103,7 @@ U_BOOT_DRIVER(testbus_drv) = { .priv_auto = sizeof(struct dm_test_priv), .plat_auto = sizeof(struct dm_test_pdata), .per_child_auto = sizeof(struct dm_test_parent_data), - .per_child_plat_auto = - sizeof(struct dm_test_parent_plat), + .per_child_plat_auto = sizeof(struct dm_test_parent_plat), .child_pre_probe = testbus_child_pre_probe, .child_post_remove = testbus_child_post_remove, }; diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 378fc1e536a..3ab4a23649e 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -126,6 +126,5 @@ UCLASS_DRIVER(test) = { .destroy = test_destroy, .priv_auto = sizeof(struct dm_test_uclass_priv), .per_device_auto = sizeof(struct dm_test_uclass_perdev_priv), - .per_device_plat_auto = - sizeof(struct dm_test_perdev_uc_pdata), + .per_device_plat_auto = sizeof(struct dm_test_perdev_uc_pdata), };

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

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/include/asm/arch-hi6220/gpio.h | 2 +- arch/arm/include/asm/arch-imx8/power-domain.h | 2 +- .../arm/include/asm/arch-imx8m/power-domain.h | 2 +- arch/arm/include/asm/arch-vf610/gpio.h | 2 +- arch/arm/include/asm/omap_gpio.h | 2 +- arch/arm/include/asm/omap_i2c.h | 2 +- arch/arm/include/asm/omap_musb.h | 2 +- .../mach-at91/arm926ejs/at91sam9260_devices.c | 2 +- .../arm926ejs/at91sam9m10g45_devices.c | 2 +- .../arm/mach-at91/include/mach/atmel_serial.h | 2 +- arch/arm/mach-at91/include/mach/gpio.h | 2 +- arch/arm/mach-bcm283x/include/mach/gpio.h | 4 +- arch/arm/mach-lpc32xx/devices.c | 4 +- arch/arm/mach-nexell/include/mach/display.h | 4 +- arch/arm/mach-omap2/am33xx/board.c | 10 ++-- arch/arm/mach-omap2/omap3/board.c | 2 +- arch/arm/mach-rockchip/px30/syscon_px30.c | 8 +-- arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 8 +-- arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 10 ++-- arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 10 ++-- arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 12 ++--- arch/arm/mach-stm32mp/bsec.c | 20 ++++---- arch/arm/mach-tegra/board.c | 2 +- arch/riscv/include/asm/arch-fu540/gpio.h | 2 +- arch/riscv/include/asm/arch-generic/gpio.h | 2 +- arch/x86/cpu/apollolake/hostbridge.c | 12 ++--- arch/x86/cpu/apollolake/pmc.c | 14 +++--- arch/x86/cpu/apollolake/spl.c | 2 +- arch/x86/cpu/apollolake/uart.c | 8 +-- arch/x86/cpu/broadwell/sata.c | 10 ++-- arch/x86/cpu/cpu_x86.c | 2 +- arch/x86/cpu/intel_common/itss.c | 6 +-- arch/x86/cpu/intel_common/p2sb.c | 12 ++--- arch/x86/cpu/mp_init.c | 4 +- arch/x86/cpu/qfw_cpu.c | 2 +- arch/x86/cpu/slimbootloader/serial.c | 4 +- arch/x86/include/asm/arch-broadwell/gpio.h | 2 +- arch/x86/include/asm/gpio.h | 2 +- arch/x86/lib/acpi_table.c | 2 +- arch/x86/lib/fsp/fsp_graphics.c | 4 +- arch/x86/lib/mpspec.c | 2 +- arch/x86/lib/sfi.c | 2 +- board/armltd/integrator/integrator.c | 4 +- board/armltd/total_compute/total_compute.c | 4 +- board/armltd/vexpress64/vexpress64.c | 4 +- board/bluewater/gurnard/gurnard.c | 4 +- board/bluewater/snapper9260/snapper9260.c | 2 +- board/cavium/thunderx/thunderx.c | 4 +- board/compulab/cm_fx6/cm_fx6.c | 2 +- board/davinci/da8xxevm/omapl138_lcdk.c | 6 +-- board/freescale/lx2160a/lx2160a.c | 4 +- board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/hisilicon/hikey/hikey.c | 6 +-- board/hisilicon/hikey960/hikey960.c | 4 +- board/hisilicon/poplar/poplar.c | 4 +- board/isee/igep00x0/igep00x0.c | 2 +- board/lg/sniper/sniper.c | 4 +- board/nokia/rx51/rx51.c | 2 +- board/siemens/corvus/board.c | 2 +- board/st/stv0991/stv0991.c | 4 +- board/sysam/amcore/amcore.c | 2 +- board/ti/am335x/board.c | 8 +-- board/timll/devkit8000/devkit8000.c | 2 +- board/toradex/apalis_imx6/apalis_imx6.c | 2 +- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 2 +- board/toradex/colibri_imx6/colibri_imx6.c | 2 +- board/toradex/colibri_pxa270/colibri_pxa270.c | 8 +-- cmd/cpu.c | 2 +- cmd/pci.c | 2 +- cmd/regulator.c | 20 ++++---- common/lcd_simplefb.c | 2 +- common/usb_hub.c | 2 +- doc/driver-model/of-plat.rst | 10 ++-- doc/driver-model/spi-howto.rst | 16 +++--- doc/driver-model/usb-info.rst | 8 +-- drivers/adc/adc-uclass.c | 20 ++++---- drivers/ata/ahci.c | 6 +-- drivers/clk/altera/clk-agilex.c | 50 +++++++++---------- drivers/clk/altera/clk-arria10.c | 18 +++---- drivers/clk/at91/compat.c | 50 +++++++++---------- drivers/core/regmap.c | 4 +- drivers/core/root.c | 6 +-- drivers/core/syscon-uclass.c | 4 +- drivers/cpu/at91_cpu.c | 10 ++-- drivers/cpu/bmips_cpu.c | 2 +- drivers/cpu/cpu-uclass.c | 2 +- drivers/cpu/cpu_sandbox.c | 2 +- drivers/cpu/imx8_cpu.c | 20 ++++---- drivers/cpu/riscv_cpu.c | 2 +- drivers/ddr/altera/sdram_agilex.c | 2 +- drivers/ddr/altera/sdram_gen5.c | 8 +-- drivers/ddr/altera/sdram_s10.c | 2 +- drivers/ddr/altera/sdram_soc64.c | 18 +++---- drivers/ddr/altera/sdram_soc64.h | 16 +++--- drivers/gpio/altera_pio.c | 16 +++--- drivers/gpio/at91_gpio.c | 4 +- drivers/gpio/atmel_pio4.c | 8 +-- drivers/gpio/bcm2835_gpio.c | 6 +-- drivers/gpio/da8xx_gpio.c | 6 +-- drivers/gpio/da8xx_gpio.h | 2 +- drivers/gpio/dwapb_gpio.c | 18 +++---- drivers/gpio/hi6220_gpio.c | 2 +- drivers/gpio/intel_broadwell_gpio.c | 6 +-- drivers/gpio/intel_ich6_gpio.c | 6 +-- drivers/gpio/iproc_gpio.c | 26 +++++----- drivers/gpio/mpc83xx_spisel_boot.c | 4 +- drivers/gpio/mpc8xxx_gpio.c | 4 +- drivers/gpio/mt7621_gpio.c | 20 ++++---- drivers/gpio/mxs_gpio.c | 8 +-- drivers/gpio/nx_gpio.c | 30 +++++------ drivers/gpio/omap_gpio.c | 8 +-- drivers/gpio/pcf8575_gpio.c | 4 +- drivers/gpio/s5p_gpio.c | 8 +-- drivers/gpio/sifive-gpio.c | 16 +++--- drivers/gpio/sunxi_gpio.c | 18 +++---- drivers/gpio/tegra186_gpio.c | 10 ++-- drivers/gpio/tegra_gpio.c | 8 +-- drivers/gpio/vybrid_gpio.c | 10 ++-- drivers/gpio/xilinx_gpio.c | 22 ++++---- drivers/gpio/zynq_gpio.c | 22 ++++---- drivers/i2c/i2c-emul-uclass.c | 12 ++--- drivers/i2c/omap24xx_i2c.c | 6 +-- drivers/led/led_cortina.c | 8 +-- drivers/misc/altera_sysid.c | 8 +-- drivers/misc/fs_loader.c | 8 +-- drivers/misc/microchip_flexcom.c | 6 +-- drivers/misc/p2sb-uclass.c | 10 ++-- drivers/misc/p2sb_emul.c | 14 +++--- drivers/misc/rockchip-efuse.c | 8 +-- drivers/misc/rockchip-otp.c | 12 ++--- drivers/misc/sandbox_adder.c | 2 +- drivers/misc/sifive-otp.c | 10 ++-- drivers/misc/swap_case.c | 12 ++--- drivers/mmc/meson_gx_mmc.c | 14 +++--- drivers/mmc/meson_gx_mmc.h | 2 +- drivers/mmc/mxsmmc.c | 16 +++--- drivers/mtd/altera_qspi.c | 22 ++++---- drivers/mtd/spi/sandbox.c | 2 +- drivers/net/dwmac_socfpga.c | 8 +-- drivers/net/fsl_enetc.c | 4 +- drivers/net/gmac_rockchip.c | 28 +++++------ drivers/net/rtl8169.c | 2 +- drivers/nvme/nvme.c | 2 +- drivers/pci/pci-emul-uclass.c | 2 +- drivers/pci/pci-uclass.c | 26 +++++----- drivers/pci/pci_rom.c | 8 +-- drivers/pci/pci_sandbox.c | 2 +- drivers/pci/pcie_mediatek.c | 2 +- drivers/pinctrl/intel/pinctrl.c | 2 +- drivers/pinctrl/intel/pinctrl_apl.c | 10 ++-- drivers/pinctrl/pinctrl-at91-pio4.c | 8 +-- drivers/pinctrl/pinctrl-qe-io.c | 10 ++-- drivers/pinctrl/pinctrl-sti.c | 10 ++-- drivers/pinctrl/renesas/pfc-r7s72100.c | 8 +-- drivers/power/acpi_pmc/acpi-pmc-uclass.c | 2 +- drivers/power/acpi_pmc/pmc_emul.c | 12 ++--- drivers/power/acpi_pmc/sandbox.c | 2 +- .../power/domain/imx8-power-domain-legacy.c | 14 +++--- drivers/power/domain/imx8m-power-domain.c | 8 +-- drivers/power/regulator/bd71837.c | 22 ++++---- drivers/power/regulator/fan53555.c | 10 ++-- drivers/power/regulator/fixed.c | 4 +- drivers/power/regulator/gpio-regulator.c | 16 +++--- drivers/power/regulator/pfuze100.c | 12 ++--- drivers/power/regulator/regulator_common.c | 6 +-- drivers/power/regulator/regulator_common.h | 10 ++-- drivers/ram/rockchip/dmc-rk3368.c | 4 +- drivers/ram/rockchip/sdram_rk3188.c | 9 ++-- drivers/ram/rockchip/sdram_rk322x.c | 9 ++-- drivers/ram/rockchip/sdram_rk3288.c | 9 ++-- drivers/ram/rockchip/sdram_rk3328.c | 9 ++-- drivers/ram/rockchip/sdram_rk3399.c | 9 ++-- drivers/rng/meson-rng.c | 12 ++--- drivers/rng/rockchip_rng.c | 14 +++--- drivers/rng/stm32mp1_rng.c | 16 +++--- drivers/rtc/pl031.c | 10 ++-- drivers/scsi/scsi-uclass.c | 2 +- drivers/scsi/scsi.c | 6 +-- drivers/serial/altera_jtag_uart.c | 14 +++--- drivers/serial/altera_uart.c | 14 +++--- drivers/serial/atmel_usart.c | 4 +- drivers/serial/lpc32xx_hsuart.c | 2 +- drivers/serial/ns16550.c | 26 +++++----- drivers/serial/sandbox.c | 12 ++--- drivers/serial/serial_arc.c | 14 +++--- drivers/serial/serial_bcm283x_mu.c | 6 +-- drivers/serial/serial_bcm283x_pl011.c | 4 +- drivers/serial/serial_coreboot.c | 4 +- drivers/serial/serial_intel_mid.c | 6 +-- drivers/serial/serial_linflexuart.c | 4 +- drivers/serial/serial_lpuart.c | 38 +++++++------- drivers/serial/serial_mcf.c | 14 +++--- drivers/serial/serial_meson.c | 16 +++--- drivers/serial/serial_mvebu_a3700.c | 16 +++--- drivers/serial/serial_mxc.c | 14 +++--- drivers/serial/serial_omap.c | 4 +- drivers/serial/serial_pl01x.c | 8 +-- drivers/serial/serial_pxa.c | 10 ++-- drivers/serial/serial_rockchip.c | 14 +++--- drivers/serial/serial_s5p.c | 16 +++--- drivers/serial/serial_sh.c | 8 +-- drivers/serial/serial_sifive.c | 16 +++--- drivers/serial/serial_stm32.c | 16 +++--- drivers/serial/serial_stm32.h | 2 +- drivers/serial/serial_xuartlite.c | 14 +++--- drivers/serial/serial_zynq.c | 16 +++--- drivers/soc/soc_ti_k3.c | 10 ++-- drivers/sound/ivybridge_sound.c | 2 +- drivers/spi/altera_spi.c | 10 ++-- drivers/spi/atcspi200_spi.c | 2 +- drivers/spi/ath79_spi.c | 2 +- drivers/spi/atmel_spi.c | 18 +++---- drivers/spi/bcm63xx_hsspi.c | 6 +-- drivers/spi/bcm63xx_spi.c | 4 +- drivers/spi/bcmstb_spi.c | 8 +-- drivers/spi/cadence_qspi.c | 14 +++--- drivers/spi/cadence_qspi.h | 12 ++--- drivers/spi/cadence_qspi_apb.c | 18 +++---- drivers/spi/cf_spi.c | 12 ++--- drivers/spi/davinci_spi.c | 10 ++-- drivers/spi/designware_spi.c | 10 ++-- drivers/spi/exynos_spi.c | 14 +++--- drivers/spi/fsl_dspi.c | 20 ++++---- drivers/spi/fsl_espi.c | 8 +-- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/ich.c | 28 +++++------ drivers/spi/kirkwood_spi.c | 18 +++---- drivers/spi/mpc8xxx_spi.c | 6 +-- drivers/spi/mscc_bb_spi.c | 2 +- drivers/spi/mvebu_a3700_spi.c | 20 ++++---- drivers/spi/mxc_spi.c | 6 +-- drivers/spi/mxs_spi.c | 8 +-- drivers/spi/nxp_fspi.c | 2 +- drivers/spi/octeon_spi.c | 2 +- drivers/spi/omap3_spi.c | 4 +- drivers/spi/pic32_spi.c | 2 +- drivers/spi/renesas_rpc_spi.c | 8 +-- drivers/spi/rk_spi.c | 20 ++++---- drivers/spi/soft_spi.c | 18 +++---- drivers/spi/spi-qup.c | 2 +- drivers/spi/spi-sifive.c | 8 +-- drivers/spi/spi-sunxi.c | 12 ++--- drivers/spi/spi-uclass.c | 15 +++--- drivers/spi/stm32_qspi.c | 2 +- drivers/spi/stm32_spi.c | 2 +- drivers/spi/tegra114_spi.c | 12 ++--- drivers/spi/tegra20_sflash.c | 12 ++--- drivers/spi/tegra20_slink.c | 12 ++--- drivers/spi/tegra210_qspi.c | 12 ++--- drivers/spi/tegra_spi.h | 2 +- drivers/spi/ti_qspi.c | 8 +-- drivers/spi/uniphier_spi.c | 14 +++--- drivers/spi/xilinx_spi.c | 4 +- drivers/spi/zynq_qspi.c | 12 ++--- drivers/spi/zynq_spi.c | 16 +++--- drivers/spi/zynqmp_gqspi.c | 12 ++--- drivers/sysreset/sysreset_x86.c | 8 +-- drivers/timer/ag101p_timer.c | 10 ++-- drivers/timer/altera_timer.c | 10 ++-- drivers/timer/atcpit100_timer.c | 10 ++-- drivers/timer/atmel_pit_timer.c | 10 ++-- drivers/timer/timer-uclass.c | 2 +- drivers/ufs/ufs.c | 2 +- drivers/usb/emul/sandbox_hub.c | 12 ++--- drivers/usb/emul/usb-emul-uclass.c | 16 +++--- drivers/usb/gadget/max3420_udc.c | 2 +- drivers/usb/host/dwc3-sti-glue.c | 18 +++---- drivers/usb/host/ehci-atmel.c | 2 +- drivers/usb/host/ehci-exynos.c | 10 ++-- drivers/usb/host/ehci-fsl.c | 2 +- drivers/usb/host/ehci-marvell.c | 2 +- drivers/usb/host/ehci-msm.c | 4 +- drivers/usb/host/ehci-mx5.c | 6 +-- drivers/usb/host/ehci-mx6.c | 8 +-- drivers/usb/host/ehci-omap.c | 6 +-- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ehci-tegra.c | 4 +- drivers/usb/host/ehci-vf.c | 4 +- drivers/usb/host/ehci-zynq.c | 4 +- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/usb-uclass.c | 14 +++--- drivers/usb/host/xhci-brcm.c | 8 +-- drivers/usb/host/xhci-dwc3.c | 8 +-- drivers/usb/host/xhci-exynos5.c | 10 ++-- drivers/usb/host/xhci-fsl.c | 2 +- drivers/usb/host/xhci-mvebu.c | 10 ++-- drivers/usb/host/xhci-pci.c | 2 +- drivers/usb/host/xhci-rcar.c | 12 ++--- drivers/usb/musb-new/da8xx.c | 8 +-- drivers/usb/musb-new/mt85xx.c | 2 +- drivers/usb/musb-new/omap2430.c | 8 +-- drivers/usb/musb-new/pic32.c | 2 +- drivers/usb/musb-new/sunxi.c | 2 +- drivers/usb/musb-new/ti-musb.c | 16 +++--- drivers/video/am335x-fb.c | 6 +-- drivers/video/atmel_hlcdfb.c | 4 +- drivers/video/atmel_lcdfb.c | 8 +-- drivers/video/bcm2835.c | 2 +- drivers/video/broadwell_igd.c | 4 +- drivers/video/coreboot.c | 2 +- drivers/video/efi.c | 2 +- drivers/video/exynos/exynos_fb.c | 4 +- drivers/video/fsl_dcu_fb.c | 4 +- drivers/video/imx/mxc_ipuv3_fb.c | 6 +-- drivers/video/ivybridge_igd.c | 4 +- drivers/video/mali_dp.c | 4 +- drivers/video/meson/meson_plane.c | 2 +- drivers/video/meson/meson_vpu.c | 4 +- drivers/video/mvebu_lcd.c | 4 +- drivers/video/mxsfb.c | 6 +-- drivers/video/nexell_display.c | 18 +++---- drivers/video/rockchip/rk_vop.c | 4 +- drivers/video/sandbox_sdl.c | 4 +- drivers/video/simplefb.c | 2 +- drivers/video/stm32/stm32_ltdc.c | 4 +- drivers/video/sunxi/sunxi_de2.c | 6 +-- drivers/video/tegra.c | 4 +- drivers/video/tegra124/display.c | 4 +- drivers/video/vesa.c | 4 +- drivers/video/video-uclass.c | 8 +-- drivers/virtio/virtio_pci_legacy.c | 2 +- drivers/virtio/virtio_pci_modern.c | 2 +- drivers/watchdog/xilinx_tb_wdt.c | 12 ++--- drivers/watchdog/xilinx_wwdt.c | 8 +-- drivers/xen/pvblock.c | 8 +-- include/atmel_lcd.h | 4 +- include/cpu.h | 4 +- include/dm/platform_data/fsl_espi.h | 2 +- include/dm/platform_data/lpc32xx_hsuart.h | 4 +- include/dm/platform_data/pxa_mmc_gen.h | 2 +- include/dm/platform_data/serial_bcm283x_mu.h | 2 +- include/dm/platform_data/serial_coldfire.h | 4 +- include/dm/platform_data/serial_mxc.h | 2 +- include/dm/platform_data/serial_pl01x.h | 2 +- include/dm/platform_data/serial_pxa.h | 4 +- include/dm/platform_data/serial_sh.h | 2 +- include/dm/platform_data/spi_coldfire.h | 4 +- include/dm/platform_data/spi_davinci.h | 2 +- include/dm/root.h | 4 +- include/fs_loader.h | 2 +- include/ns16550.h | 6 +-- include/p2sb.h | 4 +- include/pci.h | 4 +- include/power/acpi_pmc.h | 2 +- include/regmap.h | 6 +-- include/scsi.h | 4 +- include/spi.h | 7 ++- include/syscon.h | 2 +- include/usb.h | 12 ++--- include/vbe.h | 4 +- include/video.h | 6 +-- lib/acpi/acpi_device.c | 2 +- lib/efi_driver/efi_block_device.c | 10 ++-- lib/smbios.c | 2 +- test/dm/acpi.c | 10 ++-- test/dm/core.c | 8 +-- test/dm/of_platdata.c | 20 ++++---- test/dm/test-main.c | 4 +- 358 files changed, 1404 insertions(+), 1411 deletions(-)

diff --git a/arch/arm/include/asm/arch-hi6220/gpio.h b/arch/arm/include/asm/arch-hi6220/gpio.h index c5ee359a3a1..12717a96aab 100644 --- a/arch/arm/include/asm/arch-hi6220/gpio.h +++ b/arch/arm/include/asm/arch-hi6220/gpio.h @@ -18,7 +18,7 @@ struct gpio_bank { };

/* Information about a GPIO bank */ -struct hikey_gpio_platdata { +struct hikey_gpio_plat { int bank_index; ulong base; /* address of registers in physical memory */ }; diff --git a/arch/arm/include/asm/arch-imx8/power-domain.h b/arch/arm/include/asm/arch-imx8/power-domain.h index 1396008877c..1db86a1209b 100644 --- a/arch/arm/include/asm/arch-imx8/power-domain.h +++ b/arch/arm/include/asm/arch-imx8/power-domain.h @@ -8,7 +8,7 @@

#include <asm/arch/sci/types.h>

-struct imx8_power_domain_platdata { +struct imx8_power_domain_plat { sc_rsrc_t resource_id; };

diff --git a/arch/arm/include/asm/arch-imx8m/power-domain.h b/arch/arm/include/asm/arch-imx8m/power-domain.h index 0f94945894e..7a833e564b5 100644 --- a/arch/arm/include/asm/arch-imx8m/power-domain.h +++ b/arch/arm/include/asm/arch-imx8m/power-domain.h @@ -6,7 +6,7 @@ #ifndef _ASM_ARCH_IMX8M_POWER_DOMAIN_H #define _ASM_ARCH_IMX8M_POWER_DOMAIN_H

-struct imx8m_power_domain_platdata { +struct imx8m_power_domain_plat { int resource_id; int has_pd; struct power_domain pd; diff --git a/arch/arm/include/asm/arch-vf610/gpio.h b/arch/arm/include/asm/arch-vf610/gpio.h index 9bfdf168730..0b9e10f51e0 100644 --- a/arch/arm/include/asm/arch-vf610/gpio.h +++ b/arch/arm/include/asm/arch-vf610/gpio.h @@ -20,7 +20,7 @@ struct vybrid_gpio_regs { u32 gpio_pdir; };

-struct vybrid_gpio_platdata { +struct vybrid_gpio_plat { unsigned int chip; u32 base; const char *port_name; diff --git a/arch/arm/include/asm/omap_gpio.h b/arch/arm/include/asm/omap_gpio.h index 151afa8f44c..40842100215 100644 --- a/arch/arm/include/asm/omap_gpio.h +++ b/arch/arm/include/asm/omap_gpio.h @@ -25,7 +25,7 @@ #if CONFIG_IS_ENABLED(DM_GPIO)

/* Information about a GPIO bank */ -struct omap_gpio_platdata { +struct omap_gpio_plat { int bank_index; ulong base; /* address of registers in physical memory */ const char *port_name; diff --git a/arch/arm/include/asm/omap_i2c.h b/arch/arm/include/asm/omap_i2c.h index a6975401dab..ec7a145f179 100644 --- a/arch/arm/include/asm/omap_i2c.h +++ b/arch/arm/include/asm/omap_i2c.h @@ -6,7 +6,7 @@ #ifdef CONFIG_DM_I2C

/* Information about a GPIO bank */ -struct omap_i2c_platdata { +struct omap_i2c_plat { ulong base; /* address of registers in physical memory */ int speed; int ip_rev; diff --git a/arch/arm/include/asm/omap_musb.h b/arch/arm/include/asm/omap_musb.h index b40ea005bec..614c93def86 100644 --- a/arch/arm/include/asm/omap_musb.h +++ b/arch/arm/include/asm/omap_musb.h @@ -23,7 +23,7 @@ struct omap_musb_board_data {

enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI};

-struct ti_musb_platdata { +struct ti_musb_plat { void *base; void *ctrl_mod_base; struct musb_hdrc_platform_data plat; diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c index 8122d2f98e4..9d787197f35 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c @@ -213,7 +213,7 @@ void at91_sdram_hw_init(void) }

/* Platform data for the GPIOs */ -static const struct at91_port_platdata at91sam9260_plat[] = { +static const struct at91_port_plat at91sam9260_plat[] = { { ATMEL_BASE_PIOA, "PA" }, { ATMEL_BASE_PIOB, "PB" }, { ATMEL_BASE_PIOC, "PC" }, diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c index 08ca3edd782..f503553b926 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c @@ -167,7 +167,7 @@ void at91_mci_hw_init(void) #endif

/* Platform data for the GPIOs */ -static const struct at91_port_platdata at91sam9260_plat[] = { +static const struct at91_port_plat at91sam9260_plat[] = { { ATMEL_BASE_PIOA, "PA" }, { ATMEL_BASE_PIOB, "PB" }, { ATMEL_BASE_PIOC, "PC" }, diff --git a/arch/arm/mach-at91/include/mach/atmel_serial.h b/arch/arm/mach-at91/include/mach/atmel_serial.h index c53a509ff8b..5d142693640 100644 --- a/arch/arm/mach-at91/include/mach/atmel_serial.h +++ b/arch/arm/mach-at91/include/mach/atmel_serial.h @@ -7,7 +7,7 @@ #define _ATMEL_SERIAL_H

/* Information about a serial port */ -struct atmel_serial_platdata { +struct atmel_serial_plat { uint32_t base_addr; };

diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index 575c6436ad3..c1aef798b17 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -253,7 +253,7 @@ static inline unsigned at91_gpio_to_pin(unsigned gpio) }

/* Platform data for each GPIO port */ -struct at91_port_platdata { +struct at91_port_plat { uint32_t base_addr; const char *bank_name; }; diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h index 3263de9a352..4aeb48eeb20 100644 --- a/arch/arm/mach-bcm283x/include/mach/gpio.h +++ b/arch/arm/mach-bcm283x/include/mach/gpio.h @@ -52,11 +52,11 @@ struct bcm2835_gpio_regs { };

/** - * struct bcm2835_gpio_platdata - GPIO platform description + * struct bcm2835_gpio_plat - GPIO platform description * * @base: Base address of GPIO controller */ -struct bcm2835_gpio_platdata { +struct bcm2835_gpio_plat { unsigned long base; };

diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c index 7e7646a2e15..04e026a8b77 100644 --- a/arch/arm/mach-lpc32xx/devices.c +++ b/arch/arm/mach-lpc32xx/devices.c @@ -43,7 +43,7 @@ void lpc32xx_uart_init(unsigned int uart_id) }

#if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct ns16550_platdata lpc32xx_uart[] = { +static const struct ns16550_plat lpc32xx_uart[] = { { .base = UART3_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, }, { .base = UART4_BASE, .reg_shift = 2, @@ -55,7 +55,7 @@ static const struct ns16550_platdata lpc32xx_uart[] = { };

#if defined(CONFIG_LPC32XX_HSUART) -static const struct lpc32xx_hsuart_platdata lpc32xx_hsuart[] = { +static const struct lpc32xx_hsuart_plat lpc32xx_hsuart[] = { { HS_UART1_BASE, }, { HS_UART2_BASE, }, { HS_UART7_BASE, }, diff --git a/arch/arm/mach-nexell/include/mach/display.h b/arch/arm/mach-nexell/include/mach/display.h index b167e63a5a4..b0ee9126057 100644 --- a/arch/arm/mach-nexell/include/mach/display.h +++ b/arch/arm/mach-nexell/include/mach/display.h @@ -212,7 +212,7 @@ struct dp_hdmi_dev { };

/* platform data for the driver model */ -struct nx_display_platdata { +struct nx_display_plat { int module; struct dp_sync_info sync; struct dp_ctrl_info ctrl; @@ -267,7 +267,7 @@ int dp_plane_wait_vsync(int module, int layer, int fps);

#if defined CONFIG_SPL_BUILD || \ (!defined(CONFIG_DM) && !defined(CONFIG_OF_CONTROL)) -int nx_display_probe(struct nx_display_platdata *plat); +int nx_display_probe(struct nx_display_plat *plat); #endif

#endif diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 4335ee84ec8..b5f2b75e244 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -80,7 +80,7 @@ int dram_init_banksize(void) }

#if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct ns16550_platdata am33xx_serial[] = { +static const struct ns16550_plat am33xx_serial[] = { { .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, }, # ifdef CONFIG_SYS_NS16550_COM2 @@ -113,7 +113,7 @@ U_BOOT_DEVICES(am33xx_uarts) = { };

#ifdef CONFIG_DM_I2C -static const struct omap_i2c_platdata am33xx_i2c[] = { +static const struct omap_i2c_plat am33xx_i2c[] = { { I2C_BASE1, 100000, OMAP_I2C_REV_V2}, { I2C_BASE2, 100000, OMAP_I2C_REV_V2}, { I2C_BASE3, 100000, OMAP_I2C_REV_V2}, @@ -127,7 +127,7 @@ U_BOOT_DEVICES(am33xx_i2c) = { #endif

#if CONFIG_IS_ENABLED(DM_GPIO) -static const struct omap_gpio_platdata am33xx_gpio[] = { +static const struct omap_gpio_plat am33xx_gpio[] = { { 0, AM33XX_GPIO0_BASE }, { 1, AM33XX_GPIO1_BASE }, { 2, AM33XX_GPIO2_BASE }, @@ -214,7 +214,7 @@ static struct musb_hdrc_config musb_config = { };

#if CONFIG_IS_ENABLED(DM_USB) && !CONFIG_IS_ENABLED(OF_CONTROL) -static struct ti_musb_platdata usb0 = { +static struct ti_musb_plat usb0 = { .base = (void *)USB0_OTG_BASE, .ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl0, .plat = { @@ -224,7 +224,7 @@ static struct ti_musb_platdata usb0 = { }, };

-static struct ti_musb_platdata usb1 = { +static struct ti_musb_plat usb1 = { .base = (void *)USB1_OTG_BASE, .ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl1, .plat = { diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index f08c8ab43a0..6ffedd1769f 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -38,7 +38,7 @@ static void omap3_invalidate_l2_cache_secure(void); #if CONFIG_IS_ENABLED(DM_GPIO) #if !CONFIG_IS_ENABLED(OF_CONTROL) /* Manually initialize GPIO banks when OF_CONTROL doesn't */ -static const struct omap_gpio_platdata omap34xx_gpio[] = { +static const struct omap_gpio_plat omap34xx_gpio[] = { { 0, OMAP34XX_GPIO1_BASE }, { 1, OMAP34XX_GPIO2_BASE }, { 2, OMAP34XX_GPIO3_BASE }, diff --git a/arch/arm/mach-rockchip/px30/syscon_px30.c b/arch/arm/mach-rockchip/px30/syscon_px30.c index 4672bdbf009..37e88f5ccb9 100644 --- a/arch/arm/mach-rockchip/px30/syscon_px30.c +++ b/arch/arm/mach-rockchip/px30/syscon_px30.c @@ -23,7 +23,7 @@ U_BOOT_DRIVER(syscon_px30) = { };

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int px30_syscon_bind_of_platdata(struct udevice *dev) +static int px30_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -35,20 +35,20 @@ U_BOOT_DRIVER(rockchip_px30_pmu) = { .name = "rockchip_px30_pmu", .id = UCLASS_SYSCON, .of_match = px30_syscon_ids, - .bind = px30_syscon_bind_of_platdata, + .bind = px30_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_px30_pmugrf) = { .name = "rockchip_px30_pmugrf", .id = UCLASS_SYSCON, .of_match = px30_syscon_ids + 1, - .bind = px30_syscon_bind_of_platdata, + .bind = px30_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_px30_grf) = { .name = "rockchip_px30_grf", .id = UCLASS_SYSCON, .of_match = px30_syscon_ids + 2, - .bind = px30_syscon_bind_of_platdata, + .bind = px30_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c index ea7d7b5b1ac..917ff37c0fc 100644 --- a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c @@ -24,7 +24,7 @@ U_BOOT_DRIVER(syscon_rk3188) = { };

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3188_syscon_bind_of_platdata(struct udevice *dev) +static int rk3188_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -36,20 +36,20 @@ U_BOOT_DRIVER(rockchip_rk3188_noc) = { .name = "rockchip_rk3188_noc", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids, - .bind = rk3188_syscon_bind_of_platdata, + .bind = rk3188_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3188_grf) = { .name = "rockchip_rk3188_grf", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids + 1, - .bind = rk3188_syscon_bind_of_platdata, + .bind = rk3188_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3188_pmu) = { .name = "rockchip_rk3188_pmu", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids + 2, - .bind = rk3188_syscon_bind_of_platdata, + .bind = rk3188_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c index e3da0a01947..9c1ae880c74 100644 --- a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c @@ -25,7 +25,7 @@ U_BOOT_DRIVER(syscon_rk3288) = { };

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3288_syscon_bind_of_platdata(struct udevice *dev) +static int rk3288_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -37,27 +37,27 @@ U_BOOT_DRIVER(rockchip_rk3288_noc) = { .name = "rockchip_rk3288_noc", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3288_grf) = { .name = "rockchip_rk3288_grf", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids + 1, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3288_sgrf) = { .name = "rockchip_rk3288_sgrf", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids + 2, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3288_pmu) = { .name = "rockchip_rk3288_pmu", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids + 3, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c index cba0dda3e80..dc2d831dd84 100644 --- a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c @@ -30,7 +30,7 @@ U_BOOT_DRIVER(syscon_rk3368) = { };

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3368_syscon_bind_of_platdata(struct udevice *dev) +static int rk3368_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -42,27 +42,27 @@ U_BOOT_DRIVER(rockchip_rk3368_grf) = { .name = "rockchip_rk3368_grf", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3368_pmugrf) = { .name = "rockchip_rk3368_pmugrf", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids + 1, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3368_msch) = { .name = "rockchip_rk3368_msch", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids + 2, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3368_sgrf) = { .name = "rockchip_rk3368_sgrf", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids + 3, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c index 690cbe7f278..b360ca7ddef 100644 --- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c @@ -28,7 +28,7 @@ U_BOOT_DRIVER(syscon_rk3399) = { };

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3399_syscon_bind_of_platdata(struct udevice *dev) +static int rk3399_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -40,34 +40,34 @@ U_BOOT_DRIVER(rockchip_rk3399_grf) = { .name = "rockchip_rk3399_grf", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3399_pmugrf) = { .name = "rockchip_rk3399_pmugrf", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 1, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3399_pmusgrf) = { .name = "rockchip_rk3399_pmusgrf", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 2, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3399_cic) = { .name = "rockchip_rk3399_cic", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 3, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, };

U_BOOT_DRIVER(rockchip_rk3399_pmu) = { .name = "rockchip_rk3399_pmu", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 4, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index 3e9c1f3b33c..85a9e6f84e7 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -280,13 +280,13 @@ static int bsec_program_otp(long base, u32 val, u32 otp) }

/* BSEC MISC driver *******************************************************/ -struct stm32mp_bsec_platdata { +struct stm32mp_bsec_plat { u32 base; };

static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; u32 tmp_data = 0; int ret;

@@ -319,7 +319,7 @@ static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp)

static int stm32mp_bsec_read_shadow(struct udevice *dev, u32 *val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat;

if (IS_ENABLED(CONFIG_TFABOOT)) return stm32_smc(STM32_SMC_BSEC, @@ -333,7 +333,7 @@ static int stm32mp_bsec_read_shadow(struct udevice *dev, u32 *val, u32 otp)

static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp) { - struct stm32mp_bsec_platdata *plat = dev_get_plat(dev); + struct stm32mp_bsec_plat *plat = dev_get_plat(dev);

/* return OTP permanent write lock status */ *val = bsec_read_lock(plat->base + BSEC_WRLOCK_OFF, otp); @@ -343,7 +343,7 @@ static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp)

static int stm32mp_bsec_write_otp(struct udevice *dev, u32 val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat;

if (IS_ENABLED(CONFIG_TFABOOT)) return stm32_smc_exec(STM32_SMC_BSEC, @@ -358,7 +358,7 @@ static int stm32mp_bsec_write_otp(struct udevice *dev, u32 val, u32 otp)

static int stm32mp_bsec_write_shadow(struct udevice *dev, u32 val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat;

if (IS_ENABLED(CONFIG_TFABOOT)) return stm32_smc_exec(STM32_SMC_BSEC, @@ -475,7 +475,7 @@ static const struct misc_ops stm32mp_bsec_ops = {

static int stm32mp_bsec_of_to_plat(struct udevice *dev) { - struct stm32mp_bsec_platdata *plat = dev_get_plat(dev); + struct stm32mp_bsec_plat *plat = dev_get_plat(dev);

plat->base = (u32)dev_read_addr_ptr(dev);

@@ -485,7 +485,7 @@ static int stm32mp_bsec_of_to_plat(struct udevice *dev) static int stm32mp_bsec_probe(struct udevice *dev) { int otp; - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat;

/* * update unlocked shadow for OTP cleared by the rom code @@ -513,7 +513,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = { .id = UCLASS_MISC, .of_match = stm32mp_bsec_ids, .of_to_plat = stm32mp_bsec_of_to_plat, - .plat_auto = sizeof(struct stm32mp_bsec_platdata), + .plat_auto = sizeof(struct stm32mp_bsec_plat), .ops = &stm32mp_bsec_ops, .probe = stm32mp_bsec_probe, }; @@ -521,7 +521,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = { bool bsec_dbgswenable(void) { struct udevice *dev; - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; int ret;

ret = uclass_get_device_by_driver(UCLASS_MISC, diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index 03faacbd577..bf01aa5ee8f 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -257,7 +257,7 @@ void board_init_uart_f(void) }

#if !CONFIG_IS_ENABLED(OF_CONTROL) -static struct ns16550_platdata ns16550_com1_pdata = { +static struct ns16550_plat ns16550_com1_pdata = { .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK, diff --git a/arch/riscv/include/asm/arch-fu540/gpio.h b/arch/riscv/include/asm/arch-fu540/gpio.h index 0d16c59ca68..b87282b974c 100644 --- a/arch/riscv/include/asm/arch-fu540/gpio.h +++ b/arch/riscv/include/asm/arch-fu540/gpio.h @@ -28,7 +28,7 @@ enum gpio_state { };

/* Details about a GPIO bank */ -struct sifive_gpio_platdata { +struct sifive_gpio_plat { void *base; /* address of registers in physical memory */ };

diff --git a/arch/riscv/include/asm/arch-generic/gpio.h b/arch/riscv/include/asm/arch-generic/gpio.h index dfcb753051d..b1f403027db 100644 --- a/arch/riscv/include/asm/arch-generic/gpio.h +++ b/arch/riscv/include/asm/arch-generic/gpio.h @@ -28,7 +28,7 @@ enum gpio_state { };

/* Details about a GPIO bank */ -struct sifive_gpio_platdata { +struct sifive_gpio_plat { void *base; /* address of registers in physical memory */ };

diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c index 16f90a484d0..e4674f3788a 100644 --- a/arch/x86/cpu/apollolake/hostbridge.c +++ b/arch/x86/cpu/apollolake/hostbridge.c @@ -42,7 +42,7 @@ enum { };

/** - * struct apl_hostbridge_platdata - platform data for hostbridge + * struct apl_hostbridge_plat - platform data for hostbridge * * @dtplat: Platform data for of-platdata * @early_pads: Early pad data to set up, each (pad, cfg0, cfg1) @@ -50,7 +50,7 @@ enum { * @pciex_region_size: BAR length in bytes * @bdf: Bus/device/function of hostbridge */ -struct apl_hostbridge_platdata { +struct apl_hostbridge_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_apl_hostbridge dtplat; #endif @@ -158,7 +158,7 @@ static const struct nhlt_endp_descriptor dmic_4ch_descriptors[] = {

static int apl_hostbridge_early_init_pinctrl(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_plat(dev); + struct apl_hostbridge_plat *plat = dev_get_plat(dev); struct udevice *pinctrl; int ret;

@@ -172,7 +172,7 @@ static int apl_hostbridge_early_init_pinctrl(struct udevice *dev)

static int apl_hostbridge_early_init(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_plat(dev); + struct apl_hostbridge_plat *plat = dev_get_plat(dev); u32 region_size; ulong base; u32 reg; @@ -223,7 +223,7 @@ static int apl_hostbridge_early_init(struct udevice *dev)

static int apl_hostbridge_of_to_plat(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_plat(dev); + struct apl_hostbridge_plat *plat = dev_get_plat(dev); struct udevice *pinctrl; int ret;

@@ -403,7 +403,7 @@ U_BOOT_DRIVER(intel_apl_hostbridge) = { .of_to_plat = apl_hostbridge_of_to_plat, .probe = apl_hostbridge_probe, .remove = apl_hostbridge_remove, - .plat_auto = sizeof(struct apl_hostbridge_platdata), + .plat_auto = sizeof(struct apl_hostbridge_plat), ACPI_OPS_PTR(&apl_hostbridge_acpi_ops) .flags = DM_FLAG_OS_PREPARE, }; diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index 931f3399cbf..290b2cb3e71 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -53,7 +53,7 @@ enum { CF9_GLB_RST = 1 << 20, };

-struct apl_pmc_platdata { +struct apl_pmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_apl_pmc dtplat; #endif @@ -108,10 +108,10 @@ static int apl_global_reset_set_enable(struct udevice *dev, bool enable) return 0; }

-int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) +int apl_pmc_ofdata_to_uc_plat(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); - struct apl_pmc_platdata *plat = dev_get_plat(dev); + struct apl_pmc_plat *plat = dev_get_plat(dev);

#if !CONFIG_IS_ENABLED(OF_PLATDATA) u32 base[6]; @@ -144,7 +144,7 @@ int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) if (ret) return log_msg_ret("Bad gpe0-dw", ret);

- return pmc_ofdata_to_uc_platdata(dev); + return pmc_ofdata_to_uc_plat(dev); #else struct dtd_intel_apl_pmc *dtplat = &plat->dtplat;

@@ -169,7 +169,7 @@ int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) static int enable_pmcbar(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); - struct apl_pmc_platdata *priv = dev_get_plat(dev); + struct apl_pmc_plat *priv = dev_get_plat(dev); pci_dev_t pmc = priv->bdf;

/* @@ -221,8 +221,8 @@ U_BOOT_DRIVER(intel_apl_pmc) = { .name = "intel_apl_pmc", .id = UCLASS_ACPI_PMC, .of_match = apl_pmc_ids, - .of_to_plat = apl_pmc_ofdata_to_uc_platdata, + .of_to_plat = apl_pmc_ofdata_to_uc_plat, .probe = apl_pmc_probe, .ops = &apl_pmc_ops, - .plat_auto = sizeof(struct apl_pmc_platdata), + .plat_auto = sizeof(struct apl_pmc_plat), }; diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index 4110619a77e..3a1588bbd8b 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -92,7 +92,7 @@ static int apl_flash_bind(struct udevice *dev) { if (CONFIG_IS_ENABLED(OF_PLATDATA) && !CONFIG_IS_ENABLED(OF_PLATDATA_PARENT)) { - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat; struct udevice *spi; int ret;

diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c index b70299b1dd4..26aef655bef 100644 --- a/arch/x86/cpu/apollolake/uart.c +++ b/arch/x86/cpu/apollolake/uart.c @@ -68,7 +68,7 @@ void apl_uart_init(pci_dev_t bdf, ulong base) * This driver uses its own compatible string but almost everything else from * the standard ns16550 driver. This allows us to provide an of-platdata * implementation, since the platdata produced by of-platdata does not match - * struct ns16550_platdata. + * struct ns16550_plat. * * When running with of-platdata (generally TPL), the platdata is converted to * something that ns16550 expects. When running withoutof-platdata (SPL, U-Boot @@ -77,7 +77,7 @@ void apl_uart_init(pci_dev_t bdf, ulong base)

static int apl_ns16550_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_plat(dev); + struct ns16550_plat *plat = dev_get_plat(dev);

if (!CONFIG_IS_ENABLED(PCI)) apl_uart_init(plat->bdf, plat->base); @@ -89,7 +89,7 @@ static int apl_ns16550_of_to_plat(struct udevice *dev) { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_apl_ns16550 *dtplat = dev_get_plat(dev); - struct ns16550_platdata *plat; + struct ns16550_plat *plat;

/* * Convert our plat to the ns16550's plat, so we can just use @@ -126,7 +126,7 @@ U_BOOT_DRIVER(intel_apl_ns16550) = { .name = "intel_apl_ns16550", .id = UCLASS_SERIAL, .of_match = apl_ns16550_serial_ids, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .priv_auto = sizeof(struct NS16550), .ops = &ns16550_serial_ops, .of_to_plat = apl_ns16550_of_to_plat, diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index c33116a0ff0..ceb395ddcfd 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -17,7 +17,7 @@ #include <asm/arch/pch.h> #include <linux/delay.h>

-struct sata_platdata { +struct sata_plat { int port_map; uint port0_gen3_tx; uint port1_gen3_tx; @@ -41,7 +41,7 @@ struct sata_platdata {

static void broadwell_sata_init(struct udevice *dev) { - struct sata_platdata *plat = dev_get_plat(dev); + struct sata_plat *plat = dev_get_plat(dev); u32 reg32; u8 *abar; u16 reg16; @@ -211,7 +211,7 @@ static void broadwell_sata_init(struct udevice *dev)

static int broadwell_sata_enable(struct udevice *dev) { - struct sata_platdata *plat = dev_get_plat(dev); + struct sata_plat *plat = dev_get_plat(dev); struct gpio_desc desc; u16 map; int ret; @@ -234,7 +234,7 @@ static int broadwell_sata_enable(struct udevice *dev)

static int broadwell_sata_of_to_plat(struct udevice *dev) { - struct sata_platdata *plat = dev_get_plat(dev); + struct sata_plat *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev);

@@ -266,5 +266,5 @@ U_BOOT_DRIVER(ahci_broadwell_drv) = { .of_match = broadwell_ahci_ids, .of_to_plat = broadwell_sata_of_to_plat, .probe = broadwell_sata_probe, - .plat_auto = sizeof(struct sata_platdata), + .plat_auto = sizeof(struct sata_plat), }; diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index 57441c1919b..bfb511a5101 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR;

int cpu_x86_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); struct cpuid_result res;

plat->cpu_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c index b9ea968a96d..e71ea029e51 100644 --- a/arch/x86/cpu/intel_common/itss.c +++ b/arch/x86/cpu/intel_common/itss.c @@ -19,7 +19,7 @@ #include <spl.h> #include <asm/itss.h>

-struct itss_platdata { +struct itss_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) /* Put this first since driver model will copy the data here */ struct dtd_intel_itss dtplat; @@ -184,7 +184,7 @@ static int itss_of_to_plat(struct udevice *dev) int ret;

#if CONFIG_IS_ENABLED(OF_PLATDATA) - struct itss_platdata *plat = dev_get_plat(dev); + struct itss_plat *plat = dev_get_plat(dev); struct dtd_intel_itss *dtplat = &plat->dtplat;

/* @@ -242,6 +242,6 @@ U_BOOT_DRIVER(intel_itss) = { .ops = &itss_ops, .bind = itss_bind, .of_to_plat = itss_of_to_plat, - .plat_auto = sizeof(struct itss_platdata), + .plat_auto = sizeof(struct itss_plat), .priv_auto = sizeof(struct itss_priv), }; diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 098b6f00ae3..e6edab0b056 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -19,7 +19,7 @@ #define PCH_P2SB_E0 0xe0 #define HIDE_BIT BIT(0)

-struct p2sb_platdata { +struct p2sb_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_p2sb dtplat; #endif @@ -57,7 +57,7 @@ struct p2sb_platdata { */ static int p2sb_early_init(struct udevice *dev) { - struct p2sb_platdata *plat = dev_get_plat(dev); + struct p2sb_plat *plat = dev_get_plat(dev); pci_dev_t pdev = plat->bdf;

/* @@ -93,7 +93,7 @@ static int p2sb_spl_init(struct udevice *dev) int p2sb_of_to_plat(struct udevice *dev) { struct p2sb_uc_priv *upriv = dev_get_uclass_priv(dev); - struct p2sb_platdata *plat = dev_get_plat(dev); + struct p2sb_plat *plat = dev_get_plat(dev);

#if !CONFIG_IS_ENABLED(OF_PLATDATA) int ret; @@ -167,7 +167,7 @@ static int p2sb_remove(struct udevice *dev) static int p2sb_child_post_bind(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); int ret; u32 pid;

@@ -197,8 +197,8 @@ U_BOOT_DRIVER(intel_p2sb) = { .remove = p2sb_remove, .ops = &p2sb_ops, .of_to_plat = p2sb_of_to_plat, - .plat_auto = sizeof(struct p2sb_platdata), - .per_child_plat_auto = sizeof(struct p2sb_child_platdata), + .plat_auto = sizeof(struct p2sb_plat), + .per_child_plat_auto = sizeof(struct p2sb_child_plat), .child_post_bind = p2sb_child_post_bind, .flags = DM_FLAG_OS_PREPARE, }; diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index 2b0689ac6af..0e61c7b5d7f 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -221,7 +221,7 @@ static int find_cpu_by_apic_id(int apic_id, struct udevice **devp) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev);

if (plat->cpu_id == apic_id) { *devp = dev; @@ -706,7 +706,7 @@ static int ap_wait_for_instruction(struct udevice *cpu, void *unused)

static int mp_init_cpu(struct udevice *cpu, void *unused) { - struct cpu_platdata *plat = dev_get_parent_plat(cpu); + struct cpu_plat *plat = dev_get_parent_plat(cpu);

plat->ucode_version = microcode_read_rev(); plat->device_id = gd->arch.x86_device; diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c index a169783e2cf..a35de878b5d 100644 --- a/arch/x86/cpu/qfw_cpu.c +++ b/arch/x86/cpu/qfw_cpu.c @@ -18,7 +18,7 @@ int qemu_cpu_fixup(void) int cpu_num; int cpu_online; struct udevice *dev, *pdev; - struct cpu_platdata *plat; + struct cpu_plat *plat; char *cpu;

/* first we need to find '/cpus' */ diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c index a285e4d202d..5d8963220da 100644 --- a/arch/x86/cpu/slimbootloader/serial.c +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -18,7 +18,7 @@ static int slimbootloader_serial_of_to_plat(struct udevice *dev) { const efi_guid_t guid = SBL_SERIAL_PORT_INFO_GUID; struct sbl_serial_port_info *data; - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat;

if (!gd->arch.hob_list) panic("hob list not found!"); @@ -58,7 +58,7 @@ U_BOOT_DRIVER(serial_slimbootloader) = { .id = UCLASS_SERIAL, .of_match = slimbootloader_serial_ids, .of_to_plat = slimbootloader_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, diff --git a/arch/x86/include/asm/arch-broadwell/gpio.h b/arch/x86/include/asm/arch-broadwell/gpio.h index a32e2db47e1..393230e52b5 100644 --- a/arch/x86/include/asm/arch-broadwell/gpio.h +++ b/arch/x86/include/asm/arch-broadwell/gpio.h @@ -11,7 +11,7 @@ #define GPIO_PER_BANK 32 #define GPIO_BANKS 3

-struct broadwell_bank_platdata { +struct broadwell_bank_plat { uint16_t base_addr; const char *bank_name; int bank; diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h index 58e4d7b831e..a45ae3463c7 100644 --- a/arch/x86/include/asm/gpio.h +++ b/arch/x86/include/asm/gpio.h @@ -8,7 +8,7 @@

#include <asm-generic/gpio.h>

-struct ich6_bank_platdata { +struct ich6_bank_plat { uint16_t base_addr; const char *bank_name; int offset; diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 796d3689b3f..9a41ecb587d 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -74,7 +74,7 @@ int acpi_create_madt_lapics(u32 current) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); int length;

length = acpi_create_madt_lapic( diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index e4c43fb76dd..a029237d08e 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -80,7 +80,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa)

static int fsp_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct vesa_mode_info *vesa = &mode_info.vesa; int ret; @@ -124,7 +124,7 @@ err:

static int fsp_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ plat->size = 2560 * 1600 * 4; diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index d6f0e9517fa..562a27c5579 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -81,7 +81,7 @@ void mp_write_processor(struct mp_config_table *mc) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); u8 cpuflag = MPC_CPU_EN;

if (!device_active(dev)) diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c index 7de0aa0d702..85e963b634b 100644 --- a/arch/x86/lib/sfi.c +++ b/arch/x86/lib/sfi.c @@ -84,7 +84,7 @@ static int sfi_write_cpus(struct table_info *tab) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev);

if (!device_active(dev)) continue; diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 80a5f95e015..21bea62e9b7 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -32,7 +32,7 @@

DECLARE_GLOBAL_DATA_PTR;

-static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = 0x16000000, #ifdef CONFIG_ARCH_CINTEGRATOR .type = TYPE_PL011, @@ -45,7 +45,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(integrator_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, };

void peripheral_power_enable (void); diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c index 35e8743e495..6263d0c3612 100644 --- a/board/armltd/total_compute/total_compute.c +++ b/board/armltd/total_compute/total_compute.c @@ -9,7 +9,7 @@ #include <dm/platform_data/serial_pl01x.h> #include <asm/armv8/mmu.h>

-static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = UART0_BASE, .type = TYPE_PL011, .clock = CONFIG_PL011_CLOCK, @@ -17,7 +17,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(total_compute_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, };

static struct mm_region total_compute_mem_map[] = { diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 89710e0ffa8..6df6bcd3cf5 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -20,7 +20,7 @@

DECLARE_GLOBAL_DATA_PTR;

-static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = V2M_UART0, .type = TYPE_PL011, .clock = CONFIG_PL011_CLOCK, @@ -28,7 +28,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(vexpress_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, };

static struct mm_region vexpress64_mem_map[] = { diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index 6c54910861e..a71b4eb7339 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -348,7 +348,7 @@ int board_init(void)

uclass_find_first_device(UCLASS_VIDEO, &dev); if (dev) { - struct atmel_lcd_platdata *plat = dev_get_plat(dev); + struct atmel_lcd_plat *plat = dev_get_plat(dev);

plat->timing_index = 1; } @@ -416,7 +416,7 @@ void reset_phy(void) { }

-static struct atmel_serial_platdata at91sam9260_serial_plat = { +static struct atmel_serial_plat at91sam9260_serial_plat = { .base_addr = ATMEL_BASE_DBGU, };

diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c index 12fb87441e0..9e41a42263d 100644 --- a/board/bluewater/snapper9260/snapper9260.c +++ b/board/bluewater/snapper9260/snapper9260.c @@ -143,7 +143,7 @@ void reset_phy(void) { }

-static struct atmel_serial_platdata at91sam9260_serial_plat = { +static struct atmel_serial_plat at91sam9260_serial_plat = { .base_addr = ATMEL_BASE_DBGU, };

diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c index b8f060b1e8f..22c4c72361e 100644 --- a/board/cavium/thunderx/thunderx.c +++ b/board/cavium/thunderx/thunderx.c @@ -18,7 +18,7 @@ #if !CONFIG_IS_ENABLED(OF_CONTROL) #include <dm/platform_data/serial_pl01x.h>

-static const struct pl01x_serial_platdata serial0 = { +static const struct pl01x_serial_plat serial0 = { .base = CONFIG_SYS_SERIAL0, .type = TYPE_PL011, .clock = 0, @@ -30,7 +30,7 @@ U_BOOT_DEVICE(thunderx_serial0) = { .plat = &serial0, };

-static const struct pl01x_serial_platdata serial1 = { +static const struct pl01x_serial_plat serial1 = { .base = CONFIG_SYS_SERIAL1, .type = TYPE_PL011, .clock = 0, diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 6b3d0345424..bc3ce4d16c9 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -724,7 +724,7 @@ u32 get_board_rev(void) return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS); }

-static struct mxc_serial_platdata cm_fx6_mxc_serial_plat = { +static struct mxc_serial_plat cm_fx6_mxc_serial_plat = { .reg = (struct mxc_uart *)UART4_BASE, };

diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index cdfe8051e2c..a8ece170ce3 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -356,7 +356,7 @@ int board_mmc_init(struct bd_info *bis) #endif

#ifdef CONFIG_SPL_BUILD -static const struct ns16550_platdata serial_pdata = { +static const struct ns16550_plat serial_pdata = { .base = DAVINCI_UART2_BASE, .reg_shift = 2, .clock = 228000000, @@ -368,7 +368,7 @@ U_BOOT_DEVICE(omapl138_uart) = { .plat = &serial_pdata, };

-static const struct davinci_mmc_plat mmc_platdata = { +static const struct davinci_mmc_plat mmc_plat = { .reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE, .cfg = { .f_min = 200000, @@ -381,7 +381,7 @@ static const struct davinci_mmc_plat mmc_platdata = { }; U_BOOT_DEVICE(omapl138_mmc) = { .name = "ti_da830_mmc", - .plat = &mmc_platdata, + .plat = &mmc_plat, };

void spl_board_init(void) diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 457b466a0bb..8d0115eace4 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -51,7 +51,7 @@

DECLARE_GLOBAL_DATA_PTR;

-static struct pl01x_serial_platdata serial0 = { +static struct pl01x_serial_plat serial0 = { #if CONFIG_CONS_INDEX == 0 .base = CONFIG_SYS_SERIAL0, #elif CONFIG_CONS_INDEX == 1 @@ -67,7 +67,7 @@ U_BOOT_DEVICE(nxp_serial0) = { .plat = &serial0, };

-static struct pl01x_serial_platdata serial1 = { +static struct pl01x_serial_plat serial1 = { .base = CONFIG_SYS_SERIAL1, .type = TYPE_PL011, }; diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 73577d7b71d..c7224d1efe3 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1371,7 +1371,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif /* CONFIG_OF_BOARD_SETUP */

-static struct mxc_serial_platdata ventana_mxc_serial_plat = { +static struct mxc_serial_plat ventana_mxc_serial_plat = { .reg = (struct mxc_uart *)UART2_BASE, };

diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 26340da9458..0ac88306d09 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -26,7 +26,7 @@ #include <asm/armv8/mmu.h>

/*TODO drop this table in favour of device tree */ -static const struct hikey_gpio_platdata hi6220_gpio[] = { +static const struct hikey_gpio_plat hi6220_gpio[] = { { 0, HI6220_GPIO_BASE(0)}, { 1, HI6220_GPIO_BASE(1)}, { 2, HI6220_GPIO_BASE(2)}, @@ -77,7 +77,7 @@ DECLARE_GLOBAL_DATA_PTR;

#if !CONFIG_IS_ENABLED(OF_CONTROL)

-static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { #if CONFIG_CONS_INDEX == 1 .base = HI6220_UART0_BASE, #elif CONFIG_CONS_INDEX == 4 @@ -91,7 +91,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(hikey_seriala) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif

diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c index 75a5fdac5dd..04b8cde1363 100644 --- a/board/hisilicon/hikey960/hikey960.c +++ b/board/hisilicon/hikey960/hikey960.c @@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !CONFIG_IS_ENABLED(OF_CONTROL) #include <dm/platform_data/serial_pl01x.h>

-static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = HI3660_UART6_BASE, .type = TYPE_PL011, .clock = 19200000 @@ -34,7 +34,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(hikey960_serial0) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif

diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 8c8015e88b5..b8be4ce45a6 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -40,7 +40,7 @@ static struct mm_region poplar_mem_map[] = { struct mm_region *mem_map = poplar_mem_map;

#if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = REG_BASE_UART0, .type = TYPE_PL010, .clock = 75000000, @@ -48,7 +48,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(poplar_serial) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif

diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index e0ca3c2588f..6a7da502dda 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -29,7 +29,7 @@ #include <fdt_support.h> #include "igep00x0.h"

-static const struct ns16550_platdata igep_serial = { +static const struct ns16550_plat igep_serial = { .base = OMAP34XX_UART3, .reg_shift = 2, .clock = V_NS16550_CLK, diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index 372abab7e8f..d11630b9543 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -30,7 +30,7 @@ const omap3_sysinfo sysinfo = { .nand_string = "MMC" };

-static const struct ns16550_platdata serial_omap_platdata = { +static const struct ns16550_plat serial_omap_plat = { .base = OMAP34XX_UART3, .reg_shift = 2, .clock = V_NS16550_CLK, @@ -39,7 +39,7 @@ static const struct ns16550_platdata serial_omap_platdata = {

U_BOOT_DEVICE(sniper_serial) = { .name = "ns16550_serial", - .plat = &serial_omap_platdata + .plat = &serial_omap_plat };

static struct musb_hdrc_config musb_config = { diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index 3d62b5d9ad6..bafb6205bd8 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -703,7 +703,7 @@ void board_mmc_power_init(void) twl4030_power_mmc_init(1); }

-static const struct omap_i2c_platdata rx51_i2c[] = { +static const struct omap_i2c_plat rx51_i2c[] = { { I2C_BASE1, 2200000, OMAP_I2C_REV_V1 }, { I2C_BASE2, 100000, OMAP_I2C_REV_V1 }, { I2C_BASE3, 400000, OMAP_I2C_REV_V1 }, diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c index 9efae901936..1613c449294 100644 --- a/board/siemens/corvus/board.c +++ b/board/siemens/corvus/board.c @@ -314,7 +314,7 @@ void spi_cs_deactivate(struct spi_slave *slave) } }

-static struct atmel_serial_platdata at91sam9260_serial_plat = { +static struct atmel_serial_plat at91sam9260_serial_plat = { .base_addr = ATMEL_BASE_DBGU, };

diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c index 5765e42e12b..3371973600a 100644 --- a/board/st/stv0991/stv0991.c +++ b/board/st/stv0991/stv0991.c @@ -24,7 +24,7 @@ struct gpio_regs *const gpioa_regs = (struct gpio_regs *) GPIOA_BASE_ADDR;

#ifndef CONFIG_OF_CONTROL -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = 0x80406000, .type = TYPE_PL011, .clock = 2700 * 1000, @@ -32,7 +32,7 @@ static const struct pl01x_serial_platdata serial_platdata = {

U_BOOT_DEVICE(stv09911_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif

diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c index 83902061533..42e1a80ec5f 100644 --- a/board/sysam/amcore/amcore.c +++ b/board/sysam/amcore/amcore.c @@ -107,7 +107,7 @@ int dram_init(void) return 0; }

-static struct coldfire_serial_platdata mcf5307_serial_plat = { +static struct coldfire_serial_plat mcf5307_serial_plat = { .base = CONFIG_SYS_UART_BASE, .port = 0, .baudrate = CONFIG_BAUDRATE, diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 39be479d157..2aa385a937b 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -963,7 +963,7 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) #endif

#if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct omap_hsmmc_plat am335x_mmc0_platdata = { +static const struct omap_hsmmc_plat am335x_mmc0_plat = { .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE, .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT, .cfg.f_min = 400000, @@ -974,10 +974,10 @@ static const struct omap_hsmmc_plat am335x_mmc0_platdata = {

U_BOOT_DEVICE(am335x_mmc0) = { .name = "omap_hsmmc", - .plat = &am335x_mmc0_platdata, + .plat = &am335x_mmc0_plat, };

-static const struct omap_hsmmc_plat am335x_mmc1_platdata = { +static const struct omap_hsmmc_plat am335x_mmc1_plat = { .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE, .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT, .cfg.f_min = 400000, @@ -988,6 +988,6 @@ static const struct omap_hsmmc_plat am335x_mmc1_platdata = {

U_BOOT_DEVICE(am335x_mmc1) = { .name = "omap_hsmmc", - .plat = &am335x_mmc1_platdata, + .plat = &am335x_mmc1_plat, }; #endif diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 2420c28974c..875383625d4 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -47,7 +47,7 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = { 0 };

-static const struct ns16550_platdata devkit8000_serial = { +static const struct ns16550_plat devkit8000_serial = { .base = OMAP34XX_UART3, .reg_shift = 2, .clock = V_NS16550_CLK, diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index a9588c5d604..362a750b199 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -1144,7 +1144,7 @@ void reset_cpu(ulong addr)

#endif /* CONFIG_SPL_BUILD */

-static struct mxc_serial_platdata mxc_serial_plat = { +static struct mxc_serial_plat mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = true, }; diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 9e7f34907f2..056064f6b97 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -203,7 +203,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif

-static struct mxc_serial_platdata mxc_serial_plat = { +static struct mxc_serial_plat mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = 1, }; diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 282de18da3d..a82daad7395 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1086,7 +1086,7 @@ void reset_cpu(ulong addr)

#endif /* CONFIG_SPL_BUILD */

-static struct mxc_serial_platdata mxc_serial_plat = { +static struct mxc_serial_plat mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = true, }; diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index 702a31d8c12..b9d0fb98af3 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -129,18 +129,18 @@ int board_mmc_init(struct bd_info *bis) return 0; } #else /* !CONFIG_IS_ENABLED(DM_MMC) */ -static const struct pxa_mmc_plat mmc_platdata = { +static const struct pxa_mmc_plat mmc_plat = { .base = (struct pxa_mmc_regs *)MMC0_BASE, };

U_BOOT_DEVICE(pxa_mmcs) = { .name = "pxa_mmc", - .plat = &mmc_platdata, + .plat = &mmc_plat, }; #endif /* !CONFIG_IS_ENABLED(DM_MMC) */ #endif

-static const struct pxa_serial_platdata serial_platdata = { +static const struct pxa_serial_plat serial_plat = { .base = (struct pxa_uart_regs *)FFUART_BASE, .port = FFUART_INDEX, .baudrate = CONFIG_BAUDRATE, @@ -148,5 +148,5 @@ static const struct pxa_serial_platdata serial_platdata = {

U_BOOT_DEVICE(pxa_serials) = { .name = "serial_pxa", - .plat = &serial_platdata, + .plat = &serial_plat, }; diff --git a/cmd/cpu.c b/cmd/cpu.c index 07d6b094584..67dbb044b53 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -26,7 +26,7 @@ static int print_cpu_list(bool detail) for (uclass_first_device(UCLASS_CPU, &dev); dev; uclass_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); struct cpu_info info; bool first = true; int ret, i; diff --git a/cmd/pci.c b/cmd/pci.c index 6b367232b3d..e53b7c858c6 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -339,7 +339,7 @@ static void pciinfo(struct udevice *bus, bool short_listing) for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat;

pplat = dev_get_parent_plat(dev); if (short_listing) { diff --git a/cmd/regulator.c b/cmd/regulator.c index 3649719539b..60a70036d68 100644 --- a/cmd/regulator.c +++ b/cmd/regulator.c @@ -55,9 +55,9 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_SUCCESS; }

-static int curr_dev_and_platdata(struct udevice **devp, - struct dm_regulator_uclass_plat **uc_pdata, - bool allow_type_fixed) +static int curr_dev_and_plat(struct udevice **devp, + struct dm_regulator_uclass_plat **uc_pdata, + bool allow_type_fixed) { *devp = NULL; *uc_pdata = NULL; @@ -150,7 +150,7 @@ static int do_info(struct cmd_tbl *cmdtp, int flag, int argc, int ret; int i;

- ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return ret;

@@ -242,7 +242,7 @@ static int do_status(struct cmd_tbl *cmdtp, int flag, int argc, int ret;

if (currdev && (argc < 2 || strcmp(argv[1], "-a"))) { - ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return CMD_RET_FAILURE; do_status_detail(dev, uc_pdata); @@ -268,7 +268,7 @@ static int do_value(struct cmd_tbl *cmdtp, int flag, int argc, int force; int ret;

- ret = curr_dev_and_platdata(&dev, &uc_pdata, argc == 1); + ret = curr_dev_and_plat(&dev, &uc_pdata, argc == 1); if (ret) return ret;

@@ -317,7 +317,7 @@ static int do_current(struct cmd_tbl *cmdtp, int flag, int argc, int current; int ret;

- ret = curr_dev_and_platdata(&dev, &uc_pdata, argc == 1); + ret = curr_dev_and_plat(&dev, &uc_pdata, argc == 1); if (ret) return ret;

@@ -357,7 +357,7 @@ static int do_mode(struct cmd_tbl *cmdtp, int flag, int argc, int mode; int ret;

- ret = curr_dev_and_platdata(&dev, &uc_pdata, false); + ret = curr_dev_and_plat(&dev, &uc_pdata, false); if (ret) return ret;

@@ -392,7 +392,7 @@ static int do_enable(struct cmd_tbl *cmdtp, int flag, int argc, struct dm_regulator_uclass_plat *uc_pdata; int ret;

- ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return ret;

@@ -412,7 +412,7 @@ static int do_disable(struct cmd_tbl *cmdtp, int flag, int argc, struct dm_regulator_uclass_plat *uc_pdata; int ret;

- ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return ret;

diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index 9cf1668a6ad..246eb4c4955 100644 --- a/common/lcd_simplefb.c +++ b/common/lcd_simplefb.c @@ -22,7 +22,7 @@ static int lcd_dt_simplefb_configure_node(void *blob, int off) const char *name; ulong fb_base; #ifdef CONFIG_DM_VIDEO - struct video_uc_platdata *plat; + struct video_uc_plat *plat; struct video_priv *uc_priv; struct udevice *dev; int ret; diff --git a/common/usb_hub.c b/common/usb_hub.c index 80666e6496d..3d856e7de79 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -959,7 +959,7 @@ UCLASS_DRIVER(usb_hub) = { .post_probe = usb_hub_post_probe, .child_pre_probe = usb_child_pre_probe, .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), .per_device_auto = sizeof(struct usb_hub_device), };

diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst index 4436c4a2721..afa27c211cc 100644 --- a/doc/driver-model/of-plat.rst +++ b/doc/driver-model/of-plat.rst @@ -242,7 +242,7 @@ For example:

#include <dt-structs.h>

- struct mmc_platdata { + struct mmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) /* Put this first since driver model will copy the data here */ struct dtd_mmc dtplat; @@ -258,7 +258,7 @@ For example: { #if !CONFIG_IS_ENABLED(OF_PLATDATA) /* Decode the device tree data */ - struct mmc_platdata *plat = dev_get_plat(dev); + struct mmc_plat *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev);

@@ -270,7 +270,7 @@ For example:

static int mmc_probe(struct udevice *dev) { - struct mmc_platdata *plat = dev_get_plat(dev); + struct mmc_plat *plat = dev_get_plat(dev);

#if CONFIG_IS_ENABLED(OF_PLATDATA) /* Decode the of-platdata from the C structures */ @@ -294,12 +294,12 @@ For example: .of_to_plat = mmc_of_to_plat, .probe = mmc_probe, .priv_auto = sizeof(struct mmc_priv), - .plat_auto = sizeof(struct mmc_platdata), + .plat_auto = sizeof(struct mmc_plat), };

U_BOOT_DRIVER_ALIAS(mmc_drv, vendor_mmc) /* matches compatible string */

-Note that struct mmc_platdata is defined in the C file, not in a header. This +Note that struct mmc_plat is defined in the C file, not in a header. This is to avoid needing to include dt-structs.h in a header file. The idea is to keep the use of each of-platdata struct to the smallest possible code area. There is just one driver C file for each struct, that can convert from the diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst index 0770a09f0b7..f1c41671390 100644 --- a/doc/driver-model/spi-howto.rst +++ b/doc/driver-model/spi-howto.rst @@ -209,7 +209,7 @@ DM tells you. The name is not quite right. So in this case we would use:

.. code-block:: c

- struct exynos_spi_platdata { + struct exynos_spi_plat { enum periph_id periph_id; s32 frequency; /* Default clock frequency, -1 for none */ struct exynos_spi *regs; @@ -231,7 +231,7 @@ tree, but we need to tell it the size:

U_BOOT_DRIVER(spi_exynos) = { ... - .plat_auto = sizeof(struct exynos_spi_platdata), + .plat_auto = sizeof(struct exynos_spi_plat),

Here is a sample function. It gets a pointer to the platform data and @@ -241,7 +241,7 @@ fills in the fields from device tree.

static int exynos_spi_of_to_plat(struct udevice *bus) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -274,7 +274,7 @@ Specify this data in a U_BOOT_DEVICE() declaration in your board file:

.. code-block:: c

- struct exynos_spi_platdata platdata_spi0 = { + struct exynos_spi_plat platdata_spi0 = { .periph_id = ... .frequency = ... .regs = ... @@ -357,7 +357,7 @@ what you can copy out to set things up.

static int exynos_spi_probe(struct udevice *bus) { - struct exynos_spi_platdata *plat = dev_get_plat(bus); + struct exynos_spi_plat *plat = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->regs; @@ -437,7 +437,7 @@ Here is an example for the speed part:

static int exynos_spi_set_speed(struct udevice *bus, uint speed) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; struct exynos_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -585,7 +585,7 @@ The new version looks like this: static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_plat(bus); + struct exynos_spi_plat *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -657,7 +657,7 @@ A little note about SPI uclass features

The SPI uclass keeps some information about each device 'dev' on the bus:

- struct dm_spi_slave_platdata: + struct dm_spi_slave_plat: This is device_get_parent_plat(dev). This is where the chip select number is stored, along with the default bus speed and mode. It is automatically read diff --git a/doc/driver-model/usb-info.rst b/doc/driver-model/usb-info.rst index e9fe9d2904c..24d1e81a6c6 100644 --- a/doc/driver-model/usb-info.rst +++ b/doc/driver-model/usb-info.rst @@ -43,7 +43,7 @@ as drivers in the USB uclass. For example: .probe = tegra_ehci_usb_probe, .remove = tegra_ehci_usb_remove, .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, }; @@ -63,7 +63,7 @@ This can hold run-time information needed by the driver for operation. It exists when the device is probed (not when it is bound) and is removed when the driver is removed.

-Note that usb_platdata is currently only used to deal with setting up a bus +Note that usb_plat is currently only used to deal with setting up a bus in USB device mode (OTG operation). It can be omitted if that is not supported.

@@ -93,12 +93,12 @@ The following primary data structures are in use: handles that). Once the device is set up, you can find the device descriptor and current configuration descriptor in this structure.

-- struct usb_platdata: +- struct usb_plat: This holds platform data for a controller. So far this is only used as a work-around for controllers which can act as USB devices in OTG mode, since the gadget framework does not use driver model.

-- struct usb_dev_platdata: +- struct usb_dev_plat: This holds platform data for a device. You can access it for a device 'dev' with dev_get_parent_plat(dev). It holds the device address and speed - anything that can be determined before the device diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 99b83cab47d..8781f32855f 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -267,7 +267,7 @@ try_manual: return _adc_channels_single_shot(dev, channel_mask, channels); }

-static int adc_vdd_platdata_update(struct udevice *dev) +static int adc_vdd_plat_update(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -290,7 +290,7 @@ static int adc_vdd_platdata_update(struct udevice *dev) return 0; }

-static int adc_vss_platdata_update(struct udevice *dev) +static int adc_vss_plat_update(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -313,7 +313,7 @@ int adc_vdd_value(struct udevice *dev, int *uV) int ret, value_sign = uc_pdata->vdd_polarity_negative ? -1 : 1;

/* Update the regulator Value. */ - ret = adc_vdd_platdata_update(dev); + ret = adc_vdd_plat_update(dev); if (ret) return ret;

@@ -331,7 +331,7 @@ int adc_vss_value(struct udevice *dev, int *uV) int ret, value_sign = uc_pdata->vss_polarity_negative ? -1 : 1;

/* Update the regulator Value. */ - ret = adc_vss_platdata_update(dev); + ret = adc_vss_plat_update(dev); if (ret) return ret;

@@ -367,7 +367,7 @@ int adc_raw_to_uV(struct udevice *dev, unsigned int raw, int *uV) return 0; }

-static int adc_vdd_platdata_set(struct udevice *dev) +static int adc_vdd_plat_set(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -380,7 +380,7 @@ static int adc_vdd_platdata_set(struct udevice *dev) ret = device_get_supply_regulator(dev, "vdd-supply", &uc_pdata->vdd_supply); if (!ret) - return adc_vdd_platdata_update(dev); + return adc_vdd_plat_update(dev);

if (ret != -ENOENT) return ret; @@ -392,7 +392,7 @@ static int adc_vdd_platdata_set(struct udevice *dev) return 0; }

-static int adc_vss_platdata_set(struct udevice *dev) +static int adc_vss_plat_set(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -404,7 +404,7 @@ static int adc_vss_platdata_set(struct udevice *dev) ret = device_get_supply_regulator(dev, "vss-supply", &uc_pdata->vss_supply); if (!ret) - return adc_vss_platdata_update(dev); + return adc_vss_plat_update(dev);

if (ret != -ENOENT) return ret; @@ -421,12 +421,12 @@ static int adc_pre_probe(struct udevice *dev) int ret;

/* Set ADC VDD plat: polarity, uV, regulator (phandle). */ - ret = adc_vdd_platdata_set(dev); + ret = adc_vdd_plat_set(dev); if (ret) pr_err("%s: Can't update Vdd. Error: %d", dev->name, ret);

/* Set ADC VSS plat: polarity, uV, regulator (phandle). */ - ret = adc_vss_platdata_set(dev); + ret = adc_vss_plat_set(dev); if (ret) pr_err("%s: Can't update Vss. Error: %d", dev->name, ret);

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index bd8a3bcdd85..2ef21ec508a 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -172,7 +172,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv) #if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI) # ifdef CONFIG_DM_PCI struct udevice *dev = uc_priv->dev; - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); # else pci_dev_t pdev = uc_priv->dev; unsigned short vendor; @@ -474,7 +474,7 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, pci_dev_t dev) pci_write_config_byte(dev, 0x41, 0xa1); #endif #else - struct scsi_platdata *plat = dev_get_uclass_plat(dev); + struct scsi_plat *plat = dev_get_uclass_plat(dev); uc_priv->mmio_base = (void *)plat->base; #endif

@@ -1163,7 +1163,7 @@ int ahci_bind_scsi(struct udevice *ahci_dev, struct udevice **devp) int ahci_probe_scsi(struct udevice *ahci_dev, ulong base) { struct ahci_uc_priv *uc_priv; - struct scsi_platdata *uc_plat; + struct scsi_plat *uc_plat; struct udevice *dev; int ret;

diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c index e0f43a264c5..bac1d98e197 100644 --- a/drivers/clk/altera/clk-agilex.c +++ b/drivers/clk/altera/clk-agilex.c @@ -17,7 +17,7 @@

DECLARE_GLOBAL_DATA_PTR;

-struct socfpga_clk_platdata { +struct socfpga_clk_plat { void __iomem *regs; };

@@ -25,20 +25,20 @@ struct socfpga_clk_platdata { * function to write the bypass register which requires a poll of the * busy bit */ -static void clk_write_bypass_mainpll(struct socfpga_clk_platdata *plat, u32 val) +static void clk_write_bypass_mainpll(struct socfpga_clk_plat *plat, u32 val) { CM_REG_WRITEL(plat, val, CLKMGR_MAINPLL_BYPASS); cm_wait_for_fsm(); }

-static void clk_write_bypass_perpll(struct socfpga_clk_platdata *plat, u32 val) +static void clk_write_bypass_perpll(struct socfpga_clk_plat *plat, u32 val) { CM_REG_WRITEL(plat, val, CLKMGR_PERPLL_BYPASS); cm_wait_for_fsm(); }

/* function to write the ctrl register which requires a poll of the busy bit */ -static void clk_write_ctrl(struct socfpga_clk_platdata *plat, u32 val) +static void clk_write_ctrl(struct socfpga_clk_plat *plat, u32 val) { CM_REG_WRITEL(plat, val, CLKMGR_CTRL); cm_wait_for_fsm(); @@ -108,7 +108,7 @@ static const struct { }, };

-static int membus_wait_for_req(struct socfpga_clk_platdata *plat, u32 pll, +static int membus_wait_for_req(struct socfpga_clk_plat *plat, u32 pll, int timeout) { int cnt = 0; @@ -133,7 +133,7 @@ static int membus_wait_for_req(struct socfpga_clk_platdata *plat, u32 pll, return 0; }

-static int membus_write_pll(struct socfpga_clk_platdata *plat, u32 pll, +static int membus_write_pll(struct socfpga_clk_plat *plat, u32 pll, u32 addr_offset, u32 wdat, int timeout) { u32 addr; @@ -154,7 +154,7 @@ static int membus_write_pll(struct socfpga_clk_platdata *plat, u32 pll, return membus_wait_for_req(plat, pll, timeout); }

-static int membus_read_pll(struct socfpga_clk_platdata *plat, u32 pll, +static int membus_read_pll(struct socfpga_clk_plat *plat, u32 pll, u32 addr_offset, u32 *rdata, int timeout) { u32 addr; @@ -184,7 +184,7 @@ static int membus_read_pll(struct socfpga_clk_platdata *plat, u32 pll, return 0; }

-static void membus_pll_configs(struct socfpga_clk_platdata *plat, u32 pll) +static void membus_pll_configs(struct socfpga_clk_plat *plat, u32 pll) { int i; u32 rdata; @@ -236,7 +236,7 @@ static u32 calc_vocalib_pll(u32 pllm, u32 pllglob) static void clk_basic_init(struct udevice *dev, const struct cm_config * const cfg) { - struct socfpga_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_clk_plat *plat = dev_get_plat(dev); u32 vcocalib;

if (!cfg) @@ -342,7 +342,7 @@ static void clk_basic_init(struct udevice *dev, CM_REG_READL(plat, CLKMGR_CTRL) & ~CLKMGR_CTRL_BOOTMODE); }

-static u64 clk_get_vco_clk_hz(struct socfpga_clk_platdata *plat, +static u64 clk_get_vco_clk_hz(struct socfpga_clk_plat *plat, u32 pllglob_reg, u32 pllm_reg) { u64 fref, arefdiv, mdiv, reg, vco; @@ -375,26 +375,26 @@ static u64 clk_get_vco_clk_hz(struct socfpga_clk_platdata *plat, return vco; }

-static u64 clk_get_main_vco_clk_hz(struct socfpga_clk_platdata *plat) +static u64 clk_get_main_vco_clk_hz(struct socfpga_clk_plat *plat) { return clk_get_vco_clk_hz(plat, CLKMGR_MAINPLL_PLLGLOB, CLKMGR_MAINPLL_PLLM); }

-static u64 clk_get_per_vco_clk_hz(struct socfpga_clk_platdata *plat) +static u64 clk_get_per_vco_clk_hz(struct socfpga_clk_plat *plat) { return clk_get_vco_clk_hz(plat, CLKMGR_PERPLL_PLLGLOB, CLKMGR_PERPLL_PLLM); }

-static u32 clk_get_5_1_clk_src(struct socfpga_clk_platdata *plat, u64 reg) +static u32 clk_get_5_1_clk_src(struct socfpga_clk_plat *plat, u64 reg) { u32 clksrc = CM_REG_READL(plat, reg);

return (clksrc & CLKMGR_CLKSRC_MASK) >> CLKMGR_CLKSRC_OFFSET; }

-static u64 clk_get_clksrc_hz(struct socfpga_clk_platdata *plat, u32 clksrc_reg, +static u64 clk_get_clksrc_hz(struct socfpga_clk_plat *plat, u32 clksrc_reg, u32 main_reg, u32 per_reg) { u64 clock; @@ -431,7 +431,7 @@ static u64 clk_get_clksrc_hz(struct socfpga_clk_platdata *plat, u32 clksrc_reg, return clock; }

-static u64 clk_get_mpu_clk_hz(struct socfpga_clk_platdata *plat) +static u64 clk_get_mpu_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_clksrc_hz(plat, CLKMGR_MAINPLL_MPUCLK, CLKMGR_MAINPLL_PLLC0, @@ -443,14 +443,14 @@ static u64 clk_get_mpu_clk_hz(struct socfpga_clk_platdata *plat) return clock; }

-static u32 clk_get_l3_main_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l3_main_clk_hz(struct socfpga_clk_plat *plat) { return clk_get_clksrc_hz(plat, CLKMGR_MAINPLL_NOCCLK, CLKMGR_MAINPLL_PLLC1, CLKMGR_PERPLL_PLLC1); }

-static u32 clk_get_l4_main_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_main_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_l3_main_clk_hz(plat);

@@ -461,7 +461,7 @@ static u32 clk_get_l4_main_clk_hz(struct socfpga_clk_platdata *plat) return clock; }

-static u32 clk_get_sdmmc_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_sdmmc_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_clksrc_hz(plat, CLKMGR_ALTR_SDMMCCTR, CLKMGR_MAINPLL_PLLC3, @@ -473,7 +473,7 @@ static u32 clk_get_sdmmc_clk_hz(struct socfpga_clk_platdata *plat) return clock / 4; }

-static u32 clk_get_l4_sp_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_sp_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_l3_main_clk_hz(plat);

@@ -484,7 +484,7 @@ static u32 clk_get_l4_sp_clk_hz(struct socfpga_clk_platdata *plat) return clock; }

-static u32 clk_get_l4_mp_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_mp_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_l3_main_clk_hz(plat);

@@ -495,7 +495,7 @@ static u32 clk_get_l4_mp_clk_hz(struct socfpga_clk_platdata *plat) return clock; }

-static u32 clk_get_l4_sys_free_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_sys_free_clk_hz(struct socfpga_clk_plat *plat) { if (CM_REG_READL(plat, CLKMGR_STAT) & CLKMGR_STAT_BOOTMODE) return clk_get_l3_main_clk_hz(plat) / 2; @@ -503,7 +503,7 @@ static u32 clk_get_l4_sys_free_clk_hz(struct socfpga_clk_platdata *plat) return clk_get_l3_main_clk_hz(plat) / 4; }

-static u32 clk_get_emac_clk_hz(struct socfpga_clk_platdata *plat, u32 emac_id) +static u32 clk_get_emac_clk_hz(struct socfpga_clk_plat *plat, u32 emac_id) { bool emacsel_a; u32 ctl; @@ -585,7 +585,7 @@ static u32 clk_get_emac_clk_hz(struct socfpga_clk_platdata *plat, u32 emac_id)

static ulong socfpga_clk_get_rate(struct clk *clk) { - struct socfpga_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_clk_plat *plat = dev_get_plat(clk->dev);

switch (clk->id) { case AGILEX_MPU_CLK: @@ -630,7 +630,7 @@ static int socfpga_clk_probe(struct udevice *dev)

static int socfpga_clk_of_to_plat(struct udevice *dev) { - struct socfpga_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_clk_plat *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -658,5 +658,5 @@ U_BOOT_DRIVER(socfpga_agilex_clk) = { .ops = &socfpga_clk_ops, .probe = socfpga_clk_probe, .of_to_plat = socfpga_clk_of_to_plat, - .plat_auto = sizeof(struct socfpga_clk_platdata), + .plat_auto = sizeof(struct socfpga_clk_plat), }; diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index e1e4876025d..1812152d56f 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -24,7 +24,7 @@ enum socfpga_a10_clk_type { SOCFPGA_A10_CLK_UNKNOWN_CLK, };

-struct socfpga_a10_clk_platdata { +struct socfpga_a10_clk_plat { enum socfpga_a10_clk_type type; struct clk_bulk clks; u32 regs; @@ -43,7 +43,7 @@ struct socfpga_a10_clk_platdata {

static int socfpga_a10_clk_get_upstream(struct clk *clk, struct clk **upclk) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(clk->dev); u32 reg, maxval;

if (plat->clks.count == 0) @@ -84,7 +84,7 @@ static int socfpga_a10_clk_get_upstream(struct clk *clk, struct clk **upclk)

static int socfpga_a10_clk_endisable(struct clk *clk, bool enable) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(clk->dev); struct clk *upclk = NULL; int ret;

@@ -120,7 +120,7 @@ static int socfpga_a10_clk_disable(struct clk *clk)

static ulong socfpga_a10_clk_get_rate(struct clk *clk) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(clk->dev); struct clk *upclk = NULL; ulong rate = 0, reg, numer, denom; int ret; @@ -190,7 +190,7 @@ static struct clk_ops socfpga_a10_clk_ops = { */ static void socfpga_a10_handoff_workaround(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; struct clk_bulk *bulk = &plat->clks; int i, ret, offset = dev_of_offset(dev); @@ -274,8 +274,8 @@ static int socfpga_a10_clk_bind(struct udevice *dev)

static int socfpga_a10_clk_probe(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); - struct socfpga_a10_clk_platdata *pplat; + struct socfpga_a10_clk_plat *plat = dev_get_plat(dev); + struct socfpga_a10_clk_plat *pplat; struct udevice *pdev; const void *fdt = gd->fdt_blob; int offset = dev_of_offset(dev); @@ -321,7 +321,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev)

static int socfpga_a10_of_to_plat(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(dev); unsigned int divreg[3], gatereg[2]; int ret;

@@ -359,5 +359,5 @@ U_BOOT_DRIVER(socfpga_a10_clk) = { .probe = socfpga_a10_clk_probe, .of_to_plat = socfpga_a10_of_to_plat,

- .plat_auto = sizeof(struct socfpga_a10_clk_platdata), + .plat_auto = sizeof(struct socfpga_a10_clk_plat), }; diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index 89283e6e36c..e514f26656e 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -21,7 +21,7 @@

DECLARE_GLOBAL_DATA_PTR;

-struct pmc_platdata { +struct pmc_plat { struct at91_pmc *reg_base; struct regmap *regmap_sfr; }; @@ -45,7 +45,7 @@ U_BOOT_DRIVER(at91_pmc) = {

static int at91_pmc_core_probe(struct udevice *dev) { - struct pmc_platdata *plat = dev_get_plat(dev); + struct pmc_plat *plat = dev_get_plat(dev);

dev = dev_get_parent(dev);

@@ -115,7 +115,7 @@ int at91_clk_of_xlate(struct clk *clk, struct ofnode_phandle_args *args) int at91_clk_probe(struct udevice *dev) { struct udevice *dev_periph_container, *dev_pmc; - struct pmc_platdata *plat = dev_get_plat(dev); + struct pmc_plat *plat = dev_get_plat(dev);

dev_periph_container = dev_get_parent(dev); dev_pmc = dev_get_parent(dev_periph_container); @@ -191,7 +191,7 @@ U_BOOT_DRIVER(at91_master_clk) = { /* Main osc clock specific code. */ static int main_osc_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base;

if (readl(&pmc->sr) & AT91_PMC_MOSCSELS) @@ -225,14 +225,14 @@ U_BOOT_DRIVER(at91sam9x5_main_osc_clk) = { .id = UCLASS_CLK, .of_match = main_osc_clk_match, .probe = main_osc_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &main_osc_clk_ops, };

/* PLLA clock specific code. */ static int plla_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base;

if (readl(&pmc->sr) & AT91_PMC_LOCKA) @@ -266,7 +266,7 @@ U_BOOT_DRIVER(at91_plla_clk) = { .id = UCLASS_CLK, .of_match = plla_clk_match, .probe = plla_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &plla_clk_ops, };

@@ -278,7 +278,7 @@ static int at91_plladiv_clk_enable(struct clk *clk)

static ulong at91_plladiv_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; ulong clk_rate; @@ -297,7 +297,7 @@ static ulong at91_plladiv_clk_get_rate(struct clk *clk)

static ulong at91_plladiv_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; ulong parent_rate; @@ -340,7 +340,7 @@ U_BOOT_DRIVER(at91_plladiv_clk) = { .id = UCLASS_CLK, .of_match = at91_plladiv_clk_match, .probe = at91_plladiv_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &at91_plladiv_clk_ops, };

@@ -401,7 +401,7 @@ static ulong system_clk_set_rate(struct clk *clk, ulong rate)

static int system_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; u32 mask;

@@ -437,7 +437,7 @@ U_BOOT_DRIVER(system_clk) = { .name = "system-clk", .id = UCLASS_CLK, .probe = at91_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &system_clk_ops, };

@@ -483,7 +483,7 @@ U_BOOT_DRIVER(sam9x5_periph_clk) = {

static int periph_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; enum periph_clk_type clk_type; void *addr; @@ -536,7 +536,7 @@ static struct clk_ops periph_clk_ops = { U_BOOT_DRIVER(clk_periph) = { .name = "periph-clk", .id = UCLASS_CLK, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .probe = at91_clk_probe, .ops = &periph_clk_ops, }; @@ -552,7 +552,7 @@ U_BOOT_DRIVER(clk_periph) = {

static int utmi_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk clk_dev; ulong clk_rate; @@ -640,7 +640,7 @@ static struct clk_ops utmi_clk_ops = {

static int utmi_clk_of_to_plat(struct udevice *dev) { - struct pmc_platdata *plat = dev_get_plat(dev); + struct pmc_plat *plat = dev_get_plat(dev); struct udevice *syscon;

uclass_get_device_by_phandle(UCLASS_SYSCON, dev, @@ -668,7 +668,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = { .of_match = utmi_clk_match, .probe = utmi_clk_probe, .of_to_plat = utmi_clk_of_to_plat, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &utmi_clk_ops, };

@@ -681,7 +681,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = {

static ulong sama5d4_h32mx_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; ulong rate = gd->arch.mck_rate_hz;

@@ -713,7 +713,7 @@ U_BOOT_DRIVER(sama5d4_h32mx_clk) = { .id = UCLASS_CLK, .of_match = sama5d4_h32mx_clk_match, .probe = sama5d4_h32mx_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &sama5d4_h32mx_clk_ops, };

@@ -754,7 +754,7 @@ struct generic_clk_priv {

static ulong generic_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk parent; ulong clk_rate; @@ -782,7 +782,7 @@ static ulong generic_clk_get_rate(struct clk *clk)

static ulong generic_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct generic_clk_priv *priv = dev_get_priv(clk->dev); struct clk parent, best_parent; @@ -877,7 +877,7 @@ U_BOOT_DRIVER(generic_clk) = { .probe = at91_clk_probe, .of_to_plat = generic_clk_of_to_plat, .priv_auto = sizeof(struct generic_clk_priv), - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &generic_clk_ops, };

@@ -895,7 +895,7 @@ struct at91_usb_clk_priv {

static ulong at91_usb_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; u32 tmp, usbdiv; @@ -916,7 +916,7 @@ static ulong at91_usb_clk_get_rate(struct clk *clk)

static ulong at91_usb_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct at91_usb_clk_priv *priv = dev_get_priv(clk->dev); struct clk source, best_source; @@ -1013,7 +1013,7 @@ U_BOOT_DRIVER(at91_usb_clk) = { .probe = at91_usb_clk_probe, .of_to_plat = at91_usb_clk_of_to_plat, .priv_auto = sizeof(struct at91_usb_clk_priv), - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &at91_usb_clk_ops, };

diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index c2bed88eac4..4baacabd015 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -60,8 +60,8 @@ static struct regmap *regmap_alloc(int count) }

#if CONFIG_IS_ENABLED(OF_PLATDATA) -int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count, - struct regmap **mapp) +int regmap_init_mem_plat(struct udevice *dev, fdt_val_t *reg, int count, + struct regmap **mapp) { struct regmap_range *range; struct regmap *map; diff --git a/drivers/core/root.c b/drivers/core/root.c index 4fa98f05081..1282a1b8518 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -174,7 +174,7 @@ int dm_remove_devices_flags(uint flags) } #endif

-int dm_scan_platdata(bool pre_reloc_only) +int dm_scan_plat(bool pre_reloc_only) { int ret;

@@ -309,9 +309,9 @@ int dm_init_and_scan(bool pre_reloc_only) return ret; } gd->flags |= GD_FLG_DM_NO_SEQ; - ret = dm_scan_platdata(pre_reloc_only); + ret = dm_scan_plat(pre_reloc_only); if (ret) { - debug("dm_scan_platdata() failed: %d\n", ret); + debug("dm_scan_plat() failed: %d\n", ret); goto fail; }

diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index 5de462221f1..cb33facc713 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -56,9 +56,9 @@ static int syscon_pre_probe(struct udevice *dev) * using OF_PLATDATA will need to ensure that this is true. */ #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct syscon_base_platdata *plat = dev_get_plat(dev); + struct syscon_base_plat *plat = dev_get_plat(dev);

- return regmap_init_mem_platdata(dev, plat->reg, ARRAY_SIZE(plat->reg), + return regmap_init_mem_plat(dev, plat->reg, ARRAY_SIZE(plat->reg), &priv->regmap); #else return regmap_init_mem(dev_ofnode(dev), &priv->regmap); diff --git a/drivers/cpu/at91_cpu.c b/drivers/cpu/at91_cpu.c index bd81efde298..9ef1b3102cd 100644 --- a/drivers/cpu/at91_cpu.c +++ b/drivers/cpu/at91_cpu.c @@ -11,7 +11,7 @@ #include <div64.h> #include <linux/clk-provider.h>

-struct at91_cpu_platdata { +struct at91_cpu_plat { const char *name; ulong cpufreq_mhz; ulong mckfreq_mhz; @@ -27,7 +27,7 @@ const char *at91_cpu_get_name(void)

int at91_cpu_get_desc(const struct udevice *dev, char *buf, int size) { - struct at91_cpu_platdata *plat = dev_get_plat(dev); + struct at91_cpu_plat *plat = dev_get_plat(dev);

snprintf(buf, size, "%s\n" "Crystal frequency: %8lu MHz\n" @@ -41,7 +41,7 @@ int at91_cpu_get_desc(const struct udevice *dev, char *buf, int size)

static int at91_cpu_get_info(const struct udevice *dev, struct cpu_info *info) { - struct at91_cpu_platdata *plat = dev_get_plat(dev); + struct at91_cpu_plat *plat = dev_get_plat(dev);

info->cpu_freq = plat->cpufreq_mhz * 1000000; info->features = BIT(CPU_FEAT_L1_CACHE); @@ -75,7 +75,7 @@ static const struct udevice_id at91_cpu_ids[] = {

static int at91_cpu_probe(struct udevice *dev) { - struct at91_cpu_platdata *plat = dev_get_plat(dev); + struct at91_cpu_plat *plat = dev_get_plat(dev); struct clk clk; ulong rate; int ret; @@ -118,6 +118,6 @@ U_BOOT_DRIVER(cpu_at91_drv) = { .of_match = at91_cpu_ids, .ops = &at91_cpu_ops, .probe = at91_cpu_probe, - .plat_auto = sizeof(struct at91_cpu_platdata), + .plat_auto = sizeof(struct at91_cpu_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index fc2084f1c15..172bc9980f6 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -425,7 +425,7 @@ static const struct cpu_ops bmips_cpu_ops = { /* BMIPS CPU driver */ int bmips_cpu_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev);

plat->cpu_id = dev_read_u32_default(dev, "reg", -1); plat->device_id = read_c0_prid(); diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c index 55cb172b879..1c338bad9a1 100644 --- a/drivers/cpu/cpu-uclass.c +++ b/drivers/cpu/cpu-uclass.c @@ -115,7 +115,7 @@ int cpu_get_vendor(const struct udevice *dev, char *buf, int size) U_BOOT_DRIVER(cpu_bus) = { .name = "cpu_bus", .id = UCLASS_SIMPLE_BUS, - .per_child_plat_auto = sizeof(struct cpu_platdata), + .per_child_plat_auto = sizeof(struct cpu_plat), };

static int uclass_cpu_init(struct uclass *uc) diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c index df8a70220e1..fe6772ba5ac 100644 --- a/drivers/cpu/cpu_sandbox.c +++ b/drivers/cpu/cpu_sandbox.c @@ -64,7 +64,7 @@ static const struct cpu_ops cpu_sandbox_ops = { static int cpu_sandbox_bind(struct udevice *dev) { int ret; - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev);

/* first examine the property in current cpu node */ ret = dev_read_u32(dev, "timebase-frequency", &plat->timebase_freq); diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index c9f7449e579..1d1e49efea9 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -16,7 +16,7 @@

DECLARE_GLOBAL_DATA_PTR;

-struct cpu_imx_platdata { +struct cpu_imx_plat { const char *name; const char *rev; const char *type; @@ -55,7 +55,7 @@ const char *get_imx8_rev(u32 rev)

static void set_core_data(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev);

if (device_is_compatible(dev, "arm,cortex-a35")) { plat->cpu_rsrc = SC_R_A35; @@ -73,7 +73,7 @@ static void set_core_data(struct udevice *dev) }

#if IS_ENABLED(CONFIG_IMX_SCU_THERMAL) -static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) +static int cpu_imx_get_temp(struct cpu_imx_plat *plat) { struct udevice *thermal_dev; int cpu_tmp, ret; @@ -94,7 +94,7 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) return cpu_tmp; } #else -static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) +static int cpu_imx_get_temp(struct cpu_imx_plat *plat) { return 0; } @@ -102,7 +102,7 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat)

int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); int ret, temp;

if (size < 100) @@ -128,7 +128,7 @@ int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size)

static int cpu_imx_get_info(const struct udevice *dev, struct cpu_info *info) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev);

info->cpu_freq = plat->freq_mhz * 1000; info->features = BIT(CPU_FEAT_L1_CACHE) | BIT(CPU_FEAT_MMU); @@ -165,7 +165,7 @@ static int cpu_imx_get_vendor(const struct udevice *dev, char *buf, int size)

static int cpu_imx_is_current(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev);

if (plat->mpidr == (read_mpidr() & 0xffff)) return 1; @@ -190,7 +190,7 @@ static const struct udevice_id cpu_imx8_ids[] = {

static ulong imx8_get_cpu_rate(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); ulong rate; int ret;

@@ -206,7 +206,7 @@ static ulong imx8_get_cpu_rate(struct udevice *dev)

static int imx8_cpu_probe(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); u32 cpurev;

set_core_data(dev); @@ -230,6 +230,6 @@ U_BOOT_DRIVER(cpu_imx8_drv) = { .of_match = cpu_imx8_ids, .ops = &cpu_imx8_ops, .probe = imx8_cpu_probe, - .plat_auto = sizeof(struct cpu_imx_platdata), + .plat_auto = sizeof(struct cpu_imx_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c index 3899d4dd236..0b10c173a3e 100644 --- a/drivers/cpu/riscv_cpu.c +++ b/drivers/cpu/riscv_cpu.c @@ -91,7 +91,7 @@ static int riscv_cpu_get_count(const struct udevice *dev)

static int riscv_cpu_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); struct driver *drv; int ret;

diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c index 497ff7869b7..868bf142b4d 100644 --- a/drivers/ddr/altera/sdram_agilex.c +++ b/drivers/ddr/altera/sdram_agilex.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;

int sdram_mmr_init_full(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->plat; + struct altera_sdram_plat *plat = dev->plat; struct altera_sdram_priv *priv = dev_get_priv(dev); u32 i; int ret; diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 286961ca336..3ffe057543f 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -27,7 +27,7 @@ struct altera_gen5_sdram_priv { struct ram_info info; };

-struct altera_gen5_sdram_platdata { +struct altera_gen5_sdram_plat { struct socfpga_sdr *sdr; };

@@ -565,7 +565,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl)

static int altera_gen5_sdram_of_to_plat(struct udevice *dev) { - struct altera_gen5_sdram_platdata *plat = dev->plat; + struct altera_gen5_sdram_plat *plat = dev->plat;

plat->sdr = (struct socfpga_sdr *)devfdt_get_addr_index(dev, 0); if (!plat->sdr) @@ -578,7 +578,7 @@ static int altera_gen5_sdram_probe(struct udevice *dev) { int ret; unsigned long sdram_size; - struct altera_gen5_sdram_platdata *plat = dev->plat; + struct altera_gen5_sdram_plat *plat = dev->plat; struct altera_gen5_sdram_priv *priv = dev_get_priv(dev); struct socfpga_sdr_ctrl *sdr_ctrl = &plat->sdr->sdr_ctrl; struct reset_ctl_bulk resets; @@ -647,7 +647,7 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .of_match = altera_gen5_sdram_ids, .ops = &altera_gen5_sdram_ops, .of_to_plat = altera_gen5_sdram_of_to_plat, - .plat_auto = sizeof(struct altera_gen5_sdram_platdata), + .plat_auto = sizeof(struct altera_gen5_sdram_plat), .probe = altera_gen5_sdram_probe, .priv_auto = sizeof(struct altera_gen5_sdram_priv), }; diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 8028d89f223..984dc32442d 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -70,7 +70,7 @@ int match_ddr_conf(u32 ddr_conf) */ int sdram_mmr_init_full(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->plat; + struct altera_sdram_plat *plat = dev->plat; struct altera_sdram_priv *priv = dev_get_priv(dev); u32 update_value, io48_value, ddrioctl; u32 i; diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 0bd40c2a0da..7e77c7b0733 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -27,29 +27,29 @@

#define PGTABLE_OFF 0x4000

-u32 hmc_readl(struct altera_sdram_platdata *plat, u32 reg) +u32 hmc_readl(struct altera_sdram_plat *plat, u32 reg) { return readl(plat->iomhc + reg); }

-u32 hmc_ecc_readl(struct altera_sdram_platdata *plat, u32 reg) +u32 hmc_ecc_readl(struct altera_sdram_plat *plat, u32 reg) { return readl(plat->hmc + reg); }

-u32 hmc_ecc_writel(struct altera_sdram_platdata *plat, +u32 hmc_ecc_writel(struct altera_sdram_plat *plat, u32 data, u32 reg) { return writel(data, plat->hmc + reg); }

-u32 ddr_sch_writel(struct altera_sdram_platdata *plat, u32 data, +u32 ddr_sch_writel(struct altera_sdram_plat *plat, u32 data, u32 reg) { return writel(data, plat->ddr_sch + reg); }

-int emif_clear(struct altera_sdram_platdata *plat) +int emif_clear(struct altera_sdram_plat *plat) { hmc_ecc_writel(plat, 0, RSTHANDSHAKECTRL);

@@ -59,7 +59,7 @@ int emif_clear(struct altera_sdram_platdata *plat) false, 1000, false); }

-int emif_reset(struct altera_sdram_platdata *plat) +int emif_reset(struct altera_sdram_plat *plat) { u32 c2s, s2c, ret;

@@ -214,7 +214,7 @@ void sdram_size_check(struct bd_info *bd) * Calculate SDRAM device size based on SDRAM controller parameters. * Size is specified in bytes. */ -phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat) +phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat) { u32 dramaddrw = hmc_readl(plat, DRAMADDRW);

@@ -232,7 +232,7 @@ phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat)

static int altera_sdram_of_to_plat(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->plat; + struct altera_sdram_plat *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr_index(dev, 0); @@ -304,7 +304,7 @@ U_BOOT_DRIVER(altera_sdram) = { .of_match = altera_sdram_ids, .ops = &altera_sdram_ops, .of_to_plat = altera_sdram_of_to_plat, - .plat_auto = sizeof(struct altera_sdram_platdata), + .plat_auto = sizeof(struct altera_sdram_plat), .probe = altera_sdram_probe, .priv_auto = sizeof(struct altera_sdram_priv), }; diff --git a/drivers/ddr/altera/sdram_soc64.h b/drivers/ddr/altera/sdram_soc64.h index 4a830e7ec18..8af0afc4100 100644 --- a/drivers/ddr/altera/sdram_soc64.h +++ b/drivers/ddr/altera/sdram_soc64.h @@ -14,7 +14,7 @@ struct altera_sdram_priv { struct reset_ctl_bulk resets; };

-struct altera_sdram_platdata { +struct altera_sdram_plat { void __iomem *hmc; void __iomem *ddr_sch; void __iomem *iomhc; @@ -169,19 +169,19 @@ struct altera_sdram_platdata { #define FW_HMC_ADAPTOR_REG_ADDR 0xf8020004 #define FW_HMC_ADAPTOR_MPU_MASK BIT(0)

-u32 hmc_readl(struct altera_sdram_platdata *plat, u32 reg); -u32 hmc_ecc_readl(struct altera_sdram_platdata *plat, u32 reg); -u32 hmc_ecc_writel(struct altera_sdram_platdata *plat, +u32 hmc_readl(struct altera_sdram_plat *plat, u32 reg); +u32 hmc_ecc_readl(struct altera_sdram_plat *plat, u32 reg); +u32 hmc_ecc_writel(struct altera_sdram_plat *plat, u32 data, u32 reg); -u32 ddr_sch_writel(struct altera_sdram_platdata *plat, u32 data, +u32 ddr_sch_writel(struct altera_sdram_plat *plat, u32 data, u32 reg); -int emif_clear(struct altera_sdram_platdata *plat); -int emif_reset(struct altera_sdram_platdata *plat); +int emif_clear(struct altera_sdram_plat *plat); +int emif_reset(struct altera_sdram_plat *plat); int poll_hmc_clock_status(void); void sdram_clear_mem(phys_addr_t addr, phys_size_t size); void sdram_init_ecc_bits(struct bd_info *bd); void sdram_size_check(struct bd_info *bd); -phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat); +phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat); int sdram_mmr_init_full(struct udevice *dev);

#endif /* _SDRAM_SOC64_H_ */ diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 24e047e66a8..f4582b1467c 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -19,7 +19,7 @@ struct altera_pio_regs { u32 direction; /* Direction register */ };

-struct altera_pio_platdata { +struct altera_pio_plat { struct altera_pio_regs *regs; int gpio_count; const char *bank_name; @@ -27,7 +27,7 @@ struct altera_pio_platdata {

static int altera_pio_direction_input(struct udevice *dev, unsigned pin) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

clrbits_le32(&regs->direction, 1 << pin); @@ -38,7 +38,7 @@ static int altera_pio_direction_input(struct udevice *dev, unsigned pin) static int altera_pio_direction_output(struct udevice *dev, unsigned pin, int val) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

if (val) @@ -53,7 +53,7 @@ static int altera_pio_direction_output(struct udevice *dev, unsigned pin,

static int altera_pio_get_value(struct udevice *dev, unsigned pin) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

return !!(readl(&regs->data) & (1 << pin)); @@ -62,7 +62,7 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin)

static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs;

if (val) @@ -76,7 +76,7 @@ static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) static int altera_pio_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev);

uc_priv->gpio_count = plat->gpio_count; uc_priv->bank_name = plat->bank_name; @@ -86,7 +86,7 @@ static int altera_pio_probe(struct udevice *dev)

static int altera_pio_of_to_plat(struct udevice *dev) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_pio_regs), @@ -117,6 +117,6 @@ U_BOOT_DRIVER(altera_pio) = { .of_match = altera_pio_ids, .ops = &altera_pio_ops, .of_to_plat = altera_pio_of_to_plat, - .plat_auto = sizeof(struct altera_pio_platdata), + .plat_auto = sizeof(struct altera_pio_plat), .probe = altera_pio_probe, }; diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c index 7b604e4e825..1409db5dc11 100644 --- a/drivers/gpio/at91_gpio.c +++ b/drivers/gpio/at91_gpio.c @@ -590,7 +590,7 @@ static const struct dm_gpio_ops gpio_at91_ops = { static int at91_gpio_probe(struct udevice *dev) { struct at91_port_priv *port = dev_get_priv(dev); - struct at91_port_platdata *plat = dev_get_plat(dev); + struct at91_port_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct clk clk; int ret; @@ -629,7 +629,7 @@ U_BOOT_DRIVER(atmel_at91rm9200_gpio) = { .id = UCLASS_GPIO, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = at91_gpio_ids, - .plat_auto = sizeof(struct at91_port_platdata), + .plat_auto = sizeof(struct at91_port_plat), #endif .ops = &gpio_at91_ops, .probe = at91_gpio_probe, diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index e25115f8a29..e7b8f231ccf 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -176,14 +176,14 @@ struct atmel_pioctrl_data { u32 nbanks; };

-struct atmel_pio4_platdata { +struct atmel_pio4_plat { struct atmel_pio4_port *reg_base; };

static struct atmel_pio4_port *atmel_pio4_bank_base(struct udevice *dev, u32 bank) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); struct atmel_pio4_port *port_base = (struct atmel_pio4_port *)((u32)plat->reg_base + ATMEL_PIO_BANK_OFFSET * bank); @@ -281,7 +281,7 @@ static int atmel_pio4_bind(struct udevice *dev)

static int atmel_pio4_probe(struct udevice *dev) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct atmel_pioctrl_data *pioctrl_data; struct clk clk; @@ -338,7 +338,7 @@ U_BOOT_DRIVER(gpio_atmel_pio4) = { .probe = atmel_pio4_probe, .bind = atmel_pio4_bind, .of_match = atmel_pio4_ids, - .plat_auto = sizeof(struct atmel_pio4_platdata), + .plat_auto = sizeof(struct atmel_pio4_plat), };

#endif diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index a348c68a7ef..704a6fa7121 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -102,7 +102,7 @@ static const struct dm_gpio_ops gpio_bcm2835_ops = { static int bcm2835_gpio_probe(struct udevice *dev) { struct bcm2835_gpios *gpios = dev_get_priv(dev); - struct bcm2835_gpio_platdata *plat = dev_get_plat(dev); + struct bcm2835_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

uc_priv->bank_name = "GPIO"; @@ -118,7 +118,7 @@ static int bcm2835_gpio_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) static int bcm2835_gpio_of_to_plat(struct udevice *dev) { - struct bcm2835_gpio_platdata *plat = dev_get_plat(dev); + struct bcm2835_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -134,7 +134,7 @@ U_BOOT_DRIVER(gpio_bcm2835) = { .name = "gpio_bcm2835", .id = UCLASS_GPIO, .of_to_plat = of_match_ptr(bcm2835_gpio_of_to_plat), - .plat_auto = sizeof(struct bcm2835_gpio_platdata), + .plat_auto = sizeof(struct bcm2835_gpio_plat), .ops = &gpio_bcm2835_ops, .probe = bcm2835_gpio_probe, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index b47d65d4df2..9a52a5e414f 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -522,7 +522,7 @@ static const struct dm_gpio_ops gpio_davinci_ops = { static int davinci_gpio_probe(struct udevice *dev) { struct davinci_gpio_bank *bank = dev_get_priv(dev); - struct davinci_gpio_platdata *plat = dev_get_plat(dev); + struct davinci_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); @@ -542,7 +542,7 @@ static const struct udevice_id davinci_gpio_ids[] = {

static int davinci_gpio_of_to_plat(struct udevice *dev) { - struct davinci_gpio_platdata *plat = dev_get_plat(dev); + struct davinci_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -560,7 +560,7 @@ U_BOOT_DRIVER(ti_dm6441_gpio) = { .of_to_plat = of_match_ptr(davinci_gpio_of_to_plat), .of_match = davinci_gpio_ids, .bind = dm_scan_fdt_dev, - .plat_auto = sizeof(struct davinci_gpio_platdata), + .plat_auto = sizeof(struct davinci_gpio_plat), .probe = davinci_gpio_probe, .priv_auto = sizeof(struct davinci_gpio_bank), }; diff --git a/drivers/gpio/da8xx_gpio.h b/drivers/gpio/da8xx_gpio.h index 849e8d2dcf3..ca59d6a90b3 100644 --- a/drivers/gpio/da8xx_gpio.h +++ b/drivers/gpio/da8xx_gpio.h @@ -31,7 +31,7 @@ struct davinci_gpio_bank { #if CONFIG_IS_ENABLED(DM_GPIO)

/* Information about a GPIO bank */ -struct davinci_gpio_platdata { +struct davinci_gpio_plat { int bank_index; ulong base; /* address of registers in physical memory */ const char *port_name; diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index 42158bd84a4..acd77b6892e 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -36,7 +36,7 @@ struct gpio_dwapb_priv { struct reset_ctl_bulk resets; };

-struct gpio_dwapb_platdata { +struct gpio_dwapb_plat { const char *name; int bank; int pins; @@ -45,7 +45,7 @@ struct gpio_dwapb_platdata {

static int dwapb_gpio_direction_input(struct udevice *dev, unsigned pin) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev);

clrbits_le32(plat->base + GPIO_SWPORT_DDR(plat->bank), 1 << pin); return 0; @@ -54,7 +54,7 @@ static int dwapb_gpio_direction_input(struct udevice *dev, unsigned pin) static int dwapb_gpio_direction_output(struct udevice *dev, unsigned pin, int val) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev);

setbits_le32(plat->base + GPIO_SWPORT_DDR(plat->bank), 1 << pin);

@@ -68,7 +68,7 @@ static int dwapb_gpio_direction_output(struct udevice *dev, unsigned pin,

static int dwapb_gpio_set_value(struct udevice *dev, unsigned pin, int val) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev);

if (val) setbits_le32(plat->base + GPIO_SWPORT_DR(plat->bank), 1 << pin); @@ -80,7 +80,7 @@ static int dwapb_gpio_set_value(struct udevice *dev, unsigned pin, int val)

static int dwapb_gpio_get_function(struct udevice *dev, unsigned offset) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); u32 gpio;

gpio = readl(plat->base + GPIO_SWPORT_DDR(plat->bank)); @@ -93,7 +93,7 @@ static int dwapb_gpio_get_function(struct udevice *dev, unsigned offset)

static int dwapb_gpio_get_value(struct udevice *dev, unsigned pin) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); u32 value;

if (dwapb_gpio_get_function(dev, pin) == GPIOF_OUTPUT) @@ -141,7 +141,7 @@ static int gpio_dwapb_reset(struct udevice *dev) static int gpio_dwapb_probe(struct udevice *dev) { struct gpio_dev_priv *priv = dev_get_uclass_priv(dev); - struct gpio_dwapb_platdata *plat = dev->plat; + struct gpio_dwapb_plat *plat = dev->plat;

if (!plat) { /* Reset on parent device only */ @@ -156,7 +156,7 @@ static int gpio_dwapb_probe(struct udevice *dev)

static int gpio_dwapb_bind(struct udevice *dev) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); struct udevice *subdev; fdt_addr_t base; int ret, bank = 0; @@ -215,7 +215,7 @@ static int gpio_dwapb_bind(struct udevice *dev)

static int gpio_dwapb_remove(struct udevice *dev) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); struct gpio_dwapb_priv *priv = dev_get_priv(dev);

if (!plat && priv) diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c index 02a37829c0a..f5e5fc6e48a 100644 --- a/drivers/gpio/hi6220_gpio.c +++ b/drivers/gpio/hi6220_gpio.c @@ -66,7 +66,7 @@ static const struct dm_gpio_ops gpio_hi6220_ops = { static int hi6220_gpio_probe(struct udevice *dev) { struct gpio_bank *bank = dev_get_priv(dev); - struct hikey_gpio_platdata *plat = dev_get_plat(dev); + struct hikey_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev->uclass_priv; char name[18], *str;

diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index 9cd0745625e..68d72eedc5a 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -117,7 +117,7 @@ static int broadwell_gpio_get_function(struct udevice *dev, unsigned offset)

static int broadwell_gpio_probe(struct udevice *dev) { - struct broadwell_bank_platdata *plat = dev_get_plat(dev); + struct broadwell_bank_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct broadwell_bank_priv *priv = dev_get_priv(dev); struct udevice *pinctrl; @@ -141,7 +141,7 @@ static int broadwell_gpio_probe(struct udevice *dev)

static int broadwell_gpio_of_to_plat(struct udevice *dev) { - struct broadwell_bank_platdata *plat = dev_get_plat(dev); + struct broadwell_bank_plat *plat = dev_get_plat(dev); u32 gpiobase; int bank; int ret; @@ -185,5 +185,5 @@ U_BOOT_DRIVER(gpio_broadwell) = { .of_to_plat = broadwell_gpio_of_to_plat, .probe = broadwell_gpio_probe, .priv_auto = sizeof(struct broadwell_bank_priv), - .plat_auto = sizeof(struct broadwell_bank_platdata), + .plat_auto = sizeof(struct broadwell_bank_plat), }; diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index add13d89a71..11d4be04f56 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -95,7 +95,7 @@ static int _ich6_gpio_set_direction(uint16_t base, unsigned offset, int dir)

static int gpio_ich6_of_to_plat(struct udevice *dev) { - struct ich6_bank_platdata *plat = dev_get_plat(dev); + struct ich6_bank_plat *plat = dev_get_plat(dev); u32 gpiobase; int offset; int ret; @@ -119,7 +119,7 @@ static int gpio_ich6_of_to_plat(struct udevice *dev)

static int ich6_gpio_probe(struct udevice *dev) { - struct ich6_bank_platdata *plat = dev_get_plat(dev); + struct ich6_bank_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct ich6_bank_priv *bank = dev_get_priv(dev); const void *prop; @@ -237,5 +237,5 @@ U_BOOT_DRIVER(gpio_ich6) = { .of_to_plat = gpio_ich6_of_to_plat, .probe = ich6_gpio_probe, .priv_auto = sizeof(struct ich6_bank_priv), - .plat_auto = sizeof(struct ich6_bank_platdata), + .plat_auto = sizeof(struct ich6_bank_plat), }; diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c index 8bc8783f62c..8c143e9b75b 100644 --- a/drivers/gpio/iproc_gpio.c +++ b/drivers/gpio/iproc_gpio.c @@ -55,7 +55,7 @@ struct iproc_gpio_pctrl_map { * @name: gpio device name, ex GPIO0, GPIO1 * @ngpios: total number of gpios */ -struct iproc_gpio_platdata { +struct iproc_gpio_plat { struct udevice *pinctrl_dev; struct list_head gpiomap; void __iomem *base; @@ -73,7 +73,7 @@ struct iproc_gpio_platdata { * @gpio: GPIO pin * @set: set or clear */ -static inline void iproc_gpio_set_bit(struct iproc_gpio_platdata *plat, +static inline void iproc_gpio_set_bit(struct iproc_gpio_plat *plat, u32 reg, u32 gpio, bool set) { u32 offset = GPIO_REG(gpio, reg); @@ -83,7 +83,7 @@ static inline void iproc_gpio_set_bit(struct iproc_gpio_platdata *plat, (set ? BIT(shift) : 0)); }

-static inline bool iproc_gpio_get_bit(struct iproc_gpio_platdata *plat, +static inline bool iproc_gpio_get_bit(struct iproc_gpio_plat *plat, u32 reg, u32 gpio) { u32 offset = GPIO_REG(gpio, reg); @@ -98,7 +98,7 @@ static inline bool iproc_gpio_get_bit(struct iproc_gpio_platdata *plat, * @plat: iproc GPIO device * @gpio: GPIO pin */ -static u32 iproc_get_pctrl_from_gpio(struct iproc_gpio_platdata *plat, u32 gpio) +static u32 iproc_get_pctrl_from_gpio(struct iproc_gpio_plat *plat, u32 gpio) { struct iproc_gpio_pctrl_map *range = NULL; struct list_head *pos, *tmp; @@ -127,7 +127,7 @@ static u32 iproc_get_pctrl_from_gpio(struct iproc_gpio_platdata *plat, u32 gpio) */ static int iproc_get_gpio_pctrl_mapping(struct udevice *dev) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); struct iproc_gpio_pctrl_map *range = NULL; struct ofnode_phandle_args args; int index = 0, ret; @@ -153,7 +153,7 @@ static int iproc_get_gpio_pctrl_mapping(struct udevice *dev)

static int iproc_gpio_request(struct udevice *dev, u32 gpio, const char *label) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); u32 pctrl;

/* nothing to do if there is no corresponding pinctrl device */ @@ -167,7 +167,7 @@ static int iproc_gpio_request(struct udevice *dev, u32 gpio, const char *label)

static int iproc_gpio_direction_input(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev);

iproc_gpio_set_bit(plat, OUT_EN_OFFSET, gpio, false); dev_dbg(dev, "gpio:%u set input\n", gpio); @@ -177,7 +177,7 @@ static int iproc_gpio_direction_input(struct udevice *dev, u32 gpio)

static int iproc_gpio_direction_output(struct udevice *dev, u32 gpio, int value) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev);

iproc_gpio_set_bit(plat, OUT_EN_OFFSET, gpio, true); iproc_gpio_set_bit(plat, DATA_OUT_OFFSET, gpio, value); @@ -188,7 +188,7 @@ static int iproc_gpio_direction_output(struct udevice *dev, u32 gpio, int value)

static int iproc_gpio_get_value(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); int value;

value = iproc_gpio_get_bit(plat, DATA_IN_OFFSET, gpio); @@ -199,7 +199,7 @@ static int iproc_gpio_get_value(struct udevice *dev, u32 gpio)

static int iproc_gpio_set_value(struct udevice *dev, u32 gpio, int value) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev);

if (iproc_gpio_get_bit(plat, OUT_EN_OFFSET, gpio)) iproc_gpio_set_bit(plat, DATA_OUT_OFFSET, gpio, value); @@ -210,7 +210,7 @@ static int iproc_gpio_set_value(struct udevice *dev, u32 gpio, int value)

static int iproc_gpio_get_function(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev);

if (iproc_gpio_get_bit(plat, OUT_EN_OFFSET, gpio)) return GPIOF_OUTPUT; @@ -220,7 +220,7 @@ static int iproc_gpio_get_function(struct udevice *dev, u32 gpio)

static int iproc_gpio_of_to_plat(struct udevice *dev) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int ret; char name[10]; @@ -286,5 +286,5 @@ U_BOOT_DRIVER(iproc_gpio) = { .of_match = iproc_gpio_ids, .ops = &iproc_gpio_ops, .of_to_plat = iproc_gpio_of_to_plat, - .plat_auto = sizeof(struct iproc_gpio_platdata), + .plat_auto = sizeof(struct iproc_gpio_plat), }; diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index a35e4de761f..fd26a36a0f9 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -78,7 +78,7 @@ static int mpc83xx_spisel_boot_of_to_plat(struct udevice *dev) } #endif

-static int mpc83xx_spisel_boot_platdata_to_priv(struct udevice *dev) +static int mpc83xx_spisel_boot_plat_to_priv(struct udevice *dev) { struct mpc83xx_spisel_boot *priv = dev_get_priv(dev); struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); @@ -107,7 +107,7 @@ static int mpc83xx_spisel_boot_probe(struct udevice *dev) struct mpc83xx_spisel_boot *data = dev_get_priv(dev); char name[32], *str;

- mpc83xx_spisel_boot_platdata_to_priv(dev); + mpc83xx_spisel_boot_plat_to_priv(dev);

snprintf(name, sizeof(name), "MPC@%lx_", data->addr); str = strdup(name); diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index dfc1dc67d59..2bc1a0d5716 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -219,7 +219,7 @@ static int mpc8xxx_gpio_of_to_plat(struct udevice *dev) } #endif

-static int mpc8xxx_gpio_platdata_to_priv(struct udevice *dev) +static int mpc8xxx_gpio_plat_to_priv(struct udevice *dev) { struct mpc8xxx_gpio_data *priv = dev_get_priv(dev); struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); @@ -249,7 +249,7 @@ static int mpc8xxx_gpio_probe(struct udevice *dev) struct mpc8xxx_gpio_data *data = dev_get_priv(dev); char name[32], *str;

- mpc8xxx_gpio_platdata_to_priv(dev); + mpc8xxx_gpio_plat_to_priv(dev);

snprintf(name, sizeof(name), "MPC@%lx_", data->addr); str = strdup(name); diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c index e48ddb53e68..65b4cbf61b9 100644 --- a/drivers/gpio/mt7621_gpio.c +++ b/drivers/gpio/mt7621_gpio.c @@ -38,20 +38,20 @@ enum mediatek_gpio_reg {

static void __iomem *mediatek_gpio_membase;

-struct mediatek_gpio_platdata { +struct mediatek_gpio_plat { char bank_name[3]; /* Name of bank, e.g. "PA", "PB" etc */ int gpio_count; int bank; };

-static u32 reg_offs(struct mediatek_gpio_platdata *plat, int reg) +static u32 reg_offs(struct mediatek_gpio_plat *plat, int reg) { return (reg * 0x10) + (plat->bank * 0x4); }

static int mediatek_gpio_get_value(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev);

return !!(ioread32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_DATA)) & BIT(offset)); @@ -60,7 +60,7 @@ static int mediatek_gpio_get_value(struct udevice *dev, unsigned int offset) static int mediatek_gpio_set_value(struct udevice *dev, unsigned int offset, int value) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev);

iowrite32(BIT(offset), mediatek_gpio_membase + reg_offs(plat, value ? GPIO_REG_DSET : GPIO_REG_DCLR)); @@ -70,7 +70,7 @@ static int mediatek_gpio_set_value(struct udevice *dev, unsigned int offset,

static int mediatek_gpio_direction_input(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev);

clrbits_le32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL), BIT(offset)); @@ -81,7 +81,7 @@ static int mediatek_gpio_direction_input(struct udevice *dev, unsigned int offse static int mediatek_gpio_direction_output(struct udevice *dev, unsigned int offset, int value) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev);

setbits_le32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL), BIT(offset)); @@ -92,7 +92,7 @@ static int mediatek_gpio_direction_output(struct udevice *dev, unsigned int offs

static int mediatek_gpio_get_function(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); u32 t;

t = ioread32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL)); @@ -112,7 +112,7 @@ static const struct dm_gpio_ops gpio_mediatek_ops = {

static int gpio_mediatek_probe(struct udevice *dev) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

/* Tell the uclass how many GPIOs we have */ @@ -130,7 +130,7 @@ static int gpio_mediatek_probe(struct udevice *dev) */ static int gpio_mediatek_bind(struct udevice *parent) { - struct mediatek_gpio_platdata *plat = parent->plat; + struct mediatek_gpio_plat *plat = parent->plat; ofnode node; int bank = 0; int ret; @@ -145,7 +145,7 @@ static int gpio_mediatek_bind(struct udevice *parent)

for (node = dev_read_first_subnode(parent); ofnode_valid(node); node = dev_read_next_subnode(node)) { - struct mediatek_gpio_platdata *plat; + struct mediatek_gpio_plat *plat; struct udevice *dev;

plat = calloc(1, sizeof(*plat)); diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index 30daf4a74e0..5ad65e4ee0b 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -150,7 +150,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 +235,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 +264,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->plat; struct fdtdec_phandle_args args; int node = dev_of_offset(dev); int ret; @@ -299,7 +299,7 @@ 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, diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c index 8c5fd670758..52851e58b69 100644 --- a/drivers/gpio/nx_gpio.c +++ b/drivers/gpio/nx_gpio.c @@ -36,7 +36,7 @@ struct nx_alive_gpio_regs { u32 pad; /* Alive GPIO Input Value Register */ };

-struct nx_gpio_platdata { +struct nx_gpio_plat { void *regs; int gpio_count; const char *bank_name; @@ -44,7 +44,7 @@ struct nx_gpio_platdata {

static int nx_alive_gpio_is_check(struct udevice *dev) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); const char *bank_name = plat->bank_name;

if (!strcmp(bank_name, "gpio_alv")) @@ -55,7 +55,7 @@ static int nx_alive_gpio_is_check(struct udevice *dev)

static int nx_alive_gpio_direction_input(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs;

setbits_le32(&regs->outputenb_reset, 1 << pin); @@ -66,7 +66,7 @@ static int nx_alive_gpio_direction_input(struct udevice *dev, unsigned int pin) static int nx_alive_gpio_direction_output(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs;

if (val) @@ -81,7 +81,7 @@ static int nx_alive_gpio_direction_output(struct udevice *dev, unsigned int pin,

static int nx_alive_gpio_get_value(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; unsigned int mask = 1UL << pin; unsigned int value; @@ -94,7 +94,7 @@ static int nx_alive_gpio_get_value(struct udevice *dev, unsigned int pin) static int nx_alive_gpio_set_value(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs;

if (val) @@ -107,7 +107,7 @@ static int nx_alive_gpio_set_value(struct udevice *dev, unsigned int pin,

static int nx_alive_gpio_get_function(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; unsigned int mask = (1UL << pin); unsigned int output; @@ -122,7 +122,7 @@ static int nx_alive_gpio_get_function(struct udevice *dev, unsigned int pin)

static int nx_gpio_direction_input(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs;

if (nx_alive_gpio_is_check(dev)) @@ -136,7 +136,7 @@ static int nx_gpio_direction_input(struct udevice *dev, unsigned int pin) static int nx_gpio_direction_output(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs;

if (nx_alive_gpio_is_check(dev)) @@ -154,7 +154,7 @@ static int nx_gpio_direction_output(struct udevice *dev, unsigned int pin,

static int nx_gpio_get_value(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; unsigned int mask = 1UL << pin; unsigned int value; @@ -169,7 +169,7 @@ static int nx_gpio_get_value(struct udevice *dev, unsigned int pin)

static int nx_gpio_set_value(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs;

if (nx_alive_gpio_is_check(dev)) @@ -185,7 +185,7 @@ static int nx_gpio_set_value(struct udevice *dev, unsigned int pin, int val)

static int nx_gpio_get_function(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; unsigned int mask = (1UL << pin); unsigned int output; @@ -204,7 +204,7 @@ static int nx_gpio_get_function(struct udevice *dev, unsigned int pin) static int nx_gpio_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev);

uc_priv->gpio_count = plat->gpio_count; uc_priv->bank_name = plat->bank_name; @@ -214,7 +214,7 @@ static int nx_gpio_probe(struct udevice *dev)

static int nx_gpio_of_to_plat(struct udevice *dev) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev);

plat->regs = map_physmem(devfdt_get_addr(dev), sizeof(struct nx_gpio_regs), @@ -245,6 +245,6 @@ U_BOOT_DRIVER(nx_gpio) = { .of_match = nx_gpio_ids, .ops = &nx_gpio_ops, .of_to_plat = nx_gpio_of_to_plat, - .plat_auto = sizeof(struct nx_gpio_platdata), + .plat_auto = sizeof(struct nx_gpio_plat), .probe = nx_gpio_probe, }; diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 665f46d555a..400c6ca4724 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -285,7 +285,7 @@ static const struct dm_gpio_ops gpio_omap_ops = { static int omap_gpio_probe(struct udevice *dev) { struct gpio_bank *bank = dev_get_priv(dev); - struct omap_gpio_platdata *plat = dev_get_plat(dev); + struct omap_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[18], *str;

@@ -302,7 +302,7 @@ static int omap_gpio_probe(struct udevice *dev) #if !CONFIG_IS_ENABLED(OF_CONTROL) static int omap_gpio_bind(struct udevice *dev) { - struct omap_gpio_platdata *plat = dev_get_plat(dev); + struct omap_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t base_addr;

if (plat) @@ -344,7 +344,7 @@ static const struct udevice_id omap_gpio_ids[] = {

static int omap_gpio_of_to_plat(struct udevice *dev) { - struct omap_gpio_platdata *plat = dev_get_plat(dev); + struct omap_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -363,7 +363,7 @@ U_BOOT_DRIVER(gpio_omap) = { #if !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_gpio_ids, .of_to_plat = of_match_ptr(omap_gpio_of_to_plat), - .plat_auto = sizeof(struct omap_gpio_platdata), + .plat_auto = sizeof(struct omap_gpio_plat), #endif #else .bind = omap_gpio_bind, diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c index 3eed9e93c2c..6d38646ef66 100644 --- a/drivers/gpio/pcf8575_gpio.c +++ b/drivers/gpio/pcf8575_gpio.c @@ -125,7 +125,7 @@ static int pcf8575_set_value(struct udevice *dev, unsigned int offset, return pcf8575_direction_output(dev, offset, value); }

-static int pcf8575_ofdata_platdata(struct udevice *dev) +static int pcf8575_ofdata_plat(struct udevice *dev) { struct pcf8575_chip *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); @@ -175,7 +175,7 @@ U_BOOT_DRIVER(gpio_pcf8575) = { .id = UCLASS_GPIO, .ops = &pcf8575_gpio_ops, .of_match = pcf8575_gpio_ids, - .of_to_plat = pcf8575_ofdata_platdata, + .of_to_plat = pcf8575_ofdata_plat, .probe = pcf8575_gpio_probe, .plat_auto = sizeof(struct pcf8575_chip), }; diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c index 6202e4841f8..9de9541c875 100644 --- a/drivers/gpio/s5p_gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; #define RATE_SET(gpio) (0x1 << (gpio + 16))

/* Platform data for each bank */ -struct exynos_gpio_platdata { +struct exynos_gpio_plat { struct s5p_gpio_bank *bank; const char *bank_name; /* Name of port, e.g. 'gpa0" */ }; @@ -287,7 +287,7 @@ static int gpio_exynos_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct exynos_bank_info *priv = dev->priv; - struct exynos_gpio_platdata *plat = dev->plat; + struct exynos_gpio_plat *plat = dev->plat;

/* Only child devices have ports */ if (!plat) @@ -307,7 +307,7 @@ static int gpio_exynos_probe(struct udevice *dev) */ static int gpio_exynos_bind(struct udevice *parent) { - struct exynos_gpio_platdata *plat = parent->plat; + struct exynos_gpio_plat *plat = parent->plat; struct s5p_gpio_bank *bank, *base; const void *blob = gd->fdt_blob; int node; @@ -320,7 +320,7 @@ static int gpio_exynos_bind(struct udevice *parent) for (node = fdt_first_subnode(blob, dev_of_offset(parent)), bank = base; node > 0; node = fdt_next_subnode(blob, node), bank++) { - struct exynos_gpio_platdata *plat; + struct exynos_gpio_plat *plat; struct udevice *dev; fdt_addr_t reg; int ret; diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c index 933cace5bec..abd1f629b9b 100644 --- a/drivers/gpio/sifive-gpio.c +++ b/drivers/gpio/sifive-gpio.c @@ -15,7 +15,7 @@

static int sifive_gpio_probe(struct udevice *dev) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[18], *str;

@@ -49,7 +49,7 @@ static void sifive_update_gpio_reg(void *bptr, u32 offset, bool value)

static int sifive_gpio_direction_input(struct udevice *dev, u32 offset) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

if (offset > uc_priv->gpio_count) @@ -65,7 +65,7 @@ static int sifive_gpio_direction_input(struct udevice *dev, u32 offset) static int sifive_gpio_direction_output(struct udevice *dev, u32 offset, int value) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

if (offset > uc_priv->gpio_count) @@ -83,7 +83,7 @@ static int sifive_gpio_direction_output(struct udevice *dev, u32 offset,

static int sifive_gpio_get_value(struct udevice *dev, u32 offset) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int val; int dir; @@ -104,7 +104,7 @@ static int sifive_gpio_get_value(struct udevice *dev, u32 offset)

static int sifive_gpio_set_value(struct udevice *dev, u32 offset, int value) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

if (offset > uc_priv->gpio_count) @@ -117,7 +117,7 @@ static int sifive_gpio_set_value(struct udevice *dev, u32 offset, int value)

static int sifive_gpio_get_function(struct udevice *dev, unsigned int offset) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); u32 outdir, indir, val; struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

@@ -156,7 +156,7 @@ static const struct dm_gpio_ops sifive_gpio_ops = {

static int sifive_gpio_of_to_plat(struct udevice *dev) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -172,7 +172,7 @@ U_BOOT_DRIVER(gpio_sifive) = { .id = UCLASS_GPIO, .of_match = sifive_gpio_match, .of_to_plat = of_match_ptr(sifive_gpio_of_to_plat), - .plat_auto = sizeof(struct sifive_gpio_platdata), + .plat_auto = sizeof(struct sifive_gpio_plat), .ops = &sifive_gpio_ops, .probe = sifive_gpio_probe, }; diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 567bd647ff6..75494c78283 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -22,7 +22,7 @@

#define SUNXI_GPIOS_PER_BANK SUNXI_GPIO_A_NR

-struct sunxi_gpio_platdata { +struct sunxi_gpio_plat { struct sunxi_gpio *regs; const char *bank_name; /* Name of bank, e.g. "B" */ int gpio_count; @@ -158,7 +158,7 @@ int sunxi_name_to_gpio(const char *name)

static int sunxi_gpio_direction_input(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev);

sunxi_gpio_set_cfgbank(plat->regs, offset, SUNXI_GPIO_INPUT);

@@ -168,7 +168,7 @@ static int sunxi_gpio_direction_input(struct udevice *dev, unsigned offset) static int sunxi_gpio_direction_output(struct udevice *dev, unsigned offset, int value) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset);

sunxi_gpio_set_cfgbank(plat->regs, offset, SUNXI_GPIO_OUTPUT); @@ -179,7 +179,7 @@ static int sunxi_gpio_direction_output(struct udevice *dev, unsigned offset,

static int sunxi_gpio_get_value(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset); unsigned dat;

@@ -192,7 +192,7 @@ static int sunxi_gpio_get_value(struct udevice *dev, unsigned offset) static int sunxi_gpio_set_value(struct udevice *dev, unsigned offset, int value) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset);

clrsetbits_le32(&plat->regs->dat, 1 << num, value ? (1 << num) : 0); @@ -201,7 +201,7 @@ static int sunxi_gpio_set_value(struct udevice *dev, unsigned offset,

static int sunxi_gpio_get_function(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); int func;

func = sunxi_gpio_get_cfgbank(plat->regs, offset); @@ -260,7 +260,7 @@ static char *gpio_bank_name(int bank)

static int gpio_sunxi_probe(struct udevice *dev) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

/* Tell the uclass how many GPIOs we have */ @@ -285,7 +285,7 @@ static int gpio_sunxi_bind(struct udevice *parent) { struct sunxi_gpio_soc_data *soc_data = (struct sunxi_gpio_soc_data *)dev_get_driver_data(parent); - struct sunxi_gpio_platdata *plat = parent->plat; + struct sunxi_gpio_plat *plat = parent->plat; struct sunxi_gpio_reg *ctlr; int bank, ret;

@@ -295,7 +295,7 @@ static int gpio_sunxi_bind(struct udevice *parent)

ctlr = dev_read_addr_ptr(parent); for (bank = 0; bank < soc_data->no_banks; bank++) { - struct sunxi_gpio_platdata *plat; + struct sunxi_gpio_plat *plat; struct udevice *dev;

plat = calloc(1, sizeof(*plat)); diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c index 14c9d90bfdf..cd1fb65a55c 100644 --- a/drivers/gpio/tegra186_gpio.c +++ b/drivers/gpio/tegra186_gpio.c @@ -26,7 +26,7 @@ struct tegra186_gpio_ctlr_data { uint32_t port_count; };

-struct tegra186_gpio_platdata { +struct tegra186_gpio_plat { const char *name; uint32_t *regs; }; @@ -34,7 +34,7 @@ struct tegra186_gpio_platdata { static uint32_t *tegra186_gpio_reg(struct udevice *dev, uint32_t reg, uint32_t gpio) { - struct tegra186_gpio_platdata *plat = dev->plat; + struct tegra186_gpio_plat *plat = dev->plat; uint32_t index = (reg + (gpio * TEGRA186_GPIO_PER_GPIO_STRIDE)) / 4;

return &(plat->regs[index]); @@ -166,7 +166,7 @@ static const struct dm_gpio_ops tegra186_gpio_ops = { */ static int tegra186_gpio_bind(struct udevice *parent) { - struct tegra186_gpio_platdata *parent_plat = parent->plat; + struct tegra186_gpio_plat *parent_plat = parent->plat; struct tegra186_gpio_ctlr_data *ctlr_data = (struct tegra186_gpio_ctlr_data *)dev_get_driver_data(parent); uint32_t *regs; @@ -181,7 +181,7 @@ static int tegra186_gpio_bind(struct udevice *parent) return -EINVAL;

for (port = 0; port < ctlr_data->port_count; port++) { - struct tegra186_gpio_platdata *plat; + struct tegra186_gpio_plat *plat; struct udevice *dev;

plat = calloc(1, sizeof(*plat)); @@ -201,7 +201,7 @@ static int tegra186_gpio_bind(struct udevice *parent)

static int tegra186_gpio_probe(struct udevice *dev) { - struct tegra186_gpio_platdata *plat = dev->plat; + struct tegra186_gpio_plat *plat = dev->plat; struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

/* Only child devices have ports */ diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index 862a63fbf6c..c489796f77c 100644 --- a/drivers/gpio/tegra_gpio.c +++ b/drivers/gpio/tegra_gpio.c @@ -28,7 +28,7 @@ static const int CONFIG_GPIO = 1; static const int DIRECTION_INPUT = 0; static const int DIRECTION_OUTPUT = 1;

-struct tegra_gpio_platdata { +struct tegra_gpio_plat { struct gpio_ctlr_bank *bank; const char *port_name; /* Name of port, e.g. "B" */ int base_gpio; /* Port number for this port (0, 1,.., n-1) */ @@ -292,7 +292,7 @@ static int gpio_tegra_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct tegra_port_info *priv = dev->priv; - struct tegra_gpio_platdata *plat = dev->plat; + struct tegra_gpio_plat *plat = dev->plat;

/* Only child devices have ports */ if (!plat) @@ -313,7 +313,7 @@ static int gpio_tegra_probe(struct udevice *dev) */ static int gpio_tegra_bind(struct udevice *parent) { - struct tegra_gpio_platdata *plat = parent->plat; + struct tegra_gpio_plat *plat = parent->plat; struct gpio_ctlr *ctlr; int bank_count; int bank; @@ -348,7 +348,7 @@ static int gpio_tegra_bind(struct udevice *parent) int port;

for (port = 0; port < TEGRA_PORTS_PER_BANK; port++) { - struct tegra_gpio_platdata *plat; + struct tegra_gpio_plat *plat; struct udevice *dev; int base_port;

diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index d2e526d7ab8..fcce90c53c2 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -93,7 +93,7 @@ static const struct dm_gpio_ops gpio_vybrid_ops = { static int vybrid_gpio_probe(struct udevice *dev) { struct vybrid_gpios *gpios = dev_get_priv(dev); - struct vybrid_gpio_platdata *plat = dev_get_plat(dev); + struct vybrid_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);

uc_priv->bank_name = plat->port_name; @@ -104,9 +104,9 @@ static int vybrid_gpio_probe(struct udevice *dev) return 0; }

-static int vybrid_gpio_odata_to_platdata(struct udevice *dev) +static int vybrid_gpio_odata_to_plat(struct udevice *dev) { - struct vybrid_gpio_platdata *plat = dev_get_plat(dev); + struct vybrid_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t base_addr;

base_addr = dev_read_addr(dev); @@ -130,8 +130,8 @@ U_BOOT_DRIVER(gpio_vybrid) = { .id = UCLASS_GPIO, .ops = &gpio_vybrid_ops, .of_match = vybrid_gpio_ids, - .of_to_plat = vybrid_gpio_odata_to_platdata, + .of_to_plat = vybrid_gpio_odata_to_plat, .probe = vybrid_gpio_probe, .priv_auto = sizeof(struct vybrid_gpios), - .plat_auto = sizeof(struct vybrid_gpio_platdata), + .plat_auto = sizeof(struct vybrid_gpio_plat), }; diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 7bc758b1669..510838d2f52 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -21,7 +21,7 @@ struct gpio_regs { u32 gpiodir; };

-struct xilinx_gpio_platdata { +struct xilinx_gpio_plat { struct gpio_regs *regs; int bank_max[XILINX_GPIO_MAX_BANK]; int bank_input[XILINX_GPIO_MAX_BANK]; @@ -36,7 +36,7 @@ struct xilinx_gpio_privdata { static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, u32 *bank_pin_num, struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); u32 bank, max_pins; /* the first gpio is 0 not 1 */ u32 pin_num = offset; @@ -59,7 +59,7 @@ static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -87,7 +87,7 @@ static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset,

static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -114,7 +114,7 @@ static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset)

static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int val, ret; u32 bank, pin;

@@ -143,7 +143,7 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int val, ret; u32 bank, pin;

@@ -168,7 +168,7 @@ static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset,

static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int val, ret; u32 bank, pin;

@@ -194,7 +194,7 @@ static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) static int xilinx_gpio_xlate(struct udevice *dev, struct gpio_desc *desc, struct ofnode_phandle_args *args) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev);

desc->offset = args->args[0];

@@ -239,7 +239,7 @@ static const struct dm_gpio_ops xilinx_gpio_ops = {

static int xilinx_gpio_probe(struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr; @@ -265,7 +265,7 @@ static int xilinx_gpio_probe(struct udevice *dev)

static int xilinx_gpio_of_to_plat(struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int is_dual;

plat->regs = (struct gpio_regs *)dev_read_addr(dev); @@ -303,6 +303,6 @@ U_BOOT_DRIVER(xilinx_gpio) = { .of_match = xilinx_gpio_ids, .of_to_plat = xilinx_gpio_of_to_plat, .probe = xilinx_gpio_probe, - .plat_auto = sizeof(struct xilinx_gpio_platdata), + .plat_auto = sizeof(struct xilinx_gpio_plat), .priv_auto = sizeof(struct xilinx_gpio_privdata), }; diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index ffbe7b47080..71a56127c0a 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -97,7 +97,7 @@ #define PMC_GPIO_NR_GPIOS 116 #define PMC_GPIO_MAX_BANK 5

-struct zynq_gpio_platdata { +struct zynq_gpio_plat { phys_addr_t base; const struct zynq_platform_data *p_data; }; @@ -193,7 +193,7 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num, unsigned int *bank_pin_num, struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); u32 bank;

for (bank = 0; bank < plat->p_data->max_bank; bank++) { @@ -215,7 +215,7 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num,

static int gpio_is_valid(unsigned gpio, struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev);

return gpio < plat->p_data->ngpio; } @@ -233,7 +233,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) { u32 data; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -249,7 +249,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value) { unsigned int reg_offset, bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -281,7 +281,7 @@ static int zynq_gpio_direction_input(struct udevice *dev, unsigned gpio) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -305,7 +305,7 @@ static int zynq_gpio_direction_output(struct udevice *dev, unsigned gpio, { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev);

if (check_gpio(gpio, dev) < 0) return -1; @@ -331,7 +331,7 @@ static int zynq_gpio_get_function(struct udevice *dev, unsigned offset) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev);

if (check_gpio(offset, dev) < 0) return -1; @@ -369,7 +369,7 @@ static const struct udevice_id zynq_gpio_ids[] = {

static int zynq_gpio_probe(struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr;

@@ -390,7 +390,7 @@ static int zynq_gpio_probe(struct udevice *dev)

static int zynq_gpio_of_to_plat(struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev);

plat->base = (phys_addr_t)dev_read_addr(dev);

@@ -407,5 +407,5 @@ U_BOOT_DRIVER(gpio_zynq) = { .of_match = zynq_gpio_ids, .of_to_plat = zynq_gpio_of_to_plat, .probe = zynq_gpio_probe, - .plat_auto = sizeof(struct zynq_gpio_platdata), + .plat_auto = sizeof(struct zynq_gpio_plat), }; diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index 4fbf20e2759..085b824e895 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -14,7 +14,7 @@ * i2c emulation works using an 'emul' node at the bus level. Each device in * that node is in the UCLASS_I2C_EMUL uclass, and emulates one i2c device. A * pointer to the device it emulates is in the 'dev' property of the emul device - * uclass plat (struct i2c_emul_platdata), put there by i2c_emul_find(). + * uclass plat (struct i2c_emul_plat), put there by i2c_emul_find(). * When sandbox wants an emulator for a device, it calls i2c_emul_find() which * searches for the emulator with the correct address. To find the device for an * emulator, call i2c_emul_get_device(). @@ -24,27 +24,27 @@ */

/** - * struct i2c_emul_uc_platdata - information about the emulator for this device + * struct i2c_emul_uc_plat - information about the emulator for this device * * This is used by devices in UCLASS_I2C_EMUL to record information about the * device being emulated. It is accessible with dev_get_uclass_plat() * * @dev: Device being emulated */ -struct i2c_emul_uc_platdata { +struct i2c_emul_uc_plat { struct udevice *dev; };

struct udevice *i2c_emul_get_device(struct udevice *emul) { - struct i2c_emul_uc_platdata *uc_plat = dev_get_uclass_plat(emul); + struct i2c_emul_uc_plat *uc_plat = dev_get_uclass_plat(emul);

return uc_plat->dev; }

int i2c_emul_find(struct udevice *dev, struct udevice **emulp) { - struct i2c_emul_uc_platdata *uc_plat; + struct i2c_emul_uc_plat *uc_plat; struct udevice *emul; int ret;

@@ -64,7 +64,7 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp) UCLASS_DRIVER(i2c_emul) = { .id = UCLASS_I2C_EMUL, .name = "i2c_emul", - .per_device_plat_auto = sizeof(struct i2c_emul_uc_platdata), + .per_device_plat_auto = sizeof(struct i2c_emul_uc_plat), };

/* diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 322d72132b8..1355dc274ed 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -1049,7 +1049,7 @@ static int omap_i2c_probe_chip(struct udevice *bus, uint chip_addr, static int omap_i2c_probe(struct udevice *bus) { struct omap_i2c *priv = dev_get_priv(bus); - struct omap_i2c_platdata *plat = dev_get_plat(bus); + struct omap_i2c_plat *plat = dev_get_plat(bus);

priv->speed = plat->speed; priv->regs = map_physmem(plat->base, sizeof(void *), @@ -1065,7 +1065,7 @@ static int omap_i2c_probe(struct udevice *bus) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int omap_i2c_of_to_plat(struct udevice *bus) { - struct omap_i2c_platdata *plat = dev_get_plat(bus); + struct omap_i2c_plat *plat = dev_get_plat(bus);

plat->base = dev_read_addr(bus); plat->speed = dev_read_u32_default(bus, "clock-frequency", @@ -1094,7 +1094,7 @@ U_BOOT_DRIVER(i2c_omap) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_i2c_ids, .of_to_plat = omap_i2c_of_to_plat, - .plat_auto = sizeof(struct omap_i2c_platdata), + .plat_auto = sizeof(struct omap_i2c_plat), #endif .probe = omap_i2c_probe, .priv_auto = sizeof(struct omap_i2c), diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c index 971bbcf987c..598c0a03db5 100644 --- a/drivers/led/led_cortina.c +++ b/drivers/led/led_cortina.c @@ -57,7 +57,7 @@ struct cortina_led_cfg { };

/* LED_control structures */ -struct cortina_led_platdata { +struct cortina_led_plat { void __iomem *ctrl_regs; u16 rate1; /* blink rate setting 0 */ u16 rate2; /* blink rate setting 1 */ @@ -136,7 +136,7 @@ static int ca_led_of_to_plat(struct udevice *dev)

/* Top-level LED node */ if (!uc_plat->label) { - struct cortina_led_platdata *plt = dev_get_plat(dev); + struct cortina_led_plat *plt = dev_get_plat(dev);

plt->rate1 = dev_read_u32_default(dev, "Cortina,blink-rate1", 256); @@ -169,7 +169,7 @@ static int cortina_led_probe(struct udevice *dev)

/* Top-level LED node */ if (!uc_plat->label) { - struct cortina_led_platdata *plat = dev_get_plat(dev); + struct cortina_led_plat *plat = dev_get_plat(dev); u32 reg_value, val; u16 rate1, rate2;

@@ -292,7 +292,7 @@ U_BOOT_DRIVER(cortina_led) = { .of_to_plat = ca_led_of_to_plat, .bind = cortina_led_bind, .probe = cortina_led_probe, - .plat_auto = sizeof(struct cortina_led_platdata), + .plat_auto = sizeof(struct cortina_led_plat), .priv_auto = sizeof(struct cortina_led_cfg), .ops = &cortina_led_ops, }; diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index 091f055ec01..057b431c254 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -17,7 +17,7 @@ struct altera_sysid_regs { u32 timestamp; /* Timestamp */ };

-struct altera_sysid_platdata { +struct altera_sysid_plat { struct altera_sysid_regs *regs; };

@@ -59,7 +59,7 @@ U_BOOT_CMD( static int altera_sysid_read(struct udevice *dev, int offset, void *buf, int size) { - struct altera_sysid_platdata *plat = dev->plat; + struct altera_sysid_plat *plat = dev->plat; struct altera_sysid_regs *const regs = plat->regs; u32 *sysid = buf;

@@ -71,7 +71,7 @@ static int altera_sysid_read(struct udevice *dev,

static int altera_sysid_of_to_plat(struct udevice *dev) { - struct altera_sysid_platdata *plat = dev_get_plat(dev); + struct altera_sysid_plat *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_sysid_regs), @@ -94,6 +94,6 @@ U_BOOT_DRIVER(altera_sysid) = { .id = UCLASS_MISC, .of_match = altera_sysid_ids, .of_to_plat = altera_sysid_of_to_plat, - .plat_auto = sizeof(struct altera_sysid_platdata), + .plat_auto = sizeof(struct altera_sysid_plat), .ops = &altera_sysid_ops, }; diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index c228e84fa1f..5ed8ab6530f 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -61,7 +61,7 @@ static int mount_ubifs(char *mtdpart, char *ubivol) } #endif

-static int select_fs_dev(struct device_platdata *plat) +static int select_fs_dev(struct device_plat *plat) { int ret;

@@ -226,7 +226,7 @@ static int fs_loader_of_to_plat(struct udevice *dev) ofnode fs_loader_node = dev_ofnode(dev);

if (ofnode_valid(fs_loader_node)) { - struct device_platdata *plat; + struct device_plat *plat;

plat = dev->plat; if (!ofnode_read_u32_array(fs_loader_node, @@ -250,7 +250,7 @@ static int fs_loader_probe(struct udevice *dev) { #if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK) int ret; - struct device_platdata *plat = dev->plat; + struct device_plat *plat = dev->plat;

if (plat->phandlepart.phandle) { ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); @@ -285,7 +285,7 @@ U_BOOT_DRIVER(fs_loader) = { .of_match = fs_loader_ids, .probe = fs_loader_probe, .of_to_plat = fs_loader_of_to_plat, - .plat_auto = sizeof(struct device_platdata), + .plat_auto = sizeof(struct device_plat), .priv_auto = sizeof(struct firmware), };

diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c index d0ef2ef96ca..e0a6f2d3880 100644 --- a/drivers/misc/microchip_flexcom.c +++ b/drivers/misc/microchip_flexcom.c @@ -16,14 +16,14 @@ struct microchip_flexcom_regs { u32 cr; };

-struct microchip_flexcom_platdata { +struct microchip_flexcom_plat { struct microchip_flexcom_regs *regs; u32 flexcom_mode; };

static int microchip_flexcom_of_to_plat(struct udevice *dev) { - struct microchip_flexcom_platdata *plat = dev_get_plat(dev); + struct microchip_flexcom_plat *plat = dev_get_plat(dev); int ret;

plat->regs = map_physmem(dev_read_addr(dev), @@ -62,5 +62,5 @@ U_BOOT_DRIVER(microchip_flexcom) = { .id = UCLASS_MISC, .of_match = microchip_flexcom_ids, .of_to_plat = microchip_flexcom_of_to_plat, - .plat_auto = sizeof(struct microchip_flexcom_platdata), + .plat_auto = sizeof(struct microchip_flexcom_plat), }; diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index 3267e50a313..8f9ec027a2e 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -30,7 +30,7 @@ int p2sb_set_hide(struct udevice *dev, bool hide)

void *pcr_reg_address(struct udevice *dev, uint offset) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); struct udevice *p2sb = dev_get_parent(dev); struct p2sb_uc_priv *upriv = dev_get_uclass_priv(p2sb); uintptr_t reg_addr; @@ -161,7 +161,7 @@ void pcr_clrsetbits8(struct udevice *dev, uint offset, uint clr, uint set)

int p2sb_get_port_id(struct udevice *dev) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev);

return pplat->pid; } @@ -169,7 +169,7 @@ int p2sb_get_port_id(struct udevice *dev) int p2sb_set_port_id(struct udevice *dev, int portid) { struct udevice *ps2b; - struct p2sb_child_platdata *pplat; + struct p2sb_child_plat *pplat;

if (!CONFIG_IS_ENABLED(OF_PLATDATA)) return -ENOSYS; @@ -197,7 +197,7 @@ int p2sb_set_port_id(struct udevice *dev, int portid) static int p2sb_child_post_bind(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); int ret; u32 pid;

@@ -224,5 +224,5 @@ UCLASS_DRIVER(p2sb) = { .per_device_auto = sizeof(struct p2sb_uc_priv), .post_bind = p2sb_post_bind, .child_post_bind = p2sb_child_post_bind, - .per_child_plat_auto = sizeof(struct p2sb_child_platdata), + .per_child_plat_auto = sizeof(struct p2sb_child_plat), }; diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c index 5c70ca87f49..973d02d6785 100644 --- a/drivers/misc/p2sb_emul.c +++ b/drivers/misc/p2sb_emul.c @@ -18,12 +18,12 @@ #include <p2sb.h>

/** - * struct p2sb_emul_platdata - platform data for this device + * struct p2sb_emul_plat - platform data for this device * * @command: Current PCI command value * @bar: Current base address values */ -struct p2sb_emul_platdata { +struct p2sb_emul_plat { u16 command; u32 bar[6]; }; @@ -53,7 +53,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_plat(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -106,7 +106,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_plat(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -134,7 +134,7 @@ static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, static int sandbox_p2sb_emul_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct p2sb_emul_platdata *plat = dev_get_plat(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul); int barnum;

for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { @@ -197,7 +197,7 @@ static int find_p2sb_channel(struct udevice *emul, uint offset, return log_msg_ret("No client", ret);

device_foreach_child(dev, p2sb) { - struct p2sb_child_platdata *pplat = + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev);

log_debug(" - child %s, pid %d, want %d\n", dev->name, @@ -263,7 +263,7 @@ U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = { .of_match = sandbox_p2sb_emul_ids, .ops = &sandbox_p2sb_emul_emul_ops, .priv_auto = sizeof(struct p2sb_emul_priv), - .plat_auto = sizeof(struct p2sb_emul_platdata), + .plat_auto = sizeof(struct p2sb_emul_plat), };

static struct pci_device_id sandbox_p2sb_emul_supported[] = { diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 08e30bae06c..be25389e0e3 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -37,7 +37,7 @@ struct rockchip_efuse_regs { /* 0x14 efuse strobe finish control register */ };

-struct rockchip_efuse_platdata { +struct rockchip_efuse_plat { void __iomem *base; struct clk *clk; }; @@ -86,7 +86,7 @@ U_BOOT_CMD( static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, void *buf, int size) { - struct rockchip_efuse_platdata *plat = dev_get_plat(dev); + struct rockchip_efuse_plat *plat = dev_get_plat(dev); struct rockchip_efuse_regs *efuse = (struct rockchip_efuse_regs *)plat->base;

@@ -139,7 +139,7 @@ static const struct misc_ops rockchip_efuse_ops = {

static int rockchip_efuse_of_to_plat(struct udevice *dev) { - struct rockchip_efuse_platdata *plat = dev_get_plat(dev); + struct rockchip_efuse_plat *plat = dev_get_plat(dev);

plat->base = dev_read_addr_ptr(dev); return 0; @@ -155,6 +155,6 @@ U_BOOT_DRIVER(rockchip_efuse) = { .id = UCLASS_MISC, .of_match = rockchip_efuse_ids, .of_to_plat = rockchip_efuse_of_to_plat, - .plat_auto = sizeof(struct rockchip_efuse_platdata), + .plat_auto = sizeof(struct rockchip_efuse_plat), .ops = &rockchip_efuse_ops, }; diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c index 9707750355a..cc9a5450e0c 100644 --- a/drivers/misc/rockchip-otp.c +++ b/drivers/misc/rockchip-otp.c @@ -47,13 +47,13 @@

#define OTPC_TIMEOUT 10000

-struct rockchip_otp_platdata { +struct rockchip_otp_plat { void __iomem *base; unsigned long secure_conf_base; unsigned long otp_mask_base; };

-static int rockchip_otp_wait_status(struct rockchip_otp_platdata *otp, +static int rockchip_otp_wait_status(struct rockchip_otp_plat *otp, u32 flag) { int delay = OTPC_TIMEOUT; @@ -73,7 +73,7 @@ static int rockchip_otp_wait_status(struct rockchip_otp_platdata *otp, return 0; }

-static int rockchip_otp_ecc_enable(struct rockchip_otp_platdata *otp, +static int rockchip_otp_ecc_enable(struct rockchip_otp_plat *otp, bool enable) { int ret = 0; @@ -102,7 +102,7 @@ static int rockchip_otp_ecc_enable(struct rockchip_otp_platdata *otp, static int rockchip_px30_otp_read(struct udevice *dev, int offset, void *buf, int size) { - struct rockchip_otp_platdata *otp = dev_get_plat(dev); + struct rockchip_otp_plat *otp = dev_get_plat(dev); u8 *buffer = buf; int ret = 0;

@@ -147,7 +147,7 @@ static const struct misc_ops rockchip_otp_ops = {

static int rockchip_otp_of_to_plat(struct udevice *dev) { - struct rockchip_otp_platdata *otp = dev_get_plat(dev); + struct rockchip_otp_plat *otp = dev_get_plat(dev);

otp->base = dev_read_addr_ptr(dev);

@@ -172,5 +172,5 @@ U_BOOT_DRIVER(rockchip_otp) = { .of_match = rockchip_otp_ids, .ops = &rockchip_otp_ops, .of_to_plat = rockchip_otp_of_to_plat, - .plat_auto = sizeof(struct rockchip_otp_platdata), + .plat_auto = sizeof(struct rockchip_otp_plat), }; diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c index 94eaf234ae7..3ea33e46e9f 100644 --- a/drivers/misc/sandbox_adder.c +++ b/drivers/misc/sandbox_adder.c @@ -21,7 +21,7 @@ struct sandbox_adder_priv { int sandbox_adder_read(struct udevice *dev, ulong address, void *data, enum axi_size_t size) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); u32 *val = data;

*val = pplat->pid << 24 | address; diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c index e1f59716426..3e658b35662 100644 --- a/drivers/misc/sifive-otp.c +++ b/drivers/misc/sifive-otp.c @@ -89,7 +89,7 @@ struct sifive_otp_regs { u32 pwe; /* Write enable input (defines program cycle) */ };

-struct sifive_otp_platdata { +struct sifive_otp_plat { struct sifive_otp_regs __iomem *regs; u32 total_fuses; }; @@ -100,7 +100,7 @@ struct sifive_otp_platdata { static int sifive_otp_read(struct udevice *dev, int offset, void *buf, int size) { - struct sifive_otp_platdata *plat = dev_get_plat(dev); + struct sifive_otp_plat *plat = dev_get_plat(dev); struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs;

/* Check if offset and size are multiple of BYTES_PER_FUSE */ @@ -162,7 +162,7 @@ static int sifive_otp_read(struct udevice *dev, int offset, static int sifive_otp_write(struct udevice *dev, int offset, const void *buf, int size) { - struct sifive_otp_platdata *plat = dev_get_plat(dev); + struct sifive_otp_plat *plat = dev_get_plat(dev); struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs;

/* Check if offset and size are multiple of BYTES_PER_FUSE */ @@ -241,7 +241,7 @@ static int sifive_otp_write(struct udevice *dev, int offset,

static int sifive_otp_of_to_plat(struct udevice *dev) { - struct sifive_otp_platdata *plat = dev_get_plat(dev); + struct sifive_otp_plat *plat = dev_get_plat(dev); int ret;

plat->regs = dev_read_addr_ptr(dev); @@ -270,6 +270,6 @@ U_BOOT_DRIVER(sifive_otp) = { .id = UCLASS_MISC, .of_match = sifive_otp_ids, .of_to_plat = sifive_otp_of_to_plat, - .plat_auto = sizeof(struct sifive_otp_platdata), + .plat_auto = sizeof(struct sifive_otp_plat), .ops = &sifive_otp_ops, }; diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c index 9dd3b06f81b..abea0e76139 100644 --- a/drivers/misc/swap_case.c +++ b/drivers/misc/swap_case.c @@ -15,12 +15,12 @@ #include <linux/ctype.h>

/** - * struct swap_case_platdata - platform data for this device + * struct swap_case_plat - platform data for this device * * @command: Current PCI command value * @bar: Current base address values */ -struct swap_case_platdata { +struct swap_case_plat { u16 command; u32 bar[6]; }; @@ -100,7 +100,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct swap_case_platdata *plat = dev_get_plat(emul); + struct swap_case_plat *plat = dev_get_plat(emul);

/* * The content of the EA capability structure is handled elsewhere to @@ -200,7 +200,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul, static int sandbox_swap_case_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct swap_case_platdata *plat = dev_get_plat(emul); + struct swap_case_plat *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -228,7 +228,7 @@ static int sandbox_swap_case_write_config(struct udevice *emul, uint offset, static int sandbox_swap_case_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct swap_case_platdata *plat = dev_get_plat(emul); + struct swap_case_plat *plat = dev_get_plat(emul); int barnum;

for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { @@ -392,7 +392,7 @@ U_BOOT_DRIVER(sandbox_swap_case_emul) = { .of_match = sandbox_swap_case_ids, .ops = &sandbox_swap_case_emul_ops, .priv_auto = sizeof(struct swap_case_priv), - .plat_auto = sizeof(struct swap_case_platdata), + .plat_auto = sizeof(struct swap_case_plat), };

static struct pci_device_id sandbox_swap_case_supported[] = { diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 518e24e0410..8b6dfa3b960 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -27,7 +27,7 @@ bool meson_gx_mmc_is_compatible(struct udevice *dev,

static inline void *get_regbase(const struct mmc *mmc) { - struct meson_mmc_platdata *pdata = mmc->priv; + struct meson_mmc_plat *pdata = mmc->priv;

return pdata->regbase; } @@ -160,7 +160,7 @@ static void meson_mmc_setup_cmd(struct mmc *mmc, struct mmc_data *data,

static void meson_mmc_setup_addr(struct mmc *mmc, struct mmc_data *data) { - struct meson_mmc_platdata *pdata = mmc->priv; + struct meson_mmc_plat *pdata = mmc->priv; unsigned int data_size; uint32_t data_addr = 0;

@@ -198,7 +198,7 @@ static int meson_dm_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { struct mmc *mmc = mmc_get_mmc_dev(dev); - struct meson_mmc_platdata *pdata = mmc->priv; + struct meson_mmc_plat *pdata = mmc->priv; uint32_t status; ulong start; int ret = 0; @@ -243,7 +243,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = {

static int meson_mmc_of_to_plat(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_plat(dev); + struct meson_mmc_plat *pdata = dev_get_plat(dev); fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -257,7 +257,7 @@ static int meson_mmc_of_to_plat(struct udevice *dev)

static int meson_mmc_probe(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_plat(dev); + struct meson_mmc_plat *pdata = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct mmc *mmc = &pdata->mmc; struct mmc_config *cfg = &pdata->cfg; @@ -320,7 +320,7 @@ static int meson_mmc_probe(struct udevice *dev)

int meson_mmc_bind(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_plat(dev); + struct meson_mmc_plat *pdata = dev_get_plat(dev);

return mmc_bind(dev, &pdata->mmc, &pdata->cfg); } @@ -340,7 +340,7 @@ U_BOOT_DRIVER(meson_mmc) = { .probe = meson_mmc_probe, .bind = meson_mmc_bind, .of_to_plat = meson_mmc_of_to_plat, - .plat_auto = sizeof(struct meson_mmc_platdata), + .plat_auto = sizeof(struct meson_mmc_plat), };

#ifdef CONFIG_PWRSEQ diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h index 92aec5329f6..8974b78f559 100644 --- a/drivers/mmc/meson_gx_mmc.h +++ b/drivers/mmc/meson_gx_mmc.h @@ -84,7 +84,7 @@ enum meson_gx_mmc_compatible { #define MESON_SD_EMMC_CMD_RSP2 0x64 #define MESON_SD_EMMC_CMD_RSP3 0x68

-struct meson_mmc_platdata { +struct meson_mmc_plat { struct mmc_config cfg; struct mmc mmc; void *regbase; diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index c96334f96b7..143818d4018 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -52,7 +52,7 @@ struct mxsmmc_priv { #include <dm/read.h> #include <dt-structs.h>

-struct mxsmmc_platdata { +struct mxsmmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_fsl_imx23_mmc dtplat; #endif @@ -310,7 +310,7 @@ mxsmmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) static int mxsmmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs; struct mmc *mmc = &plat->mmc; @@ -490,7 +490,7 @@ mxsmmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data)

static int mxsmmc_get_cd(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs;

@@ -502,7 +502,7 @@ static int mxsmmc_get_cd(struct udevice *dev)

static int mxsmmc_set_ios(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs; struct mmc *mmc = &plat->mmc; @@ -567,7 +567,7 @@ static int mxsmmc_init(struct udevice *dev) static int mxsmmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct blk_desc *bdesc; struct mmc *mmc; @@ -653,7 +653,7 @@ static int mxsmmc_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(BLK) static int mxsmmc_bind(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev);

return mmc_bind(dev, &plat->mmc, &plat->cfg); } @@ -668,7 +668,7 @@ static const struct dm_mmc_ops mxsmmc_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxsmmc_of_to_plat(struct udevice *bus) { - struct mxsmmc_platdata *plat = bus->plat; + struct mxsmmc_plat *plat = bus->plat; u32 prop[2]; int ret;

@@ -719,7 +719,7 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = { #endif .probe = mxsmmc_probe, .priv_auto = sizeof(struct mxsmmc_priv), - .plat_auto = sizeof(struct mxsmmc_platdata), + .plat_auto = sizeof(struct mxsmmc_plat), };

U_BOOT_DRIVER_ALIAS(fsl_imx23_mmc, fsl_imx28_mmc) diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index 250fb4f75f0..0011811250b 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -48,7 +48,7 @@ struct altera_qspi_regs { u32 chip_select; };

-struct altera_qspi_platdata { +struct altera_qspi_plat { struct altera_qspi_regs *regs; void *base; unsigned long size; @@ -106,7 +106,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { struct mtd_info *mtd = info->mtd; struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); ulong base = (ulong)pdata->base; loff_t to = addr - base; size_t retlen; @@ -135,7 +135,7 @@ unsigned long flash_init(void) static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; size_t addr = instr->addr; size_t len = instr->len; @@ -197,7 +197,7 @@ static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev);

memcpy_fromio(buf, pdata->base + from, len); *retlen = len; @@ -209,7 +209,7 @@ static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 stat;

@@ -235,7 +235,7 @@ static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, uint64_t *len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; int shift0 = ffs(QUADSPI_SR_BP2_0) - 1; int shift3 = ffs(QUADSPI_SR_BP3) - 1 - 3; @@ -257,7 +257,7 @@ static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, static int altera_qspi_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 sector_start, sector_end; u32 num_sectors; @@ -291,7 +291,7 @@ static int altera_qspi_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) static int altera_qspi_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 mem_op;

@@ -304,7 +304,7 @@ static int altera_qspi_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)

static int altera_qspi_probe(struct udevice *dev) { - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; unsigned long base = (unsigned long)pdata->base; struct mtd_info *mtd; @@ -348,7 +348,7 @@ static int altera_qspi_probe(struct udevice *dev)

static int altera_qspi_of_to_plat(struct udevice *dev) { - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); void *blob = (void *)gd->fdt_blob; int node = dev_of_offset(dev); const char *list, *end; @@ -401,6 +401,6 @@ U_BOOT_DRIVER(altera_qspi) = { .id = UCLASS_MTD, .of_match = altera_qspi_ids, .of_to_plat = altera_qspi_of_to_plat, - .plat_auto = sizeof(struct altera_qspi_platdata), + .plat_auto = sizeof(struct altera_qspi_plat), .probe = altera_qspi_probe, }; diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index d59953b6e3c..3c01e3b41c8 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -124,7 +124,7 @@ static int sandbox_sf_probe(struct udevice *dev) const struct flash_info *data; struct sandbox_spi_flash_plat_data *pdata = dev_get_plat(dev); struct sandbox_state *state = state_get_current(); - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct udevice *bus = dev->parent; const char *spec = NULL; struct udevice *emul; diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c index 6171dadedf4..939f199b1fe 100644 --- a/drivers/net/dwmac_socfpga.c +++ b/drivers/net/dwmac_socfpga.c @@ -19,7 +19,7 @@

#include <asm/arch/system_manager.h>

-struct dwmac_socfpga_platdata { +struct dwmac_socfpga_plat { struct dw_eth_pdata dw_eth_pdata; void *phy_intf; u32 reg_shift; @@ -27,7 +27,7 @@ struct dwmac_socfpga_platdata {

static int dwmac_socfpga_of_to_plat(struct udevice *dev) { - struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev); + struct dwmac_socfpga_plat *pdata = dev_get_plat(dev); struct regmap *regmap; struct ofnode_phandle_args args; void *range; @@ -66,7 +66,7 @@ static int dwmac_socfpga_of_to_plat(struct udevice *dev)

static int dwmac_socfpga_probe(struct udevice *dev) { - struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev); + struct dwmac_socfpga_plat *pdata = dev_get_plat(dev); struct eth_pdata *edata = &pdata->dw_eth_pdata.eth_pdata; struct reset_ctl_bulk reset_bulk; int ret; @@ -119,6 +119,6 @@ U_BOOT_DRIVER(dwmac_socfpga) = { .probe = dwmac_socfpga_probe, .ops = &designware_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .plat_auto = sizeof(struct dwmac_socfpga_platdata), + .plat_auto = sizeof(struct dwmac_socfpga_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 765385c41d3..2e684e58393 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -54,7 +54,7 @@ static int ierb_fn_to_pf[] = {0, 1, 2, -1, -1, -1, 3}; /* sets up primary MAC addresses in DT/IERB */ void fdt_fixup_enetc_mac(void *blob) { - struct pci_child_platdata *ppdata; + struct pci_child_plat *ppdata; struct eth_pdata *pdata; struct udevice *dev; struct uclass *uc; @@ -365,7 +365,7 @@ static int enetc_remove(struct udevice *dev)

static int enetc_ls1028a_write_hwaddr(struct udevice *dev) { - struct pci_child_platdata *ppdata = dev_get_parent_plat(dev); + struct pci_child_plat *ppdata = dev_get_parent_plat(dev); const int devfn_to_pf[] = {0, 1, 2, -1, -1, -1, 3}; struct eth_pdata *plat = dev_get_plat(dev); int devfn = PCI_FUNC(ppdata->devfn); diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 0073cb3bb13..a50a5b3f33a 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR; * * dw_eth_pdata: Required platform data for designware driver (must be first) */ -struct gmac_rockchip_platdata { +struct gmac_rockchip_plat { struct dw_eth_pdata dw_eth_pdata; bool clock_input; int tx_delay; @@ -48,14 +48,14 @@ struct gmac_rockchip_platdata {

struct rk_gmac_ops { int (*fix_mac_speed)(struct dw_eth_dev *priv); - void (*set_to_rmii)(struct gmac_rockchip_platdata *pdata); - void (*set_to_rgmii)(struct gmac_rockchip_platdata *pdata); + void (*set_to_rmii)(struct gmac_rockchip_plat *pdata); + void (*set_to_rgmii)(struct gmac_rockchip_plat *pdata); };

static int gmac_rockchip_of_to_plat(struct udevice *dev) { - struct gmac_rockchip_platdata *pdata = dev_get_plat(dev); + struct gmac_rockchip_plat *pdata = dev_get_plat(dev); const char *string;

string = dev_read_string(dev, "clock_in_out"); @@ -344,7 +344,7 @@ static int rv1108_set_rmii_speed(struct dw_eth_dev *priv) return 0; }

-static void px30_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) +static void px30_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata) { struct px30_grf *grf; enum { @@ -360,7 +360,7 @@ static void px30_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) PX30_GMAC_PHY_INTF_SEL_RMII); }

-static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk322x_grf *grf; enum { @@ -403,7 +403,7 @@ static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3228_CLK_TX_DL_CFG_GMAC_SHIFT); }

-static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3288_grf *grf;

@@ -422,7 +422,7 @@ static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3288_CLK_TX_DL_CFG_GMAC_SHIFT); }

-static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) +static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata) { struct rk3308_grf *grf; enum { @@ -438,7 +438,7 @@ static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) RK3308_GMAC_PHY_INTF_SEL_RMII); }

-static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3328_grf_regs *grf; enum { @@ -481,7 +481,7 @@ static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3328_CLK_TX_DL_CFG_GMAC_SHIFT); }

-static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3368_grf *grf; enum { @@ -518,7 +518,7 @@ static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3368_CLK_TX_DL_CFG_GMAC_SHIFT); }

-static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3399_grf_regs *grf;

@@ -538,7 +538,7 @@ static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3399_CLK_TX_DL_CFG_GMAC_SHIFT); }

-static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) +static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata) { struct rv1108_grf *grf;

@@ -555,7 +555,7 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata)

static int gmac_rockchip_probe(struct udevice *dev) { - struct gmac_rockchip_platdata *pdata = dev_get_plat(dev); + struct gmac_rockchip_plat *pdata = dev_get_plat(dev); struct rk_gmac_ops *ops = (struct rk_gmac_ops *)dev_get_driver_data(dev); struct dw_eth_pdata *dw_pdata = dev_get_plat(dev); @@ -760,6 +760,6 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = { .probe = gmac_rockchip_probe, .ops = &gmac_rockchip_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .plat_auto = sizeof(struct gmac_rockchip_platdata), + .plat_auto = sizeof(struct gmac_rockchip_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 7aac8a9132b..da2cfb7f550 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -1187,7 +1187,7 @@ int rtl8169_initialize(struct bd_info *bis) #ifdef CONFIG_DM_ETH static int rtl8169_eth_probe(struct udevice *dev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct rtl8169_private *priv = dev_get_priv(dev); struct eth_pdata *plat = dev_get_plat(dev); u32 iobase; diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index cee3f57c875..5d6331ad346 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -676,7 +676,7 @@ static int nvme_blk_probe(struct udevice *udev) struct blk_desc *desc = dev_get_uclass_plat(udev); struct nvme_ns *ns = dev_get_priv(udev); u8 flbas; - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; struct nvme_id_ns *id;

id = memalign(ndev->page_size, sizeof(struct nvme_id_ns)); diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index f71ba42c389..756d8ad7449 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -111,7 +111,7 @@ UCLASS_DRIVER(pci_emul) = {

/* * This uclass is a child of the pci bus. Its plat is not defined here so - * is defined by its parent, UCLASS_PCI, which uses struct pci_child_platdata. + * is defined by its parent, UCLASS_PCI, which uses struct pci_child_plat. * See per_child_plat_auto in UCLASS_DRIVER(pci). */ UCLASS_DRIVER(pci_emul_parent) = { diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index f82a6bea242..25857b03522 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -49,7 +49,7 @@ struct udevice *pci_get_controller(struct udevice *dev)

pci_dev_t dm_pci_get_bdf(const struct udevice *dev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent;

/* @@ -136,7 +136,7 @@ int pci_bus_find_devfn(const struct udevice *bus, pci_dev_t find_devfn, for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat;

pplat = dev_get_parent_plat(dev); if (pplat && pplat->devfn == find_devfn) { @@ -162,7 +162,7 @@ int dm_pci_bus_find_bdf(pci_dev_t bdf, struct udevice **devp) static int pci_device_matches_ids(struct udevice *dev, struct pci_device_id *ids) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; int i;

pplat = dev_get_parent_plat(dev); @@ -218,7 +218,7 @@ static int dm_pci_bus_find_device(struct udevice *bus, unsigned int vendor, unsigned int device, int *indexp, struct udevice **devp) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; struct udevice *dev;

for (device_find_first_child(bus, &dev); @@ -261,7 +261,7 @@ int dm_pci_find_class(uint find_class, int index, struct udevice **devp) for (pci_find_first_device(&dev); dev; pci_find_next_device(&dev)) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev);

if (pplat->class == find_class && !index--) { *devp = dev; @@ -524,7 +524,7 @@ static void set_vga_bridge_bits(struct udevice *dev) int pci_auto_config_devices(struct udevice *bus) { struct pci_controller *hose = bus->uclass_priv; - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; unsigned int sub_bus; struct udevice *dev; int ret; @@ -799,7 +799,7 @@ int pci_bind_bus_devices(struct udevice *bus) PCI_MAX_PCI_FUNCTIONS - 1); for (bdf = PCI_BDF(dev_seq(bus), 0, 0); bdf <= end; bdf += PCI_BDF(0, 0, 1)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; struct udevice *dev; ulong class;

@@ -1072,7 +1072,7 @@ static int pci_uclass_post_probe(struct udevice *bus)

static int pci_uclass_child_post_bind(struct udevice *dev) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat;

if (!dev_of_valid(dev)) return 0; @@ -1433,7 +1433,7 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr, }

static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off, - struct pci_child_platdata *pdata) + struct pci_child_plat *pdata) { phys_addr_t addr = 0;

@@ -1464,7 +1464,7 @@ static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off, }

static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags, - int ea_off, struct pci_child_platdata *pdata) + int ea_off, struct pci_child_plat *pdata) { int ea_cnt, i, entry_size; int bar_id = (bar - PCI_BASE_ADDRESS_0) >> 2; @@ -1515,7 +1515,7 @@ static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags,

void *dm_pci_map_bar(struct udevice *dev, int bar, int flags) { - struct pci_child_platdata *pdata = dev_get_parent_plat(dev); + struct pci_child_plat *pdata = dev_get_parent_plat(dev); struct udevice *udev = dev; pci_addr_t pci_bus_addr; u32 bar_response; @@ -1717,7 +1717,7 @@ int pci_sriov_init(struct udevice *pdev, int vf_en) bdf += PCI_BDF(0, 0, vf_offset);

for (vf = 0; vf < num_vfs; vf++) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; ulong class;

pci_bus_read_config(bus, bdf, PCI_CLASS_DEVICE, @@ -1789,7 +1789,7 @@ UCLASS_DRIVER(pci) = { .post_probe = pci_uclass_post_probe, .child_post_bind = pci_uclass_child_post_bind, .per_device_auto = sizeof(struct pci_controller), - .per_child_plat_auto = sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_plat), };

static const struct dm_pci_ops pci_bridge_ops = { diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 9c98496d7a3..4a21813a82f 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -68,7 +68,7 @@ __weak uint32_t board_map_oprom_vendev(uint32_t vendev)

static int pci_rom_probe(struct udevice *dev, struct pci_rom_header **hdrp) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct pci_rom_header *rom_header; struct pci_rom_data *rom_data; u16 rom_vendor, rom_device; @@ -236,7 +236,7 @@ void setup_video(struct screen_info *screen_info) int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), int exec_method) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct pci_rom_header *rom = NULL, *ram = NULL; int vesa_mode = -1; bool emulate, alloced; @@ -328,7 +328,7 @@ err: #ifdef CONFIG_DM_VIDEO int vbe_setup_video_priv(struct vesa_mode_info *vesa, struct video_priv *uc_priv, - struct video_uc_platdata *plat) + struct video_uc_plat *plat) { if (!vesa->x_resolution) return log_msg_ret("No x resolution", -ENXIO); @@ -363,7 +363,7 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa,

int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); int ret;

diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index e2924105bd1..ca44d002371 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -132,5 +132,5 @@ U_BOOT_DRIVER(pci_sandbox) = {

/* Attach an emulator if we can */ .child_post_bind = dm_scan_fdt_dev, - .per_child_plat_auto = sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_plat), }; diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c index fc83ca3ab1c..f5556713878 100644 --- a/drivers/pci/pcie_mediatek.c +++ b/drivers/pci/pcie_mediatek.c @@ -251,7 +251,7 @@ static struct mtk_pcie_port *mtk_pcie_find_port(const struct udevice *bus, struct mtk_pcie *pcie = dev_get_priv(bus); struct mtk_pcie_port *port; struct udevice *dev; - struct pci_child_platdata *pplat = NULL; + struct pci_child_plat *pplat = NULL; int ret = 0;

if (PCI_BUS(bdf) != 0) { diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c index 64cde5e329c..9f96505dd5a 100644 --- a/drivers/pinctrl/intel/pinctrl.c +++ b/drivers/pinctrl/intel/pinctrl.c @@ -616,7 +616,7 @@ int pinctrl_config_pads_for_node(struct udevice *dev, ofnode node) int intel_pinctrl_of_to_plat(struct udevice *dev, const struct pad_community *comm, int num_cfgs) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); struct intel_pinctrl_priv *priv = dev_get_priv(dev);

if (!comm) { diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c index 2432f3f363f..48b0e9a161b 100644 --- a/drivers/pinctrl/intel/pinctrl_apl.c +++ b/drivers/pinctrl/intel/pinctrl_apl.c @@ -18,11 +18,11 @@ #include <asm/intel_pinctrl_defs.h>

/** - * struct apl_gpio_platdata - platform data for each device + * struct apl_gpio_plat - platform data for each device * * @dtplat: of-platdata data from C struct */ -struct apl_gpio_platdata { +struct apl_gpio_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) /* Put this first since driver model will copy the data here */ struct dtd_intel_apl_pinctrl dtplat; @@ -138,12 +138,12 @@ static const struct pad_community apl_gpio_communities[] = {

static int apl_pinctrl_of_to_plat(struct udevice *dev) { - struct p2sb_child_platdata *pplat; + struct p2sb_child_plat *pplat; const struct pad_community *comm = NULL; int i;

#if CONFIG_IS_ENABLED(OF_PLATDATA) - struct apl_gpio_platdata *plat = dev_get_plat(dev); + struct apl_gpio_plat *plat = dev_get_plat(dev); int ret;

/* @@ -185,5 +185,5 @@ U_BOOT_DRIVER(intel_apl_pinctrl) = { #endif .of_to_plat = apl_pinctrl_of_to_plat, .priv_auto = sizeof(struct intel_pinctrl_priv), - .plat_auto = sizeof(struct apl_gpio_platdata), + .plat_auto = sizeof(struct apl_gpio_plat), }; diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 9a25cfa95d2..1aba8a91501 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR; * framework groups, Atmel PIO groups will be called banks. */

-struct atmel_pio4_platdata { +struct atmel_pio4_plat { struct atmel_pio4_port *reg_base; };

@@ -95,7 +95,7 @@ static u32 atmel_pinctrl_get_pinconf(const void *blob, int node) static inline struct atmel_pio4_port *atmel_pio4_bank_base(struct udevice *dev, u32 bank) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); struct atmel_pio4_port *bank_base = (struct atmel_pio4_port *)((u32)plat->reg_base + ATMEL_PIO_BANK_OFFSET * bank); @@ -154,7 +154,7 @@ const struct pinctrl_ops atmel_pinctrl_ops = {

static int atmel_pinctrl_probe(struct udevice *dev) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); fdt_addr_t addr_base;

dev = dev_get_parent(dev); @@ -178,6 +178,6 @@ U_BOOT_DRIVER(atmel_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = atmel_pinctrl_match, .probe = atmel_pinctrl_probe, - .plat_auto = sizeof(struct atmel_pio4_platdata), + .plat_auto = sizeof(struct atmel_pio4_plat), .ops = &atmel_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c index 5093a52017e..690e5c77062 100644 --- a/drivers/pinctrl/pinctrl-qe-io.c +++ b/drivers/pinctrl/pinctrl-qe-io.c @@ -18,12 +18,12 @@ #include <linux/ioport.h>

/** - * struct qe_io_platdata + * struct qe_io_plat * * @base: Base register address * @num_par_io_ports number of io ports */ -struct qe_io_platdata { +struct qe_io_plat { qepio83xx_t *base; u32 num_io_ports; }; @@ -122,7 +122,7 @@ void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign) #else static int qe_io_of_to_plat(struct udevice *dev) { - struct qe_io_platdata *plat = dev->plat; + struct qe_io_plat *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -143,7 +143,7 @@ static int qe_io_of_to_plat(struct udevice *dev) */ static int par_io_of_config_node(struct udevice *dev, ofnode pio) { - struct qe_io_platdata *plat = dev->plat; + struct qe_io_plat *plat = dev->plat; qepio83xx_t *par_io = plat->base; const unsigned int *pio_map; int pio_map_len; @@ -246,7 +246,7 @@ U_BOOT_DRIVER(par_io_pinctrl) = { .of_match = of_match_ptr(par_io_pinctrl_match), .probe = par_io_pinctrl_probe, .of_to_plat = qe_io_of_to_plat, - .plat_auto = sizeof(struct qe_io_platdata), + .plat_auto = sizeof(struct qe_io_plat), .ops = &par_io_pinctrl_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 1ea869a82b6..aaaa6bdadf7 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR; /* oe = 1, pu = 1, od = 1 */ #define BIDIR_PU (OE | PU | OD)

-struct sti_pinctrl_platdata { +struct sti_pinctrl_plat { struct regmap *regmap; };

@@ -57,7 +57,7 @@ struct sti_pin_desc { */ void sti_alternate_select(struct udevice *dev, struct sti_pin_desc *pin_desc) { - struct sti_pinctrl_platdata *plat = dev_get_plat(dev); + struct sti_pinctrl_plat *plat = dev_get_plat(dev); unsigned long sysconf, *sysconfreg; int alt = pin_desc->alt; int bank = pin_desc->bank; @@ -91,7 +91,7 @@ void sti_alternate_select(struct udevice *dev, struct sti_pin_desc *pin_desc) /* pin configuration */ void sti_pin_configure(struct udevice *dev, struct sti_pin_desc *pin_desc) { - struct sti_pinctrl_platdata *plat = dev_get_plat(dev); + struct sti_pinctrl_plat *plat = dev_get_plat(dev); int bit; int oe = 0, pu = 0, od = 0; unsigned long *sysconfreg; @@ -277,7 +277,7 @@ static int sti_pinctrl_set_state(struct udevice *dev, struct udevice *config)

static int sti_pinctrl_probe(struct udevice *dev) { - struct sti_pinctrl_platdata *plat = dev_get_plat(dev); + struct sti_pinctrl_plat *plat = dev_get_plat(dev); struct udevice *syscon; int err;

@@ -316,6 +316,6 @@ U_BOOT_DRIVER(pinctrl_sti) = { .of_match = sti_pinctrl_ids, .ops = &sti_pinctrl_ops, .probe = sti_pinctrl_probe, - .plat_auto = sizeof(struct sti_pinctrl_platdata), + .plat_auto = sizeof(struct sti_pinctrl_plat), .ops = &sti_pinctrl_ops, }; diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c index bc816842a19..82bdf05b24b 100644 --- a/drivers/pinctrl/renesas/pfc-r7s72100.c +++ b/drivers/pinctrl/renesas/pfc-r7s72100.c @@ -32,14 +32,14 @@

DECLARE_GLOBAL_DATA_PTR;

-struct r7s72100_pfc_platdata { +struct r7s72100_pfc_plat { void __iomem *base; };

static void r7s72100_pfc_set_function(struct udevice *dev, u16 bank, u16 line, u16 func, u16 inbuf, u16 bidir) { - struct r7s72100_pfc_platdata *plat = dev_get_plat(dev); + struct r7s72100_pfc_plat *plat = dev_get_plat(dev);

clrsetbits_le16(plat->base + PFCAE(bank), BIT(line), (func & BIT(2)) ? BIT(line) : 0); @@ -108,7 +108,7 @@ const struct pinctrl_ops r7s72100_pfc_ops = {

static int r7s72100_pfc_probe(struct udevice *dev) { - struct r7s72100_pfc_platdata *plat = dev_get_plat(dev); + struct r7s72100_pfc_plat *plat = dev_get_plat(dev); fdt_addr_t addr_base; ofnode node;

@@ -142,6 +142,6 @@ U_BOOT_DRIVER(r7s72100_pfc) = { .id = UCLASS_PINCTRL, .of_match = r7s72100_pfc_match, .probe = r7s72100_pfc_probe, - .plat_auto = sizeof(struct r7s72100_pfc_platdata), + .plat_auto = sizeof(struct r7s72100_pfc_plat), .ops = &r7s72100_pfc_ops, }; diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c index 7eeecc0523d..32a2836f0bf 100644 --- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c +++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c @@ -204,7 +204,7 @@ void pmc_dump_info(struct udevice *dev) upriv->gen_pmcon1, upriv->gen_pmcon2, upriv->gen_pmcon3); }

-int pmc_ofdata_to_uc_platdata(struct udevice *dev) +int pmc_ofdata_to_uc_plat(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); int ret; diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c index 0a72afdccbf..a61eb5bd85c 100644 --- a/drivers/power/acpi_pmc/pmc_emul.c +++ b/drivers/power/acpi_pmc/pmc_emul.c @@ -14,12 +14,12 @@ #include <power/acpi_pmc.h>

/** - * struct pmc_emul_platdata - platform data for this device + * struct pmc_emul_plat - platform data for this device * * @command: Current PCI command value * @bar: Current base address values */ -struct pmc_emul_platdata { +struct pmc_emul_plat { u16 command; u32 bar[6]; }; @@ -46,7 +46,7 @@ struct pmc_emul_priv { static int sandbox_pmc_emul_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct pmc_emul_platdata *plat = dev_get_plat(emul); + struct pmc_emul_plat *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -99,7 +99,7 @@ static int sandbox_pmc_emul_read_config(const struct udevice *emul, uint offset, static int sandbox_pmc_emul_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct pmc_emul_platdata *plat = dev_get_plat(emul); + struct pmc_emul_plat *plat = dev_get_plat(emul);

switch (offset) { case PCI_COMMAND: @@ -127,7 +127,7 @@ static int sandbox_pmc_emul_write_config(struct udevice *emul, uint offset, static int sandbox_pmc_emul_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct pmc_emul_platdata *plat = dev_get_plat(emul); + struct pmc_emul_plat *plat = dev_get_plat(emul); int barnum;

for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { @@ -236,7 +236,7 @@ U_BOOT_DRIVER(sandbox_pmc_emul_emul) = { .ops = &sandbox_pmc_emul_emul_ops, .probe = sandbox_pmc_probe, .priv_auto = sizeof(struct pmc_emul_priv), - .plat_auto = sizeof(struct pmc_emul_platdata), + .plat_auto = sizeof(struct pmc_emul_plat), };

static struct pci_device_id sandbox_pmc_emul_supported[] = { diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c index 6cb7af10c20..8cf03f737c0 100644 --- a/drivers/power/acpi_pmc/sandbox.c +++ b/drivers/power/acpi_pmc/sandbox.c @@ -74,7 +74,7 @@ static int sandbox_pmc_probe(struct udevice *dev) upriv->pmc_bar0 = map_sysmem(base, 0x2000); upriv->gpe_cfg = (u32 *)(upriv->pmc_bar0 + GPIO_GPE_CFG);

- return pmc_ofdata_to_uc_platdata(dev); + return pmc_ofdata_to_uc_plat(dev); }

static struct acpi_pmc_ops sandbox_pmc_ops = { diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c index cf6e068f324..ec369aedd32 100644 --- a/drivers/power/domain/imx8-power-domain-legacy.c +++ b/drivers/power/domain/imx8-power-domain-legacy.c @@ -100,7 +100,7 @@ static int imx8_power_domain_free(struct power_domain *power_domain) static int imx8_power_domain_on(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8_power_domain_platdata *pdata; + struct imx8_power_domain_plat *pdata; struct imx8_power_domain_priv *ppriv; sc_err_t ret; int err; @@ -116,7 +116,7 @@ static int imx8_power_domain_on(struct power_domain *power_domain) return err; }

- pdata = (struct imx8_power_domain_platdata *)dev_get_plat(dev); + pdata = (struct imx8_power_domain_plat *)dev_get_plat(dev); ppriv = (struct imx8_power_domain_priv *)dev_get_priv(dev);

debug("%s(power_domain=%s) resource_id %d\n", __func__, dev->name, @@ -151,7 +151,7 @@ static int imx8_power_domain_off_node(struct power_domain *power_domain) struct udevice *child; struct imx8_power_domain_priv *ppriv; struct imx8_power_domain_priv *child_ppriv; - struct imx8_power_domain_platdata *pdata; + struct imx8_power_domain_plat *pdata; sc_err_t ret;

ppriv = dev_get_priv(dev); @@ -202,13 +202,13 @@ static int imx8_power_domain_off_parentnodes(struct power_domain *power_domain) struct udevice *child; struct imx8_power_domain_priv *ppriv; struct imx8_power_domain_priv *child_ppriv; - struct imx8_power_domain_platdata *pdata; + struct imx8_power_domain_plat *pdata; sc_err_t ret; struct power_domain parent_pd;

if (device_get_uclass_id(parent) == UCLASS_POWER_DOMAIN) { pdata = - (struct imx8_power_domain_platdata *)dev_get_plat(parent); + (struct imx8_power_domain_plat *)dev_get_plat(parent); ppriv = (struct imx8_power_domain_priv *)dev_get_priv(parent);

debug("%s, %s, state_on %d\n", __func__, parent->name, @@ -343,7 +343,7 @@ static int imx8_power_domain_probe(struct udevice *dev) static int imx8_power_domain_of_to_plat(struct udevice *dev) { int reg; - struct imx8_power_domain_platdata *pdata = dev_get_plat(dev); + struct imx8_power_domain_plat *pdata = dev_get_plat(dev);

reg = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1); if (reg == -1) { @@ -377,7 +377,7 @@ U_BOOT_DRIVER(imx8_power_domain) = { .bind = imx8_power_domain_bind, .probe = imx8_power_domain_probe, .of_to_plat = imx8_power_domain_of_to_plat, - .plat_auto = sizeof(struct imx8_power_domain_platdata), + .plat_auto = sizeof(struct imx8_power_domain_plat), .priv_auto = sizeof(struct imx8_power_domain_priv), .ops = &imx8_power_domain_ops, .flags = DM_FLAG_DEFAULT_PD_CTRL_OFF, diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c index 499788967c9..341c83b1365 100644 --- a/drivers/power/domain/imx8m-power-domain.c +++ b/drivers/power/domain/imx8m-power-domain.c @@ -30,7 +30,7 @@ static int imx8m_power_domain_free(struct power_domain *power_domain) static int imx8m_power_domain_on(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8m_power_domain_platdata *pdata; + struct imx8m_power_domain_plat *pdata;

pdata = dev_get_plat(dev);

@@ -49,7 +49,7 @@ static int imx8m_power_domain_on(struct power_domain *power_domain) static int imx8m_power_domain_off(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8m_power_domain_platdata *pdata; + struct imx8m_power_domain_plat *pdata; pdata = dev_get_plat(dev);

if (pdata->resource_id < 0) @@ -106,7 +106,7 @@ static int imx8m_power_domain_probe(struct udevice *dev)

static int imx8m_power_domain_of_to_plat(struct udevice *dev) { - struct imx8m_power_domain_platdata *pdata = dev_get_plat(dev); + struct imx8m_power_domain_plat *pdata = dev_get_plat(dev);

pdata->resource_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1); @@ -137,6 +137,6 @@ U_BOOT_DRIVER(imx8m_power_domain) = { .bind = imx8m_power_domain_bind, .probe = imx8m_power_domain_probe, .of_to_plat = imx8m_power_domain_of_to_plat, - .plat_auto = sizeof(struct imx8m_power_domain_platdata), + .plat_auto = sizeof(struct imx8m_power_domain_plat), .ops = &imx8m_power_domain_ops, }; diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c index 1637a2d018a..74011d62985 100644 --- a/drivers/power/regulator/bd71837.c +++ b/drivers/power/regulator/bd71837.c @@ -35,7 +35,7 @@ struct bd71837_vrange { };

/** - * struct bd71837_platdata - describe regulator control registers + * struct bd71837_plat - describe regulator control registers * * @name: name of the regulator. Used for matching the dt-entry * @enable_reg: register address used to enable/disable regulator @@ -49,7 +49,7 @@ struct bd71837_vrange { * @sel_mask: bit to toggle in order to transfer the register control to SW * @dvs: whether the voltage can be changed when regulator is enabled */ -struct bd71837_platdata { +struct bd71837_plat { const char *name; u8 enable_reg; u8 enablemask; @@ -160,7 +160,7 @@ static struct bd71837_vrange ldo7_vranges[] = { * is powering NXP i.MX8. In this use-case we (for now) only allow control * for BUCK3 and BUCK4 which are not boot critical. */ -static struct bd71837_platdata bd71837_reg_data[] = { +static struct bd71837_plat bd71837_reg_data[] = { /* Bucks 1-4 which support dynamic voltage scaling */ BD_DATA("BUCK1", BD718XX_BUCK1_CTRL, HW_STATE_CONTROL, BD718XX_BUCK1_VOLT_RUN, DVS_BUCK_RUN_MASK, dvs_buck_vranges, 0, @@ -205,7 +205,7 @@ static struct bd71837_platdata bd71837_reg_data[] = { BD71837_LDO7_MASK, ldo7_vranges, 0, false, BD718XX_LDO_SEL), };

-static struct bd71837_platdata bd71847_reg_data[] = { +static struct bd71837_plat bd71847_reg_data[] = { /* Bucks 1 and 2 which support dynamic voltage scaling */ BD_DATA("BUCK1", BD718XX_BUCK1_CTRL, HW_STATE_CONTROL, BD718XX_BUCK1_VOLT_RUN, DVS_BUCK_RUN_MASK, dvs_buck_vranges, 0, @@ -274,7 +274,7 @@ static int vrange_find_selector(struct bd71837_vrange *r, int val, static int bd71837_get_enable(struct udevice *dev) { int val; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev);

/* * boot critical regulators on bd71837 must not be controlled by sw @@ -298,7 +298,7 @@ static int bd71837_get_enable(struct udevice *dev) static int bd71837_set_enable(struct udevice *dev, bool enable) { int val = 0; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev);

/* * boot critical regulators on bd71837 must not be controlled by sw @@ -321,7 +321,7 @@ static int bd71837_set_value(struct udevice *dev, int uvolt) unsigned int range; int i; int found = 0; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev);

/* * An under/overshooting may occur if voltage is changed for other @@ -369,7 +369,7 @@ static int bd71837_get_value(struct udevice *dev) { unsigned int reg, range; unsigned int tmp; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev); int i;

reg = pmic_reg_read(dev->parent, plat->volt_reg); @@ -399,11 +399,11 @@ static int bd71837_get_value(struct udevice *dev)

static int bd71837_regulator_probe(struct udevice *dev) { - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev); int i, ret; struct dm_regulator_uclass_plat *uc_pdata; int type; - struct bd71837_platdata *init_data; + struct bd71837_plat *init_data; int data_amnt;

type = dev_get_driver_data(dev_get_parent(dev)); @@ -466,5 +466,5 @@ U_BOOT_DRIVER(bd71837_regulator) = { .id = UCLASS_REGULATOR, .ops = &bd71837_regulator_ops, .probe = bd71837_regulator_probe, - .plat_auto = sizeof(struct bd71837_platdata), + .plat_auto = sizeof(struct bd71837_plat), }; diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index fcd1d5292cc..9d8a235b79b 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -78,7 +78,7 @@ enum { FAN53555_MONITOR, };

-struct fan53555_platdata { +struct fan53555_plat { /* Voltage setting register */ unsigned int vol_reg; unsigned int sleep_reg; @@ -102,7 +102,7 @@ struct fan53555_priv {

static int fan53555_regulator_of_to_plat(struct udevice *dev) { - struct fan53555_platdata *dev_pdata = dev_get_plat(dev); + struct fan53555_plat *dev_pdata = dev_get_plat(dev); struct dm_regulator_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); u32 sleep_vsel; @@ -136,7 +136,7 @@ static int fan53555_regulator_of_to_plat(struct udevice *dev)

static int fan53555_regulator_get_value(struct udevice *dev) { - struct fan53555_platdata *pdata = dev_get_plat(dev); + struct fan53555_plat *pdata = dev_get_plat(dev); struct fan53555_priv *priv = dev_get_priv(dev); int reg; int voltage; @@ -153,7 +153,7 @@ static int fan53555_regulator_get_value(struct udevice *dev)

static int fan53555_regulator_set_value(struct udevice *dev, int uV) { - struct fan53555_platdata *pdata = dev_get_plat(dev); + struct fan53555_plat *pdata = dev_get_plat(dev); struct fan53555_priv *priv = dev_get_priv(dev); u8 vol;

@@ -239,7 +239,7 @@ U_BOOT_DRIVER(fan53555_regulator) = { .id = UCLASS_REGULATOR, .ops = &fan53555_regulator_ops, .of_to_plat = fan53555_regulator_of_to_plat, - .plat_auto = sizeof(struct fan53555_platdata), + .plat_auto = sizeof(struct fan53555_plat), .priv_auto = sizeof(struct fan53555_priv), .probe = fan53555_probe, }; diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index efe2ec9a164..d3e0fb672d9 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -17,7 +17,7 @@ static int fixed_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct regulator_common_platdata *dev_pdata; + struct regulator_common_plat *dev_pdata;

dev_pdata = dev_get_plat(dev); uc_pdata = dev_get_uclass_plat(dev); @@ -89,5 +89,5 @@ U_BOOT_DRIVER(regulator_fixed) = { .ops = &fixed_regulator_ops, .of_match = fixed_regulator_ids, .of_to_plat = fixed_regulator_of_to_plat, - .plat_auto = sizeof(struct regulator_common_platdata), + .plat_auto = sizeof(struct regulator_common_plat), }; diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 2565c4416a8..e5e08a33d3d 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -18,8 +18,8 @@

#define GPIO_REGULATOR_MAX_STATES 2

-struct gpio_regulator_platdata { - struct regulator_common_platdata common; +struct gpio_regulator_plat { + struct regulator_common_plat common; struct gpio_desc gpio; /* GPIO for regulator voltage control */ int states[GPIO_REGULATOR_MAX_STATES]; int voltages[GPIO_REGULATOR_MAX_STATES]; @@ -28,7 +28,7 @@ struct gpio_regulator_platdata { static int gpio_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct gpio_regulator_platdata *dev_pdata; + struct gpio_regulator_plat *dev_pdata; struct gpio_desc *gpio; int ret, count, i, j; u32 states_array[GPIO_REGULATOR_MAX_STATES * 2]; @@ -80,7 +80,7 @@ static int gpio_regulator_of_to_plat(struct udevice *dev) static int gpio_regulator_get_value(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); int enable;

if (!dev_pdata->gpio.dev) @@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct udevice *dev)

static int gpio_regulator_set_value(struct udevice *dev, int uV) { - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); int ret; bool enable;

@@ -127,13 +127,13 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV)

static int gpio_regulator_get_enable(struct udevice *dev) { - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); return regulator_common_get_enable(dev, &dev_pdata->common); }

static int gpio_regulator_set_enable(struct udevice *dev, bool enable) { - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); return regulator_common_set_enable(dev, &dev_pdata->common, enable); }

@@ -155,5 +155,5 @@ U_BOOT_DRIVER(gpio_regulator) = { .ops = &gpio_regulator_ops, .of_match = gpio_regulator_ids, .of_to_plat = gpio_regulator_of_to_plat, - .plat_auto = sizeof(struct gpio_regulator_platdata), + .plat_auto = sizeof(struct gpio_regulator_plat), }; diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index d75ea7c1ed1..698a6fa5923 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -41,11 +41,11 @@ struct pfuze100_regulator_desc { };

/** - * struct pfuze100_regulator_platdata - platform data for pfuze100 + * struct pfuze100_regulator_plat - platform data for pfuze100 * * @desc: Points the description entry of one regulator of pfuze100 */ -struct pfuze100_regulator_platdata { +struct pfuze100_regulator_plat { struct pfuze100_regulator_desc *desc; };

@@ -261,7 +261,7 @@ static struct pfuze100_regulator_desc *se_desc(struct pfuze100_regulator_desc *d static int pfuze100_regulator_probe(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); + struct pfuze100_regulator_plat *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc;

switch (dev_get_driver_data(dev_get_parent(dev))) { @@ -315,7 +315,7 @@ static int pfuze100_regulator_probe(struct udevice *dev) static int pfuze100_regulator_mode(struct udevice *dev, int op, int *opmode) { int val; - struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); + struct pfuze100_regulator_plat *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc = plat->desc;

if (op == PMIC_OP_GET) { @@ -449,7 +449,7 @@ static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV) { int i; int val; - struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); + struct pfuze100_regulator_plat *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc = plat->desc; struct dm_regulator_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); @@ -572,5 +572,5 @@ U_BOOT_DRIVER(pfuze100_regulator) = { .id = UCLASS_REGULATOR, .ops = &pfuze100_regulator_ops, .probe = pfuze100_regulator_probe, - .plat_auto = sizeof(struct pfuze100_regulator_platdata), + .plat_auto = sizeof(struct pfuze100_regulator_plat), }; diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index d307a1948a0..93d8196b381 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -13,7 +13,7 @@ #include "regulator_common.h"

int regulator_common_of_to_plat(struct udevice *dev, - struct regulator_common_platdata *dev_pdata, + struct regulator_common_plat *dev_pdata, const char *enable_gpio_name) { struct gpio_desc *gpio; @@ -49,7 +49,7 @@ int regulator_common_of_to_plat(struct udevice *dev, }

int regulator_common_get_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata) + struct regulator_common_plat *dev_pdata) { /* Enable GPIO is optional */ if (!dev_pdata->gpio.dev) @@ -59,7 +59,7 @@ int regulator_common_get_enable(const struct udevice *dev, }

int regulator_common_set_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata, bool enable) + struct regulator_common_plat *dev_pdata, bool enable) { int ret;

diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index 5ae0b9aa40b..c10492f0167 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -9,18 +9,18 @@

#include <asm/gpio.h>

-struct regulator_common_platdata { +struct regulator_common_plat { struct gpio_desc gpio; /* GPIO for regulator enable control */ unsigned int startup_delay_us; unsigned int off_on_delay_us; };

int regulator_common_of_to_plat(struct udevice *dev, - struct regulator_common_platdata *dev_pdata, - const char *enable_gpio_name); + struct regulator_common_plat *dev_pdata, const + char *enable_gpio_name); int regulator_common_get_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata); + struct regulator_common_plat *dev_pdata); int regulator_common_set_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata, bool enable); + struct regulator_common_plat *dev_pdata, bool enable);

#endif /* _REGULATOR_COMMON_H */ diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index 0e677f3ec78..a9d051852a4 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -895,7 +895,7 @@ static int rk3368_dmc_of_to_plat(struct udevice *dev) }

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk3368_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3368_dmc *of_plat = &plat->of_plat; @@ -923,7 +923,7 @@ static int rk3368_dmc_probe(struct udevice *dev) struct dram_info *priv = dev_get_priv(dev);

#if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index d0b0601fbe6..25ae69e9acd 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -853,7 +853,7 @@ static int rk3188_dmc_of_to_plat(struct udevice *dev) #endif /* CONFIG_SPL_BUILD */

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk3188_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3188_dmc *of_plat = &plat->of_plat; @@ -866,9 +866,8 @@ static int conv_of_platdata(struct udevice *dev) memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base)); /* rk3188 supports dual-channel, set default channel num to 2 */ plat->num_channels = 1; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, of_plat->reg, + ARRAY_SIZE(of_plat->reg) / 2, &plat->map); if (ret) return ret;

@@ -890,7 +889,7 @@ static int rk3188_dmc_probe(struct udevice *dev)

#ifdef CONFIG_SPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index bdc463c1d76..66235bd420a 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -754,7 +754,7 @@ static int rk322x_dmc_of_to_plat(struct udevice *dev) #endif /* CONFIG_TPL_BUILD */

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk322x_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk322x_dmc *of_plat = &plat->of_plat; @@ -767,9 +767,8 @@ static int conv_of_platdata(struct udevice *dev) memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base));

plat->num_channels = 1; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, of_plat->reg, + ARRAY_SIZE(of_plat->reg) / 2, &plat->map); if (ret) return ret;

@@ -789,7 +788,7 @@ static int rk322x_dmc_probe(struct udevice *dev) priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); #ifdef CONFIG_TPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index 094ae36c884..a933abf0d45 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -1015,7 +1015,7 @@ static int rk3288_dmc_of_to_plat(struct udevice *dev) #endif /* CONFIG_SPL_BUILD */

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk3288_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3288_dmc *of_plat = &plat->of_plat; @@ -1028,9 +1028,8 @@ static int conv_of_platdata(struct udevice *dev) memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base)); /* Rk3288 supports dual-channel, set default channel num to 2 */ plat->num_channels = 2; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, of_plat->reg, + ARRAY_SIZE(of_plat->reg) / 2, &plat->map); if (ret) return ret;

@@ -1053,7 +1052,7 @@ static int rk3288_dmc_probe(struct udevice *dev) #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index cfd351501a3..9af4c372d50 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -48,15 +48,14 @@ struct rockchip_dmc_plat { };

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rockchip_dmc_plat *plat = dev_get_plat(dev); struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; int ret;

- ret = regmap_init_mem_platdata(dev, dtplat->reg, - ARRAY_SIZE(dtplat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, dtplat->reg, + ARRAY_SIZE(dtplat->reg) / 2, &plat->map); if (ret) return ret;

@@ -525,7 +524,7 @@ static int rk3328_dmc_init(struct udevice *dev) struct rk3328_sdram_params *params = (void *)dtplat->rockchip_sdram_params;

- ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 261ded0760e..a83a670b322 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -3034,15 +3034,14 @@ static int rk3399_dmc_of_to_plat(struct udevice *dev) }

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rockchip_dmc_plat *plat = dev_get_plat(dev); struct dtd_rockchip_rk3399_dmc *dtplat = &plat->dtplat; int ret;

- ret = regmap_init_mem_platdata(dev, dtplat->reg, - ARRAY_SIZE(dtplat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, dtplat->reg, + ARRAY_SIZE(dtplat->reg) / 2, &plat->map); if (ret) return ret;

@@ -3076,7 +3075,7 @@ static int rk3399_dmc_init(struct udevice *dev) struct rk3399_sdram_params *params = (void *)dtplat->rockchip_sdram_params;

- ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index bebfce40a63..5a4f45ad5af 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -11,7 +11,7 @@ #include <rng.h> #include <asm/io.h>

-struct meson_rng_platdata { +struct meson_rng_plat { fdt_addr_t base; struct clk clk; }; @@ -26,7 +26,7 @@ struct meson_rng_platdata { */ static int meson_rng_read(struct udevice *dev, void *data, size_t len) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev); char *buffer = (char *)data;

while (len) { @@ -52,7 +52,7 @@ static int meson_rng_read(struct udevice *dev, void *data, size_t len) */ static int meson_rng_probe(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev); int err;

err = clk_enable(&pdata->clk); @@ -70,7 +70,7 @@ static int meson_rng_probe(struct udevice *dev) */ static int meson_rng_remove(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev);

return clk_disable(&pdata->clk); } @@ -83,7 +83,7 @@ static int meson_rng_remove(struct udevice *dev) */ static int meson_rng_of_to_plat(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev); int err;

pdata->base = dev_read_addr(dev); @@ -116,6 +116,6 @@ U_BOOT_DRIVER(meson_rng) = { .ops = &meson_rng_ops, .probe = meson_rng_probe, .remove = meson_rng_remove, - .plat_auto = sizeof(struct meson_rng_platdata), + .plat_auto = sizeof(struct meson_rng_plat), .of_to_plat = meson_rng_of_to_plat, }; diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c index ec233d13211..800150f1147 100644 --- a/drivers/rng/rockchip_rng.c +++ b/drivers/rng/rockchip_rng.c @@ -49,7 +49,7 @@ struct rk_rng_soc_data { int (*rk_rng_read)(struct udevice *dev, void *data, size_t len); };

-struct rk_rng_platdata { +struct rk_rng_plat { fdt_addr_t base; struct rk_rng_soc_data *soc_data; }; @@ -77,7 +77,7 @@ static int rk_rng_read_regs(fdt_addr_t addr, void *buf, size_t size)

static int rk_v1_rng_read(struct udevice *dev, void *data, size_t len) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev); u32 reg = 0; int retval;

@@ -108,7 +108,7 @@ exit:

static int rk_v2_rng_read(struct udevice *dev, void *data, size_t len) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev); u32 reg = 0; int retval;

@@ -146,7 +146,7 @@ static int rockchip_rng_read(struct udevice *dev, void *data, size_t len) unsigned int i; int ret = -EIO;

- struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev);

if (!len) return 0; @@ -170,7 +170,7 @@ exit:

static int rockchip_rng_of_to_plat(struct udevice *dev) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev);

memset(pdata, 0x00, sizeof(*pdata));

@@ -183,7 +183,7 @@ static int rockchip_rng_of_to_plat(struct udevice *dev)

static int rockchip_rng_probe(struct udevice *dev) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev);

pdata->soc_data = (struct rk_rng_soc_data *)dev_get_driver_data(dev);

@@ -221,5 +221,5 @@ U_BOOT_DRIVER(rockchip_rng) = { .ops = &rockchip_rng_ops, .probe = rockchip_rng_probe, .of_to_plat = rockchip_rng_of_to_plat, - .priv_auto = sizeof(struct rk_rng_platdata), + .priv_auto = sizeof(struct rk_rng_plat), }; diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index 30505ee7fc6..8ea00e3e890 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -30,7 +30,7 @@

#define RNG_DR 0x08

-struct stm32_rng_platdata { +struct stm32_rng_plat { fdt_addr_t base; struct clk clk; struct reset_ctl rst; @@ -41,7 +41,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) int retval, i; u32 sr, count, reg; size_t increment; - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev);

while (len > 0) { retval = readl_poll_timeout(pdata->base + RNG_SR, sr, @@ -80,7 +80,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) return 0; }

-static int stm32_rng_init(struct stm32_rng_platdata *pdata) +static int stm32_rng_init(struct stm32_rng_plat *pdata) { int err;

@@ -97,7 +97,7 @@ static int stm32_rng_init(struct stm32_rng_platdata *pdata) return 0; }

-static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata) +static int stm32_rng_cleanup(struct stm32_rng_plat *pdata) { writel(0, pdata->base + RNG_CR);

@@ -106,7 +106,7 @@ static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata)

static int stm32_rng_probe(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev);

reset_assert(&pdata->rst); udelay(20); @@ -117,14 +117,14 @@ static int stm32_rng_probe(struct udevice *dev)

static int stm32_rng_remove(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev);

return stm32_rng_cleanup(pdata); }

static int stm32_rng_of_to_plat(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); int err;

pdata->base = dev_read_addr(dev); @@ -160,6 +160,6 @@ U_BOOT_DRIVER(stm32_rng) = { .ops = &stm32_rng_ops, .probe = stm32_rng_probe, .remove = stm32_rng_remove, - .plat_auto = sizeof(struct stm32_rng_platdata), + .plat_auto = sizeof(struct stm32_rng_plat), .of_to_plat = stm32_rng_of_to_plat, }; diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index b9797f312ad..a1d376611d6 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -29,20 +29,20 @@

#define RTC_CR_START (1 << 0)

-struct pl031_platdata { +struct pl031_plat { phys_addr_t base; };

static inline u32 pl031_read_reg(struct udevice *dev, int reg) { - struct pl031_platdata *pdata = dev_get_plat(dev); + struct pl031_plat *pdata = dev_get_plat(dev);

return readl(pdata->base + reg); }

static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value) { - struct pl031_platdata *pdata = dev_get_plat(dev); + struct pl031_plat *pdata = dev_get_plat(dev);

return writel(value, pdata->base + reg); } @@ -124,7 +124,7 @@ static const struct udevice_id pl031_ids[] = {

static int pl031_of_to_plat(struct udevice *dev) { - struct pl031_platdata *pdata = dev_get_plat(dev); + struct pl031_plat *pdata = dev_get_plat(dev);

pdata->base = dev_read_addr(dev);

@@ -137,6 +137,6 @@ U_BOOT_DRIVER(rtc_pl031) = { .of_match = pl031_ids, .probe = pl031_probe, .of_to_plat = pl031_of_to_plat, - .plat_auto = sizeof(struct pl031_platdata), + .plat_auto = sizeof(struct pl031_plat), .ops = &pl031_ops, }; diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index e9970a7e333..90a0adda479 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -35,5 +35,5 @@ int scsi_bus_reset(struct udevice *dev) UCLASS_DRIVER(scsi) = { .id = UCLASS_SCSI, .name = "scsi", - .per_device_plat_auto = sizeof(struct scsi_platdata), + .per_device_plat_auto = sizeof(struct scsi_plat), }; diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 6e291e4799e..73894844905 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -151,7 +151,7 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, { struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); + struct scsi_plat *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks = 0; @@ -221,7 +221,7 @@ static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, { struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); + struct scsi_plat *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks; @@ -604,7 +604,7 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose)

int scsi_scan_dev(struct udevice *dev, bool verbose) { - struct scsi_platdata *uc_plat; /* scsi controller plat */ + struct scsi_plat *uc_plat; /* scsi controller plat */ int ret; int i; int lun; diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index af7fe39e20b..0d3ccd880ca 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -26,7 +26,7 @@ struct altera_jtaguart_regs { u32 control; /* Control register */ };

-struct altera_jtaguart_platdata { +struct altera_jtaguart_plat { struct altera_jtaguart_regs *regs; };

@@ -37,7 +37,7 @@ static int altera_jtaguart_setbrg(struct udevice *dev, int baudrate)

static int altera_jtaguart_putc(struct udevice *dev, const char ch) { - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 st = readl(&regs->control);

@@ -56,7 +56,7 @@ static int altera_jtaguart_putc(struct udevice *dev, const char ch)

static int altera_jtaguart_pending(struct udevice *dev, bool input) { - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 st = readl(&regs->control);

@@ -68,7 +68,7 @@ static int altera_jtaguart_pending(struct udevice *dev, bool input)

static int altera_jtaguart_getc(struct udevice *dev) { - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 val;

@@ -83,7 +83,7 @@ static int altera_jtaguart_getc(struct udevice *dev) static int altera_jtaguart_probe(struct udevice *dev) { #ifdef CONFIG_ALTERA_JTAG_UART_BYPASS - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs;

writel(ALTERA_JTAG_AC, &regs->control); /* clear AC flag */ @@ -93,7 +93,7 @@ static int altera_jtaguart_probe(struct udevice *dev)

static int altera_jtaguart_of_to_plat(struct udevice *dev) { - struct altera_jtaguart_platdata *plat = dev_get_plat(dev); + struct altera_jtaguart_plat *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_jtaguart_regs), @@ -119,7 +119,7 @@ U_BOOT_DRIVER(altera_jtaguart) = { .id = UCLASS_SERIAL, .of_match = altera_jtaguart_ids, .of_to_plat = altera_jtaguart_of_to_plat, - .plat_auto = sizeof(struct altera_jtaguart_platdata), + .plat_auto = sizeof(struct altera_jtaguart_plat), .probe = altera_jtaguart_probe, .ops = &altera_jtaguart_ops, }; diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index fe6550551da..a3efa1ee1b5 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -25,14 +25,14 @@ struct altera_uart_regs { u32 endofpacket; /* End-of-packet reg */ };

-struct altera_uart_platdata { +struct altera_uart_plat { struct altera_uart_regs *regs; unsigned int uartclk; };

static int altera_uart_setbrg(struct udevice *dev, int baudrate) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; u32 div;

@@ -44,7 +44,7 @@ static int altera_uart_setbrg(struct udevice *dev, int baudrate)

static int altera_uart_putc(struct udevice *dev, const char ch) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs;

if (!(readl(&regs->status) & ALTERA_UART_TRDY)) @@ -57,7 +57,7 @@ static int altera_uart_putc(struct udevice *dev, const char ch)

static int altera_uart_pending(struct udevice *dev, bool input) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; u32 st = readl(&regs->status);

@@ -69,7 +69,7 @@ static int altera_uart_pending(struct udevice *dev, bool input)

static int altera_uart_getc(struct udevice *dev) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs;

if (!(readl(&regs->status) & ALTERA_UART_RRDY)) @@ -85,7 +85,7 @@ static int altera_uart_probe(struct udevice *dev)

static int altera_uart_of_to_plat(struct udevice *dev) { - struct altera_uart_platdata *plat = dev_get_plat(dev); + struct altera_uart_plat *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_uart_regs), @@ -112,7 +112,7 @@ U_BOOT_DRIVER(altera_uart) = { .id = UCLASS_SERIAL, .of_match = altera_uart_ids, .of_to_plat = altera_uart_of_to_plat, - .plat_auto = sizeof(struct altera_uart_platdata), + .plat_auto = sizeof(struct altera_uart_plat), .probe = altera_uart_probe, .ops = &altera_uart_ops, }; diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 463bedef23c..7eabf76d92e 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -262,7 +262,7 @@ static int atmel_serial_enable_clk(struct udevice *dev)

static int atmel_serial_probe(struct udevice *dev) { - struct atmel_serial_platdata *plat = dev->plat; + struct atmel_serial_plat *plat = dev->plat; struct atmel_serial_priv *priv = dev_get_priv(dev); int ret; #if CONFIG_IS_ENABLED(OF_CONTROL) @@ -304,7 +304,7 @@ U_BOOT_DRIVER(serial_atmel) = { .id = UCLASS_SERIAL, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = atmel_serial_ids, - .plat_auto = sizeof(struct atmel_serial_platdata), + .plat_auto = sizeof(struct atmel_serial_plat), #endif .probe = atmel_serial_probe, .ops = &atmel_serial_ops, diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c index 4e34643b4a9..d39a3c0494e 100644 --- a/drivers/serial/lpc32xx_hsuart.c +++ b/drivers/serial/lpc32xx_hsuart.c @@ -85,7 +85,7 @@ static int lpc32xx_serial_init(struct hsuart_regs *hsuart)

static int lpc32xx_hsuart_probe(struct udevice *dev) { - struct lpc32xx_hsuart_platdata *plat = dev_get_plat(dev); + struct lpc32xx_hsuart_plat *plat = dev_get_plat(dev); struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);

priv->hsuart = (struct hsuart_regs *)plat->base; diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 6f80e02a0a6..8dd81ad7948 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -103,7 +103,7 @@ static inline int serial_in_shift(void *addr, int shift) * on a platform */ #ifdef CONFIG_NS16550_DYNAMIC -static void serial_out_dynamic(struct ns16550_platdata *plat, u8 *addr, +static void serial_out_dynamic(struct ns16550_plat *plat, u8 *addr, int value) { if (plat->flags & NS16550_FLAG_IO) { @@ -124,7 +124,7 @@ static void serial_out_dynamic(struct ns16550_platdata *plat, u8 *addr, } }

-static int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr) +static int serial_in_dynamic(struct ns16550_plat *plat, u8 *addr) { if (plat->flags & NS16550_FLAG_IO) { return inb(addr); @@ -144,12 +144,12 @@ static int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr) } } #else -static inline void serial_out_dynamic(struct ns16550_platdata *plat, u8 *addr, +static inline void serial_out_dynamic(struct ns16550_plat *plat, u8 *addr, int value) { }

-static inline int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr) +static inline int serial_in_dynamic(struct ns16550_plat *plat, u8 *addr) { return 0; } @@ -158,7 +158,7 @@ static inline int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr)

static void ns16550_writeb(NS16550_t port, int offset, int value) { - struct ns16550_platdata *plat = port->plat; + struct ns16550_plat *plat = port->plat; unsigned char *addr;

offset *= 1 << plat->reg_shift; @@ -172,7 +172,7 @@ static void ns16550_writeb(NS16550_t port, int offset, int value)

static int ns16550_readb(NS16550_t port, int offset) { - struct ns16550_platdata *plat = port->plat; + struct ns16550_plat *plat = port->plat; unsigned char *addr;

offset *= 1 << plat->reg_shift; @@ -186,7 +186,7 @@ static int ns16550_readb(NS16550_t port, int offset)

static u32 ns16550_getfcr(NS16550_t port) { - struct ns16550_platdata *plat = port->plat; + struct ns16550_plat *plat = port->plat;

return plat->fcr; } @@ -418,7 +418,7 @@ static int ns16550_serial_getc(struct udevice *dev) static int ns16550_serial_setbrg(struct udevice *dev, int baudrate) { struct NS16550 *const com_port = dev_get_priv(dev); - struct ns16550_platdata *plat = com_port->plat; + struct ns16550_plat *plat = com_port->plat; int clock_divisor;

clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate); @@ -465,7 +465,7 @@ static int ns16550_serial_getinfo(struct udevice *dev, struct serial_device_info *info) { struct NS16550 *const com_port = dev_get_priv(dev); - struct ns16550_platdata *plat = com_port->plat; + struct ns16550_plat *plat = com_port->plat;

info->type = SERIAL_CHIP_16550_COMPATIBLE; #ifdef CONFIG_SYS_NS16550_PORT_MAPPED @@ -482,7 +482,7 @@ static int ns16550_serial_getinfo(struct udevice *dev, return 0; }

-static int ns16550_serial_assign_base(struct ns16550_platdata *plat, ulong base) +static int ns16550_serial_assign_base(struct ns16550_plat *plat, ulong base) { if (base == FDT_ADDR_T_NONE) return -EINVAL; @@ -498,7 +498,7 @@ static int ns16550_serial_assign_base(struct ns16550_platdata *plat, ulong base)

int ns16550_serial_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat; struct NS16550 *const com_port = dev_get_priv(dev); struct reset_ctl_bulk reset_bulk; fdt_addr_t addr; @@ -535,7 +535,7 @@ enum { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) int ns16550_serial_of_to_plat(struct udevice *dev) { - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat; const u32 port_type = dev_get_driver_data(dev); fdt_addr_t addr; struct clk clk; @@ -611,7 +611,7 @@ U_BOOT_DRIVER(ns16550_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = ns16550_serial_ids, .of_to_plat = ns16550_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), #endif .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 48c44c24c61..72ce73676ed 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -37,7 +37,7 @@ static unsigned char serial_buf[16]; static unsigned int serial_buf_write; static unsigned int serial_buf_read;

-struct sandbox_serial_platdata { +struct sandbox_serial_plat { int colour; /* Text colour to use for output, -1 for none */ };

@@ -80,7 +80,7 @@ static int sandbox_serial_probe(struct udevice *dev)

static int sandbox_serial_remove(struct udevice *dev) { - struct sandbox_serial_platdata *plat = dev->plat; + struct sandbox_serial_plat *plat = dev->plat;

if (plat->colour != -1) output_ansi_reset(); @@ -91,7 +91,7 @@ static int sandbox_serial_remove(struct udevice *dev) static int sandbox_serial_putc(struct udevice *dev, const char ch) { struct sandbox_serial_priv *priv = dev_get_priv(dev); - struct sandbox_serial_platdata *plat = dev->plat; + struct sandbox_serial_plat *plat = dev->plat;

/* With of-platdata we don't real the colour correctly, so disable it */ if (!CONFIG_IS_ENABLED(OF_PLATDATA) && priv->start_of_line && @@ -219,7 +219,7 @@ static const char * const ansi_colour[] = {

static int sandbox_serial_of_to_plat(struct udevice *dev) { - struct sandbox_serial_platdata *plat = dev->plat; + struct sandbox_serial_plat *plat = dev->plat; const char *colour; int i;

@@ -259,7 +259,7 @@ U_BOOT_DRIVER(sandbox_serial) = { .id = UCLASS_SERIAL, .of_match = sandbox_serial_ids, .of_to_plat = sandbox_serial_of_to_plat, - .plat_auto = sizeof(struct sandbox_serial_platdata), + .plat_auto = sizeof(struct sandbox_serial_plat), .priv_auto = sizeof(struct sandbox_serial_priv), .probe = sandbox_serial_probe, .remove = sandbox_serial_remove, @@ -268,7 +268,7 @@ U_BOOT_DRIVER(sandbox_serial) = { };

#if !CONFIG_IS_ENABLED(OF_PLATDATA) -static const struct sandbox_serial_platdata platdata_non_fdt = { +static const struct sandbox_serial_plat platdata_non_fdt = { .colour = -1, };

diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index dae55ea6f4b..022e37748c8 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -25,7 +25,7 @@ struct arc_serial_regs { };

-struct arc_serial_platdata { +struct arc_serial_plat { struct arc_serial_regs *reg; unsigned int uartclk; }; @@ -37,7 +37,7 @@ struct arc_serial_platdata {

static int arc_serial_setbrg(struct udevice *dev, int baudrate) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; int arc_console_baud = gd->cpu_clk / (baudrate * 4) - 1;

@@ -49,7 +49,7 @@ static int arc_serial_setbrg(struct udevice *dev, int baudrate)

static int arc_serial_putc(struct udevice *dev, const char c) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg;

while (!(readb(&regs->status) & UART_TXEMPTY)) @@ -67,7 +67,7 @@ static int arc_serial_tstc(struct arc_serial_regs *const regs)

static int arc_serial_pending(struct udevice *dev, bool input) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; uint32_t status = readb(&regs->status);

@@ -79,7 +79,7 @@ static int arc_serial_pending(struct udevice *dev, bool input)

static int arc_serial_getc(struct udevice *dev) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg;

while (!arc_serial_tstc(regs)) @@ -111,7 +111,7 @@ static const struct udevice_id arc_serial_ids[] = {

static int arc_serial_of_to_plat(struct udevice *dev) { - struct arc_serial_platdata *plat = dev_get_plat(dev); + struct arc_serial_plat *plat = dev_get_plat(dev); DECLARE_GLOBAL_DATA_PTR;

plat->reg = dev_read_addr_ptr(dev); @@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_arc) = { .id = UCLASS_SERIAL, .of_match = arc_serial_ids, .of_to_plat = arc_serial_of_to_plat, - .plat_auto = sizeof(struct arc_serial_platdata), + .plat_auto = sizeof(struct arc_serial_plat), .probe = arc_serial_probe, .ops = &arc_serial_ops, }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index a53288dc917..58fa722b4bf 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -55,7 +55,7 @@ static int bcm283x_mu_serial_getc(struct udevice *dev);

static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) { - struct bcm283x_mu_serial_platdata *plat = dev_get_plat(dev); + struct bcm283x_mu_serial_plat *plat = dev_get_plat(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); struct bcm283x_mu_regs *regs = priv->regs; u32 divider; @@ -158,7 +158,7 @@ static bool bcm283x_is_serial_muxed(void)

static int bcm283x_mu_serial_probe(struct udevice *dev) { - struct bcm283x_mu_serial_platdata *plat = dev_get_plat(dev); + struct bcm283x_mu_serial_plat *plat = dev_get_plat(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); fdt_addr_t addr;

@@ -194,7 +194,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .name = "serial_bcm283x_mu", .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_mu_serial_id), - .plat_auto = sizeof(struct bcm283x_mu_serial_platdata), + .plat_auto = sizeof(struct bcm283x_mu_serial_plat), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 967f8421abc..2d2e970316a 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -35,7 +35,7 @@ static bool bcm283x_is_serial_muxed(void)

static int bcm283x_pl011_serial_probe(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); int ret;

/* Don't spawn the device if it's not muxed */ @@ -92,7 +92,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_pl011_serial_id), .probe = bcm283x_pl011_serial_probe, - .plat_auto = sizeof(struct pl01x_serial_platdata), + .plat_auto = sizeof(struct pl01x_serial_plat), .ops = &bcm283x_pl011_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index ece27aca888..904e1b306e0 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -13,7 +13,7 @@

static int coreboot_of_to_plat(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_plat(dev); + struct ns16550_plat *plat = dev_get_plat(dev); struct cb_serial *cb_info = lib_sysinfo.serial;

plat->base = cb_info->baseaddr; @@ -38,7 +38,7 @@ U_BOOT_DRIVER(coreboot_uart) = { .id = UCLASS_SERIAL, .of_match = coreboot_serial_ids, .priv_auto = sizeof(struct NS16550), - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .of_to_plat = coreboot_of_to_plat, .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c index 55da805b8e0..be9bf662fd2 100644 --- a/drivers/serial/serial_intel_mid.c +++ b/drivers/serial/serial_intel_mid.c @@ -21,7 +21,7 @@ #define UART_MUL 0x34 #define UART_DIV 0x38

-static void mid_writel(struct ns16550_platdata *plat, int offset, int value) +static void mid_writel(struct ns16550_plat *plat, int offset, int value) { unsigned char *addr;

@@ -33,7 +33,7 @@ static void mid_writel(struct ns16550_platdata *plat, int offset, int value)

static int mid_serial_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_plat(dev); + struct ns16550_plat *plat = dev_get_plat(dev);

/* * Initialize fractional divider correctly for Intel Edison @@ -60,7 +60,7 @@ U_BOOT_DRIVER(serial_intel_mid) = { .id = UCLASS_SERIAL, .of_match = mid_serial_ids, .of_to_plat = ns16550_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .priv_auto = sizeof(struct NS16550), .probe = mid_serial_probe, .ops = &ns16550_serial_ops, diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index 4f8867ab7be..ced005706ae 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -115,7 +115,7 @@ static int _linflex_serial_init(struct linflex_fsl *base) return 0; }

-struct linflex_serial_platdata { +struct linflex_serial_plat { struct linflex_fsl *base_addr; u8 port_id; /* do we need this? */ }; @@ -168,7 +168,7 @@ static void linflex_serial_init_internal(struct linflex_fsl *lfuart)

static int linflex_serial_probe(struct udevice *dev) { - struct linflex_serial_platdata *plat = dev->plat; + struct linflex_serial_plat *plat = dev->plat; struct linflex_serial_priv *priv = dev_get_priv(dev);

priv->lfuart = (struct linflex_fsl *)plat->base_addr; diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 56362339be5..5beb5f2ce64 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -74,7 +74,7 @@ enum lpuart_devtype { DEV_IMXRT, };

-struct lpuart_serial_platdata { +struct lpuart_serial_plat { void *reg; enum lpuart_devtype devtype; ulong flags; @@ -138,7 +138,7 @@ static inline int get_lpuart_clk_rate(struct udevice *dev, u32 *clk)

static bool is_lpuart32(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat;

return plat->flags & LPUART_FLAG_REGMAP_32BIT_REG; } @@ -146,7 +146,7 @@ static bool is_lpuart32(struct udevice *dev) static void _lpuart_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl *base = plat->reg; u32 clk; u16 sbr; @@ -167,7 +167,7 @@ static void _lpuart_serial_setbrg(struct udevice *dev, __raw_writeb(sbr & 0xff, &base->ubdl); }

-static int _lpuart_serial_getc(struct lpuart_serial_platdata *plat) +static int _lpuart_serial_getc(struct lpuart_serial_plat *plat) { struct lpuart_fsl *base = plat->reg; while (!(__raw_readb(&base->us1) & (US1_RDRF | US1_OR))) @@ -178,7 +178,7 @@ static int _lpuart_serial_getc(struct lpuart_serial_platdata *plat) return __raw_readb(&base->ud); }

-static void _lpuart_serial_putc(struct lpuart_serial_platdata *plat, +static void _lpuart_serial_putc(struct lpuart_serial_plat *plat, const char c) { struct lpuart_fsl *base = plat->reg; @@ -190,7 +190,7 @@ static void _lpuart_serial_putc(struct lpuart_serial_platdata *plat, }

/* Test whether a character is in the RX buffer */ -static int _lpuart_serial_tstc(struct lpuart_serial_platdata *plat) +static int _lpuart_serial_tstc(struct lpuart_serial_plat *plat) { struct lpuart_fsl *base = plat->reg;

@@ -206,7 +206,7 @@ static int _lpuart_serial_tstc(struct lpuart_serial_platdata *plat) */ static int _lpuart_serial_init(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl *base = (struct lpuart_fsl *)plat->reg; u8 ctrl;

@@ -235,7 +235,7 @@ static int _lpuart_serial_init(struct udevice *dev) static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = plat->reg; u32 sbr, osr, baud_diff, tmp_osr, tmp_sbr, tmp_diff, tmp; u32 clk; @@ -304,7 +304,7 @@ static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, static void _lpuart32_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = plat->reg; u32 clk; u32 sbr; @@ -324,7 +324,7 @@ static void _lpuart32_serial_setbrg(struct udevice *dev, lpuart_write32(plat->flags, &base->baud, sbr); }

-static int _lpuart32_serial_getc(struct lpuart_serial_platdata *plat) +static int _lpuart32_serial_getc(struct lpuart_serial_plat *plat) { struct lpuart_fsl_reg32 *base = plat->reg; u32 stat, val; @@ -345,7 +345,7 @@ static int _lpuart32_serial_getc(struct lpuart_serial_platdata *plat) return val & 0x3ff; }

-static void _lpuart32_serial_putc(struct lpuart_serial_platdata *plat, +static void _lpuart32_serial_putc(struct lpuart_serial_plat *plat, const char c) { struct lpuart_fsl_reg32 *base = plat->reg; @@ -367,7 +367,7 @@ static void _lpuart32_serial_putc(struct lpuart_serial_platdata *plat, }

/* Test whether a character is in the RX buffer */ -static int _lpuart32_serial_tstc(struct lpuart_serial_platdata *plat) +static int _lpuart32_serial_tstc(struct lpuart_serial_plat *plat) { struct lpuart_fsl_reg32 *base = plat->reg; u32 water; @@ -386,7 +386,7 @@ static int _lpuart32_serial_tstc(struct lpuart_serial_platdata *plat) */ static int _lpuart32_serial_init(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = (struct lpuart_fsl_reg32 *)plat->reg; u32 val, tx_fifo_size;

@@ -428,7 +428,7 @@ static int _lpuart32_serial_init(struct udevice *dev)

static int lpuart_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev);

if (is_lpuart32(dev)) { if (plat->devtype == DEV_MX7ULP || plat->devtype == DEV_IMX8 || @@ -445,7 +445,7 @@ static int lpuart_serial_setbrg(struct udevice *dev, int baudrate)

static int lpuart_serial_getc(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat;

if (is_lpuart32(dev)) return _lpuart32_serial_getc(plat); @@ -455,7 +455,7 @@ static int lpuart_serial_getc(struct udevice *dev)

static int lpuart_serial_putc(struct udevice *dev, const char c) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat;

if (is_lpuart32(dev)) _lpuart32_serial_putc(plat, c); @@ -467,7 +467,7 @@ static int lpuart_serial_putc(struct udevice *dev, const char c)

static int lpuart_serial_pending(struct udevice *dev, bool input) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat; struct lpuart_fsl *reg = plat->reg; struct lpuart_fsl_reg32 *reg32 = plat->reg; u32 stat; @@ -513,7 +513,7 @@ static int lpuart_serial_probe(struct udevice *dev)

static int lpuart_serial_of_to_plat(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); fdt_addr_t addr; @@ -567,7 +567,7 @@ U_BOOT_DRIVER(serial_lpuart) = { .id = UCLASS_SERIAL, .of_match = lpuart_serial_ids, .of_to_plat = lpuart_serial_of_to_plat, - .plat_auto = sizeof(struct lpuart_serial_platdata), + .plat_auto = sizeof(struct lpuart_serial_plat), .probe = lpuart_serial_probe, .ops = &lpuart_serial_ops, }; diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index 9b167c3c474..4ba6dc32f92 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -83,7 +83,7 @@ static void mcf_serial_setbrg_common(uart_t *uart, int baudrate)

static int coldfire_serial_probe(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat;

plat->port = dev_seq(dev);

@@ -93,7 +93,7 @@ static int coldfire_serial_probe(struct udevice *dev)

static int coldfire_serial_putc(struct udevice *dev, const char ch) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)plat->base;

/* Wait for last character to go. */ @@ -107,7 +107,7 @@ static int coldfire_serial_putc(struct udevice *dev, const char ch)

static int coldfire_serial_getc(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base);

/* Wait for a character to arrive. */ @@ -119,7 +119,7 @@ static int coldfire_serial_getc(struct udevice *dev)

int coldfire_serial_setbrg(struct udevice *dev, int baudrate) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base);

mcf_serial_setbrg_common(uart, baudrate); @@ -129,7 +129,7 @@ int coldfire_serial_setbrg(struct udevice *dev, int baudrate)

static int coldfire_serial_pending(struct udevice *dev, bool input) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base);

if (input) @@ -142,7 +142,7 @@ static int coldfire_serial_pending(struct udevice *dev, bool input)

static int coldfire_of_to_plat(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev_get_plat(dev); + struct coldfire_serial_plat *plat = dev_get_plat(dev); fdt_addr_t addr_base;

addr_base = dev_read_addr(dev); @@ -172,7 +172,7 @@ U_BOOT_DRIVER(serial_coldfire) = { .id = UCLASS_SERIAL, .of_match = coldfire_serial_ids, .of_to_plat = coldfire_of_to_plat, - .plat_auto = sizeof(struct coldfire_serial_platdata), + .plat_auto = sizeof(struct coldfire_serial_plat), .probe = coldfire_serial_probe, .ops = &coldfire_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c index ac3727d1c29..40d9bfe7c6f 100644 --- a/drivers/serial/serial_meson.c +++ b/drivers/serial/serial_meson.c @@ -19,7 +19,7 @@ struct meson_uart { u32 misc; };

-struct meson_serial_platdata { +struct meson_serial_plat { struct meson_uart *reg; };

@@ -57,7 +57,7 @@ static void meson_serial_init(struct meson_uart *uart)

static int meson_serial_probe(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg;

meson_serial_init(uart); @@ -67,7 +67,7 @@ static int meson_serial_probe(struct udevice *dev)

static void meson_serial_rx_error(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; u32 val = readl(&uart->control);

@@ -83,7 +83,7 @@ static void meson_serial_rx_error(struct udevice *dev)

static int meson_serial_getc(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; uint32_t status = readl(&uart->status);

@@ -100,7 +100,7 @@ static int meson_serial_getc(struct udevice *dev)

static int meson_serial_putc(struct udevice *dev, const char ch) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg;

if (readl(&uart->status) & AML_UART_TX_FULL) @@ -113,7 +113,7 @@ static int meson_serial_putc(struct udevice *dev, const char ch)

static int meson_serial_pending(struct udevice *dev, bool input) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; uint32_t status = readl(&uart->status);

@@ -138,7 +138,7 @@ static int meson_serial_pending(struct udevice *dev, bool input)

static int meson_serial_of_to_plat(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -169,7 +169,7 @@ U_BOOT_DRIVER(serial_meson) = { .probe = meson_serial_probe, .ops = &meson_serial_ops, .of_to_plat = meson_serial_of_to_plat, - .plat_auto = sizeof(struct meson_serial_platdata), + .plat_auto = sizeof(struct meson_serial_plat), };

#ifdef CONFIG_DEBUG_UART_MESON diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index f4676f0b8e0..5a1d40e0a6a 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -8,7 +8,7 @@ #include <serial.h> #include <asm/io.h>

-struct mvebu_platdata { +struct mvebu_plat { void __iomem *base; };

@@ -32,7 +32,7 @@ struct mvebu_platdata {

static int mvebu_serial_putc(struct udevice *dev, const char ch) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base;

while (readl(base + UART_STATUS_REG) & UART_STATUS_TXFIFO_FULL) @@ -45,7 +45,7 @@ static int mvebu_serial_putc(struct udevice *dev, const char ch)

static int mvebu_serial_getc(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base;

while (!(readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)) @@ -56,7 +56,7 @@ static int mvebu_serial_getc(struct udevice *dev)

static int mvebu_serial_pending(struct udevice *dev, bool input) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base;

if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY) @@ -67,7 +67,7 @@ static int mvebu_serial_pending(struct udevice *dev, bool input)

static int mvebu_serial_setbrg(struct udevice *dev, int baudrate) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base;

/* @@ -87,7 +87,7 @@ static int mvebu_serial_setbrg(struct udevice *dev, int baudrate)

static int mvebu_serial_probe(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base;

/* reset FIFOs */ @@ -102,7 +102,7 @@ static int mvebu_serial_probe(struct udevice *dev)

static int mvebu_serial_of_to_plat(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev);

plat->base = dev_read_addr_ptr(dev);

@@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_mvebu) = { .id = UCLASS_SERIAL, .of_match = mvebu_serial_ids, .of_to_plat = mvebu_serial_of_to_plat, - .plat_auto = sizeof(struct mvebu_platdata), + .plat_auto = sizeof(struct mvebu_plat), .probe = mvebu_serial_probe, .ops = &mvebu_serial_ops, }; diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 9602ddc7e04..2603fa8611a 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -264,7 +264,7 @@ __weak struct serial_device *default_serial_console(void)

int mxc_serial_setbrg(struct udevice *dev, int baudrate) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; u32 clk = imx_get_uartclk();

_mxc_serial_setbrg(plat->reg, clk, baudrate, plat->use_dte); @@ -274,7 +274,7 @@ int mxc_serial_setbrg(struct udevice *dev, int baudrate)

static int mxc_serial_probe(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat;

_mxc_serial_init(plat->reg, plat->use_dte);

@@ -283,7 +283,7 @@ static int mxc_serial_probe(struct udevice *dev)

static int mxc_serial_getc(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; struct mxc_uart *const uart = plat->reg;

if (readl(&uart->ts) & UTS_RXEMPTY) @@ -294,7 +294,7 @@ static int mxc_serial_getc(struct udevice *dev)

static int mxc_serial_putc(struct udevice *dev, const char ch) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; struct mxc_uart *const uart = plat->reg;

if (!(readl(&uart->ts) & UTS_TXEMPTY)) @@ -307,7 +307,7 @@ static int mxc_serial_putc(struct udevice *dev, const char ch)

static int mxc_serial_pending(struct udevice *dev, bool input) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; struct mxc_uart *const uart = plat->reg; uint32_t sr2 = readl(&uart->sr2);

@@ -327,7 +327,7 @@ static const struct dm_serial_ops mxc_serial_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) static int mxc_serial_of_to_plat(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -358,7 +358,7 @@ U_BOOT_DRIVER(serial_mxc) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = mxc_serial_ids, .of_to_plat = mxc_serial_of_to_plat, - .plat_auto = sizeof(struct mxc_serial_platdata), + .plat_auto = sizeof(struct mxc_serial_plat), #endif .probe = mxc_serial_probe, .ops = &mxc_serial_ops, diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c index 2b0a3e4d06d..2f38e1b8901 100644 --- a/drivers/serial/serial_omap.c +++ b/drivers/serial/serial_omap.c @@ -101,7 +101,7 @@ DEBUG_UART_FUNCS #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int omap_serial_of_to_plat(struct udevice *dev) { - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat; fdt_addr_t addr; struct clk clk; int err; @@ -158,7 +158,7 @@ U_BOOT_DRIVER(omap_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_serial_ids, .of_to_plat = omap_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), #endif .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 45bc1de0593..b21e943d210 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -281,7 +281,7 @@ __weak struct serial_device *default_serial_console(void)

int pl01x_serial_setbrg(struct udevice *dev, int baudrate) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); struct pl01x_priv *priv = dev_get_priv(dev);

if (!plat->skip_init) { @@ -294,7 +294,7 @@ int pl01x_serial_setbrg(struct udevice *dev, int baudrate)

int pl01x_serial_probe(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); struct pl01x_priv *priv = dev_get_priv(dev);

priv->regs = (struct pl01x_regs *)plat->base; @@ -350,7 +350,7 @@ static const struct udevice_id pl01x_serial_id[] ={

int pl01x_serial_of_to_plat(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); struct clk clk; fdt_addr_t addr; int ret; @@ -388,7 +388,7 @@ U_BOOT_DRIVER(serial_pl01x) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(pl01x_serial_id), .of_to_plat = of_match_ptr(pl01x_serial_of_to_plat), - .plat_auto = sizeof(struct pl01x_serial_platdata), + .plat_auto = sizeof(struct pl01x_serial_plat), .probe = pl01x_serial_probe, .ops = &pl01x_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index 232218dcdcc..d82f3b97529 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -268,7 +268,7 @@ void pxa_serial_initialize(void) #ifdef CONFIG_DM_SERIAL static int pxa_serial_probe(struct udevice *dev) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat;

pxa_setbrg_common((struct pxa_uart_regs *)plat->base, plat->port, plat->baudrate); @@ -277,7 +277,7 @@ static int pxa_serial_probe(struct udevice *dev)

static int pxa_serial_putc(struct udevice *dev, const char ch) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base;

/* Wait for last character to go. */ @@ -291,7 +291,7 @@ static int pxa_serial_putc(struct udevice *dev, const char ch)

static int pxa_serial_getc(struct udevice *dev) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base;

/* Wait for a character to arrive. */ @@ -303,7 +303,7 @@ static int pxa_serial_getc(struct udevice *dev)

int pxa_serial_setbrg(struct udevice *dev, int baudrate) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base; int port = plat->port;

@@ -314,7 +314,7 @@ int pxa_serial_setbrg(struct udevice *dev, int baudrate)

static int pxa_serial_pending(struct udevice *dev, bool input) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base;

if (input) diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index 930103a42cb..4c0548ed0f3 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -12,22 +12,22 @@ #include <asm/arch-rockchip/clock.h>

#if defined(CONFIG_ROCKCHIP_RK3188) -struct rockchip_uart_platdata { +struct rockchip_uart_plat { struct dtd_rockchip_rk3188_uart dtplat; - struct ns16550_platdata plat; + struct ns16550_plat plat; }; struct dtd_rockchip_rk3188_uart *dtplat, s_dtplat; #elif defined(CONFIG_ROCKCHIP_RK3288) -struct rockchip_uart_platdata { +struct rockchip_uart_plat { struct dtd_rockchip_rk3288_uart dtplat; - struct ns16550_platdata plat; + struct ns16550_plat plat; }; struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat; #endif

static int rockchip_serial_probe(struct udevice *dev) { - struct rockchip_uart_platdata *plat = dev_get_plat(dev); + struct rockchip_uart_plat *plat = dev_get_plat(dev);

/* Create some new platform data for the standard driver */ plat->plat.base = plat->dtplat.reg[0]; @@ -43,7 +43,7 @@ U_BOOT_DRIVER(rockchip_rk3188_uart) = { .name = "rockchip_rk3188_uart", .id = UCLASS_SERIAL, .priv_auto = sizeof(struct NS16550), - .plat_auto = sizeof(struct rockchip_uart_platdata), + .plat_auto = sizeof(struct rockchip_uart_plat), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, @@ -53,7 +53,7 @@ U_BOOT_DRIVER(rockchip_rk3288_uart) = { .name = "rockchip_rk3288_uart", .id = UCLASS_SERIAL, .priv_auto = sizeof(struct NS16550), - .plat_auto = sizeof(struct rockchip_uart_platdata), + .plat_auto = sizeof(struct rockchip_uart_plat), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index b8ba5da5f18..120df835dbd 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR; #define TX_FIFO_FULL (1 << 24)

/* Information about a serial port */ -struct s5p_serial_platdata { +struct s5p_serial_plat { struct s5p_uart *reg; /* address of registers in physical memory */ u8 port_id; /* uart port number */ }; @@ -88,7 +88,7 @@ static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, uint uclk, #ifndef CONFIG_SPL_BUILD int s5p_serial_setbrg(struct udevice *dev, int baudrate) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg; u32 uclk;

@@ -111,7 +111,7 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate)

static int s5p_serial_probe(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg;

s5p_serial_init(uart); @@ -140,7 +140,7 @@ static int serial_err_check(const struct s5p_uart *const uart, int op)

static int s5p_serial_getc(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg;

if (!(readl(&uart->ufstat) & RX_FIFO_COUNT_MASK)) @@ -152,7 +152,7 @@ static int s5p_serial_getc(struct udevice *dev)

static int s5p_serial_putc(struct udevice *dev, const char ch) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg;

if (readl(&uart->ufstat) & TX_FIFO_FULL) @@ -166,7 +166,7 @@ static int s5p_serial_putc(struct udevice *dev, const char ch)

static int s5p_serial_pending(struct udevice *dev, bool input) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg; uint32_t ufstat = readl(&uart->ufstat);

@@ -178,7 +178,7 @@ static int s5p_serial_pending(struct udevice *dev, bool input)

static int s5p_serial_of_to_plat(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; fdt_addr_t addr;

addr = dev_read_addr(dev); @@ -208,7 +208,7 @@ U_BOOT_DRIVER(serial_s5p) = { .id = UCLASS_SERIAL, .of_match = s5p_serial_ids, .of_to_plat = s5p_serial_of_to_plat, - .plat_auto = sizeof(struct s5p_serial_platdata), + .plat_auto = sizeof(struct s5p_serial_plat), .probe = s5p_serial_probe, .ops = &s5p_serial_ops, }; diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index a961ead1d4d..d74f8902336 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -169,7 +169,7 @@ static int sh_serial_getc(struct udevice *dev)

static int sh_serial_setbrg(struct udevice *dev, int baudrate) { - struct sh_serial_platdata *plat = dev_get_plat(dev); + struct sh_serial_plat *plat = dev_get_plat(dev); struct uart_port *priv = dev_get_priv(dev);

sh_serial_setbrg_generic(priv, plat->clk, baudrate); @@ -179,7 +179,7 @@ static int sh_serial_setbrg(struct udevice *dev, int baudrate)

static int sh_serial_probe(struct udevice *dev) { - struct sh_serial_platdata *plat = dev_get_plat(dev); + struct sh_serial_plat *plat = dev_get_plat(dev); struct uart_port *priv = dev_get_priv(dev);

priv->membase = (unsigned char *)plat->base; @@ -209,7 +209,7 @@ static const struct udevice_id sh_serial_id[] ={

static int sh_serial_of_to_plat(struct udevice *dev) { - struct sh_serial_platdata *plat = dev_get_plat(dev); + struct sh_serial_plat *plat = dev_get_plat(dev); struct clk sh_serial_clk; fdt_addr_t addr; int ret; @@ -240,7 +240,7 @@ U_BOOT_DRIVER(serial_sh) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(sh_serial_id), .of_to_plat = of_match_ptr(sh_serial_of_to_plat), - .plat_auto = sizeof(struct sh_serial_platdata), + .plat_auto = sizeof(struct sh_serial_plat), .probe = sh_serial_probe, .ops = &sh_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index 5248c6814c4..d26fe7e7704 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -37,7 +37,7 @@ struct uart_sifive { u32 div; };

-struct sifive_uart_platdata { +struct sifive_uart_plat { unsigned long clock; struct uart_sifive *regs; }; @@ -105,7 +105,7 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate) { int ret; struct clk clk; - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); u32 clock = 0;

ret = clk_get_by_index(dev, 0, &clk); @@ -131,7 +131,7 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate)

static int sifive_serial_probe(struct udevice *dev) { - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev);

/* No need to reinitialize the UART after relocation */ if (gd->flags & GD_FLG_RELOC) @@ -145,7 +145,7 @@ static int sifive_serial_probe(struct udevice *dev) static int sifive_serial_getc(struct udevice *dev) { int c; - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); struct uart_sifive *regs = plat->regs;

while ((c = _sifive_serial_getc(regs)) == -EAGAIN) ; @@ -156,7 +156,7 @@ static int sifive_serial_getc(struct udevice *dev) static int sifive_serial_putc(struct udevice *dev, const char ch) { int rc; - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev);

while ((rc = _sifive_serial_putc(plat->regs, ch)) == -EAGAIN) ;

@@ -165,7 +165,7 @@ static int sifive_serial_putc(struct udevice *dev, const char ch)

static int sifive_serial_pending(struct udevice *dev, bool input) { - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); struct uart_sifive *regs = plat->regs;

if (input) @@ -176,7 +176,7 @@ static int sifive_serial_pending(struct udevice *dev, bool input)

static int sifive_serial_of_to_plat(struct udevice *dev) { - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev);

plat->regs = (struct uart_sifive *)dev_read_addr(dev); if (IS_ERR(plat->regs)) @@ -202,7 +202,7 @@ U_BOOT_DRIVER(serial_sifive) = { .id = UCLASS_SERIAL, .of_match = sifive_serial_ids, .of_to_plat = sifive_serial_of_to_plat, - .plat_auto = sizeof(struct sifive_uart_platdata), + .plat_auto = sizeof(struct sifive_uart_plat), .probe = sifive_serial_probe, .ops = &sifive_serial_ops, }; diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index 63344b34186..818c34cf115 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -44,7 +44,7 @@ static void _stm32_serial_setbrg(fdt_addr_t base,

static int stm32_serial_setbrg(struct udevice *dev, int baudrate) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev);

_stm32_serial_setbrg(plat->base, plat->uart_info, plat->clock_rate, baudrate); @@ -54,7 +54,7 @@ static int stm32_serial_setbrg(struct udevice *dev, int baudrate)

static int stm32_serial_setconfig(struct udevice *dev, uint serial_config) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; u8 uart_enable_bit = plat->uart_info->uart_enable_bit; u32 cr1 = plat->base + CR1_OFFSET(stm32f4); @@ -102,7 +102,7 @@ static int stm32_serial_setconfig(struct udevice *dev, uint serial_config)

static int stm32_serial_getc(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; fdt_addr_t base = plat->base; u32 isr = readl(base + ISR_OFFSET(stm32f4)); @@ -139,14 +139,14 @@ static int _stm32_serial_putc(fdt_addr_t base,

static int stm32_serial_putc(struct udevice *dev, const char c) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev);

return _stm32_serial_putc(plat->base, plat->uart_info, c); }

static int stm32_serial_pending(struct udevice *dev, bool input) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; fdt_addr_t base = plat->base;

@@ -175,7 +175,7 @@ static void _stm32_serial_init(fdt_addr_t base,

static int stm32_serial_probe(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); struct clk clk; struct reset_ctl reset; int ret; @@ -219,7 +219,7 @@ static const struct udevice_id stm32_serial_id[] = {

static int stm32_serial_of_to_plat(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev);

plat->base = dev_read_addr(dev); if (plat->base == FDT_ADDR_T_NONE) @@ -241,7 +241,7 @@ U_BOOT_DRIVER(serial_stm32) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(stm32_serial_id), .of_to_plat = of_match_ptr(stm32_serial_of_to_plat), - .plat_auto = sizeof(struct stm32x7_serial_platdata), + .plat_auto = sizeof(struct stm32x7_serial_plat), .ops = &stm32_serial_ops, .probe = stm32_serial_probe, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h index 57376518880..5bee68fa9c2 100644 --- a/drivers/serial/serial_stm32.h +++ b/drivers/serial/serial_stm32.h @@ -48,7 +48,7 @@ struct stm32_uart_info stm32h7_info = { };

/* Information about a serial port */ -struct stm32x7_serial_platdata { +struct stm32x7_serial_plat { fdt_addr_t base; /* address of registers in physical memory */ struct stm32_uart_info *uart_info; unsigned long int clock_rate; diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index df4877a0b91..0efdc93c608 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -32,7 +32,7 @@ struct uartlite { unsigned int control; };

-struct uartlite_platdata { +struct uartlite_plat { struct uartlite *regs; };

@@ -54,7 +54,7 @@ static void uart_out32(void __iomem *addr, u32 val)

static int uartlite_serial_putc(struct udevice *dev, const char ch) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs;

if (uart_in32(&regs->status) & SR_TX_FIFO_FULL) @@ -67,7 +67,7 @@ static int uartlite_serial_putc(struct udevice *dev, const char ch)

static int uartlite_serial_getc(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs;

if (!(uart_in32(&regs->status) & SR_RX_FIFO_VALID_DATA)) @@ -78,7 +78,7 @@ static int uartlite_serial_getc(struct udevice *dev)

static int uartlite_serial_pending(struct udevice *dev, bool input) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs;

if (input) @@ -89,7 +89,7 @@ static int uartlite_serial_pending(struct udevice *dev, bool input)

static int uartlite_serial_probe(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs; int ret;

@@ -108,7 +108,7 @@ static int uartlite_serial_probe(struct udevice *dev)

static int uartlite_serial_of_to_plat(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev);

plat->regs = dev_read_addr_ptr(dev);

@@ -132,7 +132,7 @@ U_BOOT_DRIVER(serial_uartlite) = { .id = UCLASS_SERIAL, .of_match = uartlite_serial_ids, .of_to_plat = uartlite_serial_of_to_plat, - .plat_auto = sizeof(struct uartlite_platdata), + .plat_auto = sizeof(struct uartlite_plat), .probe = uartlite_serial_probe, .ops = &uartlite_serial_ops, }; diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 1d748e16ee9..2883e2466f8 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -41,7 +41,7 @@ struct uart_zynq { u32 baud_rate_divider; /* 0x34 - Baud Rate Divider [7:0] */ };

-struct zynq_uart_platdata { +struct zynq_uart_plat { struct uart_zynq *regs; };

@@ -107,7 +107,7 @@ static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c)

static int zynq_serial_setbrg(struct udevice *dev, int baudrate) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); unsigned long clock;

int ret; @@ -139,7 +139,7 @@ static int zynq_serial_setbrg(struct udevice *dev, int baudrate)

static int zynq_serial_probe(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs; u32 val;

@@ -155,7 +155,7 @@ static int zynq_serial_probe(struct udevice *dev)

static int zynq_serial_getc(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs;

if (readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY) @@ -166,14 +166,14 @@ static int zynq_serial_getc(struct udevice *dev)

static int zynq_serial_putc(struct udevice *dev, const char ch) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev);

return _uart_zynq_serial_putc(plat->regs, ch); }

static int zynq_serial_pending(struct udevice *dev, bool input) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs;

if (input) @@ -184,7 +184,7 @@ static int zynq_serial_pending(struct udevice *dev, bool input)

static int zynq_serial_of_to_plat(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev);

plat->regs = (struct uart_zynq *)dev_read_addr(dev); if (IS_ERR(plat->regs)) @@ -212,7 +212,7 @@ U_BOOT_DRIVER(serial_zynq) = { .id = UCLASS_SERIAL, .of_match = zynq_serial_ids, .of_to_plat = zynq_serial_of_to_plat, - .plat_auto = sizeof(struct zynq_uart_platdata), + .plat_auto = sizeof(struct zynq_uart_plat), .probe = zynq_serial_probe, .ops = &zynq_serial_ops, }; diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index cd7cf5b4fec..ecc3278cb46 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -22,7 +22,7 @@ #define JTAG_ID_PARTNO_SHIFT 12 #define JTAG_ID_PARTNO_MASK (0xffff << 12)

-struct soc_ti_k3_platdata { +struct soc_ti_k3_plat { const char *family; const char *revision; }; @@ -74,7 +74,7 @@ static const char *get_rev_string(u32 idreg)

static int soc_ti_k3_get_family(struct udevice *dev, char *buf, int size) { - struct soc_ti_k3_platdata *plat = dev_get_plat(dev); + struct soc_ti_k3_plat *plat = dev_get_plat(dev);

snprintf(buf, size, "%s", plat->family);

@@ -83,7 +83,7 @@ static int soc_ti_k3_get_family(struct udevice *dev, char *buf, int size)

static int soc_ti_k3_get_revision(struct udevice *dev, char *buf, int size) { - struct soc_ti_k3_platdata *plat = dev_get_plat(dev); + struct soc_ti_k3_plat *plat = dev_get_plat(dev);

snprintf(buf, size, "SR%s", plat->revision);

@@ -97,7 +97,7 @@ static const struct soc_ops soc_ti_k3_ops = {

int soc_ti_k3_probe(struct udevice *dev) { - struct soc_ti_k3_platdata *plat = dev_get_plat(dev); + struct soc_ti_k3_plat *plat = dev_get_plat(dev); u32 idreg; void *idreg_addr;

@@ -124,5 +124,5 @@ U_BOOT_DRIVER(soc_ti_k3) = { .ops = &soc_ti_k3_ops, .of_match = soc_ti_k3_ids, .probe = soc_ti_k3_probe, - .plat_auto = sizeof(struct soc_ti_k3_platdata), + .plat_auto = sizeof(struct soc_ti_k3_plat), }; diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c index d8d128a9206..492a86cafe1 100644 --- a/drivers/sound/ivybridge_sound.c +++ b/drivers/sound/ivybridge_sound.c @@ -22,7 +22,7 @@

static int bd82x6x_azalia_probe(struct udevice *dev) { - struct pci_child_platdata *plat; + struct pci_child_plat *plat; struct hda_codec_priv *priv; struct udevice *pch; u32 codec_mask; diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 187f2394b74..fadc9f39657 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -32,7 +32,7 @@ struct altera_spi_regs { u32 slave_sel; };

-struct altera_spi_platdata { +struct altera_spi_plat { struct altera_spi_regs *regs; };

@@ -89,7 +89,7 @@ static int altera_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct altera_spi_priv *priv = dev_get_priv(bus); struct altera_spi_regs *const regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

/* assume spi core configured to do 8 bit transfers */ unsigned int bytes = bitlen / 8; @@ -161,7 +161,7 @@ static int altera_spi_set_mode(struct udevice *bus, uint mode)

static int altera_spi_probe(struct udevice *bus) { - struct altera_spi_platdata *plat = dev_get_plat(bus); + struct altera_spi_plat *plat = dev_get_plat(bus); struct altera_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->regs; @@ -171,7 +171,7 @@ static int altera_spi_probe(struct udevice *bus)

static int altera_spi_of_to_plat(struct udevice *bus) { - struct altera_spi_platdata *plat = dev_get_plat(bus); + struct altera_spi_plat *plat = dev_get_plat(bus);

plat->regs = map_physmem(dev_read_addr(bus), sizeof(struct altera_spi_regs), @@ -203,7 +203,7 @@ U_BOOT_DRIVER(altera_spi) = { .of_match = altera_spi_ids, .ops = &altera_spi_ops, .of_to_plat = altera_spi_of_to_plat, - .plat_auto = sizeof(struct altera_spi_platdata), + .plat_auto = sizeof(struct altera_spi_plat), .priv_auto = sizeof(struct altera_spi_priv), .probe = altera_spi_probe, }; diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 9917b5414a6..0f05158c84c 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -309,7 +309,7 @@ static int atcspi200_spi_set_mode(struct udevice *bus, uint mode)

static int atcspi200_spi_claim_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct nds_spi_slave *ns = dev_get_priv(bus); diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index ad2c7ff69cf..205567ef54d 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -59,7 +59,7 @@ static int ath79_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct ath79_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); u8 *rx = din; const u8 *tx = dout; u8 curbyte, curbitlen, restbits; diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 9795972993a..702e2253581 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -105,7 +105,7 @@ #define spi_writel(as, reg, value) \ writel(value, as->regs + ATMEL_SPI_##reg)

-struct atmel_spi_platdata { +struct atmel_spi_plat { struct at91_spi *regs; };

@@ -121,9 +121,9 @@ struct atmel_spi_priv { static int atmel_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct at91_spi *reg_base = bus_plat->regs; u32 cs = slave_plat->cs; u32 freq = priv->freq; @@ -161,7 +161,7 @@ static int atmel_spi_claim_bus(struct udevice *dev) static int atmel_spi_release_bus(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus);

writel(ATMEL_SPI_CR_SPIDIS, &bus_plat->regs->cr);

@@ -173,7 +173,7 @@ static void atmel_spi_cs_activate(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_GPIO) struct udevice *bus = dev_get_parent(dev); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs;

if (!dm_gpio_is_valid(&priv->cs_gpios[cs])) @@ -188,7 +188,7 @@ static void atmel_spi_cs_deactivate(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_GPIO) struct udevice *bus = dev_get_parent(dev); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs;

if (!dm_gpio_is_valid(&priv->cs_gpios[cs])) @@ -202,7 +202,7 @@ static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus); struct at91_spi *reg_base = bus_plat->regs;

u32 len_tx, len_rx, len; @@ -344,7 +344,7 @@ static int atmel_spi_enable_clk(struct udevice *bus)

static int atmel_spi_probe(struct udevice *bus) { - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus); int ret;

ret = atmel_spi_enable_clk(bus); @@ -388,7 +388,7 @@ U_BOOT_DRIVER(atmel_spi) = { .id = UCLASS_SPI, .of_match = atmel_spi_ids, .ops = &atmel_spi_ops, - .plat_auto = sizeof(struct atmel_spi_platdata), + .plat_auto = sizeof(struct atmel_spi_plat), .priv_auto = sizeof(struct atmel_spi_priv), .probe = atmel_spi_probe, }; diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c index 6d7d1696598..85108df565c 100644 --- a/drivers/spi/bcm63xx_hsspi.c +++ b/drivers/spi/bcm63xx_hsspi.c @@ -140,7 +140,7 @@ static int bcm63xx_hsspi_set_speed(struct udevice *bus, uint speed) }

static void bcm63xx_hsspi_activate_cs(struct bcm63xx_hsspi_priv *priv, - struct dm_spi_slave_platdata *plat) + struct dm_spi_slave_plat *plat) { uint32_t clr, set;

@@ -217,7 +217,7 @@ static int bcm63xx_hsspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct bcm63xx_hsspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); size_t data_bytes = bitlen / 8; size_t step_size = HSSPI_FIFO_SIZE; uint16_t opcode = 0; @@ -316,7 +316,7 @@ static const struct udevice_id bcm63xx_hsspi_ids[] = { static int bcm63xx_hsspi_child_pre_probe(struct udevice *dev) { struct bcm63xx_hsspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev);

/* check cs */ if (plat->cs >= priv->num_cs) { diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c index fe5fe5b716d..dd5e62b2fe1 100644 --- a/drivers/spi/bcm63xx_spi.c +++ b/drivers/spi/bcm63xx_spi.c @@ -236,7 +236,7 @@ static int bcm63xx_spi_xfer(struct udevice *dev, unsigned int bitlen, }

if (flags & SPI_XFER_END) { - struct dm_spi_slave_platdata *plat = + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); uint16_t val, cmd; int ret; @@ -351,7 +351,7 @@ static int bcm63xx_spi_child_pre_probe(struct udevice *dev) struct bcm63xx_spi_priv *priv = dev_get_priv(dev->parent); const unsigned long *regs = priv->regs; struct spi_slave *slave = dev_get_parent_priv(dev); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev);

/* check cs */ if (plat->cs >= priv->num_cs) { diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c index 3afc051d21d..dc4fdacdc99 100644 --- a/drivers/spi/bcmstb_spi.c +++ b/drivers/spi/bcmstb_spi.c @@ -76,7 +76,7 @@ enum bcmstb_base_type { BASE_LAST, };

-struct bcmstb_spi_platdata { +struct bcmstb_spi_plat { void *base[4]; };

@@ -96,7 +96,7 @@ struct bcmstb_spi_priv {

static int bcmstb_spi_of_to_plat(struct udevice *bus) { - struct bcmstb_spi_platdata *plat = dev_get_plat(bus); + struct bcmstb_spi_plat *plat = dev_get_plat(bus); const void *fdt = gd->fdt_blob; int node = dev_of_offset(bus); int ret = 0; @@ -159,7 +159,7 @@ static void bcmstb_spi_clear_interrupt(void *base, u32 mask)

static int bcmstb_spi_probe(struct udevice *bus) { - struct bcmstb_spi_platdata *plat = dev_get_plat(bus); + struct bcmstb_spi_plat *plat = dev_get_plat(bus); struct bcmstb_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->base[HIF_MSPI]; @@ -434,6 +434,6 @@ U_BOOT_DRIVER(bcmstb_spi) = { .ops = &bcmstb_spi_ops, .of_to_plat = bcmstb_spi_of_to_plat, .probe = bcmstb_spi_probe, - .plat_auto = sizeof(struct bcmstb_spi_platdata), + .plat_auto = sizeof(struct bcmstb_spi_plat), .priv_auto = sizeof(struct bcmstb_spi_priv), }; diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 2317d365596..b746501f5ff 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -27,7 +27,7 @@

static int cadence_spi_write_speed(struct udevice *bus, uint hz) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus);

cadence_qspi_apb_config_baudrate_div(priv->regbase, @@ -130,7 +130,7 @@ static int spi_calibration(struct udevice *bus, uint hz)

static int cadence_spi_set_speed(struct udevice *bus, uint hz) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); int err;

@@ -165,7 +165,7 @@ static int cadence_spi_set_speed(struct udevice *bus, uint hz)

static int cadence_spi_probe(struct udevice *bus) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); struct clk clk; int ret; @@ -212,7 +212,7 @@ static int cadence_spi_remove(struct udevice *dev)

static int cadence_spi_set_mode(struct udevice *bus, uint mode) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus);

/* Disable QSPI */ @@ -235,7 +235,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi, const struct spi_mem_op *op) { struct udevice *bus = spi->dev->parent; - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); void *base = priv->regbase; int err = 0; @@ -284,7 +284,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi,

static int cadence_spi_of_to_plat(struct udevice *bus) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; ofnode subnode;

plat->regbase = (void *)devfdt_get_addr_index(bus, 0); @@ -354,7 +354,7 @@ U_BOOT_DRIVER(cadence_spi) = { .of_match = cadence_spi_ids, .ops = &cadence_spi_ops, .of_to_plat = cadence_spi_of_to_plat, - .plat_auto = sizeof(struct cadence_spi_platdata), + .plat_auto = sizeof(struct cadence_spi_plat), .priv_auto = sizeof(struct cadence_spi_priv), .probe = cadence_spi_probe, .remove = cadence_spi_remove, diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h index ae459c74a19..64c5867609c 100644 --- a/drivers/spi/cadence_qspi.h +++ b/drivers/spi/cadence_qspi.h @@ -15,7 +15,7 @@ #define CQSPI_DECODER_MAX_CS 16 #define CQSPI_READ_CAPTURE_MAX_DELAY 16

-struct cadence_spi_platdata { +struct cadence_spi_plat { unsigned int ref_clk_hz; unsigned int max_hz; void *regbase; @@ -52,7 +52,7 @@ struct cadence_spi_priv { };

/* Functions call declaration */ -void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat); +void cadence_qspi_apb_controller_init(struct cadence_spi_plat *plat); void cadence_qspi_apb_controller_enable(void *reg_base_addr); void cadence_qspi_apb_controller_disable(void *reg_base_addr); void cadence_qspi_apb_dac_mode_enable(void *reg_base); @@ -62,13 +62,13 @@ int cadence_qspi_apb_command_read(void *reg_base_addr, int cadence_qspi_apb_command_write(void *reg_base_addr, const struct spi_mem_op *op);

-int cadence_qspi_apb_read_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op); -int cadence_qspi_apb_read_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op); -int cadence_qspi_apb_write_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op); -int cadence_qspi_apb_write_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op);

void cadence_qspi_apb_chipselect(void *reg_base, diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index f9675f75a40..b051f462ed2 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -377,7 +377,7 @@ void cadence_qspi_apb_delay(void *reg_base, cadence_qspi_apb_controller_enable(reg_base); }

-void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat) +void cadence_qspi_apb_controller_init(struct cadence_spi_plat *plat) { unsigned reg;

@@ -526,7 +526,7 @@ int cadence_qspi_apb_command_write(void *reg_base, const struct spi_mem_op *op) }

/* Opcode + Address (3/4 bytes) + dummy bytes (0-4 bytes) */ -int cadence_qspi_apb_read_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { unsigned int reg; @@ -572,14 +572,14 @@ int cadence_qspi_apb_read_setup(struct cadence_spi_platdata *plat, return 0; }

-static u32 cadence_qspi_get_rd_sram_level(struct cadence_spi_platdata *plat) +static u32 cadence_qspi_get_rd_sram_level(struct cadence_spi_plat *plat) { u32 reg = readl(plat->regbase + CQSPI_REG_SDRAMLEVEL); reg >>= CQSPI_REG_SDRAMLEVEL_RD_LSB; return reg & CQSPI_REG_SDRAMLEVEL_RD_MASK; }

-static int cadence_qspi_wait_for_data(struct cadence_spi_platdata *plat) +static int cadence_qspi_wait_for_data(struct cadence_spi_plat *plat) { unsigned int timeout = 10000; u32 reg; @@ -595,7 +595,7 @@ static int cadence_qspi_wait_for_data(struct cadence_spi_platdata *plat) }

static int -cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat, +cadence_qspi_apb_indirect_read_execute(struct cadence_spi_plat *plat, unsigned int n_rx, u8 *rxbuf) { unsigned int remaining = n_rx; @@ -657,7 +657,7 @@ failrd: return ret; }

-int cadence_qspi_apb_read_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { u64 from = op->addr.val; @@ -678,7 +678,7 @@ int cadence_qspi_apb_read_execute(struct cadence_spi_platdata *plat, }

/* Opcode + Address (3/4 bytes) */ -int cadence_qspi_apb_write_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { unsigned int reg; @@ -701,7 +701,7 @@ int cadence_qspi_apb_write_setup(struct cadence_spi_platdata *plat, }

static int -cadence_qspi_apb_indirect_write_execute(struct cadence_spi_platdata *plat, +cadence_qspi_apb_indirect_write_execute(struct cadence_spi_plat *plat, unsigned int n_tx, const u8 *txbuf) { unsigned int page_size = plat->page_size; @@ -774,7 +774,7 @@ failwr: return ret; }

-int cadence_qspi_apb_write_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { u32 to = op->addr.val; diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index ab0332a77a6..8adff63edc6 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -114,7 +114,7 @@ static int coldfire_spi_claim_bus(struct udevice *dev) struct udevice *bus = dev->parent; struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

if ((in_be32(&dspi->sr) & DSPI_SR_TXRXS) != DSPI_SR_TXRXS) @@ -133,7 +133,7 @@ static int coldfire_spi_release_bus(struct udevice *dev) struct udevice *bus = dev->parent; struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

/* Clear FIFO */ @@ -150,7 +150,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct coldfire_spi_priv *cfspi = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u16 *spi_rd16 = NULL, *spi_wr16 = NULL; u8 *spi_rd = NULL, *spi_wr = NULL; static u32 ctrl; @@ -343,7 +343,7 @@ static int coldfire_spi_set_mode(struct udevice *bus, uint mode)

static int coldfire_spi_probe(struct udevice *bus) { - struct coldfire_spi_platdata *plat = dev_get_plat(bus); + struct coldfire_spi_plat *plat = dev_get_plat(bus); struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; int i; @@ -387,7 +387,7 @@ static int coldfire_spi_probe(struct udevice *bus) static int coldfire_dspi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; - struct coldfire_spi_platdata *plat = bus->plat; + struct coldfire_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); int *ctar, len; @@ -452,7 +452,7 @@ U_BOOT_DRIVER(coldfire_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = coldfire_spi_ids, .of_to_plat = coldfire_dspi_of_to_plat, - .plat_auto = sizeof(struct coldfire_spi_platdata), + .plat_auto = sizeof(struct coldfire_spi_plat), #endif .probe = coldfire_spi_probe, .ops = &coldfire_spi_ops, diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 0f887ed649a..ea088ebd2cb 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -333,7 +333,7 @@ static int davinci_spi_set_mode(struct udevice *bus, uint mode)

static int davinci_spi_claim_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct davinci_spi_slave *ds = dev_get_priv(bus); @@ -358,7 +358,7 @@ static int davinci_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct dm_spi_slave_platdata *slave = + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct davinci_spi_slave *ds = dev_get_priv(bus); @@ -383,7 +383,7 @@ static const struct dm_spi_ops davinci_spi_ops = { static int davinci_spi_probe(struct udevice *bus) { struct davinci_spi_slave *ds = dev_get_priv(bus); - struct davinci_spi_platdata *plat = bus->plat; + struct davinci_spi_plat *plat = bus->plat; ds->regs = plat->regs; ds->num_cs = plat->num_cs;

@@ -393,7 +393,7 @@ static int davinci_spi_probe(struct udevice *bus) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int davinci_ofdata_to_platadata(struct udevice *bus) { - struct davinci_spi_platdata *plat = bus->plat; + struct davinci_spi_plat *plat = bus->plat; fdt_addr_t addr;

addr = dev_read_addr(bus); @@ -420,7 +420,7 @@ U_BOOT_DRIVER(davinci_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = davinci_spi_ids, .of_to_plat = davinci_ofdata_to_platadata, - .plat_auto = sizeof(struct davinci_spi_platdata), + .plat_auto = sizeof(struct davinci_spi_plat), #endif .probe = davinci_spi_probe, .ops = &davinci_spi_ops, diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 5429ac776ed..4fa4585fc35 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -88,7 +88,7 @@

#define RX_TIMEOUT 1000 /* timeout in ms */

-struct dw_spi_platdata { +struct dw_spi_plat { s32 frequency; /* Default clock frequency, -1 for none */ void __iomem *regs; }; @@ -155,7 +155,7 @@ static int request_gpio_cs(struct udevice *bus)

static int dw_spi_of_to_plat(struct udevice *bus) { - struct dw_spi_platdata *plat = bus->plat; + struct dw_spi_plat *plat = bus->plat;

plat->regs = dev_read_addr_ptr(bus);

@@ -263,7 +263,7 @@ static int dw_spi_reset(struct udevice *bus)

static int dw_spi_probe(struct udevice *bus) { - struct dw_spi_platdata *plat = dev_get_plat(bus); + struct dw_spi_plat *plat = dev_get_plat(bus); struct dw_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -478,7 +478,7 @@ static int dw_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int dw_spi_set_speed(struct udevice *bus, uint speed) { - struct dw_spi_platdata *plat = bus->plat; + struct dw_spi_plat *plat = bus->plat; struct dw_spi_priv *priv = dev_get_priv(bus); u16 clk_div;

@@ -560,7 +560,7 @@ U_BOOT_DRIVER(dw_spi) = { .of_match = dw_spi_ids, .ops = &dw_spi_ops, .of_to_plat = dw_spi_of_to_plat, - .plat_auto = sizeof(struct dw_spi_platdata), + .plat_auto = sizeof(struct dw_spi_plat), .priv_auto = sizeof(struct dw_spi_priv), .probe = dw_spi_probe, .remove = dw_spi_remove, diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 9505d88ff06..e4d2bade0f0 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -23,7 +23,7 @@

DECLARE_GLOBAL_DATA_PTR;

-struct exynos_spi_platdata { +struct exynos_spi_plat { enum periph_id periph_id; s32 frequency; /* Default clock frequency, -1 for none */ struct exynos_spi *regs; @@ -213,7 +213,7 @@ static int spi_rx_tx(struct exynos_spi_priv *priv, int todo, static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_plat(bus); + struct exynos_spi_plat *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -239,7 +239,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_plat(bus); + struct exynos_spi_plat *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

setbits_le32(&priv->regs->cs_reg, SPI_SLAVE_SIG_INACT); @@ -253,7 +253,7 @@ static void spi_cs_deactivate(struct udevice *dev)

static int exynos_spi_of_to_plat(struct udevice *bus) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -280,7 +280,7 @@ static int exynos_spi_of_to_plat(struct udevice *bus)

static int exynos_spi_probe(struct udevice *bus) { - struct exynos_spi_platdata *plat = dev_get_plat(bus); + struct exynos_spi_plat *plat = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);

priv->regs = plat->regs; @@ -368,7 +368,7 @@ static int exynos_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int exynos_spi_set_speed(struct udevice *bus, uint speed) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; struct exynos_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -427,7 +427,7 @@ U_BOOT_DRIVER(exynos_spi) = { .of_match = exynos_spi_ids, .ops = &exynos_spi_ops, .of_to_plat = exynos_spi_of_to_plat, - .plat_auto = sizeof(struct exynos_spi_platdata), + .plat_auto = sizeof(struct exynos_spi_plat), .priv_auto = sizeof(struct exynos_spi_priv), .probe = exynos_spi_probe, }; diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index 56da67024e0..ddf4a9e413f 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -31,7 +31,7 @@

DECLARE_GLOBAL_DATA_PTR;

-/* fsl_dspi_platdata flags */ +/* fsl_dspi_plat flags */ #define DSPI_FLAG_REGMAP_ENDIAN_BIG BIT(0)

/* idle data value */ @@ -65,14 +65,14 @@ DECLARE_GLOBAL_DATA_PTR; DSPI_CTAR_DT(15))

/** - * struct fsl_dspi_platdata - platform data for Freescale DSPI + * struct fsl_dspi_plat - platform data for Freescale DSPI * * @flags: Flags for DSPI DSPI_FLAG_... * @speed_hz: Default SCK frequency * @num_chipselect: Number of DSPI chipselect signals * @regs_addr: Base address of DSPI registers */ -struct fsl_dspi_platdata { +struct fsl_dspi_plat { uint flags; uint speed_hz; uint num_chipselect; @@ -448,7 +448,7 @@ static int fsl_dspi_cfg_speed(struct fsl_dspi_priv *priv, uint speed)

static int fsl_dspi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct fsl_dspi_priv *priv = dev_get_priv(dev->parent); u32 cs_sck_delay = 0, sck_cs_delay = 0; unsigned char pcssck = 0, cssck = 0; @@ -481,7 +481,7 @@ static int fsl_dspi_child_pre_probe(struct udevice *dev)

static int fsl_dspi_probe(struct udevice *bus) { - struct fsl_dspi_platdata *plat = dev_get_plat(bus); + struct fsl_dspi_plat *plat = dev_get_plat(bus); struct fsl_dspi_priv *priv = dev_get_priv(bus); struct dm_spi_bus *dm_spi_bus; uint mcr_cfg_val; @@ -521,7 +521,7 @@ static int fsl_dspi_claim_bus(struct udevice *dev) uint sr_val; struct fsl_dspi_priv *priv; struct udevice *bus = dev->parent; - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

priv = dev_get_priv(bus); @@ -552,7 +552,7 @@ static int fsl_dspi_release_bus(struct udevice *dev) { struct udevice *bus = dev->parent; struct fsl_dspi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

/* halt module */ @@ -576,7 +576,7 @@ static int fsl_dspi_bind(struct udevice *bus) static int fsl_dspi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; - struct fsl_dspi_platdata *plat = bus->plat; + struct fsl_dspi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -608,7 +608,7 @@ static int fsl_dspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct fsl_dspi_priv *priv; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus;

bus = dev->parent; @@ -660,7 +660,7 @@ U_BOOT_DRIVER(fsl_dspi) = { .of_match = fsl_dspi_ids, .ops = &fsl_dspi_ops, .of_to_plat = fsl_dspi_of_to_plat, - .plat_auto = sizeof(struct fsl_dspi_platdata), + .plat_auto = sizeof(struct fsl_dspi_plat), .priv_auto = sizeof(struct fsl_dspi_priv), .probe = fsl_dspi_probe, .child_pre_probe = fsl_dspi_child_pre_probe, diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index b41d3d83fe6..e9e7ffd6b53 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -508,7 +508,7 @@ static int fsl_espi_set_mode(struct udevice *bus, uint mode)

static int fsl_espi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct fsl_spi_slave *fsl = dev_get_priv(bus);

@@ -520,7 +520,7 @@ static int fsl_espi_child_pre_probe(struct udevice *dev)

static int fsl_espi_probe(struct udevice *bus) { - struct fsl_espi_platdata *plat = dev_get_plat(bus); + struct fsl_espi_plat *plat = dev_get_plat(bus); struct fsl_spi_slave *fsl = dev_get_priv(bus);

fsl->espi = (ccsr_espi_t *)((u32)plat->regs_addr); @@ -544,7 +544,7 @@ static const struct dm_spi_ops fsl_espi_ops = { static int fsl_espi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; - struct fsl_espi_platdata *plat = bus->plat; + struct fsl_espi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -576,7 +576,7 @@ U_BOOT_DRIVER(fsl_espi) = { .of_to_plat = fsl_espi_of_to_plat, #endif .ops = &fsl_espi_ops, - .plat_auto = sizeof(struct fsl_espi_platdata), + .plat_auto = sizeof(struct fsl_espi_plat), .priv_auto = sizeof(struct fsl_spi_slave), .probe = fsl_espi_probe, .child_pre_probe = fsl_espi_child_pre_probe, diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 089c2d802d5..fc3b844370c 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -515,7 +515,7 @@ static void fsl_qspi_invalidate(struct fsl_qspi *q)

static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_slave *slave) { - struct dm_spi_slave_platdata *plat = + struct dm_spi_slave_plat *plat = dev_get_parent_plat(slave->dev);

if (q->selected == plat->cs) diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 4c01ec86e03..e02850e9f22 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -38,7 +38,7 @@ #define debug_trace(x, args...) #endif

-struct ich_spi_platdata { +struct ich_spi_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_fast_spi dtplat; #endif @@ -139,7 +139,7 @@ static bool ich9_can_do_33mhz(struct udevice *dev) return speed == 1; }

-static void spi_lock_down(struct ich_spi_platdata *plat, void *sbase) +static void spi_lock_down(struct ich_spi_plat *plat, void *sbase) { if (plat->ich_version == ICHV_7) { struct ich7_spi_regs *ich7_spi = sbase; @@ -152,7 +152,7 @@ static void spi_lock_down(struct ich_spi_platdata *plat, void *sbase) } }

-static bool spi_lock_status(struct ich_spi_platdata *plat, void *sbase) +static bool spi_lock_status(struct ich_spi_plat *plat, void *sbase) { int lock = 0;

@@ -264,7 +264,7 @@ static int ich_spi_exec_op_swseq(struct spi_slave *slave, const struct spi_mem_op *op) { struct udevice *bus = dev_get_parent(slave->dev); - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus); struct ich_spi_priv *ctlr = dev_get_priv(bus); uint16_t control; int16_t opcode_index; @@ -602,7 +602,7 @@ static int ich_spi_exec_op_hwseq(struct spi_slave *slave, static int ich_spi_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) { struct udevice *bus = dev_get_parent(slave->dev); - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus); int ret;

bootstage_start(BOOTSTAGE_ID_ACCUM_SPI, "fast_spi"); @@ -685,7 +685,7 @@ static int ich_get_mmap_bus(struct udevice *bus, ulong *map_basep, pci_dev_t spi_bdf; #if !CONFIG_IS_ENABLED(OF_PLATDATA) if (device_is_on_pci_bus(bus)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat;

pplat = dev_get_parent_plat(bus); spi_bdf = pplat->devfn; @@ -706,7 +706,7 @@ static int ich_get_mmap_bus(struct udevice *bus, ulong *map_basep, offsetp); } #else - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus);

/* * We cannot rely on plat->bdf being set up yet since this method can @@ -758,7 +758,7 @@ static int ich_spi_adjust_size(struct spi_slave *slave, struct spi_mem_op *op)

static int ich_protect_lockdown(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev); struct ich_spi_priv *priv = dev_get_priv(dev); int ret = -ENOSYS;

@@ -788,11 +788,11 @@ static int ich_protect_lockdown(struct udevice *dev) }

static int ich_init_controller(struct udevice *dev, - struct ich_spi_platdata *plat, + struct ich_spi_plat *plat, struct ich_spi_priv *ctlr) { if (spl_phase() == PHASE_TPL) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev); int ret;

ret = fast_spi_early_init(plat->bdf, plat->mmio_base); @@ -871,7 +871,7 @@ static int ich_cache_bios_region(struct udevice *dev)

static int ich_spi_probe(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev); struct ich_spi_priv *priv = dev_get_priv(dev); int ret;

@@ -924,7 +924,7 @@ static int ich_spi_set_mode(struct udevice *bus, uint mode) static int ich_spi_child_pre_probe(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus); struct ich_spi_priv *priv = dev_get_priv(bus); struct spi_slave *slave = dev_get_parent_priv(dev);

@@ -947,7 +947,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev)

static int ich_spi_of_to_plat(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev);

#if !CONFIG_IS_ENABLED(OF_PLATDATA) struct ich_spi_priv *priv = dev_get_priv(dev); @@ -1005,7 +1005,7 @@ U_BOOT_DRIVER(intel_fast_spi) = { .of_match = ich_spi_ids, .ops = &ich_spi_ops, .of_to_plat = ich_spi_of_to_plat, - .plat_auto = sizeof(struct ich_spi_platdata), + .plat_auto = sizeof(struct ich_spi_plat), .priv_auto = sizeof(struct ich_spi_priv), .child_pre_probe = ich_spi_child_pre_probe, .probe = ich_spi_probe, diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index 669a44ce088..43812da0ebb 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -23,7 +23,7 @@ struct mvebu_spi_dev { bool is_errata_50mhz_ac; };

-struct mvebu_spi_platdata { +struct mvebu_spi_plat { struct kwspi_registers *spireg; bool is_errata_50mhz_ac; }; @@ -109,7 +109,7 @@ static int _spi_xfer(struct kwspi_registers *reg, unsigned int bitlen,

static int mvebu_spi_set_speed(struct udevice *bus, uint hz) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data;

@@ -127,7 +127,7 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz)

static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data;

@@ -160,7 +160,7 @@ static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode)

static int mvebu_spi_set_mode(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data = readl(&reg->cfg);

@@ -185,7 +185,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus);

return _spi_xfer(plat->spireg, bitlen, dout, din, flags); } @@ -198,7 +198,7 @@ __attribute__((weak)) int mvebu_board_spi_claim_bus(struct udevice *dev) static int mvebu_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus);

/* Configure the chip-select in the CTRL register */ clrsetbits_le32(&plat->spireg->ctrl, @@ -220,7 +220,7 @@ static int mvebu_spi_release_bus(struct udevice *dev)

static int mvebu_spi_probe(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg;

writel(KWSPI_SMEMRDY, &reg->ctrl); @@ -232,7 +232,7 @@ static int mvebu_spi_probe(struct udevice *bus)

static int mvebu_spi_of_to_plat(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); const struct mvebu_spi_dev *drvdata = (struct mvebu_spi_dev *)dev_get_driver_data(bus);

@@ -296,7 +296,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .of_to_plat = mvebu_spi_of_to_plat, - .plat_auto = sizeof(struct mvebu_spi_platdata), + .plat_auto = sizeof(struct mvebu_spi_plat), .priv_auto = sizeof(struct mvebu_spi_priv), .probe = mvebu_spi_probe, }; diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 02f8219ca1f..6869d60d97b 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -107,7 +107,7 @@ static int mpc8xxx_spi_probe(struct udevice *dev) static void mpc8xxx_spi_cs_activate(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev);

dm_gpio_set_value(&priv->gpios[plat->cs], 1); } @@ -115,7 +115,7 @@ static void mpc8xxx_spi_cs_activate(struct udevice *dev) static void mpc8xxx_spi_cs_deactivate(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev);

dm_gpio_set_value(&priv->gpios[plat->cs], 0); } @@ -126,7 +126,7 @@ static int mpc8xxx_spi_xfer(struct udevice *dev, uint bitlen, struct udevice *bus = dev->parent; struct mpc8xxx_priv *priv = dev_get_priv(bus); spi8xxx_t *spi = priv->spi; - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); u32 tmpdin = 0, tmpdout = 0, n; const u8 *cout = dout; u8 *cin = din; diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c index e5de49a013e..2a01ea061fb 100644 --- a/drivers/spi/mscc_bb_spi.c +++ b/drivers/spi/mscc_bb_spi.c @@ -117,7 +117,7 @@ int mscc_bb_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); struct mscc_bb_priv *priv = dev_get_priv(bus); u32 i, count; const u8 *txd = dout; diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index 32a26d40413..c40d7d17be4 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -38,13 +38,13 @@ struct spi_reg { u32 din; /* 0x1060c */ };

-struct mvebu_spi_platdata { +struct mvebu_spi_plat { struct spi_reg *spireg; struct clk clk; struct gpio_desc cs_gpios[MAX_CS_COUNT]; };

-static void spi_cs_activate(struct mvebu_spi_platdata *plat, int cs) +static void spi_cs_activate(struct mvebu_spi_plat *plat, int cs) { if (CONFIG_IS_ENABLED(DM_GPIO) && dm_gpio_is_valid(&plat->cs_gpios[cs])) dm_gpio_set_value(&plat->cs_gpios[cs], 1); @@ -52,7 +52,7 @@ static void spi_cs_activate(struct mvebu_spi_platdata *plat, int cs) setbits_le32(&plat->spireg->ctrl, MVEBU_SPI_A3700_SPI_EN_0 << cs); }

-static void spi_cs_deactivate(struct mvebu_spi_platdata *plat, int cs) +static void spi_cs_deactivate(struct mvebu_spi_plat *plat, int cs) { if (CONFIG_IS_ENABLED(DM_GPIO) && dm_gpio_is_valid(&plat->cs_gpios[cs])) dm_gpio_set_value(&plat->cs_gpios[cs], 0); @@ -146,7 +146,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; unsigned int bytelen; int ret; @@ -186,7 +186,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int mvebu_spi_set_speed(struct udevice *bus, uint hz) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; u32 data, prescale;

@@ -207,7 +207,7 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz)

static int mvebu_spi_set_mode(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg;

/* @@ -229,7 +229,7 @@ static int mvebu_spi_set_mode(struct udevice *bus, uint mode)

static int mvebu_spi_probe(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; u32 data; int ret; @@ -281,7 +281,7 @@ static int mvebu_spi_probe(struct udevice *bus)

static int mvebu_spi_of_to_plat(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); int ret;

plat->spireg = dev_read_addr_ptr(bus); @@ -297,7 +297,7 @@ static int mvebu_spi_of_to_plat(struct udevice *bus)

static int mvebu_spi_remove(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus);

clk_free(&plat->clk);

@@ -325,7 +325,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .of_to_plat = mvebu_spi_of_to_plat, - .plat_auto = sizeof(struct mvebu_spi_platdata), + .plat_auto = sizeof(struct mvebu_spi_plat), .probe = mvebu_spi_probe, .remove = mvebu_spi_remove, }; diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index af476c8c996..c5ffad80fb6 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -69,7 +69,7 @@ static void mxc_spi_cs_activate(struct mxc_spi_slave *mxcs) { #if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev = mxcs->dev; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

u32 cs = slave_plat->cs;

@@ -87,7 +87,7 @@ static void mxc_spi_cs_deactivate(struct mxc_spi_slave *mxcs) { #if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev = mxcs->dev; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

u32 cs = slave_plat->cs;

@@ -559,7 +559,7 @@ static int mxc_spi_xfer(struct udevice *dev, unsigned int bitlen, static int mxc_spi_claim_bus(struct udevice *dev) { struct mxc_spi_slave *mxcs = dev_get_plat(dev->parent); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

mxcs->dev = dev;

diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 0973d511f12..4fafe33af57 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -41,7 +41,7 @@ #define MXS_SSP_IMX23_CLKID_SSP0 33 #define MXS_SSP_IMX28_CLKID_SSP0 46

-struct mxs_spi_platdata { +struct mxs_spi_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_fsl_imx23_spi dtplat; #endif @@ -311,7 +311,7 @@ int mxs_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int mxs_spi_probe(struct udevice *bus) { - struct mxs_spi_platdata *plat = dev_get_plat(bus); + struct mxs_spi_plat *plat = dev_get_plat(bus); struct mxs_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -443,7 +443,7 @@ static const struct dm_spi_ops mxs_spi_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxs_of_to_plat(struct udevice *bus) { - struct mxs_spi_platdata *plat = bus->plat; + struct mxs_spi_plat *plat = bus->plat; u32 prop[2]; int ret;

@@ -487,7 +487,7 @@ U_BOOT_DRIVER(fsl_imx23_spi) = { .of_match = mxs_spi_ids, .of_to_plat = mxs_of_to_plat, #endif - .plat_auto = sizeof(struct mxs_spi_platdata), + .plat_auto = sizeof(struct mxs_spi_plat), .ops = &mxs_spi_ops, .priv_auto = sizeof(struct mxs_spi_priv), .probe = mxs_spi_probe, diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 04a296a5ba5..006dd04b9e1 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -887,7 +887,7 @@ static int nxp_fspi_claim_bus(struct udevice *dev) { struct nxp_fspi *f; struct udevice *bus; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

bus = dev->parent; f = dev_get_priv(bus); diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c index 42fee1350e8..6ac66d2f9a2 100644 --- a/drivers/spi/octeon_spi.c +++ b/drivers/spi/octeon_spi.c @@ -81,7 +81,7 @@ struct octeon_spi {

static u64 octeon_spi_set_mpicfg(struct udevice *dev) { - struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); struct octeon_spi *priv = dev_get_priv(bus); u64 mpi_cfg; diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 0594a9c14af..78e2a25cdb4 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -378,7 +378,7 @@ static int omap3_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev->parent; struct omap3_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

priv->cs = slave_plat->cs; priv->freq = slave_plat->max_hz; @@ -402,7 +402,7 @@ static int omap3_spi_set_wordlen(struct udevice *dev, unsigned int wordlen) { struct udevice *bus = dev->parent; struct omap3_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

priv->cs = slave_plat->cs; priv->wordlen = wordlen; diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c index f7d2aea9132..34d7d3e2ac3 100644 --- a/drivers/spi/pic32_spi.c +++ b/drivers/spi/pic32_spi.c @@ -236,7 +236,7 @@ static int pic32_spi_xfer(struct udevice *slave, unsigned int bitlen, const void *tx_buf, void *rx_buf, unsigned long flags) { - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct udevice *bus = slave->parent; struct pic32_spi_priv *priv; int len = bitlen / 8; diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 7a030b11416..105765168e5 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -156,7 +156,7 @@

DECLARE_GLOBAL_DATA_PTR;

-struct rpc_spi_platdata { +struct rpc_spi_plat { fdt_addr_t regs; fdt_addr_t extr; s32 freq; /* Default clock freq, -1 for none */ @@ -406,7 +406,7 @@ static int rpc_spi_bind(struct udevice *parent)

static int rpc_spi_probe(struct udevice *dev) { - struct rpc_spi_platdata *plat = dev_get_plat(dev); + struct rpc_spi_plat *plat = dev_get_plat(dev); struct rpc_spi_priv *priv = dev_get_priv(dev);

priv->regs = plat->regs; @@ -419,7 +419,7 @@ static int rpc_spi_probe(struct udevice *dev)

static int rpc_spi_of_to_plat(struct udevice *bus) { - struct rpc_spi_platdata *plat = dev_get_plat(bus); + struct rpc_spi_plat *plat = dev_get_plat(bus);

plat->regs = dev_read_addr_index(bus, 0); plat->extr = dev_read_addr_index(bus, 1); @@ -464,7 +464,7 @@ U_BOOT_DRIVER(rpc_spi) = { .of_match = rpc_spi_ids, .ops = &rpc_spi_ops, .of_to_plat = rpc_spi_of_to_plat, - .plat_auto = sizeof(struct rpc_spi_platdata), + .plat_auto = sizeof(struct rpc_spi_plat), .priv_auto = sizeof(struct rpc_spi_priv), .bind = rpc_spi_bind, .probe = rpc_spi_probe, diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index 56cf7642ea7..44ac475c11d 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -40,7 +40,7 @@ struct rockchip_spi_params { bool master_manages_fifo; };

-struct rockchip_spi_platdata { +struct rockchip_spi_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_rockchip_rk3288_spi of_plat; #endif @@ -135,7 +135,7 @@ static int rkspi_wait_till_not_busy(struct rockchip_spi *regs) static void spi_cs_activate(struct udevice *dev, uint cs) { struct udevice *bus = dev->parent; - struct rockchip_spi_platdata *plat = bus->plat; + struct rockchip_spi_plat *plat = bus->plat; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs;

@@ -161,7 +161,7 @@ static void spi_cs_activate(struct udevice *dev, uint cs) static void spi_cs_deactivate(struct udevice *dev, uint cs) { struct udevice *bus = dev->parent; - struct rockchip_spi_platdata *plat = bus->plat; + struct rockchip_spi_plat *plat = bus->plat; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs;

@@ -174,9 +174,9 @@ static void spi_cs_deactivate(struct udevice *dev, uint cs) }

#if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { - struct rockchip_spi_platdata *plat = dev->plat; + struct rockchip_spi_plat *plat = dev->plat; struct dtd_rockchip_rk3288_spi *dtplat = &plat->of_plat; struct rockchip_spi_priv *priv = dev_get_priv(dev); int ret; @@ -194,7 +194,7 @@ static int conv_of_platdata(struct udevice *dev) static int rockchip_spi_of_to_plat(struct udevice *bus) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rockchip_spi_platdata *plat = dev_get_plat(bus); + struct rockchip_spi_plat *plat = dev_get_plat(bus); struct rockchip_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -252,13 +252,13 @@ static int rockchip_spi_calc_modclk(ulong max_freq)

static int rockchip_spi_probe(struct udevice *bus) { - struct rockchip_spi_platdata *plat = dev_get_plat(bus); + struct rockchip_spi_plat *plat = dev_get_plat(bus); struct rockchip_spi_priv *priv = dev_get_priv(bus); int ret;

debug("%s: probe\n", __func__); #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(bus); + ret = conv_of_plat(bus); if (ret) return ret; #endif @@ -431,7 +431,7 @@ static int rockchip_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); int len = bitlen >> 3; const u8 *out = dout; u8 *in = din; @@ -560,7 +560,7 @@ U_BOOT_DRIVER(rockchip_rk3288_spi) = { .of_match = rockchip_spi_ids, .ops = &rockchip_spi_ops, .of_to_plat = rockchip_spi_of_to_plat, - .plat_auto = sizeof(struct rockchip_spi_platdata), + .plat_auto = sizeof(struct rockchip_spi_plat), .priv_auto = sizeof(struct rockchip_spi_priv), .probe = rockchip_spi_probe, }; diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index d4a886ad405..afc98bfb663 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -22,7 +22,7 @@

DECLARE_GLOBAL_DATA_PTR;

-struct soft_spi_platdata { +struct soft_spi_plat { struct gpio_desc cs; struct gpio_desc sclk; struct gpio_desc mosi; @@ -41,7 +41,7 @@ struct soft_spi_priv { static int soft_spi_scl(struct udevice *dev, int bit) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus);

dm_gpio_set_value(&plat->sclk, bit);

@@ -51,7 +51,7 @@ static int soft_spi_scl(struct udevice *dev, int bit) static int soft_spi_sda(struct udevice *dev, int bit) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus);

dm_gpio_set_value(&plat->mosi, bit);

@@ -62,7 +62,7 @@ static int soft_spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); struct soft_spi_priv *priv = dev_get_priv(bus); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus); int cidle = !!(priv->mode & SPI_CPOL);

dm_gpio_set_value(&plat->cs, 0); @@ -75,7 +75,7 @@ static int soft_spi_cs_activate(struct udevice *dev) static int soft_spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus);

dm_gpio_set_value(&plat->cs, 0);

@@ -117,7 +117,7 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct soft_spi_priv *priv = dev_get_priv(bus); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus); uchar tmpdin = 0; uchar tmpdout = 0; const u8 *txd = dout; @@ -228,7 +228,7 @@ static const struct dm_spi_ops soft_spi_ops = {

static int soft_spi_of_to_plat(struct udevice *dev) { - struct soft_spi_platdata *plat = dev->plat; + struct soft_spi_plat *plat = dev->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(dev);

@@ -240,7 +240,7 @@ static int soft_spi_of_to_plat(struct udevice *dev) static int soft_spi_probe(struct udevice *dev) { struct spi_slave *slave = dev_get_parent_priv(dev); - struct soft_spi_platdata *plat = dev->plat; + struct soft_spi_plat *plat = dev->plat; int cs_flags, clk_flags; int ret;

@@ -281,7 +281,7 @@ U_BOOT_DRIVER(soft_spi) = { .of_match = soft_spi_ids, .ops = &soft_spi_ops, .of_to_plat = soft_spi_of_to_plat, - .plat_auto = sizeof(struct soft_spi_platdata), + .plat_auto = sizeof(struct soft_spi_plat), .priv_auto = sizeof(struct soft_spi_priv), .probe = soft_spi_probe, }; diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index a549b66639b..cdea5405f6a 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -701,7 +701,7 @@ static int qup_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); unsigned int len; const u8 *txp = dout; u8 *rxp = din; diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index 81cdfc0e104..0a00df0ac75 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -105,7 +105,7 @@ struct sifive_spi { };

static void sifive_spi_prep_device(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave_plat) + struct dm_spi_slave_plat *slave_plat) { /* Update the chip select polarity */ if (slave_plat->mode & SPI_CS_HIGH) @@ -119,7 +119,7 @@ static void sifive_spi_prep_device(struct sifive_spi *spi, }

static int sifive_spi_set_cs(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave_plat) + struct dm_spi_slave_plat *slave_plat) { u32 cs_mode = SIFIVE_SPI_CSMODE_MODE_HOLD;

@@ -137,7 +137,7 @@ static void sifive_spi_clear_cs(struct sifive_spi *spi) }

static void sifive_spi_prep_transfer(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave_plat, + struct dm_spi_slave_plat *slave_plat, u8 *rx_ptr) { u32 cr; @@ -212,7 +212,7 @@ static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct sifive_spi *spi = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); const u8 *tx_ptr = dout; u8 *rx_ptr = din; u32 remaining_len; diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index 00703f921df..11453800788 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -122,7 +122,7 @@ struct sun4i_spi_variant { bool has_burst_ctl; };

-struct sun4i_spi_platdata { +struct sun4i_spi_plat { struct sun4i_spi_variant *variant; u32 base; u32 max_hz; @@ -339,7 +339,7 @@ static int sun4i_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct sun4i_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

u32 len = bitlen / 8; u32 rx_fifocnt; @@ -407,7 +407,7 @@ static int sun4i_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int sun4i_spi_set_speed(struct udevice *dev, uint speed) { - struct sun4i_spi_platdata *plat = dev_get_plat(dev); + struct sun4i_spi_plat *plat = dev_get_plat(dev); struct sun4i_spi_priv *priv = dev_get_priv(dev); unsigned int div; u32 reg; @@ -483,7 +483,7 @@ static const struct dm_spi_ops sun4i_spi_ops = {

static int sun4i_spi_probe(struct udevice *bus) { - struct sun4i_spi_platdata *plat = dev_get_plat(bus); + struct sun4i_spi_plat *plat = dev_get_plat(bus); struct sun4i_spi_priv *priv = dev_get_priv(bus); int ret;

@@ -516,7 +516,7 @@ static int sun4i_spi_probe(struct udevice *bus)

static int sun4i_spi_of_to_plat(struct udevice *bus) { - struct sun4i_spi_platdata *plat = dev_get_plat(bus); + struct sun4i_spi_plat *plat = dev_get_plat(bus); int node = dev_of_offset(bus);

plat->base = dev_read_addr(bus); @@ -631,7 +631,7 @@ U_BOOT_DRIVER(sun4i_spi) = { .of_match = sun4i_spi_ids, .ops = &sun4i_spi_ops, .of_to_plat = sun4i_spi_of_to_plat, - .plat_auto = sizeof(struct sun4i_spi_platdata), + .plat_auto = sizeof(struct sun4i_spi_plat), .priv_auto = sizeof(struct sun4i_spi_priv), .probe = sun4i_spi_probe, }; diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index bcbbd061789..f3b8ffad425 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -153,7 +153,7 @@ int spi_write_then_read(struct spi_slave *slave, const u8 *opcode, #if !CONFIG_IS_ENABLED(OF_PLATDATA) static int spi_child_post_bind(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev);

if (!dev_of_valid(dev)) return 0; @@ -197,7 +197,7 @@ static int spi_post_probe(struct udevice *bus)

static int spi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); struct spi_slave *slave = dev_get_parent_priv(dev);

/* @@ -218,7 +218,7 @@ static int spi_child_pre_probe(struct udevice *dev)

int spi_chip_select(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev);

return plat ? plat->cs : -ENOENT; } @@ -254,7 +254,7 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp)

for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat;

plat = dev_get_parent_plat(dev); debug("%s: plat=%p, cs=%d\n", __func__, plat, plat->cs); @@ -323,7 +323,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, struct udevice **busp, struct spi_slave **devp) { struct udevice *bus, *dev; - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat; struct spi_slave *slave; bool created = false; int ret; @@ -431,8 +431,7 @@ void spi_free_slave(struct spi_slave *slave) slave->dev = NULL; }

-int spi_slave_of_to_plat(struct udevice *dev, - struct dm_spi_slave_platdata *plat) +int spi_slave_of_to_plat(struct udevice *dev, struct dm_spi_slave_plat *plat) { int mode = 0; int value; @@ -504,7 +503,7 @@ UCLASS_DRIVER(spi) = { .child_pre_probe = spi_child_pre_probe, .per_device_auto = sizeof(struct dm_spi_bus), .per_child_auto = sizeof(struct spi_slave), - .per_child_plat_auto = sizeof(struct dm_spi_slave_platdata), + .per_child_plat_auto = sizeof(struct dm_spi_slave_plat), #if !CONFIG_IS_ENABLED(OF_PLATDATA) .child_post_bind = spi_child_post_bind, #endif diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index 4d67e9ba46a..440085720aa 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -400,7 +400,7 @@ static int stm32_qspi_probe(struct udevice *bus) static int stm32_qspi_claim_bus(struct udevice *dev) { struct stm32_qspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); int slave_cs = slave_plat->cs;

if (slave_cs >= STM32_QSPI_MAX_CHIP) diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c index d2c2262dc74..720103d5176 100644 --- a/drivers/spi/stm32_spi.c +++ b/drivers/spi/stm32_spi.c @@ -362,7 +362,7 @@ static int stm32_spi_xfer(struct udevice *slave, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(slave); - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct stm32_spi_priv *priv = dev_get_priv(bus); u32 sr; u32 ifcr = 0; diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index 3df7521771a..e1fd82bdfa3 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -99,7 +99,7 @@ struct tegra114_spi_priv {

static int tegra114_spi_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat;

plat->base = dev_read_addr(bus); plat->periph_id = clock_decode_periph_id(bus); @@ -124,7 +124,7 @@ static int tegra114_spi_of_to_plat(struct udevice *bus)

static int tegra114_spi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus); struct spi_regs *regs; ulong rate; @@ -181,7 +181,7 @@ static int tegra114_spi_probe(struct udevice *bus) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -205,7 +205,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus);

setbits_le32(&priv->regs->command1, SPI_CMD1_CS_SW_VAL); @@ -352,7 +352,7 @@ static int tegra114_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra114_spi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra114_spi_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -394,7 +394,7 @@ U_BOOT_DRIVER(tegra114_spi) = { .of_match = tegra114_spi_ids, .ops = &tegra114_spi_ops, .of_to_plat = tegra114_spi_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra114_spi_priv), .probe = tegra114_spi_probe, }; diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 7fab2b7504e..d38606100d0 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -89,7 +89,7 @@ int tegra20_sflash_cs_info(struct udevice *bus, unsigned int cs,

static int tegra20_sflash_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -116,7 +116,7 @@ static int tegra20_sflash_of_to_plat(struct udevice *bus)

static int tegra20_sflash_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus);

priv->regs = (struct spi_regs *)plat->base; @@ -173,7 +173,7 @@ static int tegra20_sflash_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -192,7 +192,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus);

/* CS is negated on Tegra, so drive a 0 to get a 1 */ @@ -314,7 +314,7 @@ static int tegra20_sflash_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra20_sflash_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra20_sflash_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -354,7 +354,7 @@ U_BOOT_DRIVER(tegra20_sflash) = { .of_match = tegra20_sflash_ids, .ops = &tegra20_sflash_ops, .of_to_plat = tegra20_sflash_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra20_sflash_priv), .probe = tegra20_sflash_probe, }; diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index 0d7c79bf07b..b99ef38a143 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -95,7 +95,7 @@ struct tegra_spi_slave {

static int tegra30_spi_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -122,7 +122,7 @@ static int tegra30_spi_of_to_plat(struct udevice *bus)

static int tegra30_spi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus);

priv->regs = (struct spi_regs *)plat->base; @@ -167,7 +167,7 @@ static int tegra30_spi_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -186,7 +186,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus);

/* CS is negated on Tegra, so drive a 0 to get a 1 */ @@ -314,7 +314,7 @@ static int tegra30_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra30_spi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra30_spi_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -373,7 +373,7 @@ U_BOOT_DRIVER(tegra30_spi) = { .of_match = tegra30_spi_ids, .ops = &tegra30_spi_ops, .of_to_plat = tegra30_spi_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra30_spi_priv), .probe = tegra30_spi_probe, }; diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 6902d953637..a2a7f4614cb 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -99,7 +99,7 @@ struct tegra210_qspi_priv {

static int tegra210_qspi_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat;

plat->base = dev_read_addr(bus); plat->periph_id = clock_decode_periph_id(bus); @@ -125,7 +125,7 @@ static int tegra210_qspi_of_to_plat(struct udevice *bus)

static int tegra210_qspi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus);

priv->regs = (struct qspi_regs *)plat->base; @@ -174,7 +174,7 @@ static int tegra210_qspi_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus);

/* If it's too soon to do another transaction, wait */ @@ -198,7 +198,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus);

setbits_le32(&priv->regs->command1, QSPI_CMD1_CS_SW_VAL); @@ -380,7 +380,7 @@ static int tegra210_qspi_xfer(struct udevice *dev, unsigned int bitlen,

static int tegra210_qspi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra210_qspi_priv *priv = dev_get_priv(bus);

if (speed > plat->frequency) @@ -423,7 +423,7 @@ U_BOOT_DRIVER(tegra210_qspi) = { .of_match = tegra210_qspi_ids, .ops = &tegra210_qspi_ops, .of_to_plat = tegra210_qspi_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra210_qspi_priv), .per_child_auto = sizeof(struct spi_slave), .probe = tegra210_qspi_probe, diff --git a/drivers/spi/tegra_spi.h b/drivers/spi/tegra_spi.h index e997d668cde..ab69ea42e04 100644 --- a/drivers/spi/tegra_spi.h +++ b/drivers/spi/tegra_spi.h @@ -3,7 +3,7 @@ * (C) Copyright 2014 Google, Inc */

-struct tegra_spi_platdata { +struct tegra_spi_plat { enum periph_id periph_id; int frequency; /* Default clock frequency, -1 for none */ ulong base; diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index f1511c08034..7c3b1f7b88e 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -154,7 +154,7 @@ static void ti_qspi_ctrl_mode_mmap(void *ctrl_mod_mmap, int cs, bool enable) static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus; uint words = bitlen >> 3; /* fixed 8-bit word length */ @@ -323,7 +323,7 @@ static int ti_qspi_set_mode(struct udevice *bus, uint mode) static int ti_qspi_exec_mem_op(struct spi_slave *slave, const struct spi_mem_op *op) { - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct ti_qspi_priv *priv; struct udevice *bus; u32 from = 0; @@ -355,7 +355,7 @@ static int ti_qspi_exec_mem_op(struct spi_slave *slave,

static int ti_qspi_claim_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus;

@@ -384,7 +384,7 @@ static int ti_qspi_claim_bus(struct udevice *dev)

static int ti_qspi_release_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus;

diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index b6083e6ffca..48b8430d3d8 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -68,7 +68,7 @@ DECLARE_GLOBAL_DATA_PTR;

#define SSI_CLK 50000000 /* internal I/O clock: 50MHz */

-struct uniphier_spi_platdata { +struct uniphier_spi_plat { void __iomem *base; u32 frequency; /* input frequency */ u32 speed_hz; @@ -113,7 +113,7 @@ static void uniphier_spi_regdump(struct uniphier_spi_priv *priv) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); ulong delay_us; /* The delay completed so far */ u32 val; @@ -139,7 +139,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); u32 val;

@@ -279,7 +279,7 @@ static int uniphier_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int uniphier_spi_set_speed(struct udevice *bus, uint speed) { - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); u32 val, ckdiv;

@@ -364,7 +364,7 @@ static int uniphier_spi_set_mode(struct udevice *bus, uint mode)

static int uniphier_spi_of_to_plat(struct udevice *bus) { - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -383,7 +383,7 @@ static int uniphier_spi_of_to_plat(struct udevice *bus)

static int uniphier_spi_probe(struct udevice *bus) { - struct uniphier_spi_platdata *plat = dev_get_plat(bus); + struct uniphier_spi_plat *plat = dev_get_plat(bus); struct uniphier_spi_priv *priv = dev_get_priv(bus);

priv->base = plat->base; @@ -412,7 +412,7 @@ U_BOOT_DRIVER(uniphier_spi) = { .of_match = uniphier_spi_ids, .ops = &uniphier_spi_ops, .of_to_plat = uniphier_spi_of_to_plat, - .plat_auto = sizeof(struct uniphier_spi_platdata), + .plat_auto = sizeof(struct uniphier_spi_plat), .priv_auto = sizeof(struct uniphier_spi_priv), .probe = uniphier_spi_probe, }; diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 294810e97b2..0274afdc6e0 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -211,7 +211,7 @@ static void xilinx_spi_startup_block(struct udevice *dev, unsigned int bytes, struct udevice *bus = dev_get_parent(dev); struct xilinx_spi_priv *priv = dev_get_priv(bus); struct xilinx_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); const unsigned char *txp = dout; unsigned char *rxp = din; u32 reg; @@ -244,7 +244,7 @@ static int xilinx_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev_get_parent(dev); struct xilinx_spi_priv *priv = dev_get_priv(bus); struct xilinx_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); /* assume spi core configured to do 8 bit transfers */ unsigned int bytes = bitlen / XILSPI_MAX_XFER_BITS; const unsigned char *txp = dout; diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index 8c2fde542dc..2fc28b6bee2 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -76,7 +76,7 @@ struct zynq_qspi_regs { };

/* zynq qspi platform data */ -struct zynq_qspi_platdata { +struct zynq_qspi_plat { struct zynq_qspi_regs *regs; u32 frequency; /* input frequency */ u32 speed_hz; @@ -100,7 +100,7 @@ struct zynq_qspi_priv {

static int zynq_qspi_of_to_plat(struct udevice *bus) { - struct zynq_qspi_platdata *plat = bus->plat; + struct zynq_qspi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -171,7 +171,7 @@ static void zynq_qspi_init_hw(struct zynq_qspi_priv *priv)

static int zynq_qspi_probe(struct udevice *bus) { - struct zynq_qspi_platdata *plat = dev_get_plat(bus); + struct zynq_qspi_plat *plat = dev_get_plat(bus); struct zynq_qspi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; @@ -560,7 +560,7 @@ static int zynq_qspi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct zynq_qspi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);

priv->cs = slave_plat->cs; priv->tx_buf = dout; @@ -592,7 +592,7 @@ static int zynq_qspi_xfer(struct udevice *dev, unsigned int bitlen,

static int zynq_qspi_set_speed(struct udevice *bus, uint speed) { - struct zynq_qspi_platdata *plat = bus->plat; + struct zynq_qspi_plat *plat = bus->plat; struct zynq_qspi_priv *priv = dev_get_priv(bus); struct zynq_qspi_regs *regs = priv->regs; uint32_t confr; @@ -667,7 +667,7 @@ U_BOOT_DRIVER(zynq_qspi) = { .of_match = zynq_qspi_ids, .ops = &zynq_qspi_ops, .of_to_plat = zynq_qspi_of_to_plat, - .plat_auto = sizeof(struct zynq_qspi_platdata), + .plat_auto = sizeof(struct zynq_qspi_plat), .priv_auto = sizeof(struct zynq_qspi_priv), .probe = zynq_qspi_probe, }; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index 3cdd011c0c7..a6efa4a1c83 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -55,7 +55,7 @@ struct zynq_spi_regs {

/* zynq spi platform data */ -struct zynq_spi_platdata { +struct zynq_spi_plat { struct zynq_spi_regs *regs; u32 frequency; /* input frequency */ u32 speed_hz; @@ -75,7 +75,7 @@ struct zynq_spi_priv {

static int zynq_spi_of_to_plat(struct udevice *bus) { - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus);

@@ -121,7 +121,7 @@ static void zynq_spi_init_hw(struct zynq_spi_priv *priv)

static int zynq_spi_probe(struct udevice *bus) { - struct zynq_spi_platdata *plat = dev_get_plat(bus); + struct zynq_spi_plat *plat = dev_get_plat(bus); struct zynq_spi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; @@ -162,7 +162,7 @@ static int zynq_spi_probe(struct udevice *bus) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; u32 cr; @@ -193,7 +193,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs;

@@ -234,7 +234,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 len = bitlen / 8; u32 tx_len = len, rx_len = len, tx_tvl; const u8 *tx_buf = dout; @@ -296,7 +296,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen,

static int zynq_spi_set_speed(struct udevice *bus, uint speed) { - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; uint32_t confr; @@ -372,7 +372,7 @@ U_BOOT_DRIVER(zynq_spi) = { .of_match = zynq_spi_ids, .ops = &zynq_spi_ops, .of_to_plat = zynq_spi_of_to_plat, - .plat_auto = sizeof(struct zynq_spi_platdata), + .plat_auto = sizeof(struct zynq_spi_plat), .priv_auto = sizeof(struct zynq_spi_priv), .probe = zynq_spi_probe, }; diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index e3bfc6e74e0..f09c50757d4 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -156,7 +156,7 @@ struct zynqmp_qspi_dma_regs {

DECLARE_GLOBAL_DATA_PTR;

-struct zynqmp_qspi_platdata { +struct zynqmp_qspi_plat { struct zynqmp_qspi_regs *regs; struct zynqmp_qspi_dma_regs *dma_regs; u32 frequency; @@ -177,7 +177,7 @@ struct zynqmp_qspi_priv {

static int zynqmp_qspi_of_to_plat(struct udevice *bus) { - struct zynqmp_qspi_platdata *plat = bus->plat; + struct zynqmp_qspi_plat *plat = bus->plat;

debug("%s\n", __func__);

@@ -255,7 +255,7 @@ static void zynqmp_qspi_chipselect(struct zynqmp_qspi_priv *priv, int is_on)

void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval) { - struct zynqmp_qspi_platdata *plat = bus->plat; + struct zynqmp_qspi_plat *plat = bus->plat; struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct zynqmp_qspi_regs *regs = priv->regs; u32 tapdlybypass = 0, lpbkdlyadj = 0, datadlyadj = 0, clk_rate; @@ -295,7 +295,7 @@ void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval)

static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed) { - struct zynqmp_qspi_platdata *plat = bus->plat; + struct zynqmp_qspi_plat *plat = bus->plat; struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct zynqmp_qspi_regs *regs = priv->regs; u32 confr; @@ -333,7 +333,7 @@ static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed)

static int zynqmp_qspi_probe(struct udevice *bus) { - struct zynqmp_qspi_platdata *plat = dev_get_plat(bus); + struct zynqmp_qspi_plat *plat = dev_get_plat(bus); struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; @@ -728,7 +728,7 @@ U_BOOT_DRIVER(zynqmp_qspi) = { .of_match = zynqmp_qspi_ids, .ops = &zynqmp_qspi_ops, .of_to_plat = zynqmp_qspi_of_to_plat, - .plat_auto = sizeof(struct zynqmp_qspi_platdata), + .plat_auto = sizeof(struct zynqmp_qspi_plat), .priv_auto = sizeof(struct zynqmp_qspi_priv), .probe = zynqmp_qspi_probe, }; diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index e51ce1be59f..8f9970301e5 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -14,7 +14,7 @@ #include <asm/io.h> #include <asm/processor.h>

-struct x86_sysreset_platdata { +struct x86_sysreset_plat { struct udevice *pch; };

@@ -30,7 +30,7 @@ struct x86_sysreset_platdata { */ int pch_sysreset_power_off(struct udevice *dev) { - struct x86_sysreset_platdata *plat = dev_get_plat(dev); + struct x86_sysreset_plat *plat = dev_get_plat(dev); struct pch_pmbase_info pm; u32 reg32; int ret; @@ -130,7 +130,7 @@ void __efi_runtime EFIAPI efi_reset_system(

static int x86_sysreset_probe(struct udevice *dev) { - struct x86_sysreset_platdata *plat = dev_get_plat(dev); + struct x86_sysreset_plat *plat = dev_get_plat(dev);

/* Locate the PCH if there is one. It isn't essential */ uclass_first_device(UCLASS_PCH, &plat->pch); @@ -154,5 +154,5 @@ U_BOOT_DRIVER(x86_reset) = { .of_match = x86_sysreset_ids, .ops = &x86_sysreset_ops, .probe = x86_sysreset_probe, - .plat_auto = sizeof(struct x86_sysreset_platdata), + .plat_auto = sizeof(struct x86_sysreset_plat), }; diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c index bc99fdeac93..17174345e36 100644 --- a/drivers/timer/ag101p_timer.c +++ b/drivers/timer/ag101p_timer.c @@ -58,13 +58,13 @@ struct atftmr_timer_regs { u32 int_mask; /* 0x38 */ };

-struct atftmr_timer_platdata { +struct atftmr_timer_plat { struct atftmr_timer_regs *regs; };

static u64 atftmr_timer_get_count(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev->plat; + struct atftmr_timer_plat *plat = dev->plat; struct atftmr_timer_regs *const regs = plat->regs; u32 val; val = readl(&regs->t3_counter); @@ -73,7 +73,7 @@ static u64 atftmr_timer_get_count(struct udevice *dev)

static int atftmr_timer_probe(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev->plat; + struct atftmr_timer_plat *plat = dev->plat; struct atftmr_timer_regs *const regs = plat->regs; u32 cr; writel(0, &regs->t3_load); @@ -90,7 +90,7 @@ static int atftmr_timer_probe(struct udevice *dev)

static int atftme_timer_of_to_plat(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev_get_plat(dev); + struct atftmr_timer_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct atftmr_timer_regs), MAP_NOCACHE); @@ -111,7 +111,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = ag101p_timer_ids, .of_to_plat = atftme_timer_of_to_plat, - .plat_auto = sizeof(struct atftmr_timer_platdata), + .plat_auto = sizeof(struct atftmr_timer_plat), .probe = atftmr_timer_probe, .ops = &ag101p_timer_ops, }; diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index a8d6ba53b89..7e9abee0efc 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -28,13 +28,13 @@ struct altera_timer_regs { u32 snaph; /* Snapshot high */ };

-struct altera_timer_platdata { +struct altera_timer_plat { struct altera_timer_regs *regs; };

static u64 altera_timer_get_count(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->plat; + struct altera_timer_plat *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; u32 val;

@@ -49,7 +49,7 @@ static u64 altera_timer_get_count(struct udevice *dev)

static int altera_timer_probe(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->plat; + struct altera_timer_plat *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs;

writel(0, &regs->status); @@ -65,7 +65,7 @@ static int altera_timer_probe(struct udevice *dev)

static int altera_timer_of_to_plat(struct udevice *dev) { - struct altera_timer_platdata *plat = dev_get_plat(dev); + struct altera_timer_plat *plat = dev_get_plat(dev);

plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_timer_regs), @@ -88,7 +88,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = altera_timer_ids, .of_to_plat = altera_timer_of_to_plat, - .plat_auto = sizeof(struct altera_timer_platdata), + .plat_auto = sizeof(struct altera_timer_plat), .probe = altera_timer_probe, .ops = &altera_timer_ops, }; diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c index 16d03c41efe..fbc7fac1bba 100644 --- a/drivers/timer/atcpit100_timer.c +++ b/drivers/timer/atcpit100_timer.c @@ -64,13 +64,13 @@ struct atctmr_timer_regs { u32 int_mask; /* 0x38 */ };

-struct atcpit_timer_platdata { +struct atcpit_timer_plat { u32 *regs; };

static u64 atcpit_timer_get_count(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_plat(dev); + struct atcpit_timer_plat *plat = dev_get_plat(dev); u32 val; val = ~(REG32_TMR(CH_CNT(1))+0xffffffff); return timer_conv_64(val); @@ -78,7 +78,7 @@ static u64 atcpit_timer_get_count(struct udevice *dev)

static int atcpit_timer_probe(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_plat(dev); + struct atcpit_timer_plat *plat = dev_get_plat(dev); REG32_TMR(CH_REL(1)) = 0xffffffff; REG32_TMR(CH_CTL(1)) = APB_CLK|TMR_32; REG32_TMR(CH_EN) |= CH_TMR_EN(1 , 0); @@ -87,7 +87,7 @@ static int atcpit_timer_probe(struct udevice *dev)

static int atcpit_timer_of_to_plat(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_plat(dev); + struct atcpit_timer_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), 0x100 , MAP_NOCACHE); return 0; } @@ -106,7 +106,7 @@ U_BOOT_DRIVER(atcpit100_timer) = { .id = UCLASS_TIMER, .of_match = atcpit_timer_ids, .of_to_plat = atcpit_timer_of_to_plat, - .plat_auto = sizeof(struct atcpit_timer_platdata), + .plat_auto = sizeof(struct atcpit_timer_plat), .probe = atcpit_timer_probe, .ops = &atcpit_timer_ops, }; diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index 7b445dfe062..3178e58884a 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -21,13 +21,13 @@ struct atmel_pit_regs { u32 value_image; };

-struct atmel_pit_platdata { +struct atmel_pit_plat { struct atmel_pit_regs *regs; };

static u64 atmel_pit_get_count(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_plat(dev); + struct atmel_pit_plat *plat = dev_get_plat(dev); struct atmel_pit_regs *const regs = plat->regs; u32 val = readl(&regs->value_image);

@@ -36,7 +36,7 @@ static u64 atmel_pit_get_count(struct udevice *dev)

static int atmel_pit_probe(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_plat(dev); + struct atmel_pit_plat *plat = dev_get_plat(dev); struct atmel_pit_regs *const regs = plat->regs; struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct clk clk; @@ -60,7 +60,7 @@ static int atmel_pit_probe(struct udevice *dev)

static int atmel_pit_of_to_plat(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_plat(dev); + struct atmel_pit_plat *plat = dev_get_plat(dev);

plat->regs = dev_read_addr_ptr(dev);

@@ -81,7 +81,7 @@ U_BOOT_DRIVER(atmel_pit) = { .id = UCLASS_TIMER, .of_match = atmel_pit_ids, .of_to_plat = atmel_pit_of_to_plat, - .plat_auto = sizeof(struct atmel_pit_platdata), + .plat_auto = sizeof(struct atmel_pit_plat), .probe = atmel_pit_probe, .ops = &atmel_pit_ops, }; diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index a15198c1fe3..ab535553273 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -90,7 +90,7 @@ static int timer_post_probe(struct udevice *dev) int timer_timebase_fallback(struct udevice *dev) { struct udevice *cpu; - struct cpu_platdata *cpu_plat; + struct cpu_plat *cpu_plat; struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);

/* Did we get our clock rate from the device tree? */ diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index fe43f1b7f37..13e730b8835 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -1865,7 +1865,7 @@ int ufs_start(struct ufs_hba *hba) int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops) { struct ufs_hba *hba = dev_get_uclass_priv(ufs_dev); - struct scsi_platdata *scsi_plat; + struct scsi_plat *scsi_plat; struct udevice *scsi_dev; int err;

diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index 396923ac782..041ec3772aa 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -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, }; diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c index 1b7e1ea7c15..f5d98b917dc 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -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), }; diff --git a/drivers/usb/gadget/max3420_udc.c b/drivers/usb/gadget/max3420_udc.c index e2391510d83..a16095f8927 100644 --- a/drivers/usb/gadget/max3420_udc.c +++ b/drivers/usb/gadget/max3420_udc.c @@ -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 = dev_seq(bus); unsigned int cs; diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index 660a145e4db..deb820a0f84 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -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, }; diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index 22a35a52802..fba3595e10f 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -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, }; diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 690a96c5bd2..fda04c49335 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -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, }; diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index dfeca8915bf..8e79bdd8472 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -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, }; diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index f9e24b99a0a..3ecbfd032ff 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -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, }; diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index a3405d02e5c..d160cf019d3 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -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, }; diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index b21a953d706..0af02ba2737 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -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, }; diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 3d3bd0e1145..d2f49cf4690 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -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); @@ -585,7 +585,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; @@ -656,7 +656,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, }; diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 49845c1ee9e..12c422d811d 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -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, diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 61f5a6ce61e..4f711de7d85 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -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, }; diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index c16eec3558e..b02ee89c3ec 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -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, }; diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index e1a4b3438fc..25f76c9fa91 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -310,7 +310,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; @@ -353,7 +353,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, }; diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c index 6756465d647..f7e458cb15a 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -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, }; diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index c53b6f58e3c..6ddc9da704f 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -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, }; diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index 7e10c5486f6..a2bd7436f42 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -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) = { diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c index 31e4265a818..27c4bbfcba7 100644 --- a/drivers/usb/host/xhci-brcm.c +++ b/drivers/usb/host/xhci-brcm.c @@ -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, }; diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index f6534a2ea9e..59408e4e50e 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -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 diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index fe804a0dfe2..9893a8cccee 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -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, }; diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c index e54db0f8e28..f062f12ade6 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -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, }; diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index 017f99b6293..46b89de85d1 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -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, }; diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 96d1de67d90..2b445f21b55 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -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, }; diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index dc941a2068c..5fc7afb7d21 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -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, }; diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c index c59ca544373..f42803533d7 100644 --- a/drivers/usb/musb-new/da8xx.c +++ b/drivers/usb/musb-new/da8xx.c @@ -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), }; diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c index 4847b2c80db..730045cf9a7 100644 --- a/drivers/usb/musb-new/mt85xx.c +++ b/drivers/usb/musb-new/mt85xx.c @@ -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), }; diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index b9bba22a657..3fdcaeaa5d0 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -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), };

diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c index 7970d1620f0..b833f10f4ba 100644 --- a/drivers/usb/musb-new/pic32.c +++ b/drivers/usb/musb-new/pic32.c @@ -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), }; diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 1337e5260b2..fea4105f3d1 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -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), }; diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index b0ee57ad8a0..81b12fadfc1 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -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, }; diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c index e0d5f445901..e99a9185a2a 100644 --- a/drivers/video/am335x-fb.c +++ b/drivers/video/am335x-fb.c @@ -368,7 +368,7 @@ struct am335x_fb_priv {

static int am335x_fb_remove(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

uc_plat->base -= 0x20; uc_plat->size += 0x20; @@ -377,7 +377,7 @@ static int am335x_fb_remove(struct udevice *dev)

static int am335x_fb_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct am335x_fb_priv *priv = dev_get_priv(dev); struct am335x_lcdhw *regs = priv->regs; @@ -592,7 +592,7 @@ static int am335x_fb_of_to_plat(struct udevice *dev)

static int am335x_fb_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = ((LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP)) >> 3) + 0x20; diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 2d0d0d4f9c9..0485ae24366 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -293,7 +293,7 @@ static int at91_hlcdc_enable_clk(struct udevice *dev)

static void atmel_hlcdc_init(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct atmel_hlcdc_priv *priv = dev_get_priv(dev); struct atmel_hlcd_regs *regs = priv->regs; struct display_timing *timing = &priv->timing; @@ -539,7 +539,7 @@ static int atmel_hlcdc_of_to_plat(struct udevice *dev)

static int atmel_hlcdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index f836a9a82ff..f87c0224a1a 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -245,7 +245,7 @@ ulong calc_fbsize(void) #ifdef CONFIG_DM_VIDEO static int atmel_fb_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct atmel_fb_priv *priv = dev_get_priv(dev); struct display_timing *timing = &priv->timing; @@ -269,7 +269,7 @@ static int atmel_fb_lcd_probe(struct udevice *dev)

static int atmel_fb_of_to_plat(struct udevice *dev) { - struct atmel_lcd_platdata *plat = dev_get_plat(dev); + struct atmel_lcd_plat *plat = dev_get_plat(dev); struct atmel_fb_priv *priv = dev_get_priv(dev); struct display_timing *timing = &priv->timing; const void *blob = gd->fdt_blob; @@ -285,7 +285,7 @@ static int atmel_fb_of_to_plat(struct udevice *dev)

static int atmel_fb_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP16) / 8; @@ -306,7 +306,7 @@ U_BOOT_DRIVER(atmel_fb) = { .bind = atmel_fb_lcd_bind, .of_to_plat = atmel_fb_of_to_plat, .probe = atmel_fb_lcd_probe, - .plat_auto = sizeof(struct atmel_lcd_platdata), + .plat_auto = sizeof(struct atmel_lcd_plat), .priv_auto = sizeof(struct atmel_fb_priv), }; #endif diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 95662f14b88..9326999cd36 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -13,7 +13,7 @@

static int bcm2835_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); int ret; int w, h, pitch; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index 8e5c6cf866a..cba105c19a4 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -661,7 +661,7 @@ static int broadwell_igd_int15_handler(void)

static int broadwell_igd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); bool is_broadwell; ulong fbbase; @@ -756,7 +756,7 @@ static int broadwell_igd_of_to_plat(struct udevice *dev)

static int broadwell_igd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c index 043cc627a79..0a5fb08dc8a 100644 --- a/drivers/video/coreboot.c +++ b/drivers/video/coreboot.c @@ -38,7 +38,7 @@ static int save_vesa_mode(struct cb_framebuffer *fb,

static int coreboot_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct cb_framebuffer *fb = lib_sysinfo.framebuffer; struct vesa_mode_info *vesa = &mode_info.vesa; diff --git a/drivers/video/efi.c b/drivers/video/efi.c index ceb6f85d25a..c248bd352a7 100644 --- a/drivers/video/efi.c +++ b/drivers/video/efi.c @@ -110,7 +110,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa)

static int efi_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct vesa_mode_info *vesa = &mode_info.vesa; int ret; diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c index cd7767fb6e7..7b4459ced85 100644 --- a/drivers/video/exynos/exynos_fb.c +++ b/drivers/video/exynos/exynos_fb.c @@ -377,7 +377,7 @@ void exynos_fimd_disable_sysmmu(void) void exynos_fimd_lcd_init(struct udevice *dev) { struct exynos_fb_priv *priv = dev_get_priv(dev); - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct exynos_fb *reg = priv->reg; unsigned int cfg = 0, rgb_mode; unsigned int offset; @@ -692,7 +692,7 @@ static int exynos_fb_probe(struct udevice *dev)

static int exynos_fb_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

/* This is the maximum panel size we expect to see */ plat->size = 1920 * 1080 * 2; diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c index 9224347ab11..4ea0f124870 100644 --- a/drivers/video/fsl_dcu_fb.c +++ b/drivers/video/fsl_dcu_fb.c @@ -484,7 +484,7 @@ void *video_hw_init(void)

static int fsl_dcu_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct fb_info fbinfo = { 0 }; unsigned int win_x; @@ -516,7 +516,7 @@ static int fsl_dcu_video_probe(struct udevice *dev)

static int fsl_dcu_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); unsigned int win_x; unsigned int win_y; unsigned int depth = 0, freq = 0; diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 0bbd974c2a7..6cdbbafafb2 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -383,7 +383,7 @@ static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int mxcfb_map_video_memory(struct fb_info *fbi) { struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par; - struct video_uc_platdata *plat = dev_get_uclass_plat(mxc_fbi->udev); + struct video_uc_plat *plat = dev_get_uclass_plat(mxc_fbi->udev);

if (fbi->fix.smem_len < fbi->var.yres_virtual * fbi->fix.line_length) { fbi->fix.smem_len = fbi->var.yres_virtual * @@ -586,7 +586,7 @@ enum {

static int ipuv3_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); #if defined(CONFIG_DISPLAY) struct udevice *disp_dev; @@ -647,7 +647,7 @@ struct ipuv3_video_priv {

static int ipuv3_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP32) / 8; diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c index 9f10689ce31..e7db0cbcef1 100644 --- a/drivers/video/ivybridge_igd.c +++ b/drivers/video/ivybridge_igd.c @@ -753,7 +753,7 @@ static int gma_func0_init(struct udevice *dev)

static int bd82x6x_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong fbbase; void *gtt_bar; int ret, rev; @@ -781,7 +781,7 @@ static int bd82x6x_video_probe(struct udevice *dev)

static int bd82x6x_video_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c index 6c73bd2d62f..dc4f542256d 100644 --- a/drivers/video/mali_dp.c +++ b/drivers/video/mali_dp.c @@ -260,7 +260,7 @@ static int malidp_update_timings_from_edid(struct udevice *dev, static int malidp_probe(struct udevice *dev) { struct video_priv *uc_priv = dev_get_uclass_priv(dev); - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); ofnode framebuffer = ofnode_find_subnode(dev_ofnode(dev), "framebuffer"); struct malidp_priv *priv = dev_get_priv(dev); struct display_timing timings; @@ -382,7 +382,7 @@ fail_aclk:

static int malidp_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* choose max possible size: 2K x 2K, XRGB888 framebuffer */ uc_plat->size = 4 * 2048 * 2048; diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c index 313c013a7d8..e3f784ecfe4 100644 --- a/drivers/video/meson/meson_plane.c +++ b/drivers/video/meson/meson_plane.c @@ -100,7 +100,7 @@ meson_vpp_disable_interlace_vscaler_osd1(struct meson_vpu_priv *priv)

void meson_vpu_setup_plane(struct udevice *dev, bool is_interlaced) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct meson_vpu_priv *priv = dev_get_priv(dev); u32 osd1_ctrl_stat; diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index b5614fafe8e..ca6933a6c54 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -43,7 +43,7 @@ bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,

static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct display_timing timing; bool is_cvbs = false; @@ -138,7 +138,7 @@ static int meson_vpu_probe(struct udevice *dev)

static int meson_vpu_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

plat->size = VPU_MAX_WIDTH * VPU_MAX_HEIGHT * (1 << VPU_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c index bc789ecc7ba..d3d07e5f833 100644 --- a/drivers/video/mvebu_lcd.c +++ b/drivers/video/mvebu_lcd.c @@ -526,7 +526,7 @@ static void mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info,

static int mvebu_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct mvebu_video_priv *priv = dev_get_priv(dev); struct mvebu_lcd_info lcd_info; @@ -575,7 +575,7 @@ static int mvebu_video_probe(struct udevice *dev)

static int mvebu_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 5b770a7a0bd..b43732a77ab 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -356,7 +356,7 @@ static int mxs_of_get_timings(struct udevice *dev,

static int mxs_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev);

struct display_timing timings; @@ -409,7 +409,7 @@ static int mxs_video_probe(struct udevice *dev)

static int mxs_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct display_timing timings; u32 bpp = 0; u32 bytes_pp = 0; @@ -443,7 +443,7 @@ static int mxs_video_bind(struct udevice *dev)

static int mxs_video_remove(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

mxs_remove_common(plat->base);

diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index da11e9d2e12..00e2c36f376 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -174,7 +174,7 @@ static void nx_display_parse_dp_layer(ofnode node, struct dp_plane_info *plane)

static void nx_display_parse_dp_planes(ofnode node, struct nx_display_dev *dp, - struct video_uc_platdata *plat) + struct video_uc_plat *plat) { const char *name; ofnode subnode; @@ -332,7 +332,7 @@ static int nx_display_parse_dp_lcds(ofnode node, const char *type,

static int nx_display_parse_dt(struct udevice *dev, struct nx_display_dev *dp, - struct video_uc_platdata *plat) + struct video_uc_plat *plat) { const char *name, *dtype; int ret = 0; @@ -391,7 +391,7 @@ static struct nx_display_dev *nx_display_setup(void) struct nx_display_dev *dp; int i, ret; int node = 0; - struct video_uc_platdata *plat = NULL; + struct video_uc_plat *plat = NULL;

struct udevice *dev;

@@ -534,9 +534,9 @@ __weak void lcd_enable(void)

static int nx_display_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); - struct nx_display_platdata *plat = dev_get_plat(dev); + struct nx_display_plat *plat = dev_get_plat(dev); static GraphicDevice *graphic_device; char addr[64];

@@ -546,7 +546,7 @@ static int nx_display_probe(struct udevice *dev) return -EINVAL;

if (!uc_plat) { - debug("%s(): video_uc_platdata *plat == NULL --> return -EINVAL\n", + debug("%s(): video_uc_plat *plat == NULL --> return -EINVAL\n", __func__); return -EINVAL; } @@ -558,7 +558,7 @@ static int nx_display_probe(struct udevice *dev) }

if (!plat) { - debug("%s(): nx_display_platdata *plat == NULL --> return -EINVAL\n", + debug("%s(): nx_display_plat *plat == NULL --> return -EINVAL\n", __func__); return -EINVAL; } @@ -619,7 +619,7 @@ static int nx_display_probe(struct udevice *dev)

static int nx_display_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

debug("%s()\n", __func__);

@@ -643,7 +643,7 @@ U_BOOT_DRIVER(nexell_display) = { .name = "nexell-display", .id = UCLASS_VIDEO, .of_match = nx_display_ids, - .plat_auto = sizeof(struct nx_display_platdata), + .plat_auto = sizeof(struct nx_display_plat), .bind = nx_display_bind, .probe = nx_display_probe, .priv_auto = sizeof(struct nx_display_dev), diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c index c20d158c9fe..fcb393b906c 100644 --- a/drivers/video/rockchip/rk_vop.c +++ b/drivers/video/rockchip/rk_vop.c @@ -364,7 +364,7 @@ void rk_vop_probe_regulators(struct udevice *dev,

int rk_vop_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct rk_vop_priv *priv = dev_get_priv(dev); int ret = 0; ofnode port, node; @@ -406,7 +406,7 @@ int rk_vop_probe(struct udevice *dev)

int rk_vop_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

plat->size = 4 * (CONFIG_VIDEO_ROCKCHIP_MAX_XRES * CONFIG_VIDEO_ROCKCHIP_MAX_YRES); diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c index 3e231e8c551..12edf9c90c9 100644 --- a/drivers/video/sandbox_sdl.c +++ b/drivers/video/sandbox_sdl.c @@ -23,7 +23,7 @@ enum {

static int sandbox_sdl_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct sandbox_state *state = state_get_current(); @@ -49,7 +49,7 @@ static int sandbox_sdl_probe(struct udevice *dev)

static int sandbox_sdl_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_plat(dev); int ret = 0;

diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c index 7f940187872..b5fb6f62bb7 100644 --- a/drivers/video/simplefb.c +++ b/drivers/video/simplefb.c @@ -12,7 +12,7 @@

static int simple_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); const void *blob = gd->fdt_blob; const int node = dev_of_offset(dev); diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c index ff28bdba57e..dc10b8cfc11 100644 --- a/drivers/video/stm32/stm32_ltdc.c +++ b/drivers/video/stm32/stm32_ltdc.c @@ -329,7 +329,7 @@ static void stm32_ltdc_set_layer1(struct stm32_ltdc_priv *priv, ulong fb_addr)

static int stm32_ltdc_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct stm32_ltdc_priv *priv = dev_get_priv(dev); struct udevice *bridge = NULL; @@ -452,7 +452,7 @@ static int stm32_ltdc_probe(struct udevice *dev)

static int stm32_ltdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES * CONFIG_VIDEO_STM32_MAX_YRES * diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index 5540e70fa0c..50657a77d36 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -237,7 +237,7 @@ static int sunxi_de2_init(struct udevice *dev, ulong fbbase,

static int sunxi_de2_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct udevice *disp; int ret;

@@ -299,7 +299,7 @@ static int sunxi_de2_probe(struct udevice *dev)

static int sunxi_de2_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev);

plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; @@ -331,7 +331,7 @@ int sunxi_simplefb_setup(void *blob) { struct udevice *de2, *hdmi, *lcd; struct video_priv *de2_priv; - struct video_uc_platdata *de2_plat; + struct video_uc_plat *de2_plat; int mux; int offset, ret; u64 start, size; diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index d185096db01..08b006b469b 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -299,7 +299,7 @@ static int tegra_display_probe(const void *blob, struct tegra_lcd_priv *priv,

static int tegra_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct tegra_lcd_priv *priv = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -393,7 +393,7 @@ static int tegra_lcd_of_to_plat(struct udevice *dev)

static int tegra_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); int rgb; diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index f834bd9f59e..f642b3b10aa 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -465,7 +465,7 @@ static int tegra124_lcd_init(struct udevice *dev, void *lcdbase,

static int tegra124_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong start; int ret;

@@ -482,7 +482,7 @@ static int tegra124_lcd_probe(struct udevice *dev)

static int tegra124_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP16) / 8; diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c index e370cddda97..869e5469732 100644 --- a/drivers/video/vesa.c +++ b/drivers/video/vesa.c @@ -13,7 +13,7 @@

static int vesa_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong fbbase; int ret;

@@ -31,7 +31,7 @@ static int vesa_video_probe(struct udevice *dev)

static int vesa_video_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);

/* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 2cd0d947f0e..20f6973b4b6 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -25,7 +25,7 @@ * Theory of operation: * * Before relocation each device is bound. The driver for each device must - * set the @align and @size values in struct video_uc_platdata. This + * set the @align and @size values in struct video_uc_plat. This * information represents the requires size and alignment of the frame buffer * for the device. The values can be an over-estimate but cannot be too * small. The actual values will be suppled (in the same manner) by the bind() @@ -68,7 +68,7 @@ void video_set_flush_dcache(struct udevice *dev, bool flush)

static ulong alloc_fb(struct udevice *dev, ulong *addrp) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong base, align, size;

if (!plat->size) @@ -301,7 +301,7 @@ static int video_pre_remove(struct udevice *dev) /* Set up the display ready for use */ static int video_post_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *priv = dev_get_uclass_priv(dev); char name[30], drv[15], *str; const char *drv_name = drv; @@ -410,5 +410,5 @@ UCLASS_DRIVER(video) = { .pre_remove = video_pre_remove, .priv_auto = sizeof(struct video_uc_priv), .per_device_auto = sizeof(struct video_priv), - .per_device_plat_auto = sizeof(struct video_uc_platdata), + .per_device_plat_auto = sizeof(struct video_uc_plat), }; diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index 8aaa44983e8..03fa5cb608c 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -292,7 +292,7 @@ static int virtio_pci_bind(struct udevice *udev)

static int virtio_pci_probe(struct udevice *udev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(udev); + struct pci_child_plat *pplat = dev_get_parent_plat(udev); struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev); struct virtio_pci_priv *priv = dev_get_priv(udev); u16 subvendor, subdevice; diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 620d094b789..dfbbf8a6250 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -456,7 +456,7 @@ static int virtio_pci_bind(struct udevice *udev)

static int virtio_pci_probe(struct udevice *udev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(udev); + struct pci_child_plat *pplat = dev_get_parent_plat(udev); struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev); struct virtio_pci_priv *priv = dev_get_priv(udev); u16 subvendor; diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index b7b10dd11f6..1687a4599fc 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -26,7 +26,7 @@ struct watchdog_regs { u32 tbr; /* 0x8 */ };

-struct xlnx_wdt_platdata { +struct xlnx_wdt_plat { bool enable_once; struct watchdog_regs *regs; }; @@ -34,7 +34,7 @@ struct xlnx_wdt_platdata { static int xlnx_wdt_reset(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev);

debug("%s ", __func__);

@@ -51,7 +51,7 @@ static int xlnx_wdt_reset(struct udevice *dev) static int xlnx_wdt_stop(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev);

if (plat->enable_once) { debug("Can't stop Xilinx watchdog.\n"); @@ -71,7 +71,7 @@ static int xlnx_wdt_stop(struct udevice *dev)

static int xlnx_wdt_start(struct udevice *dev, u64 timeout, ulong flags) { - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev);

debug("%s:\n", __func__);

@@ -92,7 +92,7 @@ static int xlnx_wdt_probe(struct udevice *dev)

static int xlnx_wdt_of_to_plat(struct udevice *dev) { - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev);

plat->regs = (struct watchdog_regs *)dev_read_addr(dev); if (IS_ERR(plat->regs)) @@ -123,7 +123,7 @@ U_BOOT_DRIVER(xlnx_wdt) = { .id = UCLASS_WDT, .of_match = xlnx_wdt_ids, .probe = xlnx_wdt_probe, - .plat_auto = sizeof(struct xlnx_wdt_platdata), + .plat_auto = sizeof(struct xlnx_wdt_plat), .of_to_plat = xlnx_wdt_of_to_plat, .ops = &xlnx_wdt_ops, }; diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c index 8345b9086e8..9137d87697d 100644 --- a/drivers/watchdog/xilinx_wwdt.c +++ b/drivers/watchdog/xilinx_wwdt.c @@ -36,7 +36,7 @@ struct xlnx_wwdt_priv { struct clk clk; };

-struct xlnx_wwdt_platdata { +struct xlnx_wwdt_plat { bool enable_once; };

@@ -125,7 +125,7 @@ static int xlnx_wwdt_start(struct udevice *dev, u64 timeout, ulong flags) static int xlnx_wwdt_probe(struct udevice *dev) { int ret; - struct xlnx_wwdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wwdt_plat *plat = dev_get_plat(dev); struct xlnx_wwdt_priv *wdt = dev_get_priv(dev);

dev_dbg(dev, "%s: Probing wdt%u\n", __func__, dev_seq(dev)); @@ -147,7 +147,7 @@ static int xlnx_wwdt_probe(struct udevice *dev)

static int xlnx_wwdt_of_to_plat(struct udevice *dev) { - struct xlnx_wwdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wwdt_plat *plat = dev_get_plat(dev);

plat->enable_once = dev_read_u32_default(dev, "xlnx,wdt-enable-once", 0); @@ -173,7 +173,7 @@ U_BOOT_DRIVER(xlnx_wwdt) = { .of_match = xlnx_wwdt_ids, .probe = xlnx_wwdt_probe, .priv_auto = sizeof(struct xlnx_wwdt_priv), - .plat_auto = sizeof(struct xlnx_wwdt_platdata), + .plat_auto = sizeof(struct xlnx_wwdt_plat), .of_to_plat = xlnx_wwdt_of_to_plat, .ops = &xlnx_wwdt_ops, }; diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index 0f722416924..6455dfd5c96 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -70,7 +70,7 @@ struct blkfront_dev { u8 *bounce_buffer; };

-struct blkfront_platdata { +struct blkfront_plat { unsigned int devid; };

@@ -685,7 +685,7 @@ static int pvblock_blk_bind(struct udevice *udev) static int pvblock_blk_probe(struct udevice *udev) { struct blkfront_dev *blk_dev = dev_get_priv(udev); - struct blkfront_platdata *plat = dev_get_plat(udev); + struct blkfront_plat *plat = dev_get_plat(udev); struct blk_desc *desc = dev_get_uclass_plat(udev); int ret, devid;

@@ -737,12 +737,12 @@ static int on_new_vbd(struct udevice *parent, unsigned int devid) { struct driver_info info; struct udevice *udev; - struct blkfront_platdata *plat; + struct blkfront_plat *plat; int ret;

debug("New " DRV_NAME_BLK ", device ID %d\n", devid);

- plat = malloc(sizeof(struct blkfront_platdata)); + plat = malloc(sizeof(struct blkfront_plat)); if (!plat) { printf("Failed to allocate platform data\n"); return -ENOMEM; diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h index 4aa955b6b2d..66436b9b277 100644 --- a/include/atmel_lcd.h +++ b/include/atmel_lcd.h @@ -10,11 +10,11 @@ #define _ATMEL_LCD_H_

/** - * struct atmel_lcd_platdata - platform data for Atmel LCDs with driver model + * struct atmel_lcd_plat - platform data for Atmel LCDs with driver model * * @timing_index: Index of LCD timing to use in device tree node */ -struct atmel_lcd_platdata { +struct atmel_lcd_plat { int timing_index; };

diff --git a/include/cpu.h b/include/cpu.h index 1d53308f7a4..5831bfa7421 100644 --- a/include/cpu.h +++ b/include/cpu.h @@ -8,7 +8,7 @@ #define __CPU_H

/** - * struct cpu_platdata - platform data for a CPU + * struct cpu_plat - platform data for a CPU * @cpu_id: Platform-specific way of identifying the CPU. * @ucode_version: Microcode version, if CPU_FEAT_UCODE is set * @device_id: Driver-defined device identifier @@ -20,7 +20,7 @@ * This can be accessed with dev_get_parent_plat() for any UCLASS_CPU * device. */ -struct cpu_platdata { +struct cpu_plat { int cpu_id; int ucode_version; ulong device_id; diff --git a/include/dm/platform_data/fsl_espi.h b/include/dm/platform_data/fsl_espi.h index 812933f51cd..de2307f7fb5 100644 --- a/include/dm/platform_data/fsl_espi.h +++ b/include/dm/platform_data/fsl_espi.h @@ -6,7 +6,7 @@ #ifndef __fsl_espi_h #define __fsl_espi_h

-struct fsl_espi_platdata { +struct fsl_espi_plat { uint flags; uint speed_hz; uint num_chipselect; diff --git a/include/dm/platform_data/lpc32xx_hsuart.h b/include/dm/platform_data/lpc32xx_hsuart.h index 9bfd62833cd..6f41e0e734a 100644 --- a/include/dm/platform_data/lpc32xx_hsuart.h +++ b/include/dm/platform_data/lpc32xx_hsuart.h @@ -7,11 +7,11 @@ #define _LPC32XX_HSUART_PLAT_H

/** - * struct lpc32xx_hsuart_platdata - NXP LPC32xx HSUART platform data + * struct lpc32xx_hsuart_plat - NXP LPC32xx HSUART platform data * * @base: Base register address */ -struct lpc32xx_hsuart_platdata { +struct lpc32xx_hsuart_plat { unsigned long base; };

diff --git a/include/dm/platform_data/pxa_mmc_gen.h b/include/dm/platform_data/pxa_mmc_gen.h index 9875bab2cf4..d15c1551f46 100644 --- a/include/dm/platform_data/pxa_mmc_gen.h +++ b/include/dm/platform_data/pxa_mmc_gen.h @@ -9,7 +9,7 @@ #include <mmc.h>

/* - * struct pxa_mmc_platdata - information about a PXA MMC controller + * struct pxa_mmc_plat - information about a PXA MMC controller * * @base: MMC controller base register address */ diff --git a/include/dm/platform_data/serial_bcm283x_mu.h b/include/dm/platform_data/serial_bcm283x_mu.h index 37f5174dbf2..6c77272e804 100644 --- a/include/dm/platform_data/serial_bcm283x_mu.h +++ b/include/dm/platform_data/serial_bcm283x_mu.h @@ -14,7 +14,7 @@ * * @base: Register base address */ -struct bcm283x_mu_serial_platdata { +struct bcm283x_mu_serial_plat { unsigned long base; unsigned int clock; bool skip_init; diff --git a/include/dm/platform_data/serial_coldfire.h b/include/dm/platform_data/serial_coldfire.h index ba916fece3d..5e265e9087d 100644 --- a/include/dm/platform_data/serial_coldfire.h +++ b/include/dm/platform_data/serial_coldfire.h @@ -7,13 +7,13 @@ #define __serial_coldfire_h

/* - * struct coldfire_serial_platdata - information about a coldfire port + * struct coldfire_serial_plat - information about a coldfire port * * @base: Uart port base register address * @port: Uart port index, for cpu with pinmux for uart / gpio * baudrtatre: Uart port baudrate */ -struct coldfire_serial_platdata { +struct coldfire_serial_plat { unsigned long base; int port; int baudrate; diff --git a/include/dm/platform_data/serial_mxc.h b/include/dm/platform_data/serial_mxc.h index 86cd3bcf628..cc59eeb1dd1 100644 --- a/include/dm/platform_data/serial_mxc.h +++ b/include/dm/platform_data/serial_mxc.h @@ -7,7 +7,7 @@ #define __serial_mxc_h

/* Information about a serial port */ -struct mxc_serial_platdata { +struct mxc_serial_plat { struct mxc_uart *reg; /* address of registers in physical memory */ bool use_dte; }; diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h index 77d96c49f03..e3d4e308a14 100644 --- a/include/dm/platform_data/serial_pl01x.h +++ b/include/dm/platform_data/serial_pl01x.h @@ -20,7 +20,7 @@ enum pl01x_type { * @skip_init: Don't attempt to change port configuration (also means @clock * is ignored) */ -struct pl01x_serial_platdata { +struct pl01x_serial_plat { unsigned long base; enum pl01x_type type; unsigned int clock; diff --git a/include/dm/platform_data/serial_pxa.h b/include/dm/platform_data/serial_pxa.h index b78bdb64094..0d7dc4c462d 100644 --- a/include/dm/platform_data/serial_pxa.h +++ b/include/dm/platform_data/serial_pxa.h @@ -40,13 +40,13 @@ #endif

/* - * struct pxa_serial_platdata - information about a PXA port + * struct pxa_serial_plat - information about a PXA port * * @base: Uart port base register address * @port: Uart port index, for cpu with pinmux for uart / gpio * baudrtatre: Uart port baudrate */ -struct pxa_serial_platdata { +struct pxa_serial_plat { struct pxa_uart_regs *base; int port; int baudrate; diff --git a/include/dm/platform_data/serial_sh.h b/include/dm/platform_data/serial_sh.h index 711435d8f6e..69cd012fc5a 100644 --- a/include/dm/platform_data/serial_sh.h +++ b/include/dm/platform_data/serial_sh.h @@ -27,7 +27,7 @@ enum sh_serial_type { * @clk_mode: Clock mode, set internal (INT) or external (EXT) * @type: Type of SCIF */ -struct sh_serial_platdata { +struct sh_serial_plat { unsigned long base; unsigned int clk; enum sh_clk_mode clk_mode; diff --git a/include/dm/platform_data/spi_coldfire.h b/include/dm/platform_data/spi_coldfire.h index 8ad8eaedfde..da514bad0d3 100644 --- a/include/dm/platform_data/spi_coldfire.h +++ b/include/dm/platform_data/spi_coldfire.h @@ -10,14 +10,14 @@ #define MAX_CTAR_FIELDS 8

/* - * struct coldfire_spi_platdata - information about a coldfire spi module + * struct coldfire_spi_plat - information about a coldfire spi module * * @regs_addr: base address for module registers * @speed_hz: default SCK frequency * @mode: default SPI mode * @num_cs: number of DSPI chipselect signals */ -struct coldfire_spi_platdata { +struct coldfire_spi_plat { fdt_addr_t regs_addr; uint speed_hz; uint mode; diff --git a/include/dm/platform_data/spi_davinci.h b/include/dm/platform_data/spi_davinci.h index fbc62c262ab..42a467e40b2 100644 --- a/include/dm/platform_data/spi_davinci.h +++ b/include/dm/platform_data/spi_davinci.h @@ -7,7 +7,7 @@ #ifndef __spi_davinci_h #define __spi_davinci_h

-struct davinci_spi_platdata { +struct davinci_spi_plat { struct davinci_spi_regs *regs; u8 num_cs; /* total no. of CS available */ }; diff --git a/include/dm/root.h b/include/dm/root.h index 113e92ec783..89afbee6196 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -31,7 +31,7 @@ struct global_data; void dm_fixup_for_gd_move(struct global_data *new_gd);

/** - * dm_scan_platdata() - Scan all platform data and bind drivers + * dm_scan_plat() - Scan all platform data and bind drivers * * This scans all available plat and creates drivers for each * @@ -39,7 +39,7 @@ void dm_fixup_for_gd_move(struct global_data *new_gd); * flag. If false bind all drivers. * @return 0 if OK, -ve on error */ -int dm_scan_platdata(bool pre_reloc_only); +int dm_scan_plat(bool pre_reloc_only);

/** * dm_scan_fdt() - Scan the device tree and bind drivers diff --git a/include/fs_loader.h b/include/fs_loader.h index 1b3c58086f5..8de7cb18dc7 100644 --- a/include/fs_loader.h +++ b/include/fs_loader.h @@ -31,7 +31,7 @@ struct phandle_part { * @mtdpart: MTD partition for ubi partition. * @ubivol: UBI volume-name for ubifsmount. */ -struct device_platdata { +struct device_plat { struct phandle_part phandlepart; char *mtdpart; char *ubivol; diff --git a/include/ns16550.h b/include/ns16550.h index 08e933ffe79..bef29610325 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -56,7 +56,7 @@ enum ns16550_flags { };

/** - * struct ns16550_platdata - information about a NS16550 port + * struct ns16550_plat - information about a NS16550 port * * @base: Base register address * @reg_width: IO accesses size of registers (in bytes, 1 or 4) @@ -67,7 +67,7 @@ enum ns16550_flags { * @flags: A few flags (enum ns16550_flags) * @bdf: PCI slot/function (pci_dev_t) */ -struct ns16550_platdata { +struct ns16550_plat { unsigned long base; int reg_width; int reg_shift; @@ -111,7 +111,7 @@ struct NS16550 { UART_REG(ssr); /* 11*/ #endif #ifdef CONFIG_DM_SERIAL - struct ns16550_platdata *plat; + struct ns16550_plat *plat; #endif };

diff --git a/include/p2sb.h b/include/p2sb.h index a25170e3d11..ddbc8d5e14d 100644 --- a/include/p2sb.h +++ b/include/p2sb.h @@ -17,11 +17,11 @@ #define PCH_P2SB_HBDF 0x70

/** - * struct p2sb_child_platdata - Information about each child of a p2sb device + * struct p2sb_child_plat - Information about each child of a p2sb device * * @pid: Port ID for this child */ -struct p2sb_child_platdata { +struct p2sb_child_plat { uint pid; };

diff --git a/include/pci.h b/include/pci.h index 0e9fcebde51..5f36537b725 100644 --- a/include/pci.h +++ b/include/pci.h @@ -899,7 +899,7 @@ struct udevice;

#ifdef CONFIG_DM_PCI /** - * struct pci_child_platdata - information stored about each PCI device + * struct pci_child_plat - information stored about each PCI device * * Every device on a PCI bus has this per-child data. * @@ -914,7 +914,7 @@ struct udevice; * @pfdev: Handle to Physical Function device * @virtid: Virtual Function Index */ -struct pci_child_platdata { +struct pci_child_plat { int devfn; unsigned short vendor; unsigned short device; diff --git a/include/power/acpi_pmc.h b/include/power/acpi_pmc.h index 222288b71a4..64176d79bc6 100644 --- a/include/power/acpi_pmc.h +++ b/include/power/acpi_pmc.h @@ -180,7 +180,7 @@ int pmc_disable_tco(struct udevice *dev); */ int pmc_global_reset_set_enable(struct udevice *dev, bool enable);

-int pmc_ofdata_to_uc_platdata(struct udevice *dev); +int pmc_ofdata_to_uc_plat(struct udevice *dev);

int pmc_disable_tco_base(ulong tco_base);

diff --git a/include/regmap.h b/include/regmap.h index c6258face30..8216de015dd 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -373,7 +373,7 @@ int regmap_update_bits(struct regmap *map, uint offset, uint mask, uint val); int regmap_init_mem(ofnode node, struct regmap **mapp);

/** - * regmap_init_mem_platdata() - Set up a new memory register map for + * regmap_init_mem_plat() - Set up a new memory register map for * of-platdata * * @dev: Device that uses this map @@ -388,8 +388,8 @@ int regmap_init_mem(ofnode node, struct regmap **mapp); * Use regmap_uninit() to free it. * */ -int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count, - struct regmap **mapp); +int regmap_init_mem_plat(struct udevice *dev, fdt_val_t *reg, int count, + struct regmap **mapp);

int regmap_init_mem_index(ofnode node, struct regmap **mapp, int index);

diff --git a/include/scsi.h b/include/scsi.h index 96cb7266762..90cec99e322 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -162,14 +162,14 @@ struct scsi_cmd { #define SCSI_WRITE_SAME 0x41 /* Write Same (O) */

/** - * struct scsi_platdata - stores information about SCSI controller + * struct scsi_plat - stores information about SCSI controller * * @base: Controller base address * @max_lun: Maximum number of logical units * @max_id: Maximum number of target ids * @max_bytes_per_req: Maximum number of bytes per read/write request */ -struct scsi_platdata { +struct scsi_plat { unsigned long base; unsigned long max_lun; unsigned long max_id; diff --git a/include/spi.h b/include/spi.h index 8c131c96bed..a0342e31695 100644 --- a/include/spi.h +++ b/include/spi.h @@ -45,7 +45,7 @@ struct dm_spi_bus { };

/** - * struct dm_spi_platdata - platform data for all SPI slaves + * struct dm_spi_plat - platform data for all SPI slaves * * This describes a SPI slave, a child device of the SPI bus. To obtain this * struct from a spi_slave, use dev_get_parent_plat(dev) or @@ -58,7 +58,7 @@ struct dm_spi_bus { * @max_hz: Maximum bus speed that this slave can tolerate * @mode: SPI mode to use for this device (see SPI mode flags) */ -struct dm_spi_slave_platdata { +struct dm_spi_slave_plat { unsigned int cs; uint max_hz; uint mode; @@ -609,8 +609,7 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp); * @node: Node offset to read from * @plat: Place to put the decoded information */ -int spi_slave_of_to_plat(struct udevice *dev, - struct dm_spi_slave_platdata *plat); +int spi_slave_of_to_plat(struct udevice *dev, struct dm_spi_slave_plat *plat);

/** * spi_cs_info() - Check information on a chip select diff --git a/include/syscon.h b/include/syscon.h index 3df96e32764..2e02199c051 100644 --- a/include/syscon.h +++ b/include/syscon.h @@ -33,7 +33,7 @@ struct syscon_ops { * * Update: 64-bit is now supported and we have an education crisis. */ -struct syscon_base_platdata { +struct syscon_base_plat { fdt_val_t reg[2]; }; #endif diff --git a/include/usb.h b/include/usb.h index 9e1ec534eca..b3851fdb4f9 100644 --- a/include/usb.h +++ b/include/usb.h @@ -597,16 +597,16 @@ struct usb_hub_device {

#if CONFIG_IS_ENABLED(DM_USB) /** - * struct usb_platdata - Platform data about a USB controller + * struct usb_plat - Platform data about a USB controller * * Given a USB controller (UCLASS_USB) dev this is dev_get_plat(dev) */ -struct usb_platdata { +struct usb_plat { enum usb_init_type init_type; };

/** - * struct usb_dev_platdata - Platform data about a USB device + * struct usb_dev_plat - Platform data about a USB device * * Given a USB device dev this structure is dev_get_parent_plat(dev). * This is used by sandbox to provide emulation data also. @@ -617,7 +617,7 @@ struct usb_platdata { * @strings: List of descriptor strings (for sandbox emulation purposes) * @desc_list: List of descriptors (for sandbox emulation purposes) */ -struct usb_dev_platdata { +struct usb_dev_plat { struct usb_device_id id; int devnum; /* @@ -659,14 +659,14 @@ struct usb_bus_priv { };

/** - * struct usb_emul_platdata - platform data about the USB emulator + * struct usb_emul_plat - platform data about the USB emulator * * Given a USB emulator (UCLASS_USB_EMUL) 'dev', this is * dev_get_uclass_plat(dev). * * @port1: USB emulator device port number on the parent hub */ -struct usb_emul_platdata { +struct usb_emul_plat { int port1; /* Port number (numbered from 1) */ };

diff --git a/include/vbe.h b/include/vbe.h index f420f493ee1..1631260eb73 100644 --- a/include/vbe.h +++ b/include/vbe.h @@ -104,10 +104,10 @@ struct vbe_ddc_info { extern struct vbe_mode_info mode_info;

struct video_priv; -struct video_uc_platdata; +struct video_uc_plat; int vbe_setup_video_priv(struct vesa_mode_info *vesa, struct video_priv *uc_priv, - struct video_uc_platdata *plat); + struct video_uc_plat *plat); int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void));

#endif diff --git a/include/video.h b/include/video.h index 31a12bd7996..7b7f62a8277 100644 --- a/include/video.h +++ b/include/video.h @@ -18,7 +18,7 @@ struct udevice;

/** - * struct video_uc_platdata - uclass platform data for a video device + * struct video_uc_plat - uclass platform data for a video device * * This holds information that the uclass needs to know about each device. It * is accessed using dev_get_uclass_plat(dev). See 'Theory of operation' at @@ -31,7 +31,7 @@ struct udevice; * @copy_base: Base address of a hardware copy of the frame buffer. See * CONFIG_VIDEO_COPY. */ -struct video_uc_platdata { +struct video_uc_plat { uint align; uint size; ulong base; @@ -77,7 +77,7 @@ enum video_log2_bpp { * @fb: Frame buffer * @fb_size: Frame buffer size * @copy_fb: Copy of the frame buffer to keep up to date; see struct - * video_uc_platdata + * video_uc_plat * @line_length: Length of each frame buffer line, in bytes. This can be * set by the driver, but if not, the uclass will set it after * probing diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c index 65fb41268ed..b5f2cebbde1 100644 --- a/lib/acpi/acpi_device.c +++ b/lib/acpi/acpi_device.c @@ -724,7 +724,7 @@ static void acpi_device_write_spi(struct acpi_ctx *ctx, const struct acpi_spi *s static int acpi_device_set_spi(const struct udevice *dev, struct acpi_spi *spi, const char *scope) { - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat; struct spi_slave *slave = dev_get_parent_priv(dev);

plat = dev_get_parent_plat(slave->dev); diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 5cccc0ce4da..0937e3595a4 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -42,7 +42,7 @@ * handle handle of the controller on which this driver is installed * io block io protocol proxied by this driver */ -struct efi_blk_platdata { +struct efi_blk_plat { efi_handle_t handle; struct efi_block_io *io; }; @@ -59,7 +59,7 @@ struct efi_blk_platdata { static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct efi_blk_platdata *plat = dev_get_plat(dev); + struct efi_blk_plat *plat = dev_get_plat(dev); struct efi_block_io *io = plat->io; efi_status_t ret;

@@ -88,7 +88,7 @@ static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, static ulong efi_bl_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct efi_blk_platdata *plat = dev_get_plat(dev); + struct efi_blk_plat *plat = dev_get_plat(dev); struct efi_block_io *io = plat->io; efi_status_t ret;

@@ -140,7 +140,7 @@ static int efi_bl_bind(efi_handle_t handle, void *interface) struct efi_object *obj = efi_search_obj(handle); struct efi_block_io *io = interface; int disks; - struct efi_blk_platdata *plat; + struct efi_blk_plat *plat;

EFI_PRINT("%s: handle %p, interface %p\n", __func__, handle, io);

@@ -196,7 +196,7 @@ U_BOOT_DRIVER(efi_blk) = { .name = "efi_blk", .id = UCLASS_BLK, .ops = &efi_blk_ops, - .plat_auto = sizeof(struct efi_blk_platdata), + .plat_auto = sizeof(struct efi_blk_plat), };

/* EFI driver operators */ diff --git a/lib/smbios.c b/lib/smbios.c index 4bd16556e36..1e10fa84207 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -229,7 +229,7 @@ static void smbios_write_type4_dm(struct smbios_type4 *t, ofnode node)

uclass_find_first_device(UCLASS_CPU, &cpu); if (cpu) { - struct cpu_platdata *plat = dev_get_parent_plat(cpu); + struct cpu_plat *plat = dev_get_parent_plat(cpu);

if (plat->family) processor_family = plat->family; diff --git a/test/dm/acpi.c b/test/dm/acpi.c index adc9cd513d7..e0a323ecd40 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -25,12 +25,12 @@ #define BUF_SIZE 4096

/** - * struct testacpi_platdata - Platform data for the test ACPI device + * struct testacpi_plat - Platform data for the test ACPI device * * @no_name: true to emit an empty ACPI name from testacpi_get_name() * @return_error: true to return an error instead of a name */ -struct testacpi_platdata { +struct testacpi_plat { bool return_error; bool no_name; }; @@ -53,7 +53,7 @@ static int testacpi_write_tables(const struct udevice *dev,

static int testacpi_get_name(const struct udevice *dev, char *out_name) { - struct testacpi_platdata *plat = dev_get_plat(dev); + struct testacpi_plat *plat = dev_get_plat(dev);

if (plat->return_error) return -EINVAL; @@ -110,7 +110,7 @@ U_BOOT_DRIVER(testacpi_drv) = { .of_match = testacpi_ids, .id = UCLASS_TEST_ACPI, .bind = dm_scan_fdt_dev, - .plat_auto = sizeof(struct testacpi_platdata), + .plat_auto = sizeof(struct testacpi_plat), ACPI_OPS_PTR(&testacpi_ops) };

@@ -418,7 +418,7 @@ DM_TEST(dm_test_acpi_cmd_dump, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); /* Test acpi_device_path() */ static int dm_test_acpi_device_path(struct unit_test_state *uts) { - struct testacpi_platdata *plat; + struct testacpi_plat *plat; char buf[ACPI_PATH_MAX]; struct udevice *dev, *child;

diff --git a/test/dm/core.c b/test/dm/core.c index 5bdcab56504..a7c0f40b775 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -120,7 +120,7 @@ static int dm_test_autobind(struct unit_test_state *uts) ut_asserteq(0, list_count_items(&gd->dm_root->child_head)); ut_asserteq(0, dm_testdrv_op_count[DM_TEST_OP_POST_BIND]);

- ut_assertok(dm_scan_platdata(false)); + ut_assertok(dm_scan_plat(false));

/* We should have our test class now at least, plus more children */ ut_assert(1 < list_count_items(&gd->uclass_root)); @@ -264,7 +264,7 @@ static int dm_test_autoprobe(struct unit_test_state *uts) DM_TEST(dm_test_autoprobe, UT_TESTF_SCAN_PDATA);

/* Check that we see the correct plat in each device */ -static int dm_test_platdata(struct unit_test_state *uts) +static int dm_test_plat(struct unit_test_state *uts) { const struct dm_test_pdata *pdata; struct udevice *dev; @@ -279,7 +279,7 @@ static int dm_test_platdata(struct unit_test_state *uts)

return 0; } -DM_TEST(dm_test_platdata, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_plat, UT_TESTF_SCAN_PDATA);

/* Test that we can bind, probe, remove, unbind a driver */ static int dm_test_lifecycle(struct unit_test_state *uts) @@ -485,7 +485,7 @@ static int dm_test_leak(struct unit_test_state *uts)

dm_leak_check_start(uts);

- ut_assertok(dm_scan_platdata(false)); + ut_assertok(dm_scan_plat(false)); ut_assertok(dm_scan_fdt(false));

/* Scanning the uclass is enough to probe all the devices */ diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c index afa7c2c3f31..cfc43a5b038 100644 --- a/test/dm/of_platdata.c +++ b/test/dm/of_platdata.c @@ -8,7 +8,7 @@ #include <test/ut.h>

/* Test that we can find a device using of-platdata */ -static int dm_test_of_platdata_base(struct unit_test_state *uts) +static int dm_test_of_plat_base(struct unit_test_state *uts) { struct udevice *dev;

@@ -17,10 +17,10 @@ static int dm_test_of_platdata_base(struct unit_test_state *uts)

return 0; } -DM_TEST(dm_test_of_platdata_base, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_base, UT_TESTF_SCAN_PDATA);

/* Test that we can read properties from a device */ -static int dm_test_of_platdata_props(struct unit_test_state *uts) +static int dm_test_of_plat_props(struct unit_test_state *uts) { struct dtd_sandbox_spl_test *plat; struct udevice *dev; @@ -89,7 +89,7 @@ static int dm_test_of_platdata_props(struct unit_test_state *uts)

return 0; } -DM_TEST(dm_test_of_platdata_props, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_props, UT_TESTF_SCAN_PDATA);

/* * find_driver_info - recursively find the driver_info for a device @@ -139,7 +139,7 @@ static int find_driver_info(struct unit_test_state *uts, struct udevice *parent, }

/* Check that every device is recorded in its driver_info struct */ -static int dm_test_of_platdata_dev(struct unit_test_state *uts) +static int dm_test_of_plat_dev(struct unit_test_state *uts) { const struct driver_info *info = ll_entry_start(struct driver_info, driver_info); @@ -171,10 +171,10 @@ static int dm_test_of_platdata_dev(struct unit_test_state *uts)

return 0; } -DM_TEST(dm_test_of_platdata_dev, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_dev, UT_TESTF_SCAN_PDATA);

/* Test handling of phandles that point to other devices */ -static int dm_test_of_platdata_phandle(struct unit_test_state *uts) +static int dm_test_of_plat_phandle(struct unit_test_state *uts) { struct dtd_sandbox_clk_test *plat; struct udevice *dev, *clk; @@ -204,11 +204,11 @@ static int dm_test_of_platdata_phandle(struct unit_test_state *uts)

return 0; } -DM_TEST(dm_test_of_platdata_phandle, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_phandle, UT_TESTF_SCAN_PDATA);

#if CONFIG_IS_ENABLED(OF_PLATDATA_PARENT) /* Test that device parents are correctly set up */ -static int dm_test_of_platdata_parent(struct unit_test_state *uts) +static int dm_test_of_plat_parent(struct unit_test_state *uts) { struct udevice *rtc, *i2c;

@@ -218,5 +218,5 @@ static int dm_test_of_platdata_parent(struct unit_test_state *uts)

return 0; } -DM_TEST(dm_test_of_platdata_parent, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_parent, UT_TESTF_SCAN_PDATA); #endif diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 4ff7a01d5aa..4ee34ca2bb9 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -90,7 +90,7 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test, uts->start = mallinfo(); gd->flags |= GD_FLG_DM_NO_SEQ; if (test->flags & UT_TESTF_SCAN_PDATA) - ut_assertok(dm_scan_platdata(false)); + ut_assertok(dm_scan_plat(false)); if (test->flags & UT_TESTF_PROBE_TEST) ut_assertok(do_autoprobe(uts)); if (!CONFIG_IS_ENABLED(OF_PLATDATA) && @@ -215,7 +215,7 @@ int dm_test_main(const char *test_name) gd_set_of_root(uts->of_root); gd->dm_root = NULL; ut_assertok(dm_init(CONFIG_IS_ENABLED(OF_LIVE))); - dm_scan_platdata(false); + dm_scan_plat(false); if (!CONFIG_IS_ENABLED(OF_PLATDATA)) dm_scan_fdt(false); uclass_alloc_all_seqs();

As a way of keeping the driver declarations more consistent, add a warning if the struct used does not end with _priv or _plat.

Signed-off-by: Simon Glass sjg@chromium.org ---

scripts/checkpatch.pl | 38 +++++++++++++++++++++++++++++++++ tools/patman/test_checkpatch.py | 28 ++++++++++++++++++++++++ 2 files changed, 66 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 4ed7e124c9a..01ab570a168 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2320,6 +2320,23 @@ sub get_raw_comment { return $comment; }

+# Args: +# line: Patch line to check +# auto: Auto variable name, e.g. "per_child_auto" +# suffix: Suffix to expect on member, e.g. "_priv" +# warning: Warning name, e.g. "PRIV_AUTO" +sub u_boot_struct_name { + my ($line, $auto, $suffix, $warning) = @_; + + # Use _priv as a suffix for the device-private data struct + if ($line =~ /^+\s*.${auto}\s*=\s*sizeof(struct((\w+)).*/) { + my $struct_name = $1; + if ($struct_name !~ /^\w+${suffix}/) { + WARN($warning, "struct '$struct_name' should have a ${suffix} suffix"); + } + } +} + # Checks specific to U-Boot sub u_boot_line { my ($realfile, $line, $rawline, $herecurr) = @_; @@ -2371,6 +2388,27 @@ sub u_boot_line { ERROR("CONFIG_IS_ENABLED_CONFIG", "CONFIG_IS_ENABLED() takes values without the CONFIG_ prefix\n" . $herecurr); } + + # Use _priv as a suffix for the device-private data struct + if ($line =~ /^+\s*.priv_auto\s*=\s*sizeof(struct((\w+)).*/) { + my $struct_name = $1; + if ($struct_name !~ /^\w+_priv/) { + WARN("PRIV_AUTO", "struct '$struct_name' should have a _priv suffix"); + } + } + + # Check struct names for the 'auto' members of struct driver + u_boot_struct_name($line, "priv_auto", "_priv", "PRIV_AUTO"); + u_boot_struct_name($line, "plat_auto", "_plat", "PLAT_AUTO"); + u_boot_struct_name($line, "per_child_auto", "_priv", "CHILD_PRIV_AUTO"); + u_boot_struct_name($line, "per_child_plat_auto", "_plat", + "CHILD_PLAT_AUTO"); + + # Now the ones for struct uclass, skipping those in common with above + u_boot_struct_name($line, "per_device_auto", "_priv", + "DEVICE_PRIV_AUTO"); + u_boot_struct_name($line, "per_device_plat_auto", "_plat", + "DEVICE_PLAT_AUTO"); }

sub process { diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py index 1f7c38c4e90..a4fec1d4c14 100644 --- a/tools/patman/test_checkpatch.py +++ b/tools/patman/test_checkpatch.py @@ -411,6 +411,34 @@ index 0000000..2234c87 pm.add_line('common/main.c', 'if (CONFIG_IS_ENABLED(CONFIG_CLK))') self.checkSingleMessage(pm, 'CONFIG_IS_ENABLED_CONFIG', 'error')

+ def check_struct(self, auto, suffix, warning): + """Check one of the warnings for struct naming + + Args: + auto: Auto variable name, e.g. 'per_child_auto' + suffix: Suffix to expect on member, e.g. '_priv' + warning: Warning name, e.g. 'PRIV_AUTO' + """ + pm = PatchMaker() + pm.add_line('common/main.c', '.%s = sizeof(struct(fred)),' % auto) + pm.add_line('common/main.c', '.%s = sizeof(struct(mary%s)),' % + (auto, suffix)) + self.checkSingleMessage( + pm, warning, "struct 'fred' should have a %s suffix" % suffix) + + def testDmDriverAuto(self): + """Check for the correct suffix on 'struct driver' auto members""" + self.check_struct('priv_auto', '_priv', 'PRIV_AUTO') + self.check_struct('plat_auto', '_plat', 'PLAT_AUTO') + self.check_struct('per_child_auto', '_priv', 'CHILD_PRIV_AUTO') + self.check_struct('per_child_plat_auto', '_plat', 'CHILD_PLAT_AUTO') + + def testDmUclassAuto(self): + """Check for the correct suffix on 'struct uclass' auto members""" + # Some of these are omitted since they match those from struct driver + self.check_struct('per_device_auto', '_priv', 'DEVICE_PRIV_AUTO') + self.check_struct('per_device_plat_auto', '_plat', 'DEVICE_PLAT_AUTO') +

if __name__ == "__main__": unittest.main()