From patchwork Tue Jul 5 17:26:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Zhang X-Patchwork-Id: 12906910 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1D46C43334 for ; Tue, 5 Jul 2022 17:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CuzEWc7Ajj2n9yVMVWjzyn8wmFQ2zg6ClE0oyPU9TP0=; b=1kZ+GjjQ96DDu/nHGFLz2vfjle oqH0+PxX8aCE2QndwsQhP0nGsy4OxLyRDH3taI4uxUOiFqCA9omxF8n+SGsH4HnGw4Dl3XGrd3Ueq aGA/PyTx32K5T7+cqLVDvizhE5cvLhW+r8u36av0f0EUWH2xIzhUwj8b52mhpbVgQy5xwd5KyDel5 G2rcBdq6OeOnzZn6LgBN6IJhWbJWiZpmOhUXw1u2fdlpnOYjO6KoVWea8aOkYqOmpM4/JyvvINCVb BqvphtzQk/ILHdm2GyMt3EVjYqXcPYZr3xz+zysCXdNeRuqWOgqoRssRNF6vARNIEgGt6dzZMGwhr QKOo1QTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8mLV-001rsE-VW; Tue, 05 Jul 2022 17:28:22 +0000 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8mL2-001riB-Ql for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2022 17:27:54 +0000 Received: by mail-qk1-x736.google.com with SMTP id z7so9214893qko.8 for ; Tue, 05 Jul 2022 10:27:52 -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=bvJrf67yolog0rk7MONe06nPIgm9X8Ti/2e4wPyU868=; b=I0Nn3VFBaFAU91Dn01tKu6WzUpdjG88ct1W5VSH3w7x3AdL8HZRbh8+24MigX/OMtF j6nQheZkbR7dkCVhtOoOrLphuDX/QVh+KkEFqhhdgkilI7bGXNO5G+cpnqj1q2rYHS2K JzJre8SivAaTRC245PCbEdEr78jrsl27YK4Fk= 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=bvJrf67yolog0rk7MONe06nPIgm9X8Ti/2e4wPyU868=; b=N4Z176xeAf8zclCdMJapF0f4FBgV7kwjZ5XiTsA+65197BKWSaqyZ7pT9p9I+ZKXHt f5rYkSBDuse53mdj4Xg1x+/+4I8triAT8z0FV5QWVUVDu/i7iYMY7+wk4+ehTVj1SenR XTWleU8/jJ+pBng6MiJG0D5Wt8cJddljatEnktKnVFqL6yc/fWsEpXxrqsvhX48lk41o qduax6OmZZmJsBIgDGP96z2Ueg4D5D7tjUz6Yj7PBULVYYSeC1fwsFY/ylaab7lJZwuv bUtGJT1LZT8TUAbFuFdxU4F6++xtTg57wcVe+hyNxdIOcfgAOOorr4wYVNPd2iBhV3R9 9k3g== X-Gm-Message-State: AJIora8sDeXVhUJSpMN9ewst+uNyeIr+L9LanrX4PYSy3k5+eIidG7PM tojt2MY8Zhd8lIUnR7MofJt7oQegv0z1vx7jsjasrLxWx4loaJzdJieBwNriPPT/eqCO4OvqVQR uKCa6C7/emt82cICHVCocgEmZhuRIreVGeVTXjvamjsUJcawHc/p9ZXIuVG6hKS6IjRSFDqlniH q/tcv3V2LSvhpjSPIkNiM= X-Google-Smtp-Source: AGRyM1sjZVMU7HcPZNme7BuESeFgNh6a4NQb6dnJzNg1L1TwdUZL4oM2L02QuaKODQRLDgFgaivaRA== X-Received: by 2002:a05:620a:ec5:b0:6ae:e952:36a9 with SMTP id x5-20020a05620a0ec500b006aee95236a9mr23810667qkm.33.1657042071467; Tue, 05 Jul 2022 10:27:51 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 10:27:50 -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 , Ray Jui , Russell King , Scott Branden , linux-kernel@vger.kernel.org Subject: [PATCH 6/9] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX config to ARCH_BCMBCA Date: Tue, 5 Jul 2022 10:26:10 -0700 Message-Id: <20220705172613.21152-7-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220705_102752_932642_6005EEF2 X-CRM114-Status: GOOD ( 16.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove ARCH_BCM_63XX for BCM63138 and move it to ARCH_BCMBCA. Delete bcm63xx.c as it is no longer needed. Signed-off-by: William Zhang --- arch/arm/mach-bcm/Kconfig | 26 +++++++++----------------- arch/arm/mach-bcm/Makefile | 7 +------ arch/arm/mach-bcm/bcm63xx.c | 17 ----------------- 3 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/mach-bcm/bcm63xx.c diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index f73a056bf560..25aa4ef4db07 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -182,23 +182,6 @@ config ARCH_BCM_53573 The base chip is BCM53573 and there are some packaging modifications like BCM47189 and BCM47452. -config ARCH_BCM_63XX - bool "Broadcom BCM63xx DSL SoC" - depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER - select ARM_ERRATA_754322 - select ARM_ERRATA_764369 if SMP - select ARM_GIC - select ARM_GLOBAL_TIMER - select CACHE_L2X0 - select HAVE_ARM_ARCH_TIMER - select HAVE_ARM_TWD if SMP - select HAVE_ARM_SCU if SMP - help - This enables support for systems based on Broadcom DSL SoCs. - It currently supports the 'BCM63XX' ARM-based family, which includes - the BCM63138 variant. - config ARCH_BRCMSTB bool "Broadcom BCM7XXX based boards" depends on ARCH_MULTI_V7 @@ -224,10 +207,19 @@ config ARCH_BCMBCA select ARM_AMBA select ARM_GIC select HAVE_ARM_ARCH_TIMER + select ARCH_HAS_RESET_CONTROLLER + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 if SMP + select ARM_GLOBAL_TIMER + select CACHE_L2X0 + select HAVE_ARM_TWD if SMP + select HAVE_ARM_SCU if SMP + help Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based BCA chipset. This enables support for Broadcom BCA ARM-based broadband chipsets, including the DSL, PON and Wireless family of chips. + endif diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index 284ea2f8cbc2..25347d7049b8 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -50,12 +50,6 @@ ifeq ($(CONFIG_ARCH_BCM_5301X),y) obj-$(CONFIG_SMP) += platsmp.o endif -# BCM63XXx -ifeq ($(CONFIG_ARCH_BCM_63XX),y) -obj-y += bcm63xx.o -obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_pmb.o -endif - ifeq ($(CONFIG_ARCH_BRCMSTB),y) CFLAGS_platsmp-brcmstb.o += -march=armv7-a obj-y += brcmstb.o @@ -64,5 +58,6 @@ endif # BCMBCA ifeq ($(CONFIG_ARCH_BCMBCA),y) +obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_pmb.o obj-y += bcmbca.o endif diff --git a/arch/arm/mach-bcm/bcm63xx.c b/arch/arm/mach-bcm/bcm63xx.c deleted file mode 100644 index f855e361dfba..000000000000 --- a/arch/arm/mach-bcm/bcm63xx.c +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -// Copyright (C) 2014 Broadcom Corporation - -#include - -#include - -static const char * const bcm63xx_dt_compat[] = { - "brcm,bcm63138", - NULL -}; - -DT_MACHINE_START(BCM63XXX_DT, "BCM63xx DSL SoC") - .dt_compat = bcm63xx_dt_compat, - .l2c_aux_val = 0, - .l2c_aux_mask = ~0, -MACHINE_END