diff options
author | Magnus Damm <magnus.damm@gmail.com> | 2008-03-25 04:20:24 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-04-18 12:50:06 -0400 |
commit | 0c6111ecccb33b1a7d79b6daf64c0cc4391ff3fa (patch) | |
tree | f116f3716f0c5c588962716c249051279883a70a /arch/sh | |
parent | ef1b2327d27901596d896820722bb2cefa2d1f64 (diff) |
sh: Add I2C support to MigoR
Enable the sh7722 I2C controller on the MigoR board.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/renesas/migor/setup.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/boards/renesas/migor/setup.c b/arch/sh/boards/renesas/migor/setup.c index bc7a4cec1277..ac8d4151dc8a 100644 --- a/arch/sh/boards/renesas/migor/setup.c +++ b/arch/sh/boards/renesas/migor/setup.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/input.h> | 13 | #include <linux/input.h> |
14 | #include <linux/mtd/physmap.h> | 14 | #include <linux/mtd/physmap.h> |
15 | #include <linux/mtd/nand.h> | 15 | #include <linux/mtd/nand.h> |
16 | #include <linux/i2c.h> | ||
16 | #include <asm/machvec.h> | 17 | #include <asm/machvec.h> |
17 | #include <asm/io.h> | 18 | #include <asm/io.h> |
18 | #include <asm/sh_keysc.h> | 19 | #include <asm/sh_keysc.h> |
@@ -196,8 +197,14 @@ static struct platform_device *migor_devices[] __initdata = { | |||
196 | &migor_nand_flash_device, | 197 | &migor_nand_flash_device, |
197 | }; | 198 | }; |
198 | 199 | ||
200 | static struct i2c_board_info __initdata migor_i2c_devices[] = { | ||
201 | }; | ||
202 | |||
199 | static int __init migor_devices_setup(void) | 203 | static int __init migor_devices_setup(void) |
200 | { | 204 | { |
205 | i2c_register_board_info(0, migor_i2c_devices, | ||
206 | ARRAY_SIZE(migor_i2c_devices)); | ||
207 | |||
201 | return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); | 208 | return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices)); |
202 | } | 209 | } |
203 | __initcall(migor_devices_setup); | 210 | __initcall(migor_devices_setup); |
@@ -219,6 +226,9 @@ static void __init migor_setup(char **cmdline_p) | |||
219 | ctrl_outw(ctrl_inw(PORT_PXCR) & 0x0fff, PORT_PXCR); | 226 | ctrl_outw(ctrl_inw(PORT_PXCR) & 0x0fff, PORT_PXCR); |
220 | ctrl_outl((ctrl_inl(BSC_CS6ABCR) & ~0x00000600) | 0x00000200, | 227 | ctrl_outl((ctrl_inl(BSC_CS6ABCR) & ~0x00000600) | 0x00000200, |
221 | BSC_CS6ABCR); | 228 | BSC_CS6ABCR); |
229 | |||
230 | /* I2C */ | ||
231 | ctrl_outl(ctrl_inl(MSTPCR1) & ~0x00000200, MSTPCR1); | ||
222 | } | 232 | } |
223 | 233 | ||
224 | static struct sh_machine_vector mv_migor __initmv = { | 234 | static struct sh_machine_vector mv_migor __initmv = { |