diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 18:45:36 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 18:45:36 +0300 |
| commit | b994738bd2b38bbf60b9410bafc977858c801d7a (patch) | |
| tree | bf914e418d766045b501beb019ef026d4491679b /arch/arm/boot/dts/exynos4412-odroidx2.dts | |
| parent | 71e84db1aab65ba71cb6d6d26b0f1e0d2eacc65b (diff) | |
| parent | 5271d002709e8ca27232ab031f35e0df1d0fe4ed (diff) | |
| download | linux-b994738bd2b38bbf60b9410bafc977858c801d7a.tar.xz | |
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/exynos4412-odroidx2.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-odroidx2.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts index 3e3584270e00..4d228858f172 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx2.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts @@ -17,7 +17,8 @@ model = "Hardkernel ODROID-X2 board based on Exynos4412"; compatible = "hardkernel,odroid-x2", "samsung,exynos4412", "samsung,exynos4"; - memory { + memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x7FF00000>; }; }; |