diff for duplicates of <1488964778.2514.9.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index e45149d..c763011 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,40 +7,40 @@ On Wed, 2017-03-08 at 07:44 +0100, Heiner Kallweit wrote: > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- -> ?drivers/i2c/busses/i2c-meson.c | 13 +++++++++++-- -> ?1 file changed, 11 insertions(+), 2 deletions(-) +> drivers/i2c/busses/i2c-meson.c | 13 +++++++++++-- +> 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c > index 5e243efa..a5764be5 100644 > --- a/drivers/i2c/busses/i2c-meson.c > +++ b/drivers/i2c/busses/i2c-meson.c > @@ -35,7 +35,9 @@ -> ?#define REG_CTRL_STATUS BIT(2) -> ?#define REG_CTRL_ERROR BIT(3) -> ?#define REG_CTRL_CLKDIV_SHIFT 12 +> #define REG_CTRL_STATUS BIT(2) +> #define REG_CTRL_ERROR BIT(3) +> #define REG_CTRL_CLKDIV_SHIFT 12 > -#define REG_CTRL_CLKDIV_MASK ((BIT(10) - 1) << REG_CTRL_CLKDIV_SHIFT) > +#define REG_CTRL_CLKDIV_MASK GENMASK(21, 12) > +#define REG_CTRL_CLKDIVEXT_SHIFT 28 > +#define REG_CTRL_CLKDIVEXT_MASK GENMASK(29, 28) -> ? -> ?#define I2C_TIMEOUT_MS 500 -> ? +> +> #define I2C_TIMEOUT_MS 500 +> > @@ -136,8 +138,15 @@ static void meson_i2c_set_clk_div(struct meson_i2c *i2c) -> ? unsigned int div; -> ? -> ? div = DIV_ROUND_UP(clk_rate, i2c->timings.bus_freq_hz * 4); +> unsigned int div; +> +> div = DIV_ROUND_UP(clk_rate, i2c->timings.bus_freq_hz * 4); > + > + /* clock divider has 12 bits */ > + WARN_ON(div >= (1 << 12)); > + -> ? meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_CLKDIV_MASK, -> - ???div << REG_CTRL_CLKDIV_SHIFT); -> + ???(div & GENMASK(9, 0)) << REG_CTRL_CLKDIV_SHIFT); +> meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_CLKDIV_MASK, +> - div << REG_CTRL_CLKDIV_SHIFT); +> + (div & GENMASK(9, 0)) << REG_CTRL_CLKDIV_SHIFT); > + > + meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_CLKDIVEXT_MASK, -> + ???(div >> 10) << REG_CTRL_CLKDIVEXT_SHIFT); -> ? -> ? dev_dbg(i2c->dev, "%s: clk %lu, freq %u, div %u\n", __func__, -> ? clk_rate, i2c->timings.bus_freq_hz, div); +> + (div >> 10) << REG_CTRL_CLKDIVEXT_SHIFT); +> +> dev_dbg(i2c->dev, "%s: clk %lu, freq %u, div %u\n", __func__, +> clk_rate, i2c->timings.bus_freq_hz, div); Acked-by: Jerome Brunet <jbrunet@baylibre.com> diff --git a/a/content_digest b/N1/content_digest index d410f85..ae959a7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,12 @@ "ref\0d5f0545a-fb4c-b436-20f5-7df9d10605b1@gmail.com\0" "ref\00ea5a778-8769-50c2-35de-7136b6b407b6@gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 04/12] i2c: meson: use full 12 bits for clock divider\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 04/12] i2c: meson: use full 12 bits for clock divider\0" "Date\0Wed, 08 Mar 2017 10:19:38 +0100\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Heiner Kallweit <hkallweit1@gmail.com>" + " Wolfram Sang <wsa@the-dreams.de>\0" + "Cc\0linux-amlogic@lists.infradead.org" + " linux-i2c@vger.kernel.org <linux-i2c@vger.kernel.org>\0" "\00:1\0" "b\0" "On Wed, 2017-03-08 at 07:44 +0100, Heiner Kallweit wrote:\n" @@ -15,42 +18,42 @@ "> \n" "> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>\n" "> ---\n" - "> ?drivers/i2c/busses/i2c-meson.c | 13 +++++++++++--\n" - "> ?1 file changed, 11 insertions(+), 2 deletions(-)\n" + "> \302\240drivers/i2c/busses/i2c-meson.c | 13 +++++++++++--\n" + "> \302\2401 file changed, 11 insertions(+), 2 deletions(-)\n" "> \n" "> diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c\n" "> index 5e243efa..a5764be5 100644\n" "> --- a/drivers/i2c/busses/i2c-meson.c\n" "> +++ b/drivers/i2c/busses/i2c-meson.c\n" "> @@ -35,7 +35,9 @@\n" - "> ?#define REG_CTRL_STATUS\t\tBIT(2)\n" - "> ?#define REG_CTRL_ERROR\t\tBIT(3)\n" - "> ?#define REG_CTRL_CLKDIV_SHIFT\t12\n" + "> \302\240#define REG_CTRL_STATUS\t\tBIT(2)\n" + "> \302\240#define REG_CTRL_ERROR\t\tBIT(3)\n" + "> \302\240#define REG_CTRL_CLKDIV_SHIFT\t12\n" "> -#define REG_CTRL_CLKDIV_MASK\t((BIT(10) - 1) << REG_CTRL_CLKDIV_SHIFT)\n" "> +#define REG_CTRL_CLKDIV_MASK\tGENMASK(21, 12)\n" "> +#define REG_CTRL_CLKDIVEXT_SHIFT 28\n" "> +#define REG_CTRL_CLKDIVEXT_MASK\tGENMASK(29, 28)\n" - "> ?\n" - "> ?#define I2C_TIMEOUT_MS\t\t500\n" - "> ?\n" + "> \302\240\n" + "> \302\240#define I2C_TIMEOUT_MS\t\t500\n" + "> \302\240\n" "> @@ -136,8 +138,15 @@ static void meson_i2c_set_clk_div(struct meson_i2c *i2c)\n" - "> ?\tunsigned int div;\n" - "> ?\n" - "> ?\tdiv = DIV_ROUND_UP(clk_rate, i2c->timings.bus_freq_hz * 4);\n" + "> \302\240\tunsigned int div;\n" + "> \302\240\n" + "> \302\240\tdiv = DIV_ROUND_UP(clk_rate, i2c->timings.bus_freq_hz * 4);\n" "> +\n" "> +\t/* clock divider has 12 bits */\n" "> +\tWARN_ON(div >= (1 << 12));\n" "> +\n" - "> ?\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_CLKDIV_MASK,\n" - "> -\t\t\t???div << REG_CTRL_CLKDIV_SHIFT);\n" - "> +\t\t\t???(div & GENMASK(9, 0)) << REG_CTRL_CLKDIV_SHIFT);\n" + "> \302\240\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_CLKDIV_MASK,\n" + "> -\t\t\t\302\240\302\240\302\240div << REG_CTRL_CLKDIV_SHIFT);\n" + "> +\t\t\t\302\240\302\240\302\240(div & GENMASK(9, 0)) << REG_CTRL_CLKDIV_SHIFT);\n" "> +\n" "> +\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_CLKDIVEXT_MASK,\n" - "> +\t\t\t???(div >> 10) << REG_CTRL_CLKDIVEXT_SHIFT);\n" - "> ?\n" - "> ?\tdev_dbg(i2c->dev, \"%s: clk %lu, freq %u, div %u\\n\", __func__,\n" - "> ?\t\tclk_rate, i2c->timings.bus_freq_hz, div);\n" + "> +\t\t\t\302\240\302\240\302\240(div >> 10) << REG_CTRL_CLKDIVEXT_SHIFT);\n" + "> \302\240\n" + "> \302\240\tdev_dbg(i2c->dev, \"%s: clk %lu, freq %u, div %u\\n\", __func__,\n" + "> \302\240\t\tclk_rate, i2c->timings.bus_freq_hz, div);\n" "\n" Acked-by: Jerome Brunet <jbrunet@baylibre.com> -fe60aab9036d294f845a101d9dfaf55c73e2a3d2f906aec32db4e2ef64a3c703 +dea5c3168f002cc237ef900260d19f1f36c1dd02719c69e70c6031b2adfe7571
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.