gpu: arm: midgard: fix Kconfig for multiple driver

This will make Kconfig of midgard can select mali midgard version to
use.

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

diff --git a/drivers/gator/Kconfig b/drivers/gator/Kconfig
index f6bd2f3..dce0ae9 100644 (file)
--- a/drivers/gator/Kconfig
+++ b/drivers/gator/Kconfig
@@ -40,7 +40,7 @@ config GATOR_MALI_4XXMP_PATH
 config GATOR_MALI_MIDGARD_PATH
        string "Path to Mali driver"
        depends on GATOR_MALI_MIDGARD
-       default "drivers/gpu/arm/midgard"
+       default "drivers/gpu/arm/midgard/r5p0_06rel0"
        help
          The gator code adds this to its include path so it can get the Mali
          trace headers with: #include "linux/mali_linux_trace.h"

diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig
new file mode 100644 (file)
index 0000000..1347789
--- /dev/null
+++ b/drivers/gpu/arm/midgard/Kconfig
@@ -0,0 +1,24 @@
+menuconfig MALI_MIDGARD
+       tristate "Mali Midgard series support"
+       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.
+
+choice
+       depends on MALI_MIDGARD
+       prompt "Select MALI VER"
+       default MALI_VER_R5P0_06REL0
+
+config MALI_VER_R5P0_06REL0
+       bool "Mali Midgard Version R5P0-06REL0"
+       help
+         Choose this option to select DDK version.
+
+if MALI_VER_R5P0_06REL0
+source "drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig"
+endif
+
+endchoice

diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile
new file mode 100644 (file)
index 0000000..71f3989
--- /dev/null
+++ b/drivers/gpu/arm/midgard/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_MALI_VER_R5P0_06REL0) += r5p0_06rel0/

diff --git a/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig b/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig
index 801490f..9f1efc7 100644 (file)
--- a/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig
+++ b/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig
@@ -14,15 +14,6 @@
 
 
 
-menuconfig MALI_MIDGARD
-       tristate "Mali Midgard series support"
-       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 Debug support"
        depends on MALI_MIDGARD
@@ -190,4 +181,4 @@ config MALI_GPU_TRACEPOINTS
        help
          Enables GPU tracepoints using Android trace event definitions.
 
-source "drivers/gpu/arm/midgard/platform/Kconfig"
+source "drivers/gpu/arm/midgard/r5p0_06rel0/platform/Kconfig"