summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos5250-spring.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-19 17:45:36 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-19 17:45:36 +0200
commitb994738bd2b38bbf60b9410bafc977858c801d7a (patch)
treebf914e418d766045b501beb019ef026d4491679b /arch/arm/boot/dts/exynos5250-spring.dts
parent71e84db1aab65ba71cb6d6d26b0f1e0d2eacc65b (diff)
parent5271d002709e8ca27232ab031f35e0df1d0fe4ed (diff)
downloadlinux-b994738bd2b38bbf60b9410bafc977858c801d7a.tar.gz
Merge tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt
Pull "Samsung DeviceTree update for v4.9, second round" from Krzysztof Kozłowski: 1. Enable HDMI on Arndale Octa board. 2. Update list of clocks for FIMC-IS block on Exynos4x12. 3. Remove skeleton.dtsi thus fixing DT compiler warning: "Node /memory has a reg or ranges property, but no unit name" This is a tree-wide effort by various people. Javier Martinez Canillas did it for Exynos and S5PV210. * tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: s5p: Add missing unit name to memory nodes for S5PV210 boards ARM: dts: s5p: Remove skeleton.dtsi inclusion for S5PV210 ARM: dts: exynos: Add missing unit name to memory nodes in Exynos5 DTS ARM: dts: exynos: Add missing unit name to memory nodes in Exynos4 DTS ARM: dts: exynos: Add missing unit name to memory nodes in Exynos3 DTS ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos5 ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos4 ARM: dts: exynos: Remove skeleton.dtsi usage for Exynos3 ARM: dts: exynos: Add missing memory node for Exynos5440 boards ARM: dts: exynos: Add all required FIMC-IS clocks to exynos4x12 ARM: dts: exynos: Enable HDMI for Arndale Octa board
Diffstat (limited to 'arch/arm/boot/dts/exynos5250-spring.dts')
-rw-r--r--arch/arm/boot/dts/exynos5250-spring.dts3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 1d52a79b2f18..103d8f94e1da 100644
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -20,7 +20,8 @@
model = "Google Spring";
compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5";
- memory {
+ memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x80000000>;
};