From patchwork Wed Jun 9 11:45:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12310009 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=-17.0 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,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 E0D59C48BCD for ; Wed, 9 Jun 2021 12:27:05 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AB1F961351 for ; Wed, 9 Jun 2021 12:27:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB1F961351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iL4S+udktc9TriRiZHm9nTVM81L6lZVCy3rTMQkbIYE=; b=rqg3xae8r9vsgg Ml9vhyqc86rhIQmfRf99dY/Ol+pHjNv5s68YLNYwN/KtBRgZVKVzCbGsw+cTthRJWq5qgdHwRA2AY OFnz+S34OjKIvXiiX6sU/6l9zmC0r6O2v9yPUTTIsgLcXkzqv8gRLUzLcWth2VH1yZEJI4XQFLIpC cvTqqXmHlde1BR3hgWTZSpLSUrbgNKPpCqVSl2/BrZuwWIORY1Edeclc2khvzWgkdPz4L69FjW0yW URa6KKbcmDX0YJ6XDhW2KQuZv/3UcXJoleNX0Mpo/B+BHbJBxIVIe8CIcDFDXiz4RP4D6sjAYEv5q +TlodLA7of2w/JP752/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxGO-00DfAm-QK; Wed, 09 Jun 2021 12:24:54 +0000 Received: from mail-wm1-f53.google.com ([209.85.128.53]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwfv-00DQbw-1D for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:47:12 +0000 Received: by mail-wm1-f53.google.com with SMTP id s70-20020a1ca9490000b02901a589651424so3074946wme.0 for ; Wed, 09 Jun 2021 04:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=faDJwJkZnio3K1+D2/qEPWG8piye6Bb4xmyIkwVtbsM=; b=UmrttrlpGT6MTSmxtyJNOBUbmgFtWxEkrhN37QpZ+rjaocPopM9jfvdyufpxSLlm3G DdiTLtUDRpfqttGSfpsIllmhbJ3yPScaZZRUaRyJBZnNXj6wCa8gAabrGfeTZI1gYv8B iWLYVRax67K6VijlPRVRzhtdTgkuxDM8hXOCH+VVNa3OjM6deZP0eUuAGBbjkJ8vRiuL zu+VMO8ydFC+lQDEtpVBfrbRwMRXOe6wuzYmvRUBNhn6EDgRRTgpL1qFdSVUAnXjwYtC ZHZzvTOJNmF8AwrInbW5Kro32m3fh9DIeaXdNYkIyeLLcWbLrBPSgWUdKK3oT7IBb2N4 AdPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=faDJwJkZnio3K1+D2/qEPWG8piye6Bb4xmyIkwVtbsM=; b=dNTteDbmag+O3PXDbENp4RQB1a0EzN/XaFvLgGHP3SjzcU3Fv7uohOtlpdfNIXExg6 oPPK+tb7u4cLUdE0tx2tYD4crdPKq151Ko2/m1qARtycdSxswVKsjfrakuSOCS4lzx8E 6KxdUCJJmmJ8WoKE3mTBqIe8HlrPia2Mx5FRqlCCMvWSj/gE/iJeIW786Oup/p+hmL73 HaAAikiVXes5RfkQEXt5OB1Xp/qjnAs5NcPADI62fJgzRZQQrEVv+97GQh8UBWxSBVSs Ngg0pjNJICu2LdFtM7iafHxMEvEveZFEx9DZlk6xs5gSv+5S2Qlyaeh6lbHvxzUNTKVh 3cQA== X-Gm-Message-State: AOAM531995mP1yfEPzOWcgFuywjcDvf4N/Xpc3owuk+sE3tWmV+IBUz8 xmQT05QFRJoNUAXkD/jFQ++XZg== X-Google-Smtp-Source: ABdhPJwyvaRJV27WEeZvyOtiMcZITiOPSb+nkAyiLSj8gjv4MqWxJI0U3RW05ioxpVts1hS0s+ciiw== X-Received: by 2002:a05:600c:4f8f:: with SMTP id n15mr11461111wmq.116.1623239169240; Wed, 09 Jun 2021 04:46:09 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id x18sm2153689wrw.19.2021.06.09.04.46.08 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:46:08 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 28/31] arm64: zynqmp: Sync psgtr node location with zcu104-revA Date: Wed, 9 Jun 2021 13:45:04 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_044711_120331_CFE07E62 X-CRM114-Status: GOOD ( 11.78 ) 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 zcu104-revA has node below pinctrl which is not the same on revC. Sync location for easier comparison. Also zc1751-dc1 is not using this position. Signed-off-by: Michal Simek --- .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 14 +++++++------- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index 9f176307b62a..d78439e891b9 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -58,13 +58,6 @@ clock_si5338_3: clk150 { }; }; -&psgtr { - status = "okay"; - /* dp, usb3, sata */ - clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; - clock-names = "ref1", "ref2", "ref3"; -}; - &fpd_dma_chan1 { status = "okay"; }; @@ -340,6 +333,13 @@ conf { }; }; +&psgtr { + status = "okay"; + /* dp, usb3, sata */ + clocks = <&clock_si5338_0>, <&clock_si5338_2>, <&clock_si5338_3>; + clock-names = "ref1", "ref2", "ref3"; +}; + &qspi { status = "okay"; flash@0 { diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index fb8d76b5c27f..c21d9612ce04 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -429,6 +429,13 @@ conf-tx { }; }; +&psgtr { + status = "okay"; + /* nc, sata, usb3, dp */ + clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>; + clock-names = "ref1", "ref2", "ref3"; +}; + &qspi { status = "okay"; flash@0 { @@ -446,13 +453,6 @@ &rtc { status = "okay"; }; -&psgtr { - status = "okay"; - /* nc, sata, usb3, dp */ - clocks = <&clock_8t49n287_5>, <&clock_8t49n287_2>, <&clock_8t49n287_3>; - clock-names = "ref1", "ref2", "ref3"; -}; - &sata { status = "okay"; /* SATA OOB timing settings */