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

Commit 17a05ef3 authored by Nickolay's avatar Nickolay Committed by Linus Torvalds
Browse files

[PATCH] v4l: 665: fix for problem with audio register setup via dsp access 



- Fix for problem with audio register setup via DSP access

Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e222f834

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

+15 −8
Original line number Diff line number Diff line
@@ -646,14 +646,6 @@ static int saa7134_hwinit1(struct saa7134_dev *dev) 
		saa7134_ts_init1(dev);

	saa7134_input_init1(dev);



	switch (dev->pci->device) {

	case PCI_DEVICE_ID_PHILIPS_SAA7134:

	case PCI_DEVICE_ID_PHILIPS_SAA7133:

	case PCI_DEVICE_ID_PHILIPS_SAA7135:

		saa7134_oss_init1(dev);

		break;

	}



	/* RAM FIFO config */

	saa_writel(SAA7134_FIFO_SIZE, 0x08070503);

	saa_writel(SAA7134_THRESHOULD,0x02020202);
@@ -668,6 +660,21 @@ static int saa7134_hwinit1(struct saa7134_dev *dev) 
		   SAA7134_MAIN_CTRL_ESFE  |

		   SAA7134_MAIN_CTRL_EBDAC);



	/*

	 * Initialize OSS _after_ enabling audio clock PLL and audio processing.

	 * OSS initialization writes to registers via the audio DSP; these

	 * writes will fail unless the audio clock has been started.  At worst,

	 * audio will not work.

	 */



	switch (dev->pci->device) {

	case PCI_DEVICE_ID_PHILIPS_SAA7134:

	case PCI_DEVICE_ID_PHILIPS_SAA7133:

	case PCI_DEVICE_ID_PHILIPS_SAA7135:

		saa7134_oss_init1(dev);

		break;

	}



	/* enable peripheral devices */

	saa_writeb(SAA7134_SPECIAL_MODE, 0x01);