gpu: arm: midgard: remove choice in Kconfig of r12p0_04rel0

The choice of each mali version causes Kconfig errors like below,

$ make ARCH=arm64 menuconfig
scripts/kconfig/mconf  Kconfig
drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig:126:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig:129:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig:132:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig:135:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig:137:warning: choice value used outside its choice group

Also remove configs for unused platform.

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

diff --git a/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig b/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig
index 747d12b..2f5fd24 100644 (file)
--- a/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig
+++ b/drivers/gpu/arm/midgard/r12p0_04rel0/Kconfig
@@ -100,16 +100,10 @@ config MALI_PLATFORM_FAKE
          supports creating the platform device outside of the Linux platform-specific code.
          Enable this option if would like to use a platform device configuration from within the device driver.
 
-choice
-       prompt "Platform configuration"
-       depends on MALI_MIDGARD && MALI_EXPERT
-       default MALI_PLATFORM_DEVICETREE
-       help
-         Select the SOC platform that contains a Mali Midgard GPU
-
 config MALI_PLATFORM_DEVICETREE
        bool "Device Tree platform"
        depends on OF
+       depends on MALI_MIDGARD && MALI_EXPERT
        help
          Select this option to use Device Tree with the Mali driver.
 
@@ -121,21 +115,10 @@ config MALI_PLATFORM_DEVICETREE
          Device Tree is the recommended method for the Mali driver platform
          integration.
 
-config MALI_PLATFORM_VEXPRESS
-       depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4)
-       bool "Versatile Express"
-config MALI_PLATFORM_VEXPRESS_VIRTEX7_40MHZ
-       depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4)
-       bool "Versatile Express w/Virtex7 @ 40Mhz"
-config MALI_PLATFORM_GOLDFISH
-       depends on ARCH_GOLDFISH
-       bool "Android Goldfish virtual CPU"
-config MALI_PLATFORM_PBX
-       depends on ARCH_REALVIEW && REALVIEW_EB_A9MP && MACH_REALVIEW_PBX
-       bool "Realview PBX-A9"
 config MALI_PLATFORM_THIRDPARTY
        bool "Third Party Platform"
-endchoice
+       depends on MALI_MIDGARD && MALI_EXPERT
+       depends on !MALI_PLATFORM_DEVICETREE
 
 config MALI_PLATFORM_THIRDPARTY_NAME
        depends on MALI_MIDGARD && MALI_PLATFORM_THIRDPARTY && MALI_EXPERT