From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> To: linux-arm-kernel@lists.infradead.org Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>, linux-iio@vger.kernel.org, Nicolas Ferre <nicolas.ferre@atmel.com>, Ludovic Desroches <ludovic.desroches@atmel.com> Subject: [PATCH 2/3] ARM: AT91: IIO: add sleep mode support Date: Wed, 19 Dec 2012 19:37:11 +0100 [thread overview] Message-ID: <1355942232-26251-2-git-send-email-plagnioj@jcrosoft.com> (raw) In-Reply-To: <1355942232-26251-1-git-send-email-plagnioj@jcrosoft.com> The sleep mode will allow to put the add in sleep between conversion. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: linux-iio@vger.kernel.org Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Ludovic Desroches <ludovic.desroches@atmel.com> --- Documentation/devicetree/bindings/arm/atmel-adc.txt | 1 + drivers/iio/adc/at91_adc.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/atmel-adc.txt b/Documentation/devicetree/bindings/arm/atmel-adc.txt index fd2d69e..efb6f02 100644 --- a/Documentation/devicetree/bindings/arm/atmel-adc.txt +++ b/Documentation/devicetree/bindings/arm/atmel-adc.txt @@ -25,6 +25,7 @@ Optional properties: - atmel,adc-use-res: String corresponding to an identifier from atmel,adc-res-names property. If not specified, the highest resolution will be used. + - atmel,atmel,adc-sleep-mode: Boolean to enable of sleep mode when no conversion Optional trigger Nodes: - Required properties: diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index f175a86..c563488 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -52,6 +52,7 @@ struct at91_adc_state { void __iomem *reg_base; struct at91_adc_reg_desc *registers; u8 startup_time; + bool sleep_mode; struct iio_trigger **trig; struct at91_adc_trigger *trigger_list; u32 trigger_number; @@ -455,6 +456,8 @@ static int at91_adc_probe_dt(struct at91_adc_state *st, } st->num_channels = prop; + st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); + if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); ret = -EINVAL; @@ -580,6 +583,7 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) struct iio_dev *idev; struct at91_adc_state *st; struct resource *res; + u32 reg; idev = iio_device_alloc(sizeof(struct at91_adc_state)); if (idev == NULL) { @@ -687,16 +691,13 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) */ ticks = round_up((st->startup_time * adc_clk / 1000000) - 1, 8) / 8; - + reg = AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL; + reg |= AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP; if (st->low_res) - at91_adc_writel(st, AT91_ADC_MR, - AT91_ADC_LOWRES | - (AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL) | - (AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP)); - else - at91_adc_writel(st, AT91_ADC_MR, - (AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL) | - (AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP)); + reg |= AT91_ADC_LOWRES; + if (st->sleep_mode) + reg |= AT91_ADC_SLEEP; + at91_adc_writel(st, AT91_ADC_MR, reg); /* Setup the ADC channels available on the board */ ret = at91_adc_channel_init(idev); -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: plagnioj@jcrosoft.com (Jean-Christophe PLAGNIOL-VILLARD) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] ARM: AT91: IIO: add sleep mode support Date: Wed, 19 Dec 2012 19:37:11 +0100 [thread overview] Message-ID: <1355942232-26251-2-git-send-email-plagnioj@jcrosoft.com> (raw) In-Reply-To: <1355942232-26251-1-git-send-email-plagnioj@jcrosoft.com> The sleep mode will allow to put the add in sleep between conversion. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: linux-iio at vger.kernel.org Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Ludovic Desroches <ludovic.desroches@atmel.com> --- Documentation/devicetree/bindings/arm/atmel-adc.txt | 1 + drivers/iio/adc/at91_adc.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/atmel-adc.txt b/Documentation/devicetree/bindings/arm/atmel-adc.txt index fd2d69e..efb6f02 100644 --- a/Documentation/devicetree/bindings/arm/atmel-adc.txt +++ b/Documentation/devicetree/bindings/arm/atmel-adc.txt @@ -25,6 +25,7 @@ Optional properties: - atmel,adc-use-res: String corresponding to an identifier from atmel,adc-res-names property. If not specified, the highest resolution will be used. + - atmel,atmel,adc-sleep-mode: Boolean to enable of sleep mode when no conversion Optional trigger Nodes: - Required properties: diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index f175a86..c563488 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -52,6 +52,7 @@ struct at91_adc_state { void __iomem *reg_base; struct at91_adc_reg_desc *registers; u8 startup_time; + bool sleep_mode; struct iio_trigger **trig; struct at91_adc_trigger *trigger_list; u32 trigger_number; @@ -455,6 +456,8 @@ static int at91_adc_probe_dt(struct at91_adc_state *st, } st->num_channels = prop; + st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); + if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); ret = -EINVAL; @@ -580,6 +583,7 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) struct iio_dev *idev; struct at91_adc_state *st; struct resource *res; + u32 reg; idev = iio_device_alloc(sizeof(struct at91_adc_state)); if (idev == NULL) { @@ -687,16 +691,13 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) */ ticks = round_up((st->startup_time * adc_clk / 1000000) - 1, 8) / 8; - + reg = AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL; + reg |= AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP; if (st->low_res) - at91_adc_writel(st, AT91_ADC_MR, - AT91_ADC_LOWRES | - (AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL) | - (AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP)); - else - at91_adc_writel(st, AT91_ADC_MR, - (AT91_ADC_PRESCAL_(prsc) & AT91_ADC_PRESCAL) | - (AT91_ADC_STARTUP_(ticks) & AT91_ADC_STARTUP)); + reg |= AT91_ADC_LOWRES; + if (st->sleep_mode) + reg |= AT91_ADC_SLEEP; + at91_adc_writel(st, AT91_ADC_MR, reg); /* Setup the ADC channels available on the board */ ret = at91_adc_channel_init(idev); -- 1.7.10.4
next prev parent reply other threads:[~2012-12-19 18:58 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-12-19 18:32 [PATCH 0/3] IIO: AT91: add lowres, sleep and sample&hold time missing support Jean-Christophe PLAGNIOL-VILLARD 2012-12-19 18:32 ` Jean-Christophe PLAGNIOL-VILLARD 2012-12-19 18:37 ` [PATCH 1/3] ARM: AT91: IIO: add low and high res support for adc Jean-Christophe PLAGNIOL-VILLARD 2012-12-19 18:37 ` Jean-Christophe PLAGNIOL-VILLARD 2012-12-19 18:37 ` Jean-Christophe PLAGNIOL-VILLARD [this message] 2012-12-19 18:37 ` [PATCH 2/3] ARM: AT91: IIO: add sleep mode support Jean-Christophe PLAGNIOL-VILLARD 2012-12-20 10:46 ` Maxime Ripard 2012-12-20 10:46 ` Maxime Ripard 2012-12-27 12:09 ` Jonathan Cameron 2012-12-27 12:09 ` Jonathan Cameron 2012-12-27 17:54 ` Maxime Ripard 2012-12-27 17:54 ` Maxime Ripard 2012-12-19 18:37 ` [PATCH 3/3] ARM: AT91: IIO: fix missing Sample and Hold time Jean-Christophe PLAGNIOL-VILLARD 2012-12-19 18:37 ` Jean-Christophe PLAGNIOL-VILLARD 2012-12-20 10:55 ` Maxime Ripard 2012-12-20 10:55 ` Maxime Ripard 2012-12-20 12:49 ` Jean-Christophe PLAGNIOL-VILLARD 2012-12-20 12:49 ` Jean-Christophe PLAGNIOL-VILLARD 2012-12-21 9:08 ` Maxime Ripard 2012-12-21 9:08 ` Maxime Ripard 2012-12-20 10:42 ` [PATCH 1/3] ARM: AT91: IIO: add low and high res support for adc Maxime Ripard 2012-12-20 10:42 ` Maxime Ripard 2012-12-20 10:52 ` ludovic.desroches 2012-12-20 15:51 ` Maxime Ripard 2012-12-20 15:51 ` Maxime Ripard 2012-12-20 16:13 ` ludovic.desroches 2012-12-21 9:07 ` Maxime Ripard 2012-12-21 9:07 ` Maxime Ripard 2012-12-22 17:21 ` Jean-Christophe PLAGNIOL-VILLARD 2012-12-22 17:21 ` Jean-Christophe PLAGNIOL-VILLARD 2013-01-07 9:20 ` Maxime Ripard 2013-01-07 9:20 ` Maxime Ripard 2012-12-20 10:40 ` [PATCH 0/3] IIO: AT91: add lowres, sleep and sample&hold time missing support Maxime Ripard 2012-12-20 10:40 ` Maxime Ripard 2012-12-20 10:51 ` Nicolas Ferre 2012-12-20 10:51 ` Nicolas Ferre 2012-12-27 12:14 ` Jonathan Cameron 2012-12-27 12:14 ` Jonathan Cameron
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1355942232-26251-2-git-send-email-plagnioj@jcrosoft.com \ --to=plagnioj@jcrosoft.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-iio@vger.kernel.org \ --cc=ludovic.desroches@atmel.com \ --cc=nicolas.ferre@atmel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.