From patchwork Wed Aug 3 17:54:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Zhang X-Patchwork-Id: 12935838 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 80F33C19F2C for ; Wed, 3 Aug 2022 17:59:02 +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=f1cEL+MOG89eBkD5UiinVH/ki5wGRBdiF5pQUBr74eg=; b=ZMVMbLkJ648NNUBdAicdcGuw4J K6tW6imEJB7eJtBFRSv6Ic5IsBeOiSF1yOTp4NKPg9iXuRyXAfxO9NL6kHiR6Tx7BJ0K+a+yBiWYI C0CnywfrAcrssDeCLm7SYuXBz5x7dcDqXub4DVnxrWtcdDg6RASVjv6sxJrrtN/l1bPA8ZitKLuno Nk1ltyoVX+x/mJJXzm3F9b9h2OBuVZsiFvCZshI1XuQ48NHKCO33WB8nfgEbQ2xcIyEeIecuxf+lG qwsOU/JLbvw/da21CGYUv6TyvAzIGF8sF2Y+R9Weorf9ZSmobfaaaUzdZJPwakxDrj03QfZSYBH2S 7ABe86hw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJIcy-0088mZ-08; Wed, 03 Aug 2022 17:57:52 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJIbr-00881b-Cv for linux-arm-kernel@lists.infradead.org; Wed, 03 Aug 2022 17:56:45 +0000 Received: by mail-pj1-x102d.google.com with SMTP id a8so3797949pjg.5 for ; Wed, 03 Aug 2022 10:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc; bh=y3uCjDnbaJEWfWE+B/45jeJwRwaVtD1SdDcmYdu/AkU=; b=OzkLgcG0TEc+/VByWBiStcy4eqAXEewPKiu4Lr1SPs1Qu/5h46cxLMXd9uEilnILMv zuIdPk3np0DdnIdyg4k2hPradHZDjUv2MT1KW1fJIfEYaho9gcY13qx9f5MQ28+9X6Jy 6QsZQYuZcQdgPr00+Vn4HPG67uf54LlsBwyvM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc; bh=y3uCjDnbaJEWfWE+B/45jeJwRwaVtD1SdDcmYdu/AkU=; b=8Ruhcmavsyn+ByKEYxTxx8aHpHBgODjM3zPalM7FzLnPa5IclVtfP1c6tQrjRuOqUW Qj4estcAaUClcvMQxuIEyAtbzOsUFFmAp4eWr2oLPeaRypHCDV949Z7EdXdGt5cyjk9Q WwMZ0k9Uufy1kOJXET8NEHXqzphAfHDv3uDxaRZ9cYET/laD6U2ZSNyT6an7GL8qnTH0 xD2I2u16wzyxvGPADYkH+vhGtBRij63wCMU4nTa7HMcSg3/WQqSWbXeQGiaUglVK1ONJ 3hUsvY9nc5bDgP03qHg65MTieHIkB7bPOZOhpfKKOPGJwPdzqDDzpF1RxJkUg7b7ctJd EX1A== X-Gm-Message-State: ACgBeo3Zx4kKCQmQ4xMujFc2COTgE2ACtUlP8sTUSVIMI/T4HRYwx4Be lhQVSSDWjzlfmPjsQYxffpFY7ZVqB6EovsQLJpkfjwP/1H3DsMqf2JtsM7IH3e+OFElqbtfuvA4 2D2izVNP5TTRKEcTBQOYfI6RD65dGVH14/OmmO4srfDo+JCfhej0SQx9Ohn/JimglCHkK4dcac4 MtosfMc/izh4ksUnjgMFE= X-Google-Smtp-Source: AA6agR7tL8u2UCuuUUN1grDUOuDR5fUKUE3JGofHB+dbaqrFr/jWWlYbqzeLGQMDC8z1W0gRJpvsVw== X-Received: by 2002:a17:902:d4d1:b0:16e:ec0b:75d0 with SMTP id o17-20020a170902d4d100b0016eec0b75d0mr15411247plg.123.1659549401837; Wed, 03 Aug 2022 10:56:41 -0700 (PDT) Received: from ubuntu-22.localdomain ([192.19.222.250]) by smtp.gmail.com with ESMTPSA id iw4-20020a170903044400b0016d150c6c6dsm2238639plb.45.2022.08.03.10.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 10:56:36 -0700 (PDT) From: William Zhang To: Linux ARM List Cc: Broadcom Kernel List , joel.peshkin@broadcom.com, dan.beygelman@broadcom.com, f.fainelli@gmail.com, krzysztof.kozlowski@linaro.org, rafal@milecki.pl, William Zhang , Anand Gore , Krzysztof Kozlowski , Kursad Oney , Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder Date: Wed, 3 Aug 2022 10:54:50 -0700 Message-Id: <20220803175455.47638-5-william.zhang@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220803175455.47638-1-william.zhang@broadcom.com> References: <20220803175455.47638-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-20220803_105643_475725_A62A8B57 X-CRM114-Status: GOOD ( 15.24 ) 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 As part of ARCH_BCM4908 to ARCH_BCMBCA migration, move the BCM4908 dts files to bcmbca folder and use CONFIG_ARCH_BCMBCA to build all the BCM4908 board dts. Delete bcm4908 folder and its makefile as well. Signed-off-by: William Zhang --- (no changes since v1) arch/arm64/boot/dts/broadcom/Makefile | 1 - arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 ----- arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 4 ++++ .../broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0 .../{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts | 0 .../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0 .../broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0 .../broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts | 0 .../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0 9 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (100%) rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (100%) rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%) rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (100%) rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (100%) rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (100%) diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile index e8584d3b698f..05d8c5ecf3b0 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -8,7 +8,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \ bcm2837-rpi-cm3-io3.dtb \ bcm2837-rpi-zero-2-w.dtb -subdir-y += bcm4908 subdir-y += bcmbca subdir-y += northstar2 subdir-y += stingray diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile b/arch/arm64/boot/dts/broadcom/bcm4908/Makefile deleted file mode 100644 index 6e364e304d4f..000000000000 --- a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile index 38f14307184b..d30fa75f0611 100644 --- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile +++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile @@ -1,5 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCMBCA) += \ + bcm4906-netgear-r8000p.dtb \ + bcm4906-tplink-archer-c2300-v1.dtb \ + bcm4908-asus-gt-ac5300.dtb \ + bcm4908-netgear-raxe500.dtb \ bcm4912-asus-gt-ax6000.dtb \ bcm94912.dtb \ bcm963158.dtb \ diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi similarity index 100% rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi