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 6b898c2ed8ee3563e110fb936a112a0239ac27e6..ca4f3712dad30153e25d360abcbde99f423f0551 100644 (file)
--- a/arch/arm/dts/exynos4x12.dtsi
+++ b/arch/arm/dts/exynos4x12.dtsi
@@ -19,6 +19,7 @@
 
 #include "exynos4.dtsi"
 #include "exynos4x12-pinctrl.dtsi"
+#include "exynos4x12-pinctrl-uboot.dtsi"
 
 / {
        aliases {
@@ -26,9 +27,6 @@
                pinctrl1 = &pinctrl_1;
                pinctrl2 = &pinctrl_2;
                pinctrl3 = &pinctrl_3;
-               fimc-lite0 = &fimc_lite_0;
-               fimc-lite1 = &fimc_lite_1;
-               mshc0 = &mshc_0;
        };
 
        pd_isp: isp-power-domain@10023CA0 {
@@ -65,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 {
@@ -90,125 +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";
        };
-
-       camera {
-               clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>;
-               clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               fimc_0: fimc@11800000 {
-                       compatible = "samsung,exynos4212-fimc";
-                       samsung,pix-limits = <4224 8192 1920 4224>;
-                       samsung,mainscaler-ext;
-                       samsung,isp-wb;
-                       samsung,cam-if;
-               };
-
-               fimc_1: fimc@11810000 {
-                       compatible = "samsung,exynos4212-fimc";
-                       samsung,pix-limits = <4224 8192 1920 4224>;
-                       samsung,mainscaler-ext;
-                       samsung,isp-wb;
-                       samsung,cam-if;
-               };
-
-               fimc_2: fimc@11820000 {
-                       compatible = "samsung,exynos4212-fimc";
-                       samsung,pix-limits = <4224 8192 1920 4224>;
-                       samsung,mainscaler-ext;
-                       samsung,isp-wb;
-                       samsung,lcd-wb;
-                       samsung,cam-if;
-               };
-
-               fimc_3: fimc@11830000 {
-                       compatible = "samsung,exynos4212-fimc";
-                       samsung,pix-limits = <1920 8192 1366 1920>;
-                       samsung,rotators = <0>;
-                       samsung,mainscaler-ext;
-                       samsung,isp-wb;
-                       samsung,lcd-wb;
-               };
-
-               fimc_lite_0: fimc-lite@12390000 {
-                       compatible = "samsung,exynos4212-fimc-lite";
-                       reg = <0x12390000 0x1000>;
-                       interrupts = <0 105 0>;
-                       samsung,power-domain = <&pd_isp>;
-                       clocks = <&clock 353>;
-                       clock-names = "flite";
-                       status = "disabled";
-               };
-
-               fimc_lite_1: fimc-lite@123A0000 {
-                       compatible = "samsung,exynos4212-fimc-lite";
-                       reg = <0x123A0000 0x1000>;
-                       interrupts = <0 106 0>;
-                       samsung,power-domain = <&pd_isp>;
-                       clocks = <&clock 354>;
-                       clock-names = "flite";
-                       status = "disabled";
-               };
-
-               fimc_is: fimc-is@12000000 {
-                       compatible = "samsung,exynos4212-fimc-is", "simple-bus";
-                       reg = <0x12000000 0x260000>;
-                       interrupts = <0 90 0>, <0 95 0>;
-                       samsung,power-domain = <&pd_isp>;
-                       clocks = <&clock 353>, <&clock 354>, <&clock 355>,
-                               <&clock 356>, <&clock 17>, <&clock 357>,
-                               <&clock 358>, <&clock 359>, <&clock 360>,
-                               <&clock 450>,<&clock 451>, <&clock 452>,
-                               <&clock 453>, <&clock 176>, <&clock 13>,
-                               <&clock 454>, <&clock 395>, <&clock 455>;
-                       clock-names = "lite0", "lite1", "ppmuispx",
-                                     "ppmuispmx", "mpll", "isp",
-                                     "drc", "fd", "mcuisp",
-                                     "ispdiv0", "ispdiv1", "mcuispdiv0",
-                                     "mcuispdiv1", "uart", "aclk200",
-                                     "div_aclk200", "aclk400mcuisp",
-                                     "div_aclk400mcuisp";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       status = "disabled";
-
-                       pmu {
-                               reg = <0x10020000 0x3000>;
-                       };
-
-                       i2c1_isp: i2c-isp@12140000 {
-                               compatible = "samsung,exynos4212-i2c-isp";
-                               reg = <0x12140000 0x100>;
-                               clocks = <&clock 370>;
-                               clock-names = "i2c_isp";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                       };
-               };
-       };
-
-       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";
-       };
 };