From patchwork Mon Jan 18 09:31:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 365637 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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 E70E3C433E0 for ; Mon, 18 Jan 2021 20:37:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3C5922D73 for ; Mon, 18 Jan 2021 20:37:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388380AbhARKgw (ORCPT ); Mon, 18 Jan 2021 05:36:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:34532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388886AbhARJck (ORCPT ); Mon, 18 Jan 2021 04:32:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8EE0520780; Mon, 18 Jan 2021 09:32:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610962320; bh=7UlzqAXgQrFeU5H5PfgXOffeF2ee2L2uNmDpETFzuko=; h=From:To:Cc:Subject:Date:From; b=uIT9Osv4DcbyvIqyLKAQqyzmMgUoL1yPHJwOlJ2Jwzy84CbPkpuI7/x+GBAT8X3aA FVbvD9s/yTghq/ZLAWNP8nfMjnyxCdFc1/csF5/zzZfcOhD0mmdILdYBtk78dfWPVG juj0f9adMi4JHzqAsMo00RlMXRa10eKNq3btbcpi2ZLZRHwqJcbyaj5NndOT9M6H7E GjHruR+YoTfTkd+5SPY5TZS4l/8lMC0cUFYDDsBthBl42WV6GYPgq/Tw4s0C7jAvKW DyKv4Uk4mtwr7cuLG8BrVlK5C7Rd0htHMJyD9thfijiFN/WeNBWaiEX8RtSMMlmKDq WkuDHaxfk7JWA== Received: by pali.im (Postfix) id 2B093889; Mon, 18 Jan 2021 10:31:58 +0100 (CET) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Andrew Lunn , Gregory Clement Cc: Rob Herring , =?utf-8?q?Marek_Beh=C3=BAn?= , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: marvell: armada-37xx: Add SATA comphy into main armada-37xx.dtsi file Date: Mon, 18 Jan 2021 10:31:39 +0100 Message-Id: <20210118093139.8441-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org SATA on A3720 SOC can use only comphy2, so move this definition from board specific DTS file armada-3720-espressobin.dtsi into main A3720 SOC file armada-37xx.dtsi. Signed-off-by: Pali Rohár --- arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 -- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi index daffe136c523..5fc613d24151 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi @@ -67,8 +67,6 @@ /* J6 */ &sata { status = "okay"; - phys = <&comphy2 0>; - phy-names = "sata-phy"; }; /* U11 */ diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index b1209ccd258e..005463935ffa 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -459,6 +459,8 @@ reg = <0xe0000 0x178>; interrupts = ; clocks = <&nb_periph_clk 1>; + phys = <&comphy2 0>; + phy-names = "sata-phy"; status = "disabled"; };