From a3acf49f2cbbf3d913e2796042b265898b4e989a Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Sun, 8 Nov 2009 02:53:49 +0100
Subject: [PATCH 4/4] Colibri/PXA320: Pass IRQ line to UCB1400

This patch passes the correct IRQ line to the UCB1400 codec through
platform_data.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 arch/arm/mach-pxa/colibri-pxa320.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c
index 3b349e9..56b71bc 100644
--- a/arch/arm/mach-pxa/colibri-pxa320.c
+++ b/arch/arm/mach-pxa/colibri-pxa320.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
+#include <linux/ucb1400.h>
 
 #include <asm/mach-types.h>
 #include <asm/sizes.h>
@@ -148,6 +149,15 @@ static inline void colibri_pxa320_init_lcd(void) {}
 
 #if	defined(CONFIG_TOUCHSCREEN_UCB1400) || \
 	defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE)
+static struct ucb1400_pdata colibri_pxa320_ucb1400_pdata = {
+	.irq		= gpio_to_irq(4),
+};
+
+static pxa2xx_audio_ops_t colibri_pxa320_ac97_pdata = {
+	.codec_pdata	= { &colibri_pxa320_ucb1400_pdata },
+};
+#define	colibri_pxa320_ac97_pd	(&colibri_pxa320_ac97_pdata)
+
 static struct platform_device colibri_pxa320_ts_device = {
 	.name		= "ucb1400_core",
 	.id		= -1,
@@ -159,6 +169,7 @@ static void __init colibri_pxa320_init_touchscreen(void)
 }
 #else
 static inline void colibri_pxa320_init_touchscreen(void) {}
+#define	colibri_pxa320_ac97_pd	(NULL)
 #endif
 
 #if	defined(CONFIG_SND_AC97_CODEC) || \
@@ -175,7 +186,7 @@ static mfp_cfg_t colibri_pxa320_ac97_pin_config[] __initdata = {
 static inline void __init colibri_pxa320_init_ac97(void)
 {
 	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa320_ac97_pin_config));
-	pxa_set_ac97_info(NULL);
+	pxa_set_ac97_info(colibri_pxa320_ac97_pd);
 }
 #else
 static inline void colibri_pxa320_init_ac97(void) {}
-- 
1.6.5