ARM: mali400: r5p2_rel0: fix Makefile & Kconfig

For building of r5p2_rel0.

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

diff --git a/drivers/gpu/arm/mali400/Kconfig b/drivers/gpu/arm/mali400/Kconfig
index 6a73ad8..bad0275 100644 (file)
--- a/drivers/gpu/arm/mali400/Kconfig
+++ b/drivers/gpu/arm/mali400/Kconfig
@@ -32,6 +32,15 @@ if MALI_VER_R4P0_REL0
 source "drivers/gpu/arm/mali400/r4p0_rel0/Kconfig"
 endif
 
+config MALI_VER_R5P2_REL0
+       bool "Mali400 Version R5P2-REL0"
+       help
+         Choose this option to select DDK version.
+
+if MALI_VER_R5P2_REL0
+source "drivers/gpu/arm/mali400/r5p2_rel0/Kconfig"
+endif
+
 endchoice
 
 config VIDEO_SAMSUNG

diff --git a/drivers/gpu/arm/mali400/Makefile b/drivers/gpu/arm/mali400/Makefile
index 55410c9..222d872 100644 (file)
--- a/drivers/gpu/arm/mali400/Makefile
+++ b/drivers/gpu/arm/mali400/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_MALI_VER_R3P2_REL0) += mali/ ump/
 obj-$(CONFIG_MALI_VER_R4P0_REL0) += r4p0_rel0/
+obj-$(CONFIG_MALI_VER_R5P2_REL0) += r5p2_rel0/
 
 EXTRA_CFLAGS += -Idrivers/gpu/arm/mali400

diff --git a/drivers/gpu/arm/mali400/r5p2_rel0/Kconfig b/drivers/gpu/arm/mali400/r5p2_rel0/Kconfig
index 873d314..fda9192 100644 (file)
--- a/drivers/gpu/arm/mali400/r5p2_rel0/Kconfig
+++ b/drivers/gpu/arm/mali400/r5p2_rel0/Kconfig
@@ -1,14 +1,3 @@
-config MALI400
-       tristate "Mali-300/400/450 support"
-       depends on ARM || ARM64
-       select DMA_SHARED_BUFFER
-       ---help---
-         This enables support for the ARM Mali-300, Mali-400, and Mali-450
-         GPUs.
-
-         To compile this driver as a module, choose M here: the module will be
-         called mali.
-
 config MALI450
        bool "Enable Mali-450 support"
        depends on MALI400