Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B17FDC4361B for ; Thu, 17 Dec 2020 07:58:38 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 410BA23434 for ; Thu, 17 Dec 2020 07:58:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 410BA23434 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=marvell.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=E3efmOu7RDbMF3RLqpH6+/oVrm7br/9PfIYTl5C7dvc=; b=wXNDc/sL0sVKUJ4Aoo2EsmOTT hPpyBvYQLvNOMFTBEZkXHiICI/QfSX7SRViGbUz1nuf2S6TZoJIatMNjZIyv5jAweArdAGNnnpFlp SPQWbFQTUiBFaV/C7R+FrBgVr4MgVUfxQ5sAHE2UYxWSm3oUfETKSkcVXTdVGajzxa6WZmR6FWBlP M6jA0PTzc9KweXthpob3faSaKF9qaTu4AD6Cx12uxy1FK96T8kIDGahUdFNavvwhGYfdnMn9Qs8Ye zw9Gl6ldS2p+hiixgRqaZ6FbZFq/6/bSs0EDM8alLCj9i3MDbhXorA+Fo/F5wKCJCvpSgvArIocKa fsBKE0C8g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpo9s-0008Po-Tt; Thu, 17 Dec 2020 07:57:09 +0000 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpo9S-0008I0-Qd for linux-arm-kernel@lists.infradead.org; Thu, 17 Dec 2020 07:56:45 +0000 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BH7t6pf003188; Wed, 16 Dec 2020 23:56:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=sq1rGv0JF+jC8vVk9IiBr3mvM8yEQJCNga/I38JSMSs=; b=BiizHnn9pQBoaHXbWBDhUSdlwtDDJejFB3JyMMcIah4Fpud7cSTQJcnUUvTCj8SmiFZO HDU+v4hKbVJB3OYc9KsXreifdFCjcBoB//rKBT5XJROBmLXwoIlv3GACzEITsIOFSzA1 iBOm/nYOSI4EvDxtBolDq2Gg6pQmQ+X81Oonby6vzigT6F48oUxCDCwYj8l36eHHmwJA M00iyjp64vTxkfxIhWtMJRAYA7zS7H82UEHDR0syQ+BPd50IhG7IoXqWKMijXTMSXSwP yqXGb/nrVihRqe/+SYJUMq//XmjpMfCDG/JAGvKmXKxDYKM95S16qPgtZCyd0X71QQDH OA== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0b-0016f401.pphosted.com with ESMTP id 35cx8tev1b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 16 Dec 2020 23:56:39 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Dec 2020 23:56:37 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Dec 2020 23:56:38 -0800 Received: from vb-cavnet.porotchkin.lan (PT-LT0319.marvell.com [10.6.202.166]) by maili.marvell.com (Postfix) with ESMTP id D31893F7048; Wed, 16 Dec 2020 23:56:34 -0800 (PST) From: To: Subject: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards Date: Thu, 17 Dec 2020 09:55:41 +0200 Message-ID: <20201217075542.12472-4-kostap@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201217075542.12472-1-kostap@marvell.com> References: <20201217075542.12472-1-kostap@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-17_04:2020-12-15, 2020-12-17 signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201217_025643_112701_0C1E7AC9 X-CRM114-Status: GOOD ( 20.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tmn505@gmail.com, andrew@lunn.ch, jaz@semihalf.com, gregory.clement@bootlin.com, nadavh@marvell.com, robh+dt@kernel.org, Konstantin Porotchkin , stefanc@marvell.com, mw@semihalf.com, bpeled@marvell.com, sebastian.hesselbarth@gmail.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Konstantin Porotchkin The CN913x DB with topology B is similar to a regular setup (A) boards, but uses NAND flash as a boot device, while topology A boards are booting from SPI flash. Since NAND and SPI on CN913x DB boards share some wires, they cannot be activated simultaneously. The DTS files for setup "B" are based on setup "A", in which the CP0 NAND controller enabled and CP0 SPI1 disabled. Signed-off-by: Konstantin Porotchkin --- arch/arm64/boot/dts/marvell/Makefile | 9 +++++--- arch/arm64/boot/dts/marvell/cn9130-db-A.dts | 22 ++++++++++++++++++++ arch/arm64/boot/dts/marvell/cn9130-db-B.dts | 22 ++++++++++++++++++++ arch/arm64/boot/dts/marvell/{cn9130-db.dts => cn9130-db.dtsi} | 5 ++--- arch/arm64/boot/dts/marvell/cn9131-db-A.dts | 22 ++++++++++++++++++++ arch/arm64/boot/dts/marvell/cn9131-db-B.dts | 22 ++++++++++++++++++++ arch/arm64/boot/dts/marvell/{cn9131-db.dts => cn9131-db.dtsi} | 5 ++--- arch/arm64/boot/dts/marvell/cn9132-db-A.dts | 22 ++++++++++++++++++++ arch/arm64/boot/dts/marvell/cn9132-db-B.dts | 22 ++++++++++++++++++++ arch/arm64/boot/dts/marvell/{cn9132-db.dts => cn9132-db.dtsi} | 5 ++--- 10 files changed, 144 insertions(+), 12 deletions(-) create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-A.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-B.dts rename arch/arm64/boot/dts/marvell/{cn9130-db.dts => cn9130-db.dtsi} (99%) create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-A.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-B.dts rename arch/arm64/boot/dts/marvell/{cn9131-db.dts => cn9131-db.dtsi} (97%) create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-A.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-B.dts rename arch/arm64/boot/dts/marvell/{cn9132-db.dts => cn9132-db.dtsi} (97%) diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile index 3e5f2e7a040c..d9b924a63d89 100644 --- a/arch/arm64/boot/dts/marvell/Makefile +++ b/arch/arm64/boot/dts/marvell/Makefile @@ -13,6 +13,9 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-A.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-B.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-A.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-A.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb diff --git a/arch/arm64/boot/dts/marvell/cn9130-db-A.dts b/arch/arm64/boot/dts/marvell/cn9130-db-A.dts new file mode 100644 index 000000000000..adb3a67a20b1 --- /dev/null +++ b/arch/arm64/boot/dts/marvell/cn9130-db-A.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 Marvell International Ltd. + * + * Device tree for the CN9130-DB board. + */ + +#include "cn9131-db.dtsi" + +/ { + model = "Marvell Armada CN9130-DB setup A"; +}; + +/* Setup A has SPI1 flash as a boot device, while setup B uses NAND flash. + * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated + * simultaneously. When SPI controller is enabled, NAND should be disabled. + */ + +&cp0_spi1 { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/marvell/cn9130-db-B.dts b/arch/arm64/boot/dts/marvell/cn9130-db-B.dts new file mode 100644 index 000000000000..57e41cacd483 --- /dev/null +++ b/arch/arm64/boot/dts/marvell/cn9130-db-B.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2020 Marvell International Ltd. + * + * Device tree for the CN9130-DB board (setup "B"). + */ + +#include "cn9130-db.dtsi" + +/ { + model = "Marvell Armada CN9130-DB setup B"; +}; + +/* Setup B has NAND flash as a boot device, while regular setup uses SPI flash. + * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated + * simultaneously. When NAND controller is enabled, SPI1 should be disabled. + */ + +&cp0_nand_controller { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dts b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi similarity index 99% rename from arch/arm64/boot/dts/marvell/cn9130-db.dts rename to arch/arm64/boot/dts/marvell/cn9130-db.dtsi index d24294888400..8de3a552b806 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-db.dts +++ b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi @@ -10,8 +10,6 @@ #include / { - model = "Marvell Armada CN9130-DB"; - chosen { stdout-path = "serial0:115200n8"; }; @@ -235,6 +233,7 @@ /* U54 */ &cp0_nand_controller { + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&nand_pins &nand_rb>; @@ -306,7 +305,7 @@ /* U55 */ &cp0_spi1 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&cp0_spi0_pins>; reg = <0x700680 0x50>; diff --git a/arch/arm64/boot/dts/marvell/cn9131-db-A.dts b/arch/arm64/boot/dts/marvell/cn9131-db-A.dts new file mode 100644 index 000000000000..a60fdee79bf8 --- /dev/null +++ b/arch/arm64/boot/dts/marvell/cn9131-db-A.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 Marvell International Ltd. + * + * Device tree for the CN9131-DB board. + */ + +#include "cn9131-db.dtsi" + +/ { + model = "Marvell Armada CN9131-DB setup A"; +}; + +/* Setup A has SPI1 flash as a boot device, while setup B uses NAND flash. + * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated + * simultaneously. When SPI controller is enabled, NAND should be disabled. + */ + +&cp0_spi1 { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/marvell/cn9131-db-B.dts b/arch/arm64/boot/dts/marvell/cn9131-db-B.dts new file mode 100644 index 000000000000..94e01192aed1 --- /dev/null +++ b/arch/arm64/boot/dts/marvell/cn9131-db-B.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2020 Marvell International Ltd. + * + * Device tree for the CN9131-DB board (setup "B"). + */ + +#include "cn9131-db-A.dts" + +/ { + model = "Marvell Armada CN9131-DB setup B"; +}; + +/* Setup B has NAND flash as a boot device, while regular setup uses SPI flash. + * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated + * simultaneously. When NAND controller is enabled, SPI1 should be disabled. + */ + +&cp0_nand_controller { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dts b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi similarity index 97% rename from arch/arm64/boot/dts/marvell/cn9131-db.dts rename to arch/arm64/boot/dts/marvell/cn9131-db.dtsi index 3c975f98b2a3..82471a83ad6d 100644 --- a/arch/arm64/boot/dts/marvell/cn9131-db.dts +++ b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi @@ -1,14 +1,13 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (C) 2019 Marvell International Ltd. + * Copyright (C) 2020 Marvell International Ltd. * * Device tree for the CN9131-DB board. */ -#include "cn9130-db.dts" +#include "cn9130-db.dtsi" / { - model = "Marvell Armada CN9131-DB"; compatible = "marvell,cn9131", "marvell,cn9130", "marvell,armada-ap807-quad", "marvell,armada-ap807"; diff --git a/arch/arm64/boot/dts/marvell/cn9132-db-A.dts b/arch/arm64/boot/dts/marvell/cn9132-db-A.dts new file mode 100644 index 000000000000..1f2e6377afc3 --- /dev/null +++ b/arch/arm64/boot/dts/marvell/cn9132-db-A.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 Marvell International Ltd. + * + * Device tree for the CN9132-DB board. + */ + +#include "cn9132-db.dtsi" + +/ { + model = "Marvell Armada CN9132-DB setup A"; +}; + +/* Setup A has SPI1 flash as a boot device, while setup B uses NAND flash. + * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated + * simultaneously. When SPI controller is enabled, NAND should be disabled. + */ + +&cp0_spi1 { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/marvell/cn9132-db-B.dts b/arch/arm64/boot/dts/marvell/cn9132-db-B.dts new file mode 100644 index 000000000000..7137a6f22d0f --- /dev/null +++ b/arch/arm64/boot/dts/marvell/cn9132-db-B.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2019 Marvell International Ltd. + * + * Device tree for the CN9132-DB board. + */ + +#include "cn9132-db.dtsi" + +/ { + model = "Marvell Armada CN9132-DB setup B"; +}; + +/* Setup B has NAND flash as a boot device, while regular setup uses SPI flash. + * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated + * simultaneously. When NAND controller is enabled, SPI1 should be disabled. + */ + +&cp0_nand_controller { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dts b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi similarity index 97% rename from arch/arm64/boot/dts/marvell/cn9132-db.dts rename to arch/arm64/boot/dts/marvell/cn9132-db.dtsi index 4ef0df3097ca..0c2d9f57318b 100644 --- a/arch/arm64/boot/dts/marvell/cn9132-db.dts +++ b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi @@ -1,14 +1,13 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (C) 2019 Marvell International Ltd. + * Copyright (C) 2020 Marvell International Ltd. * * Device tree for the CN9132-DB board. */ -#include "cn9131-db.dts" +#include "cn9131-db.dtsi" / { - model = "Marvell Armada CN9132-DB"; compatible = "marvell,cn9132", "marvell,cn9131", "marvell,cn9130", "marvell,armada-ap807-quad", "marvell,armada-ap807"; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel