summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/bcm283x.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-03-01 01:26:21 +0300
committerArnd Bergmann <arnd@arndb.de>2018-03-01 01:26:21 +0300
commitc98e140ff5a284079226dc7c53ed8b81d1fded7f (patch)
treeed132f6326552f272eccdf06b3cd3c9fcf623783 /arch/arm/boot/dts/bcm283x.dtsi
parent20f4ed3ae5c1a2dfedfafc993e8974b4855e2d13 (diff)
parent2944866ac5b37e24ce1e646d2aaf472148e4a43e (diff)
downloadlinux-c98e140ff5a284079226dc7c53ed8b81d1fded7f.tar.xz
Merge tag 'arm-soc/for-4.16/devicetree-fixes' of https://github.com/Broadcom/stblinux into fixes
Pull "Broadcom devicetree fixes for 4.16" from Florian Fainelli: This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 4.16, please pull the following: - Mathieu fixes leading 0x and 0's from bindings and Device Tree source files, he has done this treewide and most of his changes are already in 4.16 - Stefan provides two changes to the BCM283x DTS files in order to fix DTC warnings - Florian fixes the amount of RAM on the BCM958625HR reference board to properly limit to what is initialized by the bootloader * tag 'arm-soc/for-4.16/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: bcm283x: Move arm-pmu out of soc node ARM: dts: bcm283x: Fix unit address of local_intc ARM: dts: NSP: Fix amount of RAM on BCM958625HR ARM: BCM: dts: Remove leading 0x and 0s from bindings notation
Diffstat (limited to 'arch/arm/boot/dts/bcm283x.dtsi')
-rw-r--r--arch/arm/boot/dts/bcm283x.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 18db25a5a66e..9d293decf8d3 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -465,7 +465,7 @@
status = "disabled";
};
- aux: aux@0x7e215000 {
+ aux: aux@7e215000 {
compatible = "brcm,bcm2835-aux";
#clock-cells = <1>;
reg = <0x7e215000 0x8>;