Merge branch 'next/dt-samsung' into next/dt-samsung-new

Conflicts:
	arch/arm/boot/dts/exynos4210-origen.dts
	arch/arm/boot/dts/exynos4210.dtsi

diff --cc arch/arm/boot/dts/exynos4210-origen.dts
index d69a7999a12b0c752b979d6155b64eb1f8ad8153,c525e98f4953de2c38032f6c56e4c55793ceff80..3e68f52e8454431d90c5bd1d47de5b791ce56b2e
--- 1/arch/arm/boot/dts/exynos4210-origen.dts
--- 2/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@@ -62,96 -64,37 +64,45 @@@
  
                up {
                        label = "Up";
 -                      gpios = <&gpx2 0 0 0 2>;
 +                      gpios = <&gpx2 0 0 0x10000 2>;
                        linux,code = <103>;
+                       gpio-key,wakeup;
                };
  
                down {
                        label = "Down";
 -                      gpios = <&gpx2 1 0 0 2>;
 +                      gpios = <&gpx2 1 0 0x10000 2>;
                        linux,code = <108>;
+                       gpio-key,wakeup;
                };
  
                back {
                        label = "Back";
 -                      gpios = <&gpx1 7 0 0 2>;
 +                      gpios = <&gpx1 7 0 0x10000 2>;
                        linux,code = <158>;
+                       gpio-key,wakeup;
                };
  
                home {
                        label = "Home";
 -                      gpios = <&gpx1 6 0 0 2>;
 +                      gpios = <&gpx1 6 0 0x10000 2>;
                        linux,code = <102>;
+                       gpio-key,wakeup;
                };
  
                menu {
                        label = "Menu";
 -                      gpios = <&gpx1 5 0 0 2>;
 +                      gpios = <&gpx1 5 0 0x10000 2>;
                        linux,code = <139>;
+                       gpio-key,wakeup;
                };
        };
- 
-       keypad@100A0000 {
-               status = "disabled";
-       };
- 
-       sdhci@12520000 {
-               status = "disabled";
-       };
- 
-       sdhci@12540000 {
-               status = "disabled";
-       };
- 
-       i2c@13860000 {
-               status = "disabled";
-       };
- 
-       i2c@13870000 {
-               status = "disabled";
-       };
- 
-       i2c@13880000 {
-               status = "disabled";
-       };
- 
-       i2c@13890000 {
-               status = "disabled";
-       };
- 
-       i2c@138A0000 {
-               status = "disabled";
-       };
- 
-       i2c@138B0000 {
-               status = "disabled";
-       };
- 
-       i2c@138C0000 {
-               status = "disabled";
-       };
- 
-       i2c@138D0000 {
-               status = "disabled";
-       };
- 
-       spi_0: spi@13920000 {
-               status = "disabled";
-       };
- 
-       spi_1: spi@13930000 {
-               status = "disabled";
-       };
- 
-       spi_2: spi@13940000 {
-               status = "disabled";
-       };
 +
 +      leds {
 +              compatible = "gpio-leds";
 +              status {
 +                      gpios = <&gpx1 3 0 0x10000 2>;
 +                      linux,default-trigger = "heartbeat";
 +              };
 +      };
  };

diff --cc arch/arm/boot/dts/exynos4210.dtsi
index a4bd0c9a206eb52b0e673981080f2a6bbba2fd48,c71db9ccf0cdc848818334d33ff2e2c1240051cc..214c557eda7f7119584df481bde074c43a3611d4
--- 1/arch/arm/boot/dts/exynos4210.dtsi
--- 2/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@@ -19,28 -19,13 +19,20 @@@
   * published by the Free Software Foundation.
  */
  
