From: Simon Glass Date: Thu, 3 Dec 2020 23:55:23 +0000 (-0700) Subject: dm: treewide: Rename ..._platdata variables to just ..._plat X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/%7B%7B%20.RelPermalink%20%7D%7D?a=commitdiff_plain;h=8a8d24bdf174851ebb8607f359d54b72e3283b97;p=u-boot.git dm: treewide: Rename ..._platdata variables to just ..._plat Try to maintain some consistency between these variables by using _plat as a suffix for them. Signed-off-by: Simon Glass --- diff --git a/arch/arm/include/asm/arch-hi6220/gpio.h b/arch/arm/include/asm/arch-hi6220/gpio.h index c5ee359a3a..12717a96aa 100644 --- a/arch/arm/include/asm/arch-hi6220/gpio.h +++ b/arch/arm/include/asm/arch-hi6220/gpio.h @@ -18,7 +18,7 @@ struct gpio_bank { }; /* Information about a GPIO bank */ -struct hikey_gpio_platdata { +struct hikey_gpio_plat { int bank_index; ulong base; /* address of registers in physical memory */ }; diff --git a/arch/arm/include/asm/arch-imx8/power-domain.h b/arch/arm/include/asm/arch-imx8/power-domain.h index 1396008877..1db86a1209 100644 --- a/arch/arm/include/asm/arch-imx8/power-domain.h +++ b/arch/arm/include/asm/arch-imx8/power-domain.h @@ -8,7 +8,7 @@ #include -struct imx8_power_domain_platdata { +struct imx8_power_domain_plat { sc_rsrc_t resource_id; }; diff --git a/arch/arm/include/asm/arch-imx8m/power-domain.h b/arch/arm/include/asm/arch-imx8m/power-domain.h index 0f94945894..7a833e564b 100644 --- a/arch/arm/include/asm/arch-imx8m/power-domain.h +++ b/arch/arm/include/asm/arch-imx8m/power-domain.h @@ -6,7 +6,7 @@ #ifndef _ASM_ARCH_IMX8M_POWER_DOMAIN_H #define _ASM_ARCH_IMX8M_POWER_DOMAIN_H -struct imx8m_power_domain_platdata { +struct imx8m_power_domain_plat { int resource_id; int has_pd; struct power_domain pd; diff --git a/arch/arm/include/asm/arch-vf610/gpio.h b/arch/arm/include/asm/arch-vf610/gpio.h index 9bfdf16873..0b9e10f51e 100644 --- a/arch/arm/include/asm/arch-vf610/gpio.h +++ b/arch/arm/include/asm/arch-vf610/gpio.h @@ -20,7 +20,7 @@ struct vybrid_gpio_regs { u32 gpio_pdir; }; -struct vybrid_gpio_platdata { +struct vybrid_gpio_plat { unsigned int chip; u32 base; const char *port_name; diff --git a/arch/arm/include/asm/omap_gpio.h b/arch/arm/include/asm/omap_gpio.h index 151afa8f44..4084210021 100644 --- a/arch/arm/include/asm/omap_gpio.h +++ b/arch/arm/include/asm/omap_gpio.h @@ -25,7 +25,7 @@ #if CONFIG_IS_ENABLED(DM_GPIO) /* Information about a GPIO bank */ -struct omap_gpio_platdata { +struct omap_gpio_plat { int bank_index; ulong base; /* address of registers in physical memory */ const char *port_name; diff --git a/arch/arm/include/asm/omap_i2c.h b/arch/arm/include/asm/omap_i2c.h index a6975401da..ec7a145f17 100644 --- a/arch/arm/include/asm/omap_i2c.h +++ b/arch/arm/include/asm/omap_i2c.h @@ -6,7 +6,7 @@ #ifdef CONFIG_DM_I2C /* Information about a GPIO bank */ -struct omap_i2c_platdata { +struct omap_i2c_plat { ulong base; /* address of registers in physical memory */ int speed; int ip_rev; diff --git a/arch/arm/include/asm/omap_musb.h b/arch/arm/include/asm/omap_musb.h index b40ea005be..614c93def8 100644 --- a/arch/arm/include/asm/omap_musb.h +++ b/arch/arm/include/asm/omap_musb.h @@ -23,7 +23,7 @@ struct omap_musb_board_data { enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; -struct ti_musb_platdata { +struct ti_musb_plat { void *base; void *ctrl_mod_base; struct musb_hdrc_platform_data plat; diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c index 8122d2f98e..9d787197f3 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c @@ -213,7 +213,7 @@ void at91_sdram_hw_init(void) } /* Platform data for the GPIOs */ -static const struct at91_port_platdata at91sam9260_plat[] = { +static const struct at91_port_plat at91sam9260_plat[] = { { ATMEL_BASE_PIOA, "PA" }, { ATMEL_BASE_PIOB, "PB" }, { ATMEL_BASE_PIOC, "PC" }, diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c index 08ca3edd78..f503553b92 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c @@ -167,7 +167,7 @@ void at91_mci_hw_init(void) #endif /* Platform data for the GPIOs */ -static const struct at91_port_platdata at91sam9260_plat[] = { +static const struct at91_port_plat at91sam9260_plat[] = { { ATMEL_BASE_PIOA, "PA" }, { ATMEL_BASE_PIOB, "PB" }, { ATMEL_BASE_PIOC, "PC" }, diff --git a/arch/arm/mach-at91/include/mach/atmel_serial.h b/arch/arm/mach-at91/include/mach/atmel_serial.h index c53a509ff8..5d14269364 100644 --- a/arch/arm/mach-at91/include/mach/atmel_serial.h +++ b/arch/arm/mach-at91/include/mach/atmel_serial.h @@ -7,7 +7,7 @@ #define _ATMEL_SERIAL_H /* Information about a serial port */ -struct atmel_serial_platdata { +struct atmel_serial_plat { uint32_t base_addr; }; diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index 575c6436ad..c1aef798b1 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -253,7 +253,7 @@ static inline unsigned at91_gpio_to_pin(unsigned gpio) } /* Platform data for each GPIO port */ -struct at91_port_platdata { +struct at91_port_plat { uint32_t base_addr; const char *bank_name; }; diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h index 3263de9a35..4aeb48eeb2 100644 --- a/arch/arm/mach-bcm283x/include/mach/gpio.h +++ b/arch/arm/mach-bcm283x/include/mach/gpio.h @@ -52,11 +52,11 @@ struct bcm2835_gpio_regs { }; /** - * struct bcm2835_gpio_platdata - GPIO platform description + * struct bcm2835_gpio_plat - GPIO platform description * * @base: Base address of GPIO controller */ -struct bcm2835_gpio_platdata { +struct bcm2835_gpio_plat { unsigned long base; }; diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c index 7e7646a2e1..04e026a8b7 100644 --- a/arch/arm/mach-lpc32xx/devices.c +++ b/arch/arm/mach-lpc32xx/devices.c @@ -43,7 +43,7 @@ void lpc32xx_uart_init(unsigned int uart_id) } #if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct ns16550_platdata lpc32xx_uart[] = { +static const struct ns16550_plat lpc32xx_uart[] = { { .base = UART3_BASE, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, }, { .base = UART4_BASE, .reg_shift = 2, @@ -55,7 +55,7 @@ static const struct ns16550_platdata lpc32xx_uart[] = { }; #if defined(CONFIG_LPC32XX_HSUART) -static const struct lpc32xx_hsuart_platdata lpc32xx_hsuart[] = { +static const struct lpc32xx_hsuart_plat lpc32xx_hsuart[] = { { HS_UART1_BASE, }, { HS_UART2_BASE, }, { HS_UART7_BASE, }, diff --git a/arch/arm/mach-nexell/include/mach/display.h b/arch/arm/mach-nexell/include/mach/display.h index b167e63a5a..b0ee912605 100644 --- a/arch/arm/mach-nexell/include/mach/display.h +++ b/arch/arm/mach-nexell/include/mach/display.h @@ -212,7 +212,7 @@ struct dp_hdmi_dev { }; /* platform data for the driver model */ -struct nx_display_platdata { +struct nx_display_plat { int module; struct dp_sync_info sync; struct dp_ctrl_info ctrl; @@ -267,7 +267,7 @@ int dp_plane_wait_vsync(int module, int layer, int fps); #if defined CONFIG_SPL_BUILD || \ (!defined(CONFIG_DM) && !defined(CONFIG_OF_CONTROL)) -int nx_display_probe(struct nx_display_platdata *plat); +int nx_display_probe(struct nx_display_plat *plat); #endif #endif diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 4335ee84ec..b5f2b75e24 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -80,7 +80,7 @@ int dram_init_banksize(void) } #if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct ns16550_platdata am33xx_serial[] = { +static const struct ns16550_plat am33xx_serial[] = { { .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, }, # ifdef CONFIG_SYS_NS16550_COM2 @@ -113,7 +113,7 @@ U_BOOT_DEVICES(am33xx_uarts) = { }; #ifdef CONFIG_DM_I2C -static const struct omap_i2c_platdata am33xx_i2c[] = { +static const struct omap_i2c_plat am33xx_i2c[] = { { I2C_BASE1, 100000, OMAP_I2C_REV_V2}, { I2C_BASE2, 100000, OMAP_I2C_REV_V2}, { I2C_BASE3, 100000, OMAP_I2C_REV_V2}, @@ -127,7 +127,7 @@ U_BOOT_DEVICES(am33xx_i2c) = { #endif #if CONFIG_IS_ENABLED(DM_GPIO) -static const struct omap_gpio_platdata am33xx_gpio[] = { +static const struct omap_gpio_plat am33xx_gpio[] = { { 0, AM33XX_GPIO0_BASE }, { 1, AM33XX_GPIO1_BASE }, { 2, AM33XX_GPIO2_BASE }, @@ -214,7 +214,7 @@ static struct musb_hdrc_config musb_config = { }; #if CONFIG_IS_ENABLED(DM_USB) && !CONFIG_IS_ENABLED(OF_CONTROL) -static struct ti_musb_platdata usb0 = { +static struct ti_musb_plat usb0 = { .base = (void *)USB0_OTG_BASE, .ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl0, .plat = { @@ -224,7 +224,7 @@ static struct ti_musb_platdata usb0 = { }, }; -static struct ti_musb_platdata usb1 = { +static struct ti_musb_plat usb1 = { .base = (void *)USB1_OTG_BASE, .ctrl_mod_base = &((struct ctrl_dev *)CTRL_DEVICE_BASE)->usb_ctrl1, .plat = { diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index f08c8ab43a..6ffedd1769 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -38,7 +38,7 @@ static void omap3_invalidate_l2_cache_secure(void); #if CONFIG_IS_ENABLED(DM_GPIO) #if !CONFIG_IS_ENABLED(OF_CONTROL) /* Manually initialize GPIO banks when OF_CONTROL doesn't */ -static const struct omap_gpio_platdata omap34xx_gpio[] = { +static const struct omap_gpio_plat omap34xx_gpio[] = { { 0, OMAP34XX_GPIO1_BASE }, { 1, OMAP34XX_GPIO2_BASE }, { 2, OMAP34XX_GPIO3_BASE }, diff --git a/arch/arm/mach-rockchip/px30/syscon_px30.c b/arch/arm/mach-rockchip/px30/syscon_px30.c index 4672bdbf00..37e88f5ccb 100644 --- a/arch/arm/mach-rockchip/px30/syscon_px30.c +++ b/arch/arm/mach-rockchip/px30/syscon_px30.c @@ -23,7 +23,7 @@ U_BOOT_DRIVER(syscon_px30) = { }; #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int px30_syscon_bind_of_platdata(struct udevice *dev) +static int px30_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -35,20 +35,20 @@ U_BOOT_DRIVER(rockchip_px30_pmu) = { .name = "rockchip_px30_pmu", .id = UCLASS_SYSCON, .of_match = px30_syscon_ids, - .bind = px30_syscon_bind_of_platdata, + .bind = px30_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_px30_pmugrf) = { .name = "rockchip_px30_pmugrf", .id = UCLASS_SYSCON, .of_match = px30_syscon_ids + 1, - .bind = px30_syscon_bind_of_platdata, + .bind = px30_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_px30_grf) = { .name = "rockchip_px30_grf", .id = UCLASS_SYSCON, .of_match = px30_syscon_ids + 2, - .bind = px30_syscon_bind_of_platdata, + .bind = px30_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c index ea7d7b5b1a..917ff37c0f 100644 --- a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c @@ -24,7 +24,7 @@ U_BOOT_DRIVER(syscon_rk3188) = { }; #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3188_syscon_bind_of_platdata(struct udevice *dev) +static int rk3188_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -36,20 +36,20 @@ U_BOOT_DRIVER(rockchip_rk3188_noc) = { .name = "rockchip_rk3188_noc", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids, - .bind = rk3188_syscon_bind_of_platdata, + .bind = rk3188_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3188_grf) = { .name = "rockchip_rk3188_grf", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids + 1, - .bind = rk3188_syscon_bind_of_platdata, + .bind = rk3188_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3188_pmu) = { .name = "rockchip_rk3188_pmu", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids + 2, - .bind = rk3188_syscon_bind_of_platdata, + .bind = rk3188_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c index e3da0a0194..9c1ae880c7 100644 --- a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c @@ -25,7 +25,7 @@ U_BOOT_DRIVER(syscon_rk3288) = { }; #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3288_syscon_bind_of_platdata(struct udevice *dev) +static int rk3288_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -37,27 +37,27 @@ U_BOOT_DRIVER(rockchip_rk3288_noc) = { .name = "rockchip_rk3288_noc", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3288_grf) = { .name = "rockchip_rk3288_grf", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids + 1, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3288_sgrf) = { .name = "rockchip_rk3288_sgrf", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids + 2, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3288_pmu) = { .name = "rockchip_rk3288_pmu", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids + 3, - .bind = rk3288_syscon_bind_of_platdata, + .bind = rk3288_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c index cba0dda3e8..dc2d831dd8 100644 --- a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c @@ -30,7 +30,7 @@ U_BOOT_DRIVER(syscon_rk3368) = { }; #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3368_syscon_bind_of_platdata(struct udevice *dev) +static int rk3368_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -42,27 +42,27 @@ U_BOOT_DRIVER(rockchip_rk3368_grf) = { .name = "rockchip_rk3368_grf", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3368_pmugrf) = { .name = "rockchip_rk3368_pmugrf", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids + 1, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3368_msch) = { .name = "rockchip_rk3368_msch", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids + 2, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3368_sgrf) = { .name = "rockchip_rk3368_sgrf", .id = UCLASS_SYSCON, .of_match = rk3368_syscon_ids + 3, - .bind = rk3368_syscon_bind_of_platdata, + .bind = rk3368_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c index 690cbe7f27..b360ca7dde 100644 --- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c @@ -28,7 +28,7 @@ U_BOOT_DRIVER(syscon_rk3399) = { }; #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int rk3399_syscon_bind_of_platdata(struct udevice *dev) +static int rk3399_syscon_bind_of_plat(struct udevice *dev) { dev->driver_data = dev->driver->of_match->data; debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data); @@ -40,34 +40,34 @@ U_BOOT_DRIVER(rockchip_rk3399_grf) = { .name = "rockchip_rk3399_grf", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3399_pmugrf) = { .name = "rockchip_rk3399_pmugrf", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 1, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3399_pmusgrf) = { .name = "rockchip_rk3399_pmusgrf", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 2, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3399_cic) = { .name = "rockchip_rk3399_cic", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 3, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, }; U_BOOT_DRIVER(rockchip_rk3399_pmu) = { .name = "rockchip_rk3399_pmu", .id = UCLASS_SYSCON, .of_match = rk3399_syscon_ids + 4, - .bind = rk3399_syscon_bind_of_platdata, + .bind = rk3399_syscon_bind_of_plat, }; #endif diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index 3e9c1f3b33..85a9e6f84e 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -280,13 +280,13 @@ static int bsec_program_otp(long base, u32 val, u32 otp) } /* BSEC MISC driver *******************************************************/ -struct stm32mp_bsec_platdata { +struct stm32mp_bsec_plat { u32 base; }; static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; u32 tmp_data = 0; int ret; @@ -319,7 +319,7 @@ static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp) static int stm32mp_bsec_read_shadow(struct udevice *dev, u32 *val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; if (IS_ENABLED(CONFIG_TFABOOT)) return stm32_smc(STM32_SMC_BSEC, @@ -333,7 +333,7 @@ static int stm32mp_bsec_read_shadow(struct udevice *dev, u32 *val, u32 otp) static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp) { - struct stm32mp_bsec_platdata *plat = dev_get_plat(dev); + struct stm32mp_bsec_plat *plat = dev_get_plat(dev); /* return OTP permanent write lock status */ *val = bsec_read_lock(plat->base + BSEC_WRLOCK_OFF, otp); @@ -343,7 +343,7 @@ static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp) static int stm32mp_bsec_write_otp(struct udevice *dev, u32 val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; if (IS_ENABLED(CONFIG_TFABOOT)) return stm32_smc_exec(STM32_SMC_BSEC, @@ -358,7 +358,7 @@ static int stm32mp_bsec_write_otp(struct udevice *dev, u32 val, u32 otp) static int stm32mp_bsec_write_shadow(struct udevice *dev, u32 val, u32 otp) { - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; if (IS_ENABLED(CONFIG_TFABOOT)) return stm32_smc_exec(STM32_SMC_BSEC, @@ -475,7 +475,7 @@ static const struct misc_ops stm32mp_bsec_ops = { static int stm32mp_bsec_of_to_plat(struct udevice *dev) { - struct stm32mp_bsec_platdata *plat = dev_get_plat(dev); + struct stm32mp_bsec_plat *plat = dev_get_plat(dev); plat->base = (u32)dev_read_addr_ptr(dev); @@ -485,7 +485,7 @@ static int stm32mp_bsec_of_to_plat(struct udevice *dev) static int stm32mp_bsec_probe(struct udevice *dev) { int otp; - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; /* * update unlocked shadow for OTP cleared by the rom code @@ -513,7 +513,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = { .id = UCLASS_MISC, .of_match = stm32mp_bsec_ids, .of_to_plat = stm32mp_bsec_of_to_plat, - .plat_auto = sizeof(struct stm32mp_bsec_platdata), + .plat_auto = sizeof(struct stm32mp_bsec_plat), .ops = &stm32mp_bsec_ops, .probe = stm32mp_bsec_probe, }; @@ -521,7 +521,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = { bool bsec_dbgswenable(void) { struct udevice *dev; - struct stm32mp_bsec_platdata *plat; + struct stm32mp_bsec_plat *plat; int ret; ret = uclass_get_device_by_driver(UCLASS_MISC, diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index 03faacbd57..bf01aa5ee8 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -257,7 +257,7 @@ void board_init_uart_f(void) } #if !CONFIG_IS_ENABLED(OF_CONTROL) -static struct ns16550_platdata ns16550_com1_pdata = { +static struct ns16550_plat ns16550_com1_pdata = { .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2, .clock = CONFIG_SYS_NS16550_CLK, diff --git a/arch/riscv/include/asm/arch-fu540/gpio.h b/arch/riscv/include/asm/arch-fu540/gpio.h index 0d16c59ca6..b87282b974 100644 --- a/arch/riscv/include/asm/arch-fu540/gpio.h +++ b/arch/riscv/include/asm/arch-fu540/gpio.h @@ -28,7 +28,7 @@ enum gpio_state { }; /* Details about a GPIO bank */ -struct sifive_gpio_platdata { +struct sifive_gpio_plat { void *base; /* address of registers in physical memory */ }; diff --git a/arch/riscv/include/asm/arch-generic/gpio.h b/arch/riscv/include/asm/arch-generic/gpio.h index dfcb753051..b1f403027d 100644 --- a/arch/riscv/include/asm/arch-generic/gpio.h +++ b/arch/riscv/include/asm/arch-generic/gpio.h @@ -28,7 +28,7 @@ enum gpio_state { }; /* Details about a GPIO bank */ -struct sifive_gpio_platdata { +struct sifive_gpio_plat { void *base; /* address of registers in physical memory */ }; diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c index 16f90a484d..e4674f3788 100644 --- a/arch/x86/cpu/apollolake/hostbridge.c +++ b/arch/x86/cpu/apollolake/hostbridge.c @@ -42,7 +42,7 @@ enum { }; /** - * struct apl_hostbridge_platdata - platform data for hostbridge + * struct apl_hostbridge_plat - platform data for hostbridge * * @dtplat: Platform data for of-platdata * @early_pads: Early pad data to set up, each (pad, cfg0, cfg1) @@ -50,7 +50,7 @@ enum { * @pciex_region_size: BAR length in bytes * @bdf: Bus/device/function of hostbridge */ -struct apl_hostbridge_platdata { +struct apl_hostbridge_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_apl_hostbridge dtplat; #endif @@ -158,7 +158,7 @@ static const struct nhlt_endp_descriptor dmic_4ch_descriptors[] = { static int apl_hostbridge_early_init_pinctrl(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_plat(dev); + struct apl_hostbridge_plat *plat = dev_get_plat(dev); struct udevice *pinctrl; int ret; @@ -172,7 +172,7 @@ static int apl_hostbridge_early_init_pinctrl(struct udevice *dev) static int apl_hostbridge_early_init(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_plat(dev); + struct apl_hostbridge_plat *plat = dev_get_plat(dev); u32 region_size; ulong base; u32 reg; @@ -223,7 +223,7 @@ static int apl_hostbridge_early_init(struct udevice *dev) static int apl_hostbridge_of_to_plat(struct udevice *dev) { - struct apl_hostbridge_platdata *plat = dev_get_plat(dev); + struct apl_hostbridge_plat *plat = dev_get_plat(dev); struct udevice *pinctrl; int ret; @@ -403,7 +403,7 @@ U_BOOT_DRIVER(intel_apl_hostbridge) = { .of_to_plat = apl_hostbridge_of_to_plat, .probe = apl_hostbridge_probe, .remove = apl_hostbridge_remove, - .plat_auto = sizeof(struct apl_hostbridge_platdata), + .plat_auto = sizeof(struct apl_hostbridge_plat), ACPI_OPS_PTR(&apl_hostbridge_acpi_ops) .flags = DM_FLAG_OS_PREPARE, }; diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index 931f3399cb..290b2cb3e7 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -53,7 +53,7 @@ enum { CF9_GLB_RST = 1 << 20, }; -struct apl_pmc_platdata { +struct apl_pmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_apl_pmc dtplat; #endif @@ -108,10 +108,10 @@ static int apl_global_reset_set_enable(struct udevice *dev, bool enable) return 0; } -int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) +int apl_pmc_ofdata_to_uc_plat(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); - struct apl_pmc_platdata *plat = dev_get_plat(dev); + struct apl_pmc_plat *plat = dev_get_plat(dev); #if !CONFIG_IS_ENABLED(OF_PLATDATA) u32 base[6]; @@ -144,7 +144,7 @@ int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) if (ret) return log_msg_ret("Bad gpe0-dw", ret); - return pmc_ofdata_to_uc_platdata(dev); + return pmc_ofdata_to_uc_plat(dev); #else struct dtd_intel_apl_pmc *dtplat = &plat->dtplat; @@ -169,7 +169,7 @@ int apl_pmc_ofdata_to_uc_platdata(struct udevice *dev) static int enable_pmcbar(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); - struct apl_pmc_platdata *priv = dev_get_plat(dev); + struct apl_pmc_plat *priv = dev_get_plat(dev); pci_dev_t pmc = priv->bdf; /* @@ -221,8 +221,8 @@ U_BOOT_DRIVER(intel_apl_pmc) = { .name = "intel_apl_pmc", .id = UCLASS_ACPI_PMC, .of_match = apl_pmc_ids, - .of_to_plat = apl_pmc_ofdata_to_uc_platdata, + .of_to_plat = apl_pmc_ofdata_to_uc_plat, .probe = apl_pmc_probe, .ops = &apl_pmc_ops, - .plat_auto = sizeof(struct apl_pmc_platdata), + .plat_auto = sizeof(struct apl_pmc_plat), }; diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index 4110619a77..3a1588bbd8 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -92,7 +92,7 @@ static int apl_flash_bind(struct udevice *dev) { if (CONFIG_IS_ENABLED(OF_PLATDATA) && !CONFIG_IS_ENABLED(OF_PLATDATA_PARENT)) { - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat; struct udevice *spi; int ret; diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c index b70299b1dd..26aef655be 100644 --- a/arch/x86/cpu/apollolake/uart.c +++ b/arch/x86/cpu/apollolake/uart.c @@ -68,7 +68,7 @@ void apl_uart_init(pci_dev_t bdf, ulong base) * This driver uses its own compatible string but almost everything else from * the standard ns16550 driver. This allows us to provide an of-platdata * implementation, since the platdata produced by of-platdata does not match - * struct ns16550_platdata. + * struct ns16550_plat. * * When running with of-platdata (generally TPL), the platdata is converted to * something that ns16550 expects. When running withoutof-platdata (SPL, U-Boot @@ -77,7 +77,7 @@ void apl_uart_init(pci_dev_t bdf, ulong base) static int apl_ns16550_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_plat(dev); + struct ns16550_plat *plat = dev_get_plat(dev); if (!CONFIG_IS_ENABLED(PCI)) apl_uart_init(plat->bdf, plat->base); @@ -89,7 +89,7 @@ static int apl_ns16550_of_to_plat(struct udevice *dev) { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_apl_ns16550 *dtplat = dev_get_plat(dev); - struct ns16550_platdata *plat; + struct ns16550_plat *plat; /* * Convert our plat to the ns16550's plat, so we can just use @@ -126,7 +126,7 @@ U_BOOT_DRIVER(intel_apl_ns16550) = { .name = "intel_apl_ns16550", .id = UCLASS_SERIAL, .of_match = apl_ns16550_serial_ids, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .priv_auto = sizeof(struct NS16550), .ops = &ns16550_serial_ops, .of_to_plat = apl_ns16550_of_to_plat, diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index c33116a0ff..ceb395ddcf 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -17,7 +17,7 @@ #include #include -struct sata_platdata { +struct sata_plat { int port_map; uint port0_gen3_tx; uint port1_gen3_tx; @@ -41,7 +41,7 @@ struct sata_platdata { static void broadwell_sata_init(struct udevice *dev) { - struct sata_platdata *plat = dev_get_plat(dev); + struct sata_plat *plat = dev_get_plat(dev); u32 reg32; u8 *abar; u16 reg16; @@ -211,7 +211,7 @@ static void broadwell_sata_init(struct udevice *dev) static int broadwell_sata_enable(struct udevice *dev) { - struct sata_platdata *plat = dev_get_plat(dev); + struct sata_plat *plat = dev_get_plat(dev); struct gpio_desc desc; u16 map; int ret; @@ -234,7 +234,7 @@ static int broadwell_sata_enable(struct udevice *dev) static int broadwell_sata_of_to_plat(struct udevice *dev) { - struct sata_platdata *plat = dev_get_plat(dev); + struct sata_plat *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); @@ -266,5 +266,5 @@ U_BOOT_DRIVER(ahci_broadwell_drv) = { .of_match = broadwell_ahci_ids, .of_to_plat = broadwell_sata_of_to_plat, .probe = broadwell_sata_probe, - .plat_auto = sizeof(struct sata_platdata), + .plat_auto = sizeof(struct sata_plat), }; diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index 57441c1919..bfb511a510 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR; int cpu_x86_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); struct cpuid_result res; plat->cpu_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c index b9ea968a96..e71ea029e5 100644 --- a/arch/x86/cpu/intel_common/itss.c +++ b/arch/x86/cpu/intel_common/itss.c @@ -19,7 +19,7 @@ #include #include -struct itss_platdata { +struct itss_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) /* Put this first since driver model will copy the data here */ struct dtd_intel_itss dtplat; @@ -184,7 +184,7 @@ static int itss_of_to_plat(struct udevice *dev) int ret; #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct itss_platdata *plat = dev_get_plat(dev); + struct itss_plat *plat = dev_get_plat(dev); struct dtd_intel_itss *dtplat = &plat->dtplat; /* @@ -242,6 +242,6 @@ U_BOOT_DRIVER(intel_itss) = { .ops = &itss_ops, .bind = itss_bind, .of_to_plat = itss_of_to_plat, - .plat_auto = sizeof(struct itss_platdata), + .plat_auto = sizeof(struct itss_plat), .priv_auto = sizeof(struct itss_priv), }; diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index 098b6f00ae..e6edab0b05 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -19,7 +19,7 @@ #define PCH_P2SB_E0 0xe0 #define HIDE_BIT BIT(0) -struct p2sb_platdata { +struct p2sb_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_p2sb dtplat; #endif @@ -57,7 +57,7 @@ struct p2sb_platdata { */ static int p2sb_early_init(struct udevice *dev) { - struct p2sb_platdata *plat = dev_get_plat(dev); + struct p2sb_plat *plat = dev_get_plat(dev); pci_dev_t pdev = plat->bdf; /* @@ -93,7 +93,7 @@ static int p2sb_spl_init(struct udevice *dev) int p2sb_of_to_plat(struct udevice *dev) { struct p2sb_uc_priv *upriv = dev_get_uclass_priv(dev); - struct p2sb_platdata *plat = dev_get_plat(dev); + struct p2sb_plat *plat = dev_get_plat(dev); #if !CONFIG_IS_ENABLED(OF_PLATDATA) int ret; @@ -167,7 +167,7 @@ static int p2sb_remove(struct udevice *dev) static int p2sb_child_post_bind(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); int ret; u32 pid; @@ -197,8 +197,8 @@ U_BOOT_DRIVER(intel_p2sb) = { .remove = p2sb_remove, .ops = &p2sb_ops, .of_to_plat = p2sb_of_to_plat, - .plat_auto = sizeof(struct p2sb_platdata), - .per_child_plat_auto = sizeof(struct p2sb_child_platdata), + .plat_auto = sizeof(struct p2sb_plat), + .per_child_plat_auto = sizeof(struct p2sb_child_plat), .child_post_bind = p2sb_child_post_bind, .flags = DM_FLAG_OS_PREPARE, }; diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index 72544361d8..a0e112178d 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -221,7 +221,7 @@ static int find_cpu_by_apic_id(int apic_id, struct udevice **devp) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); if (plat->cpu_id == apic_id) { *devp = dev; @@ -706,7 +706,7 @@ static int ap_wait_for_instruction(struct udevice *cpu, void *unused) static int mp_init_cpu(struct udevice *cpu, void *unused) { - struct cpu_platdata *plat = dev_get_parent_plat(cpu); + struct cpu_plat *plat = dev_get_parent_plat(cpu); plat->ucode_version = microcode_read_rev(); plat->device_id = gd->arch.x86_device; diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c index a169783e2c..a35de878b5 100644 --- a/arch/x86/cpu/qfw_cpu.c +++ b/arch/x86/cpu/qfw_cpu.c @@ -18,7 +18,7 @@ int qemu_cpu_fixup(void) int cpu_num; int cpu_online; struct udevice *dev, *pdev; - struct cpu_platdata *plat; + struct cpu_plat *plat; char *cpu; /* first we need to find '/cpus' */ diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c index a285e4d202..5d8963220d 100644 --- a/arch/x86/cpu/slimbootloader/serial.c +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -18,7 +18,7 @@ static int slimbootloader_serial_of_to_plat(struct udevice *dev) { const efi_guid_t guid = SBL_SERIAL_PORT_INFO_GUID; struct sbl_serial_port_info *data; - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat; if (!gd->arch.hob_list) panic("hob list not found!"); @@ -58,7 +58,7 @@ U_BOOT_DRIVER(serial_slimbootloader) = { .id = UCLASS_SERIAL, .of_match = slimbootloader_serial_ids, .of_to_plat = slimbootloader_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, diff --git a/arch/x86/include/asm/arch-broadwell/gpio.h b/arch/x86/include/asm/arch-broadwell/gpio.h index a32e2db47e..393230e52b 100644 --- a/arch/x86/include/asm/arch-broadwell/gpio.h +++ b/arch/x86/include/asm/arch-broadwell/gpio.h @@ -11,7 +11,7 @@ #define GPIO_PER_BANK 32 #define GPIO_BANKS 3 -struct broadwell_bank_platdata { +struct broadwell_bank_plat { uint16_t base_addr; const char *bank_name; int bank; diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h index 58e4d7b831..a45ae3463c 100644 --- a/arch/x86/include/asm/gpio.h +++ b/arch/x86/include/asm/gpio.h @@ -8,7 +8,7 @@ #include -struct ich6_bank_platdata { +struct ich6_bank_plat { uint16_t base_addr; const char *bank_name; int offset; diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 796d3689b3..9a41ecb587 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -74,7 +74,7 @@ int acpi_create_madt_lapics(u32 current) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); int length; length = acpi_create_madt_lapic( diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index e4c43fb76d..a029237d08 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -80,7 +80,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa) static int fsp_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct vesa_mode_info *vesa = &mode_info.vesa; int ret; @@ -124,7 +124,7 @@ err: static int fsp_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); /* Set the maximum supported resolution */ plat->size = 2560 * 1600 * 4; diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index d6f0e9517f..562a27c557 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -81,7 +81,7 @@ void mp_write_processor(struct mp_config_table *mc) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); u8 cpuflag = MPC_CPU_EN; if (!device_active(dev)) diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c index 7de0aa0d70..85e963b634 100644 --- a/arch/x86/lib/sfi.c +++ b/arch/x86/lib/sfi.c @@ -84,7 +84,7 @@ static int sfi_write_cpus(struct table_info *tab) for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); if (!device_active(dev)) continue; diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 80a5f95e01..21bea62e9b 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR; -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = 0x16000000, #ifdef CONFIG_ARCH_CINTEGRATOR .type = TYPE_PL011, @@ -45,7 +45,7 @@ static const struct pl01x_serial_platdata serial_platdata = { U_BOOT_DEVICE(integrator_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; void peripheral_power_enable (void); diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c index 35e8743e49..6263d0c361 100644 --- a/board/armltd/total_compute/total_compute.c +++ b/board/armltd/total_compute/total_compute.c @@ -9,7 +9,7 @@ #include #include -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = UART0_BASE, .type = TYPE_PL011, .clock = CONFIG_PL011_CLOCK, @@ -17,7 +17,7 @@ static const struct pl01x_serial_platdata serial_platdata = { U_BOOT_DEVICE(total_compute_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; static struct mm_region total_compute_mem_map[] = { diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 89710e0ffa..6df6bcd3cf 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = V2M_UART0, .type = TYPE_PL011, .clock = CONFIG_PL011_CLOCK, @@ -28,7 +28,7 @@ static const struct pl01x_serial_platdata serial_platdata = { U_BOOT_DEVICE(vexpress_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; static struct mm_region vexpress64_mem_map[] = { diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index 6c54910861..a71b4eb733 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -348,7 +348,7 @@ int board_init(void) uclass_find_first_device(UCLASS_VIDEO, &dev); if (dev) { - struct atmel_lcd_platdata *plat = dev_get_plat(dev); + struct atmel_lcd_plat *plat = dev_get_plat(dev); plat->timing_index = 1; } @@ -416,7 +416,7 @@ void reset_phy(void) { } -static struct atmel_serial_platdata at91sam9260_serial_plat = { +static struct atmel_serial_plat at91sam9260_serial_plat = { .base_addr = ATMEL_BASE_DBGU, }; diff --git a/board/bluewater/snapper9260/snapper9260.c b/board/bluewater/snapper9260/snapper9260.c index 12fb87441e..9e41a42263 100644 --- a/board/bluewater/snapper9260/snapper9260.c +++ b/board/bluewater/snapper9260/snapper9260.c @@ -143,7 +143,7 @@ void reset_phy(void) { } -static struct atmel_serial_platdata at91sam9260_serial_plat = { +static struct atmel_serial_plat at91sam9260_serial_plat = { .base_addr = ATMEL_BASE_DBGU, }; diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c index b8f060b1e8..22c4c72361 100644 --- a/board/cavium/thunderx/thunderx.c +++ b/board/cavium/thunderx/thunderx.c @@ -18,7 +18,7 @@ #if !CONFIG_IS_ENABLED(OF_CONTROL) #include -static const struct pl01x_serial_platdata serial0 = { +static const struct pl01x_serial_plat serial0 = { .base = CONFIG_SYS_SERIAL0, .type = TYPE_PL011, .clock = 0, @@ -30,7 +30,7 @@ U_BOOT_DEVICE(thunderx_serial0) = { .plat = &serial0, }; -static const struct pl01x_serial_platdata serial1 = { +static const struct pl01x_serial_plat serial1 = { .base = CONFIG_SYS_SERIAL1, .type = TYPE_PL011, .clock = 0, diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 6b3d034542..bc3ce4d16c 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -724,7 +724,7 @@ u32 get_board_rev(void) return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS); } -static struct mxc_serial_platdata cm_fx6_mxc_serial_plat = { +static struct mxc_serial_plat cm_fx6_mxc_serial_plat = { .reg = (struct mxc_uart *)UART4_BASE, }; diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index cdfe8051e2..a8ece170ce 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -356,7 +356,7 @@ int board_mmc_init(struct bd_info *bis) #endif #ifdef CONFIG_SPL_BUILD -static const struct ns16550_platdata serial_pdata = { +static const struct ns16550_plat serial_pdata = { .base = DAVINCI_UART2_BASE, .reg_shift = 2, .clock = 228000000, @@ -368,7 +368,7 @@ U_BOOT_DEVICE(omapl138_uart) = { .plat = &serial_pdata, }; -static const struct davinci_mmc_plat mmc_platdata = { +static const struct davinci_mmc_plat mmc_plat = { .reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE, .cfg = { .f_min = 200000, @@ -381,7 +381,7 @@ static const struct davinci_mmc_plat mmc_platdata = { }; U_BOOT_DEVICE(omapl138_mmc) = { .name = "ti_da830_mmc", - .plat = &mmc_platdata, + .plat = &mmc_plat, }; void spl_board_init(void) diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 457b466a0b..8d0115eace 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -51,7 +51,7 @@ DECLARE_GLOBAL_DATA_PTR; -static struct pl01x_serial_platdata serial0 = { +static struct pl01x_serial_plat serial0 = { #if CONFIG_CONS_INDEX == 0 .base = CONFIG_SYS_SERIAL0, #elif CONFIG_CONS_INDEX == 1 @@ -67,7 +67,7 @@ U_BOOT_DEVICE(nxp_serial0) = { .plat = &serial0, }; -static struct pl01x_serial_platdata serial1 = { +static struct pl01x_serial_plat serial1 = { .base = CONFIG_SYS_SERIAL1, .type = TYPE_PL011, }; diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 73577d7b71..c7224d1efe 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1371,7 +1371,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif /* CONFIG_OF_BOARD_SETUP */ -static struct mxc_serial_platdata ventana_mxc_serial_plat = { +static struct mxc_serial_plat ventana_mxc_serial_plat = { .reg = (struct mxc_uart *)UART2_BASE, }; diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 26340da945..0ac88306d0 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -26,7 +26,7 @@ #include /*TODO drop this table in favour of device tree */ -static const struct hikey_gpio_platdata hi6220_gpio[] = { +static const struct hikey_gpio_plat hi6220_gpio[] = { { 0, HI6220_GPIO_BASE(0)}, { 1, HI6220_GPIO_BASE(1)}, { 2, HI6220_GPIO_BASE(2)}, @@ -77,7 +77,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { #if CONFIG_CONS_INDEX == 1 .base = HI6220_UART0_BASE, #elif CONFIG_CONS_INDEX == 4 @@ -91,7 +91,7 @@ static const struct pl01x_serial_platdata serial_platdata = { U_BOOT_DEVICE(hikey_seriala) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c index 75a5fdac5d..04b8cde136 100644 --- a/board/hisilicon/hikey960/hikey960.c +++ b/board/hisilicon/hikey960/hikey960.c @@ -26,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !CONFIG_IS_ENABLED(OF_CONTROL) #include -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = HI3660_UART6_BASE, .type = TYPE_PL011, .clock = 19200000 @@ -34,7 +34,7 @@ static const struct pl01x_serial_platdata serial_platdata = { U_BOOT_DEVICE(hikey960_serial0) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 8c8015e88b..b8be4ce45a 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -40,7 +40,7 @@ static struct mm_region poplar_mem_map[] = { struct mm_region *mem_map = poplar_mem_map; #if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = REG_BASE_UART0, .type = TYPE_PL010, .clock = 75000000, @@ -48,7 +48,7 @@ static const struct pl01x_serial_platdata serial_platdata = { U_BOOT_DEVICE(poplar_serial) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index e0ca3c2588..6a7da502dd 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -29,7 +29,7 @@ #include #include "igep00x0.h" -static const struct ns16550_platdata igep_serial = { +static const struct ns16550_plat igep_serial = { .base = OMAP34XX_UART3, .reg_shift = 2, .clock = V_NS16550_CLK, diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index 372abab7e8..d11630b954 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -30,7 +30,7 @@ const omap3_sysinfo sysinfo = { .nand_string = "MMC" }; -static const struct ns16550_platdata serial_omap_platdata = { +static const struct ns16550_plat serial_omap_plat = { .base = OMAP34XX_UART3, .reg_shift = 2, .clock = V_NS16550_CLK, @@ -39,7 +39,7 @@ static const struct ns16550_platdata serial_omap_platdata = { U_BOOT_DEVICE(sniper_serial) = { .name = "ns16550_serial", - .plat = &serial_omap_platdata + .plat = &serial_omap_plat }; static struct musb_hdrc_config musb_config = { diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index 3d62b5d9ad..bafb6205bd 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -703,7 +703,7 @@ void board_mmc_power_init(void) twl4030_power_mmc_init(1); } -static const struct omap_i2c_platdata rx51_i2c[] = { +static const struct omap_i2c_plat rx51_i2c[] = { { I2C_BASE1, 2200000, OMAP_I2C_REV_V1 }, { I2C_BASE2, 100000, OMAP_I2C_REV_V1 }, { I2C_BASE3, 400000, OMAP_I2C_REV_V1 }, diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c index 9efae90193..1613c44929 100644 --- a/board/siemens/corvus/board.c +++ b/board/siemens/corvus/board.c @@ -314,7 +314,7 @@ void spi_cs_deactivate(struct spi_slave *slave) } } -static struct atmel_serial_platdata at91sam9260_serial_plat = { +static struct atmel_serial_plat at91sam9260_serial_plat = { .base_addr = ATMEL_BASE_DBGU, }; diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c index 5765e42e12..3371973600 100644 --- a/board/st/stv0991/stv0991.c +++ b/board/st/stv0991/stv0991.c @@ -24,7 +24,7 @@ struct gpio_regs *const gpioa_regs = (struct gpio_regs *) GPIOA_BASE_ADDR; #ifndef CONFIG_OF_CONTROL -static const struct pl01x_serial_platdata serial_platdata = { +static const struct pl01x_serial_plat serial_plat = { .base = 0x80406000, .type = TYPE_PL011, .clock = 2700 * 1000, @@ -32,7 +32,7 @@ static const struct pl01x_serial_platdata serial_platdata = { U_BOOT_DEVICE(stv09911_serials) = { .name = "serial_pl01x", - .plat = &serial_platdata, + .plat = &serial_plat, }; #endif diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c index 8390206153..42e1a80ec5 100644 --- a/board/sysam/amcore/amcore.c +++ b/board/sysam/amcore/amcore.c @@ -107,7 +107,7 @@ int dram_init(void) return 0; } -static struct coldfire_serial_platdata mcf5307_serial_plat = { +static struct coldfire_serial_plat mcf5307_serial_plat = { .base = CONFIG_SYS_UART_BASE, .port = 0, .baudrate = CONFIG_BAUDRATE, diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 39be479d15..2aa385a937 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -963,7 +963,7 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) #endif #if !CONFIG_IS_ENABLED(OF_CONTROL) -static const struct omap_hsmmc_plat am335x_mmc0_platdata = { +static const struct omap_hsmmc_plat am335x_mmc0_plat = { .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE, .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT, .cfg.f_min = 400000, @@ -974,10 +974,10 @@ static const struct omap_hsmmc_plat am335x_mmc0_platdata = { U_BOOT_DEVICE(am335x_mmc0) = { .name = "omap_hsmmc", - .plat = &am335x_mmc0_platdata, + .plat = &am335x_mmc0_plat, }; -static const struct omap_hsmmc_plat am335x_mmc1_platdata = { +static const struct omap_hsmmc_plat am335x_mmc1_plat = { .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE, .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT, .cfg.f_min = 400000, @@ -988,6 +988,6 @@ static const struct omap_hsmmc_plat am335x_mmc1_platdata = { U_BOOT_DEVICE(am335x_mmc1) = { .name = "omap_hsmmc", - .plat = &am335x_mmc1_platdata, + .plat = &am335x_mmc1_plat, }; #endif diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 2420c28974..875383625d 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -47,7 +47,7 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = { 0 }; -static const struct ns16550_platdata devkit8000_serial = { +static const struct ns16550_plat devkit8000_serial = { .base = OMAP34XX_UART3, .reg_shift = 2, .clock = V_NS16550_CLK, diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index a9588c5d60..362a750b19 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -1144,7 +1144,7 @@ void reset_cpu(ulong addr) #endif /* CONFIG_SPL_BUILD */ -static struct mxc_serial_platdata mxc_serial_plat = { +static struct mxc_serial_plat mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = true, }; diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 9e7f34907f..056064f6b9 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -203,7 +203,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif -static struct mxc_serial_platdata mxc_serial_plat = { +static struct mxc_serial_plat mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = 1, }; diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 282de18da3..a82daad739 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1086,7 +1086,7 @@ void reset_cpu(ulong addr) #endif /* CONFIG_SPL_BUILD */ -static struct mxc_serial_platdata mxc_serial_plat = { +static struct mxc_serial_plat mxc_serial_plat = { .reg = (struct mxc_uart *)UART1_BASE, .use_dte = true, }; diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index 702a31d8c1..b9d0fb98af 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -129,18 +129,18 @@ int board_mmc_init(struct bd_info *bis) return 0; } #else /* !CONFIG_IS_ENABLED(DM_MMC) */ -static const struct pxa_mmc_plat mmc_platdata = { +static const struct pxa_mmc_plat mmc_plat = { .base = (struct pxa_mmc_regs *)MMC0_BASE, }; U_BOOT_DEVICE(pxa_mmcs) = { .name = "pxa_mmc", - .plat = &mmc_platdata, + .plat = &mmc_plat, }; #endif /* !CONFIG_IS_ENABLED(DM_MMC) */ #endif -static const struct pxa_serial_platdata serial_platdata = { +static const struct pxa_serial_plat serial_plat = { .base = (struct pxa_uart_regs *)FFUART_BASE, .port = FFUART_INDEX, .baudrate = CONFIG_BAUDRATE, @@ -148,5 +148,5 @@ static const struct pxa_serial_platdata serial_platdata = { U_BOOT_DEVICE(pxa_serials) = { .name = "serial_pxa", - .plat = &serial_platdata, + .plat = &serial_plat, }; diff --git a/cmd/cpu.c b/cmd/cpu.c index d32e2a415d..a26234a659 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -26,7 +26,7 @@ static int print_cpu_list(bool detail) for (uclass_first_device(UCLASS_CPU, &dev); dev; uclass_next_device(&dev)) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); struct cpu_info info; bool first = true; int ret, i; diff --git a/cmd/pci.c b/cmd/pci.c index 628579a0d7..2295cc5e8e 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -339,7 +339,7 @@ static void pciinfo(struct udevice *bus, bool short_listing) for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; pplat = dev_get_parent_plat(dev); if (short_listing) { diff --git a/cmd/regulator.c b/cmd/regulator.c index 3649719539..60a70036d6 100644 --- a/cmd/regulator.c +++ b/cmd/regulator.c @@ -55,9 +55,9 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_SUCCESS; } -static int curr_dev_and_platdata(struct udevice **devp, - struct dm_regulator_uclass_plat **uc_pdata, - bool allow_type_fixed) +static int curr_dev_and_plat(struct udevice **devp, + struct dm_regulator_uclass_plat **uc_pdata, + bool allow_type_fixed) { *devp = NULL; *uc_pdata = NULL; @@ -150,7 +150,7 @@ static int do_info(struct cmd_tbl *cmdtp, int flag, int argc, int ret; int i; - ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return ret; @@ -242,7 +242,7 @@ static int do_status(struct cmd_tbl *cmdtp, int flag, int argc, int ret; if (currdev && (argc < 2 || strcmp(argv[1], "-a"))) { - ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return CMD_RET_FAILURE; do_status_detail(dev, uc_pdata); @@ -268,7 +268,7 @@ static int do_value(struct cmd_tbl *cmdtp, int flag, int argc, int force; int ret; - ret = curr_dev_and_platdata(&dev, &uc_pdata, argc == 1); + ret = curr_dev_and_plat(&dev, &uc_pdata, argc == 1); if (ret) return ret; @@ -317,7 +317,7 @@ static int do_current(struct cmd_tbl *cmdtp, int flag, int argc, int current; int ret; - ret = curr_dev_and_platdata(&dev, &uc_pdata, argc == 1); + ret = curr_dev_and_plat(&dev, &uc_pdata, argc == 1); if (ret) return ret; @@ -357,7 +357,7 @@ static int do_mode(struct cmd_tbl *cmdtp, int flag, int argc, int mode; int ret; - ret = curr_dev_and_platdata(&dev, &uc_pdata, false); + ret = curr_dev_and_plat(&dev, &uc_pdata, false); if (ret) return ret; @@ -392,7 +392,7 @@ static int do_enable(struct cmd_tbl *cmdtp, int flag, int argc, struct dm_regulator_uclass_plat *uc_pdata; int ret; - ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return ret; @@ -412,7 +412,7 @@ static int do_disable(struct cmd_tbl *cmdtp, int flag, int argc, struct dm_regulator_uclass_plat *uc_pdata; int ret; - ret = curr_dev_and_platdata(&dev, &uc_pdata, true); + ret = curr_dev_and_plat(&dev, &uc_pdata, true); if (ret) return ret; diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index 9cf1668a6a..246eb4c495 100644 --- a/common/lcd_simplefb.c +++ b/common/lcd_simplefb.c @@ -22,7 +22,7 @@ static int lcd_dt_simplefb_configure_node(void *blob, int off) const char *name; ulong fb_base; #ifdef CONFIG_DM_VIDEO - struct video_uc_platdata *plat; + struct video_uc_plat *plat; struct video_priv *uc_priv; struct udevice *dev; int ret; diff --git a/common/usb_hub.c b/common/usb_hub.c index 80666e6496..3d856e7de7 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -959,7 +959,7 @@ UCLASS_DRIVER(usb_hub) = { .post_probe = usb_hub_post_probe, .child_pre_probe = usb_child_pre_probe, .per_child_auto = sizeof(struct usb_device), - .per_child_plat_auto = sizeof(struct usb_dev_platdata), + .per_child_plat_auto = sizeof(struct usb_dev_plat), .per_device_auto = sizeof(struct usb_hub_device), }; diff --git a/doc/driver-model/of-plat.rst b/doc/driver-model/of-plat.rst index 4436c4a272..afa27c211c 100644 --- a/doc/driver-model/of-plat.rst +++ b/doc/driver-model/of-plat.rst @@ -242,7 +242,7 @@ For example: #include - struct mmc_platdata { + struct mmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) /* Put this first since driver model will copy the data here */ struct dtd_mmc dtplat; @@ -258,7 +258,7 @@ For example: { #if !CONFIG_IS_ENABLED(OF_PLATDATA) /* Decode the device tree data */ - struct mmc_platdata *plat = dev_get_plat(dev); + struct mmc_plat *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); @@ -270,7 +270,7 @@ For example: static int mmc_probe(struct udevice *dev) { - struct mmc_platdata *plat = dev_get_plat(dev); + struct mmc_plat *plat = dev_get_plat(dev); #if CONFIG_IS_ENABLED(OF_PLATDATA) /* Decode the of-platdata from the C structures */ @@ -294,12 +294,12 @@ For example: .of_to_plat = mmc_of_to_plat, .probe = mmc_probe, .priv_auto = sizeof(struct mmc_priv), - .plat_auto = sizeof(struct mmc_platdata), + .plat_auto = sizeof(struct mmc_plat), }; U_BOOT_DRIVER_ALIAS(mmc_drv, vendor_mmc) /* matches compatible string */ -Note that struct mmc_platdata is defined in the C file, not in a header. This +Note that struct mmc_plat is defined in the C file, not in a header. This is to avoid needing to include dt-structs.h in a header file. The idea is to keep the use of each of-platdata struct to the smallest possible code area. There is just one driver C file for each struct, that can convert from the diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst index 0770a09f0b..f1c4167139 100644 --- a/doc/driver-model/spi-howto.rst +++ b/doc/driver-model/spi-howto.rst @@ -209,7 +209,7 @@ DM tells you. The name is not quite right. So in this case we would use: .. code-block:: c - struct exynos_spi_platdata { + struct exynos_spi_plat { enum periph_id periph_id; s32 frequency; /* Default clock frequency, -1 for none */ struct exynos_spi *regs; @@ -231,7 +231,7 @@ tree, but we need to tell it the size: U_BOOT_DRIVER(spi_exynos) = { ... - .plat_auto = sizeof(struct exynos_spi_platdata), + .plat_auto = sizeof(struct exynos_spi_plat), Here is a sample function. It gets a pointer to the platform data and @@ -241,7 +241,7 @@ fills in the fields from device tree. static int exynos_spi_of_to_plat(struct udevice *bus) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -274,7 +274,7 @@ Specify this data in a U_BOOT_DEVICE() declaration in your board file: .. code-block:: c - struct exynos_spi_platdata platdata_spi0 = { + struct exynos_spi_plat platdata_spi0 = { .periph_id = ... .frequency = ... .regs = ... @@ -357,7 +357,7 @@ what you can copy out to set things up. static int exynos_spi_probe(struct udevice *bus) { - struct exynos_spi_platdata *plat = dev_get_plat(bus); + struct exynos_spi_plat *plat = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus); priv->regs = plat->regs; @@ -437,7 +437,7 @@ Here is an example for the speed part: static int exynos_spi_set_speed(struct udevice *bus, uint speed) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; struct exynos_spi_priv *priv = dev_get_priv(bus); int ret; @@ -585,7 +585,7 @@ The new version looks like this: static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_plat(bus); + struct exynos_spi_plat *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus); /* If it's too soon to do another transaction, wait */ @@ -657,7 +657,7 @@ A little note about SPI uclass features The SPI uclass keeps some information about each device 'dev' on the bus: - struct dm_spi_slave_platdata: + struct dm_spi_slave_plat: This is device_get_parent_plat(dev). This is where the chip select number is stored, along with the default bus speed and mode. It is automatically read diff --git a/doc/driver-model/usb-info.rst b/doc/driver-model/usb-info.rst index e9fe9d2904..24d1e81a6c 100644 --- a/doc/driver-model/usb-info.rst +++ b/doc/driver-model/usb-info.rst @@ -43,7 +43,7 @@ as drivers in the USB uclass. For example: .probe = tegra_ehci_usb_probe, .remove = tegra_ehci_usb_remove, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct fdt_usb), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; @@ -63,7 +63,7 @@ This can hold run-time information needed by the driver for operation. It exists when the device is probed (not when it is bound) and is removed when the driver is removed. -Note that usb_platdata is currently only used to deal with setting up a bus +Note that usb_plat is currently only used to deal with setting up a bus in USB device mode (OTG operation). It can be omitted if that is not supported. @@ -93,12 +93,12 @@ The following primary data structures are in use: handles that). Once the device is set up, you can find the device descriptor and current configuration descriptor in this structure. -- struct usb_platdata: +- struct usb_plat: This holds platform data for a controller. So far this is only used as a work-around for controllers which can act as USB devices in OTG mode, since the gadget framework does not use driver model. -- struct usb_dev_platdata: +- struct usb_dev_plat: This holds platform data for a device. You can access it for a device 'dev' with dev_get_parent_plat(dev). It holds the device address and speed - anything that can be determined before the device diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 99b83cab47..8781f32855 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -267,7 +267,7 @@ try_manual: return _adc_channels_single_shot(dev, channel_mask, channels); } -static int adc_vdd_platdata_update(struct udevice *dev) +static int adc_vdd_plat_update(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -290,7 +290,7 @@ static int adc_vdd_platdata_update(struct udevice *dev) return 0; } -static int adc_vss_platdata_update(struct udevice *dev) +static int adc_vss_plat_update(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -313,7 +313,7 @@ int adc_vdd_value(struct udevice *dev, int *uV) int ret, value_sign = uc_pdata->vdd_polarity_negative ? -1 : 1; /* Update the regulator Value. */ - ret = adc_vdd_platdata_update(dev); + ret = adc_vdd_plat_update(dev); if (ret) return ret; @@ -331,7 +331,7 @@ int adc_vss_value(struct udevice *dev, int *uV) int ret, value_sign = uc_pdata->vss_polarity_negative ? -1 : 1; /* Update the regulator Value. */ - ret = adc_vss_platdata_update(dev); + ret = adc_vss_plat_update(dev); if (ret) return ret; @@ -367,7 +367,7 @@ int adc_raw_to_uV(struct udevice *dev, unsigned int raw, int *uV) return 0; } -static int adc_vdd_platdata_set(struct udevice *dev) +static int adc_vdd_plat_set(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -380,7 +380,7 @@ static int adc_vdd_platdata_set(struct udevice *dev) ret = device_get_supply_regulator(dev, "vdd-supply", &uc_pdata->vdd_supply); if (!ret) - return adc_vdd_platdata_update(dev); + return adc_vdd_plat_update(dev); if (ret != -ENOENT) return ret; @@ -392,7 +392,7 @@ static int adc_vdd_platdata_set(struct udevice *dev) return 0; } -static int adc_vss_platdata_set(struct udevice *dev) +static int adc_vss_plat_set(struct udevice *dev) { struct adc_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); int ret; @@ -404,7 +404,7 @@ static int adc_vss_platdata_set(struct udevice *dev) ret = device_get_supply_regulator(dev, "vss-supply", &uc_pdata->vss_supply); if (!ret) - return adc_vss_platdata_update(dev); + return adc_vss_plat_update(dev); if (ret != -ENOENT) return ret; @@ -421,12 +421,12 @@ static int adc_pre_probe(struct udevice *dev) int ret; /* Set ADC VDD plat: polarity, uV, regulator (phandle). */ - ret = adc_vdd_platdata_set(dev); + ret = adc_vdd_plat_set(dev); if (ret) pr_err("%s: Can't update Vdd. Error: %d", dev->name, ret); /* Set ADC VSS plat: polarity, uV, regulator (phandle). */ - ret = adc_vss_platdata_set(dev); + ret = adc_vss_plat_set(dev); if (ret) pr_err("%s: Can't update Vss. Error: %d", dev->name, ret); diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index bd8a3bcdd8..2ef21ec508 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -172,7 +172,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv) #if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI) # ifdef CONFIG_DM_PCI struct udevice *dev = uc_priv->dev; - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); # else pci_dev_t pdev = uc_priv->dev; unsigned short vendor; @@ -474,7 +474,7 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, pci_dev_t dev) pci_write_config_byte(dev, 0x41, 0xa1); #endif #else - struct scsi_platdata *plat = dev_get_uclass_plat(dev); + struct scsi_plat *plat = dev_get_uclass_plat(dev); uc_priv->mmio_base = (void *)plat->base; #endif @@ -1163,7 +1163,7 @@ int ahci_bind_scsi(struct udevice *ahci_dev, struct udevice **devp) int ahci_probe_scsi(struct udevice *ahci_dev, ulong base) { struct ahci_uc_priv *uc_priv; - struct scsi_platdata *uc_plat; + struct scsi_plat *uc_plat; struct udevice *dev; int ret; diff --git a/drivers/clk/altera/clk-agilex.c b/drivers/clk/altera/clk-agilex.c index e0f43a264c..bac1d98e19 100644 --- a/drivers/clk/altera/clk-agilex.c +++ b/drivers/clk/altera/clk-agilex.c @@ -17,7 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct socfpga_clk_platdata { +struct socfpga_clk_plat { void __iomem *regs; }; @@ -25,20 +25,20 @@ struct socfpga_clk_platdata { * function to write the bypass register which requires a poll of the * busy bit */ -static void clk_write_bypass_mainpll(struct socfpga_clk_platdata *plat, u32 val) +static void clk_write_bypass_mainpll(struct socfpga_clk_plat *plat, u32 val) { CM_REG_WRITEL(plat, val, CLKMGR_MAINPLL_BYPASS); cm_wait_for_fsm(); } -static void clk_write_bypass_perpll(struct socfpga_clk_platdata *plat, u32 val) +static void clk_write_bypass_perpll(struct socfpga_clk_plat *plat, u32 val) { CM_REG_WRITEL(plat, val, CLKMGR_PERPLL_BYPASS); cm_wait_for_fsm(); } /* function to write the ctrl register which requires a poll of the busy bit */ -static void clk_write_ctrl(struct socfpga_clk_platdata *plat, u32 val) +static void clk_write_ctrl(struct socfpga_clk_plat *plat, u32 val) { CM_REG_WRITEL(plat, val, CLKMGR_CTRL); cm_wait_for_fsm(); @@ -108,7 +108,7 @@ static const struct { }, }; -static int membus_wait_for_req(struct socfpga_clk_platdata *plat, u32 pll, +static int membus_wait_for_req(struct socfpga_clk_plat *plat, u32 pll, int timeout) { int cnt = 0; @@ -133,7 +133,7 @@ static int membus_wait_for_req(struct socfpga_clk_platdata *plat, u32 pll, return 0; } -static int membus_write_pll(struct socfpga_clk_platdata *plat, u32 pll, +static int membus_write_pll(struct socfpga_clk_plat *plat, u32 pll, u32 addr_offset, u32 wdat, int timeout) { u32 addr; @@ -154,7 +154,7 @@ static int membus_write_pll(struct socfpga_clk_platdata *plat, u32 pll, return membus_wait_for_req(plat, pll, timeout); } -static int membus_read_pll(struct socfpga_clk_platdata *plat, u32 pll, +static int membus_read_pll(struct socfpga_clk_plat *plat, u32 pll, u32 addr_offset, u32 *rdata, int timeout) { u32 addr; @@ -184,7 +184,7 @@ static int membus_read_pll(struct socfpga_clk_platdata *plat, u32 pll, return 0; } -static void membus_pll_configs(struct socfpga_clk_platdata *plat, u32 pll) +static void membus_pll_configs(struct socfpga_clk_plat *plat, u32 pll) { int i; u32 rdata; @@ -236,7 +236,7 @@ static u32 calc_vocalib_pll(u32 pllm, u32 pllglob) static void clk_basic_init(struct udevice *dev, const struct cm_config * const cfg) { - struct socfpga_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_clk_plat *plat = dev_get_plat(dev); u32 vcocalib; if (!cfg) @@ -342,7 +342,7 @@ static void clk_basic_init(struct udevice *dev, CM_REG_READL(plat, CLKMGR_CTRL) & ~CLKMGR_CTRL_BOOTMODE); } -static u64 clk_get_vco_clk_hz(struct socfpga_clk_platdata *plat, +static u64 clk_get_vco_clk_hz(struct socfpga_clk_plat *plat, u32 pllglob_reg, u32 pllm_reg) { u64 fref, arefdiv, mdiv, reg, vco; @@ -375,26 +375,26 @@ static u64 clk_get_vco_clk_hz(struct socfpga_clk_platdata *plat, return vco; } -static u64 clk_get_main_vco_clk_hz(struct socfpga_clk_platdata *plat) +static u64 clk_get_main_vco_clk_hz(struct socfpga_clk_plat *plat) { return clk_get_vco_clk_hz(plat, CLKMGR_MAINPLL_PLLGLOB, CLKMGR_MAINPLL_PLLM); } -static u64 clk_get_per_vco_clk_hz(struct socfpga_clk_platdata *plat) +static u64 clk_get_per_vco_clk_hz(struct socfpga_clk_plat *plat) { return clk_get_vco_clk_hz(plat, CLKMGR_PERPLL_PLLGLOB, CLKMGR_PERPLL_PLLM); } -static u32 clk_get_5_1_clk_src(struct socfpga_clk_platdata *plat, u64 reg) +static u32 clk_get_5_1_clk_src(struct socfpga_clk_plat *plat, u64 reg) { u32 clksrc = CM_REG_READL(plat, reg); return (clksrc & CLKMGR_CLKSRC_MASK) >> CLKMGR_CLKSRC_OFFSET; } -static u64 clk_get_clksrc_hz(struct socfpga_clk_platdata *plat, u32 clksrc_reg, +static u64 clk_get_clksrc_hz(struct socfpga_clk_plat *plat, u32 clksrc_reg, u32 main_reg, u32 per_reg) { u64 clock; @@ -431,7 +431,7 @@ static u64 clk_get_clksrc_hz(struct socfpga_clk_platdata *plat, u32 clksrc_reg, return clock; } -static u64 clk_get_mpu_clk_hz(struct socfpga_clk_platdata *plat) +static u64 clk_get_mpu_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_clksrc_hz(plat, CLKMGR_MAINPLL_MPUCLK, CLKMGR_MAINPLL_PLLC0, @@ -443,14 +443,14 @@ static u64 clk_get_mpu_clk_hz(struct socfpga_clk_platdata *plat) return clock; } -static u32 clk_get_l3_main_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l3_main_clk_hz(struct socfpga_clk_plat *plat) { return clk_get_clksrc_hz(plat, CLKMGR_MAINPLL_NOCCLK, CLKMGR_MAINPLL_PLLC1, CLKMGR_PERPLL_PLLC1); } -static u32 clk_get_l4_main_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_main_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_l3_main_clk_hz(plat); @@ -461,7 +461,7 @@ static u32 clk_get_l4_main_clk_hz(struct socfpga_clk_platdata *plat) return clock; } -static u32 clk_get_sdmmc_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_sdmmc_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_clksrc_hz(plat, CLKMGR_ALTR_SDMMCCTR, CLKMGR_MAINPLL_PLLC3, @@ -473,7 +473,7 @@ static u32 clk_get_sdmmc_clk_hz(struct socfpga_clk_platdata *plat) return clock / 4; } -static u32 clk_get_l4_sp_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_sp_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_l3_main_clk_hz(plat); @@ -484,7 +484,7 @@ static u32 clk_get_l4_sp_clk_hz(struct socfpga_clk_platdata *plat) return clock; } -static u32 clk_get_l4_mp_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_mp_clk_hz(struct socfpga_clk_plat *plat) { u64 clock = clk_get_l3_main_clk_hz(plat); @@ -495,7 +495,7 @@ static u32 clk_get_l4_mp_clk_hz(struct socfpga_clk_platdata *plat) return clock; } -static u32 clk_get_l4_sys_free_clk_hz(struct socfpga_clk_platdata *plat) +static u32 clk_get_l4_sys_free_clk_hz(struct socfpga_clk_plat *plat) { if (CM_REG_READL(plat, CLKMGR_STAT) & CLKMGR_STAT_BOOTMODE) return clk_get_l3_main_clk_hz(plat) / 2; @@ -503,7 +503,7 @@ static u32 clk_get_l4_sys_free_clk_hz(struct socfpga_clk_platdata *plat) return clk_get_l3_main_clk_hz(plat) / 4; } -static u32 clk_get_emac_clk_hz(struct socfpga_clk_platdata *plat, u32 emac_id) +static u32 clk_get_emac_clk_hz(struct socfpga_clk_plat *plat, u32 emac_id) { bool emacsel_a; u32 ctl; @@ -585,7 +585,7 @@ static u32 clk_get_emac_clk_hz(struct socfpga_clk_platdata *plat, u32 emac_id) static ulong socfpga_clk_get_rate(struct clk *clk) { - struct socfpga_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_clk_plat *plat = dev_get_plat(clk->dev); switch (clk->id) { case AGILEX_MPU_CLK: @@ -630,7 +630,7 @@ static int socfpga_clk_probe(struct udevice *dev) static int socfpga_clk_of_to_plat(struct udevice *dev) { - struct socfpga_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_clk_plat *plat = dev_get_plat(dev); fdt_addr_t addr; addr = dev_read_addr(dev); @@ -658,5 +658,5 @@ U_BOOT_DRIVER(socfpga_agilex_clk) = { .ops = &socfpga_clk_ops, .probe = socfpga_clk_probe, .of_to_plat = socfpga_clk_of_to_plat, - .plat_auto = sizeof(struct socfpga_clk_platdata), + .plat_auto = sizeof(struct socfpga_clk_plat), }; diff --git a/drivers/clk/altera/clk-arria10.c b/drivers/clk/altera/clk-arria10.c index e1e4876025..1812152d56 100644 --- a/drivers/clk/altera/clk-arria10.c +++ b/drivers/clk/altera/clk-arria10.c @@ -24,7 +24,7 @@ enum socfpga_a10_clk_type { SOCFPGA_A10_CLK_UNKNOWN_CLK, }; -struct socfpga_a10_clk_platdata { +struct socfpga_a10_clk_plat { enum socfpga_a10_clk_type type; struct clk_bulk clks; u32 regs; @@ -43,7 +43,7 @@ struct socfpga_a10_clk_platdata { static int socfpga_a10_clk_get_upstream(struct clk *clk, struct clk **upclk) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(clk->dev); u32 reg, maxval; if (plat->clks.count == 0) @@ -84,7 +84,7 @@ static int socfpga_a10_clk_get_upstream(struct clk *clk, struct clk **upclk) static int socfpga_a10_clk_endisable(struct clk *clk, bool enable) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(clk->dev); struct clk *upclk = NULL; int ret; @@ -120,7 +120,7 @@ static int socfpga_a10_clk_disable(struct clk *clk) static ulong socfpga_a10_clk_get_rate(struct clk *clk) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(clk->dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(clk->dev); struct clk *upclk = NULL; ulong rate = 0, reg, numer, denom; int ret; @@ -190,7 +190,7 @@ static struct clk_ops socfpga_a10_clk_ops = { */ static void socfpga_a10_handoff_workaround(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; struct clk_bulk *bulk = &plat->clks; int i, ret, offset = dev_of_offset(dev); @@ -274,8 +274,8 @@ static int socfpga_a10_clk_bind(struct udevice *dev) static int socfpga_a10_clk_probe(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); - struct socfpga_a10_clk_platdata *pplat; + struct socfpga_a10_clk_plat *plat = dev_get_plat(dev); + struct socfpga_a10_clk_plat *pplat; struct udevice *pdev; const void *fdt = gd->fdt_blob; int offset = dev_of_offset(dev); @@ -321,7 +321,7 @@ static int socfpga_a10_clk_probe(struct udevice *dev) static int socfpga_a10_of_to_plat(struct udevice *dev) { - struct socfpga_a10_clk_platdata *plat = dev_get_plat(dev); + struct socfpga_a10_clk_plat *plat = dev_get_plat(dev); unsigned int divreg[3], gatereg[2]; int ret; @@ -359,5 +359,5 @@ U_BOOT_DRIVER(socfpga_a10_clk) = { .probe = socfpga_a10_clk_probe, .of_to_plat = socfpga_a10_of_to_plat, - .plat_auto = sizeof(struct socfpga_a10_clk_platdata), + .plat_auto = sizeof(struct socfpga_a10_clk_plat), }; diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index 89283e6e36..e514f26656 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -21,7 +21,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct pmc_platdata { +struct pmc_plat { struct at91_pmc *reg_base; struct regmap *regmap_sfr; }; @@ -45,7 +45,7 @@ U_BOOT_DRIVER(at91_pmc) = { static int at91_pmc_core_probe(struct udevice *dev) { - struct pmc_platdata *plat = dev_get_plat(dev); + struct pmc_plat *plat = dev_get_plat(dev); dev = dev_get_parent(dev); @@ -115,7 +115,7 @@ int at91_clk_of_xlate(struct clk *clk, struct ofnode_phandle_args *args) int at91_clk_probe(struct udevice *dev) { struct udevice *dev_periph_container, *dev_pmc; - struct pmc_platdata *plat = dev_get_plat(dev); + struct pmc_plat *plat = dev_get_plat(dev); dev_periph_container = dev_get_parent(dev); dev_pmc = dev_get_parent(dev_periph_container); @@ -191,7 +191,7 @@ U_BOOT_DRIVER(at91_master_clk) = { /* Main osc clock specific code. */ static int main_osc_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; if (readl(&pmc->sr) & AT91_PMC_MOSCSELS) @@ -225,14 +225,14 @@ U_BOOT_DRIVER(at91sam9x5_main_osc_clk) = { .id = UCLASS_CLK, .of_match = main_osc_clk_match, .probe = main_osc_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &main_osc_clk_ops, }; /* PLLA clock specific code. */ static int plla_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; if (readl(&pmc->sr) & AT91_PMC_LOCKA) @@ -266,7 +266,7 @@ U_BOOT_DRIVER(at91_plla_clk) = { .id = UCLASS_CLK, .of_match = plla_clk_match, .probe = plla_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &plla_clk_ops, }; @@ -278,7 +278,7 @@ static int at91_plladiv_clk_enable(struct clk *clk) static ulong at91_plladiv_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; ulong clk_rate; @@ -297,7 +297,7 @@ static ulong at91_plladiv_clk_get_rate(struct clk *clk) static ulong at91_plladiv_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; ulong parent_rate; @@ -340,7 +340,7 @@ U_BOOT_DRIVER(at91_plladiv_clk) = { .id = UCLASS_CLK, .of_match = at91_plladiv_clk_match, .probe = at91_plladiv_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &at91_plladiv_clk_ops, }; @@ -401,7 +401,7 @@ static ulong system_clk_set_rate(struct clk *clk, ulong rate) static int system_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; u32 mask; @@ -437,7 +437,7 @@ U_BOOT_DRIVER(system_clk) = { .name = "system-clk", .id = UCLASS_CLK, .probe = at91_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &system_clk_ops, }; @@ -483,7 +483,7 @@ U_BOOT_DRIVER(sam9x5_periph_clk) = { static int periph_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; enum periph_clk_type clk_type; void *addr; @@ -536,7 +536,7 @@ static struct clk_ops periph_clk_ops = { U_BOOT_DRIVER(clk_periph) = { .name = "periph-clk", .id = UCLASS_CLK, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .probe = at91_clk_probe, .ops = &periph_clk_ops, }; @@ -552,7 +552,7 @@ U_BOOT_DRIVER(clk_periph) = { static int utmi_clk_enable(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk clk_dev; ulong clk_rate; @@ -640,7 +640,7 @@ static struct clk_ops utmi_clk_ops = { static int utmi_clk_of_to_plat(struct udevice *dev) { - struct pmc_platdata *plat = dev_get_plat(dev); + struct pmc_plat *plat = dev_get_plat(dev); struct udevice *syscon; uclass_get_device_by_phandle(UCLASS_SYSCON, dev, @@ -668,7 +668,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = { .of_match = utmi_clk_match, .probe = utmi_clk_probe, .of_to_plat = utmi_clk_of_to_plat, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &utmi_clk_ops, }; @@ -681,7 +681,7 @@ U_BOOT_DRIVER(at91sam9x5_utmi_clk) = { static ulong sama5d4_h32mx_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; ulong rate = gd->arch.mck_rate_hz; @@ -713,7 +713,7 @@ U_BOOT_DRIVER(sama5d4_h32mx_clk) = { .id = UCLASS_CLK, .of_match = sama5d4_h32mx_clk_match, .probe = sama5d4_h32mx_clk_probe, - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &sama5d4_h32mx_clk_ops, }; @@ -754,7 +754,7 @@ struct generic_clk_priv { static ulong generic_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk parent; ulong clk_rate; @@ -782,7 +782,7 @@ static ulong generic_clk_get_rate(struct clk *clk) static ulong generic_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct generic_clk_priv *priv = dev_get_priv(clk->dev); struct clk parent, best_parent; @@ -877,7 +877,7 @@ U_BOOT_DRIVER(generic_clk) = { .probe = at91_clk_probe, .of_to_plat = generic_clk_of_to_plat, .priv_auto = sizeof(struct generic_clk_priv), - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &generic_clk_ops, }; @@ -895,7 +895,7 @@ struct at91_usb_clk_priv { static ulong at91_usb_clk_get_rate(struct clk *clk) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct clk source; u32 tmp, usbdiv; @@ -916,7 +916,7 @@ static ulong at91_usb_clk_get_rate(struct clk *clk) static ulong at91_usb_clk_set_rate(struct clk *clk, ulong rate) { - struct pmc_platdata *plat = dev_get_plat(clk->dev); + struct pmc_plat *plat = dev_get_plat(clk->dev); struct at91_pmc *pmc = plat->reg_base; struct at91_usb_clk_priv *priv = dev_get_priv(clk->dev); struct clk source, best_source; @@ -1013,7 +1013,7 @@ U_BOOT_DRIVER(at91_usb_clk) = { .probe = at91_usb_clk_probe, .of_to_plat = at91_usb_clk_of_to_plat, .priv_auto = sizeof(struct at91_usb_clk_priv), - .plat_auto = sizeof(struct pmc_platdata), + .plat_auto = sizeof(struct pmc_plat), .ops = &at91_usb_clk_ops, }; diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index c2bed88eac..4baacabd01 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -60,8 +60,8 @@ static struct regmap *regmap_alloc(int count) } #if CONFIG_IS_ENABLED(OF_PLATDATA) -int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count, - struct regmap **mapp) +int regmap_init_mem_plat(struct udevice *dev, fdt_val_t *reg, int count, + struct regmap **mapp) { struct regmap_range *range; struct regmap *map; diff --git a/drivers/core/root.c b/drivers/core/root.c index 42f8f0cedd..672aa7cea7 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -174,7 +174,7 @@ int dm_remove_devices_flags(uint flags) } #endif -int dm_scan_platdata(bool pre_reloc_only) +int dm_scan_plat(bool pre_reloc_only) { int ret; @@ -308,9 +308,9 @@ int dm_init_and_scan(bool pre_reloc_only) debug("dm_init() failed: %d\n", ret); return ret; } - ret = dm_scan_platdata(pre_reloc_only); + ret = dm_scan_plat(pre_reloc_only); if (ret) { - debug("dm_scan_platdata() failed: %d\n", ret); + debug("dm_scan_plat() failed: %d\n", ret); return ret; } diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index 5de462221f..cb33facc71 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -56,9 +56,9 @@ static int syscon_pre_probe(struct udevice *dev) * using OF_PLATDATA will need to ensure that this is true. */ #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct syscon_base_platdata *plat = dev_get_plat(dev); + struct syscon_base_plat *plat = dev_get_plat(dev); - return regmap_init_mem_platdata(dev, plat->reg, ARRAY_SIZE(plat->reg), + return regmap_init_mem_plat(dev, plat->reg, ARRAY_SIZE(plat->reg), &priv->regmap); #else return regmap_init_mem(dev_ofnode(dev), &priv->regmap); diff --git a/drivers/cpu/at91_cpu.c b/drivers/cpu/at91_cpu.c index bd81efde29..9ef1b3102c 100644 --- a/drivers/cpu/at91_cpu.c +++ b/drivers/cpu/at91_cpu.c @@ -11,7 +11,7 @@ #include #include -struct at91_cpu_platdata { +struct at91_cpu_plat { const char *name; ulong cpufreq_mhz; ulong mckfreq_mhz; @@ -27,7 +27,7 @@ const char *at91_cpu_get_name(void) int at91_cpu_get_desc(const struct udevice *dev, char *buf, int size) { - struct at91_cpu_platdata *plat = dev_get_plat(dev); + struct at91_cpu_plat *plat = dev_get_plat(dev); snprintf(buf, size, "%s\n" "Crystal frequency: %8lu MHz\n" @@ -41,7 +41,7 @@ int at91_cpu_get_desc(const struct udevice *dev, char *buf, int size) static int at91_cpu_get_info(const struct udevice *dev, struct cpu_info *info) { - struct at91_cpu_platdata *plat = dev_get_plat(dev); + struct at91_cpu_plat *plat = dev_get_plat(dev); info->cpu_freq = plat->cpufreq_mhz * 1000000; info->features = BIT(CPU_FEAT_L1_CACHE); @@ -75,7 +75,7 @@ static const struct udevice_id at91_cpu_ids[] = { static int at91_cpu_probe(struct udevice *dev) { - struct at91_cpu_platdata *plat = dev_get_plat(dev); + struct at91_cpu_plat *plat = dev_get_plat(dev); struct clk clk; ulong rate; int ret; @@ -118,6 +118,6 @@ U_BOOT_DRIVER(cpu_at91_drv) = { .of_match = at91_cpu_ids, .ops = &at91_cpu_ops, .probe = at91_cpu_probe, - .plat_auto = sizeof(struct at91_cpu_platdata), + .plat_auto = sizeof(struct at91_cpu_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index fc2084f1c1..172bc9980f 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -425,7 +425,7 @@ static const struct cpu_ops bmips_cpu_ops = { /* BMIPS CPU driver */ int bmips_cpu_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); plat->cpu_id = dev_read_u32_default(dev, "reg", -1); plat->device_id = read_c0_prid(); diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c index 55cb172b87..1c338bad9a 100644 --- a/drivers/cpu/cpu-uclass.c +++ b/drivers/cpu/cpu-uclass.c @@ -115,7 +115,7 @@ int cpu_get_vendor(const struct udevice *dev, char *buf, int size) U_BOOT_DRIVER(cpu_bus) = { .name = "cpu_bus", .id = UCLASS_SIMPLE_BUS, - .per_child_plat_auto = sizeof(struct cpu_platdata), + .per_child_plat_auto = sizeof(struct cpu_plat), }; static int uclass_cpu_init(struct uclass *uc) diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c index df8a70220e..fe6772ba5a 100644 --- a/drivers/cpu/cpu_sandbox.c +++ b/drivers/cpu/cpu_sandbox.c @@ -64,7 +64,7 @@ static const struct cpu_ops cpu_sandbox_ops = { static int cpu_sandbox_bind(struct udevice *dev) { int ret; - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); /* first examine the property in current cpu node */ ret = dev_read_u32(dev, "timebase-frequency", &plat->timebase_freq); diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index c9f7449e57..1d1e49efea 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -16,7 +16,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct cpu_imx_platdata { +struct cpu_imx_plat { const char *name; const char *rev; const char *type; @@ -55,7 +55,7 @@ const char *get_imx8_rev(u32 rev) static void set_core_data(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); if (device_is_compatible(dev, "arm,cortex-a35")) { plat->cpu_rsrc = SC_R_A35; @@ -73,7 +73,7 @@ static void set_core_data(struct udevice *dev) } #if IS_ENABLED(CONFIG_IMX_SCU_THERMAL) -static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) +static int cpu_imx_get_temp(struct cpu_imx_plat *plat) { struct udevice *thermal_dev; int cpu_tmp, ret; @@ -94,7 +94,7 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) return cpu_tmp; } #else -static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) +static int cpu_imx_get_temp(struct cpu_imx_plat *plat) { return 0; } @@ -102,7 +102,7 @@ static int cpu_imx_get_temp(struct cpu_imx_platdata *plat) int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); int ret, temp; if (size < 100) @@ -128,7 +128,7 @@ int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) static int cpu_imx_get_info(const struct udevice *dev, struct cpu_info *info) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); info->cpu_freq = plat->freq_mhz * 1000; info->features = BIT(CPU_FEAT_L1_CACHE) | BIT(CPU_FEAT_MMU); @@ -165,7 +165,7 @@ static int cpu_imx_get_vendor(const struct udevice *dev, char *buf, int size) static int cpu_imx_is_current(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); if (plat->mpidr == (read_mpidr() & 0xffff)) return 1; @@ -190,7 +190,7 @@ static const struct udevice_id cpu_imx8_ids[] = { static ulong imx8_get_cpu_rate(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); ulong rate; int ret; @@ -206,7 +206,7 @@ static ulong imx8_get_cpu_rate(struct udevice *dev) static int imx8_cpu_probe(struct udevice *dev) { - struct cpu_imx_platdata *plat = dev_get_plat(dev); + struct cpu_imx_plat *plat = dev_get_plat(dev); u32 cpurev; set_core_data(dev); @@ -230,6 +230,6 @@ U_BOOT_DRIVER(cpu_imx8_drv) = { .of_match = cpu_imx8_ids, .ops = &cpu_imx8_ops, .probe = imx8_cpu_probe, - .plat_auto = sizeof(struct cpu_imx_platdata), + .plat_auto = sizeof(struct cpu_imx_plat), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c index 3899d4dd23..0b10c173a3 100644 --- a/drivers/cpu/riscv_cpu.c +++ b/drivers/cpu/riscv_cpu.c @@ -91,7 +91,7 @@ static int riscv_cpu_get_count(const struct udevice *dev) static int riscv_cpu_bind(struct udevice *dev) { - struct cpu_platdata *plat = dev_get_parent_plat(dev); + struct cpu_plat *plat = dev_get_parent_plat(dev); struct driver *drv; int ret; diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c index 497ff7869b..868bf142b4 100644 --- a/drivers/ddr/altera/sdram_agilex.c +++ b/drivers/ddr/altera/sdram_agilex.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; int sdram_mmr_init_full(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->plat; + struct altera_sdram_plat *plat = dev->plat; struct altera_sdram_priv *priv = dev_get_priv(dev); u32 i; int ret; diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 286961ca33..3ffe057543 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -27,7 +27,7 @@ struct altera_gen5_sdram_priv { struct ram_info info; }; -struct altera_gen5_sdram_platdata { +struct altera_gen5_sdram_plat { struct socfpga_sdr *sdr; }; @@ -565,7 +565,7 @@ static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl) static int altera_gen5_sdram_of_to_plat(struct udevice *dev) { - struct altera_gen5_sdram_platdata *plat = dev->plat; + struct altera_gen5_sdram_plat *plat = dev->plat; plat->sdr = (struct socfpga_sdr *)devfdt_get_addr_index(dev, 0); if (!plat->sdr) @@ -578,7 +578,7 @@ static int altera_gen5_sdram_probe(struct udevice *dev) { int ret; unsigned long sdram_size; - struct altera_gen5_sdram_platdata *plat = dev->plat; + struct altera_gen5_sdram_plat *plat = dev->plat; struct altera_gen5_sdram_priv *priv = dev_get_priv(dev); struct socfpga_sdr_ctrl *sdr_ctrl = &plat->sdr->sdr_ctrl; struct reset_ctl_bulk resets; @@ -647,7 +647,7 @@ U_BOOT_DRIVER(altera_gen5_sdram) = { .of_match = altera_gen5_sdram_ids, .ops = &altera_gen5_sdram_ops, .of_to_plat = altera_gen5_sdram_of_to_plat, - .plat_auto = sizeof(struct altera_gen5_sdram_platdata), + .plat_auto = sizeof(struct altera_gen5_sdram_plat), .probe = altera_gen5_sdram_probe, .priv_auto = sizeof(struct altera_gen5_sdram_priv), }; diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 8028d89f22..984dc32442 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -70,7 +70,7 @@ int match_ddr_conf(u32 ddr_conf) */ int sdram_mmr_init_full(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->plat; + struct altera_sdram_plat *plat = dev->plat; struct altera_sdram_priv *priv = dev_get_priv(dev); u32 update_value, io48_value, ddrioctl; u32 i; diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 0bd40c2a0d..7e77c7b073 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -27,29 +27,29 @@ #define PGTABLE_OFF 0x4000 -u32 hmc_readl(struct altera_sdram_platdata *plat, u32 reg) +u32 hmc_readl(struct altera_sdram_plat *plat, u32 reg) { return readl(plat->iomhc + reg); } -u32 hmc_ecc_readl(struct altera_sdram_platdata *plat, u32 reg) +u32 hmc_ecc_readl(struct altera_sdram_plat *plat, u32 reg) { return readl(plat->hmc + reg); } -u32 hmc_ecc_writel(struct altera_sdram_platdata *plat, +u32 hmc_ecc_writel(struct altera_sdram_plat *plat, u32 data, u32 reg) { return writel(data, plat->hmc + reg); } -u32 ddr_sch_writel(struct altera_sdram_platdata *plat, u32 data, +u32 ddr_sch_writel(struct altera_sdram_plat *plat, u32 data, u32 reg) { return writel(data, plat->ddr_sch + reg); } -int emif_clear(struct altera_sdram_platdata *plat) +int emif_clear(struct altera_sdram_plat *plat) { hmc_ecc_writel(plat, 0, RSTHANDSHAKECTRL); @@ -59,7 +59,7 @@ int emif_clear(struct altera_sdram_platdata *plat) false, 1000, false); } -int emif_reset(struct altera_sdram_platdata *plat) +int emif_reset(struct altera_sdram_plat *plat) { u32 c2s, s2c, ret; @@ -214,7 +214,7 @@ void sdram_size_check(struct bd_info *bd) * Calculate SDRAM device size based on SDRAM controller parameters. * Size is specified in bytes. */ -phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat) +phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat) { u32 dramaddrw = hmc_readl(plat, DRAMADDRW); @@ -232,7 +232,7 @@ phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat) static int altera_sdram_of_to_plat(struct udevice *dev) { - struct altera_sdram_platdata *plat = dev->plat; + struct altera_sdram_plat *plat = dev->plat; fdt_addr_t addr; addr = dev_read_addr_index(dev, 0); @@ -304,7 +304,7 @@ U_BOOT_DRIVER(altera_sdram) = { .of_match = altera_sdram_ids, .ops = &altera_sdram_ops, .of_to_plat = altera_sdram_of_to_plat, - .plat_auto = sizeof(struct altera_sdram_platdata), + .plat_auto = sizeof(struct altera_sdram_plat), .probe = altera_sdram_probe, .priv_auto = sizeof(struct altera_sdram_priv), }; diff --git a/drivers/ddr/altera/sdram_soc64.h b/drivers/ddr/altera/sdram_soc64.h index 4a830e7ec1..8af0afc410 100644 --- a/drivers/ddr/altera/sdram_soc64.h +++ b/drivers/ddr/altera/sdram_soc64.h @@ -14,7 +14,7 @@ struct altera_sdram_priv { struct reset_ctl_bulk resets; }; -struct altera_sdram_platdata { +struct altera_sdram_plat { void __iomem *hmc; void __iomem *ddr_sch; void __iomem *iomhc; @@ -169,19 +169,19 @@ struct altera_sdram_platdata { #define FW_HMC_ADAPTOR_REG_ADDR 0xf8020004 #define FW_HMC_ADAPTOR_MPU_MASK BIT(0) -u32 hmc_readl(struct altera_sdram_platdata *plat, u32 reg); -u32 hmc_ecc_readl(struct altera_sdram_platdata *plat, u32 reg); -u32 hmc_ecc_writel(struct altera_sdram_platdata *plat, +u32 hmc_readl(struct altera_sdram_plat *plat, u32 reg); +u32 hmc_ecc_readl(struct altera_sdram_plat *plat, u32 reg); +u32 hmc_ecc_writel(struct altera_sdram_plat *plat, u32 data, u32 reg); -u32 ddr_sch_writel(struct altera_sdram_platdata *plat, u32 data, +u32 ddr_sch_writel(struct altera_sdram_plat *plat, u32 data, u32 reg); -int emif_clear(struct altera_sdram_platdata *plat); -int emif_reset(struct altera_sdram_platdata *plat); +int emif_clear(struct altera_sdram_plat *plat); +int emif_reset(struct altera_sdram_plat *plat); int poll_hmc_clock_status(void); void sdram_clear_mem(phys_addr_t addr, phys_size_t size); void sdram_init_ecc_bits(struct bd_info *bd); void sdram_size_check(struct bd_info *bd); -phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat); +phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat); int sdram_mmr_init_full(struct udevice *dev); #endif /* _SDRAM_SOC64_H_ */ diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 24e047e66a..f4582b1467 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -19,7 +19,7 @@ struct altera_pio_regs { u32 direction; /* Direction register */ }; -struct altera_pio_platdata { +struct altera_pio_plat { struct altera_pio_regs *regs; int gpio_count; const char *bank_name; @@ -27,7 +27,7 @@ struct altera_pio_platdata { static int altera_pio_direction_input(struct udevice *dev, unsigned pin) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs; clrbits_le32(®s->direction, 1 << pin); @@ -38,7 +38,7 @@ static int altera_pio_direction_input(struct udevice *dev, unsigned pin) static int altera_pio_direction_output(struct udevice *dev, unsigned pin, int val) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs; if (val) @@ -53,7 +53,7 @@ static int altera_pio_direction_output(struct udevice *dev, unsigned pin, static int altera_pio_get_value(struct udevice *dev, unsigned pin) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs; return !!(readl(®s->data) & (1 << pin)); @@ -62,7 +62,7 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin) static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); struct altera_pio_regs *const regs = plat->regs; if (val) @@ -76,7 +76,7 @@ static int altera_pio_set_value(struct udevice *dev, unsigned pin, int val) static int altera_pio_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); uc_priv->gpio_count = plat->gpio_count; uc_priv->bank_name = plat->bank_name; @@ -86,7 +86,7 @@ static int altera_pio_probe(struct udevice *dev) static int altera_pio_of_to_plat(struct udevice *dev) { - struct altera_pio_platdata *plat = dev_get_plat(dev); + struct altera_pio_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_pio_regs), @@ -117,6 +117,6 @@ U_BOOT_DRIVER(altera_pio) = { .of_match = altera_pio_ids, .ops = &altera_pio_ops, .of_to_plat = altera_pio_of_to_plat, - .plat_auto = sizeof(struct altera_pio_platdata), + .plat_auto = sizeof(struct altera_pio_plat), .probe = altera_pio_probe, }; diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c index 7b604e4e82..1409db5dc1 100644 --- a/drivers/gpio/at91_gpio.c +++ b/drivers/gpio/at91_gpio.c @@ -590,7 +590,7 @@ static const struct dm_gpio_ops gpio_at91_ops = { static int at91_gpio_probe(struct udevice *dev) { struct at91_port_priv *port = dev_get_priv(dev); - struct at91_port_platdata *plat = dev_get_plat(dev); + struct at91_port_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct clk clk; int ret; @@ -629,7 +629,7 @@ U_BOOT_DRIVER(atmel_at91rm9200_gpio) = { .id = UCLASS_GPIO, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = at91_gpio_ids, - .plat_auto = sizeof(struct at91_port_platdata), + .plat_auto = sizeof(struct at91_port_plat), #endif .ops = &gpio_at91_ops, .probe = at91_gpio_probe, diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index e25115f8a2..e7b8f231cc 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -176,14 +176,14 @@ struct atmel_pioctrl_data { u32 nbanks; }; -struct atmel_pio4_platdata { +struct atmel_pio4_plat { struct atmel_pio4_port *reg_base; }; static struct atmel_pio4_port *atmel_pio4_bank_base(struct udevice *dev, u32 bank) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); struct atmel_pio4_port *port_base = (struct atmel_pio4_port *)((u32)plat->reg_base + ATMEL_PIO_BANK_OFFSET * bank); @@ -281,7 +281,7 @@ static int atmel_pio4_bind(struct udevice *dev) static int atmel_pio4_probe(struct udevice *dev) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct atmel_pioctrl_data *pioctrl_data; struct clk clk; @@ -338,7 +338,7 @@ U_BOOT_DRIVER(gpio_atmel_pio4) = { .probe = atmel_pio4_probe, .bind = atmel_pio4_bind, .of_match = atmel_pio4_ids, - .plat_auto = sizeof(struct atmel_pio4_platdata), + .plat_auto = sizeof(struct atmel_pio4_plat), }; #endif diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index a348c68a7e..704a6fa712 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -102,7 +102,7 @@ static const struct dm_gpio_ops gpio_bcm2835_ops = { static int bcm2835_gpio_probe(struct udevice *dev) { struct bcm2835_gpios *gpios = dev_get_priv(dev); - struct bcm2835_gpio_platdata *plat = dev_get_plat(dev); + struct bcm2835_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); uc_priv->bank_name = "GPIO"; @@ -118,7 +118,7 @@ static int bcm2835_gpio_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) static int bcm2835_gpio_of_to_plat(struct udevice *dev) { - struct bcm2835_gpio_platdata *plat = dev_get_plat(dev); + struct bcm2835_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr; addr = dev_read_addr(dev); @@ -134,7 +134,7 @@ U_BOOT_DRIVER(gpio_bcm2835) = { .name = "gpio_bcm2835", .id = UCLASS_GPIO, .of_to_plat = of_match_ptr(bcm2835_gpio_of_to_plat), - .plat_auto = sizeof(struct bcm2835_gpio_platdata), + .plat_auto = sizeof(struct bcm2835_gpio_plat), .ops = &gpio_bcm2835_ops, .probe = bcm2835_gpio_probe, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index b47d65d4df..9a52a5e414 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -522,7 +522,7 @@ static const struct dm_gpio_ops gpio_davinci_ops = { static int davinci_gpio_probe(struct udevice *dev) { struct davinci_gpio_bank *bank = dev_get_priv(dev); - struct davinci_gpio_platdata *plat = dev_get_plat(dev); + struct davinci_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); @@ -542,7 +542,7 @@ static const struct udevice_id davinci_gpio_ids[] = { static int davinci_gpio_of_to_plat(struct udevice *dev) { - struct davinci_gpio_platdata *plat = dev_get_plat(dev); + struct davinci_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr; addr = dev_read_addr(dev); @@ -560,7 +560,7 @@ U_BOOT_DRIVER(ti_dm6441_gpio) = { .of_to_plat = of_match_ptr(davinci_gpio_of_to_plat), .of_match = davinci_gpio_ids, .bind = dm_scan_fdt_dev, - .plat_auto = sizeof(struct davinci_gpio_platdata), + .plat_auto = sizeof(struct davinci_gpio_plat), .probe = davinci_gpio_probe, .priv_auto = sizeof(struct davinci_gpio_bank), }; diff --git a/drivers/gpio/da8xx_gpio.h b/drivers/gpio/da8xx_gpio.h index 849e8d2dcf..ca59d6a90b 100644 --- a/drivers/gpio/da8xx_gpio.h +++ b/drivers/gpio/da8xx_gpio.h @@ -31,7 +31,7 @@ struct davinci_gpio_bank { #if CONFIG_IS_ENABLED(DM_GPIO) /* Information about a GPIO bank */ -struct davinci_gpio_platdata { +struct davinci_gpio_plat { int bank_index; ulong base; /* address of registers in physical memory */ const char *port_name; diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index 42158bd84a..acd77b6892 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -36,7 +36,7 @@ struct gpio_dwapb_priv { struct reset_ctl_bulk resets; }; -struct gpio_dwapb_platdata { +struct gpio_dwapb_plat { const char *name; int bank; int pins; @@ -45,7 +45,7 @@ struct gpio_dwapb_platdata { static int dwapb_gpio_direction_input(struct udevice *dev, unsigned pin) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); clrbits_le32(plat->base + GPIO_SWPORT_DDR(plat->bank), 1 << pin); return 0; @@ -54,7 +54,7 @@ static int dwapb_gpio_direction_input(struct udevice *dev, unsigned pin) static int dwapb_gpio_direction_output(struct udevice *dev, unsigned pin, int val) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); setbits_le32(plat->base + GPIO_SWPORT_DDR(plat->bank), 1 << pin); @@ -68,7 +68,7 @@ static int dwapb_gpio_direction_output(struct udevice *dev, unsigned pin, static int dwapb_gpio_set_value(struct udevice *dev, unsigned pin, int val) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); if (val) setbits_le32(plat->base + GPIO_SWPORT_DR(plat->bank), 1 << pin); @@ -80,7 +80,7 @@ static int dwapb_gpio_set_value(struct udevice *dev, unsigned pin, int val) static int dwapb_gpio_get_function(struct udevice *dev, unsigned offset) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); u32 gpio; gpio = readl(plat->base + GPIO_SWPORT_DDR(plat->bank)); @@ -93,7 +93,7 @@ static int dwapb_gpio_get_function(struct udevice *dev, unsigned offset) static int dwapb_gpio_get_value(struct udevice *dev, unsigned pin) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); u32 value; if (dwapb_gpio_get_function(dev, pin) == GPIOF_OUTPUT) @@ -141,7 +141,7 @@ static int gpio_dwapb_reset(struct udevice *dev) static int gpio_dwapb_probe(struct udevice *dev) { struct gpio_dev_priv *priv = dev_get_uclass_priv(dev); - struct gpio_dwapb_platdata *plat = dev->plat; + struct gpio_dwapb_plat *plat = dev->plat; if (!plat) { /* Reset on parent device only */ @@ -156,7 +156,7 @@ static int gpio_dwapb_probe(struct udevice *dev) static int gpio_dwapb_bind(struct udevice *dev) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); struct udevice *subdev; fdt_addr_t base; int ret, bank = 0; @@ -215,7 +215,7 @@ static int gpio_dwapb_bind(struct udevice *dev) static int gpio_dwapb_remove(struct udevice *dev) { - struct gpio_dwapb_platdata *plat = dev_get_plat(dev); + struct gpio_dwapb_plat *plat = dev_get_plat(dev); struct gpio_dwapb_priv *priv = dev_get_priv(dev); if (!plat && priv) diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c index 02a37829c0..f5e5fc6e48 100644 --- a/drivers/gpio/hi6220_gpio.c +++ b/drivers/gpio/hi6220_gpio.c @@ -66,7 +66,7 @@ static const struct dm_gpio_ops gpio_hi6220_ops = { static int hi6220_gpio_probe(struct udevice *dev) { struct gpio_bank *bank = dev_get_priv(dev); - struct hikey_gpio_platdata *plat = dev_get_plat(dev); + struct hikey_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev->uclass_priv; char name[18], *str; diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index 9cd0745625..68d72eedc5 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -117,7 +117,7 @@ static int broadwell_gpio_get_function(struct udevice *dev, unsigned offset) static int broadwell_gpio_probe(struct udevice *dev) { - struct broadwell_bank_platdata *plat = dev_get_plat(dev); + struct broadwell_bank_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct broadwell_bank_priv *priv = dev_get_priv(dev); struct udevice *pinctrl; @@ -141,7 +141,7 @@ static int broadwell_gpio_probe(struct udevice *dev) static int broadwell_gpio_of_to_plat(struct udevice *dev) { - struct broadwell_bank_platdata *plat = dev_get_plat(dev); + struct broadwell_bank_plat *plat = dev_get_plat(dev); u32 gpiobase; int bank; int ret; @@ -185,5 +185,5 @@ U_BOOT_DRIVER(gpio_broadwell) = { .of_to_plat = broadwell_gpio_of_to_plat, .probe = broadwell_gpio_probe, .priv_auto = sizeof(struct broadwell_bank_priv), - .plat_auto = sizeof(struct broadwell_bank_platdata), + .plat_auto = sizeof(struct broadwell_bank_plat), }; diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index add13d89a7..11d4be04f5 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -95,7 +95,7 @@ static int _ich6_gpio_set_direction(uint16_t base, unsigned offset, int dir) static int gpio_ich6_of_to_plat(struct udevice *dev) { - struct ich6_bank_platdata *plat = dev_get_plat(dev); + struct ich6_bank_plat *plat = dev_get_plat(dev); u32 gpiobase; int offset; int ret; @@ -119,7 +119,7 @@ static int gpio_ich6_of_to_plat(struct udevice *dev) static int ich6_gpio_probe(struct udevice *dev) { - struct ich6_bank_platdata *plat = dev_get_plat(dev); + struct ich6_bank_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct ich6_bank_priv *bank = dev_get_priv(dev); const void *prop; @@ -237,5 +237,5 @@ U_BOOT_DRIVER(gpio_ich6) = { .of_to_plat = gpio_ich6_of_to_plat, .probe = ich6_gpio_probe, .priv_auto = sizeof(struct ich6_bank_priv), - .plat_auto = sizeof(struct ich6_bank_platdata), + .plat_auto = sizeof(struct ich6_bank_plat), }; diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c index 1a3a9cbdc1..0561b36e54 100644 --- a/drivers/gpio/iproc_gpio.c +++ b/drivers/gpio/iproc_gpio.c @@ -55,7 +55,7 @@ struct iproc_gpio_pctrl_map { * @name: gpio device name, ex GPIO0, GPIO1 * @ngpios: total number of gpios */ -struct iproc_gpio_platdata { +struct iproc_gpio_plat { struct udevice *pinctrl_dev; struct list_head gpiomap; void __iomem *base; @@ -73,7 +73,7 @@ struct iproc_gpio_platdata { * @gpio: GPIO pin * @set: set or clear */ -static inline void iproc_gpio_set_bit(struct iproc_gpio_platdata *plat, +static inline void iproc_gpio_set_bit(struct iproc_gpio_plat *plat, u32 reg, u32 gpio, bool set) { u32 offset = GPIO_REG(gpio, reg); @@ -83,7 +83,7 @@ static inline void iproc_gpio_set_bit(struct iproc_gpio_platdata *plat, (set ? BIT(shift) : 0)); } -static inline bool iproc_gpio_get_bit(struct iproc_gpio_platdata *plat, +static inline bool iproc_gpio_get_bit(struct iproc_gpio_plat *plat, u32 reg, u32 gpio) { u32 offset = GPIO_REG(gpio, reg); @@ -98,7 +98,7 @@ static inline bool iproc_gpio_get_bit(struct iproc_gpio_platdata *plat, * @plat: iproc GPIO device * @gpio: GPIO pin */ -static u32 iproc_get_pctrl_from_gpio(struct iproc_gpio_platdata *plat, u32 gpio) +static u32 iproc_get_pctrl_from_gpio(struct iproc_gpio_plat *plat, u32 gpio) { struct iproc_gpio_pctrl_map *range = NULL; struct list_head *pos, *tmp; @@ -127,7 +127,7 @@ static u32 iproc_get_pctrl_from_gpio(struct iproc_gpio_platdata *plat, u32 gpio) */ static int iproc_get_gpio_pctrl_mapping(struct udevice *dev) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); struct iproc_gpio_pctrl_map *range = NULL; struct ofnode_phandle_args args; int index = 0, ret; @@ -153,7 +153,7 @@ static int iproc_get_gpio_pctrl_mapping(struct udevice *dev) static int iproc_gpio_request(struct udevice *dev, u32 gpio, const char *label) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); u32 pctrl; /* nothing to do if there is no corresponding pinctrl device */ @@ -167,7 +167,7 @@ static int iproc_gpio_request(struct udevice *dev, u32 gpio, const char *label) static int iproc_gpio_direction_input(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); iproc_gpio_set_bit(plat, OUT_EN_OFFSET, gpio, false); dev_dbg(dev, "gpio:%u set input\n", gpio); @@ -177,7 +177,7 @@ static int iproc_gpio_direction_input(struct udevice *dev, u32 gpio) static int iproc_gpio_direction_output(struct udevice *dev, u32 gpio, int value) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); iproc_gpio_set_bit(plat, OUT_EN_OFFSET, gpio, true); iproc_gpio_set_bit(plat, DATA_OUT_OFFSET, gpio, value); @@ -188,7 +188,7 @@ static int iproc_gpio_direction_output(struct udevice *dev, u32 gpio, int value) static int iproc_gpio_get_value(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); int value; value = iproc_gpio_get_bit(plat, DATA_IN_OFFSET, gpio); @@ -199,7 +199,7 @@ static int iproc_gpio_get_value(struct udevice *dev, u32 gpio) static int iproc_gpio_set_value(struct udevice *dev, u32 gpio, int value) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); if (iproc_gpio_get_bit(plat, OUT_EN_OFFSET, gpio)) iproc_gpio_set_bit(plat, DATA_OUT_OFFSET, gpio, value); @@ -210,7 +210,7 @@ static int iproc_gpio_set_value(struct udevice *dev, u32 gpio, int value) static int iproc_gpio_get_function(struct udevice *dev, u32 gpio) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); if (iproc_gpio_get_bit(plat, OUT_EN_OFFSET, gpio)) return GPIOF_OUTPUT; @@ -220,7 +220,7 @@ static int iproc_gpio_get_function(struct udevice *dev, u32 gpio) static int iproc_gpio_of_to_plat(struct udevice *dev) { - struct iproc_gpio_platdata *plat = dev_get_plat(dev); + struct iproc_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int ret; char name[10]; @@ -286,5 +286,5 @@ U_BOOT_DRIVER(iproc_gpio) = { .of_match = iproc_gpio_ids, .ops = &iproc_gpio_ops, .of_to_plat = iproc_gpio_of_to_plat, - .plat_auto = sizeof(struct iproc_gpio_platdata), + .plat_auto = sizeof(struct iproc_gpio_plat), }; diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index a35e4de761..fd26a36a0f 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -78,7 +78,7 @@ static int mpc83xx_spisel_boot_of_to_plat(struct udevice *dev) } #endif -static int mpc83xx_spisel_boot_platdata_to_priv(struct udevice *dev) +static int mpc83xx_spisel_boot_plat_to_priv(struct udevice *dev) { struct mpc83xx_spisel_boot *priv = dev_get_priv(dev); struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); @@ -107,7 +107,7 @@ static int mpc83xx_spisel_boot_probe(struct udevice *dev) struct mpc83xx_spisel_boot *data = dev_get_priv(dev); char name[32], *str; - mpc83xx_spisel_boot_platdata_to_priv(dev); + mpc83xx_spisel_boot_plat_to_priv(dev); snprintf(name, sizeof(name), "MPC@%lx_", data->addr); str = strdup(name); diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index dfc1dc67d5..2bc1a0d571 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -219,7 +219,7 @@ static int mpc8xxx_gpio_of_to_plat(struct udevice *dev) } #endif -static int mpc8xxx_gpio_platdata_to_priv(struct udevice *dev) +static int mpc8xxx_gpio_plat_to_priv(struct udevice *dev) { struct mpc8xxx_gpio_data *priv = dev_get_priv(dev); struct mpc8xxx_gpio_plat *plat = dev_get_plat(dev); @@ -249,7 +249,7 @@ static int mpc8xxx_gpio_probe(struct udevice *dev) struct mpc8xxx_gpio_data *data = dev_get_priv(dev); char name[32], *str; - mpc8xxx_gpio_platdata_to_priv(dev); + mpc8xxx_gpio_plat_to_priv(dev); snprintf(name, sizeof(name), "MPC@%lx_", data->addr); str = strdup(name); diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c index e48ddb53e6..65b4cbf61b 100644 --- a/drivers/gpio/mt7621_gpio.c +++ b/drivers/gpio/mt7621_gpio.c @@ -38,20 +38,20 @@ enum mediatek_gpio_reg { static void __iomem *mediatek_gpio_membase; -struct mediatek_gpio_platdata { +struct mediatek_gpio_plat { char bank_name[3]; /* Name of bank, e.g. "PA", "PB" etc */ int gpio_count; int bank; }; -static u32 reg_offs(struct mediatek_gpio_platdata *plat, int reg) +static u32 reg_offs(struct mediatek_gpio_plat *plat, int reg) { return (reg * 0x10) + (plat->bank * 0x4); } static int mediatek_gpio_get_value(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); return !!(ioread32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_DATA)) & BIT(offset)); @@ -60,7 +60,7 @@ static int mediatek_gpio_get_value(struct udevice *dev, unsigned int offset) static int mediatek_gpio_set_value(struct udevice *dev, unsigned int offset, int value) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); iowrite32(BIT(offset), mediatek_gpio_membase + reg_offs(plat, value ? GPIO_REG_DSET : GPIO_REG_DCLR)); @@ -70,7 +70,7 @@ static int mediatek_gpio_set_value(struct udevice *dev, unsigned int offset, static int mediatek_gpio_direction_input(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); clrbits_le32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL), BIT(offset)); @@ -81,7 +81,7 @@ static int mediatek_gpio_direction_input(struct udevice *dev, unsigned int offse static int mediatek_gpio_direction_output(struct udevice *dev, unsigned int offset, int value) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); setbits_le32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL), BIT(offset)); @@ -92,7 +92,7 @@ static int mediatek_gpio_direction_output(struct udevice *dev, unsigned int offs static int mediatek_gpio_get_function(struct udevice *dev, unsigned int offset) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); u32 t; t = ioread32(mediatek_gpio_membase + reg_offs(plat, GPIO_REG_CTRL)); @@ -112,7 +112,7 @@ static const struct dm_gpio_ops gpio_mediatek_ops = { static int gpio_mediatek_probe(struct udevice *dev) { - struct mediatek_gpio_platdata *plat = dev_get_plat(dev); + struct mediatek_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); /* Tell the uclass how many GPIOs we have */ @@ -130,7 +130,7 @@ static int gpio_mediatek_probe(struct udevice *dev) */ static int gpio_mediatek_bind(struct udevice *parent) { - struct mediatek_gpio_platdata *plat = parent->plat; + struct mediatek_gpio_plat *plat = parent->plat; ofnode node; int bank = 0; int ret; @@ -145,7 +145,7 @@ static int gpio_mediatek_bind(struct udevice *parent) for (node = dev_read_first_subnode(parent); ofnode_valid(node); node = dev_read_next_subnode(node)) { - struct mediatek_gpio_platdata *plat; + struct mediatek_gpio_plat *plat; struct udevice *dev; plat = calloc(1, sizeof(*plat)); diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index 30daf4a74e..5ad65e4ee0 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -150,7 +150,7 @@ DECLARE_GLOBAL_DATA_PTR; * Bank 4: 0-20 -> 21 PINS */ -struct mxs_gpio_platdata { +struct mxs_gpio_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_fsl_imx23_gpio dtplat; #endif @@ -235,7 +235,7 @@ static const struct dm_gpio_ops gpio_mxs_ops = { static int mxs_gpio_probe(struct udevice *dev) { - struct mxs_gpio_platdata *plat = dev_get_plat(dev); + struct mxs_gpio_plat *plat = dev_get_plat(dev); struct mxs_gpio_priv *priv = dev_get_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[16], *str; @@ -264,7 +264,7 @@ static int mxs_gpio_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxs_of_to_plat(struct udevice *dev) { - struct mxs_gpio_platdata *plat = dev->plat; + struct mxs_gpio_plat *plat = dev->plat; struct fdtdec_phandle_args args; int node = dev_of_offset(dev); int ret; @@ -299,7 +299,7 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = { .ops = &gpio_mxs_ops, .probe = mxs_gpio_probe, .priv_auto = sizeof(struct mxs_gpio_priv), - .plat_auto = sizeof(struct mxs_gpio_platdata), + .plat_auto = sizeof(struct mxs_gpio_plat), #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = mxs_gpio_ids, .of_to_plat = mxs_of_to_plat, diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c index 8c5fd67075..52851e58b6 100644 --- a/drivers/gpio/nx_gpio.c +++ b/drivers/gpio/nx_gpio.c @@ -36,7 +36,7 @@ struct nx_alive_gpio_regs { u32 pad; /* Alive GPIO Input Value Register */ }; -struct nx_gpio_platdata { +struct nx_gpio_plat { void *regs; int gpio_count; const char *bank_name; @@ -44,7 +44,7 @@ struct nx_gpio_platdata { static int nx_alive_gpio_is_check(struct udevice *dev) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); const char *bank_name = plat->bank_name; if (!strcmp(bank_name, "gpio_alv")) @@ -55,7 +55,7 @@ static int nx_alive_gpio_is_check(struct udevice *dev) static int nx_alive_gpio_direction_input(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; setbits_le32(®s->outputenb_reset, 1 << pin); @@ -66,7 +66,7 @@ static int nx_alive_gpio_direction_input(struct udevice *dev, unsigned int pin) static int nx_alive_gpio_direction_output(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; if (val) @@ -81,7 +81,7 @@ static int nx_alive_gpio_direction_output(struct udevice *dev, unsigned int pin, static int nx_alive_gpio_get_value(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; unsigned int mask = 1UL << pin; unsigned int value; @@ -94,7 +94,7 @@ static int nx_alive_gpio_get_value(struct udevice *dev, unsigned int pin) static int nx_alive_gpio_set_value(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; if (val) @@ -107,7 +107,7 @@ static int nx_alive_gpio_set_value(struct udevice *dev, unsigned int pin, static int nx_alive_gpio_get_function(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_alive_gpio_regs *const regs = plat->regs; unsigned int mask = (1UL << pin); unsigned int output; @@ -122,7 +122,7 @@ static int nx_alive_gpio_get_function(struct udevice *dev, unsigned int pin) static int nx_gpio_direction_input(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; if (nx_alive_gpio_is_check(dev)) @@ -136,7 +136,7 @@ static int nx_gpio_direction_input(struct udevice *dev, unsigned int pin) static int nx_gpio_direction_output(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; if (nx_alive_gpio_is_check(dev)) @@ -154,7 +154,7 @@ static int nx_gpio_direction_output(struct udevice *dev, unsigned int pin, static int nx_gpio_get_value(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; unsigned int mask = 1UL << pin; unsigned int value; @@ -169,7 +169,7 @@ static int nx_gpio_get_value(struct udevice *dev, unsigned int pin) static int nx_gpio_set_value(struct udevice *dev, unsigned int pin, int val) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; if (nx_alive_gpio_is_check(dev)) @@ -185,7 +185,7 @@ static int nx_gpio_set_value(struct udevice *dev, unsigned int pin, int val) static int nx_gpio_get_function(struct udevice *dev, unsigned int pin) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); struct nx_gpio_regs *const regs = plat->regs; unsigned int mask = (1UL << pin); unsigned int output; @@ -204,7 +204,7 @@ static int nx_gpio_get_function(struct udevice *dev, unsigned int pin) static int nx_gpio_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); uc_priv->gpio_count = plat->gpio_count; uc_priv->bank_name = plat->bank_name; @@ -214,7 +214,7 @@ static int nx_gpio_probe(struct udevice *dev) static int nx_gpio_of_to_plat(struct udevice *dev) { - struct nx_gpio_platdata *plat = dev_get_plat(dev); + struct nx_gpio_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(devfdt_get_addr(dev), sizeof(struct nx_gpio_regs), @@ -245,6 +245,6 @@ U_BOOT_DRIVER(nx_gpio) = { .of_match = nx_gpio_ids, .ops = &nx_gpio_ops, .of_to_plat = nx_gpio_of_to_plat, - .plat_auto = sizeof(struct nx_gpio_platdata), + .plat_auto = sizeof(struct nx_gpio_plat), .probe = nx_gpio_probe, }; diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 665f46d555..400c6ca472 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -285,7 +285,7 @@ static const struct dm_gpio_ops gpio_omap_ops = { static int omap_gpio_probe(struct udevice *dev) { struct gpio_bank *bank = dev_get_priv(dev); - struct omap_gpio_platdata *plat = dev_get_plat(dev); + struct omap_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[18], *str; @@ -302,7 +302,7 @@ static int omap_gpio_probe(struct udevice *dev) #if !CONFIG_IS_ENABLED(OF_CONTROL) static int omap_gpio_bind(struct udevice *dev) { - struct omap_gpio_platdata *plat = dev_get_plat(dev); + struct omap_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t base_addr; if (plat) @@ -344,7 +344,7 @@ static const struct udevice_id omap_gpio_ids[] = { static int omap_gpio_of_to_plat(struct udevice *dev) { - struct omap_gpio_platdata *plat = dev_get_plat(dev); + struct omap_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr; addr = dev_read_addr(dev); @@ -363,7 +363,7 @@ U_BOOT_DRIVER(gpio_omap) = { #if !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_gpio_ids, .of_to_plat = of_match_ptr(omap_gpio_of_to_plat), - .plat_auto = sizeof(struct omap_gpio_platdata), + .plat_auto = sizeof(struct omap_gpio_plat), #endif #else .bind = omap_gpio_bind, diff --git a/drivers/gpio/pcf8575_gpio.c b/drivers/gpio/pcf8575_gpio.c index 3eed9e93c2..6d38646ef6 100644 --- a/drivers/gpio/pcf8575_gpio.c +++ b/drivers/gpio/pcf8575_gpio.c @@ -125,7 +125,7 @@ static int pcf8575_set_value(struct udevice *dev, unsigned int offset, return pcf8575_direction_output(dev, offset, value); } -static int pcf8575_ofdata_platdata(struct udevice *dev) +static int pcf8575_ofdata_plat(struct udevice *dev) { struct pcf8575_chip *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); @@ -175,7 +175,7 @@ U_BOOT_DRIVER(gpio_pcf8575) = { .id = UCLASS_GPIO, .ops = &pcf8575_gpio_ops, .of_match = pcf8575_gpio_ids, - .of_to_plat = pcf8575_ofdata_platdata, + .of_to_plat = pcf8575_ofdata_plat, .probe = pcf8575_gpio_probe, .plat_auto = sizeof(struct pcf8575_chip), }; diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c index 6202e4841f..9de9541c87 100644 --- a/drivers/gpio/s5p_gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; #define RATE_SET(gpio) (0x1 << (gpio + 16)) /* Platform data for each bank */ -struct exynos_gpio_platdata { +struct exynos_gpio_plat { struct s5p_gpio_bank *bank; const char *bank_name; /* Name of port, e.g. 'gpa0" */ }; @@ -287,7 +287,7 @@ static int gpio_exynos_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct exynos_bank_info *priv = dev->priv; - struct exynos_gpio_platdata *plat = dev->plat; + struct exynos_gpio_plat *plat = dev->plat; /* Only child devices have ports */ if (!plat) @@ -307,7 +307,7 @@ static int gpio_exynos_probe(struct udevice *dev) */ static int gpio_exynos_bind(struct udevice *parent) { - struct exynos_gpio_platdata *plat = parent->plat; + struct exynos_gpio_plat *plat = parent->plat; struct s5p_gpio_bank *bank, *base; const void *blob = gd->fdt_blob; int node; @@ -320,7 +320,7 @@ static int gpio_exynos_bind(struct udevice *parent) for (node = fdt_first_subnode(blob, dev_of_offset(parent)), bank = base; node > 0; node = fdt_next_subnode(blob, node), bank++) { - struct exynos_gpio_platdata *plat; + struct exynos_gpio_plat *plat; struct udevice *dev; fdt_addr_t reg; int ret; diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c index 933cace5be..abd1f629b9 100644 --- a/drivers/gpio/sifive-gpio.c +++ b/drivers/gpio/sifive-gpio.c @@ -15,7 +15,7 @@ static int sifive_gpio_probe(struct udevice *dev) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); char name[18], *str; @@ -49,7 +49,7 @@ static void sifive_update_gpio_reg(void *bptr, u32 offset, bool value) static int sifive_gpio_direction_input(struct udevice *dev, u32 offset) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); if (offset > uc_priv->gpio_count) @@ -65,7 +65,7 @@ static int sifive_gpio_direction_input(struct udevice *dev, u32 offset) static int sifive_gpio_direction_output(struct udevice *dev, u32 offset, int value) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); if (offset > uc_priv->gpio_count) @@ -83,7 +83,7 @@ static int sifive_gpio_direction_output(struct udevice *dev, u32 offset, static int sifive_gpio_get_value(struct udevice *dev, u32 offset) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int val; int dir; @@ -104,7 +104,7 @@ static int sifive_gpio_get_value(struct udevice *dev, u32 offset) static int sifive_gpio_set_value(struct udevice *dev, u32 offset, int value) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); if (offset > uc_priv->gpio_count) @@ -117,7 +117,7 @@ static int sifive_gpio_set_value(struct udevice *dev, u32 offset, int value) static int sifive_gpio_get_function(struct udevice *dev, unsigned int offset) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); u32 outdir, indir, val; struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); @@ -156,7 +156,7 @@ static const struct dm_gpio_ops sifive_gpio_ops = { static int sifive_gpio_of_to_plat(struct udevice *dev) { - struct sifive_gpio_platdata *plat = dev_get_plat(dev); + struct sifive_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t addr; addr = dev_read_addr(dev); @@ -172,7 +172,7 @@ U_BOOT_DRIVER(gpio_sifive) = { .id = UCLASS_GPIO, .of_match = sifive_gpio_match, .of_to_plat = of_match_ptr(sifive_gpio_of_to_plat), - .plat_auto = sizeof(struct sifive_gpio_platdata), + .plat_auto = sizeof(struct sifive_gpio_plat), .ops = &sifive_gpio_ops, .probe = sifive_gpio_probe, }; diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 567bd647ff..75494c7828 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -22,7 +22,7 @@ #define SUNXI_GPIOS_PER_BANK SUNXI_GPIO_A_NR -struct sunxi_gpio_platdata { +struct sunxi_gpio_plat { struct sunxi_gpio *regs; const char *bank_name; /* Name of bank, e.g. "B" */ int gpio_count; @@ -158,7 +158,7 @@ int sunxi_name_to_gpio(const char *name) static int sunxi_gpio_direction_input(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); sunxi_gpio_set_cfgbank(plat->regs, offset, SUNXI_GPIO_INPUT); @@ -168,7 +168,7 @@ static int sunxi_gpio_direction_input(struct udevice *dev, unsigned offset) static int sunxi_gpio_direction_output(struct udevice *dev, unsigned offset, int value) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset); sunxi_gpio_set_cfgbank(plat->regs, offset, SUNXI_GPIO_OUTPUT); @@ -179,7 +179,7 @@ static int sunxi_gpio_direction_output(struct udevice *dev, unsigned offset, static int sunxi_gpio_get_value(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset); unsigned dat; @@ -192,7 +192,7 @@ static int sunxi_gpio_get_value(struct udevice *dev, unsigned offset) static int sunxi_gpio_set_value(struct udevice *dev, unsigned offset, int value) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); u32 num = GPIO_NUM(offset); clrsetbits_le32(&plat->regs->dat, 1 << num, value ? (1 << num) : 0); @@ -201,7 +201,7 @@ static int sunxi_gpio_set_value(struct udevice *dev, unsigned offset, static int sunxi_gpio_get_function(struct udevice *dev, unsigned offset) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); int func; func = sunxi_gpio_get_cfgbank(plat->regs, offset); @@ -260,7 +260,7 @@ static char *gpio_bank_name(int bank) static int gpio_sunxi_probe(struct udevice *dev) { - struct sunxi_gpio_platdata *plat = dev_get_plat(dev); + struct sunxi_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); /* Tell the uclass how many GPIOs we have */ @@ -285,7 +285,7 @@ static int gpio_sunxi_bind(struct udevice *parent) { struct sunxi_gpio_soc_data *soc_data = (struct sunxi_gpio_soc_data *)dev_get_driver_data(parent); - struct sunxi_gpio_platdata *plat = parent->plat; + struct sunxi_gpio_plat *plat = parent->plat; struct sunxi_gpio_reg *ctlr; int bank, ret; @@ -295,7 +295,7 @@ static int gpio_sunxi_bind(struct udevice *parent) ctlr = dev_read_addr_ptr(parent); for (bank = 0; bank < soc_data->no_banks; bank++) { - struct sunxi_gpio_platdata *plat; + struct sunxi_gpio_plat *plat; struct udevice *dev; plat = calloc(1, sizeof(*plat)); diff --git a/drivers/gpio/tegra186_gpio.c b/drivers/gpio/tegra186_gpio.c index 14c9d90bfd..cd1fb65a55 100644 --- a/drivers/gpio/tegra186_gpio.c +++ b/drivers/gpio/tegra186_gpio.c @@ -26,7 +26,7 @@ struct tegra186_gpio_ctlr_data { uint32_t port_count; }; -struct tegra186_gpio_platdata { +struct tegra186_gpio_plat { const char *name; uint32_t *regs; }; @@ -34,7 +34,7 @@ struct tegra186_gpio_platdata { static uint32_t *tegra186_gpio_reg(struct udevice *dev, uint32_t reg, uint32_t gpio) { - struct tegra186_gpio_platdata *plat = dev->plat; + struct tegra186_gpio_plat *plat = dev->plat; uint32_t index = (reg + (gpio * TEGRA186_GPIO_PER_GPIO_STRIDE)) / 4; return &(plat->regs[index]); @@ -166,7 +166,7 @@ static const struct dm_gpio_ops tegra186_gpio_ops = { */ static int tegra186_gpio_bind(struct udevice *parent) { - struct tegra186_gpio_platdata *parent_plat = parent->plat; + struct tegra186_gpio_plat *parent_plat = parent->plat; struct tegra186_gpio_ctlr_data *ctlr_data = (struct tegra186_gpio_ctlr_data *)dev_get_driver_data(parent); uint32_t *regs; @@ -181,7 +181,7 @@ static int tegra186_gpio_bind(struct udevice *parent) return -EINVAL; for (port = 0; port < ctlr_data->port_count; port++) { - struct tegra186_gpio_platdata *plat; + struct tegra186_gpio_plat *plat; struct udevice *dev; plat = calloc(1, sizeof(*plat)); @@ -201,7 +201,7 @@ static int tegra186_gpio_bind(struct udevice *parent) static int tegra186_gpio_probe(struct udevice *dev) { - struct tegra186_gpio_platdata *plat = dev->plat; + struct tegra186_gpio_plat *plat = dev->plat; struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); /* Only child devices have ports */ diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index 862a63fbf6..c489796f77 100644 --- a/drivers/gpio/tegra_gpio.c +++ b/drivers/gpio/tegra_gpio.c @@ -28,7 +28,7 @@ static const int CONFIG_GPIO = 1; static const int DIRECTION_INPUT = 0; static const int DIRECTION_OUTPUT = 1; -struct tegra_gpio_platdata { +struct tegra_gpio_plat { struct gpio_ctlr_bank *bank; const char *port_name; /* Name of port, e.g. "B" */ int base_gpio; /* Port number for this port (0, 1,.., n-1) */ @@ -292,7 +292,7 @@ static int gpio_tegra_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct tegra_port_info *priv = dev->priv; - struct tegra_gpio_platdata *plat = dev->plat; + struct tegra_gpio_plat *plat = dev->plat; /* Only child devices have ports */ if (!plat) @@ -313,7 +313,7 @@ static int gpio_tegra_probe(struct udevice *dev) */ static int gpio_tegra_bind(struct udevice *parent) { - struct tegra_gpio_platdata *plat = parent->plat; + struct tegra_gpio_plat *plat = parent->plat; struct gpio_ctlr *ctlr; int bank_count; int bank; @@ -348,7 +348,7 @@ static int gpio_tegra_bind(struct udevice *parent) int port; for (port = 0; port < TEGRA_PORTS_PER_BANK; port++) { - struct tegra_gpio_platdata *plat; + struct tegra_gpio_plat *plat; struct udevice *dev; int base_port; diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index 9133e59fc5..91c0308f2f 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -93,7 +93,7 @@ static const struct dm_gpio_ops gpio_vybrid_ops = { static int vybrid_gpio_probe(struct udevice *dev) { struct vybrid_gpios *gpios = dev_get_priv(dev); - struct vybrid_gpio_platdata *plat = dev_get_plat(dev); + struct vybrid_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); uc_priv->bank_name = plat->port_name; @@ -104,9 +104,9 @@ static int vybrid_gpio_probe(struct udevice *dev) return 0; } -static int vybrid_gpio_odata_to_platdata(struct udevice *dev) +static int vybrid_gpio_odata_to_plat(struct udevice *dev) { - struct vybrid_gpio_platdata *plat = dev_get_plat(dev); + struct vybrid_gpio_plat *plat = dev_get_plat(dev); fdt_addr_t base_addr; base_addr = dev_read_addr(dev); @@ -130,8 +130,8 @@ U_BOOT_DRIVER(gpio_vybrid) = { .id = UCLASS_GPIO, .ops = &gpio_vybrid_ops, .of_match = vybrid_gpio_ids, - .of_to_plat = vybrid_gpio_odata_to_platdata, + .of_to_plat = vybrid_gpio_odata_to_plat, .probe = vybrid_gpio_probe, .priv_auto = sizeof(struct vybrid_gpios), - .plat_auto = sizeof(struct vybrid_gpio_platdata), + .plat_auto = sizeof(struct vybrid_gpio_plat), }; diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 7bc758b166..510838d2f5 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -21,7 +21,7 @@ struct gpio_regs { u32 gpiodir; }; -struct xilinx_gpio_platdata { +struct xilinx_gpio_plat { struct gpio_regs *regs; int bank_max[XILINX_GPIO_MAX_BANK]; int bank_input[XILINX_GPIO_MAX_BANK]; @@ -36,7 +36,7 @@ struct xilinx_gpio_privdata { static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, u32 *bank_pin_num, struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); u32 bank, max_pins; /* the first gpio is 0 not 1 */ u32 pin_num = offset; @@ -59,7 +59,7 @@ static int xilinx_gpio_get_bank_pin(unsigned offset, u32 *bank_num, static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -87,7 +87,7 @@ static int xilinx_gpio_set_value(struct udevice *dev, unsigned offset, static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); int val, ret; u32 bank, pin; @@ -114,7 +114,7 @@ static int xilinx_gpio_get_value(struct udevice *dev, unsigned offset) static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int val, ret; u32 bank, pin; @@ -143,7 +143,7 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset, int value) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int val, ret; u32 bank, pin; @@ -168,7 +168,7 @@ static int xilinx_gpio_direction_output(struct udevice *dev, unsigned offset, static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int val, ret; u32 bank, pin; @@ -194,7 +194,7 @@ static int xilinx_gpio_direction_input(struct udevice *dev, unsigned offset) static int xilinx_gpio_xlate(struct udevice *dev, struct gpio_desc *desc, struct ofnode_phandle_args *args) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); desc->offset = args->args[0]; @@ -239,7 +239,7 @@ static const struct dm_gpio_ops xilinx_gpio_ops = { static int xilinx_gpio_probe(struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); struct xilinx_gpio_privdata *priv = dev_get_priv(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr; @@ -265,7 +265,7 @@ static int xilinx_gpio_probe(struct udevice *dev) static int xilinx_gpio_of_to_plat(struct udevice *dev) { - struct xilinx_gpio_platdata *plat = dev_get_plat(dev); + struct xilinx_gpio_plat *plat = dev_get_plat(dev); int is_dual; plat->regs = (struct gpio_regs *)dev_read_addr(dev); @@ -303,6 +303,6 @@ U_BOOT_DRIVER(xilinx_gpio) = { .of_match = xilinx_gpio_ids, .of_to_plat = xilinx_gpio_of_to_plat, .probe = xilinx_gpio_probe, - .plat_auto = sizeof(struct xilinx_gpio_platdata), + .plat_auto = sizeof(struct xilinx_gpio_plat), .priv_auto = sizeof(struct xilinx_gpio_privdata), }; diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index ffbe7b4708..71a56127c0 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -97,7 +97,7 @@ #define PMC_GPIO_NR_GPIOS 116 #define PMC_GPIO_MAX_BANK 5 -struct zynq_gpio_platdata { +struct zynq_gpio_plat { phys_addr_t base; const struct zynq_platform_data *p_data; }; @@ -193,7 +193,7 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num, unsigned int *bank_pin_num, struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); u32 bank; for (bank = 0; bank < plat->p_data->max_bank; bank++) { @@ -215,7 +215,7 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num, static int gpio_is_valid(unsigned gpio, struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); return gpio < plat->p_data->ngpio; } @@ -233,7 +233,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) { u32 data; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); if (check_gpio(gpio, dev) < 0) return -1; @@ -249,7 +249,7 @@ static int zynq_gpio_get_value(struct udevice *dev, unsigned gpio) static int zynq_gpio_set_value(struct udevice *dev, unsigned gpio, int value) { unsigned int reg_offset, bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); if (check_gpio(gpio, dev) < 0) return -1; @@ -281,7 +281,7 @@ static int zynq_gpio_direction_input(struct udevice *dev, unsigned gpio) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); if (check_gpio(gpio, dev) < 0) return -1; @@ -305,7 +305,7 @@ static int zynq_gpio_direction_output(struct udevice *dev, unsigned gpio, { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); if (check_gpio(gpio, dev) < 0) return -1; @@ -331,7 +331,7 @@ static int zynq_gpio_get_function(struct udevice *dev, unsigned offset) { u32 reg; unsigned int bank_num, bank_pin_num; - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); if (check_gpio(offset, dev) < 0) return -1; @@ -369,7 +369,7 @@ static const struct udevice_id zynq_gpio_ids[] = { static int zynq_gpio_probe(struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); const void *label_ptr; @@ -390,7 +390,7 @@ static int zynq_gpio_probe(struct udevice *dev) static int zynq_gpio_of_to_plat(struct udevice *dev) { - struct zynq_gpio_platdata *plat = dev_get_plat(dev); + struct zynq_gpio_plat *plat = dev_get_plat(dev); plat->base = (phys_addr_t)dev_read_addr(dev); @@ -407,5 +407,5 @@ U_BOOT_DRIVER(gpio_zynq) = { .of_match = zynq_gpio_ids, .of_to_plat = zynq_gpio_of_to_plat, .probe = zynq_gpio_probe, - .plat_auto = sizeof(struct zynq_gpio_platdata), + .plat_auto = sizeof(struct zynq_gpio_plat), }; diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index 4fbf20e275..085b824e89 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -14,7 +14,7 @@ * i2c emulation works using an 'emul' node at the bus level. Each device in * that node is in the UCLASS_I2C_EMUL uclass, and emulates one i2c device. A * pointer to the device it emulates is in the 'dev' property of the emul device - * uclass plat (struct i2c_emul_platdata), put there by i2c_emul_find(). + * uclass plat (struct i2c_emul_plat), put there by i2c_emul_find(). * When sandbox wants an emulator for a device, it calls i2c_emul_find() which * searches for the emulator with the correct address. To find the device for an * emulator, call i2c_emul_get_device(). @@ -24,27 +24,27 @@ */ /** - * struct i2c_emul_uc_platdata - information about the emulator for this device + * struct i2c_emul_uc_plat - information about the emulator for this device * * This is used by devices in UCLASS_I2C_EMUL to record information about the * device being emulated. It is accessible with dev_get_uclass_plat() * * @dev: Device being emulated */ -struct i2c_emul_uc_platdata { +struct i2c_emul_uc_plat { struct udevice *dev; }; struct udevice *i2c_emul_get_device(struct udevice *emul) { - struct i2c_emul_uc_platdata *uc_plat = dev_get_uclass_plat(emul); + struct i2c_emul_uc_plat *uc_plat = dev_get_uclass_plat(emul); return uc_plat->dev; } int i2c_emul_find(struct udevice *dev, struct udevice **emulp) { - struct i2c_emul_uc_platdata *uc_plat; + struct i2c_emul_uc_plat *uc_plat; struct udevice *emul; int ret; @@ -64,7 +64,7 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp) UCLASS_DRIVER(i2c_emul) = { .id = UCLASS_I2C_EMUL, .name = "i2c_emul", - .per_device_plat_auto = sizeof(struct i2c_emul_uc_platdata), + .per_device_plat_auto = sizeof(struct i2c_emul_uc_plat), }; /* diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 322d72132b..1355dc274e 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -1049,7 +1049,7 @@ static int omap_i2c_probe_chip(struct udevice *bus, uint chip_addr, static int omap_i2c_probe(struct udevice *bus) { struct omap_i2c *priv = dev_get_priv(bus); - struct omap_i2c_platdata *plat = dev_get_plat(bus); + struct omap_i2c_plat *plat = dev_get_plat(bus); priv->speed = plat->speed; priv->regs = map_physmem(plat->base, sizeof(void *), @@ -1065,7 +1065,7 @@ static int omap_i2c_probe(struct udevice *bus) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int omap_i2c_of_to_plat(struct udevice *bus) { - struct omap_i2c_platdata *plat = dev_get_plat(bus); + struct omap_i2c_plat *plat = dev_get_plat(bus); plat->base = dev_read_addr(bus); plat->speed = dev_read_u32_default(bus, "clock-frequency", @@ -1094,7 +1094,7 @@ U_BOOT_DRIVER(i2c_omap) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_i2c_ids, .of_to_plat = omap_i2c_of_to_plat, - .plat_auto = sizeof(struct omap_i2c_platdata), + .plat_auto = sizeof(struct omap_i2c_plat), #endif .probe = omap_i2c_probe, .priv_auto = sizeof(struct omap_i2c), diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c index 971bbcf987..598c0a03db 100644 --- a/drivers/led/led_cortina.c +++ b/drivers/led/led_cortina.c @@ -57,7 +57,7 @@ struct cortina_led_cfg { }; /* LED_control structures */ -struct cortina_led_platdata { +struct cortina_led_plat { void __iomem *ctrl_regs; u16 rate1; /* blink rate setting 0 */ u16 rate2; /* blink rate setting 1 */ @@ -136,7 +136,7 @@ static int ca_led_of_to_plat(struct udevice *dev) /* Top-level LED node */ if (!uc_plat->label) { - struct cortina_led_platdata *plt = dev_get_plat(dev); + struct cortina_led_plat *plt = dev_get_plat(dev); plt->rate1 = dev_read_u32_default(dev, "Cortina,blink-rate1", 256); @@ -169,7 +169,7 @@ static int cortina_led_probe(struct udevice *dev) /* Top-level LED node */ if (!uc_plat->label) { - struct cortina_led_platdata *plat = dev_get_plat(dev); + struct cortina_led_plat *plat = dev_get_plat(dev); u32 reg_value, val; u16 rate1, rate2; @@ -292,7 +292,7 @@ U_BOOT_DRIVER(cortina_led) = { .of_to_plat = ca_led_of_to_plat, .bind = cortina_led_bind, .probe = cortina_led_probe, - .plat_auto = sizeof(struct cortina_led_platdata), + .plat_auto = sizeof(struct cortina_led_plat), .priv_auto = sizeof(struct cortina_led_cfg), .ops = &cortina_led_ops, }; diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index 091f055ec0..057b431c25 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -17,7 +17,7 @@ struct altera_sysid_regs { u32 timestamp; /* Timestamp */ }; -struct altera_sysid_platdata { +struct altera_sysid_plat { struct altera_sysid_regs *regs; }; @@ -59,7 +59,7 @@ U_BOOT_CMD( static int altera_sysid_read(struct udevice *dev, int offset, void *buf, int size) { - struct altera_sysid_platdata *plat = dev->plat; + struct altera_sysid_plat *plat = dev->plat; struct altera_sysid_regs *const regs = plat->regs; u32 *sysid = buf; @@ -71,7 +71,7 @@ static int altera_sysid_read(struct udevice *dev, static int altera_sysid_of_to_plat(struct udevice *dev) { - struct altera_sysid_platdata *plat = dev_get_plat(dev); + struct altera_sysid_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_sysid_regs), @@ -94,6 +94,6 @@ U_BOOT_DRIVER(altera_sysid) = { .id = UCLASS_MISC, .of_match = altera_sysid_ids, .of_to_plat = altera_sysid_of_to_plat, - .plat_auto = sizeof(struct altera_sysid_platdata), + .plat_auto = sizeof(struct altera_sysid_plat), .ops = &altera_sysid_ops, }; diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index c228e84fa1..5ed8ab6530 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -61,7 +61,7 @@ static int mount_ubifs(char *mtdpart, char *ubivol) } #endif -static int select_fs_dev(struct device_platdata *plat) +static int select_fs_dev(struct device_plat *plat) { int ret; @@ -226,7 +226,7 @@ static int fs_loader_of_to_plat(struct udevice *dev) ofnode fs_loader_node = dev_ofnode(dev); if (ofnode_valid(fs_loader_node)) { - struct device_platdata *plat; + struct device_plat *plat; plat = dev->plat; if (!ofnode_read_u32_array(fs_loader_node, @@ -250,7 +250,7 @@ static int fs_loader_probe(struct udevice *dev) { #if CONFIG_IS_ENABLED(DM) && CONFIG_IS_ENABLED(BLK) int ret; - struct device_platdata *plat = dev->plat; + struct device_plat *plat = dev->plat; if (plat->phandlepart.phandle) { ofnode node = ofnode_get_by_phandle(plat->phandlepart.phandle); @@ -285,7 +285,7 @@ U_BOOT_DRIVER(fs_loader) = { .of_match = fs_loader_ids, .probe = fs_loader_probe, .of_to_plat = fs_loader_of_to_plat, - .plat_auto = sizeof(struct device_platdata), + .plat_auto = sizeof(struct device_plat), .priv_auto = sizeof(struct firmware), }; diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c index d0ef2ef96c..e0a6f2d388 100644 --- a/drivers/misc/microchip_flexcom.c +++ b/drivers/misc/microchip_flexcom.c @@ -16,14 +16,14 @@ struct microchip_flexcom_regs { u32 cr; }; -struct microchip_flexcom_platdata { +struct microchip_flexcom_plat { struct microchip_flexcom_regs *regs; u32 flexcom_mode; }; static int microchip_flexcom_of_to_plat(struct udevice *dev) { - struct microchip_flexcom_platdata *plat = dev_get_plat(dev); + struct microchip_flexcom_plat *plat = dev_get_plat(dev); int ret; plat->regs = map_physmem(dev_read_addr(dev), @@ -62,5 +62,5 @@ U_BOOT_DRIVER(microchip_flexcom) = { .id = UCLASS_MISC, .of_match = microchip_flexcom_ids, .of_to_plat = microchip_flexcom_of_to_plat, - .plat_auto = sizeof(struct microchip_flexcom_platdata), + .plat_auto = sizeof(struct microchip_flexcom_plat), }; diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index 3267e50a31..8f9ec027a2 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -30,7 +30,7 @@ int p2sb_set_hide(struct udevice *dev, bool hide) void *pcr_reg_address(struct udevice *dev, uint offset) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); struct udevice *p2sb = dev_get_parent(dev); struct p2sb_uc_priv *upriv = dev_get_uclass_priv(p2sb); uintptr_t reg_addr; @@ -161,7 +161,7 @@ void pcr_clrsetbits8(struct udevice *dev, uint offset, uint clr, uint set) int p2sb_get_port_id(struct udevice *dev) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); return pplat->pid; } @@ -169,7 +169,7 @@ int p2sb_get_port_id(struct udevice *dev) int p2sb_set_port_id(struct udevice *dev, int portid) { struct udevice *ps2b; - struct p2sb_child_platdata *pplat; + struct p2sb_child_plat *pplat; if (!CONFIG_IS_ENABLED(OF_PLATDATA)) return -ENOSYS; @@ -197,7 +197,7 @@ int p2sb_set_port_id(struct udevice *dev, int portid) static int p2sb_child_post_bind(struct udevice *dev) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); int ret; u32 pid; @@ -224,5 +224,5 @@ UCLASS_DRIVER(p2sb) = { .per_device_auto = sizeof(struct p2sb_uc_priv), .post_bind = p2sb_post_bind, .child_post_bind = p2sb_child_post_bind, - .per_child_plat_auto = sizeof(struct p2sb_child_platdata), + .per_child_plat_auto = sizeof(struct p2sb_child_plat), }; diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c index 5c70ca87f4..973d02d678 100644 --- a/drivers/misc/p2sb_emul.c +++ b/drivers/misc/p2sb_emul.c @@ -18,12 +18,12 @@ #include /** - * struct p2sb_emul_platdata - platform data for this device + * struct p2sb_emul_plat - platform data for this device * * @command: Current PCI command value * @bar: Current base address values */ -struct p2sb_emul_platdata { +struct p2sb_emul_plat { u16 command; u32 bar[6]; }; @@ -53,7 +53,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_plat(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul); switch (offset) { case PCI_COMMAND: @@ -106,7 +106,7 @@ static int sandbox_p2sb_emul_read_config(const struct udevice *emul, static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct p2sb_emul_platdata *plat = dev_get_plat(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul); switch (offset) { case PCI_COMMAND: @@ -134,7 +134,7 @@ static int sandbox_p2sb_emul_write_config(struct udevice *emul, uint offset, static int sandbox_p2sb_emul_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct p2sb_emul_platdata *plat = dev_get_plat(emul); + struct p2sb_emul_plat *plat = dev_get_plat(emul); int barnum; for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { @@ -197,7 +197,7 @@ static int find_p2sb_channel(struct udevice *emul, uint offset, return log_msg_ret("No client", ret); device_foreach_child(dev, p2sb) { - struct p2sb_child_platdata *pplat = + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); log_debug(" - child %s, pid %d, want %d\n", dev->name, @@ -263,7 +263,7 @@ U_BOOT_DRIVER(sandbox_p2sb_emul_emul) = { .of_match = sandbox_p2sb_emul_ids, .ops = &sandbox_p2sb_emul_emul_ops, .priv_auto = sizeof(struct p2sb_emul_priv), - .plat_auto = sizeof(struct p2sb_emul_platdata), + .plat_auto = sizeof(struct p2sb_emul_plat), }; static struct pci_device_id sandbox_p2sb_emul_supported[] = { diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 08e30bae06..be25389e0e 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -37,7 +37,7 @@ struct rockchip_efuse_regs { /* 0x14 efuse strobe finish control register */ }; -struct rockchip_efuse_platdata { +struct rockchip_efuse_plat { void __iomem *base; struct clk *clk; }; @@ -86,7 +86,7 @@ U_BOOT_CMD( static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, void *buf, int size) { - struct rockchip_efuse_platdata *plat = dev_get_plat(dev); + struct rockchip_efuse_plat *plat = dev_get_plat(dev); struct rockchip_efuse_regs *efuse = (struct rockchip_efuse_regs *)plat->base; @@ -139,7 +139,7 @@ static const struct misc_ops rockchip_efuse_ops = { static int rockchip_efuse_of_to_plat(struct udevice *dev) { - struct rockchip_efuse_platdata *plat = dev_get_plat(dev); + struct rockchip_efuse_plat *plat = dev_get_plat(dev); plat->base = dev_read_addr_ptr(dev); return 0; @@ -155,6 +155,6 @@ U_BOOT_DRIVER(rockchip_efuse) = { .id = UCLASS_MISC, .of_match = rockchip_efuse_ids, .of_to_plat = rockchip_efuse_of_to_plat, - .plat_auto = sizeof(struct rockchip_efuse_platdata), + .plat_auto = sizeof(struct rockchip_efuse_plat), .ops = &rockchip_efuse_ops, }; diff --git a/drivers/misc/rockchip-otp.c b/drivers/misc/rockchip-otp.c index 9707750355..cc9a5450e0 100644 --- a/drivers/misc/rockchip-otp.c +++ b/drivers/misc/rockchip-otp.c @@ -47,13 +47,13 @@ #define OTPC_TIMEOUT 10000 -struct rockchip_otp_platdata { +struct rockchip_otp_plat { void __iomem *base; unsigned long secure_conf_base; unsigned long otp_mask_base; }; -static int rockchip_otp_wait_status(struct rockchip_otp_platdata *otp, +static int rockchip_otp_wait_status(struct rockchip_otp_plat *otp, u32 flag) { int delay = OTPC_TIMEOUT; @@ -73,7 +73,7 @@ static int rockchip_otp_wait_status(struct rockchip_otp_platdata *otp, return 0; } -static int rockchip_otp_ecc_enable(struct rockchip_otp_platdata *otp, +static int rockchip_otp_ecc_enable(struct rockchip_otp_plat *otp, bool enable) { int ret = 0; @@ -102,7 +102,7 @@ static int rockchip_otp_ecc_enable(struct rockchip_otp_platdata *otp, static int rockchip_px30_otp_read(struct udevice *dev, int offset, void *buf, int size) { - struct rockchip_otp_platdata *otp = dev_get_plat(dev); + struct rockchip_otp_plat *otp = dev_get_plat(dev); u8 *buffer = buf; int ret = 0; @@ -147,7 +147,7 @@ static const struct misc_ops rockchip_otp_ops = { static int rockchip_otp_of_to_plat(struct udevice *dev) { - struct rockchip_otp_platdata *otp = dev_get_plat(dev); + struct rockchip_otp_plat *otp = dev_get_plat(dev); otp->base = dev_read_addr_ptr(dev); @@ -172,5 +172,5 @@ U_BOOT_DRIVER(rockchip_otp) = { .of_match = rockchip_otp_ids, .ops = &rockchip_otp_ops, .of_to_plat = rockchip_otp_of_to_plat, - .plat_auto = sizeof(struct rockchip_otp_platdata), + .plat_auto = sizeof(struct rockchip_otp_plat), }; diff --git a/drivers/misc/sandbox_adder.c b/drivers/misc/sandbox_adder.c index 94eaf234ae..3ea33e46e9 100644 --- a/drivers/misc/sandbox_adder.c +++ b/drivers/misc/sandbox_adder.c @@ -21,7 +21,7 @@ struct sandbox_adder_priv { int sandbox_adder_read(struct udevice *dev, ulong address, void *data, enum axi_size_t size) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); u32 *val = data; *val = pplat->pid << 24 | address; diff --git a/drivers/misc/sifive-otp.c b/drivers/misc/sifive-otp.c index e1f5971642..3e658b3566 100644 --- a/drivers/misc/sifive-otp.c +++ b/drivers/misc/sifive-otp.c @@ -89,7 +89,7 @@ struct sifive_otp_regs { u32 pwe; /* Write enable input (defines program cycle) */ }; -struct sifive_otp_platdata { +struct sifive_otp_plat { struct sifive_otp_regs __iomem *regs; u32 total_fuses; }; @@ -100,7 +100,7 @@ struct sifive_otp_platdata { static int sifive_otp_read(struct udevice *dev, int offset, void *buf, int size) { - struct sifive_otp_platdata *plat = dev_get_plat(dev); + struct sifive_otp_plat *plat = dev_get_plat(dev); struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs; /* Check if offset and size are multiple of BYTES_PER_FUSE */ @@ -162,7 +162,7 @@ static int sifive_otp_read(struct udevice *dev, int offset, static int sifive_otp_write(struct udevice *dev, int offset, const void *buf, int size) { - struct sifive_otp_platdata *plat = dev_get_plat(dev); + struct sifive_otp_plat *plat = dev_get_plat(dev); struct sifive_otp_regs *regs = (struct sifive_otp_regs *)plat->regs; /* Check if offset and size are multiple of BYTES_PER_FUSE */ @@ -241,7 +241,7 @@ static int sifive_otp_write(struct udevice *dev, int offset, static int sifive_otp_of_to_plat(struct udevice *dev) { - struct sifive_otp_platdata *plat = dev_get_plat(dev); + struct sifive_otp_plat *plat = dev_get_plat(dev); int ret; plat->regs = dev_read_addr_ptr(dev); @@ -270,6 +270,6 @@ U_BOOT_DRIVER(sifive_otp) = { .id = UCLASS_MISC, .of_match = sifive_otp_ids, .of_to_plat = sifive_otp_of_to_plat, - .plat_auto = sizeof(struct sifive_otp_platdata), + .plat_auto = sizeof(struct sifive_otp_plat), .ops = &sifive_otp_ops, }; diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c index 9dd3b06f81..abea0e7613 100644 --- a/drivers/misc/swap_case.c +++ b/drivers/misc/swap_case.c @@ -15,12 +15,12 @@ #include /** - * struct swap_case_platdata - platform data for this device + * struct swap_case_plat - platform data for this device * * @command: Current PCI command value * @bar: Current base address values */ -struct swap_case_platdata { +struct swap_case_plat { u16 command; u32 bar[6]; }; @@ -100,7 +100,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct swap_case_platdata *plat = dev_get_plat(emul); + struct swap_case_plat *plat = dev_get_plat(emul); /* * The content of the EA capability structure is handled elsewhere to @@ -200,7 +200,7 @@ static int sandbox_swap_case_read_config(const struct udevice *emul, static int sandbox_swap_case_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct swap_case_platdata *plat = dev_get_plat(emul); + struct swap_case_plat *plat = dev_get_plat(emul); switch (offset) { case PCI_COMMAND: @@ -228,7 +228,7 @@ static int sandbox_swap_case_write_config(struct udevice *emul, uint offset, static int sandbox_swap_case_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct swap_case_platdata *plat = dev_get_plat(emul); + struct swap_case_plat *plat = dev_get_plat(emul); int barnum; for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { @@ -392,7 +392,7 @@ U_BOOT_DRIVER(sandbox_swap_case_emul) = { .of_match = sandbox_swap_case_ids, .ops = &sandbox_swap_case_emul_ops, .priv_auto = sizeof(struct swap_case_priv), - .plat_auto = sizeof(struct swap_case_platdata), + .plat_auto = sizeof(struct swap_case_plat), }; static struct pci_device_id sandbox_swap_case_supported[] = { diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 518e24e041..8b6dfa3b96 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -27,7 +27,7 @@ bool meson_gx_mmc_is_compatible(struct udevice *dev, static inline void *get_regbase(const struct mmc *mmc) { - struct meson_mmc_platdata *pdata = mmc->priv; + struct meson_mmc_plat *pdata = mmc->priv; return pdata->regbase; } @@ -160,7 +160,7 @@ static void meson_mmc_setup_cmd(struct mmc *mmc, struct mmc_data *data, static void meson_mmc_setup_addr(struct mmc *mmc, struct mmc_data *data) { - struct meson_mmc_platdata *pdata = mmc->priv; + struct meson_mmc_plat *pdata = mmc->priv; unsigned int data_size; uint32_t data_addr = 0; @@ -198,7 +198,7 @@ static int meson_dm_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { struct mmc *mmc = mmc_get_mmc_dev(dev); - struct meson_mmc_platdata *pdata = mmc->priv; + struct meson_mmc_plat *pdata = mmc->priv; uint32_t status; ulong start; int ret = 0; @@ -243,7 +243,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = { static int meson_mmc_of_to_plat(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_plat(dev); + struct meson_mmc_plat *pdata = dev_get_plat(dev); fdt_addr_t addr; addr = dev_read_addr(dev); @@ -257,7 +257,7 @@ static int meson_mmc_of_to_plat(struct udevice *dev) static int meson_mmc_probe(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_plat(dev); + struct meson_mmc_plat *pdata = dev_get_plat(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct mmc *mmc = &pdata->mmc; struct mmc_config *cfg = &pdata->cfg; @@ -320,7 +320,7 @@ static int meson_mmc_probe(struct udevice *dev) int meson_mmc_bind(struct udevice *dev) { - struct meson_mmc_platdata *pdata = dev_get_plat(dev); + struct meson_mmc_plat *pdata = dev_get_plat(dev); return mmc_bind(dev, &pdata->mmc, &pdata->cfg); } @@ -340,7 +340,7 @@ U_BOOT_DRIVER(meson_mmc) = { .probe = meson_mmc_probe, .bind = meson_mmc_bind, .of_to_plat = meson_mmc_of_to_plat, - .plat_auto = sizeof(struct meson_mmc_platdata), + .plat_auto = sizeof(struct meson_mmc_plat), }; #ifdef CONFIG_PWRSEQ diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h index 92aec5329f..8974b78f55 100644 --- a/drivers/mmc/meson_gx_mmc.h +++ b/drivers/mmc/meson_gx_mmc.h @@ -84,7 +84,7 @@ enum meson_gx_mmc_compatible { #define MESON_SD_EMMC_CMD_RSP2 0x64 #define MESON_SD_EMMC_CMD_RSP3 0x68 -struct meson_mmc_platdata { +struct meson_mmc_plat { struct mmc_config cfg; struct mmc mmc; void *regbase; diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index c96334f96b..143818d401 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -52,7 +52,7 @@ struct mxsmmc_priv { #include #include -struct mxsmmc_platdata { +struct mxsmmc_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_fsl_imx23_mmc dtplat; #endif @@ -310,7 +310,7 @@ mxsmmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) static int mxsmmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs; struct mmc *mmc = &plat->mmc; @@ -490,7 +490,7 @@ mxsmmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) static int mxsmmc_get_cd(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs; @@ -502,7 +502,7 @@ static int mxsmmc_get_cd(struct udevice *dev) static int mxsmmc_set_ios(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct mxs_ssp_regs *ssp_regs = priv->regs; struct mmc *mmc = &plat->mmc; @@ -567,7 +567,7 @@ static int mxsmmc_init(struct udevice *dev) static int mxsmmc_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); struct mxsmmc_priv *priv = dev_get_priv(dev); struct blk_desc *bdesc; struct mmc *mmc; @@ -653,7 +653,7 @@ static int mxsmmc_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(BLK) static int mxsmmc_bind(struct udevice *dev) { - struct mxsmmc_platdata *plat = dev_get_plat(dev); + struct mxsmmc_plat *plat = dev_get_plat(dev); return mmc_bind(dev, &plat->mmc, &plat->cfg); } @@ -668,7 +668,7 @@ static const struct dm_mmc_ops mxsmmc_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxsmmc_of_to_plat(struct udevice *bus) { - struct mxsmmc_platdata *plat = bus->plat; + struct mxsmmc_plat *plat = bus->plat; u32 prop[2]; int ret; @@ -719,7 +719,7 @@ U_BOOT_DRIVER(fsl_imx23_mmc) = { #endif .probe = mxsmmc_probe, .priv_auto = sizeof(struct mxsmmc_priv), - .plat_auto = sizeof(struct mxsmmc_platdata), + .plat_auto = sizeof(struct mxsmmc_plat), }; U_BOOT_DRIVER_ALIAS(fsl_imx23_mmc, fsl_imx28_mmc) diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index 250fb4f75f..0011811250 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -48,7 +48,7 @@ struct altera_qspi_regs { u32 chip_select; }; -struct altera_qspi_platdata { +struct altera_qspi_plat { struct altera_qspi_regs *regs; void *base; unsigned long size; @@ -106,7 +106,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) { struct mtd_info *mtd = info->mtd; struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); ulong base = (ulong)pdata->base; loff_t to = addr - base; size_t retlen; @@ -135,7 +135,7 @@ unsigned long flash_init(void) static int altera_qspi_erase(struct mtd_info *mtd, struct erase_info *instr) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; size_t addr = instr->addr; size_t len = instr->len; @@ -197,7 +197,7 @@ static int altera_qspi_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); memcpy_fromio(buf, pdata->base + from, len); *retlen = len; @@ -209,7 +209,7 @@ static int altera_qspi_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 stat; @@ -235,7 +235,7 @@ static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, uint64_t *len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; int shift0 = ffs(QUADSPI_SR_BP2_0) - 1; int shift3 = ffs(QUADSPI_SR_BP3) - 1 - 3; @@ -257,7 +257,7 @@ static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, static int altera_qspi_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 sector_start, sector_end; u32 num_sectors; @@ -291,7 +291,7 @@ static int altera_qspi_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) static int altera_qspi_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct udevice *dev = mtd->dev; - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; u32 mem_op; @@ -304,7 +304,7 @@ static int altera_qspi_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) static int altera_qspi_probe(struct udevice *dev) { - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); struct altera_qspi_regs *regs = pdata->regs; unsigned long base = (unsigned long)pdata->base; struct mtd_info *mtd; @@ -348,7 +348,7 @@ static int altera_qspi_probe(struct udevice *dev) static int altera_qspi_of_to_plat(struct udevice *dev) { - struct altera_qspi_platdata *pdata = dev_get_plat(dev); + struct altera_qspi_plat *pdata = dev_get_plat(dev); void *blob = (void *)gd->fdt_blob; int node = dev_of_offset(dev); const char *list, *end; @@ -401,6 +401,6 @@ U_BOOT_DRIVER(altera_qspi) = { .id = UCLASS_MTD, .of_match = altera_qspi_ids, .of_to_plat = altera_qspi_of_to_plat, - .plat_auto = sizeof(struct altera_qspi_platdata), + .plat_auto = sizeof(struct altera_qspi_plat), .probe = altera_qspi_probe, }; diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 50274390ff..740bd7541c 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -124,7 +124,7 @@ static int sandbox_sf_probe(struct udevice *dev) const struct flash_info *data; struct sandbox_spi_flash_plat_data *pdata = dev_get_plat(dev); struct sandbox_state *state = state_get_current(); - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct udevice *bus = dev->parent; const char *spec = NULL; struct udevice *emul; diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c index 6171dadedf..939f199b1f 100644 --- a/drivers/net/dwmac_socfpga.c +++ b/drivers/net/dwmac_socfpga.c @@ -19,7 +19,7 @@ #include -struct dwmac_socfpga_platdata { +struct dwmac_socfpga_plat { struct dw_eth_pdata dw_eth_pdata; void *phy_intf; u32 reg_shift; @@ -27,7 +27,7 @@ struct dwmac_socfpga_platdata { static int dwmac_socfpga_of_to_plat(struct udevice *dev) { - struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev); + struct dwmac_socfpga_plat *pdata = dev_get_plat(dev); struct regmap *regmap; struct ofnode_phandle_args args; void *range; @@ -66,7 +66,7 @@ static int dwmac_socfpga_of_to_plat(struct udevice *dev) static int dwmac_socfpga_probe(struct udevice *dev) { - struct dwmac_socfpga_platdata *pdata = dev_get_plat(dev); + struct dwmac_socfpga_plat *pdata = dev_get_plat(dev); struct eth_pdata *edata = &pdata->dw_eth_pdata.eth_pdata; struct reset_ctl_bulk reset_bulk; int ret; @@ -119,6 +119,6 @@ U_BOOT_DRIVER(dwmac_socfpga) = { .probe = dwmac_socfpga_probe, .ops = &designware_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .plat_auto = sizeof(struct dwmac_socfpga_platdata), + .plat_auto = sizeof(struct dwmac_socfpga_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 765385c41d..2e684e5839 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -54,7 +54,7 @@ static int ierb_fn_to_pf[] = {0, 1, 2, -1, -1, -1, 3}; /* sets up primary MAC addresses in DT/IERB */ void fdt_fixup_enetc_mac(void *blob) { - struct pci_child_platdata *ppdata; + struct pci_child_plat *ppdata; struct eth_pdata *pdata; struct udevice *dev; struct uclass *uc; @@ -365,7 +365,7 @@ static int enetc_remove(struct udevice *dev) static int enetc_ls1028a_write_hwaddr(struct udevice *dev) { - struct pci_child_platdata *ppdata = dev_get_parent_plat(dev); + struct pci_child_plat *ppdata = dev_get_parent_plat(dev); const int devfn_to_pf[] = {0, 1, 2, -1, -1, -1, 3}; struct eth_pdata *plat = dev_get_plat(dev); int devfn = PCI_FUNC(ppdata->devfn); diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 0073cb3bb1..a50a5b3f33 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR; * * dw_eth_pdata: Required platform data for designware driver (must be first) */ -struct gmac_rockchip_platdata { +struct gmac_rockchip_plat { struct dw_eth_pdata dw_eth_pdata; bool clock_input; int tx_delay; @@ -48,14 +48,14 @@ struct gmac_rockchip_platdata { struct rk_gmac_ops { int (*fix_mac_speed)(struct dw_eth_dev *priv); - void (*set_to_rmii)(struct gmac_rockchip_platdata *pdata); - void (*set_to_rgmii)(struct gmac_rockchip_platdata *pdata); + void (*set_to_rmii)(struct gmac_rockchip_plat *pdata); + void (*set_to_rgmii)(struct gmac_rockchip_plat *pdata); }; static int gmac_rockchip_of_to_plat(struct udevice *dev) { - struct gmac_rockchip_platdata *pdata = dev_get_plat(dev); + struct gmac_rockchip_plat *pdata = dev_get_plat(dev); const char *string; string = dev_read_string(dev, "clock_in_out"); @@ -344,7 +344,7 @@ static int rv1108_set_rmii_speed(struct dw_eth_dev *priv) return 0; } -static void px30_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) +static void px30_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata) { struct px30_grf *grf; enum { @@ -360,7 +360,7 @@ static void px30_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) PX30_GMAC_PHY_INTF_SEL_RMII); } -static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk322x_grf *grf; enum { @@ -403,7 +403,7 @@ static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3228_CLK_TX_DL_CFG_GMAC_SHIFT); } -static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3288_grf *grf; @@ -422,7 +422,7 @@ static void rk3288_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3288_CLK_TX_DL_CFG_GMAC_SHIFT); } -static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) +static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata) { struct rk3308_grf *grf; enum { @@ -438,7 +438,7 @@ static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) RK3308_GMAC_PHY_INTF_SEL_RMII); } -static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3328_grf_regs *grf; enum { @@ -481,7 +481,7 @@ static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3328_CLK_TX_DL_CFG_GMAC_SHIFT); } -static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3368_grf *grf; enum { @@ -518,7 +518,7 @@ static void rk3368_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3368_CLK_TX_DL_CFG_GMAC_SHIFT); } -static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) +static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata) { struct rk3399_grf_regs *grf; @@ -538,7 +538,7 @@ static void rk3399_gmac_set_to_rgmii(struct gmac_rockchip_platdata *pdata) pdata->tx_delay << RK3399_CLK_TX_DL_CFG_GMAC_SHIFT); } -static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) +static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata) { struct rv1108_grf *grf; @@ -555,7 +555,7 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_platdata *pdata) static int gmac_rockchip_probe(struct udevice *dev) { - struct gmac_rockchip_platdata *pdata = dev_get_plat(dev); + struct gmac_rockchip_plat *pdata = dev_get_plat(dev); struct rk_gmac_ops *ops = (struct rk_gmac_ops *)dev_get_driver_data(dev); struct dw_eth_pdata *dw_pdata = dev_get_plat(dev); @@ -760,6 +760,6 @@ U_BOOT_DRIVER(eth_gmac_rockchip) = { .probe = gmac_rockchip_probe, .ops = &gmac_rockchip_eth_ops, .priv_auto = sizeof(struct dw_eth_dev), - .plat_auto = sizeof(struct gmac_rockchip_platdata), + .plat_auto = sizeof(struct gmac_rockchip_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 7aac8a9132..da2cfb7f55 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -1187,7 +1187,7 @@ int rtl8169_initialize(struct bd_info *bis) #ifdef CONFIG_DM_ETH static int rtl8169_eth_probe(struct udevice *dev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct rtl8169_private *priv = dev_get_priv(dev); struct eth_pdata *plat = dev_get_plat(dev); u32 iobase; diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index cee3f57c87..5d6331ad34 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -676,7 +676,7 @@ static int nvme_blk_probe(struct udevice *udev) struct blk_desc *desc = dev_get_uclass_plat(udev); struct nvme_ns *ns = dev_get_priv(udev); u8 flbas; - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; struct nvme_id_ns *id; id = memalign(ndev->page_size, sizeof(struct nvme_id_ns)); diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index f71ba42c38..756d8ad744 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -111,7 +111,7 @@ UCLASS_DRIVER(pci_emul) = { /* * This uclass is a child of the pci bus. Its plat is not defined here so - * is defined by its parent, UCLASS_PCI, which uses struct pci_child_platdata. + * is defined by its parent, UCLASS_PCI, which uses struct pci_child_plat. * See per_child_plat_auto in UCLASS_DRIVER(pci). */ UCLASS_DRIVER(pci_emul_parent) = { diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index e46c59b98e..9fc13e39e8 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -49,7 +49,7 @@ struct udevice *pci_get_controller(struct udevice *dev) pci_dev_t dm_pci_get_bdf(const struct udevice *dev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; /* @@ -136,7 +136,7 @@ int pci_bus_find_devfn(const struct udevice *bus, pci_dev_t find_devfn, for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; pplat = dev_get_parent_plat(dev); if (pplat && pplat->devfn == find_devfn) { @@ -162,7 +162,7 @@ int dm_pci_bus_find_bdf(pci_dev_t bdf, struct udevice **devp) static int pci_device_matches_ids(struct udevice *dev, struct pci_device_id *ids) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; int i; pplat = dev_get_parent_plat(dev); @@ -218,7 +218,7 @@ static int dm_pci_bus_find_device(struct udevice *bus, unsigned int vendor, unsigned int device, int *indexp, struct udevice **devp) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; struct udevice *dev; for (device_find_first_child(bus, &dev); @@ -261,7 +261,7 @@ int dm_pci_find_class(uint find_class, int index, struct udevice **devp) for (pci_find_first_device(&dev); dev; pci_find_next_device(&dev)) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); if (pplat->class == find_class && !index--) { *devp = dev; @@ -524,7 +524,7 @@ static void set_vga_bridge_bits(struct udevice *dev) int pci_auto_config_devices(struct udevice *bus) { struct pci_controller *hose = bus->uclass_priv; - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; unsigned int sub_bus; struct udevice *dev; int ret; @@ -807,7 +807,7 @@ int pci_bind_bus_devices(struct udevice *bus) PCI_MAX_PCI_FUNCTIONS - 1); for (bdf = PCI_BDF(bus->seq, 0, 0); bdf <= end; bdf += PCI_BDF(0, 0, 1)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; struct udevice *dev; ulong class; @@ -1080,7 +1080,7 @@ static int pci_uclass_post_probe(struct udevice *bus) static int pci_uclass_child_post_bind(struct udevice *dev) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; if (!dev_of_valid(dev)) return 0; @@ -1441,7 +1441,7 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr, } static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off, - struct pci_child_platdata *pdata) + struct pci_child_plat *pdata) { phys_addr_t addr = 0; @@ -1472,7 +1472,7 @@ static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off, } static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags, - int ea_off, struct pci_child_platdata *pdata) + int ea_off, struct pci_child_plat *pdata) { int ea_cnt, i, entry_size; int bar_id = (bar - PCI_BASE_ADDRESS_0) >> 2; @@ -1523,7 +1523,7 @@ static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags, void *dm_pci_map_bar(struct udevice *dev, int bar, int flags) { - struct pci_child_platdata *pdata = dev_get_parent_plat(dev); + struct pci_child_plat *pdata = dev_get_parent_plat(dev); struct udevice *udev = dev; pci_addr_t pci_bus_addr; u32 bar_response; @@ -1725,7 +1725,7 @@ int pci_sriov_init(struct udevice *pdev, int vf_en) bdf += PCI_BDF(0, 0, vf_offset); for (vf = 0; vf < num_vfs; vf++) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; ulong class; pci_bus_read_config(bus, bdf, PCI_CLASS_DEVICE, @@ -1797,7 +1797,7 @@ UCLASS_DRIVER(pci) = { .post_probe = pci_uclass_post_probe, .child_post_bind = pci_uclass_child_post_bind, .per_device_auto = sizeof(struct pci_controller), - .per_child_plat_auto = sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_plat), }; static const struct dm_pci_ops pci_bridge_ops = { diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 9c98496d7a..4a21813a82 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -68,7 +68,7 @@ __weak uint32_t board_map_oprom_vendev(uint32_t vendev) static int pci_rom_probe(struct udevice *dev, struct pci_rom_header **hdrp) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct pci_rom_header *rom_header; struct pci_rom_data *rom_data; u16 rom_vendor, rom_device; @@ -236,7 +236,7 @@ void setup_video(struct screen_info *screen_info) int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), int exec_method) { - struct pci_child_platdata *pplat = dev_get_parent_plat(dev); + struct pci_child_plat *pplat = dev_get_parent_plat(dev); struct pci_rom_header *rom = NULL, *ram = NULL; int vesa_mode = -1; bool emulate, alloced; @@ -328,7 +328,7 @@ err: #ifdef CONFIG_DM_VIDEO int vbe_setup_video_priv(struct vesa_mode_info *vesa, struct video_priv *uc_priv, - struct video_uc_platdata *plat) + struct video_uc_plat *plat) { if (!vesa->x_resolution) return log_msg_ret("No x resolution", -ENXIO); @@ -363,7 +363,7 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa, int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); int ret; diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index e2924105bd..ca44d00237 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -132,5 +132,5 @@ U_BOOT_DRIVER(pci_sandbox) = { /* Attach an emulator if we can */ .child_post_bind = dm_scan_fdt_dev, - .per_child_plat_auto = sizeof(struct pci_child_platdata), + .per_child_plat_auto = sizeof(struct pci_child_plat), }; diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c index 41c38ed731..16a9dbfcb8 100644 --- a/drivers/pci/pcie_mediatek.c +++ b/drivers/pci/pcie_mediatek.c @@ -251,7 +251,7 @@ static struct mtk_pcie_port *mtk_pcie_find_port(const struct udevice *bus, struct mtk_pcie *pcie = dev_get_priv(bus); struct mtk_pcie_port *port; struct udevice *dev; - struct pci_child_platdata *pplat = NULL; + struct pci_child_plat *pplat = NULL; int ret = 0; if (PCI_BUS(bdf) != 0) { diff --git a/drivers/pinctrl/intel/pinctrl.c b/drivers/pinctrl/intel/pinctrl.c index 64cde5e329..9f96505dd5 100644 --- a/drivers/pinctrl/intel/pinctrl.c +++ b/drivers/pinctrl/intel/pinctrl.c @@ -616,7 +616,7 @@ int pinctrl_config_pads_for_node(struct udevice *dev, ofnode node) int intel_pinctrl_of_to_plat(struct udevice *dev, const struct pad_community *comm, int num_cfgs) { - struct p2sb_child_platdata *pplat = dev_get_parent_plat(dev); + struct p2sb_child_plat *pplat = dev_get_parent_plat(dev); struct intel_pinctrl_priv *priv = dev_get_priv(dev); if (!comm) { diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c index 2432f3f363..48b0e9a161 100644 --- a/drivers/pinctrl/intel/pinctrl_apl.c +++ b/drivers/pinctrl/intel/pinctrl_apl.c @@ -18,11 +18,11 @@ #include /** - * struct apl_gpio_platdata - platform data for each device + * struct apl_gpio_plat - platform data for each device * * @dtplat: of-platdata data from C struct */ -struct apl_gpio_platdata { +struct apl_gpio_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) /* Put this first since driver model will copy the data here */ struct dtd_intel_apl_pinctrl dtplat; @@ -138,12 +138,12 @@ static const struct pad_community apl_gpio_communities[] = { static int apl_pinctrl_of_to_plat(struct udevice *dev) { - struct p2sb_child_platdata *pplat; + struct p2sb_child_plat *pplat; const struct pad_community *comm = NULL; int i; #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct apl_gpio_platdata *plat = dev_get_plat(dev); + struct apl_gpio_plat *plat = dev_get_plat(dev); int ret; /* @@ -185,5 +185,5 @@ U_BOOT_DRIVER(intel_apl_pinctrl) = { #endif .of_to_plat = apl_pinctrl_of_to_plat, .priv_auto = sizeof(struct intel_pinctrl_priv), - .plat_auto = sizeof(struct apl_gpio_platdata), + .plat_auto = sizeof(struct apl_gpio_plat), }; diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 9a25cfa95d..1aba8a9150 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR; * framework groups, Atmel PIO groups will be called banks. */ -struct atmel_pio4_platdata { +struct atmel_pio4_plat { struct atmel_pio4_port *reg_base; }; @@ -95,7 +95,7 @@ static u32 atmel_pinctrl_get_pinconf(const void *blob, int node) static inline struct atmel_pio4_port *atmel_pio4_bank_base(struct udevice *dev, u32 bank) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); struct atmel_pio4_port *bank_base = (struct atmel_pio4_port *)((u32)plat->reg_base + ATMEL_PIO_BANK_OFFSET * bank); @@ -154,7 +154,7 @@ const struct pinctrl_ops atmel_pinctrl_ops = { static int atmel_pinctrl_probe(struct udevice *dev) { - struct atmel_pio4_platdata *plat = dev_get_plat(dev); + struct atmel_pio4_plat *plat = dev_get_plat(dev); fdt_addr_t addr_base; dev = dev_get_parent(dev); @@ -178,6 +178,6 @@ U_BOOT_DRIVER(atmel_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = atmel_pinctrl_match, .probe = atmel_pinctrl_probe, - .plat_auto = sizeof(struct atmel_pio4_platdata), + .plat_auto = sizeof(struct atmel_pio4_plat), .ops = &atmel_pinctrl_ops, }; diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c index 5093a52017..690e5c7706 100644 --- a/drivers/pinctrl/pinctrl-qe-io.c +++ b/drivers/pinctrl/pinctrl-qe-io.c @@ -18,12 +18,12 @@ #include /** - * struct qe_io_platdata + * struct qe_io_plat * * @base: Base register address * @num_par_io_ports number of io ports */ -struct qe_io_platdata { +struct qe_io_plat { qepio83xx_t *base; u32 num_io_ports; }; @@ -122,7 +122,7 @@ void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign) #else static int qe_io_of_to_plat(struct udevice *dev) { - struct qe_io_platdata *plat = dev->plat; + struct qe_io_plat *plat = dev->plat; fdt_addr_t addr; addr = dev_read_addr(dev); @@ -143,7 +143,7 @@ static int qe_io_of_to_plat(struct udevice *dev) */ static int par_io_of_config_node(struct udevice *dev, ofnode pio) { - struct qe_io_platdata *plat = dev->plat; + struct qe_io_plat *plat = dev->plat; qepio83xx_t *par_io = plat->base; const unsigned int *pio_map; int pio_map_len; @@ -246,7 +246,7 @@ U_BOOT_DRIVER(par_io_pinctrl) = { .of_match = of_match_ptr(par_io_pinctrl_match), .probe = par_io_pinctrl_probe, .of_to_plat = qe_io_of_to_plat, - .plat_auto = sizeof(struct qe_io_platdata), + .plat_auto = sizeof(struct qe_io_plat), .ops = &par_io_pinctrl_ops, #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 1ea869a82b..aaaa6bdadf 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR; /* oe = 1, pu = 1, od = 1 */ #define BIDIR_PU (OE | PU | OD) -struct sti_pinctrl_platdata { +struct sti_pinctrl_plat { struct regmap *regmap; }; @@ -57,7 +57,7 @@ struct sti_pin_desc { */ void sti_alternate_select(struct udevice *dev, struct sti_pin_desc *pin_desc) { - struct sti_pinctrl_platdata *plat = dev_get_plat(dev); + struct sti_pinctrl_plat *plat = dev_get_plat(dev); unsigned long sysconf, *sysconfreg; int alt = pin_desc->alt; int bank = pin_desc->bank; @@ -91,7 +91,7 @@ void sti_alternate_select(struct udevice *dev, struct sti_pin_desc *pin_desc) /* pin configuration */ void sti_pin_configure(struct udevice *dev, struct sti_pin_desc *pin_desc) { - struct sti_pinctrl_platdata *plat = dev_get_plat(dev); + struct sti_pinctrl_plat *plat = dev_get_plat(dev); int bit; int oe = 0, pu = 0, od = 0; unsigned long *sysconfreg; @@ -277,7 +277,7 @@ static int sti_pinctrl_set_state(struct udevice *dev, struct udevice *config) static int sti_pinctrl_probe(struct udevice *dev) { - struct sti_pinctrl_platdata *plat = dev_get_plat(dev); + struct sti_pinctrl_plat *plat = dev_get_plat(dev); struct udevice *syscon; int err; @@ -316,6 +316,6 @@ U_BOOT_DRIVER(pinctrl_sti) = { .of_match = sti_pinctrl_ids, .ops = &sti_pinctrl_ops, .probe = sti_pinctrl_probe, - .plat_auto = sizeof(struct sti_pinctrl_platdata), + .plat_auto = sizeof(struct sti_pinctrl_plat), .ops = &sti_pinctrl_ops, }; diff --git a/drivers/pinctrl/renesas/pfc-r7s72100.c b/drivers/pinctrl/renesas/pfc-r7s72100.c index bc816842a1..82bdf05b24 100644 --- a/drivers/pinctrl/renesas/pfc-r7s72100.c +++ b/drivers/pinctrl/renesas/pfc-r7s72100.c @@ -32,14 +32,14 @@ DECLARE_GLOBAL_DATA_PTR; -struct r7s72100_pfc_platdata { +struct r7s72100_pfc_plat { void __iomem *base; }; static void r7s72100_pfc_set_function(struct udevice *dev, u16 bank, u16 line, u16 func, u16 inbuf, u16 bidir) { - struct r7s72100_pfc_platdata *plat = dev_get_plat(dev); + struct r7s72100_pfc_plat *plat = dev_get_plat(dev); clrsetbits_le16(plat->base + PFCAE(bank), BIT(line), (func & BIT(2)) ? BIT(line) : 0); @@ -108,7 +108,7 @@ const struct pinctrl_ops r7s72100_pfc_ops = { static int r7s72100_pfc_probe(struct udevice *dev) { - struct r7s72100_pfc_platdata *plat = dev_get_plat(dev); + struct r7s72100_pfc_plat *plat = dev_get_plat(dev); fdt_addr_t addr_base; ofnode node; @@ -142,6 +142,6 @@ U_BOOT_DRIVER(r7s72100_pfc) = { .id = UCLASS_PINCTRL, .of_match = r7s72100_pfc_match, .probe = r7s72100_pfc_probe, - .plat_auto = sizeof(struct r7s72100_pfc_platdata), + .plat_auto = sizeof(struct r7s72100_pfc_plat), .ops = &r7s72100_pfc_ops, }; diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c index 7eeecc0523..32a2836f0b 100644 --- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c +++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c @@ -204,7 +204,7 @@ void pmc_dump_info(struct udevice *dev) upriv->gen_pmcon1, upriv->gen_pmcon2, upriv->gen_pmcon3); } -int pmc_ofdata_to_uc_platdata(struct udevice *dev) +int pmc_ofdata_to_uc_plat(struct udevice *dev) { struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); int ret; diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c index 0a72afdccb..a61eb5bd85 100644 --- a/drivers/power/acpi_pmc/pmc_emul.c +++ b/drivers/power/acpi_pmc/pmc_emul.c @@ -14,12 +14,12 @@ #include /** - * struct pmc_emul_platdata - platform data for this device + * struct pmc_emul_plat - platform data for this device * * @command: Current PCI command value * @bar: Current base address values */ -struct pmc_emul_platdata { +struct pmc_emul_plat { u16 command; u32 bar[6]; }; @@ -46,7 +46,7 @@ struct pmc_emul_priv { static int sandbox_pmc_emul_read_config(const struct udevice *emul, uint offset, ulong *valuep, enum pci_size_t size) { - struct pmc_emul_platdata *plat = dev_get_plat(emul); + struct pmc_emul_plat *plat = dev_get_plat(emul); switch (offset) { case PCI_COMMAND: @@ -99,7 +99,7 @@ static int sandbox_pmc_emul_read_config(const struct udevice *emul, uint offset, static int sandbox_pmc_emul_write_config(struct udevice *emul, uint offset, ulong value, enum pci_size_t size) { - struct pmc_emul_platdata *plat = dev_get_plat(emul); + struct pmc_emul_plat *plat = dev_get_plat(emul); switch (offset) { case PCI_COMMAND: @@ -127,7 +127,7 @@ static int sandbox_pmc_emul_write_config(struct udevice *emul, uint offset, static int sandbox_pmc_emul_find_bar(struct udevice *emul, unsigned int addr, int *barnump, unsigned int *offsetp) { - struct pmc_emul_platdata *plat = dev_get_plat(emul); + struct pmc_emul_plat *plat = dev_get_plat(emul); int barnum; for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { @@ -236,7 +236,7 @@ U_BOOT_DRIVER(sandbox_pmc_emul_emul) = { .ops = &sandbox_pmc_emul_emul_ops, .probe = sandbox_pmc_probe, .priv_auto = sizeof(struct pmc_emul_priv), - .plat_auto = sizeof(struct pmc_emul_platdata), + .plat_auto = sizeof(struct pmc_emul_plat), }; static struct pci_device_id sandbox_pmc_emul_supported[] = { diff --git a/drivers/power/acpi_pmc/sandbox.c b/drivers/power/acpi_pmc/sandbox.c index 6cb7af10c2..8cf03f737c 100644 --- a/drivers/power/acpi_pmc/sandbox.c +++ b/drivers/power/acpi_pmc/sandbox.c @@ -74,7 +74,7 @@ static int sandbox_pmc_probe(struct udevice *dev) upriv->pmc_bar0 = map_sysmem(base, 0x2000); upriv->gpe_cfg = (u32 *)(upriv->pmc_bar0 + GPIO_GPE_CFG); - return pmc_ofdata_to_uc_platdata(dev); + return pmc_ofdata_to_uc_plat(dev); } static struct acpi_pmc_ops sandbox_pmc_ops = { diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c index cf6e068f32..ec369aedd3 100644 --- a/drivers/power/domain/imx8-power-domain-legacy.c +++ b/drivers/power/domain/imx8-power-domain-legacy.c @@ -100,7 +100,7 @@ static int imx8_power_domain_free(struct power_domain *power_domain) static int imx8_power_domain_on(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8_power_domain_platdata *pdata; + struct imx8_power_domain_plat *pdata; struct imx8_power_domain_priv *ppriv; sc_err_t ret; int err; @@ -116,7 +116,7 @@ static int imx8_power_domain_on(struct power_domain *power_domain) return err; } - pdata = (struct imx8_power_domain_platdata *)dev_get_plat(dev); + pdata = (struct imx8_power_domain_plat *)dev_get_plat(dev); ppriv = (struct imx8_power_domain_priv *)dev_get_priv(dev); debug("%s(power_domain=%s) resource_id %d\n", __func__, dev->name, @@ -151,7 +151,7 @@ static int imx8_power_domain_off_node(struct power_domain *power_domain) struct udevice *child; struct imx8_power_domain_priv *ppriv; struct imx8_power_domain_priv *child_ppriv; - struct imx8_power_domain_platdata *pdata; + struct imx8_power_domain_plat *pdata; sc_err_t ret; ppriv = dev_get_priv(dev); @@ -202,13 +202,13 @@ static int imx8_power_domain_off_parentnodes(struct power_domain *power_domain) struct udevice *child; struct imx8_power_domain_priv *ppriv; struct imx8_power_domain_priv *child_ppriv; - struct imx8_power_domain_platdata *pdata; + struct imx8_power_domain_plat *pdata; sc_err_t ret; struct power_domain parent_pd; if (device_get_uclass_id(parent) == UCLASS_POWER_DOMAIN) { pdata = - (struct imx8_power_domain_platdata *)dev_get_plat(parent); + (struct imx8_power_domain_plat *)dev_get_plat(parent); ppriv = (struct imx8_power_domain_priv *)dev_get_priv(parent); debug("%s, %s, state_on %d\n", __func__, parent->name, @@ -343,7 +343,7 @@ static int imx8_power_domain_probe(struct udevice *dev) static int imx8_power_domain_of_to_plat(struct udevice *dev) { int reg; - struct imx8_power_domain_platdata *pdata = dev_get_plat(dev); + struct imx8_power_domain_plat *pdata = dev_get_plat(dev); reg = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1); if (reg == -1) { @@ -377,7 +377,7 @@ U_BOOT_DRIVER(imx8_power_domain) = { .bind = imx8_power_domain_bind, .probe = imx8_power_domain_probe, .of_to_plat = imx8_power_domain_of_to_plat, - .plat_auto = sizeof(struct imx8_power_domain_platdata), + .plat_auto = sizeof(struct imx8_power_domain_plat), .priv_auto = sizeof(struct imx8_power_domain_priv), .ops = &imx8_power_domain_ops, .flags = DM_FLAG_DEFAULT_PD_CTRL_OFF, diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c index 499788967c..341c83b136 100644 --- a/drivers/power/domain/imx8m-power-domain.c +++ b/drivers/power/domain/imx8m-power-domain.c @@ -30,7 +30,7 @@ static int imx8m_power_domain_free(struct power_domain *power_domain) static int imx8m_power_domain_on(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8m_power_domain_platdata *pdata; + struct imx8m_power_domain_plat *pdata; pdata = dev_get_plat(dev); @@ -49,7 +49,7 @@ static int imx8m_power_domain_on(struct power_domain *power_domain) static int imx8m_power_domain_off(struct power_domain *power_domain) { struct udevice *dev = power_domain->dev; - struct imx8m_power_domain_platdata *pdata; + struct imx8m_power_domain_plat *pdata; pdata = dev_get_plat(dev); if (pdata->resource_id < 0) @@ -106,7 +106,7 @@ static int imx8m_power_domain_probe(struct udevice *dev) static int imx8m_power_domain_of_to_plat(struct udevice *dev) { - struct imx8m_power_domain_platdata *pdata = dev_get_plat(dev); + struct imx8m_power_domain_plat *pdata = dev_get_plat(dev); pdata->resource_id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1); @@ -137,6 +137,6 @@ U_BOOT_DRIVER(imx8m_power_domain) = { .bind = imx8m_power_domain_bind, .probe = imx8m_power_domain_probe, .of_to_plat = imx8m_power_domain_of_to_plat, - .plat_auto = sizeof(struct imx8m_power_domain_platdata), + .plat_auto = sizeof(struct imx8m_power_domain_plat), .ops = &imx8m_power_domain_ops, }; diff --git a/drivers/power/regulator/bd71837.c b/drivers/power/regulator/bd71837.c index 1637a2d018..74011d6298 100644 --- a/drivers/power/regulator/bd71837.c +++ b/drivers/power/regulator/bd71837.c @@ -35,7 +35,7 @@ struct bd71837_vrange { }; /** - * struct bd71837_platdata - describe regulator control registers + * struct bd71837_plat - describe regulator control registers * * @name: name of the regulator. Used for matching the dt-entry * @enable_reg: register address used to enable/disable regulator @@ -49,7 +49,7 @@ struct bd71837_vrange { * @sel_mask: bit to toggle in order to transfer the register control to SW * @dvs: whether the voltage can be changed when regulator is enabled */ -struct bd71837_platdata { +struct bd71837_plat { const char *name; u8 enable_reg; u8 enablemask; @@ -160,7 +160,7 @@ static struct bd71837_vrange ldo7_vranges[] = { * is powering NXP i.MX8. In this use-case we (for now) only allow control * for BUCK3 and BUCK4 which are not boot critical. */ -static struct bd71837_platdata bd71837_reg_data[] = { +static struct bd71837_plat bd71837_reg_data[] = { /* Bucks 1-4 which support dynamic voltage scaling */ BD_DATA("BUCK1", BD718XX_BUCK1_CTRL, HW_STATE_CONTROL, BD718XX_BUCK1_VOLT_RUN, DVS_BUCK_RUN_MASK, dvs_buck_vranges, 0, @@ -205,7 +205,7 @@ static struct bd71837_platdata bd71837_reg_data[] = { BD71837_LDO7_MASK, ldo7_vranges, 0, false, BD718XX_LDO_SEL), }; -static struct bd71837_platdata bd71847_reg_data[] = { +static struct bd71837_plat bd71847_reg_data[] = { /* Bucks 1 and 2 which support dynamic voltage scaling */ BD_DATA("BUCK1", BD718XX_BUCK1_CTRL, HW_STATE_CONTROL, BD718XX_BUCK1_VOLT_RUN, DVS_BUCK_RUN_MASK, dvs_buck_vranges, 0, @@ -274,7 +274,7 @@ static int vrange_find_selector(struct bd71837_vrange *r, int val, static int bd71837_get_enable(struct udevice *dev) { int val; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev); /* * boot critical regulators on bd71837 must not be controlled by sw @@ -298,7 +298,7 @@ static int bd71837_get_enable(struct udevice *dev) static int bd71837_set_enable(struct udevice *dev, bool enable) { int val = 0; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev); /* * boot critical regulators on bd71837 must not be controlled by sw @@ -321,7 +321,7 @@ static int bd71837_set_value(struct udevice *dev, int uvolt) unsigned int range; int i; int found = 0; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev); /* * An under/overshooting may occur if voltage is changed for other @@ -369,7 +369,7 @@ static int bd71837_get_value(struct udevice *dev) { unsigned int reg, range; unsigned int tmp; - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev); int i; reg = pmic_reg_read(dev->parent, plat->volt_reg); @@ -399,11 +399,11 @@ static int bd71837_get_value(struct udevice *dev) static int bd71837_regulator_probe(struct udevice *dev) { - struct bd71837_platdata *plat = dev_get_plat(dev); + struct bd71837_plat *plat = dev_get_plat(dev); int i, ret; struct dm_regulator_uclass_plat *uc_pdata; int type; - struct bd71837_platdata *init_data; + struct bd71837_plat *init_data; int data_amnt; type = dev_get_driver_data(dev_get_parent(dev)); @@ -466,5 +466,5 @@ U_BOOT_DRIVER(bd71837_regulator) = { .id = UCLASS_REGULATOR, .ops = &bd71837_regulator_ops, .probe = bd71837_regulator_probe, - .plat_auto = sizeof(struct bd71837_platdata), + .plat_auto = sizeof(struct bd71837_plat), }; diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index fcd1d5292c..9d8a235b79 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -78,7 +78,7 @@ enum { FAN53555_MONITOR, }; -struct fan53555_platdata { +struct fan53555_plat { /* Voltage setting register */ unsigned int vol_reg; unsigned int sleep_reg; @@ -102,7 +102,7 @@ struct fan53555_priv { static int fan53555_regulator_of_to_plat(struct udevice *dev) { - struct fan53555_platdata *dev_pdata = dev_get_plat(dev); + struct fan53555_plat *dev_pdata = dev_get_plat(dev); struct dm_regulator_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); u32 sleep_vsel; @@ -136,7 +136,7 @@ static int fan53555_regulator_of_to_plat(struct udevice *dev) static int fan53555_regulator_get_value(struct udevice *dev) { - struct fan53555_platdata *pdata = dev_get_plat(dev); + struct fan53555_plat *pdata = dev_get_plat(dev); struct fan53555_priv *priv = dev_get_priv(dev); int reg; int voltage; @@ -153,7 +153,7 @@ static int fan53555_regulator_get_value(struct udevice *dev) static int fan53555_regulator_set_value(struct udevice *dev, int uV) { - struct fan53555_platdata *pdata = dev_get_plat(dev); + struct fan53555_plat *pdata = dev_get_plat(dev); struct fan53555_priv *priv = dev_get_priv(dev); u8 vol; @@ -239,7 +239,7 @@ U_BOOT_DRIVER(fan53555_regulator) = { .id = UCLASS_REGULATOR, .ops = &fan53555_regulator_ops, .of_to_plat = fan53555_regulator_of_to_plat, - .plat_auto = sizeof(struct fan53555_platdata), + .plat_auto = sizeof(struct fan53555_plat), .priv_auto = sizeof(struct fan53555_priv), .probe = fan53555_probe, }; diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index efe2ec9a16..d3e0fb672d 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -17,7 +17,7 @@ static int fixed_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct regulator_common_platdata *dev_pdata; + struct regulator_common_plat *dev_pdata; dev_pdata = dev_get_plat(dev); uc_pdata = dev_get_uclass_plat(dev); @@ -89,5 +89,5 @@ U_BOOT_DRIVER(regulator_fixed) = { .ops = &fixed_regulator_ops, .of_match = fixed_regulator_ids, .of_to_plat = fixed_regulator_of_to_plat, - .plat_auto = sizeof(struct regulator_common_platdata), + .plat_auto = sizeof(struct regulator_common_plat), }; diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 2565c4416a..e5e08a33d3 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -18,8 +18,8 @@ #define GPIO_REGULATOR_MAX_STATES 2 -struct gpio_regulator_platdata { - struct regulator_common_platdata common; +struct gpio_regulator_plat { + struct regulator_common_plat common; struct gpio_desc gpio; /* GPIO for regulator voltage control */ int states[GPIO_REGULATOR_MAX_STATES]; int voltages[GPIO_REGULATOR_MAX_STATES]; @@ -28,7 +28,7 @@ struct gpio_regulator_platdata { static int gpio_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct gpio_regulator_platdata *dev_pdata; + struct gpio_regulator_plat *dev_pdata; struct gpio_desc *gpio; int ret, count, i, j; u32 states_array[GPIO_REGULATOR_MAX_STATES * 2]; @@ -80,7 +80,7 @@ static int gpio_regulator_of_to_plat(struct udevice *dev) static int gpio_regulator_get_value(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); int enable; if (!dev_pdata->gpio.dev) @@ -101,7 +101,7 @@ static int gpio_regulator_get_value(struct udevice *dev) static int gpio_regulator_set_value(struct udevice *dev, int uV) { - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); int ret; bool enable; @@ -127,13 +127,13 @@ static int gpio_regulator_set_value(struct udevice *dev, int uV) static int gpio_regulator_get_enable(struct udevice *dev) { - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); return regulator_common_get_enable(dev, &dev_pdata->common); } static int gpio_regulator_set_enable(struct udevice *dev, bool enable) { - struct gpio_regulator_platdata *dev_pdata = dev_get_plat(dev); + struct gpio_regulator_plat *dev_pdata = dev_get_plat(dev); return regulator_common_set_enable(dev, &dev_pdata->common, enable); } @@ -155,5 +155,5 @@ U_BOOT_DRIVER(gpio_regulator) = { .ops = &gpio_regulator_ops, .of_match = gpio_regulator_ids, .of_to_plat = gpio_regulator_of_to_plat, - .plat_auto = sizeof(struct gpio_regulator_platdata), + .plat_auto = sizeof(struct gpio_regulator_plat), }; diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index d75ea7c1ed..698a6fa592 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -41,11 +41,11 @@ struct pfuze100_regulator_desc { }; /** - * struct pfuze100_regulator_platdata - platform data for pfuze100 + * struct pfuze100_regulator_plat - platform data for pfuze100 * * @desc: Points the description entry of one regulator of pfuze100 */ -struct pfuze100_regulator_platdata { +struct pfuze100_regulator_plat { struct pfuze100_regulator_desc *desc; }; @@ -261,7 +261,7 @@ static struct pfuze100_regulator_desc *se_desc(struct pfuze100_regulator_desc *d static int pfuze100_regulator_probe(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); + struct pfuze100_regulator_plat *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc; switch (dev_get_driver_data(dev_get_parent(dev))) { @@ -315,7 +315,7 @@ static int pfuze100_regulator_probe(struct udevice *dev) static int pfuze100_regulator_mode(struct udevice *dev, int op, int *opmode) { int val; - struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); + struct pfuze100_regulator_plat *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc = plat->desc; if (op == PMIC_OP_GET) { @@ -449,7 +449,7 @@ static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV) { int i; int val; - struct pfuze100_regulator_platdata *plat = dev_get_plat(dev); + struct pfuze100_regulator_plat *plat = dev_get_plat(dev); struct pfuze100_regulator_desc *desc = plat->desc; struct dm_regulator_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); @@ -572,5 +572,5 @@ U_BOOT_DRIVER(pfuze100_regulator) = { .id = UCLASS_REGULATOR, .ops = &pfuze100_regulator_ops, .probe = pfuze100_regulator_probe, - .plat_auto = sizeof(struct pfuze100_regulator_platdata), + .plat_auto = sizeof(struct pfuze100_regulator_plat), }; diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index d307a1948a..93d8196b38 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -13,7 +13,7 @@ #include "regulator_common.h" int regulator_common_of_to_plat(struct udevice *dev, - struct regulator_common_platdata *dev_pdata, + struct regulator_common_plat *dev_pdata, const char *enable_gpio_name) { struct gpio_desc *gpio; @@ -49,7 +49,7 @@ int regulator_common_of_to_plat(struct udevice *dev, } int regulator_common_get_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata) + struct regulator_common_plat *dev_pdata) { /* Enable GPIO is optional */ if (!dev_pdata->gpio.dev) @@ -59,7 +59,7 @@ int regulator_common_get_enable(const struct udevice *dev, } int regulator_common_set_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata, bool enable) + struct regulator_common_plat *dev_pdata, bool enable) { int ret; diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index 5ae0b9aa40..c10492f016 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -9,18 +9,18 @@ #include -struct regulator_common_platdata { +struct regulator_common_plat { struct gpio_desc gpio; /* GPIO for regulator enable control */ unsigned int startup_delay_us; unsigned int off_on_delay_us; }; int regulator_common_of_to_plat(struct udevice *dev, - struct regulator_common_platdata *dev_pdata, - const char *enable_gpio_name); + struct regulator_common_plat *dev_pdata, const + char *enable_gpio_name); int regulator_common_get_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata); + struct regulator_common_plat *dev_pdata); int regulator_common_set_enable(const struct udevice *dev, - struct regulator_common_platdata *dev_pdata, bool enable); + struct regulator_common_plat *dev_pdata, bool enable); #endif /* _REGULATOR_COMMON_H */ diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index 0e677f3ec7..a9d051852a 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -895,7 +895,7 @@ static int rk3368_dmc_of_to_plat(struct udevice *dev) } #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk3368_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3368_dmc *of_plat = &plat->of_plat; @@ -923,7 +923,7 @@ static int rk3368_dmc_probe(struct udevice *dev) struct dram_info *priv = dev_get_priv(dev); #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index d0b0601fbe..25ae69e9ac 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -853,7 +853,7 @@ static int rk3188_dmc_of_to_plat(struct udevice *dev) #endif /* CONFIG_SPL_BUILD */ #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk3188_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3188_dmc *of_plat = &plat->of_plat; @@ -866,9 +866,8 @@ static int conv_of_platdata(struct udevice *dev) memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base)); /* rk3188 supports dual-channel, set default channel num to 2 */ plat->num_channels = 1; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, of_plat->reg, + ARRAY_SIZE(of_plat->reg) / 2, &plat->map); if (ret) return ret; @@ -890,7 +889,7 @@ static int rk3188_dmc_probe(struct udevice *dev) #ifdef CONFIG_SPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index bdc463c1d7..66235bd420 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -754,7 +754,7 @@ static int rk322x_dmc_of_to_plat(struct udevice *dev) #endif /* CONFIG_TPL_BUILD */ #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk322x_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk322x_dmc *of_plat = &plat->of_plat; @@ -767,9 +767,8 @@ static int conv_of_platdata(struct udevice *dev) memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base)); plat->num_channels = 1; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, of_plat->reg, + ARRAY_SIZE(of_plat->reg) / 2, &plat->map); if (ret) return ret; @@ -789,7 +788,7 @@ static int rk322x_dmc_probe(struct udevice *dev) priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); #ifdef CONFIG_TPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index 094ae36c88..a933abf0d4 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -1015,7 +1015,7 @@ static int rk3288_dmc_of_to_plat(struct udevice *dev) #endif /* CONFIG_SPL_BUILD */ #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rk3288_sdram_params *plat = dev_get_plat(dev); struct dtd_rockchip_rk3288_dmc *of_plat = &plat->of_plat; @@ -1028,9 +1028,8 @@ static int conv_of_platdata(struct udevice *dev) memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base)); /* Rk3288 supports dual-channel, set default channel num to 2 */ plat->num_channels = 2; - ret = regmap_init_mem_platdata(dev, of_plat->reg, - ARRAY_SIZE(of_plat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, of_plat->reg, + ARRAY_SIZE(of_plat->reg) / 2, &plat->map); if (ret) return ret; @@ -1053,7 +1052,7 @@ static int rk3288_dmc_probe(struct udevice *dev) #if defined(CONFIG_TPL_BUILD) || \ (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD)) #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index cfd351501a..9af4c372d5 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -48,15 +48,14 @@ struct rockchip_dmc_plat { }; #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rockchip_dmc_plat *plat = dev_get_plat(dev); struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; int ret; - ret = regmap_init_mem_platdata(dev, dtplat->reg, - ARRAY_SIZE(dtplat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, dtplat->reg, + ARRAY_SIZE(dtplat->reg) / 2, &plat->map); if (ret) return ret; @@ -525,7 +524,7 @@ static int rk3328_dmc_init(struct udevice *dev) struct rk3328_sdram_params *params = (void *)dtplat->rockchip_sdram_params; - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 261ded0760..a83a670b32 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -3034,15 +3034,14 @@ static int rk3399_dmc_of_to_plat(struct udevice *dev) } #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { struct rockchip_dmc_plat *plat = dev_get_plat(dev); struct dtd_rockchip_rk3399_dmc *dtplat = &plat->dtplat; int ret; - ret = regmap_init_mem_platdata(dev, dtplat->reg, - ARRAY_SIZE(dtplat->reg) / 2, - &plat->map); + ret = regmap_init_mem_plat(dev, dtplat->reg, + ARRAY_SIZE(dtplat->reg) / 2, &plat->map); if (ret) return ret; @@ -3076,7 +3075,7 @@ static int rk3399_dmc_init(struct udevice *dev) struct rk3399_sdram_params *params = (void *)dtplat->rockchip_sdram_params; - ret = conv_of_platdata(dev); + ret = conv_of_plat(dev); if (ret) return ret; #endif diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index bebfce40a6..5a4f45ad5a 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -11,7 +11,7 @@ #include #include -struct meson_rng_platdata { +struct meson_rng_plat { fdt_addr_t base; struct clk clk; }; @@ -26,7 +26,7 @@ struct meson_rng_platdata { */ static int meson_rng_read(struct udevice *dev, void *data, size_t len) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev); char *buffer = (char *)data; while (len) { @@ -52,7 +52,7 @@ static int meson_rng_read(struct udevice *dev, void *data, size_t len) */ static int meson_rng_probe(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev); int err; err = clk_enable(&pdata->clk); @@ -70,7 +70,7 @@ static int meson_rng_probe(struct udevice *dev) */ static int meson_rng_remove(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev); return clk_disable(&pdata->clk); } @@ -83,7 +83,7 @@ static int meson_rng_remove(struct udevice *dev) */ static int meson_rng_of_to_plat(struct udevice *dev) { - struct meson_rng_platdata *pdata = dev_get_plat(dev); + struct meson_rng_plat *pdata = dev_get_plat(dev); int err; pdata->base = dev_read_addr(dev); @@ -116,6 +116,6 @@ U_BOOT_DRIVER(meson_rng) = { .ops = &meson_rng_ops, .probe = meson_rng_probe, .remove = meson_rng_remove, - .plat_auto = sizeof(struct meson_rng_platdata), + .plat_auto = sizeof(struct meson_rng_plat), .of_to_plat = meson_rng_of_to_plat, }; diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c index ec233d1321..800150f114 100644 --- a/drivers/rng/rockchip_rng.c +++ b/drivers/rng/rockchip_rng.c @@ -49,7 +49,7 @@ struct rk_rng_soc_data { int (*rk_rng_read)(struct udevice *dev, void *data, size_t len); }; -struct rk_rng_platdata { +struct rk_rng_plat { fdt_addr_t base; struct rk_rng_soc_data *soc_data; }; @@ -77,7 +77,7 @@ static int rk_rng_read_regs(fdt_addr_t addr, void *buf, size_t size) static int rk_v1_rng_read(struct udevice *dev, void *data, size_t len) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev); u32 reg = 0; int retval; @@ -108,7 +108,7 @@ exit: static int rk_v2_rng_read(struct udevice *dev, void *data, size_t len) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev); u32 reg = 0; int retval; @@ -146,7 +146,7 @@ static int rockchip_rng_read(struct udevice *dev, void *data, size_t len) unsigned int i; int ret = -EIO; - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev); if (!len) return 0; @@ -170,7 +170,7 @@ exit: static int rockchip_rng_of_to_plat(struct udevice *dev) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev); memset(pdata, 0x00, sizeof(*pdata)); @@ -183,7 +183,7 @@ static int rockchip_rng_of_to_plat(struct udevice *dev) static int rockchip_rng_probe(struct udevice *dev) { - struct rk_rng_platdata *pdata = dev_get_priv(dev); + struct rk_rng_plat *pdata = dev_get_priv(dev); pdata->soc_data = (struct rk_rng_soc_data *)dev_get_driver_data(dev); @@ -221,5 +221,5 @@ U_BOOT_DRIVER(rockchip_rng) = { .ops = &rockchip_rng_ops, .probe = rockchip_rng_probe, .of_to_plat = rockchip_rng_of_to_plat, - .priv_auto = sizeof(struct rk_rng_platdata), + .priv_auto = sizeof(struct rk_rng_plat), }; diff --git a/drivers/rng/stm32mp1_rng.c b/drivers/rng/stm32mp1_rng.c index 30505ee7fc..8ea00e3e89 100644 --- a/drivers/rng/stm32mp1_rng.c +++ b/drivers/rng/stm32mp1_rng.c @@ -30,7 +30,7 @@ #define RNG_DR 0x08 -struct stm32_rng_platdata { +struct stm32_rng_plat { fdt_addr_t base; struct clk clk; struct reset_ctl rst; @@ -41,7 +41,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) int retval, i; u32 sr, count, reg; size_t increment; - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); while (len > 0) { retval = readl_poll_timeout(pdata->base + RNG_SR, sr, @@ -80,7 +80,7 @@ static int stm32_rng_read(struct udevice *dev, void *data, size_t len) return 0; } -static int stm32_rng_init(struct stm32_rng_platdata *pdata) +static int stm32_rng_init(struct stm32_rng_plat *pdata) { int err; @@ -97,7 +97,7 @@ static int stm32_rng_init(struct stm32_rng_platdata *pdata) return 0; } -static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata) +static int stm32_rng_cleanup(struct stm32_rng_plat *pdata) { writel(0, pdata->base + RNG_CR); @@ -106,7 +106,7 @@ static int stm32_rng_cleanup(struct stm32_rng_platdata *pdata) static int stm32_rng_probe(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); reset_assert(&pdata->rst); udelay(20); @@ -117,14 +117,14 @@ static int stm32_rng_probe(struct udevice *dev) static int stm32_rng_remove(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); return stm32_rng_cleanup(pdata); } static int stm32_rng_of_to_plat(struct udevice *dev) { - struct stm32_rng_platdata *pdata = dev_get_plat(dev); + struct stm32_rng_plat *pdata = dev_get_plat(dev); int err; pdata->base = dev_read_addr(dev); @@ -160,6 +160,6 @@ U_BOOT_DRIVER(stm32_rng) = { .ops = &stm32_rng_ops, .probe = stm32_rng_probe, .remove = stm32_rng_remove, - .plat_auto = sizeof(struct stm32_rng_platdata), + .plat_auto = sizeof(struct stm32_rng_plat), .of_to_plat = stm32_rng_of_to_plat, }; diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index b9797f312a..a1d376611d 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -29,20 +29,20 @@ #define RTC_CR_START (1 << 0) -struct pl031_platdata { +struct pl031_plat { phys_addr_t base; }; static inline u32 pl031_read_reg(struct udevice *dev, int reg) { - struct pl031_platdata *pdata = dev_get_plat(dev); + struct pl031_plat *pdata = dev_get_plat(dev); return readl(pdata->base + reg); } static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value) { - struct pl031_platdata *pdata = dev_get_plat(dev); + struct pl031_plat *pdata = dev_get_plat(dev); return writel(value, pdata->base + reg); } @@ -124,7 +124,7 @@ static const struct udevice_id pl031_ids[] = { static int pl031_of_to_plat(struct udevice *dev) { - struct pl031_platdata *pdata = dev_get_plat(dev); + struct pl031_plat *pdata = dev_get_plat(dev); pdata->base = dev_read_addr(dev); @@ -137,6 +137,6 @@ U_BOOT_DRIVER(rtc_pl031) = { .of_match = pl031_ids, .probe = pl031_probe, .of_to_plat = pl031_of_to_plat, - .plat_auto = sizeof(struct pl031_platdata), + .plat_auto = sizeof(struct pl031_plat), .ops = &pl031_ops, }; diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index e9970a7e33..90a0adda47 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -35,5 +35,5 @@ int scsi_bus_reset(struct udevice *dev) UCLASS_DRIVER(scsi) = { .id = UCLASS_SCSI, .name = "scsi", - .per_device_plat_auto = sizeof(struct scsi_platdata), + .per_device_plat_auto = sizeof(struct scsi_plat), }; diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 6e291e4799..7389484490 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -151,7 +151,7 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, { struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); + struct scsi_plat *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks = 0; @@ -221,7 +221,7 @@ static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, { struct blk_desc *block_dev = dev_get_uclass_plat(dev); struct udevice *bdev = dev->parent; - struct scsi_platdata *uc_plat = dev_get_uclass_plat(bdev); + struct scsi_plat *uc_plat = dev_get_uclass_plat(bdev); lbaint_t start, blks, max_blks; uintptr_t buf_addr; unsigned short smallblks; @@ -604,7 +604,7 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose) int scsi_scan_dev(struct udevice *dev, bool verbose) { - struct scsi_platdata *uc_plat; /* scsi controller plat */ + struct scsi_plat *uc_plat; /* scsi controller plat */ int ret; int i; int lun; diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index af7fe39e20..0d3ccd880c 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -26,7 +26,7 @@ struct altera_jtaguart_regs { u32 control; /* Control register */ }; -struct altera_jtaguart_platdata { +struct altera_jtaguart_plat { struct altera_jtaguart_regs *regs; }; @@ -37,7 +37,7 @@ static int altera_jtaguart_setbrg(struct udevice *dev, int baudrate) static int altera_jtaguart_putc(struct udevice *dev, const char ch) { - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 st = readl(®s->control); @@ -56,7 +56,7 @@ static int altera_jtaguart_putc(struct udevice *dev, const char ch) static int altera_jtaguart_pending(struct udevice *dev, bool input) { - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 st = readl(®s->control); @@ -68,7 +68,7 @@ static int altera_jtaguart_pending(struct udevice *dev, bool input) static int altera_jtaguart_getc(struct udevice *dev) { - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; u32 val; @@ -83,7 +83,7 @@ static int altera_jtaguart_getc(struct udevice *dev) static int altera_jtaguart_probe(struct udevice *dev) { #ifdef CONFIG_ALTERA_JTAG_UART_BYPASS - struct altera_jtaguart_platdata *plat = dev->plat; + struct altera_jtaguart_plat *plat = dev->plat; struct altera_jtaguart_regs *const regs = plat->regs; writel(ALTERA_JTAG_AC, ®s->control); /* clear AC flag */ @@ -93,7 +93,7 @@ static int altera_jtaguart_probe(struct udevice *dev) static int altera_jtaguart_of_to_plat(struct udevice *dev) { - struct altera_jtaguart_platdata *plat = dev_get_plat(dev); + struct altera_jtaguart_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_jtaguart_regs), @@ -119,7 +119,7 @@ U_BOOT_DRIVER(altera_jtaguart) = { .id = UCLASS_SERIAL, .of_match = altera_jtaguart_ids, .of_to_plat = altera_jtaguart_of_to_plat, - .plat_auto = sizeof(struct altera_jtaguart_platdata), + .plat_auto = sizeof(struct altera_jtaguart_plat), .probe = altera_jtaguart_probe, .ops = &altera_jtaguart_ops, }; diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index fe6550551d..a3efa1ee1b 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -25,14 +25,14 @@ struct altera_uart_regs { u32 endofpacket; /* End-of-packet reg */ }; -struct altera_uart_platdata { +struct altera_uart_plat { struct altera_uart_regs *regs; unsigned int uartclk; }; static int altera_uart_setbrg(struct udevice *dev, int baudrate) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; u32 div; @@ -44,7 +44,7 @@ static int altera_uart_setbrg(struct udevice *dev, int baudrate) static int altera_uart_putc(struct udevice *dev, const char ch) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; if (!(readl(®s->status) & ALTERA_UART_TRDY)) @@ -57,7 +57,7 @@ static int altera_uart_putc(struct udevice *dev, const char ch) static int altera_uart_pending(struct udevice *dev, bool input) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; u32 st = readl(®s->status); @@ -69,7 +69,7 @@ static int altera_uart_pending(struct udevice *dev, bool input) static int altera_uart_getc(struct udevice *dev) { - struct altera_uart_platdata *plat = dev->plat; + struct altera_uart_plat *plat = dev->plat; struct altera_uart_regs *const regs = plat->regs; if (!(readl(®s->status) & ALTERA_UART_RRDY)) @@ -85,7 +85,7 @@ static int altera_uart_probe(struct udevice *dev) static int altera_uart_of_to_plat(struct udevice *dev) { - struct altera_uart_platdata *plat = dev_get_plat(dev); + struct altera_uart_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_uart_regs), @@ -112,7 +112,7 @@ U_BOOT_DRIVER(altera_uart) = { .id = UCLASS_SERIAL, .of_match = altera_uart_ids, .of_to_plat = altera_uart_of_to_plat, - .plat_auto = sizeof(struct altera_uart_platdata), + .plat_auto = sizeof(struct altera_uart_plat), .probe = altera_uart_probe, .ops = &altera_uart_ops, }; diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 463bedef23..7eabf76d92 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -262,7 +262,7 @@ static int atmel_serial_enable_clk(struct udevice *dev) static int atmel_serial_probe(struct udevice *dev) { - struct atmel_serial_platdata *plat = dev->plat; + struct atmel_serial_plat *plat = dev->plat; struct atmel_serial_priv *priv = dev_get_priv(dev); int ret; #if CONFIG_IS_ENABLED(OF_CONTROL) @@ -304,7 +304,7 @@ U_BOOT_DRIVER(serial_atmel) = { .id = UCLASS_SERIAL, #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = atmel_serial_ids, - .plat_auto = sizeof(struct atmel_serial_platdata), + .plat_auto = sizeof(struct atmel_serial_plat), #endif .probe = atmel_serial_probe, .ops = &atmel_serial_ops, diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c index 4e34643b4a..d39a3c0494 100644 --- a/drivers/serial/lpc32xx_hsuart.c +++ b/drivers/serial/lpc32xx_hsuart.c @@ -85,7 +85,7 @@ static int lpc32xx_serial_init(struct hsuart_regs *hsuart) static int lpc32xx_hsuart_probe(struct udevice *dev) { - struct lpc32xx_hsuart_platdata *plat = dev_get_plat(dev); + struct lpc32xx_hsuart_plat *plat = dev_get_plat(dev); struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev); priv->hsuart = (struct hsuart_regs *)plat->base; diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 6f80e02a0a..8dd81ad794 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -103,7 +103,7 @@ static inline int serial_in_shift(void *addr, int shift) * on a platform */ #ifdef CONFIG_NS16550_DYNAMIC -static void serial_out_dynamic(struct ns16550_platdata *plat, u8 *addr, +static void serial_out_dynamic(struct ns16550_plat *plat, u8 *addr, int value) { if (plat->flags & NS16550_FLAG_IO) { @@ -124,7 +124,7 @@ static void serial_out_dynamic(struct ns16550_platdata *plat, u8 *addr, } } -static int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr) +static int serial_in_dynamic(struct ns16550_plat *plat, u8 *addr) { if (plat->flags & NS16550_FLAG_IO) { return inb(addr); @@ -144,12 +144,12 @@ static int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr) } } #else -static inline void serial_out_dynamic(struct ns16550_platdata *plat, u8 *addr, +static inline void serial_out_dynamic(struct ns16550_plat *plat, u8 *addr, int value) { } -static inline int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr) +static inline int serial_in_dynamic(struct ns16550_plat *plat, u8 *addr) { return 0; } @@ -158,7 +158,7 @@ static inline int serial_in_dynamic(struct ns16550_platdata *plat, u8 *addr) static void ns16550_writeb(NS16550_t port, int offset, int value) { - struct ns16550_platdata *plat = port->plat; + struct ns16550_plat *plat = port->plat; unsigned char *addr; offset *= 1 << plat->reg_shift; @@ -172,7 +172,7 @@ static void ns16550_writeb(NS16550_t port, int offset, int value) static int ns16550_readb(NS16550_t port, int offset) { - struct ns16550_platdata *plat = port->plat; + struct ns16550_plat *plat = port->plat; unsigned char *addr; offset *= 1 << plat->reg_shift; @@ -186,7 +186,7 @@ static int ns16550_readb(NS16550_t port, int offset) static u32 ns16550_getfcr(NS16550_t port) { - struct ns16550_platdata *plat = port->plat; + struct ns16550_plat *plat = port->plat; return plat->fcr; } @@ -418,7 +418,7 @@ static int ns16550_serial_getc(struct udevice *dev) static int ns16550_serial_setbrg(struct udevice *dev, int baudrate) { struct NS16550 *const com_port = dev_get_priv(dev); - struct ns16550_platdata *plat = com_port->plat; + struct ns16550_plat *plat = com_port->plat; int clock_divisor; clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate); @@ -465,7 +465,7 @@ static int ns16550_serial_getinfo(struct udevice *dev, struct serial_device_info *info) { struct NS16550 *const com_port = dev_get_priv(dev); - struct ns16550_platdata *plat = com_port->plat; + struct ns16550_plat *plat = com_port->plat; info->type = SERIAL_CHIP_16550_COMPATIBLE; #ifdef CONFIG_SYS_NS16550_PORT_MAPPED @@ -482,7 +482,7 @@ static int ns16550_serial_getinfo(struct udevice *dev, return 0; } -static int ns16550_serial_assign_base(struct ns16550_platdata *plat, ulong base) +static int ns16550_serial_assign_base(struct ns16550_plat *plat, ulong base) { if (base == FDT_ADDR_T_NONE) return -EINVAL; @@ -498,7 +498,7 @@ static int ns16550_serial_assign_base(struct ns16550_platdata *plat, ulong base) int ns16550_serial_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat; struct NS16550 *const com_port = dev_get_priv(dev); struct reset_ctl_bulk reset_bulk; fdt_addr_t addr; @@ -535,7 +535,7 @@ enum { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) int ns16550_serial_of_to_plat(struct udevice *dev) { - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat; const u32 port_type = dev_get_driver_data(dev); fdt_addr_t addr; struct clk clk; @@ -611,7 +611,7 @@ U_BOOT_DRIVER(ns16550_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = ns16550_serial_ids, .of_to_plat = ns16550_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), #endif .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 2deb14d5d1..c7d5390b43 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -21,7 +21,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct sandbox_serial_platdata { +struct sandbox_serial_plat { int colour; /* Text colour to use for output, -1 for none */ }; @@ -72,7 +72,7 @@ static int sandbox_serial_probe(struct udevice *dev) static int sandbox_serial_remove(struct udevice *dev) { - struct sandbox_serial_platdata *plat = dev->plat; + struct sandbox_serial_plat *plat = dev->plat; if (plat->colour != -1) output_ansi_reset(); @@ -83,7 +83,7 @@ static int sandbox_serial_remove(struct udevice *dev) static int sandbox_serial_putc(struct udevice *dev, const char ch) { struct sandbox_serial_priv *priv = dev_get_priv(dev); - struct sandbox_serial_platdata *plat = dev->plat; + struct sandbox_serial_plat *plat = dev->plat; /* With of-platdata we don't real the colour correctly, so disable it */ if (!CONFIG_IS_ENABLED(OF_PLATDATA) && priv->start_of_line && @@ -203,7 +203,7 @@ static const char * const ansi_colour[] = { static int sandbox_serial_of_to_plat(struct udevice *dev) { - struct sandbox_serial_platdata *plat = dev->plat; + struct sandbox_serial_plat *plat = dev->plat; const char *colour; int i; @@ -242,7 +242,7 @@ U_BOOT_DRIVER(sandbox_serial) = { .id = UCLASS_SERIAL, .of_match = sandbox_serial_ids, .of_to_plat = sandbox_serial_of_to_plat, - .plat_auto = sizeof(struct sandbox_serial_platdata), + .plat_auto = sizeof(struct sandbox_serial_plat), .priv_auto = sizeof(struct sandbox_serial_priv), .probe = sandbox_serial_probe, .remove = sandbox_serial_remove, @@ -251,7 +251,7 @@ U_BOOT_DRIVER(sandbox_serial) = { }; #if !CONFIG_IS_ENABLED(OF_PLATDATA) -static const struct sandbox_serial_platdata platdata_non_fdt = { +static const struct sandbox_serial_plat platdata_non_fdt = { .colour = -1, }; diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index dae55ea6f4..022e37748c 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -25,7 +25,7 @@ struct arc_serial_regs { }; -struct arc_serial_platdata { +struct arc_serial_plat { struct arc_serial_regs *reg; unsigned int uartclk; }; @@ -37,7 +37,7 @@ struct arc_serial_platdata { static int arc_serial_setbrg(struct udevice *dev, int baudrate) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; int arc_console_baud = gd->cpu_clk / (baudrate * 4) - 1; @@ -49,7 +49,7 @@ static int arc_serial_setbrg(struct udevice *dev, int baudrate) static int arc_serial_putc(struct udevice *dev, const char c) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; while (!(readb(®s->status) & UART_TXEMPTY)) @@ -67,7 +67,7 @@ static int arc_serial_tstc(struct arc_serial_regs *const regs) static int arc_serial_pending(struct udevice *dev, bool input) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; uint32_t status = readb(®s->status); @@ -79,7 +79,7 @@ static int arc_serial_pending(struct udevice *dev, bool input) static int arc_serial_getc(struct udevice *dev) { - struct arc_serial_platdata *plat = dev->plat; + struct arc_serial_plat *plat = dev->plat; struct arc_serial_regs *const regs = plat->reg; while (!arc_serial_tstc(regs)) @@ -111,7 +111,7 @@ static const struct udevice_id arc_serial_ids[] = { static int arc_serial_of_to_plat(struct udevice *dev) { - struct arc_serial_platdata *plat = dev_get_plat(dev); + struct arc_serial_plat *plat = dev_get_plat(dev); DECLARE_GLOBAL_DATA_PTR; plat->reg = dev_read_addr_ptr(dev); @@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_arc) = { .id = UCLASS_SERIAL, .of_match = arc_serial_ids, .of_to_plat = arc_serial_of_to_plat, - .plat_auto = sizeof(struct arc_serial_platdata), + .plat_auto = sizeof(struct arc_serial_plat), .probe = arc_serial_probe, .ops = &arc_serial_ops, }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index a53288dc91..58fa722b4b 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -55,7 +55,7 @@ static int bcm283x_mu_serial_getc(struct udevice *dev); static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) { - struct bcm283x_mu_serial_platdata *plat = dev_get_plat(dev); + struct bcm283x_mu_serial_plat *plat = dev_get_plat(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); struct bcm283x_mu_regs *regs = priv->regs; u32 divider; @@ -158,7 +158,7 @@ static bool bcm283x_is_serial_muxed(void) static int bcm283x_mu_serial_probe(struct udevice *dev) { - struct bcm283x_mu_serial_platdata *plat = dev_get_plat(dev); + struct bcm283x_mu_serial_plat *plat = dev_get_plat(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); fdt_addr_t addr; @@ -194,7 +194,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .name = "serial_bcm283x_mu", .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_mu_serial_id), - .plat_auto = sizeof(struct bcm283x_mu_serial_platdata), + .plat_auto = sizeof(struct bcm283x_mu_serial_plat), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 967f8421ab..2d2e970316 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -35,7 +35,7 @@ static bool bcm283x_is_serial_muxed(void) static int bcm283x_pl011_serial_probe(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); int ret; /* Don't spawn the device if it's not muxed */ @@ -92,7 +92,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(bcm283x_pl011_serial_id), .probe = bcm283x_pl011_serial_probe, - .plat_auto = sizeof(struct pl01x_serial_platdata), + .plat_auto = sizeof(struct pl01x_serial_plat), .ops = &bcm283x_pl011_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index ece27aca88..904e1b306e 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -13,7 +13,7 @@ static int coreboot_of_to_plat(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_plat(dev); + struct ns16550_plat *plat = dev_get_plat(dev); struct cb_serial *cb_info = lib_sysinfo.serial; plat->base = cb_info->baseaddr; @@ -38,7 +38,7 @@ U_BOOT_DRIVER(coreboot_uart) = { .id = UCLASS_SERIAL, .of_match = coreboot_serial_ids, .priv_auto = sizeof(struct NS16550), - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .of_to_plat = coreboot_of_to_plat, .probe = ns16550_serial_probe, .ops = &ns16550_serial_ops, diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c index 55da805b8e..be9bf662fd 100644 --- a/drivers/serial/serial_intel_mid.c +++ b/drivers/serial/serial_intel_mid.c @@ -21,7 +21,7 @@ #define UART_MUL 0x34 #define UART_DIV 0x38 -static void mid_writel(struct ns16550_platdata *plat, int offset, int value) +static void mid_writel(struct ns16550_plat *plat, int offset, int value) { unsigned char *addr; @@ -33,7 +33,7 @@ static void mid_writel(struct ns16550_platdata *plat, int offset, int value) static int mid_serial_probe(struct udevice *dev) { - struct ns16550_platdata *plat = dev_get_plat(dev); + struct ns16550_plat *plat = dev_get_plat(dev); /* * Initialize fractional divider correctly for Intel Edison @@ -60,7 +60,7 @@ U_BOOT_DRIVER(serial_intel_mid) = { .id = UCLASS_SERIAL, .of_match = mid_serial_ids, .of_to_plat = ns16550_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), .priv_auto = sizeof(struct NS16550), .probe = mid_serial_probe, .ops = &ns16550_serial_ops, diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index 4f8867ab7b..ced005706a 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -115,7 +115,7 @@ static int _linflex_serial_init(struct linflex_fsl *base) return 0; } -struct linflex_serial_platdata { +struct linflex_serial_plat { struct linflex_fsl *base_addr; u8 port_id; /* do we need this? */ }; @@ -168,7 +168,7 @@ static void linflex_serial_init_internal(struct linflex_fsl *lfuart) static int linflex_serial_probe(struct udevice *dev) { - struct linflex_serial_platdata *plat = dev->plat; + struct linflex_serial_plat *plat = dev->plat; struct linflex_serial_priv *priv = dev_get_priv(dev); priv->lfuart = (struct linflex_fsl *)plat->base_addr; diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 56362339be..5beb5f2ce6 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -74,7 +74,7 @@ enum lpuart_devtype { DEV_IMXRT, }; -struct lpuart_serial_platdata { +struct lpuart_serial_plat { void *reg; enum lpuart_devtype devtype; ulong flags; @@ -138,7 +138,7 @@ static inline int get_lpuart_clk_rate(struct udevice *dev, u32 *clk) static bool is_lpuart32(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat; return plat->flags & LPUART_FLAG_REGMAP_32BIT_REG; } @@ -146,7 +146,7 @@ static bool is_lpuart32(struct udevice *dev) static void _lpuart_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl *base = plat->reg; u32 clk; u16 sbr; @@ -167,7 +167,7 @@ static void _lpuart_serial_setbrg(struct udevice *dev, __raw_writeb(sbr & 0xff, &base->ubdl); } -static int _lpuart_serial_getc(struct lpuart_serial_platdata *plat) +static int _lpuart_serial_getc(struct lpuart_serial_plat *plat) { struct lpuart_fsl *base = plat->reg; while (!(__raw_readb(&base->us1) & (US1_RDRF | US1_OR))) @@ -178,7 +178,7 @@ static int _lpuart_serial_getc(struct lpuart_serial_platdata *plat) return __raw_readb(&base->ud); } -static void _lpuart_serial_putc(struct lpuart_serial_platdata *plat, +static void _lpuart_serial_putc(struct lpuart_serial_plat *plat, const char c) { struct lpuart_fsl *base = plat->reg; @@ -190,7 +190,7 @@ static void _lpuart_serial_putc(struct lpuart_serial_platdata *plat, } /* Test whether a character is in the RX buffer */ -static int _lpuart_serial_tstc(struct lpuart_serial_platdata *plat) +static int _lpuart_serial_tstc(struct lpuart_serial_plat *plat) { struct lpuart_fsl *base = plat->reg; @@ -206,7 +206,7 @@ static int _lpuart_serial_tstc(struct lpuart_serial_platdata *plat) */ static int _lpuart_serial_init(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl *base = (struct lpuart_fsl *)plat->reg; u8 ctrl; @@ -235,7 +235,7 @@ static int _lpuart_serial_init(struct udevice *dev) static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = plat->reg; u32 sbr, osr, baud_diff, tmp_osr, tmp_sbr, tmp_diff, tmp; u32 clk; @@ -304,7 +304,7 @@ static void _lpuart32_serial_setbrg_7ulp(struct udevice *dev, static void _lpuart32_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = plat->reg; u32 clk; u32 sbr; @@ -324,7 +324,7 @@ static void _lpuart32_serial_setbrg(struct udevice *dev, lpuart_write32(plat->flags, &base->baud, sbr); } -static int _lpuart32_serial_getc(struct lpuart_serial_platdata *plat) +static int _lpuart32_serial_getc(struct lpuart_serial_plat *plat) { struct lpuart_fsl_reg32 *base = plat->reg; u32 stat, val; @@ -345,7 +345,7 @@ static int _lpuart32_serial_getc(struct lpuart_serial_platdata *plat) return val & 0x3ff; } -static void _lpuart32_serial_putc(struct lpuart_serial_platdata *plat, +static void _lpuart32_serial_putc(struct lpuart_serial_plat *plat, const char c) { struct lpuart_fsl_reg32 *base = plat->reg; @@ -367,7 +367,7 @@ static void _lpuart32_serial_putc(struct lpuart_serial_platdata *plat, } /* Test whether a character is in the RX buffer */ -static int _lpuart32_serial_tstc(struct lpuart_serial_platdata *plat) +static int _lpuart32_serial_tstc(struct lpuart_serial_plat *plat) { struct lpuart_fsl_reg32 *base = plat->reg; u32 water; @@ -386,7 +386,7 @@ static int _lpuart32_serial_tstc(struct lpuart_serial_platdata *plat) */ static int _lpuart32_serial_init(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); struct lpuart_fsl_reg32 *base = (struct lpuart_fsl_reg32 *)plat->reg; u32 val, tx_fifo_size; @@ -428,7 +428,7 @@ static int _lpuart32_serial_init(struct udevice *dev) static int lpuart_serial_setbrg(struct udevice *dev, int baudrate) { - struct lpuart_serial_platdata *plat = dev_get_plat(dev); + struct lpuart_serial_plat *plat = dev_get_plat(dev); if (is_lpuart32(dev)) { if (plat->devtype == DEV_MX7ULP || plat->devtype == DEV_IMX8 || @@ -445,7 +445,7 @@ static int lpuart_serial_setbrg(struct udevice *dev, int baudrate) static int lpuart_serial_getc(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat; if (is_lpuart32(dev)) return _lpuart32_serial_getc(plat); @@ -455,7 +455,7 @@ static int lpuart_serial_getc(struct udevice *dev) static int lpuart_serial_putc(struct udevice *dev, const char c) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat; if (is_lpuart32(dev)) _lpuart32_serial_putc(plat, c); @@ -467,7 +467,7 @@ static int lpuart_serial_putc(struct udevice *dev, const char c) static int lpuart_serial_pending(struct udevice *dev, bool input) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat; struct lpuart_fsl *reg = plat->reg; struct lpuart_fsl_reg32 *reg32 = plat->reg; u32 stat; @@ -513,7 +513,7 @@ static int lpuart_serial_probe(struct udevice *dev) static int lpuart_serial_of_to_plat(struct udevice *dev) { - struct lpuart_serial_platdata *plat = dev->plat; + struct lpuart_serial_plat *plat = dev->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); fdt_addr_t addr; @@ -567,7 +567,7 @@ U_BOOT_DRIVER(serial_lpuart) = { .id = UCLASS_SERIAL, .of_match = lpuart_serial_ids, .of_to_plat = lpuart_serial_of_to_plat, - .plat_auto = sizeof(struct lpuart_serial_platdata), + .plat_auto = sizeof(struct lpuart_serial_plat), .probe = lpuart_serial_probe, .ops = &lpuart_serial_ops, }; diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index 12b2df2e56..a78a7ec6f8 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -83,7 +83,7 @@ static void mcf_serial_setbrg_common(uart_t *uart, int baudrate) static int coldfire_serial_probe(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; plat->port = dev->seq; @@ -93,7 +93,7 @@ static int coldfire_serial_probe(struct udevice *dev) static int coldfire_serial_putc(struct udevice *dev, const char ch) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)plat->base; /* Wait for last character to go. */ @@ -107,7 +107,7 @@ static int coldfire_serial_putc(struct udevice *dev, const char ch) static int coldfire_serial_getc(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base); /* Wait for a character to arrive. */ @@ -119,7 +119,7 @@ static int coldfire_serial_getc(struct udevice *dev) int coldfire_serial_setbrg(struct udevice *dev, int baudrate) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base); mcf_serial_setbrg_common(uart, baudrate); @@ -129,7 +129,7 @@ int coldfire_serial_setbrg(struct udevice *dev, int baudrate) static int coldfire_serial_pending(struct udevice *dev, bool input) { - struct coldfire_serial_platdata *plat = dev->plat; + struct coldfire_serial_plat *plat = dev->plat; uart_t *uart = (uart_t *)(plat->base); if (input) @@ -142,7 +142,7 @@ static int coldfire_serial_pending(struct udevice *dev, bool input) static int coldfire_of_to_plat(struct udevice *dev) { - struct coldfire_serial_platdata *plat = dev_get_plat(dev); + struct coldfire_serial_plat *plat = dev_get_plat(dev); fdt_addr_t addr_base; addr_base = dev_read_addr(dev); @@ -172,7 +172,7 @@ U_BOOT_DRIVER(serial_coldfire) = { .id = UCLASS_SERIAL, .of_match = coldfire_serial_ids, .of_to_plat = coldfire_of_to_plat, - .plat_auto = sizeof(struct coldfire_serial_platdata), + .plat_auto = sizeof(struct coldfire_serial_plat), .probe = coldfire_serial_probe, .ops = &coldfire_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c index ac3727d1c2..40d9bfe7c6 100644 --- a/drivers/serial/serial_meson.c +++ b/drivers/serial/serial_meson.c @@ -19,7 +19,7 @@ struct meson_uart { u32 misc; }; -struct meson_serial_platdata { +struct meson_serial_plat { struct meson_uart *reg; }; @@ -57,7 +57,7 @@ static void meson_serial_init(struct meson_uart *uart) static int meson_serial_probe(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; meson_serial_init(uart); @@ -67,7 +67,7 @@ static int meson_serial_probe(struct udevice *dev) static void meson_serial_rx_error(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; u32 val = readl(&uart->control); @@ -83,7 +83,7 @@ static void meson_serial_rx_error(struct udevice *dev) static int meson_serial_getc(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; uint32_t status = readl(&uart->status); @@ -100,7 +100,7 @@ static int meson_serial_getc(struct udevice *dev) static int meson_serial_putc(struct udevice *dev, const char ch) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; if (readl(&uart->status) & AML_UART_TX_FULL) @@ -113,7 +113,7 @@ static int meson_serial_putc(struct udevice *dev, const char ch) static int meson_serial_pending(struct udevice *dev, bool input) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; struct meson_uart *const uart = plat->reg; uint32_t status = readl(&uart->status); @@ -138,7 +138,7 @@ static int meson_serial_pending(struct udevice *dev, bool input) static int meson_serial_of_to_plat(struct udevice *dev) { - struct meson_serial_platdata *plat = dev->plat; + struct meson_serial_plat *plat = dev->plat; fdt_addr_t addr; addr = dev_read_addr(dev); @@ -169,7 +169,7 @@ U_BOOT_DRIVER(serial_meson) = { .probe = meson_serial_probe, .ops = &meson_serial_ops, .of_to_plat = meson_serial_of_to_plat, - .plat_auto = sizeof(struct meson_serial_platdata), + .plat_auto = sizeof(struct meson_serial_plat), }; #ifdef CONFIG_DEBUG_UART_MESON diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index f4676f0b8e..5a1d40e0a6 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -8,7 +8,7 @@ #include #include -struct mvebu_platdata { +struct mvebu_plat { void __iomem *base; }; @@ -32,7 +32,7 @@ struct mvebu_platdata { static int mvebu_serial_putc(struct udevice *dev, const char ch) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base; while (readl(base + UART_STATUS_REG) & UART_STATUS_TXFIFO_FULL) @@ -45,7 +45,7 @@ static int mvebu_serial_putc(struct udevice *dev, const char ch) static int mvebu_serial_getc(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base; while (!(readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)) @@ -56,7 +56,7 @@ static int mvebu_serial_getc(struct udevice *dev) static int mvebu_serial_pending(struct udevice *dev, bool input) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base; if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY) @@ -67,7 +67,7 @@ static int mvebu_serial_pending(struct udevice *dev, bool input) static int mvebu_serial_setbrg(struct udevice *dev, int baudrate) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base; /* @@ -87,7 +87,7 @@ static int mvebu_serial_setbrg(struct udevice *dev, int baudrate) static int mvebu_serial_probe(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); void __iomem *base = plat->base; /* reset FIFOs */ @@ -102,7 +102,7 @@ static int mvebu_serial_probe(struct udevice *dev) static int mvebu_serial_of_to_plat(struct udevice *dev) { - struct mvebu_platdata *plat = dev_get_plat(dev); + struct mvebu_plat *plat = dev_get_plat(dev); plat->base = dev_read_addr_ptr(dev); @@ -126,7 +126,7 @@ U_BOOT_DRIVER(serial_mvebu) = { .id = UCLASS_SERIAL, .of_match = mvebu_serial_ids, .of_to_plat = mvebu_serial_of_to_plat, - .plat_auto = sizeof(struct mvebu_platdata), + .plat_auto = sizeof(struct mvebu_plat), .probe = mvebu_serial_probe, .ops = &mvebu_serial_ops, }; diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index 9602ddc7e0..2603fa8611 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -264,7 +264,7 @@ __weak struct serial_device *default_serial_console(void) int mxc_serial_setbrg(struct udevice *dev, int baudrate) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; u32 clk = imx_get_uartclk(); _mxc_serial_setbrg(plat->reg, clk, baudrate, plat->use_dte); @@ -274,7 +274,7 @@ int mxc_serial_setbrg(struct udevice *dev, int baudrate) static int mxc_serial_probe(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; _mxc_serial_init(plat->reg, plat->use_dte); @@ -283,7 +283,7 @@ static int mxc_serial_probe(struct udevice *dev) static int mxc_serial_getc(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; struct mxc_uart *const uart = plat->reg; if (readl(&uart->ts) & UTS_RXEMPTY) @@ -294,7 +294,7 @@ static int mxc_serial_getc(struct udevice *dev) static int mxc_serial_putc(struct udevice *dev, const char ch) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; struct mxc_uart *const uart = plat->reg; if (!(readl(&uart->ts) & UTS_TXEMPTY)) @@ -307,7 +307,7 @@ static int mxc_serial_putc(struct udevice *dev, const char ch) static int mxc_serial_pending(struct udevice *dev, bool input) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; struct mxc_uart *const uart = plat->reg; uint32_t sr2 = readl(&uart->sr2); @@ -327,7 +327,7 @@ static const struct dm_serial_ops mxc_serial_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) static int mxc_serial_of_to_plat(struct udevice *dev) { - struct mxc_serial_platdata *plat = dev->plat; + struct mxc_serial_plat *plat = dev->plat; fdt_addr_t addr; addr = dev_read_addr(dev); @@ -358,7 +358,7 @@ U_BOOT_DRIVER(serial_mxc) = { #if CONFIG_IS_ENABLED(OF_CONTROL) .of_match = mxc_serial_ids, .of_to_plat = mxc_serial_of_to_plat, - .plat_auto = sizeof(struct mxc_serial_platdata), + .plat_auto = sizeof(struct mxc_serial_plat), #endif .probe = mxc_serial_probe, .ops = &mxc_serial_ops, diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c index 2b0a3e4d06..2f38e1b890 100644 --- a/drivers/serial/serial_omap.c +++ b/drivers/serial/serial_omap.c @@ -101,7 +101,7 @@ DEBUG_UART_FUNCS #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int omap_serial_of_to_plat(struct udevice *dev) { - struct ns16550_platdata *plat = dev->plat; + struct ns16550_plat *plat = dev->plat; fdt_addr_t addr; struct clk clk; int err; @@ -158,7 +158,7 @@ U_BOOT_DRIVER(omap_serial) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = omap_serial_ids, .of_to_plat = omap_serial_of_to_plat, - .plat_auto = sizeof(struct ns16550_platdata), + .plat_auto = sizeof(struct ns16550_plat), #endif .priv_auto = sizeof(struct NS16550), .probe = ns16550_serial_probe, diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 45bc1de059..b21e943d21 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -281,7 +281,7 @@ __weak struct serial_device *default_serial_console(void) int pl01x_serial_setbrg(struct udevice *dev, int baudrate) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); struct pl01x_priv *priv = dev_get_priv(dev); if (!plat->skip_init) { @@ -294,7 +294,7 @@ int pl01x_serial_setbrg(struct udevice *dev, int baudrate) int pl01x_serial_probe(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); struct pl01x_priv *priv = dev_get_priv(dev); priv->regs = (struct pl01x_regs *)plat->base; @@ -350,7 +350,7 @@ static const struct udevice_id pl01x_serial_id[] ={ int pl01x_serial_of_to_plat(struct udevice *dev) { - struct pl01x_serial_platdata *plat = dev_get_plat(dev); + struct pl01x_serial_plat *plat = dev_get_plat(dev); struct clk clk; fdt_addr_t addr; int ret; @@ -388,7 +388,7 @@ U_BOOT_DRIVER(serial_pl01x) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(pl01x_serial_id), .of_to_plat = of_match_ptr(pl01x_serial_of_to_plat), - .plat_auto = sizeof(struct pl01x_serial_platdata), + .plat_auto = sizeof(struct pl01x_serial_plat), .probe = pl01x_serial_probe, .ops = &pl01x_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index 232218dcdc..d82f3b9752 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -268,7 +268,7 @@ void pxa_serial_initialize(void) #ifdef CONFIG_DM_SERIAL static int pxa_serial_probe(struct udevice *dev) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; pxa_setbrg_common((struct pxa_uart_regs *)plat->base, plat->port, plat->baudrate); @@ -277,7 +277,7 @@ static int pxa_serial_probe(struct udevice *dev) static int pxa_serial_putc(struct udevice *dev, const char ch) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base; /* Wait for last character to go. */ @@ -291,7 +291,7 @@ static int pxa_serial_putc(struct udevice *dev, const char ch) static int pxa_serial_getc(struct udevice *dev) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base; /* Wait for a character to arrive. */ @@ -303,7 +303,7 @@ static int pxa_serial_getc(struct udevice *dev) int pxa_serial_setbrg(struct udevice *dev, int baudrate) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base; int port = plat->port; @@ -314,7 +314,7 @@ int pxa_serial_setbrg(struct udevice *dev, int baudrate) static int pxa_serial_pending(struct udevice *dev, bool input) { - struct pxa_serial_platdata *plat = dev->plat; + struct pxa_serial_plat *plat = dev->plat; struct pxa_uart_regs *uart_regs = (struct pxa_uart_regs *)plat->base; if (input) diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index 930103a42c..4c0548ed0f 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -12,22 +12,22 @@ #include #if defined(CONFIG_ROCKCHIP_RK3188) -struct rockchip_uart_platdata { +struct rockchip_uart_plat { struct dtd_rockchip_rk3188_uart dtplat; - struct ns16550_platdata plat; + struct ns16550_plat plat; }; struct dtd_rockchip_rk3188_uart *dtplat, s_dtplat; #elif defined(CONFIG_ROCKCHIP_RK3288) -struct rockchip_uart_platdata { +struct rockchip_uart_plat { struct dtd_rockchip_rk3288_uart dtplat; - struct ns16550_platdata plat; + struct ns16550_plat plat; }; struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat; #endif static int rockchip_serial_probe(struct udevice *dev) { - struct rockchip_uart_platdata *plat = dev_get_plat(dev); + struct rockchip_uart_plat *plat = dev_get_plat(dev); /* Create some new platform data for the standard driver */ plat->plat.base = plat->dtplat.reg[0]; @@ -43,7 +43,7 @@ U_BOOT_DRIVER(rockchip_rk3188_uart) = { .name = "rockchip_rk3188_uart", .id = UCLASS_SERIAL, .priv_auto = sizeof(struct NS16550), - .plat_auto = sizeof(struct rockchip_uart_platdata), + .plat_auto = sizeof(struct rockchip_uart_plat), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, @@ -53,7 +53,7 @@ U_BOOT_DRIVER(rockchip_rk3288_uart) = { .name = "rockchip_rk3288_uart", .id = UCLASS_SERIAL, .priv_auto = sizeof(struct NS16550), - .plat_auto = sizeof(struct rockchip_uart_platdata), + .plat_auto = sizeof(struct rockchip_uart_plat), .probe = rockchip_serial_probe, .ops = &ns16550_serial_ops, .flags = DM_FLAG_PRE_RELOC, diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 5a333c4bb0..e328fb6538 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR; #define TX_FIFO_FULL (1 << 24) /* Information about a serial port */ -struct s5p_serial_platdata { +struct s5p_serial_plat { struct s5p_uart *reg; /* address of registers in physical memory */ u8 port_id; /* uart port number */ }; @@ -88,7 +88,7 @@ static void __maybe_unused s5p_serial_baud(struct s5p_uart *uart, uint uclk, #ifndef CONFIG_SPL_BUILD int s5p_serial_setbrg(struct udevice *dev, int baudrate) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg; u32 uclk; @@ -111,7 +111,7 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate) static int s5p_serial_probe(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg; s5p_serial_init(uart); @@ -140,7 +140,7 @@ static int serial_err_check(const struct s5p_uart *const uart, int op) static int s5p_serial_getc(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg; if (!(readl(&uart->ufstat) & RX_FIFO_COUNT_MASK)) @@ -152,7 +152,7 @@ static int s5p_serial_getc(struct udevice *dev) static int s5p_serial_putc(struct udevice *dev, const char ch) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg; if (readl(&uart->ufstat) & TX_FIFO_FULL) @@ -166,7 +166,7 @@ static int s5p_serial_putc(struct udevice *dev, const char ch) static int s5p_serial_pending(struct udevice *dev, bool input) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; struct s5p_uart *const uart = plat->reg; uint32_t ufstat = readl(&uart->ufstat); @@ -178,7 +178,7 @@ static int s5p_serial_pending(struct udevice *dev, bool input) static int s5p_serial_of_to_plat(struct udevice *dev) { - struct s5p_serial_platdata *plat = dev->plat; + struct s5p_serial_plat *plat = dev->plat; fdt_addr_t addr; addr = dev_read_addr(dev); @@ -208,7 +208,7 @@ U_BOOT_DRIVER(serial_s5p) = { .id = UCLASS_SERIAL, .of_match = s5p_serial_ids, .of_to_plat = s5p_serial_of_to_plat, - .plat_auto = sizeof(struct s5p_serial_platdata), + .plat_auto = sizeof(struct s5p_serial_plat), .probe = s5p_serial_probe, .ops = &s5p_serial_ops, }; diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index a961ead1d4..d74f890233 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -169,7 +169,7 @@ static int sh_serial_getc(struct udevice *dev) static int sh_serial_setbrg(struct udevice *dev, int baudrate) { - struct sh_serial_platdata *plat = dev_get_plat(dev); + struct sh_serial_plat *plat = dev_get_plat(dev); struct uart_port *priv = dev_get_priv(dev); sh_serial_setbrg_generic(priv, plat->clk, baudrate); @@ -179,7 +179,7 @@ static int sh_serial_setbrg(struct udevice *dev, int baudrate) static int sh_serial_probe(struct udevice *dev) { - struct sh_serial_platdata *plat = dev_get_plat(dev); + struct sh_serial_plat *plat = dev_get_plat(dev); struct uart_port *priv = dev_get_priv(dev); priv->membase = (unsigned char *)plat->base; @@ -209,7 +209,7 @@ static const struct udevice_id sh_serial_id[] ={ static int sh_serial_of_to_plat(struct udevice *dev) { - struct sh_serial_platdata *plat = dev_get_plat(dev); + struct sh_serial_plat *plat = dev_get_plat(dev); struct clk sh_serial_clk; fdt_addr_t addr; int ret; @@ -240,7 +240,7 @@ U_BOOT_DRIVER(serial_sh) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(sh_serial_id), .of_to_plat = of_match_ptr(sh_serial_of_to_plat), - .plat_auto = sizeof(struct sh_serial_platdata), + .plat_auto = sizeof(struct sh_serial_plat), .probe = sh_serial_probe, .ops = &sh_serial_ops, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index 5248c6814c..d26fe7e770 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -37,7 +37,7 @@ struct uart_sifive { u32 div; }; -struct sifive_uart_platdata { +struct sifive_uart_plat { unsigned long clock; struct uart_sifive *regs; }; @@ -105,7 +105,7 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate) { int ret; struct clk clk; - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); u32 clock = 0; ret = clk_get_by_index(dev, 0, &clk); @@ -131,7 +131,7 @@ static int sifive_serial_setbrg(struct udevice *dev, int baudrate) static int sifive_serial_probe(struct udevice *dev) { - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); /* No need to reinitialize the UART after relocation */ if (gd->flags & GD_FLG_RELOC) @@ -145,7 +145,7 @@ static int sifive_serial_probe(struct udevice *dev) static int sifive_serial_getc(struct udevice *dev) { int c; - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); struct uart_sifive *regs = plat->regs; while ((c = _sifive_serial_getc(regs)) == -EAGAIN) ; @@ -156,7 +156,7 @@ static int sifive_serial_getc(struct udevice *dev) static int sifive_serial_putc(struct udevice *dev, const char ch) { int rc; - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); while ((rc = _sifive_serial_putc(plat->regs, ch)) == -EAGAIN) ; @@ -165,7 +165,7 @@ static int sifive_serial_putc(struct udevice *dev, const char ch) static int sifive_serial_pending(struct udevice *dev, bool input) { - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); struct uart_sifive *regs = plat->regs; if (input) @@ -176,7 +176,7 @@ static int sifive_serial_pending(struct udevice *dev, bool input) static int sifive_serial_of_to_plat(struct udevice *dev) { - struct sifive_uart_platdata *plat = dev_get_plat(dev); + struct sifive_uart_plat *plat = dev_get_plat(dev); plat->regs = (struct uart_sifive *)dev_read_addr(dev); if (IS_ERR(plat->regs)) @@ -202,7 +202,7 @@ U_BOOT_DRIVER(serial_sifive) = { .id = UCLASS_SERIAL, .of_match = sifive_serial_ids, .of_to_plat = sifive_serial_of_to_plat, - .plat_auto = sizeof(struct sifive_uart_platdata), + .plat_auto = sizeof(struct sifive_uart_plat), .probe = sifive_serial_probe, .ops = &sifive_serial_ops, }; diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index 63344b3418..818c34cf11 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -44,7 +44,7 @@ static void _stm32_serial_setbrg(fdt_addr_t base, static int stm32_serial_setbrg(struct udevice *dev, int baudrate) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); _stm32_serial_setbrg(plat->base, plat->uart_info, plat->clock_rate, baudrate); @@ -54,7 +54,7 @@ static int stm32_serial_setbrg(struct udevice *dev, int baudrate) static int stm32_serial_setconfig(struct udevice *dev, uint serial_config) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; u8 uart_enable_bit = plat->uart_info->uart_enable_bit; u32 cr1 = plat->base + CR1_OFFSET(stm32f4); @@ -102,7 +102,7 @@ static int stm32_serial_setconfig(struct udevice *dev, uint serial_config) static int stm32_serial_getc(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; fdt_addr_t base = plat->base; u32 isr = readl(base + ISR_OFFSET(stm32f4)); @@ -139,14 +139,14 @@ static int _stm32_serial_putc(fdt_addr_t base, static int stm32_serial_putc(struct udevice *dev, const char c) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); return _stm32_serial_putc(plat->base, plat->uart_info, c); } static int stm32_serial_pending(struct udevice *dev, bool input) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); bool stm32f4 = plat->uart_info->stm32f4; fdt_addr_t base = plat->base; @@ -175,7 +175,7 @@ static void _stm32_serial_init(fdt_addr_t base, static int stm32_serial_probe(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); struct clk clk; struct reset_ctl reset; int ret; @@ -219,7 +219,7 @@ static const struct udevice_id stm32_serial_id[] = { static int stm32_serial_of_to_plat(struct udevice *dev) { - struct stm32x7_serial_platdata *plat = dev_get_plat(dev); + struct stm32x7_serial_plat *plat = dev_get_plat(dev); plat->base = dev_read_addr(dev); if (plat->base == FDT_ADDR_T_NONE) @@ -241,7 +241,7 @@ U_BOOT_DRIVER(serial_stm32) = { .id = UCLASS_SERIAL, .of_match = of_match_ptr(stm32_serial_id), .of_to_plat = of_match_ptr(stm32_serial_of_to_plat), - .plat_auto = sizeof(struct stm32x7_serial_platdata), + .plat_auto = sizeof(struct stm32x7_serial_plat), .ops = &stm32_serial_ops, .probe = stm32_serial_probe, #if !CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h index 5737651888..5bee68fa9c 100644 --- a/drivers/serial/serial_stm32.h +++ b/drivers/serial/serial_stm32.h @@ -48,7 +48,7 @@ struct stm32_uart_info stm32h7_info = { }; /* Information about a serial port */ -struct stm32x7_serial_platdata { +struct stm32x7_serial_plat { fdt_addr_t base; /* address of registers in physical memory */ struct stm32_uart_info *uart_info; unsigned long int clock_rate; diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index df4877a0b9..0efdc93c60 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -32,7 +32,7 @@ struct uartlite { unsigned int control; }; -struct uartlite_platdata { +struct uartlite_plat { struct uartlite *regs; }; @@ -54,7 +54,7 @@ static void uart_out32(void __iomem *addr, u32 val) static int uartlite_serial_putc(struct udevice *dev, const char ch) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs; if (uart_in32(®s->status) & SR_TX_FIFO_FULL) @@ -67,7 +67,7 @@ static int uartlite_serial_putc(struct udevice *dev, const char ch) static int uartlite_serial_getc(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs; if (!(uart_in32(®s->status) & SR_RX_FIFO_VALID_DATA)) @@ -78,7 +78,7 @@ static int uartlite_serial_getc(struct udevice *dev) static int uartlite_serial_pending(struct udevice *dev, bool input) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs; if (input) @@ -89,7 +89,7 @@ static int uartlite_serial_pending(struct udevice *dev, bool input) static int uartlite_serial_probe(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); struct uartlite *regs = plat->regs; int ret; @@ -108,7 +108,7 @@ static int uartlite_serial_probe(struct udevice *dev) static int uartlite_serial_of_to_plat(struct udevice *dev) { - struct uartlite_platdata *plat = dev_get_plat(dev); + struct uartlite_plat *plat = dev_get_plat(dev); plat->regs = dev_read_addr_ptr(dev); @@ -132,7 +132,7 @@ U_BOOT_DRIVER(serial_uartlite) = { .id = UCLASS_SERIAL, .of_match = uartlite_serial_ids, .of_to_plat = uartlite_serial_of_to_plat, - .plat_auto = sizeof(struct uartlite_platdata), + .plat_auto = sizeof(struct uartlite_plat), .probe = uartlite_serial_probe, .ops = &uartlite_serial_ops, }; diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 1d748e16ee..2883e2466f 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -41,7 +41,7 @@ struct uart_zynq { u32 baud_rate_divider; /* 0x34 - Baud Rate Divider [7:0] */ }; -struct zynq_uart_platdata { +struct zynq_uart_plat { struct uart_zynq *regs; }; @@ -107,7 +107,7 @@ static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c) static int zynq_serial_setbrg(struct udevice *dev, int baudrate) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); unsigned long clock; int ret; @@ -139,7 +139,7 @@ static int zynq_serial_setbrg(struct udevice *dev, int baudrate) static int zynq_serial_probe(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs; u32 val; @@ -155,7 +155,7 @@ static int zynq_serial_probe(struct udevice *dev) static int zynq_serial_getc(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs; if (readl(®s->channel_sts) & ZYNQ_UART_SR_RXEMPTY) @@ -166,14 +166,14 @@ static int zynq_serial_getc(struct udevice *dev) static int zynq_serial_putc(struct udevice *dev, const char ch) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); return _uart_zynq_serial_putc(plat->regs, ch); } static int zynq_serial_pending(struct udevice *dev, bool input) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); struct uart_zynq *regs = plat->regs; if (input) @@ -184,7 +184,7 @@ static int zynq_serial_pending(struct udevice *dev, bool input) static int zynq_serial_of_to_plat(struct udevice *dev) { - struct zynq_uart_platdata *plat = dev_get_plat(dev); + struct zynq_uart_plat *plat = dev_get_plat(dev); plat->regs = (struct uart_zynq *)dev_read_addr(dev); if (IS_ERR(plat->regs)) @@ -212,7 +212,7 @@ U_BOOT_DRIVER(serial_zynq) = { .id = UCLASS_SERIAL, .of_match = zynq_serial_ids, .of_to_plat = zynq_serial_of_to_plat, - .plat_auto = sizeof(struct zynq_uart_platdata), + .plat_auto = sizeof(struct zynq_uart_plat), .probe = zynq_serial_probe, .ops = &zynq_serial_ops, }; diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index cd7cf5b4fe..ecc3278cb4 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -22,7 +22,7 @@ #define JTAG_ID_PARTNO_SHIFT 12 #define JTAG_ID_PARTNO_MASK (0xffff << 12) -struct soc_ti_k3_platdata { +struct soc_ti_k3_plat { const char *family; const char *revision; }; @@ -74,7 +74,7 @@ static const char *get_rev_string(u32 idreg) static int soc_ti_k3_get_family(struct udevice *dev, char *buf, int size) { - struct soc_ti_k3_platdata *plat = dev_get_plat(dev); + struct soc_ti_k3_plat *plat = dev_get_plat(dev); snprintf(buf, size, "%s", plat->family); @@ -83,7 +83,7 @@ static int soc_ti_k3_get_family(struct udevice *dev, char *buf, int size) static int soc_ti_k3_get_revision(struct udevice *dev, char *buf, int size) { - struct soc_ti_k3_platdata *plat = dev_get_plat(dev); + struct soc_ti_k3_plat *plat = dev_get_plat(dev); snprintf(buf, size, "SR%s", plat->revision); @@ -97,7 +97,7 @@ static const struct soc_ops soc_ti_k3_ops = { int soc_ti_k3_probe(struct udevice *dev) { - struct soc_ti_k3_platdata *plat = dev_get_plat(dev); + struct soc_ti_k3_plat *plat = dev_get_plat(dev); u32 idreg; void *idreg_addr; @@ -124,5 +124,5 @@ U_BOOT_DRIVER(soc_ti_k3) = { .ops = &soc_ti_k3_ops, .of_match = soc_ti_k3_ids, .probe = soc_ti_k3_probe, - .plat_auto = sizeof(struct soc_ti_k3_platdata), + .plat_auto = sizeof(struct soc_ti_k3_plat), }; diff --git a/drivers/sound/ivybridge_sound.c b/drivers/sound/ivybridge_sound.c index d8d128a920..492a86cafe 100644 --- a/drivers/sound/ivybridge_sound.c +++ b/drivers/sound/ivybridge_sound.c @@ -22,7 +22,7 @@ static int bd82x6x_azalia_probe(struct udevice *dev) { - struct pci_child_platdata *plat; + struct pci_child_plat *plat; struct hda_codec_priv *priv; struct udevice *pch; u32 codec_mask; diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 84aca85df3..fd01c8e33b 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -32,7 +32,7 @@ struct altera_spi_regs { u32 slave_sel; }; -struct altera_spi_platdata { +struct altera_spi_plat { struct altera_spi_regs *regs; }; @@ -89,7 +89,7 @@ static int altera_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct altera_spi_priv *priv = dev_get_priv(bus); struct altera_spi_regs *const regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); /* assume spi core configured to do 8 bit transfers */ unsigned int bytes = bitlen / 8; @@ -161,7 +161,7 @@ static int altera_spi_set_mode(struct udevice *bus, uint mode) static int altera_spi_probe(struct udevice *bus) { - struct altera_spi_platdata *plat = dev_get_plat(bus); + struct altera_spi_plat *plat = dev_get_plat(bus); struct altera_spi_priv *priv = dev_get_priv(bus); priv->regs = plat->regs; @@ -171,7 +171,7 @@ static int altera_spi_probe(struct udevice *bus) static int altera_spi_of_to_plat(struct udevice *bus) { - struct altera_spi_platdata *plat = dev_get_plat(bus); + struct altera_spi_plat *plat = dev_get_plat(bus); plat->regs = map_physmem(dev_read_addr(bus), sizeof(struct altera_spi_regs), @@ -203,7 +203,7 @@ U_BOOT_DRIVER(altera_spi) = { .of_match = altera_spi_ids, .ops = &altera_spi_ops, .of_to_plat = altera_spi_of_to_plat, - .plat_auto = sizeof(struct altera_spi_platdata), + .plat_auto = sizeof(struct altera_spi_plat), .priv_auto = sizeof(struct altera_spi_priv), .probe = altera_spi_probe, }; diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 9917b5414a..0f05158c84 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -309,7 +309,7 @@ static int atcspi200_spi_set_mode(struct udevice *bus, uint mode) static int atcspi200_spi_claim_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct nds_spi_slave *ns = dev_get_priv(bus); diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index ad2c7ff69c..205567ef54 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -59,7 +59,7 @@ static int ath79_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct ath79_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); u8 *rx = din; const u8 *tx = dout; u8 curbyte, curbitlen, restbits; diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 9795972993..702e225358 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -105,7 +105,7 @@ #define spi_writel(as, reg, value) \ writel(value, as->regs + ATMEL_SPI_##reg) -struct atmel_spi_platdata { +struct atmel_spi_plat { struct at91_spi *regs; }; @@ -121,9 +121,9 @@ struct atmel_spi_priv { static int atmel_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct at91_spi *reg_base = bus_plat->regs; u32 cs = slave_plat->cs; u32 freq = priv->freq; @@ -161,7 +161,7 @@ static int atmel_spi_claim_bus(struct udevice *dev) static int atmel_spi_release_bus(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus); writel(ATMEL_SPI_CR_SPIDIS, &bus_plat->regs->cr); @@ -173,7 +173,7 @@ static void atmel_spi_cs_activate(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_GPIO) struct udevice *bus = dev_get_parent(dev); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs; if (!dm_gpio_is_valid(&priv->cs_gpios[cs])) @@ -188,7 +188,7 @@ static void atmel_spi_cs_deactivate(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_GPIO) struct udevice *bus = dev_get_parent(dev); struct atmel_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs; if (!dm_gpio_is_valid(&priv->cs_gpios[cs])) @@ -202,7 +202,7 @@ static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus); struct at91_spi *reg_base = bus_plat->regs; u32 len_tx, len_rx, len; @@ -344,7 +344,7 @@ static int atmel_spi_enable_clk(struct udevice *bus) static int atmel_spi_probe(struct udevice *bus) { - struct atmel_spi_platdata *bus_plat = dev_get_plat(bus); + struct atmel_spi_plat *bus_plat = dev_get_plat(bus); int ret; ret = atmel_spi_enable_clk(bus); @@ -388,7 +388,7 @@ U_BOOT_DRIVER(atmel_spi) = { .id = UCLASS_SPI, .of_match = atmel_spi_ids, .ops = &atmel_spi_ops, - .plat_auto = sizeof(struct atmel_spi_platdata), + .plat_auto = sizeof(struct atmel_spi_plat), .priv_auto = sizeof(struct atmel_spi_priv), .probe = atmel_spi_probe, }; diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c index 6d7d169659..85108df565 100644 --- a/drivers/spi/bcm63xx_hsspi.c +++ b/drivers/spi/bcm63xx_hsspi.c @@ -140,7 +140,7 @@ static int bcm63xx_hsspi_set_speed(struct udevice *bus, uint speed) } static void bcm63xx_hsspi_activate_cs(struct bcm63xx_hsspi_priv *priv, - struct dm_spi_slave_platdata *plat) + struct dm_spi_slave_plat *plat) { uint32_t clr, set; @@ -217,7 +217,7 @@ static int bcm63xx_hsspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct bcm63xx_hsspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); size_t data_bytes = bitlen / 8; size_t step_size = HSSPI_FIFO_SIZE; uint16_t opcode = 0; @@ -316,7 +316,7 @@ static const struct udevice_id bcm63xx_hsspi_ids[] = { static int bcm63xx_hsspi_child_pre_probe(struct udevice *dev) { struct bcm63xx_hsspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); /* check cs */ if (plat->cs >= priv->num_cs) { diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c index fe5fe5b716..dd5e62b2fe 100644 --- a/drivers/spi/bcm63xx_spi.c +++ b/drivers/spi/bcm63xx_spi.c @@ -236,7 +236,7 @@ static int bcm63xx_spi_xfer(struct udevice *dev, unsigned int bitlen, } if (flags & SPI_XFER_END) { - struct dm_spi_slave_platdata *plat = + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); uint16_t val, cmd; int ret; @@ -351,7 +351,7 @@ static int bcm63xx_spi_child_pre_probe(struct udevice *dev) struct bcm63xx_spi_priv *priv = dev_get_priv(dev->parent); const unsigned long *regs = priv->regs; struct spi_slave *slave = dev_get_parent_priv(dev); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); /* check cs */ if (plat->cs >= priv->num_cs) { diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c index 3afc051d21..dc4fdacdc9 100644 --- a/drivers/spi/bcmstb_spi.c +++ b/drivers/spi/bcmstb_spi.c @@ -76,7 +76,7 @@ enum bcmstb_base_type { BASE_LAST, }; -struct bcmstb_spi_platdata { +struct bcmstb_spi_plat { void *base[4]; }; @@ -96,7 +96,7 @@ struct bcmstb_spi_priv { static int bcmstb_spi_of_to_plat(struct udevice *bus) { - struct bcmstb_spi_platdata *plat = dev_get_plat(bus); + struct bcmstb_spi_plat *plat = dev_get_plat(bus); const void *fdt = gd->fdt_blob; int node = dev_of_offset(bus); int ret = 0; @@ -159,7 +159,7 @@ static void bcmstb_spi_clear_interrupt(void *base, u32 mask) static int bcmstb_spi_probe(struct udevice *bus) { - struct bcmstb_spi_platdata *plat = dev_get_plat(bus); + struct bcmstb_spi_plat *plat = dev_get_plat(bus); struct bcmstb_spi_priv *priv = dev_get_priv(bus); priv->regs = plat->base[HIF_MSPI]; @@ -434,6 +434,6 @@ U_BOOT_DRIVER(bcmstb_spi) = { .ops = &bcmstb_spi_ops, .of_to_plat = bcmstb_spi_of_to_plat, .probe = bcmstb_spi_probe, - .plat_auto = sizeof(struct bcmstb_spi_platdata), + .plat_auto = sizeof(struct bcmstb_spi_plat), .priv_auto = sizeof(struct bcmstb_spi_priv), }; diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 2317d36559..b746501f5f 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -27,7 +27,7 @@ static int cadence_spi_write_speed(struct udevice *bus, uint hz) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); cadence_qspi_apb_config_baudrate_div(priv->regbase, @@ -130,7 +130,7 @@ static int spi_calibration(struct udevice *bus, uint hz) static int cadence_spi_set_speed(struct udevice *bus, uint hz) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); int err; @@ -165,7 +165,7 @@ static int cadence_spi_set_speed(struct udevice *bus, uint hz) static int cadence_spi_probe(struct udevice *bus) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); struct clk clk; int ret; @@ -212,7 +212,7 @@ static int cadence_spi_remove(struct udevice *dev) static int cadence_spi_set_mode(struct udevice *bus, uint mode) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); /* Disable QSPI */ @@ -235,7 +235,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi, const struct spi_mem_op *op) { struct udevice *bus = spi->dev->parent; - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; struct cadence_spi_priv *priv = dev_get_priv(bus); void *base = priv->regbase; int err = 0; @@ -284,7 +284,7 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi, static int cadence_spi_of_to_plat(struct udevice *bus) { - struct cadence_spi_platdata *plat = bus->plat; + struct cadence_spi_plat *plat = bus->plat; ofnode subnode; plat->regbase = (void *)devfdt_get_addr_index(bus, 0); @@ -354,7 +354,7 @@ U_BOOT_DRIVER(cadence_spi) = { .of_match = cadence_spi_ids, .ops = &cadence_spi_ops, .of_to_plat = cadence_spi_of_to_plat, - .plat_auto = sizeof(struct cadence_spi_platdata), + .plat_auto = sizeof(struct cadence_spi_plat), .priv_auto = sizeof(struct cadence_spi_priv), .probe = cadence_spi_probe, .remove = cadence_spi_remove, diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h index ae459c74a1..64c5867609 100644 --- a/drivers/spi/cadence_qspi.h +++ b/drivers/spi/cadence_qspi.h @@ -15,7 +15,7 @@ #define CQSPI_DECODER_MAX_CS 16 #define CQSPI_READ_CAPTURE_MAX_DELAY 16 -struct cadence_spi_platdata { +struct cadence_spi_plat { unsigned int ref_clk_hz; unsigned int max_hz; void *regbase; @@ -52,7 +52,7 @@ struct cadence_spi_priv { }; /* Functions call declaration */ -void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat); +void cadence_qspi_apb_controller_init(struct cadence_spi_plat *plat); void cadence_qspi_apb_controller_enable(void *reg_base_addr); void cadence_qspi_apb_controller_disable(void *reg_base_addr); void cadence_qspi_apb_dac_mode_enable(void *reg_base); @@ -62,13 +62,13 @@ int cadence_qspi_apb_command_read(void *reg_base_addr, int cadence_qspi_apb_command_write(void *reg_base_addr, const struct spi_mem_op *op); -int cadence_qspi_apb_read_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op); -int cadence_qspi_apb_read_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op); -int cadence_qspi_apb_write_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op); -int cadence_qspi_apb_write_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op); void cadence_qspi_apb_chipselect(void *reg_base, diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index f9675f75a4..b051f462ed 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -377,7 +377,7 @@ void cadence_qspi_apb_delay(void *reg_base, cadence_qspi_apb_controller_enable(reg_base); } -void cadence_qspi_apb_controller_init(struct cadence_spi_platdata *plat) +void cadence_qspi_apb_controller_init(struct cadence_spi_plat *plat) { unsigned reg; @@ -526,7 +526,7 @@ int cadence_qspi_apb_command_write(void *reg_base, const struct spi_mem_op *op) } /* Opcode + Address (3/4 bytes) + dummy bytes (0-4 bytes) */ -int cadence_qspi_apb_read_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { unsigned int reg; @@ -572,14 +572,14 @@ int cadence_qspi_apb_read_setup(struct cadence_spi_platdata *plat, return 0; } -static u32 cadence_qspi_get_rd_sram_level(struct cadence_spi_platdata *plat) +static u32 cadence_qspi_get_rd_sram_level(struct cadence_spi_plat *plat) { u32 reg = readl(plat->regbase + CQSPI_REG_SDRAMLEVEL); reg >>= CQSPI_REG_SDRAMLEVEL_RD_LSB; return reg & CQSPI_REG_SDRAMLEVEL_RD_MASK; } -static int cadence_qspi_wait_for_data(struct cadence_spi_platdata *plat) +static int cadence_qspi_wait_for_data(struct cadence_spi_plat *plat) { unsigned int timeout = 10000; u32 reg; @@ -595,7 +595,7 @@ static int cadence_qspi_wait_for_data(struct cadence_spi_platdata *plat) } static int -cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat, +cadence_qspi_apb_indirect_read_execute(struct cadence_spi_plat *plat, unsigned int n_rx, u8 *rxbuf) { unsigned int remaining = n_rx; @@ -657,7 +657,7 @@ failrd: return ret; } -int cadence_qspi_apb_read_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_read_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { u64 from = op->addr.val; @@ -678,7 +678,7 @@ int cadence_qspi_apb_read_execute(struct cadence_spi_platdata *plat, } /* Opcode + Address (3/4 bytes) */ -int cadence_qspi_apb_write_setup(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_setup(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { unsigned int reg; @@ -701,7 +701,7 @@ int cadence_qspi_apb_write_setup(struct cadence_spi_platdata *plat, } static int -cadence_qspi_apb_indirect_write_execute(struct cadence_spi_platdata *plat, +cadence_qspi_apb_indirect_write_execute(struct cadence_spi_plat *plat, unsigned int n_tx, const u8 *txbuf) { unsigned int page_size = plat->page_size; @@ -774,7 +774,7 @@ failwr: return ret; } -int cadence_qspi_apb_write_execute(struct cadence_spi_platdata *plat, +int cadence_qspi_apb_write_execute(struct cadence_spi_plat *plat, const struct spi_mem_op *op) { u32 to = op->addr.val; diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index 2ba523f2c9..cc934d18a6 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -114,7 +114,7 @@ static int coldfire_spi_claim_bus(struct udevice *dev) struct udevice *bus = dev->parent; struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); if ((in_be32(&dspi->sr) & DSPI_SR_TXRXS) != DSPI_SR_TXRXS) @@ -133,7 +133,7 @@ static int coldfire_spi_release_bus(struct udevice *dev) struct udevice *bus = dev->parent; struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); /* Clear FIFO */ @@ -150,7 +150,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct coldfire_spi_priv *cfspi = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u16 *spi_rd16 = NULL, *spi_wr16 = NULL; u8 *spi_rd = NULL, *spi_wr = NULL; static u32 ctrl; @@ -343,7 +343,7 @@ static int coldfire_spi_set_mode(struct udevice *bus, uint mode) static int coldfire_spi_probe(struct udevice *bus) { - struct coldfire_spi_platdata *plat = dev_get_plat(bus); + struct coldfire_spi_plat *plat = dev_get_plat(bus); struct coldfire_spi_priv *cfspi = dev_get_priv(bus); struct dspi *dspi = cfspi->regs; int i; @@ -387,7 +387,7 @@ static int coldfire_spi_probe(struct udevice *bus) static int coldfire_dspi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; - struct coldfire_spi_platdata *plat = bus->plat; + struct coldfire_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); int *ctar, len; @@ -452,7 +452,7 @@ U_BOOT_DRIVER(coldfire_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = coldfire_spi_ids, .of_to_plat = coldfire_dspi_of_to_plat, - .plat_auto = sizeof(struct coldfire_spi_platdata), + .plat_auto = sizeof(struct coldfire_spi_plat), #endif .probe = coldfire_spi_probe, .ops = &coldfire_spi_ops, diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 0f887ed649..ea088ebd2c 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -333,7 +333,7 @@ static int davinci_spi_set_mode(struct udevice *bus, uint mode) static int davinci_spi_claim_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct davinci_spi_slave *ds = dev_get_priv(bus); @@ -358,7 +358,7 @@ static int davinci_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct dm_spi_slave_platdata *slave = + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct davinci_spi_slave *ds = dev_get_priv(bus); @@ -383,7 +383,7 @@ static const struct dm_spi_ops davinci_spi_ops = { static int davinci_spi_probe(struct udevice *bus) { struct davinci_spi_slave *ds = dev_get_priv(bus); - struct davinci_spi_platdata *plat = bus->plat; + struct davinci_spi_plat *plat = bus->plat; ds->regs = plat->regs; ds->num_cs = plat->num_cs; @@ -393,7 +393,7 @@ static int davinci_spi_probe(struct udevice *bus) #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int davinci_ofdata_to_platadata(struct udevice *bus) { - struct davinci_spi_platdata *plat = bus->plat; + struct davinci_spi_plat *plat = bus->plat; fdt_addr_t addr; addr = dev_read_addr(bus); @@ -420,7 +420,7 @@ U_BOOT_DRIVER(davinci_spi) = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) .of_match = davinci_spi_ids, .of_to_plat = davinci_ofdata_to_platadata, - .plat_auto = sizeof(struct davinci_spi_platdata), + .plat_auto = sizeof(struct davinci_spi_plat), #endif .probe = davinci_spi_probe, .ops = &davinci_spi_ops, diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 5429ac776e..4fa4585fc3 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -88,7 +88,7 @@ #define RX_TIMEOUT 1000 /* timeout in ms */ -struct dw_spi_platdata { +struct dw_spi_plat { s32 frequency; /* Default clock frequency, -1 for none */ void __iomem *regs; }; @@ -155,7 +155,7 @@ static int request_gpio_cs(struct udevice *bus) static int dw_spi_of_to_plat(struct udevice *bus) { - struct dw_spi_platdata *plat = bus->plat; + struct dw_spi_plat *plat = bus->plat; plat->regs = dev_read_addr_ptr(bus); @@ -263,7 +263,7 @@ static int dw_spi_reset(struct udevice *bus) static int dw_spi_probe(struct udevice *bus) { - struct dw_spi_platdata *plat = dev_get_plat(bus); + struct dw_spi_plat *plat = dev_get_plat(bus); struct dw_spi_priv *priv = dev_get_priv(bus); int ret; @@ -478,7 +478,7 @@ static int dw_spi_xfer(struct udevice *dev, unsigned int bitlen, static int dw_spi_set_speed(struct udevice *bus, uint speed) { - struct dw_spi_platdata *plat = bus->plat; + struct dw_spi_plat *plat = bus->plat; struct dw_spi_priv *priv = dev_get_priv(bus); u16 clk_div; @@ -560,7 +560,7 @@ U_BOOT_DRIVER(dw_spi) = { .of_match = dw_spi_ids, .ops = &dw_spi_ops, .of_to_plat = dw_spi_of_to_plat, - .plat_auto = sizeof(struct dw_spi_platdata), + .plat_auto = sizeof(struct dw_spi_plat), .priv_auto = sizeof(struct dw_spi_priv), .probe = dw_spi_probe, .remove = dw_spi_remove, diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 9505d88ff0..e4d2bade0f 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -23,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct exynos_spi_platdata { +struct exynos_spi_plat { enum periph_id periph_id; s32 frequency; /* Default clock frequency, -1 for none */ struct exynos_spi *regs; @@ -213,7 +213,7 @@ static int spi_rx_tx(struct exynos_spi_priv *priv, int todo, static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_plat(bus); + struct exynos_spi_plat *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus); /* If it's too soon to do another transaction, wait */ @@ -239,7 +239,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct exynos_spi_platdata *pdata = dev_get_plat(bus); + struct exynos_spi_plat *pdata = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus); setbits_le32(&priv->regs->cs_reg, SPI_SLAVE_SIG_INACT); @@ -253,7 +253,7 @@ static void spi_cs_deactivate(struct udevice *dev) static int exynos_spi_of_to_plat(struct udevice *bus) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -280,7 +280,7 @@ static int exynos_spi_of_to_plat(struct udevice *bus) static int exynos_spi_probe(struct udevice *bus) { - struct exynos_spi_platdata *plat = dev_get_plat(bus); + struct exynos_spi_plat *plat = dev_get_plat(bus); struct exynos_spi_priv *priv = dev_get_priv(bus); priv->regs = plat->regs; @@ -368,7 +368,7 @@ static int exynos_spi_xfer(struct udevice *dev, unsigned int bitlen, static int exynos_spi_set_speed(struct udevice *bus, uint speed) { - struct exynos_spi_platdata *plat = bus->plat; + struct exynos_spi_plat *plat = bus->plat; struct exynos_spi_priv *priv = dev_get_priv(bus); int ret; @@ -427,7 +427,7 @@ U_BOOT_DRIVER(exynos_spi) = { .of_match = exynos_spi_ids, .ops = &exynos_spi_ops, .of_to_plat = exynos_spi_of_to_plat, - .plat_auto = sizeof(struct exynos_spi_platdata), + .plat_auto = sizeof(struct exynos_spi_plat), .priv_auto = sizeof(struct exynos_spi_priv), .probe = exynos_spi_probe, }; diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index 82aabe79c0..fcaf2baecf 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; -/* fsl_dspi_platdata flags */ +/* fsl_dspi_plat flags */ #define DSPI_FLAG_REGMAP_ENDIAN_BIG BIT(0) /* idle data value */ @@ -65,14 +65,14 @@ DECLARE_GLOBAL_DATA_PTR; DSPI_CTAR_DT(15)) /** - * struct fsl_dspi_platdata - platform data for Freescale DSPI + * struct fsl_dspi_plat - platform data for Freescale DSPI * * @flags: Flags for DSPI DSPI_FLAG_... * @speed_hz: Default SCK frequency * @num_chipselect: Number of DSPI chipselect signals * @regs_addr: Base address of DSPI registers */ -struct fsl_dspi_platdata { +struct fsl_dspi_plat { uint flags; uint speed_hz; uint num_chipselect; @@ -448,7 +448,7 @@ static int fsl_dspi_cfg_speed(struct fsl_dspi_priv *priv, uint speed) static int fsl_dspi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct fsl_dspi_priv *priv = dev_get_priv(dev->parent); u32 cs_sck_delay = 0, sck_cs_delay = 0; unsigned char pcssck = 0, cssck = 0; @@ -481,7 +481,7 @@ static int fsl_dspi_child_pre_probe(struct udevice *dev) static int fsl_dspi_probe(struct udevice *bus) { - struct fsl_dspi_platdata *plat = dev_get_plat(bus); + struct fsl_dspi_plat *plat = dev_get_plat(bus); struct fsl_dspi_priv *priv = dev_get_priv(bus); struct dm_spi_bus *dm_spi_bus; uint mcr_cfg_val; @@ -521,7 +521,7 @@ static int fsl_dspi_claim_bus(struct udevice *dev) uint sr_val; struct fsl_dspi_priv *priv; struct udevice *bus = dev->parent; - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); priv = dev_get_priv(bus); @@ -552,7 +552,7 @@ static int fsl_dspi_release_bus(struct udevice *dev) { struct udevice *bus = dev->parent; struct fsl_dspi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); /* halt module */ @@ -576,7 +576,7 @@ static int fsl_dspi_bind(struct udevice *bus) static int fsl_dspi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; - struct fsl_dspi_platdata *plat = bus->plat; + struct fsl_dspi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -608,7 +608,7 @@ static int fsl_dspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct fsl_dspi_priv *priv; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus; bus = dev->parent; @@ -660,7 +660,7 @@ U_BOOT_DRIVER(fsl_dspi) = { .of_match = fsl_dspi_ids, .ops = &fsl_dspi_ops, .of_to_plat = fsl_dspi_of_to_plat, - .plat_auto = sizeof(struct fsl_dspi_platdata), + .plat_auto = sizeof(struct fsl_dspi_plat), .priv_auto = sizeof(struct fsl_dspi_priv), .probe = fsl_dspi_probe, .child_pre_probe = fsl_dspi_child_pre_probe, diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index 0c40a4a519..8545461ed7 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -508,7 +508,7 @@ static int fsl_espi_set_mode(struct udevice *bus, uint mode) static int fsl_espi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct udevice *bus = dev->parent; struct fsl_spi_slave *fsl = dev_get_priv(bus); @@ -520,7 +520,7 @@ static int fsl_espi_child_pre_probe(struct udevice *dev) static int fsl_espi_probe(struct udevice *bus) { - struct fsl_espi_platdata *plat = dev_get_plat(bus); + struct fsl_espi_plat *plat = dev_get_plat(bus); struct fsl_spi_slave *fsl = dev_get_priv(bus); fsl->espi = (ccsr_espi_t *)((u32)plat->regs_addr); @@ -544,7 +544,7 @@ static const struct dm_spi_ops fsl_espi_ops = { static int fsl_espi_of_to_plat(struct udevice *bus) { fdt_addr_t addr; - struct fsl_espi_platdata *plat = bus->plat; + struct fsl_espi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -576,7 +576,7 @@ U_BOOT_DRIVER(fsl_espi) = { .of_to_plat = fsl_espi_of_to_plat, #endif .ops = &fsl_espi_ops, - .plat_auto = sizeof(struct fsl_espi_platdata), + .plat_auto = sizeof(struct fsl_espi_plat), .priv_auto = sizeof(struct fsl_spi_slave), .probe = fsl_espi_probe, .child_pre_probe = fsl_espi_child_pre_probe, diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 089c2d802d..fc3b844370 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -515,7 +515,7 @@ static void fsl_qspi_invalidate(struct fsl_qspi *q) static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_slave *slave) { - struct dm_spi_slave_platdata *plat = + struct dm_spi_slave_plat *plat = dev_get_parent_plat(slave->dev); if (q->selected == plat->cs) diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 4c01ec86e0..e02850e9f2 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -38,7 +38,7 @@ #define debug_trace(x, args...) #endif -struct ich_spi_platdata { +struct ich_spi_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_intel_fast_spi dtplat; #endif @@ -139,7 +139,7 @@ static bool ich9_can_do_33mhz(struct udevice *dev) return speed == 1; } -static void spi_lock_down(struct ich_spi_platdata *plat, void *sbase) +static void spi_lock_down(struct ich_spi_plat *plat, void *sbase) { if (plat->ich_version == ICHV_7) { struct ich7_spi_regs *ich7_spi = sbase; @@ -152,7 +152,7 @@ static void spi_lock_down(struct ich_spi_platdata *plat, void *sbase) } } -static bool spi_lock_status(struct ich_spi_platdata *plat, void *sbase) +static bool spi_lock_status(struct ich_spi_plat *plat, void *sbase) { int lock = 0; @@ -264,7 +264,7 @@ static int ich_spi_exec_op_swseq(struct spi_slave *slave, const struct spi_mem_op *op) { struct udevice *bus = dev_get_parent(slave->dev); - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus); struct ich_spi_priv *ctlr = dev_get_priv(bus); uint16_t control; int16_t opcode_index; @@ -602,7 +602,7 @@ static int ich_spi_exec_op_hwseq(struct spi_slave *slave, static int ich_spi_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) { struct udevice *bus = dev_get_parent(slave->dev); - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus); int ret; bootstage_start(BOOTSTAGE_ID_ACCUM_SPI, "fast_spi"); @@ -685,7 +685,7 @@ static int ich_get_mmap_bus(struct udevice *bus, ulong *map_basep, pci_dev_t spi_bdf; #if !CONFIG_IS_ENABLED(OF_PLATDATA) if (device_is_on_pci_bus(bus)) { - struct pci_child_platdata *pplat; + struct pci_child_plat *pplat; pplat = dev_get_parent_plat(bus); spi_bdf = pplat->devfn; @@ -706,7 +706,7 @@ static int ich_get_mmap_bus(struct udevice *bus, ulong *map_basep, offsetp); } #else - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus); /* * We cannot rely on plat->bdf being set up yet since this method can @@ -758,7 +758,7 @@ static int ich_spi_adjust_size(struct spi_slave *slave, struct spi_mem_op *op) static int ich_protect_lockdown(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev); struct ich_spi_priv *priv = dev_get_priv(dev); int ret = -ENOSYS; @@ -788,11 +788,11 @@ static int ich_protect_lockdown(struct udevice *dev) } static int ich_init_controller(struct udevice *dev, - struct ich_spi_platdata *plat, + struct ich_spi_plat *plat, struct ich_spi_priv *ctlr) { if (spl_phase() == PHASE_TPL) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev); int ret; ret = fast_spi_early_init(plat->bdf, plat->mmio_base); @@ -871,7 +871,7 @@ static int ich_cache_bios_region(struct udevice *dev) static int ich_spi_probe(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev); struct ich_spi_priv *priv = dev_get_priv(dev); int ret; @@ -924,7 +924,7 @@ static int ich_spi_set_mode(struct udevice *bus, uint mode) static int ich_spi_child_pre_probe(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct ich_spi_platdata *plat = dev_get_plat(bus); + struct ich_spi_plat *plat = dev_get_plat(bus); struct ich_spi_priv *priv = dev_get_priv(bus); struct spi_slave *slave = dev_get_parent_priv(dev); @@ -947,7 +947,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev) static int ich_spi_of_to_plat(struct udevice *dev) { - struct ich_spi_platdata *plat = dev_get_plat(dev); + struct ich_spi_plat *plat = dev_get_plat(dev); #if !CONFIG_IS_ENABLED(OF_PLATDATA) struct ich_spi_priv *priv = dev_get_priv(dev); @@ -1005,7 +1005,7 @@ U_BOOT_DRIVER(intel_fast_spi) = { .of_match = ich_spi_ids, .ops = &ich_spi_ops, .of_to_plat = ich_spi_of_to_plat, - .plat_auto = sizeof(struct ich_spi_platdata), + .plat_auto = sizeof(struct ich_spi_plat), .priv_auto = sizeof(struct ich_spi_priv), .child_pre_probe = ich_spi_child_pre_probe, .probe = ich_spi_probe, diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index 669a44ce08..43812da0eb 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -23,7 +23,7 @@ struct mvebu_spi_dev { bool is_errata_50mhz_ac; }; -struct mvebu_spi_platdata { +struct mvebu_spi_plat { struct kwspi_registers *spireg; bool is_errata_50mhz_ac; }; @@ -109,7 +109,7 @@ static int _spi_xfer(struct kwspi_registers *reg, unsigned int bitlen, static int mvebu_spi_set_speed(struct udevice *bus, uint hz) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data; @@ -127,7 +127,7 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz) static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data; @@ -160,7 +160,7 @@ static void mvebu_spi_50mhz_ac_timing_erratum(struct udevice *bus, uint mode) static int mvebu_spi_set_mode(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; u32 data = readl(®->cfg); @@ -185,7 +185,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); return _spi_xfer(plat->spireg, bitlen, dout, din, flags); } @@ -198,7 +198,7 @@ __attribute__((weak)) int mvebu_board_spi_claim_bus(struct udevice *dev) static int mvebu_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); /* Configure the chip-select in the CTRL register */ clrsetbits_le32(&plat->spireg->ctrl, @@ -220,7 +220,7 @@ static int mvebu_spi_release_bus(struct udevice *dev) static int mvebu_spi_probe(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct kwspi_registers *reg = plat->spireg; writel(KWSPI_SMEMRDY, ®->ctrl); @@ -232,7 +232,7 @@ static int mvebu_spi_probe(struct udevice *bus) static int mvebu_spi_of_to_plat(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); const struct mvebu_spi_dev *drvdata = (struct mvebu_spi_dev *)dev_get_driver_data(bus); @@ -296,7 +296,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .of_to_plat = mvebu_spi_of_to_plat, - .plat_auto = sizeof(struct mvebu_spi_platdata), + .plat_auto = sizeof(struct mvebu_spi_plat), .priv_auto = sizeof(struct mvebu_spi_priv), .probe = mvebu_spi_probe, }; diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 02f8219ca1..6869d60d97 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -107,7 +107,7 @@ static int mpc8xxx_spi_probe(struct udevice *dev) static void mpc8xxx_spi_cs_activate(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); dm_gpio_set_value(&priv->gpios[plat->cs], 1); } @@ -115,7 +115,7 @@ static void mpc8xxx_spi_cs_activate(struct udevice *dev) static void mpc8xxx_spi_cs_deactivate(struct udevice *dev) { struct mpc8xxx_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); dm_gpio_set_value(&priv->gpios[plat->cs], 0); } @@ -126,7 +126,7 @@ static int mpc8xxx_spi_xfer(struct udevice *dev, uint bitlen, struct udevice *bus = dev->parent; struct mpc8xxx_priv *priv = dev_get_priv(bus); spi8xxx_t *spi = priv->spi; - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); u32 tmpdin = 0, tmpdout = 0, n; const u8 *cout = dout; u8 *cin = din; diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c index e5de49a013..2a01ea061f 100644 --- a/drivers/spi/mscc_bb_spi.c +++ b/drivers/spi/mscc_bb_spi.c @@ -117,7 +117,7 @@ int mscc_bb_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); struct mscc_bb_priv *priv = dev_get_priv(bus); u32 i, count; const u8 *txd = dout; diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index 32a26d4041..c40d7d17be 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -38,13 +38,13 @@ struct spi_reg { u32 din; /* 0x1060c */ }; -struct mvebu_spi_platdata { +struct mvebu_spi_plat { struct spi_reg *spireg; struct clk clk; struct gpio_desc cs_gpios[MAX_CS_COUNT]; }; -static void spi_cs_activate(struct mvebu_spi_platdata *plat, int cs) +static void spi_cs_activate(struct mvebu_spi_plat *plat, int cs) { if (CONFIG_IS_ENABLED(DM_GPIO) && dm_gpio_is_valid(&plat->cs_gpios[cs])) dm_gpio_set_value(&plat->cs_gpios[cs], 1); @@ -52,7 +52,7 @@ static void spi_cs_activate(struct mvebu_spi_platdata *plat, int cs) setbits_le32(&plat->spireg->ctrl, MVEBU_SPI_A3700_SPI_EN_0 << cs); } -static void spi_cs_deactivate(struct mvebu_spi_platdata *plat, int cs) +static void spi_cs_deactivate(struct mvebu_spi_plat *plat, int cs) { if (CONFIG_IS_ENABLED(DM_GPIO) && dm_gpio_is_valid(&plat->cs_gpios[cs])) dm_gpio_set_value(&plat->cs_gpios[cs], 0); @@ -146,7 +146,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev->parent; - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; unsigned int bytelen; int ret; @@ -186,7 +186,7 @@ static int mvebu_spi_xfer(struct udevice *dev, unsigned int bitlen, static int mvebu_spi_set_speed(struct udevice *bus, uint hz) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; u32 data, prescale; @@ -207,7 +207,7 @@ static int mvebu_spi_set_speed(struct udevice *bus, uint hz) static int mvebu_spi_set_mode(struct udevice *bus, uint mode) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; /* @@ -229,7 +229,7 @@ static int mvebu_spi_set_mode(struct udevice *bus, uint mode) static int mvebu_spi_probe(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); struct spi_reg *reg = plat->spireg; u32 data; int ret; @@ -281,7 +281,7 @@ static int mvebu_spi_probe(struct udevice *bus) static int mvebu_spi_of_to_plat(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); int ret; plat->spireg = dev_read_addr_ptr(bus); @@ -297,7 +297,7 @@ static int mvebu_spi_of_to_plat(struct udevice *bus) static int mvebu_spi_remove(struct udevice *bus) { - struct mvebu_spi_platdata *plat = dev_get_plat(bus); + struct mvebu_spi_plat *plat = dev_get_plat(bus); clk_free(&plat->clk); @@ -325,7 +325,7 @@ U_BOOT_DRIVER(mvebu_spi) = { .of_match = mvebu_spi_ids, .ops = &mvebu_spi_ops, .of_to_plat = mvebu_spi_of_to_plat, - .plat_auto = sizeof(struct mvebu_spi_platdata), + .plat_auto = sizeof(struct mvebu_spi_plat), .probe = mvebu_spi_probe, .remove = mvebu_spi_remove, }; diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index af476c8c99..c5ffad80fb 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -69,7 +69,7 @@ static void mxc_spi_cs_activate(struct mxc_spi_slave *mxcs) { #if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev = mxcs->dev; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs; @@ -87,7 +87,7 @@ static void mxc_spi_cs_deactivate(struct mxc_spi_slave *mxcs) { #if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev = mxcs->dev; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs; @@ -559,7 +559,7 @@ static int mxc_spi_xfer(struct udevice *dev, unsigned int bitlen, static int mxc_spi_claim_bus(struct udevice *dev) { struct mxc_spi_slave *mxcs = dev_get_plat(dev->parent); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); mxcs->dev = dev; diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 0973d511f1..4fafe33af5 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -41,7 +41,7 @@ #define MXS_SSP_IMX23_CLKID_SSP0 33 #define MXS_SSP_IMX28_CLKID_SSP0 46 -struct mxs_spi_platdata { +struct mxs_spi_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_fsl_imx23_spi dtplat; #endif @@ -311,7 +311,7 @@ int mxs_spi_xfer(struct udevice *dev, unsigned int bitlen, static int mxs_spi_probe(struct udevice *bus) { - struct mxs_spi_platdata *plat = dev_get_plat(bus); + struct mxs_spi_plat *plat = dev_get_plat(bus); struct mxs_spi_priv *priv = dev_get_priv(bus); int ret; @@ -443,7 +443,7 @@ static const struct dm_spi_ops mxs_spi_ops = { #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) static int mxs_of_to_plat(struct udevice *bus) { - struct mxs_spi_platdata *plat = bus->plat; + struct mxs_spi_plat *plat = bus->plat; u32 prop[2]; int ret; @@ -487,7 +487,7 @@ U_BOOT_DRIVER(fsl_imx23_spi) = { .of_match = mxs_spi_ids, .of_to_plat = mxs_of_to_plat, #endif - .plat_auto = sizeof(struct mxs_spi_platdata), + .plat_auto = sizeof(struct mxs_spi_plat), .ops = &mxs_spi_ops, .priv_auto = sizeof(struct mxs_spi_priv), .probe = mxs_spi_probe, diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 04a296a5ba..006dd04b9e 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -887,7 +887,7 @@ static int nxp_fspi_claim_bus(struct udevice *dev) { struct nxp_fspi *f; struct udevice *bus; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); bus = dev->parent; f = dev_get_priv(bus); diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c index 6466329326..6e02a99c9b 100644 --- a/drivers/spi/octeon_spi.c +++ b/drivers/spi/octeon_spi.c @@ -81,7 +81,7 @@ struct octeon_spi { static u64 octeon_spi_set_mpicfg(struct udevice *dev) { - struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); struct udevice *bus = dev_get_parent(dev); struct octeon_spi *priv = dev_get_priv(bus); u64 mpi_cfg; diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 0594a9c14a..78e2a25cdb 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -378,7 +378,7 @@ static int omap3_spi_claim_bus(struct udevice *dev) { struct udevice *bus = dev->parent; struct omap3_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); priv->cs = slave_plat->cs; priv->freq = slave_plat->max_hz; @@ -402,7 +402,7 @@ static int omap3_spi_set_wordlen(struct udevice *dev, unsigned int wordlen) { struct udevice *bus = dev->parent; struct omap3_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); priv->cs = slave_plat->cs; priv->wordlen = wordlen; diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c index 463c13c5bd..cd83c11304 100644 --- a/drivers/spi/pic32_spi.c +++ b/drivers/spi/pic32_spi.c @@ -236,7 +236,7 @@ static int pic32_spi_xfer(struct udevice *slave, unsigned int bitlen, const void *tx_buf, void *rx_buf, unsigned long flags) { - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct udevice *bus = slave->parent; struct pic32_spi_priv *priv; int len = bitlen / 8; diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 7a030b1141..105765168e 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -156,7 +156,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct rpc_spi_platdata { +struct rpc_spi_plat { fdt_addr_t regs; fdt_addr_t extr; s32 freq; /* Default clock freq, -1 for none */ @@ -406,7 +406,7 @@ static int rpc_spi_bind(struct udevice *parent) static int rpc_spi_probe(struct udevice *dev) { - struct rpc_spi_platdata *plat = dev_get_plat(dev); + struct rpc_spi_plat *plat = dev_get_plat(dev); struct rpc_spi_priv *priv = dev_get_priv(dev); priv->regs = plat->regs; @@ -419,7 +419,7 @@ static int rpc_spi_probe(struct udevice *dev) static int rpc_spi_of_to_plat(struct udevice *bus) { - struct rpc_spi_platdata *plat = dev_get_plat(bus); + struct rpc_spi_plat *plat = dev_get_plat(bus); plat->regs = dev_read_addr_index(bus, 0); plat->extr = dev_read_addr_index(bus, 1); @@ -464,7 +464,7 @@ U_BOOT_DRIVER(rpc_spi) = { .of_match = rpc_spi_ids, .ops = &rpc_spi_ops, .of_to_plat = rpc_spi_of_to_plat, - .plat_auto = sizeof(struct rpc_spi_platdata), + .plat_auto = sizeof(struct rpc_spi_plat), .priv_auto = sizeof(struct rpc_spi_priv), .bind = rpc_spi_bind, .probe = rpc_spi_probe, diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index 3a97fb5a83..64bb257ae7 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -40,7 +40,7 @@ struct rockchip_spi_params { bool master_manages_fifo; }; -struct rockchip_spi_platdata { +struct rockchip_spi_plat { #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_rockchip_rk3288_spi of_plat; #endif @@ -135,7 +135,7 @@ static int rkspi_wait_till_not_busy(struct rockchip_spi *regs) static void spi_cs_activate(struct udevice *dev, uint cs) { struct udevice *bus = dev->parent; - struct rockchip_spi_platdata *plat = bus->plat; + struct rockchip_spi_plat *plat = bus->plat; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs; @@ -161,7 +161,7 @@ static void spi_cs_activate(struct udevice *dev, uint cs) static void spi_cs_deactivate(struct udevice *dev, uint cs) { struct udevice *bus = dev->parent; - struct rockchip_spi_platdata *plat = bus->plat; + struct rockchip_spi_plat *plat = bus->plat; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs; @@ -174,9 +174,9 @@ static void spi_cs_deactivate(struct udevice *dev, uint cs) } #if CONFIG_IS_ENABLED(OF_PLATDATA) -static int conv_of_platdata(struct udevice *dev) +static int conv_of_plat(struct udevice *dev) { - struct rockchip_spi_platdata *plat = dev->plat; + struct rockchip_spi_plat *plat = dev->plat; struct dtd_rockchip_rk3288_spi *dtplat = &plat->of_plat; struct rockchip_spi_priv *priv = dev_get_priv(dev); int ret; @@ -195,7 +195,7 @@ static int conv_of_platdata(struct udevice *dev) static int rockchip_spi_of_to_plat(struct udevice *bus) { #if !CONFIG_IS_ENABLED(OF_PLATDATA) - struct rockchip_spi_platdata *plat = dev_get_plat(bus); + struct rockchip_spi_plat *plat = dev_get_plat(bus); struct rockchip_spi_priv *priv = dev_get_priv(bus); int ret; @@ -253,13 +253,13 @@ static int rockchip_spi_calc_modclk(ulong max_freq) static int rockchip_spi_probe(struct udevice *bus) { - struct rockchip_spi_platdata *plat = dev_get_plat(bus); + struct rockchip_spi_plat *plat = dev_get_plat(bus); struct rockchip_spi_priv *priv = dev_get_priv(bus); int ret; debug("%s: probe\n", __func__); #if CONFIG_IS_ENABLED(OF_PLATDATA) - ret = conv_of_platdata(bus); + ret = conv_of_plat(bus); if (ret) return ret; #endif @@ -432,7 +432,7 @@ static int rockchip_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct rockchip_spi_priv *priv = dev_get_priv(bus); struct rockchip_spi *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); int len = bitlen >> 3; const u8 *out = dout; u8 *in = din; @@ -561,7 +561,7 @@ U_BOOT_DRIVER(rockchip_rk3288_spi) = { .of_match = rockchip_spi_ids, .ops = &rockchip_spi_ops, .of_to_plat = rockchip_spi_of_to_plat, - .plat_auto = sizeof(struct rockchip_spi_platdata), + .plat_auto = sizeof(struct rockchip_spi_plat), .priv_auto = sizeof(struct rockchip_spi_priv), .probe = rockchip_spi_probe, }; diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index d4a886ad40..afc98bfb66 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct soft_spi_platdata { +struct soft_spi_plat { struct gpio_desc cs; struct gpio_desc sclk; struct gpio_desc mosi; @@ -41,7 +41,7 @@ struct soft_spi_priv { static int soft_spi_scl(struct udevice *dev, int bit) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus); dm_gpio_set_value(&plat->sclk, bit); @@ -51,7 +51,7 @@ static int soft_spi_scl(struct udevice *dev, int bit) static int soft_spi_sda(struct udevice *dev, int bit) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus); dm_gpio_set_value(&plat->mosi, bit); @@ -62,7 +62,7 @@ static int soft_spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); struct soft_spi_priv *priv = dev_get_priv(bus); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus); int cidle = !!(priv->mode & SPI_CPOL); dm_gpio_set_value(&plat->cs, 0); @@ -75,7 +75,7 @@ static int soft_spi_cs_activate(struct udevice *dev) static int soft_spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev_get_parent(dev); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus); dm_gpio_set_value(&plat->cs, 0); @@ -117,7 +117,7 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev_get_parent(dev); struct soft_spi_priv *priv = dev_get_priv(bus); - struct soft_spi_platdata *plat = dev_get_plat(bus); + struct soft_spi_plat *plat = dev_get_plat(bus); uchar tmpdin = 0; uchar tmpdout = 0; const u8 *txd = dout; @@ -228,7 +228,7 @@ static const struct dm_spi_ops soft_spi_ops = { static int soft_spi_of_to_plat(struct udevice *dev) { - struct soft_spi_platdata *plat = dev->plat; + struct soft_spi_plat *plat = dev->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); @@ -240,7 +240,7 @@ static int soft_spi_of_to_plat(struct udevice *dev) static int soft_spi_probe(struct udevice *dev) { struct spi_slave *slave = dev_get_parent_priv(dev); - struct soft_spi_platdata *plat = dev->plat; + struct soft_spi_plat *plat = dev->plat; int cs_flags, clk_flags; int ret; @@ -281,7 +281,7 @@ U_BOOT_DRIVER(soft_spi) = { .of_match = soft_spi_ids, .ops = &soft_spi_ops, .of_to_plat = soft_spi_of_to_plat, - .plat_auto = sizeof(struct soft_spi_platdata), + .plat_auto = sizeof(struct soft_spi_plat), .priv_auto = sizeof(struct soft_spi_priv), .probe = soft_spi_probe, }; diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index a549b66639..cdea5405f6 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -701,7 +701,7 @@ static int qup_spi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(dev); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); unsigned int len; const u8 *txp = dout; u8 *rxp = din; diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index 81cdfc0e10..0a00df0ac7 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -105,7 +105,7 @@ struct sifive_spi { }; static void sifive_spi_prep_device(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave_plat) + struct dm_spi_slave_plat *slave_plat) { /* Update the chip select polarity */ if (slave_plat->mode & SPI_CS_HIGH) @@ -119,7 +119,7 @@ static void sifive_spi_prep_device(struct sifive_spi *spi, } static int sifive_spi_set_cs(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave_plat) + struct dm_spi_slave_plat *slave_plat) { u32 cs_mode = SIFIVE_SPI_CSMODE_MODE_HOLD; @@ -137,7 +137,7 @@ static void sifive_spi_clear_cs(struct sifive_spi *spi) } static void sifive_spi_prep_transfer(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave_plat, + struct dm_spi_slave_plat *slave_plat, u8 *rx_ptr) { u32 cr; @@ -212,7 +212,7 @@ static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct sifive_spi *spi = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); const u8 *tx_ptr = dout; u8 *rx_ptr = din; u32 remaining_len; diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index 00703f921d..1145380078 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -122,7 +122,7 @@ struct sun4i_spi_variant { bool has_burst_ctl; }; -struct sun4i_spi_platdata { +struct sun4i_spi_plat { struct sun4i_spi_variant *variant; u32 base; u32 max_hz; @@ -339,7 +339,7 @@ static int sun4i_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct sun4i_spi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 len = bitlen / 8; u32 rx_fifocnt; @@ -407,7 +407,7 @@ static int sun4i_spi_xfer(struct udevice *dev, unsigned int bitlen, static int sun4i_spi_set_speed(struct udevice *dev, uint speed) { - struct sun4i_spi_platdata *plat = dev_get_plat(dev); + struct sun4i_spi_plat *plat = dev_get_plat(dev); struct sun4i_spi_priv *priv = dev_get_priv(dev); unsigned int div; u32 reg; @@ -483,7 +483,7 @@ static const struct dm_spi_ops sun4i_spi_ops = { static int sun4i_spi_probe(struct udevice *bus) { - struct sun4i_spi_platdata *plat = dev_get_plat(bus); + struct sun4i_spi_plat *plat = dev_get_plat(bus); struct sun4i_spi_priv *priv = dev_get_priv(bus); int ret; @@ -516,7 +516,7 @@ static int sun4i_spi_probe(struct udevice *bus) static int sun4i_spi_of_to_plat(struct udevice *bus) { - struct sun4i_spi_platdata *plat = dev_get_plat(bus); + struct sun4i_spi_plat *plat = dev_get_plat(bus); int node = dev_of_offset(bus); plat->base = dev_read_addr(bus); @@ -631,7 +631,7 @@ U_BOOT_DRIVER(sun4i_spi) = { .of_match = sun4i_spi_ids, .ops = &sun4i_spi_ops, .of_to_plat = sun4i_spi_of_to_plat, - .plat_auto = sizeof(struct sun4i_spi_platdata), + .plat_auto = sizeof(struct sun4i_spi_plat), .priv_auto = sizeof(struct sun4i_spi_priv), .probe = sun4i_spi_probe, }; diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 0bba37779c..9dd32ab333 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -153,7 +153,7 @@ int spi_write_then_read(struct spi_slave *slave, const u8 *opcode, #if !CONFIG_IS_ENABLED(OF_PLATDATA) static int spi_child_post_bind(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); if (!dev_of_valid(dev)) return 0; @@ -197,7 +197,7 @@ static int spi_post_probe(struct udevice *bus) static int spi_child_pre_probe(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); struct spi_slave *slave = dev_get_parent_priv(dev); /* @@ -218,7 +218,7 @@ static int spi_child_pre_probe(struct udevice *dev) int spi_chip_select(struct udevice *dev) { - struct dm_spi_slave_platdata *plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); return plat ? plat->cs : -ENOENT; } @@ -254,7 +254,7 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp) for (device_find_first_child(bus, &dev); dev; device_find_next_child(&dev)) { - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat; plat = dev_get_parent_plat(dev); debug("%s: plat=%p, cs=%d\n", __func__, plat, plat->cs); @@ -323,7 +323,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, struct udevice **busp, struct spi_slave **devp) { struct udevice *bus, *dev; - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat; struct spi_slave *slave; bool created = false; int ret; @@ -431,8 +431,7 @@ void spi_free_slave(struct spi_slave *slave) slave->dev = NULL; } -int spi_slave_of_to_plat(struct udevice *dev, - struct dm_spi_slave_platdata *plat) +int spi_slave_of_to_plat(struct udevice *dev, struct dm_spi_slave_plat *plat) { int mode = 0; int value; @@ -504,7 +503,7 @@ UCLASS_DRIVER(spi) = { .child_pre_probe = spi_child_pre_probe, .per_device_auto = sizeof(struct dm_spi_bus), .per_child_auto = sizeof(struct spi_slave), - .per_child_plat_auto = sizeof(struct dm_spi_slave_platdata), + .per_child_plat_auto = sizeof(struct dm_spi_slave_plat), #if !CONFIG_IS_ENABLED(OF_PLATDATA) .child_post_bind = spi_child_post_bind, #endif diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index 4d67e9ba46..440085720a 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -400,7 +400,7 @@ static int stm32_qspi_probe(struct udevice *bus) static int stm32_qspi_claim_bus(struct udevice *dev) { struct stm32_qspi_priv *priv = dev_get_priv(dev->parent); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); int slave_cs = slave_plat->cs; if (slave_cs >= STM32_QSPI_MAX_CHIP) diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c index d2c2262dc7..720103d517 100644 --- a/drivers/spi/stm32_spi.c +++ b/drivers/spi/stm32_spi.c @@ -362,7 +362,7 @@ static int stm32_spi_xfer(struct udevice *slave, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct udevice *bus = dev_get_parent(slave); - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct stm32_spi_priv *priv = dev_get_priv(bus); u32 sr; u32 ifcr = 0; diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index 0798db7224..2bfa2624e1 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -99,7 +99,7 @@ struct tegra114_spi_priv { static int tegra114_spi_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; plat->base = dev_read_addr(bus); plat->periph_id = clock_decode_periph_id(bus); @@ -124,7 +124,7 @@ static int tegra114_spi_of_to_plat(struct udevice *bus) static int tegra114_spi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus); struct spi_regs *regs; ulong rate; @@ -181,7 +181,7 @@ static int tegra114_spi_probe(struct udevice *bus) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus); /* If it's too soon to do another transaction, wait */ @@ -205,7 +205,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus); setbits_le32(&priv->regs->command1, SPI_CMD1_CS_SW_VAL); @@ -352,7 +352,7 @@ static int tegra114_spi_xfer(struct udevice *dev, unsigned int bitlen, static int tegra114_spi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra114_spi_priv *priv = dev_get_priv(bus); if (speed > plat->frequency) @@ -394,7 +394,7 @@ U_BOOT_DRIVER(tegra114_spi) = { .of_match = tegra114_spi_ids, .ops = &tegra114_spi_ops, .of_to_plat = tegra114_spi_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra114_spi_priv), .probe = tegra114_spi_probe, }; diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index d27f67932a..ad19a4efbb 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -89,7 +89,7 @@ int tegra20_sflash_cs_info(struct udevice *bus, unsigned int cs, static int tegra20_sflash_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -116,7 +116,7 @@ static int tegra20_sflash_of_to_plat(struct udevice *bus) static int tegra20_sflash_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus); priv->regs = (struct spi_regs *)plat->base; @@ -173,7 +173,7 @@ static int tegra20_sflash_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus); /* If it's too soon to do another transaction, wait */ @@ -192,7 +192,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus); /* CS is negated on Tegra, so drive a 0 to get a 1 */ @@ -314,7 +314,7 @@ static int tegra20_sflash_xfer(struct udevice *dev, unsigned int bitlen, static int tegra20_sflash_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra20_sflash_priv *priv = dev_get_priv(bus); if (speed > plat->frequency) @@ -354,7 +354,7 @@ U_BOOT_DRIVER(tegra20_sflash) = { .of_match = tegra20_sflash_ids, .ops = &tegra20_sflash_ops, .of_to_plat = tegra20_sflash_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra20_sflash_priv), .probe = tegra20_sflash_probe, }; diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index 1a26e5c045..57994d24de 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -95,7 +95,7 @@ struct tegra_spi_slave { static int tegra30_spi_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -122,7 +122,7 @@ static int tegra30_spi_of_to_plat(struct udevice *bus) static int tegra30_spi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus); priv->regs = (struct spi_regs *)plat->base; @@ -167,7 +167,7 @@ static int tegra30_spi_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus); /* If it's too soon to do another transaction, wait */ @@ -186,7 +186,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus); /* CS is negated on Tegra, so drive a 0 to get a 1 */ @@ -314,7 +314,7 @@ static int tegra30_spi_xfer(struct udevice *dev, unsigned int bitlen, static int tegra30_spi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra30_spi_priv *priv = dev_get_priv(bus); if (speed > plat->frequency) @@ -373,7 +373,7 @@ U_BOOT_DRIVER(tegra30_spi) = { .of_match = tegra30_spi_ids, .ops = &tegra30_spi_ops, .of_to_plat = tegra30_spi_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra30_spi_priv), .probe = tegra30_spi_probe, }; diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 99a5319509..2baa2ce0e9 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -99,7 +99,7 @@ struct tegra210_qspi_priv { static int tegra210_qspi_of_to_plat(struct udevice *bus) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; plat->base = dev_read_addr(bus); plat->periph_id = clock_decode_periph_id(bus); @@ -125,7 +125,7 @@ static int tegra210_qspi_of_to_plat(struct udevice *bus) static int tegra210_qspi_probe(struct udevice *bus) { - struct tegra_spi_platdata *plat = dev_get_plat(bus); + struct tegra_spi_plat *plat = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus); priv->regs = (struct qspi_regs *)plat->base; @@ -174,7 +174,7 @@ static int tegra210_qspi_claim_bus(struct udevice *dev) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus); /* If it's too soon to do another transaction, wait */ @@ -198,7 +198,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct tegra_spi_platdata *pdata = dev_get_plat(bus); + struct tegra_spi_plat *pdata = dev_get_plat(bus); struct tegra210_qspi_priv *priv = dev_get_priv(bus); setbits_le32(&priv->regs->command1, QSPI_CMD1_CS_SW_VAL); @@ -380,7 +380,7 @@ static int tegra210_qspi_xfer(struct udevice *dev, unsigned int bitlen, static int tegra210_qspi_set_speed(struct udevice *bus, uint speed) { - struct tegra_spi_platdata *plat = bus->plat; + struct tegra_spi_plat *plat = bus->plat; struct tegra210_qspi_priv *priv = dev_get_priv(bus); if (speed > plat->frequency) @@ -423,7 +423,7 @@ U_BOOT_DRIVER(tegra210_qspi) = { .of_match = tegra210_qspi_ids, .ops = &tegra210_qspi_ops, .of_to_plat = tegra210_qspi_of_to_plat, - .plat_auto = sizeof(struct tegra_spi_platdata), + .plat_auto = sizeof(struct tegra_spi_plat), .priv_auto = sizeof(struct tegra210_qspi_priv), .per_child_auto = sizeof(struct spi_slave), .probe = tegra210_qspi_probe, diff --git a/drivers/spi/tegra_spi.h b/drivers/spi/tegra_spi.h index e997d668cd..ab69ea42e0 100644 --- a/drivers/spi/tegra_spi.h +++ b/drivers/spi/tegra_spi.h @@ -3,7 +3,7 @@ * (C) Copyright 2014 Google, Inc */ -struct tegra_spi_platdata { +struct tegra_spi_plat { enum periph_id periph_id; int frequency; /* Default clock frequency, -1 for none */ ulong base; diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index f1511c0803..7c3b1f7b88 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -154,7 +154,7 @@ static void ti_qspi_ctrl_mode_mmap(void *ctrl_mod_mmap, int cs, bool enable) static int ti_qspi_xfer(struct udevice *dev, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct dm_spi_slave_platdata *slave = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus; uint words = bitlen >> 3; /* fixed 8-bit word length */ @@ -323,7 +323,7 @@ static int ti_qspi_set_mode(struct udevice *bus, uint mode) static int ti_qspi_exec_mem_op(struct spi_slave *slave, const struct spi_mem_op *op) { - struct dm_spi_slave_platdata *slave_plat; + struct dm_spi_slave_plat *slave_plat; struct ti_qspi_priv *priv; struct udevice *bus; u32 from = 0; @@ -355,7 +355,7 @@ static int ti_qspi_exec_mem_op(struct spi_slave *slave, static int ti_qspi_claim_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus; @@ -384,7 +384,7 @@ static int ti_qspi_claim_bus(struct udevice *dev) static int ti_qspi_release_bus(struct udevice *dev) { - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); struct ti_qspi_priv *priv; struct udevice *bus; diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index b6083e6ffc..48b8430d3d 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -68,7 +68,7 @@ DECLARE_GLOBAL_DATA_PTR; #define SSI_CLK 50000000 /* internal I/O clock: 50MHz */ -struct uniphier_spi_platdata { +struct uniphier_spi_plat { void __iomem *base; u32 frequency; /* input frequency */ u32 speed_hz; @@ -113,7 +113,7 @@ static void uniphier_spi_regdump(struct uniphier_spi_priv *priv) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); ulong delay_us; /* The delay completed so far */ u32 val; @@ -139,7 +139,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); u32 val; @@ -279,7 +279,7 @@ static int uniphier_spi_xfer(struct udevice *dev, unsigned int bitlen, static int uniphier_spi_set_speed(struct udevice *bus, uint speed) { - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; struct uniphier_spi_priv *priv = dev_get_priv(bus); u32 val, ckdiv; @@ -364,7 +364,7 @@ static int uniphier_spi_set_mode(struct udevice *bus, uint mode) static int uniphier_spi_of_to_plat(struct udevice *bus) { - struct uniphier_spi_platdata *plat = bus->plat; + struct uniphier_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -383,7 +383,7 @@ static int uniphier_spi_of_to_plat(struct udevice *bus) static int uniphier_spi_probe(struct udevice *bus) { - struct uniphier_spi_platdata *plat = dev_get_plat(bus); + struct uniphier_spi_plat *plat = dev_get_plat(bus); struct uniphier_spi_priv *priv = dev_get_priv(bus); priv->base = plat->base; @@ -412,7 +412,7 @@ U_BOOT_DRIVER(uniphier_spi) = { .of_match = uniphier_spi_ids, .ops = &uniphier_spi_ops, .of_to_plat = uniphier_spi_of_to_plat, - .plat_auto = sizeof(struct uniphier_spi_platdata), + .plat_auto = sizeof(struct uniphier_spi_plat), .priv_auto = sizeof(struct uniphier_spi_priv), .probe = uniphier_spi_probe, }; diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 7e0939c4a0..b32cdac5c3 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -211,7 +211,7 @@ static void xilinx_spi_startup_block(struct udevice *dev, unsigned int bytes, struct udevice *bus = dev_get_parent(dev); struct xilinx_spi_priv *priv = dev_get_priv(bus); struct xilinx_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); const unsigned char *txp = dout; unsigned char *rxp = din; u32 reg; @@ -244,7 +244,7 @@ static int xilinx_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev_get_parent(dev); struct xilinx_spi_priv *priv = dev_get_priv(bus); struct xilinx_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); /* assume spi core configured to do 8 bit transfers */ unsigned int bytes = bitlen / XILSPI_MAX_XFER_BITS; const unsigned char *txp = dout; diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index 7da7903fa6..c2ae4e935e 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -76,7 +76,7 @@ struct zynq_qspi_regs { }; /* zynq qspi platform data */ -struct zynq_qspi_platdata { +struct zynq_qspi_plat { struct zynq_qspi_regs *regs; u32 frequency; /* input frequency */ u32 speed_hz; @@ -100,7 +100,7 @@ struct zynq_qspi_priv { static int zynq_qspi_of_to_plat(struct udevice *bus) { - struct zynq_qspi_platdata *plat = bus->plat; + struct zynq_qspi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -171,7 +171,7 @@ static void zynq_qspi_init_hw(struct zynq_qspi_priv *priv) static int zynq_qspi_probe(struct udevice *bus) { - struct zynq_qspi_platdata *plat = dev_get_plat(bus); + struct zynq_qspi_plat *plat = dev_get_plat(bus); struct zynq_qspi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; @@ -560,7 +560,7 @@ static int zynq_qspi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct zynq_qspi_priv *priv = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); priv->cs = slave_plat->cs; priv->tx_buf = dout; @@ -592,7 +592,7 @@ static int zynq_qspi_xfer(struct udevice *dev, unsigned int bitlen, static int zynq_qspi_set_speed(struct udevice *bus, uint speed) { - struct zynq_qspi_platdata *plat = bus->plat; + struct zynq_qspi_plat *plat = bus->plat; struct zynq_qspi_priv *priv = dev_get_priv(bus); struct zynq_qspi_regs *regs = priv->regs; uint32_t confr; @@ -667,7 +667,7 @@ U_BOOT_DRIVER(zynq_qspi) = { .of_match = zynq_qspi_ids, .ops = &zynq_qspi_ops, .of_to_plat = zynq_qspi_of_to_plat, - .plat_auto = sizeof(struct zynq_qspi_platdata), + .plat_auto = sizeof(struct zynq_qspi_plat), .priv_auto = sizeof(struct zynq_qspi_priv), .probe = zynq_qspi_probe, }; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index 285b006f6a..281db4541f 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -55,7 +55,7 @@ struct zynq_spi_regs { /* zynq spi platform data */ -struct zynq_spi_platdata { +struct zynq_spi_plat { struct zynq_spi_regs *regs; u32 frequency; /* input frequency */ u32 speed_hz; @@ -75,7 +75,7 @@ struct zynq_spi_priv { static int zynq_spi_of_to_plat(struct udevice *bus) { - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; const void *blob = gd->fdt_blob; int node = dev_of_offset(bus); @@ -121,7 +121,7 @@ static void zynq_spi_init_hw(struct zynq_spi_priv *priv) static int zynq_spi_probe(struct udevice *bus) { - struct zynq_spi_platdata *plat = dev_get_plat(bus); + struct zynq_spi_plat *plat = dev_get_plat(bus); struct zynq_spi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; @@ -162,7 +162,7 @@ static int zynq_spi_probe(struct udevice *bus) static void spi_cs_activate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; u32 cr; @@ -193,7 +193,7 @@ static void spi_cs_activate(struct udevice *dev) static void spi_cs_deactivate(struct udevice *dev) { struct udevice *bus = dev->parent; - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; @@ -234,7 +234,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen, struct udevice *bus = dev->parent; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; - struct dm_spi_slave_platdata *slave_plat = dev_get_parent_plat(dev); + struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 len = bitlen / 8; u32 tx_len = len, rx_len = len, tx_tvl; const u8 *tx_buf = dout; @@ -296,7 +296,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen, static int zynq_spi_set_speed(struct udevice *bus, uint speed) { - struct zynq_spi_platdata *plat = bus->plat; + struct zynq_spi_plat *plat = bus->plat; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; uint32_t confr; @@ -372,7 +372,7 @@ U_BOOT_DRIVER(zynq_spi) = { .of_match = zynq_spi_ids, .ops = &zynq_spi_ops, .of_to_plat = zynq_spi_of_to_plat, - .plat_auto = sizeof(struct zynq_spi_platdata), + .plat_auto = sizeof(struct zynq_spi_plat), .priv_auto = sizeof(struct zynq_spi_priv), .probe = zynq_spi_probe, }; diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index e3bfc6e74e..f09c50757d 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -156,7 +156,7 @@ struct zynqmp_qspi_dma_regs { DECLARE_GLOBAL_DATA_PTR; -struct zynqmp_qspi_platdata { +struct zynqmp_qspi_plat { struct zynqmp_qspi_regs *regs; struct zynqmp_qspi_dma_regs *dma_regs; u32 frequency; @@ -177,7 +177,7 @@ struct zynqmp_qspi_priv { static int zynqmp_qspi_of_to_plat(struct udevice *bus) { - struct zynqmp_qspi_platdata *plat = bus->plat; + struct zynqmp_qspi_plat *plat = bus->plat; debug("%s\n", __func__); @@ -255,7 +255,7 @@ static void zynqmp_qspi_chipselect(struct zynqmp_qspi_priv *priv, int is_on) void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval) { - struct zynqmp_qspi_platdata *plat = bus->plat; + struct zynqmp_qspi_plat *plat = bus->plat; struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct zynqmp_qspi_regs *regs = priv->regs; u32 tapdlybypass = 0, lpbkdlyadj = 0, datadlyadj = 0, clk_rate; @@ -295,7 +295,7 @@ void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval) static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed) { - struct zynqmp_qspi_platdata *plat = bus->plat; + struct zynqmp_qspi_plat *plat = bus->plat; struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct zynqmp_qspi_regs *regs = priv->regs; u32 confr; @@ -333,7 +333,7 @@ static int zynqmp_qspi_set_speed(struct udevice *bus, uint speed) static int zynqmp_qspi_probe(struct udevice *bus) { - struct zynqmp_qspi_platdata *plat = dev_get_plat(bus); + struct zynqmp_qspi_plat *plat = dev_get_plat(bus); struct zynqmp_qspi_priv *priv = dev_get_priv(bus); struct clk clk; unsigned long clock; @@ -728,7 +728,7 @@ U_BOOT_DRIVER(zynqmp_qspi) = { .of_match = zynqmp_qspi_ids, .ops = &zynqmp_qspi_ops, .of_to_plat = zynqmp_qspi_of_to_plat, - .plat_auto = sizeof(struct zynqmp_qspi_platdata), + .plat_auto = sizeof(struct zynqmp_qspi_plat), .priv_auto = sizeof(struct zynqmp_qspi_priv), .probe = zynqmp_qspi_probe, }; diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index e51ce1be59..8f9970301e 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -14,7 +14,7 @@ #include #include -struct x86_sysreset_platdata { +struct x86_sysreset_plat { struct udevice *pch; }; @@ -30,7 +30,7 @@ struct x86_sysreset_platdata { */ int pch_sysreset_power_off(struct udevice *dev) { - struct x86_sysreset_platdata *plat = dev_get_plat(dev); + struct x86_sysreset_plat *plat = dev_get_plat(dev); struct pch_pmbase_info pm; u32 reg32; int ret; @@ -130,7 +130,7 @@ void __efi_runtime EFIAPI efi_reset_system( static int x86_sysreset_probe(struct udevice *dev) { - struct x86_sysreset_platdata *plat = dev_get_plat(dev); + struct x86_sysreset_plat *plat = dev_get_plat(dev); /* Locate the PCH if there is one. It isn't essential */ uclass_first_device(UCLASS_PCH, &plat->pch); @@ -154,5 +154,5 @@ U_BOOT_DRIVER(x86_reset) = { .of_match = x86_sysreset_ids, .ops = &x86_sysreset_ops, .probe = x86_sysreset_probe, - .plat_auto = sizeof(struct x86_sysreset_platdata), + .plat_auto = sizeof(struct x86_sysreset_plat), }; diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c index bc99fdeac9..17174345e3 100644 --- a/drivers/timer/ag101p_timer.c +++ b/drivers/timer/ag101p_timer.c @@ -58,13 +58,13 @@ struct atftmr_timer_regs { u32 int_mask; /* 0x38 */ }; -struct atftmr_timer_platdata { +struct atftmr_timer_plat { struct atftmr_timer_regs *regs; }; static u64 atftmr_timer_get_count(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev->plat; + struct atftmr_timer_plat *plat = dev->plat; struct atftmr_timer_regs *const regs = plat->regs; u32 val; val = readl(®s->t3_counter); @@ -73,7 +73,7 @@ static u64 atftmr_timer_get_count(struct udevice *dev) static int atftmr_timer_probe(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev->plat; + struct atftmr_timer_plat *plat = dev->plat; struct atftmr_timer_regs *const regs = plat->regs; u32 cr; writel(0, ®s->t3_load); @@ -90,7 +90,7 @@ static int atftmr_timer_probe(struct udevice *dev) static int atftme_timer_of_to_plat(struct udevice *dev) { - struct atftmr_timer_platdata *plat = dev_get_plat(dev); + struct atftmr_timer_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct atftmr_timer_regs), MAP_NOCACHE); @@ -111,7 +111,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = ag101p_timer_ids, .of_to_plat = atftme_timer_of_to_plat, - .plat_auto = sizeof(struct atftmr_timer_platdata), + .plat_auto = sizeof(struct atftmr_timer_plat), .probe = atftmr_timer_probe, .ops = &ag101p_timer_ops, }; diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index a8d6ba53b8..7e9abee0ef 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -28,13 +28,13 @@ struct altera_timer_regs { u32 snaph; /* Snapshot high */ }; -struct altera_timer_platdata { +struct altera_timer_plat { struct altera_timer_regs *regs; }; static u64 altera_timer_get_count(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->plat; + struct altera_timer_plat *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; u32 val; @@ -49,7 +49,7 @@ static u64 altera_timer_get_count(struct udevice *dev) static int altera_timer_probe(struct udevice *dev) { - struct altera_timer_platdata *plat = dev->plat; + struct altera_timer_plat *plat = dev->plat; struct altera_timer_regs *const regs = plat->regs; writel(0, ®s->status); @@ -65,7 +65,7 @@ static int altera_timer_probe(struct udevice *dev) static int altera_timer_of_to_plat(struct udevice *dev) { - struct altera_timer_platdata *plat = dev_get_plat(dev); + struct altera_timer_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), sizeof(struct altera_timer_regs), @@ -88,7 +88,7 @@ U_BOOT_DRIVER(altera_timer) = { .id = UCLASS_TIMER, .of_match = altera_timer_ids, .of_to_plat = altera_timer_of_to_plat, - .plat_auto = sizeof(struct altera_timer_platdata), + .plat_auto = sizeof(struct altera_timer_plat), .probe = altera_timer_probe, .ops = &altera_timer_ops, }; diff --git a/drivers/timer/atcpit100_timer.c b/drivers/timer/atcpit100_timer.c index 16d03c41ef..fbc7fac1bb 100644 --- a/drivers/timer/atcpit100_timer.c +++ b/drivers/timer/atcpit100_timer.c @@ -64,13 +64,13 @@ struct atctmr_timer_regs { u32 int_mask; /* 0x38 */ }; -struct atcpit_timer_platdata { +struct atcpit_timer_plat { u32 *regs; }; static u64 atcpit_timer_get_count(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_plat(dev); + struct atcpit_timer_plat *plat = dev_get_plat(dev); u32 val; val = ~(REG32_TMR(CH_CNT(1))+0xffffffff); return timer_conv_64(val); @@ -78,7 +78,7 @@ static u64 atcpit_timer_get_count(struct udevice *dev) static int atcpit_timer_probe(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_plat(dev); + struct atcpit_timer_plat *plat = dev_get_plat(dev); REG32_TMR(CH_REL(1)) = 0xffffffff; REG32_TMR(CH_CTL(1)) = APB_CLK|TMR_32; REG32_TMR(CH_EN) |= CH_TMR_EN(1 , 0); @@ -87,7 +87,7 @@ static int atcpit_timer_probe(struct udevice *dev) static int atcpit_timer_of_to_plat(struct udevice *dev) { - struct atcpit_timer_platdata *plat = dev_get_plat(dev); + struct atcpit_timer_plat *plat = dev_get_plat(dev); plat->regs = map_physmem(dev_read_addr(dev), 0x100 , MAP_NOCACHE); return 0; } @@ -106,7 +106,7 @@ U_BOOT_DRIVER(atcpit100_timer) = { .id = UCLASS_TIMER, .of_match = atcpit_timer_ids, .of_to_plat = atcpit_timer_of_to_plat, - .plat_auto = sizeof(struct atcpit_timer_platdata), + .plat_auto = sizeof(struct atcpit_timer_plat), .probe = atcpit_timer_probe, .ops = &atcpit_timer_ops, }; diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index 7b445dfe06..3178e58884 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -21,13 +21,13 @@ struct atmel_pit_regs { u32 value_image; }; -struct atmel_pit_platdata { +struct atmel_pit_plat { struct atmel_pit_regs *regs; }; static u64 atmel_pit_get_count(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_plat(dev); + struct atmel_pit_plat *plat = dev_get_plat(dev); struct atmel_pit_regs *const regs = plat->regs; u32 val = readl(®s->value_image); @@ -36,7 +36,7 @@ static u64 atmel_pit_get_count(struct udevice *dev) static int atmel_pit_probe(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_plat(dev); + struct atmel_pit_plat *plat = dev_get_plat(dev); struct atmel_pit_regs *const regs = plat->regs; struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct clk clk; @@ -60,7 +60,7 @@ static int atmel_pit_probe(struct udevice *dev) static int atmel_pit_of_to_plat(struct udevice *dev) { - struct atmel_pit_platdata *plat = dev_get_plat(dev); + struct atmel_pit_plat *plat = dev_get_plat(dev); plat->regs = dev_read_addr_ptr(dev); @@ -81,7 +81,7 @@ U_BOOT_DRIVER(atmel_pit) = { .id = UCLASS_TIMER, .of_match = atmel_pit_ids, .of_to_plat = atmel_pit_of_to_plat, - .plat_auto = sizeof(struct atmel_pit_platdata), + .plat_auto = sizeof(struct atmel_pit_plat), .probe = atmel_pit_probe, .ops = &atmel_pit_ops, }; diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index a15198c1fe..ab53555327 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -90,7 +90,7 @@ static int timer_post_probe(struct udevice *dev) int timer_timebase_fallback(struct udevice *dev) { struct udevice *cpu; - struct cpu_platdata *cpu_plat; + struct cpu_plat *cpu_plat; struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); /* Did we get our clock rate from the device tree? */ diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index fe43f1b7f3..13e730b883 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -1865,7 +1865,7 @@ int ufs_start(struct ufs_hba *hba) int ufshcd_probe(struct udevice *ufs_dev, struct ufs_hba_ops *hba_ops) { struct ufs_hba *hba = dev_get_uclass_priv(ufs_dev); - struct scsi_platdata *scsi_plat; + struct scsi_plat *scsi_plat; struct udevice *scsi_dev; int err; diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index 396923ac78..041ec3772a 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -13,8 +13,8 @@ /* We only support up to 8 */ #define SANDBOX_NUM_PORTS 4 -struct sandbox_hub_platdata { - struct usb_dev_platdata plat; +struct sandbox_hub_plat { + struct usb_dev_plat plat; int port; /* Port number (numbered from 0) */ }; @@ -129,7 +129,7 @@ static struct udevice *hub_find_device(struct udevice *hub, int port, for (device_find_first_child(hub, &dev); dev; device_find_next_child(&dev)) { - struct sandbox_hub_platdata *plat; + struct sandbox_hub_plat *plat; plat = dev_get_parent_plat(dev); if (plat->port == port) { @@ -304,8 +304,8 @@ static int sandbox_hub_bind(struct udevice *dev) static int sandbox_child_post_bind(struct udevice *dev) { - struct sandbox_hub_platdata *plat = dev_get_parent_plat(dev); - struct usb_emul_platdata *emul = dev_get_uclass_plat(dev); + struct sandbox_hub_plat *plat = dev_get_parent_plat(dev); + struct usb_emul_plat *emul = dev_get_uclass_plat(dev); plat->port = dev_read_u32_default(dev, "reg", -1); emul->port1 = plat->port + 1; @@ -329,6 +329,6 @@ U_BOOT_DRIVER(usb_sandbox_hub) = { .bind = sandbox_hub_bind, .ops = &sandbox_usb_hub_ops, .priv_auto = sizeof(struct sandbox_hub_priv), - .per_child_plat_auto = sizeof(struct sandbox_hub_platdata), + .per_child_plat_auto = sizeof(struct sandbox_hub_plat), .child_post_bind = sandbox_child_post_bind, }; diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c index 1b7e1ea7c1..f5d98b917d 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -75,7 +75,7 @@ struct usb_generic_descriptor **usb_emul_find_descriptor( return ptr; } -static int usb_emul_get_descriptor(struct usb_dev_platdata *plat, int value, +static int usb_emul_get_descriptor(struct usb_dev_plat *plat, int value, void *buffer, int length) { struct usb_generic_descriptor **ptr; @@ -115,7 +115,7 @@ static int usb_emul_find_devnum(int devnum, int port1, struct udevice **emulp) if (ret) return ret; uclass_foreach_dev(dev, uc) { - struct usb_dev_platdata *udev = dev_get_parent_plat(dev); + struct usb_dev_plat *udev = dev_get_parent_plat(dev); /* * devnum is initialzied to zero at the beginning of the @@ -126,7 +126,7 @@ static int usb_emul_find_devnum(int devnum, int port1, struct udevice **emulp) * emulator device. */ if (!devnum) { - struct usb_emul_platdata *plat; + struct usb_emul_plat *plat; /* * If the parent is sandbox USB controller, we are @@ -169,7 +169,7 @@ int usb_emul_find(struct udevice *bus, ulong pipe, int port1, int usb_emul_find_for_dev(struct udevice *dev, struct udevice **emulp) { - struct usb_dev_platdata *udev = dev_get_parent_plat(dev); + struct usb_dev_plat *udev = dev_get_parent_plat(dev); return usb_emul_find_devnum(udev->devnum, 0, emulp); } @@ -179,7 +179,7 @@ int usb_emul_control(struct udevice *emul, struct usb_device *udev, struct devrequest *setup) { struct dm_usb_ops *ops = usb_get_emul_ops(emul); - struct usb_dev_platdata *plat; + struct usb_dev_plat *plat; int ret; /* We permit getting the descriptor before we are probed */ @@ -262,7 +262,7 @@ int usb_emul_int(struct udevice *emul, struct usb_device *udev, int usb_emul_setup_device(struct udevice *dev, struct usb_string *strings, void **desc_list) { - struct usb_dev_platdata *plat = dev_get_parent_plat(dev); + struct usb_dev_plat *plat = dev_get_parent_plat(dev); struct usb_generic_descriptor **ptr; struct usb_config_descriptor *cdesc; int upto; @@ -298,7 +298,7 @@ UCLASS_DRIVER(usb_emul) = { .id = UCLASS_USB_EMUL, .name = "usb_emul", .post_bind = dm_scan_fdt_dev, - .per_device_plat_auto = sizeof(struct usb_emul_platdata), + .per_device_plat_auto = sizeof(struct usb_emul_plat), .per_child_auto = sizeof(struct usb_device), - .per_child_plat_auto = sizeof(struct usb_dev_platdata), + .per_child_plat_auto = sizeof(struct usb_dev_plat), }; diff --git a/drivers/usb/gadget/max3420_udc.c b/drivers/usb/gadget/max3420_udc.c index 36f3eb54d8..53e74d4f61 100644 --- a/drivers/usb/gadget/max3420_udc.c +++ b/drivers/usb/gadget/max3420_udc.c @@ -819,7 +819,7 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev) static int max3420_udc_probe(struct udevice *dev) { struct max3420_udc *udc = dev_get_priv(dev); - struct dm_spi_slave_platdata *slave_pdata; + struct dm_spi_slave_plat *slave_pdata; struct udevice *bus = dev->parent; int busnum = bus->seq; unsigned int cs; diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index 660a145e4d..deb820a0f8 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; /* - * struct sti_dwc3_glue_platdata - dwc3 STi glue driver private structure + * struct sti_dwc3_glue_plat - dwc3 STi glue driver private structure * @syscfg_base: addr for the glue syscfg * @glue_base: addr for the glue registers * @syscfg_offset: usb syscfg control offset @@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR; * @softreset_ctl: reset controller for softreset signal * @mode: drd static host/device config */ -struct sti_dwc3_glue_platdata { +struct sti_dwc3_glue_plat { phys_addr_t syscfg_base; phys_addr_t glue_base; phys_addr_t syscfg_offset; @@ -41,7 +41,7 @@ struct sti_dwc3_glue_platdata { enum usb_dr_mode mode; }; -static int sti_dwc3_glue_drd_init(struct sti_dwc3_glue_platdata *plat) +static int sti_dwc3_glue_drd_init(struct sti_dwc3_glue_plat *plat) { unsigned long val; @@ -77,7 +77,7 @@ static int sti_dwc3_glue_drd_init(struct sti_dwc3_glue_platdata *plat) return 0; } -static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat) +static void sti_dwc3_glue_init(struct sti_dwc3_glue_plat *plat) { unsigned long reg; @@ -102,7 +102,7 @@ static void sti_dwc3_glue_init(struct sti_dwc3_glue_platdata *plat) static int sti_dwc3_glue_of_to_plat(struct udevice *dev) { - struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); + struct sti_dwc3_glue_plat *plat = dev_get_plat(dev); struct udevice *syscon; struct regmap *regmap; int ret; @@ -150,7 +150,7 @@ static int sti_dwc3_glue_of_to_plat(struct udevice *dev) static int sti_dwc3_glue_bind(struct udevice *dev) { - struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); + struct sti_dwc3_glue_plat *plat = dev_get_plat(dev); ofnode node, dwc3_node; /* Find snps,dwc3 node from subnode */ @@ -175,7 +175,7 @@ static int sti_dwc3_glue_bind(struct udevice *dev) static int sti_dwc3_glue_probe(struct udevice *dev) { - struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); + struct sti_dwc3_glue_plat *plat = dev_get_plat(dev); int ret; /* deassert both powerdown and softreset */ @@ -216,7 +216,7 @@ softreset_err: static int sti_dwc3_glue_remove(struct udevice *dev) { - struct sti_dwc3_glue_platdata *plat = dev_get_plat(dev); + struct sti_dwc3_glue_plat *plat = dev_get_plat(dev); int ret; /* assert both powerdown and softreset */ @@ -246,6 +246,6 @@ U_BOOT_DRIVER(dwc3_sti_glue) = { .probe = sti_dwc3_glue_probe, .remove = sti_dwc3_glue_remove, .bind = sti_dwc3_glue_bind, - .plat_auto = sizeof(struct sti_dwc3_glue_platdata), + .plat_auto = sizeof(struct sti_dwc3_glue_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index 22a35a5280..fba3595e10 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -124,7 +124,7 @@ U_BOOT_DRIVER(ehci_atmel) = { .probe = ehci_atmel_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_atmel_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 690a96c5bd..fda04c4933 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -26,8 +26,8 @@ /* Declare global data pointer */ DECLARE_GLOBAL_DATA_PTR; -struct exynos_ehci_platdata { - struct usb_platdata usb_plat; +struct exynos_ehci_plat { + struct usb_plat usb_plat; fdt_addr_t hcd_base; fdt_addr_t phy_base; struct gpio_desc vbus_gpio; @@ -45,7 +45,7 @@ struct exynos_ehci { static int ehci_usb_of_to_plat(struct udevice *dev) { - struct exynos_ehci_platdata *plat = dev_get_plat(dev); + struct exynos_ehci_plat *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; unsigned int node; int depth; @@ -214,7 +214,7 @@ static void reset_usb_phy(struct exynos_usb_phy *usb) static int ehci_usb_probe(struct udevice *dev) { - struct exynos_ehci_platdata *plat = dev_get_plat(dev); + struct exynos_ehci_plat *plat = dev_get_plat(dev); struct exynos_ehci *ctx = dev_get_priv(dev); struct ehci_hcor *hcor; @@ -259,6 +259,6 @@ U_BOOT_DRIVER(usb_ehci) = { .remove = ehci_usb_remove, .ops = &ehci_usb_ops, .priv_auto = sizeof(struct exynos_ehci), - .plat_auto = sizeof(struct exynos_ehci_platdata), + .plat_auto = sizeof(struct exynos_ehci_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index dfeca8915b..8e79bdd847 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -145,7 +145,7 @@ U_BOOT_DRIVER(ehci_fsl) = { .probe = ehci_fsl_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_fsl_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index f9e24b99a0..3ecbfd032f 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -152,7 +152,7 @@ U_BOOT_DRIVER(ehci_mvebu) = { .probe = ehci_mvebu_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_mvebu_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index a3405d02e5..d160cf019d 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -47,7 +47,7 @@ static int ehci_usb_probe(struct udevice *dev) { struct msm_ehci_priv *p = dev_get_priv(dev); struct usb_ehci *ehci = p->ehci; - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; int ret; @@ -145,6 +145,6 @@ U_BOOT_DRIVER(usb_ehci) = { .remove = ehci_usb_remove, .ops = &ehci_usb_ops, .priv_auto = sizeof(struct msm_ehci_priv), - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index 970bbe924b..04862638ef 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -287,7 +287,7 @@ static const struct ehci_ops mx5_ehci_ops = { static int ehci_usb_of_to_plat(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); const char *mode; mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "dr_mode", NULL); @@ -305,7 +305,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev) static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); struct usb_ehci *ehci = dev_read_addr_ptr(dev); struct ehci_mx5_priv_data *priv = dev_get_priv(dev); enum usb_init_type type = plat->init_type; @@ -367,7 +367,7 @@ U_BOOT_DRIVER(usb_mx5) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_mx5_priv_data), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 628081aec9..65ebd7c809 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -472,7 +472,7 @@ static const struct ehci_ops mx6_ehci_ops = { static int ehci_usb_phy_mode(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); void *__iomem addr = dev_read_addr_ptr(dev); void *__iomem phy_ctrl, *__iomem phy_status; const void *blob = gd->fdt_blob; @@ -520,7 +520,7 @@ static int ehci_usb_phy_mode(struct udevice *dev) static int ehci_usb_of_to_plat(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); enum usb_dr_mode dr_mode; dr_mode = usb_get_dr_mode(dev->node); @@ -579,7 +579,7 @@ static int ehci_usb_bind(struct udevice *dev) static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); struct usb_ehci *ehci = dev_read_addr_ptr(dev); struct ehci_mx6_priv_data *priv = dev_get_priv(dev); enum usb_init_type type = plat->init_type; @@ -650,7 +650,7 @@ U_BOOT_DRIVER(usb_mx6) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_mx6_priv_data), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 58a9a1da5f..cb50bf3c4f 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -368,7 +368,7 @@ struct ehci_omap_priv_data { static int ehci_usb_of_to_plat(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); plat->init_type = USB_INIT_HOST; @@ -377,7 +377,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev) static int omap_ehci_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); struct ehci_omap_priv_data *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; @@ -403,7 +403,7 @@ U_BOOT_DRIVER(usb_omap_ehci) = { .of_match = omap_ehci_dt_ids, .probe = omap_ehci_probe, .of_to_plat = ehci_usb_of_to_plat, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_omap_priv_data), .remove = ehci_deregister, .ops = &ehci_usb_ops, diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 61f5a6ce61..4f711de7d8 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -163,7 +163,7 @@ U_BOOT_DRIVER(ehci_pci) = { .remove = ehci_pci_remove, .of_match = ehci_pci_ids, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_pci_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index c16eec3558..b02ee89c3e 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -828,7 +828,7 @@ static int ehci_usb_of_to_plat(struct udevice *dev) static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); struct fdt_usb *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; @@ -865,7 +865,7 @@ U_BOOT_DRIVER(usb_ehci) = { .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct fdt_usb), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index a517c61f6b..e0e4f84a9e 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -312,7 +312,7 @@ static int vf_usb_bind(struct udevice *dev) static int ehci_usb_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); struct ehci_vf_priv_data *priv = dev_get_priv(dev); struct usb_ehci *ehci = priv->ehci; struct ehci_hccr *hccr; @@ -355,7 +355,7 @@ U_BOOT_DRIVER(usb_ehci) = { .remove = ehci_deregister, .ops = &ehci_usb_ops, .of_to_plat = vf_usb_of_to_plat, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct ehci_vf_priv_data), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c index 6756465d64..f7e458cb15 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -34,7 +34,7 @@ static int ehci_zynq_of_to_plat(struct udevice *dev) static int ehci_zynq_probe(struct udevice *dev) { - struct usb_platdata *plat = dev_get_plat(dev); + struct usb_plat *plat = dev_get_plat(dev); struct zynq_ehci_priv *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; @@ -85,7 +85,7 @@ U_BOOT_DRIVER(ehci_zynq) = { .probe = ehci_zynq_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct zynq_ehci_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index c53b6f58e3..6ddc9da704 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -39,7 +39,7 @@ U_BOOT_DRIVER(ohci_pci) = { .remove = ohci_pci_remove, .of_match = ohci_pci_ids, .ops = &ohci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(ohci_t), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index 94ce9a6917..decee61d96 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -389,7 +389,7 @@ struct usb_device *usb_get_dev_index(struct udevice *bus, int index) int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) { - struct usb_platdata *plat; + struct usb_plat *plat; struct udevice *dev; int ret; @@ -566,7 +566,7 @@ static int usb_find_and_bind_driver(struct udevice *parent, const struct usb_device_id *id; struct udevice *dev; const struct driver *drv; - struct usb_dev_platdata *plat; + struct usb_dev_plat *plat; for (id = entry->match; id->match_flags; id++) { if (!usb_match_one_id(desc, iface, id)) @@ -622,7 +622,7 @@ static int usb_find_child(struct udevice *parent, for (device_find_first_child(parent, &dev); dev; device_find_next_child(&dev)) { - struct usb_dev_platdata *plat = dev_get_parent_plat(dev); + struct usb_dev_plat *plat = dev_get_parent_plat(dev); /* If this device is already in use, skip it */ if (device_active(dev)) @@ -643,7 +643,7 @@ int usb_scan_device(struct udevice *parent, int port, { struct udevice *dev; bool created = false; - struct usb_dev_platdata *plat; + struct usb_dev_plat *plat; struct usb_bus_priv *priv; struct usb_device *parent_udev; int ret; @@ -770,7 +770,7 @@ int usb_detect_change(void) static int usb_child_post_bind(struct udevice *dev) { - struct usb_dev_platdata *plat = dev_get_parent_plat(dev); + struct usb_dev_plat *plat = dev_get_parent_plat(dev); int val; if (!dev_of_valid(dev)) @@ -809,7 +809,7 @@ struct udevice *usb_get_bus(struct udevice *dev) int usb_child_pre_probe(struct udevice *dev) { struct usb_device *udev = dev_get_parent_priv(dev); - struct usb_dev_platdata *plat = dev_get_parent_plat(dev); + struct usb_dev_plat *plat = dev_get_parent_plat(dev); int ret; if (plat->udev) { @@ -854,7 +854,7 @@ UCLASS_DRIVER(usb) = { .per_device_auto = sizeof(struct usb_bus_priv), .child_post_bind = usb_child_post_bind, .child_pre_probe = usb_child_pre_probe, - .per_child_plat_auto = sizeof(struct usb_dev_platdata), + .per_child_plat_auto = sizeof(struct usb_dev_plat), }; UCLASS_DRIVER(usb_dev_generic) = { diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c index 31e4265a81..27c4bbfcba 100644 --- a/drivers/usb/host/xhci-brcm.c +++ b/drivers/usb/host/xhci-brcm.c @@ -22,7 +22,7 @@ #define USBAXI_SA_UA_MASK (USBAXI_UA_MASK | USBAXI_SA_MASK) #define USBAXI_SA_UA_VAL (USBAXI_UA_VAL | USBAXI_SA_VAL) -struct brcm_xhci_platdata { +struct brcm_xhci_plat { unsigned int arcache; unsigned int awcache; void __iomem *hc_base; @@ -30,7 +30,7 @@ struct brcm_xhci_platdata { static int xhci_brcm_probe(struct udevice *dev) { - struct brcm_xhci_platdata *plat = dev_get_plat(dev); + struct brcm_xhci_plat *plat = dev_get_plat(dev); struct xhci_hcor *hcor; struct xhci_hccr *hcd; int len, ret = 0; @@ -71,7 +71,7 @@ static int xhci_brcm_probe(struct udevice *dev) static int xhci_brcm_deregister(struct udevice *dev) { - struct brcm_xhci_platdata *plat = dev_get_plat(dev); + struct brcm_xhci_plat *plat = dev_get_plat(dev); /* Restore the default values for AXI read and write attributes */ writel(plat->awcache, plat->hc_base + DRD2U3H_XHC_REGS_AXIWRA); @@ -92,7 +92,7 @@ U_BOOT_DRIVER(usb_xhci) = { .remove = xhci_brcm_deregister, .ops = &xhci_usb_ops, .of_match = xhci_brcm_ids, - .plat_auto = sizeof(struct brcm_xhci_platdata), + .plat_auto = sizeof(struct brcm_xhci_plat), .priv_auto = sizeof(struct xhci_ctrl), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index f6534a2ea9..59408e4e50 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -20,7 +20,7 @@ #include #include -struct xhci_dwc3_platdata { +struct xhci_dwc3_plat { struct phy_bulk phys; }; @@ -117,7 +117,7 @@ static int xhci_dwc3_probe(struct udevice *dev) struct xhci_hccr *hccr; struct dwc3 *dwc3_reg; enum usb_dr_mode dr_mode; - struct xhci_dwc3_platdata *plat = dev_get_plat(dev); + struct xhci_dwc3_plat *plat = dev_get_plat(dev); const char *phy; u32 reg; int ret; @@ -167,7 +167,7 @@ static int xhci_dwc3_probe(struct udevice *dev) static int xhci_dwc3_remove(struct udevice *dev) { - struct xhci_dwc3_platdata *plat = dev_get_plat(dev); + struct xhci_dwc3_plat *plat = dev_get_plat(dev); dwc3_shutdown_phy(dev, &plat->phys); @@ -187,7 +187,7 @@ U_BOOT_DRIVER(xhci_dwc3) = { .remove = xhci_dwc3_remove, .ops = &xhci_usb_ops, .priv_auto = sizeof(struct xhci_ctrl), - .plat_auto = sizeof(struct xhci_dwc3_platdata), + .plat_auto = sizeof(struct xhci_dwc3_plat), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; #endif diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index fe804a0dfe..9893a8ccce 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -34,7 +34,7 @@ /* Declare global data pointer */ DECLARE_GLOBAL_DATA_PTR; -struct exynos_xhci_platdata { +struct exynos_xhci_plat { fdt_addr_t hcd_base; fdt_addr_t phy_base; struct gpio_desc vbus_gpio; @@ -45,7 +45,7 @@ struct exynos_xhci_platdata { * for the usb controller. */ struct exynos_xhci { - struct usb_platdata usb_plat; + struct usb_plat usb_plat; struct xhci_ctrl ctrl; struct exynos_usb3_phy *usb3_phy; struct xhci_hccr *hcd; @@ -54,7 +54,7 @@ struct exynos_xhci { static int xhci_usb_of_to_plat(struct udevice *dev) { - struct exynos_xhci_platdata *plat = dev_get_plat(dev); + struct exynos_xhci_plat *plat = dev_get_plat(dev); const void *blob = gd->fdt_blob; unsigned int node; int depth; @@ -205,7 +205,7 @@ static void exynos_xhci_core_exit(struct exynos_xhci *exynos) static int xhci_usb_probe(struct udevice *dev) { - struct exynos_xhci_platdata *plat = dev_get_plat(dev); + struct exynos_xhci_plat *plat = dev_get_plat(dev); struct exynos_xhci *ctx = dev_get_priv(dev); struct xhci_hcor *hcor; int ret; @@ -255,7 +255,7 @@ U_BOOT_DRIVER(usb_xhci) = { .probe = xhci_usb_probe, .remove = xhci_usb_remove, .ops = &xhci_usb_ops, - .plat_auto = sizeof(struct exynos_xhci_platdata), + .plat_auto = sizeof(struct exynos_xhci_plat), .priv_auto = sizeof(struct exynos_xhci), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c index e54db0f8e2..f062f12ade 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -169,7 +169,7 @@ U_BOOT_DRIVER(xhci_fsl) = { .probe = xhci_fsl_probe, .remove = xhci_fsl_remove, .ops = &xhci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct xhci_fsl_priv), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index 017f99b629..46b89de85d 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -15,7 +15,7 @@ #include -struct mvebu_xhci_platdata { +struct mvebu_xhci_plat { fdt_addr_t hcd_base; }; @@ -25,7 +25,7 @@ struct mvebu_xhci_platdata { */ struct mvebu_xhci { struct xhci_ctrl ctrl; /* Needs to come first in this struct! */ - struct usb_platdata usb_plat; + struct usb_plat usb_plat; struct xhci_hccr *hcd; }; @@ -40,7 +40,7 @@ __weak int board_xhci_enable(fdt_addr_t base) static int xhci_usb_probe(struct udevice *dev) { - struct mvebu_xhci_platdata *plat = dev_get_plat(dev); + struct mvebu_xhci_plat *plat = dev_get_plat(dev); struct mvebu_xhci *ctx = dev_get_priv(dev); struct xhci_hcor *hcor; int len, ret; @@ -67,7 +67,7 @@ static int xhci_usb_probe(struct udevice *dev) static int xhci_usb_of_to_plat(struct udevice *dev) { - struct mvebu_xhci_platdata *plat = dev_get_plat(dev); + struct mvebu_xhci_plat *plat = dev_get_plat(dev); /* * Get the base address for XHCI controller from the device node @@ -96,7 +96,7 @@ U_BOOT_DRIVER(usb_xhci) = { .probe = xhci_usb_probe, .remove = xhci_deregister, .ops = &xhci_usb_ops, - .plat_auto = sizeof(struct mvebu_xhci_platdata), + .plat_auto = sizeof(struct mvebu_xhci_plat), .priv_auto = sizeof(struct mvebu_xhci), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 96d1de67d9..2b445f21b5 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -59,7 +59,7 @@ U_BOOT_DRIVER(xhci_pci) = { .remove = xhci_deregister, .of_match = xhci_pci_ids, .ops = &xhci_usb_ops, - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct xhci_ctrl), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index dc941a2068..5fc7afb7d2 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -29,7 +29,7 @@ #define RCAR_USB3_DL_CTRL_FW_SUCCESS BIT(4) #define RCAR_USB3_DL_CTRL_FW_SET_DATA0 BIT(8) -struct rcar_xhci_platdata { +struct rcar_xhci_plat { fdt_addr_t hcd_base; struct clk clk; }; @@ -40,7 +40,7 @@ struct rcar_xhci_platdata { */ struct rcar_xhci { struct xhci_ctrl ctrl; /* Needs to come first in this struct! */ - struct usb_platdata usb_plat; + struct usb_plat usb_plat; struct xhci_hccr *hcd; }; @@ -76,7 +76,7 @@ static int xhci_rcar_download_fw(struct rcar_xhci *ctx, const u32 *fw_data, static int xhci_rcar_probe(struct udevice *dev) { - struct rcar_xhci_platdata *plat = dev_get_plat(dev); + struct rcar_xhci_plat *plat = dev_get_plat(dev); struct rcar_xhci *ctx = dev_get_priv(dev); struct xhci_hcor *hcor; int len, ret; @@ -122,7 +122,7 @@ err_clk: static int xhci_rcar_deregister(struct udevice *dev) { int ret; - struct rcar_xhci_platdata *plat = dev_get_plat(dev); + struct rcar_xhci_plat *plat = dev_get_plat(dev); ret = xhci_deregister(dev); @@ -134,7 +134,7 @@ static int xhci_rcar_deregister(struct udevice *dev) static int xhci_rcar_of_to_plat(struct udevice *dev) { - struct rcar_xhci_platdata *plat = dev_get_plat(dev); + struct rcar_xhci_plat *plat = dev_get_plat(dev); plat->hcd_base = dev_read_addr(dev); if (plat->hcd_base == FDT_ADDR_T_NONE) { @@ -161,7 +161,7 @@ U_BOOT_DRIVER(usb_xhci) = { .ops = &xhci_usb_ops, .of_match = xhci_rcar_ids, .of_to_plat = xhci_rcar_of_to_plat, - .plat_auto = sizeof(struct rcar_xhci_platdata), + .plat_auto = sizeof(struct rcar_xhci_plat), .priv_auto = sizeof(struct rcar_xhci), .flags = DM_FLAG_ALLOC_PRIV_DMA, }; diff --git a/drivers/usb/musb-new/da8xx.c b/drivers/usb/musb-new/da8xx.c index c59ca54437..f42803533d 100644 --- a/drivers/usb/musb-new/da8xx.c +++ b/drivers/usb/musb-new/da8xx.c @@ -247,7 +247,7 @@ const struct musb_platform_ops da8xx_ops = { .disable = da8xx_musb_disable, }; -struct da8xx_musb_platdata { +struct da8xx_musb_plat { void *base; void *ctrl_mod_base; struct musb_hdrc_platform_data plat; @@ -258,7 +258,7 @@ struct da8xx_musb_platdata { static int da8xx_musb_of_to_plat(struct udevice *dev) { - struct da8xx_musb_platdata *plat = dev_get_plat(dev); + struct da8xx_musb_plat *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); @@ -282,7 +282,7 @@ static int da8xx_musb_of_to_plat(struct udevice *dev) static int da8xx_musb_probe(struct udevice *dev) { struct musb_host_data *host = dev_get_priv(dev); - struct da8xx_musb_platdata *plat = dev_get_plat(dev); + struct da8xx_musb_plat *plat = dev_get_plat(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct omap_musb_board_data *otg_board_data; int ret; @@ -348,6 +348,6 @@ U_BOOT_DRIVER(da8xx_musb) = { .probe = da8xx_musb_probe, .remove = da8xx_musb_remove, .ops = &musb_usb_ops, - .plat_auto = sizeof(struct da8xx_musb_platdata), + .plat_auto = sizeof(struct da8xx_musb_plat), .priv_auto = sizeof(struct musb_host_data), }; diff --git a/drivers/usb/musb-new/mt85xx.c b/drivers/usb/musb-new/mt85xx.c index 4847b2c80d..730045cf9a 100644 --- a/drivers/usb/musb-new/mt85xx.c +++ b/drivers/usb/musb-new/mt85xx.c @@ -414,6 +414,6 @@ U_BOOT_DRIVER(mtk_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct mtk_musb_glue), }; diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index b9bba22a65..3fdcaeaa5d 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -141,7 +141,7 @@ const struct musb_platform_ops omap2430_ops = { #if CONFIG_IS_ENABLED(DM_USB) -struct omap2430_musb_platdata { +struct omap2430_musb_plat { void *base; void *ctrl_mod_base; struct musb_hdrc_platform_data plat; @@ -151,7 +151,7 @@ struct omap2430_musb_platdata { static int omap2430_musb_of_to_plat(struct udevice *dev) { - struct omap2430_musb_platdata *plat = dev_get_plat(dev); + struct omap2430_musb_plat *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); @@ -218,7 +218,7 @@ static int omap2430_musb_probe(struct udevice *dev) #else struct musb *musbp; #endif - struct omap2430_musb_platdata *plat = dev_get_plat(dev); + struct omap2430_musb_plat *plat = dev_get_plat(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct omap_musb_board_data *otg_board_data; int ret = 0; @@ -275,7 +275,7 @@ U_BOOT_DRIVER(omap2430_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .plat_auto = sizeof(struct omap2430_musb_platdata), + .plat_auto = sizeof(struct omap2430_musb_plat), .priv_auto = sizeof(struct musb_host_data), }; diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c index 7970d1620f..b833f10f4b 100644 --- a/drivers/usb/musb-new/pic32.c +++ b/drivers/usb/musb-new/pic32.c @@ -288,6 +288,6 @@ U_BOOT_DRIVER(usb_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct pic32_musb_data), }; diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 1337e5260b..fea4105f3d 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -552,6 +552,6 @@ U_BOOT_DRIVER(usb_musb) = { #ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, #endif - .plat_auto = sizeof(struct usb_platdata), + .plat_auto = sizeof(struct usb_plat), .priv_auto = sizeof(struct sunxi_glue), }; diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index b0ee57ad8a..81b12fadfc 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR; static void ti_musb_set_phy_power(struct udevice *dev, u8 on) { - struct ti_musb_platdata *plat = dev_get_plat(dev); + struct ti_musb_plat *plat = dev_get_plat(dev); if (!plat->ctrl_mod_base) return; @@ -79,7 +79,7 @@ static int ti_musb_get_usb_index(int node) static int ti_musb_of_to_plat(struct udevice *dev) { - struct ti_musb_platdata *plat = dev_get_plat(dev); + struct ti_musb_plat *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int phys; @@ -147,7 +147,7 @@ static int ti_musb_of_to_plat(struct udevice *dev) static int ti_musb_host_probe(struct udevice *dev) { struct musb_host_data *host = dev_get_priv(dev); - struct ti_musb_platdata *plat = dev_get_plat(dev); + struct ti_musb_plat *plat = dev_get_plat(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); int ret; @@ -178,7 +178,7 @@ static int ti_musb_host_remove(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_CONTROL) static int ti_musb_host_of_to_plat(struct udevice *dev) { - struct ti_musb_platdata *plat = dev_get_plat(dev); + struct ti_musb_plat *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int ret; @@ -204,7 +204,7 @@ U_BOOT_DRIVER(ti_musb_host) = { .probe = ti_musb_host_probe, .remove = ti_musb_host_remove, .ops = &musb_usb_ops, - .plat_auto = sizeof(struct ti_musb_platdata), + .plat_auto = sizeof(struct ti_musb_plat), .priv_auto = sizeof(struct musb_host_data), }; @@ -216,7 +216,7 @@ struct ti_musb_peripheral { #if CONFIG_IS_ENABLED(OF_CONTROL) static int ti_musb_peripheral_of_to_plat(struct udevice *dev) { - struct ti_musb_platdata *plat = dev_get_plat(dev); + struct ti_musb_plat *plat = dev_get_plat(dev); const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); int ret; @@ -244,7 +244,7 @@ int dm_usb_gadget_handle_interrupts(struct udevice *dev) static int ti_musb_peripheral_probe(struct udevice *dev) { struct ti_musb_peripheral *priv = dev_get_priv(dev); - struct ti_musb_platdata *plat = dev_get_plat(dev); + struct ti_musb_plat *plat = dev_get_plat(dev); int ret; priv->periph = musb_init_controller(&plat->plat, @@ -277,7 +277,7 @@ U_BOOT_DRIVER(ti_musb_peripheral) = { .probe = ti_musb_peripheral_probe, .remove = ti_musb_peripheral_remove, .ops = &musb_usb_ops, - .plat_auto = sizeof(struct ti_musb_platdata), + .plat_auto = sizeof(struct ti_musb_plat), .priv_auto = sizeof(struct ti_musb_peripheral), .flags = DM_FLAG_PRE_RELOC, }; diff --git a/drivers/video/am335x-fb.c b/drivers/video/am335x-fb.c index e0d5f44590..e99a9185a2 100644 --- a/drivers/video/am335x-fb.c +++ b/drivers/video/am335x-fb.c @@ -368,7 +368,7 @@ struct am335x_fb_priv { static int am335x_fb_remove(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->base -= 0x20; uc_plat->size += 0x20; @@ -377,7 +377,7 @@ static int am335x_fb_remove(struct udevice *dev) static int am335x_fb_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct am335x_fb_priv *priv = dev_get_priv(dev); struct am335x_lcdhw *regs = priv->regs; @@ -592,7 +592,7 @@ static int am335x_fb_of_to_plat(struct udevice *dev) static int am335x_fb_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = ((LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP)) >> 3) + 0x20; diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 2d0d0d4f9c..0485ae2436 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -293,7 +293,7 @@ static int at91_hlcdc_enable_clk(struct udevice *dev) static void atmel_hlcdc_init(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct atmel_hlcdc_priv *priv = dev_get_priv(dev); struct atmel_hlcd_regs *regs = priv->regs; struct display_timing *timing = &priv->timing; @@ -539,7 +539,7 @@ static int atmel_hlcdc_of_to_plat(struct udevice *dev) static int atmel_hlcdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index f836a9a82f..f87c0224a1 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -245,7 +245,7 @@ ulong calc_fbsize(void) #ifdef CONFIG_DM_VIDEO static int atmel_fb_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct atmel_fb_priv *priv = dev_get_priv(dev); struct display_timing *timing = &priv->timing; @@ -269,7 +269,7 @@ static int atmel_fb_lcd_probe(struct udevice *dev) static int atmel_fb_of_to_plat(struct udevice *dev) { - struct atmel_lcd_platdata *plat = dev_get_plat(dev); + struct atmel_lcd_plat *plat = dev_get_plat(dev); struct atmel_fb_priv *priv = dev_get_priv(dev); struct display_timing *timing = &priv->timing; const void *blob = gd->fdt_blob; @@ -285,7 +285,7 @@ static int atmel_fb_of_to_plat(struct udevice *dev) static int atmel_fb_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP16) / 8; @@ -306,7 +306,7 @@ U_BOOT_DRIVER(atmel_fb) = { .bind = atmel_fb_lcd_bind, .of_to_plat = atmel_fb_of_to_plat, .probe = atmel_fb_lcd_probe, - .plat_auto = sizeof(struct atmel_lcd_platdata), + .plat_auto = sizeof(struct atmel_lcd_plat), .priv_auto = sizeof(struct atmel_fb_priv), }; #endif diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 95662f14b8..9326999cd3 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -13,7 +13,7 @@ static int bcm2835_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); int ret; int w, h, pitch; diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index 8e5c6cf866..cba105c19a 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -661,7 +661,7 @@ static int broadwell_igd_int15_handler(void) static int broadwell_igd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); bool is_broadwell; ulong fbbase; @@ -756,7 +756,7 @@ static int broadwell_igd_of_to_plat(struct udevice *dev) static int broadwell_igd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); /* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c index 043cc627a7..0a5fb08dc8 100644 --- a/drivers/video/coreboot.c +++ b/drivers/video/coreboot.c @@ -38,7 +38,7 @@ static int save_vesa_mode(struct cb_framebuffer *fb, static int coreboot_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct cb_framebuffer *fb = lib_sysinfo.framebuffer; struct vesa_mode_info *vesa = &mode_info.vesa; diff --git a/drivers/video/efi.c b/drivers/video/efi.c index ceb6f85d25..c248bd352a 100644 --- a/drivers/video/efi.c +++ b/drivers/video/efi.c @@ -110,7 +110,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa) static int efi_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct vesa_mode_info *vesa = &mode_info.vesa; int ret; diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c index cd7767fb6e..7b4459ced8 100644 --- a/drivers/video/exynos/exynos_fb.c +++ b/drivers/video/exynos/exynos_fb.c @@ -377,7 +377,7 @@ void exynos_fimd_disable_sysmmu(void) void exynos_fimd_lcd_init(struct udevice *dev) { struct exynos_fb_priv *priv = dev_get_priv(dev); - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct exynos_fb *reg = priv->reg; unsigned int cfg = 0, rgb_mode; unsigned int offset; @@ -692,7 +692,7 @@ static int exynos_fb_probe(struct udevice *dev) static int exynos_fb_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); /* This is the maximum panel size we expect to see */ plat->size = 1920 * 1080 * 2; diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c index 9224347ab1..4ea0f12487 100644 --- a/drivers/video/fsl_dcu_fb.c +++ b/drivers/video/fsl_dcu_fb.c @@ -484,7 +484,7 @@ void *video_hw_init(void) static int fsl_dcu_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct fb_info fbinfo = { 0 }; unsigned int win_x; @@ -516,7 +516,7 @@ static int fsl_dcu_video_probe(struct udevice *dev) static int fsl_dcu_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); unsigned int win_x; unsigned int win_y; unsigned int depth = 0, freq = 0; diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 0bbd974c2a..6cdbbafafb 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -383,7 +383,7 @@ static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int mxcfb_map_video_memory(struct fb_info *fbi) { struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par; - struct video_uc_platdata *plat = dev_get_uclass_plat(mxc_fbi->udev); + struct video_uc_plat *plat = dev_get_uclass_plat(mxc_fbi->udev); if (fbi->fix.smem_len < fbi->var.yres_virtual * fbi->fix.line_length) { fbi->fix.smem_len = fbi->var.yres_virtual * @@ -586,7 +586,7 @@ enum { static int ipuv3_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); #if defined(CONFIG_DISPLAY) struct udevice *disp_dev; @@ -647,7 +647,7 @@ struct ipuv3_video_priv { static int ipuv3_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP32) / 8; diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c index 9f10689ce3..e7db0cbcef 100644 --- a/drivers/video/ivybridge_igd.c +++ b/drivers/video/ivybridge_igd.c @@ -753,7 +753,7 @@ static int gma_func0_init(struct udevice *dev) static int bd82x6x_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong fbbase; void *gtt_bar; int ret, rev; @@ -781,7 +781,7 @@ static int bd82x6x_video_probe(struct udevice *dev) static int bd82x6x_video_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); /* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c index 6c73bd2d62..dc4f542256 100644 --- a/drivers/video/mali_dp.c +++ b/drivers/video/mali_dp.c @@ -260,7 +260,7 @@ static int malidp_update_timings_from_edid(struct udevice *dev, static int malidp_probe(struct udevice *dev) { struct video_priv *uc_priv = dev_get_uclass_priv(dev); - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); ofnode framebuffer = ofnode_find_subnode(dev_ofnode(dev), "framebuffer"); struct malidp_priv *priv = dev_get_priv(dev); struct display_timing timings; @@ -382,7 +382,7 @@ fail_aclk: static int malidp_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); /* choose max possible size: 2K x 2K, XRGB888 framebuffer */ uc_plat->size = 4 * 2048 * 2048; diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c index 313c013a7d..e3f784ecfe 100644 --- a/drivers/video/meson/meson_plane.c +++ b/drivers/video/meson/meson_plane.c @@ -100,7 +100,7 @@ meson_vpp_disable_interlace_vscaler_osd1(struct meson_vpu_priv *priv) void meson_vpu_setup_plane(struct udevice *dev, bool is_interlaced) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct meson_vpu_priv *priv = dev_get_priv(dev); u32 osd1_ctrl_stat; diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index b5614fafe8..ca6933a6c5 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -43,7 +43,7 @@ bool meson_vpu_is_compatible(struct meson_vpu_priv *priv, static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct display_timing timing; bool is_cvbs = false; @@ -138,7 +138,7 @@ static int meson_vpu_probe(struct udevice *dev) static int meson_vpu_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = VPU_MAX_WIDTH * VPU_MAX_HEIGHT * (1 << VPU_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c index bc789ecc7b..d3d07e5f83 100644 --- a/drivers/video/mvebu_lcd.c +++ b/drivers/video/mvebu_lcd.c @@ -526,7 +526,7 @@ static void mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info, static int mvebu_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct mvebu_video_priv *priv = dev_get_priv(dev); struct mvebu_lcd_info lcd_info; @@ -575,7 +575,7 @@ static int mvebu_video_probe(struct udevice *dev) static int mvebu_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 5b770a7a0b..b43732a77a 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -356,7 +356,7 @@ static int mxs_of_get_timings(struct udevice *dev, static int mxs_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct display_timing timings; @@ -409,7 +409,7 @@ static int mxs_video_probe(struct udevice *dev) static int mxs_video_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct display_timing timings; u32 bpp = 0; u32 bytes_pp = 0; @@ -443,7 +443,7 @@ static int mxs_video_bind(struct udevice *dev) static int mxs_video_remove(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); mxs_remove_common(plat->base); diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index da11e9d2e1..00e2c36f37 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -174,7 +174,7 @@ static void nx_display_parse_dp_layer(ofnode node, struct dp_plane_info *plane) static void nx_display_parse_dp_planes(ofnode node, struct nx_display_dev *dp, - struct video_uc_platdata *plat) + struct video_uc_plat *plat) { const char *name; ofnode subnode; @@ -332,7 +332,7 @@ static int nx_display_parse_dp_lcds(ofnode node, const char *type, static int nx_display_parse_dt(struct udevice *dev, struct nx_display_dev *dp, - struct video_uc_platdata *plat) + struct video_uc_plat *plat) { const char *name, *dtype; int ret = 0; @@ -391,7 +391,7 @@ static struct nx_display_dev *nx_display_setup(void) struct nx_display_dev *dp; int i, ret; int node = 0; - struct video_uc_platdata *plat = NULL; + struct video_uc_plat *plat = NULL; struct udevice *dev; @@ -534,9 +534,9 @@ __weak void lcd_enable(void) static int nx_display_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); - struct nx_display_platdata *plat = dev_get_plat(dev); + struct nx_display_plat *plat = dev_get_plat(dev); static GraphicDevice *graphic_device; char addr[64]; @@ -546,7 +546,7 @@ static int nx_display_probe(struct udevice *dev) return -EINVAL; if (!uc_plat) { - debug("%s(): video_uc_platdata *plat == NULL --> return -EINVAL\n", + debug("%s(): video_uc_plat *plat == NULL --> return -EINVAL\n", __func__); return -EINVAL; } @@ -558,7 +558,7 @@ static int nx_display_probe(struct udevice *dev) } if (!plat) { - debug("%s(): nx_display_platdata *plat == NULL --> return -EINVAL\n", + debug("%s(): nx_display_plat *plat == NULL --> return -EINVAL\n", __func__); return -EINVAL; } @@ -619,7 +619,7 @@ static int nx_display_probe(struct udevice *dev) static int nx_display_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); debug("%s()\n", __func__); @@ -643,7 +643,7 @@ U_BOOT_DRIVER(nexell_display) = { .name = "nexell-display", .id = UCLASS_VIDEO, .of_match = nx_display_ids, - .plat_auto = sizeof(struct nx_display_platdata), + .plat_auto = sizeof(struct nx_display_plat), .bind = nx_display_bind, .probe = nx_display_probe, .priv_auto = sizeof(struct nx_display_dev), diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c index c20d158c9f..fcb393b906 100644 --- a/drivers/video/rockchip/rk_vop.c +++ b/drivers/video/rockchip/rk_vop.c @@ -364,7 +364,7 @@ void rk_vop_probe_regulators(struct udevice *dev, int rk_vop_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct rk_vop_priv *priv = dev_get_priv(dev); int ret = 0; ofnode port, node; @@ -406,7 +406,7 @@ int rk_vop_probe(struct udevice *dev) int rk_vop_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = 4 * (CONFIG_VIDEO_ROCKCHIP_MAX_XRES * CONFIG_VIDEO_ROCKCHIP_MAX_YRES); diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c index 3e231e8c55..12edf9c90c 100644 --- a/drivers/video/sandbox_sdl.c +++ b/drivers/video/sandbox_sdl.c @@ -23,7 +23,7 @@ enum { static int sandbox_sdl_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct sandbox_state *state = state_get_current(); @@ -49,7 +49,7 @@ static int sandbox_sdl_probe(struct udevice *dev) static int sandbox_sdl_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct sandbox_sdl_plat *plat = dev_get_plat(dev); int ret = 0; diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c index 7f94018787..b5fb6f62bb 100644 --- a/drivers/video/simplefb.c +++ b/drivers/video/simplefb.c @@ -12,7 +12,7 @@ static int simple_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); const void *blob = gd->fdt_blob; const int node = dev_of_offset(dev); diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c index ff28bdba57..dc10b8cfc1 100644 --- a/drivers/video/stm32/stm32_ltdc.c +++ b/drivers/video/stm32/stm32_ltdc.c @@ -329,7 +329,7 @@ static void stm32_ltdc_set_layer1(struct stm32_ltdc_priv *priv, ulong fb_addr) static int stm32_ltdc_probe(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct stm32_ltdc_priv *priv = dev_get_priv(dev); struct udevice *bridge = NULL; @@ -452,7 +452,7 @@ static int stm32_ltdc_probe(struct udevice *dev) static int stm32_ltdc_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES * CONFIG_VIDEO_STM32_MAX_YRES * diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index 5540e70fa0..50657a77d3 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -237,7 +237,7 @@ static int sunxi_de2_init(struct udevice *dev, ulong fbbase, static int sunxi_de2_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct udevice *disp; int ret; @@ -299,7 +299,7 @@ static int sunxi_de2_probe(struct udevice *dev) static int sunxi_de2_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << LCD_MAX_LOG2_BPP) / 8; @@ -331,7 +331,7 @@ int sunxi_simplefb_setup(void *blob) { struct udevice *de2, *hdmi, *lcd; struct video_priv *de2_priv; - struct video_uc_platdata *de2_plat; + struct video_uc_plat *de2_plat; int mux; int offset, ret; u64 start, size; diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index d185096db0..08b006b469 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -299,7 +299,7 @@ static int tegra_display_probe(const void *blob, struct tegra_lcd_priv *priv, static int tegra_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct tegra_lcd_priv *priv = dev_get_priv(dev); const void *blob = gd->fdt_blob; @@ -393,7 +393,7 @@ static int tegra_lcd_of_to_plat(struct udevice *dev) static int tegra_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); const void *blob = gd->fdt_blob; int node = dev_of_offset(dev); int rgb; diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index f834bd9f59..f642b3b10a 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -465,7 +465,7 @@ static int tegra124_lcd_init(struct udevice *dev, void *lcdbase, static int tegra124_lcd_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong start; int ret; @@ -482,7 +482,7 @@ static int tegra124_lcd_probe(struct udevice *dev) static int tegra124_lcd_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP16) / 8; diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c index e370cddda9..869e546973 100644 --- a/drivers/video/vesa.c +++ b/drivers/video/vesa.c @@ -13,7 +13,7 @@ static int vesa_video_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong fbbase; int ret; @@ -31,7 +31,7 @@ static int vesa_video_probe(struct udevice *dev) static int vesa_video_bind(struct udevice *dev) { - struct video_uc_platdata *uc_plat = dev_get_uclass_plat(dev); + struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); /* Set the maximum supported resolution */ uc_plat->size = 2560 * 1600 * 4; diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 2cd0d947f0..20f6973b4b 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -25,7 +25,7 @@ * Theory of operation: * * Before relocation each device is bound. The driver for each device must - * set the @align and @size values in struct video_uc_platdata. This + * set the @align and @size values in struct video_uc_plat. This * information represents the requires size and alignment of the frame buffer * for the device. The values can be an over-estimate but cannot be too * small. The actual values will be suppled (in the same manner) by the bind() @@ -68,7 +68,7 @@ void video_set_flush_dcache(struct udevice *dev, bool flush) static ulong alloc_fb(struct udevice *dev, ulong *addrp) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); ulong base, align, size; if (!plat->size) @@ -301,7 +301,7 @@ static int video_pre_remove(struct udevice *dev) /* Set up the display ready for use */ static int video_post_probe(struct udevice *dev) { - struct video_uc_platdata *plat = dev_get_uclass_plat(dev); + struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *priv = dev_get_uclass_priv(dev); char name[30], drv[15], *str; const char *drv_name = drv; @@ -410,5 +410,5 @@ UCLASS_DRIVER(video) = { .pre_remove = video_pre_remove, .priv_auto = sizeof(struct video_uc_priv), .per_device_auto = sizeof(struct video_priv), - .per_device_plat_auto = sizeof(struct video_uc_platdata), + .per_device_plat_auto = sizeof(struct video_uc_plat), }; diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index 8aaa44983e..03fa5cb608 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -292,7 +292,7 @@ static int virtio_pci_bind(struct udevice *udev) static int virtio_pci_probe(struct udevice *udev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(udev); + struct pci_child_plat *pplat = dev_get_parent_plat(udev); struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev); struct virtio_pci_priv *priv = dev_get_priv(udev); u16 subvendor, subdevice; diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 620d094b78..dfbbf8a625 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -456,7 +456,7 @@ static int virtio_pci_bind(struct udevice *udev) static int virtio_pci_probe(struct udevice *udev) { - struct pci_child_platdata *pplat = dev_get_parent_plat(udev); + struct pci_child_plat *pplat = dev_get_parent_plat(udev); struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev); struct virtio_pci_priv *priv = dev_get_priv(udev); u16 subvendor; diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index 98fdb3ffc5..d71ae6cf50 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -26,7 +26,7 @@ struct watchdog_regs { u32 tbr; /* 0x8 */ }; -struct xlnx_wdt_platdata { +struct xlnx_wdt_plat { bool enable_once; struct watchdog_regs *regs; }; @@ -34,7 +34,7 @@ struct xlnx_wdt_platdata { static int xlnx_wdt_reset(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev); debug("%s ", __func__); @@ -51,7 +51,7 @@ static int xlnx_wdt_reset(struct udevice *dev) static int xlnx_wdt_stop(struct udevice *dev) { u32 reg; - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev); if (plat->enable_once) { debug("Can't stop Xilinx watchdog.\n"); @@ -71,7 +71,7 @@ static int xlnx_wdt_stop(struct udevice *dev) static int xlnx_wdt_start(struct udevice *dev, u64 timeout, ulong flags) { - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev); debug("%s:\n", __func__); @@ -92,7 +92,7 @@ static int xlnx_wdt_probe(struct udevice *dev) static int xlnx_wdt_of_to_plat(struct udevice *dev) { - struct xlnx_wdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wdt_plat *plat = dev_get_plat(dev); plat->regs = (struct watchdog_regs *)dev_read_addr(dev); if (IS_ERR(plat->regs)) @@ -123,7 +123,7 @@ U_BOOT_DRIVER(xlnx_wdt) = { .id = UCLASS_WDT, .of_match = xlnx_wdt_ids, .probe = xlnx_wdt_probe, - .plat_auto = sizeof(struct xlnx_wdt_platdata), + .plat_auto = sizeof(struct xlnx_wdt_plat), .of_to_plat = xlnx_wdt_of_to_plat, .ops = &xlnx_wdt_ops, }; diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c index 3e5063c716..49f20436f2 100644 --- a/drivers/watchdog/xilinx_wwdt.c +++ b/drivers/watchdog/xilinx_wwdt.c @@ -36,7 +36,7 @@ struct xlnx_wwdt_priv { struct clk clk; }; -struct xlnx_wwdt_platdata { +struct xlnx_wwdt_plat { bool enable_once; }; @@ -125,7 +125,7 @@ static int xlnx_wwdt_start(struct udevice *dev, u64 timeout, ulong flags) static int xlnx_wwdt_probe(struct udevice *dev) { int ret; - struct xlnx_wwdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wwdt_plat *plat = dev_get_plat(dev); struct xlnx_wwdt_priv *wdt = dev_get_priv(dev); dev_dbg(dev, "%s: Probing wdt%u\n", __func__, dev->seq); @@ -147,7 +147,7 @@ static int xlnx_wwdt_probe(struct udevice *dev) static int xlnx_wwdt_of_to_plat(struct udevice *dev) { - struct xlnx_wwdt_platdata *plat = dev_get_plat(dev); + struct xlnx_wwdt_plat *plat = dev_get_plat(dev); plat->enable_once = dev_read_u32_default(dev, "xlnx,wdt-enable-once", 0); @@ -173,7 +173,7 @@ U_BOOT_DRIVER(xlnx_wwdt) = { .of_match = xlnx_wwdt_ids, .probe = xlnx_wwdt_probe, .priv_auto = sizeof(struct xlnx_wwdt_priv), - .plat_auto = sizeof(struct xlnx_wwdt_platdata), + .plat_auto = sizeof(struct xlnx_wwdt_plat), .of_to_plat = xlnx_wwdt_of_to_plat, .ops = &xlnx_wwdt_ops, }; diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index 0f72241692..6455dfd5c9 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -70,7 +70,7 @@ struct blkfront_dev { u8 *bounce_buffer; }; -struct blkfront_platdata { +struct blkfront_plat { unsigned int devid; }; @@ -685,7 +685,7 @@ static int pvblock_blk_bind(struct udevice *udev) static int pvblock_blk_probe(struct udevice *udev) { struct blkfront_dev *blk_dev = dev_get_priv(udev); - struct blkfront_platdata *plat = dev_get_plat(udev); + struct blkfront_plat *plat = dev_get_plat(udev); struct blk_desc *desc = dev_get_uclass_plat(udev); int ret, devid; @@ -737,12 +737,12 @@ static int on_new_vbd(struct udevice *parent, unsigned int devid) { struct driver_info info; struct udevice *udev; - struct blkfront_platdata *plat; + struct blkfront_plat *plat; int ret; debug("New " DRV_NAME_BLK ", device ID %d\n", devid); - plat = malloc(sizeof(struct blkfront_platdata)); + plat = malloc(sizeof(struct blkfront_plat)); if (!plat) { printf("Failed to allocate platform data\n"); return -ENOMEM; diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h index 4aa955b6b2..66436b9b27 100644 --- a/include/atmel_lcd.h +++ b/include/atmel_lcd.h @@ -10,11 +10,11 @@ #define _ATMEL_LCD_H_ /** - * struct atmel_lcd_platdata - platform data for Atmel LCDs with driver model + * struct atmel_lcd_plat - platform data for Atmel LCDs with driver model * * @timing_index: Index of LCD timing to use in device tree node */ -struct atmel_lcd_platdata { +struct atmel_lcd_plat { int timing_index; }; diff --git a/include/cpu.h b/include/cpu.h index 1d53308f7a..5831bfa742 100644 --- a/include/cpu.h +++ b/include/cpu.h @@ -8,7 +8,7 @@ #define __CPU_H /** - * struct cpu_platdata - platform data for a CPU + * struct cpu_plat - platform data for a CPU * @cpu_id: Platform-specific way of identifying the CPU. * @ucode_version: Microcode version, if CPU_FEAT_UCODE is set * @device_id: Driver-defined device identifier @@ -20,7 +20,7 @@ * This can be accessed with dev_get_parent_plat() for any UCLASS_CPU * device. */ -struct cpu_platdata { +struct cpu_plat { int cpu_id; int ucode_version; ulong device_id; diff --git a/include/dm/platform_data/fsl_espi.h b/include/dm/platform_data/fsl_espi.h index 812933f51c..de2307f7fb 100644 --- a/include/dm/platform_data/fsl_espi.h +++ b/include/dm/platform_data/fsl_espi.h @@ -6,7 +6,7 @@ #ifndef __fsl_espi_h #define __fsl_espi_h -struct fsl_espi_platdata { +struct fsl_espi_plat { uint flags; uint speed_hz; uint num_chipselect; diff --git a/include/dm/platform_data/lpc32xx_hsuart.h b/include/dm/platform_data/lpc32xx_hsuart.h index 9bfd62833c..6f41e0e734 100644 --- a/include/dm/platform_data/lpc32xx_hsuart.h +++ b/include/dm/platform_data/lpc32xx_hsuart.h @@ -7,11 +7,11 @@ #define _LPC32XX_HSUART_PLAT_H /** - * struct lpc32xx_hsuart_platdata - NXP LPC32xx HSUART platform data + * struct lpc32xx_hsuart_plat - NXP LPC32xx HSUART platform data * * @base: Base register address */ -struct lpc32xx_hsuart_platdata { +struct lpc32xx_hsuart_plat { unsigned long base; }; diff --git a/include/dm/platform_data/pxa_mmc_gen.h b/include/dm/platform_data/pxa_mmc_gen.h index 9875bab2cf..d15c1551f4 100644 --- a/include/dm/platform_data/pxa_mmc_gen.h +++ b/include/dm/platform_data/pxa_mmc_gen.h @@ -9,7 +9,7 @@ #include /* - * struct pxa_mmc_platdata - information about a PXA MMC controller + * struct pxa_mmc_plat - information about a PXA MMC controller * * @base: MMC controller base register address */ diff --git a/include/dm/platform_data/serial_bcm283x_mu.h b/include/dm/platform_data/serial_bcm283x_mu.h index 37f5174dbf..6c77272e80 100644 --- a/include/dm/platform_data/serial_bcm283x_mu.h +++ b/include/dm/platform_data/serial_bcm283x_mu.h @@ -14,7 +14,7 @@ * * @base: Register base address */ -struct bcm283x_mu_serial_platdata { +struct bcm283x_mu_serial_plat { unsigned long base; unsigned int clock; bool skip_init; diff --git a/include/dm/platform_data/serial_coldfire.h b/include/dm/platform_data/serial_coldfire.h index ba916fece3..5e265e9087 100644 --- a/include/dm/platform_data/serial_coldfire.h +++ b/include/dm/platform_data/serial_coldfire.h @@ -7,13 +7,13 @@ #define __serial_coldfire_h /* - * struct coldfire_serial_platdata - information about a coldfire port + * struct coldfire_serial_plat - information about a coldfire port * * @base: Uart port base register address * @port: Uart port index, for cpu with pinmux for uart / gpio * baudrtatre: Uart port baudrate */ -struct coldfire_serial_platdata { +struct coldfire_serial_plat { unsigned long base; int port; int baudrate; diff --git a/include/dm/platform_data/serial_mxc.h b/include/dm/platform_data/serial_mxc.h index 86cd3bcf62..cc59eeb1dd 100644 --- a/include/dm/platform_data/serial_mxc.h +++ b/include/dm/platform_data/serial_mxc.h @@ -7,7 +7,7 @@ #define __serial_mxc_h /* Information about a serial port */ -struct mxc_serial_platdata { +struct mxc_serial_plat { struct mxc_uart *reg; /* address of registers in physical memory */ bool use_dte; }; diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h index 77d96c49f0..e3d4e308a1 100644 --- a/include/dm/platform_data/serial_pl01x.h +++ b/include/dm/platform_data/serial_pl01x.h @@ -20,7 +20,7 @@ enum pl01x_type { * @skip_init: Don't attempt to change port configuration (also means @clock * is ignored) */ -struct pl01x_serial_platdata { +struct pl01x_serial_plat { unsigned long base; enum pl01x_type type; unsigned int clock; diff --git a/include/dm/platform_data/serial_pxa.h b/include/dm/platform_data/serial_pxa.h index b78bdb6409..0d7dc4c462 100644 --- a/include/dm/platform_data/serial_pxa.h +++ b/include/dm/platform_data/serial_pxa.h @@ -40,13 +40,13 @@ #endif /* - * struct pxa_serial_platdata - information about a PXA port + * struct pxa_serial_plat - information about a PXA port * * @base: Uart port base register address * @port: Uart port index, for cpu with pinmux for uart / gpio * baudrtatre: Uart port baudrate */ -struct pxa_serial_platdata { +struct pxa_serial_plat { struct pxa_uart_regs *base; int port; int baudrate; diff --git a/include/dm/platform_data/serial_sh.h b/include/dm/platform_data/serial_sh.h index 711435d8f6..69cd012fc5 100644 --- a/include/dm/platform_data/serial_sh.h +++ b/include/dm/platform_data/serial_sh.h @@ -27,7 +27,7 @@ enum sh_serial_type { * @clk_mode: Clock mode, set internal (INT) or external (EXT) * @type: Type of SCIF */ -struct sh_serial_platdata { +struct sh_serial_plat { unsigned long base; unsigned int clk; enum sh_clk_mode clk_mode; diff --git a/include/dm/platform_data/spi_coldfire.h b/include/dm/platform_data/spi_coldfire.h index 8ad8eaedfd..da514bad0d 100644 --- a/include/dm/platform_data/spi_coldfire.h +++ b/include/dm/platform_data/spi_coldfire.h @@ -10,14 +10,14 @@ #define MAX_CTAR_FIELDS 8 /* - * struct coldfire_spi_platdata - information about a coldfire spi module + * struct coldfire_spi_plat - information about a coldfire spi module * * @regs_addr: base address for module registers * @speed_hz: default SCK frequency * @mode: default SPI mode * @num_cs: number of DSPI chipselect signals */ -struct coldfire_spi_platdata { +struct coldfire_spi_plat { fdt_addr_t regs_addr; uint speed_hz; uint mode; diff --git a/include/dm/platform_data/spi_davinci.h b/include/dm/platform_data/spi_davinci.h index fbc62c262a..42a467e40b 100644 --- a/include/dm/platform_data/spi_davinci.h +++ b/include/dm/platform_data/spi_davinci.h @@ -7,7 +7,7 @@ #ifndef __spi_davinci_h #define __spi_davinci_h -struct davinci_spi_platdata { +struct davinci_spi_plat { struct davinci_spi_regs *regs; u8 num_cs; /* total no. of CS available */ }; diff --git a/include/dm/root.h b/include/dm/root.h index 113e92ec78..89afbee619 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -31,7 +31,7 @@ struct global_data; void dm_fixup_for_gd_move(struct global_data *new_gd); /** - * dm_scan_platdata() - Scan all platform data and bind drivers + * dm_scan_plat() - Scan all platform data and bind drivers * * This scans all available plat and creates drivers for each * @@ -39,7 +39,7 @@ void dm_fixup_for_gd_move(struct global_data *new_gd); * flag. If false bind all drivers. * @return 0 if OK, -ve on error */ -int dm_scan_platdata(bool pre_reloc_only); +int dm_scan_plat(bool pre_reloc_only); /** * dm_scan_fdt() - Scan the device tree and bind drivers diff --git a/include/fs_loader.h b/include/fs_loader.h index 1b3c58086f..8de7cb18dc 100644 --- a/include/fs_loader.h +++ b/include/fs_loader.h @@ -31,7 +31,7 @@ struct phandle_part { * @mtdpart: MTD partition for ubi partition. * @ubivol: UBI volume-name for ubifsmount. */ -struct device_platdata { +struct device_plat { struct phandle_part phandlepart; char *mtdpart; char *ubivol; diff --git a/include/ns16550.h b/include/ns16550.h index 08e933ffe7..bef2961032 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -56,7 +56,7 @@ enum ns16550_flags { }; /** - * struct ns16550_platdata - information about a NS16550 port + * struct ns16550_plat - information about a NS16550 port * * @base: Base register address * @reg_width: IO accesses size of registers (in bytes, 1 or 4) @@ -67,7 +67,7 @@ enum ns16550_flags { * @flags: A few flags (enum ns16550_flags) * @bdf: PCI slot/function (pci_dev_t) */ -struct ns16550_platdata { +struct ns16550_plat { unsigned long base; int reg_width; int reg_shift; @@ -111,7 +111,7 @@ struct NS16550 { UART_REG(ssr); /* 11*/ #endif #ifdef CONFIG_DM_SERIAL - struct ns16550_platdata *plat; + struct ns16550_plat *plat; #endif }; diff --git a/include/p2sb.h b/include/p2sb.h index a25170e3d1..ddbc8d5e14 100644 --- a/include/p2sb.h +++ b/include/p2sb.h @@ -17,11 +17,11 @@ #define PCH_P2SB_HBDF 0x70 /** - * struct p2sb_child_platdata - Information about each child of a p2sb device + * struct p2sb_child_plat - Information about each child of a p2sb device * * @pid: Port ID for this child */ -struct p2sb_child_platdata { +struct p2sb_child_plat { uint pid; }; diff --git a/include/pci.h b/include/pci.h index a8472dd268..d5b42cee83 100644 --- a/include/pci.h +++ b/include/pci.h @@ -899,7 +899,7 @@ struct udevice; #ifdef CONFIG_DM_PCI /** - * struct pci_child_platdata - information stored about each PCI device + * struct pci_child_plat - information stored about each PCI device * * Every device on a PCI bus has this per-child data. * @@ -914,7 +914,7 @@ struct udevice; * @pfdev: Handle to Physical Function device * @virtid: Virtual Function Index */ -struct pci_child_platdata { +struct pci_child_plat { int devfn; unsigned short vendor; unsigned short device; diff --git a/include/power/acpi_pmc.h b/include/power/acpi_pmc.h index 222288b71a..64176d79bc 100644 --- a/include/power/acpi_pmc.h +++ b/include/power/acpi_pmc.h @@ -180,7 +180,7 @@ int pmc_disable_tco(struct udevice *dev); */ int pmc_global_reset_set_enable(struct udevice *dev, bool enable); -int pmc_ofdata_to_uc_platdata(struct udevice *dev); +int pmc_ofdata_to_uc_plat(struct udevice *dev); int pmc_disable_tco_base(ulong tco_base); diff --git a/include/regmap.h b/include/regmap.h index c6258face3..8216de015d 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -373,7 +373,7 @@ int regmap_update_bits(struct regmap *map, uint offset, uint mask, uint val); int regmap_init_mem(ofnode node, struct regmap **mapp); /** - * regmap_init_mem_platdata() - Set up a new memory register map for + * regmap_init_mem_plat() - Set up a new memory register map for * of-platdata * * @dev: Device that uses this map @@ -388,8 +388,8 @@ int regmap_init_mem(ofnode node, struct regmap **mapp); * Use regmap_uninit() to free it. * */ -int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count, - struct regmap **mapp); +int regmap_init_mem_plat(struct udevice *dev, fdt_val_t *reg, int count, + struct regmap **mapp); int regmap_init_mem_index(ofnode node, struct regmap **mapp, int index); diff --git a/include/scsi.h b/include/scsi.h index 96cb726676..90cec99e32 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -162,14 +162,14 @@ struct scsi_cmd { #define SCSI_WRITE_SAME 0x41 /* Write Same (O) */ /** - * struct scsi_platdata - stores information about SCSI controller + * struct scsi_plat - stores information about SCSI controller * * @base: Controller base address * @max_lun: Maximum number of logical units * @max_id: Maximum number of target ids * @max_bytes_per_req: Maximum number of bytes per read/write request */ -struct scsi_platdata { +struct scsi_plat { unsigned long base; unsigned long max_lun; unsigned long max_id; diff --git a/include/spi.h b/include/spi.h index 85a785e833..6b42b3e36a 100644 --- a/include/spi.h +++ b/include/spi.h @@ -45,7 +45,7 @@ struct dm_spi_bus { }; /** - * struct dm_spi_platdata - platform data for all SPI slaves + * struct dm_spi_plat - platform data for all SPI slaves * * This describes a SPI slave, a child device of the SPI bus. To obtain this * struct from a spi_slave, use dev_get_parent_plat(dev) or @@ -58,7 +58,7 @@ struct dm_spi_bus { * @max_hz: Maximum bus speed that this slave can tolerate * @mode: SPI mode to use for this device (see SPI mode flags) */ -struct dm_spi_slave_platdata { +struct dm_spi_slave_plat { unsigned int cs; uint max_hz; uint mode; @@ -609,8 +609,7 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp); * @node: Node offset to read from * @plat: Place to put the decoded information */ -int spi_slave_of_to_plat(struct udevice *dev, - struct dm_spi_slave_platdata *plat); +int spi_slave_of_to_plat(struct udevice *dev, struct dm_spi_slave_plat *plat); /** * spi_cs_info() - Check information on a chip select diff --git a/include/syscon.h b/include/syscon.h index 3df96e3276..2e02199c05 100644 --- a/include/syscon.h +++ b/include/syscon.h @@ -33,7 +33,7 @@ struct syscon_ops { * * Update: 64-bit is now supported and we have an education crisis. */ -struct syscon_base_platdata { +struct syscon_base_plat { fdt_val_t reg[2]; }; #endif diff --git a/include/usb.h b/include/usb.h index 9e1ec534ec..b3851fdb4f 100644 --- a/include/usb.h +++ b/include/usb.h @@ -597,16 +597,16 @@ struct usb_hub_device { #if CONFIG_IS_ENABLED(DM_USB) /** - * struct usb_platdata - Platform data about a USB controller + * struct usb_plat - Platform data about a USB controller * * Given a USB controller (UCLASS_USB) dev this is dev_get_plat(dev) */ -struct usb_platdata { +struct usb_plat { enum usb_init_type init_type; }; /** - * struct usb_dev_platdata - Platform data about a USB device + * struct usb_dev_plat - Platform data about a USB device * * Given a USB device dev this structure is dev_get_parent_plat(dev). * This is used by sandbox to provide emulation data also. @@ -617,7 +617,7 @@ struct usb_platdata { * @strings: List of descriptor strings (for sandbox emulation purposes) * @desc_list: List of descriptors (for sandbox emulation purposes) */ -struct usb_dev_platdata { +struct usb_dev_plat { struct usb_device_id id; int devnum; /* @@ -659,14 +659,14 @@ struct usb_bus_priv { }; /** - * struct usb_emul_platdata - platform data about the USB emulator + * struct usb_emul_plat - platform data about the USB emulator * * Given a USB emulator (UCLASS_USB_EMUL) 'dev', this is * dev_get_uclass_plat(dev). * * @port1: USB emulator device port number on the parent hub */ -struct usb_emul_platdata { +struct usb_emul_plat { int port1; /* Port number (numbered from 1) */ }; diff --git a/include/vbe.h b/include/vbe.h index f420f493ee..1631260eb7 100644 --- a/include/vbe.h +++ b/include/vbe.h @@ -104,10 +104,10 @@ struct vbe_ddc_info { extern struct vbe_mode_info mode_info; struct video_priv; -struct video_uc_platdata; +struct video_uc_plat; int vbe_setup_video_priv(struct vesa_mode_info *vesa, struct video_priv *uc_priv, - struct video_uc_platdata *plat); + struct video_uc_plat *plat); int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)); #endif diff --git a/include/video.h b/include/video.h index 31a12bd799..7b7f62a827 100644 --- a/include/video.h +++ b/include/video.h @@ -18,7 +18,7 @@ struct udevice; /** - * struct video_uc_platdata - uclass platform data for a video device + * struct video_uc_plat - uclass platform data for a video device * * This holds information that the uclass needs to know about each device. It * is accessed using dev_get_uclass_plat(dev). See 'Theory of operation' at @@ -31,7 +31,7 @@ struct udevice; * @copy_base: Base address of a hardware copy of the frame buffer. See * CONFIG_VIDEO_COPY. */ -struct video_uc_platdata { +struct video_uc_plat { uint align; uint size; ulong base; @@ -77,7 +77,7 @@ enum video_log2_bpp { * @fb: Frame buffer * @fb_size: Frame buffer size * @copy_fb: Copy of the frame buffer to keep up to date; see struct - * video_uc_platdata + * video_uc_plat * @line_length: Length of each frame buffer line, in bytes. This can be * set by the driver, but if not, the uclass will set it after * probing diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c index 52b21cea70..8efa8e9a53 100644 --- a/lib/acpi/acpi_device.c +++ b/lib/acpi/acpi_device.c @@ -724,7 +724,7 @@ static void acpi_device_write_spi(struct acpi_ctx *ctx, const struct acpi_spi *s static int acpi_device_set_spi(const struct udevice *dev, struct acpi_spi *spi, const char *scope) { - struct dm_spi_slave_platdata *plat; + struct dm_spi_slave_plat *plat; struct spi_slave *slave = dev_get_parent_priv(dev); plat = dev_get_parent_plat(slave->dev); diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 5cccc0ce4d..0937e3595a 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -42,7 +42,7 @@ * handle handle of the controller on which this driver is installed * io block io protocol proxied by this driver */ -struct efi_blk_platdata { +struct efi_blk_plat { efi_handle_t handle; struct efi_block_io *io; }; @@ -59,7 +59,7 @@ struct efi_blk_platdata { static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) { - struct efi_blk_platdata *plat = dev_get_plat(dev); + struct efi_blk_plat *plat = dev_get_plat(dev); struct efi_block_io *io = plat->io; efi_status_t ret; @@ -88,7 +88,7 @@ static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, static ulong efi_bl_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) { - struct efi_blk_platdata *plat = dev_get_plat(dev); + struct efi_blk_plat *plat = dev_get_plat(dev); struct efi_block_io *io = plat->io; efi_status_t ret; @@ -140,7 +140,7 @@ static int efi_bl_bind(efi_handle_t handle, void *interface) struct efi_object *obj = efi_search_obj(handle); struct efi_block_io *io = interface; int disks; - struct efi_blk_platdata *plat; + struct efi_blk_plat *plat; EFI_PRINT("%s: handle %p, interface %p\n", __func__, handle, io); @@ -196,7 +196,7 @@ U_BOOT_DRIVER(efi_blk) = { .name = "efi_blk", .id = UCLASS_BLK, .ops = &efi_blk_ops, - .plat_auto = sizeof(struct efi_blk_platdata), + .plat_auto = sizeof(struct efi_blk_plat), }; /* EFI driver operators */ diff --git a/lib/smbios.c b/lib/smbios.c index 4bd16556e3..1e10fa8420 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -229,7 +229,7 @@ static void smbios_write_type4_dm(struct smbios_type4 *t, ofnode node) uclass_find_first_device(UCLASS_CPU, &cpu); if (cpu) { - struct cpu_platdata *plat = dev_get_parent_plat(cpu); + struct cpu_plat *plat = dev_get_parent_plat(cpu); if (plat->family) processor_family = plat->family; diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 1c7c6caf1b..c5c3726382 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -25,12 +25,12 @@ #define BUF_SIZE 4096 /** - * struct testacpi_platdata - Platform data for the test ACPI device + * struct testacpi_plat - Platform data for the test ACPI device * * @no_name: true to emit an empty ACPI name from testacpi_get_name() * @return_error: true to return an error instead of a name */ -struct testacpi_platdata { +struct testacpi_plat { bool return_error; bool no_name; }; @@ -53,7 +53,7 @@ static int testacpi_write_tables(const struct udevice *dev, static int testacpi_get_name(const struct udevice *dev, char *out_name) { - struct testacpi_platdata *plat = dev_get_plat(dev); + struct testacpi_plat *plat = dev_get_plat(dev); if (plat->return_error) return -EINVAL; @@ -110,7 +110,7 @@ U_BOOT_DRIVER(testacpi_drv) = { .of_match = testacpi_ids, .id = UCLASS_TEST_ACPI, .bind = dm_scan_fdt_dev, - .plat_auto = sizeof(struct testacpi_platdata), + .plat_auto = sizeof(struct testacpi_plat), ACPI_OPS_PTR(&testacpi_ops) }; @@ -422,7 +422,7 @@ DM_TEST(dm_test_acpi_cmd_dump, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); /* Test acpi_device_path() */ static int dm_test_acpi_device_path(struct unit_test_state *uts) { - struct testacpi_platdata *plat; + struct testacpi_plat *plat; char buf[ACPI_PATH_MAX]; struct udevice *dev, *child; diff --git a/test/dm/core.c b/test/dm/core.c index 617458f985..0e0696af98 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -120,7 +120,7 @@ static int dm_test_autobind(struct unit_test_state *uts) ut_asserteq(0, list_count_items(&gd->dm_root->child_head)); ut_asserteq(0, dm_testdrv_op_count[DM_TEST_OP_POST_BIND]); - ut_assertok(dm_scan_platdata(false)); + ut_assertok(dm_scan_plat(false)); /* We should have our test class now at least, plus more children */ ut_assert(1 < list_count_items(&gd->uclass_root)); @@ -264,7 +264,7 @@ static int dm_test_autoprobe(struct unit_test_state *uts) DM_TEST(dm_test_autoprobe, UT_TESTF_SCAN_PDATA); /* Check that we see the correct plat in each device */ -static int dm_test_platdata(struct unit_test_state *uts) +static int dm_test_plat(struct unit_test_state *uts) { const struct dm_test_pdata *pdata; struct udevice *dev; @@ -279,7 +279,7 @@ static int dm_test_platdata(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_platdata, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_plat, UT_TESTF_SCAN_PDATA); /* Test that we can bind, probe, remove, unbind a driver */ static int dm_test_lifecycle(struct unit_test_state *uts) @@ -485,7 +485,7 @@ static int dm_test_leak(struct unit_test_state *uts) dm_leak_check_start(uts); - ut_assertok(dm_scan_platdata(false)); + ut_assertok(dm_scan_plat(false)); ut_assertok(dm_scan_fdt(false)); /* Scanning the uclass is enough to probe all the devices */ diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c index afa7c2c3f3..cfc43a5b03 100644 --- a/test/dm/of_platdata.c +++ b/test/dm/of_platdata.c @@ -8,7 +8,7 @@ #include /* Test that we can find a device using of-platdata */ -static int dm_test_of_platdata_base(struct unit_test_state *uts) +static int dm_test_of_plat_base(struct unit_test_state *uts) { struct udevice *dev; @@ -17,10 +17,10 @@ static int dm_test_of_platdata_base(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_of_platdata_base, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_base, UT_TESTF_SCAN_PDATA); /* Test that we can read properties from a device */ -static int dm_test_of_platdata_props(struct unit_test_state *uts) +static int dm_test_of_plat_props(struct unit_test_state *uts) { struct dtd_sandbox_spl_test *plat; struct udevice *dev; @@ -89,7 +89,7 @@ static int dm_test_of_platdata_props(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_of_platdata_props, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_props, UT_TESTF_SCAN_PDATA); /* * find_driver_info - recursively find the driver_info for a device @@ -139,7 +139,7 @@ static int find_driver_info(struct unit_test_state *uts, struct udevice *parent, } /* Check that every device is recorded in its driver_info struct */ -static int dm_test_of_platdata_dev(struct unit_test_state *uts) +static int dm_test_of_plat_dev(struct unit_test_state *uts) { const struct driver_info *info = ll_entry_start(struct driver_info, driver_info); @@ -171,10 +171,10 @@ static int dm_test_of_platdata_dev(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_of_platdata_dev, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_dev, UT_TESTF_SCAN_PDATA); /* Test handling of phandles that point to other devices */ -static int dm_test_of_platdata_phandle(struct unit_test_state *uts) +static int dm_test_of_plat_phandle(struct unit_test_state *uts) { struct dtd_sandbox_clk_test *plat; struct udevice *dev, *clk; @@ -204,11 +204,11 @@ static int dm_test_of_platdata_phandle(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_of_platdata_phandle, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_phandle, UT_TESTF_SCAN_PDATA); #if CONFIG_IS_ENABLED(OF_PLATDATA_PARENT) /* Test that device parents are correctly set up */ -static int dm_test_of_platdata_parent(struct unit_test_state *uts) +static int dm_test_of_plat_parent(struct unit_test_state *uts) { struct udevice *rtc, *i2c; @@ -218,5 +218,5 @@ static int dm_test_of_platdata_parent(struct unit_test_state *uts) return 0; } -DM_TEST(dm_test_of_platdata_parent, UT_TESTF_SCAN_PDATA); +DM_TEST(dm_test_of_plat_parent, UT_TESTF_SCAN_PDATA); #endif diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 4814e186cb..69458d62c8 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -89,7 +89,7 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test, uts->start = mallinfo(); if (test->flags & UT_TESTF_SCAN_PDATA) - ut_assertok(dm_scan_platdata(false)); + ut_assertok(dm_scan_plat(false)); if (test->flags & UT_TESTF_PROBE_TEST) ut_assertok(do_autoprobe(uts)); if (!CONFIG_IS_ENABLED(OF_PLATDATA) && @@ -211,7 +211,7 @@ int dm_test_main(const char *test_name) gd_set_of_root(uts->of_root); gd->dm_root = NULL; ut_assertok(dm_init(CONFIG_IS_ENABLED(OF_LIVE))); - dm_scan_platdata(false); + dm_scan_plat(false); if (!CONFIG_IS_ENABLED(OF_PLATDATA)) dm_scan_fdt(false);