diff mbox series

xilinx: kconfig: Change Kconfig dependencies for Xilinx drivers

Message ID a32757aa2dcb7c5abe6c425508622006e4a44cc4.1598273163.git.michal.simek@xilinx.com
State Accepted
Commit 54fdef242fdcda8792b7c05d687dc79a624fcc32
Delegated to: Michal Simek
Headers show
Series xilinx: kconfig: Change Kconfig dependencies for Xilinx drivers | expand

Commit Message

Michal Simek Aug. 24, 2020, 12:46 p.m. UTC
Zynq/ZynqMP/Versal IPs should be possible to called also from Microblaze in
PL and vice versa. That's why change dependencies and do not limit enabling
just for some platforms.

This is follow up patch based on commit 664e16ce99a0 ("xilinx: kconfig:
Change Kconfig dependencies for Xilinx drivers").

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 drivers/serial/Kconfig   | 4 ++--
 drivers/spi/Kconfig      | 3 ---
 drivers/usb/host/Kconfig | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

Comments

Michal Simek Sept. 23, 2020, 12:03 p.m. UTC | #1
po 24. 8. 2020 v 14:46 odesílatel Michal Simek <michal.simek@xilinx.com> napsal:
>
> Zynq/ZynqMP/Versal IPs should be possible to called also from Microblaze in
> PL and vice versa. That's why change dependencies and do not limit enabling
> just for some platforms.
>
> This is follow up patch based on commit 664e16ce99a0 ("xilinx: kconfig:
> Change Kconfig dependencies for Xilinx drivers").
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  drivers/serial/Kconfig   | 4 ++--
>  drivers/spi/Kconfig      | 3 ---
>  drivers/usb/host/Kconfig | 3 +--
>  3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> index e344677f91f6..b4805a2e4ea4 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -734,7 +734,7 @@ config UNIPHIER_SERIAL
>
>  config XILINX_UARTLITE
>         bool "Xilinx Uarlite support"
> -       depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || 4xx)
> +       depends on DM_SERIAL
>         help
>           If you have a Xilinx based board and want to use the uartlite
>           serial ports, say Y to this option. If unsure, say N.
> @@ -802,7 +802,7 @@ config STM32_SERIAL
>
>  config ZYNQ_SERIAL
>         bool "Cadence (Xilinx Zynq) UART support"
> -       depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_ZYNQMP_R5)
> +       depends on DM_SERIAL
>         help
>           This driver supports the Cadence UART. It is found e.g. in Xilinx
>           Zynq/ZynqMP.
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 3fc2d0674ae4..5df97c80fa51 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -407,7 +407,6 @@ config XILINX_SPI
>
>  config ZYNQ_SPI
>         bool "Zynq SPI driver"
> -       depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
>         help
>           Enable the Zynq SPI driver. This driver can be used to
>           access the SPI NOR flash on platforms embedding this Zynq
> @@ -415,7 +414,6 @@ config ZYNQ_SPI
>
>  config ZYNQ_QSPI
>         bool "Zynq QSPI driver"
> -       depends on ARCH_ZYNQ
>         imply SPI_FLASH_BAR
>         help
>           Enable the Zynq Quad-SPI (QSPI) driver. This driver can be
> @@ -425,7 +423,6 @@ config ZYNQ_QSPI
>
>  config ZYNQMP_GQSPI
>         bool "Configure ZynqMP Generic QSPI"
> -       depends on ARCH_ZYNQMP || ARCH_VERSAL
>         help
>           This option is used to enable ZynqMP QSPI controller driver which
>           is used to communicate with qspi flash devices.
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 1c374a7bd809..4eb7b34e245f 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -200,8 +200,7 @@ config USB_EHCI_TEGRA
>
>  config USB_EHCI_ZYNQ
>         bool "Support for Xilinx Zynq on-chip EHCI USB controller"
> -       depends on ARCH_ZYNQ
> -       default y
> +       default y if ARCH_ZYNQ
>         ---help---
>           Enable support for Zynq on-chip EHCI USB controller
>
> --
> 2.28.0
>

Applied.
M
diff mbox series

Patch

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index e344677f91f6..b4805a2e4ea4 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -734,7 +734,7 @@  config UNIPHIER_SERIAL
 
 config XILINX_UARTLITE
 	bool "Xilinx Uarlite support"
-	depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || 4xx)
+	depends on DM_SERIAL
 	help
 	  If you have a Xilinx based board and want to use the uartlite
 	  serial ports, say Y to this option. If unsure, say N.
@@ -802,7 +802,7 @@  config STM32_SERIAL
 
 config ZYNQ_SERIAL
 	bool "Cadence (Xilinx Zynq) UART support"
-	depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_ZYNQMP_R5)
+	depends on DM_SERIAL
 	help
 	  This driver supports the Cadence UART. It is found e.g. in Xilinx
 	  Zynq/ZynqMP.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3fc2d0674ae4..5df97c80fa51 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -407,7 +407,6 @@  config XILINX_SPI
 
 config ZYNQ_SPI
 	bool "Zynq SPI driver"
-	depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
 	help
 	  Enable the Zynq SPI driver. This driver can be used to
 	  access the SPI NOR flash on platforms embedding this Zynq
@@ -415,7 +414,6 @@  config ZYNQ_SPI
 
 config ZYNQ_QSPI
 	bool "Zynq QSPI driver"
-	depends on ARCH_ZYNQ
 	imply SPI_FLASH_BAR
 	help
 	  Enable the Zynq Quad-SPI (QSPI) driver. This driver can be
@@ -425,7 +423,6 @@  config ZYNQ_QSPI
 
 config ZYNQMP_GQSPI
 	bool "Configure ZynqMP Generic QSPI"
-	depends on ARCH_ZYNQMP || ARCH_VERSAL
 	help
 	  This option is used to enable ZynqMP QSPI controller driver which
 	  is used to communicate with qspi flash devices.
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1c374a7bd809..4eb7b34e245f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -200,8 +200,7 @@  config USB_EHCI_TEGRA
 
 config USB_EHCI_ZYNQ
 	bool "Support for Xilinx Zynq on-chip EHCI USB controller"
-	depends on ARCH_ZYNQ
-	default y
+	default y if ARCH_ZYNQ
 	---help---
 	  Enable support for Zynq on-chip EHCI USB controller