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

Commit 122b5dbe authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4913): Fix broken TUNER_LG_NTSC_TAPE radio support 



The TUNER_LG_NTSC_TAPE is identical in all respects to the
TUNER_PHILIPS_FM1236_MK3. So use the params struct for the Philips tuner.
Also add this LG_NTSC_TAPE tuner to the switches where radio specific
parameters are set so it behaves like a TUNER_PHILIPS_FM1236_MK3. This
change fixes the radio support for this tuner (the wrong bandswitch byte
was used).
Thanks to Andy Walls <cwalls@radix.net> for finding this bug.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c8f5b2f5

drivers/media/video/tuner-simple.c

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static int tuner_stereo(struct i2c_client *c) 
		case TUNER_PHILIPS_FM1216ME_MK3:

		case TUNER_PHILIPS_FM1236_MK3:

		case TUNER_PHILIPS_FM1256_IH3:

		case TUNER_LG_NTSC_TAPE:

			stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);

			break;

		default:
@@ -421,6 +422,7 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq) 
	case TUNER_PHILIPS_FM1216ME_MK3:

	case TUNER_PHILIPS_FM1236_MK3:

	case TUNER_PHILIPS_FMD1216ME_MK3:

	case TUNER_LG_NTSC_TAPE:

		buffer[3] = 0x19;

		break;

	case TUNER_TNF_5335MF:

drivers/media/video/tuner-types.c

+2 −12
Original line number Diff line number Diff line
@@ -672,16 +672,6 @@ static struct tuner_params tuner_panasonic_vp27_params[] = { 
	},

};



/* ------------ TUNER_LG_NTSC_TAPE - LGINNOTEK NTSC ------------ */



static struct tuner_params tuner_lg_ntsc_tape_params[] = {

	{

		.type   = TUNER_PARAM_TYPE_NTSC,

		.ranges = tuner_fm1236_mk3_ntsc_ranges,

		.count  = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges),

	},

};



/* ------------ TUNER_TNF_8831BGFF - Philips PAL ------------ */



static struct tuner_range tuner_tnf_8831bgff_pal_ranges[] = {
@@ -1331,8 +1321,8 @@ struct tunertype tuners[] = { 
	},

	[TUNER_LG_NTSC_TAPE] = { /* LGINNOTEK NTSC */

		.name   = "LG NTSC (TAPE series)",

		.params = tuner_lg_ntsc_tape_params,

		.count  = ARRAY_SIZE(tuner_lg_ntsc_tape_params),

		.params = tuner_fm1236_mk3_params,

		.count  = ARRAY_SIZE(tuner_fm1236_mk3_params),

	},

	[TUNER_TNF_8831BGFF] = { /* Philips PAL */

		.name   = "Tenna TNF 8831 BGFF)",