aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2008-04-09 14:14:15 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-19 06:29:06 -0400
commite6816f34e4ee237fc1b54e0357e9ea31462ad411 (patch)
treec4cd7946f62d12b8440c5f793819a53ccf537081
parent103a1754894eecf488103f7739061e7e767049ad (diff)
[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>
-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 @@
29#include <asm/arch/magician.h> 29#include <asm/arch/magician.h>
30#include <asm/arch/pxa-regs.h> 30#include <asm/arch/pxa-regs.h>
31#include <asm/arch/pxafb.h> 31#include <asm/arch/pxafb.h>
32#include <asm/arch/i2c.h>
32#include <asm/arch/irda.h> 33#include <asm/arch/irda.h>
33#include <asm/arch/ohci.h> 34#include <asm/arch/ohci.h>
34 35
@@ -201,6 +202,7 @@ static struct platform_device *devices[] __initdata = {
201static void __init magician_init(void) 202static void __init magician_init(void)
202{ 203{
203 platform_add_devices(devices, ARRAY_SIZE(devices)); 204 platform_add_devices(devices, ARRAY_SIZE(devices));
205 pxa_set_i2c_info(NULL);
204 pxa_set_ohci_info(&magician_ohci_info); 206 pxa_set_ohci_info(&magician_ohci_info);
205 pxa_set_ficp_info(&magician_ficp_info); 207 pxa_set_ficp_info(&magician_ficp_info);
206 set_pxa_fb_info(&toppoly_info); 208 set_pxa_fb_info(&toppoly_info);