- /include/ "skeleton.dtsi"
+ /include/ "exynos4.dtsi"
 +/include/ "exynos4210-pinctrl.dtsi"
  
  / {
        compatible = "samsung,exynos4210";
-       interrupt-parent = <&gic>;
  
-               spi0 = &spi_0;
-               spi1 = &spi_1;
-               spi2 = &spi_2;
 +      aliases {
 +              pinctrl0 = &pinctrl_0;
 +              pinctrl1 = &pinctrl_1;
 +              pinctrl2 = &pinctrl_2;
 +      };
 +
        gic:interrupt-controller@10490000 {
-               compatible = "arm,cortex-a9-gic";
-               #interrupt-cells = <3>;
-               interrupt-controller;
                cpu-offset = <0x8000>;
-               reg = <0x10490000 0x1000>, <0x10480000 0x100>;
        };
  
        combiner:interrupt-controller@10440000 {
@@@ -54,203 -35,6 +42,39 @@@
                             <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>;
        };
  
-                                       <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>,
-                                       <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,
-                                       <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>,
-                                       <0 32 0>;
 +      pinctrl_0: pinctrl@11400000 {
 +              compatible = "samsung,pinctrl-exynos4210";
 +              reg = <0x11400000 0x1000>;
 +              interrupts = <0 47 0>;
 +              interrupt-controller;
 +              #interrupt-cells = <2>;
 +      };
 +
 +      pinctrl_1: pinctrl@11000000 {
 +              compatible = "samsung,pinctrl-exynos4210";
 +              reg = <0x11000000 0x1000>;
 +              interrupts = <0 46 0>;
 +              interrupt-controller;
 +              #interrupt-cells = <2>;
 +
 +              wakup_eint: wakeup-interrupt-controller {
 +                      compatible = "samsung,exynos4210-wakeup-eint";
 +                      interrupt-parent = <&gic>;
 +                      interrupt-controller;
 +                      #interrupt-cells = <2>;
 +                      interrupts = <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>,
-       watchdog@10060000 {
-               compatible = "samsung,s3c2410-wdt";
-               reg = <0x10060000 0x100>;
-               interrupts = <0 43 0>;
-       };
- 
-       rtc@10070000 {
-               compatible = "samsung,s3c6410-rtc";
-               reg = <0x10070000 0x100>;
-               interrupts = <0 44 0>, <0 45 0>;
-       };
- 
-       keypad@100A0000 {
-               compatible = "samsung,s5pv210-keypad";
-               reg = <0x100A0000 0x100>;
-               interrupts = <0 109 0>;
-       };
- 
-       sdhci@12510000 {
-               compatible = "samsung,exynos4210-sdhci";
-               reg = <0x12510000 0x100>;
-               interrupts = <0 73 0>;
-       };
- 
-       sdhci@12520000 {
-               compatible = "samsung,exynos4210-sdhci";
-               reg = <0x12520000 0x100>;
-               interrupts = <0 74 0>;
-       };
- 
-       sdhci@12530000 {
-               compatible = "samsung,exynos4210-sdhci";
-               reg = <0x12530000 0x100>;
-               interrupts = <0 75 0>;
-       };
- 
-       sdhci@12540000 {
-               compatible = "samsung,exynos4210-sdhci";
-               reg = <0x12540000 0x100>;
-               interrupts = <0 76 0>;
-       };
- 
-       serial@13800000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x13800000 0x100>;
-               interrupts = <0 52 0>;
-       };
- 
-       serial@13810000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x13810000 0x100>;
-               interrupts = <0 53 0>;
-       };
- 
-       serial@13820000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x13820000 0x100>;
-               interrupts = <0 54 0>;
-       };
- 
-       serial@13830000 {
-               compatible = "samsung,exynos4210-uart";
-               reg = <0x13830000 0x100>;
-               interrupts = <0 55 0>;
-       };
- 
-       i2c@13860000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x13860000 0x100>;
-               interrupts = <0 58 0>;
-       };
- 
-       i2c@13870000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x13870000 0x100>;
-               interrupts = <0 59 0>;
-       };
- 
-       i2c@13880000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x13880000 0x100>;
-               interrupts = <0 60 0>;
-       };
- 
-       i2c@13890000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x13890000 0x100>;
-               interrupts = <0 61 0>;
-       };
- 
-       i2c@138A0000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x138A0000 0x100>;
-               interrupts = <0 62 0>;
-       };
- 
-       i2c@138B0000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x138B0000 0x100>;
-               interrupts = <0 63 0>;
-       };
- 
-       i2c@138C0000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x138C0000 0x100>;
-               interrupts = <0 64 0>;
-       };
- 
-       i2c@138D0000 {
-               compatible = "samsung,s3c2440-i2c";
-               reg = <0x138D0000 0x100>;
-               interrupts = <0 65 0>;
-       };
- 
-       spi_0: spi@13920000 {
-               compatible = "samsung,exynos4210-spi";
-               reg = <0x13920000 0x100>;
-               interrupts = <0 66 0>;
-               tx-dma-channel = <&pdma0 7>; /* preliminary */
-               rx-dma-channel = <&pdma0 6>; /* preliminary */
-               #address-cells = <1>;
-               #size-cells = <0>;
-       };
- 
-       spi_1: spi@13930000 {
-               compatible = "samsung,exynos4210-spi";
-               reg = <0x13930000 0x100>;
-               interrupts = <0 67 0>;
-               tx-dma-channel = <&pdma1 7>; /* preliminary */
-               rx-dma-channel = <&pdma1 6>; /* preliminary */
-               #address-cells = <1>;
-               #size-cells = <0>;
-       };
- 
-       spi_2: spi@13940000 {
-               compatible = "samsung,exynos4210-spi";
-               reg = <0x13940000 0x100>;
-               interrupts = <0 68 0>;
-               tx-dma-channel = <&pdma0 9>; /* preliminary */
-               rx-dma-channel = <&pdma0 8>; /* preliminary */
-               #address-cells = <1>;
-               #size-cells = <0>;
-       };
- 
-       amba {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "arm,amba-bus";
-               interrupt-parent = <&gic>;
-               ranges;
- 
-               pdma0: pdma@12680000 {
-                       compatible = "arm,pl330", "arm,primecell";
-                       reg = <0x12680000 0x1000>;
-                       interrupts = <0 35 0>;
-               };
- 
-               pdma1: pdma@12690000 {
-                       compatible = "arm,pl330", "arm,primecell";
-                       reg = <0x12690000 0x1000>;
-                       interrupts = <0 36 0>;
-               };
-       };
- 
++                                   <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>,
++                                   <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,
++                                   <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>,
++                                   <0 32 0>;
 +              };
 +      };
 +
 +      pinctrl_2: pinctrl@03860000 {
 +              compatible = "samsung,pinctrl-exynos4210";
 +              reg = <0x03860000 0x1000>;
 +      };
 +
        gpio-controllers {
                #address-cells = <1>;
                #size-cells = <1>;