From patchwork Thu Jun 8 16:51:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory CLEMENT X-Patchwork-Id: 9776057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CEE47601C3 for ; Thu, 8 Jun 2017 16:52:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFB6528546 for ; Thu, 8 Jun 2017 16:52:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B450E2854F; Thu, 8 Jun 2017 16:52:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C34EF2855A for ; Thu, 8 Jun 2017 16:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=Vhl9cPyBGb9YTjMqJLWSalc2NWfb/3tsfLNZQRxHE/Q=; b=QZgXbtz47lsAigA0RlbWABrp0D mJtxKHkIrBmznSrKzfOS4IDCzIqOpxu7oxtkHCLuLe4foEuVqUTLOXtTZehJkxVkcIwc6V1SlgW/n A+OWOTPQFMgQ63YhAdVY0Y8HcCyIlSiRYQW+soO9w/2cOZQXrSyU9cxxOw5qpxrxeYlB2awouNkVS LY05A6QfHd+NDuSALM7YrKGCFAm+T/pQPFeD5uVg5Ac0B33+FMWkk2hc070EH/smWYr1qmHwb7vh6 TIR9DTfWWLC9WRMy/4yOAr2l+hKdReSRYkoSgRWwnXVd3tgnQsVYJJW+RfEEIDky9LQWHLBQGXtIL qzno7e6g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dJ0fz-00089U-9n; Thu, 08 Jun 2017 16:52:51 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dJ0fG-0006xR-Gj for linux-arm-kernel@lists.infradead.org; Thu, 08 Jun 2017 16:52:11 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 86A4921D97; Thu, 8 Jun 2017 18:51:45 +0200 (CEST) Received: from localhost (83.146.29.93.rev.sfr.net [93.29.146.83]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5D2F021DA7; Thu, 8 Jun 2017 18:51:35 +0200 (CEST) From: Gregory CLEMENT To: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory CLEMENT Subject: [PATCH 2/4] arm64: dts: marvell: armada-3720-db: Add information about the V2 board Date: Thu, 8 Jun 2017 18:51:23 +0200 Message-Id: <20170608165125.27630-3-gregory.clement@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608165125.27630-1-gregory.clement@free-electrons.com> References: <20170608165125.27630-1-gregory.clement@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170608_095206_998604_7F8F8353 X-CRM114-Status: GOOD ( 11.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Hua Jing , Nadav Haklai , Victor Gu , Neta Zur Hershkovits , Kostya Porotchkin , Marcin Wojtas , Wilson Ding , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The initial device tree file was for the board V1.4. Now the V2.0 board is also available. The same dtb will work for both, but the CON number have changed, so update the comment in the dts to reflect this. Signed-off-by: Gregory CLEMENT --- arch/arm64/boot/dts/marvell/armada-3720-db.dts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts index d6f12fafac6c..3ee920ac0015 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts @@ -42,6 +42,10 @@ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. + * + * This file is compatible with the version 1.4 and the version 2.0 of + * the board, however the CON numbers are different between the 2 + * version */ /dts-v1/; @@ -78,6 +82,7 @@ }; }; +/* Gigabit module on CON19(V2.0)/CON21(V1.4) */ ð0 { pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; @@ -86,6 +91,7 @@ status = "okay"; }; +/* Gigabit module on CON18(V2.0)/CON20(V1.4) */ ð1 { phy-mode = "sgmii"; phy = <&phy1>; @@ -133,7 +139,7 @@ }; }; -/* CON17 (PCIe) / CON12 (mini-PCIe) */ +/* CON15(V2.0)/CON17(V1.4) : PCIe / CON15(V2.0)/CON12(V1.4) :mini-PCIe */ &pcie0 { status = "okay"; }; @@ -184,19 +190,22 @@ }; }; -/* Exported on the micro USB connector CON32 through an FTDI */ +/* + * Exported on the micro USB connector CON30(V2.0)/CON32(V1.4) through + * an FTDI + */ &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart1_pins>; status = "okay"; }; -/* CON27 */ +/* CON27(V2.0)/CON29(V1.4) */ &usb2 { status = "okay"; }; -/* CON31 */ +/* CON29(V2.0)/CON31(V1.4) */ &usb3 { status = "okay"; usb-phy = <&usb3_phy>;