ARM: dts: exynos: replace mshc0 alias with mmc-ddr-1_8v property

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4412-p4note.dtsi

diff --git a/arch/arm/boot/dts/exynos4412-p4note.dtsi b/arch/arm/boot/dts/exynos4412-p4note.dtsi
index 3e05a49..9052b3e 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-p4note.dtsi
+++ b/arch/arm/boot/dts/exynos4412-p4note.dtsi
@@ -188,14 +188,12 @@
                        pinctrl-names = "default";
                        interrupt-parent = <&gpx0>;
                        interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
-                       interrupt-controller;
-                       irq-trigger = <0x1>;
                        st,adc-freq = <3>;
                        st,mod-12b = <1>;
                        st,ref-sel = <0>;
                        st,sample-time = <3>;
 
-                       stmpe_adc {
+                       adc {
                                compatible = "st,stmpe-adc";
                                #io-channel-cells = <1>;
                                st,norequest-mask = <0x2f>;
@@ -695,6 +693,7 @@
        samsung,dw-mshc-ciu-div = <0>;
        samsung,dw-mshc-sdr-timing = <2 3>;
        samsung,dw-mshc-ddr-timing = <1 2>;
+       mmc-ddr-1_8v;
        pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
        pinctrl-names = "default";
        bus-width = <4>;