diff for duplicates of <1481742050.9552.5.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 7c02952..5c06ca1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,9 +8,9 @@ On Tue, 2016-12-13 at 21:34 +0100, Wolfram Sang wrote: > Adding designware maintainers to CC... > > > --- -> > drivers/i2c/busses/i2c-designware-core.h | 1 + -> > drivers/i2c/busses/i2c-designware-platdrv.c | 5 +++++ -> > 2 files changed, 6 insertions(+) +> > ?drivers/i2c/busses/i2c-designware-core.h????| 1 + +> > ?drivers/i2c/busses/i2c-designware-platdrv.c | 5 +++++ +> > ?2 files changed, 6 insertions(+) > > > > diff --git a/drivers/i2c/busses/i2c-designware-core.h > > b/drivers/i2c/busses/i2c-designware-core.h @@ -18,32 +18,32 @@ On Tue, 2016-12-13 at 21:34 +0100, Wolfram Sang wrote: > > --- a/drivers/i2c/busses/i2c-designware-core.h > > +++ b/drivers/i2c/busses/i2c-designware-core.h > > @@ -80,6 +80,7 @@ struct dw_i2c_dev { -> > void __iomem *base; -> > struct completion cmd_complete; -> > struct clk *clk; +> > ? void __iomem *base; +> > ? struct completion cmd_complete; +> > ? struct clk *clk; > > + struct reset_control *rst; -> > u32 (*get_clk_rate_khz) (struct +> > ? u32 (*get_clk_rate_khz) (struct > > dw_i2c_dev *dev); -> > struct dw_pci_controller *controller; -> > int cmd_err; +> > ? struct dw_pci_controller *controller; +> > ? int cmd_err; > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > > b/drivers/i2c/busses/i2c-designware-platdrv.c > > index 0b42a12..fd80e58 100644 > > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > > @@ -38,6 +38,7 @@ -> > #include <linux/pm_runtime.h> -> > #include <linux/property.h> -> > #include <linux/io.h> +> > ?#include <linux/pm_runtime.h> +> > ?#include <linux/property.h> +> > ?#include <linux/io.h> > > +#include <linux/reset.h> -> > #include <linux/slab.h> -> > #include <linux/acpi.h> -> > #include <linux/platform_data/i2c-designware.h> +> > ?#include <linux/slab.h> +> > ?#include <linux/acpi.h> +> > ?#include <linux/platform_data/i2c-designware.h> > > @@ -176,6 +177,10 @@ static int dw_i2c_plat_probe(struct > > platform_device *pdev) -> > dev->irq = irq; -> > platform_set_drvdata(pdev, dev); -> > +> > ? dev->irq = irq; +> > ? platform_set_drvdata(pdev, dev); +> > ? > > + dev->rst = devm_reset_control_get(&pdev->dev, NULL); > > + if (!IS_ERR(dev->rst)) > > + reset_control_reset(dev->rst); @@ -55,10 +55,10 @@ Perhaps on error path we need to assert it. And I guess it should be devm_reset_control_get_optional(). > > + -> > /* fast mode by default because of legacy reasons */ -> > dev->clk_freq = 400000; -> > -> > -- +> > ? /* fast mode by default because of legacy reasons */ +> > ? dev->clk_freq = 400000; +> > ? +> > --? > > 2.7.4 > > diff --git a/a/content_digest b/N1/content_digest index 0c28738..a0afede 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,9 @@ "ref\01479789700-19532-1-git-send-email-zhangfei.gao@linaro.org\0" "ref\020161213203457.GB2889@katana\0" - "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" - "Subject\0Re: [PATCH] i2c: designware: add reset interface\0" + "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" + "Subject\0[PATCH] i2c: designware: add reset interface\0" "Date\0Wed, 14 Dec 2016 21:00:50 +0200\0" - "To\0Wolfram Sang <wsa@the-dreams.de>" - " Zhangfei Gao <zhangfei.gao@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-i2c@vger.kernel.org - Jarkko Nikula <jarkko.nikula@linux.intel.com> - " Mika Westerberg <mika.westerberg@linux.intel.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2016-12-13 at 21:34 +0100, Wolfram Sang wrote:\n" @@ -21,9 +16,9 @@ "> Adding designware maintainers to CC...\n" "> \n" "> > ---\n" - "> > \302\240drivers/i2c/busses/i2c-designware-core.h\302\240\302\240\302\240\302\240| 1 +\n" - "> > \302\240drivers/i2c/busses/i2c-designware-platdrv.c | 5 +++++\n" - "> > \302\2402 files changed, 6 insertions(+)\n" + "> > ?drivers/i2c/busses/i2c-designware-core.h????| 1 +\n" + "> > ?drivers/i2c/busses/i2c-designware-platdrv.c | 5 +++++\n" + "> > ?2 files changed, 6 insertions(+)\n" "> > \n" "> > diff --git a/drivers/i2c/busses/i2c-designware-core.h\n" "> > b/drivers/i2c/busses/i2c-designware-core.h\n" @@ -31,32 +26,32 @@ "> > --- a/drivers/i2c/busses/i2c-designware-core.h\n" "> > +++ b/drivers/i2c/busses/i2c-designware-core.h\n" "> > @@ -80,6 +80,7 @@ struct dw_i2c_dev {\n" - "> > \302\240\tvoid __iomem\t\t*base;\n" - "> > \302\240\tstruct completion\tcmd_complete;\n" - "> > \302\240\tstruct clk\t\t*clk;\n" + "> > ?\tvoid __iomem\t\t*base;\n" + "> > ?\tstruct completion\tcmd_complete;\n" + "> > ?\tstruct clk\t\t*clk;\n" "> > +\tstruct reset_control\t*rst;\n" - "> > \302\240\tu32\t\t\t(*get_clk_rate_khz) (struct\n" + "> > ?\tu32\t\t\t(*get_clk_rate_khz) (struct\n" "> > dw_i2c_dev *dev);\n" - "> > \302\240\tstruct dw_pci_controller *controller;\n" - "> > \302\240\tint\t\t\tcmd_err;\n" + "> > ?\tstruct dw_pci_controller *controller;\n" + "> > ?\tint\t\t\tcmd_err;\n" "> > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c\n" "> > b/drivers/i2c/busses/i2c-designware-platdrv.c\n" "> > index 0b42a12..fd80e58 100644\n" "> > --- a/drivers/i2c/busses/i2c-designware-platdrv.c\n" "> > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c\n" "> > @@ -38,6 +38,7 @@\n" - "> > \302\240#include <linux/pm_runtime.h>\n" - "> > \302\240#include <linux/property.h>\n" - "> > \302\240#include <linux/io.h>\n" + "> > ?#include <linux/pm_runtime.h>\n" + "> > ?#include <linux/property.h>\n" + "> > ?#include <linux/io.h>\n" "> > +#include <linux/reset.h>\n" - "> > \302\240#include <linux/slab.h>\n" - "> > \302\240#include <linux/acpi.h>\n" - "> > \302\240#include <linux/platform_data/i2c-designware.h>\n" + "> > ?#include <linux/slab.h>\n" + "> > ?#include <linux/acpi.h>\n" + "> > ?#include <linux/platform_data/i2c-designware.h>\n" "> > @@ -176,6 +177,10 @@ static int dw_i2c_plat_probe(struct\n" "> > platform_device *pdev)\n" - "> > \302\240\tdev->irq = irq;\n" - "> > \302\240\tplatform_set_drvdata(pdev, dev);\n" - "> > \302\240\n" + "> > ?\tdev->irq = irq;\n" + "> > ?\tplatform_set_drvdata(pdev, dev);\n" + "> > ?\n" "> > +\tdev->rst = devm_reset_control_get(&pdev->dev, NULL);\n" "> > +\tif (!IS_ERR(dev->rst))\n" "> > +\t\treset_control_reset(dev->rst);\n" @@ -68,10 +63,10 @@ "And I guess it should be devm_reset_control_get_optional().\n" "\n" "> > +\n" - "> > \302\240\t/* fast mode by default because of legacy reasons */\n" - "> > \302\240\tdev->clk_freq = 400000;\n" - "> > \302\240\n" - "> > --\302\240\n" + "> > ?\t/* fast mode by default because of legacy reasons */\n" + "> > ?\tdev->clk_freq = 400000;\n" + "> > ?\n" + "> > --?\n" "> > 2.7.4\n" "> > \n" "\n" @@ -79,4 +74,4 @@ "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -1404c567f0dbb05f8dfeee860c1cd3c6e914af81300d5edf219d105e1f52c044 +104b10905d0b279349acc28fc3ca9b2585cf499c611e7c7fc4369fcd482bd174
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.