aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2008-01-28 18:36:12 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-02-04 08:15:24 -0500
commite28067d533f1c6fc8c5e31495994f1c9bf7febe6 (patch)
tree9b05d2e90b701609ba72533345f95fa0b41a583c
parent2bea80187f6218ed8b5c1e1280220b1c53d8dd05 (diff)
[ARM] 4772/2: ixp4xx: Register nslu2 rtc i2c_board_info
Register the i2c board info related to the RTC chip on the nslu2 board to allow it to be found automatically on boot. Signed-off-by: Rod Whitby <rod@whitby.id.au> Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-ixp4xx/nslu2-setup.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index 77277d27fcc5..16d091c98ea6 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -18,6 +18,7 @@
18#include <linux/serial.h> 18#include <linux/serial.h>
19#include <linux/serial_8250.h> 19#include <linux/serial_8250.h>
20#include <linux/leds.h> 20#include <linux/leds.h>
21#include <linux/i2c.h>
21#include <linux/i2c-gpio.h> 22#include <linux/i2c-gpio.h>
22 23
23#include <asm/mach-types.h> 24#include <asm/mach-types.h>
@@ -47,6 +48,12 @@ static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = {
47 .scl_pin = NSLU2_SCL_PIN, 48 .scl_pin = NSLU2_SCL_PIN,
48}; 49};
49 50
51static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {
52 {
53 I2C_BOARD_INFO("rtc-x1205", 0x6f),
54 },
55};
56
50#ifdef CONFIG_LEDS_IXP4XX 57#ifdef CONFIG_LEDS_IXP4XX
51static struct resource nslu2_led_resources[] = { 58static struct resource nslu2_led_resources[] = {
52 { 59 {
@@ -183,6 +190,9 @@ static void __init nslu2_init(void)
183 190
184 pm_power_off = nslu2_power_off; 191 pm_power_off = nslu2_power_off;
185 192
193 i2c_register_board_info(0, nslu2_i2c_board_info,
194 ARRAY_SIZE(nslu2_i2c_board_info));
195
186 /* 196 /*
187 * This is only useful on a modified machine, but it is valuable 197 * This is only useful on a modified machine, but it is valuable
188 * to have it first in order to see debug messages, and so that 198 * to have it first in order to see debug messages, and so that