i2c: ibm_iic: rename i2c_timings struct due to clash with generic version
Fixes: e1dba01ca6
("i2c: add generic routine to parse DT for timing information")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
parent
90708ce22b
commit
f199b2605c
drivers/i2c/busses
|
@ -99,7 +99,7 @@ static void dump_iic_regs(const char* header, struct ibm_iic_private* dev)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Bus timings (in ns) for bit-banging */
|
/* Bus timings (in ns) for bit-banging */
|
||||||
static struct i2c_timings {
|
static struct ibm_iic_timings {
|
||||||
unsigned int hd_sta;
|
unsigned int hd_sta;
|
||||||
unsigned int su_sto;
|
unsigned int su_sto;
|
||||||
unsigned int low;
|
unsigned int low;
|
||||||
|
@ -241,7 +241,7 @@ static int iic_dc_wait(volatile struct iic_regs __iomem *iic, u8 mask)
|
||||||
static int iic_smbus_quick(struct ibm_iic_private* dev, const struct i2c_msg* p)
|
static int iic_smbus_quick(struct ibm_iic_private* dev, const struct i2c_msg* p)
|
||||||
{
|
{
|
||||||
volatile struct iic_regs __iomem *iic = dev->vaddr;
|
volatile struct iic_regs __iomem *iic = dev->vaddr;
|
||||||
const struct i2c_timings* t = &timings[dev->fast_mode ? 1 : 0];
|
const struct ibm_iic_timings *t = &timings[dev->fast_mode ? 1 : 0];
|
||||||
u8 mask, v, sda;
|
u8 mask, v, sda;
|
||||||
int i, res;
|
int i, res;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue