Push various XGENE drivers behind ARCH_XGENE dependency so that it doesn't get enabled by default on other platforms. Signed-off-by: Amit Kucheria <amit.kucheria@xxxxxxxxxx> --- arch/arm64/Kconfig.platforms | 3 +++ drivers/clk/Kconfig | 2 +- drivers/gpio/Kconfig | 1 + drivers/pci/controller/Kconfig | 1 + drivers/phy/Kconfig | 1 + drivers/power/reset/Kconfig | 2 +- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 4778c775de1b..cdf4e452e34c 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -281,6 +281,9 @@ config ARCH_VULCAN config ARCH_XGENE bool "AppliedMicro X-Gene SOC Family" + select COMMON_CLK_XGENE + select PCI_XGENE + select GPIO_XGENE help This enables support for AppliedMicro X-Gene SOC Family diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 801fa1cd0321..9b2790d3f18a 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -225,7 +225,7 @@ config CLK_QORIQ config COMMON_CLK_XGENE bool "Clock driver for APM XGene SoC" - default ARCH_XGENE + depends on ARCH_XGENE depends on ARM64 || COMPILE_TEST ---help--- Sypport for the APM X-Gene SoC reference, PLL, and device clocks. diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index bb13c266c329..072c749c5c1f 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -580,6 +580,7 @@ config GPIO_VX855 config GPIO_XGENE bool "APM X-Gene GPIO controller support" + depends on ARCH_XGENE depends on ARM64 && OF_GPIO help This driver is to support the GPIO block within the APM X-Gene SoC diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index fe9f9f13ce11..44699f45784f 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -112,6 +112,7 @@ config PCIE_XILINX config PCI_XGENE bool "X-Gene PCIe controller" depends on ARM64 || COMPILE_TEST + depends on ARCH_XGENE depends on OF || (ACPI && PCI_QUIRKS) help Say Y here if you want internal PCI support on APM X-Gene SoC. diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 0263db2ac874..7c5eefecdabd 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -44,6 +44,7 @@ config PHY_PISTACHIO_USB config PHY_XGENE tristate "APM X-Gene 15Gbps PHY support" + depends on ARCH_XGENE depends on HAS_IOMEM && OF && (ARM64 || COMPILE_TEST) select GENERIC_PHY help diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index a564237278ff..651b763f80cd 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -181,7 +181,7 @@ config POWER_RESET_VEXPRESS config POWER_RESET_XGENE bool "APM SoC X-Gene reset driver" - depends on ARM64 + depends on ARCH_XGENE && ARM64 help Reboot support for the APM SoC X-Gene Eval boards. -- 2.17.1
