mirror of https://lore.kernel.org/linux-amlogic/
 help / color / mirror / Atom feed
From: hkallweit1@gmail.com (Heiner Kallweit)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v3 04/10] i2c: meson: use i2c core for DT clock-frequency parsing
Date: Sat, 11 Mar 2017 19:23:24 +0100	[thread overview]
Message-ID: <27b52215-3cbe-b407-c439-216fdace3745@gmail.com> (raw)
In-Reply-To: <a0ebd65b-712d-2b15-dcc6-3b8a9a619770@gmail.com>

We don't have to parse the DT manually to retrieve the bus frequency
and we don't have to maintain an own default for the bus frequency.
Let the i2c core do this for us.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
---
v2:
- added Reviewed-by
v3:
- changed order of patches
---
 drivers/i2c/busses/i2c-meson.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index e597764e..ac0ac82d 100644
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -38,7 +38,6 @@
 #define REG_CTRL_CLKDIV_MASK	((BIT(10) - 1) << REG_CTRL_CLKDIV_SHIFT)
 
 #define I2C_TIMEOUT_MS		500
-#define DEFAULT_FREQ		100000
 
 enum {
 	TOKEN_END = 0,
@@ -387,15 +386,14 @@ static int meson_i2c_probe(struct platform_device *pdev)
 	struct device_node *np = pdev->dev.of_node;
 	struct meson_i2c *i2c;
 	struct resource *mem;
-	u32 freq;
+	struct i2c_timings timings;
 	int irq, ret = 0;
 
 	i2c = devm_kzalloc(&pdev->dev, sizeof(struct meson_i2c), GFP_KERNEL);
 	if (!i2c)
 		return -ENOMEM;
 
-	if (of_property_read_u32(pdev->dev.of_node, "clock-frequency", &freq))
-		freq = DEFAULT_FREQ;
+	i2c_parse_fw_timings(&pdev->dev, &timings, true);
 
 	i2c->dev = &pdev->dev;
 	platform_set_drvdata(pdev, i2c);
@@ -453,7 +451,7 @@ static int meson_i2c_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	meson_i2c_set_clk_div(i2c, freq);
+	meson_i2c_set_clk_div(i2c, timings.bus_freq_hz);
 
 	return 0;
 }
-- 
2.12.0

  parent reply	other threads:[~2017-03-11 18:23 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-11 17:48 [PATCH v3 00/10] i2c: meson: series with improvements Heiner Kallweit
2017-03-11 18:22 ` [PATCH v3 01/10] i2c: meson: use min instead of min_t where min_t isn't needed Heiner Kallweit
2017-03-11 18:22 ` [PATCH v3 02/10] i2c: meson: remove member irq from struct meson_i2c Heiner Kallweit
2017-03-11 18:23 ` [PATCH v3 03/10] i2c: meson: set clock divider in probe instead of setting it for each transfer Heiner Kallweit
2017-03-11 18:23 ` Heiner Kallweit [this message]
2017-03-13  9:01   ` [PATCH v3 04/10] i2c: meson: use i2c core for DT clock-frequency parsing Neil Armstrong
2017-03-13 19:03     ` Heiner Kallweit
2017-03-14 11:16       ` Neil Armstrong
2017-03-11 18:23 ` [PATCH v3 05/10] i2c: meson: use full 12 bits for clock divider Heiner Kallweit
2017-03-11 18:23 ` [PATCH v3 06/10] i2c: meson: remove variable count from meson_i2c_xfer Heiner Kallweit
2017-03-11 18:24 ` [PATCH v3 07/10] i2c: meson: improve interrupt handler and detect spurious interrupts Heiner Kallweit
2017-03-11 18:24 ` [PATCH v3 08/10] i2c: meson: don't create separate token chain just for the stop command Heiner Kallweit
2017-03-11 18:24 ` [PATCH v3 09/10] i2c: meson: remove meson_i2c_write_tokens Heiner Kallweit
2017-03-11 18:24 ` [PATCH v3 10/10] i2c: meson: improve and simplify interrupt handler 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=27b52215-3cbe-b407-c439-216fdace3745@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=linus-amlogic@lists.infradead.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®