3 files changed, 121 insertions, 0 deletions

diff --git a/arch/arm64/boot/dts/actions/s700-cubieboard7.dts b/arch/arm64/boot/dts/actions/s700-cubieboard7.dts
index 28f3f4a0f7f0..63e375cd9eb4 100644
--- a/arch/arm64/boot/dts/actions/s700-cubieboard7.dts
+++ b/arch/arm64/boot/dts/actions/s700-cubieboard7.dts
@@ -30,6 +30,59 @@
         };
 };
 
+&i2c0 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_default>;
+};
+
+&i2c1 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_default>;
+};
+
+&i2c2 {
+        status = "disabled";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_default>;
+};
+
+&pinctrl {
+        i2c0_default: i2c0_default {
+                pinmux {
+                        groups = "i2c0_mfp";
+                        function = "i2c0";
+                };
+                pinconf {
+                        pins = "i2c0_sclk", "i2c0_sdata";
+                        bias-pull-up;
+                };
+        };
+
+        i2c1_default: i2c1_default {
+                pinmux {
+                        groups = "i2c1_dummy";
+                        function = "i2c1";
+                };
+                pinconf {
+                        pins = "i2c1_sclk", "i2c1_sdata";
+                        bias-pull-up;
+                };
+        };
+
+        i2c2_default: i2c2_default {
+                pinmux {
+                        groups = "i2c2_dummy";
+                        function = "i2c2";
+                };
+                pinconf {
+                        pins = "i2c2_sclk", "i2c2_sdata";
+                        bias-pull-up;
+                };
+        };
+};
+
 &timer {
         clocks = <&hosc>;
 };
diff --git a/arch/arm64/boot/dts/actions/s700.dtsi b/arch/arm64/boot/dts/actions/s700.dtsi
index 273a1b169efc..2006ad5424fa 100644
--- a/arch/arm64/boot/dts/actions/s700.dtsi
+++ b/arch/arm64/boot/dts/actions/s700.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/clock/actions,s700-cmu.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/actions,s700-reset.h>
 
 / {
         compatible = "actions,s700";
@@ -172,6 +173,47 @@
                         reg = <0x0 0xe0168000 0x0 0x1000>;
                         clocks = <&hosc>, <&losc>;
                         #clock-cells = <1>;
+                        #reset-cells = <1>;
+                };
+
+                i2c0: i2c@e0170000 {
+                        compatible = "actions,s700-i2c";
+                        reg = <0 0xe0170000 0 0x1000>;
+                        clocks = <&cmu CLK_I2C0>;
+                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c1: i2c@e0174000 {
+                        compatible = "actions,s700-i2c";
+                        reg = <0 0xe0174000 0 0x1000>;
+                        clocks = <&cmu CLK_I2C1>;
+                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c2: i2c@e0178000 {
+                        compatible = "actions,s700-i2c";
+                        reg = <0 0xe0178000 0 0x1000>;
+                        clocks = <&cmu CLK_I2C2>;
+                        interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c3: i2c@e017c000 {
+                        compatible = "actions,s700-i2c";
+                        reg = <0 0xe017c000 0 0x1000>;
+                        clocks = <&cmu CLK_I2C3>;
+                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
                 };
 
                 sps: power-controller@e01b0100 {
@@ -186,5 +228,21 @@
                         interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
                         interrupt-names = "timer1";
                 };
+
+                pinctrl: pinctrl@e01b0000 {
+                        compatible = "actions,s700-pinctrl";
+                        reg = <0x0 0xe01b0000 0x0 0x1000>;
+                        clocks = <&cmu CLK_GPIO>;
+                        gpio-controller;
+                        gpio-ranges = <&pinctrl 0 0 136>;
+                        #gpio-cells = <2>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+                };
         };
 };
diff --git a/arch/arm64/boot/dts/actions/s900.dtsi b/arch/arm64/boot/dts/actions/s900.dtsi
index 9e75782b438f..df3a68a3ac97 100644
--- a/arch/arm64/boot/dts/actions/s900.dtsi
+++ b/arch/arm64/boot/dts/actions/s900.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/clock/actions,s900-cmu.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/actions,s900-reset.h>
 
 / {
         compatible = "actions,s900";
@@ -184,6 +185,7 @@
                         reg = <0x0 0xe0160000 0x0 0x1000>;
                         clocks = <&hosc>, <&losc>;
                         #clock-cells = <1>;
+                        #reset-cells = <1>;
                 };
 
                 i2c0: i2c@e0170000 {
@@ -253,6 +255,14 @@
                         gpio-controller;
                         gpio-ranges = <&pinctrl 0 0 146>;
                         #gpio-cells = <2>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
                 };
 
                 timer: timer@e0228000 {