p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] adv7842: mute audio before switching inputs to avoid noise/pops 

Signed-off-by: Mats Randgaard <matrandg@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mats Randgaard 2013-12-05 12:08:45 -03:00 committed by Mauro Carvalho Chehab
parent 7de6fab1fd
commit 5b64b20539
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/i2c/adv7842.c
View File

@ -20,10 +20,13 @@
/* /*
* References (c = chapter, p = page): * References (c = chapter, p = page):
* REF_01 - Analog devices, ADV7842, Register Settings Recommendations, * REF_01 - Analog devices, ADV7842,
* Revision 2.5, June 2010 * Register Settings Recommendations, Rev. 1.9, April 2011
* REF_02 - Analog devices, Software User Guide, UG-206, * REF_02 - Analog devices, Software User Guide, UG-206,
* ADV7842 I2C Register Maps, Rev. 0, November 2010 * ADV7842 I2C Register Maps, Rev. 0, November 2010
* REF_03 - Analog devices, Hardware User Guide, UG-214,
* ADV7842 Fast Switching 2:1 HDMI 1.4 Receiver with 3D-Comb
* Decoder and Digitizer , Rev. 0, January 2011
*/ */
@ -491,6 +494,11 @@ static inline int hdmi_write(struct v4l2_subdev *sd, u8 reg, u8 val)
return adv_smbus_write_byte_data(state->i2c_hdmi, reg, val); return adv_smbus_write_byte_data(state->i2c_hdmi, reg, val);
} }
static inline int hdmi_write_and_or(struct v4l2_subdev *sd, u8 reg, u8 mask, u8 val)
{
return hdmi_write(sd, reg, (hdmi_read(sd, reg) & mask) | val);
}
static inline int cp_read(struct v4l2_subdev *sd, u8 reg) static inline int cp_read(struct v4l2_subdev *sd, u8 reg)
{ {
struct adv7842_state *state = to_state(sd); struct adv7842_state *state = to_state(sd);
@ -1459,14 +1467,12 @@ static void enable_input(struct v4l2_subdev *sd)
case ADV7842_MODE_SDP: case ADV7842_MODE_SDP:
case ADV7842_MODE_COMP: case ADV7842_MODE_COMP:
case ADV7842_MODE_RGB: case ADV7842_MODE_RGB:
/* enable */
io_write(sd, 0x15, 0xb0); /* Disable Tristate of Pins (no audio) */ io_write(sd, 0x15, 0xb0); /* Disable Tristate of Pins (no audio) */
break; break;
case ADV7842_MODE_HDMI: case ADV7842_MODE_HDMI:
/* enable */
hdmi_write(sd, 0x1a, 0x0a); /* Unmute audio */
hdmi_write(sd, 0x01, 0x00); /* Enable HDMI clock terminators */ hdmi_write(sd, 0x01, 0x00); /* Enable HDMI clock terminators */
io_write(sd, 0x15, 0xa0); /* Disable Tristate of Pins */ io_write(sd, 0x15, 0xa0); /* Disable Tristate of Pins */
hdmi_write_and_or(sd, 0x1a, 0xef, 0x00); /* Unmute audio */
break; break;
default: default:
v4l2_dbg(2, debug, sd, "%s: Unknown mode %d\n", v4l2_dbg(2, debug, sd, "%s: Unknown mode %d\n",
@ -1477,9 +1483,9 @@ static void enable_input(struct v4l2_subdev *sd)
static void disable_input(struct v4l2_subdev *sd) static void disable_input(struct v4l2_subdev *sd)
{ {
/* disable */ hdmi_write_and_or(sd, 0x1a, 0xef, 0x10); /* Mute audio [REF_01, c. 2.2.2] */
msleep(16); /* 512 samples with >= 32 kHz sample rate [REF_03, c. 8.29] */
io_write(sd, 0x15, 0xbe); /* Tristate all outputs from video core */ io_write(sd, 0x15, 0xbe); /* Tristate all outputs from video core */
hdmi_write(sd, 0x1a, 0x1a); /* Mute audio */
hdmi_write(sd, 0x01, 0x78); /* Disable HDMI clock terminators */ hdmi_write(sd, 0x01, 0x78); /* Disable HDMI clock terminators */
} }
@ -2432,6 +2438,9 @@ static int adv7842_core_init(struct v4l2_subdev *sd)
pdata->replicate_av_codes << 1 | pdata->replicate_av_codes << 1 |
pdata->invert_cbcr << 0); pdata->invert_cbcr << 0);
/* HDMI audio */
hdmi_write_and_or(sd, 0x1a, 0xf1, 0x08); /* Wait 1 s before unmute */
/* Drive strength */ /* Drive strength */
io_write_and_or(sd, 0x14, 0xc0, pdata->drive_strength.data<<4 | io_write_and_or(sd, 0x14, 0xc0, pdata->drive_strength.data<<4 |
pdata->drive_strength.clock<<2 | pdata->drive_strength.clock<<2 |