projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
103a175
)
[ARM] 4944/2: magician: enable i2c bus
author
Philipp Zabel
<philipp.zabel@gmail.com>
Wed, 9 Apr 2008 18:14:15 +0000
(19:14 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sat, 19 Apr 2008 10:29:06 +0000
(11:29 +0100)
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>
arch/arm/mach-pxa/magician.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-pxa/magician.c
b/arch/arm/mach-pxa/magician.c
index b0dc18110225c1a83de3887441cb8228fdbd2c2a..0160cd8f6c653eac614e966b1fff19856083edc9 100644
(file)
--- 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);