[3/5] arm64: dts: ti: k3-j7200: main_pmx0 clean up

Message ID 20230426103219.1565266-4-u-kumar1@ti.com
State New
Headers
Series arm64: dts: ti: k3-j7200: Add properties and sync with uboot |

Commit Message

Kumar, Udit April 26, 2023, 10:32 a.m. UTC
  This patch removes duplicated define of main_i2c0
and adds main_uart0 pin mux.

Signed-off-by: Udit Kumar <u-kumar1@ti.com>
---
 arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
  

Comments

Nishanth Menon April 26, 2023, 12:51 p.m. UTC | #1
On 16:02-20230426, Udit Kumar wrote:
> This patch removes duplicated define of main_i2c0
> and adds main_uart0 pin mux.
> 
> Signed-off-by: Udit Kumar <u-kumar1@ti.com>
> ---
>  arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
> index 63633e4f6c59..37eb24d69924 100644
> --- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
> @@ -107,10 +107,12 @@ J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
>  };
>  
>  &main_pmx0 {
> -	main_i2c0_pins_default: main-i2c0-pins-default {

nice catch, but We should clean up the reference in
common-proc-board.dts, which would make it it's own patch. Also
indicate that the definition is already present in som.dtsi


> +	main_uart0_pins_default: main_uart0_pins_default {
>  		pinctrl-single,pins = <
> -			J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
> -			J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
> +			J721E_IOPAD(0xb0, PIN_INPUT, 0) /* (T16) UART0_RXD */
> +			J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */
> +			J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) SPI0_CS0.UART0_CTSn */
> +			J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) SPI0_CS1.UART0_RTSn */
>  		>;
>  	};
>  
> @@ -163,6 +165,8 @@ &main_uart0 {
>  	status = "okay";
>  	/* Shared with ATF on this platform */
>  	power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&main_uart0_pins_default>;
>  };
>  
>  &main_uart1 {
> -- 
> 2.34.1
>
  
Kumar, Udit April 26, 2023, 2:17 p.m. UTC | #2
Hi Nishanth,

On 4/26/2023 6:21 PM, Nishanth Menon wrote:
> On 16:02-20230426, Udit Kumar wrote:
>> This patch removes duplicated define of main_i2c0
>> and adds main_uart0 pin mux.
>>
>> Signed-off-by: Udit Kumar <u-kumar1@ti.com>
>> ---
>>   arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 10 +++++++---
>>   1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
>> index 63633e4f6c59..37eb24d69924 100644
>> --- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
>> +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
>> @@ -107,10 +107,12 @@ J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
>>   };
>>   
>>   &main_pmx0 {
>> -	main_i2c0_pins_default: main-i2c0-pins-default {
> nice catch, but We should clean up the reference in
> common-proc-board.dts, which would make it it's own patch. Also
> indicate that the definition is already present in som.dtsi
>
thanks , will make a patch for its own


>> +	main_uart0_pins_default: main_uart0_pins_default {
>>   		pinctrl-single,pins = <
>> -			J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
>> -			J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
>> +			J721E_IOPAD(0xb0, PIN_INPUT, 0) /* (T16) UART0_RXD */
>> +			J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */
>> +			J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) SPI0_CS0.UART0_CTSn */
>> +			J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) SPI0_CS1.UART0_RTSn */
>>   		>;
>>   	};
>>   
>> @@ -163,6 +165,8 @@ &main_uart0 {
>>   	status = "okay";
>>   	/* Shared with ATF on this platform */
>>   	power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
>> +	pinctrl-names = "default";
>> +	pinctrl-0 = <&main_uart0_pins_default>;
>>   };
>>   
>>   &main_uart1 {
>> -- 
>> 2.34.1
>>
  

Patch

diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
index 63633e4f6c59..37eb24d69924 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
@@ -107,10 +107,12 @@  J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
 };
 
 &main_pmx0 {
-	main_i2c0_pins_default: main-i2c0-pins-default {
+	main_uart0_pins_default: main_uart0_pins_default {
 		pinctrl-single,pins = <
-			J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
-			J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
+			J721E_IOPAD(0xb0, PIN_INPUT, 0) /* (T16) UART0_RXD */
+			J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */
+			J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) SPI0_CS0.UART0_CTSn */
+			J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) SPI0_CS1.UART0_RTSn */
 		>;
 	};
 
@@ -163,6 +165,8 @@  &main_uart0 {
 	status = "okay";
 	/* Shared with ATF on this platform */
 	power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_uart0_pins_default>;
 };
 
 &main_uart1 {