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

Commit b34dddbe authored by Dmitry Belimov's avatar Dmitry Belimov Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7677): saa7134: Add/fix Beholder entries 



Beholder TV/FM tuners:

Changes:
     Add support Beholder Columbus PCMCIA card.
     Add key map for remote control of Beholder Columbus PCMCIA card.
     Fix gpiomask for all Beholder tuners.

Signed-off-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 8fb737b7

Documentation/video4linux/CARDLIST.saa7134

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
 24 -> KNC One TV-Station DVR                   [1894:a006]

 25 -> ASUS TV-FM 7133                          [1043:4843]

 26 -> Pinnacle PCTV Stereo (saa7134)           [11bd:002b]

 27 -> Manli MuchTV M-TV002/Behold TV 403 FM

 28 -> Manli MuchTV M-TV001/Behold TV 401

 27 -> Manli MuchTV M-TV002

 28 -> Manli MuchTV M-TV001

 29 -> Nagase Sangyo TransGear 3000TV           [1461:050c]

 30 -> Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)  [1019:4cb4]

 31 -> Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM) [1019:4cb5]

drivers/media/common/ir-keymaps.c

+70 −0
Original line number Diff line number Diff line
@@ -2043,6 +2043,76 @@ IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE] = { 


EXPORT_SYMBOL_GPL(ir_codes_behold);



/* Beholder Intl. Ltd. 2008

 * Dmitry Belimov d.belimov@google.com

 * Keytable is used by BeholdTV Columbus

 * The "ascii-art picture" below (in comments, first row

 * is the keycode in hex, and subsequent row(s) shows

 * the button labels (several variants when appropriate)

 * helps to descide which keycodes to assign to the buttons.

 */

IR_KEYTAB_TYPE ir_codes_behold_columbus[IR_KEYTAB_SIZE] = {



	/*  0x13   0x11   0x1C   0x12  *

	 *  Mute  Source  TV/FM  Power *

	 *                             */



	[0x13] = KEY_MUTE,

	[0x11] = KEY_PROPS,

	[0x1C] = KEY_TUNER,	/* KEY_TV/KEY_RADIO */

	[0x12] = KEY_POWER,



	/*  0x01    0x02    0x03  0x0D    *

	 *   1       2       3   Stereo   *

	 *                        	  *

	 *  0x04    0x05    0x06  0x19    *

	 *   4       5       6   Snapshot *

	 *                        	  *

	 *  0x07    0x08    0x09  0x10    *

	 *   7       8       9    Zoom 	  *

	 *                                */

	[0x01] = KEY_1,

	[0x02] = KEY_2,

	[0x03] = KEY_3,

	[0x0D] = KEY_SETUP,	  /* Setup key */

	[0x04] = KEY_4,

	[0x05] = KEY_5,

	[0x06] = KEY_6,

	[0x19] = KEY_BOOKMARKS, /* Snapshot key */

	[0x07] = KEY_7,

	[0x08] = KEY_8,

	[0x09] = KEY_9,

	[0x10] = KEY_ZOOM,



	/*  0x0A    0x00    0x0B       0x0C   *

	 * RECALL    0    ChannelUp  VolumeUp *

	 *                                    */

	[0x0A] = KEY_AGAIN,

	[0x00] = KEY_0,

	[0x0B] = KEY_CHANNELUP,

	[0x0C] = KEY_VOLUMEUP,



	/*   0x1B      0x1D      0x15        0x18     *

	 * Timeshift  Record  ChannelDown  VolumeDown *

	 *                                            */



	[0x1B] = KEY_REWIND,

	[0x1D] = KEY_RECORD,

	[0x15] = KEY_CHANNELDOWN,

	[0x18] = KEY_VOLUMEDOWN,



	/*   0x0E   0x1E     0x0F     0x1A  *

	 *   Stop   Pause  Previouse  Next  *

	 *                                  */



	[0x0E] = KEY_STOP,

	[0x1E] = KEY_PAUSE,

	[0x0F] = KEY_PREVIOUS,

	[0x1A] = KEY_NEXT,



};

EXPORT_SYMBOL_GPL(ir_codes_behold_columbus);



/*

 * Remote control for the Genius TVGO A11MCE

 * Adrian Pardini <pardo.bsso@gmail.com>

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

+72 −8
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "tuner-xc2028.h"

#include <media/v4l2-common.h>

#include <media/tveeprom.h>

#include "tea5767.h"



/* commly used strings */

static char name_mute[]    = "mute";
@@ -1049,7 +1050,7 @@ struct saa7134_board saa7134_boards[] = { 
	},

	[SAA7134_BOARD_MANLI_MTV002] = {

		/* Ognjen Nastic <ognjen@logosoft.ba> */

		.name           = "Manli MuchTV M-TV002/Behold TV 403 FM",

		.name           = "Manli MuchTV M-TV002",

		.audio_clock    = 0x00200000,

		.tuner_type     = TUNER_PHILIPS_PAL,

		.radio_type     = UNSET,
@@ -1076,7 +1077,7 @@ struct saa7134_board saa7134_boards[] = { 
	},

	[SAA7134_BOARD_MANLI_MTV001] = {

		/* Ognjen Nastic <ognjen@logosoft.ba> UNTESTED */

		.name           = "Manli MuchTV M-TV001/Behold TV 401",

		.name           = "Manli MuchTV M-TV001",

		.audio_clock    = 0x00200000,

		.tuner_type     = TUNER_PHILIPS_PAL,

		.radio_type     = UNSET,
@@ -2198,6 +2199,8 @@ struct saa7134_board saa7134_boards[] = { 
	},

	[SAA7134_BOARD_BEHOLD_409FM] = {

		/* <http://tuner.beholder.ru>, Sergey <skiv@orel.ru> */

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 409 FM",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
@@ -2205,6 +2208,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			  .name = name_tv,

			  .vmux = 3,
@@ -3576,12 +3580,15 @@ struct saa7134_board saa7134_boards[] = { 
		}},

	},

	[SAA7134_BOARD_BEHOLD_401] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 401",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FQ1216ME,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_svideo,

			.vmux = 8,
@@ -3602,12 +3609,15 @@ struct saa7134_board saa7134_boards[] = { 
		},

	},

	[SAA7134_BOARD_BEHOLD_403] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 403",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FQ1216ME,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_svideo,

			.vmux = 8,
@@ -3624,12 +3634,15 @@ struct saa7134_board saa7134_boards[] = { 
		}},

	},

	[SAA7134_BOARD_BEHOLD_403FM] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 403 FM",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FQ1216ME,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_svideo,

			.vmux = 8,
