From 3e1c1717a878fd61a52eaeaeab87b45e3d812604 Mon Sep 17 00:00:00 2001 From: Zyta Szpak Date: Thu, 31 Jul 2025 20:06:57 +0000 Subject: [PATCH] ANDROID: kconfig: Enable options needed for MTK desktop The options are needed for MTK desktop device to boot and avoid adding CONFIG_ARCH_MEDIATEK to gki_defconfig. The options are enabled as hidden because of dependency on CONFIG_ARCH_MEDIATEK. Being selected from hidden overrides the dependency. Bug: 432487220 Change-Id: I184ac064b0392153c1b4392b8374fd82d39d6cee Signed-off-by: Zyta Szpak --- drivers/irqchip/Kconfig | 4 ++++ drivers/irqchip/Makefile | 2 +- init/Kconfig.gki | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index c1f304836008..cd5ffb6659a8 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -702,6 +702,10 @@ 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 diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index e3679ec2b9f7..e91fb381c5cf 100644 --- a/drivers/irqchip/Makefile +++ b/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_ARCH_MEDIATEK) += irq-mtk-sysirq.o irq-mtk-cirq.o +obj-$(CONFIG_MTK_IRQ) += 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 diff --git a/init/Kconfig.gki b/init/Kconfig.gki index 88f4946d963a..f9523b4102d2 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -109,6 +109,20 @@ 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 @@ -294,6 +308,7 @@ 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