Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / uniphier-sld8.dtsi

diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index ebd0c3f63e7fb6bf05d8e775367e6572f8931318..71885366cd238339f1ddc03ae3010c4052806ce8 100644 (file)
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -37,7 +37,7 @@
                        clock-frequency = <25000000>;
                };
 
-               arm_timer_clk: arm_timer_clk {
+               arm_timer_clk: arm-timer {
                        #clock-cells = <0>;
                        compatible = "fixed-clock";
                        clock-frequency = <50000000>;
@@ -71,6 +71,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
+                       resets = <&peri_rst 0>;
                };
 
                serial1: serial@54006900 {
@@ -81,6 +82,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
+                       resets = <&peri_rst 1>;
                };
 
                serial2: serial@54006a00 {
@@ -91,6 +93,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
+                       resets = <&peri_rst 2>;
                };
 
                serial3: serial@54006b00 {
@@ -101,6 +104,25 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
+                       resets = <&peri_rst 3>;
+               };
+
+               gpio: gpio@55000000 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000000 0x200>;
+                       interrupt-parent = <&aidet>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pinctrl 0 0 0>,
+                                     <&pinctrl 104 0 0>,
+                                     <&pinctrl 112 0 0>;
+                       gpio-ranges-group-names = "gpio_range0",
+                                                 "gpio_range1",
+                                                 "gpio_range2";
+                       ngpios = <136>;
+                       socionext,interrupt-ranges = <0 48 13>, <14 62 2>;
                };
 
                i2c0: i2c@58400000 {
@@ -113,6 +135,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c0>;
                        clocks = <&peri_clk 4>;
+                       resets = <&peri_rst 4>;
                        clock-frequency = <100000>;
                };
 
@@ -126,6 +149,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c1>;
                        clocks = <&peri_clk 5>;
+                       resets = <&peri_rst 5>;
                        clock-frequency = <100000>;
                };
 
@@ -139,6 +163,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c2>;
                        clocks = <&peri_clk 6>;
+                       resets = <&peri_rst 6>;
                        clock-frequency = <400000>;
                };
 
@@ -152,6 +177,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c3>;
                        clocks = <&peri_clk 7>;
+                       resets = <&peri_rst 7>;
                        clock-frequency = <100000>;
                };
 
@@ -305,6 +331,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_nand2cs>;
                        clocks = <&sys_clk 2>;
+                       resets = <&sys_rst 2>;
                };
        };
 };