lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 851/879] ARM: pxa: maybe fix gpio lookup tables
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    commit 2672a4bff6c03a20d5ae460a091f67ee782c3eff upstream.

    >From inspection I found a couple of GPIO lookups that are
    listed with device "gpio-pxa", but actually have a number
    from a different gpio controller.

    Try to rectify that here, with a guess of what the actual
    device name is.

    Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
    Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
    Cc: stable@vger.kernel.org
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/arm/mach-pxa/cm-x300.c | 8 ++++----
    arch/arm/mach-pxa/magician.c | 2 +-
    arch/arm/mach-pxa/tosa.c | 4 ++--
    3 files changed, 7 insertions(+), 7 deletions(-)

    --- a/arch/arm/mach-pxa/cm-x300.c
    +++ b/arch/arm/mach-pxa/cm-x300.c
    @@ -354,13 +354,13 @@ static struct platform_device cm_x300_sp
    static struct gpiod_lookup_table cm_x300_spi_gpiod_table = {
    .dev_id = "spi_gpio",
    .table = {
    - GPIO_LOOKUP("gpio-pxa", GPIO_LCD_SCL,
    + GPIO_LOOKUP("pca9555.1", GPIO_LCD_SCL - GPIO_LCD_BASE,
    "sck", GPIO_ACTIVE_HIGH),
    - GPIO_LOOKUP("gpio-pxa", GPIO_LCD_DIN,
    + GPIO_LOOKUP("pca9555.1", GPIO_LCD_DIN - GPIO_LCD_BASE,
    "mosi", GPIO_ACTIVE_HIGH),
    - GPIO_LOOKUP("gpio-pxa", GPIO_LCD_DOUT,
    + GPIO_LOOKUP("pca9555.1", GPIO_LCD_DOUT - GPIO_LCD_BASE,
    "miso", GPIO_ACTIVE_HIGH),
    - GPIO_LOOKUP("gpio-pxa", GPIO_LCD_CS,
    + GPIO_LOOKUP("pca9555.1", GPIO_LCD_CS - GPIO_LCD_BASE,
    "cs", GPIO_ACTIVE_HIGH),
    { },
    },
    --- a/arch/arm/mach-pxa/magician.c
    +++ b/arch/arm/mach-pxa/magician.c
    @@ -681,7 +681,7 @@ static struct platform_device bq24022 =
    static struct gpiod_lookup_table bq24022_gpiod_table = {
    .dev_id = "gpio-regulator",
    .table = {
    - GPIO_LOOKUP("gpio-pxa", EGPIO_MAGICIAN_BQ24022_ISET2,
    + GPIO_LOOKUP("htc-egpio-0", EGPIO_MAGICIAN_BQ24022_ISET2 - MAGICIAN_EGPIO_BASE,
    NULL, GPIO_ACTIVE_HIGH),
    GPIO_LOOKUP("gpio-pxa", GPIO30_MAGICIAN_BQ24022_nCHARGE_EN,
    "enable", GPIO_ACTIVE_LOW),
    --- a/arch/arm/mach-pxa/tosa.c
    +++ b/arch/arm/mach-pxa/tosa.c
    @@ -296,9 +296,9 @@ static struct gpiod_lookup_table tosa_mc
    .table = {
    GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_nSD_DETECT,
    "cd", GPIO_ACTIVE_LOW),
    - GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_SD_WP,
    + GPIO_LOOKUP("sharp-scoop.0", TOSA_GPIO_SD_WP - TOSA_SCOOP_GPIO_BASE,
    "wp", GPIO_ACTIVE_LOW),
    - GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_PWR_ON,
    + GPIO_LOOKUP("sharp-scoop.0", TOSA_GPIO_PWR_ON - TOSA_SCOOP_GPIO_BASE,
    "power", GPIO_ACTIVE_HIGH),
    { },
    },

    \
     
     \ /
      Last update: 2022-06-08 04:50    [W:4.029 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site