summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2021-12-03 00:15:27 +0100
committerFlorian Fainelli <f.fainelli@gmail.com>2021-12-19 19:48:33 +0100
commitd2b820bb16c509b313b87f616dcf6aa612d01fb9 (patch)
tree491bbd9fcd4d8f769b90b045c81c128edb4c65ab /arch/arm
parentARM: dts: Cygnus: Update PCIe PHY node unit name(s) (diff)
downloadlinux-d2b820bb16c509b313b87f616dcf6aa612d01fb9.tar.xz
linux-d2b820bb16c509b313b87f616dcf6aa612d01fb9.zip
ARM: dts: HR2: Fixed iProc PCIe MSI sub-node
Rename the msi controller unit name to 'msi' to avoid collisions with the 'msi-controller' boolean property. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/bcm-hr2.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/bcm-hr2.dtsi b/arch/arm/boot/dts/bcm-hr2.dtsi
index 84cda16f68a2..33e6ba63a1ee 100644
--- a/arch/arm/boot/dts/bcm-hr2.dtsi
+++ b/arch/arm/boot/dts/bcm-hr2.dtsi
@@ -318,7 +318,7 @@
status = "disabled";
msi-parent = <&msi0>;
- msi0: msi-controller {
+ msi0: msi {
compatible = "brcm,iproc-msi";
msi-controller;
interrupt-parent = <&gic>;
@@ -354,7 +354,7 @@
status = "disabled";
msi-parent = <&msi1>;
- msi1: msi-controller {
+ msi1: msi {
compatible = "brcm,iproc-msi";
msi-controller;
interrupt-parent = <&gic>;