From patchwork Mon Jun 14 15:25:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12319325 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.9 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 E2FE2C2B9F4 for ; Mon, 14 Jun 2021 16:01:24 +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 AADA261245 for ; Mon, 14 Jun 2021 16:01:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AADA261245 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=IZ9I8Ci2sJj5r1ujdoXiNT5kWtxXTCjwU50pbK0cWUk=; b=R0et6vyjoMnqDF +odfdbG3SAtL2VAas32mAVATn9WA3Y3p2MkZqwoVQlSodhmh4vikxOiF0x4OKoGoS+t3QH2B2ROYg VceejfkWV2qrggARPyaNQETfCBKZLd8sIPCebFFeN5P+jBK2QVySvWT5BYWCrECLZb9rVpLs88cG5 HCkg5IQ2tgeoAphj/IbSnw25vd93b7R+t80YO5jlZq/tLNRRBF/JR++3X6Ugoex57QLexKBbEsx3a Q+JplhuBFClxCHD9r8dfnovC10QoKadegZJTW8rUPa3WLOhsoUBZLoYiibVdIWZK/1OsCunhLSmH3 i264sxtxpx0TrXOAljww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsozB-00Ew2y-SP; Mon, 14 Jun 2021 15:58:52 +0000 Received: from mail-ej1-f54.google.com ([209.85.218.54]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsoUn-00EjYN-CQ for linux-arm-kernel@lists.infradead.org; Mon, 14 Jun 2021 15:27:26 +0000 Received: by mail-ej1-f54.google.com with SMTP id nd37so9614530ejc.3 for ; Mon, 14 Jun 2021 08:27:25 -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=rTsK2s3RJlRtX1F6hWpi5z/cpdgJZCL2W87lLK+hyQk=; b=NDNRYBc1z9R72eDBswmweZiavGcR7ukxJlH0BWIt8LUWmRDlzo77J/cw5dqJf9O8Md rLXK+QsqBNkZQeKzpGzrI0PI6vx5ITRjuMzXqFnopabEeGwwADDhTFpN7rkQGxFhSr5w dkDMR7PWXxZ5fuhlnFf8wtdtfnN8szf92pFDB+EXnyAYpUzajAO1qU21lvoQrTvR6ert csH3GCDy7K5n5FrR7j/iNIZVBSaqG70jPTx4gxScc0Ym6D3tuhzPKuKUYh2Ehhhapdcq dfLg5ESzh5F6NblHRyYw+Q8gELXNGUb40+TmjC0TGuPVaY78S5p80yiIiTaOVUj/f7mS OniQ== 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=rTsK2s3RJlRtX1F6hWpi5z/cpdgJZCL2W87lLK+hyQk=; b=FWCFqwgJiy5+EDJ34Ty6zDL4wDXn0NL9hMdBou7dy+fs/cKxL49OyqcTAoGgppS/90 CY1L20iYA5CJvqUa1alSrd7xDnTMSbyfIO6yMkgWxi53IabpdofK8t4mRbCV2rzhEnKZ 8mqWehHZLgH8WDZGWfBLLvlwQwbctLOHy/mWo69zlYxEWOC05D4RJYf57BT8bDiXWfLq x0EBkWpKkNf3IJlbwLCVRqbbMFc+F3eqr1w7BDDXXcQ6TArAESFbP6ylObKnXDde/WMM ef910rZl7TS0DTIVVL77O5xc/zvyzvqdALbK/FvXbULJD2dGCPFAQUcSBeF3IIGNj4Z6 wAkQ== X-Gm-Message-State: AOAM532cBux/jd7ZJoDJuOdYfGY/ESnAfXIxACx0BoIXzleRLYcL6F82 N4EeMd3fCy8lrTJ0A9p6QgJR8w== X-Google-Smtp-Source: ABdhPJz/Qy8wL55WZ9epr2Ncto1U6xrKCqtQvG9/0Bz81V8s0zPp0G197J9wRBFCiNMetwtlCw54SQ== X-Received: by 2002:a17:906:f744:: with SMTP id jp4mr15781392ejb.210.1623684384248; Mon, 14 Jun 2021 08:26:24 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6:f666:9af6:3fed:e53b]) by smtp.gmail.com with ESMTPSA id f18sm4699806edu.5.2021.06.14.08.26.23 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jun 2021 08:26:23 -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 v2 28/33] arm64: zynqmp: Sync psgtr node location with zcu104-revA Date: Mon, 14 Jun 2021 17:25:36 +0200 Message-Id: <4b691bab5ba83b5352d4669bd54bcdb8273b2156.1623684253.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210614_082725_483958_974E755B X-CRM114-Status: GOOD ( 12.25 ) 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 --- Changes in v2: None .../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 */