Skip to content

Commit e86c620

Browse files
masahir0ylinusw
masahir0y
authored and
linusw
committed
pinctrl: uniphier: add SD card pinmux settings
Add SD card pinmux settings for PH1-LD4, PH1-Pro4, PH1-sLD8, PH1-Pro5, ProXstream2, and PH1-LD6b SoCs. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent be2cbd4 commit e86c620

File tree

6 files changed

+36
-0
lines changed

6 files changed

+36
-0
lines changed

‎drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,8 @@ static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
537537
0, 0};
538538
static const unsigned nand_cs1_pins[] = {22, 23};
539539
static const unsigned nand_cs1_muxvals[] = {0, 0};
540+
static const unsigned sd_pins[] = {44, 45, 46, 47, 48, 49, 50, 51, 52};
541+
static const unsigned sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
540542
static const unsigned uart0_pins[] = {85, 88};
541543
static const unsigned uart0_muxvals[] = {1, 1};
542544
static const unsigned uart1_pins[] = {155, 156};
@@ -619,6 +621,7 @@ static const struct uniphier_pinctrl_group ph1_ld4_groups[] = {
619621
UNIPHIER_PINCTRL_GROUP(i2c3),
620622
UNIPHIER_PINCTRL_GROUP(nand),
621623
UNIPHIER_PINCTRL_GROUP(nand_cs1),
624+
UNIPHIER_PINCTRL_GROUP(sd),
622625
UNIPHIER_PINCTRL_GROUP(uart0),
623626
UNIPHIER_PINCTRL_GROUP(uart1),
624627
UNIPHIER_PINCTRL_GROUP(uart1b),
@@ -776,6 +779,7 @@ static const char * const i2c1_groups[] = {"i2c1"};
776779
static const char * const i2c2_groups[] = {"i2c2"};
777780
static const char * const i2c3_groups[] = {"i2c3"};
778781
static const char * const nand_groups[] = {"nand", "nand_cs1"};
782+
static const char * const sd_groups[] = {"sd"};
779783
static const char * const uart0_groups[] = {"uart0"};
780784
static const char * const uart1_groups[] = {"uart1", "uart1b"};
781785
static const char * const uart2_groups[] = {"uart2"};
@@ -831,6 +835,7 @@ static const struct uniphier_pinmux_function ph1_ld4_functions[] = {
831835
UNIPHIER_PINMUX_FUNCTION(i2c2),
832836
UNIPHIER_PINMUX_FUNCTION(i2c3),
833837
UNIPHIER_PINMUX_FUNCTION(nand),
838+
UNIPHIER_PINMUX_FUNCTION(sd),
834839
UNIPHIER_PINMUX_FUNCTION(uart0),
835840
UNIPHIER_PINMUX_FUNCTION(uart1),
836841
UNIPHIER_PINMUX_FUNCTION(uart2),

‎drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
761761
0, 0};
762762
static const unsigned nand_cs1_pins[] = {37, 38};
763763
static const unsigned nand_cs1_muxvals[] = {0, 0};
764+
static const unsigned sd_pins[] = {47, 48, 49, 50, 51, 52, 53, 54, 55};
765+
static const unsigned sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
764766
static const unsigned uart0_pins[] = {135, 136};
765767
static const unsigned uart0_muxvals[] = {3, 3};
766768
static const unsigned uart0b_pins[] = {11, 12};
@@ -866,6 +868,7 @@ static const struct uniphier_pinctrl_group ph1_ld6b_groups[] = {
866868
UNIPHIER_PINCTRL_GROUP(i2c3),
867869
UNIPHIER_PINCTRL_GROUP(nand),
868870
UNIPHIER_PINCTRL_GROUP(nand_cs1),
871+
UNIPHIER_PINCTRL_GROUP(sd),
869872
UNIPHIER_PINCTRL_GROUP(uart0),
870873
UNIPHIER_PINCTRL_GROUP(uart0b),
871874
UNIPHIER_PINCTRL_GROUP(uart1),
@@ -1136,6 +1139,7 @@ static const char * const i2c1_groups[] = {"i2c1"};
11361139
static const char * const i2c2_groups[] = {"i2c2"};
11371140
static const char * const i2c3_groups[] = {"i2c3"};
11381141
static const char * const nand_groups[] = {"nand", "nand_cs1"};
1142+
static const char * const sd_groups[] = {"sd"};
11391143
static const char * const uart0_groups[] = {"uart0", "uart0b"};
11401144
static const char * const uart1_groups[] = {"uart1", "uart1b"};
11411145
static const char * const uart2_groups[] = {"uart2", "uart2b"};
@@ -1219,6 +1223,7 @@ static const struct uniphier_pinmux_function ph1_ld6b_functions[] = {
12191223
UNIPHIER_PINMUX_FUNCTION(i2c2),
12201224
UNIPHIER_PINMUX_FUNCTION(i2c3),
12211225
UNIPHIER_PINMUX_FUNCTION(nand),
1226+
UNIPHIER_PINMUX_FUNCTION(sd),
12221227
UNIPHIER_PINMUX_FUNCTION(uart0),
12231228
UNIPHIER_PINMUX_FUNCTION(uart1),
12241229
UNIPHIER_PINMUX_FUNCTION(uart2),

‎drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,11 @@ static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
10311031
0, 0};
10321032
static const unsigned nand_cs1_pins[] = {131, 132};
10331033
static const unsigned nand_cs1_muxvals[] = {1, 1};
1034+
static const unsigned sd_pins[] = {150, 151, 152, 153, 154, 155, 156, 157, 158};
1035+
static const unsigned sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
1036+
static const unsigned sd1_pins[] = {319, 320, 321, 322, 323, 324, 325, 326,
1037+
327};
1038+
static const unsigned sd1_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
10341039
static const unsigned uart0_pins[] = {127, 128};
10351040
static const unsigned uart0_muxvals[] = {0, 0};
10361041
static const unsigned uart1_pins[] = {129, 130};
@@ -1140,6 +1145,8 @@ static const struct uniphier_pinctrl_group ph1_pro4_groups[] = {
11401145
UNIPHIER_PINCTRL_GROUP(i2c6),
11411146
UNIPHIER_PINCTRL_GROUP(nand),
11421147
UNIPHIER_PINCTRL_GROUP(nand_cs1),
1148+
UNIPHIER_PINCTRL_GROUP(sd),
1149+
UNIPHIER_PINCTRL_GROUP(sd1),
11431150
UNIPHIER_PINCTRL_GROUP(uart0),
11441151
UNIPHIER_PINCTRL_GROUP(uart1),
11451152
UNIPHIER_PINCTRL_GROUP(uart2),
@@ -1412,6 +1419,8 @@ static const char * const i2c2_groups[] = {"i2c2"};
14121419
static const char * const i2c3_groups[] = {"i2c3"};
14131420
static const char * const i2c6_groups[] = {"i2c6"};
14141421
static const char * const nand_groups[] = {"nand", "nand_cs1"};
1422+
static const char * const sd_groups[] = {"sd"};
1423+
static const char * const sd1_groups[] = {"sd1"};
14151424
static const char * const uart0_groups[] = {"uart0"};
14161425
static const char * const uart1_groups[] = {"uart1"};
14171426
static const char * const uart2_groups[] = {"uart2"};
@@ -1498,6 +1507,8 @@ static const struct uniphier_pinmux_function ph1_pro4_functions[] = {
14981507
UNIPHIER_PINMUX_FUNCTION(i2c3),
14991508
UNIPHIER_PINMUX_FUNCTION(i2c6),
15001509
UNIPHIER_PINMUX_FUNCTION(nand),
1510+
UNIPHIER_PINMUX_FUNCTION(sd),
1511+
UNIPHIER_PINMUX_FUNCTION(sd1),
15011512
UNIPHIER_PINMUX_FUNCTION(uart0),
15021513
UNIPHIER_PINMUX_FUNCTION(uart1),
15031514
UNIPHIER_PINMUX_FUNCTION(uart2),

‎drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,8 @@ static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
818818
0, 0};
819819
static const unsigned nand_cs1_pins[] = {26, 27};
820820
static const unsigned nand_cs1_muxvals[] = {0, 0};
821+
static const unsigned sd_pins[] = {250, 251, 252, 253, 254, 255, 256, 257, 258};
822+
static const unsigned sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
821823
static const unsigned uart0_pins[] = {47, 48};
822824
static const unsigned uart0_muxvals[] = {0, 0};
823825
static const unsigned uart0b_pins[] = {227, 228};
@@ -930,6 +932,7 @@ static const struct uniphier_pinctrl_group ph1_pro5_groups[] = {
930932
UNIPHIER_PINCTRL_GROUP(i2c5b),
931933
UNIPHIER_PINCTRL_GROUP(i2c5c),
932934
UNIPHIER_PINCTRL_GROUP(i2c6),
935+
UNIPHIER_PINCTRL_GROUP(sd),
933936
UNIPHIER_PINCTRL_GROUP(uart0),
934937
UNIPHIER_PINCTRL_GROUP(uart0b),
935938
UNIPHIER_PINCTRL_GROUP(uart1),
@@ -1209,6 +1212,7 @@ static const char * const i2c3_groups[] = {"i2c3"};
12091212
static const char * const i2c5_groups[] = {"i2c5", "i2c5b", "i2c5c"};
12101213
static const char * const i2c6_groups[] = {"i2c6"};
12111214
static const char * const nand_groups[] = {"nand", "nand_cs1"};
1215+
static const char * const sd_groups[] = {"sd"};
12121216
static const char * const uart0_groups[] = {"uart0", "uart0b"};
12131217
static const char * const uart1_groups[] = {"uart1"};
12141218
static const char * const uart2_groups[] = {"uart2"};
@@ -1296,6 +1300,7 @@ static const struct uniphier_pinmux_function ph1_pro5_functions[] = {
12961300
UNIPHIER_PINMUX_FUNCTION(i2c5),
12971301
UNIPHIER_PINMUX_FUNCTION(i2c6),
12981302
UNIPHIER_PINMUX_FUNCTION(nand),
1303+
UNIPHIER_PINMUX_FUNCTION(sd),
12991304
UNIPHIER_PINMUX_FUNCTION(uart0),
13001305
UNIPHIER_PINMUX_FUNCTION(uart1),
13011306
UNIPHIER_PINMUX_FUNCTION(uart2),

‎drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,8 @@ static const unsigned nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
450450
0, 0};
451451
static const unsigned nand_cs1_pins[] = {22, 23};
452452
static const unsigned nand_cs1_muxvals[] = {0, 0};
453+
static const unsigned sd_pins[] = {32, 33, 34, 35, 36, 37, 38, 39, 40};
454+
static const unsigned sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
453455
static const unsigned uart0_pins[] = {70, 71};
454456
static const unsigned uart0_muxvals[] = {3, 3};
455457
static const unsigned uart1_pins[] = {114, 115};
@@ -536,6 +538,7 @@ static const struct uniphier_pinctrl_group ph1_sld8_groups[] = {
536538
UNIPHIER_PINCTRL_GROUP(i2c3),
537539
UNIPHIER_PINCTRL_GROUP(nand),
538540
UNIPHIER_PINCTRL_GROUP(nand_cs1),
541+
UNIPHIER_PINCTRL_GROUP(sd),
539542
UNIPHIER_PINCTRL_GROUP(uart0),
540543
UNIPHIER_PINCTRL_GROUP(uart1),
541544
UNIPHIER_PINCTRL_GROUP(uart2),
@@ -684,6 +687,7 @@ static const char * const i2c1_groups[] = {"i2c1"};
684687
static const char * const i2c2_groups[] = {"i2c2"};
685688
static const char * const i2c3_groups[] = {"i2c3"};
686689
static const char * const nand_groups[] = {"nand", "nand_cs1"};
690+
static const char * const sd_groups[] = {"sd"};
687691
static const char * const uart0_groups[] = {"uart0"};
688692
static const char * const uart1_groups[] = {"uart1"};
689693
static const char * const uart2_groups[] = {"uart2"};
@@ -739,6 +743,7 @@ static const struct uniphier_pinmux_function ph1_sld8_functions[] = {
739743
UNIPHIER_PINMUX_FUNCTION(i2c2),
740744
UNIPHIER_PINMUX_FUNCTION(i2c3),
741745
UNIPHIER_PINMUX_FUNCTION(nand),
746+
UNIPHIER_PINMUX_FUNCTION(sd),
742747
UNIPHIER_PINMUX_FUNCTION(uart0),
743748
UNIPHIER_PINMUX_FUNCTION(uart1),
744749
UNIPHIER_PINMUX_FUNCTION(uart2),

‎drivers/pinctrl/uniphier/pinctrl-proxstream2.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,8 @@ static const unsigned nand_muxvals[] = {8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
751751
8, 8};
752752
static const unsigned nand_cs1_pins[] = {37, 38};
753753
static const unsigned nand_cs1_muxvals[] = {8, 8};
754+
static const unsigned sd_pins[] = {47, 48, 49, 50, 51, 52, 53, 54, 55};
755+
static const unsigned sd_muxvals[] = {8, 8, 8, 8, 8, 8, 8, 8, 8};
754756
static const unsigned uart0_pins[] = {217, 218};
755757
static const unsigned uart0_muxvals[] = {8, 8};
756758
static const unsigned uart0b_pins[] = {179, 180};
@@ -857,6 +859,7 @@ static const struct uniphier_pinctrl_group proxstream2_groups[] = {
857859
UNIPHIER_PINCTRL_GROUP(i2c6),
858860
UNIPHIER_PINCTRL_GROUP(nand),
859861
UNIPHIER_PINCTRL_GROUP(nand_cs1),
862+
UNIPHIER_PINCTRL_GROUP(sd),
860863
UNIPHIER_PINCTRL_GROUP(uart0),
861864
UNIPHIER_PINCTRL_GROUP(uart0b),
862865
UNIPHIER_PINCTRL_GROUP(uart1),
@@ -1128,6 +1131,7 @@ static const char * const i2c3_groups[] = {"i2c3"};
11281131
static const char * const i2c5_groups[] = {"i2c5"};
11291132
static const char * const i2c6_groups[] = {"i2c6"};
11301133
static const char * const nand_groups[] = {"nand", "nand_cs1"};
1134+
static const char * const sd_groups[] = {"sd"};
11311135
static const char * const uart0_groups[] = {"uart0", "uart0b"};
11321136
static const char * const uart1_groups[] = {"uart1"};
11331137
static const char * const uart2_groups[] = {"uart2"};
@@ -1213,6 +1217,7 @@ static const struct uniphier_pinmux_function proxstream2_functions[] = {
12131217
UNIPHIER_PINMUX_FUNCTION(i2c5),
12141218
UNIPHIER_PINMUX_FUNCTION(i2c6),
12151219
UNIPHIER_PINMUX_FUNCTION(nand),
1220+
UNIPHIER_PINMUX_FUNCTION(sd),
12161221
UNIPHIER_PINMUX_FUNCTION(uart0),
12171222
UNIPHIER_PINMUX_FUNCTION(uart1),
12181223
UNIPHIER_PINMUX_FUNCTION(uart2),

0 commit comments

Comments
 (0)