dm: core: Replace of_offset with accessor
Subsystems (43)
PATCH 1/1 dm: core: Replace of_offset with accessor
At present devices use a simple integer offset to record the device tree node associated with the device. In preparation for supporting a live device tree, which uses a node pointer instead, refactor existing code to access this field through an inline function.
Signed-off-by Simon Glass <[email protected]>
---
arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 2 +- arch/nios2/cpu/cpu.c | 2 +- arch/x86/cpu/broadwell/cpu.c | 10 ++++----- arch/x86/cpu/broadwell/pch.c | 4 ++-- arch/x86/cpu/broadwell/pinctrl_broadwell.c | 4 ++-- arch/x86/cpu/broadwell/sata.c | 2 +- arch/x86/cpu/cpu_x86.c | 2 +- arch/x86/cpu/intel_common/lpc.c | 2 +- arch/x86/cpu/intel_common/mrc.c | 2 +- arch/x86/cpu/irq.c | 2 +- arch/x86/cpu/ivybridge/lpc.c | 6 +++--- arch/x86/cpu/ivybridge/model_206ax.c | 4 ++-- arch/x86/cpu/ivybridge/sata.c | 4 ++-- arch/x86/cpu/mp_init.c | 3 ++- arch/x86/lib/mpspec.c | 3 ++- arch/x86/lib/pinctrl_ich6.c | 2 +- board/qualcomm/dragonboard410c/dragonboard410c.c | 9 +++++--- doc/driver-model/README.txt | 2 +- doc/driver-model/of-plat.txt | 2 +- doc/driver-model/spi-howto.txt | 2 +- drivers/adc/adc-uclass.c | 4 ++-- drivers/clk/at91/clk-generated.c | 5 ++--- drivers/clk/at91/pmc.c | 5 +++-- drivers/clk/clk-uclass.c | 4 ++-- drivers/clk/clk_fixed_rate.c | 2 +- drivers/clk/clk_pic32.c | 5 +++-- drivers/core/device.c | 27 ++++++++++++------------ drivers/core/regmap.c | 4 ++-- drivers/core/root.c | 4 ++-- drivers/core/simple-bus.c | 2 +- drivers/core/uclass.c | 8 ++++--- drivers/demo/demo-shape.c | 2 +- drivers/demo/demo-uclass.c | 2 +- drivers/gpio/74x164_gpio.c | 2 +- drivers/gpio/altera_pio.c | 4 ++-- drivers/gpio/atmel_pio4.c | 5 +++-- drivers/gpio/dwapb_gpio.c | 6 +++--- drivers/gpio/gpio-uclass.c | 6 +++--- drivers/gpio/intel_broadwell_gpio.c | 4 ++-- drivers/gpio/intel_ich6_gpio.c | 4 ++-- drivers/gpio/lpc32xx_gpio.c | 2 +- drivers/gpio/mpc85xx_gpio.c | 8 +++---- drivers/gpio/msm_gpio.c | 4 ++-- drivers/gpio/omap_gpio.c | 2 +- drivers/gpio/pca953x_gpio.c | 2 +- drivers/gpio/pcf8575_gpio.c | 8 +++---- drivers/gpio/pic32_gpio.c | 3 ++- drivers/gpio/pm8916_gpio.c | 4 ++-- drivers/gpio/s5p_gpio.c | 4 ++-- drivers/gpio/sandbox.c | 6 +++--- drivers/gpio/sunxi_gpio.c | 2 +- drivers/gpio/tegra186_gpio.c | 2 +- drivers/gpio/tegra_gpio.c | 5 +++-- drivers/gpio/vybrid_gpio.c | 2 +- drivers/i2c/at91_i2c.c | 2 +- drivers/i2c/cros_ec_tunnel.c | 2 +- drivers/i2c/exynos_hs_i2c.c | 2 +- drivers/i2c/fsl_i2c.c | 14 ++++++------ drivers/i2c/i2c-gpio.c | 2 +- drivers/i2c/i2c-uclass.c | 7 +++--- drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +- drivers/i2c/muxes/i2c-mux-uclass.c | 4 ++-- drivers/i2c/muxes/pca954x.c | 2 +- drivers/i2c/mvtwsi.c | 6 +++--- drivers/i2c/mxc_i2c.c | 2 +- drivers/i2c/s3c24x0_i2c.c | 2 +- drivers/i2c/tegra186_bpmp_i2c.c | 2 +- drivers/input/cros_ec_keyb.c | 2 +- drivers/input/i8042.c | 2 +- drivers/input/tegra-kbc.c | 2 +- drivers/led/led_gpio.c | 2 +- drivers/mailbox/mailbox-uclass.c | 4 ++-- drivers/misc/cros_ec.c | 2 +- drivers/misc/cros_ec_sandbox.c | 4 ++-- drivers/misc/i2c_eeprom_emul.c | 4 ++-- drivers/misc/tegra186_bpmp.c | 8 +++---- drivers/misc/tegra_car.c | 4 ++-- drivers/mmc/atmel_sdhci.c | 2 +- drivers/mmc/exynos_dw_mmc.c | 2 +- drivers/mmc/fsl_esdhc.c | 2 +- drivers/mmc/msm_sdhci.c | 19 +++++++---------- drivers/mmc/omap_hsmmc.c | 2 +- drivers/mmc/pic32_sdhci.c | 6 +++--- drivers/mmc/rockchip_dw_mmc.c | 10 ++++----- drivers/mmc/rockchip_sdhci.c | 2 +- drivers/mmc/s5p_sdhci.c | 2 +- drivers/mmc/socfpga_dw_mmc.c | 8 +++---- drivers/mmc/tegra_mmc.c | 4 ++-- drivers/mmc/uniphier-sd.c | 5 +++-- drivers/mtd/altera_qspi.c | 2 +- drivers/mtd/cfi_flash.c | 2 +- drivers/mtd/pic32_flash.c | 2 +- drivers/mtd/spi/sandbox.c | 4 ++-- drivers/mtd/spi/spi_flash.c | 2 +- drivers/net/ag7xxx.c | 2 +- drivers/net/altera_tse.c | 5 +++-- drivers/net/cpsw-common.c | 4 ++-- drivers/net/cpsw.c | 4 ++-- drivers/net/designware.c | 9 ++++---- drivers/net/fec_mxc.c | 3 ++- drivers/net/gmac_rockchip.c | 4 ++-- drivers/net/keystone_net.c | 6 +++--- drivers/net/macb.c | 3 ++- drivers/net/mvneta.c | 5 +++-- drivers/net/mvpp2.c | 6 +++--- drivers/net/phy/micrel.c | 2 +- drivers/net/phy/ti.c | 6 +++--- drivers/net/phy/xilinx_phy.c | 2 +- drivers/net/pic32_eth.c | 10 +++++---- drivers/net/sandbox-raw.c | 2 +- drivers/net/sandbox.c | 5 +++-- drivers/net/sun8i_emac.c | 9 ++++---- drivers/net/tsec.c | 6 +++--- drivers/net/xilinx_axi_emac.c | 8 +++---- drivers/net/xilinx_emaclite.c | 6 +++--- drivers/net/zynq_gem.c | 11 +++++----- drivers/pci/pci-uclass.c | 9 ++++---- drivers/pci/pci_tegra.c | 2 +- drivers/pci/pcie_xilinx.c | 2 +- drivers/phy/marvell/comphy_core.c | 2 +- drivers/pinctrl/ath79/pinctrl_ar933x.c | 2 +- drivers/pinctrl/ath79/pinctrl_qca953x.c | 2 +- drivers/pinctrl/exynos/pinctrl-exynos.c | 2 +- drivers/pinctrl/meson/pinctrl-meson.c | 6 +++--- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 6 +++--- drivers/pinctrl/nxp/pinctrl-imx.c | 7 +++--- drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- drivers/pinctrl/pinctrl-generic.c | 4 ++-- drivers/pinctrl/pinctrl-uclass.c | 4 ++-- drivers/pinctrl/pinctrl_pic32.c | 4 ++-- drivers/pinctrl/rockchip/pinctrl_rk3036.c | 2 +- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 4 ++-- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 2 +- drivers/power/domain/power-domain-uclass.c | 2 +- drivers/power/pmic/act8846.c | 2 +- drivers/power/pmic/i2c_pmic_emul.c | 6 +++--- drivers/power/pmic/lp873x.c | 2 +- drivers/power/pmic/max77686.c | 2 +- drivers/power/pmic/palmas.c | 2 +- drivers/power/pmic/pfuze100.c | 2 +- drivers/power/pmic/pmic-uclass.c | 2 +- drivers/power/pmic/rk808.c | 2 +- drivers/power/pmic/s5m8767.c | 2 +- drivers/power/pmic/sandbox.c | 2 +- drivers/power/pmic/tps65090.c | 2 +- drivers/power/regulator/fixed.c | 4 ++-- drivers/power/regulator/gpio-regulator.c | 2 +- drivers/power/regulator/pwm_regulator.c | 2 +- drivers/power/regulator/regulator-uclass.c | 4 ++-- drivers/remoteproc/rproc-uclass.c | 2 +- drivers/remoteproc/ti_power_proc.c | 2 +- drivers/reset/reset-uclass.c | 4 ++-- drivers/serial/altera_uart.c | 2 +- drivers/serial/ns16550.c | 10 ++++----- drivers/serial/sandbox.c | 2 +- drivers/serial/serial_arc.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 5 +++-- drivers/serial/serial_msm.c | 6 +++--- drivers/serial/serial_mxc.c | 2 +- drivers/serial/serial_pic32.c | 3 ++- drivers/serial/serial_pl01x.c | 5 +++-- drivers/serial/serial_s5p.c | 2 +- drivers/serial/serial_sh.c | 5 +++-- drivers/serial/serial_uniphier.c | 2 +- drivers/spi/cadence_qspi.c | 2 +- drivers/spi/davinci_spi.c | 2 +- drivers/spi/designware_spi.c | 2 +- drivers/spi/exynos_spi.c | 2 +- drivers/spi/fsl_dspi.c | 2 +- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/ich.c | 6 +++--- drivers/spi/mvebu_a3700_spi.c | 4 ++-- drivers/spi/omap3_spi.c | 2 +- drivers/spi/pic32_spi.c | 10 ++++----- drivers/spi/rk_spi.c | 2 +- drivers/spi/soft_spi.c | 2 +- drivers/spi/spi-uclass.c | 7 +++--- drivers/spi/tegra114_spi.c | 2 +- drivers/spi/tegra20_sflash.c | 2 +- drivers/spi/tegra20_slink.c | 2 +- drivers/spi/tegra210_qspi.c | 2 +- drivers/spi/ti_qspi.c | 2 +- drivers/spi/zynq_qspi.c | 2 +- drivers/spi/zynq_spi.c | 2 +- drivers/spmi/spmi-msm.c | 10 +++------ drivers/sysreset/sysreset_sandbox.c | 2 +- drivers/timer/timer-uclass.c | 2 +- drivers/usb/emul/sandbox_flash.c | 4 ++-- drivers/usb/emul/sandbox_hub.c | 3 ++- drivers/usb/host/dwc2.c | 4 ++-- drivers/usb/host/ehci-exynos.c | 2 +- drivers/usb/host/ehci-fsl.c | 2 +- drivers/usb/host/ehci-tegra.c | 2 +- drivers/usb/host/ehci-vf.c | 2 +- drivers/usb/host/usb-uclass.c | 7 +++--- drivers/usb/host/xhci-exynos5.c | 2 +- drivers/usb/host/xhci-rockchip.c | 8 +++---- drivers/usb/musb-new/pic32.c | 2 +- drivers/usb/musb-new/ti-musb.c | 6 +++--- drivers/video/atmel_lcdfb.c | 2 +- drivers/video/bridge/ps862x.c | 3 ++- drivers/video/broadwell_igd.c | 2 +- drivers/video/exynos/exynos_dp.c | 2 +- drivers/video/exynos/exynos_fb.c | 4 ++-- drivers/video/ivybridge_igd.c | 2 +- drivers/video/pwm_backlight.c | 2 +- drivers/video/rockchip/rk_lvds.c | 4 ++-- drivers/video/rockchip/rk_vop.c | 2 +- drivers/video/sandbox_sdl.c | 2 +- drivers/video/tegra.c | 4 ++-- drivers/video/tegra124/display.c | 4 ++-- drivers/video/tegra124/sor.c | 6 +++--- include/dm/device.h | 10 +++++++++ test/dm/spi.c | 2 +- test/dm/test-fdt.c | 8 +++---- 215 files changed, 437 insertions(+), 400 deletions(-)
arch/arm/mach-rockchip/rk3288/sdram_rk3288.c +1 -1
@@ -1016,7 +1016,7 @@ static int rk3288_dmc_ofdata_to_platdata(struct udevice *dev)#if !CONFIG_IS_ENABLED (OF_PLATDATA )struct rk3288_sdram_params *params =dev_get_platdata (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret;/* Rk3288 supports dual-channel, set default channel num to 2 */
arch/nios2/cpu/cpu.c +1 -1
@@ -103,7 +103,7 @@ static int altera_nios2_get_count(struct udevice *dev)static int altera_nios2_probe (struct udevice *dev) {const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev); gd->cpu_clk =fdtdec_get_int (blob, node,"clock-frequency" ,0 );
arch/x86/cpu/broadwell/cpu.c +5 -5
@@ -256,8 +256,8 @@ static void initialize_vr_config(struct udevice *dev)/* Set the slow ramp rate */ msr.hi &= ~(0x3 << (53 -32 ));/* Configure the C-state exit ramp rate */ - ramp =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"intel,slow-ramp" , --1 ); + ramp =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), +"intel,slow-ramp" ,-1 );if (ramp !=-1 ) {/* Configured slow ramp rate */ msr.hi |= ((ramp &0x3 ) << (53 -32 ));
@@ -271,8 +271,8 @@ static void initialize_vr_config(struct udevice *dev) }/* Set MIN_VID (31:24) to allow CPU to have full control */ msr.lo &= ~0xff000000 ; - min_vid =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"intel,min-vid" , -0 ); + min_vid =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), +"intel,min-vid" ,0 ); msr.lo |= (min_vid &0xff ) <<24 ;msr_write (MSR_VR_MISC_CONFIG , msr);
@@ -562,7 +562,7 @@ static void configure_thermal_target(struct udevice *dev)int tcc_offset;msr_t msr; - tcc_offset =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + tcc_offset =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"intel,tcc-offset" ,0 );/* Set TCC activaiton offset if supported */
arch/x86/cpu/broadwell/pch.c +2 -2
@@ -190,14 +190,14 @@ static int pch_power_options(struct udevice *dev)debug ("Set power %s after power failure.\n" , state);/* GPE setup based on device tree configuration */ - ret =fdtdec_get_int_array (gd->fdt_blob, dev->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (dev),"intel,gpe0-en" , enable,ARRAY_SIZE (enable));if (ret)return -EINVAL ;enable_all_gpe (enable[0 ], enable[1 ], enable[2 ], enable[3 ]);/* SMI setup based on device tree configuration */ -enable_alt_smi (dev,fdtdec_get_int (gd->fdt_blob, dev->of_offset, +enable_alt_smi (dev,fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"intel,alt-gp-smi-enable" ,0 ));return 0 ;
arch/x86/cpu/broadwell/pinctrl_broadwell.c +2 -2
@@ -51,7 +51,7 @@ static int broadwell_pinctrl_read_configs(struct udevice *dev,int node;debug ("%s: starting\n" , __func__); -for (node =fdt_first_subnode (blob, dev->of_offset); +for (node =fdt_first_subnode (blob,dev_of_offset (dev)); node >0 ; node =fdt_next_subnode (blob, node)) {int phandle =fdt_get_phandle (blob, node);
@@ -115,7 +115,7 @@ static int broadwell_pinctrl_read_pins(struct udevice *dev,int count =0 ;int node; -for (node =fdt_first_subnode (blob, dev->of_offset); +for (node =fdt_first_subnode (blob,dev_of_offset (dev)); node >0 ; node =fdt_next_subnode (blob, node)) {int len, i;
arch/x86/cpu/broadwell/sata.c +1 -1
@@ -235,7 +235,7 @@ static int broadwell_sata_ofdata_to_platdata(struct udevice *dev) {struct sata_platdata *plat =dev_get_platdata (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev); plat->port_map =fdtdec_get_int (blob, node,"intel,sata-port-map" ,0 ); plat->port0_gen3_tx = fdtdec_get_int(blob, node,
arch/x86/cpu/cpu_x86.c +1 -1
@@ -17,7 +17,7 @@ int cpu_x86_bind(struct udevice *dev)struct cpu_platdata *plat =dev_get_parent_platdata (dev);struct cpuid_result res; - plat->cpu_id =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->cpu_id =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"intel,apic-id" ,-1 ); plat->family = gd->arch.x86; res =cpuid (1 );
arch/x86/cpu/intel_common/lpc.c +1 -1
@@ -50,7 +50,7 @@ int lpc_common_early_init(struct udevice *dev)int count;int i; - count =fdtdec_get_int_array_count (gd->fdt_blob, dev->of_offset, + count =fdtdec_get_int_array_count (gd->fdt_blob,dev_of_offset (dev),"intel,gen-dec" , (u32 *)values,sizeof (values) /sizeof (u32));if (count <0 )
arch/x86/cpu/intel_common/mrc.c +1 -1
@@ -149,7 +149,7 @@ int mrc_locate_spd(struct udevice *dev, int size, const void **spd_datap) spd_index =dm_gpio_get_values_as_int (desc, ret);debug ("spd index %d\n" , spd_index); - node =fdt_first_subnode (blob, dev->of_offset); + node =fdt_first_subnode (blob,dev_of_offset (dev));if (node <0 )return -EINVAL ; for (spd_node = fdt_first_subnode(blob, node);
arch/x86/cpu/irq.c +1 -1
@@ -98,7 +98,7 @@ static int create_pirq_routing_table(struct udevice *dev)int i;int ret; - node = dev->of_offset; + node =dev_of_offset (dev);/* extract the bdf from fdt_pci_addr */ priv->bdf =dm_pci_get_bdf (dev->parent);
arch/x86/cpu/ivybridge/lpc.c +3 -3
@@ -84,7 +84,7 @@ static int pch_pirq_init(struct udevice *pch) {uint8_t route[8 ], *ptr; -if (fdtdec_get_byte_array (gd->fdt_blob, pch->of_offset, +if (fdtdec_get_byte_array (gd->fdt_blob,dev_of_offset (pch),"intel,pirq-routing" , route,sizeof (route)))return -EINVAL ; ptr = route;
@@ -111,7 +111,7 @@ static int pch_gpi_routing(struct udevice *pch)u32 reg;int gpi; -if (fdtdec_get_byte_array (gd->fdt_blob, pch->of_offset, +if (fdtdec_get_byte_array (gd->fdt_blob,dev_of_offset (pch),"intel,gpi-routing" , route,sizeof (route)))return -EINVAL ;
@@ -126,7 +126,7 @@ static int pch_gpi_routing(struct udevice *pch)static int pch_power_options (struct udevice *pch) {const void *blob = gd->fdt_blob; -int node = pch->of_offset; +int node =dev_of_offset (pch);u8 reg8;u16 reg16, pmbase;u32 reg32;
arch/x86/cpu/ivybridge/model_206ax.c +2 -2
@@ -286,8 +286,8 @@ static int configure_thermal_target(struct udevice *dev)int tcc_offset;msr_t msr; - tcc_offset =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"tcc-offset" , -0 ); + tcc_offset =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), +"tcc-offset" ,0 );/* Set TCC activaiton offset if supported */ msr =msr_read (MSR_PLATFORM_INFO );
arch/x86/cpu/ivybridge/sata.c +2 -2
@@ -39,7 +39,7 @@ static void bd82x6x_sata_init(struct udevice *dev, struct udevice *pch) {unsigned int port_map, speed_support, port_tx;const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);const char *mode;u32 reg32;u16 reg16;
@@ -190,7 +190,7 @@ static void bd82x6x_sata_init(struct udevice *dev, struct udevice *pch)static void bd82x6x_sata_enable (struct udevice *dev) {const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);unsigned port_map;const char *mode;u16 map =0 ;
arch/x86/cpu/mp_init.c +2 -1
@@ -568,7 +568,8 @@ int mp_init_cpu(struct udevice *cpu, void *unused)* seq num in the uclass_resolve_seq() during device_probe(). To avoid * this, set req_seq to the reg number in the device tree in advance. */ - cpu->req_seq =fdtdec_get_int (gd->fdt_blob, cpu->of_offset,"reg" ,-1 ); + cpu->req_seq =fdtdec_get_int (gd->fdt_blob,dev_of_offset (cpu),"reg" , +-1 ); plat->ucode_version =microcode_read_rev (); plat->device_id = gd->arch.x86_device;
arch/x86/lib/mpspec.c +2 -1
@@ -304,7 +304,8 @@ static int mptable_add_intsrc(struct mp_config_table *mc, }/* Get I/O interrupt information from device tree */ - cell =fdt_getprop (blob, dev->of_offset,"intel,pirq-routing" , &len); + cell =fdt_getprop (blob,dev_of_offset (dev),"intel,pirq-routing" , + &len);if (!cell)return -ENOENT ;
arch/x86/lib/pinctrl_ich6.c +1 -1
@@ -187,7 +187,7 @@ static int ich6_pinctrl_probe(struct udevice *dev)return -EINVAL ; } -for (pin_node =fdt_first_subnode (gd->fdt_blob, dev->of_offset); +for (pin_node =fdt_first_subnode (gd->fdt_blob,dev_of_offset (dev)); pin_node >0 ; pin_node =fdt_next_subnode (gd->fdt_blob, pin_node)) {/* Configure the pin */
board/qualcomm/dragonboard410c/dragonboard410c.c +6 -3
@@ -44,7 +44,8 @@ int board_prepare_usb(enum usb_init_type type)/* Try to request gpios needed to start usb host on dragonboard */ if (!dm_gpio_is_valid (&hub_reset)) { - node =fdt_subnode_offset (gd->fdt_blob, pmic_gpio->of_offset, + node =fdt_subnode_offset (gd->fdt_blob, +dev_of_offset (pmic_gpio),"usb_hub_reset_pm" );if (node <0 ) {printf ("Failed to find usb_hub_reset_pm dt node.\n" );
@@ -59,7 +60,8 @@ int board_prepare_usb(enum usb_init_type type) }if (!dm_gpio_is_valid (&usb_sel)) { - node =fdt_subnode_offset (gd->fdt_blob, pmic_gpio->of_offset, + node =fdt_subnode_offset (gd->fdt_blob, +dev_of_offset (pmic_gpio),"usb_sw_sel_pm" );if (node <0 ) {printf ("Failed to find usb_sw_sel_pm dt node.\n" );
@@ -110,7 +112,8 @@ int misc_init_r(void)return 0 ; } - node =fdt_subnode_offset (gd->fdt_blob, pon->of_offset,"key_vol_down" ); + node =fdt_subnode_offset (gd->fdt_blob,dev_of_offset (pon), +"key_vol_down" );if (node <0 ) {printf ("Failed to find key_vol_down node. Check device tree\n" );return 0 ;
doc/driver-model/README.txt +1 -1
@@ -684,7 +684,7 @@ steps (see device_probe()): g. If the driver provides an ofdata_to_platdata() method, then this is called to convert the device tree data into platform data. This should - do various calls like fdtdec_get_int(gd->fdt_blob, dev->of_offset, ...) + do various calls like fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), ...) to access the node and store the resulting information into dev->platdata. After this point, the device works the same way whether it was bound using a device tree node or U_BOOT_DEVICE() structure. In either case,
doc/driver-model/of-plat.txt +1 -1
@@ -205,7 +205,7 @@ For example: /* Decode the device tree data */ struct mmc_platdata *plat = dev_get_platdata(dev); const void *blob = gd->fdt_blob; - int node = dev->of_offset; + int node = dev_of_offset(dev); plat->fifo_depth = fdtdec_get_int(blob, node, "fifo-depth", 0); #endif
doc/driver-model/spi-howto.txt +1 -1
@@ -223,7 +223,7 @@ static int exynos_spi_ofdata_to_platdata(struct udevice *bus) { struct exynos_spi_platdata *plat = bus->platdata; const void *blob = gd->fdt_blob; - int node = bus->of_offset; + int node = dev_of_offset(bus); plat->regs = (struct exynos_spi *)fdtdec_get_addr(blob, node, "reg"); plat->periph_id = pinmux_decode_periph_id(blob, node);
drivers/adc/adc-uclass.c +2 -2
@@ -345,7 +345,7 @@ nodev:static int adc_vdd_platdata_set (struct udevice *dev) {struct adc_uclass_platdata *uc_pdata =dev_get_uclass_platdata (dev); -int ret, offset = dev->of_offset; +int ret, offset =dev_of_offset (dev);const void *fdt = gd->fdt_blob;char *prop;
@@ -366,7 +366,7 @@ static int adc_vdd_platdata_set(struct udevice *dev)static int adc_vss_platdata_set (struct udevice *dev) {struct adc_uclass_platdata *uc_pdata =dev_get_uclass_platdata (dev); -int ret, offset = dev->of_offset; +int ret, offset =dev_of_offset (dev);const void *fdt = gd->fdt_blob;char *prop;
drivers/clk/at91/clk-generated.c +2 -3
@@ -154,9 +154,8 @@ static int generic_clk_ofdata_to_platdata(struct udevice *dev)u32 num_parents; num_parents =fdtdec_get_int_array_count (gd->fdt_blob, -dev_get_parent (dev)->of_offset, -"clocks" , cells, -GENERATED_SOURCE_MAX ); +dev_of_offset (dev_get_parent (dev)),"clocks" , cells, +GENERATED_SOURCE_MAX );if (!num_parents)return -1 ;
drivers/clk/at91/pmc.c +3 -2
@@ -47,7 +47,7 @@ int at91_pmc_core_probe(struct udevice *dev)int at91_clk_sub_device_bind (struct udevice *dev,const char *drv_name) {const void *fdt = gd->fdt_blob; -int offset = dev->of_offset; +int offset =dev_of_offset (dev);bool pre_reloc_only = !(gd->flags &GD_FLG_RELOC );const char *name;int ret;
@@ -90,7 +90,8 @@ int at91_clk_of_xlate(struct clk *clk, struct fdtdec_phandle_args *args)return -EINVAL ; } - periph =fdtdec_get_uint (gd->fdt_blob, clk->dev->of_offset,"reg" ,-1 ); + periph =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (clk->dev),"reg" , +-1 );if (periph <0 )return -EINVAL ;
drivers/clk/clk-uclass.c +2 -2
@@ -65,7 +65,7 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)debug ("%s(dev=%p, index=%d, clk=%p)\n" , __func__, dev, index, clk);assert (clk); - ret =fdtdec_parse_phandle_with_args (gd->fdt_blob, dev->of_offset, + ret =fdtdec_parse_phandle_with_args (gd->fdt_blob,dev_of_offset (dev),"clocks" ,"#clock-cells" ,0 , index, &args);if (ret) {
@@ -104,7 +104,7 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)debug ("%s(dev=%p, name=%s, clk=%p)\n" , __func__, dev, name, clk); - index =fdt_stringlist_search (gd->fdt_blob, dev->of_offset, + index =fdt_stringlist_search (gd->fdt_blob,dev_of_offset (dev),"clock-names" , name);if (index <0 ) {debug ("fdt_stringlist_search() failed: %d\n" , index);
drivers/clk/clk_fixed_rate.c +1 -1
@@ -32,7 +32,7 @@ static int clk_fixed_rate_ofdata_to_platdata(struct udevice *dev) {#if !CONFIG_IS_ENABLED (OF_PLATDATA )to_clk_fixed_rate (dev)->fixed_rate = -fdtdec_get_int (gd->fdt_blob, dev->of_offset, +fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock-frequency" ,0 );#endif
drivers/clk/clk_pic32.c +3 -2
@@ -330,7 +330,7 @@ static void pic32_clk_init(struct udevice *dev)for (i =REF1CLK ; i <=REF5CLK ; i++) {snprintf (propname,sizeof (propname),"microchip,refo%d-frequency" , i -REF1CLK +1 ); - rate =fdtdec_get_int (blob, dev->of_offset, propname,0 ); + rate =fdtdec_get_int (blob,dev_of_offset (dev), propname,0 );if (rate)pic32_set_refclk (priv, i, pll_hz, rate,ROCLK_SRC_SPLL ); }
@@ -393,7 +393,8 @@ static int pic32_clk_probe(struct udevice *dev)fdt_addr_t addr;fdt_size_t size; - addr =fdtdec_get_addr_size (gd->fdt_blob, dev->of_offset,"reg" , &size); + addr =fdtdec_get_addr_size (gd->fdt_blob,dev_of_offset (dev),"reg" , + &size);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ;
drivers/core/device.c +14 -13
@@ -355,7 +355,7 @@ int device_probe(struct udevice *dev) goto fail; } -if (drv->ofdata_to_platdata && dev->of_offset >=0 ) { +if (drv->ofdata_to_platdata &&dev_of_offset (dev) >=0 ) { ret = drv->ofdata_to_platdata (dev);if (ret) goto fail;
@@ -524,7 +524,7 @@ int device_find_child_by_of_offset(struct udevice *parent, int of_offset, *devp =NULL ;list_for_each_entry (dev, &parent->child_head, sibling_node) { -if (dev->of_offset == of_offset) { +if (dev_of_offset (dev) == of_offset) { *devp = dev;return 0 ; }
@@ -549,7 +549,7 @@ static struct udevice *_device_find_global_by_of_offset(struct udevice *parent, {struct udevice *dev, *found; -if (parent->of_offset == of_offset) +if (dev_of_offset (parent) == of_offset)return parent;list_for_each_entry (dev, &parent->child_head, sibling_node) {
@@ -637,19 +637,21 @@ fdt_addr_t dev_get_addr_index(struct udevice *dev, int index)int len =0 ;int na, ns; - na =fdt_address_cells (gd->fdt_blob, dev->parent->of_offset); + na =fdt_address_cells (gd->fdt_blob, +dev_of_offset (dev->parent));if (na <1 ) {debug ("bad #address-cells\n" );return FDT_ADDR_T_NONE ; } - ns =fdt_size_cells (gd->fdt_blob, dev->parent->of_offset); + ns =fdt_size_cells (gd->fdt_blob,dev_of_offset (dev->parent));if (ns <0 ) {debug ("bad #size-cells\n" );return FDT_ADDR_T_NONE ; } - reg =fdt_getprop (gd->fdt_blob, dev->of_offset,"reg" , &len); + reg =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"reg" , + &len);if (!reg || (len <= (index *sizeof (fdt32_t) * (na + ns)))) {debug ("Req index out of range\n" );return FDT_ADDR_T_NONE ;
@@ -662,16 +664,15 @@ fdt_addr_t dev_get_addr_index(struct udevice *dev, int index)* bus setups. */ addr =fdt_translate_address ((void *)gd->fdt_blob, - dev->of_offset, reg); +dev_of_offset (dev), reg); }else {/* * Use the "simple" translate function for less complex * bus setups. */ addr =fdtdec_get_addr_size_auto_parent (gd->fdt_blob, - dev->parent->of_offset, - dev->of_offset,"reg" , - index,NULL , false); +dev_of_offset (dev->parent),dev_of_offset (dev), +"reg" , index,NULL , false);if (CONFIG_IS_ENABLED (SIMPLE_BUS ) && addr !=FDT_ADDR_T_NONE ) {if (device_get_uclass_id (dev->parent) ==UCLASS_SIMPLE_BUS )
@@ -702,7 +703,7 @@ fdt_addr_t dev_get_addr_size_index(struct udevice *dev, int index,* next call to the exisiting dev_get_xxx function which handles * all config options. */ -fdtdec_get_addr_size_auto_noparent (gd->fdt_blob, dev->of_offset, +fdtdec_get_addr_size_auto_noparent (gd->fdt_blob,dev_of_offset (dev),"reg" , index, size, false);/*
@@ -720,7 +721,7 @@ fdt_addr_t dev_get_addr_name(struct udevice *dev, const char *name)#if CONFIG_IS_ENABLED (OF_CONTROL )int index; - index =fdt_stringlist_search (gd->fdt_blob, dev->of_offset, + index =fdt_stringlist_search (gd->fdt_blob,dev_of_offset (dev),"reg-names" , name);if (index <0 )return index;
@@ -799,7 +800,7 @@ bool of_device_is_compatible(struct udevice *dev, const char *compat) {const void *fdt = gd->fdt_blob; -return !fdt_node_check_compatible (fdt, dev->of_offset, compat); +return !fdt_node_check_compatible (fdt,dev_of_offset (dev), compat); }bool of_machine_is_compatible (const char *compat)
drivers/core/regmap.c +2 -2
@@ -71,12 +71,12 @@ int regmap_init_mem(struct udevice *dev, struct regmap **mapp)int parent;int len; - parent = dev->parent->of_offset; + parent =dev_of_offset (dev->parent); addr_len =fdt_address_cells (blob, parent); size_len =fdt_size_cells (blob, parent); both_len = addr_len + size_len; - cell =fdt_getprop (blob, dev->of_offset,"reg" , &len); + cell =fdt_getprop (blob,dev_of_offset (dev),"reg" , &len); len /=sizeof (*cell); count = len / both_len;if (!cell || !count)
drivers/core/root.c +2 -2
@@ -227,10 +227,10 @@ int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,int dm_scan_fdt_dev (struct udevice *dev) { -if (dev->of_offset ==-1 ) +if (dev_of_offset (dev) ==-1 )return 0 ; -return dm_scan_fdt_node (dev, gd->fdt_blob, dev->of_offset, +return dm_scan_fdt_node (dev, gd->fdt_blob,dev_of_offset (dev), gd->flags &GD_FLG_RELOC ? false : true); }
drivers/core/simple-bus.c +1 -1
@@ -30,7 +30,7 @@ static int simple_bus_post_bind(struct udevice *dev)u32 cell[3 ];int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, dev->of_offset,"ranges" , + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (dev),"ranges" , cell,ARRAY_SIZE (cell));if (!ret) {struct simple_bus_plat *plat =dev_get_uclass_platdata (dev);
drivers/core/uclass.c +5 -3
@@ -278,7 +278,7 @@ int uclass_find_device_by_of_offset(enum uclass_id id, int node,return ret;list_for_each_entry (dev, &uc->dev_head, uclass_node) { -if (dev->of_offset == node) { +if (dev_of_offset (dev) == node) { *devp = dev;return 0 ; }
@@ -299,7 +299,7 @@ static int uclass_find_device_by_phandle(enum uclass_id id,int ret; *devp =NULL ; - find_phandle =fdtdec_get_int (gd->fdt_blob, parent->of_offset, name, + find_phandle =fdtdec_get_int (gd->fdt_blob,dev_of_offset (parent), name,-1 );if (find_phandle <=0 )return -ENOENT ;
@@ -308,7 +308,9 @@ static int uclass_find_device_by_phandle(enum uclass_id id,return ret;list_for_each_entry (dev, &uc->dev_head, uclass_node) { -uint phandle =fdt_get_phandle (gd->fdt_blob, dev->of_offset); +uint phandle; + + phandle =fdt_get_phandle (gd->fdt_blob,dev_of_offset (dev));if (phandle == find_phandle) { *devp = dev;
drivers/demo/demo-shape.c +1 -1
@@ -151,7 +151,7 @@ static int shape_ofdata_to_platdata(struct udevice *dev)return ret;/* Parse the data that only we need */ - pdata->default_char =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + pdata->default_char =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"character" ,'@' );return 0 ;
drivers/demo/demo-uclass.c +1 -1
@@ -66,7 +66,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); -int dn = dev->of_offset; +int dn =dev_of_offset (dev); pdata->sides =fdtdec_get_int (gd->fdt_blob, dn,"sides" ,0 ); pdata->colour =fdt_getprop (gd->fdt_blob, dn,"colour" ,NULL );
drivers/gpio/74x164_gpio.c +1 -1
@@ -130,7 +130,7 @@ static int gen_74x164_probe(struct udevice *dev)char *str, name[32 ];int ret;const void *fdt = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);snprintf (name,sizeof (name),"%s_" , dev->name); str =strdup (name);
drivers/gpio/altera_pio.c +2 -2
@@ -92,9 +92,9 @@ static int altera_pio_ofdata_to_platdata(struct udevice *dev) plat->regs =map_physmem (dev_get_addr (dev),sizeof (struct altera_pio_regs ),MAP_NOCACHE ); - plat->gpio_count =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->gpio_count =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"altr,gpio-bank-width" ,32 ); - plat->bank_name =fdt_getprop (gd->fdt_blob, dev->of_offset, + plat->bank_name =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"gpio-bank-name" ,NULL );return 0 ;
drivers/gpio/atmel_pio4.c +3 -2
@@ -276,7 +276,7 @@ static const struct dm_gpio_ops atmel_pio4_ops = {static int atmel_pio4_bind (struct udevice *dev) { -return dm_scan_fdt_node (dev, gd->fdt_blob, dev->of_offset, false); +return dm_scan_fdt_node (dev, gd->fdt_blob,dev_of_offset (dev), false); }static int atmel_pio4_probe (struct udevice *dev)
@@ -308,7 +308,8 @@ static int atmel_pio4_probe(struct udevice *dev) pioctrl_data = (struct atmel_pioctrl_data *)dev_get_driver_data (dev); nbanks = pioctrl_data->nbanks; - uc_priv->bank_name =fdt_get_name (gd->fdt_blob, dev->of_offset,NULL ); + uc_priv->bank_name =fdt_get_name (gd->fdt_blob,dev_of_offset (dev), +NULL ); uc_priv->gpio_count = nbanks *ATMEL_PIO_NPINS_PER_BANK ;return 0 ;
drivers/gpio/dwapb_gpio.c +3 -3
@@ -112,13 +112,13 @@ static int gpio_dwapb_bind(struct udevice *dev)if (plat)return 0 ; - base =fdtdec_get_addr (blob, dev->of_offset,"reg" ); + base =fdtdec_get_addr (blob,dev_of_offset (dev),"reg" );if (base ==FDT_ADDR_T_NONE ) {debug ("Can't get the GPIO register base address\n" );return -ENXIO ; } -for (node =fdt_first_subnode (blob, dev->of_offset); +for (node =fdt_first_subnode (blob,dev_of_offset (dev)); node >0 ; node =fdt_next_subnode (blob, node)) {if (!fdtdec_get_bool (blob, node,"gpio-controller" ))
@@ -142,7 +142,7 @@ static int gpio_dwapb_bind(struct udevice *dev)if (ret) goto err; - subdev->of_offset = node; +dev_set_of_offset (subdev, node); bank++; }
drivers/gpio/gpio-uclass.c +3 -3
@@ -707,7 +707,7 @@ int gpio_request_by_name(struct udevice *dev, const char *list_name, int index,* calls in gpio_request_by_name(), but we can do this until * gpio_request_by_name_nodev() can be dropped. */ -return gpio_request_by_name_nodev (gd->fdt_blob, dev->of_offset, +return gpio_request_by_name_nodev (gd->fdt_blob,dev_of_offset (dev), list_name, index, desc, flags); }
@@ -746,7 +746,7 @@ int gpio_request_list_by_name(struct udevice *dev, const char *list_name,* calls in gpio_request_by_name(), but we can do this until * gpio_request_list_by_name_nodev() can be dropped. */ -return gpio_request_list_by_name_nodev (gd->fdt_blob, dev->of_offset, +return gpio_request_list_by_name_nodev (gd->fdt_blob,dev_of_offset (dev), list_name, desc, max_count, flags); }
@@ -755,7 +755,7 @@ int gpio_get_list_count(struct udevice *dev, const char *list_name) {int ret; - ret =fdtdec_parse_phandle_with_args (gd->fdt_blob, dev->of_offset, + ret =fdtdec_parse_phandle_with_args (gd->fdt_blob,dev_of_offset (dev), list_name,"#gpio-cells" ,0 ,-1 ,NULL );if (ret) {
drivers/gpio/intel_broadwell_gpio.c +2 -2
@@ -149,14 +149,14 @@ static int broadwell_gpio_ofdata_to_platdata(struct udevice *dev)if (ret)return ret; - bank =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"reg" ,-1 ); + bank =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg" ,-1 );if (bank ==-1 ) {debug ("%s: Invalid bank number %d\n" , __func__, bank);return -EINVAL ; } plat->bank = bank; plat->base_addr = gpiobase; - plat->bank_name =fdt_getprop (gd->fdt_blob, dev->of_offset, + plat->bank_name =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"bank-name" ,NULL );return 0 ;
drivers/gpio/intel_ich6_gpio.c +2 -2
@@ -94,14 +94,14 @@ static int gpio_ich6_ofdata_to_platdata(struct udevice *dev)if (ret)return ret; - offset =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"reg" ,-1 ); + offset =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg" ,-1 );if (offset ==-1 ) {debug ("%s: Invalid register offset %d\n" , __func__, offset);return -EINVAL ; } plat->offset = offset; plat->base_addr = gpiobase + offset; - plat->bank_name =fdt_getprop (gd->fdt_blob, dev->of_offset, + plat->bank_name =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"bank-name" ,NULL );return 0 ;
drivers/gpio/lpc32xx_gpio.c +1 -1
@@ -297,7 +297,7 @@ static int lpc32xx_gpio_probe(struct udevice *dev)struct lpc32xx_gpio_priv *gpio_priv =dev_get_priv (dev);struct gpio_dev_priv *uc_priv = dev->uclass_priv; -if (dev->of_offset ==-1 ) { +if (dev_of_offset (dev) ==-1 ) {/* Tell the uclass how many GPIOs we have */ uc_priv->gpio_count =LPC32XX_GPIOS ; }
drivers/gpio/mpc85xx_gpio.c +4 -4
@@ -169,13 +169,13 @@ static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev) {fdt_addr_t addr;fdt_size_t size; - addr =fdtdec_get_addr_size_auto_noparent (gd->fdt_blob, dev->of_offset, -"reg" ,0 , &size, false); + addr =fdtdec_get_addr_size_auto_noparent (gd->fdt_blob, +dev_of_offset (dev),"reg" ,0 , &size, false); plat->addr = addr; plat->size = size; - plat->ngpios =fdtdec_get_int (gd->fdt_blob, dev->of_offset, -"ngpios" ,32 ); + plat->ngpios =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), +"ngpios" ,32 );return 0 ; }
drivers/gpio/msm_gpio.c +2 -2
@@ -106,9 +106,9 @@ static int msm_gpio_ofdata_to_platdata(struct udevice *dev) {struct gpio_dev_priv *uc_priv =dev_get_uclass_priv (dev); - uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"gpio-count" ,0 ); - uc_priv->bank_name =fdt_getprop (gd->fdt_blob, dev->of_offset, + uc_priv->bank_name =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"gpio-bank-name" ,NULL );if (uc_priv->bank_name ==NULL ) uc_priv->bank_name ="soc" ;
drivers/gpio/omap_gpio.c +1 -1
@@ -320,7 +320,7 @@ static int omap_gpio_bind(struct udevice *dev)return -ENOMEM ; plat->base = base_addr; - plat->port_name =fdt_get_name (gd->fdt_blob, dev->of_offset,NULL ); + plat->port_name =fdt_get_name (gd->fdt_blob,dev_of_offset (dev),NULL ); dev->platdata = plat;return 0 ;
drivers/gpio/pca953x_gpio.c +1 -1
@@ -265,7 +265,7 @@ static int pca953x_probe(struct udevice *dev)return -ENODEV ; } - addr =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"reg" ,0 ); + addr =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg" ,0 );if (addr ==0 )return -ENODEV ;
drivers/gpio/pcf8575_gpio.c +4 -4
@@ -131,15 +131,15 @@ static int pcf8575_ofdata_platdata(struct udevice *dev)int n_latch; - uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"gpio-count" ,16 ); - uc_priv->bank_name =fdt_getprop (gd->fdt_blob, dev->of_offset, + uc_priv->bank_name =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"gpio-bank-name" ,NULL );if (!uc_priv->bank_name) uc_priv->bank_name =fdt_get_name (gd->fdt_blob, - dev->of_offset,NULL ); +dev_of_offset (dev),NULL ); - n_latch =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + n_latch =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"lines-initial-states" ,0 ); plat->out = ~n_latch;
drivers/gpio/pic32_gpio.c +2 -1
@@ -133,7 +133,8 @@ static int pic32_gpio_probe(struct udevice *dev)char *end;int bank; - addr =fdtdec_get_addr_size (gd->fdt_blob, dev->of_offset,"reg" , &size); + addr =fdtdec_get_addr_size (gd->fdt_blob,dev_of_offset (dev),"reg" , + &size);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ;
drivers/gpio/pm8916_gpio.c +2 -2
@@ -193,9 +193,9 @@ static int pm8916_gpio_ofdata_to_platdata(struct udevice *dev) {struct gpio_dev_priv *uc_priv =dev_get_uclass_priv (dev); - uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"gpio-count" ,0 ); - uc_priv->bank_name =fdt_getprop (gd->fdt_blob, dev->of_offset, + uc_priv->bank_name =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"gpio-bank-name" ,NULL );if (uc_priv->bank_name ==NULL ) uc_priv->bank_name ="pm8916" ;
drivers/gpio/s5p_gpio.c +2 -2
@@ -317,7 +317,7 @@ static int gpio_exynos_bind(struct udevice *parent)return 0 ; base = (struct s5p_gpio_bank *)dev_get_addr (parent); -for (node =fdt_first_subnode (blob, parent->of_offset), bank = base; +for (node =fdt_first_subnode (blob,dev_of_offset (parent)), bank = base; node >0 ; node =fdt_next_subnode (blob, node), bank++) {struct exynos_gpio_platdata *plat;
@@ -337,7 +337,7 @@ static int gpio_exynos_bind(struct udevice *parent)if (ret)return ret; - dev->of_offset = node; +dev_set_of_offset (dev, node); reg =dev_get_addr (dev);if (reg !=FDT_ADDR_T_NONE )
drivers/gpio/sandbox.c +3 -3
@@ -197,9 +197,9 @@ static int sandbox_gpio_ofdata_to_platdata(struct udevice *dev) {struct gpio_dev_priv *uc_priv =dev_get_uclass_priv (dev); - uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + uc_priv->gpio_count =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"num-gpios" ,0 ); - uc_priv->bank_name =fdt_getprop (gd->fdt_blob, dev->of_offset, + uc_priv->bank_name =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"gpio-bank-name" ,NULL );return 0 ;
@@ -209,7 +209,7 @@ static int gpio_sandbox_probe(struct udevice *dev) {struct gpio_dev_priv *uc_priv =dev_get_uclass_priv (dev); -if (dev->of_offset ==-1 ) { +if (dev_of_offset (dev) ==-1 ) {/* Tell the uclass how many GPIOs we have */ uc_priv->gpio_count =CONFIG_SANDBOX_GPIO_COUNT ; }
drivers/gpio/sunxi_gpio.c +1 -1
@@ -312,7 +312,7 @@ static int gpio_sunxi_bind(struct udevice *parent) plat->bank_name, plat, -1, &dev);if (ret)return ret; - dev->of_offset = parent->of_offset; +dev_set_of_offset (dev,dev_of_offset (parent)); }return 0 ;
drivers/gpio/tegra186_gpio.c +1 -1
@@ -197,7 +197,7 @@ static int tegra186_gpio_bind(struct udevice *parent) -1, &dev);if (ret)return ret; - dev->of_offset = parent->of_offset; +dev_set_of_offset (dev,dev_of_offset (parent)); }return 0 ;
drivers/gpio/tegra_gpio.c +3 -2
@@ -337,7 +337,8 @@ static int gpio_tegra_bind(struct udevice *parent)* This driver does not make use of interrupts, other than to figure * out the number of GPIO banks */ -if (!fdt_getprop (gd->fdt_blob, parent->of_offset,"interrupts" , &len)) +if (!fdt_getprop (gd->fdt_blob,dev_of_offset (parent),"interrupts" , + &len))return -EINVAL ; bank_count = len /3 /sizeof (u32); ctlr = (struct gpio_ctlr *)dev_get_addr (parent);
@@ -363,7 +364,7 @@ static int gpio_tegra_bind(struct udevice *parent) plat->port_name, plat, -1, &dev);if (ret)return ret; - dev->of_offset = parent->of_offset; +dev_set_of_offset (dev,dev_of_offset (parent)); } }
drivers/gpio/vybrid_gpio.c +1 -1
@@ -129,7 +129,7 @@ static int vybrid_gpio_bind(struct udevice *dev) plat->base = base_addr; plat->chip = dev->req_seq; - plat->port_name =fdt_get_name (gd->fdt_blob, dev->of_offset,NULL ); + plat->port_name =fdt_get_name (gd->fdt_blob,dev_of_offset (dev),NULL ); dev->platdata = plat;return 0 ;
drivers/i2c/at91_i2c.c +1 -1
@@ -242,7 +242,7 @@ static int at91_i2c_ofdata_to_platdata(struct udevice *dev) {const void *blob = gd->fdt_blob;struct at91_i2c_bus *bus =dev_get_priv (dev); -int node = dev->of_offset; +int node =dev_of_offset (dev); bus->regs = (struct at91_i2c_regs *)dev_get_addr (dev); bus->pdata = (struct at91_i2c_pdata *)dev_get_driver_data (dev);
drivers/i2c/cros_ec_tunnel.c +1 -1
@@ -34,7 +34,7 @@ static int cros_ec_i2c_ofdata_to_platdata(struct udevice *dev) {struct cros_ec_i2c_bus *i2c_bus =dev_get_priv (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev); i2c_bus->remote_bus =fdtdec_get_uint (blob, node,"google,remote-bus" ,0 );
drivers/i2c/exynos_hs_i2c.c +1 -1
@@ -522,7 +522,7 @@ static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)struct s3c24x0_i2c_bus *i2c_bus =dev_get_priv (dev);int node; - node = dev->of_offset; + node =dev_of_offset (dev); i2c_bus->hsregs = (struct exynos5_hsi2c *)dev_get_addr (dev);
drivers/i2c/fsl_i2c.c +7 -7
@@ -585,21 +585,21 @@ static int fsl_i2c_ofdata_to_platdata(struct udevice *bus)struct fsl_i2c_dev *dev =dev_get_priv (bus);fdt_addr_t addr;fdt_size_t size; +int node =dev_of_offset (bus); - addr =fdtdec_get_addr_size_auto_noparent (gd->fdt_blob, bus->of_offset, -"reg" ,0 , &size, false); + addr =fdtdec_get_addr_size_auto_noparent (gd->fdt_blob, node,"reg" ,0 , + &size, false); dev->base =map_sysmem (CONFIG_SYS_IMMR + addr, size);if (!dev->base)return -ENOMEM ; - dev->index =fdtdec_get_int (gd->fdt_blob, bus->of_offset, -"cell-index" ,-1 ); - dev->slaveadd =fdtdec_get_int (gd->fdt_blob, bus->of_offset, + dev->index =fdtdec_get_int (gd->fdt_blob, node,"cell-index" ,-1 ); + dev->slaveadd =fdtdec_get_int (gd->fdt_blob, node,"u-boot,i2c-slave-addr" ,0x7f ); - dev->speed =fdtdec_get_int (gd->fdt_blob, bus->of_offset, -"clock-frequency" ,400000 ); + dev->speed =fdtdec_get_int (gd->fdt_blob, node,"clock-frequency" , +400000 ); dev->i2c_clk = dev->index ? gd->arch.i2c2_clk : gd->arch.i2c1_clk;
drivers/i2c/i2c-gpio.c +1 -1
@@ -309,7 +309,7 @@ static int i2c_gpio_ofdata_to_platdata(struct udevice *dev) {struct i2c_gpio_bus *bus =dev_get_priv (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret; ret = gpio_request_list_by_name(dev, "gpios", bus->gpios,
drivers/i2c/i2c-uclass.c +4 -3
@@ -489,7 +489,7 @@ static int i2c_post_probe(struct udevice *dev)#if CONFIG_IS_ENABLED (OF_CONTROL )struct dm_i2c_bus *i2c =dev_get_uclass_priv (dev); - i2c->speed_hz =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + i2c->speed_hz =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock-frequency" ,100000 );return dm_i2c_set_bus_speed (dev, i2c->speed_hz);
@@ -503,10 +503,11 @@ static int i2c_child_post_bind(struct udevice *dev)#if CONFIG_IS_ENABLED (OF_CONTROL )struct dm_i2c_chip *plat =dev_get_parent_platdata (dev); -if (dev->of_offset ==-1 ) +if (dev_of_offset (dev) ==-1 )return 0 ; -return i2c_chip_ofdata_to_platdata (gd->fdt_blob, dev->of_offset, plat); +return i2c_chip_ofdata_to_platdata (gd->fdt_blob,dev_of_offset (dev), + plat);#else return 0 ;#endif
drivers/i2c/muxes/i2c-arb-gpio-challenge.c +1 -1
@@ -89,7 +89,7 @@ static int i2c_arbitrator_probe(struct udevice *dev) {struct i2c_arbitrator_priv *priv =dev_get_priv (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret;debug ("%s: %s\n" , __func__, dev->name);
drivers/i2c/muxes/i2c-mux-uclass.c +2 -2
@@ -40,7 +40,7 @@ static int i2c_mux_child_post_bind(struct udevice *dev)struct i2c_mux_bus *plat =dev_get_parent_platdata (dev);int channel; - channel =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"reg" ,-1 ); + channel =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg" ,-1 );if (channel <0 )return -EINVAL ; plat->channel = channel;
@@ -60,7 +60,7 @@ static int i2c_mux_post_bind(struct udevice *mux)* There is no compatible string in the sub-nodes, so we must manually * bind these */ -for (offset =fdt_first_subnode (blob, mux->of_offset); +for (offset =fdt_first_subnode (blob,dev_of_offset (mux)); offset >0 ; offset =fdt_next_subnode (blob, offset)) {struct udevice *dev;
drivers/i2c/muxes/pca954x.c +1 -1
@@ -51,7 +51,7 @@ static int pca954x_ofdata_to_platdata(struct udevice *dev) {struct pca954x_priv *priv =dev_get_priv (dev); - priv->addr =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"reg" ,0 ); + priv->addr =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg" ,0 );if (!priv->addr) {debug ("MUX not found\n" );return -ENODEV ;
drivers/i2c/mvtwsi.c +3 -3
@@ -775,11 +775,11 @@ static int mvtwsi_i2c_ofdata_to_platdata(struct udevice *bus)if (!dev->base)return -ENOMEM ; - dev->index =fdtdec_get_int (gd->fdt_blob, bus->of_offset, + dev->index =fdtdec_get_int (gd->fdt_blob,dev_of_offset (bus),"cell-index" ,-1 ); - dev->slaveadd =fdtdec_get_int (gd->fdt_blob, bus->of_offset, + dev->slaveadd =fdtdec_get_int (gd->fdt_blob,dev_of_offset (bus),"u-boot,i2c-slave-addr" ,0x0 ); - dev->speed =fdtdec_get_int (gd->fdt_blob, bus->of_offset, + dev->speed =fdtdec_get_int (gd->fdt_blob,dev_of_offset (bus),"clock-frequency" ,100000 );return 0 ; }
drivers/i2c/mxc_i2c.c +1 -1
@@ -750,7 +750,7 @@ static int mxc_i2c_probe(struct udevice *bus) {struct mxc_i2c_bus *i2c_bus =dev_get_priv (bus);const void *fdt = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus);fdt_addr_t addr;int ret, ret2;
drivers/i2c/s3c24x0_i2c.c +1 -1
@@ -306,7 +306,7 @@ static int s3c_i2c_ofdata_to_platdata(struct udevice *dev)struct s3c24x0_i2c_bus *i2c_bus =dev_get_priv (dev);int node; - node = dev->of_offset; + node =dev_of_offset (dev); i2c_bus->regs = (struct s3c24x0_i2c *)dev_get_addr (dev);
drivers/i2c/tegra186_bpmp_i2c.c +1 -1
@@ -90,7 +90,7 @@ static int tegra186_bpmp_i2c_probe(struct udevice *dev) {struct tegra186_bpmp_i2c *priv =dev_get_priv (dev); - priv->bpmp_bus_id =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + priv->bpmp_bus_id =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"nvidia,bpmp-bus-id" ,U32_MAX );if (priv->bpmp_bus_id ==U32_MAX ) {debug ("%s: could not parse nvidia,bpmp-bus-id\n" , __func__);
drivers/input/cros_ec_keyb.c +1 -1
@@ -189,7 +189,7 @@ static int cros_ec_kbd_probe(struct udevice *dev)struct stdio_dev *sdev = &uc_priv->sdev;struct input_config *input = &uc_priv->input;const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret;if (cros_ec_keyb_decode_fdt (blob, node, priv))
drivers/input/i8042.c +1 -1
@@ -315,7 +315,7 @@ static int i8042_kbd_probe(struct udevice *dev)struct input_config *input = &uc_priv->input;int ret; -if (fdtdec_get_bool (gd->fdt_blob, dev->of_offset, +if (fdtdec_get_bool (gd->fdt_blob,dev_of_offset (dev),"intel,duplicate-por" )) priv->quirks |=QUIRK_DUP_POR ;
drivers/input/tegra-kbc.c +1 -1
@@ -290,7 +290,7 @@ static int tegra_kbd_probe(struct udevice *dev)struct keyboard_priv *uc_priv =dev_get_uclass_priv (dev);struct stdio_dev *sdev = &uc_priv->sdev;struct input_config *input = &uc_priv->input; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret; priv->kbc = (struct kbc_tegra *)dev_get_addr (dev);
drivers/led/led_gpio.c +1 -1
@@ -62,7 +62,7 @@ static int led_gpio_bind(struct udevice *parent)int node;int ret; -for (node =fdt_first_subnode (blob, parent->of_offset); +for (node =fdt_first_subnode (blob,dev_of_offset (parent)); node >0 ; node =fdt_next_subnode (blob, node)) {struct led_uclass_plat *uc_plat;
drivers/mailbox/mailbox-uclass.c +2 -2
@@ -41,7 +41,7 @@ int mbox_get_by_index(struct udevice *dev, int index, struct mbox_chan *chan)debug ("%s(dev=%p, index=%d, chan=%p)\n" , __func__, dev, index, chan); - ret =fdtdec_parse_phandle_with_args (gd->fdt_blob, dev->of_offset, + ret =fdtdec_parse_phandle_with_args (gd->fdt_blob,dev_of_offset (dev),"mboxes" ,"#mbox-cells" ,0 , index, &args);if (ret) {
@@ -85,7 +85,7 @@ int mbox_get_by_name(struct udevice *dev, const char *name,debug ("%s(dev=%p, name=%s, chan=%p)\n" , __func__, dev, name, chan); - index =fdt_stringlist_search (gd->fdt_blob, dev->of_offset, + index =fdt_stringlist_search (gd->fdt_blob,dev_of_offset (dev),"mbox-names" , name);if (index <0 ) {debug ("fdt_stringlist_search() failed: %d\n" , index);
drivers/misc/cros_ec.c +1 -1
@@ -998,7 +998,7 @@ int cros_ec_register(struct udevice *dev) {struct cros_ec_dev *cdev =dev_get_uclass_priv (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);char id[MSG_BYTES ]; cdev->dev = dev;
drivers/misc/cros_ec_sandbox.c +2 -2
@@ -522,7 +522,7 @@ int cros_ec_probe(struct udevice *dev)int err;memcpy (ec, &s_state,sizeof (*ec)); - err =cros_ec_decode_ec_flash (blob, dev->of_offset, &ec->ec_config); + err =cros_ec_decode_ec_flash (blob,dev_of_offset (dev), &ec->ec_config);if (err)return err;
@@ -531,7 +531,7 @@ int cros_ec_probe(struct udevice *dev)keyb_dev ; device_find_next_child(&keyb_dev)) {if (device_get_uclass_id (keyb_dev) ==UCLASS_KEYBOARD ) { - node = keyb_dev->of_offset; + node =dev_of_offset (keyb_dev);break ; } }
drivers/misc/i2c_eeprom_emul.c +2 -2
@@ -115,9 +115,9 @@ static int sandbox_i2c_eeprom_ofdata_to_platdata(struct udevice *dev) {struct sandbox_i2c_flash_plat_data *plat =dev_get_platdata (dev); - plat->size =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->size =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"sandbox,size" ,32 ); - plat->filename =fdt_getprop (gd->fdt_blob, dev->of_offset, + plat->filename =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"sandbox,filename" ,NULL );if (!plat->filename) { debug("%s: No filename for device '%s'\n", __func__,
drivers/misc/tegra186_bpmp.c +4 -4
@@ -112,19 +112,19 @@ static int tegra186_bpmp_bind(struct udevice *dev)debug ("%s(dev=%p)\n" , __func__, dev); ret =device_bind_driver_to_node (dev,"tegra186_clk" ,"tegra186_clk" , - dev->of_offset, &child); +dev_of_offset (dev), &child);if (ret)return ret; ret =device_bind_driver_to_node (dev,"tegra186_reset" , -"tegra186_reset" , dev->of_offset, +"tegra186_reset" ,dev_of_offset (dev), &child);if (ret)return ret; ret =device_bind_driver_to_node (dev,"tegra186_power_domain" ,"tegra186_power_domain" , - dev->of_offset, &child); +dev_of_offset (dev), &child);if (ret)return ret;
@@ -141,7 +141,7 @@ static ulong tegra186_bpmp_get_shmem(struct udevice *dev, int index)struct fdtdec_phandle_args args;fdt_addr_t reg; - ret =fdtdec_parse_phandle_with_args (gd->fdt_blob, dev->of_offset, + ret =fdtdec_parse_phandle_with_args (gd->fdt_blob,dev_of_offset (dev),"shmem" ,NULL ,0 , index, &args);if (ret <0 ) {error ("fdtdec_parse_phandle_with_args() failed: %d\n" , ret);
drivers/misc/tegra_car.c +2 -2
@@ -22,12 +22,12 @@ static int tegra_car_bpmp_bind(struct udevice *dev)debug ("%s(dev=%p)\n" , __func__, dev); ret =device_bind_driver_to_node (dev,"tegra_car_clk" ,"tegra_car_clk" , - dev->of_offset, &child); +dev_of_offset (dev), &child);if (ret)return ret; ret =device_bind_driver_to_node (dev,"tegra_car_reset" , -"tegra_car_reset" , dev->of_offset, +"tegra_car_reset" ,dev_of_offset (dev), &child);if (ret)return ret;
drivers/mmc/atmel_sdhci.c +1 -1
@@ -74,7 +74,7 @@ static int atmel_sdhci_probe(struct udevice *dev) host->ioaddr = (void *)dev_get_addr (dev); host->quirks =0 ; - host->bus_width =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + host->bus_width =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"bus-width" ,4 ); caps =sdhci_readl (host,SDHCI_CAPABILITIES );
drivers/mmc/exynos_dw_mmc.c +1 -1
@@ -264,7 +264,7 @@ static int exynos_dwmmc_probe(struct udevice *dev)struct dwmci_host *host = &priv->host;int err; - err =exynos_dwmci_get_config (gd->fdt_blob, dev->of_offset, host); + err =exynos_dwmci_get_config (gd->fdt_blob,dev_of_offset (dev), host);if (err)return err; err =do_dwmci_init (host);
drivers/mmc/fsl_esdhc.c +1 -1
@@ -944,7 +944,7 @@ static int fsl_esdhc_probe(struct udevice *dev)struct mmc_uclass_priv *upriv =dev_get_uclass_priv (dev);struct fsl_esdhc_priv *priv =dev_get_priv (dev);const void *fdt = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);fdt_addr_t addr;unsigned int val;int ret;
drivers/mmc/msm_sdhci.c +8 -11
@@ -50,16 +50,16 @@ DECLARE_GLOBAL_DATA_PTR;static int msm_sdc_clk_init (struct udevice *dev) { -uint clk_rate =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, -"clock-frequency" ,400000 ); +int node =dev_of_offset (dev); +uint clk_rate =fdtdec_get_uint (gd->fdt_blob, node,"clock-frequency" , +400000 );uint clkd[2 ];/* clk_id and clk_no */ int clk_offset;struct udevice *clk_dev;struct clk clk;int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, dev->of_offset,"clock" , clkd, -2 ); + ret =fdtdec_get_int_array (gd->fdt_blob, node,"clock" , clkd,2 );if (ret)return ret;
@@ -166,17 +166,14 @@ static int msm_ofdata_to_platdata(struct udevice *dev)struct udevice *parent = dev->parent;struct msm_sdhc *priv =dev_get_priv (dev);struct sdhci_host *host = &priv->host; +int node =dev_of_offset (dev); host->name =strdup (dev->name); host->ioaddr = (void *)dev_get_addr (dev); - host->bus_width =fdtdec_get_int (gd->fdt_blob, dev->of_offset, -"bus-width" ,4 ); - host->index =fdtdec_get_uint (gd->fdt_blob, dev->of_offset,"index" ,0 ); + host->bus_width =fdtdec_get_int (gd->fdt_blob, node,"bus-width" ,4 ); + host->index =fdtdec_get_uint (gd->fdt_blob, node,"index" ,0 ); priv->base = (void *)fdtdec_get_addr_size_auto_parent (gd->fdt_blob, - parent->of_offset, - dev->of_offset, -"reg" ,1 ,NULL , - false); +dev_of_offset (parent), node,"reg" ,1 ,NULL , false);if (priv->base == (void *)FDT_ADDR_T_NONE || host->ioaddr == (void *)FDT_ADDR_T_NONE )return -EINVAL ;
drivers/mmc/omap_hsmmc.c +1 -1
@@ -728,7 +728,7 @@ static int omap_hsmmc_ofdata_to_platdata(struct udevice *dev) {struct omap_hsmmc_data *priv =dev_get_priv (dev);const void *fdt = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);struct mmc_config *cfg;int val;
drivers/mmc/pic32_sdhci.c +3 -3
@@ -38,18 +38,18 @@ static int pic32_sdhci_probe(struct udevice *dev)fdt_size_t size;int ret; - addr =fdtdec_get_addr_size (fdt, dev->of_offset,"reg" , &size); + addr =fdtdec_get_addr_size (fdt,dev_of_offset (dev),"reg" , &size);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; host->ioaddr =ioremap (addr, size); host->name = dev->name; host->quirks =SDHCI_QUIRK_NO_HISPD_BIT ; - host->bus_width =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + host->bus_width =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"bus-width" ,4 ); host->ops = &pic32_sdhci_ops; - ret =fdtdec_get_int_array (gd->fdt_blob, dev->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (dev),"clock-freq-min-max" , f_min_max,2 );if (ret) {printf ("sdhci: clock-freq-min-max not found\n" );
drivers/mmc/rockchip_dw_mmc.c +5 -5
@@ -59,24 +59,24 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev) host->name = dev->name; host->ioaddr = (void *)dev_get_addr (dev); - host->buswidth =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + host->buswidth =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"bus-width" ,4 ); host->get_mmc_clk = rockchip_dwmmc_get_mmc_clk; host->priv = dev;/* use non-removeable as sdcard and emmc as judgement */ -if (fdtdec_get_bool (gd->fdt_blob, dev->of_offset,"non-removable" )) +if (fdtdec_get_bool (gd->fdt_blob,dev_of_offset (dev),"non-removable" )) host->dev_index =0 ;else host->dev_index =1 ; - priv->fifo_depth =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + priv->fifo_depth =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"fifo-depth" ,0 );if (priv->fifo_depth <0 )return -EINVAL ; - priv->fifo_mode =fdtdec_get_bool (gd->fdt_blob, dev->of_offset, + priv->fifo_mode =fdtdec_get_bool (gd->fdt_blob,dev_of_offset (dev),"fifo-mode" ); -if (fdtdec_get_int_array (gd->fdt_blob, dev->of_offset, +if (fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (dev),"clock-freq-min-max" , priv->minmax,2 ))return -EINVAL ;#endif
drivers/mmc/rockchip_sdhci.c +1 -1
@@ -38,7 +38,7 @@ static int arasan_sdhci_probe(struct udevice *dev)struct clk clk; - max_frequency =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + max_frequency =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"max-frequency" ,0 ); ret =clk_get_by_index (dev,0 , &clk);if (!ret) {
drivers/mmc/s5p_sdhci.c +1 -1
@@ -246,7 +246,7 @@ static int s5p_sdhci_probe(struct udevice *dev)struct sdhci_host *host =dev_get_priv (dev);int ret; - ret =sdhci_get_config (gd->fdt_blob, dev->of_offset, host); + ret =sdhci_get_config (gd->fdt_blob,dev_of_offset (dev), host);if (ret)return ret;
drivers/mmc/socfpga_dw_mmc.c +4 -4
@@ -70,7 +70,7 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)return -EINVAL ; } - fifo_depth =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + fifo_depth =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"fifo-depth" ,0 );if (fifo_depth <0 ) {printf ("DWMMC: Can't get FIFO depth\n" );
@@ -79,7 +79,7 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev) host->name = dev->name; host->ioaddr = (void *)dev_get_addr (dev); - host->buswidth =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + host->buswidth =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"bus-width" ,4 ); host->clksel = socfpga_dwmci_clksel;
@@ -92,9 +92,9 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev) host->bus_hz = clk; host->fifoth_val =MSIZE (0x2 ) |RX_WMARK (fifo_depth /2 -1 ) |TX_WMARK (fifo_depth /2 ); - priv->drvsel =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + priv->drvsel =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"drvsel" ,3 ); - priv->smplsel =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + priv->smplsel =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"smplsel" ,0 ); host->priv = priv;
drivers/mmc/tegra_mmc.c +2 -2
@@ -578,8 +578,8 @@ static int tegra_mmc_probe(struct udevice *dev) priv->cfg.name ="Tegra SD/MMC" ; priv->cfg.ops = &tegra_mmc_ops; - bus_width =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"bus-width" , -1 ); + bus_width =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev), +"bus-width" ,1 ); priv->cfg.voltages =MMC_VDD_32_33 |MMC_VDD_33_34 |MMC_VDD_165_195 ; priv->cfg.host_caps =0 ;
drivers/mmc/uniphier-sd.c +3 -2
@@ -705,7 +705,8 @@ static int uniphier_sd_probe(struct udevice *dev) plat->cfg.name = dev->name; plat->cfg.host_caps = MMC_MODE_HS_52MHz |MMC_MODE_HS ; -switch (fdtdec_get_int (gd->fdt_blob, dev->of_offset,"bus-width" ,1 )) { +switch (fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"bus-width" , +1 )) {case 8 : plat->cfg.host_caps |=MMC_MODE_8BIT ;break ;
@@ -719,7 +720,7 @@ static int uniphier_sd_probe(struct udevice *dev)return -EINVAL ; } -if (fdt_get_property (gd->fdt_blob, dev->of_offset,"non-removable" , +if (fdt_get_property (gd->fdt_blob,dev_of_offset (dev),"non-removable" ,NULL )) priv->caps |=UNIPHIER_SD_CAP_NONREMOVABLE ;
drivers/mtd/altera_qspi.c +1 -1
@@ -349,7 +349,7 @@ static int altera_qspi_ofdata_to_platdata(struct udevice *dev) {struct altera_qspi_platdata *pdata =dev_get_platdata (dev);void *blob = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);const char *list, *end;const fdt32_t *cell;void *base;
drivers/mtd/cfi_flash.c +1 -1
@@ -2441,7 +2441,7 @@ unsigned long flash_init (void)static int cfi_flash_probe (struct udevice *dev) {void *blob = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);const fdt32_t *cell;phys_addr_t addr;int parent, addrc, sizec;
drivers/mtd/pic32_flash.c +1 -1
@@ -371,7 +371,7 @@ static void pic32_flash_bank_init(flash_info_t *info,static int pic32_flash_probe (struct udevice *dev) {void *blob = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);const char *list, *end;const fdt32_t *cell;unsigned long addr, size;
drivers/mtd/spi/sandbox.c +2 -2
@@ -516,7 +516,7 @@ int sandbox_sf_ofdata_to_platdata(struct udevice *dev) {struct sandbox_spi_flash_plat_data *pdata =dev_get_platdata (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev); pdata->filename =fdt_getprop (blob, node,"sandbox,filename" ,NULL ); pdata->device_name =fdt_getprop (blob, node,"compatible" ,NULL );
@@ -641,7 +641,7 @@ int sandbox_spi_get_emul(struct sandbox_state *state,debug ("%s: busnum=%u, cs=%u: binding SPI flash emulation: " , __func__, busnum, cs); ret =sandbox_sf_bind_emul (state, busnum, cs, bus, - slave->of_offset, slave->name); +dev_of_offset (slave), slave->name);if (ret) {debug ("failed (err=%d)\n" , ret);return ret;
drivers/mtd/spi/spi_flash.c +1 -1
@@ -919,7 +919,7 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash)#ifdef CONFIG_DM_SPI_FLASH fdt_addr_t addr;fdt_size_t size; -int node = flash->dev->of_offset; +int node =dev_of_offset (flash->dev); addr =fdtdec_get_addr_size (blob, node,"memory-map" , &size);if (addr ==FDT_ADDR_T_NONE ) {
drivers/net/ag7xxx.c +1 -1
@@ -857,7 +857,7 @@ static int ag7xxx_get_phy_iface_offset(struct udevice *dev) {int offset; - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset,"phy" ); + offset =fdtdec_lookup_phandle (gd->fdt_blob,dev_of_offset (dev),"phy" );if (offset <=0 ) {debug ("%s: PHY OF node not found (ret=%i)\n" , __func__, offset);return -EINVAL ;
drivers/net/altera_tse.c +3 -2
@@ -576,7 +576,7 @@ static int altera_tse_probe(struct udevice *dev)struct eth_pdata *pdata =dev_get_platdata (dev);struct altera_tse_priv *priv =dev_get_priv (dev);void *blob = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);const char *list, *end;const fdt32_t *cell;void *base, *desc_mem =NULL ;
@@ -676,7 +676,8 @@ static int altera_tse_ofdata_to_platdata(struct udevice *dev)const char *phy_mode; pdata->phy_interface =-1 ; - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy-mode" , +NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
drivers/net/cpsw-common.c +2 -2
@@ -20,7 +20,7 @@ static int davinci_emac_3517_get_macid(struct udevice *dev, u16 offset, int slave, u8 *mac_addr) { void *fdt = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);u32 macid_lsb;u32 macid_msb;fdt32_t gmii =0 ;
@@ -60,7 +60,7 @@ static int cpsw_am33xx_cm_get_macid(struct udevice *dev, u16 offset, int slave, u8 *mac_addr) {void *fdt = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);u32 macid_lo;u32 macid_hi;fdt32_t gmii =0 ;
drivers/net/cpsw.c +2 -2
@@ -981,7 +981,7 @@ static int cpsw_phy_init(struct cpsw_priv *priv, struct cpsw_slave *slave)#ifdef CONFIG_DM_ETH if (slave->data->phy_of_handle) - phydev->dev->of_offset = slave->data->phy_of_handle; +dev_set_of_offset (phydev->dev, slave->data->phy_of_handle);#endif priv->phydev = phydev;
@@ -1286,7 +1286,7 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)const char *phy_mode;const char *phy_sel_compat =NULL ;const void *fdt = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int subnode;int slave_index =0 ;int active_slave;
drivers/net/designware.c +5 -4
@@ -728,7 +728,8 @@ int designware_eth_ofdata_to_platdata(struct udevice *dev) pdata->iobase =dev_get_addr (dev); pdata->phy_interface =-1 ; - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy-mode" , +NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
@@ -737,19 +738,19 @@ int designware_eth_ofdata_to_platdata(struct udevice *dev) } pdata->max_speed =0 ; - cell =fdt_getprop (gd->fdt_blob, dev->of_offset,"max-speed" ,NULL ); + cell =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"max-speed" ,NULL );if (cell) pdata->max_speed =fdt32_to_cpu (*cell);#ifdef CONFIG_DM_GPIO -if (fdtdec_get_bool (gd->fdt_blob, dev->of_offset, +if (fdtdec_get_bool (gd->fdt_blob,dev_of_offset (dev),"snps,reset-active-low" )) reset_flags |=GPIOD_ACTIVE_LOW ; ret =gpio_request_by_name (dev,"snps,reset-gpio" ,0 , &priv->reset_gpio, reset_flags);if (ret ==0 ) { - ret =fdtdec_get_int_array (gd->fdt_blob, dev->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (dev),"snps,reset-delays-us" , dw_pdata->reset_delays,3 ); }else if (ret == -ENOENT ) { ret =0 ;
drivers/net/fec_mxc.c +2 -1
@@ -1277,7 +1277,8 @@ static int fecmxc_ofdata_to_platdata(struct udevice *dev) priv->eth = (struct ethernet_regs *)pdata->iobase; pdata->phy_interface =-1 ; - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy-mode" , +NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
drivers/net/gmac_rockchip.c +2 -2
@@ -36,9 +36,9 @@ static int gmac_rockchip_ofdata_to_platdata(struct udevice *dev) {struct gmac_rockchip_platdata *pdata =dev_get_platdata (dev); - pdata->tx_delay =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + pdata->tx_delay =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"tx-delay" ,0x30 ); - pdata->rx_delay =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + pdata->rx_delay =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"rx-delay" ,0x10 );return designware_eth_ofdata_to_platdata (dev);
drivers/net/keystone_net.c +3 -3
@@ -1099,7 +1099,7 @@ static int ks2_sl_eth_ofdata_to_platdata(struct udevice *dev)struct ks2_eth_priv *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_platdata (dev);const void *fdt = gd->fdt_blob; -int slave = dev->of_offset; +int slave =dev_of_offset (dev);int interfaces;int gbe;int netcp_devices;
@@ -1126,13 +1126,13 @@ static int ks2_eth_ofdata_to_platdata(struct udevice *dev)int netcp_devices;int gbe; - netcp_devices =fdt_subnode_offset (fdt, dev->of_offset, + netcp_devices =fdt_subnode_offset (fdt,dev_of_offset (dev),"netcp-devices" ); gbe =fdt_subnode_offset (fdt, netcp_devices,"gbe" );ks2_eth_bind_slaves (dev, gbe, &gbe_0); -ks2_eth_parse_slave_interface (dev->of_offset, gbe_0, priv, pdata); +ks2_eth_parse_slave_interface (dev_of_offset (dev), gbe_0, priv, pdata); pdata->iobase =dev_get_addr (dev);
drivers/net/macb.c +2 -1
@@ -999,7 +999,8 @@ static int macb_eth_probe(struct udevice *dev)#ifdef CONFIG_DM_ETH const char *phy_mode; - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy-mode" , +NULL );if (phy_mode) macb->phy_interface =phy_get_interface_by_name (phy_mode);if (macb->phy_interface ==-1 ) {
drivers/net/mvneta.c +3 -2
@@ -1611,7 +1611,7 @@ static int mvneta_probe(struct udevice *dev)struct eth_pdata *pdata =dev_get_platdata (dev);struct mvneta_port *pp =dev_get_priv (dev);void *blob = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);struct mii_dev *bus;unsigned long addr;void *bd_space;
@@ -1691,7 +1691,8 @@ static int mvneta_ofdata_to_platdata(struct udevice *dev)/* Get phy-mode / phy_interface from DT */ pdata->phy_interface =-1 ; - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy-mode" , +NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
drivers/net/mvpp2.c +3 -3
@@ -4047,7 +4047,7 @@ static int mvpp2_probe(struct udevice *dev)return err; } -return mvpp2_port_probe (dev, port, dev->of_offset, priv, +return mvpp2_port_probe (dev, port,dev_of_offset (dev), priv, &buffer_loc.first_rxq); }
@@ -4138,7 +4138,7 @@ static int mvpp2_base_probe(struct udevice *dev)static int mvpp2_base_bind (struct udevice *parent) {const void *blob = gd->fdt_blob; -int node = parent->of_offset; +int node =dev_of_offset (parent);struct uclass_driver *drv;struct udevice *dev;struct eth_pdata *plat;
@@ -4169,7 +4169,7 @@ static int mvpp2_base_bind(struct udevice *parent)/* Create child device UCLASS_ETH and bind it */ device_bind (parent, &mvpp2_driver, name, plat, subnode, &dev); - dev->of_offset = subnode; +dev_set_of_offset (dev, subnode); }return 0 ;
drivers/net/phy/micrel.c +1 -1
@@ -244,7 +244,7 @@ static int ksz90x1_of_config_group(struct phy_device *phydev,return -EOPNOTSUPP ;for (i =0 ; i < ofcfg->grpsz; i++) { - val[i] =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + val[i] =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev), ofcfg->grp[i].name,-1 ); offset = ofcfg->grp[i].off;if (val[i] ==-1 ) {
drivers/net/phy/ti.c +3 -3
@@ -167,13 +167,13 @@ static int dp83867_of_init(struct phy_device *phydev)struct dp83867_private *dp83867 = phydev->priv;struct udevice *dev = phydev->dev; - dp83867->rx_id_delay =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + dp83867->rx_id_delay =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"ti,rx-internal-delay" ,-1 ); - dp83867->tx_id_delay =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + dp83867->tx_id_delay =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"ti,tx-internal-delay" ,-1 ); - dp83867->fifo_depth =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, + dp83867->fifo_depth =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"ti,fifo-depth" ,-1 );return 0 ;
drivers/net/phy/xilinx_phy.c +1 -1
@@ -104,7 +104,7 @@ static int xilinxphy_of_init(struct phy_device *phydev)u32 phytype;debug ("%s\n" , __func__); - phytype =fdtdec_get_int (gd->fdt_blob, phydev->dev->of_offset, + phytype =fdtdec_get_int (gd->fdt_blob,dev_of_offset (phydev->dev),"phy-type" ,-1 );if (phytype ==XAE_PHY_TYPE_1000BASE_X ) phydev->flags |=XAE_PHY_TYPE_1000BASE_X ;
drivers/net/pic32_eth.c +6 -4
@@ -535,7 +535,8 @@ static int pic32_eth_probe(struct udevice *dev)int offset =0 ;int phy_addr =-1 ; - addr =fdtdec_get_addr_size (gd->fdt_blob, dev->of_offset,"reg" , &size); + addr =fdtdec_get_addr_size (gd->fdt_blob,dev_of_offset (dev),"reg" , + &size);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ;
@@ -544,7 +545,8 @@ static int pic32_eth_probe(struct udevice *dev)/* get phy mode */ pdata->phy_interface =-1 ; - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy-mode" , +NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
@@ -553,13 +555,13 @@ static int pic32_eth_probe(struct udevice *dev) }/* get phy addr */ - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, + offset =fdtdec_lookup_phandle (gd->fdt_blob,dev_of_offset (dev),"phy-handle" );if (offset >0 ) phy_addr =fdtdec_get_int (gd->fdt_blob, offset,"reg" ,-1 );/* phy reset gpio */ -gpio_request_by_name_nodev (gd->fdt_blob, dev->of_offset, +gpio_request_by_name_nodev (gd->fdt_blob,dev_of_offset (dev),"reset-gpios" ,0 , &priv->rst_gpio,GPIOD_IS_OUT );
drivers/net/sandbox-raw.c +1 -1
@@ -26,7 +26,7 @@ static int sb_eth_raw_start(struct udevice *dev)debug ("eth_sandbox_raw: Start\n" ); - interface =fdt_getprop (gd->fdt_blob, dev->of_offset, + interface =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"host-raw-interface" ,NULL );if (interface ==NULL )return -EINVAL ;
drivers/net/sandbox.c +3 -2
@@ -60,8 +60,9 @@ static int sb_eth_start(struct udevice *dev)debug ("eth_sandbox: Start\n" ); -fdtdec_get_byte_array (gd->fdt_blob, dev->of_offset,"fake-host-hwaddr" , - priv->fake_host_hwaddr,ARP_HLEN ); +fdtdec_get_byte_array (gd->fdt_blob,dev_of_offset (dev), +"fake-host-hwaddr" , priv->fake_host_hwaddr, +ARP_HLEN ); priv->recv_packet_buffer = net_rx_packets[0 ];return 0 ; }
drivers/net/sun8i_emac.c +5 -4
@@ -442,7 +442,7 @@ static int parse_phy_pins(struct udevice *dev)const char *pin_name;int drive, pull, i; - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, + offset =fdtdec_lookup_phandle (gd->fdt_blob,dev_of_offset (dev),"pinctrl-0" );if (offset <0 ) {printf ("WARNING: emac: cannot find pinctrl-0 node\n" );
@@ -716,6 +716,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)struct eth_pdata *pdata =dev_get_platdata (dev);struct emac_eth_dev *priv =dev_get_priv (dev);const char *phy_mode; +int node =dev_of_offset (dev);int offset =0 ; pdata->iobase =dev_get_addr_name (dev,"emac" );
@@ -725,13 +726,13 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) priv->phyaddr =-1 ; priv->use_internal_phy = false; - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, + offset =fdtdec_lookup_phandle (gd->fdt_blob, node,"phy" );if (offset >0 ) priv->phyaddr =fdtdec_get_int (gd->fdt_blob, offset,"reg" ,-1 ); - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob, node,"phy-mode" ,NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);
@@ -751,7 +752,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) }if (priv->variant ==H3_EMAC ) { -if (fdt_getprop (gd->fdt_blob, dev->of_offset, +if (fdt_getprop (gd->fdt_blob, node,"allwinner,use-internal-phy" ,NULL )) priv->use_internal_phy = true; }
drivers/net/tsec.c +3 -3
@@ -783,7 +783,7 @@ int tsec_probe(struct udevice *dev) pdata->iobase = (phys_addr_t )dev_get_addr (dev); priv->regs = (struct tsec *)pdata->iobase; - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, + offset =fdtdec_lookup_phandle (gd->fdt_blob,dev_of_offset (dev),"phy-handle" );if (offset >0 ) { reg =fdtdec_get_int (gd->fdt_blob, offset,"reg" ,0 );
@@ -802,7 +802,7 @@ int tsec_probe(struct udevice *dev)return -ENOENT ; } - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, + offset =fdtdec_lookup_phandle (gd->fdt_blob,dev_of_offset (dev),"tbi-handle" );if (offset >0 ) { reg = fdtdec_get_int(gd->fdt_blob, offset, "reg",
@@ -812,7 +812,7 @@ int tsec_probe(struct udevice *dev) priv->tbiaddr =CONFIG_SYS_TBIPA_VALUE ; } - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset, + phy_mode =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy-connection-type" ,NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);
drivers/net/xilinx_axi_emac.c +4 -4
@@ -682,13 +682,14 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev) {struct eth_pdata *pdata =dev_get_platdata (dev);struct axidma_priv *priv =dev_get_priv (dev); +int node =dev_of_offset (dev);int offset =0 ;const char *phy_mode; pdata->iobase = (phys_addr_t )dev_get_addr (dev); priv->iobase = (struct axi_regs *)pdata->iobase; - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, + offset =fdtdec_lookup_phandle (gd->fdt_blob, node,"axistream-connected" );if (offset <=0 ) {printf ("%s: axistream is not found\n" , __func__);
@@ -705,12 +706,11 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev) priv->phyaddr =-1 ; - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, -"phy-handle" ); + offset =fdtdec_lookup_phandle (gd->fdt_blob, node,"phy-handle" );if (offset >0 ) priv->phyaddr =fdtdec_get_int (gd->fdt_blob, offset,"reg" ,-1 ); - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob, node,"phy-mode" ,NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
drivers/net/xilinx_emaclite.c +3 -3
@@ -604,15 +604,15 @@ static int emaclite_ofdata_to_platdata(struct udevice *dev) emaclite->phyaddr =-1 ; - offset =fdtdec_lookup_phandle (gd->fdt_blob, dev->of_offset, + offset =fdtdec_lookup_phandle (gd->fdt_blob,dev_of_offset (dev),"phy-handle" );if (offset >0 ) emaclite->phyaddr =fdtdec_get_int (gd->fdt_blob, offset,"reg" ,-1 ); - emaclite->txpp =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + emaclite->txpp =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"xlnx,tx-ping-pong" ,0 ); - emaclite->rxpp =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + emaclite->rxpp =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"xlnx,rx-ping-pong" ,0 ); printf("EMACLITE: %lx, phyaddr %d, %d/%d\n", (ulong)emaclite->regs,
drivers/net/zynq_gem.c +6 -5
@@ -345,7 +345,7 @@ static int zynq_phy_init(struct udevice *dev) priv->phydev->advertising = priv->phydev->supported;if (priv->phy_of_handle >0 ) - priv->phydev->dev->of_offset = priv->phy_of_handle; +dev_set_of_offset (priv->phydev->dev, priv->phy_of_handle);return phy_config (priv->phydev); }
@@ -684,6 +684,7 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) {struct eth_pdata *pdata =dev_get_platdata (dev);struct zynq_gem_priv *priv =dev_get_priv (dev); +int node =dev_of_offset (dev);const char *phy_mode; pdata->iobase = (phys_addr_t )dev_get_addr (dev);
@@ -692,13 +693,13 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) priv->emio =0 ; priv->phyaddr =-1 ; - priv->phy_of_handle =fdtdec_lookup_phandle (gd->fdt_blob, - dev->of_offset,"phy-handle" ); + priv->phy_of_handle =fdtdec_lookup_phandle (gd->fdt_blob, node, +"phy-handle" );if (priv->phy_of_handle >0 ) priv->phyaddr =fdtdec_get_int (gd->fdt_blob, priv->phy_of_handle,"reg" ,-1 ); - phy_mode =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy-mode" ,NULL ); + phy_mode =fdt_getprop (gd->fdt_blob, node,"phy-mode" ,NULL );if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
@@ -707,7 +708,7 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) } priv->interface = pdata->phy_interface; - priv->emio =fdtdec_get_bool (gd->fdt_blob, dev->of_offset,"xlnx,emio" ); + priv->emio =fdtdec_get_bool (gd->fdt_blob, node,"xlnx,emio" );printf ("ZYNQ GEM: %lx, phyaddr %x, interface %s\n" , (ulong )priv->iobase, priv->phyaddr,phy_string_for_interface (priv->interface));
drivers/pci/pci-uclass.c +5 -4
@@ -839,8 +839,9 @@ static int pci_uclass_pre_probe(struct udevice *bus)/* For bridges, use the top-level PCI controller */ if (!device_is_on_pci_bus (bus)) { hose->ctlr = bus; - ret =decode_regions (hose, gd->fdt_blob, bus->parent->of_offset, - bus->of_offset); + ret =decode_regions (hose, gd->fdt_blob, +dev_of_offset (bus->parent), +dev_of_offset (bus));if (ret) {debug ("%s: Cannot decode regions\n" , __func__);return ret;
@@ -903,7 +904,7 @@ static int pci_uclass_child_post_bind(struct udevice *dev)struct fdt_pci_addr addr;int ret; -if (dev->of_offset ==-1 ) +if (dev_of_offset (dev) ==-1 )return 0 ;/*
@@ -911,7 +912,7 @@ static int pci_uclass_child_post_bind(struct udevice *dev)* just check the address. */ pplat =dev_get_parent_platdata (dev); - ret =fdtdec_get_pci_addr (gd->fdt_blob, dev->of_offset, + ret =fdtdec_get_pci_addr (gd->fdt_blob,dev_of_offset (dev),FDT_PCI_SPACE_CONFIG ,"reg" , &addr);if (ret) {
drivers/pci/pci_tegra.c +1 -1
@@ -1099,7 +1099,7 @@ static int pci_tegra_ofdata_to_platdata(struct udevice *dev)INIT_LIST_HEAD (&pcie->ports); -if (tegra_pcie_parse_dt (gd->fdt_blob, dev->of_offset, id, pcie)) +if (tegra_pcie_parse_dt (gd->fdt_blob,dev_of_offset (dev), id, pcie))return -EINVAL ;return 0 ;
drivers/pci/pcie_xilinx.c +1 -1
@@ -186,7 +186,7 @@ static int pcie_xilinx_ofdata_to_platdata(struct udevice *dev)DECLARE_GLOBAL_DATA_PTR ;int err; - err =fdt_get_resource (gd->fdt_blob, dev->of_offset,"reg" , + err =fdt_get_resource (gd->fdt_blob,dev_of_offset (dev),"reg" ,0 , ®_res);if (err <0 ) {error ("\"reg\" resource not found\n" );
drivers/phy/marvell/comphy_core.c +1 -1
@@ -107,7 +107,7 @@ void comphy_print(struct chip_serdes_phy_config *chip_cfg,static int comphy_probe (struct udevice *dev) {const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);struct chip_serdes_phy_config *chip_cfg =dev_get_priv (dev);struct comphy_map comphy_map_data[MAX_LANE_OPTIONS ];int subnode;
drivers/pinctrl/ath79/pinctrl_ar933x.c +1 -1
@@ -75,7 +75,7 @@ static int ar933x_pinctrl_get_periph_id(struct udevice *dev,u32 cell[2 ];int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, periph->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph),"interrupts" , cell,ARRAY_SIZE (cell));if (ret <0 )return -EINVAL ;
drivers/pinctrl/ath79/pinctrl_qca953x.c +1 -1
@@ -95,7 +95,7 @@ static int qca953x_pinctrl_get_periph_id(struct udevice *dev,u32 cell[2 ];int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, periph->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph),"interrupts" , cell,ARRAY_SIZE (cell));if (ret <0 )return -EINVAL ;
drivers/pinctrl/exynos/pinctrl-exynos.c +1 -1
@@ -70,7 +70,7 @@ static unsigned long pin_to_bank_base(struct udevice *dev, const char *pin_name,int exynos_pinctrl_set_state (struct udevice *dev,struct udevice *config) {const void *fdt = gd->fdt_blob; -int node = config->of_offset; +int node =dev_of_offset (config);unsigned int count, idx, pin_num;unsigned int pinfunc, pinpud, pindrv;unsigned long reg, value;
drivers/pinctrl/meson/pinctrl-meson.c +3 -3
@@ -142,19 +142,19 @@ int meson_pinctrl_probe(struct udevice *dev)int node, gpio =-1 , len;int na, ns; - na =fdt_address_cells (gd->fdt_blob, dev->parent->of_offset); + na =fdt_address_cells (gd->fdt_blob,dev_of_offset (dev->parent));if (na <1 ) {debug ("bad #address-cells\n" );return -EINVAL ; } - ns =fdt_size_cells (gd->fdt_blob, dev->parent->of_offset); + ns =fdt_size_cells (gd->fdt_blob,dev_of_offset (dev->parent));if (ns <1 ) {debug ("bad #size-cells\n" );return -EINVAL ; } -fdt_for_each_subnode (node, gd->fdt_blob, dev->of_offset) { +fdt_for_each_subnode (node, gd->fdt_blob,dev_of_offset (dev)) {if (fdt_getprop (gd->fdt_blob, node,"gpio-controller" , &len)) { gpio = node;break ;
drivers/pinctrl/mvebu/pinctrl-mvebu.c +3 -3
@@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;int mvebu_pinctrl_set_state (struct udevice *dev,struct udevice *config) {const void *blob = gd->fdt_blob; -int node = config->of_offset; +int node =dev_of_offset (config);struct mvebu_pinctrl_priv *priv;u32 pin_arr[MVEBU_MAX_PINS_PER_BANK ];u32 function;
@@ -82,7 +82,7 @@ static int mvebu_pinctrl_set_state_all(struct udevice *dev, struct udevice *config) {const void *blob = gd->fdt_blob; -int node = config->of_offset; +int node =dev_of_offset (config);struct mvebu_pinctrl_priv *priv;u32 func_arr[MVEBU_MAX_PINS_PER_BANK ];int pin, err;
@@ -128,7 +128,7 @@ static int mvebu_pinctrl_set_state_all(struct udevice *dev,int mvebu_pinctl_probe (struct udevice *dev) {const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);struct mvebu_pinctrl_priv *priv; priv =dev_get_priv (dev);
drivers/pinctrl/nxp/pinctrl-imx.c +4 -3
@@ -19,7 +19,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config) {struct imx_pinctrl_priv *priv =dev_get_priv (dev);struct imx_pinctrl_soc_info *info = priv->info; -int node = config->of_offset; +int node =dev_of_offset (config);const struct fdt_property *prop;u32 *pin_data;int npins, size, pin_size;
@@ -176,7 +176,7 @@ int imx_pinctrl_probe(struct udevice *dev, struct imx_pinctrl_soc_info *info) {struct imx_pinctrl_priv *priv =dev_get_priv (dev); -int node = dev->of_offset, ret; +int node =dev_of_offset (dev), ret;struct fdtdec_phandle_args arg;fdt_addr_t addr;fdt_size_t size;
@@ -189,7 +189,8 @@ int imx_pinctrl_probe(struct udevice *dev, priv->dev = dev; priv->info = info; - addr =fdtdec_get_addr_size (gd->fdt_blob, dev->of_offset,"reg" , &size); + addr =fdtdec_get_addr_size (gd->fdt_blob,dev_of_offset (dev),"reg" , + &size);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ;
drivers/pinctrl/pinctrl-at91-pio4.c +1 -1
@@ -109,7 +109,7 @@ static int atmel_pinctrl_set_state(struct udevice *dev, struct udevice *config) {struct atmel_pio4_port *bank_base;const void *blob = gd->fdt_blob; -int node = config->of_offset; +int node =dev_of_offset (config);u32 offset, func, bank, line;u32 cells[MAX_PINMUX_ENTRIES ];u32 i, conf;
drivers/pinctrl/pinctrl-generic.c +2 -2
@@ -245,7 +245,7 @@ static int pinctrl_generic_set_state_one(struct udevice *dev, bool is_group, unsigned selector) {const void *fdt = gd->fdt_blob; -int node_offset = config->of_offset; +int node_offset =dev_of_offset (config);const char *propname;const void *value;int prop_offset, len, func_selector, param, ret;
@@ -300,7 +300,7 @@ static int pinctrl_generic_set_state_subnode(struct udevice *dev, struct udevice *config) {const void *fdt = gd->fdt_blob; -int node = config->of_offset; +int node =dev_of_offset (config);const char *subnode_target_type ="pins" ;bool is_group = false;const char *name;
drivers/pinctrl/pinctrl-uclass.c +2 -2
@@ -64,7 +64,7 @@ static int pinctrl_config_one(struct udevice *config)static int pinctrl_select_state_full (struct udevice *dev,const char *statename) {const void *fdt = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);char propname[32 ];/* long enough */ const fdt32_t *list;uint32_t phandle;
@@ -122,7 +122,7 @@ static int pinctrl_select_state_full(struct udevice *dev, const char *statename)static int pinconfig_post_bind (struct udevice *dev) {const void *fdt = gd->fdt_blob; -int offset = dev->of_offset; +int offset =dev_of_offset (dev);bool pre_reloc_only = !(gd->flags &GD_FLG_RELOC );const char *name;int ret;
drivers/pinctrl/pinctrl_pic32.c +2 -2
@@ -253,7 +253,7 @@ static int pic32_pinctrl_get_periph_id(struct udevice *dev,int ret;u32 cell[2 ]; - ret =fdtdec_get_int_array (gd->fdt_blob, periph->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph),"interrupts" , cell,ARRAY_SIZE (cell));if (ret <0 )return -EINVAL ;
@@ -310,7 +310,7 @@ static int pic32_pinctrl_probe(struct udevice *dev)struct pic32_pinctrl_priv *priv =dev_get_priv (dev);struct fdt_resource res;void *fdt = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret; ret = fdt_get_named_resource(fdt, node, "reg", "reg-names",
drivers/pinctrl/rockchip/pinctrl_rk3036.c +1 -1
@@ -205,7 +205,7 @@ static int rk3036_pinctrl_get_periph_id(struct udevice *dev,u32 cell[3 ];int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, periph->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph),"interrupts" , cell,ARRAY_SIZE (cell));if (ret <0 )return -EINVAL ;
drivers/pinctrl/rockchip/pinctrl_rk3288.c +2 -2
@@ -479,7 +479,7 @@ static int rk3288_pinctrl_get_periph_id(struct udevice *dev,u32 cell[3 ];int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, periph->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph),"interrupts" , cell,ARRAY_SIZE (cell));if (ret <0 )return -EINVAL ;
@@ -644,7 +644,7 @@ static int rk3288_pinctrl_set_state(struct udevice *dev, struct udevice *config)u32 cell[60 ], *ptr;debug ("%s: %s %s\n" , __func__, dev->name, config->name); - ret =fdtdec_get_int_array_count (blob, config->of_offset, + ret =fdtdec_get_int_array_count (blob,dev_of_offset (config),"rockchip,pins" , cell,ARRAY_SIZE (cell));if (ret <0 ) {
drivers/pinctrl/rockchip/pinctrl_rk3399.c +1 -1
@@ -362,7 +362,7 @@ static int rk3399_pinctrl_get_periph_id(struct udevice *dev,u32 cell[3 ];int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, periph->of_offset, + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (periph),"interrupts" , cell,ARRAY_SIZE (cell));if (ret <0 )return -EINVAL ;
drivers/power/domain/power-domain-uclass.c +1 -1
@@ -41,7 +41,7 @@ int power_domain_get(struct udevice *dev, struct power_domain *power_domain)debug ("%s(dev=%p, power_domain=%p)\n" , __func__, dev, power_domain); - ret =fdtdec_parse_phandle_with_args (gd->fdt_blob, dev->of_offset, + ret =fdtdec_parse_phandle_with_args (gd->fdt_blob,dev_of_offset (dev),"power-domains" ,"#power-domain-cells" ,0 ,0 , &args);
drivers/power/pmic/act8846.c +1 -1
@@ -52,7 +52,7 @@ static int act8846_bind(struct udevice *dev)int regulators_node;int children; - regulators_node =fdt_subnode_offset (blob, dev->of_offset, + regulators_node =fdt_subnode_offset (blob,dev_of_offset (dev),"regulators" );if (regulators_node <=0 ) { debug("%s: %s regulators subnode not found!", __func__,
drivers/power/pmic/i2c_pmic_emul.c +3 -3
@@ -108,9 +108,9 @@ static int sandbox_i2c_pmic_ofdata_to_platdata(struct udevice *emul)debug ("%s:%d Setting PMIC default registers\n" , __func__, __LINE__); - reg_defaults =fdtdec_locate_byte_array (gd->fdt_blob, emul->of_offset, -"reg-defaults" , -SANDBOX_PMIC_REG_COUNT ); + reg_defaults =fdtdec_locate_byte_array (gd->fdt_blob, +dev_of_offset (emul),"reg-defaults" , +SANDBOX_PMIC_REG_COUNT );if (!reg_defaults) { error("Property \"reg-defaults\" not found for device: %s!",
drivers/power/pmic/lp873x.c +1 -1
@@ -49,7 +49,7 @@ static int lp873x_bind(struct udevice *dev)int regulators_node;const void *blob = gd->fdt_blob;int children; -int node = dev->of_offset; +int node =dev_of_offset (dev); regulators_node =fdt_subnode_offset (blob, node,"regulators" );
drivers/power/pmic/max77686.c +1 -1
@@ -54,7 +54,7 @@ static int max77686_bind(struct udevice *dev)const void *blob = gd->fdt_blob;int children; - regulators_node =fdt_subnode_offset (blob, dev->of_offset, + regulators_node =fdt_subnode_offset (blob,dev_of_offset (dev),"voltage-regulators" );if (regulators_node <=0 ) { debug("%s: %s regulators subnode not found!", __func__,
drivers/power/pmic/palmas.c +1 -1
@@ -49,7 +49,7 @@ static int palmas_bind(struct udevice *dev)int pmic_node =-1 , regulators_node;const void *blob = gd->fdt_blob;int children; -int node = dev->of_offset; +int node =dev_of_offset (dev);int subnode, len;fdt_for_each_subnode (subnode, blob, node) {
drivers/power/pmic/pfuze100.c +1 -1
@@ -56,7 +56,7 @@ static int pfuze100_bind(struct udevice *dev)int regulators_node;const void *blob = gd->fdt_blob; - regulators_node =fdt_subnode_offset (blob, dev->of_offset, + regulators_node =fdt_subnode_offset (blob,dev_of_offset (dev),"regulators" );if (regulators_node <=0 ) { debug("%s: %s regulators subnode not found!", __func__,
drivers/power/pmic/pmic-uclass.c +1 -1
@@ -33,7 +33,7 @@ int pmic_bind_children(struct udevice *pmic, int offset,int ret;debug ("%s for '%s'@node offset: %d\n" , __func__, pmic->name, - pmic->of_offset); +dev_of_offset (pmic)); for (node = fdt_first_subnode(blob, offset); node > 0;
drivers/power/pmic/rk808.c +1 -1
@@ -61,7 +61,7 @@ static int rk808_bind(struct udevice *dev)int regulators_node;int children; - regulators_node =fdt_subnode_offset (blob, dev->of_offset, + regulators_node =fdt_subnode_offset (blob,dev_of_offset (dev),"regulators" );if (regulators_node <=0 ) { debug("%s: %s regulators subnode not found!", __func__,
drivers/power/pmic/s5m8767.c +1 -1
@@ -58,7 +58,7 @@ static int s5m8767_bind(struct udevice *dev)const void *blob = gd->fdt_blob;int children; - node =fdt_subnode_offset (blob, dev->of_offset,"regulators" ); + node =fdt_subnode_offset (blob,dev_of_offset (dev),"regulators" );if (node <=0 ) {debug ("%s: %s regulators subnode not found!" , __func__, dev->name);
drivers/power/pmic/sandbox.c +1 -1
@@ -51,7 +51,7 @@ static int sandbox_pmic_read(struct udevice *dev, uint reg,static int sandbox_pmic_bind (struct udevice *dev) { -if (!pmic_bind_children (dev, dev->of_offset, pmic_children_info)) +if (!pmic_bind_children (dev,dev_of_offset (dev), pmic_children_info))error ("%s:%d PMIC: %s - no child found!" , __func__, __LINE__, dev->name);
drivers/power/pmic/tps65090.c +1 -1
@@ -56,7 +56,7 @@ static int tps65090_bind(struct udevice *dev)const void *blob = gd->fdt_blob;int children; - regulators_node =fdt_subnode_offset (blob, dev->of_offset, + regulators_node =fdt_subnode_offset (blob,dev_of_offset (dev),"regulators" );if (regulators_node <=0 ) { debug("%s: %s regulators subnode not found!", __func__,
drivers/power/regulator/fixed.c +2 -2
@@ -28,7 +28,7 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)struct fixed_regulator_platdata *dev_pdata;struct gpio_desc *gpio;const void *blob = gd->fdt_blob; -int node = dev->of_offset, flags =GPIOD_IS_OUT ; +int node =dev_of_offset (dev), flags =GPIOD_IS_OUT ;int ret; dev_pdata =dev_get_platdata (dev);
@@ -54,7 +54,7 @@ static int fixed_regulator_ofdata_to_platdata(struct udevice *dev)/* Get optional ramp up delay */ dev_pdata->startup_delay_us =fdtdec_get_uint (gd->fdt_blob, - dev->of_offset, +dev_of_offset (dev),"startup-delay-us" ,0 );return 0 ;
drivers/power/regulator/gpio-regulator.c +1 -1
@@ -30,7 +30,7 @@ static int gpio_regulator_ofdata_to_platdata(struct udevice *dev)struct gpio_regulator_platdata *dev_pdata;struct gpio_desc *gpio;const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret, count, i, j;u32 states_array[8 ];
drivers/power/regulator/pwm_regulator.c +1 -1
@@ -88,7 +88,7 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev)struct pwm_regulator_info *priv =dev_get_priv (dev);struct fdtdec_phandle_args args;const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret; ret = fdtdec_parse_phandle_with_args(blob, node, "pwms", "#pwm-cells",
drivers/power/regulator/regulator-uclass.c +2 -2
@@ -278,7 +278,7 @@ static bool regulator_name_is_unique(struct udevice *check_dev,static int regulator_post_bind (struct udevice *dev) {struct dm_regulator_uclass_platdata *uc_pdata; -int offset = dev->of_offset; +int offset =dev_of_offset (dev);const void *blob = gd->fdt_blob;const char *property ="regulator-name" ;
@@ -308,7 +308,7 @@ static int regulator_post_bind(struct udevice *dev)static int regulator_pre_probe (struct udevice *dev) {struct dm_regulator_uclass_platdata *uc_pdata; -int offset = dev->of_offset; +int offset =dev_of_offset (dev); uc_pdata =dev_get_uclass_platdata (dev);if (!uc_pdata)
drivers/remoteproc/rproc-uclass.c +1 -1
@@ -116,7 +116,7 @@ static int rproc_pre_probe(struct udevice *dev)if (!dev->platdata) {#if CONFIG_IS_ENABLED (OF_CONTROL ) -int node = dev->of_offset; +int node =dev_of_offset (dev);const void *blob = gd->fdt_blob;bool tmp;if (!blob) {
drivers/remoteproc/ti_power_proc.c +1 -1
@@ -33,7 +33,7 @@ struct ti_powerproc_privdata {static int ti_of_to_priv (struct udevice *dev,struct ti_powerproc_privdata *priv) { -int node = dev->of_offset; +int node =dev_of_offset (dev);const void *blob = gd->fdt_blob;int tmp;
drivers/reset/reset-uclass.c +2 -2
@@ -43,7 +43,7 @@ int reset_get_by_index(struct udevice *dev, int index,debug ("%s(dev=%p, index=%d, reset_ctl=%p)\n" , __func__, dev, index, reset_ctl); - ret =fdtdec_parse_phandle_with_args (gd->fdt_blob, dev->of_offset, + ret =fdtdec_parse_phandle_with_args (gd->fdt_blob,dev_of_offset (dev),"resets" ,"#reset-cells" ,0 , index, &args);if (ret) {
@@ -88,7 +88,7 @@ int reset_get_by_name(struct udevice *dev, const char *name,debug ("%s(dev=%p, name=%s, reset_ctl=%p)\n" , __func__, dev, name, reset_ctl); - index =fdt_stringlist_search (gd->fdt_blob, dev->of_offset, + index =fdt_stringlist_search (gd->fdt_blob,dev_of_offset (dev),"reset-names" , name);if (index <0 ) {debug ("fdt_stringlist_search() failed: %d\n" , index);
drivers/serial/altera_uart.c +1 -1
@@ -92,7 +92,7 @@ static int altera_uart_ofdata_to_platdata(struct udevice *dev) plat->regs =map_physmem (dev_get_addr (dev),sizeof (struct altera_uart_regs ),MAP_NOCACHE ); - plat->uartclk =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->uartclk =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock-frequency" ,0 );return 0 ;
drivers/serial/ns16550.c +5 -5
@@ -386,13 +386,13 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)int ret;/* we prefer to use a memory-mapped register */ - ret =fdtdec_get_pci_addr (gd->fdt_blob, dev->of_offset, + ret =fdtdec_get_pci_addr (gd->fdt_blob,dev_of_offset (dev),FDT_PCI_SPACE_MEM32 ,"reg" , &pci_addr);if (ret) {/* try if there is any i/o-mapped register */ ret =fdtdec_get_pci_addr (gd->fdt_blob, - dev->of_offset, +dev_of_offset (dev),FDT_PCI_SPACE_IO ,"reg" , &pci_addr);if (ret)
@@ -416,9 +416,9 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) plat->base = (unsigned long )map_physmem (addr,0 ,MAP_NOCACHE );#endif - plat->reg_offset =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->reg_offset =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg-offset" ,0 ); - plat->reg_shift =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->reg_shift =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg-shift" ,0 ); err =clk_get_by_index (dev,0 , &clk);
@@ -432,7 +432,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) }if (!plat->clock) - plat->clock =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->clock =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock-frequency" ,CONFIG_SYS_NS16550_CLK );if (!plat->clock) {
drivers/serial/sandbox.c +1 -1
@@ -152,7 +152,7 @@ static int sandbox_serial_ofdata_to_platdata(struct udevice *dev)int i; plat->colour =-1 ; - colour =fdt_getprop (gd->fdt_blob, dev->of_offset, + colour =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"sandbox,text-colour" ,NULL );if (colour) {for (i =0 ; i <ARRAY_SIZE (ansi_colour); i++) {
drivers/serial/serial_arc.c +1 -1
@@ -115,7 +115,7 @@ static int arc_serial_ofdata_to_platdata(struct udevice *dev)DECLARE_GLOBAL_DATA_PTR ; plat->reg = (struct arc_serial_regs *)dev_get_addr (dev); - plat->uartclk =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->uartclk =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock-frequency" ,0 );return 0 ;
drivers/serial/serial_bcm283x_mu.c +3 -2
@@ -164,8 +164,9 @@ static int bcm283x_mu_serial_ofdata_to_platdata(struct udevice *dev)return -EINVAL ; plat->base = addr; - plat->clock =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"clock" ,1 ); - plat->skip_init =fdtdec_get_bool (gd->fdt_blob, dev->of_offset, + plat->clock =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock" , +1 ); + plat->skip_init =fdtdec_get_bool (gd->fdt_blob,dev_of_offset (dev),"skip-init" ); plat->disabled = false;return 0 ;
drivers/serial/serial_msm.c +3 -3
@@ -146,7 +146,7 @@ static const struct dm_serial_ops msm_serial_ops = {static int msm_uart_clk_init (struct udevice *dev) { -uint clk_rate =fdtdec_get_uint (gd->fdt_blob, dev->of_offset, +uint clk_rate =fdtdec_get_uint (gd->fdt_blob,dev_of_offset (dev),"clock-frequency" ,115200 );uint clkd[2 ];/* clk_id and clk_no */ int clk_offset;
@@ -154,8 +154,8 @@ static int msm_uart_clk_init(struct udevice *dev)struct clk clk;int ret; - ret =fdtdec_get_int_array (gd->fdt_blob, dev->of_offset,"clock" , clkd, -2 ); + ret =fdtdec_get_int_array (gd->fdt_blob,dev_of_offset (dev),"clock" , + clkd,2 );if (ret)return ret;
drivers/serial/serial_mxc.c +1 -1
@@ -359,7 +359,7 @@ static int mxc_serial_ofdata_to_platdata(struct udevice *dev) plat->reg = (struct mxc_uart *)addr; - plat->use_dte =fdtdec_get_bool (gd->fdt_blob, dev->of_offset, + plat->use_dte =fdtdec_get_bool (gd->fdt_blob,dev_of_offset (dev),"fsl,dte-mode" );return 0 ; }
drivers/serial/serial_pic32.c +2 -1
@@ -141,7 +141,8 @@ static int pic32_uart_probe(struct udevice *dev)int ret;/* get address */ - addr =fdtdec_get_addr_size (gd->fdt_blob, dev->of_offset,"reg" , &size); + addr =fdtdec_get_addr_size (gd->fdt_blob,dev_of_offset (dev),"reg" , + &size);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ;
drivers/serial/serial_pl01x.c +3 -2
@@ -354,9 +354,10 @@ static int pl01x_serial_ofdata_to_platdata(struct udevice *dev)return -EINVAL ; plat->base = addr; - plat->clock =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"clock" ,1 ); + plat->clock =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock" , +1 ); plat->type =dev_get_driver_data (dev); - plat->skip_init =fdtdec_get_bool (gd->fdt_blob, dev->of_offset, + plat->skip_init =fdtdec_get_bool (gd->fdt_blob,dev_of_offset (dev),"skip-init" );return 0 ; }
drivers/serial/serial_s5p.c +1 -1
@@ -187,7 +187,7 @@ static int s5p_serial_ofdata_to_platdata(struct udevice *dev)return -EINVAL ; plat->reg = (struct s5p_uart *)addr; - plat->port_id =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + plat->port_id =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"id" , dev->seq);return 0 ; }
drivers/serial/serial_sh.c +3 -2
@@ -216,12 +216,13 @@ static int sh_serial_ofdata_to_platdata(struct udevice *dev)struct sh_serial_platdata *plat =dev_get_platdata (dev);fdt_addr_t addr; - addr =fdtdec_get_addr (gd->fdt_blob, dev->of_offset,"reg" ); + addr =fdtdec_get_addr (gd->fdt_blob,dev_of_offset (dev),"reg" );if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; plat->base = addr; - plat->clk =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"clock" ,1 ); + plat->clk =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock" , +1 ); plat->type =dev_get_driver_data (dev);return 0 ; }
drivers/serial/serial_uniphier.c +1 -1
@@ -105,7 +105,7 @@ static int uniphier_serial_probe(struct udevice *dev) priv->membase = port; - priv->uartclk =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + priv->uartclk =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"clock-frequency" ,0 ); tmp =readl (&port->lcr_mcr);
drivers/spi/cadence_qspi.c +1 -1
@@ -282,7 +282,7 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus) {struct cadence_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus);int subnode;u32 data[4 ];int ret;
drivers/spi/davinci_spi.c +1 -1
@@ -540,7 +540,7 @@ static int davinci_ofdata_to_platadata(struct udevice *bus) {struct davinci_spi_slave *ds =dev_get_priv (bus);const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); ds->regs =dev_map_physmem (bus,sizeof (struct davinci_spi_regs ));if (!ds->regs) {
drivers/spi/designware_spi.c +1 -1
@@ -132,7 +132,7 @@ static int dw_spi_ofdata_to_platdata(struct udevice *bus) {struct dw_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->regs = (struct dw_spi *)dev_get_addr (bus);
drivers/spi/exynos_spi.c +1 -1
@@ -253,7 +253,7 @@ static int exynos_spi_ofdata_to_platdata(struct udevice *bus) {struct exynos_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->regs = (struct exynos_spi *)dev_get_addr (bus); plat->periph_id =pinmux_decode_periph_id (blob, node);
drivers/spi/fsl_dspi.c +1 -1
@@ -646,7 +646,7 @@ static int fsl_dspi_ofdata_to_platdata(struct udevice *bus)fdt_addr_t addr;struct fsl_dspi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus);if (fdtdec_get_bool (blob, node,"big-endian" )) plat->flags |=DSPI_FLAG_REGMAP_ENDIAN_BIG ;
drivers/spi/fsl_qspi.c +1 -1
@@ -1078,7 +1078,7 @@ static int fsl_qspi_ofdata_to_platdata(struct udevice *bus)struct fdt_resource res_regs, res_mem;struct fsl_qspi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus);int ret, flash_num =0 , subnode;if (fdtdec_get_bool (blob, node,"big-endian" ))
drivers/spi/ich.c +3 -3
@@ -658,14 +658,14 @@ static int ich_spi_child_pre_probe(struct udevice *dev)static int ich_spi_ofdata_to_platdata (struct udevice *dev) {struct ich_spi_platdata *plat =dev_get_platdata (dev); +int node =dev_of_offset (dev);int ret; - ret =fdt_node_check_compatible (gd->fdt_blob, dev->of_offset, -"intel,ich7-spi" ); + ret =fdt_node_check_compatible (gd->fdt_blob, node,"intel,ich7-spi" );if (ret ==0 ) { plat->ich_version =ICHV_7 ; }else { - ret =fdt_node_check_compatible (gd->fdt_blob, dev->of_offset, + ret =fdt_node_check_compatible (gd->fdt_blob, node,"intel,ich9-spi" );if (ret ==0 ) plat->ich_version =ICHV_9 ;
drivers/spi/mvebu_a3700_spi.c +2 -2
@@ -261,9 +261,9 @@ static int mvebu_spi_ofdata_to_platdata(struct udevice *bus)* it should be used to read the input clock and the DT property * can be removed. */ - plat->clock =fdtdec_get_int (gd->fdt_blob, bus->of_offset, + plat->clock =fdtdec_get_int (gd->fdt_blob,dev_of_offset (bus),"clock-frequency" ,160000 ); - plat->frequency =fdtdec_get_int (gd->fdt_blob, bus->of_offset, + plat->frequency =fdtdec_get_int (gd->fdt_blob,dev_of_offset (bus),"spi-max-frequency" ,40000 );return 0 ;
drivers/spi/omap3_spi.c +1 -1
@@ -627,7 +627,7 @@ static int omap3_spi_probe(struct udevice *dev) {struct omap3_spi_priv *priv =dev_get_priv (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);struct omap2_mcspi_platform_config * data = (struct omap2_mcspi_platform_config *)dev_get_driver_data (dev);
drivers/spi/pic32_spi.c +5 -5
@@ -377,13 +377,14 @@ static int pic32_spi_probe(struct udevice *bus) {struct pic32_spi_priv *priv =dev_get_priv (bus);struct dm_spi_bus *dm_spi =dev_get_uclass_priv (bus); +int node =dev_of_offset (bus);struct udevice *clkdev;fdt_addr_t addr;fdt_size_t size;int ret;debug ("%s: %d, bus: %i\n" , __func__, __LINE__, bus->seq); - addr =fdtdec_get_addr_size (gd->fdt_blob, bus->of_offset,"reg" , &size); + addr =fdtdec_get_addr_size (gd->fdt_blob, node,"reg" , &size);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ;
@@ -391,8 +392,8 @@ static int pic32_spi_probe(struct udevice *bus)if (!priv->regs)return -EINVAL ; - dm_spi->max_hz =fdtdec_get_int (gd->fdt_blob, bus->of_offset, -"spi-max-frequency" ,250000000 ); + dm_spi->max_hz =fdtdec_get_int (gd->fdt_blob, node,"spi-max-frequency" , +250000000 );/* get clock rate */ ret =clk_get_by_index (bus,0 , &clkdev);if (ret <0 ) {
@@ -413,8 +414,7 @@ static int pic32_spi_probe(struct udevice *bus)* of the ongoing transfer. To avoid this sort of error we will drive * /CS manually by toggling cs-gpio pins. */ - ret =gpio_request_by_name_nodev (gd->fdt_blob, bus->of_offset, -"cs-gpios" ,0 , + ret =gpio_request_by_name_nodev (gd->fdt_blob, node,"cs-gpios" ,0 , &priv->cs_gpio,GPIOD_IS_OUT );if (ret) {printf ("pic32-spi: error, cs-gpios not found\n" );
drivers/spi/rk_spi.c +1 -1
@@ -164,7 +164,7 @@ static int rockchip_spi_ofdata_to_platdata(struct udevice *bus)struct rockchip_spi_platdata *plat =dev_get_platdata (bus);struct rockchip_spi_priv *priv =dev_get_priv (bus);const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus);int ret; plat->base =dev_get_addr (bus);
drivers/spi/soft_spi.c +1 -1
@@ -202,7 +202,7 @@ static int soft_spi_ofdata_to_platdata(struct udevice *dev) {struct soft_spi_platdata *plat = dev->platdata;const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev); plat->spi_delay_us =fdtdec_get_int (blob, node,"spi-delay-us" ,0 );
drivers/spi/spi-uclass.c +4 -3
@@ -113,10 +113,11 @@ static int spi_child_post_bind(struct udevice *dev) {struct dm_spi_slave_platdata *plat =dev_get_parent_platdata (dev); -if (dev->of_offset ==-1 ) +if (dev_of_offset (dev) ==-1 )return 0 ; -return spi_slave_ofdata_to_platdata (gd->fdt_blob, dev->of_offset, plat); +return spi_slave_ofdata_to_platdata (gd->fdt_blob,dev_of_offset (dev), + plat); }#endif
@@ -125,7 +126,7 @@ static int spi_post_probe(struct udevice *bus)#if !CONFIG_IS_ENABLED (OF_PLATDATA )struct dm_spi_bus *spi =dev_get_uclass_priv (bus); - spi->max_hz =fdtdec_get_int (gd->fdt_blob, bus->of_offset, + spi->max_hz =fdtdec_get_int (gd->fdt_blob,dev_of_offset (bus),"spi-max-frequency" ,0 );#endif #if defined(CONFIG_NEEDS_MANUAL_RELOC )
drivers/spi/tegra114_spi.c +1 -1
@@ -101,7 +101,7 @@ static int tegra114_spi_ofdata_to_platdata(struct udevice *bus) {struct tegra_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->base =dev_get_addr (bus); plat->periph_id =clock_decode_periph_id (blob, node);
drivers/spi/tegra20_sflash.c +1 -1
@@ -88,7 +88,7 @@ static int tegra20_sflash_ofdata_to_platdata(struct udevice *bus) {struct tegra_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->base =dev_get_addr (bus); plat->periph_id =clock_decode_periph_id (blob, node);
drivers/spi/tegra20_slink.c +1 -1
@@ -94,7 +94,7 @@ static int tegra30_spi_ofdata_to_platdata(struct udevice *bus) {struct tegra_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->base =dev_get_addr (bus); plat->periph_id =clock_decode_periph_id (blob, node);
drivers/spi/tegra210_qspi.c +1 -1
@@ -97,7 +97,7 @@ static int tegra210_qspi_ofdata_to_platdata(struct udevice *bus) {struct tegra_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->base =dev_get_addr (bus); plat->periph_id =clock_decode_periph_id (blob, node);
drivers/spi/ti_qspi.c +1 -1
@@ -553,7 +553,7 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus) {struct ti_qspi_priv *priv =dev_get_priv (bus);const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus);fdt_addr_t addr;void *mmap;
drivers/spi/zynq_qspi.c +1 -1
@@ -101,7 +101,7 @@ static int zynq_qspi_ofdata_to_platdata(struct udevice *bus) {struct zynq_qspi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->regs = (struct zynq_qspi_regs *)fdtdec_get_addr (blob, node,"reg" );
drivers/spi/zynq_spi.c +1 -1
@@ -71,7 +71,7 @@ static int zynq_spi_ofdata_to_platdata(struct udevice *bus) {struct zynq_spi_platdata *plat = bus->platdata;const void *blob = gd->fdt_blob; -int node = bus->of_offset; +int node =dev_of_offset (bus); plat->regs = (struct zynq_spi_regs *)dev_get_addr (bus);
drivers/spmi/spmi-msm.c +3 -7
@@ -147,18 +147,14 @@ static int msm_spmi_probe(struct udevice *dev) {struct udevice *parent = dev->parent;struct msm_spmi_priv *priv =dev_get_priv (dev); +int node =dev_of_offset (dev);int i; priv->arb_chnl =dev_get_addr (dev); priv->spmi_core =fdtdec_get_addr_size_auto_parent (gd->fdt_blob, - parent->of_offset, - dev->of_offset, -"reg" ,1 ,NULL , - false); +dev_of_offset (parent), node,"reg" ,1 ,NULL , false); priv->spmi_obs =fdtdec_get_addr_size_auto_parent (gd->fdt_blob, - parent->of_offset, - dev->of_offset,"reg" , -2 ,NULL , false); +dev_of_offset (parent), node,"reg" ,2 ,NULL , false);if (priv->arb_chnl ==FDT_ADDR_T_NONE || priv->spmi_core ==FDT_ADDR_T_NONE || priv->spmi_obs ==FDT_ADDR_T_NONE )
drivers/sysreset/sysreset_sandbox.c +1 -1
@@ -41,7 +41,7 @@ static int sandbox_sysreset_request(struct udevice *dev, enum sysreset_t type)* (see the U_BOOT_DEVICE() declaration below) should not do anything. * If we are that device, return an error. */ -if (state->fdt_fname && dev->of_offset ==-1 ) +if (state->fdt_fname &&dev_of_offset (dev) ==-1 )return -ENODEV ;switch (type) {
drivers/timer/timer-uclass.c +1 -1
@@ -55,7 +55,7 @@ static int timer_pre_probe(struct udevice *dev) uc_priv->clock_rate = ret; }else uc_priv->clock_rate =fdtdec_get_int (gd->fdt_blob, - dev->of_offset,"clock-frequency" ,0 ); +dev_of_offset (dev),"clock-frequency" ,0 );return 0 ; }
drivers/usb/emul/sandbox_flash.c +2 -2
@@ -373,8 +373,8 @@ static int sandbox_flash_ofdata_to_platdata(struct udevice *dev)struct sandbox_flash_plat *plat =dev_get_platdata (dev);const void *blob = gd->fdt_blob; - plat->pathname =fdt_getprop (blob, dev->of_offset,"sandbox,filepath" , -NULL ); + plat->pathname =fdt_getprop (blob,dev_of_offset (dev), +"sandbox,filepath" ,NULL );return 0 ; }
drivers/usb/emul/sandbox_hub.c +2 -1
@@ -277,7 +277,8 @@ static int sandbox_child_post_bind(struct udevice *dev) {struct sandbox_hub_platdata *plat =dev_get_parent_platdata (dev); - plat->port =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"reg" ,-1 ); + plat->port =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"reg" , +-1 );return 0 ; }
drivers/usb/host/dwc2.c +2 -2
@@ -1199,8 +1199,8 @@ static int dwc2_usb_ofdata_to_platdata(struct udevice *dev)return -EINVAL ; priv->regs = (struct dwc2_core_regs *)addr; - prop =fdt_getprop (gd->fdt_blob, dev->of_offset,"disable-over-current" , -NULL ); + prop =fdt_getprop (gd->fdt_blob,dev_of_offset (dev), +"disable-over-current" ,NULL );if (prop) priv->oc_disable = true;
drivers/usb/host/ehci-exynos.c +1 -1
@@ -59,7 +59,7 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev) } depth =0 ; - node =fdtdec_next_compatible_subnode (blob, dev->of_offset, + node =fdtdec_next_compatible_subnode (blob,dev_of_offset (dev),COMPAT_SAMSUNG_EXYNOS_USB_PHY , &depth);if (node <=0 ) {debug ("XHCI: Can't get device node for usb3-phy controller\n" );
drivers/usb/host/ehci-fsl.c +1 -1
@@ -61,7 +61,7 @@ static int ehci_fsl_ofdata_to_platdata(struct udevice *dev)struct ehci_fsl_priv *priv =dev_get_priv (dev);const void *prop; - prop =fdt_getprop (gd->fdt_blob, dev->of_offset,"phy_type" , + prop =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"phy_type" ,NULL );if (prop) { priv->phy_type = (char *)prop;
drivers/usb/host/ehci-tegra.c +1 -1
@@ -696,7 +696,7 @@ static void config_clock(const u32 timing[])static int fdt_decode_usb (struct udevice *dev,struct fdt_usb *config) {const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);const char *phy, *mode; config->reg = (struct usb_ctlr *)dev_get_addr (dev);
drivers/usb/host/ehci-vf.c +1 -1
@@ -218,7 +218,7 @@ static int vf_usb_ofdata_to_platdata(struct udevice *dev) {struct ehci_vf_priv_data *priv =dev_get_priv (dev);const void *dt_blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);const char *mode; priv->portnr = dev->seq;
drivers/usb/host/usb-uclass.c +4 -3
@@ -686,16 +686,17 @@ int usb_child_post_bind(struct udevice *dev)const void *blob = gd->fdt_blob;int val; -if (dev->of_offset ==-1 ) +if (dev_of_offset (dev) ==-1 )return 0 ;/* We only support matching a few things */ - val =fdtdec_get_int (blob, dev->of_offset,"usb,device-class" ,-1 ); + val =fdtdec_get_int (blob,dev_of_offset (dev),"usb,device-class" ,-1 );if (val !=-1 ) { plat->id.match_flags |=USB_DEVICE_ID_MATCH_DEV_CLASS ; plat->id.bDeviceClass = val; } - val =fdtdec_get_int (blob, dev->of_offset,"usb,interface-class" ,-1 ); + val =fdtdec_get_int (blob,dev_of_offset (dev),"usb,interface-class" , +-1 );if (val !=-1 ) { plat->id.match_flags |=USB_DEVICE_ID_MATCH_INT_CLASS ; plat->id.bInterfaceClass = val;
drivers/usb/host/xhci-exynos5.c +1 -1
@@ -68,7 +68,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev) } depth =0 ; - node =fdtdec_next_compatible_subnode (blob, dev->of_offset, + node =fdtdec_next_compatible_subnode (blob,dev_of_offset (dev),COMPAT_SAMSUNG_EXYNOS5_USB3_PHY , &depth);if (node <=0 ) {debug ("XHCI: Can't get device node for usb3-phy controller\n" );
drivers/usb/host/xhci-rockchip.c +4 -4
@@ -90,11 +90,11 @@ static void rockchip_dwc3_phy_setup(struct dwc3 *dwc3_reg,/* Set dwc3 usb2 phy config */ reg =readl (&dwc3_reg->g_usb2phycfg[0 ]); -if (fdtdec_get_bool (blob, dev->of_offset, +if (fdtdec_get_bool (blob,dev_of_offset (dev),"snps,dis-enblslpm-quirk" )) reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM ; - utmi_bits =fdtdec_get_int (blob, dev->of_offset, + utmi_bits =fdtdec_get_int (blob,dev_of_offset (dev),"snps,phyif-utmi-bits" ,-1 );if (utmi_bits ==16 ) { reg |=DWC3_GUSB2PHYCFG_PHYIF ;
@@ -106,11 +106,11 @@ static void rockchip_dwc3_phy_setup(struct dwc3 *dwc3_reg, reg |=DWC3_GUSB2PHYCFG_USBTRDTIM_8BIT ; } -if (fdtdec_get_bool (blob, dev->of_offset, +if (fdtdec_get_bool (blob,dev_of_offset (dev),"snps,dis-u2-freeclk-exists-quirk" )) reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS ; -if (fdtdec_get_bool (blob, dev->of_offset, +if (fdtdec_get_bool (blob,dev_of_offset (dev),"snps,dis-u2-susphy-quirk" )) reg &= ~DWC3_GUSB2PHYCFG_SUSPHY ;
drivers/usb/musb-new/pic32.c +1 -1
@@ -219,7 +219,7 @@ static int musb_usb_probe(struct udevice *dev)struct musb_host_data *mdata = &pdata->mdata;struct fdt_resource mc, glue;void *fdt = (void *)gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);void __iomem *mregs;int ret;
drivers/usb/musb-new/ti-musb.c +3 -3
@@ -83,7 +83,7 @@ static int ti_musb_ofdata_to_platdata(struct udevice *dev) {struct ti_musb_platdata *platdata =dev_get_platdata (dev);const void *fdt = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int phys;int ctrl_mod;int usb_index;
@@ -178,7 +178,7 @@ static int ti_musb_host_ofdata_to_platdata(struct udevice *dev) {struct ti_musb_platdata *platdata =dev_get_platdata (dev);const void *fdt = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret; ret =ti_musb_ofdata_to_platdata (dev);
@@ -209,7 +209,7 @@ static int ti_musb_wrapper_bind(struct udevice *parent)int node;int ret; -for (node =fdt_first_subnode (fdt, parent->of_offset); node >0 ; +for (node =fdt_first_subnode (fdt,dev_of_offset (parent)); node >0 ; node =fdt_next_subnode (fdt, node)) {struct udevice *dev;const char *name =fdt_get_name (fdt, node,NULL );
drivers/video/atmel_lcdfb.c +1 -1
@@ -276,7 +276,7 @@ static int atmel_fb_ofdata_to_platdata(struct udevice *dev)struct display_timing *timing = &priv->timing;const void *blob = gd->fdt_blob; -if (fdtdec_decode_display_timing (blob, dev->of_offset, +if (fdtdec_decode_display_timing (blob,dev_of_offset (dev), plat->timing_index, timing)) {debug ("%s: Failed to decode display timing\n" , __func__);return -EINVAL ;
drivers/video/bridge/ps862x.c +2 -1
@@ -86,7 +86,8 @@ static int ps8622_attach(struct udevice *dev)if (ret)return ret; - params =fdt_getprop (gd->fdt_blob, dev->of_offset,"parade,regs" , &len); + params =fdt_getprop (gd->fdt_blob,dev_of_offset (dev),"parade,regs" , + &len);if (!params || len %3 ) {debug ("%s: missing/invalid params=%p, len=%x\n" , __func__, params, len);
drivers/video/broadwell_igd.c +1 -1
@@ -705,7 +705,7 @@ static int broadwell_igd_ofdata_to_platdata(struct udevice *dev) {struct broadwell_igd_plat *plat =dev_get_platdata (dev);struct broadwell_igd_priv *priv =dev_get_priv (dev); -int node = dev->of_offset; +int node =dev_of_offset (dev);const void *blob = gd->fdt_blob; if (fdtdec_get_int_array(blob, node, "intel,dp-hotplug",
drivers/video/exynos/exynos_dp.c +1 -1
@@ -880,7 +880,7 @@ static int exynos_dp_ofdata_to_platdata(struct udevice *dev) {struct exynos_dp_priv *priv =dev_get_priv (dev);const void *blob = gd->fdt_blob; -unsigned int node = dev->of_offset; +unsigned int node =dev_of_offset (dev);fdt_addr_t addr; addr =dev_get_addr (dev);
drivers/video/exynos/exynos_fb.c +2 -2
@@ -383,7 +383,7 @@ void exynos_fimd_lcd_init(struct udevice *dev)unsigned int offset;unsigned int node; - node = dev->of_offset; + node =dev_of_offset (dev);if (fdtdec_get_bool (gd->fdt_blob, node,"samsung,disable-sysmmu" ))exynos_fimd_disable_sysmmu ();
@@ -482,7 +482,7 @@ unsigned long exynos_fimd_calc_fbsize(struct exynos_fb_priv *priv)int exynos_fb_ofdata_to_platdata (struct udevice *dev) {struct exynos_fb_priv *priv =dev_get_priv (dev); -unsigned int node = dev->of_offset; +unsigned int node =dev_of_offset (dev);const void *blob = gd->fdt_blob;fdt_addr_t addr;
drivers/video/ivybridge_igd.c +1 -1
@@ -515,7 +515,7 @@ static int gma_pm_init_pre_vbios(void *gtt_bar, int rev)static int gma_pm_init_post_vbios (struct udevice *dev,int rev,void *gtt_bar) {const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);u32 reg32, cycle_delay;debug ("GT Power Management Init (post VBIOS)\n" );
drivers/video/pwm_backlight.c +1 -1
@@ -61,7 +61,7 @@ static int pwm_backlight_ofdata_to_platdata(struct udevice *dev)struct pwm_backlight_priv *priv =dev_get_priv (dev);struct fdtdec_phandle_args args;const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int index, ret, count, len;const u32 *cell;
drivers/video/rockchip/rk_lvds.c +2 -2
@@ -162,7 +162,7 @@ int rk_lvds_enable(struct udevice *dev, int panel_bpp,int rk_lvds_read_timing (struct udevice *dev,struct display_timing *timing) {if (fdtdec_decode_display_timing - (gd->fdt_blob, dev->of_offset,0 , timing)) { + (gd->fdt_blob,dev_of_offset (dev),0 , timing)) {debug ("%s: Failed to decode display timing\n" , __func__);return -EINVAL ; }
@@ -174,7 +174,7 @@ static int rk_lvds_ofdata_to_platdata(struct udevice *dev) {struct rk_lvds_priv *priv =dev_get_priv (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret; priv->regs = (void *)dev_get_addr (dev); priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF );
drivers/video/rockchip/rk_vop.c +1 -1
@@ -321,7 +321,7 @@ static int rk_vop_probe(struct udevice *dev)* clock so it is currently not possible to use more than one display * device simultaneously. */ - port =fdt_subnode_offset (blob, dev->of_offset,"port" ); + port =fdt_subnode_offset (blob,dev_of_offset (dev),"port" );if (port <0 )return -EINVAL ; for (node = fdt_first_subnode(blob, port);
drivers/video/sandbox_sdl.c +1 -1
@@ -46,7 +46,7 @@ static int sandbox_sdl_bind(struct udevice *dev)struct video_uc_platdata *uc_plat =dev_get_uclass_platdata (dev);struct sandbox_sdl_plat *plat =dev_get_platdata (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int ret =0 ; plat->xres =fdtdec_get_int (blob, node,"xres" ,LCD_MAX_WIDTH );
drivers/video/tegra.c +2 -2
@@ -338,7 +338,7 @@ static int tegra_lcd_ofdata_to_platdata(struct udevice *dev)struct tegra_lcd_priv *priv =dev_get_priv (dev);const void *blob = gd->fdt_blob;struct display_timing *timing; -int node = dev->of_offset; +int node =dev_of_offset (dev);int panel_node;int rgb;int ret;
@@ -392,7 +392,7 @@ static int tegra_lcd_bind(struct udevice *dev) {struct video_uc_platdata *plat =dev_get_uclass_platdata (dev);const void *blob = gd->fdt_blob; -int node = dev->of_offset; +int node =dev_of_offset (dev);int rgb; rgb =fdt_subnode_offset (blob, node,"rgb" );
drivers/video/tegra124/display.c +2 -2
@@ -363,9 +363,9 @@ static int display_init(struct udevice *dev, void *lcdbase,return ret; } - dc_ctlr = (struct dc_ctlr *)fdtdec_get_addr (blob, dev->of_offset, + dc_ctlr = (struct dc_ctlr *)fdtdec_get_addr (blob,dev_of_offset (dev),"reg" ); -if (fdtdec_decode_display_timing (blob, dev->of_offset,0 , timing)) { +if (fdtdec_decode_display_timing (blob,dev_of_offset (dev),0 , timing)) {debug ("%s: Failed to decode display timing\n" , __func__);return -EINVAL ; }
drivers/video/tegra124/sor.c +3 -3
@@ -757,7 +757,7 @@ int tegra_dc_sor_attach(struct udevice *dc_dev, struct udevice *dev,/* Use the first display controller */ debug ("%s\n" , __func__); - node = dc_dev->of_offset; + node =dev_of_offset (dc_dev); disp_ctrl = (struct dc_ctlr *)fdtdec_get_addr (blob, node,"reg" );tegra_dc_sor_enable_dc (disp_ctrl);
@@ -973,7 +973,7 @@ int tegra_dc_sor_detach(struct udevice *dc_dev, struct udevice *dev)debug ("%s\n" , __func__);/* Use the first display controller */ - node = dc_dev->of_offset; + node =dev_of_offset (dc_dev); disp_ctrl = (struct dc_ctlr *)fdtdec_get_addr (blob, node,"reg" );/* Sleep mode */
@@ -1045,7 +1045,7 @@ static int tegra_sor_ofdata_to_platdata(struct udevice *dev)int node;int ret; - priv->base = (void *)fdtdec_get_addr (blob, dev->of_offset,"reg" ); + priv->base = (void *)fdtdec_get_addr (blob,dev_of_offset (dev),"reg" ); node =fdtdec_next_compatible (blob,0 ,COMPAT_NVIDIA_TEGRA124_PMC );if (node <0 ) {
include/dm/device.h +10 -0
@@ -121,6 +121,16 @@ struct udevice {/* Returns non-zero if the device is active (probed and not removed) */ #define device_active (dev) ((dev)->flags & DM_FLAG_ACTIVATED) +static inline int dev_of_offset (const struct udevice *dev) +{ +return dev->of_offset; +} + +static inline void dev_set_of_offset (struct udevice *dev,int of_offset) +{ + dev->of_offset = of_offset; +} +/** * struct udevice_id - Lists the compatible strings supported by a driver * @compatible: Compatible string
test/dm/spi.c +1 -1
@@ -35,7 +35,7 @@ static int dm_test_spi_find(struct unit_test_state *uts)*/ ut_asserteq (0 ,uclass_get_device_by_seq (UCLASS_SPI , busnum, &bus));ut_assertok (spi_cs_info (bus, cs, &info)); - of_offset = info.dev->of_offset; + of_offset =dev_of_offset (info.dev);device_remove (info.dev);device_unbind (info.dev);
test/dm/test-fdt.c +4 -4
@@ -37,9 +37,9 @@ static int testfdt_ofdata_to_platdata(struct udevice *dev) {struct dm_test_pdata *pdata =dev_get_platdata (dev); - pdata->ping_add =fdtdec_get_int (gd->fdt_blob, dev->of_offset, + pdata->ping_add =fdtdec_get_int (gd->fdt_blob,dev_of_offset (dev),"ping-add" ,-1 ); - pdata->base =fdtdec_get_addr (gd->fdt_blob, dev->of_offset, + pdata->base =fdtdec_get_addr (gd->fdt_blob,dev_of_offset (dev),"ping-expect" );return 0 ;
@@ -121,10 +121,10 @@ int dm_check_devices(struct unit_test_state *uts, int num_devices)* want to test the code that sets that up * (testfdt_drv_probe()). */ - base =fdtdec_get_addr (gd->fdt_blob, dev->of_offset, + base =fdtdec_get_addr (gd->fdt_blob,dev_of_offset (dev),"ping-expect" );debug ("dev=%d, base=%d: %s\n" , i, base, -fdt_get_name (gd->fdt_blob, dev->of_offset,NULL )); +fdt_get_name (gd->fdt_blob,dev_of_offset (dev),NULL ));ut_assert (!dm_check_operations (uts, dev, base,dev_get_priv (dev)));
Signature · 1 line
2.11.0.483.g087da7b7c-goog
PATCH 1/1 dm: core: Replace of_offset with accessor
Quoted 7 lines · Simon Glass
At present devices use a simple integer offset to record the device tree node associated with the device. In preparation for supporting a live device tree, which uses a node pointer instead, refactor existing code to access this field through an inline function.
Signed-off-by Simon Glass <[email protected]>---
Updated to include a few more occurences and
Applied to u-boot-dm