arm: bcmbca: replace ARCH_BCM68360 symbols in Kconfig with BCM6856

As CONFIG_ARCH_BCM68360 is replaced with CONFIG_BCM6856, 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 851f14deb46fadfdf79fb57465fbd3be890bf2b4..df45bce21c6fd089c8d240098c690e35a8e90bfa 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -110,7 +110,7 @@ config BCM2835_GPIO
 
 config BCM6345_GPIO
        bool "BCM6345 GPIO driver"
-       depends on DM_GPIO && (ARCH_BMIPS || ARCH_BCM68360 || \
+       depends on DM_GPIO && (ARCH_BMIPS || BCM6856 || \
                               ARCH_BCM6858 || BCM63158 || \
                               ARCH_BCM6753)
        help

diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
index d777414dda8d31349cb385ab91cdcccdd78fdf44..bd8f23fd96317343eea0ac51fe451d7fa7e39879 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 && (ARCH_BCM68360 || ARCH_BCM6858 || BCM63158)
+       depends on LED && (BCM6856 || ARCH_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 24c27b6ecf7fa92ae71ed5ac3d1643b50cade71c..5d006ca1ea07cc456b6df9f83e2d7f853a25027d 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -103,7 +103,7 @@ config NAND_BRCMNAND_6753
 
 config NAND_BRCMNAND_68360
        bool "Support Broadcom NAND controller on bcm68360"
-       depends on NAND_BRCMNAND && ARCH_BCM68360
+       depends on NAND_BRCMNAND && BCM6856
        help
          Enable support for broadcom nand driver on bcm68360.
 

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 667e4bd811992e512547c5148c22231ae5dad16b..36095ccb7198385278b04a520b027b3b54749bfb 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -101,7 +101,7 @@ config ATMEL_SPI
 
 config BCM63XX_HSSPI
        bool "BCM63XX HSSPI driver"
-       depends on (ARCH_BMIPS || ARCH_BCM68360 || \
+       depends on (ARCH_BMIPS || BCM6856 || \
                    ARCH_BCM6858 || BCM63158)
        help
          Enable the BCM6328 HSSPI driver. This driver can be used to

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 550bed70270897fd23ae3b2ef69c889584795c6a..aef6d3f3668982f3d327097fa86dc31643ebdba6 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -130,7 +130,7 @@ config WDT_AT91
 
 config WDT_BCM6345
        bool "BCM6345 watchdog timer support"
-       depends on WDT && (ARCH_BMIPS || ARCH_BCM68360 || \
+       depends on WDT && (ARCH_BMIPS || BCM6856 || \
                           ARCH_BCM6858 || BCM63158 || \
                           ARCH_BCM6753)
        help