From patchwork Mon Jun 14 15:25:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 12319307 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=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 18469C2B9F4 for ; Mon, 14 Jun 2021 15:53:56 +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 D172261185 for ; Mon, 14 Jun 2021 15:53:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D172261185 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=hM1nymdhrJgJUt8F6aBNYc3kdf/Y7ZiB/EqtGBC7M3U=; b=q+mjiU2uKuJzIh Kwy/8p/hb+0a3OdldyymYdYueKUZs08BomADZpEdk5VYGu3sGKdanoUkoxxjAtn+oqwdgRWFiFy1/ JgcDGOjegRqMWtOFJA14rUdqzgHW8C3aGgRwFOL5eUQK5OuyHTs3PqpE0TRIZKbLBdP6eadTTSwe1 JGzGAy4CGI5JcM/6LOkQo3xJ0uCp50E90G/OTRpmuxGwiNSnDBEdNJp3Tq1yIltf89EceLu7vD3AL m+BGiz8Rmyjr2nzwaR1exXH19JU+kZIvAJ9qtz+6BJLo8vcM6ZvE6SKixqnebIIV/0t4cQ6RI09Ts E+ggdnDYVibeIkMKB+pA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsosG-00EsYG-Iy; Mon, 14 Jun 2021 15:51:43 +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 1lsoUX-00EjRT-8f for linux-arm-kernel@lists.infradead.org; Mon, 14 Jun 2021 15:27:10 +0000 Received: by mail-ej1-f54.google.com with SMTP id he7so17153057ejc.13 for ; Mon, 14 Jun 2021 08:27:08 -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=gllPyzZeEX/vDyJ3iT0Ol5hJ7mGlkFSmcymYGuLNAuI=; b=1QJiidPhXWjW0PtK0xSmoO/ecIdUmyct1tJx1dAQlHPYvRrsgevszxF0GO6pXsw5Ky trMAinGt3QH52kPjU1fDwEj6EaqGA1TNTx4+pKhvUIGmNaPHAf4MvKllnVVIxl0EDiLP /Udnq0Aa4zQMtPIzlHgDQCHOr5ier5GGslQfRap2nJRdRWexlPaT/raeoWDevJEKv0aK oQijS9ZGBdzS0Qjq3ybHN+RzC+jLJ5ZRJ7McAcyLHy0LFV/TgHzp8YQ0mUxPn3F6vkA4 t0Csfebtyisn8ei2o4rRbvIRvtM2ib3cdpMQEjBPmy1QbKZv4aGhbwrTDDARqhZjfkY2 OPgA== 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=gllPyzZeEX/vDyJ3iT0Ol5hJ7mGlkFSmcymYGuLNAuI=; b=rsnHE1307UeqYoufa3XdUeTC98hFHgd2N2KRRJG+o/U/WtRBU7QBQ/sYFb6nQ+7Ekh aaDj+0U6qogzIKm0YliW0M4Xe14c5/AnR7idY+V/mrYLbaRPP0wIEYH1iEqtpS19sDDM cmzoqcWjWGDaX953B6tmTRopg+XOa85+Epx+ag/Iqm1GxFp6BTIBYdVl6/RVllGTuDKg Soo2SixXOyAAGQVX1ngaWf+VIoJPekkJDzWRvUe0yqPX+x05WdIbGudGwOKugxXN5FbI jT2/6RCM3Mgrpyg70UkrRBI9qYRyR0B0gh8rqt4d9to6E33Lc5SQe71N7oH1fzfoyU8f ALLg== X-Gm-Message-State: AOAM533Bi8k1FgVy6Kqeg09o22V/XS8/4GU1wwgmdSkzth/SpQzNd5s7 Qnw34k4t/lyk7/W7MyzK/EQTvw== X-Google-Smtp-Source: ABdhPJzE5n0YS5cnGm1aFvZPzqx+Hdoc8adk6XXIUGJ6Aa63Oa7GqiS5Ly5TcixBrmgLEP8YikPOOg== X-Received: by 2002:a17:907:98ae:: with SMTP id ju14mr15738417ejc.173.1623684367284; Mon, 14 Jun 2021 08:26:07 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6:f666:9af6:3fed:e53b]) by smtp.gmail.com with ESMTPSA id y25sm9102666edt.17.2021.06.14.08.26.06 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jun 2021 08:26:06 -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 v2 16/33] arm64: zynqmp: Move clock node to zynqmp-clk-ccf.dtsi Date: Mon, 14 Jun 2021 17:25:24 +0200 Message-Id: <48bfd8cf0de4d10b9c4d745218595f28954f70d5.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_082709_343755_D8B13D07 X-CRM114-Status: GOOD ( 13.07 ) 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 --- Changes in v2: None 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>;