linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Juergen Beisert <jbe@pengutronix.de>
To: linux-iio@vger.kernel.org
Cc: devel@driverdev.osuosl.org, marex@denx.de,
	fabio.estevam@freescale.com, jic23@cam.ac.uk,
	linux-input@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/9] Staging/iio/adc/touchscreen/MXS: add proper clock handling
Date: Mon, 23 Sep 2013 16:36:30 +0200	[thread overview]
Message-ID: <1379946998-23041-2-git-send-email-jbe@pengutronix.de> (raw)
In-Reply-To: <1379946998-23041-1-git-send-email-jbe@pengutronix.de>

The delay units inside the LRADC depend on the presence of a 2 kHz clock.
This change enables the clock to be able to use the delay unit for the
touchscreen part of the driver.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 arch/arm/boot/dts/imx23.dtsi        | 1 +
 arch/arm/boot/dts/imx28.dtsi        | 1 +
 drivers/staging/iio/adc/mxs-lradc.c | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 28b5ce2..07caf76 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -430,6 +430,7 @@
 				reg = <0x80050000 0x2000>;
 				interrupts = <36 37 38 39 40 41 42 43 44>;
 				status = "disabled";
+				clocks = <&clks 26>;
 			};
 
 			spdif@80054000 {
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 7363fde..175deef 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -902,6 +902,7 @@
 				interrupts = <10 14 15 16 17 18 19
 						20 21 22 23 24 25>;
 				status = "disabled";
+				clocks = <&clks 41>;
 			};
 
 			spdif: spdif@80054000 {
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index a08c173..00b61ac 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -35,6 +35,7 @@
 #include <linux/completion.h>
 #include <linux/delay.h>
 #include <linux/input.h>
+#include <linux/clk.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
@@ -134,6 +135,8 @@ struct mxs_lradc {
 	void __iomem		*base;
 	int			irq[13];
 
+	struct clk		*clk;
+
 	uint32_t		*buffer;
 	struct iio_trigger	*trig;
 
@@ -928,6 +931,9 @@ static int mxs_lradc_probe(struct platform_device *pdev)
 	if (IS_ERR(lradc->base))
 		return PTR_ERR(lradc->base);
 
+	lradc->clk = devm_clk_get(&pdev->dev, NULL);
+	clk_prepare_enable(lradc->clk);
+
 	INIT_WORK(&lradc->ts_work, mxs_lradc_ts_work);
 
 	/* Check if touchscreen is enabled in DT. */
@@ -1020,6 +1026,7 @@ static int mxs_lradc_remove(struct platform_device *pdev)
 	iio_triggered_buffer_cleanup(iio);
 	mxs_lradc_trigger_remove(iio);
 
+	clk_disable_unprepare(lradc->clk);
 	return 0;
 }
 
-- 
1.8.4.rc3

  reply	other threads:[~2013-09-23 14:36 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-23 14:36 [PATCHv6] staging/iio/adc: change the MXS touchscreen driver implementation Juergen Beisert
2013-09-23 14:36 ` Juergen Beisert [this message]
2013-09-23 15:13   ` [PATCH 1/9] Staging/iio/adc/touchscreen/MXS: add proper clock handling Fabio Estevam
     [not found]     ` <52405A7F.1050801-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-09-24  7:50       ` Jürgen Beisert
2013-09-24 13:50         ` Fabio Estevam
2013-10-01 10:57         ` Jonathan Cameron
     [not found]   ` <1379946998-23041-2-git-send-email-jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-09-23 15:30     ` Lothar Waßmann
     [not found]       ` <21056.24202.312851.105281-VjFSrY7JcPWvSplVBqRQBQ@public.gmane.org>
2013-09-24  7:39         ` Jürgen Beisert
2013-09-23 14:36 ` [PATCH 2/9] Staging/iio/adc/touchscreen/MXS: distinguish i.MX23's and i.MX28's LRADC Juergen Beisert
     [not found]   ` <1379946998-23041-3-git-send-email-jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-10-01 10:58     ` Jonathan Cameron
2013-09-23 14:36 ` [PATCH 3/9] Staging/iio/adc/touchscreen/MXS: separate i.MX28 specific register bits Juergen Beisert
     [not found]   ` <1379946998-23041-4-git-send-email-jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-10-01 11:00     ` Jonathan Cameron
2013-09-23 14:36 ` [PATCH 4/9] Staging/iio/adc/touchscreen/MXS: simplify register access Juergen Beisert
2013-10-01 11:01   ` Jonathan Cameron
2013-09-23 14:36 ` [PATCH 5/9] Staging/iio/adc/touchscreen/MXS: add i.MX23 support to the LRADC touchscreen driver Juergen Beisert
2013-10-01 11:02   ` Jonathan Cameron
2013-09-23 14:36 ` [PATCH 6/9] Staging/iio/adc/touchscreen/MXS: add interrupt driven touch detection Juergen Beisert
     [not found]   ` <1379946998-23041-7-git-send-email-jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-10-01  9:28     ` Jürgen Beisert
2013-10-01 10:51       ` Jonathan Cameron
     [not found]         ` <524AA91F.7000906-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-10-01 11:06           ` Jonathan Cameron
2013-09-23 14:36 ` [PATCH 7/9] Staging/iio/adc/touchscreen/MXS: remove old touchscreen detection implementation Juergen Beisert
2013-10-01 11:13   ` Jonathan Cameron
2013-09-23 14:36 ` [PATCH 9/9] Staging/iio: add TODO reminder Juergen Beisert
     [not found]   ` <1379946998-23041-10-git-send-email-jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-10-01 11:14     ` Jonathan Cameron
     [not found]       ` <524AAEA8.4090106-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-10-01 11:21         ` Jonathan Cameron
     [not found]           ` <524AB04C.4070409-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-10-01 11:22             ` Jonathan Cameron
     [not found] ` <1379946998-23041-1-git-send-email-jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-09-23 14:36   ` [PATCH 8/9] Staging/iio/adc/touchscreen/MXS: provide devicetree adaption Juergen Beisert
     [not found]     ` <1379946998-23041-9-git-send-email-jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2013-10-01 11:14       ` Jonathan Cameron
2013-09-23 15:25   ` [PATCHv6] staging/iio/adc: change the MXS touchscreen driver implementation Marek Vasut
2013-10-01  9:25   ` Jonathan Cameron
     [not found]     ` <524A951A.5050606-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-10-01 10:49       ` Marek Vasut
2014-01-09 13:31   ` Alexandre Belloni
     [not found]     ` <52CEA4AA.8050503-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2014-01-10  8:55       ` Jürgen Beisert
2014-02-04 23:45         ` Marek Vasut
     [not found]         ` <201401100955.45885.jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-02-24 13:16           ` Juergen Beisert
2014-02-24 13:33             ` Dan Carpenter
2014-02-24 14:38               ` Juergen Beisert
2014-02-24 14:47                 ` Dan Carpenter
2014-02-24 14:39               ` [PATCH] staging/iio/adc/MXS/LRADC: fix touchscreen statemachine Juergen Beisert
2014-02-24 16:48                 ` Alexandre Belloni
     [not found]                   ` <20140224164817.GE4436-m++hUPXGwpdeoWH0uzbU5w@public.gmane.org>
2014-02-24 21:14                     ` Jonathan Cameron
     [not found]                       ` <530BB63D.4050200-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2014-02-24 22:04                         ` Jonathan Cameron
     [not found]             ` <201402241416.24270.jbe-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-02-24 14:26               ` [PATCHv6] staging/iio/adc: change the MXS touchscreen driver implementation Alexandre Belloni
     [not found]                 ` <20140224142658.GD4436-m++hUPXGwpdeoWH0uzbU5w@public.gmane.org>
2014-02-24 17: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=1379946998-23041-2-git-send-email-jbe@pengutronix.de \
    --to=jbe@pengutronix.de \
    --cc=devel@driverdev.osuosl.org \
    --cc=fabio.estevam@freescale.com \
    --cc=jic23@cam.ac.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=marex@denx.de \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).