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

Commit 972deb4f authored by Shubhrajyoti D's avatar Shubhrajyoti D Committed by Wolfram Sang
Browse files

i2c: omap: Remove the OMAP_I2C_FLAG_RESET_REGS_POSTIDLE flag 



The OMAP_I2C_FLAG_RESET_REGS_POSTIDLE is not used anymore
in the i2c driver. Remove the flag.

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

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

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



static struct omap_i2c_dev_attr i2c_dev_attr = {

	.flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE |

		  OMAP_I2C_FLAG_RESET_REGS_POSTIDLE,

	.flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE,

};



/* i2c1 */

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_RESET_REGS_POSTIDLE |

			  OMAP_I2C_FLAG_BUS_SHIFT_2,

	.flags		= OMAP_I2C_FLAG_BUS_SHIFT_2,

};



static struct omap_hwmod omap3xxx_i2c1_hwmod = {
@@ -817,8 +816,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_RESET_REGS_POSTIDLE |

		 OMAP_I2C_FLAG_BUS_SHIFT_2,

	.flags = OMAP_I2C_FLAG_BUS_SHIFT_2,

};



static struct omap_hwmod omap3xxx_i2c2_hwmod = {
@@ -843,8 +841,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_RESET_REGS_POSTIDLE |

		 OMAP_I2C_FLAG_BUS_SHIFT_2,

	.flags = OMAP_I2C_FLAG_BUS_SHIFT_2,

};



static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = {

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+1 −2
Original line number Diff line number Diff line
@@ -1526,8 +1526,7 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = { 
};



static struct omap_i2c_dev_attr i2c_dev_attr = {

	.flags	= OMAP_I2C_FLAG_BUS_SHIFT_NONE |

			OMAP_I2C_FLAG_RESET_REGS_POSTIDLE,

	.flags	= OMAP_I2C_FLAG_BUS_SHIFT_NONE,

};



/* i2c1 */

drivers/i2c/busses/i2c-omap.c

+1 −2
Original line number Diff line number Diff line
@@ -1038,8 +1038,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_RESET_REGS_POSTIDLE |

		 OMAP_I2C_FLAG_BUS_SHIFT_2,

	.flags = OMAP_I2C_FLAG_BUS_SHIFT_2,

};



static struct omap_i2c_bus_platform_data omap4_pdata = {

include/linux/i2c-omap.h

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

#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_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 */