mirror of
https://github.com/torvalds/linux.git
synced 2025-04-09 14:45:27 +00:00
ARM: spitz: Use software nodes to describe LCD GPIOs
Convert Spitz to use software nodes for specifying GPIOs for the LCD. 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-8-dmitry.torokhov@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
9d91c7c39e
commit
1447c7df38
@ -532,22 +532,24 @@ static struct gpiod_lookup_table spitz_ads7846_gpio_table = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table spitz_lcdcon_gpio_table = {
|
||||
.dev_id = "spi2.1",
|
||||
.table = {
|
||||
GPIO_LOOKUP("sharp-scoop.1", 6, "BL_CONT", GPIO_ACTIVE_LOW),
|
||||
GPIO_LOOKUP("sharp-scoop.1", 7, "BL_ON", GPIO_ACTIVE_HIGH),
|
||||
{ },
|
||||
},
|
||||
static const struct property_entry spitz_lcdcon_props[] = {
|
||||
PROPERTY_ENTRY_GPIO("BL_CONT-gpios",
|
||||
&spitz_scoop_2_gpiochip_node, 6, GPIO_ACTIVE_LOW),
|
||||
PROPERTY_ENTRY_GPIO("BL_ON-gpios",
|
||||
&spitz_scoop_2_gpiochip_node, 7, GPIO_ACTIVE_HIGH),
|
||||
{ }
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table akita_lcdcon_gpio_table = {
|
||||
.dev_id = "spi2.1",
|
||||
.table = {
|
||||
GPIO_LOOKUP("i2c-max7310", 3, "BL_ON", GPIO_ACTIVE_HIGH),
|
||||
GPIO_LOOKUP("i2c-max7310", 4, "BL_CONT", GPIO_ACTIVE_LOW),
|
||||
{ },
|
||||
},
|
||||
static const struct property_entry akita_lcdcon_props[] = {
|
||||
PROPERTY_ENTRY_GPIO("BL_ON-gpios",
|
||||
&akita_max7310_gpiochip_node, 3, GPIO_ACTIVE_HIGH),
|
||||
PROPERTY_ENTRY_GPIO("BL_CONT-gpios",
|
||||
&akita_max7310_gpiochip_node, 4, GPIO_ACTIVE_LOW),
|
||||
{ }
|
||||
};
|
||||
|
||||
static struct software_node spitz_lcdcon_node = {
|
||||
.name = "spitz-lcdcon",
|
||||
};
|
||||
|
||||
static struct corgi_lcd_platform_data spitz_lcdcon_info = {
|
||||
@ -572,6 +574,7 @@ static struct spi_board_info spitz_spi_devices[] = {
|
||||
.bus_num = 2,
|
||||
.chip_select = 1,
|
||||
.platform_data = &spitz_lcdcon_info,
|
||||
.swnode = &spitz_lcdcon_node,
|
||||
}, {
|
||||
.modalias = "max1111",
|
||||
.max_speed_hz = 450000,
|
||||
@ -606,11 +609,6 @@ static void __init spitz_spi_init(void)
|
||||
struct platform_device *pd;
|
||||
int err;
|
||||
|
||||
if (machine_is_akita())
|
||||
gpiod_add_lookup_table(&akita_lcdcon_gpio_table);
|
||||
else
|
||||
gpiod_add_lookup_table(&spitz_lcdcon_gpio_table);
|
||||
|
||||
gpiod_add_lookup_table(&spitz_ads7846_gpio_table);
|
||||
|
||||
pd = platform_device_register_full(&spitz_spi_device_info);
|
||||
@ -619,6 +617,8 @@ static void __init spitz_spi_init(void)
|
||||
pr_err("pxa2xx-spi: failed to instantiate SPI controller: %d\n",
|
||||
err);
|
||||
|
||||
spitz_lcdcon_node.properties = machine_is_akita() ?
|
||||
akita_lcdcon_props : spitz_lcdcon_props;
|
||||
spi_register_board_info(ARRAY_AND_SIZE(spitz_spi_devices));
|
||||
}
|
||||
#else
|
||||
|
Loading…
x
Reference in New Issue
Block a user