dm: treewide: Tidy up and adjust driver model naming
Subsystems (101)
PATCH 3/9 dm: treewide: Rename 'platdata' variables to just 'plat'
In reply to Simon GlassWe 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.
---
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(-)
Applied to u-boot-dm/next, thanks!
PATCH 4/9 dm: Rename 'platdata_size' to 'plat_size'
In reply to Simon GlassRename this to be consistent with the change from 'platdata'.
---
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(-)
doc/driver-model/of-plat.rst +1 -1
@@ -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,
drivers/core/device.c +7 -8
@@ -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;
include/dm/platdata.h +2 -2
@@ -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 };
tools/dtoc/dtb_platdata.py +1 -1
@@ -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
tools/dtoc/test_dtoc.py +33 -33
264 lines not on this page · raw message
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
PATCH 4/9 dm: Rename 'platdata_size' to 'plat_size'
Rename this to be consistent with the change from 'platdata'.
---
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(-)
Applied to u-boot-dm/next, thanks!
PATCH 5/9 dm: treewide: Rename dev_get_platdata() to dev_get_plat()
In reply to Simon GlassRename this to be consistent with the change from 'platdata'.
---
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 +-
19 lines not shown · raw message
arch/arm/mach-stm32mp/bsec.c +8 -8
@@ -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;
arch/x86/cpu/apollolake/hostbridge.c +3 -3
@@ -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;
arch/x86/cpu/apollolake/pmc.c +2 -2
@@ -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;/*
arch/x86/cpu/apollolake/uart.c +2 -2
@@ -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;/*
arch/x86/cpu/broadwell/sata.c +3 -3
@@ -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);
arch/x86/cpu/intel_common/itss.c +1 -1
@@ -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;/*
arch/x86/cpu/intel_common/p2sb.c +2 -2
@@ -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;
board/bluewater/gurnard/gurnard.c +1 -1
@@ -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 ; }
cmd/demo.c +1 -1
@@ -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);
cmd/host.c +1 -1
@@ -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
common/usb_storage.c +1 -1
@@ -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);
doc/driver-model/design.rst +1 -1
@@ -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);
doc/driver-model/of-plat.rst +3 -3
@@ -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 */
doc/driver-model/spi-howto.rst +2 -2
@@ -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 */
drivers/ata/fsl_sata.c +4 -4
@@ -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);
drivers/ata/sata_mv.c +20 -20
@@ -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 */
drivers/ata/sata_sil.c +4 -4
@@ -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 ];
drivers/block/sandbox.c +3 -3
@@ -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;
drivers/cache/cache-v5l2.c +4 -4
@@ -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;
drivers/clk/altera/clk-agilex.c +3 -3
@@ -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);
drivers/clk/altera/clk-arria10.c +7 -7
@@ -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;
drivers/clk/at91/compat.c +15 -15
@@ -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;
drivers/clk/clk_boston.c +2 -2
@@ -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;
drivers/clk/clk_fixed_factor.c +1 -1
@@ -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) {
drivers/clk/rockchip/clk_rk3188.c +1 -1
@@ -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
drivers/clk/rockchip/clk_rk3288.c +1 -1
@@ -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
drivers/clk/rockchip/clk_rk3368.c +1 -1
@@ -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
drivers/clk/rockchip/clk_rk3399.c +2 -2
@@ -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
drivers/core/device.c +1 -1
@@ -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__);
drivers/core/syscon-uclass.c +1 -1
@@ -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);
drivers/cpu/at91_cpu.c +3 -3
@@ -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;
drivers/cpu/imx8_cpu.c +6 -6
@@ -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);
drivers/demo/demo-shape.c +2 -2
@@ -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 */
drivers/demo/demo-simple.c +1 -1
@@ -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);
drivers/demo/demo-uclass.c +1 -1
@@ -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 );
drivers/gpio/altera_pio.c +6 -6
@@ -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 (®s->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 (®s->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),
drivers/gpio/at91_gpio.c +1 -1
@@ -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;
drivers/gpio/atmel_pio4.c +2 -2
@@ -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;
drivers/gpio/bcm2835_gpio.c +2 -2
@@ -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);
drivers/gpio/da8xx_gpio.c +2 -2
@@ -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);
drivers/gpio/dwapb_gpio.c +7 -7
@@ -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)
drivers/gpio/gpio-uclass.c +2 -2
@@ -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;
drivers/gpio/hi6220_gpio.c +1 -1
@@ -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;
drivers/gpio/imx_rgpio2p.c +1 -1
@@ -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;
drivers/gpio/intel_broadwell_gpio.c +2 -2
@@ -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;
drivers/gpio/intel_ich6_gpio.c +2 -2
@@ -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;
drivers/gpio/iproc_gpio.c +8 -8
@@ -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 ];
drivers/gpio/mpc83xx_spisel_boot.c +2 -2
@@ -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);
drivers/gpio/mpc8xxx_gpio.c +2 -2
@@ -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);
drivers/gpio/mt7621_gpio.c +6 -6
@@ -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 offsestatic 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 offsstatic 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 */
drivers/gpio/mxc_gpio.c +2 -2
@@ -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);
drivers/gpio/mxs_gpio.c +1 -1
@@ -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;
drivers/gpio/nx_gpio.c +13 -13
@@ -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 (®s->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),
drivers/gpio/omap_gpio.c +3 -3
@@ -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);
drivers/gpio/pca953x_gpio.c +8 -8
@@ -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;
drivers/gpio/pcf8575_gpio.c +3 -3
@@ -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;
drivers/gpio/sifive-gpio.c +7 -7
@@ -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);
drivers/gpio/sunxi_gpio.c +6 -6
@@ -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 */
drivers/gpio/vybrid_gpio.c +2 -2
@@ -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);
drivers/gpio/xilinx_gpio.c +9 -9
@@ -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);
drivers/gpio/zynq_gpio.c +9 -9
@@ -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);
drivers/i2c/lpc32xx_i2c.c +5 -5
@@ -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 ;
drivers/i2c/omap24xx_i2c.c +2 -2
@@ -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",
drivers/led/led_cortina.c +2 -2
@@ -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;
drivers/misc/altera_sysid.c +1 -1
@@ -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),
drivers/misc/i2c_eeprom_emul.c +6 -6
@@ -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);
drivers/misc/imx8/scu.c +2 -2
@@ -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);
drivers/misc/microchip_flexcom.c +1 -1
@@ -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),
drivers/misc/p2sb_emul.c +3 -3
@@ -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++) {
drivers/misc/rockchip-efuse.c +2 -2
@@ -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 ;
drivers/misc/rockchip-otp.c +2 -2
@@ -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);
drivers/misc/sifive-otp.c +3 -3
@@ -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);
drivers/misc/swap_case.c +3 -3
@@ -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++) {
drivers/mmc/am654_sdhci.c +7 -7
@@ -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;
drivers/mmc/arm_pl180_mmci.c +2 -2
@@ -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); }
drivers/mmc/aspeed_sdhci.c +2 -2
@@ -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); }
drivers/mmc/atmel_sdhci.c +2 -2
@@ -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); }
drivers/mmc/bcm2835_sdhci.c +2 -2
@@ -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;
drivers/mmc/bcm2835_sdhost.c +2 -2
@@ -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); }
drivers/mmc/bcmstb_sdhci.c +2 -2
@@ -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;
drivers/mmc/ca_dw_mmc.c +2 -2
@@ -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); }
drivers/mmc/davinci_mmc.c +3 -3
@@ -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);
drivers/mmc/exynos_dw_mmc.c +2 -2
@@ -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); }
drivers/mmc/fsl_esdhc.c +7 -7
@@ -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); }
drivers/mmc/fsl_esdhc_imx.c +5 -5
@@ -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); }
drivers/mmc/ftsdc010_mci.c +2 -2
@@ -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); }
drivers/mmc/gen_atmel_mci.c +7 -7
@@ -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); }
drivers/mmc/hi6220_dw_mmc.c +2 -2
@@ -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);
drivers/mmc/iproc_sdhci.c +2 -2
@@ -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); }
drivers/mmc/jz_mmc.c +3 -3
@@ -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;
drivers/mmc/meson_gx_mmc.c +3 -3
@@ -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); }
drivers/mmc/mmc_spi.c +2 -2
@@ -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); }
drivers/mmc/msm_sdhci.c +2 -2
@@ -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); }
drivers/mmc/mtk-sd.c +9 -9
@@ -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); }
drivers/mmc/mv_sdhci.c +2 -2
@@ -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); }
drivers/mmc/mxsmmc.c +5 -5
@@ -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); }
drivers/mmc/nexell_dw_mmc.c +2 -2
@@ -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); }
drivers/mmc/omap_hsmmc.c +4 -4
@@ -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;
drivers/mmc/pci_mmc.c +2 -2
@@ -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); }
drivers/mmc/pic32_sdhci.c +2 -2
@@ -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); }
drivers/mmc/pxa_mmc_gen.c +4 -4
@@ -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); }
drivers/mmc/renesas-sdhi.c +1 -1
@@ -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) &&
drivers/mmc/rockchip_dw_mmc.c +2 -2
@@ -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); }
drivers/mmc/rockchip_sdhci.c +2 -2
@@ -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); }
drivers/mmc/s5p_sdhci.c +2 -2
@@ -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);
drivers/mmc/sandbox_mmc.c +2 -2
@@ -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);
Lines of this file are not shown. View the raw message.
drivers/net/mscc_eswitch/luton_switch.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/mscc_eswitch/ocelot_switch.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/mscc_eswitch/serval_switch.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/mscc_eswitch/servalt_switch.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/power/domain/imx8-power-domain-legacy.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/power/domain/imx8m-power-domain.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/power/regulator/gpio-regulator.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/power/regulator/tps62360_regulator.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/power/regulator/tps65910_regulator.c +11 -11
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
1 line not shown · raw message
Parts of this message are not shown here. View the raw message.
PATCH 5/9 dm: treewide: Rename dev_get_platdata() to dev_get_plat()
Rename this to be consistent with the change from 'platdata'.
---
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(-)
Applied to u-boot-dm/next, thanks!
PATCH 6/9 dm: treewide: Rename ofdata_to_platdata() to of_to_plat()
In reply to Simon GlassThis name is far too long. Rename it to remove the 'data' bits. This makes it consistent with the platdata->plat rename.
---
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(-)
arch/arm/mach-stm32mp/bsec.c +2 -2
@@ -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,
arch/arm/mach-stm32mp/pwr_regulator.c +2 -2
@@ -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), };
arch/x86/cpu/acpi_gpe.c +2 -2
@@ -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), };
arch/x86/cpu/apollolake/hostbridge.c +2 -2
@@ -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),
arch/x86/cpu/apollolake/pmc.c +1 -1
@@ -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),
arch/x86/cpu/apollolake/uart.c +4 -4
@@ -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, };
arch/x86/cpu/broadwell/adsp.c +2 -2
@@ -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,
arch/x86/cpu/broadwell/sata.c +2 -2
@@ -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), };
arch/x86/cpu/intel_common/itss.c +2 -2
@@ -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), };
arch/x86/cpu/intel_common/p2sb.c +2 -2
@@ -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),
arch/x86/cpu/slimbootloader/serial.c +2 -2
@@ -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,
arch/x86/include/asm/intel_pinctrl.h +3 -4
@@ -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
board/intel/galileo/galileo.c +1 -1
@@ -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. *
doc/driver-model/debugging.rst +1 -1
@@ -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.
doc/driver-model/design.rst +18 -18
@@ -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
doc/driver-model/ethernet.rst +1 -1
@@ -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 = ð_ape_ops, .priv_auto = sizeof(struct eth_ape_priv),
doc/driver-model/of-plat.rst +6 -6
@@ -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
doc/driver-model/spi-howto.rst +4 -4
@@ -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;
doc/driver-model/usb-info.rst +2 -2
@@ -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
drivers/adc/exynos-adc.c +2 -2
@@ -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), };
drivers/adc/meson-saradc.c +2 -2
@@ -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), };
drivers/adc/rockchip-saradc.c +2 -2
@@ -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), };
drivers/adc/sandbox.c +2 -2
@@ -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), };
drivers/ata/dwc_ahci.c +2 -2
@@ -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),
drivers/ata/fsl_sata.c +2 -2
@@ -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),
drivers/ata/mtk_ahci.c +2 -2
@@ -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),
drivers/ata/sata_ceva.c +2 -2
@@ -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, };
drivers/cache/cache-v5l2.c +2 -2
@@ -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,
drivers/clk/altera/clk-agilex.c +2 -2
@@ -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), };
drivers/clk/altera/clk-arria10.c +2 -2
@@ -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), };
drivers/clk/aspeed/clk_ast2500.c +2 -2
@@ -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, };
drivers/clk/at91/compat.c +6 -6
@@ -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,
drivers/clk/clk_boston.c +2 -2
@@ -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, };
drivers/clk/clk_fixed_factor.c +2 -2
@@ -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, };
drivers/clk/clk_fixed_rate.c +2 -2
@@ -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,
drivers/clk/rockchip/clk_px30.c +4 -4
@@ -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, };
drivers/clk/rockchip/clk_rk3036.c +2 -2
@@ -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,
drivers/clk/rockchip/clk_rk3128.c +2 -2
@@ -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,
drivers/clk/rockchip/clk_rk3188.c +2 -2
@@ -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, };
drivers/clk/rockchip/clk_rk322x.c +2 -2
@@ -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,
drivers/clk/rockchip/clk_rk3288.c +2 -2
@@ -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, };
drivers/clk/rockchip/clk_rk3308.c +2 -2
@@ -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,
drivers/clk/rockchip/clk_rk3328.c +2 -2
@@ -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,
drivers/clk/rockchip/clk_rk3368.c +2 -2
@@ -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,
drivers/clk/rockchip/clk_rk3399.c +4 -4
@@ -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,
drivers/clk/rockchip/clk_rv1108.c +2 -2
@@ -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, };
drivers/core/acpi.c +1 -1
@@ -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);
drivers/core/device.c +7 -7
@@ -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;
drivers/core/devres.c +1 -1
@@ -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 {
drivers/core/root.c +2 -2
@@ -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)
drivers/ddr/altera/sdram_gen5.c +2 -2
@@ -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),
drivers/ddr/altera/sdram_soc64.c +2 -2
@@ -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),
drivers/demo/demo-shape.c +2 -2
@@ -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,
drivers/demo/demo-simple.c +2 -2
@@ -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), };
drivers/dma/ti-edma3.c +2 -2
@@ -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), };
drivers/gpio/altera_pio.c +2 -2
@@ -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, };
drivers/gpio/bcm2835_gpio.c +2 -2
@@ -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,
drivers/gpio/da8xx_gpio.c +2 -2
@@ -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),
drivers/gpio/gpio-uclass.c +2 -2
@@ -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 ),
drivers/gpio/intel_broadwell_gpio.c +2 -2
@@ -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),
drivers/gpio/intel_gpio.c +2 -2
@@ -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, };
drivers/gpio/intel_ich6_gpio.c +2 -2
@@ -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),
drivers/gpio/iproc_gpio.c +2 -2
@@ -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), };
drivers/gpio/mpc83xx_spisel_boot.c +2 -2
@@ -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
drivers/gpio/mpc8xxx_gpio.c +2 -2
@@ -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
drivers/gpio/msm_gpio.c +2 -2
@@ -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),
drivers/gpio/mxc_gpio.c +2 -2
@@ -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,
drivers/gpio/mxs_gpio.c +2 -2
@@ -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 };
drivers/gpio/nx_gpio.c +2 -2
@@ -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, };
drivers/gpio/omap_gpio.c +2 -2
@@ -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
drivers/gpio/pcf8575_gpio.c +1 -1
@@ -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), };
drivers/gpio/pm8916_gpio.c +4 -4
@@ -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),
drivers/gpio/sandbox.c +2 -2
@@ -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,
drivers/gpio/sifive-gpio.c +2 -2
@@ -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,
drivers/gpio/vybrid_gpio.c +1 -1
@@ -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),
drivers/gpio/xilinx_gpio.c +2 -2
@@ -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),
drivers/gpio/zynq_gpio.c +2 -2
@@ -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), };
drivers/i2c/acpi_i2c.c +1 -1
@@ -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);
drivers/i2c/acpi_i2c.h +1 -1
@@ -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
drivers/i2c/ast_i2c.c +2 -2
@@ -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, };
drivers/i2c/at91_i2c.c +2 -2
@@ -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,
drivers/i2c/cros_ec_tunnel.c +2 -2
@@ -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, };
drivers/i2c/designware_i2c.c +2 -2
@@ -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,
drivers/i2c/designware_i2c.h +1 -1
@@ -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
drivers/i2c/designware_i2c_pci.c +3 -3
@@ -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,
drivers/i2c/exynos_hs_i2c.c +2 -2
@@ -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, };
drivers/i2c/fsl_i2c.c +2 -2
@@ -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, };
drivers/i2c/i2c-cdns.c +2 -2
@@ -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, };
drivers/i2c/i2c-cortina.c +2 -2
@@ -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,
drivers/i2c/i2c-gpio.c +2 -2
@@ -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, };
drivers/i2c/i2c-uclass.c +3 -3
@@ -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)
drivers/i2c/iproc_i2c.c +2 -2
@@ -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,
drivers/i2c/muxes/pca954x.c +2 -2
@@ -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), };
drivers/i2c/mvtwsi.c +2 -2
@@ -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, };
drivers/i2c/omap24xx_i2c.c +2 -2
@@ -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,
drivers/i2c/rk_i2c.c +2 -2
@@ -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,
drivers/i2c/s3c24x0_i2c.c +2 -2
@@ -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, };
drivers/i2c/stm32f7_i2c.c +2 -2
@@ -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,
drivers/led/led_cortina.c +2 -2
@@ -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),
drivers/misc/altera_sysid.c +2 -2
@@ -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, };
drivers/misc/atsha204a-i2c.c +2 -2
@@ -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), };
drivers/misc/fs_loader.c +2 -2
@@ -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), };
drivers/misc/i2c_eeprom.c +4 -4
@@ -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, };
drivers/misc/i2c_eeprom_emul.c +2 -2
@@ -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),
drivers/misc/microchip_flexcom.c +2 -2
@@ -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), };
drivers/misc/rockchip-efuse.c +2 -2
@@ -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, };
drivers/misc/rockchip-otp.c +2 -2
@@ -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), };
drivers/misc/sifive-otp.c +2 -2
@@ -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, };
drivers/mmc/am654_sdhci.c +2 -2
@@ -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,
drivers/mmc/arm_pl180_mmci.c +2 -2
@@ -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),
drivers/mmc/ca_dw_mmc.c +2 -2
@@ -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,
drivers/mmc/davinci_mmc.c +2 -2
@@ -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,
drivers/mmc/fsl_esdhc_imx.c +2 -2
@@ -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,
drivers/mmc/ftsdc010_mci.c +2 -2
@@ -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,
drivers/mmc/hi6220_dw_mmc.c +2 -2
@@ -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,
drivers/mmc/jz_mmc.c +2 -2
@@ -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),
drivers/mmc/meson_gx_mmc.c +2 -2
@@ -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), };
drivers/mmc/msm_sdhci.c +2 -2
@@ -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,
drivers/mmc/mtk-sd.c +2 -2
@@ -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,
drivers/mmc/mxsmmc.c +2 -2
@@ -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 )
drivers/mmc/nexell_dw_mmc.c +2 -2
@@ -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,
drivers/mmc/omap_hsmmc.c +2 -2
@@ -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
drivers/mmc/pci_mmc.c +2 -2
@@ -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),
drivers/mmc/rockchip_dw_mmc.c +2 -2
@@ -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,
drivers/mmc/rockchip_sdhci.c +2 -2
@@ -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,
drivers/mmc/snps_dw_mmc.c +2 -2
@@ -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,
drivers/mmc/socfpga_dw_mmc.c +2 -2
@@ -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,
drivers/mmc/sti_sdhci.c +2 -2
@@ -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),
drivers/mmc/xenon_sdhci.c +2 -2
@@ -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,
drivers/mmc/zynq_sdhci.c +2 -2
@@ -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,
drivers/mtd/altera_qspi.c +2 -2
@@ -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, };
drivers/mtd/nand/raw/octeontx_nand.c +2 -2
@@ -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,
drivers/mtd/spi/sandbox.c +2 -2
@@ -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),
drivers/net/ag7xxx.c +2 -2
@@ -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,
drivers/net/altera_tse.c +2 -2
@@ -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,
drivers/net/bcmgenet.c +2 -2
@@ -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),
drivers/net/designware.c +2 -2
@@ -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,
drivers/net/designware.h +1 -1
@@ -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;
drivers/net/dwmac_s700.c +3 -3
@@ -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),
drivers/net/dwmac_socfpga.c +3 -3
@@ -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),
drivers/net/ethoc.c +2 -2
@@ -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 = ðoc_ops,
drivers/net/fec_mxc.c +2 -2
@@ -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,
drivers/net/fsl_mcdmafec.c +3 -3
@@ -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,
drivers/net/ftgmac100.c +2 -2
@@ -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,
drivers/net/ftmac100.c +2 -2
@@ -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),
drivers/net/gmac_rockchip.c +3 -3
@@ -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),
drivers/net/higmacv300.c +2 -2
@@ -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,
drivers/net/ks8851_mll.c +2 -2
@@ -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),
drivers/net/ldpaa_eth/ldpaa_eth.c +2 -2
@@ -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,
drivers/net/macb.c +5 -5
@@ -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,
drivers/net/mcffec.c +3 -3
@@ -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,
drivers/net/mtk_eth.c +2 -2
@@ -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,
drivers/net/mvgbe.c +2 -2
@@ -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),
drivers/net/mvneta.c +3 -3
@@ -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),
drivers/net/qe/dm_qe_uec.c +2 -2
@@ -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,
drivers/net/ravb.c +2 -2
@@ -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,
drivers/net/sandbox-raw.c +2 -2
@@ -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),
drivers/net/sandbox.c +2 -2
@@ -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),
drivers/net/sh_eth.c +2 -2
@@ -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,
drivers/net/smc911x.c +2 -2
@@ -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),
drivers/net/sni_ave.c +2 -2
@@ -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),
drivers/net/sun8i_emac.c +2 -2
@@ -861,7 +861,7 @@ static int sun8i_handle_internal_phy(struct udevice *dev, struct emac_eth_dev *preturn 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),
drivers/net/sunxi_emac.c +2 -2
@@ -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),
drivers/net/ti/cpsw.c +2 -2
@@ -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,
drivers/net/ti/keystone_net.c +4 -4
@@ -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,
drivers/net/xilinx_axi_emac.c +2 -2
@@ -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,
drivers/net/xilinx_emaclite.c +2 -2
@@ -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,
drivers/net/zynq_gem.c +2 -2
@@ -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,
drivers/pci/pci-aardvark.c +3 -3
@@ -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,
drivers/pci/pci-rcar-gen2.c +2 -2
@@ -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), };
drivers/pci/pci-rcar-gen3.c +2 -2
@@ -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,
Lines of this file are not shown. View the raw message.
drivers/pinctrl/broadcom/pinctrl-bcm283x.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/pinctrl/mtmips/pinctrl-mt7628.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/power/domain/imx8-power-domain-legacy.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/power/domain/imx8m-power-domain.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/power/regulator/gpio-regulator.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/power/regulator/pbias_regulator.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/power/regulator/pwm_regulator.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/power/regulator/regulator_common.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/power/regulator/regulator_common.h +3 -2
Lines of this file are not shown. View the raw message.
drivers/power/regulator/tps65910_regulator.c +4 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
Part of the diff is not shown here. View the raw message.
PATCH 6/9 dm: treewide: Rename ofdata_to_platdata() to of_to_plat()
This name is far too long. Rename it to remove the 'data' bits. This makes it consistent with the platdata->plat rename.
---
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(-)
Applied to u-boot-dm/next, thanks!
PATCH 7/9 dm: treewide: Update 'auto' declarations to be on one line
In reply to Simon GlassFix 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.
---
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(-)
arch/x86/cpu/intel_common/p2sb.c +1 -2
@@ -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, };
drivers/i2c/i2c-emul-uclass.c +1 -2
@@ -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 ), };/*
drivers/misc/p2sb-uclass.c +1 -2
@@ -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), };
drivers/pci/pci-uclass.c +1 -2
@@ -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 = {
drivers/pci/pci_sandbox.c +1 -2
@@ -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), };
drivers/power/regulator/regulator-uclass.c +1 -2
@@ -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), };
drivers/remoteproc/rproc-uclass.c +1 -2
@@ -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 */
drivers/spi/spi-uclass.c +1 -2
@@ -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
drivers/usb/emul/sandbox_hub.c +1 -2
@@ -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, };
drivers/video/nexell_display.c +1 -2
@@ -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),
test/dm/bus.c +1 -2
@@ -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, };
test/dm/test-uclass.c +1 -2
@@ -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), };
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
PATCH 7/9 dm: treewide: Update 'auto' declarations to be on one line
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.
---
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(-)
Applied to u-boot-dm/next, thanks!
PATCH 8/9 dm: treewide: Rename ..._platdata variables to just ..._plat
In reply to Simon GlassTry to maintain some consistency between these variables by using _plat as a suffix for them.
---
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(-)
arch/arm/include/asm/arch-hi6220/gpio.h +1 -1
@@ -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 */ };
arch/arm/include/asm/arch-imx8/power-domain.h +1 -1
@@ -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; };
arch/arm/include/asm/arch-imx8m/power-domain.h +1 -1
@@ -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;
arch/arm/include/asm/arch-vf610/gpio.h +1 -1
@@ -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;
arch/arm/include/asm/omap_gpio.h +1 -1
@@ -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;
arch/arm/include/asm/omap_i2c.h +1 -1
@@ -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;
arch/arm/include/asm/omap_musb.h +1 -1
@@ -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;
arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c +1 -1
@@ -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" },
arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c +1 -1
@@ -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" },
arch/arm/mach-at91/include/mach/atmel_serial.h +1 -1
@@ -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; };
arch/arm/mach-at91/include/mach/gpio.h +1 -1
@@ -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; };
arch/arm/mach-bcm283x/include/mach/gpio.h +2 -2
@@ -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; };
arch/arm/mach-lpc32xx/devices.c +2 -2
@@ -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, },
arch/arm/mach-nexell/include/mach/display.h +2 -2
@@ -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 definedCONFIG_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
arch/arm/mach-omap2/am33xx/board.c +5 -5
@@ -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 = {
arch/arm/mach-omap2/omap3/board.c +1 -1
@@ -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 },
arch/arm/mach-rockchip/px30/syscon_px30.c +4 -4
@@ -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
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +4 -4
@@ -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
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +5 -5
@@ -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
arch/arm/mach-rockchip/rk3368/syscon_rk3368.c +5 -5
@@ -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
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c +6 -6
@@ -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
arch/arm/mach-stm32mp/bsec.c +10 -10
@@ -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,
arch/arm/mach-tegra/board.c +1 -1
@@ -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,
arch/riscv/include/asm/arch-fu540/gpio.h +1 -1
@@ -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 */ };
arch/riscv/include/asm/arch-generic/gpio.h +1 -1
@@ -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 */ };
arch/x86/cpu/apollolake/hostbridge.c +6 -6
@@ -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, };
arch/x86/cpu/apollolake/pmc.c +7 -7
@@ -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), };
arch/x86/cpu/apollolake/spl.c +1 -1
@@ -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;
arch/x86/cpu/apollolake/uart.c +4 -4
@@ -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,
arch/x86/cpu/broadwell/sata.c +5 -5
@@ -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), };
arch/x86/cpu/cpu_x86.c +1 -1
@@ -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),
arch/x86/cpu/intel_common/itss.c +3 -3
@@ -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), };
arch/x86/cpu/intel_common/p2sb.c +6 -6
@@ -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, };
arch/x86/cpu/mp_init.c +2 -2
@@ -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;
arch/x86/cpu/qfw_cpu.c +1 -1
@@ -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' */
arch/x86/cpu/slimbootloader/serial.c +2 -2
@@ -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,
arch/x86/include/asm/arch-broadwell/gpio.h +1 -1
@@ -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;
arch/x86/include/asm/gpio.h +1 -1
@@ -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;
arch/x86/lib/acpi_table.c +1 -1
@@ -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(
arch/x86/lib/fsp/fsp_graphics.c +2 -2
@@ -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 ;
arch/x86/lib/mpspec.c +1 -1
@@ -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))
arch/x86/lib/sfi.c +1 -1
@@ -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 ;
board/armltd/integrator/integrator.c +2 -2
@@ -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 );
board/armltd/total_compute/total_compute.c +2 -2
@@ -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[] = {
board/armltd/vexpress64/vexpress64.c +2 -2
@@ -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[] = {
board/bluewater/gurnard/gurnard.c +2 -2
@@ -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 , };
board/bluewater/snapper9260/snapper9260.c +1 -1
@@ -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 , };
board/cavium/thunderx/thunderx.c +2 -2
@@ -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 ,
board/compulab/cm_fx6/cm_fx6.c +1 -1
@@ -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 , };
board/davinci/da8xxevm/omapl138_lcdk.c +3 -3
@@ -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 )
board/freescale/lx2160a/lx2160a.c +2 -2
@@ -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 , };
board/gateworks/gw_ventana/gw_ventana.c +1 -1
@@ -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 , };
board/hisilicon/hikey/hikey.c +3 -3
@@ -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
board/hisilicon/hikey960/hikey960.c +2 -2
@@ -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
board/hisilicon/poplar/poplar.c +2 -2
@@ -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
board/isee/igep00x0/igep00x0.c +1 -1
@@ -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 ,
board/lg/sniper/sniper.c +2 -2
@@ -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 = {
board/nokia/rx51/rx51.c +1 -1
@@ -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 },
board/siemens/corvus/board.c +1 -1
@@ -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 , };
board/st/stv0991/stv0991.c +2 -2
@@ -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
board/sysam/amcore/amcore.c +1 -1
@@ -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 ,
board/ti/am335x/board.c +4 -4
@@ -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
board/timll/devkit8000/devkit8000.c +1 -1
@@ -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 ,
board/toradex/apalis_imx6/apalis_imx6.c +1 -1
@@ -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, };
board/toradex/colibri-imx6ull/colibri-imx6ull.c +1 -1
@@ -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 , };
board/toradex/colibri_imx6/colibri_imx6.c +1 -1
@@ -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, };
board/toradex/colibri_pxa270/colibri_pxa270.c +4 -4
@@ -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, };
cmd/cpu.c +1 -1
@@ -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;
cmd/pci.c +1 -1
@@ -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) {
cmd/regulator.c +10 -10
@@ -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;
common/lcd_simplefb.c +1 -1
@@ -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;
common/usb_hub.c +1 -1
@@ -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), };
doc/driver-model/of-plat.rst +5 -5
@@ -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
doc/driver-model/spi-howto.rst +8 -8
@@ -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
doc/driver-model/usb-info.rst +4 -4
@@ -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
drivers/adc/adc-uclass.c +10 -10
@@ -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);
drivers/ata/ahci.c +3 -3
@@ -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;
drivers/clk/altera/clk-agilex.c +25 -25
195 lines not on this page · raw message
drivers/clk/altera/clk-arria10.c +9 -9
@@ -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), };
drivers/clk/at91/compat.c +25 -25
200 lines not on this page · raw message
drivers/core/regmap.c +2 -2
@@ -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;
drivers/core/root.c +3 -3
@@ -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; }
drivers/core/syscon-uclass.c +2 -2
@@ -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);
drivers/cpu/at91_cpu.c +5 -5
@@ -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, };
drivers/cpu/bmips_cpu.c +1 -1
@@ -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 ();
drivers/cpu/cpu-uclass.c +1 -1
@@ -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)
drivers/cpu/cpu_sandbox.c +1 -1
@@ -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);
drivers/cpu/imx8_cpu.c +10 -10
@@ -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, };
drivers/cpu/riscv_cpu.c +1 -1
@@ -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;
drivers/ddr/altera/sdram_agilex.c +1 -1
@@ -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;
drivers/ddr/altera/sdram_gen5.c +4 -4
@@ -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), };
drivers/ddr/altera/sdram_s10.c +1 -1
@@ -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;
drivers/ddr/altera/sdram_soc64.c +9 -9
@@ -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), };
drivers/ddr/altera/sdram_soc64.h +8 -8
@@ -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_ */
drivers/gpio/altera_pio.c +8 -8
@@ -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 (®s->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 (®s->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, };
drivers/gpio/at91_gpio.c +2 -2
@@ -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,
drivers/gpio/atmel_pio4.c +4 -4
@@ -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
drivers/gpio/bcm2835_gpio.c +3 -3
@@ -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,
drivers/gpio/da8xx_gpio.c +3 -3
@@ -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), };
drivers/gpio/da8xx_gpio.h +1 -1
@@ -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;
drivers/gpio/dwapb_gpio.c +9 -9
@@ -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)
drivers/gpio/hi6220_gpio.c +1 -1
@@ -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;
drivers/gpio/intel_broadwell_gpio.c +3 -3
@@ -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), };
drivers/gpio/intel_ich6_gpio.c +3 -3
@@ -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), };
drivers/gpio/iproc_gpio.c +13 -13
@@ -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), };
drivers/gpio/mpc83xx_spisel_boot.c +2 -2
@@ -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);
drivers/gpio/mpc8xxx_gpio.c +2 -2
@@ -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);
drivers/gpio/mt7621_gpio.c +10 -10
@@ -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 offsestatic 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 offsstatic 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));
drivers/gpio/mxs_gpio.c +4 -4
@@ -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,
drivers/gpio/nx_gpio.c +15 -15
@@ -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 (®s->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, };
drivers/gpio/omap_gpio.c +4 -4
@@ -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,
drivers/gpio/pcf8575_gpio.c +2 -2
@@ -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), };
drivers/gpio/s5p_gpio.c +4 -4
@@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;#define RATE_SET (gpio) (0x1 << (gpio + 16))/* Platform data for each bank */ -struct exynos_gpio_platdata {
Lines of this file are not shown. View the raw message.
drivers/power/acpi_pmc/acpi-pmc-uclass.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/power/domain/imx8-power-domain-legacy.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/power/domain/imx8m-power-domain.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/power/regulator/gpio-regulator.c +8 -8
Lines of this file are not shown. View the raw message.
drivers/power/regulator/regulator_common.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/power/regulator/regulator_common.h +5 -5
Lines of this file are not shown. View the raw message.
include/dm/platform_data/lpc32xx_hsuart.h +2 -2
Lines of this file are not shown. View the raw message.
include/dm/platform_data/serial_bcm283x_mu.h +1 -1
Lines of this file are not shown. View the raw message.
include/dm/platform_data/serial_coldfire.h +2 -2
Lines of this file are not shown. View the raw message.
include/dm/platform_data/serial_pl01x.h +1 -1
Lines of this file are not shown. View the raw message.
include/dm/platform_data/spi_coldfire.h +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
Part of the diff is not shown here. View the raw message.