From cdfa30f39d5d514e3dfc7df630a6e2e8f947193b Mon Sep 17 00:00:00 2001
From: xxm <xxm@rock-chips.com>
Date: Tue, 1 Jul 2014 15:26:15 +0800
Subject: [PATCH] rockchip:mali400:1,update rk3036.dtsi with mali400 2,update
 mali400 build config

---
 arch/arm/boot/dts/rk3036.dtsi | 9 +++++++++
 drivers/gpu/arm/Kbuild        | 1 +
 drivers/video/Kconfig         | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 0725b12648a6..4b0c46ed4ba4 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -306,4 +306,13 @@
 		fifo-depth = <0x100>;
 		bus-width = <4>;
 	};
+	gpu {
+		      compatible = "arm,mali400";
+		      reg = <0x10090000 0x10000>;
+	          interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
+                           <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
+			  			   <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+			  interrupt-names = "GP", "MMU", "PP";
+	  };
+
 };
diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild
index 19c7e9a2659d..9de45d245a86 100755
--- a/drivers/gpu/arm/Kbuild
+++ b/drivers/gpu/arm/Kbuild
@@ -15,3 +15,4 @@
 
 
 obj-$(CONFIG_MALI_MIDGARD) += midgard/
+obj-$(CONFIG_MALI400)      += mali400/
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 6aca9688c6e0..a45746bebf8b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -25,6 +25,10 @@ source "drivers/gpu/host1x/Kconfig"
 
 source "drivers/gpu/arm/midgard/Kconfig"
 
+source "drivers/gpu/arm/mali400/mali/Kconfig"
+
+source "drivers/gpu/arm/mali400/ump/Kconfig"
+
 config VGASTATE
        tristate
        default n
-- 
2.34.1