lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 078/142] [media] adv7604: fix tx 5v detect regression
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Hans Verkuil <hansverk@cisco.com>

    commit 0ba4581c84cfb39fd527f6b3457f1c97f6356c04 upstream.

    The 5 volt detect functionality broke in 3.14: the code reads IO register 0x70
    again after it has already been cleared. Instead it should use the cached
    irq_reg_0x70 value and the io_write to 0x71 to clear 0x70 can be dropped since
    this has already been done.

    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    [ luis: backported to 3.16: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/media/i2c/adv7604.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
    index 67403b94f0a2..f70cdea2fcc1 100644
    --- a/drivers/media/i2c/adv7604.c
    +++ b/drivers/media/i2c/adv7604.c
    @@ -1981,10 +1981,9 @@ static int adv7604_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
    }

    /* tx 5v detect */
    - tx_5v = io_read(sd, 0x70) & info->cable_det_mask;
    + tx_5v = irq_reg_0x70 & info->cable_det_mask;
    if (tx_5v) {
    v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v);
    - io_write(sd, 0x71, tx_5v);
    adv7604_s_detect_tx_5v_ctrl(sd);
    if (handled)
    *handled = true;
    \
     
     \ /
      Last update: 2016-03-22 12:41    [W:2.616 / U:0.624 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site