[PATCH] arm64: zynqmp: Do not use '_' in DT node names

Michal Simek michal.simek at amd.com
Mon Oct 9 12:13:46 CEST 2023



On 9/27/23 11:57, Michal Simek wrote:
> Using '_' is not recommended for node names. Use '-' instead.
> Pretty much run seds below for node names.
> s/heartbeat_led/heartbeat-led/
> s/gtr_sel/gtr-sel/
> s/zynqmp_ipi/zynqmp-ipi/
> s/nvmem_firmware/nvmem-firmware/
> s/soc_revision/soc-revision/
> 
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
> 
>   arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 8 ++++----
>   arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 8 ++++----
>   arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 8 ++++----
>   arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 8 ++++----
>   arch/arm/dts/zynqmp-zcu208-revA.dts     | 2 +-
>   arch/arm/dts/zynqmp-zcu216-revA.dts     | 2 +-
>   arch/arm/dts/zynqmp.dtsi                | 6 +++---
>   7 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
> index cfd5ba1aac63..25ef646c8466 100644
> --- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
> +++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
> @@ -363,25 +363,25 @@
>   				#gpio-cells = <2>;
>   				gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4",
>   						  "", "", "", "";
> -				gtr_sel0 {
> +				gtr-sel0 {
>   					gpio-hog;
>   					gpios = <0 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_1";
>   				};
> -				gtr_sel1 {
> +				gtr-sel1 {
>   					gpio-hog;
>   					gpios = <1 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_2";
>   				};
> -				gtr_sel2 {
> +				gtr-sel2 {
>   					gpio-hog;
>   					gpios = <2 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_3";
>   				};
> -				gtr_sel3 {
> +				gtr-sel3 {
>   					gpio-hog;
>   					gpios = <3 0>;
>   					input; /* FIXME add meaning */
> diff --git a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
> index 18e14389f85f..ece9e6914541 100644
> --- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
> +++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
> @@ -365,25 +365,25 @@
>   				#gpio-cells = <2>;
>   				gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4",
>   						  "", "", "", "";
> -				gtr_sel0 {
> +				gtr-sel0 {
>   					gpio-hog;
>   					gpios = <0 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_1";
>   				};
> -				gtr_sel1 {
> +				gtr-sel1 {
>   					gpio-hog;
>   					gpios = <1 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_2";
>   				};
> -				gtr_sel2 {
> +				gtr-sel2 {
>   					gpio-hog;
>   					gpios = <2 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_3";
>   				};
> -				gtr_sel3 {
> +				gtr-sel3 {
>   					gpio-hog;
>   					gpios = <3 0>;
>   					input; /* FIXME add meaning */
> diff --git a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
> index cd7654a9f7ed..7372968e5734 100644
> --- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
> +++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
> @@ -359,25 +359,25 @@
>   				#gpio-cells = <2>;
>   				gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4",
>   						  "", "", "", "";
> -				gtr_sel0 {
> +				gtr-sel0 {
>   					gpio-hog;
>   					gpios = <0 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_1";
>   				};
> -				gtr_sel1 {
> +				gtr-sel1 {
>   					gpio-hog;
>   					gpios = <1 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_2";
>   				};
> -				gtr_sel2 {
> +				gtr-sel2 {
>   					gpio-hog;
>   					gpios = <2 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_3";
>   				};
> -				gtr_sel3 {
> +				gtr-sel3 {
>   					gpio-hog;
>   					gpios = <3 0>;
>   					input; /* FIXME add meaning */
> diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> index 97b9cdf82ae7..c456c375ac80 100644
> --- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> +++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
> @@ -427,25 +427,25 @@
>   				#gpio-cells = <2>;
>   				gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4",
>   						  "", "", "", "";
> -				gtr_sel0 {
> +				gtr-sel0 {
>   					gpio-hog;
>   					gpios = <0 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_1";
>   				};
> -				gtr_sel1 {
> +				gtr-sel1 {
>   					gpio-hog;
>   					gpios = <1 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_2";
>   				};
> -				gtr_sel2 {
> +				gtr-sel2 {
>   					gpio-hog;
>   					gpios = <2 0>;
>   					input; /* FIXME add meaning */
>   					line-name = "sw4_3";
>   				};
> -				gtr_sel3 {
> +				gtr-sel3 {
>   					gpio-hog;
>   					gpios = <3 0>;
>   					input; /* FIXME add meaning */
> diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts
> index d09e53f42fa8..22ad8d33a116 100644
> --- a/arch/arm/dts/zynqmp-zcu208-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu208-revA.dts
> @@ -57,7 +57,7 @@
>   
>   	leds {
>   		compatible = "gpio-leds";
> -		heartbeat_led {
> +		heartbeat-led {
>   			label = "heartbeat";
>   			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
>   			linux,default-trigger = "heartbeat";
> diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts
> index fd026347c25f..575ff5b1b77b 100644
> --- a/arch/arm/dts/zynqmp-zcu216-revA.dts
> +++ b/arch/arm/dts/zynqmp-zcu216-revA.dts
> @@ -57,7 +57,7 @@
>   
>   	leds {
>   		compatible = "gpio-leds";
> -		heartbeat_led {
> +		heartbeat-led {
>   			label = "heartbeat";
>   			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
>   			linux,default-trigger = "heartbeat";
> diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
> index 30bd7b499603..f03c201caee9 100644
> --- a/arch/arm/dts/zynqmp.dtsi
> +++ b/arch/arm/dts/zynqmp.dtsi
> @@ -136,7 +136,7 @@
>   		};
>   	};
>   
> -	zynqmp_ipi: zynqmp_ipi {
> +	zynqmp_ipi: zynqmp-ipi {
>   		bootph-all;
>   		compatible = "xlnx,zynqmp-ipi-mailbox";
>   		interrupt-parent = <&gic>;
> @@ -206,12 +206,12 @@
>   				mbox-names = "tx", "rx";
>   			};
>   
> -			nvmem_firmware {
> +			nvmem-firmware {
>   				compatible = "xlnx,zynqmp-nvmem-fw";
>   				#address-cells = <1>;
>   				#size-cells = <1>;
>   
> -				soc_revision: soc_revision at 0 {
> +				soc_revision: soc-revision at 0 {
>   					reg = <0x0 0x4>;
>   				};
>   			};

Applied.
M


More information about the U-Boot mailing list