Merge tag 'for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[platform/kernel/linux-starfive.git] / arch / arm / mach-pxa / z2.c

diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index a5dad8d..8e74fbb 100644 (file)
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -20,7 +20,6 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/spi/libertas_spi.h>
-#include <linux/spi/lms283gf05.h>
 #include <linux/power_supply.h>
 #include <linux/mtd/physmap.h>
 #include <linux/gpio.h>
@@ -588,8 +587,13 @@ static struct pxa2xx_spi_chip lms283_chip_info = {
        .gpio_cs        = GPIO88_ZIPITZ2_LCD_CS,
 };
 
-static const struct lms283gf05_pdata lms283_pdata = {
-       .reset_gpio     = GPIO19_ZIPITZ2_LCD_RESET,
+static struct gpiod_lookup_table lms283_gpio_table = {
+       .dev_id = "spi2.0", /* SPI bus 2 chip select 0 */
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO19_ZIPITZ2_LCD_RESET,
+                           "reset", GPIO_ACTIVE_LOW),
+               { },
+       },
 };
 
 static struct spi_board_info spi_board_info[] __initdata = {
@@ -605,7 +609,6 @@ static struct spi_board_info spi_board_info[] __initdata = {
 {
        .modalias               = "lms283gf05",
        .controller_data        = &lms283_chip_info,
-       .platform_data          = &lms283_pdata,
        .max_speed_hz           = 400000,
        .bus_num                = 2,
        .chip_select            = 0,
@@ -625,6 +628,7 @@ static void __init z2_spi_init(void)
 {
        pxa2xx_set_spi_info(1, &pxa_ssp1_master_info);
        pxa2xx_set_spi_info(2, &pxa_ssp2_master_info);
+       gpiod_add_lookup_table(&lms283_gpio_table);
        spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
 }
 #else