gpu: arm: midgard: support Kconfig for r12p0_04rel0

So, we can select mali midgard r12p0_04rel0 from Kconfig of midgard.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig
index 1347789..d4653c8 100644 (file)
--- a/drivers/gpu/arm/midgard/Kconfig
+++ b/drivers/gpu/arm/midgard/Kconfig
@@ -21,4 +21,13 @@ if MALI_VER_R5P0_06REL0
 source "drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig"
 endif
 
+config MALI_VER_R12P0_04REL0
+       bool "Mali Midgard Version R12P0-04REL0"
+       help
+         Choose this option to select DDK version.
+
+if MALI_VER_R12P0_04REL0
+source "drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig"
+endif
+
 endchoice

diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile
index 71f3989..36723a8 100644 (file)
--- a/drivers/gpu/arm/midgard/Makefile
+++ b/drivers/gpu/arm/midgard/Makefile
@@ -1 +1,2 @@
 obj-$(CONFIG_MALI_VER_R5P0_06REL0) += r5p0_06rel0/
+obj-$(CONFIG_MALI_VER_R12P0_04REL0) += r12p0_04rel0/

diff --git a/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig b/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig
index 367f0c7..747d12b 100644 (file)
--- a/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig
+++ b/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig
@@ -14,16 +14,6 @@
 
 
 
-menuconfig MALI_MIDGARD
-       tristate "Mali Midgard series support"
-       select GPU_TRACEPOINTS if ANDROID
-       default n
-       help
-         Enable this option to build support for a ARM Mali Midgard GPU.
-
-         To compile this driver as a module, choose M here:
-         this will generate a single module, called mali_kbase.
-
 config MALI_GATOR_SUPPORT
        bool "Streamline support via Gator"
        depends on MALI_MIDGARD
@@ -198,4 +188,4 @@ config MALI_SYSTEM_TRACE
          minimal overhead when not in use. Enable only if you know what
          you are doing.
 
-source "drivers/gpu/arm/midgard/platform/Kconfig"
+source "drivers/gpu/arm/midgard/r12p0_04rel0/platform/Kconfig"