From patchwork Wed Jun 9 11:44:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12309935 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=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 A57C1C48BCF for ; Wed, 9 Jun 2021 12:05:19 +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 6DB256124C for ; Wed, 9 Jun 2021 12:05:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DB256124C 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=XbAwotx1BQkNcAoy8FhlMHnVvGR69jqHErZ33VCk51g=; b=rneUVQUh6+/57B 0sAMYkd0R5v4a6nSseo87AlWWIsNyQ6bOAg7ylbLDZ8A3/LELywkAn054j4n7yl8iQztoV/nCTKkN mtu/gejjLHWLSb+5JRzySwvvcjF9zxTKQnXMccFvx2TiU1//lA8bXzab6X3UvQSsrC7KAlrfFEi9a cGCPtidqhu5KnHCMX34uzZbmCMJZLPX+vMkfiGtpK03iMvqLIl5ZrBPUbAxyDeZKZDkS9r1ECueBQ nrS3oN26UjB9kAPqTK03mAAQl/pIrjKhHUGCJdfM5WhI06UJ6NvfIx4oRMXR79jWV7ZPPexU823jO G269TERFN+ooiV47l+kw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwun-00DWjP-RI; Wed, 09 Jun 2021 12:02:35 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqwec-00DQ0r-M7 for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 11:45:52 +0000 Received: by mail-wr1-x429.google.com with SMTP id f2so25088050wri.11 for ; Wed, 09 Jun 2021 04:45:49 -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=OFkJ4b+Pv9hA9fg/hHFAqZWjcxiSUunEmPfat4jQdC4=; b=Ts8TbXPH/MqSFzh9qeCjFmMNJ7DArCCG2XWTDXEtuPLRtl+xkadG1WFuu39jDDUi4+ OO8e4MOv7ihZdTaJzg8M/4NSKkz3ESZduJ/4QdjJWlzP0xDHzQ0+SrhNptIp5iDlRhgg 0g/xrpytLVFKOGxadnv5Cnp9xGISUFO6q2Wz+p8xhR+sEkQW3oV/XFsKEf8VAUM+xEzy 14uvEx8qE470D8gTNWjlF760fnB1rFj/8wWetPOPZTYuCLGu1Wgw9V2qMQwc6tecubPs MI8Jsnli5nAbGI5iwfJ/GERKxvG/UR0SDVLQQcr7vcdhtuhEDCdsaxaTF9Vmbzg0PjGq Kz/w== 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=OFkJ4b+Pv9hA9fg/hHFAqZWjcxiSUunEmPfat4jQdC4=; b=q2h6KeKDuRcSXSrpmsxOjONv7dKxV6enhVsTYfZwVKzXkBHLja9c63N5UTEQX11Eoh ma/1kZm+kQ9QdSVo0UZIN0kVj3out9R9ph4VqBAjw3kedeCv/fxID/tB+/Ins3t90E2F zMab2udxIzeN7zzSm7p2Dknn3EXxDnMzRJPshZpRK2eF9ihFUNZRK2KuSG2hLtTwHn0O iRQl2510mMh7rsrTLSpi9IHCk6HRdSlR6Ta6aJNNf47/4ubf7BOL/05R8Nw7oMfvp6mr 1lcF/ZXUSPmBdXdNJEyLqenPYSgjzy3hk93o/gTwwTA0ZYqbX+g032U+npbsqKq5fsI6 fVDQ== X-Gm-Message-State: AOAM530iPuB5My98iX0/2hVQGBz45s1D+vwJKVMtZKrVmjG3f7wPc+T4 erJQg4GUo8Ur3r0+G3kdW6ml0A== X-Google-Smtp-Source: ABdhPJyURMieWSx/lNg4b2fyHhX9FhDq86PbmK1VZeJCx8xeecvlukgiGTspB96uKuiLVljoOa9klg== X-Received: by 2002:a5d:47ce:: with SMTP id o14mr27341558wrc.273.1623239148723; Wed, 09 Jun 2021 04:45:48 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id t9sm16840930wmq.14.2021.06.09.04.45.48 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jun 2021 04:45:48 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com, Viresh Kumar Cc: Krzysztof Kozlowski , Laurent Pinchart , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 16/31] arm64: zynqmp: Move clock node to zynqmp-clk-ccf.dtsi Date: Wed, 9 Jun 2021 13:44:52 +0200 Message-Id: <48bfd8cf0de4d10b9c4d745218595f28954f70d5.1623239033.git.michal.simek@xilinx.com> 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_044550_773772_14B36B6E X-CRM114-Status: GOOD ( 13.03 ) 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 Using clock firmware driver is not the only one option how to configure clock. In past fixed clocks were also used and that configuration is still valid that's why move clock firmware node to the same file where zynqmp_clk references are used. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 ++++++++++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 15 --------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi index cf5295224750..1e0b1bca7c94 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi @@ -2,7 +2,7 @@ /* * Clock specification for Xilinx ZynqMP * - * (C) Copyright 2017 - 2019, Xilinx, Inc. + * (C) Copyright 2017 - 2021, Xilinx, Inc. * * Michal Simek */ @@ -40,6 +40,17 @@ aux_ref_clk: aux_ref_clk { }; }; +&zynqmp_firmware { + zynqmp_clk: clock-controller { + #clock-cells = <1>; + compatible = "xlnx,zynqmp-clk"; + clocks = <&pss_ref_clk>, <&video_clk>, <&pss_alt_ref_clk>, + <&aux_ref_clk>, <>_crx_ref_clk>; + clock-names = "pss_ref_clk", "video_clk", "pss_alt_ref_clk", + "aux_ref_clk", "gt_crx_ref_clk"; + }; +}; + &can0 { clocks = <&zynqmp_clk CAN0_REF>, <&zynqmp_clk LPD_LSBUS>; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 3fa0517cfd98..bd3f0d456ca4 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -156,21 +156,6 @@ zynqmp_power: zynqmp-power { mbox-names = "tx", "rx"; }; - zynqmp_clk: clock-controller { - #clock-cells = <1>; - compatible = "xlnx,zynqmp-clk"; - clocks = <&pss_ref_clk>, - <&video_clk>, - <&pss_alt_ref_clk>, - <&aux_ref_clk>, - <>_crx_ref_clk>; - clock-names = "pss_ref_clk", - "video_clk", - "pss_alt_ref_clk", - "aux_ref_clk", - "gt_crx_ref_clk"; - }; - nvmem_firmware { compatible = "xlnx,zynqmp-nvmem-fw"; #address-cells = <1>;