From patchwork Mon Jul 25 05:53:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Zhang X-Patchwork-Id: 12927762 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 68688C43334 for ; Mon, 25 Jul 2022 05:56:49 +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=aXqT9XvXFtTdPsS+OBNi/itS4eFQrigq4cw+kAHF2ME=; b=IKR8roTefknBLlUO3rjF5J51oJ xV7WEKPX3Q8c2BlW/V4rl3nlz8xknGFwFp9SHPPT3hziXjviXYEzWCcdihGiHe/m/7sGn2h0aIbz/ KqdFeU/z9kxL4M6Q0f41zeIPD8jhnYNgKaFVZVGEjja5PYDRQTTDCYW8wJzEogIoesHZRHY0ki7OL jaqLwk64H5Zow5Qv5QzzUu3j1HbiBfEb93/jNxTBTHpIBcsgdQw8PRI+9jItNXBLTEjCjwffO5qBi R1vxVO2Whb4VL6l/7fxnfZKwoxFZym1Eb6tDKlGqXfGDWlIqR6HqGO99Klw6vV+apC2vwuRfsA89m fzHPt7+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oFr4A-004nqu-9E; Mon, 25 Jul 2022 05:55:42 +0000 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oFr3P-004n0N-SL for linux-arm-kernel@lists.infradead.org; Mon, 25 Jul 2022 05:54:57 +0000 Received: by mail-pj1-x102b.google.com with SMTP id y1so1257332pja.4 for ; Sun, 24 Jul 2022 22:54:53 -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=5XLquCb9T7jtVIxfCDaCQ7FqKH0r3uf6hrc/joGlvkg=; b=DuH7RB3yw6+9j46/55XJyiICvUJhFHn7mDEudAgqvLAIko+PAaVnL8BEWPjyGKaEsj 1WdAjt7L+VyWf7IEJ/8/Og5/hsBBySFU41MGGyknAO59M3rp+S3neSVWhp3EMRNB4k1r ZbTMjNsFe3GGX0DvTrSfqHcjdQBlgqet7d0qo= 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=5XLquCb9T7jtVIxfCDaCQ7FqKH0r3uf6hrc/joGlvkg=; b=u6dJvzkxhb7k0PxnLL8QTTAME1Kko0MWq0yYb6wXkreu5Ta5yjeyhRroVU/BPqq//P G5BhUT9nMv3Pbvt3DTVFKq5vKjpqwuFp+U3ukS2RJDSMJzqoqwmYkCzkMwmps+ZLZfpM GP1FoQvEpMJg1DFkrNZ+hGmbq7fabmSpTDNzxVcojDUTRqi22kKvrCFP/ATJfXUvixyq kUPMyXUfSAlxgbvzH86A0Z6qF+wYh3tJ/S58OVrZCMwNnFEsnarxxqb3vozJSlajFLgU 5cQTjGRvf4D3OXMrWFXP9aMo87+tiglenz4YbLA6wgkHdRX/mLlWP9zp/QqQwfPaSAka qSwA== X-Gm-Message-State: AJIora+eue+B5XOc0mJsNp51WO9hBMpbqqxht4IUI2itKLmOqL1i1kh1 vIj7F/6NAE8zeDnLhlgkGtHsItnFOPlh+HWGTPid6yj/I70U2u1y0H7t6Ugv3QJo/kUsSjfDdSq 9+iRfnticuE2ooEpCxVuBJzQ2iTt6ls+9tYw4Mhie68csML7G2fwZwayLbNcsyBp+G8j5ZtG6Pa kd2QGsUoG5LKFo+cSvuzo= X-Google-Smtp-Source: AGRyM1vyjds/F/mnDWXWFDdmcRG6BVHziWCsHy6g1IV6hQKmaqPOywnItHFw/RXgBOIH+r5QNs9GqA== X-Received: by 2002:a17:902:8bcb:b0:16c:a264:77ae with SMTP id r11-20020a1709028bcb00b0016ca26477aemr10591359plo.130.1658728492551; Sun, 24 Jul 2022 22:54:52 -0700 (PDT) Received: from ubuntu-22.localdomain ([192.19.222.250]) by smtp.gmail.com with ESMTPSA id m5-20020a170902bb8500b0016c4331e61csm8198910pls.137.2022.07.24.22.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jul 2022 22:54:52 -0700 (PDT) From: William Zhang To: Linux ARM List Cc: joel.peshkin@broadcom.com, f.fainelli@gmail.com, Broadcom Kernel List , dan.beygelman@broadcom.com, anand.gore@broadcom.com, kursad.oney@broadcom.com, rafal@milecki.pl, krzysztof.kozlowski@linaro.org, William Zhang , Krzysztof Kozlowski , Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder Date: Sun, 24 Jul 2022 22:53:57 -0700 Message-Id: <20220725055402.6013-5-william.zhang@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220725055402.6013-1-william.zhang@broadcom.com> References: <20220725055402.6013-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-20220724_225455_954225_38FFD9E6 X-CRM114-Status: GOOD ( 15.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 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