Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 972deb4f49b5b6703d9c6117ba0aeda2180d4447

Authored by Shubhrajyoti D
Committed by Wolfram Sang
1 parent 60937b2cdb
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 5 changed files with 6 additions and 13 deletions Side-by-side Diff

arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Diff comments   View file @ 972deb4
... ... @@ -1103,8 +1103,7 @@
1103 1103 };
1104 1104  
1105 1105 static struct omap_i2c_dev_attr i2c_dev_attr = {
1106   - .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE |
1107   - OMAP_I2C_FLAG_RESET_REGS_POSTIDLE,
  1106 + .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE,
1108 1107 };
1109 1108  
1110 1109 /* i2c1 */
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diff comments   View file @ 972deb4
... ... @@ -791,8 +791,7 @@
791 791 /* I2C1 */
792 792 static struct omap_i2c_dev_attr i2c1_dev_attr = {
793 793 .fifo_depth = 8, /* bytes */
794   - .flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
795   - OMAP_I2C_FLAG_BUS_SHIFT_2,
  794 + .flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
796 795 };
797 796  
798 797 static struct omap_hwmod omap3xxx_i2c1_hwmod = {
... ... @@ -817,8 +816,7 @@
817 816 /* I2C2 */
818 817 static struct omap_i2c_dev_attr i2c2_dev_attr = {
819 818 .fifo_depth = 8, /* bytes */
820   - .flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
821   - OMAP_I2C_FLAG_BUS_SHIFT_2,
  819 + .flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
822 820 };
823 821  
824 822 static struct omap_hwmod omap3xxx_i2c2_hwmod = {
... ... @@ -843,8 +841,7 @@
843 841 /* I2C3 */
844 842 static struct omap_i2c_dev_attr i2c3_dev_attr = {
845 843 .fifo_depth = 64, /* bytes */
846   - .flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
847   - OMAP_I2C_FLAG_BUS_SHIFT_2,
  844 + .flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
848 845 };
849 846  
850 847 static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = {
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Diff comments   View file @ 972deb4
... ... @@ -1526,8 +1526,7 @@
1526 1526 };
1527 1527  
1528 1528 static struct omap_i2c_dev_attr i2c_dev_attr = {
1529   - .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE |
1530   - OMAP_I2C_FLAG_RESET_REGS_POSTIDLE,
  1529 + .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE,
1531 1530 };
1532 1531  
1533 1532 /* i2c1 */
drivers/i2c/busses/i2c-omap.c
Diff comments   View file @ 972deb4
... ... @@ -1038,8 +1038,7 @@
1038 1038 #ifdef CONFIG_OF
1039 1039 static struct omap_i2c_bus_platform_data omap3_pdata = {
1040 1040 .rev = OMAP_I2C_IP_VERSION_1,
1041   - .flags = OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
1042   - OMAP_I2C_FLAG_BUS_SHIFT_2,
  1041 + .flags = OMAP_I2C_FLAG_BUS_SHIFT_2,
1043 1042 };
1044 1043  
1045 1044 static struct omap_i2c_bus_platform_data omap4_pdata = {
include/linux/i2c-omap.h
Diff comments   View file @ 972deb4
... ... @@ -20,7 +20,6 @@
20 20 #define OMAP_I2C_FLAG_NO_FIFO BIT(0)
21 21 #define OMAP_I2C_FLAG_SIMPLE_CLOCK BIT(1)
22 22 #define OMAP_I2C_FLAG_16BIT_DATA_REG BIT(2)
23   -#define OMAP_I2C_FLAG_RESET_REGS_POSTIDLE BIT(3)
24 23 #define OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK BIT(5)
25 24 #define OMAP_I2C_FLAG_FORCE_19200_INT_CLK BIT(6)
26 25 /* how the CPU address bus must be translated for I2C unit access */