[PATCH v2 3/3] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858

[Philippe REYNES]

Hi William,


Le 22/08/2022 à 20:39, William Zhang a écrit :
> As CONFIG_ARCH_BCM6858 is replaced with CONFIG_BCM6858, update the
> driver Kconfig to use the new config symbol.
>
> Signed-off-by: William Zhang <william.zhang at broadcom.com>


Reviewed-by: Philippe Reynes <philippe.reynes at softathome.com>


>
> ---
>
> Changes in v2:
> -Update subject line to be more clear for patch 3
>
>   drivers/gpio/Kconfig         | 3 +--
>   drivers/led/Kconfig          | 2 +-
>   drivers/mtd/nand/raw/Kconfig | 2 +-
>   drivers/spi/Kconfig          | 3 +--
>   drivers/watchdog/Kconfig     | 3 +--
>   5 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 9e00b48234ab..929f3fb9eacb 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -111,8 +111,7 @@ config BCM2835_GPIO
>   config BCM6345_GPIO
>   	bool "BCM6345 GPIO driver"
>   	depends on DM_GPIO && (ARCH_BMIPS || BCM6856 || \
> -			       ARCH_BCM6858 || BCM63158 || \
> -			       ARCH_BCM6753)
> +			       BCM6858 || BCM63158 || ARCH_BCM6753)
>   	help
>   	  This driver supports the GPIO banks on BCM6345 SoCs.
>   
> diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
> index bd8f23fd9631..98f015a07f97 100644
> --- a/drivers/led/Kconfig
> +++ b/drivers/led/Kconfig
> @@ -37,7 +37,7 @@ config LED_BCM6753
>   
>   config LED_BCM6858
>   	bool "LED Support for BCM6858"
> -	depends on LED && (BCM6856 || ARCH_BCM6858 || BCM63158)
> +	depends on LED && (BCM6856 || BCM6858 || BCM63158)
>   	help
>   	  This option enables support for LEDs connected to the BCM6858
>   	  HW has blinking capabilities and up to 32 LEDs can be controlled.
> diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
> index 5d006ca1ea07..f8445e09633c 100644
> --- a/drivers/mtd/nand/raw/Kconfig
> +++ b/drivers/mtd/nand/raw/Kconfig
> @@ -115,7 +115,7 @@ config NAND_BRCMNAND_6838
>   
>   config NAND_BRCMNAND_6858
>          bool "Support Broadcom NAND controller on bcm6858"
> -       depends on NAND_BRCMNAND && ARCH_BCM6858
> +       depends on NAND_BRCMNAND && BCM6858
>          help
>            Enable support for broadcom nand driver on bcm6858.
>   
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 978e5c86a420..e815a715f9b2 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -91,8 +91,7 @@ config ATMEL_SPI
>   
>   config BCM63XX_HSSPI
>   	bool "BCM63XX HSSPI driver"
> -	depends on (ARCH_BMIPS || BCM6856 || \
> -		    ARCH_BCM6858 || BCM63158)
> +	depends on (ARCH_BMIPS || BCM6856 || BCM6858 || BCM63158)
>   	help
>   	  Enable the BCM6328 HSSPI driver. This driver can be used to
>   	  access the SPI NOR flash on platforms embedding this Broadcom
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 6d559515b78b..84a4034fe87c 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -129,8 +129,7 @@ config WDT_AT91
>   config WDT_BCM6345
>   	bool "BCM6345 watchdog timer support"
>   	depends on WDT && (ARCH_BMIPS || BCM6856 || \
> -			   ARCH_BCM6858 || BCM63158 || \
> -			   ARCH_BCM6753)
> +			   BCM6858 || BCM63158 || ARCH_BCM6753)
>   	help
>   	  Select this to enable watchdog timer for BCM6345 SoCs.
>   	  The watchdog timer is stopped when initialized.