ARM: s3c24xx: fix mmc gpio lookup tables

[ 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>

diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
index 58c5ef3cf1d7e583a4bb49172aad1e7938e318eb..2d370f7f75fa295efdb283d475b82bd288b45098 100644 (file)
--- 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 e1c372e5447b6a5b9bb9707da961b872a4782c47..82cc37513779c3755926d2cf4c620974cd02a28d 100644 (file)
--- 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 9035f868fb34e9e70ea656e1e0514dd9dcccde5b..3a5b1124037b26447eee6cd81b504ac2fa3e5e85 100644 (file)
--- 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 d856f23939affd8acc5611f246be722b7d39ff75..ffa20f52aa832a842771ded397b6ceb3a704b15f 100644 (file)
--- 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 fde98b175c7521ea5e621adcda7b6370cc8edff6..c0a06f123cfeae1a21c3fd77482c5a68f20609fd 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -571,9 +571,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),
                { },
        },
 };