diff --git a/[refs] b/[refs] index 4e0267797438..bef512749405 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dbeef231e2247f91784f33555ed6f7da7a6f726 +refs/heads/master: f8f9d5ecfff9b2d04db4decd7d2c86aba86e49e5 diff --git a/trunk/arch/arm/mach-pxa/magician.c b/trunk/arch/arm/mach-pxa/magician.c index 5a9df973935d..34046c8bfaf5 100644 --- a/trunk/arch/arm/mach-pxa/magician.c +++ b/trunk/arch/arm/mach-pxa/magician.c @@ -744,6 +744,14 @@ static struct platform_device strataflash = { }, }; +/* + * I2C + */ + +static struct i2c_pxa_platform_data i2c_info = { + .fast_mode = 1, +}; + /* * Platform devices */ @@ -779,7 +787,7 @@ static void __init magician_init(void) pxa_set_ficp_info(&magician_ficp_info); } pxa27x_set_i2c_power_info(NULL); - pxa_set_i2c_info(NULL); + pxa_set_i2c_info(&i2c_info); pxa_set_mci_info(&magician_mci_info); pxa_set_ohci_info(&magician_ohci_info);