ARM64: dts: amlogic: use generic bus node names

The DT spec recommends that node-names have generic names like "bus".
Fix that in the Amlogic DTs, while leaving the label names to have more
SoC-specific names that match with the HW documentation.

Suggested-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index b932a784b02afe61833991bc6f4fbaa8710e5a60..e7213eb53958b852f86b8b6af71428ecd0e25dde 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -113,7 +113,7 @@ soc {
                #size-cells = <2>;
                ranges;
 
-               cbus: cbus@ffd00000 {
+               cbus: bus@ffd00000 {
                        compatible = "simple-bus";
                        reg = <0x0 0xffd00000 0x0 0x25000>;
                        #address-cells = <2>;
@@ -175,7 +175,7 @@ cpu_scp_hpri: scp-shmem@200 {
                        };
                };
 
-               aobus: aobus@ff800000 {
+               aobus: bus@ff800000 {
                        compatible = "simple-bus";
                        reg = <0x0 0xff800000 0x0 0x100000>;
                        #address-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 7cdbf58a062f476faac6316542c946e271681cc1..6cb3c2a52bafe5f0db8a0018b35e88998ed90f01 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -211,7 +211,7 @@ soc {
                #size-cells = <2>;
                ranges;
 
-               cbus: cbus@c1100000 {
+               cbus: bus@c1100000 {
                        compatible = "simple-bus";
                        reg = <0x0 0xc1100000 0x0 0x100000>;
                        #address-cells = <2>;
@@ -366,7 +366,7 @@ cpu_scp_hpri: scp-shmem@200 {
                        };
                };
 
-               aobus: aobus@c8100000 {
+               aobus: bus@c8100000 {
                        compatible = "simple-bus";
                        reg = <0x0 0xc8100000 0x0 0x100000>;
                        #address-cells = <2>;
@@ -453,7 +453,7 @@ hwrng: rng {
                        };
                };
 
-               hiubus: hiubus@c883c000 {
+               hiubus: bus@c883c000 {
                        compatible = "simple-bus";
                        reg = <0x0 0xc883c000 0x0 0x2000>;
                        #address-cells = <2>;