diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-31 23:38:52 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-08-13 07:15:05 -0400 |
commit | 39b87ad166114b842159e5384a948b168cfa61d8 (patch) | |
tree | e54bd6fbcbbb87cd9f15940db85316c157ef6154 /drivers/pinctrl/uniphier | |
parent | d7f005e8392e41014864b717e00a0777ebcfc64e (diff) |
pinctrl: UniPhier: PH1-Pro5: add I2C ch6 pin-mux setting
The initial version of this driver missed to add I2C ch6 pin-muxing.
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-ph1-pro5.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c b/drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c index b35cf4a24bb7..9af455978058 100644 --- a/drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c +++ b/drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | |||
@@ -810,6 +810,8 @@ static const unsigned i2c5b_pins[] = {196, 197}; | |||
810 | static const unsigned i2c5b_muxvals[] = {2, 2}; | 810 | static const unsigned i2c5b_muxvals[] = {2, 2}; |
811 | static const unsigned i2c5c_pins[] = {215, 216}; | 811 | static const unsigned i2c5c_pins[] = {215, 216}; |
812 | static const unsigned i2c5c_muxvals[] = {2, 2}; | 812 | static const unsigned i2c5c_muxvals[] = {2, 2}; |
813 | static const unsigned i2c6_pins[] = {101, 102}; | ||
814 | static const unsigned i2c6_muxvals[] = {2, 2}; | ||
813 | static const unsigned nand_pins[] = {19, 20, 21, 22, 23, 24, 25, 28, 29, 30, | 815 | static const unsigned nand_pins[] = {19, 20, 21, 22, 23, 24, 25, 28, 29, 30, |
814 | 31, 32, 33, 34, 35}; | 816 | 31, 32, 33, 34, 35}; |
815 | static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | 817 | static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
@@ -927,6 +929,7 @@ static const struct uniphier_pinctrl_group ph1_pro5_groups[] = { | |||
927 | UNIPHIER_PINCTRL_GROUP(i2c5), | 929 | UNIPHIER_PINCTRL_GROUP(i2c5), |
928 | UNIPHIER_PINCTRL_GROUP(i2c5b), | 930 | UNIPHIER_PINCTRL_GROUP(i2c5b), |
929 | UNIPHIER_PINCTRL_GROUP(i2c5c), | 931 | UNIPHIER_PINCTRL_GROUP(i2c5c), |
932 | UNIPHIER_PINCTRL_GROUP(i2c6), | ||
930 | UNIPHIER_PINCTRL_GROUP(uart0), | 933 | UNIPHIER_PINCTRL_GROUP(uart0), |
931 | UNIPHIER_PINCTRL_GROUP(uart0b), | 934 | UNIPHIER_PINCTRL_GROUP(uart0b), |
932 | UNIPHIER_PINCTRL_GROUP(uart1), | 935 | UNIPHIER_PINCTRL_GROUP(uart1), |
@@ -1204,6 +1207,7 @@ static const char * const i2c1_groups[] = {"i2c1"}; | |||
1204 | static const char * const i2c2_groups[] = {"i2c2"}; | 1207 | static const char * const i2c2_groups[] = {"i2c2"}; |
1205 | static const char * const i2c3_groups[] = {"i2c3"}; | 1208 | static const char * const i2c3_groups[] = {"i2c3"}; |
1206 | static const char * const i2c5_groups[] = {"i2c5", "i2c5b", "i2c5c"}; | 1209 | static const char * const i2c5_groups[] = {"i2c5", "i2c5b", "i2c5c"}; |
1210 | static const char * const i2c6_groups[] = {"i2c6"}; | ||
1207 | static const char * const nand_groups[] = {"nand", "nand_cs1"}; | 1211 | static const char * const nand_groups[] = {"nand", "nand_cs1"}; |
1208 | static const char * const uart0_groups[] = {"uart0", "uart0b"}; | 1212 | static const char * const uart0_groups[] = {"uart0", "uart0b"}; |
1209 | static const char * const uart1_groups[] = {"uart1"}; | 1213 | static const char * const uart1_groups[] = {"uart1"}; |
@@ -1290,6 +1294,7 @@ static const struct uniphier_pinmux_function ph1_pro5_functions[] = { | |||
1290 | UNIPHIER_PINMUX_FUNCTION(i2c2), | 1294 | UNIPHIER_PINMUX_FUNCTION(i2c2), |
1291 | UNIPHIER_PINMUX_FUNCTION(i2c3), | 1295 | UNIPHIER_PINMUX_FUNCTION(i2c3), |
1292 | UNIPHIER_PINMUX_FUNCTION(i2c5), | 1296 | UNIPHIER_PINMUX_FUNCTION(i2c5), |
1297 | UNIPHIER_PINMUX_FUNCTION(i2c6), | ||
1293 | UNIPHIER_PINMUX_FUNCTION(nand), | 1298 | UNIPHIER_PINMUX_FUNCTION(nand), |
1294 | UNIPHIER_PINMUX_FUNCTION(uart0), | 1299 | UNIPHIER_PINMUX_FUNCTION(uart0), |
1295 | UNIPHIER_PINMUX_FUNCTION(uart1), | 1300 | UNIPHIER_PINMUX_FUNCTION(uart1), |