GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: dts: imx: use generic name bus

Browse source 
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>
This commit is contained in:
Oleksandr Suvorov 2021-09-23 23:14:37 +03:00 • committed by Stefano Babic
parent 64fe0ffca0
commit cdb18048f9
15 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/imx53-m53menlo-u-boot.dtsi
View file

@ -7,7 +7,7 @@
soc { soc {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
aips@50000000 { bus@50000000 {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
}; };

4
arch/arm/dts/imx53.dtsi
View file

@ -222,7 +222,7 @@
clock-names = "core_clk", "mem_iface_clk"; clock-names = "core_clk", "mem_iface_clk";
}; };
aips@50000000 { /* AIPS1 */ bus@50000000 { /* AIPS1 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -654,7 +654,7 @@
}; };
}; };
aips@60000000 { /* AIPS2 */ bus@60000000 { /* AIPS2 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

4
arch/arm/dts/imx6dl.dtsi
View file

@ -84,7 +84,7 @@
clocks = <&clks IMX6QDL_CLK_OCRAM>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
aips1: aips-bus@2000000 { aips1: bus@2000000 {
iomuxc: iomuxc@20e0000 { iomuxc: iomuxc@20e0000 {
compatible = "fsl,imx6dl-iomuxc"; compatible = "fsl,imx6dl-iomuxc";
}; };
@ -100,7 +100,7 @@
}; };
}; };
aips2: aips-bus@2100000 { aips2: bus@2100000 {
i2c4: i2c@21f8000 { i2c4: i2c@21f8000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

2
arch/arm/dts/imx6q-display5-u-boot.dtsi
View file

@ -23,7 +23,7 @@
soc { soc {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
aips-bus@2100000 { bus@2100000 {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
}; };

2
arch/arm/dts/imx6q.dtsi
View file

@ -162,7 +162,7 @@
clocks = <&clks IMX6QDL_CLK_OCRAM>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
aips-bus@2000000 { /* AIPS1 */ bus@2000000 { /* AIPS1 */
spba-bus@2000000 { spba-bus@2000000 {
ecspi5: spi@2018000 { ecspi5: spi@2018000 {
#address-cells = <1>; #address-cells = <1>;

4
arch/arm/dts/imx6qdl-u-boot.dtsi
View file

@ -13,14 +13,14 @@
u-boot,dm-spl; u-boot,dm-spl;
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
aips-bus@2000000 { bus@2000000 {
u-boot,dm-spl; u-boot,dm-spl;
spba-bus@2000000 { spba-bus@2000000 {
u-boot,dm-spl; u-boot,dm-spl;
}; };
}; };
aips-bus@2100000 { bus@2100000 {
u-boot,dm-spl; u-boot,dm-spl;
}; };
}; };

4
arch/arm/dts/imx6qdl.dtsi
View file

@ -283,7 +283,7 @@
status = "disabled"; status = "disabled";
}; };
aips-bus@2000000 { /* AIPS1 */ bus@2000000 { /* AIPS1 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -913,7 +913,7 @@
}; };
}; };
aips-bus@2100000 { /* AIPS2 */ bus@2100000 { /* AIPS2 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

2
arch/arm/dts/imx6qp.dtsi
View file

@ -18,7 +18,7 @@
clocks = <&clks IMX6QDL_CLK_OCRAM>; clocks = <&clks IMX6QDL_CLK_OCRAM>;
}; };
aips-bus@2100000 { bus@2100000 {
pre1: pre@21c8000 { pre1: pre@21c8000 {
compatible = "fsl,imx6qp-pre"; compatible = "fsl,imx6qp-pre";
reg = <0x021c8000 0x1000>; reg = <0x021c8000 0x1000>;

4
arch/arm/dts/imx6sl.dtsi
View file

@ -130,7 +130,7 @@
interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
}; };
aips1: aips-bus@02000000 { aips1: bus@02000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -751,7 +751,7 @@
}; };
}; };
aips2: aips-bus@02100000 { aips2: bus@02100000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

4
arch/arm/dts/imx6sll.dtsi
View file

@ -176,7 +176,7 @@
arm,data-latency = <4 2 3>; arm,data-latency = <4 2 3>;
}; };
aips1: aips-bus@02000000 { aips1: bus@02000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -682,7 +682,7 @@
}; };
}; };
aips2: aips-bus@02100000 { aips2: bus@02100000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

6
arch/arm/dts/imx6sx.dtsi
View file

@ -235,7 +235,7 @@
status = "disabled"; status = "disabled";
}; };
aips1: aips-bus@2000000 { aips1: bus@2000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -830,7 +830,7 @@
}; };
}; };
aips2: aips-bus@2100000 { aips2: bus@2100000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -1188,7 +1188,7 @@
}; };
}; };
aips3: aips-bus@2200000 { aips3: bus@2200000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

4
arch/arm/dts/imx6ul.dtsi
View file

@ -206,7 +206,7 @@
status = "disabled"; status = "disabled";
}; };
aips1: aips-bus@2000000 { aips1: bus@2000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -763,7 +763,7 @@
}; };
}; };
aips2: aips-bus@2100000 { aips2: bus@2100000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

2
arch/arm/dts/imx6ull.dtsi
View file

@ -44,7 +44,7 @@
/ { / {
soc { soc {
aips3: aips-bus@2200000 { aips3: bus@2200000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

6
arch/arm/dts/imx7s.dtsi
View file

@ -340,7 +340,7 @@
<0x31006000 0x2000>; <0x31006000 0x2000>;
}; };
aips1: aips-bus@30000000 { aips1: bus@30000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -647,7 +647,7 @@
}; };
}; };
aips2: aips-bus@30400000 { aips2: bus@30400000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -739,7 +739,7 @@
}; };
}; };
aips3: aips-bus@30800000 { aips3: bus@30800000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

4
arch/arm/dts/vf.dtsi
View file

@ -34,7 +34,7 @@
compatible = "simple-bus"; compatible = "simple-bus";
ranges; ranges;
aips0: aips-bus@40000000 { aips0: bus@40000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -158,7 +158,7 @@
}; };
}; };
aips1: aips-bus@40080000 { aips1: bus@40080000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;