---

yaml --- r: 82932 b: refs/heads/master c: e28067d h: refs/heads/master v: v3
git-mirror · Feb 4, 2008 · 08ec39a · 08ec39a
1 parent ef67b83
commit 08ec39a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bea80187f6218ed8b5c1e1280220b1c53d8dd05
+refs/heads/master: e28067d533f1c6fc8c5e31495994f1c9bf7febe6
diff --git a/trunk/arch/arm/mach-ixp4xx/nslu2-setup.c b/trunk/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -18,6 +18,7 @@
 #include <linux/serial.h>
 #include <linux/serial_8250.h>
 #include <linux/leds.h>
+#include <linux/i2c.h>
 #include <linux/i2c-gpio.h>
 
 #include <asm/mach-types.h>
@@ -47,6 +48,12 @@ static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = {
 	.scl_pin		= NSLU2_SCL_PIN,
 };
 
+static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {
+	{
+		I2C_BOARD_INFO("rtc-x1205", 0x6f),
+	},
+};
+
 #ifdef CONFIG_LEDS_IXP4XX
 static struct resource nslu2_led_resources[] = {
 	{
@@ -183,6 +190,9 @@ static void __init nslu2_init(void)
 
 	pm_power_off = nslu2_power_off;
 
+	i2c_register_board_info(0, nslu2_i2c_board_info,
+				ARRAY_SIZE(nslu2_i2c_board_info));
+
 	/*
 	 * This is only useful on a modified machine, but it is valuable
 	 * to have it first in order to see debug messages, and so that