upstream: [media] adv7842: platform-data for Hotplug Active (HPA) manual/auto

This applies to HDMI-map register 0x69.
So far we have been using HPA manual mode.
This way we had control of HPA which could be
set after EDID had been programmed.

Using a Mac Mini with mini-displayport to DVI-D converter as source
caused the adv7842 to lock up and fail to detect any further signals.

After experimenting with different configurations it was found that
using the HPA auto mode and in addition letting RX-termination
be controlled by HPA prevented this error from occuring.

I was not able to re-create this problem on the adv7604.

Signed-off-by: Martin Bugge <marbugge@cisco.com>
Cc: Mats Randgaard <matrandg@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index db33ea7..1105e5d 100644 (file)
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -2693,9 +2693,15 @@ static int adv7842_core_init(struct v4l2_subdev *sd)
        /* disable I2C access to internal EDID ram from HDMI DDC ports */
        rep_write_and_or(sd, 0x77, 0xf3, 0x00);
 
-       hdmi_write(sd, 0x69, 0xa3); /* HPA manual */
-       /* HPA disable on port A and B */
-       io_write_and_or(sd, 0x20, 0xcf, 0x00);
+       if (pdata->hpa_auto) {
+               /* HPA auto, HPA 0.5s after Edid set and Cable detect */
+               hdmi_write(sd, 0x69, 0x5c);
+       } else {
+               /* HPA manual */
+               hdmi_write(sd, 0x69, 0xa3);
+               /* HPA disable on port A and B */
+               io_write_and_or(sd, 0x20, 0xcf, 0x00);
+       }
 
        /* LLC */
        io_write(sd, 0x19, 0x80 | pdata->llc_dll_phase);

diff --git a/include/media/adv7842.h b/include/media/adv7842.h
index 3932209..924cbb8 100644 (file)
--- a/include/media/adv7842.h
+++ b/include/media/adv7842.h
@@ -220,6 +220,9 @@ struct adv7842_platform_data {
        unsigned sdp_free_run_cbar_en:1;
        unsigned sdp_free_run_force:1;
 
+       /* HPA manual (0) or auto (1), affects HDMI register 0x69 */
+       unsigned hpa_auto:1;
+
        struct adv7842_sdp_csc_coeff sdp_csc_coeff;
 
        struct adv7842_sdp_io_sync_adjustment sdp_io_sync_625;