lkml.org 
[lkml]   [2011]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/7 v2] i2c-eg20t: delete 10bit access processing
    Date
    Linux I2C core doesn't support 10bit access formally.
    Additionally, we can't test with 10bit mode.
    This patch deletes the 10bit access processing.

    Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
    ---
    drivers/i2c/busses/i2c-eg20t.c | 27 +++++++--------------------
    1 files changed, 7 insertions(+), 20 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
    index f8ccdec..c18210e 100644
    --- a/drivers/i2c/busses/i2c-eg20t.c
    +++ b/drivers/i2c/busses/i2c-eg20t.c
    @@ -387,8 +387,6 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
    u8 *buf;
    u32 length;
    u32 addr;
    - u32 addr_2_msb;
    - u32 addr_8_lsb;
    s32 wrcount;
    void __iomem *p = adap->pch_base_address;

    @@ -408,25 +406,16 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
    }

    if (msgs->flags & I2C_M_TEN) {
    - addr_2_msb = ((addr & I2C_MSB_2B_MSK) >> 7);
    - iowrite32(addr_2_msb | TEN_BIT_ADDR_MASK, p + PCH_I2CDR);
    - if (first)
    - pch_i2c_start(adap);
    - if (pch_i2c_wait_for_xfer_complete(adap) == 0 &&
    - pch_i2c_getack(adap) == 0) {
    - addr_8_lsb = (addr & I2C_ADDR_MSK);
    - iowrite32(addr_8_lsb, p + PCH_I2CDR);
    - } else {
    - pch_i2c_stop(adap);
    - return -ETIME;
    - }
    + pch_err(adap, "10Bit access is not supported\n");
    + return -EINVAL;
    } else {
    /* set 7 bit slave address and R/W bit as 0 */
    iowrite32(addr << 1, p + PCH_I2CDR);
    - if (first)
    - pch_i2c_start(adap);
    }

    + if (first)
    + pch_i2c_start(adap);
    +
    if ((pch_i2c_wait_for_xfer_complete(adap) == 0) &&
    (pch_i2c_getack(adap) == 0)) {
    for (wrcount = 0; wrcount < length; ++wrcount) {
    @@ -495,7 +484,6 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
    u32 count;
    u32 length;
    u32 addr;
    - u32 addr_2_msb;
    void __iomem *p = adap->pch_base_address;

    length = msgs->len;
    @@ -511,9 +499,8 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
    }

    if (msgs->flags & I2C_M_TEN) {
    - addr_2_msb = (((addr & I2C_MSB_2B_MSK) >> 7) | (I2C_RD));
    - iowrite32(addr_2_msb | TEN_BIT_ADDR_MASK, p + PCH_I2CDR);
    -
    + pch_err(adap, "10Bit access is not supported\n");
    + return -EINVAL;
    } else {
    /* 7 address bits + R/W bit */
    addr = (((addr) << 1) | (I2C_RD));
    --
    1.7.6.4


    \
     
     \ /
      Last update: 2011-10-05 06:21    [W:0.022 / U:0.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site