aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-06-17 09:01:05 -0400
committerOlof Johansson <olof@lixom.net>2019-07-01 18:26:09 -0400
commit521a503f5247de9a5cbc381f15c466a6c6f2793c (patch)
tree984d1262a51c83093d6543c8a9eabff1d568a8b9
parent180ae5095246402ed47d57568d8c31568c3c4f18 (diff)
soc: ti: fix irq-ti-sci link error
The irqchip driver depends on the SoC specific driver, but we want to be able to compile-test it elsewhere: WARNING: unmet direct dependencies detected for TI_SCI_INTA_MSI_DOMAIN Depends on [n]: SOC_TI [=n] Selected by [y]: - TI_SCI_INTA_IRQCHIP [=y] && TI_SCI_PROTOCOL [=y] drivers/irqchip/irq-ti-sci-inta.o: In function `ti_sci_inta_irq_domain_probe': irq-ti-sci-inta.c:(.text+0x204): undefined reference to `ti_sci_inta_msi_create_irq_domain' Rearrange the Kconfig and Makefile so we build the soc driver whenever its users are there, regardless of the SOC_TI option. Fixes: 49b323157bf1 ("soc: ti: Add MSI domain bus support for Interrupt Aggregator") Fixes: f011df6179bd ("irqchip/ti-sci-inta: Add msi domain support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--drivers/soc/Makefile2
-rw-r--r--drivers/soc/ti/Kconfig4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 524ecdc2a9bb..2ec355003524 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
22obj-$(CONFIG_SOC_SAMSUNG) += samsung/ 22obj-$(CONFIG_SOC_SAMSUNG) += samsung/
23obj-y += sunxi/ 23obj-y += sunxi/
24obj-$(CONFIG_ARCH_TEGRA) += tegra/ 24obj-$(CONFIG_ARCH_TEGRA) += tegra/
25obj-$(CONFIG_SOC_TI) += ti/ 25obj-y += ti/
26obj-$(CONFIG_ARCH_U8500) += ux500/ 26obj-$(CONFIG_ARCH_U8500) += ux500/
27obj-$(CONFIG_PLAT_VERSATILE) += versatile/ 27obj-$(CONFIG_PLAT_VERSATILE) += versatile/
28obj-y += xilinx/ 28obj-y += xilinx/
diff --git a/drivers/soc/ti/Kconfig b/drivers/soc/ti/Kconfig
index ea0859f7b185..d7d50d48d05d 100644
--- a/drivers/soc/ti/Kconfig
+++ b/drivers/soc/ti/Kconfig
@@ -75,10 +75,10 @@ config TI_SCI_PM_DOMAINS
75 called ti_sci_pm_domains. Note this is needed early in boot before 75 called ti_sci_pm_domains. Note this is needed early in boot before
76 rootfs may be available. 76 rootfs may be available.
77 77
78endif # SOC_TI
79
78config TI_SCI_INTA_MSI_DOMAIN 80config TI_SCI_INTA_MSI_DOMAIN
79 bool 81 bool
80 select GENERIC_MSI_IRQ_DOMAIN 82 select GENERIC_MSI_IRQ_DOMAIN
81 help 83 help
82 Driver to enable Interrupt Aggregator specific MSI Domain. 84 Driver to enable Interrupt Aggregator specific MSI Domain.
83
84endif # SOC_TI