summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsy1124.kim <sy1124.kim@samsung.com>2016-08-24 15:37:12 +0900
committersy1124.kim <sy1124.kim@samsung.com>2016-08-24 16:20:39 +0900
commit07cdf929c03de58863bbe19fd6a553e40a64894a (patch)
treeedf0dec177f88d6a90c7051a4416bf2b1e62b568
parenta21a911edfb74d33a58aeef84c8cf6a55af185f1 (diff)
downloadlinux-3.10-artik-07cdf929c03de58863bbe19fd6a553e40a64894a.tar.gz
linux-3.10-artik-07cdf929c03de58863bbe19fd6a553e40a64894a.tar.bz2
linux-3.10-artik-07cdf929c03de58863bbe19fd6a553e40a64894a.zip
gpu: arm: midgard: support Kconfig for r12p0_04rel0
So, we can select mali midgard r12p0_04rel0 from Kconfig of midgard. Change-Id: I497e7d9bb9ec661fe4625de16ad658dfc669fe49 Signed-off-by: sy1124.kim <sy1124.kim@samsung.com>
-rw-r--r--drivers/gpu/arm/midgard/Kconfig8
-rw-r--r--drivers/gpu/arm/midgard/Makefile1
-rw-r--r--drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig12
3 files changed, 10 insertions, 11 deletions
diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig
index 00184c6a5e2..2f142d4166a 100644
--- a/drivers/gpu/arm/midgard/Kconfig
+++ b/drivers/gpu/arm/midgard/Kconfig
@@ -18,3 +18,11 @@ 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
diff --git a/drivers/gpu/arm/midgard/Makefile b/drivers/gpu/arm/midgard/Makefile
index 15208724c02..4db0520ccfa 100644
--- a/drivers/gpu/arm/midgard/Makefile
+++ b/drivers/gpu/arm/midgard/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_MALI_VER_R5P0_06REL0) += r5p0_06rel0/
+obj-$(CONFIG_MALI_VER_R12P0_04REL0) += r12p0_04rel0/
EXTRA_CFLAGS += -Idrivers/gpu/arm/midgard/
diff --git a/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig b/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig
index 367f0c78753..747d12b8c71 100644
--- 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"