From: Kevin Hilman <khilman@baylibre.com> To: Heiner Kallweit <hkallweit1@gmail.com> Cc: Wolfram Sang <wsa@the-dreams.de>, Jerome Brunet <jbrunet@baylibre.com>, linux-amlogic@lists.infradead.org, "linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org> Subject: Re: [PATCH v2 05/10] i2c: meson: set clock divider in probe instead of setting it for each transfer Date: Fri, 10 Mar 2017 15:17:55 -0800 [thread overview] Message-ID: <m2shmkd8m4.fsf@baylibre.com> (raw) In-Reply-To: <5fcfa996-5986-1856-d6f7-a979b7c5d5c9@gmail.com> (Heiner Kallweit's message of "Thu, 9 Mar 2017 07:42:08 +0100") Heiner Kallweit <hkallweit1@gmail.com> writes: > The bus frequency won't change, therefore we can set the clock divider > in probe already and we don't have to set it for each transfer. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > v2: > - no changes > --- > drivers/i2c/busses/i2c-meson.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c > index a5764be5..594fec22 100644 > --- a/drivers/i2c/busses/i2c-meson.c > +++ b/drivers/i2c/busses/i2c-meson.c > @@ -74,7 +74,6 @@ enum { > * @error: Flag set when an error is received > * @lock: To avoid race conditions between irq handler and xfer code > * @done: Completion used to wait for transfer termination > - * @timings: Struct including the bus frequency You just added this field in PATCH 03/10. Why not do this patch first, which will simplify the other. Kevin > * @tokens: Sequence of tokens to be written to the device > * @num_tokens: Number of tokens > */ > @@ -93,7 +92,6 @@ struct meson_i2c { > > spinlock_t lock; > struct completion done; > - struct i2c_timings timings; > u32 tokens[2]; > int num_tokens; > }; > @@ -132,12 +130,12 @@ static void meson_i2c_write_tokens(struct meson_i2c *i2c) > writel(i2c->tokens[1], i2c->regs + REG_TOK_LIST1); > } > > -static void meson_i2c_set_clk_div(struct meson_i2c *i2c) > +static void meson_i2c_set_clk_div(struct meson_i2c *i2c, unsigned int freq) > { > unsigned long clk_rate = clk_get_rate(i2c->clk); > unsigned int div; > > - div = DIV_ROUND_UP(clk_rate, i2c->timings.bus_freq_hz * 4); > + div = DIV_ROUND_UP(clk_rate, freq * 4); > > /* clock divider has 12 bits */ > WARN_ON(div >= (1 << 12)); > @@ -149,7 +147,7 @@ static void meson_i2c_set_clk_div(struct meson_i2c *i2c) > (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); > + clk_rate, freq, div); > } > > static void meson_i2c_get_data(struct meson_i2c *i2c, char *buf, int len) > @@ -369,7 +367,6 @@ static int meson_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > int i, ret = 0, count = 0; > > clk_enable(i2c->clk); > - meson_i2c_set_clk_div(i2c); > > for (i = 0; i < num; i++) { > ret = meson_i2c_xfer_msg(i2c, msgs + i, i == num - 1); > @@ -396,6 +393,7 @@ static const struct i2c_algorithm meson_i2c_algorithm = { > static int meson_i2c_probe(struct platform_device *pdev) > { > struct device_node *np = pdev->dev.of_node; > + struct i2c_timings timings; > struct meson_i2c *i2c; > struct resource *mem; > int irq, ret = 0; > @@ -404,7 +402,7 @@ static int meson_i2c_probe(struct platform_device *pdev) > if (!i2c) > return -ENOMEM; > > - i2c_parse_fw_timings(&pdev->dev, &i2c->timings, true); > + i2c_parse_fw_timings(&pdev->dev, &timings, true); > > i2c->dev = &pdev->dev; > platform_set_drvdata(pdev, i2c); > @@ -462,6 +460,8 @@ static int meson_i2c_probe(struct platform_device *pdev) > return ret; > } > > + meson_i2c_set_clk_div(i2c, timings.bus_freq_hz); > + > return 0; > }
WARNING: multiple messages have this Message-ID (diff)
From: khilman@baylibre.com (Kevin Hilman) To: linus-amlogic@lists.infradead.org Subject: [PATCH v2 05/10] i2c: meson: set clock divider in probe instead of setting it for each transfer Date: Fri, 10 Mar 2017 15:17:55 -0800 [thread overview] Message-ID: <m2shmkd8m4.fsf@baylibre.com> (raw) In-Reply-To: <5fcfa996-5986-1856-d6f7-a979b7c5d5c9@gmail.com> (Heiner Kallweit's message of "Thu, 9 Mar 2017 07:42:08 +0100") Heiner Kallweit <hkallweit1@gmail.com> writes: > The bus frequency won't change, therefore we can set the clock divider > in probe already and we don't have to set it for each transfer. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > v2: > - no changes > --- > drivers/i2c/busses/i2c-meson.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c > index a5764be5..594fec22 100644 > --- a/drivers/i2c/busses/i2c-meson.c > +++ b/drivers/i2c/busses/i2c-meson.c > @@ -74,7 +74,6 @@ enum { > * @error: Flag set when an error is received > * @lock: To avoid race conditions between irq handler and xfer code > * @done: Completion used to wait for transfer termination > - * @timings: Struct including the bus frequency You just added this field in PATCH 03/10. Why not do this patch first, which will simplify the other. Kevin > * @tokens: Sequence of tokens to be written to the device > * @num_tokens: Number of tokens > */ > @@ -93,7 +92,6 @@ struct meson_i2c { > > spinlock_t lock; > struct completion done; > - struct i2c_timings timings; > u32 tokens[2]; > int num_tokens; > }; > @@ -132,12 +130,12 @@ static void meson_i2c_write_tokens(struct meson_i2c *i2c) > writel(i2c->tokens[1], i2c->regs + REG_TOK_LIST1); > } > > -static void meson_i2c_set_clk_div(struct meson_i2c *i2c) > +static void meson_i2c_set_clk_div(struct meson_i2c *i2c, unsigned int freq) > { > unsigned long clk_rate = clk_get_rate(i2c->clk); > unsigned int div; > > - div = DIV_ROUND_UP(clk_rate, i2c->timings.bus_freq_hz * 4); > + div = DIV_ROUND_UP(clk_rate, freq * 4); > > /* clock divider has 12 bits */ > WARN_ON(div >= (1 << 12)); > @@ -149,7 +147,7 @@ static void meson_i2c_set_clk_div(struct meson_i2c *i2c) > (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); > + clk_rate, freq, div); > } > > static void meson_i2c_get_data(struct meson_i2c *i2c, char *buf, int len) > @@ -369,7 +367,6 @@ static int meson_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > int i, ret = 0, count = 0; > > clk_enable(i2c->clk); > - meson_i2c_set_clk_div(i2c); > > for (i = 0; i < num; i++) { > ret = meson_i2c_xfer_msg(i2c, msgs + i, i == num - 1); > @@ -396,6 +393,7 @@ static const struct i2c_algorithm meson_i2c_algorithm = { > static int meson_i2c_probe(struct platform_device *pdev) > { > struct device_node *np = pdev->dev.of_node; > + struct i2c_timings timings; > struct meson_i2c *i2c; > struct resource *mem; > int irq, ret = 0; > @@ -404,7 +402,7 @@ static int meson_i2c_probe(struct platform_device *pdev) > if (!i2c) > return -ENOMEM; > > - i2c_parse_fw_timings(&pdev->dev, &i2c->timings, true); > + i2c_parse_fw_timings(&pdev->dev, &timings, true); > > i2c->dev = &pdev->dev; > platform_set_drvdata(pdev, i2c); > @@ -462,6 +460,8 @@ static int meson_i2c_probe(struct platform_device *pdev) > return ret; > } > > + meson_i2c_set_clk_div(i2c, timings.bus_freq_hz); > + > return 0; > }
next prev parent reply other threads:[~2017-03-10 23:24 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-09 6:33 [PATCH v2 00/10] i2c: meson: series with improvements Heiner Kallweit 2017-03-09 6:33 ` Heiner Kallweit 2017-03-09 6:35 ` [PATCH v2 01/10] i2c: meson: i2c: meson: use min instead of min_t where min_t isn't needed Heiner Kallweit 2017-03-09 6:35 ` Heiner Kallweit 2017-03-09 6:37 ` [PATCH v2 02/10] i2c: meson: remove member irq from struct meson_i2c Heiner Kallweit 2017-03-09 6:37 ` Heiner Kallweit 2017-03-09 6:39 ` [PATCH v2 03/10] i2c: meson: use i2c core for DT clock-frequency parsing Heiner Kallweit 2017-03-09 6:39 ` Heiner Kallweit 2017-03-09 8:26 ` Neil Armstrong 2017-03-09 8:26 ` Neil Armstrong 2017-03-09 20:13 ` Heiner Kallweit 2017-03-09 20:13 ` Heiner Kallweit 2017-03-09 6:40 ` [PATCH v2 04/10] i2c: meson: use full 12 bits for clock divider Heiner Kallweit 2017-03-09 6:40 ` Heiner Kallweit 2017-03-09 6:42 ` [PATCH v2 05/10] i2c: meson: set clock divider in probe instead of setting it for each transfer Heiner Kallweit 2017-03-09 6:42 ` Heiner Kallweit 2017-03-10 23:17 ` Kevin Hilman [this message] 2017-03-10 23:17 ` Kevin Hilman 2017-03-10 23:36 ` Heiner Kallweit 2017-03-10 23:36 ` Heiner Kallweit 2017-03-09 6:43 ` [PATCH v2 06/10] i2c: meson: remove variable count from meson_i2c_xfer Heiner Kallweit 2017-03-09 6:43 ` Heiner Kallweit 2017-03-09 6:53 ` [PATCH v2 07/10] i2c: meson: improve interrupt handler and detect spurious interrupts Heiner Kallweit 2017-03-09 6:53 ` Heiner Kallweit 2017-03-09 6:56 ` [PATCH v2 08/10] i2c: meson: don't create separate token chain just for the stop command Heiner Kallweit 2017-03-09 6:56 ` Heiner Kallweit 2017-03-09 6:58 ` [PATCH v2 09/10] i2c: meson: remove meson_i2c_write_tokens Heiner Kallweit 2017-03-09 6:58 ` Heiner Kallweit 2017-03-09 7:01 ` [PATCH v2 10/10] i2c: meson: improve and simplify interrupt handler Heiner Kallweit 2017-03-09 7:01 ` Heiner Kallweit
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=m2shmkd8m4.fsf@baylibre.com \ --to=khilman@baylibre.com \ --cc=hkallweit1@gmail.com \ --cc=jbrunet@baylibre.com \ --cc=linux-amlogic@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.