From: Andrew Lunn <andrew@lunn.ch>
To: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Andrew Lunn <andrew@lunn.ch>, Jason Cooper <jason@lakedaemon.net>,
Wolfram Sang <wsa@the-dreams.de>,
Emilio Lopez <emilio@elopez.com.ar>,
Tomasz Figa <tomasz.figa@gmail.com>,
linux-sunxi@googlegroups.com, linux-i2c@vger.kernel.org,
sunny@allwinnertech.com, shuge@allwinnertech.com,
kevin@allwinnertech.com, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCHv4 2/9] i2c: mv64xxx: make the registers offset configurable
Date: Wed, 12 Jun 2013 12:54:31 +0200 [thread overview]
Message-ID: <20130612105431.GS16502@lunn.ch> (raw)
In-Reply-To: <1371024438-16631-3-git-send-email-maxime.ripard@free-electrons.com>
On Wed, Jun 12, 2013 at 10:07:11AM +0200, Maxime Ripard wrote:
> The Allwinner i2c controller uses the same logic as the Marvell one, but
> with slightly different register offsets.
>
> Introduce a structure that will be passed by either the pdata or
> associated to the compatible strings, and that holds the various
> registers that might be needed.
Hi Maxime
I don't think this change is bisectable. It assumes the platform data
passes the registers, which is not true until the next patch.
Please can you re-arrange the order. Add the extra information to the
platform data, and then make use of it, not the other way around.
Thanks
Andrew
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/i2c/busses/i2c-mv64xxx.c | 81 +++++++++++++++++++++-------------------
> include/linux/mv643xx_i2c.h | 27 ++++++++++++--
> 2 files changed, 66 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
> index d70a2fda..f9e076e 100644
> --- a/drivers/i2c/busses/i2c-mv64xxx.c
> +++ b/drivers/i2c/busses/i2c-mv64xxx.c
> @@ -19,20 +19,12 @@
> #include <linux/platform_device.h>
> #include <linux/io.h>
> #include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/of_irq.h>
> #include <linux/of_i2c.h>
> #include <linux/clk.h>
> #include <linux/err.h>
>
> -/* Register defines */
> -#define MV64XXX_I2C_REG_SLAVE_ADDR 0x00
> -#define MV64XXX_I2C_REG_DATA 0x04
> -#define MV64XXX_I2C_REG_CONTROL 0x08
> -#define MV64XXX_I2C_REG_STATUS 0x0c
> -#define MV64XXX_I2C_REG_BAUD 0x0c
> -#define MV64XXX_I2C_REG_EXT_SLAVE_ADDR 0x10
> -#define MV64XXX_I2C_REG_SOFT_RESET 0x1c
> -
> #define MV64XXX_I2C_ADDR_ADDR(val) ((val & 0x7f) << 1)
> #define MV64XXX_I2C_BAUD_DIV_N(val) (val & 0x7)
> #define MV64XXX_I2C_BAUD_DIV_M(val) ((val & 0xf) << 3)
> @@ -98,6 +90,7 @@ struct mv64xxx_i2c_data {
> u32 aborting;
> u32 cntl_bits;
> void __iomem *reg_base;
> + struct mv64xxx_i2c_regs *regs;
> u32 addr1;
> u32 addr2;
> u32 bytes_left;
> @@ -154,13 +147,13 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
> static void
> mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data)
> {
> - writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SOFT_RESET);
> + writel(0, drv_data->reg_base + drv_data->regs->soft_reset);
> writel(MV64XXX_I2C_BAUD_DIV_M(drv_data->freq_m) | MV64XXX_I2C_BAUD_DIV_N(drv_data->freq_n),
> - drv_data->reg_base + MV64XXX_I2C_REG_BAUD);
> - writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SLAVE_ADDR);
> - writel(0, drv_data->reg_base + MV64XXX_I2C_REG_EXT_SLAVE_ADDR);
> + drv_data->reg_base + drv_data->regs->clock);
> + writel(0, drv_data->reg_base + drv_data->regs->addr);
> + writel(0, drv_data->reg_base + drv_data->regs->ext_addr);
> writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> drv_data->state = MV64XXX_I2C_STATE_IDLE;
> }
>
> @@ -282,7 +275,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
>
> drv_data->cntl_bits |= MV64XXX_I2C_REG_CONTROL_START;
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
>
> drv_data->msgs++;
> drv_data->num_msgs--;
> @@ -300,48 +293,48 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
>
> case MV64XXX_I2C_ACTION_CONTINUE:
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_START:
> writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_ADDR_1:
> writel(drv_data->addr1,
> - drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_ADDR_2:
> writel(drv_data->addr2,
> - drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_DATA:
> writel(drv_data->msg->buf[drv_data->byte_posn++],
> - drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_RCV_DATA:
> drv_data->msg->buf[drv_data->byte_posn++] =
> - readl(drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + readl(drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_RCV_DATA_STOP:
> drv_data->msg->buf[drv_data->byte_posn++] =
> - readl(drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + readl(drv_data->reg_base + drv_data->regs->data);
> drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
> writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> drv_data->block = 0;
> wake_up(&drv_data->waitq);
> break;
> @@ -356,7 +349,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
> case MV64XXX_I2C_ACTION_SEND_STOP:
> drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
> writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> drv_data->block = 0;
> wake_up(&drv_data->waitq);
> break;
> @@ -372,9 +365,9 @@ mv64xxx_i2c_intr(int irq, void *dev_id)
> irqreturn_t rc = IRQ_NONE;
>
> spin_lock_irqsave(&drv_data->lock, flags);
> - while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) &
> + while (readl(drv_data->reg_base + drv_data->regs->control) &
> MV64XXX_I2C_REG_CONTROL_IFLG) {
> - status = readl(drv_data->reg_base + MV64XXX_I2C_REG_STATUS);
> + status = readl(drv_data->reg_base + drv_data->regs->status);
> mv64xxx_i2c_fsm(drv_data, status);
> mv64xxx_i2c_do_action(drv_data);
> rc = IRQ_HANDLED;
> @@ -496,6 +489,12 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = {
> *****************************************************************************
> */
> #ifdef CONFIG_OF
> +static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
> + { .compatible = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
> +
> static int
> mv64xxx_calc_freq(const int tclk, const int n, const int m)
> {
> @@ -528,8 +527,10 @@ mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
>
> static int
> mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
> - struct device_node *np)
> + struct device *dev)
> {
> + const struct of_device_id *device;
> + struct device_node *np = dev->of_node;
> u32 bus_freq, tclk;
> int rc = 0;
>
> @@ -558,6 +559,13 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
> * So hard code the value to 1 second.
> */
> drv_data->adapter.timeout = HZ;
> +
> + device = of_match_device(mv64xxx_i2c_of_match_table, dev);
> + if (!device)
> + return -ENODEV;
> +
> + drv_data->regs = (struct mv64xxx_i2c_regs *)device->data;
> +
> out:
> return rc;
> #endif
> @@ -565,7 +573,7 @@ out:
> #else /* CONFIG_OF */
> static int
> mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
> - struct device_node *np)
> + struct device *dev)
> {
> return -ENODEV;
> }
> @@ -611,8 +619,9 @@ mv64xxx_i2c_probe(struct platform_device *pd)
> drv_data->freq_n = pdata->freq_n;
> drv_data->irq = platform_get_irq(pd, 0);
> drv_data->adapter.timeout = msecs_to_jiffies(pdata->timeout);
> + drv_data->regs = pdata->regs;
> } else if (pd->dev.of_node) {
> - rc = mv64xxx_of_config(drv_data, pd->dev.of_node);
> + rc = mv64xxx_of_config(drv_data, &pd->dev);
> if (rc)
> goto exit_clk;
> }
> @@ -680,12 +689,6 @@ mv64xxx_i2c_remove(struct platform_device *dev)
> return 0;
> }
>
> -static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
> - { .compatible = "marvell,mv64xxx-i2c", },
> - {}
> -};
> -MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
> -
> static struct platform_driver mv64xxx_i2c_driver = {
> .probe = mv64xxx_i2c_probe,
> .remove = mv64xxx_i2c_remove,
> diff --git a/include/linux/mv643xx_i2c.h b/include/linux/mv643xx_i2c.h
> index 5db5152..9304c94 100644
> --- a/include/linux/mv643xx_i2c.h
> +++ b/include/linux/mv643xx_i2c.h
> @@ -12,11 +12,32 @@
>
> #define MV64XXX_I2C_CTLR_NAME "mv64xxx_i2c"
>
> +struct mv64xxx_i2c_regs {
> + u8 addr;
> + u8 ext_addr;
> + u8 data;
> + u8 control;
> + u8 status;
> + u8 clock;
> + u8 soft_reset;
> +};
> +
> +struct mv64xxx_i2c_regs mv64xxx_i2c_regs_mv64xxx = {
> + .addr = 0x00,
> + .ext_addr = 0x10,
> + .data = 0x04,
> + .control = 0x08,
> + .status = 0x0c,
> + .clock = 0x0c,
> + .soft_reset = 0x1c,
> +};
> +
> /* i2c Platform Device, Driver Data */
> struct mv64xxx_i2c_pdata {
> - u32 freq_m;
> - u32 freq_n;
> - u32 timeout; /* In milliseconds */
> + u32 freq_m;
> + u32 freq_n;
> + struct mv64xxx_i2c_regs *regs;
> + u32 timeout; /* In milliseconds */
> };
>
> #endif /*_MV64XXX_I2C_H_*/
> --
> 1.8.3
>
WARNING: multiple messages have this Message-ID (diff)
From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv4 2/9] i2c: mv64xxx: make the registers offset configurable
Date: Wed, 12 Jun 2013 12:54:31 +0200 [thread overview]
Message-ID: <20130612105431.GS16502@lunn.ch> (raw)
In-Reply-To: <1371024438-16631-3-git-send-email-maxime.ripard@free-electrons.com>
On Wed, Jun 12, 2013 at 10:07:11AM +0200, Maxime Ripard wrote:
> The Allwinner i2c controller uses the same logic as the Marvell one, but
> with slightly different register offsets.
>
> Introduce a structure that will be passed by either the pdata or
> associated to the compatible strings, and that holds the various
> registers that might be needed.
Hi Maxime
I don't think this change is bisectable. It assumes the platform data
passes the registers, which is not true until the next patch.
Please can you re-arrange the order. Add the extra information to the
platform data, and then make use of it, not the other way around.
Thanks
Andrew
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/i2c/busses/i2c-mv64xxx.c | 81 +++++++++++++++++++++-------------------
> include/linux/mv643xx_i2c.h | 27 ++++++++++++--
> 2 files changed, 66 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
> index d70a2fda..f9e076e 100644
> --- a/drivers/i2c/busses/i2c-mv64xxx.c
> +++ b/drivers/i2c/busses/i2c-mv64xxx.c
> @@ -19,20 +19,12 @@
> #include <linux/platform_device.h>
> #include <linux/io.h>
> #include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/of_irq.h>
> #include <linux/of_i2c.h>
> #include <linux/clk.h>
> #include <linux/err.h>
>
> -/* Register defines */
> -#define MV64XXX_I2C_REG_SLAVE_ADDR 0x00
> -#define MV64XXX_I2C_REG_DATA 0x04
> -#define MV64XXX_I2C_REG_CONTROL 0x08
> -#define MV64XXX_I2C_REG_STATUS 0x0c
> -#define MV64XXX_I2C_REG_BAUD 0x0c
> -#define MV64XXX_I2C_REG_EXT_SLAVE_ADDR 0x10
> -#define MV64XXX_I2C_REG_SOFT_RESET 0x1c
> -
> #define MV64XXX_I2C_ADDR_ADDR(val) ((val & 0x7f) << 1)
> #define MV64XXX_I2C_BAUD_DIV_N(val) (val & 0x7)
> #define MV64XXX_I2C_BAUD_DIV_M(val) ((val & 0xf) << 3)
> @@ -98,6 +90,7 @@ struct mv64xxx_i2c_data {
> u32 aborting;
> u32 cntl_bits;
> void __iomem *reg_base;
> + struct mv64xxx_i2c_regs *regs;
> u32 addr1;
> u32 addr2;
> u32 bytes_left;
> @@ -154,13 +147,13 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
> static void
> mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data)
> {
> - writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SOFT_RESET);
> + writel(0, drv_data->reg_base + drv_data->regs->soft_reset);
> writel(MV64XXX_I2C_BAUD_DIV_M(drv_data->freq_m) | MV64XXX_I2C_BAUD_DIV_N(drv_data->freq_n),
> - drv_data->reg_base + MV64XXX_I2C_REG_BAUD);
> - writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SLAVE_ADDR);
> - writel(0, drv_data->reg_base + MV64XXX_I2C_REG_EXT_SLAVE_ADDR);
> + drv_data->reg_base + drv_data->regs->clock);
> + writel(0, drv_data->reg_base + drv_data->regs->addr);
> + writel(0, drv_data->reg_base + drv_data->regs->ext_addr);
> writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> drv_data->state = MV64XXX_I2C_STATE_IDLE;
> }
>
> @@ -282,7 +275,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
>
> drv_data->cntl_bits |= MV64XXX_I2C_REG_CONTROL_START;
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
>
> drv_data->msgs++;
> drv_data->num_msgs--;
> @@ -300,48 +293,48 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
>
> case MV64XXX_I2C_ACTION_CONTINUE:
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_START:
> writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_ADDR_1:
> writel(drv_data->addr1,
> - drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_ADDR_2:
> writel(drv_data->addr2,
> - drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_SEND_DATA:
> writel(drv_data->msg->buf[drv_data->byte_posn++],
> - drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_RCV_DATA:
> drv_data->msg->buf[drv_data->byte_posn++] =
> - readl(drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + readl(drv_data->reg_base + drv_data->regs->data);
> writel(drv_data->cntl_bits,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> break;
>
> case MV64XXX_I2C_ACTION_RCV_DATA_STOP:
> drv_data->msg->buf[drv_data->byte_posn++] =
> - readl(drv_data->reg_base + MV64XXX_I2C_REG_DATA);
> + readl(drv_data->reg_base + drv_data->regs->data);
> drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
> writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> drv_data->block = 0;
> wake_up(&drv_data->waitq);
> break;
> @@ -356,7 +349,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
> case MV64XXX_I2C_ACTION_SEND_STOP:
> drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
> writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
> - drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
> + drv_data->reg_base + drv_data->regs->control);
> drv_data->block = 0;
> wake_up(&drv_data->waitq);
> break;
> @@ -372,9 +365,9 @@ mv64xxx_i2c_intr(int irq, void *dev_id)
> irqreturn_t rc = IRQ_NONE;
>
> spin_lock_irqsave(&drv_data->lock, flags);
> - while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) &
> + while (readl(drv_data->reg_base + drv_data->regs->control) &
> MV64XXX_I2C_REG_CONTROL_IFLG) {
> - status = readl(drv_data->reg_base + MV64XXX_I2C_REG_STATUS);
> + status = readl(drv_data->reg_base + drv_data->regs->status);
> mv64xxx_i2c_fsm(drv_data, status);
> mv64xxx_i2c_do_action(drv_data);
> rc = IRQ_HANDLED;
> @@ -496,6 +489,12 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = {
> *****************************************************************************
> */
> #ifdef CONFIG_OF
> +static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
> + { .compatible = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
> +
> static int
> mv64xxx_calc_freq(const int tclk, const int n, const int m)
> {
> @@ -528,8 +527,10 @@ mv64xxx_find_baud_factors(const u32 req_freq, const u32 tclk, u32 *best_n,
>
> static int
> mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
> - struct device_node *np)
> + struct device *dev)
> {
> + const struct of_device_id *device;
> + struct device_node *np = dev->of_node;
> u32 bus_freq, tclk;
> int rc = 0;
>
> @@ -558,6 +559,13 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
> * So hard code the value to 1 second.
> */
> drv_data->adapter.timeout = HZ;
> +
> + device = of_match_device(mv64xxx_i2c_of_match_table, dev);
> + if (!device)
> + return -ENODEV;
> +
> + drv_data->regs = (struct mv64xxx_i2c_regs *)device->data;
> +
> out:
> return rc;
> #endif
> @@ -565,7 +573,7 @@ out:
> #else /* CONFIG_OF */
> static int
> mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
> - struct device_node *np)
> + struct device *dev)
> {
> return -ENODEV;
> }
> @@ -611,8 +619,9 @@ mv64xxx_i2c_probe(struct platform_device *pd)
> drv_data->freq_n = pdata->freq_n;
> drv_data->irq = platform_get_irq(pd, 0);
> drv_data->adapter.timeout = msecs_to_jiffies(pdata->timeout);
> + drv_data->regs = pdata->regs;
> } else if (pd->dev.of_node) {
> - rc = mv64xxx_of_config(drv_data, pd->dev.of_node);
> + rc = mv64xxx_of_config(drv_data, &pd->dev);
> if (rc)
> goto exit_clk;
> }
> @@ -680,12 +689,6 @@ mv64xxx_i2c_remove(struct platform_device *dev)
> return 0;
> }
>
> -static const struct of_device_id mv64xxx_i2c_of_match_table[] = {
> - { .compatible = "marvell,mv64xxx-i2c", },
> - {}
> -};
> -MODULE_DEVICE_TABLE(of, mv64xxx_i2c_of_match_table);
> -
> static struct platform_driver mv64xxx_i2c_driver = {
> .probe = mv64xxx_i2c_probe,
> .remove = mv64xxx_i2c_remove,
> diff --git a/include/linux/mv643xx_i2c.h b/include/linux/mv643xx_i2c.h
> index 5db5152..9304c94 100644
> --- a/include/linux/mv643xx_i2c.h
> +++ b/include/linux/mv643xx_i2c.h
> @@ -12,11 +12,32 @@
>
> #define MV64XXX_I2C_CTLR_NAME "mv64xxx_i2c"
>
> +struct mv64xxx_i2c_regs {
> + u8 addr;
> + u8 ext_addr;
> + u8 data;
> + u8 control;
> + u8 status;
> + u8 clock;
> + u8 soft_reset;
> +};
> +
> +struct mv64xxx_i2c_regs mv64xxx_i2c_regs_mv64xxx = {
> + .addr = 0x00,
> + .ext_addr = 0x10,
> + .data = 0x04,
> + .control = 0x08,
> + .status = 0x0c,
> + .clock = 0x0c,
> + .soft_reset = 0x1c,
> +};
> +
> /* i2c Platform Device, Driver Data */
> struct mv64xxx_i2c_pdata {
> - u32 freq_m;
> - u32 freq_n;
> - u32 timeout; /* In milliseconds */
> + u32 freq_m;
> + u32 freq_n;
> + struct mv64xxx_i2c_regs *regs;
> + u32 timeout; /* In milliseconds */
> };
>
> #endif /*_MV64XXX_I2C_H_*/
> --
> 1.8.3
>
next prev parent reply other threads:[~2013-06-12 10:54 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 8:07 [PATCHv4 0/9] Add I2C support for Allwinner SoCs Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
[not found] ` <1371024438-16631-1-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2013-06-12 8:07 ` [PATCHv4 1/9] i2c: mv64xxx: Add macros to access parts of registers Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
2013-06-12 8:07 ` [PATCHv4 2/9] i2c: mv64xxx: make the registers offset configurable Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
2013-06-12 10:54 ` Andrew Lunn [this message]
2013-06-12 10:54 ` Andrew Lunn
[not found] ` <20130612105431.GS16502-g2DYL2Zd6BY@public.gmane.org>
2013-06-12 11:29 ` Maxime Ripard
2013-06-12 11:29 ` Maxime Ripard
[not found] ` <1371024438-16631-3-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2013-06-12 13:57 ` Russell King - ARM Linux
2013-06-12 13:57 ` Russell King - ARM Linux
[not found] ` <20130612135735.GR18614-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2013-06-12 14:44 ` Maxime Ripard
2013-06-12 14:44 ` Maxime Ripard
2013-06-12 14:51 ` Russell King - ARM Linux
2013-06-12 14:51 ` Russell King - ARM Linux
[not found] ` <20130612145139.GS18614-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2013-06-12 15:17 ` Maxime Ripard
2013-06-12 15:17 ` Maxime Ripard
2013-06-12 15:03 ` Sebastian Hesselbarth
2013-06-12 15:03 ` Sebastian Hesselbarth
[not found] ` <51B88DB0.90302-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-06-12 15:37 ` Maxime Ripard
2013-06-12 15:37 ` Maxime Ripard
2013-06-12 8:07 ` [PATCHv4 3/9] ARM: orion: pass the i2c registers definition through the platform data Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
[not found] ` <1371024438-16631-4-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2013-06-12 8:39 ` Tomasz Figa
2013-06-12 8:39 ` Tomasz Figa
2013-06-12 8:07 ` [PATCHv4 4/9] i2c: mv64xxx: Add Allwinner sun4i compatible Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
[not found] ` <1371024438-16631-5-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2013-06-12 8:42 ` Tomasz Figa
2013-06-12 8:42 ` Tomasz Figa
2013-06-12 11:27 ` Maxime Ripard
2013-06-12 11:27 ` Maxime Ripard
2013-06-12 10:56 ` Andrew Lunn
2013-06-12 10:56 ` Andrew Lunn
[not found] ` <20130612105613.GT16502-g2DYL2Zd6BY@public.gmane.org>
2013-06-12 11:31 ` Maxime Ripard
2013-06-12 11:31 ` Maxime Ripard
2013-06-12 8:07 ` [PATCHv4 5/9] ARM: sunxi: dt: Add i2c controller nodes to the DTSI Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
2013-06-12 8:07 ` [PATCHv4 6/9] ARM: sun4i: dt: Add i2c muxing options Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
2013-06-12 8:07 ` [PATCHv4 7/9] ARM: sun5i: " Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
[not found] ` <1371024438-16631-8-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2013-06-12 8:29 ` Henrik Nordström
2013-06-12 8:29 ` [linux-sunxi] " Henrik Nordström
2013-06-12 11:20 ` Maxime Ripard
2013-06-12 11:20 ` [linux-sunxi] " Maxime Ripard
2013-06-12 8:07 ` [PATCHv4 8/9] ARM: sun5i: olinuxino: Enable the i2c controllers Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
2013-06-12 8:07 ` [PATCHv4 9/9] ARM: sun4i: cubieboard: " Maxime Ripard
2013-06-12 8:07 ` Maxime Ripard
2013-06-12 11:26 ` [PATCHv4 0/9] Add I2C support for Allwinner SoCs Arnd Bergmann
2013-06-12 11:26 ` Arnd Bergmann
2013-06-12 11:38 ` Maxime Ripard
2013-06-12 11:38 ` Maxime Ripard
2013-06-12 12:38 ` Arnd Bergmann
2013-06-12 12:38 ` Arnd Bergmann
[not found] ` <201306121438.12549.arnd-r2nGTMty4D4@public.gmane.org>
2013-06-12 12:44 ` Maxime Ripard
2013-06-12 12:44 ` Maxime Ripard
2013-06-14 14:01 ` Wolfram Sang
2013-06-14 14:01 ` Wolfram Sang
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=20130612105431.GS16502@lunn.ch \
--to=andrew@lunn.ch \
--cc=emilio@elopez.com.ar \
--cc=jason@lakedaemon.net \
--cc=kevin@allwinnertech.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=shuge@allwinnertech.com \
--cc=sunny@allwinnertech.com \
--cc=tomasz.figa@gmail.com \
--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: link
Be 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.