Commit a7b4e550 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Russell King

[ARM] 4144/1: Fix for patch #4099/1 with CONFIG_I2C_PXA_SLAVE set

Switch the i2c-pxa driver to actually using the platform device information and let it handle the power i2c bus on pxa27x too. Original version of this patch didn't compile with CONFIG_I2C_PXA_SLAVE set.
Signed-off-by: default avatarG. Liakhovetski <gl@dsa-ac.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ae0a846e
...@@ -338,6 +338,27 @@ static struct platform_device i2c_device = { ...@@ -338,6 +338,27 @@ static struct platform_device i2c_device = {
.num_resources = ARRAY_SIZE(i2c_resources), .num_resources = ARRAY_SIZE(i2c_resources),
}; };
#ifdef CONFIG_PXA27x
static struct resource i2c_power_resources[] = {
{
.start = 0x40f00180,
.end = 0x40f001a3,
.flags = IORESOURCE_MEM,
}, {
.start = IRQ_PWRI2C,
.end = IRQ_PWRI2C,
.flags = IORESOURCE_IRQ,
},
};
static struct platform_device i2c_power_device = {
.name = "pxa2xx-i2c",
.id = 1,
.resource = i2c_power_resources,
.num_resources = ARRAY_SIZE(i2c_resources),
};
#endif
void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
{ {
i2c_device.dev.platform_data = info; i2c_device.dev.platform_data = info;
...@@ -392,6 +413,9 @@ static struct platform_device *devices[] __initdata = { ...@@ -392,6 +413,9 @@ static struct platform_device *devices[] __initdata = {
&stuart_device, &stuart_device,
&pxaficp_device, &pxaficp_device,
&i2c_device, &i2c_device,
#ifdef CONFIG_PXA27x
&i2c_power_device,
#endif
&i2s_device, &i2s_device,
&pxartc_device, &pxartc_device,
}; };
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment