All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>,
	Jonathan Cameron <jic23@kernel.org>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-iio@vger.kernel.org,
	linux-input@vger.kernel.org,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	Gregory Clement <gregory.clement@free-electrons.com>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCH 05/15] ARM: at91: sam9m10g45ek: Add touchscreen support through at91_adc
Date: Wed,  5 Mar 2014 18:35:30 +0100	[thread overview]
Message-ID: <1394040940-18246-6-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1394040940-18246-1-git-send-email-alexandre.belloni@free-electrons.com>

at91_adc now supports reading a touchscreen for ADCs without a TSMR register.
Enable touchscreen support through at91_adc. This allows to use both a
touchscreen and the remaining ADC channel at the same time.

Also, lower the clock for the ADC as it allows to have more stable reads and
this is the speed used by atmel_tsadcc.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/at91sam9g45.c        | 2 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 2f455ce35268..3c519a7a938f 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -181,7 +181,7 @@ static struct clk vdec_clk = {
 static struct clk adc_op_clk = {
 	.name		= "adc_op_clk",
 	.type		= CLK_TYPE_PERIPHERAL,
-	.rate_hz	= 13200000,
+	.rate_hz	= 300000,
 };
 
 /* AES/TDES/SHA clock - Only for sam9m11/sam9g56 */
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ef39078c8ce2..4d775b796ce4 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -315,6 +315,7 @@ static struct at91_adc_data ek_adc_data = {
 	.channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7),
 	.use_external_triggers = true,
 	.vref = 3300,
+	.touchscreen_type = ATMEL_ADC_TOUCHSCREEN_4WIRE,
 };
 
 /*
-- 
1.8.3.2


WARNING: multiple messages have this Message-ID (diff)
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>,
	Jonathan Cameron <jic23@kernel.org>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	linux-input@vger.kernel.org,
	Gregory Clement <gregory.clement@free-electrons.com>,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/15] ARM: at91: sam9m10g45ek: Add touchscreen support through at91_adc
Date: Wed,  5 Mar 2014 18:35:30 +0100	[thread overview]
Message-ID: <1394040940-18246-6-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1394040940-18246-1-git-send-email-alexandre.belloni@free-electrons.com>

at91_adc now supports reading a touchscreen for ADCs without a TSMR register.
Enable touchscreen support through at91_adc. This allows to use both a
touchscreen and the remaining ADC channel at the same time.

Also, lower the clock for the ADC as it allows to have more stable reads and
this is the speed used by atmel_tsadcc.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/at91sam9g45.c        | 2 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 2f455ce35268..3c519a7a938f 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -181,7 +181,7 @@ static struct clk vdec_clk = {
 static struct clk adc_op_clk = {
 	.name		= "adc_op_clk",
 	.type		= CLK_TYPE_PERIPHERAL,
-	.rate_hz	= 13200000,
+	.rate_hz	= 300000,
 };
 
 /* AES/TDES/SHA clock - Only for sam9m11/sam9g56 */
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ef39078c8ce2..4d775b796ce4 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -315,6 +315,7 @@ static struct at91_adc_data ek_adc_data = {
 	.channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7),
 	.use_external_triggers = true,
 	.vref = 3300,
+	.touchscreen_type = ATMEL_ADC_TOUCHSCREEN_4WIRE,
 };
 
 /*
-- 
1.8.3.2

WARNING: multiple messages have this Message-ID (diff)
From: alexandre.belloni@free-electrons.com (Alexandre Belloni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/15] ARM: at91: sam9m10g45ek: Add touchscreen support through at91_adc
Date: Wed,  5 Mar 2014 18:35:30 +0100	[thread overview]
Message-ID: <1394040940-18246-6-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1394040940-18246-1-git-send-email-alexandre.belloni@free-electrons.com>

at91_adc now supports reading a touchscreen for ADCs without a TSMR register.
Enable touchscreen support through at91_adc. This allows to use both a
touchscreen and the remaining ADC channel at the same time.

Also, lower the clock for the ADC as it allows to have more stable reads and
this is the speed used by atmel_tsadcc.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/at91sam9g45.c        | 2 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 2f455ce35268..3c519a7a938f 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -181,7 +181,7 @@ static struct clk vdec_clk = {
 static struct clk adc_op_clk = {
 	.name		= "adc_op_clk",
 	.type		= CLK_TYPE_PERIPHERAL,
-	.rate_hz	= 13200000,
+	.rate_hz	= 300000,
 };
 
 /* AES/TDES/SHA clock - Only for sam9m11/sam9g56 */
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ef39078c8ce2..4d775b796ce4 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -315,6 +315,7 @@ static struct at91_adc_data ek_adc_data = {
 	.channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7),
 	.use_external_triggers = true,
 	.vref = 3300,
