Fix 'simple-bus' node names to follow the defined pattern. Nodes with 'reg'
or 'ranges' addresses should also have a unit-address.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi | 2 +-
.../boot/dts/broadcom/stingray/stingray-pcie.dtsi | 2 +-
.../arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi | 2 +-
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 18 +++++++++---------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi
index 9666969c8c88..cf3cb9199ce4 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi
@@ -30,7 +30,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
- fs4: fs4 {
+ fs4: fs4-bus@67000000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi
index 663e51756746..fbb2621d1b29 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi
@@ -38,7 +38,7 @@ pcie8: pcie@60400000 {
phy-names = "pcie-phy";
};
-pcie-ss {
+pcie-ss-bus@40000000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
index 3fa9e57185b2..850988287e48 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
@@ -2,7 +2,7 @@
/*
*Copyright(c) 2018 Broadcom
*/
- usb {
+ usb-bus@68500000 {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
index 9b015b8e1bb1..f9f77b2639c5 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
+++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
@@ -199,7 +199,7 @@ hsls_25m_div2_clk: clock-12500000 {
clock-mult = <1>;
};
- scr {
+ scr-bus@61000000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -303,7 +303,7 @@ smmu: iommu@3000000 {
};
};
- crmu: crmu {
+ crmu: crmu-bus@66400000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -412,7 +412,7 @@ gpio_crmu: gpio@24800 {
#include "stingray-pcie.dtsi"
#include "stingray-usb.dtsi"
- hsls {
+ hsls-bus@68900000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -725,7 +725,7 @@ sdio1: sdhci@3f2000 {
};
};
- tmons {
+ tmons-bus@8f100000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@ -814,18 +814,18 @@ cpu-crit {
};
};
- nic-hsls {
+ nic-hsls-bus@60800000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
- ranges = <0x0 0x0 0x0 0x7fffffff>;
+ ranges = <0x0 0x0 0x60800000 0x6fffff>;
- nic_i2c0: i2c@60826100 {
+ nic_i2c0: i2c@26100 {
compatible = "brcm,iproc-nic-i2c";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x60826100 0x100>,
- <0x60e00408 0x1000>;
+ reg = <0x026100 0x100>,
+ <0x600408 0x1000>;
brcm,ape-hsls-addr-mask = <0x03400000>;
clock-frequency = <100000>;
status = "disabled";
--
2.51.0