summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-16 22:09:05 -0800
committerOlof Johansson <olof@lixom.net>2017-01-16 22:09:05 -0800
commitdcde6b16eb6fda3f6434074e08b141c3d1f93308 (patch)
tree53a899b18d44171e399fa780bd1030bb1117b8d1 /arch/arm
parente577969aee3681866fd0d3b54a2ec5e2a8005523 (diff)
parent6771e01f7965ea13988d0a5a7972f97be4e46452 (diff)
downloadlinux-dcde6b16eb6fda3f6434074e08b141c3d1f93308.tar.gz
linux-dcde6b16eb6fda3f6434074e08b141c3d1f93308.tar.bz2
linux-dcde6b16eb6fda3f6434074e08b141c3d1f93308.zip
Merge tag 'arm-soc/for-4.10/devicetree-fixes' of http://github.com/Broadcom/stblinux into fixes
This pull request contains Broadcom ARM-based SoC Device Tree fixes for v4.10, please pull the following: - Jon fixes an invalid value for the "ranges" property of the bus nodes on NorthStar Plus SoCs * tag 'arm-soc/for-4.10/devicetree-fixes' of http://github.com/Broadcom/stblinux: ARM: dts: NSP: Fix DT ranges error Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/bcm-nsp.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index b6142bda661e..15f07f9af3b3 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -160,7 +160,7 @@
axi {
compatible = "simple-bus";
- ranges = <0x00000000 0x18000000 0x0011c40a>;
+ ranges = <0x00000000 0x18000000 0x0011c40c>;
#address-cells = <1>;
#size-cells = <1>;