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

Commit 84b27148 authored by istvan_v@mailbox.hu's avatar istvan_v@mailbox.hu Committed by Mauro Carvalho Chehab
Browse files

[media] cx88: notch filter control fixes 



This patch reduces the number of available choices for the notch filter type control
so that the standard-specific filter types cannot be selected. It is now limited to
being either 0 (4xFsc, the default) or 1 (square pixel optimized).
The patch also removes the initialization of this control from cx88_reset(), since
that is already done by init_controls(), which is called by cx8800_initdev().

Signed-off-by: default avatarIstvan Varga <istvan_v@mailbox.hu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2b50763a

drivers/media/video/cx88/cx88-core.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -636,9 +636,6 @@ int cx88_reset(struct cx88_core *core) 
	cx_write(MO_PCI_INTSTAT,   0xFFFFFFFF); // Clear PCI int

	cx_write(MO_PCI_INTSTAT,   0xFFFFFFFF); // Clear PCI int

	cx_write(MO_INT1_STAT,     0xFFFFFFFF); // Clear RISC int

	cx_write(MO_INT1_STAT,     0xFFFFFFFF); // Clear RISC int





	/* set default notch filter */

	cx_andor(MO_HTOTAL, 0x1800, (HLNotchFilter4xFsc << 11));



	/* Reset on-board parts */

	/* Reset on-board parts */

	cx_write(MO_SRST_IO, 0);

	cx_write(MO_SRST_IO, 0);

	msleep(10);

	msleep(10);

drivers/media/video/cx88/cx88-video.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -266,7 +266,7 @@ static const struct cx88_ctrl cx8800_ctls[] = { 
			.id            = V4L2_CID_BAND_STOP_FILTER,

			.id            = V4L2_CID_BAND_STOP_FILTER,

			.name          = "Notch filter",

			.name          = "Notch filter",

			.minimum       = 0,

			.minimum       = 0,

			.maximum       = 3,

			.maximum       = 1,

			.step          = 1,

			.step          = 1,

			.default_value = 0x0,

			.default_value = 0x0,

			.type          = V4L2_CTRL_TYPE_INTEGER,

			.type          = V4L2_CTRL_TYPE_INTEGER,