[ARM] 4650/1: AT91: New-style init of I2C, support for i2c-gpio

[linux-2.6-omap-h63xx.git] / arch / arm / mach-at91 / board-carmeva.c

diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index a0815322f68532b4cce12a60b61a14c424787a3e..0f0878294a67c660a8bb2e3b291f5c85212cd3f6 100644 (file)
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -79,7 +79,7 @@ static struct at91_udc_data __initdata carmeva_udc_data = {
        .pullup_pin     = AT91_PIN_PD9,
 };
 
-/* FIXME: user dependend */
+/* FIXME: user dependant */
 // static struct at91_cf_data __initdata carmeva_cf_data = {
 //     .det_pin        = AT91_PIN_PB0,
 //     .rst_pin        = AT91_PIN_PC5,
@@ -100,17 +100,17 @@ static struct spi_board_info carmeva_spi_devices[] = {
                .chip_select  = 0,
                .max_speed_hz = 10 * 1000 * 1000,
        },
-       { /* User accessable spi - cs1 (250KHz) */
+       { /* User accessible spi - cs1 (250KHz) */
                .modalias = "spi-cs1",
                .chip_select  = 1,
                .max_speed_hz = 250 *  1000,
        },
-       { /* User accessable spi - cs2 (1MHz) */
+       { /* User accessible spi - cs2 (1MHz) */
                .modalias = "spi-cs2",
                .chip_select  = 2,
                .max_speed_hz = 1 * 1000 *  1000,
        },
-       { /* User accessable spi - cs3 (10MHz) */
+       { /* User accessible spi - cs3 (10MHz) */
                .modalias = "spi-cs3",
                .chip_select  = 3,
                .max_speed_hz = 10 * 1000 *  1000,
@@ -128,13 +128,13 @@ static void __init carmeva_board_init(void)
        /* USB Device */
        at91_add_device_udc(&carmeva_udc_data);
        /* I2C */
-       at91_add_device_i2c();
+       at91_add_device_i2c(NULL, 0);
        /* SPI */
        at91_add_device_spi(carmeva_spi_devices, ARRAY_SIZE(carmeva_spi_devices));
        /* Compact Flash */
 //     at91_add_device_cf(&carmeva_cf_data);
        /* MMC */
-       at91_add_device_mmc(&carmeva_mmc_data);
+       at91_add_device_mmc(0, &carmeva_mmc_data);
 }
 
 MACHINE_START(CARMEVA, "Carmeva")