public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: pxa/gumstix: convert vbus gpio to use software nodes

Browse source 
Switch vbus gpios from using a custom GPIO lookup table to software
properties using PROPERTY_ENTRY_GPIO() constructs which closely mimic
device tree gpio properties.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240628180852.1738922-4-dmitry.torokhov@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Dmitry Torokhov 2024-06-28 11:08:43 -07:00 • committed by Arnd Bergmann
parent 917195d6f8
commit f1d6588af9
No known key found for this signature in database
GPG key ID: 60AB47FFC9095227
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-pxa/devices.c
View file

@ -629,6 +629,10 @@ struct platform_device pxa27x_device_pwm1 = {
}; };
#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */ #endif /* CONFIG_PXA27x || CONFIG_PXA3xx */
const struct software_node pxa2xx_gpiochip_node = {
.name = "gpio-pxa",
};
struct resource pxa_resource_gpio[] = { struct resource pxa_resource_gpio[] = {
{ {
.start = 0x40e00000, .start = 0x40e00000,

4
arch/arm/mach-pxa/devices.h
View file

@ -53,8 +53,8 @@ extern struct platform_device pxa_device_asoc_ssp4;
extern struct platform_device pxa25x_device_gpio; extern struct platform_device pxa25x_device_gpio;
extern struct platform_device pxa27x_device_gpio; extern struct platform_device pxa27x_device_gpio;
extern struct platform_device pxa3xx_device_gpio;
extern struct platform_device pxa93x_device_gpio; extern const struct software_node pxa2xx_gpiochip_node;
void __init pxa_register_device(struct platform_device *dev, void *data); void __init pxa_register_device(struct platform_device *dev, void *data);
void __init pxa2xx_set_dmac_info(struct mmp_dma_platdata *dma_pdata); void __init pxa2xx_set_dmac_info(struct mmp_dma_platdata *dma_pdata);

22
arch/arm/mach-pxa/gumstix.c
View file

@ -100,26 +100,22 @@ static void __init gumstix_mmc_init(void)
#endif #endif
#ifdef CONFIG_USB_PXA25X #ifdef CONFIG_USB_PXA25X
static struct gpiod_lookup_table gumstix_gpio_vbus_gpiod_table = { static const struct property_entry spitz_mci_props[] __initconst = {
.dev_id = "gpio-vbus", PROPERTY_ENTRY_GPIO("vbus-gpios", &pxa2xx_gpiochip_node,
.table = { GPIO_GUMSTIX_USB_GPIOn, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP("gpio-pxa", GPIO_GUMSTIX_USB_GPIOn, PROPERTY_ENTRY_GPIO("pullup-gpios", &pxa2xx_gpiochip_node,
"vbus", GPIO_ACTIVE_HIGH), GPIO_GUMSTIX_USB_GPIOx, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP("gpio-pxa", GPIO_GUMSTIX_USB_GPIOx, { }
"pullup", GPIO_ACTIVE_HIGH),
{ },
},
}; };
static struct platform_device gumstix_gpio_vbus = { static const struct platform_device_info gumstix_gpio_vbus_info __initconst = {
.name = "gpio-vbus", .name = "gpio-vbus",
.id = -1, .id = PLATFORM_DEVID_NONE,
}; };
static void __init gumstix_udc_init(void) static void __init gumstix_udc_init(void)
{ {
gpiod_add_lookup_table(&gumstix_gpio_vbus_gpiod_table); platform_device_register_full(&gumstix_gpio_vbus_info);
platform_device_register(&gumstix_gpio_vbus);
} }
#else #else
static void gumstix_udc_init(void) static void gumstix_udc_init(void)

1
arch/arm/mach-pxa/pxa25x.c
View file

@ -239,6 +239,7 @@ static int __init pxa25x_init(void)
register_syscore_ops(&pxa2xx_mfp_syscore_ops); register_syscore_ops(&pxa2xx_mfp_syscore_ops);
if (!of_have_populated_dt()) { if (!of_have_populated_dt()) {
software_node_register(&pxa2xx_gpiochip_node);
pxa2xx_set_dmac_info(&pxa25x_dma_pdata); pxa2xx_set_dmac_info(&pxa25x_dma_pdata);
ret = platform_add_devices(pxa25x_devices, ret = platform_add_devices(pxa25x_devices,
ARRAY_SIZE(pxa25x_devices)); ARRAY_SIZE(pxa25x_devices));