Skip to contentSkip to conversation

meson-g12: add pwm and uart pin muxing options

PATCH Superseded Gary Bisson 3 participants 17 messages Jan 3, 2022 – Jan 17, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover meson-g12: add pwm and uart pin muxing options

Hi,

This series adds a few pin muxing options needed for our HW platform (to be submitted soon).

1- pwm_f: adding missing both GPIOZ_12 & GPIOA_11 options
-> tested GPIOA_11 as mipi display backlight
-> order for this patch is not alphabetical but follows doc order (to
match current order)
2- uart_ao_b: adding both options for ao_b uart + its rts/cts pins
-> tested on custom hw too

Let me know if you have any questions.

Regards,
Gary

Gary Bisson (3):
pinctrl: meson-g12a: add more pwm_f options
arm64: dts: meson-g12-common: add more pwm_f options
arm64: dts: meson-g12-common: add uart_ao_b pins muxing

 .../boot/dts/amlogic/meson-g12-common.dtsi    | 43 +++++++++++++++++++
 drivers/pinctrl/meson/pinctrl-meson-g12a.c    |  6 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)
Signature · 7 lines
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: [email protected]
Cc: [email protected]
-- 
2.34.1
#1 lore raw

PATCH 1/3 pinctrl: meson-g12a: add more pwm_f options

Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12.

---
Cc: Linus Walleij <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-meson-g12a.c +5 -1
index cd9656b13836..d182a575981e 100644
@@ -283,6 +283,8 @@ static const unsigned int pwm_d_x6_pins[]		= { GPIOX_6 };
 static const unsigned int pwm_e_pins[]			= { GPIOX_16 };
 
 /* pwm_f */
+static const unsigned int pwm_f_z_pins[]		= { GPIOZ_12 };
+static const unsigned int pwm_f_a_pins[]		= { GPIOA_11 };
 static const unsigned int pwm_f_x_pins[]		= { GPIOX_7 };
 static const unsigned int pwm_f_h_pins[]		= { GPIOH_5 };
 
@@ -618,6 +620,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
 	GROUP(tdm_c_dout2_z,		4),
 	GROUP(tdm_c_dout3_z,		4),
 	GROUP(mclk1_z,			4),
+	GROUP(pwm_f_z,			5),
 
 	/* bank GPIOX */
 	GROUP(sdio_d0,			1),
@@ -768,6 +771,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
 	GROUP(tdm_c_dout3_a,		2),
 	GROUP(mclk0_a,			1),
 	GROUP(mclk1_a,			2),
+	GROUP(pwm_f_a,			3),
 };
 
 /* uart_ao_a */
@@ -1069,7 +1073,7 @@ static const char * const pwm_e_groups[] = {
 };
 
 static const char * const pwm_f_groups[] = {
-	"pwm_f_x", "pwm_f_h",
+	"pwm_f_z", "pwm_f_a", "pwm_f_x", "pwm_f_h",
 };
 
 static const char * const cec_ao_a_h_groups[] = {
Signature · 1 line
2.34.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] pinctrl: meson-g12a: add more pwm_f options

Quoted 47 lines · Gary Bisson

Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12.

---
Cc: Linus Walleij <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-meson-g12a.c +4 -0
index cd9656b13836..d182a575981e 100644
@@ -283,6 +283,8 @@ static const unsigned int pwm_d_x6_pins[]		= { GPIOX_6 };
 static const unsigned int pwm_e_pins[]			= { GPIOX_16 };
 
 /* pwm_f */
+static const unsigned int pwm_f_z_pins[]		= { GPIOZ_12 };
+static const unsigned int pwm_f_a_pins[]		= { GPIOA_11 };
 static const unsigned int pwm_f_x_pins[]		= { GPIOX_7 };
 static const unsigned int pwm_f_h_pins[]		= { GPIOH_5 };
 
@@ -618,6 +620,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
 	GROUP(tdm_c_dout2_z,		4),
 	GROUP(tdm_c_dout3_z,		4),
 	GROUP(mclk1_z,			4),
+	GROUP(pwm_f_z,			5),
 
 	/* bank GPIOX */
 	GROUP(sdio_d0,			1),
@@ -768,6 +771,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
 	GROUP(tdm_c_dout3_a,		2),
 	GROUP(mclk0_a,			1),
 	GROUP(mclk1_a,			2),
