Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-ariag25.dts

diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index dbfefef2869de13eb62c95ba738daa94c537e753..713d18f8035687cc043e05349cdaffb1bc9ae6c0 100644 (file)
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -22,7 +22,7 @@
                bootargs = "console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait";
        };
 
-       memory {
+       memory@20000000 {
                /* 128 MB, change this for 256 MB revision */
                reg = <0x20000000 0x8000000>;
        };
@@ -93,6 +93,7 @@
        pinctrl-0 = <
                &pinctrl_mmc0_slot0_clk_cmd_dat0
                &pinctrl_mmc0_slot0_dat1_3>;
+       pinctrl-names = "default";
        status = "okay";
 
        slot@0 {