Commit 3af4e877 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski

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: d2951dfa ("mmc: s3cmci: Use the slot GPIO descriptor")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20200806182059.2431-3-krzk@kernel.orgSigned-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent f6d7cde8
...@@ -141,7 +141,7 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = { ...@@ -141,7 +141,7 @@ static struct gpiod_lookup_table at2440evb_mci_gpio_table = {
.dev_id = "s3c2410-sdi", .dev_id = "s3c2410-sdi",
.table = { .table = {
/* Card detect S3C2410_GPG(10) */ /* Card detect S3C2410_GPG(10) */
GPIO_LOOKUP("GPG", 10, "cd", GPIO_ACTIVE_LOW), GPIO_LOOKUP("GPIOG", 10, "cd", GPIO_ACTIVE_LOW),
{ }, { },
}, },
}; };
......
...@@ -467,9 +467,9 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = { ...@@ -467,9 +467,9 @@ static struct gpiod_lookup_table h1940_mmc_gpio_table = {
.dev_id = "s3c2410-sdi", .dev_id = "s3c2410-sdi",
.table = { .table = {
/* Card detect S3C2410_GPF(5) */ /* 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) */ /* Write protect S3C2410_GPH(8) */
GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), GPIO_LOOKUP("GPIOH", 8, "wp", GPIO_ACTIVE_LOW),
{ }, { },
}, },
}; };
......
...@@ -242,9 +242,9 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = { ...@@ -242,9 +242,9 @@ static struct gpiod_lookup_table mini2440_mmc_gpio_table = {
.dev_id = "s3c2410-sdi", .dev_id = "s3c2410-sdi",
.table = { .table = {
/* Card detect S3C2410_GPG(8) */ /* 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) */ /* Write protect S3C2410_GPH(8) */
GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_HIGH), GPIO_LOOKUP("GPIOH", 8, "wp", GPIO_ACTIVE_HIGH),
{ }, { },
}, },
}; };
......
...@@ -388,9 +388,9 @@ static struct gpiod_lookup_table n30_mci_gpio_table = { ...@@ -388,9 +388,9 @@ static struct gpiod_lookup_table n30_mci_gpio_table = {
.dev_id = "s3c2410-sdi", .dev_id = "s3c2410-sdi",
.table = { .table = {
/* Card detect S3C2410_GPF(1) */ /* 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) */ /* Write protect S3C2410_GPG(10) */
GPIO_LOOKUP("GPG", 10, "wp", GPIO_ACTIVE_LOW), GPIO_LOOKUP("GPIOG", 10, "wp", GPIO_ACTIVE_LOW),
{ }, { },
}, },
}; };
......
...@@ -570,9 +570,9 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = { ...@@ -570,9 +570,9 @@ static struct gpiod_lookup_table rx1950_mmc_gpio_table = {
.dev_id = "s3c2410-sdi", .dev_id = "s3c2410-sdi",
.table = { .table = {
/* Card detect S3C2410_GPF(5) */ /* 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) */ /* Write protect S3C2410_GPH(8) */
GPIO_LOOKUP("GPH", 8, "wp", GPIO_ACTIVE_LOW), GPIO_LOOKUP("GPIOH", 8, "wp", GPIO_ACTIVE_LOW),
{ }, { },
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment