---

yaml --- r: 106839 b: refs/heads/master c: 026953d h: refs/heads/master i: 106837: 904353b 106835: 08120b8 106831: 124ccc1 v: v3
git-mirror · Jul 28, 2008 · af97afa · af97afa
1 parent 3e5aa4f
commit af97afa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fff76f2da9dd0cd1918822cdc99d0191f9b78cf
+refs/heads/master: 026953db56e6244c8c80be8e211e244ff6015992
diff --git a/trunk/arch/sh/boards/renesas/ap325rxa/setup.c b/trunk/arch/sh/boards/renesas/ap325rxa/setup.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/delay.h>
+#include <linux/i2c.h>
 #include <asm/io.h>
 
 static struct resource smc9118_resources[] = {
@@ -83,14 +84,21 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
 	&ap325rxa_nor_flash_device
 };
 
+static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
+};
+
 static int __init ap325rxa_devices_setup(void)
 {
+	i2c_register_board_info(0, ap325rxa_i2c_devices,
+				ARRAY_SIZE(ap325rxa_i2c_devices));
+
 	return platform_add_devices(ap325rxa_devices,
 				ARRAY_SIZE(ap325rxa_devices));
 }
 device_initcall(ap325rxa_devices_setup);
 
 #define MSTPCR0		(0xA4150030)
+#define MSTPCR1		(0xA4150034)
 #define MSTPCR2		(0xA4150038)
 
 static void __init ap325rxa_setup(char **cmdline_p)
@@ -100,6 +108,9 @@ static void __init ap325rxa_setup(char **cmdline_p)
 
 	/* enable MERAM */
 	ctrl_outl(ctrl_inl(MSTPCR0) & ~0x00000001, MSTPCR0);	/* bit 0 */
+
+	/* I2C */
+	ctrl_outl(ctrl_inl(MSTPCR1) & ~0x00000200, MSTPCR1);
 }
 
 static struct sh_machine_vector mv_ap325rxa __initmv = {