upstream: [media] adv7842: add drive strength enum and sync names with adv7604

Add a proper driver strength enum and use the same names in the platform
data as with adv7604.

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 cb1ec67..e224343 100644 (file)
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -2541,9 +2541,10 @@ static int adv7842_core_init(struct v4l2_subdev *sd)
        hdmi_write_and_or(sd, 0x1a, 0xf1, 0x08); /* Wait 1 s before unmute */
 
        /* Drive strength */
-       io_write_and_or(sd, 0x14, 0xc0, pdata->drive_strength.data<<4 |
-                       pdata->drive_strength.clock<<2 |
-                       pdata->drive_strength.sync);
+       io_write_and_or(sd, 0x14, 0xc0,
+                       pdata->dr_str_data << 4 |
+                       pdata->dr_str_clk << 2 |
+                       pdata->dr_str_sync);
 
        /* HDMI free run */
        cp_write_and_or(sd, 0xba, 0xfc, pdata->hdmi_free_run_enable |

diff --git a/include/media/adv7842.h b/include/media/adv7842.h
index d72a8a7..3932209 100644 (file)
--- a/include/media/adv7842.h
+++ b/include/media/adv7842.h
@@ -108,6 +108,13 @@ enum adv7842_select_input {
        ADV7842_SELECT_SDP_YC,
 };
 
+enum adv7842_drive_strength {
+       ADV7842_DR_STR_LOW = 0,
+       ADV7842_DR_STR_MEDIUM_LOW = 1,
+       ADV7842_DR_STR_MEDIUM_HIGH = 2,
+       ADV7842_DR_STR_HIGH = 3,
+};
+
 struct adv7842_sdp_csc_coeff {
        bool manual;
        uint16_t scaling;
@@ -186,11 +193,9 @@ struct adv7842_platform_data {
        unsigned output_bus_lsb_to_msb:1;
 
        /* IO register 0x14 */
-       struct {
-               unsigned data:2;
-               unsigned clock:2;
-               unsigned sync:2;
-       } drive_strength;
+       enum adv7842_drive_strength dr_str_data;
+       enum adv7842_drive_strength dr_str_clk;
+       enum adv7842_drive_strength dr_str_sync;
 
        /*
         * IO register 0x19: Adjustment to the LLC DLL phase in