mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: imx: add struct to hold more configurable quirks

Browse source 
This add struct imx_i2c_hwdata to hold more quirks data
which may vary between SoCs, thus the driver can operate
on more differences to support more SoCs.

Signed-off-by: Jingchang Lu <b35083@freescale.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Jingchang Lu 2013-08-07 17:05:42 +08:00 committed by Wolfram Sang
parent 171408c211
commit 4b775022f6
1 changed files with 52 additions and 25 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

77
drivers/i2c/busses/i2c-imx.c
View file

@ -108,9 +108,6 @@
#define I2CR_IEN_OPCODE_0 0x0 #define I2CR_IEN_OPCODE_0 0x0
#define I2CR_IEN_OPCODE_1 I2CR_IEN #define I2CR_IEN_OPCODE_1 I2CR_IEN
#define IMX_I2SR_CLR_OPCODE I2SR_CLR_OPCODE_W0C
#define IMX_I2CR_IEN_OPCODE I2CR_IEN_OPCODE_1
/** Variables ****************************************************************** /** Variables ******************************************************************
*******************************************************************************/ *******************************************************************************/
@ -127,7 +124,7 @@ struct imx_i2c_clk_pair {
u16 val; u16 val;
}; };
static struct imx_i2c_clk_pair __initdata i2c_clk_div[] = { static struct imx_i2c_clk_pair imx_i2c_clk_div[] = {
{ 22, 0x20 }, { 24, 0x21 }, { 26, 0x22 }, { 28, 0x23 }, { 22, 0x20 }, { 24, 0x21 }, { 26, 0x22 }, { 28, 0x23 },
{ 30, 0x00 }, { 32, 0x24 }, { 36, 0x25 }, { 40, 0x26 }, { 30, 0x00 }, { 32, 0x24 }, { 36, 0x25 }, { 40, 0x26 },
{ 42, 0x03 }, { 44, 0x27 }, { 48, 0x28 }, { 52, 0x05 }, { 42, 0x03 }, { 44, 0x27 }, { 48, 0x28 }, { 52, 0x05 },
@ -148,6 +145,15 @@ enum imx_i2c_type {
IMX21_I2C, IMX21_I2C,
}; };
struct imx_i2c_hwdata {
enum imx_i2c_type devtype;
unsigned regshift;
struct imx_i2c_clk_pair *clk_div;
unsigned ndivs;
unsigned i2sr_clr_opcode;
unsigned i2cr_ien_opcode;
};
struct imx_i2c_struct { struct imx_i2c_struct {
struct i2c_adapter adapter; struct i2c_adapter adapter;
struct clk *clk; struct clk *clk;
@ -157,16 +163,36 @@ struct imx_i2c_struct {
unsigned int disable_delay; unsigned int disable_delay;
int stopped; int stopped;
unsigned int ifdr; /* IMX_I2C_IFDR */ unsigned int ifdr; /* IMX_I2C_IFDR */
enum imx_i2c_type devtype; const struct imx_i2c_hwdata *hwdata;
};
static const struct imx_i2c_hwdata imx1_i2c_hwdata = {
.devtype = IMX1_I2C,
.regshift = IMX_I2C_REGSHIFT,
.clk_div = imx_i2c_clk_div,
.ndivs = ARRAY_SIZE(imx_i2c_clk_div),
.i2sr_clr_opcode = I2SR_CLR_OPCODE_W0C,
.i2cr_ien_opcode = I2CR_IEN_OPCODE_1,
};
static const struct imx_i2c_hwdata imx21_i2c_hwdata = {
.devtype = IMX21_I2C,
.regshift = IMX_I2C_REGSHIFT,
.clk_div = imx_i2c_clk_div,
.ndivs = ARRAY_SIZE(imx_i2c_clk_div),
.i2sr_clr_opcode = I2SR_CLR_OPCODE_W0C,
.i2cr_ien_opcode = I2CR_IEN_OPCODE_1,
}; };
static struct platform_device_id imx_i2c_devtype[] = { static struct platform_device_id imx_i2c_devtype[] = {
{ {
.name = "imx1-i2c", .name = "imx1-i2c",
.driver_data = IMX1_I2C, .driver_data = (kernel_ulong_t)&imx1_i2c_hwdata,
}, { }, {
.name = "imx21-i2c", .name = "imx21-i2c",
.driver_data = IMX21_I2C, .driver_data = (kernel_ulong_t)&imx21_i2c_hwdata,
}, { }, {
/* sentinel */ /* sentinel */
} }
@ -174,27 +200,27 @@ static struct platform_device_id imx_i2c_devtype[] = {
MODULE_DEVICE_TABLE(platform, imx_i2c_devtype); MODULE_DEVICE_TABLE(platform, imx_i2c_devtype);
static const struct of_device_id i2c_imx_dt_ids[] = { static const struct of_device_id i2c_imx_dt_ids[] = {
{ .compatible = "fsl,imx1-i2c", .data = &imx_i2c_devtype[IMX1_I2C], }, { .compatible = "fsl,imx1-i2c", .data = &imx1_i2c_hwdata, },
{ .compatible = "fsl,imx21-i2c", .data = &imx_i2c_devtype[IMX21_I2C], }, { .compatible = "fsl,imx21-i2c", .data = &imx21_i2c_hwdata, },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, i2c_imx_dt_ids); MODULE_DEVICE_TABLE(of, i2c_imx_dt_ids);
static inline int is_imx1_i2c(struct imx_i2c_struct *i2c_imx) static inline int is_imx1_i2c(struct imx_i2c_struct *i2c_imx)
{ {
return i2c_imx->devtype == IMX1_I2C; return i2c_imx->hwdata->devtype == IMX1_I2C;
} }
static inline void imx_i2c_write_reg(unsigned int val, static inline void imx_i2c_write_reg(unsigned int val,
struct imx_i2c_struct *i2c_imx, unsigned int reg) struct imx_i2c_struct *i2c_imx, unsigned int reg)
{ {
writeb(val, i2c_imx->base + (reg << IMX_I2C_REGSHIFT)); writeb(val, i2c_imx->base + (reg << i2c_imx->hwdata->regshift));
} }
static inline unsigned char imx_i2c_read_reg(struct imx_i2c_struct *i2c_imx, static inline unsigned char imx_i2c_read_reg(struct imx_i2c_struct *i2c_imx,
unsigned int reg) unsigned int reg)
{ {
return readb(i2c_imx->base + (reg << IMX_I2C_REGSHIFT)); return readb(i2c_imx->base + (reg << i2c_imx->hwdata->regshift));
} }
/** Functions for IMX I2C adapter driver *************************************** /** Functions for IMX I2C adapter driver ***************************************
@ -258,8 +284,8 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
clk_prepare_enable(i2c_imx->clk); clk_prepare_enable(i2c_imx->clk);
imx_i2c_write_reg(i2c_imx->ifdr, i2c_imx, IMX_I2C_IFDR); imx_i2c_write_reg(i2c_imx->ifdr, i2c_imx, IMX_I2C_IFDR);
/* Enable I2C controller */ /* Enable I2C controller */
imx_i2c_write_reg(IMX_I2SR_CLR_OPCODE, i2c_imx, IMX_I2C_I2SR); imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
imx_i2c_write_reg(IMX_I2CR_IEN_OPCODE, i2c_imx, IMX_I2C_I2CR); imx_i2c_write_reg(i2c_imx->hwdata->i2cr_ien_opcode, i2c_imx, IMX_I2C_I2CR);
/* Wait controller to be stable */ /* Wait controller to be stable */
udelay(50); udelay(50);
@ -303,13 +329,15 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
} }
/* Disable I2C controller */ /* Disable I2C controller */
imx_i2c_write_reg(IMX_I2CR_IEN_OPCODE ^ I2CR_IEN, i2c_imx, IMX_I2C_I2CR); temp = i2c_imx->hwdata->i2cr_ien_opcode ^ I2CR_IEN,
imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);
clk_disable_unprepare(i2c_imx->clk); clk_disable_unprepare(i2c_imx->clk);
} }
static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx, static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
unsigned int rate) unsigned int rate)
{ {
struct imx_i2c_clk_pair *i2c_clk_div = i2c_imx->hwdata->clk_div;
unsigned int i2c_clk_rate; unsigned int i2c_clk_rate;
unsigned int div; unsigned int div;
int i; int i;
@ -319,8 +347,8 @@ static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
div = (i2c_clk_rate + rate - 1) / rate; div = (i2c_clk_rate + rate - 1) / rate;
if (div < i2c_clk_div[0].div) if (div < i2c_clk_div[0].div)
i = 0; i = 0;
else if (div > i2c_clk_div[ARRAY_SIZE(i2c_clk_div) - 1].div) else if (div > i2c_clk_div[i2c_imx->hwdata->ndivs - 1].div)
i = ARRAY_SIZE(i2c_clk_div) - 1; i = i2c_imx->hwdata->ndivs - 1;
else else
for (i = 0; i2c_clk_div[i].div < div; i++); for (i = 0; i2c_clk_div[i].div < div; i++);
@ -355,7 +383,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
/* save status register */ /* save status register */
i2c_imx->i2csr = temp; i2c_imx->i2csr = temp;
temp &= ~I2SR_IIF; temp &= ~I2SR_IIF;
temp |= (IMX_I2SR_CLR_OPCODE & I2SR_IIF); temp |= (i2c_imx->hwdata->i2sr_clr_opcode & I2SR_IIF);
imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR); imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);
wake_up(&i2c_imx->queue); wake_up(&i2c_imx->queue);
return IRQ_HANDLED; return IRQ_HANDLED;
@ -537,7 +565,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
struct imx_i2c_struct *i2c_imx; struct imx_i2c_struct *i2c_imx;
struct resource *res; struct resource *res;
struct imxi2c_platform_data *pdata = pdev->dev.platform_data; struct imxi2c_platform_data *pdata = pdev->dev.platform_data;
const struct platform_device_id *imx_id;
void __iomem *base; void __iomem *base;
int irq, ret; int irq, ret;
u32 bitrate; u32 bitrate;
@ -563,11 +590,10 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
} }
if (of_id) if (of_id)
imx_id = of_id->data; i2c_imx->hwdata = of_id->data;
else else
imx_id = platform_get_device_id(pdev); i2c_imx->hwdata = (struct imx_i2c_hwdata *)
platform_get_device_id(pdev)->driver_data;
i2c_imx->devtype = imx_id->driver_data;
/* Setup i2c_imx driver structure */ /* Setup i2c_imx driver structure */
strlcpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name)); strlcpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name));
@ -613,8 +639,9 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
i2c_imx_set_clk(i2c_imx, bitrate); i2c_imx_set_clk(i2c_imx, bitrate);
/* Set up chip registers to defaults */ /* Set up chip registers to defaults */
imx_i2c_write_reg(IMX_I2CR_IEN_OPCODE ^ I2CR_IEN, i2c_imx, IMX_I2C_I2CR); imx_i2c_write_reg(i2c_imx->hwdata->i2cr_ien_opcode ^ I2CR_IEN,
imx_i2c_write_reg(IMX_I2SR_CLR_OPCODE, i2c_imx, IMX_I2C_I2SR); i2c_imx, IMX_I2C_I2CR);
imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
/* Add I2C adapter */ /* Add I2C adapter */
ret = i2c_add_numbered_adapter(&i2c_imx->adapter); ret = i2c_add_numbered_adapter(&i2c_imx->adapter);