diff mbox

[4/6] ARM64: dts: meson-axg: uart: Add the pinctrl info description

Message ID 20180105095621.196472-5-yixun.lan@amlogic.com (mailing list archive)
State Superseded
Headers show

Commit Message

Yixun Lan Jan. 5, 2018, 9:56 a.m. UTC
Describe the pinctrl info for the UART controller which found
in the Meson-AXG SoCs.

Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 96 ++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

Comments

Jerome Brunet Jan. 5, 2018, 10:28 a.m. UTC | #1
On Fri, 2018-01-05 at 17:56 +0800, Yixun Lan wrote:
> Describe the pinctrl info for the UART controller which 

is

> found
> in the Meson-AXG SoCs.

Yixun,

Could you please review this patch again. Some "strings" used here will
obviously not work. I've picked up a few but I'm pretty sure there are other ...

Thanks

> 
> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
> ---
>  arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 96 ++++++++++++++++++++++++++++++
>  1 file changed, 96 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> index f6bf01cfff4b..78bb206e2897 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> @@ -303,6 +303,70 @@
>  						function = "pwm_d";
>  					};
>  				};
> +
> +				uart_a_pins: uart_a {
> +					mux {
> +						groups = "uart_tx_a",
> +							"uart_rx_a";
> +						function = "uart_a";
> +					};
> +				};
> +
> +				uart_a_cts_rts_pins: uart_a_cts_rts {
> +					mux {
> +						groups = "uart_ctx_a",

uart_ctx_a does not exist in pinctrl

> +							"uart_rts_a";
> +						function = "uart_a";
> +					};
> +				};
> +
> +				uart_b_x_pins: uart_b_x {
> +					mux {
> +						groups = "uart_tx_b_x",
> +							"uart_rx_b_x";
> +						function = "uart_b";
> +					};
> +				};
> +
> +				uart_b_x_cts_rts_pins: uart_b_x_cts_rts {
> +					mux {
> +						groups = "uart_cts_b_x",
> +							"uart_rts_b_x";
> +						function = "uart_b";
> +					};
> +				};
> +
> +				uart_b_z_pins: uart_b_z {
> +					mux {
> +						groups = "uart_tx_b_z",
> +							"uart_rx_b_z";
> +						function = "uart_b";
> +					};
> +				};
> +
> +				uart_b_z_cts_rts_pins: uart_b_z_cts_rts {
> +					mux {
> +						groups = "uart_cts_b_z",
> +							"uart_rts_b_z";
> +						function = "uart_b";
> +					};
> +				};
> +
> +				uart_ao_b_z_pins: uart_ao_b_z {
> +					mux {
> +						groups = "uart_ao_tx_b_z",
> +							"uart_ao_rx_b_z";
> +						function = "uart_ao_b_groupz";

"uart_ao_b_groupz" function does not exist in pinctrl

> +					};
> +				};
> +
> +				uart_ao_b_z_cts_rts_pins: uart_ao_b_z_cts_rts {
> +					mux {
> +						groups = "uart_ao_cts_b_z",
> +							"uart_ao_rts_b_z";
> +						function = "uart_ao_b_groupz";
> +					};
> +				};
>  			};
>  		};
>  
> @@ -346,6 +410,38 @@
>  					#gpio-cells = <2>;
>  					gpio-ranges = <&pinctrl_aobus 0 0 15>;
>  				};
> +
> +				uart_ao_a_pins: uart_ao_a {
> +					mux {
> +						groups = "uart_ao_tx_a",
> +							"uart_ao_rx_a";
> +						function = "uart_ao_a";
> +					};
> +				};
> +
> +				uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts {
> +					mux {
> +						groups = "uart_ao_cts_a",
> +							"uart_ao_rts_a";
> +						function = "uart_ao_a";
> +					};
> +				};
> +
> +				uart_ao_b_pins: uart_ao_b {
> +					mux {
> +						groups = "uart_ao_tx_b",
> +							"uart_ao_rx_b";
> +						function = "uart_ao_b";
> +					};
> +				};
> +
> +				uart_ao_b_cts_rts_pins: uart_ao_b_cts_rts {
> +					mux {
> +						groups = "uart_ao_cts_b",
> +							"uart_ao_rts_b";
> +						function = "uart_ao_b";
> +					};
> +				};
>  			};
>  
>  			pwm_AO_ab: pwm@7000 {
Yixun Lan Jan. 5, 2018, 2:22 p.m. UTC | #2
On 01/05/2018 06:28 PM, Jerome Brunet wrote:
> On Fri, 2018-01-05 at 17:56 +0800, Yixun Lan wrote:
>> Describe the pinctrl info for the UART controller which 
.

>> +				uart_a_cts_rts_pins: uart_a_cts_rts {
>> +					mux {
>> +						groups = "uart_ctx_a",
> 
> uart_ctx_a does not exist in pinctrl
> 
sorry, it's a typo, it's uart_cts_a

em. end of the Friday is really bad time for me to compose the patches..


>> +							"uart_rts_a";
>> +						function = "uart_a";
>> +					};
>> +				};
>> +
>> +				uart_b_x_pins: uart_b_x {
>> +					mux {
>> +						groups = "uart_tx_b_x",
>> +							"uart_rx_b_x";
>> +						function = "uart_b";
>> +					};
>> +				};
>> +
>> +				uart_b_x_cts_rts_pins: uart_b_x_cts_rts {
>> +					mux {
>> +						groups = "uart_cts_b_x",
>> +							"uart_rts_b_x";
>> +						function = "uart_b";
>> +					};
>> +				};
>> +
>> +				uart_b_z_pins: uart_b_z {
>> +					mux {
>> +						groups = "uart_tx_b_z",
>> +							"uart_rx_b_z";
>> +						function = "uart_b";
>> +					};
>> +				};
>> +
>> +				uart_b_z_cts_rts_pins: uart_b_z_cts_rts {
>> +					mux {
>> +						groups = "uart_cts_b_z",
>> +							"uart_rts_b_z";
>> +						function = "uart_b";
>> +					};
>> +				};
>> +
>> +				uart_ao_b_z_pins: uart_ao_b_z {
>> +					mux {
>> +						groups = "uart_ao_tx_b_z",
>> +							"uart_ao_rx_b_z";
>> +						function = "uart_ao_b_groupz";
> 
> "uart_ao_b_groupz" function does not exist in pinctrl
typo, uart_ao_b_gpioz

> 
.
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index f6bf01cfff4b..78bb206e2897 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -303,6 +303,70 @@ 
 						function = "pwm_d";
 					};
 				};
+
+				uart_a_pins: uart_a {
+					mux {
+						groups = "uart_tx_a",
+							"uart_rx_a";
+						function = "uart_a";
+					};
+				};
+
+				uart_a_cts_rts_pins: uart_a_cts_rts {
+					mux {
+						groups = "uart_ctx_a",
+							"uart_rts_a";
+						function = "uart_a";
+					};
+				};
+
+				uart_b_x_pins: uart_b_x {
+					mux {
+						groups = "uart_tx_b_x",
+							"uart_rx_b_x";
+						function = "uart_b";
+					};
+				};
+
+				uart_b_x_cts_rts_pins: uart_b_x_cts_rts {
+					mux {
+						groups = "uart_cts_b_x",
+							"uart_rts_b_x";
+						function = "uart_b";
+					};
+				};
+
+				uart_b_z_pins: uart_b_z {
+					mux {
+						groups = "uart_tx_b_z",
+							"uart_rx_b_z";
+						function = "uart_b";
+					};
+				};
+
+				uart_b_z_cts_rts_pins: uart_b_z_cts_rts {
+					mux {
+						groups = "uart_cts_b_z",
+							"uart_rts_b_z";
+						function = "uart_b";
+					};
+				};
+
+				uart_ao_b_z_pins: uart_ao_b_z {
+					mux {
+						groups = "uart_ao_tx_b_z",
+							"uart_ao_rx_b_z";
+						function = "uart_ao_b_groupz";
+					};
+				};
+
+				uart_ao_b_z_cts_rts_pins: uart_ao_b_z_cts_rts {
+					mux {
+						groups = "uart_ao_cts_b_z",
+							"uart_ao_rts_b_z";
+						function = "uart_ao_b_groupz";
+					};
+				};
 			};
 		};
 
@@ -346,6 +410,38 @@ 
 					#gpio-cells = <2>;
 					gpio-ranges = <&pinctrl_aobus 0 0 15>;
 				};
+
+				uart_ao_a_pins: uart_ao_a {
+					mux {
+						groups = "uart_ao_tx_a",
+							"uart_ao_rx_a";
+						function = "uart_ao_a";
+					};
+				};
+
+				uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts {
+					mux {
+						groups = "uart_ao_cts_a",
+							"uart_ao_rts_a";
+						function = "uart_ao_a";
+					};
+				};
+
+				uart_ao_b_pins: uart_ao_b {
+					mux {
+						groups = "uart_ao_tx_b",
+							"uart_ao_rx_b";
+						function = "uart_ao_b";
+					};
+				};
+
+				uart_ao_b_cts_rts_pins: uart_ao_b_cts_rts {
+					mux {
+						groups = "uart_ao_cts_b",
+							"uart_ao_rts_b";
+						function = "uart_ao_b";
+					};
+				};
 			};
 
 			pwm_AO_ab: pwm@7000 {