Revert "ANDROID: kconfig: Enable options needed for MTK desktop"

This reverts commit 3e1c1717a8.

Reason for revert: Causing build breakage

WARNING: unmet direct dependencies detected for MTK_SCPSYS
Depends on [n]: (ARCH_MEDIATEK [=n] || COMPILE_TEST [=n]) && OF [=y]
Selected by [y]:
- GKI_HIDDEN_MTK_CONFIGS [=y]

WARNING: unmet direct dependencies detected for MTK_INFRACFG
Depends on [n]: ARCH_MEDIATEK [=n] || COMPILE_TEST [=n]
Selected by [y]:
- GKI_HIDDEN_MTK_CONFIGS [=y]

WARNING: unmet direct dependencies detected for MTK_REGULATOR_COUPLER
Depends on [n]: (ARCH_MEDIATEK [=n] || COMPILE_TEST [=n]) && REGULATOR [=y]
Selected by [y]:
- GKI_HIDDEN_MTK_CONFIGS [=y]


Bug: 432487220
Change-Id: If8ae69c229cd888111cc68171cf9fbc2fa96aede
Signed-off-by: John Stultz <jstultz@google.com>

drivers/irqchip/Kconfig

@@ -702,10 +702,6 @@ config MST_IRQ
 	help
 	  Support MStar Interrupt Controller.
 
-config MTK_IRQ
-	bool
-	default ARCH_MEDIATEK
-
 config WPCM450_AIC
 	bool "Nuvoton WPCM450 Advanced Interrupt Controller"
 	depends on ARCH_WPCM450

drivers/irqchip/Makefile

@@ -68,7 +68,7 @@ obj-$(CONFIG_BCM7120_L2_IRQ)		+= irq-bcm7120-l2.o
 obj-$(CONFIG_BRCMSTB_L2_IRQ)		+= irq-brcmstb-l2.o
 obj-$(CONFIG_KEYSTONE_IRQ)		+= irq-keystone.o
 obj-$(CONFIG_MIPS_GIC)			+= irq-mips-gic.o
-obj-$(CONFIG_MTK_IRQ)			+= irq-mtk-sysirq.o irq-mtk-cirq.o
+obj-$(CONFIG_ARCH_MEDIATEK)		+= irq-mtk-sysirq.o irq-mtk-cirq.o
 obj-$(CONFIG_ARCH_DIGICOLOR)		+= irq-digicolor.o
 obj-$(CONFIG_ARCH_SA1100)		+= irq-sa11x0.o
 obj-$(CONFIG_INGENIC_IRQ)		+= irq-ingenic.o

init/Kconfig.gki

@@ -109,20 +109,6 @@ config GKI_HIDDEN_QCOM_CONFIGS
 	  These are normally selected implicitly when a module
 	  that relies on it is configured.
 
-config GKI_HIDDEN_MTK_CONFIGS
-	bool "Hidden MTK configs needed for GKI"
-	select MTK_TIMER
-	select MTK_CPUX_TIMER
-	select MTK_REGULATOR_COUPLER
-	select MTK_SCPSYS
-	select MTK_INFRACFG
-	select MTK_IRQ
-
-	help
-	  Dummy config option used to enable hidden MTK configs.
-	  These are normally selected implicitly when a module
-	  that relies on it is configured.
-
 config GKI_HIDDEN_MEDIA_CONFIGS
 	bool "Hidden Media configs needed for GKI"
 	select VIDEOBUF2_CORE
@@ -308,7 +294,6 @@ config GKI_HACKS_TO_FIX
 	select GKI_HIDDEN_MMC_CONFIGS
 	select GKI_HIDDEN_GPIO_CONFIGS
 	select GKI_HIDDEN_QCOM_CONFIGS
-	select GKI_HIDDEN_MTK_CONFIGS if (ARM64)
 	select GKI_LEGACY_WEXT_ALLCONFIG
 	select GKI_HIDDEN_MEDIA_CONFIGS
 	select GKI_HIDDEN_VIRTUAL_CONFIGS