Commit 586b0cab authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: tuner improvements 



*tuner-core.c:
- some tuner_info msgs will be generated only if insmod opt
        tuner_debug enabled.
- Implemented tuner-core support for VIDIO_S_TUNER to allow
        changing mono/stereo mode
- Remove unneeded config options.
- I2C_CLIENT_MULTI option removed.
- support for Philips FMD12ME hybrid tuner
- allow to initialize with another tuner
- Move PHILIPS_FMD initialization code to set_type function,

* tda8290:

- Fix dumb error in tda8290 tunning.
- Radio tuner uses high-precision step instead of 62.5 KHz.

*tea5767.c:
- tuner_info msgs will be generated only if insmod tuner option
        tuner_debug enabled.
- some cleanups for better reading.
- Radio tuner uses high-precision step instead of 62.5 KHz.
- Changing radio mode stereo/mono for tea5767 working.

*tuner-simple.c:
- TNF9533-D/IF UHF fixup.
- Radio tuners now uses high-precision step instead of 62.5 KHz.

*mt20xx.c:
        - Radio tuner uses high-precision step instead of 62.5 KHz.

*tda9887.c:
        - tab and blank spaces corrections.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarGerd Knorr <kraxel@bytesex.org>
Signed-off-by: default avatarNickolay V Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 96b6aba0

drivers/media/video/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,7 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ 
zoran-objs      :=	zr36120.o zr36120_i2c.o zr36120_mem.o

zoran-objs      :=	zr36120.o zr36120_i2c.o zr36120_mem.o

zr36067-objs	:=	zoran_procfs.o zoran_device.o \

zr36067-objs	:=	zoran_procfs.o zoran_device.o \

			zoran_driver.o zoran_card.o

			zoran_driver.o zoran_card.o

tuner-objs	:=	tuner-core.o tuner-simple.o mt20xx.o tda8290.o

tuner-objs	:=	tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o



obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o

obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o





obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \

obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \

drivers/media/video/mt20xx.c

+3 −3
Original line number Original line Diff line number Diff line 
/*

/*

 * $Id: mt20xx.c,v 1.4 2005/03/04 09:24:56 kraxel Exp $

 * $Id: mt20xx.c,v 1.5 2005/06/16 08:29:49 nsh Exp $

 *

 *

 * i2c tv tuner chip device driver

 * i2c tv tuner chip device driver

 * controls microtune tuners, mt2032 + mt2050 at the moment.

 * controls microtune tuners, mt2032 + mt2050 at the moment.
@@ -295,7 +295,7 @@ static void mt2032_set_radio_freq(struct i2c_client *c, unsigned int freq) 
	int if2 = t->radio_if2;

	int if2 = t->radio_if2;





	// per Manual for FM tuning: first if center freq. 1085 MHz

	// per Manual for FM tuning: first if center freq. 1085 MHz

        mt2032_set_if_freq(c, freq*62500 /* freq*1000*1000/16 */,

        mt2032_set_if_freq(c, freq * 1000 / 16,

			      1085*1000*1000,if2,if2,if2);

			      1085*1000*1000,if2,if2,if2);

}

}

drivers/media/video/tda8290.c

