Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / arch / avr32 / boards / merisc / setup.c

diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index 2dbca46337af84fb686ff2479e11abd82cba2124..20b300cf105ade80ed74f2a0f94fc4aa100a9098 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[] = {
        {
@@ -225,9 +231,9 @@ static void detect_merisc_board_id(void)
 
 void __init setup_board(void)
 {
-       at32_map_usart(0, 0);
-       at32_map_usart(1, 1);
-       at32_map_usart(3, 3);
+       at32_map_usart(0, 0, 0);
+       at32_map_usart(1, 1, 0);
+       at32_map_usart(3, 3, 0);
        at32_setup_serial_console(1);
 }
 
@@ -242,7 +248,7 @@ static int __init merisc_init(void)
        at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26));
 
        if (merisc_board_id >= 1)
-               at32_map_usart(2, 2);
+               at32_map_usart(2, 2, 0);
 
        at32_add_device_usart(0);
        at32_add_device_usart(1);
@@ -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);