ARM/fbdev: sa11x0: Switch to use GPIO descriptors

This converts the SA11x0 frame buffer driver to use
GPIO descriptors. Get the GPIO optional and register
a look-up table specifically for the Shannon machine.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415165055.193113-1-linus.walleij@linaro.org

diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 5bc82e2671c6e69944d11f8d55446873e442a274..351f891b4842e4d0453b047adb8d98995f2a7081 100644 (file)
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -104,6 +104,14 @@ static struct fixed_voltage_config shannon_cf_vcc_pdata __initdata = {
        .enabled_at_boot = 1,
 };
 
+static struct gpiod_lookup_table shannon_display_gpio_table = {
+       .dev_id = "sa11x0-fb",
+       .table = {
+               GPIO_LOOKUP("gpio", 22, "shannon-lcden", GPIO_ACTIVE_HIGH),
+               { },
+       },
+};
+
 static void __init shannon_init(void)
 {
        sa11x0_register_fixed_regulator(0, &shannon_cf_vcc_pdata,
@@ -113,6 +121,7 @@ static void __init shannon_init(void)
        sa11x0_register_pcmcia(0, &shannon_pcmcia0_gpio_table);
        sa11x0_register_pcmcia(1, &shannon_pcmcia1_gpio_table);
        sa11x0_ppc_configure_mcp();
+       gpiod_add_lookup_table(&shannon_display_gpio_table);
        sa11x0_register_lcd(&shannon_lcd_info);
        sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1);
        sa11x0_register_mcp(&shannon_mcp_data);

diff --git a/drivers/video/fbdev/sa1100fb.c b/drivers/video/fbdev/sa1100fb.c
index 2d285cc384cfd8b6732daa5b573d5c4757d3a8f0..3e6e13f7a831968c59edc1e136733c3618f6cebf 100644 (file)
--- a/drivers/video/fbdev/sa1100fb.c
+++ b/drivers/video/fbdev/sa1100fb.c
@@ -173,7 +173,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/cpufreq.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/mutex.h>
@@ -799,8 +799,8 @@ static void sa1100fb_enable_controller(struct sa1100fb_info *fbi)
        writel_relaxed(fbi->dbar2, fbi->base + DBAR2);
        writel_relaxed(fbi->reg_lccr0 | LCCR0_LEN, fbi->base + LCCR0);
 
-       if (machine_is_shannon())
-               gpio_set_value(SHANNON_GPIO_DISP_EN, 1);
+       if (fbi->shannon_lcden)
+               gpiod_set_value(fbi->shannon_lcden, 1);
 
        dev_dbg(fbi->dev, "DBAR1: 0x%08x\n", readl_relaxed(fbi->base + DBAR1));
        dev_dbg(fbi->dev, "DBAR2: 0x%08x\n", readl_relaxed(fbi->base + DBAR2));
@@ -817,8 +817,8 @@ static void sa1100fb_disable_controller(struct sa1100fb_info *fbi)
 
        dev_dbg(fbi->dev, "Disabling LCD controller\n");
 
-       if (machine_is_shannon())
-               gpio_set_value(SHANNON_GPIO_DISP_EN, 0);
+       if (fbi->shannon_lcden)
+               gpiod_set_value(fbi->shannon_lcden, 0);
 
        set_current_state(TASK_UNINTERRUPTIBLE);
        add_wait_queue(&fbi->ctrlr_wait, &wait);
@@ -1173,12 +1173,10 @@ static int sa1100fb_probe(struct platform_device *pdev)
                return ret;
        }
 
-       if (machine_is_shannon()) {
-               ret = devm_gpio_request_one(&pdev->dev, SHANNON_GPIO_DISP_EN,
-                       GPIOF_OUT_INIT_LOW, "display enable");
-               if (ret)
-                       return ret;
-       }
+       fbi->shannon_lcden = gpiod_get_optional(&pdev->dev, "shannon-lcden",
+                                               GPIOD_OUT_LOW);
+       if (IS_ERR(fbi->shannon_lcden))
+               return PTR_ERR(fbi->shannon_lcden);
 
        /* Initialize video memory */
        ret = sa1100fb_map_video_memory(fbi);

diff --git a/drivers/video/fbdev/sa1100fb.h b/drivers/video/fbdev/sa1100fb.h
index d0aa33b0b88a8c07c0f94450fec8cdcf9458c4f0..b4363444fa5dd35b2453a212f80e069d2f04cc02 100644 (file)
--- a/drivers/video/fbdev/sa1100fb.h
+++ b/drivers/video/fbdev/sa1100fb.h
@@ -10,6 +10,8 @@
  * for more details.
  */
 
+struct gpio_desc;
+
 #define LCCR0           0x0000          /* LCD Control Reg. 0 */
 #define LCSR            0x0004          /* LCD Status Reg. */
 #define DBAR1           0x0010          /* LCD DMA Base Address Reg. channel 1 */
@@ -33,6 +35,7 @@ struct sa1100fb_info {
        struct device           *dev;
        const struct sa1100fb_rgb *rgb[NR_RGB];
        void __iomem            *base;
+       struct gpio_desc        *shannon_lcden;
 
        /*
         * These are the addresses we mapped