+14 −6
Original line number Original line Diff line number Diff line 
/*

/*

 * $Id: tda8290.c,v 1.7 2005/03/07 12:01:51 kraxel Exp $

 * $Id: tda8290.c,v 1.11 2005/06/18 06:09:06 nsh Exp $

 *

 *

 * i2c tv tuner chip device driver

 * i2c tv tuner chip device driver

 * controls the philips tda8290+75 tuner chip combo.

 * controls the philips tda8290+75 tuner chip combo.
@@ -69,7 +69,7 @@ static __u8 get_freq_entry( struct freq_entry* table, __u16 freq) 
static unsigned char i2c_enable_bridge[2] = 	{ 0x21, 0xC0 };

static unsigned char i2c_enable_bridge[2] = 	{ 0x21, 0xC0 };

static unsigned char i2c_disable_bridge[2] = 	{ 0x21, 0x80 };

static unsigned char i2c_disable_bridge[2] = 	{ 0x21, 0x80 };

static unsigned char i2c_init_tda8275[14] = 	{ 0x00, 0x00, 0x00, 0x00,

static unsigned char i2c_init_tda8275[14] = 	{ 0x00, 0x00, 0x00, 0x00,

						  0x7C, 0x04, 0xA3, 0x3F,

						  0xfC, 0x04, 0xA3, 0x3F,

						  0x2A, 0x04, 0xFF, 0x00,

						  0x2A, 0x04, 0xFF, 0x00,

						  0x00, 0x40 };

						  0x00, 0x40 };

static unsigned char i2c_set_VS[2] = 		{ 0x30, 0x6F };

static unsigned char i2c_set_VS[2] = 		{ 0x30, 0x6F };
@@ -138,16 +138,24 @@ static int tda8290_tune(struct i2c_client *c) 




static void set_frequency(struct tuner *t, u16 ifc)

static void set_frequency(struct tuner *t, u16 ifc)

{

{

	u32 N = (((t->freq<<3)+ifc)&0x3fffc);

	u32 freq;

	u32 N;





	N = N >> get_freq_entry(div_table, t->freq);

	if (t->mode == V4L2_TUNER_RADIO)

		freq = t->freq / 1000;

	else

		freq = t->freq;



	N = (((freq<<3)+ifc)&0x3fffc);



	N = N >> get_freq_entry(div_table, freq);

	t->i2c_set_freq[0] = 0;

	t->i2c_set_freq[0] = 0;

	t->i2c_set_freq[1] = (unsigned char)(N>>8);

	t->i2c_set_freq[1] = (unsigned char)(N>>8);

	t->i2c_set_freq[2] = (unsigned char) N;

	t->i2c_set_freq[2] = (unsigned char) N;

	t->i2c_set_freq[3] = 0x40;

	t->i2c_set_freq[3] = 0x40;

	t->i2c_set_freq[4] = 0x52;

	t->i2c_set_freq[4] = 0x52;

	t->i2c_set_freq[5] = get_freq_entry(band_table, t->freq);

	t->i2c_set_freq[5] = get_freq_entry(band_table, freq);

	t->i2c_set_freq[6] = get_freq_entry(agc_table,  t->freq);

	t->i2c_set_freq[6] = get_freq_entry(agc_table,  freq);

	t->i2c_set_freq[7] = 0x8f;

	t->i2c_set_freq[7] = 0x8f;

}

}

drivers/media/video/tda9887.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -566,7 +566,6 @@ static int tda9887_configure(struct tda9887 *t) 
	if (UNSET != t->pinnacle_id) {

	if (UNSET != t->pinnacle_id) {

		tda9887_set_pinnacle(t,buf);

		tda9887_set_pinnacle(t,buf);

	}

	}



	tda9887_set_config(t,buf);

	tda9887_set_config(t,buf);

	tda9887_set_insmod(t,buf);

	tda9887_set_insmod(t,buf);

drivers/media/video/tea5767.c

0 → 100644
+334 −0
Original line number Original line Diff line number Diff line 
/*

 * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview

 * I2C address is allways 0xC0.

 *

 * $Id: tea5767.c,v 1.11 2005/06/21 15:40:33 mchehab Exp $

 *

 * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)

 * This code is placed under the terms of the GNU General Public License

 *

 * tea5767 autodetection thanks to Torsten Seeboth and Atsushi Nakagawa

 * from their contributions on DScaler.

 */



#include <linux/module.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/string.h>

#include <linux/timer.h>

#include <linux/delay.h>

#include <linux/errno.h>

#include <linux/slab.h>

#include <linux/videodev.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>



#include <media/tuner.h>



/* Declared at tuner-core.c */

extern unsigned int tuner_debug;



#define PREFIX "TEA5767 "



/*****************************************************************************/



/******************************

 * Write mode register values *

 ******************************/



/* First register */

#define TEA5767_MUTE		0x80 /* Mutes output */

#define TEA5767_SEARCH		0x40 /* Activates station search */

/* Bits 0-5 for divider MSB */



/* Second register */

/* Bits 0-7 for divider LSB */



/* Third register */



/* Station search from botton to up */

#define TEA5767_SEARCH_UP	0x80



/* Searches with ADC output = 10 */

#define TEA5767_SRCH_HIGH_LVL	0x60



/* Searches with ADC output = 10 */

#define TEA5767_SRCH_MID_LVL	0x40



/* Searches with ADC output = 5 */

#define TEA5767_SRCH_LOW_LVL	0x20



/* if on, div=4*(Frf+Fif)/Fref otherwise, div=4*(Frf-Fif)/Freq) */

#define TEA5767_HIGH_LO_INJECT	0x10



/* Disable stereo */

#define TEA5767_MONO		0x08



/* Disable right channel and turns to mono */

#define TEA5767_MUTE_RIGHT	0x04



/* Disable left channel and turns to mono */

#define TEA5767_MUTE_LEFT	0x02



#define TEA5767_PORT1_HIGH	0x01



/* Forth register */

#define TEA5767_PORT2_HIGH	0x80

/* Chips stops working. Only I2C bus remains on */

#define TEA5767_STDBY		0x40



/* Japan freq (76-108 MHz. If disabled, 87.5-108 MHz */

#define TEA5767_JAPAN_BAND	0x20



/* Unselected means 32.768 KHz freq as reference. Otherwise Xtal at 13 MHz */

