[PATCH 3/7] arm64: dts: ti: k3-*: Use generic pinctrl for node names

Suman Anna s-anna at ti.com
Wed Sep 2 00:14:14 EDT 2020


On 9/1/20 5:30 PM, Nishanth Menon wrote:
> Use pinctrl@ naming for nodes following standard conventions of device
> tree (section 2.2.2 Generic Names recommendation in [1]).
> 
> [1] https://github.com/devicetree-org/devicetree-specification/tree/v0.3
> 
> Suggested-by: Suman Anna <s-anna at ti.com>
> Signed-off-by: Nishanth Menon <nm at ti.com>

Acked-by: Suman Anna <s-anna at ti.com>

> ---
>  arch/arm64/boot/dts/ti/k3-am65-main.dtsi        | 4 ++--
>  arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi      | 2 +-
>  arch/arm64/boot/dts/ti/k3-j721e-main.dtsi       | 2 +-
>  arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 03e28fc256de..9c96e3f58c86 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -134,7 +134,7 @@
>  		};
>  	};
>  
> -	main_pmx0: pinmux at 11c000 {
> +	main_pmx0: pinctrl at 11c000 {
>  		compatible = "pinctrl-single";
>  		reg = <0x0 0x11c000 0x0 0x2e4>;
>  		#pinctrl-cells = <1>;
> @@ -142,7 +142,7 @@
>  		pinctrl-single,function-mask = <0xffffffff>;
>  	};
>  
> -	main_pmx1: pinmux at 11c2e8 {
> +	main_pmx1: pinctrl at 11c2e8 {
>  		compatible = "pinctrl-single";
>  		reg = <0x0 0x11c2e8 0x0 0x24>;
>  		#pinctrl-cells = <1>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> index 0765700a8ba8..bb498be2f0a4 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
> @@ -39,7 +39,7 @@
>  		reg = <0x43000014 0x4>;
>  	};
>  
> -	wkup_pmx0: pinmux at 4301c000 {
> +	wkup_pmx0: pinctrl at 4301c000 {
>  		compatible = "pinctrl-single";
>  		reg = <0x4301c000 0x118>;
>  		#pinctrl-cells = <1>;
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index 00a36a14efe7..1d2a7c05b6f3 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -327,7 +327,7 @@
>  		};
>  	};
>  
> -	main_pmx0: pinmux at 11c000 {
> +	main_pmx0: pinctrl at 11c000 {
>  		compatible = "pinctrl-single";
>  		/* Proxy 0 addressing */
>  		reg = <0x0 0x11c000 0x0 0x2b4>;
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> index c4a48e8d420a..9ad0266598ad 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> @@ -53,7 +53,7 @@
>  		reg = <0x0 0x43000014 0x0 0x4>;
>  	};
>  
> -	wkup_pmx0: pinmux at 4301c000 {
> +	wkup_pmx0: pinctrl at 4301c000 {
>  		compatible = "pinctrl-single";
>  		/* Proxy 0 addressing */
>  		reg = <0x00 0x4301c000 0x00 0x178>;
> 




More information about the linux-arm-kernel mailing list