@@ -3650,6 +3663,8 @@ struct saa7134_board saa7134_boards[] = { 
		},

	},

	[SAA7134_BOARD_BEHOLD_405] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 405",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
@@ -3657,6 +3672,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_svideo,

			.vmux = 8,
@@ -3674,6 +3690,8 @@ struct saa7134_board saa7134_boards[] = { 
	},

	[SAA7134_BOARD_BEHOLD_405FM] = {

		/* Sergey <skiv@orel.ru> */

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 405 FM",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
@@ -3681,6 +3699,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_svideo,

			.vmux = 8,
@@ -3701,6 +3720,8 @@ struct saa7134_board saa7134_boards[] = { 
		},

	},

	[SAA7134_BOARD_BEHOLD_407] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name 		= "Beholder BeholdTV 407",

		.audio_clock 	= 0x00187de7,

		.tuner_type 	= TUNER_PHILIPS_FM1216ME_MK3,
@@ -3708,7 +3729,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr 	= ADDR_UNSET,

		.radio_addr 	= ADDR_UNSET,

		.tda9887_conf 	= TDA9887_PRESENT,

		.gpiomask = 0xc0c000,

		.gpiomask       = 0x00008000,

		.inputs = {{

			.name = name_svideo,

			.vmux = 8,
@@ -3728,6 +3749,8 @@ struct saa7134_board saa7134_boards[] = { 
		}},

	},

	[SAA7134_BOARD_BEHOLD_407FM] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name 		= "Beholder BeholdTV 407 FM",

		.audio_clock 	= 0x00187de7,

		.tuner_type 	= TUNER_PHILIPS_FM1216ME_MK3,
@@ -3735,7 +3758,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr 	= ADDR_UNSET,

		.radio_addr 	= ADDR_UNSET,

		.tda9887_conf 	= TDA9887_PRESENT,

		.gpiomask = 0xc0c000,

		.gpiomask       = 0x00008000,

		.inputs = {{

			.name = name_svideo,

			.vmux = 8,
@@ -3760,6 +3783,8 @@ struct saa7134_board saa7134_boards[] = { 
		},

	},

	[SAA7134_BOARD_BEHOLD_409] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 409",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
@@ -3767,6 +3792,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_tv,

			.vmux = 3,
@@ -3783,6 +3809,8 @@ struct saa7134_board saa7134_boards[] = { 
		}},

	},

	[SAA7134_BOARD_BEHOLD_505FM] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 505 FM/RDS",

		.audio_clock    = 0x00200000,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
