Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fc97ef9 authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Linus Walleij
Browse files

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: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Acked-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c8a83090

drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c

+4 −1
Original line number Diff line number Diff line
@@ -506,6 +506,8 @@ static const unsigned uart2_pins[] = {90, 91}; 
static const int uart2_muxvals[] = {1, 1};

static const unsigned uart3_pins[] = {94, 95};

static const int uart3_muxvals[] = {1, 1};

static const unsigned uart3_ctsrts_pins[] = {96, 97, 98, 99, 100, 101};

static const int uart3_ctsrts_muxvals[] = {1, 1, 1, 1, 1, 1};

static const unsigned usb0_pins[] = {46, 47};

static const int usb0_muxvals[] = {0, 0};

static const unsigned usb1_pins[] = {48, 49};
@@ -565,6 +567,7 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(uart1),

	UNIPHIER_PINCTRL_GROUP(uart2),

	UNIPHIER_PINCTRL_GROUP(uart3),

	UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),

	UNIPHIER_PINCTRL_GROUP(usb0),

	UNIPHIER_PINCTRL_GROUP(usb1),

	UNIPHIER_PINCTRL_GROUP(usb2),
@@ -590,7 +593,7 @@ static const char * const system_bus_groups[] = {"system_bus", 
static const char * const uart0_groups[] = {"uart0"};

static const char * const uart1_groups[] = {"uart1"};

static const char * const uart2_groups[] = {"uart2"};

static const char * const uart3_groups[] = {"uart3"};

static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts"};

static const char * const usb0_groups[] = {"usb0"};

static const char * const usb1_groups[] = {"usb1"};

static const char * const usb2_groups[] = {"usb2"};

drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c

+4 −1
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ static const unsigned uart2_pins[] = {90, 91}; 
static const int uart2_muxvals[] = {1, 1};

static const unsigned uart3_pins[] = {94, 95};

static const int uart3_muxvals[] = {1, 1};

static const unsigned uart3_ctsrts_pins[] = {96, 97, 98, 99, 100, 101};

static const int uart3_ctsrts_muxvals[] = {1, 1, 1, 1, 1, 1};

static const unsigned usb0_pins[] = {46, 47};

static const int usb0_muxvals[] = {0, 0};

static const unsigned usb1_pins[] = {48, 49};
@@ -651,6 +653,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(uart1),

	UNIPHIER_PINCTRL_GROUP(uart2),

	UNIPHIER_PINCTRL_GROUP(uart3),

	UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),

	UNIPHIER_PINCTRL_GROUP(usb0),

	UNIPHIER_PINCTRL_GROUP(usb1),

	UNIPHIER_PINCTRL_GROUP(usb2),
@@ -676,7 +679,7 @@ static const char * const system_bus_groups[] = {"system_bus", 
static const char * const uart0_groups[] = {"uart0"};

static const char * const uart1_groups[] = {"uart1"};

static const char * const uart2_groups[] = {"uart2"};

static const char * const uart3_groups[] = {"uart3"};

static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts"};

static const char * const usb0_groups[] = {"usb0"};

static const char * const usb1_groups[] = {"usb1"};

static const char * const usb2_groups[] = {"usb2"};

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

+4 −1
Original line number Diff line number Diff line
@@ -590,6 +590,8 @@ static const unsigned system_bus_cs3_pins[] = {156}; 
static const int system_bus_cs3_muxvals[] = {1};

static const unsigned uart0_pins[] = {85, 88};

static const int uart0_muxvals[] = {1, 1};

static const unsigned uart0_ctsrts_pins[] = {86, 87, 89};

static const int uart0_ctsrts_muxvals[] = {1, 1, 1};

static const unsigned uart1_pins[] = {155, 156};

static const int uart1_muxvals[] = {13, 13};

static const unsigned uart1b_pins[] = {69, 70};
@@ -644,6 +646,7 @@ static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(system_bus_cs2),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs3),

	UNIPHIER_PINCTRL_GROUP(uart0),

	UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),

	UNIPHIER_PINCTRL_GROUP(uart1),

	UNIPHIER_PINCTRL_GROUP(uart1b),

	UNIPHIER_PINCTRL_GROUP(uart2),
