* [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings
@ 2019-07-09 10:29 Kunihiko Hayashi
2019-07-09 10:29 ` [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group Kunihiko Hayashi
` (5 more replies)
0 siblings, 6 replies; 15+ messages in thread
From: Kunihiko Hayashi @ 2019-07-09 10:29 UTC (permalink / raw)
To: Linus Walleij, Masahiro Yamada, linux-gpio
Cc: linux-arm-kernel, linux-kernel, Masami Hiramatsu, Jassi Brar,
Kunihiko Hayashi
This series adds some improvements and new settings for pin-mux.
Kunihiko Hayashi (5):
pinctrl: uniphier: Separate modem group from UART ctsrts group
pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20
pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting
pinctrl: uniphier: Add Pro5 PCIe pin-mux settings
pinctrl: uniphier: Fix Pro5 SD pin-mux setting
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 10 +++++++---
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 20 +++++++++++++++++---
drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 10 +++++++---
drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 10 +++++++---
drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 10 +++++++---
drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 17 +++++++++++++----
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 10 +++++++---
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 10 +++++++---
drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 10 +++++++---
9 files changed, 79 insertions(+), 28 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group 2019-07-09 10:29 [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Kunihiko Hayashi @ 2019-07-09 10:29 ` Kunihiko Hayashi 2019-07-29 13:45 ` Masahiro Yamada 2019-07-09 10:29 ` [PATCH 2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 Kunihiko Hayashi ` (4 subsequent siblings) 5 siblings, 1 reply; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-09 10:29 UTC (permalink / raw) To: Linus Walleij, Masahiro Yamada, linux-gpio Cc: linux-arm-kernel, linux-kernel, Masami Hiramatsu, Jassi Brar, Kunihiko Hayashi 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: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 10 +++++++--- drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 10 +++++++--- 9 files changed, 63 insertions(+), 27 deletions(-) diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c index 92fef3a..c390a55 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c @@ -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"}; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 7fbc965..28e54b3 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -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"}; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c index d09019b..88fd68f 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c @@ -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"}; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c index 414ff3a..d1ed5b7 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c @@ -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[] = {138, 140, 141, 124}; +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"}; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c index 919b9be..4f63d7b 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c @@ -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"}; diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c index 4a6580d..1d418e3 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c @@ -839,8 +839,10 @@ static const unsigned uart0_pins[] = {47, 48}; static const int uart0_muxvals[] = {0, 0}; static const unsigned uart0b_pins[] = {227, 228}; static const int uart0b_muxvals[] = {3, 3}; -static const unsigned uart0b_ctsrts_pins[] = {229, 230, 231, 232, 233, 234}; -static const int uart0b_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3}; +static const unsigned uart0b_ctsrts_pins[] = {232, 233}; +static const int uart0b_ctsrts_muxvals[] = {3, 3}; +static const unsigned uart0b_modem_pins[] = {229, 230, 231, 234}; +static const int uart0b_modem_muxvals[] = {3, 3, 3, 3}; static const unsigned uart1_pins[] = {49, 50}; static const int uart1_muxvals[] = {0, 0}; static const unsigned uart2_pins[] = {51, 52}; @@ -916,6 +918,7 @@ static const struct uniphier_pinctrl_group uniphier_pro5_groups[] = { UNIPHIER_PINCTRL_GROUP(uart0), UNIPHIER_PINCTRL_GROUP(uart0b), UNIPHIER_PINCTRL_GROUP(uart0b_ctsrts), + UNIPHIER_PINCTRL_GROUP(uart0b_modem), UNIPHIER_PINCTRL_GROUP(uart1), UNIPHIER_PINCTRL_GROUP(uart2), UNIPHIER_PINCTRL_GROUP(uart3), @@ -946,7 +949,8 @@ static const char * const system_bus_groups[] = {"system_bus", "system_bus_cs5", "system_bus_cs6", "system_bus_cs7"}; -static const char * const uart0_groups[] = {"uart0", "uart0b", "uart0b_ctsrts"}; +static const char * const uart0_groups[] = {"uart0", "uart0b", + "uart0b_ctsrts", "uart0b_modem"}; static const char * const uart1_groups[] = {"uart1"}; static const char * const uart2_groups[] = {"uart2"}; static 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 169bb44..e52e65a 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c @@ -783,8 +783,10 @@ static const unsigned uart0_pins[] = {217, 218}; static const int uart0_muxvals[] = {8, 8}; static const unsigned uart0b_pins[] = {179, 180}; static const int uart0b_muxvals[] = {10, 10}; -static const unsigned uart0b_ctsrts_pins[] = {176, 177, 178, 183, 184, 185}; -static const int uart0b_ctsrts_muxvals[] = {10, 10, 10, 10, 10, 10}; +static const unsigned uart0b_ctsrts_pins[] = {183, 185}; +static const int uart0b_ctsrts_muxvals[] = {10, 10}; +static const unsigned uart0b_modem_pins[] = {176, 177, 178, 184}; +static const int uart0b_modem_muxvals[] = {10, 10, 10, 10}; static const unsigned uart1_pins[] = {115, 116}; static const int uart1_muxvals[] = {8, 8}; static const unsigned uart2_pins[] = {113, 114}; @@ -863,6 +865,7 @@ static const struct uniphier_pinctrl_group uniphier_pxs2_groups[] = { UNIPHIER_PINCTRL_GROUP(uart0), UNIPHIER_PINCTRL_GROUP(uart0b), UNIPHIER_PINCTRL_GROUP(uart0b_ctsrts), + UNIPHIER_PINCTRL_GROUP(uart0b_modem), UNIPHIER_PINCTRL_GROUP(uart1), UNIPHIER_PINCTRL_GROUP(uart2), UNIPHIER_PINCTRL_GROUP(uart3), @@ -898,7 +901,8 @@ static const char * const spi0_groups[] = {"spi0"}; static const char * const spi1_groups[] = {"spi1"}; static const char * const system_bus_groups[] = {"system_bus", "system_bus_cs1"}; -static const char * const uart0_groups[] = {"uart0", "uart0b", "uart0b_ctsrts"}; +static const char * const uart0_groups[] = {"uart0", "uart0b", + "uart0b_ctsrts", "uart0b_modem"}; static const char * const uart1_groups[] = {"uart1"}; static const char * const uart2_groups[] = {"uart2"}; static 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 3dc3e5b..2b388fd 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c @@ -811,8 +811,10 @@ static const unsigned int system_bus_cs1_pins[] = {15}; static const int system_bus_cs1_muxvals[] = {0}; static const unsigned int uart0_pins[] = {92, 93}; static const int uart0_muxvals[] = {0, 0}; -static const unsigned int uart0_ctsrts_pins[] = {243, 244, 245, 246, 247, 248}; -static const int uart0_ctsrts_muxvals[] = {3, 3, 3, 3, 3, 3}; +static const unsigned int uart0_ctsrts_pins[] = {243, 247}; +static const int uart0_ctsrts_muxvals[] = {3, 3}; +static const unsigned int uart0_modem_pins[] = {244, 245, 246, 248}; +static const int uart0_modem_muxvals[] = {3, 3, 3, 3}; static const unsigned int uart1_pins[] = {94, 95}; static const int uart1_muxvals[] = {0, 0}; static const unsigned int uart2_pins[] = {96, 97}; @@ -887,6 +889,7 @@ static const struct uniphier_pinctrl_group uniphier_pxs3_groups[] = { UNIPHIER_PINCTRL_GROUP(system_bus_cs1), UNIPHIER_PINCTRL_GROUP(uart0), UNIPHIER_PINCTRL_GROUP(uart0_ctsrts), + UNIPHIER_PINCTRL_GROUP(uart0_modem), UNIPHIER_PINCTRL_GROUP(uart1), UNIPHIER_PINCTRL_GROUP(uart2), UNIPHIER_PINCTRL_GROUP(uart3), @@ -914,7 +917,8 @@ static const char * const spi0_groups[] = {"spi0"}; static const char * const spi1_groups[] = {"spi1"}; static const char * const system_bus_groups[] = {"system_bus", "system_bus_cs1"}; -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"}; static const char * const uart2_groups[] = {"uart2"}; static 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 463e932..087e8db 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c @@ -513,8 +513,10 @@ static const unsigned system_bus_cs5_pins[] = {13}; static const int system_bus_cs5_muxvals[] = {1}; static const unsigned uart0_pins[] = {70, 71}; static const int uart0_muxvals[] = {3, 3}; -static const unsigned uart0_ctsrts_pins[] = {72, 73, 74}; -static const int uart0_ctsrts_muxvals[] = {3, 3, 3}; +static const unsigned uart0_ctsrts_pins[] = {72, 74}; +static const int uart0_ctsrts_muxvals[] = {3, 3}; +static const unsigned uart0_modem_pins[] = {73}; +static const int uart0_modem_muxvals[] = {3}; static const unsigned uart1_pins[] = {114, 115}; static const int uart1_muxvals[] = {0, 0}; static const unsigned uart2_pins[] = {112, 113}; @@ -572,6 +574,7 @@ static const struct uniphier_pinctrl_group uniphier_sld8_groups[] = { UNIPHIER_PINCTRL_GROUP(system_bus_cs5), UNIPHIER_PINCTRL_GROUP(uart0), UNIPHIER_PINCTRL_GROUP(uart0_ctsrts), + UNIPHIER_PINCTRL_GROUP(uart0_modem), UNIPHIER_PINCTRL_GROUP(uart1), UNIPHIER_PINCTRL_GROUP(uart2), UNIPHIER_PINCTRL_GROUP(uart3), @@ -599,7 +602,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"}; +static const char * const uart0_groups[] = {"uart0", "uart0_ctsrts", + "uart0_modem"}; static const char * const uart1_groups[] = {"uart1"}; static const char * const uart2_groups[] = {"uart2"}; static const char * const uart3_groups[] = {"uart3"}; -- 2.7.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group 2019-07-09 10:29 ` [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group Kunihiko Hayashi @ 2019-07-29 13:45 ` Masahiro Yamada 2019-07-30 2:21 ` Kunihiko Hayashi 0 siblings, 1 reply; 15+ messages in thread From: Masahiro Yamada @ 2019-07-29 13:45 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > > 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: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c > index 414ff3a..d1ed5b7 100644 > --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c > +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c > @@ -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[] = {138, 140, 141, 124}; Please sort this array while you are here. Otherwise, looks good to me. -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group 2019-07-29 13:45 ` Masahiro Yamada @ 2019-07-30 2:21 ` Kunihiko Hayashi 0 siblings, 0 replies; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-30 2:21 UTC (permalink / raw) To: Masahiro Yamada Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar Hello, On Mon, 29 Jul 2019 22:45:01 +0900 <yamada.masahiro@socionext.com> wrote: > On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi > <hayashi.kunihiko@socionext.com> wrote: > > > > 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: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > > --- > > > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c > > index 414ff3a..d1ed5b7 100644 > > --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c > > +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c > > @@ -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[] = {138, 140, 141, 124}; > > Please sort this array > while you are here. Thank you for pointing out. I'll sort it in v2. > > Otherwise, looks good to me. > > > > > > > -- > Best Regards > Masahiro Yamada --- Best Regards, Kunihiko Hayashi ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 2019-07-09 10:29 [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Kunihiko Hayashi 2019-07-09 10:29 ` [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group Kunihiko Hayashi @ 2019-07-09 10:29 ` Kunihiko Hayashi 2019-07-29 13:44 ` Masahiro Yamada 2019-07-09 10:29 ` [PATCH 3/5] pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting Kunihiko Hayashi ` (3 subsequent siblings) 5 siblings, 1 reply; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-09 10:29 UTC (permalink / raw) To: Linus Walleij, Masahiro Yamada, linux-gpio Cc: linux-arm-kernel, linux-kernel, Masami Hiramatsu, Jassi Brar, Kunihiko Hayashi This adds support for pinmux settings of aout1b groups. This group includes aout1 signals derived from xirq pins. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 28e54b3..2c66e70 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -544,6 +544,8 @@ static const struct pinctrl_pin_desc uniphier_ld20_pins[] = { static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142}; static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0}; +static const unsigned aout1b_pins[] = {150, 151, 152, 153, 154, 155, 156}; +static const int aout1b_muxvals[] = {1, 1, 1, 1, 1, 1, 1}; static const unsigned aoutiec1_pins[] = {135, 136}; static const int aoutiec1_muxvals[] = {0, 0}; static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25}; @@ -664,6 +666,7 @@ static const unsigned int gpio_range2_pins[] = { static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { UNIPHIER_PINCTRL_GROUP(aout1), + UNIPHIER_PINCTRL_GROUP(aout1b), UNIPHIER_PINCTRL_GROUP(aoutiec1), UNIPHIER_PINCTRL_GROUP(emmc), UNIPHIER_PINCTRL_GROUP(emmc_dat8), @@ -708,6 +711,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { }; static const char * const aout1_groups[] = {"aout1"}; +static const char * const aout1b_groups[] = {"aout1b"}; static const char * const aoutiec1_groups[] = {"aoutiec1"}; static const char * const emmc_groups[] = {"emmc", "emmc_dat8"}; static const char * const ether_rgmii_groups[] = {"ether_rgmii"}; @@ -746,6 +750,7 @@ static const char * const usb3_groups[] = {"usb3"}; static const struct uniphier_pinmux_function uniphier_ld20_functions[] = { UNIPHIER_PINMUX_FUNCTION(aout1), + UNIPHIER_PINMUX_FUNCTION(aout1b), UNIPHIER_PINMUX_FUNCTION(aoutiec1), UNIPHIER_PINMUX_FUNCTION(emmc), UNIPHIER_PINMUX_FUNCTION(ether_rgmii), -- 2.7.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 2019-07-09 10:29 ` [PATCH 2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 Kunihiko Hayashi @ 2019-07-29 13:44 ` Masahiro Yamada 2019-07-30 2:22 ` Kunihiko Hayashi 0 siblings, 1 reply; 15+ messages in thread From: Masahiro Yamada @ 2019-07-29 13:44 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > > This adds support for pinmux settings of aout1b groups. This group includes > aout1 signals derived from xirq pins. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c > index 28e54b3..2c66e70 100644 > --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c > +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c > @@ -544,6 +544,8 @@ static const struct pinctrl_pin_desc uniphier_ld20_pins[] = { > > static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142}; > static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0}; > +static const unsigned aout1b_pins[] = {150, 151, 152, 153, 154, 155, 156}; > +static const int aout1b_muxvals[] = {1, 1, 1, 1, 1, 1, 1}; > static const unsigned aoutiec1_pins[] = {135, 136}; > static const int aoutiec1_muxvals[] = {0, 0}; > static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25}; > @@ -664,6 +666,7 @@ static const unsigned int gpio_range2_pins[] = { > > static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { > UNIPHIER_PINCTRL_GROUP(aout1), > + UNIPHIER_PINCTRL_GROUP(aout1b), > UNIPHIER_PINCTRL_GROUP(aoutiec1), > UNIPHIER_PINCTRL_GROUP(emmc), > UNIPHIER_PINCTRL_GROUP(emmc_dat8), > @@ -708,6 +711,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { > }; > > static const char * const aout1_groups[] = {"aout1"}; > +static const char * const aout1b_groups[] = {"aout1b"}; If this has the same functionality as "aout1", shouldn't it be a part of aout1_groups? -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 2019-07-29 13:44 ` Masahiro Yamada @ 2019-07-30 2:22 ` Kunihiko Hayashi 0 siblings, 0 replies; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-30 2:22 UTC (permalink / raw) To: Masahiro Yamada Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar Hello, On Mon, 29 Jul 2019 22:44:27 +0900 <yamada.masahiro@socionext.com> wrote: > On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi > <hayashi.kunihiko@socionext.com> wrote: > > > > This adds support for pinmux settings of aout1b groups. This group includes > > aout1 signals derived from xirq pins. > > > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > > --- > > drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c > > index 28e54b3..2c66e70 100644 > > --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c > > +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c > > @@ -544,6 +544,8 @@ static const struct pinctrl_pin_desc uniphier_ld20_pins[] = { > > > > static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142}; > > static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0}; > > +static const unsigned aout1b_pins[] = {150, 151, 152, 153, 154, 155, 156}; > > +static const int aout1b_muxvals[] = {1, 1, 1, 1, 1, 1, 1}; > > static const unsigned aoutiec1_pins[] = {135, 136}; > > static const int aoutiec1_muxvals[] = {0, 0}; > > static const unsigned int emmc_pins[] = {19, 20, 21, 22, 23, 24, 25}; > > @@ -664,6 +666,7 @@ static const unsigned int gpio_range2_pins[] = { > > > > static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { > > UNIPHIER_PINCTRL_GROUP(aout1), > > + UNIPHIER_PINCTRL_GROUP(aout1b), > > UNIPHIER_PINCTRL_GROUP(aoutiec1), > > UNIPHIER_PINCTRL_GROUP(emmc), > > UNIPHIER_PINCTRL_GROUP(emmc_dat8), > > @@ -708,6 +711,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { > > }; > > > > static const char * const aout1_groups[] = {"aout1"}; > > +static const char * const aout1b_groups[] = {"aout1b"}; > > If this has the same functionality as "aout1", > shouldn't it be a part of aout1_groups? Indeed. I'll merge "aout1b" with aout1_groups. > > > > > -- > Best Regards > Masahiro Yamada --- Best Regards, Kunihiko Hayashi ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/5] pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting 2019-07-09 10:29 [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Kunihiko Hayashi 2019-07-09 10:29 ` [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group Kunihiko Hayashi 2019-07-09 10:29 ` [PATCH 2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 Kunihiko Hayashi @ 2019-07-09 10:29 ` Kunihiko Hayashi 2019-07-29 13:45 ` Masahiro Yamada 2019-07-09 10:29 ` [PATCH 4/5] pinctrl: uniphier: Add Pro5 PCIe pin-mux settings Kunihiko Hayashi ` (2 subsequent siblings) 5 siblings, 1 reply; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-09 10:29 UTC (permalink / raw) To: Linus Walleij, Masahiro Yamada, linux-gpio Cc: linux-arm-kernel, linux-kernel, Masami Hiramatsu, Jassi Brar, Kunihiko Hayashi The 4th serial TS interface uses the following pins: hscin4_s: PCA[11-14] Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 2c66e70..2de601c 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -576,6 +576,8 @@ static const unsigned hscin2_s_pins[] = {124, 125, 126, 127}; static const int hscin2_s_muxvals[] = {3, 3, 3, 3}; static const unsigned hscin3_s_pins[] = {129, 130, 131, 132}; static const int hscin3_s_muxvals[] = {3, 3, 3, 3}; +static const unsigned hscin4_s_pins[] = {80, 81, 82, 83}; +static const int hscin4_s_muxvals[] = {3, 3, 3, 3}; static const unsigned hscout0_ci_pins[] = {113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123}; static const int hscout0_ci_muxvals[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; @@ -679,6 +681,7 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = { UNIPHIER_PINCTRL_GROUP(hscin1_s), UNIPHIER_PINCTRL_GROUP(hscin2_s), UNIPHIER_PINCTRL_GROUP(hscin3_s), + UNIPHIER_PINCTRL_GROUP(hscin4_s), UNIPHIER_PINCTRL_GROUP(hscout0_ci), UNIPHIER_PINCTRL_GROUP(hscout0_p), UNIPHIER_PINCTRL_GROUP(hscout0_s), @@ -722,6 +725,7 @@ static const char * const hscin0_groups[] = {"hscin0_ci", static const char * const hscin1_groups[] = {"hscin1_p", "hscin1_s"}; static const char * const hscin2_groups[] = {"hscin2_s"}; static const char * const hscin3_groups[] = {"hscin3_s"}; +static const char * const hscin4_groups[] = {"hscin4_s"}; static const char * const hscout0_groups[] = {"hscout0_ci", "hscout0_p", "hscout0_s"}; @@ -759,6 +763,7 @@ static const struct uniphier_pinmux_function uniphier_ld20_functions[] = { UNIPHIER_PINMUX_FUNCTION(hscin1), UNIPHIER_PINMUX_FUNCTION(hscin2), UNIPHIER_PINMUX_FUNCTION(hscin3), + UNIPHIER_PINMUX_FUNCTION(hscin4), UNIPHIER_PINMUX_FUNCTION(hscout0), UNIPHIER_PINMUX_FUNCTION(hscout1), UNIPHIER_PINMUX_FUNCTION(i2c0), -- 2.7.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 3/5] pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting 2019-07-09 10:29 ` [PATCH 3/5] pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting Kunihiko Hayashi @ 2019-07-29 13:45 ` Masahiro Yamada 0 siblings, 0 replies; 15+ messages in thread From: Masahiro Yamada @ 2019-07-29 13:45 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > > The 4th serial TS interface uses the following pins: This is the 5th pin-group (hscin0, hscin1, hscin2, hscin3, and hscin4) but I see what you mean. So, I do not not mind. Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> > hscin4_s: PCA[11-14] > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 4/5] pinctrl: uniphier: Add Pro5 PCIe pin-mux settings 2019-07-09 10:29 [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Kunihiko Hayashi ` (2 preceding siblings ...) 2019-07-09 10:29 ` [PATCH 3/5] pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting Kunihiko Hayashi @ 2019-07-09 10:29 ` Kunihiko Hayashi 2019-07-29 13:46 ` Masahiro Yamada 2019-07-09 10:29 ` [PATCH 5/5] pinctrl: uniphier: Fix Pro5 SD pin-mux setting Kunihiko Hayashi 2019-07-28 23:07 ` [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Linus Walleij 5 siblings, 1 reply; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-09 10:29 UTC (permalink / raw) To: Linus Walleij, Masahiro Yamada, linux-gpio Cc: linux-arm-kernel, linux-kernel, Masami Hiramatsu, Jassi Brar, Kunihiko Hayashi Pro5 PCIe interface uses the following pins: XPERST, XPEWAKE, XPECLKRQ Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c index 1d418e3..577f12e 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c @@ -855,6 +855,8 @@ static const unsigned usb1_pins[] = {126, 127}; static const int usb1_muxvals[] = {0, 0}; static const unsigned usb2_pins[] = {128, 129}; static const int usb2_muxvals[] = {0, 0}; +static const unsigned pcie_pins[] = {109, 110, 111}; +static const int pcie_muxvals[] = {0, 0, 0}; static const unsigned int gpio_range_pins[] = { 89, 90, 91, 92, 93, 94, 95, 96, /* PORT0x */ 97, 98, 99, 100, 101, 102, 103, 104, /* PORT1x */ @@ -925,6 +927,7 @@ static const struct uniphier_pinctrl_group uniphier_pro5_groups[] = { UNIPHIER_PINCTRL_GROUP(usb0), UNIPHIER_PINCTRL_GROUP(usb1), UNIPHIER_PINCTRL_GROUP(usb2), + UNIPHIER_PINCTRL_GROUP(pcie), UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range), }; @@ -957,6 +960,7 @@ static const char * const uart3_groups[] = {"uart3"}; static const char * const usb0_groups[] = {"usb0"}; static const char * const usb1_groups[] = {"usb1"}; static const char * const usb2_groups[] = {"usb2"}; +static const char * const pcie_groups[] = {"pcie"}; static const struct uniphier_pinmux_function uniphier_pro5_functions[] = { UNIPHIER_PINMUX_FUNCTION(emmc), @@ -979,6 +983,7 @@ static const struct uniphier_pinmux_function uniphier_pro5_functions[] = { UNIPHIER_PINMUX_FUNCTION(usb0), UNIPHIER_PINMUX_FUNCTION(usb1), UNIPHIER_PINMUX_FUNCTION(usb2), + UNIPHIER_PINMUX_FUNCTION(pcie), }; static int uniphier_pro5_get_gpio_muxval(unsigned int pin, -- 2.7.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] pinctrl: uniphier: Add Pro5 PCIe pin-mux settings 2019-07-09 10:29 ` [PATCH 4/5] pinctrl: uniphier: Add Pro5 PCIe pin-mux settings Kunihiko Hayashi @ 2019-07-29 13:46 ` Masahiro Yamada 2019-07-30 2:22 ` Kunihiko Hayashi 0 siblings, 1 reply; 15+ messages in thread From: Masahiro Yamada @ 2019-07-29 13:46 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > > Pro5 PCIe interface uses the following pins: > XPERST, XPEWAKE, XPECLKRQ > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > index 1d418e3..577f12e 100644 > --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > @@ -855,6 +855,8 @@ static const unsigned usb1_pins[] = {126, 127}; > static const int usb1_muxvals[] = {0, 0}; > static const unsigned usb2_pins[] = {128, 129}; > static const int usb2_muxvals[] = {0, 0}; > +static const unsigned pcie_pins[] = {109, 110, 111}; > +static const int pcie_muxvals[] = {0, 0, 0}; Please keep the alphabetical sorting. > static const unsigned int gpio_range_pins[] = { > 89, 90, 91, 92, 93, 94, 95, 96, /* PORT0x */ > 97, 98, 99, 100, 101, 102, 103, 104, /* PORT1x */ > @@ -925,6 +927,7 @@ static const struct uniphier_pinctrl_group uniphier_pro5_groups[] = { > UNIPHIER_PINCTRL_GROUP(usb0), > UNIPHIER_PINCTRL_GROUP(usb1), > UNIPHIER_PINCTRL_GROUP(usb2), > + UNIPHIER_PINCTRL_GROUP(pcie), Ditto. > UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range), > }; > > @@ -957,6 +960,7 @@ static const char * const uart3_groups[] = {"uart3"}; > static const char * const usb0_groups[] = {"usb0"}; > static const char * const usb1_groups[] = {"usb1"}; > static const char * const usb2_groups[] = {"usb2"}; > +static const char * const pcie_groups[] = {"pcie"}; > > static const struct uniphier_pinmux_function uniphier_pro5_functions[] = { > UNIPHIER_PINMUX_FUNCTION(emmc), > @@ -979,6 +983,7 @@ static const struct uniphier_pinmux_function uniphier_pro5_functions[] = { > UNIPHIER_PINMUX_FUNCTION(usb0), > UNIPHIER_PINMUX_FUNCTION(usb1), > UNIPHIER_PINMUX_FUNCTION(usb2), > + UNIPHIER_PINMUX_FUNCTION(pcie), Ditto. > }; > > static int uniphier_pro5_get_gpio_muxval(unsigned int pin, > -- > 2.7.4 > -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5] pinctrl: uniphier: Add Pro5 PCIe pin-mux settings 2019-07-29 13:46 ` Masahiro Yamada @ 2019-07-30 2:22 ` Kunihiko Hayashi 0 siblings, 0 replies; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-30 2:22 UTC (permalink / raw) To: Masahiro Yamada Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar Hello, On Mon, 29 Jul 2019 22:46:02 +0900 <yamada.masahiro@socionext.com> wrote: > On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi > <hayashi.kunihiko@socionext.com> wrote: > > > > Pro5 PCIe interface uses the following pins: > > XPERST, XPEWAKE, XPECLKRQ > > > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > > --- > > drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > > index 1d418e3..577f12e 100644 > > --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > > +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > > @@ -855,6 +855,8 @@ static const unsigned usb1_pins[] = {126, 127}; > > static const int usb1_muxvals[] = {0, 0}; > > static const unsigned usb2_pins[] = {128, 129}; > > static const int usb2_muxvals[] = {0, 0}; > > +static const unsigned pcie_pins[] = {109, 110, 111}; > > +static const int pcie_muxvals[] = {0, 0, 0}; > > Please keep the alphabetical sorting. I made mistake in adding it. Okay, I'll sort it including below in v2. > > static const unsigned int gpio_range_pins[] = { > > 89, 90, 91, 92, 93, 94, 95, 96, /* PORT0x */ > > 97, 98, 99, 100, 101, 102, 103, 104, /* PORT1x */ > > @@ -925,6 +927,7 @@ static const struct uniphier_pinctrl_group uniphier_pro5_groups[] = { > > UNIPHIER_PINCTRL_GROUP(usb0), > > UNIPHIER_PINCTRL_GROUP(usb1), > > UNIPHIER_PINCTRL_GROUP(usb2), > > + UNIPHIER_PINCTRL_GROUP(pcie), > > Ditto. > > > UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range), > > }; > > > > @@ -957,6 +960,7 @@ static const char * const uart3_groups[] = {"uart3"}; > > static const char * const usb0_groups[] = {"usb0"}; > > static const char * const usb1_groups[] = {"usb1"}; > > static const char * const usb2_groups[] = {"usb2"}; > > +static const char * const pcie_groups[] = {"pcie"}; > > > > static const struct uniphier_pinmux_function uniphier_pro5_functions[] = { > > UNIPHIER_PINMUX_FUNCTION(emmc), > > @@ -979,6 +983,7 @@ static const struct uniphier_pinmux_function uniphier_pro5_functions[] = { > > UNIPHIER_PINMUX_FUNCTION(usb0), > > UNIPHIER_PINMUX_FUNCTION(usb1), > > UNIPHIER_PINMUX_FUNCTION(usb2), > > + UNIPHIER_PINMUX_FUNCTION(pcie), > > Ditto. > > > > > }; > > > > static int uniphier_pro5_get_gpio_muxval(unsigned int pin, > > -- > > 2.7.4 > > > > > -- > Best Regards > Masahiro Yamada --- Best Regards, Kunihiko Hayashi ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/5] pinctrl: uniphier: Fix Pro5 SD pin-mux setting 2019-07-09 10:29 [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Kunihiko Hayashi ` (3 preceding siblings ...) 2019-07-09 10:29 ` [PATCH 4/5] pinctrl: uniphier: Add Pro5 PCIe pin-mux settings Kunihiko Hayashi @ 2019-07-09 10:29 ` Kunihiko Hayashi 2019-07-29 13:46 ` Masahiro Yamada 2019-07-28 23:07 ` [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Linus Walleij 5 siblings, 1 reply; 15+ messages in thread From: Kunihiko Hayashi @ 2019-07-09 10:29 UTC (permalink / raw) To: Linus Walleij, Masahiro Yamada, linux-gpio Cc: linux-arm-kernel, linux-kernel, Masami Hiramatsu, Jassi Brar, Kunihiko Hayashi SD uses the following pins starting from 247: SDCD, SDWP, SDVOLC, SDCLK, SDCMD, SDDAT{0,1,2,3} Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c index 577f12e..22ce0a5 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c @@ -807,7 +807,7 @@ static const unsigned nand_pins[] = {19, 20, 21, 22, 23, 24, 25, 28, 29, 30, static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; static const unsigned nand_cs1_pins[] = {26, 27}; static const int nand_cs1_muxvals[] = {0, 0}; -static const unsigned sd_pins[] = {250, 251, 252, 253, 254, 255, 256, 257, 258}; +static const unsigned sd_pins[] = {247, 248, 249, 250, 251, 252, 253, 254, 255}; static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; static const unsigned spi0_pins[] = {120, 121, 122, 123}; static const int spi0_muxvals[] = {0, 0, 0, 0}; -- 2.7.4 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 5/5] pinctrl: uniphier: Fix Pro5 SD pin-mux setting 2019-07-09 10:29 ` [PATCH 5/5] pinctrl: uniphier: Fix Pro5 SD pin-mux setting Kunihiko Hayashi @ 2019-07-29 13:46 ` Masahiro Yamada 0 siblings, 0 replies; 15+ messages in thread From: Masahiro Yamada @ 2019-07-29 13:46 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Linus Walleij, open list:GPIO SUBSYSTEM, linux-arm-kernel, Linux Kernel Mailing List, Masami Hiramatsu, Jassi Brar On Tue, Jul 9, 2019 at 7:29 PM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > > SD uses the following pins starting from 247: > SDCD, SDWP, SDVOLC, SDCLK, SDCMD, SDDAT{0,1,2,3} > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > index 577f12e..22ce0a5 100644 > --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c > @@ -807,7 +807,7 @@ static const unsigned nand_pins[] = {19, 20, 21, 22, 23, 24, 25, 28, 29, 30, > static const int nand_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; > static const unsigned nand_cs1_pins[] = {26, 27}; > static const int nand_cs1_muxvals[] = {0, 0}; > -static const unsigned sd_pins[] = {250, 251, 252, 253, 254, 255, 256, 257, 258}; > +static const unsigned sd_pins[] = {247, 248, 249, 250, 251, 252, 253, 254, 255}; > static const int sd_muxvals[] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; > static const unsigned spi0_pins[] = {120, 121, 122, 123}; > static const int spi0_muxvals[] = {0, 0, 0, 0}; > -- > 2.7.4 > -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings 2019-07-09 10:29 [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Kunihiko Hayashi ` (4 preceding siblings ...) 2019-07-09 10:29 ` [PATCH 5/5] pinctrl: uniphier: Fix Pro5 SD pin-mux setting Kunihiko Hayashi @ 2019-07-28 23:07 ` Linus Walleij 5 siblings, 0 replies; 15+ messages in thread From: Linus Walleij @ 2019-07-28 23:07 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Masahiro Yamada, open list:GPIO SUBSYSTEM, Linux ARM, linux-kernel, Masami Hiramatsu, Jassi Brar On Tue, Jul 9, 2019 at 12:29 PM Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > This series adds some improvements and new settings for pin-mux. > > Kunihiko Hayashi (5): > pinctrl: uniphier: Separate modem group from UART ctsrts group > pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 > pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting > pinctrl: uniphier: Add Pro5 PCIe pin-mux settings > pinctrl: uniphier: Fix Pro5 SD pin-mux setting Looks fine to me. Masahiro, can I have your ACK/review on these patches? Yours, Linus Walleij ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2019-07-30 2:22 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-07-09 10:29 [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Kunihiko Hayashi 2019-07-09 10:29 ` [PATCH 1/5] pinctrl: uniphier: Separate modem group from UART ctsrts group Kunihiko Hayashi 2019-07-29 13:45 ` Masahiro Yamada 2019-07-30 2:21 ` Kunihiko Hayashi 2019-07-09 10:29 ` [PATCH 2/5] pinctrl: uniphier: Add another audio I/O pin-mux settings for LD20 Kunihiko Hayashi 2019-07-29 13:44 ` Masahiro Yamada 2019-07-30 2:22 ` Kunihiko Hayashi 2019-07-09 10:29 ` [PATCH 3/5] pinctrl: uniphier: Add 4th LD20 MPEG2-TS input pin-mux setting Kunihiko Hayashi 2019-07-29 13:45 ` Masahiro Yamada 2019-07-09 10:29 ` [PATCH 4/5] pinctrl: uniphier: Add Pro5 PCIe pin-mux settings Kunihiko Hayashi 2019-07-29 13:46 ` Masahiro Yamada 2019-07-30 2:22 ` Kunihiko Hayashi 2019-07-09 10:29 ` [PATCH 5/5] pinctrl: uniphier: Fix Pro5 SD pin-mux setting Kunihiko Hayashi 2019-07-29 13:46 ` Masahiro Yamada 2019-07-28 23:07 ` [PATCH 0/5] pinctrl: uniphier: Add some improvements and new settings Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).