Merge tag 'samsung-dt-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...

[cascardo/linux.git] / arch / arm / boot / dts / exynos5410-smdk5410.dts

diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index a731fbe..5e36bdd 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -16,7 +16,8 @@
        model = "Samsung SMDK5410 board based on EXYNOS5410";
        compatible = "samsung,smdk5410", "samsung,exynos5410", "samsung,exynos5";
 
-       memory {
+       memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 
@@ -97,19 +98,19 @@
                smsc,irq-push-pull;
                smsc,force-internal-phy;
 
-               samsung,srom-page-mode = <1>;
+               samsung,srom-page-mode;
                samsung,srom-timing = <9 12 1 9 1 1>;
        };
 };
 
-&uart0 {
+&serial_0 {
        status = "okay";
 };
 
-&uart1 {
+&serial_1 {
        status = "okay";
 };
 
-&uart2 {
+&serial_2 {
        status = "okay";
 };