diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-04-21 14:43:11 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-04-24 09:53:54 +0900 |
commit | 740314326dd49888647bf84ed44106faf2f161cd (patch) | |
tree | 60b10546fad0cb8fe033daea9838818baa60e4b1 /drivers/pinctrl | |
parent | ac13ce49a4cb9e7629d6c151b754bb15b2ba33da (diff) | |
download | talos-obmc-uboot-740314326dd49888647bf84ed44106faf2f161cd.tar.gz talos-obmc-uboot-740314326dd49888647bf84ed44106faf2f161cd.zip |
pinctrl: uniphier: fix NAND and SD pin-mux settings for PH1-LD11/LD20
I found many mistakes in the initial version.
Fixes: 8a3328c209d0 ("pinctrl: uniphier: support UniPhier PH1-LD20 pinctrl driver")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 3d5ac5f49d..fe154b7dd1 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -22,13 +22,13 @@ static const unsigned i2c3_muxvals[] = {1, 1}; static const unsigned i2c4_pins[] = {61, 62}; static const unsigned i2c4_muxvals[] = {1, 1}; static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16}; -static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0}; + 15, 16, 17}; +static const unsigned nand_muxvals[] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2}; static const unsigned nand_cs1_pins[] = {}; static const unsigned nand_cs1_muxvals[] = {}; static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; -static const unsigned sd_muxvals[] = {8, 8, 8, 8, 8, 8, 8, 8}; /* No SDVOLC */ +static const unsigned sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ static const unsigned uart0_pins[] = {54, 55}; static const unsigned uart0_muxvals[] = {0, 0}; static const unsigned uart1_pins[] = {58, 59}; |