From patchwork Mon Mar 4 14:05:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Trumtrar X-Patchwork-Id: 224734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-we0-x23f.google.com (mail-we0-x23f.google.com [IPv6:2a00:1450:400c:c03::23f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id C7F9C2C034F for ; Tue, 5 Mar 2013 01:06:35 +1100 (EST) Received: by mail-we0-f191.google.com with SMTP id r5sf1856789wey.18 for ; Mon, 04 Mar 2013 06:06:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:mime-version:x-beenthere:x-received:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-sa-exim-connect-ip:x-sa-exim-mail-from :x-sa-exim-scanned:x-ptx-original-recipient:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=c82DijjXcQK8aIv0D28K0b8chYLnAkvUcn3Rbw9+skU=; b=WC++E4Rah1eg1Qw9dR1Wp9A83bKiJh2qK8IOg96uTWjkK0rxPEVgCpf6ilFuaYFlZi KkYJaP5Aqd5cdK1mSpxZrKu9OKfE+HpySDhoknE3QYOlof2XqpgG+VRjcBNNtpXLRLYb dTiVbi2SwUmnw1EUQd78lHTOv6rb65MbfC/duBl6PnmWbbmrTrGRM9jMEfAvozLM84je VE9tbFmuYM4lLtbTJn7wQOgsCsF/Hbwv4Z0lcYNAjAt8CG4lmP3jOz+RwObKaN5IzZfH dspRlZcRQ9wwWsoVr3QN0qMrSQeM5xe9yjyaMAyjR5eDW94n34h6NoW+akOZNXI7OHcE nTDg== X-Received: by 10.180.81.8 with SMTP id v8mr644466wix.11.1362405992243; Mon, 04 Mar 2013 06:06:32 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.180.75.6 with SMTP id y6ls501509wiv.13.gmail; Mon, 04 Mar 2013 06:06:31 -0800 (PST) X-Received: by 10.14.211.1 with SMTP id v1mr20102006eeo.0.1362405991954; Mon, 04 Mar 2013 06:06:31 -0800 (PST) X-Received: by 10.14.211.1 with SMTP id v1mr20102000eeo.0.1362405991908; Mon, 04 Mar 2013 06:06:31 -0800 (PST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de. [2001:6f8:1178:4:290:27ff:fe1d:cc33]) by gmr-mx.google.com with ESMTPS id 47si5927813eeh.1.2013.03.04.06.06.31 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Mar 2013 06:06:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of str@pengutronix.de designates 2001:6f8:1178:4:290:27ff:fe1d:cc33 as permitted sender) client-ip=2001:6f8:1178:4:290:27ff:fe1d:cc33; Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1UCW1j-0004Yc-At; Mon, 04 Mar 2013 15:06:03 +0100 Received: from str by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1UCW1h-0002JC-6x; Mon, 04 Mar 2013 15:06:01 +0100 From: Steffen Trumtrar To: rtc-linux@googlegroups.com, devicetree-discuss@lists.ozlabs.org Cc: Shawn Guo , Alessandro Zummo , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Juergen Beisert , Steffen Trumtrar Subject: [rtc-linux] [PATCH 1/9] MXS/i.MX28: add the possibility to define the used crystals via device tree Date: Mon, 4 Mar 2013 15:05:40 +0100 Message-Id: <1362405948-12992-2-git-send-email-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362405948-12992-1-git-send-email-s.trumtrar@pengutronix.de> References: <1362405948-12992-1-git-send-email-s.trumtrar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: str@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: rtc-linux@googlegroups.com X-Original-Sender: s.trumtrar@pengutronix.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of str@pengutronix.de designates 2001:6f8:1178:4:290:27ff:fe1d:cc33 as permitted sender) smtp.mail=str@pengutronix.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , From: Juergen Beisert Signed-off-by: Juergen Beisert Signed-off-by: Steffen Trumtrar --- arch/arm/boot/dts/imx28.dtsi | 11 +++++++++++ drivers/clk/mxs/clk-imx28.c | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 7ba4966..958bd10 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -37,6 +37,17 @@ }; }; + clocks { + #address-cells = <1>; + #size-cells = <0>; + + osc24m: system_oscillator { + compatible = "fsl,mxs-system", "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24000000>; + }; + }; + apb@80000000 { compatible = "simple-bus"; #address-cells = <1>; diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 76ce6c6..01048b5 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -158,7 +158,21 @@ int __init mx28_clocks_init(void) clk_misc_init(); - clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000); + /* retrieve the crystal's frequencies from device tree */ + for_each_compatible_node(np, NULL, "fixed-clock") { + u32 rate; + + if (of_property_read_u32(np, "clock-frequency", &rate)) + continue; + + if (of_device_is_compatible(np, "fsl,mxs-system")) + clks[ref_xtal] = mxs_clk_fixed("ref_xtal", rate); + } + + /* if not set, guess their frequency */ + if (clks[ref_xtal] == NULL) + clks[ref_xtal] = mxs_clk_fixed("ref_xtal", 24000000); + clks[pll0] = mxs_clk_pll("pll0", "ref_xtal", PLL0CTRL0, 17, 480000000); clks[pll1] = mxs_clk_pll("pll1", "ref_xtal", PLL1CTRL0, 17, 480000000); clks[pll2] = mxs_clk_pll("pll2", "ref_xtal", PLL2CTRL0, 23, 50000000);