mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-09 23:36:23 +09:00
i2c: imx: correct code of errata A-010650 for layerscape platform
- Simplify code with helper function i2c_imx_clr_al_bit - Fix an error about clearing arbitration lost bit - Fix an error that not set I2Cx_IBCR following by the workaround of A-010650 (in step 5) Reviewed-by: Clark Wang <xiaoning.wang@nxp.com> Signed-off-by: Biwen Li <biwen.li@nxp.com>
This commit is contained in:
parent
60c97c96b5
commit
0af141327c
|
@ -503,6 +503,14 @@ static void i2c_imx_dma_free(struct imx_i2c_struct *i2c_imx)
|
||||||
dma->chan_using = NULL;
|
dma->chan_using = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Clear arbitration lost bit */
|
||||||
|
static void i2c_imx_clr_al_bit(unsigned int status, struct imx_i2c_struct *i2c_imx)
|
||||||
|
{
|
||||||
|
status &= ~I2SR_IAL;
|
||||||
|
status |= (i2c_imx->hwdata->i2sr_clr_opcode & I2SR_IAL);
|
||||||
|
imx_i2c_write_reg(status, i2c_imx, IMX_I2C_I2SR);
|
||||||
|
}
|
||||||
|
|
||||||
static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
|
static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
|
||||||
{
|
{
|
||||||
unsigned long orig_jiffies = jiffies;
|
unsigned long orig_jiffies = jiffies;
|
||||||
|
@ -515,8 +523,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
|
||||||
|
|
||||||
/* check for arbitration lost */
|
/* check for arbitration lost */
|
||||||
if (temp & I2SR_IAL) {
|
if (temp & I2SR_IAL) {
|
||||||
temp &= ~I2SR_IAL;
|
i2c_imx_clr_al_bit(temp, i2c_imx);
|
||||||
imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);
|
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -700,14 +707,6 @@ static void i2c_imx_clr_if_bit(unsigned int status, struct imx_i2c_struct *i2c_i
|
||||||
imx_i2c_write_reg(status, i2c_imx, IMX_I2C_I2SR);
|
imx_i2c_write_reg(status, i2c_imx, IMX_I2C_I2SR);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clear arbitration lost bit */
|
|
||||||
static void i2c_imx_clr_al_bit(unsigned int status, struct imx_i2c_struct *i2c_imx)
|
|
||||||
{
|
|
||||||
status &= ~I2SR_IAL;
|
|
||||||
status |= (i2c_imx->hwdata->i2sr_clr_opcode & I2SR_IAL);
|
|
||||||
imx_i2c_write_reg(status, i2c_imx, IMX_I2C_I2SR);
|
|
||||||
}
|
|
||||||
|
|
||||||
static irqreturn_t i2c_imx_master_isr(struct imx_i2c_struct *i2c_imx)
|
static irqreturn_t i2c_imx_master_isr(struct imx_i2c_struct *i2c_imx)
|
||||||
{
|
{
|
||||||
unsigned int status;
|
unsigned int status;
|
||||||
|
@ -1050,12 +1049,14 @@ static int i2c_imx_recovery_for_layerscape(struct imx_i2c_struct *i2c_imx)
|
||||||
gpio_set_value(i2c_imx->gpio, 1);
|
gpio_set_value(i2c_imx->gpio, 1);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set I2Cx_IBCR = 0h00 to generate a STOP and then
|
* Set I2Cx_IBCR = 0h00 to generate a STOP
|
||||||
* set I2Cx_IBCR = 0h80 to reset
|
|
||||||
*/
|
*/
|
||||||
temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);
|
imx_i2c_write_reg(i2c_imx->hwdata->i2cr_ien_opcode, i2c_imx, IMX_I2C_I2CR);
|
||||||
temp &= ~(I2CR_MSTA | I2CR_MTX);
|
|
||||||
imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);
|
/*
|
||||||
|
* Set I2Cx_IBCR = 0h80 to reset the I2Cx controller
|
||||||
|
*/
|
||||||
|
imx_i2c_write_reg(i2c_imx->hwdata->i2cr_ien_opcode | I2CR_IEN, i2c_imx, IMX_I2C_I2CR);
|
||||||
|
|
||||||
/* Restore the saved value of the register SCFG_RCWPMUXCR0 */
|
/* Restore the saved value of the register SCFG_RCWPMUXCR0 */
|
||||||
if (i2c_imx->need_set_pmuxcr == 1) {
|
if (i2c_imx->need_set_pmuxcr == 1) {
|
||||||
|
@ -1069,10 +1070,9 @@ static int i2c_imx_recovery_for_layerscape(struct imx_i2c_struct *i2c_imx)
|
||||||
* I2C_IBSR[IBAL] = 1
|
* I2C_IBSR[IBAL] = 1
|
||||||
*/
|
*/
|
||||||
temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR);
|
temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR);
|
||||||
if (temp & I2SR_IAL) {
|
if (temp & I2SR_IAL)
|
||||||
temp &= ~I2SR_IAL;
|
i2c_imx_clr_al_bit(temp, i2c_imx);
|
||||||
imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR);
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user