+	.touchscreen_type = ATMEL_ADC_TOUCHSCREEN_4WIRE,
 };
 
 /*
-- 
1.8.3.2

  parent reply	other threads:[~2014-03-05 17:39 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-05 17:35 [PATCH 00/15] iio: adc: at91 cleanups and atmel_tsadcc removal Alexandre Belloni
2014-03-05 17:35 ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 01/15] ARM: at91: sam9g45: remove unused platform_data Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-16 17:49   ` Jonathan Cameron
2014-03-16 17:49     ` Jonathan Cameron
2014-03-16 17:49     ` Jonathan Cameron
2014-03-05 17:35 ` [PATCH 02/15] ARM: at91: sam9260: " Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-16 17:49   ` Jonathan Cameron
2014-03-16 17:49     ` Jonathan Cameron
2014-03-16 17:49     ` Jonathan Cameron
2014-03-05 17:35 ` [PATCH 03/15] iio: adc: at91: cleanup platform_data Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-16 17:55   ` Jonathan Cameron
2014-03-16 17:55     ` Jonathan Cameron
2014-03-05 17:35 ` [PATCH 04/15] iio: adc: at91_adc: Add support for touchscreens without TSMR Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 18:27   ` Thomas Petazzoni
2014-03-05 18:27     ` Thomas Petazzoni
2014-03-05 18:50   ` Dmitry Torokhov
2014-03-05 18:50     ` Dmitry Torokhov
2014-03-16 18:16   ` Jonathan Cameron
2014-03-16 18:16     ` Jonathan Cameron
2014-03-16 19:16     ` Alexandre Belloni
2014-03-16 19:16       ` Alexandre Belloni
2014-03-16 19:16       ` Alexandre Belloni
2014-03-16 20:28       ` Jonathan Cameron
2014-03-16 20:28         ` Jonathan Cameron
2014-03-16 20:28         ` Jonathan Cameron
2014-03-05 17:35 ` Alexandre Belloni [this message]
2014-03-05 17:35   ` [PATCH 05/15] ARM: at91: sam9m10g45ek: Add touchscreen support through at91_adc Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-16 18:18   ` Jonathan Cameron
2014-03-16 18:18     ` Jonathan Cameron
2014-03-16 20:00     ` Alexandre Belloni
2014-03-16 20:00       ` Alexandre Belloni
2014-03-16 20:00       ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 06/15] iio: adc: at91: remove unused include from include/mach Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 07/15] iio: adc: at91: add sam9rl support Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 08/15] ARM: at91: sam9rl: add at91_adc to support adc and touchscreen Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 09/15] ARM: at91: sam9rlek add touchscreen support through at91_adc Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 10/15] ARM: at91: sam9g45: switch from atmel_tsadcc to at91_adc Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 11/15] ARM: at91: sam9rl: " Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 12/15] ARM: at91: remove atmel_tsadcc platform_data Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 13/15] ARM: at91: remove atmel_tsadcc from sama5_defconfig Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 17:35 ` [PATCH 14/15] Input: atmel_tsadcc: remove driver Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-05 18:46   ` Dmitry Torokhov
2014-03-05 18:46     ` Dmitry Torokhov
2014-03-16 18:26     ` Jonathan Cameron
2014-03-16 18:26       ` Jonathan Cameron
2014-03-16 19:26       ` Dmitry Torokhov
2014-03-16 19:26         ` Dmitry Torokhov
2014-03-16 19:26         ` Dmitry Torokhov
2014-03-05 17:35 ` [PATCH 15/15] ARM: at91/dt: at91-cosino_mega2560 remove useless tsadcc node Alexandre Belloni
2014-03-05 17:35   ` Alexandre Belloni
2014-03-16 18:30 ` [PATCH 00/15] iio: adc: at91 cleanups and atmel_tsadcc removal Jonathan Cameron
2014-03-16 18:30   ` Jonathan Cameron
2014-03-16 18:30   ` Jonathan Cameron
2014-03-16 19:29   ` Alexandre Belloni
2014-03-16 19:29     ` Alexandre Belloni
2014-03-19 10:19   ` Nicolas Ferre
2014-03-19 10:19     ` Nicolas Ferre
2014-03-19 10:19     ` Nicolas Ferre
2014-03-22 12:31     ` Jonathan Cameron
2014-03-22 12:31       ` Jonathan Cameron
2014-03-24  9:00       ` Nicolas Ferre
2014-03-24  9:00         ` Nicolas Ferre
2014-03-24  9:00         ` Nicolas Ferre

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=1394040940-18246-6-git-send-email-alexandre.belloni@free-electrons.com \
    --to=alexandre.belloni@free-electrons.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=gregory.clement@free-electrons.com \
    --cc=jic23@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.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: link
Be 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.