| Message ID | 20171206193005.24171-1-khilman@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 06/12/2017 20:30, Kevin Hilman wrote: > 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> > Signed-off-by: Kevin Hilman <khilman@baylibre.com> > --- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index b932a784b02a..e7213eb53958 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -113,7 +113,7 @@ > #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 @@ > }; > }; > > - 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 7cdbf58a062f..6cb3c2a52baf 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi > @@ -211,7 +211,7 @@ > #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 @@ > }; > }; > > - aobus: aobus@c8100000 { > + aobus: bus@c8100000 { > compatible = "simple-bus"; > reg = <0x0 0xc8100000 0x0 0x100000>; > #address-cells = <2>; > @@ -453,7 +453,7 @@ > }; > }; > > - hiubus: hiubus@c883c000 { > + hiubus: bus@c883c000 { > compatible = "simple-bus"; > reg = <0x0 0xc883c000 0x0 0x2000>; > #address-cells = <2>; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Neil Armstrong <narmstrong@baylibre.com> writes: > On 06/12/2017 20:30, Kevin Hilman wrote: >> 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> >> Signed-off-by: Kevin Hilman <khilman@baylibre.com> >> --- >> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- >> arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +++--- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> index b932a784b02a..e7213eb53958 100644 >> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi >> @@ -113,7 +113,7 @@ >> #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 @@ >> }; >> }; >> >> - 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 7cdbf58a062f..6cb3c2a52baf 100644 >> --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi >> +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi >> @@ -211,7 +211,7 @@ >> #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 @@ >> }; >> }; >> >> - aobus: aobus@c8100000 { >> + aobus: bus@c8100000 { >> compatible = "simple-bus"; >> reg = <0x0 0xc8100000 0x0 0x100000>; >> #address-cells = <2>; >> @@ -453,7 +453,7 @@ >> }; >> }; >> >> - hiubus: hiubus@c883c000 { >> + hiubus: bus@c883c000 { >> compatible = "simple-bus"; >> reg = <0x0 0xc883c000 0x0 0x2000>; >> #address-cells = <2>; >> > > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Applied to v4.16/dt64 with Neil's review and after doing some basic build/boot tests. Thanks, Kevin
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index b932a784b02a..e7213eb53958 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -113,7 +113,7 @@ #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 @@ }; }; - 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 7cdbf58a062f..6cb3c2a52baf 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -211,7 +211,7 @@ #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 @@ }; }; - aobus: aobus@c8100000 { + aobus: bus@c8100000 { compatible = "simple-bus"; reg = <0x0 0xc8100000 0x0 0x100000>; #address-cells = <2>; @@ -453,7 +453,7 @@ }; }; - hiubus: hiubus@c883c000 { + hiubus: bus@c883c000 { compatible = "simple-bus"; reg = <0x0 0xc883c000 0x0 0x2000>; #address-cells = <2>;
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> Signed-off-by: Kevin Hilman <khilman@baylibre.com> --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)