From patchwork Tue Nov 12 14:29:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Parrot X-Patchwork-Id: 179186 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp7817222ocf; Tue, 12 Nov 2019 06:26:54 -0800 (PST) X-Google-Smtp-Source: APXvYqxxkh5oPsUHMgd070wDrDFB6JKKiiTMMffAScLBdQ3RLfieMbrIufVtodAZX9nLBtfWkzU0 X-Received: by 2002:a17:906:69d2:: with SMTP id g18mr13345467ejs.153.1573568814423; Tue, 12 Nov 2019 06:26:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573568814; cv=none; d=google.com; s=arc-20160816; b=DJgt6tH00sOJNrsAglJde+Kb0oAm7edgul1oDdL5bB3HZbsIloaEanoYBjrVz4s1aF TeAzwkxm2hXwtMDRhgg7yYSYvznLPRy2bI1lfJxTlV2x/nqKxjWXrXwaQHjwyQdnhPLJ vgdOWNxMwXkdZnQv/Uo1FiH+728TD9d9ytxFbKwbgslK0/lMQUDzI4CRzNSQujpV0dHi zh5w6LbrcdWF7caeyFN6hKJUwpepzpGXRA9551n8Qb/9oGQgWLsIrzTelkWNVbiViru8 6zYAtntqlxk5qEDHodP+05JbiFsFbx8vrRuNGXeRVsl0uZtn7Fm38RzLOADwnPzh+9si h75Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=gpv+haEFzzKdzy9mhyYEcsJmcwqJdZynv2MIZuwV8kA=; b=guJhyjTB6w72zwGNxT2oYu77LVKmW6JgY5AglHts1XMiitZ3ZE2iMTHMoEIJ8cuUXT 7+UBGesjhczalpLbCayS5mgFQyYsmIIOmW8+1lbEFk/O8fb6cNYHtsfH5oZS2J0qEfJV zWwLOqkWUy/JzgDHA37354iQJYw08FtaS4FXC8W2+Kb0vpEYPB5PH20voQ/OxaFPMoE4 n/r+IXbMFOSyQfcSCy8Vwj+2AEPsMzx9nPIDQyXMqqan0Uvop8GOPeUjxSxsV0AKuR03 i7TAukqhmJ3vWU6ZP8bfq+ydYYwD5Q9ADXyz5vwtUfy3H8ZrWSRuSEoV2HYC5eMXEDL6 uIeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ffJzGMuk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id be23si12465536edb.103.2019.11.12.06.26.54; Tue, 12 Nov 2019 06:26:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ffJzGMuk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727747AbfKLO0k (ORCPT + 26 others); Tue, 12 Nov 2019 09:26:40 -0500 Received: from lelv0143.ext.ti.com ([198.47.23.248]:49652 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726738AbfKLO0i (ORCPT ); Tue, 12 Nov 2019 09:26:38 -0500 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id xACEQWBd090825; Tue, 12 Nov 2019 08:26:32 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1573568792; bh=gpv+haEFzzKdzy9mhyYEcsJmcwqJdZynv2MIZuwV8kA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ffJzGMukJRIBh55FUrs/B+aUsWIiBuaDmy8oH9zgDQodOVDLFCWzR35hRoYjfVhEn 7h0MXEDqCNU+z3Y+saVvh0Q2O0vktYpu88Ul2kFXVafYbv1P2n8K2mUQxSgkzLtgMC 3cTtDI/V9UdgCOg8RbOTTIZH9wHeGMmAf6Ygc/j4= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xACEQWMA014358 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 12 Nov 2019 08:26:32 -0600 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Tue, 12 Nov 2019 08:26:14 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Tue, 12 Nov 2019 08:26:14 -0600 Received: from uda0869644b.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id xACEQUtu040290; Tue, 12 Nov 2019 08:26:31 -0600 From: Benoit Parrot To: Tony Lindgren , Tero Kristo CC: , , , , , Benoit Parrot Subject: [Patch v2 1/3] ARM: dts: am43xx: add support for clkout1 clock Date: Tue, 12 Nov 2019 08:29:27 -0600 Message-ID: <20191112142929.23058-2-bparrot@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191112142929.23058-1-bparrot@ti.com> References: <20191112142929.23058-1-bparrot@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tero Kristo clkout1 clock node and its generation tree was missing. Add this based on the data on TRM and PRCM functional spec. commit 664ae1ab2536 ("ARM: dts: am43xx: add clkctrl nodes") effectively reverted this commit 8010f13a40d3 ("ARM: dts: am43xx: add support for clkout1 clock") which is needed for the ov2659 camera sensor clock definition hence it is being re-applied here. Note that because of the current dts node name dependency for mapping to clock domain, we must still use "clkout1-*ck" naming instead of generic "clock@" naming for the node. And because of this, it's probably best to apply the dts node addition together along with the other clock changes. Fixes: 664ae1ab2536 ("ARM: dts: am43xx: add clkctrl nodes") Signed-off-by: Tero Kristo Tested-by: Benoit Parrot Signed-off-by: Tony Lindgren Signed-off-by: Benoit Parrot --- arch/arm/boot/dts/am43xx-clocks.dtsi | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) -- 2.17.1 diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi index 091356f2a8c1..c726cd8dbdf1 100644 --- a/arch/arm/boot/dts/am43xx-clocks.dtsi +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi @@ -704,6 +704,60 @@ ti,bit-shift = <8>; reg = <0x2a48>; }; + + clkout1_osc_div_ck: clkout1-osc-div-ck { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&sys_clkin_ck>; + ti,bit-shift = <20>; + ti,max-div = <4>; + reg = <0x4100>; + }; + + clkout1_src2_mux_ck: clkout1-src2-mux-ck { + #clock-cells = <0>; + compatible = "ti,mux-clock"; + clocks = <&clk_rc32k_ck>, <&sysclk_div>, <&dpll_ddr_m2_ck>, + <&dpll_per_m2_ck>, <&dpll_disp_m2_ck>, + <&dpll_mpu_m2_ck>; + reg = <0x4100>; + }; + + clkout1_src2_pre_div_ck: clkout1-src2-pre-div-ck { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&clkout1_src2_mux_ck>; + ti,bit-shift = <4>; + ti,max-div = <8>; + reg = <0x4100>; + }; + + clkout1_src2_post_div_ck: clkout1-src2-post-div-ck { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&clkout1_src2_pre_div_ck>; + ti,bit-shift = <8>; + ti,max-div = <32>; + ti,index-power-of-two; + reg = <0x4100>; + }; + + clkout1_mux_ck: clkout1-mux-ck { + #clock-cells = <0>; + compatible = "ti,mux-clock"; + clocks = <&clkout1_osc_div_ck>, <&clk_rc32k_ck>, + <&clkout1_src2_post_div_ck>, <&dpll_extdev_m2_ck>; + ti,bit-shift = <16>; + reg = <0x4100>; + }; + + clkout1_ck: clkout1-ck { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&clkout1_mux_ck>; + ti,bit-shift = <23>; + reg = <0x4100>; + }; }; &prcm {