diff --git a/[refs] b/[refs] index 6e1f63a53821..679e6d1a6f23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70c14ff0e9f5e1f5456587b827620e636ba70a09 +refs/heads/master: fe885fa2372b1d255974e71d5b7c51b1e9673835 diff --git a/trunk/arch/arm/mach-iop32x/em7210.c b/trunk/arch/arm/mach-iop32x/em7210.c index f0362053fdcc..c947152f9a3c 100644 --- a/trunk/arch/arm/mach-iop32x/em7210.c +++ b/trunk/arch/arm/mach-iop32x/em7210.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,15 @@ static struct sys_timer em7210_timer = { .offset = iop_gettimeoffset, }; +/* + * EM7210 RTC + */ +static struct i2c_board_info __initdata em7210_i2c_devices[] = { + { + I2C_BOARD_INFO("rtc-rs5c372", 0x32), + .type = "rs5c372a", + }, +}; /* * EM7210 I/O @@ -187,6 +197,9 @@ static void __init em7210_init_machine(void) platform_device_register(&iop3xx_dma_0_channel); platform_device_register(&iop3xx_dma_1_channel); + i2c_register_board_info(0, em7210_i2c_devices, + ARRAY_SIZE(em7210_i2c_devices)); + pm_power_off = em7210_power_off; }