From patchwork Sun Jul 14 08:04:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Wu X-Patchwork-Id: 2827201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E199D9F756 for ; Sun, 14 Jul 2013 08:06:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02AEF2011B for ; Sun, 14 Jul 2013 08:06:55 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0005C20111 for ; Sun, 14 Jul 2013 08:06:53 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UyHJa-0005fS-05; Sun, 14 Jul 2013 08:05:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UyHJT-0008Hw-P2; Sun, 14 Jul 2013 08:05:47 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UyHJG-0008FF-8F for linux-arm-kernel@lists.infradead.org; Sun, 14 Jul 2013 08:05:35 +0000 Received: from bamboo.corp.atmel.com ([10.217.11.52]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id r6E7wb9A003909; Sun, 14 Jul 2013 00:59:00 -0700 (PDT) From: Josh Wu To: jic23@cam.ac.uk Subject: [PATCH 4/5] iio: at91: add an optional dt property for for adc clock hz. Date: Sun, 14 Jul 2013 16:04:28 +0800 Message-Id: <1373789069-11604-5-git-send-email-josh.wu@atmel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1373789069-11604-1-git-send-email-josh.wu@atmel.com> References: <1373789069-11604-1-git-send-email-josh.wu@atmel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130714_040534_545284_EBEC5D7A X-CRM114-Status: GOOD ( 10.91 ) X-Spam-Score: -1.9 (-) Cc: linux-iio@vger.kernel.org, nicolas.ferre@atmel.com, Josh Wu , maxime.ripard@free-electrons.com, plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Josh Wu --- Documentation/devicetree/bindings/arm/atmel-adc.txt | 2 ++ drivers/iio/adc/at91_adc.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/atmel-adc.txt b/Documentation/devicetree/bindings/arm/atmel-adc.txt index 16769d9..0db2945 100644 --- a/Documentation/devicetree/bindings/arm/atmel-adc.txt +++ b/Documentation/devicetree/bindings/arm/atmel-adc.txt @@ -27,6 +27,8 @@ Optional properties: resolution will be used. - atmel,adc-sleep-mode: Boolean to enable sleep mode when no conversion - atmel,adc-sample-hold-time: Sample and Hold Time in microseconds + - atmel,adc-clock-rate: ADC clock rate. If not specified, use the default + adc_op_clk. Optional trigger Nodes: - Required properties: diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index e93a075..8f1386f 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -47,6 +47,7 @@ struct at91_adc_caps { struct at91_adc_state { struct clk *adc_clk; + u32 adc_clk_rate; u16 *buffer; unsigned long channels_mask; struct clk *clk; @@ -448,6 +449,10 @@ static int at91_adc_probe_dt(struct at91_adc_state *st, if (!node) return -EINVAL; + prop = 0; + of_property_read_u32(node, "atmel,adc-clock-rate", &prop); + st->adc_clk_rate = prop; + st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { @@ -723,7 +728,8 @@ static int at91_adc_probe(struct platform_device *pdev) * specified by the electrical characteristics of the board. */ mstrclk = clk_get_rate(st->clk); - adc_clk = clk_get_rate(st->adc_clk); + adc_clk = st->adc_clk_rate ? + st->adc_clk_rate : clk_get_rate(st->adc_clk); adc_clk_khz = adc_clk / 1000; prsc = (mstrclk / (2 * adc_clk)) - 1;