summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-06-25 04:15:53 -0700
committerOlof Johansson <olof@lixom.net>2019-06-25 04:15:53 -0700
commit98d70a5cd929081e605b2983550a893d6540e955 (patch)
tree2a8cf743663b94f3c675d513c79137ac824a95e3 /arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
parent4ed7e4e57822d01d887d3eec7e10d8e50c39dd43 (diff)
parentdfa84bb99285b4335e5b2a23b772991362e47ee6 (diff)
Merge tag 'arm-soc/for-5.3/devicetree-v2' of https://github.com/Broadcom/stblinux into arm/dt
This pull request contain Broadcom ARM-based SoCs Device Tree changes for 5.3 please pull the following: - Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI controller - Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files and provides a fix for devices failing to boot after the removal of skelton.dtsi (that commit has been submitted as a separate fix) * tag 'arm-soc/for-5.3/devicetree-v2' of https://github.com/Broadcom/stblinux: ARM: dts: BCM5301X: Fix most DTC W=1 warnings ARM: dts: NSP: Fix the bulk of W=1 DTC warnings ARM: dts: BCM63xx: Fix DTC W=1 warnings ARM: dts: BCM53573: Fix DTC W=1 warnings ARM: dts: bcm-mobile: Fix most DTC W=1 warnings ARM: dts: Cygnus: Fix most DTC W=1 warnings ARM: dts: Fix BCM7445 DTC warnings ARM: bcm283x: Enable DMA support for SPI controller ARM: dts: bcm: Add missing device_type = "memory" property Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts')
-rw-r--r--arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
index 79d454ff3be4..6a96655d8626 100644
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
@@ -19,7 +19,8 @@
bootargs = "console=ttyS0,115200";
};
- memory {
+ memory@0 {
+ device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
};
@@ -68,8 +69,6 @@
gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
- #size-cells = <0>;
rfkill {
label = "WiFi";