rockchip:mali400:1,update rk3036.dtsi with mali400 2,update mali400 build config

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 0725b12648a63ede646d8e9857a2599b39839360..4b0c46ed4ba4525397631fa9515a005b594e37e8 100644 (file)
--- 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 19c7e9a2659d23b7688ef78ca644b380a6cc3827..9de45d245a86fb1fb22a5914d49eb89c46edd5c6 100755 (executable)
--- 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 6aca9688c6e083d6daef8724bc4c2d3fb84b921a..a45746bebf8b6e3ec1546e08ba4c50af557efc8b 100644 (file)
--- 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