[ARM] 4246/1: i2c-pxa: add adapter class to platform specific data
Reposted patch for kernel 2.6.21-rc2. The driver i2c-pxa doesn't set the class member in i2c_adapter, which is used to register the I2C adapter. The hwmon (sensors) drivers (e.g. adm1021) that are connected to a i2c-pxa adapter don't attach because they expect that the adapter supports class I2C_CLASS_HWMON. This patch adds functionality to allow platforms to set the class and pass it as platform_data to the i2c-pxa driver. Sample usage in platform code: static struct i2c_pxa_platform_data my_i2c_platform_data = { .class = I2C_CLASS_HWMON }; static void __init my_platform_init(void) { (void) platform_add_devices(devices, ARRAY_SIZE(devices)); pxa_set_i2c_info(&my_i2c_platform_data); } Signed-off-by: Matej Kenda <matej.kenda@hermes-softlab.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
4fe4a2bf9a
commit
a79220b763
2 changed files with 5 additions and 2 deletions
|
@ -839,9 +839,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
|
||||||
{
|
{
|
||||||
struct pxa_i2c *i2c = &i2c_pxa;
|
struct pxa_i2c *i2c = &i2c_pxa;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
#ifdef CONFIG_I2C_PXA_SLAVE
|
|
||||||
struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
|
struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
|
||||||
#endif
|
|
||||||
int ret;
|
int ret;
|
||||||
int irq;
|
int irq;
|
||||||
|
|
||||||
|
@ -911,6 +909,10 @@ static int i2c_pxa_probe(struct platform_device *dev)
|
||||||
i2c->adap.algo_data = i2c;
|
i2c->adap.algo_data = i2c;
|
||||||
i2c->adap.dev.parent = &dev->dev;
|
i2c->adap.dev.parent = &dev->dev;
|
||||||
|
|
||||||
|
if (plat) {
|
||||||
|
i2c->adap.class = plat->class;
|
||||||
|
}
|
||||||
|
|
||||||
ret = i2c_add_adapter(&i2c->adap);
|
ret = i2c_add_adapter(&i2c->adap);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
printk(KERN_INFO "I2C: Failed to add bus\n");
|
printk(KERN_INFO "I2C: Failed to add bus\n");
|
||||||
|
|
|
@ -64,6 +64,7 @@ struct i2c_slave_client;
|
||||||
struct i2c_pxa_platform_data {
|
struct i2c_pxa_platform_data {
|
||||||
unsigned int slave_addr;
|
unsigned int slave_addr;
|
||||||
struct i2c_slave_client *slave;
|
struct i2c_slave_client *slave;
|
||||||
|
unsigned int class;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
|
extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
|
||||||
|
|
Reference in a new issue