@@ -669,7 +672,7 @@ static const char * const system_bus_groups[] = {"system_bus", 
						 "system_bus_cs1",

						 "system_bus_cs2",

						 "system_bus_cs3"};

static const char * const uart0_groups[] = {"uart0"};

static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts"};

static const char * const uart1_groups[] = {"uart1", "uart1b"};

static const char * const uart2_groups[] = {"uart2"};

static const char * const uart3_groups[] = {"uart3"};

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

+4 −1
Original line number Diff line number Diff line
@@ -785,6 +785,8 @@ static const unsigned system_bus_cs5_pins[] = {55}; 
static const int system_bus_cs5_muxvals[] = {6};

static const unsigned uart0_pins[] = {135, 136};

static const int uart0_muxvals[] = {3, 3};

static const unsigned uart0_ctsrts_pins[] = {137, 138, 139, 140, 141, 124};

static const int uart0_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3};

static const unsigned uart0b_pins[] = {11, 12};

static const int uart0b_muxvals[] = {2, 2};

static const unsigned uart1_pins[] = {115, 116};
@@ -856,6 +858,7 @@ static const struct uniphier_pinctrl_group uniphier_ld6b_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(system_bus_cs4),

	UNIPHIER_PINCTRL_GROUP(system_bus_cs5),

	UNIPHIER_PINCTRL_GROUP(uart0),

	UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),

	UNIPHIER_PINCTRL_GROUP(uart0b),

	UNIPHIER_PINCTRL_GROUP(uart1),

	UNIPHIER_PINCTRL_GROUP(uart1b),
@@ -885,7 +888,7 @@ static const char * const system_bus_groups[] = {"system_bus", 
						 "system_bus_cs3",

						 "system_bus_cs4",

						 "system_bus_cs5"};

static const char * const uart0_groups[] = {"uart0", "uart0b"};

static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts", "uart0b"};

static const char * const uart1_groups[] = {"uart1", "uart1b"};

static const char * const uart2_groups[] = {"uart2", "uart2b"};

static const char * const usb0_groups[] = {"usb0"};

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

+4 −1
Original line number Diff line number Diff line
@@ -1078,6 +1078,8 @@ static const unsigned uart2_pins[] = {131, 132}; 
static const int uart2_muxvals[] = {0, 0};

static const unsigned uart3_pins[] = {88, 89};

static const int uart3_muxvals[] = {2, 2};

static const unsigned uart3_ctsrts_pins[] = {80, 81, 82, 83, 90, 91};

static const int uart3_ctsrts_muxvals[] = {2, 2, 2, 2, 2, 2};

static const unsigned usb0_pins[] = {180, 181};

static const int usb0_muxvals[] = {0, 0};

static const unsigned usb1_pins[] = {182, 183};
@@ -1149,6 +1151,7 @@ static const struct uniphier_pinctrl_group uniphier_pro4_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(uart1),

	UNIPHIER_PINCTRL_GROUP(uart2),

	UNIPHIER_PINCTRL_GROUP(uart3),

	UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),

	UNIPHIER_PINCTRL_GROUP(usb0),

	UNIPHIER_PINCTRL_GROUP(usb1),

	UNIPHIER_PINCTRL_GROUP(usb2),
@@ -1180,7 +1183,7 @@ static const char * const system_bus_groups[] = {"system_bus", 
static const char * const uart0_groups[] = {"uart0"};

static const char * const uart1_groups[] = {"uart1"};

static const char * const uart2_groups[] = {"uart2"};

static const char * const uart3_groups[] = {"uart3"};

static const char * const uart3_groups[] = {"uart3", "uart3_ctsrts"};

static const char * const usb0_groups[] = {"usb0"};

static const char * const usb1_groups[] = {"usb1"};

static const char * const usb2_groups[] = {"usb2"};