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>

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index df45bce21c6fd089c8d240098c690e35a8e90bfa..a6dd02f685a149982506da89a61da93eadcd1a8e 100644 (file)
--- 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 bd8f23fd96317343eea0ac51fe451d7fa7e39879..98f015a07f9709f82ec148d063d1b5756068ca60 100644 (file)
--- 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 5d006ca1ea07cc456b6df9f83e2d7f853a25027d..f8445e09633cc60e35d5f931f53e3b59befbca67 100644 (file)
--- 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 36095ccb7198385278b04a520b027b3b54749bfb..34b92ceaee08224a7767ccc0837f5348e8bcbd81 100644 (file)
--- 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 aef6d3f3668982f3d327097fa86dc31643ebdba6..3b726af8dbd963d8ec689a7b79f214f83051a9d1 100644 (file)
--- 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.