From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 9 Apr 2008 18:14:15 +0000 (+0100)
Subject: [ARM] 4944/2: magician: enable i2c bus
X-Git-Tag: v2.6.26-rc1~1131^2~2^10~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6816f34e4ee237fc1b54e0357e9ea31462ad411;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index b0dc1811022..0160cd8f6c6 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);