Skip to content

Commit ed9c2b2

Browse files
robherringgclement
authored andcommitted
arm64: dts: marvell: Use preferred node names for "simple-bus"
The "simple-bus" binding has preferred node names such as "bus", ".*-bus", or "soc". Rename the Marvell platforms to use these names. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent b463620 commit ed9c2b2

7 files changed

Lines changed: 8 additions & 10 deletions

File tree

arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
#size-cells = <2>;
7979
ranges;
8080

81-
internal-regs@7f000000 {
81+
bus@7f000000 {
8282
#address-cells = <1>;
8383
#size-cells = <1>;
8484
compatible = "simple-bus";

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
#size-cells = <2>;
7777
ranges;
7878

79-
internal-regs@d0000000 {
79+
bus@d0000000 {
8080
#address-cells = <1>;
8181
#size-cells = <1>;
8282
compatible = "simple-bus";

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* Device Tree file for Marvell Armada AP806.
66
*/
77

8-
#define AP_NAME ap806
98
#include "armada-ap80x.dtsi"
109

1110
&ap_syscon0 {

arch/arm64/boot/dts/marvell/armada-ap807.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* Copyright (C) 2019 Marvell Technology Group Ltd.
66
*/
77

8-
#define AP_NAME ap807
98
#include "armada-ap80x.dtsi"
109

1110
&ap_syscon0 {

arch/arm64/boot/dts/marvell/armada-ap80x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@
6363
interrupts = <17>;
6464
};
6565

66-
AP_NAME {
66+
soc {
6767
#address-cells = <2>;
6868
#size-cells = <2>;
6969
compatible = "simple-bus";
7070
interrupt-parent = <&gic>;
7171
ranges;
7272

73-
config-space@f0000000 {
73+
bus@f0000000 {
7474
#address-cells = <1>;
7575
#size-cells = <1>;
7676
compatible = "simple-bus";

arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
3333
};
3434

35-
ap810-ap0 {
35+
soc {
3636
#address-cells = <2>;
3737
#size-cells = <2>;
3838
compatible = "simple-bus";
3939
ranges;
4040

41-
config-space@e8000000 {
41+
bus@e8000000 {
4242
#address-cells = <1>;
4343
#size-cells = <1>;
4444
compatible = "simple-bus";

arch/arm64/boot/dts/marvell/armada-cp11x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* The contents of the node are defined below, in order to
1818
* save one indentation level
1919
*/
20-
CP11X_NAME: CP11X_NAME { };
20+
CP11X_NAME: CP11X_NODE_NAME(bus) { };
2121

2222
/*
2323
* CPs only have one sensor in the thermal IC.
@@ -51,7 +51,7 @@
5151
interrupt-parent = <&CP11X_LABEL(icu_nsr)>;
5252
ranges;
5353

54-
config-space@CP11X_BASE {
54+
bus@CP11X_BASE {
5555
#address-cells = <1>;
5656
#size-cells = <1>;
5757
compatible = "simple-bus";

0 commit comments

Comments
 (0)