* [PATCH v2] i2c: tegra: use i2c_timings for bus clock freq
@ 2021-12-09 16:28 Akhil R
2021-12-09 22:27 ` Dmitry Osipenko
0 siblings, 1 reply; 4+ messages in thread
From: Akhil R @ 2021-12-09 16:28 UTC (permalink / raw)
To: andy.shevchenko, christian.koenig, digetx, dri-devel, jonathanh,
ldewangan, linaro-mm-sig, linux-i2c, linux-kernel, linux-media,
linux-tegra, p.zabel, sumit.semwal, thierry.reding
Cc: akhilrajeev
Use i2c_timings struct and corresponding methods to get bus clock frequency
Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
v1->v2: Added temp var for i2c_timings struct in function.
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index a5be8f0..4cbe89b 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -246,7 +246,7 @@ struct tegra_i2c_hw_feature {
* @msg_buf: pointer to current message data
* @msg_buf_remaining: size of unsent data in the message buffer
* @msg_read: indicates that the transfer is a read access
- * @bus_clk_rate: current I2C bus clock rate
+ * @timings: i2c timings information like bus frequency
* @multimaster_mode: indicates that I2C controller is in multi-master mode
* @tx_dma_chan: DMA transmit channel
* @rx_dma_chan: DMA receive channel
@@ -273,7 +273,7 @@ struct tegra_i2c_dev {
unsigned int nclocks;
struct clk *div_clk;
- u32 bus_clk_rate;
+ struct i2c_timings timings;
struct completion msg_complete;
size_t msg_buf_remaining;
@@ -610,6 +610,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
{
u32 val, clk_divisor, clk_multiplier, tsu_thd, tlow, thigh, non_hs_mode;
acpi_handle handle = ACPI_HANDLE(i2c_dev->dev);
+ struct i2c_timings *t = &i2c_dev->timings;
int err;
/*
@@ -642,14 +643,14 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
if (i2c_dev->is_vi)
tegra_i2c_vi_init(i2c_dev);
- switch (i2c_dev->bus_clk_rate) {
+ switch (t->bus_freq_hz) {
case I2C_MAX_STANDARD_MODE_FREQ + 1 ... I2C_MAX_FAST_MODE_PLUS_FREQ:
default:
tlow = i2c_dev->hw->tlow_fast_fastplus_mode;
thigh = i2c_dev->hw->thigh_fast_fastplus_mode;
tsu_thd = i2c_dev->hw->setup_hold_time_fast_fast_plus_mode;
- if (i2c_dev->bus_clk_rate > I2C_MAX_FAST_MODE_FREQ)
+ if (t->bus_freq_hz > I2C_MAX_FAST_MODE_FREQ)
non_hs_mode = i2c_dev->hw->clk_divisor_fast_plus_mode;
else
non_hs_mode = i2c_dev->hw->clk_divisor_fast_mode;
@@ -685,7 +686,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
clk_multiplier = (tlow + thigh + 2) * (non_hs_mode + 1);
err = clk_set_rate(i2c_dev->div_clk,
- i2c_dev->bus_clk_rate * clk_multiplier);
+ t->bus_freq_hz * clk_multiplier);
if (err) {
dev_err(i2c_dev->dev, "failed to set div-clk rate: %d\n", err);
return err;
@@ -724,7 +725,7 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev)
* before disabling the controller so that the STOP condition has
* been delivered properly.
*/
- udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
+ udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->timings.bus_freq_hz));
cnfg = i2c_readl(i2c_dev, I2C_CNFG);
if (cnfg & I2C_CNFG_PACKET_MODE_EN)
@@ -1254,7 +1255,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
* Total bits = 9 bits per byte (including ACK bit) + Start & stop bits
*/
xfer_time += DIV_ROUND_CLOSEST(((xfer_size * 9) + 2) * MSEC_PER_SEC,
- i2c_dev->bus_clk_rate);
+ i2c_dev->timings.bus_freq_hz);
int_mask = I2C_INT_NO_ACK | I2C_INT_ARBITRATION_LOST;
tegra_i2c_unmask_irq(i2c_dev, int_mask);
@@ -1633,10 +1634,7 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev)
bool multi_mode;
int err;
- err = device_property_read_u32(i2c_dev->dev, "clock-frequency",
- &i2c_dev->bus_clk_rate);
- if (err)
- i2c_dev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ;
+ i2c_parse_fw_timings(i2c_dev->dev, &i2c_dev->timings, true);
multi_mode = device_property_read_bool(i2c_dev->dev, "multi-master");
i2c_dev->multimaster_mode = multi_mode;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] i2c: tegra: use i2c_timings for bus clock freq
2021-12-09 16:28 [PATCH v2] i2c: tegra: use i2c_timings for bus clock freq Akhil R
@ 2021-12-09 22:27 ` Dmitry Osipenko
2021-12-10 6:43 ` Akhil R
0 siblings, 1 reply; 4+ messages in thread
From: Dmitry Osipenko @ 2021-12-09 22:27 UTC (permalink / raw)
To: Akhil R, andy.shevchenko, jonathanh, ldewangan, linux-i2c,
linux-kernel, linux-tegra, thierry.reding
09.12.2021 19:28, Akhil R пишет:
> - err = device_property_read_u32(i2c_dev->dev, "clock-frequency",
> - &i2c_dev->bus_clk_rate);
> - if (err)
> - i2c_dev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ;
> + i2c_parse_fw_timings(i2c_dev->dev, &i2c_dev->timings, true);
Was this patch tested at all? Apparently it wasn't compile-tested.
drivers/i2c/busses/i2c-tegra.c: In function ‘tegra_i2c_parse_dt’:
drivers/i2c/busses/i2c-tegra.c:1635:13: warning: unused variable ‘err’ [-Wunused-variable]
1635 | int err;
BTW, MM, DRI and media mailing lists have nothing to do with this patch
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v2] i2c: tegra: use i2c_timings for bus clock freq
2021-12-09 22:27 ` Dmitry Osipenko
@ 2021-12-10 6:43 ` Akhil R
2021-12-10 8:51 ` Andy Shevchenko
0 siblings, 1 reply; 4+ messages in thread
From: Akhil R @ 2021-12-10 6:43 UTC (permalink / raw)
To: Dmitry Osipenko, andy.shevchenko, Jonathan Hunter,
Laxman Dewangan, linux-i2c, linux-kernel, linux-tegra,
thierry.reding
> 09.12.2021 19:28, Akhil R пишет:
> > - err = device_property_read_u32(i2c_dev->dev, "clock-frequency",
> > - &i2c_dev->bus_clk_rate);
> > - if (err)
> > - i2c_dev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ;
> > + i2c_parse_fw_timings(i2c_dev->dev, &i2c_dev->timings, true);
>
> Was this patch tested at all? Apparently, it wasn't compile-tested.
Sorry, it got somehow missed as the build did not fail when prepared
the image for testing. Thanks for pointing this out.
Would fix and update.
>
> drivers/i2c/busses/i2c-tegra.c: In function ‘tegra_i2c_parse_dt’:
> drivers/i2c/busses/i2c-tegra.c:1635:13: warning: unused variable ‘err’ [-
> Wunused-variable]
> 1635 | int err;
>
> BTW, MM, DRI and media mailing lists have nothing to do with this patch
Even I was wondering on this, but apparently those lists are shown if get_maintainer.pl
is run. Would remove the mailing lists going further.
Thanks,
Akhil
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] i2c: tegra: use i2c_timings for bus clock freq
2021-12-10 6:43 ` Akhil R
@ 2021-12-10 8:51 ` Andy Shevchenko
0 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2021-12-10 8:51 UTC (permalink / raw)
To: Akhil R
Cc: Dmitry Osipenko, Jonathan Hunter, Laxman Dewangan, linux-i2c,
linux-kernel, linux-tegra, thierry.reding
On Fri, Dec 10, 2021 at 8:43 AM Akhil R <akhilrajeev@nvidia.com> wrote:
>
> > 09.12.2021 19:28, Akhil R пишет:
> > > - err = device_property_read_u32(i2c_dev->dev, "clock-frequency",
> > > - &i2c_dev->bus_clk_rate);
> > > - if (err)
> > > - i2c_dev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ;
> > > + i2c_parse_fw_timings(i2c_dev->dev, &i2c_dev->timings, true);
> >
> > Was this patch tested at all? Apparently, it wasn't compile-tested.
> Sorry, it got somehow missed as the build did not fail when prepared
> the image for testing. Thanks for pointing this out.
> Would fix and update.
It is because Dmitry runs `make W=1 ...`. Otherwise these types of
warnings are hidden.
> > drivers/i2c/busses/i2c-tegra.c: In function ‘tegra_i2c_parse_dt’:
> > drivers/i2c/busses/i2c-tegra.c:1635:13: warning: unused variable ‘err’ [-
> > Wunused-variable]
> > 1635 | int err;
> >
> > BTW, MM, DRI and media mailing lists have nothing to do with this patch
> Even I was wondering on this, but apparently those lists are shown if get_maintainer.pl
> is run. Would remove the mailing lists going further.
I would recommend using my script [1] which has good heuristics.
[1]: https://github.com/andy-shev/home-bin-tools/blob/master/ge2maintainer.sh
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-10 8:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-09 16:28 [PATCH v2] i2c: tegra: use i2c_timings for bus clock freq Akhil R
2021-12-09 22:27 ` Dmitry Osipenko
2021-12-10 6:43 ` Akhil R
2021-12-10 8:51 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).