diff --git a/[refs] b/[refs]
index 713d2ec28880..88d79a19b414 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f47c8c5556e91f309e24162263ebacff6973007
+refs/heads/master: a6b6b5ff8f31960f760dd849beb70e1ae8ddc0e2
diff --git a/trunk/arch/avr32/boards/merisc/setup.c b/trunk/arch/avr32/boards/merisc/setup.c
index 2dbca46337af..58acdb4fc9b3 100644
--- a/trunk/arch/avr32/boards/merisc/setup.c
+++ b/trunk/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/trunk/arch/avr32/configs/merisc_defconfig b/trunk/arch/avr32/configs/merisc_defconfig
index cd51459ecd97..41554db4877f 100644
--- a/trunk/arch/avr32/configs/merisc_defconfig
+++ b/trunk/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