Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c88ab8c authored by Shubhrajyoti D's avatar Shubhrajyoti D Committed by Wolfram Sang
Browse files

ARM: i2c: omap: Remove the i207 errata flag 



The commit [i2c: omap: use revision check for OMAP_I2C_FLAG_APPLY_ERRATA_I207]
uses the revision id instead of the flag. So the flag can be safely removed.

Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent cd10c74a

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+1 −2
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ static struct omap_hwmod_class i2c_class = { 


static struct omap_i2c_dev_attr i2c_dev_attr = {

	.fifo_depth	= 8, /* bytes */

	.flags		= OMAP_I2C_FLAG_APPLY_ERRATA_I207 |

			  OMAP_I2C_FLAG_BUS_SHIFT_2 |

	.flags		= OMAP_I2C_FLAG_BUS_SHIFT_2 |

			  OMAP_I2C_FLAG_FORCE_19200_INT_CLK,

};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+3 −6
Original line number Diff line number Diff line
@@ -791,8 +791,7 @@ static struct omap_hwmod omap3xxx_dss_venc_hwmod = { 
/* I2C1 */

static struct omap_i2c_dev_attr i2c1_dev_attr = {

	.fifo_depth	= 8, /* bytes */

	.flags		= OMAP_I2C_FLAG_APPLY_ERRATA_I207 |

			  OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

	.flags		= OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

			  OMAP_I2C_FLAG_BUS_SHIFT_2,

};
@@ -818,8 +817,7 @@ static struct omap_hwmod omap3xxx_i2c1_hwmod = { 
/* I2C2 */

static struct omap_i2c_dev_attr i2c2_dev_attr = {

	.fifo_depth	= 8, /* bytes */

	.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |

		 OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

	.flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

		 OMAP_I2C_FLAG_BUS_SHIFT_2,

};
@@ -845,8 +843,7 @@ static struct omap_hwmod omap3xxx_i2c2_hwmod = { 
/* I2C3 */

static struct omap_i2c_dev_attr i2c3_dev_attr = {

	.fifo_depth	= 64, /* bytes */

	.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |

		 OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

	.flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

		 OMAP_I2C_FLAG_BUS_SHIFT_2,

};

drivers/i2c/busses/i2c-omap.c

+1 −2
Original line number Diff line number Diff line
@@ -1028,8 +1028,7 @@ static const struct i2c_algorithm omap_i2c_algo = { 
#ifdef CONFIG_OF

static struct omap_i2c_bus_platform_data omap3_pdata = {

	.rev = OMAP_I2C_IP_VERSION_1,

	.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |

		 OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

	.flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |

		 OMAP_I2C_FLAG_BUS_SHIFT_2,

};

include/linux/i2c-omap.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define OMAP_I2C_FLAG_SIMPLE_CLOCK		BIT(1)

#define OMAP_I2C_FLAG_16BIT_DATA_REG		BIT(2)

#define OMAP_I2C_FLAG_RESET_REGS_POSTIDLE	BIT(3)

#define OMAP_I2C_FLAG_APPLY_ERRATA_I207	BIT(4)

#define OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK	BIT(5)

#define OMAP_I2C_FLAG_FORCE_19200_INT_CLK	BIT(6)

/* how the CPU address bus must be translated for I2C unit access */