@@ -3790,6 +3818,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_tv,

			.vmux = 3,
@@ -3814,6 +3843,8 @@ struct saa7134_board saa7134_boards[] = { 
		},

	},

	[SAA7134_BOARD_BEHOLD_507_9FM] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
@@ -3821,6 +3852,7 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x00008000,

		.inputs         = {{

			.name = name_tv,

			.vmux = 3,
@@ -3841,6 +3873,8 @@ struct saa7134_board saa7134_boards[] = { 
		},

	},

	[SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM] = {

		/*       Beholder Intl. Ltd. 2008      */

		/*Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV Columbus TVFM",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_ALPS_TSBE5_PAL,
@@ -3848,23 +3882,28 @@ struct saa7134_board saa7134_boards[] = { 
		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x000A8004,

		.inputs         = {{

			.name = name_tv,

			.vmux = 3,

			.amux = TV,

			.tv   = 1,

			.gpio = 0x000A8004,

		}, {

			.name = name_comp1,

			.vmux = 1,

			.amux = LINE1,

			.gpio = 0x000A8000,

		}, {

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE1,

			.gpio = 0x000A8000,

		} },

		.radio = {

			.name = name_radio,

			.amux = LINE2,

			.gpio = 0x000A8000,

		},

	},

	[SAA7134_BOARD_BEHOLD_607_9FM] = {
@@ -5471,7 +5510,6 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_AVERMEDIA_CARDBUS:

	case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:

	case SAA7134_BOARD_AVERMEDIA_M115:

	case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM:

	case SAA7134_BOARD_AVERMEDIA_A16D:

		/* power-down tuner chip */

		saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0xffffffff, 0);
@@ -5482,6 +5520,18 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
		saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0xffffffff);

		msleep(10);

		break;

	case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM:

		/* power-down tuner chip */

		saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x000A8004, 0x000A8004);

		saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x000A8004, 0);

		msleep(10);

		/* power-up tuner chip */

		saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x000A8004, 0x000A8004);

		saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x000A8004, 0x000A8004);

		msleep(10);

		/* remote via GPIO */

		dev->has_remote = SAA7134_REMOTE_GPIO;

		break;

	case SAA7134_BOARD_RTD_VFG7350:



		/*
@@ -5770,6 +5820,20 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
			break;

		}

		break;

	case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM:

		{

		struct v4l2_priv_tun_config tea5767_cfg;

		struct tea5767_ctrl ctl;



		dev->i2c_client.addr = 0xC0;

		/* set TEA5767(analog FM) defines */

		memset(&ctl, 0, sizeof(ctl));

		ctl.xtal_freq = TEA5767_HIGH_LO_13MHz;

		tea5767_cfg.tuner = TUNER_TEA5767;

		tea5767_cfg.priv  = &ctl;

		saa7134_i2c_call_clients(dev, TUNER_SET_CONFIG, &tea5767_cfg);

		}

		break;

	}



	if (dev->tuner_type == TUNER_XC2028) {

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

+12 −1
Original line number Diff line number Diff line
@@ -331,6 +331,11 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
		break;

	case SAA7134_BOARD_MANLI_MTV001:

	case SAA7134_BOARD_MANLI_MTV002:

		ir_codes     = ir_codes_manli;

		mask_keycode = 0x001f00;

		mask_keyup   = 0x004000;

		polling      = 50; /* ms */

		break;

	case SAA7134_BOARD_BEHOLD_409FM:

	case SAA7134_BOARD_BEHOLD_401:

	case SAA7134_BOARD_BEHOLD_403:
@@ -343,7 +348,13 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_BEHOLD_505FM:

	case SAA7134_BOARD_BEHOLD_507_9FM:

		ir_codes     = ir_codes_manli;

		mask_keycode = 0x001f00;

		mask_keycode = 0x003f00;

		mask_keyup   = 0x004000;

		polling      = 50; /* ms */

		break;

	case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM:

		ir_codes     = ir_codes_behold_columbus;

		mask_keycode = 0x003f00;

		mask_keyup   = 0x004000;

		polling      = 50; // ms

		break;

include/media/ir-common.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ extern IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE]; 
extern IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE];

extern IR_KEYTAB_TYPE ir_codes_fusionhdtv_mce[IR_KEYTAB_SIZE];

extern IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE];

extern IR_KEYTAB_TYPE ir_codes_behold_columbus[IR_KEYTAB_SIZE];

extern IR_KEYTAB_TYPE ir_codes_pinnacle_pctv_hd[IR_KEYTAB_SIZE];

extern IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE];

extern IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE];