Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[profile/ivi/kernel-x86-ivi.git] / drivers / i2c / busses / i2c-at91.c

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index ebc2241..75195e3 100644 (file)
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -553,13 +553,6 @@ static struct at91_twi_pdata at91sam9g10_config = {
        .has_dma_support = false,
 };
 
-static struct at91_twi_pdata at91sam9x5_config = {
-       .clk_max_div = 7,
-       .clk_offset = 4,
-       .has_unre_flag = false,
-       .has_dma_support = true,
-};
-
 static const struct platform_device_id at91_twi_devtypes[] = {
        {
                .name = "i2c-at91rm9200",
@@ -582,8 +575,18 @@ static const struct platform_device_id at91_twi_devtypes[] = {
 };
 
 #if defined(CONFIG_OF)
+static struct at91_twi_pdata at91sam9x5_config = {
+       .clk_max_div = 7,
+       .clk_offset = 4,
+       .has_unre_flag = false,
+       .has_dma_support = true,
+};
+
 static const struct of_device_id atmel_twi_dt_ids[] = {
        {
+               .compatible = "atmel,at91rm9200-i2c",
+               .data = &at91rm9200_config,
+       } , {
                .compatible = "atmel,at91sam9260-i2c",
                .data = &at91sam9260_config,
        } , {