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

Commit 52ce27bf authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8466): cx23885: Bugfix - DVB Transport cards using DVB port VIDB/TS1 did not stream. 



Certain DVB cards that have demodulators on TS1/VIDB were not streaming packets.
This ensure the pin directions on PAD_CTRL are set correctly, solving the issue.

Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ecda5966

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

+16 −2
Original line number Original line Diff line number Diff line
@@ -1084,7 +1084,21 @@ static int cx23885_start_dma(struct cx23885_tsport *port, 
	cx_write(port->reg_gpcnt_ctl, 3);

	cx_write(port->reg_gpcnt_ctl, 3);

	q->count = 1;

	q->count = 1;





	if (cx23885_boards[dev->board].portb & CX23885_MPEG_ENCODER) {

	/* Set VIDB pins to input */

	if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) {

		reg = cx_read(PAD_CTRL);

		reg &= ~0x3; /* Clear TS1_OE & TS1_SOP_OE */

		cx_write(PAD_CTRL, reg);

	}



	/* Set VIDC pins to input */

	if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB) {

		reg = cx_read(PAD_CTRL);

		reg &= ~0x4; /* Clear TS2_SOP_OE */

		cx_write(PAD_CTRL, reg);

	}



	if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER) {





		reg = cx_read(PAD_CTRL);

		reg = cx_read(PAD_CTRL);

		reg = reg & ~0x1;    /* Clear TS1_OE */

		reg = reg & ~0x1;    /* Clear TS1_OE */
@@ -1134,7 +1148,7 @@ static int cx23885_stop_dma(struct cx23885_tsport *port) 
	cx_clear(port->reg_ts_int_msk, port->ts_int_msk_val);

	cx_clear(port->reg_ts_int_msk, port->ts_int_msk_val);

	cx_clear(port->reg_dma_ctl, port->dma_ctl_val);

	cx_clear(port->reg_dma_ctl, port->dma_ctl_val);





	if (cx23885_boards[dev->board].portb & CX23885_MPEG_ENCODER) {

	if (cx23885_boards[dev->board].portb == CX23885_MPEG_ENCODER) {





		reg = cx_read(PAD_CTRL);

		reg = cx_read(PAD_CTRL);