Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'

[linux-2.6-microblaze.git] / arch / arm / boot / dts / aspeed-g6.dtsi

diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index f96607b..1b47be1 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -377,6 +377,34 @@
                                #interrupt-cells = <2>;
                        };
 
+                       sgpiom0: sgpiom@1e780500 {
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               compatible = "aspeed,ast2600-sgpiom";
+                               reg = <0x1e780500 0x100>;
+                               interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&syscon ASPEED_CLK_APB2>;
+                               interrupt-controller;
+                               bus-frequency = <12000000>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_sgpm1_default>;
+                               status = "disabled";
+                       };
+
+                       sgpiom1: sgpiom@1e780600 {
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               compatible = "aspeed,ast2600-sgpiom";
+                               reg = <0x1e780600 0x100>;
+                               interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&syscon ASPEED_CLK_APB2>;
+                               interrupt-controller;
+                               bus-frequency = <12000000>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_sgpm2_default>;
+                               status = "disabled";
+                       };
+
                        gpio1: gpio@1e780800 {
                                #gpio-cells = <2>;
                                gpio-controller;