From 2dab3ee50c600e4e58f8bbf444ce8ffaee783916 Mon Sep 17 00:00:00 2001
From: William Zhang <william.zhang@broadcom.com>
Date: Mon, 22 Aug 2022 11:39:45 -0700
Subject: [PATCH] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with
BCM6858
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@broadcom.com>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
---
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 df45bce21c..a6dd02f685 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 bd8f23fd96..98f015a07f 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 5d006ca1ea..f8445e0963 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 36095ccb71..34b92ceaee 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -101,8 +101,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 aef6d3f366..3b726af8db 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -131,8 +131,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.
--
2.39.5