aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Larsson <jonas.larsson@martinsson.se>2009-03-30 17:04:53 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-03-30 17:17:58 +0200
commita6b6b5ff8f31960f760dd849beb70e1ae8ddc0e2 (patch)
tree0c7679a44a3e59d2de16e43d8fd7b3ae04e0f707
parent2f47c8c5556e91f309e24162263ebacff6973007 (diff)
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>
-rw-r--r--arch/avr32/boards/merisc/setup.c8
-rw-r--r--arch/avr32/configs/merisc_defconfig2
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index 2dbca46337a..58acdb4fc9b 100644
--- 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 cd51459ecd9..41554db4877 100644
--- 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