x86/platform/geode: Convert geode LED to GPIO machine descriptor

Look up the LED from a GPIO machine descriptor table. The Geode LEDs
should be on the CS5535 companion chip.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lkml.kernel.org/r/20201124085339.6181-2-linus.walleij@linaro.org

diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c
index 73a3f49b4eb6368e75fca4bff5cb3a30c2e6a521..d263528c90bbf10f676df580d25d83301956bc27 100644 (file)
--- a/arch/x86/platform/geode/geos.c
+++ b/arch/x86/platform/geode/geos.c
@@ -20,6 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
+#include <linux/gpio/machine.h>
 #include <linux/dmi.h>
 
 #include <asm/geode.h>
@@ -53,21 +54,15 @@ static struct platform_device geos_buttons_dev = {
 static struct gpio_led geos_leds[] = {
        {
                .name = "geos:1",
-               .gpio = 6,
                .default_trigger = "default-on",
-               .active_low = 1,
        },
        {
                .name = "geos:2",
-               .gpio = 25,
                .default_trigger = "default-off",
-               .active_low = 1,
        },
        {
                .name = "geos:3",
-               .gpio = 27,
                .default_trigger = "default-off",
-               .active_low = 1,
        },
 };
 
@@ -76,6 +71,17 @@ static struct gpio_led_platform_data geos_leds_data = {
        .leds = geos_leds,
 };
 
+static struct gpiod_lookup_table geos_leds_gpio_table = {
+       .dev_id = "leds-gpio",
+       .table = {
+               /* The Geode GPIOs should be on the CS5535 companion chip */
+               GPIO_LOOKUP_IDX("cs5535-gpio", 6, NULL, 0, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("cs5535-gpio", 25, NULL, 1, GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP_IDX("cs5535-gpio", 27, NULL, 2, GPIO_ACTIVE_LOW),
+               { }
+       },
+};
+
 static struct platform_device geos_leds_dev = {
        .name = "leds-gpio",
        .id = -1,
@@ -90,6 +96,7 @@ static struct platform_device *geos_devs[] __initdata = {
 static void __init register_geos(void)
 {
        /* Setup LED control through leds-gpio driver */
+       gpiod_add_lookup_table(&geos_leds_gpio_table);
        platform_add_devices(geos_devs, ARRAY_SIZE(geos_devs));
 }