[PATCH] ARM: davinci: dm644x: Convert LEDs to GPIO descriptor table

Bartosz Golaszewski bgolaszewski at baylibre.com
Mon Aug 3 15:47:58 EDT 2020


On Mon, Jul 27, 2020 at 9:05 AM Linus Walleij <linus.walleij at linaro.org> wrote:
>
> This converts the DaVinci DM644x LEDs to use GPIO
> descriptor look-ups.
>
> Cc: Sekhar Nori <nsekhar at ti.com>
> Cc: Bartosz Golaszewski <bgolaszewski at baylibre.com>
> Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
> ---
>  arch/arm/mach-davinci/board-dm644x-evm.c | 46 +++++++++++++++---------
>  1 file changed, 30 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index a5d3708fedf6..69f799e8036a 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -319,17 +319,14 @@ static struct platform_device rtc_dev = {
>  /* U2 -- LEDs */
>
>  static struct gpio_led evm_leds[] = {
> -       { .name = "DS8", .active_low = 1,
> -               .default_trigger = "heartbeat", },
> -       { .name = "DS7", .active_low = 1, },
> -       { .name = "DS6", .active_low = 1, },
> -       { .name = "DS5", .active_low = 1, },
> -       { .name = "DS4", .active_low = 1, },
> -       { .name = "DS3", .active_low = 1, },
> -       { .name = "DS2", .active_low = 1,
> -               .default_trigger = "mmc0", },
> -       { .name = "DS1", .active_low = 1,
> -               .default_trigger = "disk-activity", },
> +       { .name = "DS8", .default_trigger = "heartbeat", },
> +       { .name = "DS7", },
> +       { .name = "DS6", },
> +       { .name = "DS5", },
> +       { .name = "DS4", },
> +       { .name = "DS3", },
> +       { .name = "DS2", .default_trigger = "mmc0", },
> +       { .name = "DS1", .default_trigger = "disk-activity", },
>  };
>
>  static const struct gpio_led_platform_data evm_led_data = {
> @@ -337,18 +334,35 @@ static const struct gpio_led_platform_data evm_led_data = {
>         .leds           = evm_leds,
>  };
>
> +static struct gpiod_lookup_table evm_leds_gpio_table = {
> +       .dev_id = "leds-gpio.0",
> +       .table = {
> +               /*
> +                * These GPIOs are on a PCF8574 GPIO expander, which
> +                * is in turn named after the I2C device name. This is
> +                * device "u2" on I2C bus 1 with address 0x38.
> +                */
> +               GPIO_LOOKUP_IDX("1-0038", 0, NULL, 0, GPIO_ACTIVE_LOW),
> +               GPIO_LOOKUP_IDX("1-0038", 1, NULL, 1, GPIO_ACTIVE_LOW),
> +               GPIO_LOOKUP_IDX("1-0038", 2, NULL, 2, GPIO_ACTIVE_LOW),
> +               GPIO_LOOKUP_IDX("1-0038", 3, NULL, 3, GPIO_ACTIVE_LOW),
> +               GPIO_LOOKUP_IDX("1-0038", 4, NULL, 4, GPIO_ACTIVE_LOW),
> +               GPIO_LOOKUP_IDX("1-0038", 5, NULL, 5, GPIO_ACTIVE_LOW),
> +               GPIO_LOOKUP_IDX("1-0038", 6, NULL, 6, GPIO_ACTIVE_LOW),
> +               GPIO_LOOKUP_IDX("1-0038", 7, NULL, 7, GPIO_ACTIVE_LOW),
> +               { },
> +       },
> +};
> +
>  static struct platform_device *evm_led_dev;
>
>  static int
>  evm_led_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
>  {
> -       struct gpio_led *leds = evm_leds;
>         int status;
>
> -       while (ngpio--) {
> -               leds->gpio = gpio++;
> -               leds++;
> -       }
> +       /* Add the lookup table */
> +       gpiod_add_lookup_table(&evm_leds_gpio_table);
>
>         /* what an extremely annoying way to be forced to handle
>          * device unregistration ...
> --
> 2.26.2
>

Looks good to me. Unfortunately I don't have this specific davinci board.

Reviewed-by: Bartosz Golaszewski <bgolaszewski at baylibre.com>



More information about the linux-arm-kernel mailing list