[PATCH] xilinx: kconfig: Change Kconfig dependencies for Xilinx drivers

[Michal Simek]

čt 13. 8. 2020 v 14:35 odesílatel Michal Simek <michal.simek at 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.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  drivers/gpio/Kconfig | 4 ++--
>  drivers/i2c/Kconfig  | 2 +-
>  drivers/mmc/Kconfig  | 1 -
>  drivers/net/Kconfig  | 6 +++---
>  4 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 11e9a17f9729..202fcc6f4759 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -381,8 +381,8 @@ config MVEBU_GPIO
>
>  config ZYNQ_GPIO
>         bool "Zynq GPIO driver"
> -       depends on DM_GPIO && (ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL)
> -       default y
> +       depends on DM_GPIO
> +       default y if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
>         help
>           Supports GPIO access on Zynq SoC.
>
> diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
> index dec6dc9dfa4d..8ae54e1e93b0 100644
> --- a/drivers/i2c/Kconfig
> +++ b/drivers/i2c/Kconfig
> @@ -88,7 +88,7 @@ config SYS_I2C_FSL
>
>  config SYS_I2C_CADENCE
>         tristate "Cadence I2C Controller"
> -       depends on DM_I2C && (ARCH_ZYNQ || ARM64)
> +       depends on DM_I2C
>         help
>           Say yes here to select Cadence I2C Host Controller. This controller is
>           e.g. used by Xilinx Zynq.
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index 556b3ac48978..c29d1ea680ef 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -653,7 +653,6 @@ config TEGRA124_MMC_DISABLE_EXT_LOOPBACK
>
>  config MMC_SDHCI_ZYNQ
>         bool "Arasan SDHCI controller support"
> -       depends on ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
>         depends on DM_MMC && OF_CONTROL && BLK
>         depends on MMC_SDHCI
>         help
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index ecd779d979e4..039f9fb05899 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -519,7 +519,7 @@ config TULIP
>           This driver supports DEC DC2114x Fast ethernet chips.
>
>  config XILINX_AXIEMAC
> -       depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
> +       depends on DM_ETH
>         select PHYLIB
>         select MII
>         bool "Xilinx AXI Ethernet"
> @@ -527,7 +527,7 @@ config XILINX_AXIEMAC
>           This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs.
>
>  config XILINX_EMACLITE
> -       depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || MIPS)
> +       depends on DM_ETH
>         select PHYLIB
>         select MII
>         bool "Xilinx Ethernetlite"
> @@ -535,7 +535,7 @@ config XILINX_EMACLITE
>           This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs.
>
>  config ZYNQ_GEM
> -       depends on DM_ETH && (ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL)
> +       depends on DM_ETH
>         select PHYLIB
>         bool "Xilinx Ethernet GEM"
>         help
> --
> 2.28.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs