aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKunihiko Hayashi <hayashi.kunihiko@socionext.com>2018-03-19 04:13:14 -0400
committerLinus Walleij <linus.walleij@linaro.org>2018-03-27 09:14:43 -0400
commit4fc97ef94bbfa185d16b3e44199b7559d0668747 (patch)
tree922222a02148ea3b42cfd0e51e66c701ec670dca
parentc8a830904991931106c96ff1ee0588d1ca9ea5f0 (diff)
pinctrl: uniphier: add UART hardware flow control pin-mux settings
UniPhier SoCs have the following pins for hardware flow control of UART: XRTS, XCTS and for modem control of UART: XDTR, XDSR, XDCD, XRI The port number with the flow control is SoC-dependent. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c5
-rw-r--r--drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c5
9 files changed, 36 insertions, 9 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
index 5ec5afa70413..0976fbfecd50 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
@@ -506,6 +506,8 @@ static const unsigned uart2_pins[] = {90, 91};
506static const int uart2_muxvals[] = {1, 1}; 506static const int uart2_muxvals[] = {1, 1};
507static const unsigned uart3_pins[] = {94, 95}; 507static const unsigned uart3_pins[] = {94, 95};
508static const int uart3_muxvals[] = {1, 1}; 508static const int uart3_muxvals[] = {1, 1};
509static const unsigned uart3_ctsrts_pins[] = {96, 97, 98, 99, 100, 101};
510static const int uart3_ctsrts_muxvals[] = {1, 1, 1, 1, 1, 1};
509static const unsigned usb0_pins[] = {46, 47}; 511static const unsigned usb0_pins[] = {46, 47};
510static const int usb0_muxvals[] = {0, 0}; 512static const int usb0_muxvals[] = {0, 0};
511static const unsigned usb1_pins[] = {48, 49}; 513static const unsigned usb1_pins[] = {48, 49};
@@ -565,6 +567,7 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = {
565 UNIPHIER_PINCTRL_GROUP(uart1), 567 UNIPHIER_PINCTRL_GROUP(uart1),
566 UNIPHIER_PINCTRL_GROUP(uart2), 568 UNIPHIER_PINCTRL_GROUP(uart2),
567 UNIPHIER_PINCTRL_GROUP(uart3), 569 UNIPHIER_PINCTRL_GROUP(uart3),
570 UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),
568 UNIPHIER_PINCTRL_GROUP(usb0), 571 UNIPHIER_PINCTRL_GROUP(usb0),
569 UNIPHIER_PINCTRL_GROUP(usb1), 572 UNIPHIER_PINCTRL_GROUP(usb1),
570 UNIPHIER_PINCTRL_GROUP(usb2), 573 UNIPHIER_PINCTRL_GROUP(usb2),
@@ -590,7 +593,7 @@ static const char * const system_bus_groups[] = {"system_bus",
590static const char * const uart0_groups[] = {"uart0"}; 593static const char * const uart0_groups[] = {"uart0"};
591static const char * const uart1_groups[] = {"uart1"}; 594static const char * const uart1_groups[] = {"uart1"};
592static const char * const uart2_groups[] = {"uart2"}; 595static const char * const uart2_groups[] = {"uart2"};
593static const char * const uart3_groups[] = {"uart3"}; 596static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts"};
594static const char * const usb0_groups[] = {"usb0"}; 597static const char * const usb0_groups[] = {"usb0"};
595static const char * const usb1_groups[] = {"usb1"}; 598static const char * const usb1_groups[] = {"usb1"};
596static const char * const usb2_groups[] = {"usb2"}; 599static const char * const usb2_groups[] = {"usb2"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index eb5d4cc6a3ba..bf8f0c3bea5e 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -593,6 +593,8 @@ static const unsigned uart2_pins[] = {90, 91};
593static const int uart2_muxvals[] = {1, 1}; 593static const int uart2_muxvals[] = {1, 1};
594static const unsigned uart3_pins[] = {94, 95}; 594static const unsigned uart3_pins[] = {94, 95};
595static const int uart3_muxvals[] = {1, 1}; 595static const int uart3_muxvals[] = {1, 1};
596static const unsigned uart3_ctsrts_pins[] = {96, 97, 98, 99, 100, 101};
597static const int uart3_ctsrts_muxvals[] = {1, 1, 1, 1, 1, 1};
596static const unsigned usb0_pins[] = {46, 47}; 598static const unsigned usb0_pins[] = {46, 47};
597static const int usb0_muxvals[] = {0, 0}; 599static const int usb0_muxvals[] = {0, 0};
598static const unsigned usb1_pins[] = {48, 49}; 600static const unsigned usb1_pins[] = {48, 49};
@@ -651,6 +653,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
651 UNIPHIER_PINCTRL_GROUP(uart1), 653 UNIPHIER_PINCTRL_GROUP(uart1),
652 UNIPHIER_PINCTRL_GROUP(uart2), 654 UNIPHIER_PINCTRL_GROUP(uart2),
653 UNIPHIER_PINCTRL_GROUP(uart3), 655 UNIPHIER_PINCTRL_GROUP(uart3),
656 UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),
654 UNIPHIER_PINCTRL_GROUP(usb0), 657 UNIPHIER_PINCTRL_GROUP(usb0),
655 UNIPHIER_PINCTRL_GROUP(usb1), 658 UNIPHIER_PINCTRL_GROUP(usb1),
656 UNIPHIER_PINCTRL_GROUP(usb2), 659 UNIPHIER_PINCTRL_GROUP(usb2),
@@ -676,7 +679,7 @@ static const char * const system_bus_groups[] = {"system_bus",
676static const char * const uart0_groups[] = {"uart0"}; 679static const char * const uart0_groups[] = {"uart0"};
677static const char * const uart1_groups[] = {"uart1"}; 680static const char * const uart1_groups[] = {"uart1"};
678static const char * const uart2_groups[] = {"uart2"}; 681static const char * const uart2_groups[] = {"uart2"};
679static const char * const uart3_groups[] = {"uart3"}; 682static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts"};
680static const char * const usb0_groups[] = {"usb0"}; 683static const char * const usb0_groups[] = {"usb0"};
681static const char * const usb1_groups[] = {"usb1"}; 684static const char * const usb1_groups[] = {"usb1"};
682static const char * const usb2_groups[] = {"usb2"}; 685static const char * const usb2_groups[] = {"usb2"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index 840382847212..0b10ebc07eb8 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -590,6 +590,8 @@ static const unsigned system_bus_cs3_pins[] = {156};
590static const int system_bus_cs3_muxvals[] = {1}; 590static const int system_bus_cs3_muxvals[] = {1};
591static const unsigned uart0_pins[] = {85, 88}; 591static const unsigned uart0_pins[] = {85, 88};
592static const int uart0_muxvals[] = {1, 1}; 592static const int uart0_muxvals[] = {1, 1};
593static const unsigned uart0_ctsrts_pins[] = {86, 87, 89};
594static const int uart0_ctsrts_muxvals[] = {1, 1, 1};
593static const unsigned uart1_pins[] = {155, 156}; 595static const unsigned uart1_pins[] = {155, 156};
594static const int uart1_muxvals[] = {13, 13}; 596static const int uart1_muxvals[] = {13, 13};
595static const unsigned uart1b_pins[] = {69, 70}; 597static const unsigned uart1b_pins[] = {69, 70};
@@ -644,6 +646,7 @@ static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = {
644 UNIPHIER_PINCTRL_GROUP(system_bus_cs2), 646 UNIPHIER_PINCTRL_GROUP(system_bus_cs2),
645 UNIPHIER_PINCTRL_GROUP(system_bus_cs3), 647 UNIPHIER_PINCTRL_GROUP(system_bus_cs3),
646 UNIPHIER_PINCTRL_GROUP(uart0), 648 UNIPHIER_PINCTRL_GROUP(uart0),
649 UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),
647 UNIPHIER_PINCTRL_GROUP(uart1), 650 UNIPHIER_PINCTRL_GROUP(uart1),
648 UNIPHIER_PINCTRL_GROUP(uart1b), 651 UNIPHIER_PINCTRL_GROUP(uart1b),
649 UNIPHIER_PINCTRL_GROUP(uart2), 652 UNIPHIER_PINCTRL_GROUP(uart2),
@@ -669,7 +672,7 @@ static const char * const system_bus_groups[] = {"system_bus",
669 "system_bus_cs1", 672 "system_bus_cs1",
670 "system_bus_cs2", 673 "system_bus_cs2",
671 "system_bus_cs3"}; 674 "system_bus_cs3"};
672static const char * const uart0_groups[] = {"uart0"}; 675static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts"};
673static const char * const uart1_groups[] = {"uart1", "uart1b"}; 676static const char * const uart1_groups[] = {"uart1", "uart1b"};
674static const char * const uart2_groups[] = {"uart2"}; 677static const char * const uart2_groups[] = {"uart2"};
675static const char * const uart3_groups[] = {"uart3"}; 678static const char * const uart3_groups[] = {"uart3"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index 493a90c6d733..8e4d45fea885 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -785,6 +785,8 @@ static const unsigned system_bus_cs5_pins[] = {55};
785static const int system_bus_cs5_muxvals[] = {6}; 785static const int system_bus_cs5_muxvals[] = {6};
786static const unsigned uart0_pins[] = {135, 136}; 786static const unsigned uart0_pins[] = {135, 136};
787static const int uart0_muxvals[] = {3, 3}; 787static const int uart0_muxvals[] = {3, 3};
788static const unsigned uart0_ctsrts_pins[] = {137, 138, 139, 140, 141, 124};
789static const int uart0_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3};
788static const unsigned uart0b_pins[] = {11, 12}; 790static const unsigned uart0b_pins[] = {11, 12};
789static const int uart0b_muxvals[] = {2, 2}; 791static const int uart0b_muxvals[] = {2, 2};
790static const unsigned uart1_pins[] = {115, 116}; 792static const unsigned uart1_pins[] = {115, 116};
@@ -856,6 +858,7 @@ static const struct uniphier_pinctrl_group uniphier_ld6b_groups[] = {
856 UNIPHIER_PINCTRL_GROUP(system_bus_cs4), 858 UNIPHIER_PINCTRL_GROUP(system_bus_cs4),
857 UNIPHIER_PINCTRL_GROUP(system_bus_cs5), 859 UNIPHIER_PINCTRL_GROUP(system_bus_cs5),
858 UNIPHIER_PINCTRL_GROUP(uart0), 860 UNIPHIER_PINCTRL_GROUP(uart0),
861 UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),
859 UNIPHIER_PINCTRL_GROUP(uart0b), 862 UNIPHIER_PINCTRL_GROUP(uart0b),
860 UNIPHIER_PINCTRL_GROUP(uart1), 863 UNIPHIER_PINCTRL_GROUP(uart1),
861 UNIPHIER_PINCTRL_GROUP(uart1b), 864 UNIPHIER_PINCTRL_GROUP(uart1b),
@@ -885,7 +888,7 @@ static const char * const system_bus_groups[] = {"system_bus",
885 "system_bus_cs3", 888 "system_bus_cs3",
886 "system_bus_cs4", 889 "system_bus_cs4",
887 "system_bus_cs5"}; 890 "system_bus_cs5"};
888static const char * const uart0_groups[] = {"uart0", "uart0b"}; 891static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts", "uart0b"};
889static const char * const uart1_groups[] = {"uart1", "uart1b"}; 892static const char * const uart1_groups[] = {"uart1", "uart1b"};
890static const char * const uart2_groups[] = {"uart2", "uart2b"}; 893static const char * const uart2_groups[] = {"uart2", "uart2b"};
891static const char * const usb0_groups[] = {"usb0"}; 894static const char * const usb0_groups[] = {"usb0"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 603204a00213..24788a74c254 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -1078,6 +1078,8 @@ static const unsigned uart2_pins[] = {131, 132};
1078static const int uart2_muxvals[] = {0, 0}; 1078static const int uart2_muxvals[] = {0, 0};
1079static const unsigned uart3_pins[] = {88, 89}; 1079static const unsigned uart3_pins[] = {88, 89};
1080static const int uart3_muxvals[] = {2, 2}; 1080static const int uart3_muxvals[] = {2, 2};
1081static const unsigned uart3_ctsrts_pins[] = {80, 81, 82, 83, 90, 91};
1082static const int uart3_ctsrts_muxvals[] = {2, 2, 2, 2, 2, 2};
1081static const unsigned usb0_pins[] = {180, 181}; 1083static const unsigned usb0_pins[] = {180, 181};
1082static const int usb0_muxvals[] = {0, 0}; 1084static const int usb0_muxvals[] = {0, 0};
1083static const unsigned usb1_pins[] = {182, 183}; 1085static const unsigned usb1_pins[] = {182, 183};
@@ -1149,6 +1151,7 @@ static const struct uniphier_pinctrl_group uniphier_pro4_groups[] = {
1149 UNIPHIER_PINCTRL_GROUP(uart1), 1151 UNIPHIER_PINCTRL_GROUP(uart1),
1150 UNIPHIER_PINCTRL_GROUP(uart2), 1152 UNIPHIER_PINCTRL_GROUP(uart2),
1151 UNIPHIER_PINCTRL_GROUP(uart3), 1153 UNIPHIER_PINCTRL_GROUP(uart3),
1154 UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),
1152 UNIPHIER_PINCTRL_GROUP(usb0), 1155 UNIPHIER_PINCTRL_GROUP(usb0),
1153 UNIPHIER_PINCTRL_GROUP(usb1), 1156 UNIPHIER_PINCTRL_GROUP(usb1),
1154 UNIPHIER_PINCTRL_GROUP(usb2), 1157 UNIPHIER_PINCTRL_GROUP(usb2),
@@ -1180,7 +1183,7 @@ static const char * const system_bus_groups[] = {"system_bus",
1180static const char * const uart0_groups[] = {"uart0"}; 1183static const char * const uart0_groups[] = {"uart0"};
1181static const char * const uart1_groups[] = {"uart1"}; 1184static const char * const uart1_groups[] = {"uart1"};
1182static const char * const uart2_groups[] = {"uart2"}; 1185static const char * const uart2_groups[] = {"uart2"};
1183static const char * const uart3_groups[] = {"uart3"}; 1186static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts"};
1184static const char * const usb0_groups[] = {"usb0"}; 1187static const char * const usb0_groups[] = {"usb0"};
1185static const char * const usb1_groups[] = {"usb1"}; 1188static const char * const usb1_groups[] = {"usb1"};
1186static const char * const usb2_groups[] = {"usb2"}; 1189static const char * const usb2_groups[] = {"usb2"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 9381a4ff4389..d5d5e579cb08 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -842,6 +842,8 @@ static const unsigned uart0_pins[] = {47, 48};
842static const int uart0_muxvals[] = {0, 0}; 842static const int uart0_muxvals[] = {0, 0};
843static const unsigned uart0b_pins[] = {227, 228}; 843static const unsigned uart0b_pins[] = {227, 228};
844static const int uart0b_muxvals[] = {3, 3}; 844static const int uart0b_muxvals[] = {3, 3};
845static const unsigned uart0b_ctsrts_pins[] = {229, 230, 231, 232, 233, 234};
846static const int uart0b_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3};
845static const unsigned uart1_pins[] = {49, 50}; 847static const unsigned uart1_pins[] = {49, 50};
846static const int uart1_muxvals[] = {0, 0}; 848static const int uart1_muxvals[] = {0, 0};
847static const unsigned uart2_pins[] = {51, 52}; 849static const unsigned uart2_pins[] = {51, 52};
@@ -913,6 +915,7 @@ static const struct uniphier_pinctrl_group uniphier_pro5_groups[] = {
913 UNIPHIER_PINCTRL_GROUP(system_bus_cs7), 915 UNIPHIER_PINCTRL_GROUP(system_bus_cs7),
914 UNIPHIER_PINCTRL_GROUP(uart0), 916 UNIPHIER_PINCTRL_GROUP(uart0),
915 UNIPHIER_PINCTRL_GROUP(uart0b), 917 UNIPHIER_PINCTRL_GROUP(uart0b),
918 UNIPHIER_PINCTRL_GROUP(uart0b_ctsrts),
916 UNIPHIER_PINCTRL_GROUP(uart1), 919 UNIPHIER_PINCTRL_GROUP(uart1),
917 UNIPHIER_PINCTRL_GROUP(uart2), 920 UNIPHIER_PINCTRL_GROUP(uart2),
918 UNIPHIER_PINCTRL_GROUP(uart3), 921 UNIPHIER_PINCTRL_GROUP(uart3),
@@ -940,7 +943,7 @@ static const char * const system_bus_groups[] = {"system_bus",
940 "system_bus_cs5", 943 "system_bus_cs5",
941 "system_bus_cs6", 944 "system_bus_cs6",
942 "system_bus_cs7"}; 945 "system_bus_cs7"};
943static const char * const uart0_groups[] = {"uart0", "uart0b"}; 946static const char * const uart0_groups[] = {"uart0", "uart0b", "uart0b_ctsrts"};
944static const char * const uart1_groups[] = {"uart1"}; 947static const char * const uart1_groups[] = {"uart1"};
945static const char * const uart2_groups[] = {"uart2"}; 948static const char * const uart2_groups[] = {"uart2"};
946static const char * const uart3_groups[] = {"uart3"}; 949static const char * const uart3_groups[] = {"uart3"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index f0a4cfc00160..032619ad0e73 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -788,6 +788,8 @@ static const unsigned uart0_pins[] = {217, 218};
788static const int uart0_muxvals[] = {8, 8}; 788static const int uart0_muxvals[] = {8, 8};
789static const unsigned uart0b_pins[] = {179, 180}; 789static const unsigned uart0b_pins[] = {179, 180};
790static const int uart0b_muxvals[] = {10, 10}; 790static const int uart0b_muxvals[] = {10, 10};
791static const unsigned uart0b_ctsrts_pins[] = {176, 177, 178, 183, 184, 185};
792static const int uart0b_ctsrts_muxvals[] = {10, 10, 10, 10, 10, 10};
791static const unsigned uart1_pins[] = {115, 116}; 793static const unsigned uart1_pins[] = {115, 116};
792static const int uart1_muxvals[] = {8, 8}; 794static const int uart1_muxvals[] = {8, 8};
793static const unsigned uart2_pins[] = {113, 114}; 795static const unsigned uart2_pins[] = {113, 114};
@@ -863,6 +865,7 @@ static const struct uniphier_pinctrl_group uniphier_pxs2_groups[] = {
863 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 865 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
864 UNIPHIER_PINCTRL_GROUP(uart0), 866 UNIPHIER_PINCTRL_GROUP(uart0),
865 UNIPHIER_PINCTRL_GROUP(uart0b), 867 UNIPHIER_PINCTRL_GROUP(uart0b),
868 UNIPHIER_PINCTRL_GROUP(uart0b_ctsrts),
866 UNIPHIER_PINCTRL_GROUP(uart1), 869 UNIPHIER_PINCTRL_GROUP(uart1),
867 UNIPHIER_PINCTRL_GROUP(uart2), 870 UNIPHIER_PINCTRL_GROUP(uart2),
868 UNIPHIER_PINCTRL_GROUP(uart3), 871 UNIPHIER_PINCTRL_GROUP(uart3),
@@ -896,7 +899,7 @@ static const char * const nand_groups[] = {"nand", "nand_cs1"};
896static const char * const sd_groups[] = {"sd"}; 899static const char * const sd_groups[] = {"sd"};
897static const char * const system_bus_groups[] = {"system_bus", 900static const char * const system_bus_groups[] = {"system_bus",
898 "system_bus_cs1"}; 901 "system_bus_cs1"};
899static const char * const uart0_groups[] = {"uart0", "uart0b"}; 902static const char * const uart0_groups[] = {"uart0", "uart0b", "uart0b_ctsrts"};
900static const char * const uart1_groups[] = {"uart1"}; 903static const char * const uart1_groups[] = {"uart1"};
901static const char * const uart2_groups[] = {"uart2"}; 904static const char * const uart2_groups[] = {"uart2"};
902static const char * const uart3_groups[] = {"uart3", "uart3b"}; 905static const char * const uart3_groups[] = {"uart3", "uart3b"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
index dbe94a9a0353..535bb2e935e4 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
@@ -816,6 +816,8 @@ static const unsigned int system_bus_cs1_pins[] = {15};
816static const int system_bus_cs1_muxvals[] = {0}; 816static const int system_bus_cs1_muxvals[] = {0};
817static const unsigned int uart0_pins[] = {92, 93}; 817static const unsigned int uart0_pins[] = {92, 93};
818static const int uart0_muxvals[] = {0, 0}; 818static const int uart0_muxvals[] = {0, 0};
819static const unsigned int uart0_ctsrts_pins[] = {243, 244, 245, 246, 247, 248};
820static const int uart0_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3};
819static const unsigned int uart1_pins[] = {94, 95}; 821static const unsigned int uart1_pins[] = {94, 95};
820static const int uart1_muxvals[] = {0, 0}; 822static const int uart1_muxvals[] = {0, 0};
821static const unsigned int uart2_pins[] = {96, 97}; 823static const unsigned int uart2_pins[] = {96, 97};
@@ -887,6 +889,7 @@ static const struct uniphier_pinctrl_group uniphier_pxs3_groups[] = {
887 UNIPHIER_PINCTRL_GROUP(system_bus), 889 UNIPHIER_PINCTRL_GROUP(system_bus),
888 UNIPHIER_PINCTRL_GROUP(system_bus_cs1), 890 UNIPHIER_PINCTRL_GROUP(system_bus_cs1),
889 UNIPHIER_PINCTRL_GROUP(uart0), 891 UNIPHIER_PINCTRL_GROUP(uart0),
892 UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),
890 UNIPHIER_PINCTRL_GROUP(uart1), 893 UNIPHIER_PINCTRL_GROUP(uart1),
891 UNIPHIER_PINCTRL_GROUP(uart2), 894 UNIPHIER_PINCTRL_GROUP(uart2),
892 UNIPHIER_PINCTRL_GROUP(uart3), 895 UNIPHIER_PINCTRL_GROUP(uart3),
@@ -912,7 +915,7 @@ static const char * const nand_groups[] = {"nand"};
912static const char * const sd_groups[] = {"sd"}; 915static const char * const sd_groups[] = {"sd"};
913static const char * const system_bus_groups[] = {"system_bus", 916static const char * const system_bus_groups[] = {"system_bus",
914 "system_bus_cs1"}; 917 "system_bus_cs1"};
915static const char * const uart0_groups[] = {"uart0"}; 918static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts"};
916static const char * const uart1_groups[] = {"uart1"}; 919static const char * const uart1_groups[] = {"uart1"};
917static const char * const uart2_groups[] = {"uart2"}; 920static const char * const uart2_groups[] = {"uart2"};
918static const char * const uart3_groups[] = {"uart3"}; 921static const char * const uart3_groups[] = {"uart3"};
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 1af430d701be..0f921a653164 100644
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -520,6 +520,8 @@ static const unsigned system_bus_cs5_pins[] = {13};
520static const int system_bus_cs5_muxvals[] = {1}; 520static const int system_bus_cs5_muxvals[] = {1};
521static const unsigned uart0_pins[] = {70, 71}; 521static const unsigned uart0_pins[] = {70, 71};
522static const int uart0_muxvals[] = {3, 3}; 522static const int uart0_muxvals[] = {3, 3};
523static const unsigned uart0_ctsrts_pins[] = {72, 73, 74};
524static const int uart0_ctsrts_muxvals[] = {3, 3, 3};
523static const unsigned uart1_pins[] = {114, 115}; 525static const unsigned uart1_pins[] = {114, 115};
524static const int uart1_muxvals[] = {0, 0}; 526static const int uart1_muxvals[] = {0, 0};
525static const unsigned uart2_pins[] = {112, 113}; 527static const unsigned uart2_pins[] = {112, 113};
@@ -575,6 +577,7 @@ static const struct uniphier_pinctrl_group uniphier_sld8_groups[] = {
575 UNIPHIER_PINCTRL_GROUP(system_bus_cs4), 577 UNIPHIER_PINCTRL_GROUP(system_bus_cs4),
576 UNIPHIER_PINCTRL_GROUP(system_bus_cs5), 578 UNIPHIER_PINCTRL_GROUP(system_bus_cs5),
577 UNIPHIER_PINCTRL_GROUP(uart0), 579 UNIPHIER_PINCTRL_GROUP(uart0),
580 UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),
578 UNIPHIER_PINCTRL_GROUP(uart1), 581 UNIPHIER_PINCTRL_GROUP(uart1),
579 UNIPHIER_PINCTRL_GROUP(uart2), 582 UNIPHIER_PINCTRL_GROUP(uart2),
580 UNIPHIER_PINCTRL_GROUP(uart3), 583 UNIPHIER_PINCTRL_GROUP(uart3),
@@ -601,7 +604,7 @@ static const char * const system_bus_groups[] = {"system_bus",
601 "system_bus_cs3", 604 "system_bus_cs3",
602 "system_bus_cs4", 605 "system_bus_cs4",
603 "system_bus_cs5"}; 606 "system_bus_cs5"};
604static const char * const uart0_groups[] = {"uart0"}; 607static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts"};
605static const char * const uart1_groups[] = {"uart1"}; 608static const char * const uart1_groups[] = {"uart1"};
606static const char * const uart2_groups[] = {"uart2"}; 609static const char * const uart2_groups[] = {"uart2"};
607static const char * const uart3_groups[] = {"uart3"}; 610static const char * const uart3_groups[] = {"uart3"};