summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/assabet.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-20 23:18:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-19 00:15:43 +0100
commit69dde86aa616b09bb3ef39a5ab783f82254d241c (patch)
tree6e7fad723f7ef0be1f549ceb3c5df85a5463544d /arch/arm/mach-sa1100/assabet.c
parentMFD: ucb1x00-core: add wakeup support (diff)
downloadlinux-69dde86aa616b09bb3ef39a5ab783f82254d241c.tar.xz
linux-69dde86aa616b09bb3ef39a5ab783f82254d241c.zip
ARM: sa11x0: add assabet ucb1x00 platform data
Add ucb1x00 platform data to enable GPIO support on the UCB1300 device. Acked-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/assabet.c')
-rw-r--r--arch/arm/mach-sa1100/assabet.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 3a1914568374..c45402f866cc 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -15,6 +15,7 @@
#include <linux/errno.h>
#include <linux/ioport.h>
#include <linux/serial_core.h>
+#include <linux/mfd/ucb1x00.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/delay.h>
@@ -199,9 +200,14 @@ static struct irda_platform_data assabet_irda_data = {
.set_speed = assabet_irda_set_speed,
};
+static struct ucb1x00_plat_data assabet_ucb1x00_data = {
+ .gpio_base = -1,
+};
+
static struct mcp_plat_data assabet_mcp_data = {
.mccr0 = MCCR0_ADM,
.sclk_rate = 11981000,
+ .codec_pdata = &assabet_ucb1x00_data,
};
static void __init assabet_init(void)