+	GROUP(pwm_f_a,			3),
 };
 
 /* uart_ao_a */

drivers/pinctrl/meson/pinctrl-meson-g12a.c static const char * const pwm_e_groups[] = { · line 1079

Quoted 8 lines
drivers/pinctrl/meson/pinctrl-meson-g12a.c +1 -1
@@ -1069,7 +1073,7 @@ static const char * const pwm_e_groups[] = {
 };
 
 static const char * const pwm_f_groups[] = {
-	"pwm_f_x", "pwm_f_h",
+	"pwm_f_z", "pwm_f_a", "pwm_f_x", "pwm_f_h",
 };
 
 static const char * const cec_ao_a_h_groups[] = {
#4 lore raw

PATCH 2/3 arm64: dts: meson-g12-common: add more pwm_f options

In reply to Gary Bisson

Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12.

---
Cc: Rob Herring <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 .../arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +16 -0
index 00c6f53290d4..af1357c48bee 100644
@@ -894,6 +894,22 @@ mux {
 						};
 					};
 
+					pwm_f_z_pins: pwm-f-z {
+						mux {
+							groups = "pwm_f_z";
+							function = "pwm_f";
+							bias-disable;
+						};
+					};
+
+					pwm_f_a_pins: pwm-f-a {
+						mux {
+							groups = "pwm_f_a";
+							function = "pwm_f";
+							bias-disable;
+						};
+					};
+
 					pwm_f_x_pins: pwm-f-x {
 						mux {
 							groups = "pwm_f_x";
Signature · 1 line
2.34.1
Reviewed-by on v1 2/3
#5 lore raw

Re: [PATCH 2/3] arm64: dts: meson-g12-common: add more pwm_f options

Quoted 34 lines · Gary Bisson

Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12.

---
Cc: Rob Herring <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 .../arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +9 -0
index 00c6f53290d4..af1357c48bee 100644
@@ -894,6 +894,22 @@ mux {
 						};
 					};
 
+					pwm_f_z_pins: pwm-f-z {
+						mux {
+							groups = "pwm_f_z";
+							function = "pwm_f";
+							bias-disable;
+						};
+					};
+
+					pwm_f_a_pins: pwm-f-a {

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi mux { · line 915

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +7 -0
+						mux {
+							groups = "pwm_f_a";
+							function = "pwm_f";
+							bias-disable;
+						};
+					};
+
 					pwm_f_x_pins: pwm-f-x {
 						mux {
 							groups = "pwm_f_x";
#6 lore raw

PATCH 3/3 arm64: dts: meson-g12-common: add uart_ao_b pins muxing

In reply to Gary Bisson

- RX/TX signals can be mapped on 2 different pairs of pins so supporting both options
- RTS/CTS signals however only have 1 option available

---
Cc: Rob Herring <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 .../boot/dts/amlogic/meson-g12-common.dtsi    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +27 -0
index af1357c48bee..3a7773ffbd08 100644
@@ -1952,6 +1952,33 @@ mux {
 						};
 					};
 
+					uart_ao_b_1_pins: uart-ao-b-1 {
+						mux {
+							groups = "uart_ao_b_tx_2",
+								 "uart_ao_b_rx_3";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
+					uart_ao_b_2_pins: uart-ao-b-2 {
+						mux {
+							groups = "uart_ao_b_tx_8",
+								 "uart_ao_b_rx_9";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
+					uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
+						mux {
+							groups = "uart_ao_b_cts",
+								 "uart_ao_b_rts";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
 					pwm_a_e_pins: pwm-a-e {
 						mux {
 							groups = "pwm_a_e";
Signature · 1 line
2.34.1
#7 lore raw

Re: [PATCH 3/3] arm64: dts: meson-g12-common: add uart_ao_b pins muxing

Hi,

Quoted 33 lines · Gary Bisson

- RX/TX signals can be mapped on 2 different pairs of pins so supporting both options
- RTS/CTS signals however only have 1 option available

---
Cc: Rob Herring <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 .../boot/dts/amlogic/meson-g12-common.dtsi    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +7 -0
index af1357c48bee..3a7773ffbd08 100644
@@ -1952,6 +1952,33 @@ mux {
 						};
 					};
 
+					uart_ao_b_1_pins: uart-ao-b-1 {
+						mux {
+							groups = "uart_ao_b_tx_2",
+								 "uart_ao_b_rx_3";
+							function = "uart_ao_b";
+							bias-disable;
+						};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi mux { · line 1971

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +10 -0
+					};
+
+					uart_ao_b_2_pins: uart-ao-b-2 {
+						mux {
+							groups = "uart_ao_b_tx_8",
+								 "uart_ao_b_rx_9";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};

I'm not fan of these nodes namings.

Perhaps :
- uart-ao-b-2-3
- uart-ao-b-8-9

so the actual pins numbers used are more clear ?

Quoted 14 lines
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +10 -0
+
+					uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
+						mux {
+							groups = "uart_ao_b_cts",
+								 "uart_ao_b_rts";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
 					pwm_a_e_pins: pwm-a-e {
 						mux {
 							groups = "pwm_a_e";
#8 lore raw

Re: [PATCH 3/3] arm64: dts: meson-g12-common: add uart_ao_b pins muxing

Hi,

Quoted 49 lines · Neil Armstrong

Hi,

Quoted 33 lines · Gary Bisson

- RX/TX signals can be mapped on 2 different pairs of pins so supporting both options
- RTS/CTS signals however only have 1 option available

---
Cc: Rob Herring <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 .../boot/dts/amlogic/meson-g12-common.dtsi    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +7 -0
index af1357c48bee..3a7773ffbd08 100644
@@ -1952,6 +1952,33 @@ mux {
 						};
 					};
 
+					uart_ao_b_1_pins: uart-ao-b-1 {
+						mux {
+							groups = "uart_ao_b_tx_2",
+								 "uart_ao_b_rx_3";
+							function = "uart_ao_b";
+							bias-disable;
+						};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi mux { · line 1971

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +10 -0
+					};
+
+					uart_ao_b_2_pins: uart-ao-b-2 {
+						mux {
+							groups = "uart_ao_b_tx_8",
+								 "uart_ao_b_rx_9";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};

I'm not fan of these nodes namings.

Quoted 5 lines

Perhaps :
- uart-ao-b-2-3
- uart-ao-b-8-9

so the actual pins numbers used are more clear ?

Sure, I wasn't convinced by that naming either. I although thought about:
- uart-ao-b
- uart-ao-b-alt

Let me know which one you prefer and I'll respin the patch. Also let me know if I should re-send the entire series or just this patch.

Regards,
Gary

#9 lore raw

Re: [PATCH 3/3] arm64: dts: meson-g12-common: add uart_ao_b pins muxing

Quoted 56 lines · Gary Bisson

Hi,

Quoted 53 lines · Neil Armstrong

Hi,

Quoted 33 lines · Gary Bisson

- RX/TX signals can be mapped on 2 different pairs of pins so supporting both options
- RTS/CTS signals however only have 1 option available

---
Cc: Rob Herring <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 .../boot/dts/amlogic/meson-g12-common.dtsi    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +7 -0
index af1357c48bee..3a7773ffbd08 100644
@@ -1952,6 +1952,33 @@ mux {
 						};
 					};
 
+					uart_ao_b_1_pins: uart-ao-b-1 {
+						mux {
+							groups = "uart_ao_b_tx_2",
+								 "uart_ao_b_rx_3";
+							function = "uart_ao_b";
+							bias-disable;
+						};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi mux { · line 1971

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +10 -0
+					};
+
+					uart_ao_b_2_pins: uart-ao-b-2 {
+						mux {
+							groups = "uart_ao_b_tx_8",
+								 "uart_ao_b_rx_9";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};

I'm not fan of these nodes namings.

Perhaps :
- uart-ao-b-2-3
- uart-ao-b-8-9

Quoted 6 lines
Quoted 1 line

so the actual pins numbers used are more clear ?

Sure, I wasn't convinced by that naming either. I although thought about:
- uart-ao-b
- uart-ao-b-alt

Not sure about these because it means one is the default and the second is an alternate one, and I'm not sure about that. If it's the case, then this naming is ok.

Quoted 4 lines

Let me know which one you prefer and I'll respin the patch. Also let me know if I should re-send the entire series or just this patch.

I'm lazy, so the entire patchset please :-)

Thanks,
Neil

Quoted 4 lines

Regards,
Gary

#10 lore raw

v2 cover meson-g12: add pwm and uart pin muxing options

In reply to Gary Bisson

This series adds a few pin muxing options needed for our HW platform (to be submitted soon).

1- pwm_f: adding missing both GPIOZ_12 & GPIOA_11 options
-> tested GPIOA_11 as mipi display backlight
-> order for this patch is not alphabetical but follows doc order (to
match current order)
2- uart_ao_b: adding both options for ao_b uart + its rts/cts pins
-> tested on custom hw too

Changes v1->v2:
- rename uart_ao_b signals as suggested by Neil

Let me know if you have any questions.

Regards,
Gary

Gary Bisson (3):
pinctrl: meson-g12a: add more pwm_f options
arm64: dts: meson-g12-common: add more pwm_f options
arm64: dts: meson-g12-common: add uart_ao_b pins muxing

 .../boot/dts/amlogic/meson-g12-common.dtsi    | 43 +++++++++++++++++++
 drivers/pinctrl/meson/pinctrl-meson-g12a.c    |  6 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)
Signature · 7 lines
2.34.1


_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
#11 lore raw

PATCH v2 1/3 pinctrl: meson-g12a: add more pwm_f options

Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12.

---
Cc: Linus Walleij <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-meson-g12a.c +5 -1
index cd9656b13836..d182a575981e 100644
@@ -283,6 +283,8 @@ static const unsigned int pwm_d_x6_pins[]		= { GPIOX_6 };
 static const unsigned int pwm_e_pins[]			= { GPIOX_16 };
 
 /* pwm_f */
+static const unsigned int pwm_f_z_pins[]		= { GPIOZ_12 };
+static const unsigned int pwm_f_a_pins[]		= { GPIOA_11 };
 static const unsigned int pwm_f_x_pins[]		= { GPIOX_7 };
 static const unsigned int pwm_f_h_pins[]		= { GPIOH_5 };
 
@@ -618,6 +620,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
 	GROUP(tdm_c_dout2_z,		4),
 	GROUP(tdm_c_dout3_z,		4),
 	GROUP(mclk1_z,			4),
+	GROUP(pwm_f_z,			5),
 
 	/* bank GPIOX */
 	GROUP(sdio_d0,			1),
@@ -768,6 +771,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
 	GROUP(tdm_c_dout3_a,		2),
 	GROUP(mclk0_a,			1),
 	GROUP(mclk1_a,			2),
+	GROUP(pwm_f_a,			3),
 };
 
 /* uart_ao_a */
@@ -1069,7 +1073,7 @@ static const char * const pwm_e_groups[] = {
 };
 
 static const char * const pwm_f_groups[] = {
-	"pwm_f_x", "pwm_f_h",
+	"pwm_f_z", "pwm_f_a", "pwm_f_x", "pwm_f_h",
 };
 
 static const char * const cec_ao_a_h_groups[] = {
Signature · 1 line
2.34.1
#12 lore raw

PATCH v2 2/3 arm64: dts: meson-g12-common: add more pwm_f options

In reply to Gary Bisson

Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12.

---
Cc: Rob Herring <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Kevin Hilman <[email protected]>
Cc: Jerome Brunet <[email protected]>
Cc: Martin Blumenstingl <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

---
 .../arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +16 -0
index 00c6f53290d4..af1357c48bee 100644
@@ -894,6 +894,22 @@ mux {
 						};
 					};
 
+					pwm_f_z_pins: pwm-f-z {
+						mux {
+							groups = "pwm_f_z";
+							function = "pwm_f";
+							bias-disable;
+						};
+					};
+
+					pwm_f_a_pins: pwm-f-a {
+						mux {
+							groups = "pwm_f_a";
+							function = "pwm_f";
+							bias-disable;
+						};
+					};
+
 					pwm_f_x_pins: pwm-f-x {
 						mux {
 							groups = "pwm_f_x";
Signature · 1 line
2.34.1
#13 lore raw

PATCH v2 3/3 arm64: dts: meson-g12-common: add uart_ao_b pins muxing

In reply to Gary Bisson

- RX/TX signals can be mapped on 2 different pairs of pins so supporting both options
- RTS/CTS signals however only have 1 option available

---
Changes v1->v2:
- renamed nodes as suggested by Neil

Cc Rob Herring <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Jerome Brunet <[email protected]>
Cc Martin Blumenstingl <[email protected]>
---
 .../boot/dts/amlogic/meson-g12-common.dtsi    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +27 -0
index af1357c48bee..62350c408e16 100644
@@ -1952,6 +1952,33 @@ mux {
 						};
 					};
 
+					uart_ao_b_2_3_pins: uart-ao-b-2-3 {
+						mux {
+							groups = "uart_ao_b_tx_2",
+								 "uart_ao_b_rx_3";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
+					uart_ao_b_8_9_pins: uart-ao-b-8-9 {
+						mux {
+							groups = "uart_ao_b_tx_8",
+								 "uart_ao_b_rx_9";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
+					uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
+						mux {
+							groups = "uart_ao_b_cts",
+								 "uart_ao_b_rts";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
 					pwm_a_e_pins: pwm-a-e {
 						mux {
 							groups = "pwm_a_e";
Signature · 1 line
2.34.1
Reviewed-by on v2 3/3
#14 lore raw

Re: [PATCH v2 3/3] arm64: dts: meson-g12-common: add uart_ao_b pins muxing

Quoted 50 lines · Gary Bisson

- RX/TX signals can be mapped on 2 different pairs of pins so supporting both options
- RTS/CTS signals however only have 1 option available

---
Changes v1->v2:
- renamed nodes as suggested by Neil

Cc Rob Herring <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Jerome Brunet <[email protected]>
Cc Martin Blumenstingl <[email protected]>
---
 .../boot/dts/amlogic/meson-g12-common.dtsi    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +20 -0
index af1357c48bee..62350c408e16 100644
@@ -1952,6 +1952,33 @@ mux {
 						};
 					};
 
+					uart_ao_b_2_3_pins: uart-ao-b-2-3 {
+						mux {
+							groups = "uart_ao_b_tx_2",
+								 "uart_ao_b_rx_3";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
+					uart_ao_b_8_9_pins: uart-ao-b-8-9 {
+						mux {
+							groups = "uart_ao_b_tx_8",
+								 "uart_ao_b_rx_9";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
+					uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
+						mux {

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi mux { · line 1984

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +7 -0
+							groups = "uart_ao_b_cts",
+								 "uart_ao_b_rts";
+							function = "uart_ao_b";
+							bias-disable;
+						};
+					};
+
 					pwm_a_e_pins: pwm-a-e {
 						mux {
 							groups = "pwm_a_e";

Thanks !
Neil

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

#15 lore raw
In reply to Gary Bisson

Hi,

Quoted 10 lines · Gary Bisson

This series adds a few pin muxing options needed for our HW platform (to be submitted soon).

1- pwm_f: adding missing both GPIOZ_12 & GPIOA_11 options
-> tested GPIOA_11 as mipi display backlight
-> order for this patch is not alphabetical but follows doc order (to
match current order)
2- uart_ao_b: adding both options for ao_b uart + its rts/cts pins
-> tested on custom hw too

Quoted 4 lines

Changes v1->v2:
- rename uart_ao_b signals as suggested by Neil

Let me know if you have any questions.

Thanks, I'm waiting for Linus to pick the pinctrl patch and I'll apply the DT patches.

Thanks,
Neil

Quoted 4 lines

Regards,
Gary

Quoted 9 lines

Gary Bisson (3):
pinctrl: meson-g12a: add more pwm_f options
arm64: dts: meson-g12-common: add more pwm_f options
arm64: dts: meson-g12-common: add uart_ao_b pins muxing

 .../boot/dts/amlogic/meson-g12-common.dtsi    | 43 +++++++++++++++++++
 drivers/pinctrl/meson/pinctrl-meson-g12a.c    |  6 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

#16 lore raw
In reply to Gary Bisson

Hi,

Quoted 11 lines · Gary Bisson

This series adds a few pin muxing options needed for our HW platform (to be submitted soon).

1- pwm_f: adding missing both GPIOZ_12 & GPIOA_11 options
-> tested GPIOA_11 as mipi display backlight
-> order for this patch is not alphabetical but follows doc order (to
match current order)
2- uart_ao_b: adding both options for ao_b uart + its rts/cts pins
-> tested on custom hw too

[...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v5.18/dt64)

[2/3] arm64: dts: meson-g12-common: add more pwm_f options

      https://git.kernel.org/amlogic/c/073983233302641d080b524640cc99be696e802a
[3/3] arm64: dts: meson-g12-common: add uart_ao_b pins muxing
      https://git.kernel.org/amlogic/c/2c420d79dae47f9fa3bb8ccb76eaba864c579721
Signature · 6 lines
Neil

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic