aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
Diffstat (limited to 'arch/avr32')
-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 2dbca46337af..58acdb4fc9b3 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 = {
160 }, 160 },
161}; 161};
162 162
163static struct i2c_board_info __initdata i2c_info[] = {
164 {
165 I2C_BOARD_INFO("pcf8563", 0x51)
166 },
167};
168
163#ifdef CONFIG_LEDS_ATMEL_PWM 169#ifdef CONFIG_LEDS_ATMEL_PWM
164static struct gpio_led stk_pwm_led[] = { 170static struct gpio_led stk_pwm_led[] = {
165 { 171 {
@@ -284,6 +290,8 @@ static int __init merisc_init(void)
284 AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH); 290 AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
285 platform_device_register(&i2c_gpio_device); 291 platform_device_register(&i2c_gpio_device);
286 292
293 i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
294
287 return 0; 295 return 0;
288} 296}
289postcore_initcall(merisc_init); 297postcore_initcall(merisc_init);
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig
index cd51459ecd97..41554db4877f 100644
--- a/arch/avr32/configs/merisc_defconfig
+++ b/arch/avr32/configs/merisc_defconfig
@@ -887,7 +887,7 @@ CONFIG_RTC_INTF_DEV=y
887# CONFIG_RTC_DRV_RS5C372 is not set 887# CONFIG_RTC_DRV_RS5C372 is not set
888# CONFIG_RTC_DRV_ISL1208 is not set 888# CONFIG_RTC_DRV_ISL1208 is not set
889# CONFIG_RTC_DRV_X1205 is not set 889# CONFIG_RTC_DRV_X1205 is not set
890# CONFIG_RTC_DRV_PCF8563 is not set 890CONFIG_RTC_DRV_PCF8563=y
891# CONFIG_RTC_DRV_PCF8583 is not set 891# CONFIG_RTC_DRV_PCF8583 is not set
892# CONFIG_RTC_DRV_M41T80 is not set 892# CONFIG_RTC_DRV_M41T80 is not set
893# CONFIG_RTC_DRV_S35390A is not set 893# CONFIG_RTC_DRV_S35390A is not set