aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKunihiko Hayashi <hayashi.kunihiko@socionext.com>2018-07-19 05:05:36 -0400
committerLinus Walleij <linus.walleij@linaro.org>2018-07-30 05:06:17 -0400
commit24d1c2171f15bb6fad2ad69cfc2ee81dc4577b76 (patch)
tree27e622a85630907da6d6e6f3fcf70a3c8adfc303
parent17ac526824a8b5544bc2545c76f489e49c6593a2 (diff)
pinctrl: uniphier: add spi pin-mux settings
Add pin-mux settings for spi controller. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Signed-off-by: Keiji Hayashibara <hayashibara.keiji@socionext.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c10
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c20
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c10
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c10
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c15
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c10
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c10
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c5
9 files changed, 95 insertions, 0 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
index 58825f68b58b..bce533f85420 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
@@ -517,6 +517,10 @@ static const int i2c4_muxvals[] = {1, 1};
517static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 517static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
518 15, 16, 17}; 518 15, 16, 17};
519static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; 519static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
520static const unsigned spi0_pins[] = {56, 57, 58, 59};
521static const int spi0_muxvals[] = {0, 0, 0, 0};
522static const unsigned spi1_pins[] = {169, 170, 171, 172};
523static const int spi1_muxvals[] = {1, 1, 1, 1};
520static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13, 524static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13,
521 14, 15, 16, 17}; 525 14, 15, 16, 17};
522static const int system_bus_muxvals[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 526static const int system_bus_muxvals[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -596,6 +600,8 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = {
596 UNIPHIER_PINCTRL_GROUP(i2c3), 600 UNIPHIER_PINCTRL_GROUP(i2c3),
597 UNIPHIER_PINCTRL_GROUP(i2c4), 601 UNIPHIER_PINCTRL_GROUP(i2c4),
598 UNIPHIER_PINCTRL_GROUP(nand), 602 UNIPHIER_PINCTRL_GROUP(nand),
603 UNIPHIER_PINCTRL_GROUP(spi0),
604 UNIPHIER_PINCTRL_GROUP(spi1),
599 UNIPHIER_PINCTRL_GROUP(system_bus), 605 UNIPHIER_PINCTRL_GROUP(system_bus),
600 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 606 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
601 UNIPHIER_PINCTRL_GROUP(uart0), 607 UNIPHIER_PINCTRL_GROUP(uart0),
@@ -632,6 +638,8 @@ static const char * const i2c1_groups[] = {"i2c1"};
632static const char * const i2c3_groups[] = {"i2c3"}; 638static const char * const i2c3_groups[] = {"i2c3"};
633static const char * const i2c4_groups[] = {"i2c4"}; 639static const char * const i2c4_groups[] = {"i2c4"};
634static const char * const nand_groups[] = {"nand"}; 640static const char * const nand_groups[] = {"nand"};
641static const char * const spi0_groups[] = {"spi0"};
642static const char * const spi1_groups[] = {"spi1"};
635static const char * const system_bus_groups[] = {"system_bus", 643static const char * const system_bus_groups[] = {"system_bus",
636 "system_bus_cs1"}; 644 "system_bus_cs1"};
637static const char * const uart0_groups[] = {"uart0"}; 645static const char * const uart0_groups[] = {"uart0"};
@@ -657,6 +665,8 @@ static const struct uniphier_pinmux_function uniphier_ld11_functions[] = {
657 UNIPHIER_PINMUX_FUNCTION(i2c3), 665 UNIPHIER_PINMUX_FUNCTION(i2c3),
658 UNIPHIER_PINMUX_FUNCTION(i2c4), 666 UNIPHIER_PINMUX_FUNCTION(i2c4),
659 UNIPHIER_PINMUX_FUNCTION(nand), 667 UNIPHIER_PINMUX_FUNCTION(nand),
668 UNIPHIER_PINMUX_FUNCTION(spi0),
669 UNIPHIER_PINMUX_FUNCTION(spi1),
660 UNIPHIER_PINMUX_FUNCTION(system_bus), 670 UNIPHIER_PINMUX_FUNCTION(system_bus),
661 UNIPHIER_PINMUX_FUNCTION(uart0), 671 UNIPHIER_PINMUX_FUNCTION(uart0),
662 UNIPHIER_PINMUX_FUNCTION(uart1), 672 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index 9f449b35e300..99f06fe8e1cb 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -606,6 +606,14 @@ static const unsigned nand_pins[] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
606static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; 606static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
607static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17}; 607static const unsigned sd_pins[] = {10, 11, 12, 13, 14, 15, 16, 17};
608static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */ 608static const int sd_muxvals[] = {3, 3, 3, 3, 3, 3, 3, 3}; /* No SDVOLC */
609static const unsigned spi0_pins[] = {56, 57, 58, 59};
610static const int spi0_muxvals[] = {0, 0, 0, 0};
611static const unsigned spi1_pins[] = {169, 170, 171, 172};
612static const int spi1_muxvals[] = {1, 1, 1, 1};
613static const unsigned spi2_pins[] = {86, 87, 88, 89};
614static const int spi2_muxvals[] = {1, 1, 1, 1};
615static const unsigned spi3_pins[] = {74, 75, 76, 77};
616static const int spi3_muxvals[] = {1, 1, 1, 1};
609static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13, 617static const unsigned system_bus_pins[] = {1, 2, 6, 7, 8, 9, 10, 11, 12, 13,
610 14, 15, 16, 17}; 618 14, 15, 16, 17};
611static const int system_bus_muxvals[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 619static const int system_bus_muxvals[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -685,6 +693,10 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
685 UNIPHIER_PINCTRL_GROUP(i2c4), 693 UNIPHIER_PINCTRL_GROUP(i2c4),
686 UNIPHIER_PINCTRL_GROUP(nand), 694 UNIPHIER_PINCTRL_GROUP(nand),
687 UNIPHIER_PINCTRL_GROUP(sd), 695 UNIPHIER_PINCTRL_GROUP(sd),
696 UNIPHIER_PINCTRL_GROUP(spi0),
697 UNIPHIER_PINCTRL_GROUP(spi1),
698 UNIPHIER_PINCTRL_GROUP(spi2),
699 UNIPHIER_PINCTRL_GROUP(spi3),
688 UNIPHIER_PINCTRL_GROUP(system_bus), 700 UNIPHIER_PINCTRL_GROUP(system_bus),
689 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 701 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
690 UNIPHIER_PINCTRL_GROUP(uart0), 702 UNIPHIER_PINCTRL_GROUP(uart0),
@@ -722,6 +734,10 @@ static const char * const i2c3_groups[] = {"i2c3"};
722static const char * const i2c4_groups[] = {"i2c4"}; 734static const char * const i2c4_groups[] = {"i2c4"};
723static const char * const nand_groups[] = {"nand"}; 735static const char * const nand_groups[] = {"nand"};
724static const char * const sd_groups[] = {"sd"}; 736static const char * const sd_groups[] = {"sd"};
737static const char * const spi0_groups[] = {"spi0"};
738static const char * const spi1_groups[] = {"spi1"};
739static const char * const spi2_groups[] = {"spi2"};
740static const char * const spi3_groups[] = {"spi3"};
725static const char * const system_bus_groups[] = {"system_bus", 741static const char * const system_bus_groups[] = {"system_bus",
726 "system_bus_cs1"}; 742 "system_bus_cs1"};
727static const char * const uart0_groups[] = {"uart0"}; 743static const char * const uart0_groups[] = {"uart0"};
@@ -751,6 +767,10 @@ static const struct uniphier_pinmux_function uniphier_ld20_functions[] = {
751 UNIPHIER_PINMUX_FUNCTION(i2c4), 767 UNIPHIER_PINMUX_FUNCTION(i2c4),
752 UNIPHIER_PINMUX_FUNCTION(nand), 768 UNIPHIER_PINMUX_FUNCTION(nand),
753 UNIPHIER_PINMUX_FUNCTION(sd), 769 UNIPHIER_PINMUX_FUNCTION(sd),
770 UNIPHIER_PINMUX_FUNCTION(spi0),
771 UNIPHIER_PINMUX_FUNCTION(spi1),
772 UNIPHIER_PINMUX_FUNCTION(spi2),
773 UNIPHIER_PINMUX_FUNCTION(spi3),
754 UNIPHIER_PINMUX_FUNCTION(system_bus), 774 UNIPHIER_PINMUX_FUNCTION(system_bus),
755 UNIPHIER_PINMUX_FUNCTION(uart0), 775 UNIPHIER_PINMUX_FUNCTION(uart0),
756 UNIPHIER_PINMUX_FUNCTION(uart1), 776 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index 0b10ebc07eb8..b247011524bf 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -576,6 +576,8 @@ static const unsigned nand_cs1_pins[] = {22, 23};
576static const int nand_cs1_muxvals[] = {0, 0}; 576static const int nand_cs1_muxvals[] = {0, 0};
577static const unsigned sd_pins[] = {44, 45, 46, 47, 48, 49, 50, 51, 52}; 577static const unsigned sd_pins[] = {44, 45, 46, 47, 48, 49, 50, 51, 52};
578static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; 578static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
579static const unsigned spi0_pins[] = {135, 136, 137, 138};
580static const int spi0_muxvals[] = {12, 12, 12, 12};
579static const unsigned system_bus_pins[] = {16, 17, 18, 19, 20, 165, 166, 167, 581static const unsigned system_bus_pins[] = {16, 17, 18, 19, 20, 165, 166, 167,
580 168, 169, 170, 171, 172, 173}; 582 168, 169, 170, 171, 172, 173};
581static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, 583static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1,
@@ -640,6 +642,7 @@ static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = {
640 UNIPHIER_PINCTRL_GROUP(nand), 642 UNIPHIER_PINCTRL_GROUP(nand),
641 UNIPHIER_PINCTRL_GROUP(nand_cs1), 643 UNIPHIER_PINCTRL_GROUP(nand_cs1),
642 UNIPHIER_PINCTRL_GROUP(sd), 644 UNIPHIER_PINCTRL_GROUP(sd),
645 UNIPHIER_PINCTRL_GROUP(spi0),
643 UNIPHIER_PINCTRL_GROUP(system_bus), 646 UNIPHIER_PINCTRL_GROUP(system_bus),
644 UNIPHIER_PINCTRL_GROUP(system_bus_cs0), 647 UNIPHIER_PINCTRL_GROUP(system_bus_cs0),
645 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 648 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
@@ -667,6 +670,7 @@ static const char * const i2c2_groups[] = {"i2c2"};
667static const char * const i2c3_groups[] = {"i2c3"}; 670static const char * const i2c3_groups[] = {"i2c3"};
668static const char * const nand_groups[] = {"nand", "nand_cs1"}; 671static const char * const nand_groups[] = {"nand", "nand_cs1"};
669static const char * const sd_groups[] = {"sd"}; 672static const char * const sd_groups[] = {"sd"};
673static const char * const spi0_groups[] = {"spi0"};
670static const char * const system_bus_groups[] = {"system_bus", 674static const char * const system_bus_groups[] = {"system_bus",
671 "system_bus_cs0", 675 "system_bus_cs0",
672 "system_bus_cs1", 676 "system_bus_cs1",
@@ -690,6 +694,7 @@ static const struct uniphier_pinmux_function uniphier_ld4_functions[] = {
690 UNIPHIER_PINMUX_FUNCTION(i2c3), 694 UNIPHIER_PINMUX_FUNCTION(i2c3),
691 UNIPHIER_PINMUX_FUNCTION(nand), 695 UNIPHIER_PINMUX_FUNCTION(nand),
692 UNIPHIER_PINMUX_FUNCTION(sd), 696 UNIPHIER_PINMUX_FUNCTION(sd),
697 UNIPHIER_PINMUX_FUNCTION(spi0),
693 UNIPHIER_PINMUX_FUNCTION(system_bus), 698 UNIPHIER_PINMUX_FUNCTION(system_bus),
694 UNIPHIER_PINMUX_FUNCTION(uart0), 699 UNIPHIER_PINMUX_FUNCTION(uart0),
695 UNIPHIER_PINMUX_FUNCTION(uart1), 700 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index 8e4d45fea885..cb58797adaee 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -769,6 +769,10 @@ static const unsigned nand_cs1_pins[] = {37, 38};
769static const int nand_cs1_muxvals[] = {0, 0}; 769static const int nand_cs1_muxvals[] = {0, 0};
770static const unsigned sd_pins[] = {47, 48, 49, 50, 51, 52, 53, 54, 55}; 770static const unsigned sd_pins[] = {47, 48, 49, 50, 51, 52, 53, 54, 55};
771static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; 771static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
772static const unsigned spi0_pins[] = {199, 200, 201, 202};
773static const int spi0_muxvals[] = {8, 8, 8, 8};
774static const unsigned spi1_pins[] = {93, 94, 95, 96};
775static const int spi1_muxvals[] = {1, 1, 1, 1};
772static const unsigned system_bus_pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 776static const unsigned system_bus_pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
773 11, 12, 13}; 777 11, 12, 13};
774static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 778static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -851,6 +855,8 @@ static const struct uniphier_pinctrl_group uniphier_ld6b_groups[] = {
851 UNIPHIER_PINCTRL_GROUP(nand), 855 UNIPHIER_PINCTRL_GROUP(nand),
852 UNIPHIER_PINCTRL_GROUP(nand_cs1), 856 UNIPHIER_PINCTRL_GROUP(nand_cs1),
853 UNIPHIER_PINCTRL_GROUP(sd), 857 UNIPHIER_PINCTRL_GROUP(sd),
858 UNIPHIER_PINCTRL_GROUP(spi0),
859 UNIPHIER_PINCTRL_GROUP(spi1),
854 UNIPHIER_PINCTRL_GROUP(system_bus), 860 UNIPHIER_PINCTRL_GROUP(system_bus),
855 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 861 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
856 UNIPHIER_PINCTRL_GROUP(system_bus_cs2), 862 UNIPHIER_PINCTRL_GROUP(system_bus_cs2),
@@ -882,6 +888,8 @@ static const char * const i2c2_groups[] = {"i2c2"};
882static const char * const i2c3_groups[] = {"i2c3"}; 888static const char * const i2c3_groups[] = {"i2c3"};
883static const char * const nand_groups[] = {"nand", "nand_cs1"}; 889static const char * const nand_groups[] = {"nand", "nand_cs1"};
884static const char * const sd_groups[] = {"sd"}; 890static const char * const sd_groups[] = {"sd"};
891static const char * const spi0_groups[] = {"spi0"};
892static const char * const spi1_groups[] = {"spi1"};
885static const char * const system_bus_groups[] = {"system_bus", 893static const char * const system_bus_groups[] = {"system_bus",
886 "system_bus_cs1", 894 "system_bus_cs1",
887 "system_bus_cs2", 895 "system_bus_cs2",
@@ -907,6 +915,8 @@ static const struct uniphier_pinmux_function uniphier_ld6b_functions[] = {
907 UNIPHIER_PINMUX_FUNCTION(i2c3), 915 UNIPHIER_PINMUX_FUNCTION(i2c3),
908 UNIPHIER_PINMUX_FUNCTION(nand), 916 UNIPHIER_PINMUX_FUNCTION(nand),
909 UNIPHIER_PINMUX_FUNCTION(sd), 917 UNIPHIER_PINMUX_FUNCTION(sd),
918 UNIPHIER_PINMUX_FUNCTION(spi0),
919 UNIPHIER_PINMUX_FUNCTION(spi1),
910 UNIPHIER_PINMUX_FUNCTION(system_bus), 920 UNIPHIER_PINMUX_FUNCTION(system_bus),
911 UNIPHIER_PINMUX_FUNCTION(uart0), 921 UNIPHIER_PINMUX_FUNCTION(uart0),
912 UNIPHIER_PINMUX_FUNCTION(uart1), 922 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 24788a74c254..89148f81d5e0 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -1050,6 +1050,10 @@ static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
1050static const unsigned sd1_pins[] = {319, 320, 321, 322, 323, 324, 325, 326, 1050static const unsigned sd1_pins[] = {319, 320, 321, 322, 323, 324, 325, 326,
1051 327}; 1051 327};
1052static const int sd1_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; 1052static const int sd1_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
1053static const unsigned spi0_pins[] = {199, 200, 201, 202};
1054static const int spi0_muxvals[] = {11, 11, 11, 11};
1055static const unsigned spi1_pins[] = {195, 196, 197, 198, 235, 238, 239};
1056static const int spi1_muxvals[] = {11, 11, 11, 11, 11, 11, 11};
1053static const unsigned system_bus_pins[] = {25, 26, 27, 28, 29, 30, 31, 32, 33, 1057static const unsigned system_bus_pins[] = {25, 26, 27, 28, 29, 30, 31, 32, 33,
1054 34, 35, 36, 37, 38}; 1058 34, 35, 36, 37, 38};
1055static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1059static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1138,6 +1142,8 @@ static const struct uniphier_pinctrl_group uniphier_pro4_groups[] = {
1138 UNIPHIER_PINCTRL_GROUP(nand_cs1), 1142 UNIPHIER_PINCTRL_GROUP(nand_cs1),
1139 UNIPHIER_PINCTRL_GROUP(sd), 1143 UNIPHIER_PINCTRL_GROUP(sd),
1140 UNIPHIER_PINCTRL_GROUP(sd1), 1144 UNIPHIER_PINCTRL_GROUP(sd1),
1145 UNIPHIER_PINCTRL_GROUP(spi0),
1146 UNIPHIER_PINCTRL_GROUP(spi1),
1141 UNIPHIER_PINCTRL_GROUP(system_bus), 1147 UNIPHIER_PINCTRL_GROUP(system_bus),
1142 UNIPHIER_PINCTRL_GROUP(system_bus_cs0), 1148 UNIPHIER_PINCTRL_GROUP(system_bus_cs0),
1143 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 1149 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
@@ -1171,6 +1177,8 @@ static const char * const i2c6_groups[] = {"i2c6"};
1171static const char * const nand_groups[] = {"nand", "nand_cs1"}; 1177static const char * const nand_groups[] = {"nand", "nand_cs1"};
1172static const char * const sd_groups[] = {"sd"}; 1178static const char * const sd_groups[] = {"sd"};
1173static const char * const sd1_groups[] = {"sd1"}; 1179static const char * const sd1_groups[] = {"sd1"};
1180static const char * const spi0_groups[] = {"spi0"};
1181static const char * const spi1_groups[] = {"spi1"};
1174static const char * const system_bus_groups[] = {"system_bus", 1182static const char * const system_bus_groups[] = {"system_bus",
1175 "system_bus_cs0", 1183 "system_bus_cs0",
1176 "system_bus_cs1", 1184 "system_bus_cs1",
@@ -1202,6 +1210,8 @@ static const struct uniphier_pinmux_function uniphier_pro4_functions[] = {
1202 UNIPHIER_PINMUX_FUNCTION(nand), 1210 UNIPHIER_PINMUX_FUNCTION(nand),
1203 UNIPHIER_PINMUX_FUNCTION(sd), 1211 UNIPHIER_PINMUX_FUNCTION(sd),
1204 UNIPHIER_PINMUX_FUNCTION(sd1), 1212 UNIPHIER_PINMUX_FUNCTION(sd1),
1213 UNIPHIER_PINMUX_FUNCTION(spi0),
1214 UNIPHIER_PINMUX_FUNCTION(spi1),
1205 UNIPHIER_PINMUX_FUNCTION(system_bus), 1215 UNIPHIER_PINMUX_FUNCTION(system_bus),
1206 UNIPHIER_PINMUX_FUNCTION(uart0), 1216 UNIPHIER_PINMUX_FUNCTION(uart0),
1207 UNIPHIER_PINMUX_FUNCTION(uart1), 1217 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index d5d5e579cb08..d77d6b37aabe 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -818,6 +818,12 @@ static const unsigned nand_cs1_pins[] = {26, 27};
818static const int nand_cs1_muxvals[] = {0, 0}; 818static const int nand_cs1_muxvals[] = {0, 0};
819static const unsigned sd_pins[] = {250, 251, 252, 253, 254, 255, 256, 257, 258}; 819static const unsigned sd_pins[] = {250, 251, 252, 253, 254, 255, 256, 257, 258};
820static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; 820static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
821static const unsigned spi0_pins[] = {120, 121, 122, 123};
822static const int spi0_muxvals[] = {0, 0, 0, 0};
823static const unsigned spi1_pins[] = {134, 139, 85, 86};
824static const int spi1_muxvals[] = {1, 1, 1, 1};
825static const unsigned spi2_pins[] = {55, 56, 57, 58, 82, 83, 84};
826static const int spi2_muxvals[] = {0, 0, 0, 0, 1, 1, 1};
821static const unsigned system_bus_pins[] = {4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 827static const unsigned system_bus_pins[] = {4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
822 14, 15, 16, 17}; 828 14, 15, 16, 17};
823static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 829static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -904,6 +910,9 @@ static const struct uniphier_pinctrl_group uniphier_pro5_groups[] = {
904 UNIPHIER_PINCTRL_GROUP(i2c5c), 910 UNIPHIER_PINCTRL_GROUP(i2c5c),
905 UNIPHIER_PINCTRL_GROUP(i2c6), 911 UNIPHIER_PINCTRL_GROUP(i2c6),
906 UNIPHIER_PINCTRL_GROUP(sd), 912 UNIPHIER_PINCTRL_GROUP(sd),
913 UNIPHIER_PINCTRL_GROUP(spi0),
914 UNIPHIER_PINCTRL_GROUP(spi1),
915 UNIPHIER_PINCTRL_GROUP(spi2),
907 UNIPHIER_PINCTRL_GROUP(system_bus), 916 UNIPHIER_PINCTRL_GROUP(system_bus),
908 UNIPHIER_PINCTRL_GROUP(system_bus_cs0), 917 UNIPHIER_PINCTRL_GROUP(system_bus_cs0),
909 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 918 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
@@ -934,6 +943,9 @@ static const char * const i2c5_groups[] = {"i2c5", "i2c5b", "i2c5c"};
934static const char * const i2c6_groups[] = {"i2c6"}; 943static const char * const i2c6_groups[] = {"i2c6"};
935static const char * const nand_groups[] = {"nand", "nand_cs1"}; 944static const char * const nand_groups[] = {"nand", "nand_cs1"};
936static const char * const sd_groups[] = {"sd"}; 945static const char * const sd_groups[] = {"sd"};
946static const char * const spi0_groups[] = {"spi0"};
947static const char * const spi1_groups[] = {"spi1"};
948static const char * const spi2_groups[] = {"spi2"};
937static const char * const system_bus_groups[] = {"system_bus", 949static const char * const system_bus_groups[] = {"system_bus",
938 "system_bus_cs0", 950 "system_bus_cs0",
939 "system_bus_cs1", 951 "system_bus_cs1",
@@ -961,6 +973,9 @@ static const struct uniphier_pinmux_function uniphier_pro5_functions[] = {
961 UNIPHIER_PINMUX_FUNCTION(i2c6), 973 UNIPHIER_PINMUX_FUNCTION(i2c6),
962 UNIPHIER_PINMUX_FUNCTION(nand), 974 UNIPHIER_PINMUX_FUNCTION(nand),
963 UNIPHIER_PINMUX_FUNCTION(sd), 975 UNIPHIER_PINMUX_FUNCTION(sd),
976 UNIPHIER_PINMUX_FUNCTION(spi0),
977 UNIPHIER_PINMUX_FUNCTION(spi1),
978 UNIPHIER_PINMUX_FUNCTION(spi2),
964 UNIPHIER_PINMUX_FUNCTION(system_bus), 979 UNIPHIER_PINMUX_FUNCTION(system_bus),
965 UNIPHIER_PINMUX_FUNCTION(uart0), 980 UNIPHIER_PINMUX_FUNCTION(uart0),
966 UNIPHIER_PINMUX_FUNCTION(uart1), 981 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 032619ad0e73..90199da87eb9 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -778,6 +778,10 @@ static const unsigned nand_cs1_pins[] = {37, 38};
778static const int nand_cs1_muxvals[] = {8, 8}; 778static const int nand_cs1_muxvals[] = {8, 8};
779static const unsigned sd_pins[] = {47, 48, 49, 50, 51, 52, 53, 54, 55}; 779static const unsigned sd_pins[] = {47, 48, 49, 50, 51, 52, 53, 54, 55};
780static const int sd_muxvals[] = {8, 8, 8, 8, 8, 8, 8, 8, 8}; 780static const int sd_muxvals[] = {8, 8, 8, 8, 8, 8, 8, 8, 8};
781static const unsigned spi0_pins[] = {199, 200, 201, 202};
782static const int spi0_muxvals[] = {8, 8, 8, 8};
783static const unsigned spi1_pins[] = {93, 94, 95, 96};
784static const int spi1_muxvals[] = {1, 1, 1, 1};
781static const unsigned system_bus_pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 785static const unsigned system_bus_pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
782 11, 12, 13}; 786 11, 12, 13};
783static const int system_bus_muxvals[] = {8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 787static const int system_bus_muxvals[] = {8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
@@ -861,6 +865,8 @@ static const struct uniphier_pinctrl_group uniphier_pxs2_groups[] = {
861 UNIPHIER_PINCTRL_GROUP(nand), 865 UNIPHIER_PINCTRL_GROUP(nand),
862 UNIPHIER_PINCTRL_GROUP(nand_cs1), 866 UNIPHIER_PINCTRL_GROUP(nand_cs1),
863 UNIPHIER_PINCTRL_GROUP(sd), 867 UNIPHIER_PINCTRL_GROUP(sd),
868 UNIPHIER_PINCTRL_GROUP(spi0),
869 UNIPHIER_PINCTRL_GROUP(spi1),
864 UNIPHIER_PINCTRL_GROUP(system_bus), 870 UNIPHIER_PINCTRL_GROUP(system_bus),
865 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 871 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
866 UNIPHIER_PINCTRL_GROUP(uart0), 872 UNIPHIER_PINCTRL_GROUP(uart0),
@@ -897,6 +903,8 @@ static const char * const i2c5_groups[] = {"i2c5"};
897static const char * const i2c6_groups[] = {"i2c6"}; 903static const char * const i2c6_groups[] = {"i2c6"};
898static const char * const nand_groups[] = {"nand", "nand_cs1"}; 904static const char * const nand_groups[] = {"nand", "nand_cs1"};
899static const char * const sd_groups[] = {"sd"}; 905static const char * const sd_groups[] = {"sd"};
906static const char * const spi0_groups[] = {"spi0"};
907static const char * const spi1_groups[] = {"spi1"};
900static const char * const system_bus_groups[] = {"system_bus", 908static const char * const system_bus_groups[] = {"system_bus",
901 "system_bus_cs1"}; 909 "system_bus_cs1"};
902static const char * const uart0_groups[] = {"uart0", "uart0b", "uart0b_ctsrts"}; 910static const char * const uart0_groups[] = {"uart0", "uart0b", "uart0b_ctsrts"};
@@ -928,6 +936,8 @@ static const struct uniphier_pinmux_function uniphier_pxs2_functions[] = {
928 UNIPHIER_PINMUX_FUNCTION(i2c6), 936 UNIPHIER_PINMUX_FUNCTION(i2c6),
929 UNIPHIER_PINMUX_FUNCTION(nand), 937 UNIPHIER_PINMUX_FUNCTION(nand),
930 UNIPHIER_PINMUX_FUNCTION(sd), 938 UNIPHIER_PINMUX_FUNCTION(sd),
939 UNIPHIER_PINMUX_FUNCTION(spi0),
940 UNIPHIER_PINMUX_FUNCTION(spi1),
931 UNIPHIER_PINMUX_FUNCTION(system_bus), 941 UNIPHIER_PINMUX_FUNCTION(system_bus),
932 UNIPHIER_PINMUX_FUNCTION(uart0), 942 UNIPHIER_PINMUX_FUNCTION(uart0),
933 UNIPHIER_PINMUX_FUNCTION(uart1), 943 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
index 535bb2e935e4..3b860da47733 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
@@ -808,6 +808,10 @@ static const unsigned int nand_pins[] = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
808static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; 808static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
809static const unsigned int sd_pins[] = {43, 44, 45, 46, 47, 48, 49, 50, 51}; 809static const unsigned int sd_pins[] = {43, 44, 45, 46, 47, 48, 49, 50, 51};
810static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; 810static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
811static const unsigned spi0_pins[] = {100, 101, 102, 103};
812static const int spi0_muxvals[] = {0, 0, 0, 0};
813static const unsigned spi1_pins[] = {112, 113, 114, 115};
814static const int spi1_muxvals[] = {2, 2, 2, 2};
811static const unsigned int system_bus_pins[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 815static const unsigned int system_bus_pins[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
812 11, 12, 13, 14}; 816 11, 12, 13, 14};
813static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 817static const int system_bus_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -886,6 +890,8 @@ static const struct uniphier_pinctrl_group uniphier_pxs3_groups[] = {
886 UNIPHIER_PINCTRL_GROUP(i2c3), 890 UNIPHIER_PINCTRL_GROUP(i2c3),
887 UNIPHIER_PINCTRL_GROUP(nand), 891 UNIPHIER_PINCTRL_GROUP(nand),
888 UNIPHIER_PINCTRL_GROUP(sd), 892 UNIPHIER_PINCTRL_GROUP(sd),
893 UNIPHIER_PINCTRL_GROUP(spi0),
894 UNIPHIER_PINCTRL_GROUP(spi1),
889 UNIPHIER_PINCTRL_GROUP(system_bus), 895 UNIPHIER_PINCTRL_GROUP(system_bus),
890 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 896 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
891 UNIPHIER_PINCTRL_GROUP(uart0), 897 UNIPHIER_PINCTRL_GROUP(uart0),
@@ -913,6 +919,8 @@ static const char * const i2c2_groups[] = {"i2c2"};
913static const char * const i2c3_groups[] = {"i2c3"}; 919static const char * const i2c3_groups[] = {"i2c3"};
914static const char * const nand_groups[] = {"nand"}; 920static const char * const nand_groups[] = {"nand"};
915static const char * const sd_groups[] = {"sd"}; 921static const char * const sd_groups[] = {"sd"};
922static const char * const spi0_groups[] = {"spi0"};
923static const char * const spi1_groups[] = {"spi1"};
916static const char * const system_bus_groups[] = {"system_bus", 924static const char * const system_bus_groups[] = {"system_bus",
917 "system_bus_cs1"}; 925 "system_bus_cs1"};
918static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts"}; 926static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts"};
@@ -936,6 +944,8 @@ static const struct uniphier_pinmux_function uniphier_pxs3_functions[] = {
936 UNIPHIER_PINMUX_FUNCTION(i2c3), 944 UNIPHIER_PINMUX_FUNCTION(i2c3),
937 UNIPHIER_PINMUX_FUNCTION(nand), 945 UNIPHIER_PINMUX_FUNCTION(nand),
938 UNIPHIER_PINMUX_FUNCTION(sd), 946 UNIPHIER_PINMUX_FUNCTION(sd),
947 UNIPHIER_PINMUX_FUNCTION(spi0),
948 UNIPHIER_PINMUX_FUNCTION(spi1),
939 UNIPHIER_PINMUX_FUNCTION(system_bus), 949 UNIPHIER_PINMUX_FUNCTION(system_bus),
940 UNIPHIER_PINMUX_FUNCTION(uart0), 950 UNIPHIER_PINMUX_FUNCTION(uart0),
941 UNIPHIER_PINMUX_FUNCTION(uart1), 951 UNIPHIER_PINMUX_FUNCTION(uart1),
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 0f921a653164..f086083368a7 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -504,6 +504,8 @@ static const unsigned nand_cs1_pins[] = {22, 23};
504static const int nand_cs1_muxvals[] = {0, 0}; 504static const int nand_cs1_muxvals[] = {0, 0};
505static const unsigned sd_pins[] = {32, 33, 34, 35, 36, 37, 38, 39, 40}; 505static const unsigned sd_pins[] = {32, 33, 34, 35, 36, 37, 38, 39, 40};
506static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; 506static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
507static const unsigned spi0_pins[] = {118, 119, 120, 121};
508static const int spi0_muxvals[] = {3, 3, 3, 3};
507static const unsigned system_bus_pins[] = {136, 137, 138, 139, 140, 141, 142, 509static const unsigned system_bus_pins[] = {136, 137, 138, 139, 140, 141, 142,
508 143, 144, 145, 146, 147, 148, 149}; 510 143, 144, 145, 146, 147, 148, 149};
509static const int system_bus_muxvals[] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, 511static const int system_bus_muxvals[] = {-1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -570,6 +572,7 @@ static const struct uniphier_pinctrl_group uniphier_sld8_groups[] = {
570 UNIPHIER_PINCTRL_GROUP(nand), 572 UNIPHIER_PINCTRL_GROUP(nand),
571 UNIPHIER_PINCTRL_GROUP(nand_cs1), 573 UNIPHIER_PINCTRL_GROUP(nand_cs1),
572 UNIPHIER_PINCTRL_GROUP(sd), 574 UNIPHIER_PINCTRL_GROUP(sd),
575 UNIPHIER_PINCTRL_GROUP(spi0),
573 UNIPHIER_PINCTRL_GROUP(system_bus), 576 UNIPHIER_PINCTRL_GROUP(system_bus),
574 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 577 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
575 UNIPHIER_PINCTRL_GROUP(system_bus_cs2), 578 UNIPHIER_PINCTRL_GROUP(system_bus_cs2),
@@ -598,6 +601,7 @@ static const char * const i2c2_groups[] = {"i2c2"};
598static const char * const i2c3_groups[] = {"i2c3"}; 601static const char * const i2c3_groups[] = {"i2c3"};
599static const char * const nand_groups[] = {"nand", "nand_cs1"}; 602static const char * const nand_groups[] = {"nand", "nand_cs1"};
600static const char * const sd_groups[] = {"sd"}; 603static const char * const sd_groups[] = {"sd"};
604static const char * const spi0_groups[] = {"spi0"};
601static const char * const system_bus_groups[] = {"system_bus", 605static const char * const system_bus_groups[] = {"system_bus",
602 "system_bus_cs1", 606 "system_bus_cs1",
603 "system_bus_cs2", 607 "system_bus_cs2",
@@ -622,6 +626,7 @@ static const struct uniphier_pinmux_function uniphier_sld8_functions[] = {
622 UNIPHIER_PINMUX_FUNCTION(i2c3), 626 UNIPHIER_PINMUX_FUNCTION(i2c3),
623 UNIPHIER_PINMUX_FUNCTION(nand), 627 UNIPHIER_PINMUX_FUNCTION(nand),
624 UNIPHIER_PINMUX_FUNCTION(sd), 628 UNIPHIER_PINMUX_FUNCTION(sd),
629 UNIPHIER_PINMUX_FUNCTION(spi0),
625 UNIPHIER_PINMUX_FUNCTION(system_bus), 630 UNIPHIER_PINMUX_FUNCTION(system_bus),
626 UNIPHIER_PINMUX_FUNCTION(uart0), 631 UNIPHIER_PINMUX_FUNCTION(uart0),
627 UNIPHIER_PINMUX_FUNCTION(uart1), 632 UNIPHIER_PINMUX_FUNCTION(uart1),
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-22 04:05:19 -0400