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

Commit 111a8fcb authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Linus Walleij
Browse files

pinctrl: uniphier: Separate modem group from UART ctsrts group 



It depends on the board implementation whether to have each pins of
CTS/RTS, and others for modem. So it is necessary to divide current
uart_ctsrts group into uart_ctsrts and uart_modem groups.

Since the number of implemented pins for modem differs depending
on SoC, each uart_modem group also has a different number of pins.

Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Link: https://lore.kernel.org/r/1564465410-9165-2-git-send-email-hayashi.kunihiko@socionext.com


Acked-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 726e8d81

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

+7 −3
Original line number Diff line number Diff line
@@ -526,8 +526,10 @@ 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 uart3_ctsrts_pins[] = {96, 98};

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

static const unsigned uart3_modem_pins[] = {97, 99, 100, 101};

static const int uart3_modem_muxvals[] = {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};
@@ -600,6 +602,7 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(uart2),

	UNIPHIER_PINCTRL_GROUP(uart3),

	UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),

	UNIPHIER_PINCTRL_GROUP(uart3_modem),

	UNIPHIER_PINCTRL_GROUP(usb0),

	UNIPHIER_PINCTRL_GROUP(usb1),

	UNIPHIER_PINCTRL_GROUP(usb2),
@@ -636,7 +639,8 @@ 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", "uart3_ctsrts"};

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

					    "uart3_modem"};

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

+7 −3
Original line number Diff line number Diff line
@@ -619,8 +619,10 @@ 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 uart3_ctsrts_pins[] = {96, 98};

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

static const unsigned uart3_modem_pins[] = {97, 99, 100, 101};

static const int uart3_modem_muxvals[] = {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};
@@ -695,6 +697,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(uart2),

	UNIPHIER_PINCTRL_GROUP(uart3),

	UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),

	UNIPHIER_PINCTRL_GROUP(uart3_modem),

	UNIPHIER_PINCTRL_GROUP(usb0),

	UNIPHIER_PINCTRL_GROUP(usb1),

	UNIPHIER_PINCTRL_GROUP(usb2),
@@ -734,7 +737,8 @@ 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", "uart3_ctsrts"};

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

					    "uart3_modem"};

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

+7 −3
Original line number Diff line number Diff line
@@ -583,8 +583,10 @@ 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 uart0_ctsrts_pins[] = {86, 89};

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

static const unsigned uart0_modem_pins[] = {87};

static const int uart0_modem_muxvals[] = {1};

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

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

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

	UNIPHIER_PINCTRL_GROUP(uart0),

	UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),

	UNIPHIER_PINCTRL_GROUP(uart0_modem),

	UNIPHIER_PINCTRL_GROUP(uart1),

	UNIPHIER_PINCTRL_GROUP(uart1b),

	UNIPHIER_PINCTRL_GROUP(uart2),
@@ -667,7 +670,8 @@ 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", "uart0_ctsrts"};

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

					    "uart0_modem"};

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

+7 −3
Original line number Diff line number Diff line
@@ -780,8 +780,10 @@ 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 uart0_ctsrts_pins[] = {137, 139};

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

static const unsigned uart0_modem_pins[] = {124, 138, 140, 141};

static const int uart0_modem_muxvals[] = {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_cs5),

	UNIPHIER_PINCTRL_GROUP(uart0),

	UNIPHIER_PINCTRL_GROUP(uart0_ctsrts),

	UNIPHIER_PINCTRL_GROUP(uart0_modem),

	UNIPHIER_PINCTRL_GROUP(uart0b),

	UNIPHIER_PINCTRL_GROUP(uart1),

	UNIPHIER_PINCTRL_GROUP(uart1b),
@@ -887,7 +890,8 @@ 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", "uart0_ctsrts", "uart0b"};

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

					    "uart0_modem", "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

+7 −3
Original line number Diff line number Diff line
@@ -1072,8 +1072,10 @@ 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 uart3_ctsrts_pins[] = {90, 91};

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

static const unsigned uart3_modem_pins[] = {80, 81, 82, 83};

static const int uart3_modem_muxvals[] = {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};
@@ -1148,6 +1150,7 @@ static const struct uniphier_pinctrl_group uniphier_pro4_groups[] = { 
	UNIPHIER_PINCTRL_GROUP(uart2),

	UNIPHIER_PINCTRL_GROUP(uart3),

	UNIPHIER_PINCTRL_GROUP(uart3_ctsrts),

	UNIPHIER_PINCTRL_GROUP(uart3_modem),

	UNIPHIER_PINCTRL_GROUP(usb0),

	UNIPHIER_PINCTRL_GROUP(usb1),

	UNIPHIER_PINCTRL_GROUP(usb2),
@@ -1181,7 +1184,8 @@ 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", "uart3_ctsrts"};

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

					    "uart3_modem"};

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

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

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