From patchwork Thu Jul 7 07:00:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Zhang X-Patchwork-Id: 12909123 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 B6AECC43334 for ; Thu, 7 Jul 2022 07:07:18 +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=SA2pxhKBUuswjpe18e6jkTjnQnYj01kGEvnRAKXUNbY=; b=xlLC9OHkwC/xcVSff5no2am5US QThFNAH0Rf8TgSWB+XaR/BFlzvsCgwyFF3MfN5ovashhmssSgOubVFfa357DQVcOL5FYQivbVoSYX TzoUaxovkckxt/1pT7dbd8HCyhn28b2E11jg/8irjQmIsadbfnjq+5wKKfN3teZ1nvrY1NVWusniv BLQMkghXQEUvyaZ8FbIDtnntrFEUiXNgMY+A92qsu0aD3Vp1P1EbVDIb4xSEfeE7LsEzoEKyj0AhO /GlpFKd8m/tquqoewom54kQ2X8EHutPzxicgLwz95Y09UTRA3Zhf1ILki5PHUhBZEyQ6Bal2qOYRe qVV8JJNA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9LaE-00ENho-LD; Thu, 07 Jul 2022 07:05:56 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9LWj-00EKqf-RJ for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2022 07:02:20 +0000 Received: by mail-pg1-x533.google.com with SMTP id 73so1438527pgb.10 for ; Thu, 07 Jul 2022 00:02:15 -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=bNBEBJyqzUhb48mmUrG2Lbp6vWs90hk0saSNsxFLbuA=; b=XgaTlsKZrXhAUNVDsKQbW/IbMEn4fA3dXX9Mq/1g3vuEexNnFFVITJQpA1bxLIMEVb 2dgof7EMIGvGN9z3APhVW5ed5n8Fp0PgvgbCdYhYNDFWIKYG+kI+oT0NAzjzYXSpXMng GTh2x18fHIyKU1/N/W/aFaDInFM4mqiuH6Rm4= 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=bNBEBJyqzUhb48mmUrG2Lbp6vWs90hk0saSNsxFLbuA=; b=u7gShdcO8UXMd0WjdA8W72pM7yPA886h8A1lvfHA2g1bisypjaPoeJxRujl90GWBgQ qIz8rGNgU05xQ8om9vFpA95rBX7DUhzd4IjhLc/aB7sRQpyV5hrAsqutWGQohM5EwDzQ 3NmNiRRbni5ze/eWQFlaPaPuUUjB3zE0eKrO88ruGSeNk7dQtBbHL8IqK5a+DWG4RvgA TLWEJMqCjonuRM8Vgd8l+5MDMoIJxtXWzwybMfZHS1MrBBgEFbqaCqZ+sCRmfxO6ZMcL PNAK+FoJbsZgwaJh1iJMwCosp0BPQf9d0lvUkoQaS87BC+4FtaVA4HAniI22vMiNf/VN BeFA== X-Gm-Message-State: AJIora/fMmfVXlik0bw+IB8Fw3NEGA9R/oHcdWEb+aM+fG7USp7r0sid nSvXjO/w9NYFeokaiqmzYEUuo7fSr+Hw7rgGVmQ22TWricnJ1g4Mx/Gcb0dWtFR8AoN7uon7/er husaHEvxVywkz2FLiXTyIGQ8hwZVjhZN1fvZjNdWESm81YMOTlME/iJ/BALjqSLrlqywwAswKYQ BJngCjkpeyJsPVMJ8yy/Q= X-Google-Smtp-Source: AGRyM1t2DE9ibu6bkz4BeglaLbRhyxxPWbT7flgw2V81ZowLY5UW/N5TUSFgfEP2l8FHl8rgF0VO9Q== X-Received: by 2002:aa7:8e45:0:b0:528:9e96:744b with SMTP id d5-20020aa78e45000000b005289e96744bmr10946819pfr.19.1657177334287; Thu, 07 Jul 2022 00:02:14 -0700 (PDT) Received: from ubuntu-22.localdomain ([192.19.222.250]) by smtp.gmail.com with ESMTPSA id d21-20020a17090abf9500b001ec9b7efec2sm18291626pjs.5.2022.07.07.00.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:02:12 -0700 (PDT) From: William Zhang To: Linux ARM List Cc: Broadcom Kernel List , joel.peshkin@broadcom.com, dan.beygelman@broadcom.com, kursad.oney@broadcom.com, f.fainelli@gmail.com, anand.gore@broadcom.com, William Zhang , Ray Jui , Russell King , Scott Branden , linux-kernel@vger.kernel.org Subject: [PATCH v2 5/8] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA Date: Thu, 7 Jul 2022 00:00:35 -0700 Message-Id: <20220707070037.261532-6-william.zhang@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220707070037.261532-1-william.zhang@broadcom.com> References: <20220707070037.261532-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-20220707_000217_976280_C8D7BF00 X-CRM114-Status: GOOD ( 17.14 ) 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 Kconfig for BCM63138 and merge its selections to ARCH_BCMBCA. Delete bcm63xx.c as it is no longer needed. Signed-off-by: William Zhang --- (no changes since v1) 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