tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

xtensa: move PLATFORM_NR_IRQS to Kconfig

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

Max Filippov 994fa1c8 aea731c8

+7 -10
+4
arch/xtensa/Kconfig
··· 435 435 436 436 endchoice 437 437 438 + config PLATFORM_NR_IRQS 439 + int 440 + default 3 if XTENSA_PLATFORM_XT2000 441 + default 0 438 442 439 443 config XTENSA_CPU_CLOCK 440 444 int "CPU clock rate [MHz]"
+3 -2
arch/xtensa/include/asm/irq.h
··· 12 12 #define _XTENSA_IRQ_H 13 13 14 14 #include <linux/init.h> 15 - #include <platform/hardware.h> 16 15 #include <variant/core.h> 17 16 18 17 #ifdef CONFIG_VARIANT_IRQ_SWITCH ··· 24 25 #ifndef VARIANT_NR_IRQS 25 26 # define VARIANT_NR_IRQS 0 26 27 #endif 27 - #ifndef PLATFORM_NR_IRQS 28 + #ifdef CONFIG_PLATFORM_NR_IRQS 29 + # define PLATFORM_NR_IRQS CONFIG_PLATFORM_NR_IRQS 30 + #else 28 31 # define PLATFORM_NR_IRQS 0 29 32 #endif 30 33 #define XTENSA_NR_IRQS XCHAL_NUM_INTERRUPTS
-4
arch/xtensa/platforms/xt2000/include/platform/hardware.h
··· 18 18 #include <variant/core.h> 19 19 20 20 /* 21 - * Number of platform IRQs 22 - */ 23 - #define PLATFORM_NR_IRQS 3 24 - /* 25 21 * On-board components. 26 22 */ 27 23
-4
arch/xtensa/platforms/xtfpga/include/platform/hardware.h
··· 17 17 #ifndef __XTENSA_XTAVNET_HARDWARE_H 18 18 #define __XTENSA_XTAVNET_HARDWARE_H 19 19 20 - /* Interrupt configuration. */ 21 - 22 - #define PLATFORM_NR_IRQS 0 23 - 24 20 /* Default assignment of LX60 devices to external interrupts. */ 25 21 26 22 #ifdef CONFIG_XTENSA_MX