#define TEA5767_XTAL_32768	0x10



/* Cuts weak signals */

#define TEA5767_SOFT_MUTE	0x08



/* Activates high cut control */

#define TEA5767_HIGH_CUT_CTRL	0x04



/* Activates stereo noise control */

#define TEA5767_ST_NOISE_CTL	0x02



/* If activate PORT 1 indicates SEARCH or else it is used as PORT1 */

#define TEA5767_SRCH_IND	0x01



/* Fiveth register */



/* By activating, it will use Xtal at 13 MHz as reference for divider */

#define TEA5767_PLLREF_ENABLE	0x80



/* By activating, deemphasis=50, or else, deemphasis of 50us */

#define TEA5767_DEEMPH_75	0X40



/*****************************

 * Read mode register values *

 *****************************/



/* First register */

#define TEA5767_READY_FLAG_MASK	0x80

#define TEA5767_BAND_LIMIT_MASK	0X40

/* Bits 0-5 for divider MSB after search or preset */



/* Second register */

/* Bits 0-7 for divider LSB after search or preset */



/* Third register */

#define TEA5767_STEREO_MASK	0x80

#define TEA5767_IF_CNTR_MASK	0x7f



/* Four register */

#define TEA5767_ADC_LEVEL_MASK	0xf0



/* should be 0 */

#define TEA5767_CHIP_ID_MASK	0x0f



/* Fiveth register */

/* Reserved for future extensions */

#define TEA5767_RESERVED_MASK	0xff



/*****************************************************************************/



static void set_tv_freq(struct i2c_client *c, unsigned int freq)

{

	struct tuner *t = i2c_get_clientdata(c);



	tuner_warn("This tuner doesn't support TV freq.\n");

}



static void tea5767_status_dump(unsigned char *buffer)

{

	unsigned int div, frq;



	if (TEA5767_READY_FLAG_MASK & buffer[0])

		printk(PREFIX "Ready Flag ON\n");

	else

		printk(PREFIX "Ready Flag OFF\n");



	if (TEA5767_BAND_LIMIT_MASK & buffer[0])

		printk(PREFIX "Tuner at band limit\n");

	else

		printk(PREFIX "Tuner not at band limit\n");



	div=((buffer[0]&0x3f)<<8) | buffer[1];



	switch (TEA5767_HIGH_LO_32768) {

	case TEA5767_HIGH_LO_13MHz:

		frq = 1000*(div*50-700-225)/4; /* Freq in KHz */

		break;

	case TEA5767_LOW_LO_13MHz:

		frq = 1000*(div*50+700+225)/4; /* Freq in KHz */

		break;

	case TEA5767_LOW_LO_32768:

		frq = 1000*(div*32768/1000+700+225)/4; /* Freq in KHz */

		break;

	case TEA5767_HIGH_LO_32768:

	default:

		frq = 1000*(div*32768/1000-700-225)/4; /* Freq in KHz */

		break;

	}

        buffer[0] = (div>>8) & 0x3f;

        buffer[1] = div      & 0xff;



	printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",

						frq/1000,frq%1000,div);



	if (TEA5767_STEREO_MASK & buffer[2])

		printk(PREFIX "Stereo\n");

	else

		printk(PREFIX "Mono\n");



	printk(PREFIX "IF Counter = %d\n",buffer[2] & TEA5767_IF_CNTR_MASK);



	printk(PREFIX "ADC Level = %d\n",(buffer[3] & TEA5767_ADC_LEVEL_MASK)>>4);



	printk(PREFIX "Chip ID = %d\n",(buffer[3] & TEA5767_CHIP_ID_MASK));



	printk(PREFIX "Reserved = 0x%02x\n",(buffer[4] & TEA5767_RESERVED_MASK));

}



/* Freq should be specifyed at 62.5 Hz */

static void set_radio_freq(struct i2c_client *c, unsigned int frq)

