From patchwork Fri Nov 8 13:48:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 289841 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441292C00A8 for ; Sat, 9 Nov 2013 00:49:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757086Ab3KHNty (ORCPT ); Fri, 8 Nov 2013 08:49:54 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:42761 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757167Ab3KHNtx (ORCPT ); Fri, 8 Nov 2013 08:49:53 -0500 Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=bjornoya.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1VemRc-0008Tl-DY for devicetree@vger.kernel.org; Fri, 08 Nov 2013 14:49:52 +0100 Received: from [172.17.34.65] (hardanger.do.blackshift.org [172.17.34.65]) (using TLSv1 with cipher ECDHE-ECDSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: frogger) by bjornoya.do.blackshift.org (Postfix) with ESMTPSA id A62125E848 for ; Fri, 8 Nov 2013 14:49:51 +0100 (CET) Received: from bjornoya.do.blackshift.org by bjornoya.do.blackshift.org (Dovecot) with LMTP id tMn5JMbrfFIZCwAAaRGyPQ for ; Fri, 08 Nov 2013 14:48:54 +0100 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.do.blackshift.org (Postfix) with SMTP id 6180C5EA7E for ; Fri, 8 Nov 2013 14:48:54 +0100 (CET) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:6f8:1178:4:290:27ff:fe1d:cc33]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by bjornoya.do.blackshift.org (Postfix) with ESMTPS id E981F5E848 for ; Fri, 8 Nov 2013 14:48:53 +0100 (CET) Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=hardanger.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1VemQd-0008PI-H0; Fri, 08 Nov 2013 14:48:51 +0100 From: Marc Kleine-Budde To: linux-arm-kernel@lists.infradead.org Cc: Shawn Guo , kernel@pengutronix.de, devicetree-discuss@lists.ozlabs.org, Juergen Beisert , Steffen Trumtrar , Marc Kleine-Budde Subject: [PATCH 2/2] ARM: i.MX28: define external RTC crystal frequency in DT Date: Fri, 8 Nov 2013 14:48:41 +0100 Message-Id: <1383918521-4668-3-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1383918521-4668-1-git-send-email-mkl@pengutronix.de> References: <1383918521-4668-1-git-send-email-mkl@pengutronix.de> X-PTX-Original-Recipient: kernel@pengutronix.de X-PTX-Original-Recipient: entwicklung@pengutronix.de X-PTX-Original-Recipient: mkl@pengutronix.de X-PTX-Original-Recipient: marc@kleine-budde.de X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Fri Nov 8 14:48:54 2013 X-DSPAM-Confidence: 0.9995 X-DSPAM-Improbability: 1 in 187923 chance of being spam X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 527cebc660479880214067 X-DSPAM-Factors: 27, git, 0.00025, git, 0.00025, Subject*[PATCH, 0.00026, Signed, 0.00028, Signed, 0.00028, Signed+off, 0.00028, Signed+off, 0.00028, 100644, 0.00029, 100644, 0.00029, diff, 0.00030, diff, 0.00030, index, 0.00030, index, 0.00030, insertions(+), 0.00030, insertions(, 0.00030, diff+git, 0.00030, diff+git, 0.00030, Cc*kernel, 0.00034, c+|, 0.00037, static, 0.00039, struct, 0.00046, X-Mailer*send+email, 0.00047, X-Mailer*email, 0.00047, X-Mailer*git+send, 0.00047, X-Mailer*git, 0.00047, X-Mailer*send, 0.00047, )+diff, 0.00051 X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: devicetree@vger.kernel.org Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Juergen Beisert The RTC in the i.MX28 may be clocked with different crystals. Get the rate of the connected one from the DT. Signed-off-by: Juergen Beisert Signed-off-by: Steffen Trumtrar Signed-off-by: Marc Kleine-Budde --- Documentation/devicetree/bindings/clock/imx28-clock.txt | 1 + arch/arm/boot/dts/imx28.dtsi | 5 +++++ drivers/clk/mxs/clk-imx28.c | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/clock/imx28-clock.txt b/Documentation/devicetree/bindings/clock/imx28-clock.txt index e6587af..c3a9d94 100644 --- a/Documentation/devicetree/bindings/clock/imx28-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx28-clock.txt @@ -76,6 +76,7 @@ clocks and IDs. usb0_phy 62 usb1_phy 63 enet_out 64 + rtc_32k 65 Examples: diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 979c37d..6af9094 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -47,6 +47,11 @@ #address-cells = <1>; #size-cells = <0>; + xtal-32k { + compatible = "fsl,mxs-xtal-32k", "fixed-clock"; + clock-frequency = <0>; + }; + xtal-24m { compatible = "fsl,mxs-xtal-24m", "fixed-clock"; clock-frequency = <24000000>; diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 874ca4e..b6afeb1 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -144,7 +144,7 @@ enum imx28_clk { clk32k_div, rtc, lradc, spdif_div, clk32k, pwm, uart, ssp0, ssp1, ssp2, ssp3, gpmi, spdif, emi, saif0, saif1, lcdif, etm, fec, can0, can1, usb0, usb1, usb0_phy, usb1_phy, enet_out, - clk_max + rtc_32k, clk_max }; static struct clk *clks[clk_max]; @@ -178,6 +178,8 @@ int __init mx28_clocks_init(void) if (of_device_is_compatible(np_tmp, "fsl,mxs-xtal-24m")) clks[ref_xtal] = mxs_clk_fixed("ref_xtal", rate); + else if (of_device_is_compatible(np_tmp, "fsl,mxs-xtal-32k")) + clks[rtc_32k] = mxs_clk_fixed("rtc_32k", rate); } /* if not set, use default frequency */