Re: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA

Damien Le Moal
2022-07-06T03:45:25Z

On 7/6/22 02:26, William Zhang wrote:
> Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>

For the ata Kconfig change:

Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

> ---
>
> arch/arm/Kconfig.debug | 2 +-
> drivers/ata/Kconfig | 2 +-
> drivers/char/hw_random/Kconfig | 2 +-
> drivers/clk/bcm/Kconfig | 4 ++--
> drivers/i2c/busses/Kconfig | 2 +-
> drivers/phy/broadcom/Kconfig | 2 +-
> drivers/spi/Kconfig | 2 +-
> drivers/tty/serial/Kconfig | 4 ++--
> 8 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9b0aa4822d69..792796a348c3 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -271,7 +271,7 @@ choice
>
> config DEBUG_BCM63XX_UART
> bool "Kernel low-level debugging on BCM63XX UART"
> - depends on ARCH_BCM_63XX
> + depends on ARCH_BCMBCA
>
> config DEBUG_BERLIN_UART
> bool "Marvell Berlin SoC Debug UART"
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index bb45a9c00514..1c9f4fb2595d 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -148,7 +148,7 @@ config SATA_AHCI_PLATFORM
> config AHCI_BRCM
> tristate "Broadcom AHCI SATA support"
> depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \
> - ARCH_BCM_63XX || COMPILE_TEST
> + ARCH_BCMBCA || COMPILE_TEST
> select SATA_HOST
> help
> This option enables support for the AHCI SATA3 controller found on
> diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
> index b3f2d55dc551..3da8e85f8aae 100644
> --- a/drivers/char/hw_random/Kconfig
> +++ b/drivers/char/hw_random/Kconfig
> @@ -87,7 +87,7 @@ config HW_RANDOM_BA431
> config HW_RANDOM_BCM2835
> tristate "Broadcom BCM2835/BCM63xx Random Number Generator support"
> depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \
> - ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> + ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> default HW_RANDOM
> help
> This driver provides kernel-side support for the Random Number
> diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
> index ec738f74a026..77266afb1c79 100644
> --- a/drivers/clk/bcm/Kconfig
> +++ b/drivers/clk/bcm/Kconfig
> @@ -22,9 +22,9 @@ config CLK_BCM2835
>
> config CLK_BCM_63XX
> bool "Broadcom BCM63xx clock support"
> - depends on ARCH_BCM_63XX || COMPILE_TEST
> + depends on ARCH_BCMBCA || COMPILE_TEST
> select COMMON_CLK_IPROC
> - default ARCH_BCM_63XX
> + default ARCH_BCMBCA
> help
> Enable common clock framework support for Broadcom BCM63xx DSL SoCs
> based on the ARM architecture
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index b1d7069dd377..acf2a393bd56 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -486,7 +486,7 @@ config I2C_BCM_KONA
>
> config I2C_BRCMSTB
> tristate "BRCM Settop/DSL I2C controller"
> - depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCM_63XX || \
> + depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \
> ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
> default y
> help
> diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
> index 849c4204f550..93a6a8ee4716 100644
> --- a/drivers/phy/broadcom/Kconfig
> +++ b/drivers/phy/broadcom/Kconfig
> @@ -83,7 +83,7 @@ config PHY_NS2_USB_DRD
> config PHY_BRCM_SATA
> tristate "Broadcom SATA PHY driver"
> depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || \
> - ARCH_BCM_63XX || COMPILE_TEST
> + ARCH_BCMBCA || COMPILE_TEST
> depends on OF
> select GENERIC_PHY
> default ARCH_BCM_IPROC
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 2d034459e79f..8e550269d488 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -183,7 +183,7 @@ config SPI_BCM63XX
>
> config SPI_BCM63XX_HSSPI
> tristate "Broadcom BCM63XX HS SPI controller driver"
> - depends on BCM63XX || BMIPS_GENERIC || ARCH_BCM_63XX || COMPILE_TEST
> + depends on BCM63XX || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST
> help
> This enables support for the High Speed SPI controller present on
> newer Broadcom BCM63XX SoCs.
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 8a3ee1525d80..e3279544b03c 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -1100,8 +1100,8 @@ config SERIAL_TIMBERDALE
> config SERIAL_BCM63XX
> tristate "Broadcom BCM63xx/BCM33xx UART support"
> select SERIAL_CORE
> - depends on ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> - default ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC
> + depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> + default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
> help
> This enables the driver for the onchip UART core found on
> the following chipsets:

--
Damien Le Moal
Western Digital Research