* [PATCH] pinctrl: Ingenic: Add missing UART2 group C for X1000/E
@ 2022-03-24 12:04 Yunian Yang
2022-03-24 12:10 ` Paul Cercueil
0 siblings, 1 reply; 3+ messages in thread
From: Yunian Yang @ 2022-03-24 12:04 UTC (permalink / raw)
To: linux-mips; +Cc: Paul Cercueil, Linus Walleij, linux-gpio, linux-kernel
X1000/E has a third UART2 pin group selection, which uses the TDI(G2) as RX
and TDO(G1) as TX. This configuration is becoming increasingly popular in
newer core boards, such as the Halley2 v4.1. This is done by enabling
function 1 of a "virtual pin" PC31. See section 19.3.3 of the X1000
Programming Manual for details.
Signed-off-by: Yunian Yang <reimu@sudomaker.com>
---
drivers/pinctrl/pinctrl-ingenic.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 2712f51eb238..29709059d62b 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -1982,6 +1982,7 @@ static int x1000_uart1_data_a_pins[] = { 0x04, 0x05, };
static int x1000_uart1_data_d_pins[] = { 0x62, 0x63, };
static int x1000_uart1_hwflow_pins[] = { 0x64, 0x65, };
static int x1000_uart2_data_a_pins[] = { 0x02, 0x03, };
+static int x1000_uart2_data_c_pins[] = { 0x5f, 0x5f, };
static int x1000_uart2_data_d_pins[] = { 0x65, 0x64, };
static int x1000_sfc_data_pins[] = { 0x1d, 0x1c, 0x1e, 0x1f, };
static int x1000_sfc_clk_pins[] = { 0x1a, };
@@ -2058,6 +2059,7 @@ static const struct group_desc x1000_groups[] = {
INGENIC_PIN_GROUP("uart1-data-d", x1000_uart1_data_d, 1),
INGENIC_PIN_GROUP("uart1-hwflow", x1000_uart1_hwflow, 1),
INGENIC_PIN_GROUP("uart2-data-a", x1000_uart2_data_a, 2),
+ INGENIC_PIN_GROUP("uart2-data-c", x1000_uart2_data_c, 1),
INGENIC_PIN_GROUP("uart2-data-d", x1000_uart2_data_d, 0),
INGENIC_PIN_GROUP("sfc-data", x1000_sfc_data, 1),
INGENIC_PIN_GROUP("sfc-clk", x1000_sfc_clk, 1),
@@ -2115,7 +2117,7 @@ static const char *x1000_uart0_groups[] = { "uart0-data", "uart0-hwflow", };
static const char *x1000_uart1_groups[] = {
"uart1-data-a", "uart1-data-d", "uart1-hwflow",
};
-static const char *x1000_uart2_groups[] = { "uart2-data-a", "uart2-data-d", };
+static const char *x1000_uart2_groups[] = { "uart2-data-a", "uart2-data-c", "uart2-data-d", };
static const char *x1000_sfc_groups[] = { "sfc-data", "sfc-clk", "sfc-ce", };
static const char *x1000_ssi_groups[] = {
"ssi-dt-a-22", "ssi-dt-a-29", "ssi-dt-d",
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] pinctrl: Ingenic: Add missing UART2 group C for X1000/E
2022-03-24 12:04 [PATCH] pinctrl: Ingenic: Add missing UART2 group C for X1000/E Yunian Yang
@ 2022-03-24 12:10 ` Paul Cercueil
2022-03-24 13:39 ` Yunian Yang
0 siblings, 1 reply; 3+ messages in thread
From: Paul Cercueil @ 2022-03-24 12:10 UTC (permalink / raw)
To: Yunian Yang; +Cc: linux-mips, Linus Walleij, linux-gpio, linux-kernel
Hi Yunian,
Le jeu., mars 24 2022 at 20:04:41 +0800, Yunian Yang
<reimu@sudomaker.com> a écrit :
> X1000/E has a third UART2 pin group selection, which uses the TDI(G2)
> as RX
> and TDO(G1) as TX. This configuration is becoming increasingly
> popular in
> newer core boards, such as the Halley2 v4.1. This is done by enabling
> function 1 of a "virtual pin" PC31. See section 19.3.3 of the X1000
> Programming Manual for details.
>
> Signed-off-by: Yunian Yang <reimu@sudomaker.com>
> ---
> drivers/pinctrl/pinctrl-ingenic.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-ingenic.c
> b/drivers/pinctrl/pinctrl-ingenic.c
> index 2712f51eb238..29709059d62b 100644
> --- a/drivers/pinctrl/pinctrl-ingenic.c
> +++ b/drivers/pinctrl/pinctrl-ingenic.c
> @@ -1982,6 +1982,7 @@ static int x1000_uart1_data_a_pins[] = { 0x04,
> 0x05, };
> static int x1000_uart1_data_d_pins[] = { 0x62, 0x63, };
> static int x1000_uart1_hwflow_pins[] = { 0x64, 0x65, };
> static int x1000_uart2_data_a_pins[] = { 0x02, 0x03, };
> +static int x1000_uart2_data_c_pins[] = { 0x5f, 0x5f, };
One should be enough.
Looks fine otherwise.
Cheers,
-Paul
> static int x1000_uart2_data_d_pins[] = { 0x65, 0x64, };
> static int x1000_sfc_data_pins[] = { 0x1d, 0x1c, 0x1e, 0x1f, };
> static int x1000_sfc_clk_pins[] = { 0x1a, };
> @@ -2058,6 +2059,7 @@ static const struct group_desc x1000_groups[] =
> {
> INGENIC_PIN_GROUP("uart1-data-d", x1000_uart1_data_d, 1),
> INGENIC_PIN_GROUP("uart1-hwflow", x1000_uart1_hwflow, 1),
> INGENIC_PIN_GROUP("uart2-data-a", x1000_uart2_data_a, 2),
> + INGENIC_PIN_GROUP("uart2-data-c", x1000_uart2_data_c, 1),
> INGENIC_PIN_GROUP("uart2-data-d", x1000_uart2_data_d, 0),
> INGENIC_PIN_GROUP("sfc-data", x1000_sfc_data, 1),
> INGENIC_PIN_GROUP("sfc-clk", x1000_sfc_clk, 1),
> @@ -2115,7 +2117,7 @@ static const char *x1000_uart0_groups[] = {
> "uart0-data", "uart0-hwflow", };
> static const char *x1000_uart1_groups[] = {
> "uart1-data-a", "uart1-data-d", "uart1-hwflow",
> };
> -static const char *x1000_uart2_groups[] = { "uart2-data-a",
> "uart2-data-d", };
> +static const char *x1000_uart2_groups[] = { "uart2-data-a",
> "uart2-data-c", "uart2-data-d", };
> static const char *x1000_sfc_groups[] = { "sfc-data", "sfc-clk",
> "sfc-ce", };
> static const char *x1000_ssi_groups[] = {
> "ssi-dt-a-22", "ssi-dt-a-29", "ssi-dt-d",
> --
> 2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] pinctrl: Ingenic: Add missing UART2 group C for X1000/E
2022-03-24 12:10 ` Paul Cercueil
@ 2022-03-24 13:39 ` Yunian Yang
0 siblings, 0 replies; 3+ messages in thread
From: Yunian Yang @ 2022-03-24 13:39 UTC (permalink / raw)
To: Paul Cercueil; +Cc: linux-mips, Linus Walleij, linux-gpio, linux-kernel
Hi Paul,
Thank you for pointing this out. I sent the refined patch.
On 3/24/22 20:10, Paul Cercueil wrote:
> Hi Yunian,
>
> Le jeu., mars 24 2022 at 20:04:41 +0800, Yunian Yang <reimu@sudomaker.com> a écrit :
>> X1000/E has a third UART2 pin group selection, which uses the TDI(G2) as RX
>> and TDO(G1) as TX. This configuration is becoming increasingly popular in
>> newer core boards, such as the Halley2 v4.1. This is done by enabling
>> function 1 of a "virtual pin" PC31. See section 19.3.3 of the X1000
>> Programming Manual for details.
>>
>> Signed-off-by: Yunian Yang <reimu@sudomaker.com>
>> ---
>> drivers/pinctrl/pinctrl-ingenic.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
>> index 2712f51eb238..29709059d62b 100644
>> --- a/drivers/pinctrl/pinctrl-ingenic.c
>> +++ b/drivers/pinctrl/pinctrl-ingenic.c
>> @@ -1982,6 +1982,7 @@ static int x1000_uart1_data_a_pins[] = { 0x04, 0x05, };
>> static int x1000_uart1_data_d_pins[] = { 0x62, 0x63, };
>> static int x1000_uart1_hwflow_pins[] = { 0x64, 0x65, };
>> static int x1000_uart2_data_a_pins[] = { 0x02, 0x03, };
>> +static int x1000_uart2_data_c_pins[] = { 0x5f, 0x5f, };
>
> One should be enough.
>
> Looks fine otherwise.
>
> Cheers,
> -Paul
>
>> static int x1000_uart2_data_d_pins[] = { 0x65, 0x64, };
>> static int x1000_sfc_data_pins[] = { 0x1d, 0x1c, 0x1e, 0x1f, };
>> static int x1000_sfc_clk_pins[] = { 0x1a, };
>> @@ -2058,6 +2059,7 @@ static const struct group_desc x1000_groups[] = {
>> INGENIC_PIN_GROUP("uart1-data-d", x1000_uart1_data_d, 1),
>> INGENIC_PIN_GROUP("uart1-hwflow", x1000_uart1_hwflow, 1),
>> INGENIC_PIN_GROUP("uart2-data-a", x1000_uart2_data_a, 2),
>> + INGENIC_PIN_GROUP("uart2-data-c", x1000_uart2_data_c, 1),
>> INGENIC_PIN_GROUP("uart2-data-d", x1000_uart2_data_d, 0),
>> INGENIC_PIN_GROUP("sfc-data", x1000_sfc_data, 1),
>> INGENIC_PIN_GROUP("sfc-clk", x1000_sfc_clk, 1),
>> @@ -2115,7 +2117,7 @@ static const char *x1000_uart0_groups[] = { "uart0-data", "uart0-hwflow", };
>> static const char *x1000_uart1_groups[] = {
>> "uart1-data-a", "uart1-data-d", "uart1-hwflow",
>> };
>> -static const char *x1000_uart2_groups[] = { "uart2-data-a", "uart2-data-d", };
>> +static const char *x1000_uart2_groups[] = { "uart2-data-a", "uart2-data-c", "uart2-data-d", };
>> static const char *x1000_sfc_groups[] = { "sfc-data", "sfc-clk", "sfc-ce", };
>> static const char *x1000_ssi_groups[] = {
>> "ssi-dt-a-22", "ssi-dt-a-29", "ssi-dt-d",
>> --
>> 2.30.2
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-24 13:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-24 12:04 [PATCH] pinctrl: Ingenic: Add missing UART2 group C for X1000/E Yunian Yang
2022-03-24 12:10 ` Paul Cercueil
2022-03-24 13:39 ` Yunian Yang
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).