{

	struct tuner *t = i2c_get_clientdata(c);

        unsigned char buffer[5];

	unsigned div;

	int rc;



	if ( tuner_debug )

		printk(PREFIX "radio freq counter %d\n",frq);



	/* Rounds freq to next decimal value - for 62.5 KHz step */

	/* frq = 20*(frq/16)+radio_frq[frq%16]; */



	buffer[2] = TEA5767_PORT1_HIGH;

	buffer[3] = TEA5767_PORT2_HIGH | TEA5767_HIGH_CUT_CTRL | TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND;

	buffer[4]=0;



	if (t->audmode == V4L2_TUNER_MODE_MONO) {

		tuner_dbg("TEA5767 set to mono\n");

		buffer[2] |= TEA5767_MONO;

	} else

 		tuner_dbg("TEA5767 set to stereo\n");



	switch (t->type) {

	case TEA5767_HIGH_LO_13MHz:

		tuner_dbg("TEA5767 radio HIGH LO inject xtal @ 13 MHz\n");

		buffer[2] |= TEA5767_HIGH_LO_INJECT;

		buffer[4] |= TEA5767_PLLREF_ENABLE;

		div = (frq*4/16+700+225+25)/50;

		break;

	case TEA5767_LOW_LO_13MHz:

		tuner_dbg("TEA5767 radio LOW LO inject xtal @ 13 MHz\n");



		buffer[4] |= TEA5767_PLLREF_ENABLE;

		div = (frq*4/16-700-225+25)/50;

		break;

	case TEA5767_LOW_LO_32768:

		tuner_dbg("TEA5767 radio LOW LO inject xtal @ 32,768 MHz\n");

		buffer[3] |= TEA5767_XTAL_32768;

		/* const 700=4000*175 Khz - to adjust freq to right value */

		div = (1000*(frq*4/16-700-225)+16384)>>15;

		break;

	case TEA5767_HIGH_LO_32768:

	default:

		tuner_dbg("TEA5767 radio HIGH LO inject xtal @ 32,768 MHz\n");



		buffer[2] |= TEA5767_HIGH_LO_INJECT;

		buffer[3] |= TEA5767_XTAL_32768;

		div = (1000*(frq*4/16+700+225)+16384)>>15;

		break;

	}

        buffer[0] = (div>>8) & 0x3f;

        buffer[1] = div      & 0xff;



	if ( tuner_debug )

		tea5767_status_dump(buffer);



        if (5 != (rc = i2c_master_send(c,buffer,5)))

		tuner_warn("i2c i/o error: rc == %d (should be 5)\n",rc);

}



static int tea5767_signal(struct i2c_client *c)

{

	unsigned char buffer[5];

	int rc;

	struct tuner *t = i2c_get_clientdata(c);



	memset(buffer,0,sizeof(buffer));

        if (5 != (rc = i2c_master_recv(c,buffer,5)))

                tuner_warn ( "i2c i/o error: rc == %d (should be 5)\n",rc);



	return ((buffer[3] & TEA5767_ADC_LEVEL_MASK) <<(13-4));

}



static int tea5767_stereo(struct i2c_client *c)

{

	unsigned char buffer[5];

	int rc;

	struct tuner *t = i2c_get_clientdata(c);



	memset(buffer,0,sizeof(buffer));

        if (5 != (rc = i2c_master_recv(c,buffer,5)))

                tuner_warn ( "i2c i/o error: rc == %d (should be 5)\n",rc);



	rc = buffer[2] & TEA5767_STEREO_MASK;



	if ( tuner_debug )

		tuner_dbg("TEA5767 radio ST GET = %02x\n", rc);



	return ( (buffer[2] & TEA5767_STEREO_MASK) ? V4L2_TUNER_SUB_STEREO: 0);

}



int tea_detection(struct i2c_client *c)

{

	unsigned char buffer[5]= { 0xff, 0xff, 0xff, 0xff, 0xff };

	int rc;

	struct tuner *t = i2c_get_clientdata(c);



        if (5 != (rc = i2c_master_recv(c,buffer,5))) {

                tuner_warn ( "it is not a TEA5767. Received %i chars.\n",rc );

		return EINVAL;

	}



	/* If all bytes are the same then it's a TV tuner and not a tea5767 chip. */

	if (buffer[0] == buffer[1] &&  buffer[0] == buffer[2] &&

	    buffer[0] == buffer[3] &&  buffer[0] == buffer[4]) {

                tuner_warn ( "All bytes are equal. It is not a TEA5767\n" );

		return EINVAL;

	}



	/*  Status bytes:

	 *  Byte 4: bit 3:1 : CI (Chip Identification) == 0

	 *	    bit 0   : internally set to 0

	 *  Byte 5: bit 7:0 : == 0

	 */



	if (!((buffer[3] & 0x0f) == 0x00) && (buffer[4] == 0x00)) {

                tuner_warn ( "Chip ID is not zero. It is not a TEA5767\n" );

		return EINVAL;

	}

	tuner_warn ( "TEA5767 detected.\n" );

	return 0;

}



int tea5767_tuner_init(struct i2c_client *c)

{

	struct tuner *t = i2c_get_clientdata(c);



	if (tea_detection(c)==EINVAL) return EINVAL;



        tuner_info("type set to %d (%s)\n",

                   t->type, TEA5767_TUNER_NAME);

        strlcpy(c->name, TEA5767_TUNER_NAME, sizeof(c->name));



	t->tv_freq    = set_tv_freq;

	t->radio_freq = set_radio_freq;

	t->has_signal = tea5767_signal;

	t->is_stereo  = tea5767_stereo;



	return (0);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE