aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorShubhrajyoti D <shubhrajyoti@ti.com>2012-11-26 04:55:11 -0500
committerWolfram Sang <w.sang@pengutronix.de>2012-11-28 05:36:32 -0500
commit972deb4f49b5b6703d9c6117ba0aeda2180d4447 (patch)
tree5a7d2f74404f8e5c87706dd7dd7e68be3c35d6e7 /arch
parent60937b2cdbf948ddb84cbf5d728012519ff4b321 (diff)
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: Shubhrajyoti D <shubhrajyoti@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_33xx_data.c3
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c9
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_44xx_data.c3
3 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 59d5c1cd316d..c9a186bc6d40 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -1103,8 +1103,7 @@ static struct omap_hwmod_class i2c_class = {
1103}; 1103};
1104 1104
1105static struct omap_i2c_dev_attr i2c_dev_attr = { 1105static struct omap_i2c_dev_attr i2c_dev_attr = {
1106 .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE | 1106 .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE,
1107 OMAP_I2C_FLAG_RESET_REGS_POSTIDLE,
1108}; 1107};
1109 1108
1110/* i2c1 */ 1109/* i2c1 */
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 943222c40489..36270bb637e4 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -791,8 +791,7 @@ static struct omap_hwmod omap3xxx_dss_venc_hwmod = {
791/* I2C1 */ 791/* I2C1 */
792static struct omap_i2c_dev_attr i2c1_dev_attr = { 792static struct omap_i2c_dev_attr i2c1_dev_attr = {
793 .fifo_depth = 8, /* bytes */ 793 .fifo_depth = 8, /* bytes */
794 .flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE | 794 .flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
795 OMAP_I2C_FLAG_BUS_SHIFT_2,
796}; 795};
797 796
798static struct omap_hwmod omap3xxx_i2c1_hwmod = { 797static struct omap_hwmod omap3xxx_i2c1_hwmod = {
@@ -817,8 +816,7 @@ static struct omap_hwmod omap3xxx_i2c1_hwmod = {
817/* I2C2 */ 816/* I2C2 */
818static struct omap_i2c_dev_attr i2c2_dev_attr = { 817static struct omap_i2c_dev_attr i2c2_dev_attr = {
819 .fifo_depth = 8, /* bytes */ 818 .fifo_depth = 8, /* bytes */
820 .flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE | 819 .flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
821 OMAP_I2C_FLAG_BUS_SHIFT_2,
822}; 820};
823 821
824static struct omap_hwmod omap3xxx_i2c2_hwmod = { 822static struct omap_hwmod omap3xxx_i2c2_hwmod = {
@@ -843,8 +841,7 @@ static struct omap_hwmod omap3xxx_i2c2_hwmod = {
843/* I2C3 */ 841/* I2C3 */
844static struct omap_i2c_dev_attr i2c3_dev_attr = { 842static struct omap_i2c_dev_attr i2c3_dev_attr = {
845 .fifo_depth = 64, /* bytes */ 843 .fifo_depth = 64, /* bytes */
846 .flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE | 844 .flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
847 OMAP_I2C_FLAG_BUS_SHIFT_2,
848}; 845};
849 846
850static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = { 847static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 652d0285bd6d..eb40dbc6688e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -1526,8 +1526,7 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = {
1526}; 1526};
1527 1527
1528static struct omap_i2c_dev_attr i2c_dev_attr = { 1528static struct omap_i2c_dev_attr i2c_dev_attr = {
1529 .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE | 1529 .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE,
1530 OMAP_I2C_FLAG_RESET_REGS_POSTIDLE,
1531}; 1530};
1532 1531
1533/* i2c1 */ 1532/* i2c1 */