summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2008-04-09 20:14:15 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-19 12:29:06 +0200
commite6816f34e4ee237fc1b54e0357e9ea31462ad411 (patch)
treec4cd7946f62d12b8440c5f793819a53ccf537081 /arch/arm/mach-pxa
parent[ARM] 4943/2: magician: fix magician.h GPIO header includes (diff)
downloadlinux-e6816f34e4ee237fc1b54e0357e9ea31462ad411.tar.xz
linux-e6816f34e4ee237fc1b54e0357e9ea31462ad411.zip
[ARM] 4944/2: magician: enable i2c bus
Since recent PXA changes the (non-power-)I2C bus has to be explicitly enabled from board initialisation code. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/magician.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index b0dc18110225..0160cd8f6c65 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -29,6 +29,7 @@
#include <asm/arch/magician.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxafb.h>
+#include <asm/arch/i2c.h>
#include <asm/arch/irda.h>
#include <asm/arch/ohci.h>
@@ -201,6 +202,7 @@ static struct platform_device *devices[] __initdata = {
static void __init magician_init(void)
{
platform_add_devices(devices, ARRAY_SIZE(devices));
+ pxa_set_i2c_info(NULL);
pxa_set_ohci_info(&magician_ohci_info);
pxa_set_ficp_info(&magician_ficp_info);
set_pxa_fb_info(&toppoly_info);