From patchwork Sun Jul 14 08:04:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Wu X-Patchwork-Id: 2827204 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 CDFFE9F756 for ; Sun, 14 Jul 2013 08:09:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2725200EC for ; Sun, 14 Jul 2013 08:09:25 +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 536AD200C6 for ; Sun, 14 Jul 2013 08:09:24 +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 1UyHKL-0005oq-NF; Sun, 14 Jul 2013 08:06:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UyHJq-0008J8-0B; Sun, 14 Jul 2013 08:06:10 +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-0008FE-8G for linux-arm-kernel@lists.infradead.org; Sun, 14 Jul 2013 08:05:37 +0000 Received: from bamboo.corp.atmel.com ([10.217.11.52]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id r6E7wb98003909; Sun, 14 Jul 2013 00:58:55 -0700 (PDT) From: Josh Wu To: jic23@cam.ac.uk Subject: [PATCH 2/5] iio: at91: Use different prescal, startup mask in MR for different IP Date: Sun, 14 Jul 2013 16:04:26 +0800 Message-Id: <1373789069-11604-3-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_610971_E6D90E2A X-CRM114-Status: GOOD ( 14.77 ) 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 For at91 boards, there are different IPs for adc. Different IPs has different STARTUP & PRESCAL mask in ADC_MR. This patch can change the masks according to the different IP version. Signed-off-by: Josh Wu --- arch/arm/mach-at91/include/mach/at91_adc.h | 9 ++++-- drivers/iio/adc/at91_adc.c | 48 ++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-at91/include/mach/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h index 8e7ed5c..ab273ee 100644 --- a/arch/arm/mach-at91/include/mach/at91_adc.h +++ b/arch/arm/mach-at91/include/mach/at91_adc.h @@ -28,9 +28,12 @@ #define AT91_ADC_TRGSEL_EXTERNAL (6 << 1) #define AT91_ADC_LOWRES (1 << 4) /* Low Resolution */ #define AT91_ADC_SLEEP (1 << 5) /* Sleep Mode */ -#define AT91_ADC_PRESCAL (0x3f << 8) /* Prescalar Rate Selection */ +#define AT91_ADC_PRESCAL (0xff << 8) /* Prescalar Rate Selection */ +#define AT91_ADC_PRESCAL_9260 (0x3f << 8) #define AT91_ADC_PRESCAL_(x) ((x) << 8) -#define AT91_ADC_STARTUP (0x1f << 16) /* Startup Up Time */ +#define AT91_ADC_STARTUP (0xf << 16) /* Startup Up Time */ +#define AT91_ADC_STARTUP_9260 (0x1f << 16) +#define AT91_ADC_STARTUP_9G45 (0x7f << 16) #define AT91_ADC_STARTUP_(x) ((x) << 16) #define AT91_ADC_SHTIM (0xf << 24) /* Sample & Hold Time */ #define AT91_ADC_SHTIM_(x) ((x) << 24) @@ -58,4 +61,6 @@ #define AT91_ADC_CHR(n) (0x30 + ((n) * 4)) /* Channel Data Register N */ #define AT91_ADC_DATA (0x3ff) +#define AT91_ADC_VERSION 0xFC + #endif diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index 18bd54f..14e99ba 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -39,6 +39,12 @@ #define at91_adc_writel(st, reg, val) \ (writel_relaxed(val, st->reg_base + reg)) +struct at91_adc_caps { + bool has_tsmr; /* only at91sam9x5, sama5d3 have TSMR reg */ + u32 mr_prescal_mask; + u32 mr_startup_mask; +}; + struct at91_adc_state { struct clk *adc_clk; u16 *buffer; @@ -62,6 +68,7 @@ struct at91_adc_state { u32 res; /* resolution used for convertions */ bool low_res; /* the resolution corresponds to the lowest one */ wait_queue_head_t wq_data_avail; + struct at91_adc_caps caps; }; static irqreturn_t at91_adc_trigger_handler(int irq, void *p) @@ -580,6 +587,41 @@ static const struct iio_info at91_adc_info = { .read_raw = &at91_adc_read_raw, }; +/* + * Since atmel adc support different ip for touchscreen mode. Through the + * IP check, we will know the touchscreen capbilities. + */ +static void atmel_adc_get_cap(struct at91_adc_state *st) +{ + unsigned int version; + struct iio_dev *idev = iio_priv_to_dev(st); + + version = at91_adc_readl(st, AT91_ADC_VERSION); + dev_dbg(&idev->dev, "version: 0x%x\n", version); + + st->caps.mr_prescal_mask = AT91_ADC_PRESCAL_9260; + st->caps.mr_startup_mask = AT91_ADC_STARTUP_9260; + + /* keep only major version number */ + switch (version & 0xf00) { + case 0x500: /* SAMA5D3 */ + case 0x400: /* AT91SAM9X5/9N12 */ + st->caps.has_tsmr = 1; + st->caps.mr_startup_mask = AT91_ADC_STARTUP; + case 0x200: /* AT91SAM9M10/9G45 */ + st->caps.mr_prescal_mask = AT91_ADC_PRESCAL; + + if ((version & 0xf00) == 0x200) + st->caps.mr_startup_mask = AT91_ADC_STARTUP_9G45; + case 0x100: /* AT91SAM9260/9G20 */ + break; + default: + dev_warn(&idev->dev, + "Unmanaged adc version, use minimal capabilities\n"); + break; + }; +} + static int at91_adc_probe(struct platform_device *pdev) { unsigned int prsc, mstrclk, ticks, adc_clk, adc_clk_khz, shtim; @@ -645,6 +687,8 @@ static int at91_adc_probe(struct platform_device *pdev) goto error_free_device; } + atmel_adc_get_cap(st); + st->clk = devm_clk_get(&pdev->dev, "adc_clk"); if (IS_ERR(st->clk)) { dev_err(&pdev->dev, "Failed to get the clock.\n"); @@ -704,8 +748,8 @@ static int at91_adc_probe(struct platform_device *pdev) shtim = round_up((st->sample_hold_time * adc_clk_khz / 1000) - 1, 1); - reg = AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL; - reg |= AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP; + reg = AT91_ADC_PRESCAL_(prsc) & st->caps.mr_prescal_mask; + reg |= AT91_ADC_STARTUP_(ticks) & st->caps.mr_startup_mask; if (st->low_res) reg |= AT91_ADC_LOWRES; if (st->sleep_mode)