From patchwork Tue Jul 5 17:26:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Zhang X-Patchwork-Id: 12906891 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89DA0C433EF for ; Tue, 5 Jul 2022 17:28:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230058AbiGER2R (ORCPT ); Tue, 5 Jul 2022 13:28:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232949AbiGER1y (ORCPT ); Tue, 5 Jul 2022 13:27:54 -0400 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2CF320BCC for ; Tue, 5 Jul 2022 10:27:50 -0700 (PDT) Received: by mail-qk1-x733.google.com with SMTP id c137so9234463qkg.5 for ; Tue, 05 Jul 2022 10:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=VggLGykjJBGEkdAn/EbmWYesPUYJaU25kPRisPPLHD0=; b=KLr1aGrMNrD6jfoEFvXZZrDTjBbaK0/0DZVZblqByUMttCu54LhLLbdrSr6j0mpita +hUAuoC4iafwyHaoAS71aRZfAiNinFoaevhmeA9rK6vd0e8MeYrAPZ7SV0sVCP5XVeMe ABTG/GRvQ2CNEQEJIhY/FJwJ6ARCaHGOUqPvM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=VggLGykjJBGEkdAn/EbmWYesPUYJaU25kPRisPPLHD0=; b=gyEFn6ROdGLOcK+k8TWQK9ZQM0J4tLHvher0L+OfAT4e4XcSJFmKNhhQhvYqL3GziU aTBiVCVpZqlBGVyg7CnURTwmEcpM9foKwWxCW3Gft5hA0Kj+//AVarzMc/qaIg00iyXm TIT/NJIdWAq7GCp8oFEXn0/6ydTAWlqGthYxds0+wkik9sww41B4ApuWdc+zngenY7Q2 zOdm8BJ8nHxOIrt1v2sRsoUC8WJ+7iEPnJPHZ5UweYI90TKXfdkoV9xNtSG/Nxaax/WM so1XDptM45hcEtgwaqe9GaiQU4Kyzswgt3WZamoX2FQX0nI6aBnNY3W4m0mz0g+74qg6 /oYw== X-Gm-Message-State: AJIora+fEHl1T26L+UQ2wf+4WF1FCt98F+ndnh+vKjgXoTmXbjhQ9kQT nTEJgjr1gYd7Et6jBtTvBlN67Q== X-Google-Smtp-Source: AGRyM1tICpJBWTpJluwVWgvr/SiLOtLEOfN8aYULIVJ2nAnAkDYsCqqAiCqdyZRxsnO8pWoWjjJEXw== X-Received: by 2002:a05:620a:c1b:b0:6af:1f8c:d73d with SMTP id l27-20020a05620a0c1b00b006af1f8cd73dmr24124048qki.536.1657042069366; Tue, 05 Jul 2022 10:27:49 -0700 (PDT) Received: from ubuntu-22.localdomain ([192.19.222.250]) by smtp.gmail.com with ESMTPSA id d8-20020ac85ac8000000b00304e70585f9sm24439851qtd.72.2022.07.05.10.27.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 10:27:48 -0700 (PDT) From: William Zhang To: Linux ARM List Cc: joel.peshkin@broadcom.com, kursad.oney@broadcom.com, f.fainelli@gmail.com, anand.gore@broadcom.com, Broadcom Kernel List , philippe.reynes@softathome.com, dan.beygelman@broadcom.com, William Zhang , Al Cooper , Andre Przywara , Andy Shevchenko , Ard Biesheuvel , Arnd Bergmann , Cai Huoqing , Conor Dooley , Damien Le Moal , Eugen Hristev , Geert Uytterhoeven , Greg Kroah-Hartman , Herbert Xu , Jan Dabros , Jarkko Nikula , Jie Deng , Jiri Slaby , Kavyasree Kotagiri , Kishon Vijay Abraham I , Krzysztof Kozlowski , Lukas Bulwahn , Mark Brown , Matt Mackall , Michael Turquette , Nathan Chancellor , Nicolas Ferre , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Rob Herring , Russell King , Sam Protsenko , Stephen Boyd , Sunil Goutham , Sven Peter , Thomas Bogendoerfer , Tyrone Ting , Vinod Koul , Wolfram Sang , linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org, linux-i2c@vger.kernel.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, linux-serial@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA Date: Tue, 5 Jul 2022 10:26:09 -0700 Message-Id: <20220705172613.21152-6-william.zhang@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705172613.21152-1-william.zhang@broadcom.com> References: <20220705172613.21152-1-william.zhang@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead. Signed-off-by: William Zhang Acked-by: Wolfram Sang # for I2C Acked-by: Damien Le Moal Acked-By: Vinod Koul --- 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: