aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/arm/samsung.txt9
-rwxr-xr-xarch/arm/boot/dts/exynos4-smdkv310.dts24
-rw-r--r--arch/arm/mach-exynos4/mach-smdkv310.c2
3 files changed, 12 insertions, 23 deletions
diff --git a/Documentation/devicetree/bindings/arm/samsung.txt b/Documentation/devicetree/bindings/arm/samsung.txt
new file mode 100644
index 00000000000..594cb97e3d8
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/samsung.txt
@@ -0,0 +1,9 @@
+Samsung Exynos4 S5PV310 SoC based SMDKV310 eval board
+
+ SMDKV310 eval board is based on S5PV310 SoC which belongs to
+ Samsung's Exynos4 family of application processors.
+
+Required root node properties:
+ - compatible = "samsung,smdkv310","samsung,s5pv310"
+ (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
+ (b) "samsung,s5pv310" - for boards based on S5PV310 SoC.
diff --git a/arch/arm/boot/dts/exynos4-smdkv310.dts b/arch/arm/boot/dts/exynos4-smdkv310.dts
index 9f276645e69..dd6c80a7ffc 100755
--- a/arch/arm/boot/dts/exynos4-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4-smdkv310.dts
@@ -1,31 +1,11 @@
/dts-v1/;
+/include/ "skeleton.dtsi"
/ {
model = "Samsung Exynos4 SMDKV310 eval board";
- compatible = "samsung,smdkv310","samsung,s5pv310";
- #address-cells = <1>;
- #size-cells = <1>;
-
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu@0{
- compatible = "arm,cortex-a9";
- reg = <0x0>;
- };
-
- cpu@1 {
- compatible = "arm,cortex-a9";
- reg = <0x1>;
- };
- };
+ compatible = "samsung,smdkv310", "samsung,s5pv310";
memory {
- device_type = "memory";
reg = <0x40000000 0x08000000>;
};
-
- chosen {
- };
};
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c
index 7e0efc0f647..08bcc557458 100644
--- a/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@ -237,7 +237,7 @@ static void __init smdkv310_machine_init(void)
platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
}
-static char const *smdkv310_dt_compat[] = {
+static char const *smdkv310_dt_compat[] __initdata = {
"samsung,smdkv310",
NULL
};