* [PATCH] ARM: dts: imx: use generic name bus
@ 2021-09-23 20:14 Oleksandr Suvorov
2021-09-24 2:39 ` Peng Fan (OSS)
2021-10-07 14:12 ` sbabic
0 siblings, 2 replies; 3+ messages in thread
From: Oleksandr Suvorov @ 2021-09-23 20:14 UTC (permalink / raw)
To: u-boot
Cc: Oleksandr Suvorov, Fabio Estevam, NXP i.MX U-Boot Team,
Stefano Babic, Tom Rini
Synchronize the u-boot and kernel imx device trees, using tuned
script from commit c0157bdcafa1 ("ARM: dts: imx: use generic name bus")
Per devicetree specification, generic names are recommended to be
used, such as bus.
i.MX AIPS is an AHB - IP bridge bus, so we could use bus as node
name.
Script:
sed -i "s/\<aips@/bus@/" arch/arm/dts/imx*.dtsi
sed -i "s/\<aips@/bus@/" arch/arm/dts/vf*.dtsi
sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/imx*.dtsi
sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/vf*.dtsi
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---
arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 2 +-
arch/arm/dts/imx53.dtsi | 4 ++--
arch/arm/dts/imx6dl.dtsi | 4 ++--
arch/arm/dts/imx6q-display5-u-boot.dtsi | 2 +-
arch/arm/dts/imx6q.dtsi | 2 +-
arch/arm/dts/imx6qdl-u-boot.dtsi | 4 ++--
arch/arm/dts/imx6qdl.dtsi | 4 ++--
arch/arm/dts/imx6qp.dtsi | 2 +-
arch/arm/dts/imx6sl.dtsi | 4 ++--
arch/arm/dts/imx6sll.dtsi | 4 ++--
arch/arm/dts/imx6sx.dtsi | 6 +++---
arch/arm/dts/imx6ul.dtsi | 4 ++--
arch/arm/dts/imx6ull.dtsi | 2 +-
arch/arm/dts/imx7s.dtsi | 6 +++---
arch/arm/dts/vf.dtsi | 4 ++--
15 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
index bc4b3483a6..869adb9dad 100644
--- a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
+++ b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
@@ -7,7 +7,7 @@
soc {
u-boot,dm-pre-reloc;
- aips@50000000 {
+ bus@50000000 {
u-boot,dm-pre-reloc;
};
};
diff --git a/arch/arm/dts/imx53.dtsi b/arch/arm/dts/imx53.dtsi
index ed341cfd9d..8536f59f59 100644
--- a/arch/arm/dts/imx53.dtsi
+++ b/arch/arm/dts/imx53.dtsi
@@ -222,7 +222,7 @@
clock-names = "core_clk", "mem_iface_clk";
};
- aips@50000000 { /* AIPS1 */
+ bus@50000000 { /* AIPS1 */
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -654,7 +654,7 @@
};
};
- aips@60000000 { /* AIPS2 */
+ bus@60000000 { /* AIPS2 */
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx6dl.dtsi b/arch/arm/dts/imx6dl.dtsi
index f0607eb41d..ae5aad6b9e 100644
--- a/arch/arm/dts/imx6dl.dtsi
+++ b/arch/arm/dts/imx6dl.dtsi
@@ -84,7 +84,7 @@
clocks = <&clks IMX6QDL_CLK_OCRAM>;
};
- aips1: aips-bus@2000000 {
+ aips1: bus@2000000 {
iomuxc: iomuxc@20e0000 {
compatible = "fsl,imx6dl-iomuxc";
};
@@ -100,7 +100,7 @@
};
};
- aips2: aips-bus@2100000 {
+ aips2: bus@2100000 {
i2c4: i2c@21f8000 {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi
index aa660b5aeb..ced4dacc73 100644
--- a/arch/arm/dts/imx6q-display5-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi
@@ -23,7 +23,7 @@
soc {
u-boot,dm-pre-reloc;
- aips-bus@2100000 {
+ bus@2100000 {
u-boot,dm-pre-reloc;
};
};
diff --git a/arch/arm/dts/imx6q.dtsi b/arch/arm/dts/imx6q.dtsi
index 71543a4a68..c37484dce3 100644
--- a/arch/arm/dts/imx6q.dtsi
+++ b/arch/arm/dts/imx6q.dtsi
@@ -162,7 +162,7 @@
clocks = <&clks IMX6QDL_CLK_OCRAM>;
};
- aips-bus@2000000 { /* AIPS1 */
+ bus@2000000 { /* AIPS1 */
spba-bus@2000000 {
ecspi5: spi@2018000 {
#address-cells = <1>;
diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi
index 1279cc2338..f74af6c423 100644
--- a/arch/arm/dts/imx6qdl-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-u-boot.dtsi
@@ -13,14 +13,14 @@
u-boot,dm-spl;
u-boot,dm-pre-reloc;
- aips-bus@2000000 {
+ bus@2000000 {
u-boot,dm-spl;
spba-bus@2000000 {
u-boot,dm-spl;
};
};
- aips-bus@2100000 {
+ bus@2100000 {
u-boot,dm-spl;
};
};
diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi
index e4daf15088..1cdb498c72 100644
--- a/arch/arm/dts/imx6qdl.dtsi
+++ b/arch/arm/dts/imx6qdl.dtsi
@@ -283,7 +283,7 @@
status = "disabled";
};
- aips-bus@2000000 { /* AIPS1 */
+ bus@2000000 { /* AIPS1 */
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -913,7 +913,7 @@
};
};
- aips-bus@2100000 { /* AIPS2 */
+ bus@2100000 { /* AIPS2 */
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi
index 5f51f8e5c1..93b89dc1f5 100644
--- a/arch/arm/dts/imx6qp.dtsi
+++ b/arch/arm/dts/imx6qp.dtsi
@@ -18,7 +18,7 @@
clocks = <&clks IMX6QDL_CLK_OCRAM>;
};
- aips-bus@2100000 {
+ bus@2100000 {
pre1: pre@21c8000 {
compatible = "fsl,imx6qp-pre";
reg = <0x021c8000 0x1000>;
diff --git a/arch/arm/dts/imx6sl.dtsi b/arch/arm/dts/imx6sl.dtsi
index cc9572ea28..37e341c6c3 100644
--- a/arch/arm/dts/imx6sl.dtsi
+++ b/arch/arm/dts/imx6sl.dtsi
@@ -130,7 +130,7 @@
interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
};
- aips1: aips-bus@02000000 {
+ aips1: bus@02000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -751,7 +751,7 @@
};
};
- aips2: aips-bus@02100000 {
+ aips2: bus@02100000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx6sll.dtsi b/arch/arm/dts/imx6sll.dtsi
index 349c47a03a..ebc6d9d2c9 100644
--- a/arch/arm/dts/imx6sll.dtsi
+++ b/arch/arm/dts/imx6sll.dtsi
@@ -176,7 +176,7 @@
arm,data-latency = <4 2 3>;
};
- aips1: aips-bus@02000000 {
+ aips1: bus@02000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -682,7 +682,7 @@
};
};
- aips2: aips-bus@02100000 {
+ aips2: bus@02100000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx6sx.dtsi b/arch/arm/dts/imx6sx.dtsi
index 531a52c1e9..8d2d396ad1 100644
--- a/arch/arm/dts/imx6sx.dtsi
+++ b/arch/arm/dts/imx6sx.dtsi
@@ -235,7 +235,7 @@
status = "disabled";
};
- aips1: aips-bus@2000000 {
+ aips1: bus@2000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -830,7 +830,7 @@
};
};
- aips2: aips-bus@2100000 {
+ aips2: bus@2100000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -1188,7 +1188,7 @@
};
};
- aips3: aips-bus@2200000 {
+ aips3: bus@2200000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx6ul.dtsi b/arch/arm/dts/imx6ul.dtsi
index 5644b0f34d..ad9cb37db7 100644
--- a/arch/arm/dts/imx6ul.dtsi
+++ b/arch/arm/dts/imx6ul.dtsi
@@ -206,7 +206,7 @@
status = "disabled";
};
- aips1: aips-bus@2000000 {
+ aips1: bus@2000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -763,7 +763,7 @@
};
};
- aips2: aips-bus@2100000 {
+ aips2: bus@2100000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx6ull.dtsi b/arch/arm/dts/imx6ull.dtsi
index 22e4a307fa..f224e20bda 100644
--- a/arch/arm/dts/imx6ull.dtsi
+++ b/arch/arm/dts/imx6ull.dtsi
@@ -44,7 +44,7 @@
/ {
soc {
- aips3: aips-bus@2200000 {
+ aips3: bus@2200000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi
index 967023fde1..483824fc06 100644
--- a/arch/arm/dts/imx7s.dtsi
+++ b/arch/arm/dts/imx7s.dtsi
@@ -340,7 +340,7 @@
<0x31006000 0x2000>;
};
- aips1: aips-bus@30000000 {
+ aips1: bus@30000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -647,7 +647,7 @@
};
};
- aips2: aips-bus@30400000 {
+ aips2: bus@30400000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -739,7 +739,7 @@
};
};
- aips3: aips-bus@30800000 {
+ aips3: bus@30800000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi
index 5f69d0fd6e..5ba13dc62b 100644
--- a/arch/arm/dts/vf.dtsi
+++ b/arch/arm/dts/vf.dtsi
@@ -34,7 +34,7 @@
compatible = "simple-bus";
ranges;
- aips0: aips-bus@40000000 {
+ aips0: bus@40000000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -158,7 +158,7 @@
};
};
- aips1: aips-bus@40080000 {
+ aips1: bus@40080000 {
compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: dts: imx: use generic name bus
2021-09-23 20:14 [PATCH] ARM: dts: imx: use generic name bus Oleksandr Suvorov
@ 2021-09-24 2:39 ` Peng Fan (OSS)
2021-10-07 14:12 ` sbabic
1 sibling, 0 replies; 3+ messages in thread
From: Peng Fan (OSS) @ 2021-09-24 2:39 UTC (permalink / raw)
To: Oleksandr Suvorov, u-boot
Cc: Fabio Estevam, dl-uboot-imx, Stefano Babic, Tom Rini
On 2021/9/24 4:14, Oleksandr Suvorov wrote:
> Synchronize the u-boot and kernel imx device trees, using tuned
> script from commit c0157bdcafa1 ("ARM: dts: imx: use generic name bus")
>
> Per devicetree specification, generic names are recommended to be
> used, such as bus.
>
> i.MX AIPS is an AHB - IP bridge bus, so we could use bus as node
> name.
>
> Script:
> sed -i "s/\<aips@/bus@/" arch/arm/dts/imx*.dtsi
> sed -i "s/\<aips@/bus@/" arch/arm/dts/vf*.dtsi
> sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/imx*.dtsi
> sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/vf*.dtsi
>
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> ---
>
> arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 2 +-
> arch/arm/dts/imx53.dtsi | 4 ++--
> arch/arm/dts/imx6dl.dtsi | 4 ++--
> arch/arm/dts/imx6q-display5-u-boot.dtsi | 2 +-
> arch/arm/dts/imx6q.dtsi | 2 +-
> arch/arm/dts/imx6qdl-u-boot.dtsi | 4 ++--
> arch/arm/dts/imx6qdl.dtsi | 4 ++--
> arch/arm/dts/imx6qp.dtsi | 2 +-
> arch/arm/dts/imx6sl.dtsi | 4 ++--
> arch/arm/dts/imx6sll.dtsi | 4 ++--
> arch/arm/dts/imx6sx.dtsi | 6 +++---
> arch/arm/dts/imx6ul.dtsi | 4 ++--
> arch/arm/dts/imx6ull.dtsi | 2 +-
> arch/arm/dts/imx7s.dtsi | 6 +++---
> arch/arm/dts/vf.dtsi | 4 ++--
> 15 files changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
> index bc4b3483a6..869adb9dad 100644
> --- a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
> +++ b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
> @@ -7,7 +7,7 @@
> soc {
> u-boot,dm-pre-reloc;
>
> - aips@50000000 {
> + bus@50000000 {
> u-boot,dm-pre-reloc;
> };
> };
> diff --git a/arch/arm/dts/imx53.dtsi b/arch/arm/dts/imx53.dtsi
> index ed341cfd9d..8536f59f59 100644
> --- a/arch/arm/dts/imx53.dtsi
> +++ b/arch/arm/dts/imx53.dtsi
> @@ -222,7 +222,7 @@
> clock-names = "core_clk", "mem_iface_clk";
> };
>
> - aips@50000000 { /* AIPS1 */
> + bus@50000000 { /* AIPS1 */
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -654,7 +654,7 @@
> };
> };
>
> - aips@60000000 { /* AIPS2 */
> + bus@60000000 { /* AIPS2 */
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/imx6dl.dtsi b/arch/arm/dts/imx6dl.dtsi
> index f0607eb41d..ae5aad6b9e 100644
> --- a/arch/arm/dts/imx6dl.dtsi
> +++ b/arch/arm/dts/imx6dl.dtsi
> @@ -84,7 +84,7 @@
> clocks = <&clks IMX6QDL_CLK_OCRAM>;
> };
>
> - aips1: aips-bus@2000000 {
> + aips1: bus@2000000 {
> iomuxc: iomuxc@20e0000 {
> compatible = "fsl,imx6dl-iomuxc";
> };
> @@ -100,7 +100,7 @@
> };
> };
>
> - aips2: aips-bus@2100000 {
> + aips2: bus@2100000 {
> i2c4: i2c@21f8000 {
> #address-cells = <1>;
> #size-cells = <0>;
> diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi
> index aa660b5aeb..ced4dacc73 100644
> --- a/arch/arm/dts/imx6q-display5-u-boot.dtsi
> +++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi
> @@ -23,7 +23,7 @@
> soc {
> u-boot,dm-pre-reloc;
>
> - aips-bus@2100000 {
> + bus@2100000 {
> u-boot,dm-pre-reloc;
> };
> };
> diff --git a/arch/arm/dts/imx6q.dtsi b/arch/arm/dts/imx6q.dtsi
> index 71543a4a68..c37484dce3 100644
> --- a/arch/arm/dts/imx6q.dtsi
> +++ b/arch/arm/dts/imx6q.dtsi
> @@ -162,7 +162,7 @@
> clocks = <&clks IMX6QDL_CLK_OCRAM>;
> };
>
> - aips-bus@2000000 { /* AIPS1 */
> + bus@2000000 { /* AIPS1 */
> spba-bus@2000000 {
> ecspi5: spi@2018000 {
> #address-cells = <1>;
> diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi
> index 1279cc2338..f74af6c423 100644
> --- a/arch/arm/dts/imx6qdl-u-boot.dtsi
> +++ b/arch/arm/dts/imx6qdl-u-boot.dtsi
> @@ -13,14 +13,14 @@
> u-boot,dm-spl;
> u-boot,dm-pre-reloc;
>
> - aips-bus@2000000 {
> + bus@2000000 {
> u-boot,dm-spl;
> spba-bus@2000000 {
> u-boot,dm-spl;
> };
> };
>
> - aips-bus@2100000 {
> + bus@2100000 {
> u-boot,dm-spl;
> };
> };
> diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi
> index e4daf15088..1cdb498c72 100644
> --- a/arch/arm/dts/imx6qdl.dtsi
> +++ b/arch/arm/dts/imx6qdl.dtsi
> @@ -283,7 +283,7 @@
> status = "disabled";
> };
>
> - aips-bus@2000000 { /* AIPS1 */
> + bus@2000000 { /* AIPS1 */
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -913,7 +913,7 @@
> };
> };
>
> - aips-bus@2100000 { /* AIPS2 */
> + bus@2100000 { /* AIPS2 */
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi
> index 5f51f8e5c1..93b89dc1f5 100644
> --- a/arch/arm/dts/imx6qp.dtsi
> +++ b/arch/arm/dts/imx6qp.dtsi
> @@ -18,7 +18,7 @@
> clocks = <&clks IMX6QDL_CLK_OCRAM>;
> };
>
> - aips-bus@2100000 {
> + bus@2100000 {
> pre1: pre@21c8000 {
> compatible = "fsl,imx6qp-pre";
> reg = <0x021c8000 0x1000>;
> diff --git a/arch/arm/dts/imx6sl.dtsi b/arch/arm/dts/imx6sl.dtsi
> index cc9572ea28..37e341c6c3 100644
> --- a/arch/arm/dts/imx6sl.dtsi
> +++ b/arch/arm/dts/imx6sl.dtsi
> @@ -130,7 +130,7 @@
> interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
> };
>
> - aips1: aips-bus@02000000 {
> + aips1: bus@02000000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -751,7 +751,7 @@
> };
> };
>
> - aips2: aips-bus@02100000 {
> + aips2: bus@02100000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/imx6sll.dtsi b/arch/arm/dts/imx6sll.dtsi
> index 349c47a03a..ebc6d9d2c9 100644
> --- a/arch/arm/dts/imx6sll.dtsi
> +++ b/arch/arm/dts/imx6sll.dtsi
> @@ -176,7 +176,7 @@
> arm,data-latency = <4 2 3>;
> };
>
> - aips1: aips-bus@02000000 {
> + aips1: bus@02000000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -682,7 +682,7 @@
> };
> };
>
> - aips2: aips-bus@02100000 {
> + aips2: bus@02100000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/imx6sx.dtsi b/arch/arm/dts/imx6sx.dtsi
> index 531a52c1e9..8d2d396ad1 100644
> --- a/arch/arm/dts/imx6sx.dtsi
> +++ b/arch/arm/dts/imx6sx.dtsi
> @@ -235,7 +235,7 @@
> status = "disabled";
> };
>
> - aips1: aips-bus@2000000 {
> + aips1: bus@2000000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -830,7 +830,7 @@
> };
> };
>
> - aips2: aips-bus@2100000 {
> + aips2: bus@2100000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -1188,7 +1188,7 @@
> };
> };
>
> - aips3: aips-bus@2200000 {
> + aips3: bus@2200000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/imx6ul.dtsi b/arch/arm/dts/imx6ul.dtsi
> index 5644b0f34d..ad9cb37db7 100644
> --- a/arch/arm/dts/imx6ul.dtsi
> +++ b/arch/arm/dts/imx6ul.dtsi
> @@ -206,7 +206,7 @@
> status = "disabled";
> };
>
> - aips1: aips-bus@2000000 {
> + aips1: bus@2000000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -763,7 +763,7 @@
> };
> };
>
> - aips2: aips-bus@2100000 {
> + aips2: bus@2100000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/imx6ull.dtsi b/arch/arm/dts/imx6ull.dtsi
> index 22e4a307fa..f224e20bda 100644
> --- a/arch/arm/dts/imx6ull.dtsi
> +++ b/arch/arm/dts/imx6ull.dtsi
> @@ -44,7 +44,7 @@
>
> / {
> soc {
> - aips3: aips-bus@2200000 {
> + aips3: bus@2200000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi
> index 967023fde1..483824fc06 100644
> --- a/arch/arm/dts/imx7s.dtsi
> +++ b/arch/arm/dts/imx7s.dtsi
> @@ -340,7 +340,7 @@
> <0x31006000 0x2000>;
> };
>
> - aips1: aips-bus@30000000 {
> + aips1: bus@30000000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -647,7 +647,7 @@
> };
> };
>
> - aips2: aips-bus@30400000 {
> + aips2: bus@30400000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -739,7 +739,7 @@
> };
> };
>
> - aips3: aips-bus@30800000 {
> + aips3: bus@30800000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi
> index 5f69d0fd6e..5ba13dc62b 100644
> --- a/arch/arm/dts/vf.dtsi
> +++ b/arch/arm/dts/vf.dtsi
> @@ -34,7 +34,7 @@
> compatible = "simple-bus";
> ranges;
>
> - aips0: aips-bus@40000000 {
> + aips0: bus@40000000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -158,7 +158,7 @@
> };
> };
>
> - aips1: aips-bus@40080000 {
> + aips1: bus@40080000 {
> compatible = "fsl,aips-bus", "simple-bus";
> #address-cells = <1>;
> #size-cells = <1>;
>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: dts: imx: use generic name bus
2021-09-23 20:14 [PATCH] ARM: dts: imx: use generic name bus Oleksandr Suvorov
2021-09-24 2:39 ` Peng Fan (OSS)
@ 2021-10-07 14:12 ` sbabic
1 sibling, 0 replies; 3+ messages in thread
From: sbabic @ 2021-10-07 14:12 UTC (permalink / raw)
To: Oleksandr Suvorov, U-Boot
> Synchronize the u-boot and kernel imx device trees, using tuned
> script from commit c0157bdcafa1 ("ARM: dts: imx: use generic name bus")
> Per devicetree specification, generic names are recommended to be
> used, such as bus.
> i.MX AIPS is an AHB - IP bridge bus, so we could use bus as node
> name.
> Script:
> sed -i "s/\<aips@/bus@/" arch/arm/dts/imx*.dtsi
> sed -i "s/\<aips@/bus@/" arch/arm/dts/vf*.dtsi
> sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/imx*.dtsi
> sed -i "s/\<aips-bus@/bus@/" arch/arm/dts/vf*.dtsi
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-07 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-23 20:14 [PATCH] ARM: dts: imx: use generic name bus Oleksandr Suvorov
2021-09-24 2:39 ` Peng Fan (OSS)
2021-10-07 14:12 ` sbabic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.