aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/poodle.c
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2008-08-26 13:30:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-26 16:26:25 +0100
commitf8787fdcf6f46d6a65a42dbddb70cd7e4dc5b741 (patch)
tree20fc8f3dd5683bbf8f70f688a7a9e6b0c8e75c50 /arch/arm/mach-pxa/poodle.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-dev-f8787fdcf6f46d6a65a42dbddb70cd7e4dc5b741.tar.xz
linux-dev-f8787fdcf6f46d6a65a42dbddb70cd7e4dc5b741.zip
[ARM] 5225/1: zaurus: Register I2C controller for audio codecs
corgi, spitz and poodle have audio codecs on their primary I2C bus so need to call pxa_set_i2c_info() to set it up during init. Tested on spitz by Stanislav. Reported-by: Stanislav Brabec <utx@penguin.cz> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
-rw-r--r--arch/arm/mach-pxa/poodle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 055ec63d768c..3f5f484549b3 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -36,6 +36,7 @@
#include <mach/pxa2xx-gpio.h>
#include <mach/mmc.h>
#include <mach/udc.h>
+#include <mach/i2c.h>
#include <mach/irda.h>
#include <mach/poodle.h>
#include <mach/pxafb.h>
@@ -387,6 +388,7 @@ static void __init poodle_init(void)
pxa_set_udc_info(&udc_info);
pxa_set_mci_info(&poodle_mci_platform_data);
pxa_set_ficp_info(&poodle_ficp_platform_data);
+ pxa_set_i2c_info(NULL);
platform_scoop_config = &poodle_pcmcia_config;