From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/13] ARM: pxa: Correct touch IRQ passing to UCB1400 on vpac270
Date: Sun, 10 Oct 2010 00:39:28 +0200 [thread overview]
Message-ID: <1286663971-15634-10-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1286663971-15634-1-git-send-email-marek.vasut@gmail.com>
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
arch/arm/mach-pxa/vpac270.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index 07c35eb..6278578 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -430,20 +430,18 @@ static inline void vpac270_eth_init(void) {}
******************************************************************************/
#if defined(CONFIG_TOUCHSCREEN_UCB1400) || \
defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)
-static pxa2xx_audio_ops_t vpac270_ac97_pdata = {
- .reset_gpio = 95,
-};
-
static struct ucb1400_pdata vpac270_ucb1400_pdata = {
.irq = IRQ_GPIO(GPIO113_VPAC270_TS_IRQ),
};
+static pxa2xx_audio_ops_t vpac270_ac97_pdata = {
+ .reset_gpio = 95,
+ .codec_pdata = { &vpac270_ucb1400_pdata, },
+};
+
static struct platform_device vpac270_ucb1400_device = {
.name = "ucb1400_core",
.id = -1,
- .dev = {
- .platform_data = &vpac270_ucb1400_pdata,
- },
};
static void __init vpac270_ts_init(void)
--
1.7.1
next prev parent reply other threads:[~2010-10-09 22:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 22:39 [PATCH 01/13] ARM: pxa: Introduce pxa[23]xx_map_io Marek Vasut
2010-10-09 22:39 ` [PATCH 02/13] ARM: pxa: Access SMEMC via virtual addresses Marek Vasut
2010-10-10 0:31 ` Haojian Zhuang
2010-10-10 2:03 ` Marek Vasut
2010-10-09 22:39 ` [PATCH 03/13] ARM: pxa: Toradex Colibri PXA270 CF support Marek Vasut
2010-10-09 22:39 ` [PATCH 04/13] ARM: pxa: Push Colibri evalboard MFP into module files Marek Vasut
2010-10-09 22:39 ` [PATCH 05/13] ARM: pxa: Add M41T00 RTC support into Colibri evalboard Marek Vasut
2010-10-09 22:39 ` [PATCH 06/13] ARM: pxa: Rename " Marek Vasut
2010-10-09 22:39 ` [PATCH 07/13] ARM: pxa: Colibri PXA320 PCMCIA driver Marek Vasut
2010-10-09 22:39 ` [PATCH 08/13] ARM: pxa: Modularize Palm Tungsten|C Marek Vasut
2010-10-09 22:39 ` [PATCH 09/13] UCB1400: Pass ucb1400-gpio data through ac97 bus Marek Vasut
2010-10-09 22:39 ` Marek Vasut [this message]
2010-10-09 22:39 ` [PATCH 11/13] ARM: pxa: Pass GPIO offset to ucb1400-gpio on PalmTC Marek Vasut
2010-10-09 22:39 ` [PATCH 12/13] ARM: pxa: Add gpio-leds and vibrator support to PalmTC Marek Vasut
2010-10-10 0:34 ` Haojian Zhuang
2010-10-10 2:04 ` Marek Vasut
2010-10-09 22:39 ` [PATCH 13/13] ARM: pxa: Fix pxa2xx-flash section mismatch Marek Vasut
2010-10-10 0:32 ` Haojian Zhuang
2010-10-10 2:05 ` Marek Vasut
2010-10-10 7:38 ` [PATCH 01/13] ARM: pxa: Introduce pxa[23]xx_map_io Igor Grinberg
2010-10-10 18:16 ` Marek Vasut
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=1286663971-15634-10-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).