| Message ID | 102d9499e9bab12f89dbf9ceaa49a11d685146b3.1721054306.git.michal.simek@amd.com |
|---|---|
| State | Accepted |
| Commit | 2b82768d55c1c72b3d9ae601f17cd1a3de1f7e20 |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | arm64: versal-net: Align node names with dt-schema | expand |
On 7/15/24 16:38, Michal Simek wrote: > dt-schema is forcing some rules for node names that's why align them with > it. Labels are not changing that's why this change is not breaking any > other board specific DTSes. > > Signed-off-by: Michal Simek <michal.simek@amd.com> > --- > > arch/arm/dts/versal-net-mini-emmc.dts | 4 ++-- > arch/arm/dts/versal-net-mini-ospi.dtsi | 2 +- > arch/arm/dts/versal-net-mini-qspi.dtsi | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/dts/versal-net-mini-emmc.dts b/arch/arm/dts/versal-net-mini-emmc.dts > index 8a864ba3ed3f..e200fb694c6b 100644 > --- a/arch/arm/dts/versal-net-mini-emmc.dts > +++ b/arch/arm/dts/versal-net-mini-emmc.dts > @@ -42,14 +42,14 @@ > bootph-all; > }; > > - amba: amba { > + amba: axi { > bootph-all; > compatible = "simple-bus"; > #address-cells = <2>; > #size-cells = <2>; > ranges; > > - sdhci1: sdhci@f1050000 { > + sdhci1: mmc@f1050000 { > compatible = "xlnx,versal-net-emmc"; > status = "okay"; > non-removable; > diff --git a/arch/arm/dts/versal-net-mini-ospi.dtsi b/arch/arm/dts/versal-net-mini-ospi.dtsi > index 5d188db62d92..d511b823754b 100644 > --- a/arch/arm/dts/versal-net-mini-ospi.dtsi > +++ b/arch/arm/dts/versal-net-mini-ospi.dtsi > @@ -42,7 +42,7 @@ > bootph-all; > }; > > - amba: amba { > + amba: axi { > bootph-all; > compatible = "simple-bus"; > #address-cells = <0x2>; > diff --git a/arch/arm/dts/versal-net-mini-qspi.dtsi b/arch/arm/dts/versal-net-mini-qspi.dtsi > index 097b58c633b8..e29a3f36d6e4 100644 > --- a/arch/arm/dts/versal-net-mini-qspi.dtsi > +++ b/arch/arm/dts/versal-net-mini-qspi.dtsi > @@ -42,7 +42,7 @@ > bootph-all; > }; > > - amba: amba { > + amba: axi { > bootph-all; > compatible = "simple-bus"; > #address-cells = <2>; Applied. M
diff --git a/arch/arm/dts/versal-net-mini-emmc.dts b/arch/arm/dts/versal-net-mini-emmc.dts index 8a864ba3ed3f..e200fb694c6b 100644 --- a/arch/arm/dts/versal-net-mini-emmc.dts +++ b/arch/arm/dts/versal-net-mini-emmc.dts @@ -42,14 +42,14 @@ bootph-all; }; - amba: amba { + amba: axi { bootph-all; compatible = "simple-bus"; #address-cells = <2>; #size-cells = <2>; ranges; - sdhci1: sdhci@f1050000 { + sdhci1: mmc@f1050000 { compatible = "xlnx,versal-net-emmc"; status = "okay"; non-removable; diff --git a/arch/arm/dts/versal-net-mini-ospi.dtsi b/arch/arm/dts/versal-net-mini-ospi.dtsi index 5d188db62d92..d511b823754b 100644 --- a/arch/arm/dts/versal-net-mini-ospi.dtsi +++ b/arch/arm/dts/versal-net-mini-ospi.dtsi @@ -42,7 +42,7 @@ bootph-all; }; - amba: amba { + amba: axi { bootph-all; compatible = "simple-bus"; #address-cells = <0x2>; diff --git a/arch/arm/dts/versal-net-mini-qspi.dtsi b/arch/arm/dts/versal-net-mini-qspi.dtsi index 097b58c633b8..e29a3f36d6e4 100644 --- a/arch/arm/dts/versal-net-mini-qspi.dtsi +++ b/arch/arm/dts/versal-net-mini-qspi.dtsi @@ -42,7 +42,7 @@ bootph-all; }; - amba: amba { + amba: axi { bootph-all; compatible = "simple-bus"; #address-cells = <2>;
dt-schema is forcing some rules for node names that's why align them with it. Labels are not changing that's why this change is not breaking any other board specific DTSes. Signed-off-by: Michal Simek <michal.simek@amd.com> --- arch/arm/dts/versal-net-mini-emmc.dts | 4 ++-- arch/arm/dts/versal-net-mini-ospi.dtsi | 2 +- arch/arm/dts/versal-net-mini-qspi.dtsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)