Commit 931b18e9 authored by Jian Hu's avatar Jian Hu Committed by Wolfram Sang

i2c: meson: add configurable divider factors

This patch try to add support for I2C controller in Meson-AXG SoC,
Due to the IP changes between I2C controller, we need to introduce
a compatible data to make the divider factor configurable.
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarJian Hu <jian.hu@amlogic.com>
Signed-off-by: default avatarYixun Lan <yixun.lan@amlogic.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent f13ebc4f
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -57,6 +58,10 @@ enum { ...@@ -57,6 +58,10 @@ enum {
STATE_WRITE, STATE_WRITE,
}; };
struct meson_i2c_data {
unsigned char div_factor;
};
/** /**
* struct meson_i2c - Meson I2C device private data * struct meson_i2c - Meson I2C device private data
* *
...@@ -93,6 +98,8 @@ struct meson_i2c { ...@@ -93,6 +98,8 @@ struct meson_i2c {
struct completion done; struct completion done;
u32 tokens[2]; u32 tokens[2];
int num_tokens; int num_tokens;
const struct meson_i2c_data *data;
}; };
static void meson_i2c_set_mask(struct meson_i2c *i2c, int reg, u32 mask, static void meson_i2c_set_mask(struct meson_i2c *i2c, int reg, u32 mask,
...@@ -128,7 +135,7 @@ static void meson_i2c_set_clk_div(struct meson_i2c *i2c, unsigned int freq) ...@@ -128,7 +135,7 @@ static void meson_i2c_set_clk_div(struct meson_i2c *i2c, unsigned int freq)
unsigned long clk_rate = clk_get_rate(i2c->clk); unsigned long clk_rate = clk_get_rate(i2c->clk);
unsigned int div; unsigned int div;
div = DIV_ROUND_UP(clk_rate, freq * 4); div = DIV_ROUND_UP(clk_rate, freq * i2c->data->div_factor);
/* clock divider has 12 bits */ /* clock divider has 12 bits */
if (div >= (1 << 12)) { if (div >= (1 << 12)) {
...@@ -376,6 +383,9 @@ static int meson_i2c_probe(struct platform_device *pdev) ...@@ -376,6 +383,9 @@ static int meson_i2c_probe(struct platform_device *pdev)
spin_lock_init(&i2c->lock); spin_lock_init(&i2c->lock);
init_completion(&i2c->done); init_completion(&i2c->done);
i2c->data = (const struct meson_i2c_data *)
of_device_get_match_data(&pdev->dev);
i2c->clk = devm_clk_get(&pdev->dev, NULL); i2c->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(i2c->clk)) { if (IS_ERR(i2c->clk)) {
dev_err(&pdev->dev, "can't get device clock\n"); dev_err(&pdev->dev, "can't get device clock\n");
...@@ -440,11 +450,25 @@ static int meson_i2c_remove(struct platform_device *pdev) ...@@ -440,11 +450,25 @@ static int meson_i2c_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct meson_i2c_data i2c_meson6_data = {
.div_factor = 4,
};
static const struct meson_i2c_data i2c_gxbb_data = {
.div_factor = 4,
};
static const struct meson_i2c_data i2c_axg_data = {
.div_factor = 3,
};
static const struct of_device_id meson_i2c_match[] = { static const struct of_device_id meson_i2c_match[] = {
{ .compatible = "amlogic,meson6-i2c" }, { .compatible = "amlogic,meson6-i2c", .data = &i2c_meson6_data },
{ .compatible = "amlogic,meson-gxbb-i2c" }, { .compatible = "amlogic,meson-gxbb-i2c", .data = &i2c_gxbb_data },
{ }, { .compatible = "amlogic,meson-axg-i2c", .data = &i2c_axg_data },
{},
}; };
MODULE_DEVICE_TABLE(of, meson_i2c_match); MODULE_DEVICE_TABLE(of, meson_i2c_match);
static struct platform_driver meson_i2c_driver = { static struct platform_driver meson_i2c_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment