From patchwork Fri Jan 31 21:08:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13955858 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 95463C0218F for ; Fri, 31 Jan 2025 21:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7o/Mo7PEZVnBLaRHOpCeyBG7g5T7BpBoFkyQBh8RW7I=; b=UKLiYYpV9dEht4cZE2OkeWoDBb 53TcQGZA84X+YVtUn9+cZWuZ/K9OjThujALyVn8stlpKKPOETVB1yFuXX599wCpMJK0cc/DuXAWT6 0k2YOLL4D2LBXec16UNyY8FMxAmm0TnesUQ1rbimwz8zxJKD/GobPwNWEzvuS5U1w7bpbdZQeLWOn DwHQIuHFaYdr+C7rNpEvRr1OZYAnYjtzu1Q4Et1MVPQA8cbyIQmjKZcJIWRDfPKhTKZAhxaYXGz9F 6gBa/VWA2WJ4n8JJ7CCIYLK1TSuF9IfafblzvKY+djaA/RinaLXdhhBdaURYAwwyHFfxcutWgcDUj L25qEc3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tdyJA-0000000BQwf-0HOd; Fri, 31 Jan 2025 21:12:12 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tdyFw-0000000BQEp-1gJa for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2025 21:08:53 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 1897BA414E5; Fri, 31 Jan 2025 21:07:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFE3BC4CEE3; Fri, 31 Jan 2025 21:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738357731; bh=hMG0Y6gWueOlmwyswPIHvrcICb1asfhtGWiaIHkDqUk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IvC+KNEBpSzkQFiGkETJZRvRtqGu/lYPn+oL2jh8sNk1KplgaDB3kE7AD1t5bKOOx s3JIYKU55/SgRdAsP/wFsOG6PCHPRfAShus+fZsKyoyUaGagWiL9UuK6NGvtwPcY6W zQZP8p6wqRlimNfziZq5T0SAfd4HC4eW+SAitPP50bvLn7Yx3VMybUR1x2Yknty27X CxnKgY36aDzyqhwQzxnRtOVzfHHj787rmMn3kSY4RRfs0nxkztnnzKR420vp6J4ZwU Xy7ANee/jHDwm0cAsgAUfYLFms9CEaUcTpBbnHHc6YsLl+OzzY46+98JedJZ6PGDPI pGzbOkIw3W4Og== From: "Rob Herring (Arm)" Date: Fri, 31 Jan 2025 15:08:25 -0600 Subject: [PATCH 1/6] dt-bindings: marvell: armada-37xx: Add glinet,gl-mv1000 compatible MIME-Version: 1.0 Message-Id: <20250131-dt-marvell-fixes-v1-1-55f9f6acd4b1@kernel.org> References: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> In-Reply-To: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley , Robert Marko Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250131_130852_505066_422DCBFB X-CRM114-Status: UNSURE ( 8.00 ) X-CRM114-Notice: Please train this message. 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 "glinet,gl-mv1000" is already in use, so add it to documentation. Signed-off-by: Rob Herring (Arm) --- Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml index 6905d29f3108..51e1386f0e01 100644 --- a/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml +++ b/Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml @@ -18,6 +18,7 @@ properties: items: - enum: - cznic,turris-mox + - glinet,gl-mv1000 - globalscale,espressobin - marvell,armada-3720-db - methode,edpu From patchwork Fri Jan 31 21:08:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13955859 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 936A3C0218F for ; Fri, 31 Jan 2025 21:13:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kpXIxb/MdG+ObimhZZPZ1lZIvIZbSlS8h5Q34NbFtkQ=; b=wf1P6k2I3r8VviEienQi27xIcb QuFiVJrCmCEvvmsABo0ij7g3/sfqmdnXQyCHEYIa7x4QMJpUaMue9++TYeKqQk/1md4mJ6WsrZ5Iw 8fsbuoQ1XsXPF8BmOwaHnxinAPVLhq5zZNoob8kxpqUrNnP7DKn7qbdrz9xa+/Mv7k2iI8kVXPG6O 7EISw6xevMMIcKO7i6+v087KmxsqQNEgJoFhhiiF9JFDO+4RMbERlqyf9LjHCjbXXc9XJw0NTTxdo plqoE7bfUiSxNVYB2T+q6jmtfRWStrxhbJvgS/eGar0fy/KLdEH5r814cPHtN80Ru6IA3Q2yJdH8q b/APmo8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tdyKQ-0000000BR1t-2pIo; Fri, 31 Jan 2025 21:13:30 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tdyFx-0000000BQFK-1q0J for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2025 21:08:54 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 1FA42A41D69; Fri, 31 Jan 2025 21:07:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C86CC4CEE8; Fri, 31 Jan 2025 21:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738357732; bh=pA+myvP/+kW1tdoHHa/+v6g0X2wfWCQZqyzpEqfgcMc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ohvzy+TabFrY6iS6xeJZEo4sxmIOz0CCgw/N9/H4opjDL8Mg+x+jq2Iw5bRy6wCD7 T84n0CStOA1aHBbZvKmg4wngVDvh9rmnkk6KOlPSkZzXiZZ2VCX+mUrL8upYQ/coaB ZkQLBBBSH35F8G7qlXYTwR/hCIos52dcyyxa6jReOcq9HVC7Vro91wDLym1MFVEoqx xG3isCLOYOmvJQGG3qwAu/oVtc69k/cuOhdk6VR+sbGSQmUKLod2hKdTMTYu9QBDyS SYKqVexA/e5CqaWqo0GPhkXmNZbIE+XD7tZbQUYN/nehrD2rxX82nOej3+RSY4g3aW GazuWSp/T2ZPw== From: "Rob Herring (Arm)" Date: Fri, 31 Jan 2025 15:08:26 -0600 Subject: [PATCH 2/6] dt-bindings: marvell: armada-7k-8k: Move Armada 8KPlus to schema MIME-Version: 1.0 Message-Id: <20250131-dt-marvell-fixes-v1-2-55f9f6acd4b1@kernel.org> References: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> In-Reply-To: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley , Robert Marko Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250131_130853_557440_11552C25 X-CRM114-Status: GOOD ( 11.00 ) 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 Move the text binding for the Armada 8KPlus to the existing DT schema for Marvell 7k and 8k SoCs. Signed-off-by: Rob Herring (Arm) --- .../devicetree/bindings/arm/marvell/armada-7k-8k.yaml | 8 ++++++++ .../devicetree/bindings/arm/marvell/armada-8kp.txt | 15 --------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml index 538d91be8857..f1a7e6576306 100644 --- a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml +++ b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml @@ -39,6 +39,14 @@ properties: - const: marvell,armada-ap806-quad - const: marvell,armada-ap806 + - description: Armada 8080 SoC + items: + - enum: + - marvell,armada-8080-db + - const: marvell,armada-8080 + - const: marvell,armada-ap810-octa + - const: marvell,armada-ap810 + - description: Armada CN9130 SoC with no external CP items: - const: marvell,cn9130 diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt b/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt deleted file mode 100644 index f3e9624534c6..000000000000 --- a/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt +++ /dev/null @@ -1,15 +0,0 @@ -Marvell Armada 8KPlus Platforms Device Tree Bindings ----------------------------------------------------- - -Boards using a SoC of the Marvell Armada 8KP families must carry -the following root node property: - - - compatible, with one of the following values: - - - "marvell,armada-8080", "marvell,armada-ap810-octa", "marvell,armada-ap810" - when the SoC being used is the Armada 8080 - -Example: - -compatible = "marvell,armada-8080-db", "marvell,armada-8080", - "marvell,armada-ap810-octa", "marvell,armada-ap810" From patchwork Fri Jan 31 21:08:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13955860 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 3CEC8C0218F for ; Fri, 31 Jan 2025 21:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TFqxtCc0DMueUMEFIVJfUgZ9qFoe0P9JLtt4xvUJJdQ=; b=KzvAIX9VTe/1rVvozObI4EvEFY uCFVDbcf47lsIQOHVS+WdzvTx7sSScj3kjc/VFH7EAr1atWkzp8pZqAISEBsmn48ze2+eT7XIpLM9 AWnQ+meYtl2w0TGM86tlWqa9tDyGSCdSw0wh0qffLZ113ImwADxI/ZiRoCja3I+cDepUwxeejSKCE pJd6cNl0w6gzSo0E0YxWVUDOfcw3kMenCv+0dUnJOQH+JT3Tz2+AbOjCTDYAwqeLNtIRNjW4U5Yqi cP7GNJ+L81u3fcfcy+5a9LBX1sclsqzofT0EKd3UZQI2P8a0r6ML4JcTT0s5ff25XGU6bHAAJiMI8 xQi0IcMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tdyLh-0000000BR7D-1a62; Fri, 31 Jan 2025 21:14:49 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tdyFy-0000000BQFk-2cDS for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2025 21:08:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 570F4A4255D; Fri, 31 Jan 2025 21:07:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9378CC4CEE7; Fri, 31 Jan 2025 21:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738357733; bh=RJ05aPYqi6Of4mqMNLTsRwytI7XXfUy6aHeMa00xhm0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=V/v/u9OULjLBlZAbG9SfvhJWjqvHfxKpgA5GPv0nwU0mHTR9VjASNL/XIkUjyF0iE IfWOHjp8IA+BZyPEGxr17rvbGNTGpLoMKxRKyUcFBMgH35stA4dwL8OCC2WQAGsDNV utBnLlomkRAf7JHR8dKlv+2dxUDe3Jqp5U07YciF+HrPGhRdowJGIHCqmsSHwIXGDE V/dqA3WUe8bJ302e+raJpmcKspc8rKkTbzkzYfEE4SatrqRUMI9Y5CVKpaKUuXxEKN wsCPAOaROnaPucrSQraCQP+BL56s+RkmpN/ZOY9CzyWWxM2sp4AHjnOYBRcMWVqdOv Tl+Fm2cQJrTOg== From: "Rob Herring (Arm)" Date: Fri, 31 Jan 2025 15:08:27 -0600 Subject: [PATCH 3/6] dt-bindings: marvell: armada-7k-8k: Add missing 7040 and 8040 board compatibles MIME-Version: 1.0 Message-Id: <20250131-dt-marvell-fixes-v1-3-55f9f6acd4b1@kernel.org> References: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> In-Reply-To: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley , Robert Marko Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250131_130854_731394_B088475D X-CRM114-Status: UNSURE ( 8.66 ) X-CRM114-Notice: Please train this message. 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 There's a number of board compatibles already in use, but not documented. Add them to the schema. These are added to the existing entries which are missing any board specific compatible. Entries with only SoC compatibles should not have been allowed in the first place. Signed-off-by: Rob Herring (Arm) --- .../devicetree/bindings/arm/marvell/armada-7k-8k.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml index f1a7e6576306..4bc7454a5d3a 100644 --- a/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml +++ b/Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml @@ -23,6 +23,9 @@ properties: - description: Armada 7040 SoC items: + - enum: + - globalscale,mochabin + - marvell,armada7040-db - const: marvell,armada7040 - const: marvell,armada-ap806-quad - const: marvell,armada-ap806 @@ -35,6 +38,20 @@ properties: - description: Armada 8040 SoC items: + - enum: + - iei,puzzle-m801 + - marvell,armada8040-db + - solidrun,clearfog-gt-8k + - const: marvell,armada8040 + - const: marvell,armada-ap806-quad + - const: marvell,armada-ap806 + + - description: Armada 8040 SoC MACCHIATOBin Boards + items: + - enum: + - marvell,armada8040-mcbin-doubleshot + - marvell,armada8040-mcbin-singleshot + - const: marvell,armada8040-mcbin - const: marvell,armada8040 - const: marvell,armada-ap806-quad - const: marvell,armada-ap806 From patchwork Fri Jan 31 21:08:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13955861 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 B8CEEC0218F for ; Fri, 31 Jan 2025 21:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OmsVuclXwm8PQr/6LB1+/Fwu0UzhPKdMvCNKYvU09X4=; b=KkFPsjPmjZwXOyetB429++NKSO rwgLcv0OJuexl9ibaUCIiI6iLg7V3epAenEbSZZcbI5CGKW9YJvuOGVu97DaS9+JM1m94hdBCz2p5 lSYKsLn9sL99CbyUf+qa8IyElFbPIpbAmx6C/TnJA/1gVZInvHlShW+KgdBGJYDW/jxubcOpe1RNl GGqUbOzn1j/05mHgY66xr1x16vEJqjcetNa+Aw5HlDDZHZjlGkyNC2ci+4+oY9mC2d3GdBuj23OA+ 6KYoqEeQB89bpYxZZLS5+DZIndbmUa/V/tyq/Bgk38IxFkdd6K4kZii/VzPxvwyn+sud7Ipz0tcFP d9AQ/mQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tdyMy-0000000BRCs-47sE; Fri, 31 Jan 2025 21:16:08 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tdyFz-0000000BQG5-3ybI for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2025 21:08:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id A768DA414E5; Fri, 31 Jan 2025 21:07:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC297C4CED1; Fri, 31 Jan 2025 21:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738357734; bh=Za+NrW98YddhKRc1vNrsOW2b1nHMoDqwrwHLpvFTyko=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=d+bxMNHZPlRF22IT7zGa3Ac+Qji07FTRbqfSCCIzU/hAbeswAo4pqPfkPCzGc7GeB 3H88VCmOo4RcP9ub1LeepYOAEH4tLXqg75aRH4QYjjBCPsYz11Pglw2s8C+KiWYFEu Q6ISCQ1TAcKtlv6NSP+pkdNBCp73VcD7A2SHcWkJRZLWt0KdxF9YwTWqpcrYD6rmt5 gNO24LAbzWgbNS2Lzsg4eEIEh7TfQS+mSN91w8kS/jiDtRAu+wu6ttFQiB09J8KlDn PlAjfjRULeJU1/Yxcw6lf/L+ZWWgApoZel61Q4OCXgkr1hHm2GtICtUyWLwt1uZXlf dk9K1+QuOG92w== From: "Rob Herring (Arm)" Date: Fri, 31 Jan 2025 15:08:28 -0600 Subject: [PATCH 4/6] arm64: dts: marvell: Drop incomplete root compatible/model properties MIME-Version: 1.0 Message-Id: <20250131-dt-marvell-fixes-v1-4-55f9f6acd4b1@kernel.org> References: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> In-Reply-To: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley , Robert Marko Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250131_130856_130083_7091E100 X-CRM114-Status: GOOD ( 15.23 ) 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 The Marvell .dtsi files define model and compatible properties which aren't complete. They are missing board compatible for example. This is mostly harmless as the properties will typically get overwritten. However, with these there will not be any warning should a board .dts forget to define its compatible and model. armada-371x.dtsi is not used anywhere, so it can be removed entirely since there is nothing left in it. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/marvell/armada-371x.dtsi | 17 ----------------- arch/arm64/boot/dts/marvell/armada-372x.dtsi | 3 --- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 -- arch/arm64/boot/dts/marvell/armada-7020.dtsi | 6 ------ arch/arm64/boot/dts/marvell/armada-7040.dtsi | 6 ------ arch/arm64/boot/dts/marvell/armada-8020.dtsi | 6 ------ arch/arm64/boot/dts/marvell/armada-8040.dtsi | 6 ------ arch/arm64/boot/dts/marvell/armada-8080.dtsi | 6 ------ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 3 --- arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 3 --- arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 5 ----- arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 3 --- arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 5 ----- .../boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi | 1 - arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 2 -- arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi | 3 --- 16 files changed, 77 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-371x.dtsi b/arch/arm64/boot/dts/marvell/armada-371x.dtsi deleted file mode 100644 index dc1182ec9fa1..000000000000 --- a/arch/arm64/boot/dts/marvell/armada-371x.dtsi +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Device Tree Include file for Marvell Armada 371x family of SoCs - * (also named 88F3710) - * - * Copyright (C) 2016 Marvell - * - * Gregory CLEMENT - * - */ - -#include "armada-37xx.dtsi" - -/ { - model = "Marvell Armada 3710 SoC"; - compatible = "marvell,armada3710", "marvell,armada3700"; -}; diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi index 02ae1e153288..b99ac4c03a48 100644 --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi @@ -12,9 +12,6 @@ #include "armada-37xx.dtsi" / { - model = "Marvell Armada 3720 SoC"; - compatible = "marvell,armada3720", "marvell,armada3700"; - cpus { cpu1: cpu@1 { device_type = "cpu"; diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 9603223dd761..4e5ff7f67e33 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -11,8 +11,6 @@ #include / { - model = "Marvell Armada 37xx SoC"; - compatible = "marvell,armada3700"; interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm64/boot/dts/marvell/armada-7020.dtsi b/arch/arm64/boot/dts/marvell/armada-7020.dtsi index 4e46326dd123..570f901b4f4a 100644 --- a/arch/arm64/boot/dts/marvell/armada-7020.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-7020.dtsi @@ -8,9 +8,3 @@ #include "armada-ap806-dual.dtsi" #include "armada-70x0.dtsi" - -/ { - model = "Marvell Armada 7020"; - compatible = "marvell,armada7020", "marvell,armada-ap806-dual", - "marvell,armada-ap806"; -}; diff --git a/arch/arm64/boot/dts/marvell/armada-7040.dtsi b/arch/arm64/boot/dts/marvell/armada-7040.dtsi index 2f440711d21d..710ac44870bd 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-7040.dtsi @@ -9,12 +9,6 @@ #include "armada-ap806-quad.dtsi" #include "armada-70x0.dtsi" -/ { - model = "Marvell Armada 7040"; - compatible = "marvell,armada7040", "marvell,armada-ap806-quad", - "marvell,armada-ap806"; -}; - &cp0_pcie0 { iommu-map = <0x0 &smmu 0x480 0x20>, diff --git a/arch/arm64/boot/dts/marvell/armada-8020.dtsi b/arch/arm64/boot/dts/marvell/armada-8020.dtsi index ba1307c0fadb..b6fc18876093 100644 --- a/arch/arm64/boot/dts/marvell/armada-8020.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8020.dtsi @@ -9,12 +9,6 @@ #include "armada-ap806-dual.dtsi" #include "armada-80x0.dtsi" -/ { - model = "Marvell Armada 8020"; - compatible = "marvell,armada8020", "marvell,armada-ap806-dual", - "marvell,armada-ap806"; -}; - /* The RTC requires external oscillator. But on Aramda 80x0, the RTC clock * in CP master is not connected (by package) to the oscillator. So * disable it. However, the RTC clock in CP slave is connected to the diff --git a/arch/arm64/boot/dts/marvell/armada-8040.dtsi b/arch/arm64/boot/dts/marvell/armada-8040.dtsi index 22c2d6ebf381..3efd9b9e6892 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040.dtsi @@ -9,12 +9,6 @@ #include "armada-ap806-quad.dtsi" #include "armada-80x0.dtsi" -/ { - model = "Marvell Armada 8040"; - compatible = "marvell,armada8040", "marvell,armada-ap806-quad", - "marvell,armada-ap806"; -}; - &cp0_pcie0 { iommu-map = <0x0 &smmu 0x480 0x20>, diff --git a/arch/arm64/boot/dts/marvell/armada-8080.dtsi b/arch/arm64/boot/dts/marvell/armada-8080.dtsi index 299e814d1ded..32bb56f2fe3f 100644 --- a/arch/arm64/boot/dts/marvell/armada-8080.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8080.dtsi @@ -6,9 +6,3 @@ */ #include "armada-ap810-ap0-octa-core.dtsi" - -/ { - model = "Marvell 8080 board"; - compatible = "marvell,armada-8080", "marvell,armada-ap810-octa", - "marvell,armada-ap810"; -}; diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi index 3ed6fba1f438..82f4dedfc25e 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi @@ -8,9 +8,6 @@ #include "armada-ap806.dtsi" / { - model = "Marvell Armada AP806 Dual"; - compatible = "marvell,armada-ap806-dual", "marvell,armada-ap806"; - cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi index cf6a96ddcf40..f37f49c79a50 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi @@ -8,9 +8,6 @@ #include "armada-ap806.dtsi" / { - model = "Marvell Armada AP806 Quad"; - compatible = "marvell,armada-ap806-quad", "marvell,armada-ap806"; - cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi index 866628679ac7..ecfd5f70190b 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi @@ -8,11 +8,6 @@ #define AP_NAME ap806 #include "armada-ap80x.dtsi" -/ { - model = "Marvell Armada AP806"; - compatible = "marvell,armada-ap806"; -}; - &ap_syscon0 { ap_clk: clock { compatible = "marvell,ap806-clock"; diff --git a/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi index 8848238f9565..e8af7546e893 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi @@ -8,9 +8,6 @@ #include "armada-ap807.dtsi" / { - model = "Marvell Armada AP807 Quad"; - compatible = "marvell,armada-ap807-quad", "marvell,armada-ap807"; - cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi index a3328d05fc94..550bdba7aeb9 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi @@ -8,11 +8,6 @@ #define AP_NAME ap807 #include "armada-ap80x.dtsi" -/ { - model = "Marvell Armada AP807"; - compatible = "marvell,armada-ap807"; -}; - &ap_syscon0 { ap_clk: clock { compatible = "marvell,ap807-clock"; diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi index d1a7143ef3d4..2e719ffc8289 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi @@ -11,7 +11,6 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; - compatible = "marvell,armada-ap810-octa"; cpu0: cpu@0 { device_type = "cpu"; diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi index 2f9ab6b4a2c9..f824eb56b0e2 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi @@ -10,8 +10,6 @@ /dts-v1/; / { - model = "Marvell Armada AP810"; - compatible = "marvell,armada-ap810"; #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi b/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi index cb8d54895a77..a997bbabedd8 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi @@ -7,9 +7,6 @@ #include / { - model = "SolidRun CN9130 SoM"; - compatible = "solidrun,cn9130-sr-som", "marvell,cn9130"; - aliases { ethernet0 = &cp0_eth0; ethernet1 = &cp0_eth1; From patchwork Fri Jan 31 21:08:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13955862 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 893D8C0218F for ; Fri, 31 Jan 2025 21:17:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LOMagjVk/RHMeRQd+AcBOL2NXRKa31WOVE1JJnG35Y0=; b=ynkzg87KZDHI63VvuEbRG/DQn5 aU/4EDJ4j/ZPvcZX2ELJJ0DT2TtTr9E5iDWP8jVXrDV8tFgu76B92j8d7SGcdua8ArmhwZ22I/LJP NnxNkhIczt6A0wqq2Pz4jg33vQgB4Dys1uYqkoDKw/y1wXhCWopTEyfCpd/rtj8IVRGI/x8Me95Mp wJMojKD9tWe9dfGzZ3UKA1nopYpeRc7XbHCla9/UUZfQc5q2tPXGahLXHDlF47BCXSg8q2Kz6PJkM Xg7UqOVhC8VlEDGn4Yldy+PgAj582vqkIVdTiU02nANgCFI73fY+dbBFNvakVvP19T1gFqAIgJOtp Mw/TSs8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tdyOG-0000000BRHf-2gIb; Fri, 31 Jan 2025 21:17:28 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tdyG1-0000000BQFk-0End for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2025 21:08:58 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 41BF1A42546; Fri, 31 Jan 2025 21:07:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3831C4CED1; Fri, 31 Jan 2025 21:08:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738357736; bh=y1XRJOOEojK7aHlX06znA6wDgkwys+QMiT/chEEavzk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=VclobnRrgpKlObwrwzhaDtJM0gusceIxnEajayKElBUfWzXjo6x6cEwD1msRJMwXC EY8YQmF/6eR2kiOJL11RWyTT7L1A7o/lTaIHC+x+YCoK71rWVAce2+V/8wiwm/x9Sj uVFG4q26hEyh4wKXfql3X+Mq8RPEDPdZdDLD86WZgujaHYhUQckpExiDM7jO6+WiEw rtngVPnUmGp9FffKJFv6QobySq2qNtVgxUjInfKxKW73KkE49it/ZOtX+8GjOy2JWI PT+t+/TNczBLyBeCP4gbgeu0ukgqrXebt05T6BcyAHNwYXRcY9AcNqvlYHU1n3Rq5F BL9RugIBtW8ng== From: "Rob Herring (Arm)" Date: Fri, 31 Jan 2025 15:08:29 -0600 Subject: [PATCH 5/6] arm64: dts: marvell: Fix missing/incorrect "marvell,armada3710" compatible MIME-Version: 1.0 Message-Id: <20250131-dt-marvell-fixes-v1-5-55f9f6acd4b1@kernel.org> References: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> In-Reply-To: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley , Robert Marko Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250131_130857_239272_F1C98B10 X-CRM114-Status: GOOD ( 10.27 ) 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 "marvell,armada3700" is not a documented compatible value. According to the schema, "marvell,armada3720" SoCs should have a "marvell,armada3710" fallback compatible. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +- arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +- arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +- arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +- arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +- arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +- arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts | 2 +- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts index 0cfb38492021..bd4e61d5448e 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts @@ -18,7 +18,7 @@ / { model = "Marvell Armada 3720 Development Board DB-88F3720-DDR3"; - compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3700"; + compatible = "marvell,armada-3720-db", "marvell,armada3720", "marvell,armada3710"; chosen { stdout-path = "serial0:115200n8"; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts index 6715a19c1483..5c4d8f379704 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts @@ -18,7 +18,7 @@ / { model = "Globalscale Marvell ESPRESSOBin Board (eMMC)"; compatible = "globalscale,espressobin-emmc", "globalscale,espressobin", - "marvell,armada3720", "marvell,armada3700"; + "marvell,armada3720", "marvell,armada3710"; }; &sdhci0 { diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts index b3cc2b7b5d19..97a180c8dcd9 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts @@ -13,7 +13,7 @@ / { model = "Globalscale Marvell ESPRESSOBin Ultra Board"; compatible = "globalscale,espressobin-ultra", "globalscale,espressobin", - "marvell,armada3720", "marvell,armada3700"; + "marvell,armada3720", "marvell,armada3710"; aliases { /* ethernet1 is WAN port */ diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts index 2a8aa3901a9f..75401eab4d42 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts @@ -19,7 +19,7 @@ / { model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)"; compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7", "globalscale,espressobin", "marvell,armada3720", - "marvell,armada3700"; + "marvell,armada3710"; aliases { /* ethernet1 is wan port */ diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts index b03af87611a9..48a7f50fb427 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts @@ -18,7 +18,7 @@ / { model = "Globalscale Marvell ESPRESSOBin Board V7"; compatible = "globalscale,espressobin-v7", "globalscale,espressobin", - "marvell,armada3720", "marvell,armada3700"; + "marvell,armada3720", "marvell,armada3710"; aliases { /* ethernet1 is wan port */ diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts index c5a834b33b77..1542d836c090 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts @@ -16,5 +16,5 @@ / { model = "Globalscale Marvell ESPRESSOBin Board"; - compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700"; + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710"; }; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts index 56930f2ce481..9f4bafeddd82 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts @@ -7,7 +7,7 @@ / { model = "GL.iNet GL-MV1000"; - compatible = "glinet,gl-mv1000", "marvell,armada3720"; + compatible = "glinet,gl-mv1000", "marvell,armada3720", "marvell,armada3710"; aliases { led-boot = &led_power; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 54453b0a91f9..f4d73c8b1a6d 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -14,7 +14,7 @@ / { model = "CZ.NIC Turris Mox Board"; compatible = "cznic,turris-mox", "marvell,armada3720", - "marvell,armada3700"; + "marvell,armada3710"; aliases { spi0 = &spi0; From patchwork Fri Jan 31 21:08:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13955863 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 469A2C02192 for ; Fri, 31 Jan 2025 21:18:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4Kv3tELbGRteR+FHvYsv5r70TIfhm0NNGS79jrWuxbU=; b=pU7P1qEwUQZzvEbUCwknYihJLY Elg84ywjZpEL7m5QUblVifsANbSuVCVYAGhnk9rhzP8dKTN25cVqqvAdzCMBJ0awfOoe5Q/gwQ0d5 n0TAIf3Hn0cWHSugTkkRmysRsgwJmjTHckGGjGO4+DccaKiYmsYba8O89GJZITBWTAPLv2OSrDH+E uaD/fEFxW4JdPQaAnOB9ti/6SKNs7iKfNoMQNQMrcYbZdg8Ba0/twDzCLgLLxXxFFFrxbuy5pc5ny yFoHCSfifuwuPMUA0pEddYRdd5LGoATjzZ0LGUfoOdRm8OKWqYyVwvDOFaXIBT9bmdjFR9FO69Wtr K4c1qnmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tdyPX-0000000BRQG-18vT; Fri, 31 Jan 2025 21:18:47 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tdyG1-0000000BQG5-3ebP for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2025 21:08:58 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 050C5A42566; Fri, 31 Jan 2025 21:07:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17FABC4CEE5; Fri, 31 Jan 2025 21:08:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738357737; bh=JiQ9WBmvrNQ9x4NMLYax8YWwyVUnldYxerF00xmFMyw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JXz6RVMIJK+JHZX+7RYvJ62oGvLA1lWYg0h4VNHnSlBA3x5Q0Wv9n37/HuaSsk4VA AtsScPkCEFELwmyiA0oWQgho4JzrOHSWC1HJ3h0Tn67ZzMbrhH2Rc9cPubGmA3RiYd CKVvWIGC+WoIwfxc3+yo4NEAJnuYJaP9HRSDCAiAMFHcZCLPt9OlC0cft8z8Axy3Ou My4Ey+8qpJwzqtqD5BQ4ceW+ndrPmyH5EiOHQ1FS4WAyUVHpb/VhR6AudR1IrYODMh R/fxT814MpYGlVfdc7xhTy7re467rWUnmiVs8GJig7vRtv+e0vu6/rhdPBLU/RWCGX YF17LZgxKVe9g== From: "Rob Herring (Arm)" Date: Fri, 31 Jan 2025 15:08:30 -0600 Subject: [PATCH 6/6] arm64: dts: marvell: Add missing board compatible for IEI-Puzzle-M801 MIME-Version: 1.0 Message-Id: <20250131-dt-marvell-fixes-v1-6-55f9f6acd4b1@kernel.org> References: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> In-Reply-To: <20250131-dt-marvell-fixes-v1-0-55f9f6acd4b1@kernel.org> To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Krzysztof Kozlowski , Conor Dooley , Robert Marko Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250131_130857_982224_20670493 X-CRM114-Status: GOOD ( 10.57 ) 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 The IEI-Puzzle-M801 board is missing a board compatible, so add one. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts index 9c25a88581e4..def25d51c4bf 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts @@ -13,7 +13,7 @@ / { model = "IEI-Puzzle-M801"; - compatible = "marvell,armada8040", "marvell,armada-ap806-quad", "marvell,armada-ap806"; + compatible = "iei,puzzle-m801", "marvell,armada8040", "marvell,armada-ap806-quad", "marvell,armada-ap806"; aliases { ethernet0 = &cp0_eth0;