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

irqchip: davinci-cp-intc: move the driver to drivers/irqchip

The cp-intc driver has now been cleaned up. Move it to drivers/irqchip
where it belongs.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

authored by

Bartosz Golaszewski and committed by
Sekhar Nori 0fc3d74c 3114111a

+8 -8
+2 -6
arch/arm/mach-davinci/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 if ARCH_DAVINCI 3 3 4 - config CP_INTC 5 - bool 6 - select IRQ_DOMAIN 7 - 8 4 config ARCH_DAVINCI_DMx 9 5 bool 10 6 ··· 29 33 select ARCH_DAVINCI_DA8XX 30 34 # needed on silicon revs 1.0, 1.1: 31 35 select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE 32 - select CP_INTC 36 + select DAVINCI_CP_INTC 33 37 34 38 config ARCH_DAVINCI_DA850 35 39 bool "DA850/OMAP-L138/AM18x based system" 36 40 depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) 37 41 select ARCH_DAVINCI_DA8XX 38 - select CP_INTC 42 + select DAVINCI_CP_INTC 39 43 40 44 config ARCH_DAVINCI_DA8XX 41 45 bool
-2
arch/arm/mach-davinci/Makefile
··· 18 18 obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o usb-da8xx.o 19 19 obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o usb-da8xx.o 20 20 21 - obj-$(CONFIG_CP_INTC) += cp_intc.o 22 - 23 21 # Board specific 24 22 obj-$(CONFIG_MACH_DA8XX_DT) += da8xx-dt.o pdata-quirks.o 25 23 obj-$(CONFIG_MACH_DAVINCI_EVM) += board-dm644x-evm.o
arch/arm/mach-davinci/cp_intc.c drivers/irqchip/irq-davinci-cp-intc.c
+5
drivers/irqchip/Kconfig
··· 134 134 select GENERIC_IRQ_CHIP 135 135 select IRQ_DOMAIN 136 136 137 + config DAVINCI_CP_INTC 138 + bool 139 + select GENERIC_IRQ_CHIP 140 + select IRQ_DOMAIN 141 + 137 142 config DW_APB_ICTL 138 143 bool 139 144 select GENERIC_IRQ_CHIP
+1
drivers/irqchip/Makefile
··· 7 7 obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o 8 8 obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2836.o 9 9 obj-$(CONFIG_DAVINCI_AINTC) += irq-davinci-aintc.o 10 + obj-$(CONFIG_DAVINCI_CP_INTC) += irq-davinci-cp-intc.o 10 11 obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o 11 12 obj-$(CONFIG_FARADAY_FTINTC010) += irq-ftintc010.o 12 13 obj-$(CONFIG_ARCH_HIP04) += irq-hip04.o