Browse Source

i2c: ibm_iic: rename i2c_timings struct due to clash with generic version

Fixes: e1dba01ca620 ("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>
Stephen Rothwell 9 years ago
parent
commit
f199b2605c
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/i2c/busses/i2c-ibm_iic.c

+ 2 - 2
drivers/i2c/busses/i2c-ibm_iic.c

@@ -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;