From patchwork Mon Apr 1 16:51:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10880353 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43D371800 for ; Mon, 1 Apr 2019 17:08:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C56C26E96 for ; Mon, 1 Apr 2019 17:08:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E171284C7; Mon, 1 Apr 2019 17:08:31 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 9DDE926E96 for ; Mon, 1 Apr 2019 17:08:30 +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: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=skuDBuDeqOOURdMKuNtdQX2FlNC31j/+uydXh1ktNDk=; b=VsPVN0h8EqTVvy Qr42AMX9TNJCJ3k92Rx84+jNk2kptIkFfswI6kVQhr74ivI6CZR9YJKsJSGUi6tQlkrgWfRP2sM4c SX9hFHUje5mS+a0BVZxVWrPxhJbBhfEzoswGUDQ8Q3rTvhRa+IVisnhNR8A1quaC4LVn6krT3veV8 oq5YHWQl0NjLYro4econOB9VVvqhhVEmP+yDYH0y2usR9nEWgGZecmncvUvEDZMktSZ7eCAOLHg4K V2EnsQDZKGNDb8Rb8k2kYH1Cb2mXPKp0plxgYUJoT2A8M74WNqhr1LNe59Lj63L1qVgmF5NQuN1bD 3mmQt0E42aEg/zzu+Suw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hB0Q7-0007TN-OR; Mon, 01 Apr 2019 17:08:27 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hB0Pn-00071H-QT for linux-arm-kernel@bombadil.infradead.org; Mon, 01 Apr 2019 17:08:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=EMByolfFlS9/LdhdmKN/MaKh/2JxnW88eX6zmm5W+d8=; b=X5TIFSm/flmEPcR2tzpkZu/7B7 1hI5/UpPbmdC/sYj8YQkhwKbFUfNGaFWyuwCiorpZeR64IY262K6nua8W5UhB5t6UbBycwWQMpAWo 4vq2XKHzAEqAr09cv2JpRXnJ0fRH+rC1o/xpmYmoPaDYP4tQ2WZ5kHvdDtEr/GsBZXGRs9mnf8yig q5M8J8DrxFzQjm2e9AheX0C+DQ5PGyS5tCFJyPEXkxdPnZTrzCv8ttVS86DXAmeuGu1AJjGMJW0tT JBGipyshP0AFQFWMhlr4fHABJLqmAlexOOFogxTuR7ey8+E01NamRG4xva4HFsre7/ikXp+VVs1NH x9hJ3Nsw==; Received: from relay1-d.mail.gandi.net ([217.70.183.193]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hB0B7-000894-4m for linux-arm-kernel@lists.infradead.org; Mon, 01 Apr 2019 16:52:58 +0000 X-Originating-IP: 81.185.163.178 Received: from localhost.localdomain (178.163.185.81.rev.sfr.net [81.185.163.178]) (Authenticated sender: miquel.raynal@bootlin.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 2C9C524000A; Mon, 1 Apr 2019 16:52:33 +0000 (UTC) From: Miquel Raynal To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Kishon Vijay Abraham I Subject: [PATCH 12/15] arm64: dts: marvell: Add 7k/8k per-port PHYs in SATA nodes Date: Mon, 1 Apr 2019 18:51:28 +0200 Message-Id: <20190401165131.23370-13-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190401165131.23370-1-miquel.raynal@bootlin.com> References: <20190401165131.23370-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190401_175257_254773_73482AAD X-CRM114-Status: GOOD ( 11.52 ) 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: devicetree@vger.kernel.org, Antoine Tenart , Russell King , Maxime Chevallier , Nadav Haklai , Rob Herring , Thomas Petazzoni , Miquel Raynal , linux-arm-kernel@lists.infradead.org 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 Fill-in the missing SATA phys/phy-names DT properties of Armada 7k/8k based boards. Signed-off-by: Miquel Raynal --- arch/arm64/boot/dts/marvell/armada-7040-db.dts | 5 +++++ .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 5 +++++ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 18 ++++++++++++++++++ .../boot/dts/marvell/armada-8040-mcbin.dtsi | 18 ++++++++++++++++-- 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts index d20d84ce7ca8..0ece9d5b16b4 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts @@ -191,6 +191,11 @@ &cp0_sata0 { status = "okay"; + + sata-port@1 { + phys = <&cp0_comphy3 1>; + phy-names = "cp0-sata1-phy"; + }; }; &cp0_usb3_0 { diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts index 2468762283a5..4ee063d2b16d 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts @@ -336,6 +336,11 @@ &cp1_sata0 { pinctrl-0 = <&cp0_pci1_reset_pins>; status = "okay"; + + sata-port@1 { + phys = <&cp1_comphy0 1>; + phy-names = "cp1-sata1-phy"; + }; }; &cp1_mdio { diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts index 9f4f939ab65f..a2e75609b1ad 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts @@ -146,6 +146,15 @@ /* CON4 on CP0 expansion */ &cp0_sata0 { status = "okay"; + + sata-port@0 { + phys = <&cp0_comphy1 0>; + phy-names = "cp0-sata0-phy"; + }; + sata-port@1 { + phys = <&cp0_comphy3 1>; + phy-names = "cp0-sata1-phy"; + }; }; /* CON9 on CP0 expansion */ @@ -276,6 +285,15 @@ /* CON4 on CP1 expansion */ &cp1_sata0 { status = "okay"; + + sata-port@0 { + phys = <&cp1_comphy1 0>; + phy-names = "cp1-sata0-phy"; + }; + sata-port@1 { + phys = <&cp1_comphy3 1>; + phy-names = "cp1-sata1-phy"; + }; }; /* CON9 on CP1 expansion */ diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index 329f8ceeebea..28d380769506 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi @@ -237,8 +237,13 @@ }; &cp0_sata0 { - /* CPM Lane 0 - U29 */ + /* CPM Lane 5 - U29 */ status = "okay"; + + sata-port@1 { + phys = <&cp0_comphy5 1>; + phy-names = "cp0-sata1-phy"; + }; }; &cp0_sdhci0 { @@ -322,9 +327,18 @@ }; &cp1_sata0 { + status = "okay"; + /* CPS Lane 1 - U32 */ + sata-port@0 { + phys = <&cp1_comphy1 0>; + phy-names = "cp1-sata0-phy"; + }; /* CPS Lane 3 - U31 */ - status = "okay"; + sata-port@1 { + phys = <&cp1_comphy3 1>; + phy-names = "cp1-sata1-phy"; + }; }; &cp1_spi1 {