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

[linux-beck.git] / arch / arm / boot / dts / exynos4210.dtsi

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index c71db9ccf0cdc848818334d33ff2e2c1240051cc..214c557eda7f7119584df481bde074c43a3611d4 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -20,10 +20,17 @@
 */
 
 /include/ "exynos4.dtsi"
+/include/ "exynos4210-pinctrl.dtsi"
 
 / {
        compatible = "samsung,exynos4210";
 
+       aliases {
+               pinctrl0 = &pinctrl_0;
+               pinctrl1 = &pinctrl_1;
+               pinctrl2 = &pinctrl_2;
+       };
+
        gic:interrupt-controller@10490000 {
                cpu-offset = <0x8000>;
        };
@@ -35,6 +42,39 @@
                             <0 12 0>, <0 13 0>, <0 14 0>, <0 15 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>,
+                                    <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>;