Merge branch 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[cascardo/linux.git] / arch / arm / boot / dts / dove.dtsi

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index cd58c2e..698d58c 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -33,6 +33,12 @@
                marvell,tauros2-cache-features = <0>;
        };
 
+       gpu-subsystem {
+               compatible = "marvell,dove-gpu-subsystem";
+               cores = <&gpu>;
+               status = "disabled";
+       };
+
        i2c-mux {
                compatible = "i2c-mux-pinctrl";
                #address-cells = <1>;
@@ -460,6 +466,12 @@
                                        #clock-cells = <1>;
                                };
 
+                               divider_clk: core-clock@0064 {
+                                       compatible = "marvell,dove-divider-clock";
+                                       reg = <0x0064 0x8>;
+                                       #clock-cells = <1>;
+                               };
+
                                pinctrl: pin-ctrl@0200 {
                                        compatible = "marvell,dove-pinctrl";
                                        reg = <0x0200 0x14>,
@@ -776,6 +788,16 @@
                                #address-cells = <1>;
                                #size-cells = <1>;
                        };
+
+                       gpu: gpu@840000 {
+                               clocks = <&divider_clk 1>;
+                               clock-names = "core";
+                               compatible = "vivante,gc";
+                               interrupts = <48>;
+                               power-domains = <&gpu_domain>;
+                               reg = <0x840000 0x4000>;
+                               status = "disabled";
+                       };
                };
        };
 };