diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index ddcf991a7..a4da551db 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -341,4 +341,90 @@ config ARCH_PHYTIUM This enables support for Phytium ARMv8 SoC family. select ARM_GIC_PHYTIUM_2500 +config ARCH_PHYTIUM_PLD + bool "Phytium pld support" + default n + help + This enables support for Phytium pld + +config ARCH_PHYTIUM_MHU + bool "phytium mhu support" + select ARCH_MHU + help + this enables support for phytium mhu + +config ARCH_PHYTIUM_RTC + bool "phytium rtc support" + help + this enables support for phytium rtc + +config ARCH_PHYTIUM_GPIO + bool "phytium gpio support" + help + this enables support for phytium gpio + +config ARCH_PHYTIUM_AT8035_PHY + bool "phytium at8035 support" + help + this enables support for phytium at8035 phy + +config USB_VIDEO_CLASS_CONFIG_PHYTIUM + bool "PHYTIUM USB Video config" + depends on ARCH_PHYTIUM + default y + help + This option is to fix create two video dev node bug + +config ARCH_PHYTIUM_CLOCK + bool "phytium clock support" + depends on ARCH_PHYTIUM + default y + help + this enable support phyitum clock + +config ARCH_PHYTIUM_LPC + bool "phytium lpc support" + depends on ARCH_PHYTIUM + default y + help + only used for phytium notebook + +config PHYTIUM_RAS + bool "phytium ras support" + depends on ARCH_PHYTIUM && ARM_SDE_INTERFACE + help + this enable support phytium ras + +config ARCH_PHYTIUM_SCTO + bool "phytium scto support" + depends on ARCH_PHYTIUM + help + only used for phytium device + +config FT_CAN + bool "phytium can" + depends on ARCH_PHYTIUM + help + Phytium CAN driver. This driver supports support for the Phytium FT4CCAN Controller + +config ARCH_PHYTIUM_EC + tristate "phytium ec support" + depends on ARCH_PHYTIUM_LPC + select INPUT_SPARSEKMAP + help + only used for phytium notebook + +config ARCH_PHYTIUM_UART_INIT + bool "phytium uart init" + depends on ARCH_PHYTIUM + default y + help + only used for phytium uart + +config PHYTIUM_S3_TIMEOUT + tristate "phytium ec s3 timeout support" + depends on ARCH_PHYTIUM_EC && SUSPEND + help + only used for phytium notebook + endmenu diff --git a/drivers/FtDriver/lpc/lpc.c b/drivers/FtDriver/lpc/lpc.c index 1ca217bc2..00685c8ac 100644 --- a/drivers/FtDriver/lpc/lpc.c +++ b/drivers/FtDriver/lpc/lpc.c @@ -217,7 +217,7 @@ static void __exit lpc_exit(void) { if (!cpu_is_phytium()) { - return 0; + return; } platform_driver_unregister(&lpc_driver); diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index fca637d4d..773e28a33 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -18,9 +18,6 @@ #include "internals.h" -#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER -void (*handle_arch_irq)(struct pt_regs *) __ro_after_init; -#endif /** * handle_bad_irq - handle spurious and unhandled irqs @@ -217,13 +214,3 @@ irqreturn_t handle_irq_event(struct irq_desc *desc) return ret; } -#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER -int __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) -{ - if (handle_arch_irq) - return -EBUSY; - - handle_arch_irq = handle_irq; - return 0; -} -#endif