diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-06 21:36:05 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-06-08 05:13:11 -0400 |
commit | 9467f5688bdc0469ece5cfaa4bb4ee8a35e80abd (patch) | |
tree | 62ecc3144488e6a2e5cf50c19bc329287bef6ead /drivers/pinctrl/uniphier | |
parent | d2fcd62a9c6ad5122cbe2c8f5a45e2f31dbda169 (diff) |
pinctrl: uniphier: fix NAND pin-mux settings for PH1-LD11/LD20
My mistake in the initial support patches.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/uniphier')
-rw-r--r-- | drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c index 418ccd6170f3..150942f918ff 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | |||
@@ -484,7 +484,7 @@ static const unsigned i2c4_pins[] = {61, 62}; | |||
484 | static const int i2c4_muxvals[] = {1, 1}; | 484 | static const int i2c4_muxvals[] = {1, 1}; |
485 | static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, | 485 | static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, |
486 | 15, 16, 17}; | 486 | 15, 16, 17}; |
487 | static const int nand_muxvals[] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; | 487 | static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; |
488 | static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; | 488 | static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; |
489 | static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ | 489 | static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ |
490 | static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13, | 490 | static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13, |
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 2cb26b74042a..7311453b5b79 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | |||
@@ -565,7 +565,7 @@ static const unsigned i2c4_pins[] = {61, 62}; | |||
565 | static const int i2c4_muxvals[] = {1, 1}; | 565 | static const int i2c4_muxvals[] = {1, 1}; |
566 | static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, | 566 | static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, |
567 | 15, 16, 17}; | 567 | 15, 16, 17}; |
568 | static const int nand_muxvals[] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; | 568 | static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; |
569 | static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; | 569 | static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; |
570 | static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ | 570 | static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ |
571 | static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13, | 571 | static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13, |