ARM: s3c24xx: fix mmc gpio lookup tables

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>

diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
index 6da4dcfd5c0ff09446f6b72a6ee7156226d0244e..fe8f9f1bdc0a374583a95e3028a4dbb907ba2d2e 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
@@ -141,7 +141,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 c09f61d35d57661681f4517e4ba2f39a1a6b97f4..9c71472c939fba752f00f338e106760bd2ac6c68 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -467,9 +467,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 5bfe9ef627167f583871586495ead821dcdce699..65f48094114e644b58693cc1a53e60a4175db5a1 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -242,9 +242,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 b9ceacfdd6efbe4ea6df0bdc644a3d464140e8c8..152f09242579451c3053d64f75727799742a7ab8 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-n30.c
+++ b/arch/arm/mach-s3c24xx/mach-n30.c
@@ -388,9 +388,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 c46fb6b9e11a97a401dcc83d7d3fe1450b072971..65440c39500eb18faafc13ced16fbf4802bb2efb 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -570,9 +570,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),
                { },
        },
 };