[PATCH v2 09/13] ARM: dts: imx6qdl-kontron-samx6i: fix node names

Michael Walle posted 13 patches 1 year, 8 months ago
There is a newer version of this series
[PATCH v2 09/13] ARM: dts: imx6qdl-kontron-samx6i: fix node names
Posted by Michael Walle 1 year, 8 months ago
Rename the nodes according to the schema. In particular, renamae the bit
bang I2C controller to "i2c-N" and the mux nodes of the audmux to
"mux-*". While at it, fix the typo "adu", which should have been "aud".

Signed-off-by: Michael Walle <mwalle@kernel.org>
---
 .../boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi
index d36743e47552..85e5adac6ee9 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi
@@ -149,7 +149,7 @@ lcd_backlight: lcd-backlight {
 		status = "disabled";
 	};
 
-	i2c_intern: i2c-gpio-intern {
+	i2c_intern: i2c-0 {
 		compatible = "i2c-gpio";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_i2c_gpio_intern>;
@@ -160,7 +160,7 @@ i2c_intern: i2c-gpio-intern {
 		#size-cells = <0>;
 	};
 
-	i2c_lcd: i2c-gpio-lcd {
+	i2c_lcd: i2c-1 {
 		compatible = "i2c-gpio";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_i2c_gpio_lcd>;
@@ -172,7 +172,7 @@ i2c_lcd: i2c-gpio-lcd {
 		status = "disabled";
 	};
 
-	i2c_cam: i2c-gpio-cam {
+	i2c_cam: i2c-2 {
 		compatible = "i2c-gpio";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_i2c_gpio_cam>;
@@ -190,7 +190,7 @@ &audmux {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_audmux>;
 
-	audmux_ssi1 {
+	mux-ssi1 {
 		fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;
 		fsl,port-config = <
 			(IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT3) |
@@ -202,7 +202,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT3)
 		>;
 	};
 
-	audmux_adu3 {
+	mux-aud3 {
 		fsl,audmux-port = <MX51_AUDMUX_PORT3>;
 		fsl,port-config = <
 			IMX_AUDMUX_V2_PTCR_SYN
@@ -210,7 +210,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT1_SSI0)
 		>;
 	};
 
-	audmux_ssi2 {
+	mux-ssi2 {
 		fsl,audmux-port = <MX51_AUDMUX_PORT2_SSI1>;
 		fsl,port-config = <
 			(IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT4) |
@@ -222,7 +222,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT4)
 		>;
 	};
 
-	audmux_adu4 {
+	mux-aud4 {
 		fsl,audmux-port = <MX51_AUDMUX_PORT4>;
 		fsl,port-config = <
 			IMX_AUDMUX_V2_PTCR_SYN
-- 
2.39.2
Re: [PATCH v2 09/13] ARM: dts: imx6qdl-kontron-samx6i: fix node names
Posted by Shawn Guo 1 year, 8 months ago
On Thu, Jun 06, 2024 at 11:02:02AM +0200, Michael Walle wrote:
> Rename the nodes according to the schema. In particular, renamae the bit

s/renamae/rename

Shawn

> bang I2C controller to "i2c-N" and the mux nodes of the audmux to
> "mux-*". While at it, fix the typo "adu", which should have been "aud".
> 
> Signed-off-by: Michael Walle <mwalle@kernel.org>
> ---
>  .../boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi   | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi
> index d36743e47552..85e5adac6ee9 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi
> +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi
> @@ -149,7 +149,7 @@ lcd_backlight: lcd-backlight {
>  		status = "disabled";
>  	};
>  
> -	i2c_intern: i2c-gpio-intern {
> +	i2c_intern: i2c-0 {
>  		compatible = "i2c-gpio";
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_i2c_gpio_intern>;
> @@ -160,7 +160,7 @@ i2c_intern: i2c-gpio-intern {
>  		#size-cells = <0>;
>  	};
>  
> -	i2c_lcd: i2c-gpio-lcd {
> +	i2c_lcd: i2c-1 {
>  		compatible = "i2c-gpio";
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_i2c_gpio_lcd>;
> @@ -172,7 +172,7 @@ i2c_lcd: i2c-gpio-lcd {
>  		status = "disabled";
>  	};
>  
> -	i2c_cam: i2c-gpio-cam {
> +	i2c_cam: i2c-2 {
>  		compatible = "i2c-gpio";
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&pinctrl_i2c_gpio_cam>;
> @@ -190,7 +190,7 @@ &audmux {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pinctrl_audmux>;
>  
> -	audmux_ssi1 {
> +	mux-ssi1 {
>  		fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;
>  		fsl,port-config = <
>  			(IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT3) |
> @@ -202,7 +202,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT3)
>  		>;
>  	};
>  
> -	audmux_adu3 {
> +	mux-aud3 {
>  		fsl,audmux-port = <MX51_AUDMUX_PORT3>;
>  		fsl,port-config = <
>  			IMX_AUDMUX_V2_PTCR_SYN
> @@ -210,7 +210,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT1_SSI0)
>  		>;
>  	};
>  
> -	audmux_ssi2 {
> +	mux-ssi2 {
>  		fsl,audmux-port = <MX51_AUDMUX_PORT2_SSI1>;
>  		fsl,port-config = <
>  			(IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT4) |
> @@ -222,7 +222,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT4)
>  		>;
>  	};
>  
> -	audmux_adu4 {
> +	mux-aud4 {
>  		fsl,audmux-port = <MX51_AUDMUX_PORT4>;
>  		fsl,port-config = <
>  			IMX_AUDMUX_V2_PTCR_SYN
> -- 
> 2.39.2
>