summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos5250-smdk5250.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-29 05:03:39 +0400
committerArnd Bergmann <arnd@arndb.de>2014-03-29 05:03:39 +0400
commit9e0c42ea3d2c8e24e6ad27a6d749b3085f1a2430 (patch)
tree21b276e3d14bcdfe9049d8bbd8ba17b9523b0c31 /arch/arm/boot/dts/exynos5250-smdk5250.dts
parent2c793fa3493d4e7b7f6cc3392458ef9d94884dac (diff)
parent602408e3de70d132c115670a366f4c5ae657080c (diff)
downloadlinux-9e0c42ea3d2c8e24e6ad27a6d749b3085f1a2430.tar.xz
Merge tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3
Merge "Exynos cleanup for v3.15" from Kukjin Kim: - reorganize code for - add support reserve memory for mfc-v7 - consolidate exynos4 and exynos5 machine codes - add generic compatible strings for exynos4 and exynos5 - update DT with generic compatible strings - move clk related dt-binding header file in dt-bindings/clock * tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock ARM: dts: Update Exynos DT files with generic compatible strings ARM: EXYNOS: Add generic compatible strings ARM: EXYNOS: Consolidate exynos4 and exynos5 machine files ARM: EXYNOS: Consolidate CPU init code ARM: SAMSUNG: Introduce generic Exynos4 and 5 helpers ARM: EXYNOS: Add support to reserve memory for MFC-v7 ARM: SAMSUNG: Reorganize calls to reserve memory for MFC Conflicts: arch/arm/mach-exynos/exynos.c Signed-off-by; Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/exynos5250-smdk5250.dts')
-rw-r--r--arch/arm/boot/dts/exynos5250-smdk5250.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 140de8563e94..a794a705d404 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -14,7 +14,7 @@
/ {
model = "SAMSUNG SMDK5250 board based on EXYNOS5250";
- compatible = "samsung,smdk5250", "samsung,exynos5250";
+ compatible = "samsung,smdk5250", "samsung,exynos5250", "samsung,exynos5";
aliases {
};