Add RTC support for Merisc boards

This patch adds RTC support for the Merisc boards.

Signed-off-by: Jonas Larsson <jonas.larsson@martinsson.se>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index 2dbca46337af84fb686ff2479e11abd82cba2124..58acdb4fc9b308384db306a9358e12ec79b3a15d 100644 (file)
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -160,6 +160,12 @@ static struct platform_device i2c_gpio_device = {
        },
 };
 
+static struct i2c_board_info __initdata i2c_info[] = {
+       {
+               I2C_BOARD_INFO("pcf8563", 0x51)
+       },
+};
+
 #ifdef CONFIG_LEDS_ATMEL_PWM
 static struct gpio_led stk_pwm_led[] = {
        {
@@ -284,6 +290,8 @@ static int __init merisc_init(void)
                AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
        platform_device_register(&i2c_gpio_device);
 
+       i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
+
        return 0;
 }
 postcore_initcall(merisc_init);

diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig
index cd51459ecd971dbab8b440d9bf64a5a3a1962dce..41554db4877fec7da346a8b0e87ca3cbdeaddd91 100644 (file)
--- a/arch/avr32/configs/merisc_defconfig
+++ b/arch/avr32/configs/merisc_defconfig
@@ -887,7 +887,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
+CONFIG_RTC_DRV_PCF8563=y
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_S35390A is not set