lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 298/408] ARM: s3c24xx: fix mmc gpio lookup tables
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit 3af4e8774b6d03683932b0961998e01355bccd74 ]

    The gpio controller names differ between s3c24xx and s3c64xx,
    and it seems that these all got the wrong names, using GPx instead
    of GPIOx.

    Fixes: d2951dfa070d ("mmc: s3cmci: Use the slot GPIO descriptor")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
    Link: https://lore.kernel.org/r/20200806182059.2431-3-krzk@kernel.org
    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 +-
    arch/arm/mach-s3c24xx/mach-h1940.c | 4 ++--
    arch/arm/mach-s3c24xx/mach-mini2440.c | 4 ++--
    arch/arm/mach-s3c24xx/mach-n30.c | 4 ++--
    arch/arm/mach-s3c24xx/mach-rx1950.c | 4 ++--
    5 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
    index 58c5ef3cf1d7e..2d370f7f75fa2 100644
    --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
    +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
    @@ -143,7 +143,7 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = {
    .dev_id = "s3c2410-sdi",
    .table = {
    /* Card detect S3C2410_GPG(10) */
    - GPIO_LOOKUP("GPG", 10, "cd", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOG", 10, "cd", GPIO_ACTIVE_LOW),
    { },
    },
    };
    diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
    index 74d6b68e91c74..8d9d8e7c71d4c 100644
    --- a/arch/arm/mach-s3c24xx/mach-h1940.c
    +++ b/arch/arm/mach-s3c24xx/mach-h1940.c
    @@ -468,9 +468,9 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = {
    .dev_id = "s3c2410-sdi",
    .table = {
    /* Card detect S3C2410_GPF(5) */
    - GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOF", 5, "cd", GPIO_ACTIVE_LOW),
    /* Write protect S3C2410_GPH(8) */
    - GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOH", 8, "wp", GPIO_ACTIVE_LOW),
    { },
    },
    };
    diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
    index 9035f868fb34e..3a5b1124037b2 100644
    --- a/arch/arm/mach-s3c24xx/mach-mini2440.c
    +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
    @@ -244,9 +244,9 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = {
    .dev_id = "s3c2410-sdi",
    .table = {
    /* Card detect S3C2410_GPG(8) */
    - GPIO_LOOKUP("GPG", 8, "cd", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOG", 8, "cd", GPIO_ACTIVE_LOW),
    /* Write protect S3C2410_GPH(8) */
    - GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_HIGH),
    + GPIO_LOOKUP("GPIOH", 8, "wp", GPIO_ACTIVE_HIGH),
    { },
    },
    };
    diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c
    index d856f23939aff..ffa20f52aa832 100644
    --- a/arch/arm/mach-s3c24xx/mach-n30.c
    +++ b/arch/arm/mach-s3c24xx/mach-n30.c
    @@ -359,9 +359,9 @@ static struct gpiod_lookup_table n30_mci_gpio_table = {
    .dev_id = "s3c2410-sdi",
    .table = {
    /* Card detect S3C2410_GPF(1) */
    - GPIO_LOOKUP("GPF", 1, "cd", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOF", 1, "cd", GPIO_ACTIVE_LOW),
    /* Write protect S3C2410_GPG(10) */
    - GPIO_LOOKUP("GPG", 10, "wp", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOG", 10, "wp", GPIO_ACTIVE_LOW),
    { },
    },
    };
    diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
    index 29f9b345a5311..534e9c1d8161f 100644
    --- a/arch/arm/mach-s3c24xx/mach-rx1950.c
    +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
    @@ -567,9 +567,9 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = {
    .dev_id = "s3c2410-sdi",
    .table = {
    /* Card detect S3C2410_GPF(5) */
    - GPIO_LOOKUP("GPF", 5, "cd", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOF", 5, "cd", GPIO_ACTIVE_LOW),
    /* Write protect S3C2410_GPH(8) */
    - GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW),
    + GPIO_LOOKUP("GPIOH", 8, "wp", GPIO_ACTIVE_LOW),
    { },
    },
    };
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:32    [W:2.973 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site