diff for duplicates of <4D77A01F.8080706@ti.com> diff --git a/a/1.txt b/N1/1.txt index 4d3b416..f5a57a5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,149 +25,3 @@ You can find it below. I changed as well the subject as suggested. Benoit --- ->From 561068054176af4574b5bf3a1d1258f19dc186e8 Mon Sep 17 00:00:00 2001 -From: Andy Green <andy@warmcat.com> -Date: Tue, 8 Mar 2011 11:09:12 +0000 -Subject: [PATCH] OMAP2+: hwmod data: add correct functionality flags to all omap2plus i2c dev_attr - -This adds the new functionality flags for OMAP i2c unit to all OMAP2+ -hwmod definitions. - -Cc: patches@linaro.org -Cc: Ben Dooks <ben-linux@fluff.org> -Reported-by: Peter Maydell <peter.maydell@linaro.org> -Signed-off-by: Andy Green <andy.green@linaro.org> -[b-cousson@ti.com: Move dev_attr to stick to -hwmod template, update the subject] -Signed-off-by: Benoit Cousson <b-cousson@ti.com> ---- - arch/arm/mach-omap2/omap_hwmod_2420_data.c | 7 ++++++- - arch/arm/mach-omap2/omap_hwmod_2430_data.c | 3 +++ - arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 9 +++++++++ - arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 ++++++++++ - 4 files changed, 28 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c -index de92d75..fe70365 100644 ---- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c -@@ -1450,7 +1450,12 @@ static struct omap_hwmod_class i2c_class = { - .rev = OMAP_I2C_IP_VERSION_1, - }; - --static struct omap_i2c_dev_attr i2c_dev_attr; -+static struct omap_i2c_dev_attr i2c_dev_attr = { -+ .flags = OMAP_I2C_FLAG_NO_FIFO | -+ OMAP_I2C_FLAG_SIMPLE_CLOCK | -+ OMAP_I2C_FLAG_16BIT_DATA_REG | -+ OMAP_I2C_FLAG_BUS_SHIFT_2, -+}; - - /* I2C1 */ - -diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c -index d737b99..a30b100 100644 ---- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c -@@ -1527,6 +1527,9 @@ 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 | -+ OMAP_I2C_FLAG_FORCE_19200_INT_CLK, - }; - - /* I2C1 */ -diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c -index 324162d..f804e78 100644 ---- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c -@@ -1876,6 +1876,9 @@ static struct omap_hwmod omap3xxx_dss_venc_hwmod = { - - 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 | -+ OMAP_I2C_FLAG_BUS_SHIFT_2, - }; - - static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = { -@@ -1919,6 +1922,9 @@ static struct omap_hwmod omap3xxx_i2c1_hwmod = { - - 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 | -+ OMAP_I2C_FLAG_BUS_SHIFT_2, - }; - - static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = { -@@ -1962,6 +1968,9 @@ static struct omap_hwmod omap3xxx_i2c2_hwmod = { - - 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 | -+ OMAP_I2C_FLAG_BUS_SHIFT_2, - }; - - static 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 5d3f684..c2edb21 100644 ---- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c -@@ -27,6 +27,7 @@ - #include <plat/mcspi.h> - #include <plat/mcbsp.h> - #include <plat/mmc.h> -+#include <plat/i2c.h> - - #include "omap_hwmod_common_data.h" - -@@ -2090,6 +2091,11 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = { - .rev = OMAP_I2C_IP_VERSION_2, - }; - -+/* i2c dev_attr */ -+static struct omap_i2c_dev_attr i2c_dev_attr = { -+ .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE, -+}; -+ - /* i2c1 */ - static struct omap_hwmod omap44xx_i2c1_hwmod; - static struct omap_hwmod_irq_info omap44xx_i2c1_irqs[] = { -@@ -2138,6 +2144,7 @@ static struct omap_hwmod omap44xx_i2c1_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_I2C1_CLKCTRL, - }, - }, -+ .dev_attr = &i2c_dev_attr, - .slaves = omap44xx_i2c1_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_i2c1_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -2191,6 +2198,7 @@ static struct omap_hwmod omap44xx_i2c2_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_I2C2_CLKCTRL, - }, - }, -+ .dev_attr = &i2c_dev_attr, - .slaves = omap44xx_i2c2_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_i2c2_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -2244,6 +2252,7 @@ static struct omap_hwmod omap44xx_i2c3_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_I2C3_CLKCTRL, - }, - }, -+ .dev_attr = &i2c_dev_attr, - .slaves = omap44xx_i2c3_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_i2c3_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), -@@ -2297,6 +2306,7 @@ static struct omap_hwmod omap44xx_i2c4_hwmod = { - .clkctrl_reg = OMAP4430_CM_L4PER_I2C4_CLKCTRL, - }, - }, -+ .dev_attr = &i2c_dev_attr, - .slaves = omap44xx_i2c4_slaves, - .slaves_cnt = ARRAY_SIZE(omap44xx_i2c4_slaves), - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), --- -1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index 92aa185..988bf22 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,10 @@ "ref\020110308110912.23531.6379.stgit@otae.warmcat.com\0" "ref\04D778551.5010900@ti.com\0" "ref\04D7788D5.8040603@linaro.org\0" - "From\0Cousson, Benoit <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH 2 15/18] I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" + "Subject\0[PATCH 2 15/18] I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr\0" "Date\0Wed, 9 Mar 2011 16:43:27 +0100\0" - "To\0andy.green@linaro.org <andy.green@linaro.org>\0" - "Cc\0Andy Green <andy@warmcat.com>" - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - patches@linaro.org <patches@linaro.org> - " Ben Dooks <ben-linux@fluff.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 3/9/2011 3:04 PM, Andy Green wrote:\n" @@ -39,152 +34,6 @@ "\n" "Benoit\n" "\n" - "---\n" - ">From 561068054176af4574b5bf3a1d1258f19dc186e8 Mon Sep 17 00:00:00 2001\n" - "From: Andy Green <andy@warmcat.com>\n" - "Date: Tue, 8 Mar 2011 11:09:12 +0000\n" - "Subject: [PATCH] OMAP2+: hwmod data: add correct functionality flags to all omap2plus i2c dev_attr\n" - "\n" - "This adds the new functionality flags for OMAP i2c unit to all OMAP2+\n" - "hwmod definitions.\n" - "\n" - "Cc: patches@linaro.org\n" - "Cc: Ben Dooks <ben-linux@fluff.org>\n" - "Reported-by: Peter Maydell <peter.maydell@linaro.org>\n" - "Signed-off-by: Andy Green <andy.green@linaro.org>\n" - "[b-cousson@ti.com: Move dev_attr to stick to\n" - "hwmod template, update the subject]\n" - "Signed-off-by: Benoit Cousson <b-cousson@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/omap_hwmod_2420_data.c | 7 ++++++-\n" - " arch/arm/mach-omap2/omap_hwmod_2430_data.c | 3 +++\n" - " arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 9 +++++++++\n" - " arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 ++++++++++\n" - " 4 files changed, 28 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c\n" - "index de92d75..fe70365 100644\n" - "--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c\n" - "+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c\n" - "@@ -1450,7 +1450,12 @@ static struct omap_hwmod_class i2c_class = {\n" - " \t.rev\t\t= OMAP_I2C_IP_VERSION_1,\n" - " };\n" - " \n" - "-static struct omap_i2c_dev_attr i2c_dev_attr;\n" - "+static struct omap_i2c_dev_attr i2c_dev_attr = {\n" - "+\t.flags\t\t= OMAP_I2C_FLAG_NO_FIFO |\n" - "+\t\t\t OMAP_I2C_FLAG_SIMPLE_CLOCK |\n" - "+\t\t\t OMAP_I2C_FLAG_16BIT_DATA_REG |\n" - "+\t\t\t OMAP_I2C_FLAG_BUS_SHIFT_2,\n" - "+};\n" - " \n" - " /* I2C1 */\n" - " \n" - "diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c\n" - "index d737b99..a30b100 100644\n" - "--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c\n" - "+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c\n" - "@@ -1527,6 +1527,9 @@ static struct omap_hwmod_class i2c_class = {\n" - " \n" - " static struct omap_i2c_dev_attr i2c_dev_attr = {\n" - " \t.fifo_depth\t= 8, /* bytes */\n" - "+\t.flags\t\t= OMAP_I2C_FLAG_APPLY_ERRATA_I207 |\n" - "+\t\t\t OMAP_I2C_FLAG_BUS_SHIFT_2 |\n" - "+\t\t\t OMAP_I2C_FLAG_FORCE_19200_INT_CLK,\n" - " };\n" - " \n" - " /* I2C1 */\n" - "diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c\n" - "index 324162d..f804e78 100644\n" - "--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c\n" - "+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c\n" - "@@ -1876,6 +1876,9 @@ static struct omap_hwmod omap3xxx_dss_venc_hwmod = {\n" - " \n" - " static struct omap_i2c_dev_attr i2c1_dev_attr = {\n" - " \t.fifo_depth\t= 8, /* bytes */\n" - "+\t.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |\n" - "+\t\t OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |\n" - "+\t\t OMAP_I2C_FLAG_BUS_SHIFT_2,\n" - " };\n" - " \n" - " static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = {\n" - "@@ -1919,6 +1922,9 @@ static struct omap_hwmod omap3xxx_i2c1_hwmod = {\n" - " \n" - " static struct omap_i2c_dev_attr i2c2_dev_attr = {\n" - " \t.fifo_depth\t= 8, /* bytes */\n" - "+\t.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |\n" - "+\t\t OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |\n" - "+\t\t OMAP_I2C_FLAG_BUS_SHIFT_2,\n" - " };\n" - " \n" - " static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = {\n" - "@@ -1962,6 +1968,9 @@ static struct omap_hwmod omap3xxx_i2c2_hwmod = {\n" - " \n" - " static struct omap_i2c_dev_attr i2c3_dev_attr = {\n" - " \t.fifo_depth\t= 64, /* bytes */\n" - "+\t.flags = OMAP_I2C_FLAG_APPLY_ERRATA_I207 |\n" - "+\t\t OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |\n" - "+\t\t OMAP_I2C_FLAG_BUS_SHIFT_2,\n" - " };\n" - " \n" - " static struct omap_hwmod_irq_info i2c3_mpu_irqs[] = {\n" - "diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "index 5d3f684..c2edb21 100644\n" - "--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" - "@@ -27,6 +27,7 @@\n" - " #include <plat/mcspi.h>\n" - " #include <plat/mcbsp.h>\n" - " #include <plat/mmc.h>\n" - "+#include <plat/i2c.h>\n" - " \n" - " #include \"omap_hwmod_common_data.h\"\n" - " \n" - "@@ -2090,6 +2091,11 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = {\n" - " \t.rev\t= OMAP_I2C_IP_VERSION_2,\n" - " };\n" - " \n" - "+/* i2c dev_attr */\n" - "+static struct omap_i2c_dev_attr i2c_dev_attr = {\n" - "+\t.flags\t= OMAP_I2C_FLAG_BUS_SHIFT_NONE,\n" - "+};\n" - "+\n" - " /* i2c1 */\n" - " static struct omap_hwmod omap44xx_i2c1_hwmod;\n" - " static struct omap_hwmod_irq_info omap44xx_i2c1_irqs[] = {\n" - "@@ -2138,6 +2144,7 @@ static struct omap_hwmod omap44xx_i2c1_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_I2C1_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &i2c_dev_attr,\n" - " \t.slaves\t\t= omap44xx_i2c1_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_i2c1_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -2191,6 +2198,7 @@ static struct omap_hwmod omap44xx_i2c2_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_I2C2_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &i2c_dev_attr,\n" - " \t.slaves\t\t= omap44xx_i2c2_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_i2c2_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -2244,6 +2252,7 @@ static struct omap_hwmod omap44xx_i2c3_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_I2C3_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &i2c_dev_attr,\n" - " \t.slaves\t\t= omap44xx_i2c3_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_i2c3_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "@@ -2297,6 +2306,7 @@ static struct omap_hwmod omap44xx_i2c4_hwmod = {\n" - " \t\t\t.clkctrl_reg = OMAP4430_CM_L4PER_I2C4_CLKCTRL,\n" - " \t\t},\n" - " \t},\n" - "+\t.dev_attr\t= &i2c_dev_attr,\n" - " \t.slaves\t\t= omap44xx_i2c4_slaves,\n" - " \t.slaves_cnt\t= ARRAY_SIZE(omap44xx_i2c4_slaves),\n" - " \t.omap_chip\t= OMAP_CHIP_INIT(CHIP_IS_OMAP4430),\n" - "-- \n" - 1.7.0.4 + --- -bab461554d22b2c3d2f7fecfe156f7e9bea950dd26311be6fa64a4be8ef6d5fe +5f00b9afea4d83ea1f5485b42d28720e57a9edfab84e2729cc4a8717c3850bf2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.