Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bb5bafa authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] tda9840: fix setting of the audio mode 



You have to first detect the current rxsubchans (mono, stereo or bilingual),
and depending on that you can set the audio mode. It does not automatically
switch when the audio channels change.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aaab4951

drivers/media/video/tda9840.c

+44 −31
Original line number Diff line number Diff line
@@ -66,30 +66,54 @@ static void tda9840_write(struct v4l2_subdev *sd, u8 reg, u8 val) 
				val, reg);

}



static int tda9840_status(struct v4l2_subdev *sd)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	u8 byte;



	if (1 != i2c_master_recv(client, &byte, 1)) {

		v4l2_dbg(1, debug, sd,

			"i2c_master_recv() failed\n");

		return -EIO;

	}



	if (byte & 0x80) {

		v4l2_dbg(1, debug, sd,

			"TDA9840_DETECT: register contents invalid\n");

		return -EINVAL;

	}



	v4l2_dbg(1, debug, sd, "TDA9840_DETECT: byte: 0x%02x\n", byte);

	return byte & 0x60;

}



static int tda9840_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *t)

{

	int stat = tda9840_status(sd);

	int byte;



	if (t->index)

		return -EINVAL;



	stat = stat < 0 ? 0 : stat;

	if (stat == 0 || stat == 0x60) /* mono input */

		byte = TDA9840_SET_MONO;

	else if (stat == 0x40) /* stereo input */

		byte = (t->audmode == V4L2_TUNER_MODE_MONO) ?

			TDA9840_SET_MONO : TDA9840_SET_STEREO;

	else { /* bilingual */

		switch (t->audmode) {

	case V4L2_TUNER_MODE_STEREO:

		byte = TDA9840_SET_STEREO;

		break;

		case V4L2_TUNER_MODE_LANG1_LANG2:

			byte = TDA9840_SET_BOTH;

			break;

	case V4L2_TUNER_MODE_LANG1:

		byte = TDA9840_SET_LANG1;

		break;

		case V4L2_TUNER_MODE_LANG2:

			byte = TDA9840_SET_LANG2;

			break;

		default:

		byte = TDA9840_SET_MONO;

			byte = TDA9840_SET_LANG1;

			break;

		}

	}

	v4l2_dbg(1, debug, sd, "TDA9840_SWITCH: 0x%02x\n", byte);

	tda9840_write(sd, SWITCH, byte);

	return 0;
@@ -97,25 +121,14 @@ static int tda9840_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *t) 


static int tda9840_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *t)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	u8 byte;

	int stat = tda9840_status(sd);



	t->rxsubchans = V4L2_TUNER_SUB_MONO;

	if (1 != i2c_master_recv(client, &byte, 1)) {

		v4l2_dbg(1, debug, sd,

			"i2c_master_recv() failed\n");

		return -EIO;

	}



	if (byte & 0x80) {

		v4l2_dbg(1, debug, sd,

			"TDA9840_DETECT: register contents invalid\n");

		return -EINVAL;

	}

	if (stat < 0)

		return stat;



	v4l2_dbg(1, debug, sd, "TDA9840_DETECT: byte: 0x%02x\n", byte);

	t->rxsubchans = V4L2_TUNER_SUB_MONO;



	switch (byte & 0x60) {

	switch (stat & 0x60) {

	case 0x00:

		t->rxsubchans = V4L2_TUNER_SUB_MONO;

		break;