Merge git://git.denx.de/u-boot-marvell

[oweals/u-boot.git] / arch / arm / dts / exynos4x12.dtsi

diff --git a/arch/arm/dts/exynos4x12.dtsi b/arch/arm/dts/exynos4x12.dtsi
index 5d58c6eedcf86a69fcd139bd7cacace0b0136ef2..ca4f3712dad30153e25d360abcbde99f423f0551 100644 (file)
--- a/arch/arm/dts/exynos4x12.dtsi
+++ b/arch/arm/dts/exynos4x12.dtsi
@@ -27,7 +27,6 @@
                pinctrl1 = &pinctrl_1;
                pinctrl2 = &pinctrl_2;
                pinctrl3 = &pinctrl_3;
-               mshc0 = &mshc_0;
        };
 
        pd_isp: isp-power-domain@10023CA0 {
@@ -64,12 +63,14 @@
        pinctrl_0: pinctrl@11400000 {
                compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x11400000 0x1000>;
+               interrupt-parent = <&gic>;
                interrupts = <0 47 0>;
        };
 
        pinctrl_1: pinctrl@11000000 {
                compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x11000000 0x1000>;
+               interrupt-parent = <&gic>;
                interrupts = <0 46 0>;
 
                wakup_eint: wakeup-interrupt-controller {
@@ -89,27 +90,17 @@
        pinctrl_3: pinctrl@106E0000 {
                compatible = "samsung,exynos4x12-pinctrl";
                reg = <0x106E0000 0x1000>;
+               interrupt-parent = <&gic>;
                interrupts = <0 72 0>;
        };
 
        g2d@10800000 {
                compatible = "samsung,exynos4212-g2d";
                reg = <0x10800000 0x1000>;
+               interrupt-parent = <&gic>;
                interrupts = <0 89 0>;
                clocks = <&clock 177>, <&clock 277>;
                clock-names = "sclk_fimg2d", "fimg2d";
                status = "disabled";
        };
-
-       mshc_0: mmc@12550000 {
-               compatible = "samsung,exynos4412-dw-mshc";
-               reg = <0x12550000 0x1000>;
-               interrupts = <0 77 0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               fifo-depth = <0x80>;
-               clocks = <&clock 301>, <&clock 149>;
-               clock-names = "biu", "ciu";
-               status = "disabled";
-       };
 };