Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-i2c
+8
-4
drivers/i2c/busses/i2c-pxa.c
+8
-4
drivers/i2c/busses/i2c-pxa.c
···
914
return ret;
915
}
916
917
static struct i2c_algorithm i2c_pxa_algorithm = {
918
-
.name = "PXA-I2C-Algorithm",
919
-
.id = I2C_ALGO_PXA,
920
.master_xfer = i2c_pxa_xfer,
921
};
922
923
static struct pxa_i2c i2c_pxa = {
924
.lock = SPIN_LOCK_UNLOCKED,
925
.wait = __WAIT_QUEUE_HEAD_INITIALIZER(i2c_pxa.wait),
926
.adap = {
927
-
.name = "pxa2xx-i2c",
928
-
.id = I2C_ALGO_PXA,
929
.algo = &i2c_pxa_algorithm,
930
.retries = 5,
931
},
932
};
···
914
return ret;
915
}
916
917
+
static u32 i2c_pxa_functionality(struct i2c_adapter *adap)
918
+
{
919
+
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
920
+
}
921
+
922
static struct i2c_algorithm i2c_pxa_algorithm = {
923
.master_xfer = i2c_pxa_xfer,
924
+
.functionality = i2c_pxa_functionality,
925
};
926
927
static struct pxa_i2c i2c_pxa = {
928
.lock = SPIN_LOCK_UNLOCKED,
929
.wait = __WAIT_QUEUE_HEAD_INITIALIZER(i2c_pxa.wait),
930
.adap = {
931
+
.owner = THIS_MODULE,
932
.algo = &i2c_pxa_algorithm,
933
+
.name = "pxa2xx-i2c",
934
.retries = 5,
935
},
936
};