[media] Add support for KWorld PC150-U ATSC hybrid tuner card (25fa2071) · Commits · jan.koester / Linux

Documentation/dvb/cards.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,4 +119,5 @@ o Cards based on the Phillips saa7134 PCI bridge:
		- Compro Videomate DVB-T300
		- Compro Videomate DVB-T200
		- AVerMedia AVerTVHD MCE A180
		- KWorld PC150-U ATSC Hybrid

drivers/media/rc/keymaps/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
		rc-it913x-v2.o \
		rc-kaiomy.o \
		rc-kworld-315u.o \
		rc-kworld-pc150u.o \
		rc-kworld-plus-tv-analog.o \
		rc-leadtek-y04g0051.o \
		rc-lirc.o \

drivers/media/rc/keymaps/rc-kworld-pc150u.c

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		/* kworld-pc150u.c - Keytable for kworld_pc150u Remote Controller
		*
		* keymap imported from ir-keymaps.c
		*
		* Copyright (c) 2010 by Kyle Strickland
		* (based on kworld-plus-tv-analog.c by
		* Mauro Carvalho Chehab <mchehab@redhat.com>)
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*/

		#include <media/rc-map.h>
		#include <linux/module.h>

		/* Kworld PC150-U
		Kyle Strickland <kyle@kyle.strickland.name>
		*/

		static struct rc_map_table kworld_pc150u[] = {
		{ 0x0c, KEY_MEDIA }, /* Kworld key */
		{ 0x16, KEY_EJECTCLOSECD }, /* -> ) */
		{ 0x1d, KEY_POWER2 },

		{ 0x00, KEY_1 },
		{ 0x01, KEY_2 },
		{ 0x02, KEY_3 },
		{ 0x03, KEY_4 },
		{ 0x04, KEY_5 },
		{ 0x05, KEY_6 },
		{ 0x06, KEY_7 },
		{ 0x07, KEY_8 },
		{ 0x08, KEY_9 },
		{ 0x0a, KEY_0 },

		{ 0x09, KEY_AGAIN },
		{ 0x14, KEY_MUTE },

		{ 0x1e, KEY_LAST },
		{ 0x17, KEY_ZOOM },
		{ 0x1f, KEY_HOMEPAGE },
		{ 0x0e, KEY_ESC },

		{ 0x20, KEY_UP },
		{ 0x21, KEY_DOWN },
		{ 0x42, KEY_LEFT },
		{ 0x43, KEY_RIGHT },
		{ 0x0b, KEY_ENTER },

		{ 0x10, KEY_CHANNELUP },
		{ 0x11, KEY_CHANNELDOWN },

		{ 0x13, KEY_VOLUMEUP },
		{ 0x12, KEY_VOLUMEDOWN },

		{ 0x19, KEY_TIME}, /* Timeshift */
		{ 0x1a, KEY_STOP},
		{ 0x1b, KEY_RECORD},
		{ 0x4b, KEY_EMAIL},

		{ 0x40, KEY_REWIND},
		{ 0x44, KEY_PLAYPAUSE},
		{ 0x41, KEY_FORWARD},
		{ 0x22, KEY_TEXT},

		{ 0x15, KEY_AUDIO}, /* (()) /
		{ 0x0f, KEY_MODE}, /* display ratio */
		{ 0x1c, KEY_SYSRQ}, /* snapshot */
		{ 0x4a, KEY_SLEEP}, /* sleep timer */

		{ 0x48, KEY_SOUND}, /* switch theater mode */
		{ 0x49, KEY_BLUE}, /* A */
		{ 0x18, KEY_RED}, /* B */
		{ 0x23, KEY_GREEN}, /* C */
		};

		static struct rc_map_list kworld_pc150u_map = {
		.map = {
		.scan = kworld_pc150u,
		.size = ARRAY_SIZE(kworld_pc150u),
		.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
		.name = RC_MAP_KWORLD_PC150U,
		}
		};

		static int __init init_rc_map_kworld_pc150u(void)
		{
		return rc_map_register(&kworld_pc150u_map);
		}

		static void __exit exit_rc_map_kworld_pc150u(void)
		{
		rc_map_unregister(&kworld_pc150u_map);
		}

		module_init(init_rc_map_kworld_pc150u)
		module_exit(exit_rc_map_kworld_pc150u)

		MODULE_LICENSE("GPL");
		MODULE_AUTHOR("Kyle Strickland <kyle@kyle.strickland.name>");

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

+59 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include "tea5767.h"
		#include "tda18271.h"
		#include "xc5000.h"
		#include "s5h1411.h"

		/* commly used strings */
		static char name_mute[] = "mute";
		@@ -5712,6 +5713,36 @@ struct saa7134_board saa7134_boards[] = {
		.amux = LINE1,
		} },
		},
		[SAA7134_BOARD_KWORLD_PC150U] = {
		.name = "Kworld PC150-U",
		.audio_clock = 0x00187de7,
		.tuner_type = TUNER_PHILIPS_TDA8290,
		.radio_type = UNSET,
		.tuner_addr = ADDR_UNSET,
		.radio_addr = ADDR_UNSET,
		.mpeg = SAA7134_MPEG_DVB,
		.gpiomask = 1 << 21,
		.ts_type = SAA7134_MPEG_TS_PARALLEL,
		.inputs = { {
		.name = name_tv,
		.vmux = 1,
		.amux = TV,
		.tv = 1,
		}, {
		.name = name_comp,
		.vmux = 3,
		.amux = LINE1,
		}, {
		.name = name_svideo,
		.vmux = 8,
		.amux = LINE2,
		} },
		.radio = {
		.name = name_radio,
		.amux = TV,
		.gpio = 0x0000000,
		},
		},

		};

		@@ -6304,6 +6335,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
		.subvendor = 0x17de,
		.subdevice = 0x7352,
		.driver_data = SAA7134_BOARD_KWORLD_ATSC110, /* ATSC 115 */
		},{
		.vendor = PCI_VENDOR_ID_PHILIPS,
		.device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
		.subvendor = 0x17de,
		.subdevice = 0xa134,
		.driver_data = SAA7134_BOARD_KWORLD_PC150U,
		}, {
		.vendor = PCI_VENDOR_ID_PHILIPS,
		.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
		@@ -7134,6 +7171,23 @@ static inline int saa7134_kworld_sbtvd_toggle_agc(struct saa7134_dev *dev,
		return 0;
		}

		static int saa7134_kworld_pc150u_toggle_agc(struct saa7134_dev *dev,
		enum tda18271_mode mode)
		{
		switch (mode) {
		case TDA18271_ANALOG:
		saa7134_set_gpio(dev, 18, 0);
		break;
		case TDA18271_DIGITAL:
		saa7134_set_gpio(dev, 18, 1);
		msleep(30);
		break;
		default:
		return -EINVAL;
		}
		return 0;
		}

		static int saa7134_tda8290_18271_callback(struct saa7134_dev *dev,
		int command, int arg)
		{
		@@ -7150,6 +7204,9 @@ static int saa7134_tda8290_18271_callback(struct saa7134_dev *dev,
		case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
		ret = saa7134_kworld_sbtvd_toggle_agc(dev, arg);
		break;
		case SAA7134_BOARD_KWORLD_PC150U:
		ret = saa7134_kworld_pc150u_toggle_agc(dev, arg);
		break;
		default:
		break;
		}
		@@ -7171,6 +7228,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
		case SAA7134_BOARD_HAUPPAUGE_HVR1120:
		case SAA7134_BOARD_AVERMEDIA_M733A:
		case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
		case SAA7134_BOARD_KWORLD_PC150U:
		case SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2:
		/* tda8290 + tda18271 */
		ret = saa7134_tda8290_18271_callback(dev, command, arg);
		@@ -7452,6 +7510,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
		case SAA7134_BOARD_BEHOLD_X7:
		case SAA7134_BOARD_BEHOLD_H7:
		case SAA7134_BOARD_BEHOLD_A7:
		case SAA7134_BOARD_KWORLD_PC150U:
		dev->has_remote = SAA7134_REMOTE_I2C;
		break;
		case SAA7134_BOARD_AVERMEDIA_A169_B:

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

+44 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@
		#include "zl10036.h"
		#include "zl10039.h"
		#include "mt312.h"
		#include "s5h1411.h"

		MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
		MODULE_LICENSE("GPL");
		@@ -1158,6 +1159,33 @@ static struct tda18271_config prohdtv_pro2_tda18271_config = {
		.output_opt = TDA18271_OUTPUT_LT_OFF,
		};

		static struct tda18271_std_map kworld_tda18271_std_map = {
		.atsc_6 = { .if_freq = 3250, .agc_mode = 3, .std = 3,
		.if_lvl = 6, .rfagc_top = 0x37 },
		.qam_6 = { .if_freq = 4000, .agc_mode = 3, .std = 0,
		.if_lvl = 6, .rfagc_top = 0x37 },
		};

		static struct tda18271_config kworld_pc150u_tda18271_config = {
		.std_map = &kworld_tda18271_std_map,
		.gate = TDA18271_GATE_ANALOG,
		.output_opt = TDA18271_OUTPUT_LT_OFF,
		.config = 3, /* Use tuner callback for AGC */
		.rf_cal_on_startup = 1
		};

		static struct s5h1411_config kworld_s5h1411_config = {
		.output_mode = S5H1411_PARALLEL_OUTPUT,
		.gpio = S5H1411_GPIO_OFF,
		.qam_if = S5H1411_IF_4000,
		.vsb_if = S5H1411_IF_3250,
		.inversion = S5H1411_INVERSION_ON,
		.status_mode = S5H1411_DEMODLOCKING,
		.mpeg_timing =
		S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK,
		};


		/* ==================================================================
		* Core code
		*/
		@@ -1438,6 +1466,22 @@ static int dvb_init(struct saa7134_dev *dev)
		&dev->i2c_adap, 0x61,
		TUNER_PHILIPS_TUV1236D);
		break;
		case SAA7134_BOARD_KWORLD_PC150U:
		saa7134_set_gpio(dev, 18, 1); /* Switch to digital mode */
		saa7134_tuner_callback(dev, 0,
		TDA18271_CALLBACK_CMD_AGC_ENABLE, 1);
		fe0->dvb.frontend = dvb_attach(s5h1411_attach,
		&kworld_s5h1411_config,
		&dev->i2c_adap);
		if (fe0->dvb.frontend != NULL) {
		dvb_attach(tda829x_attach, fe0->dvb.frontend,
		&dev->i2c_adap, 0x4b,
		&tda829x_no_probe);
		dvb_attach(tda18271_attach, fe0->dvb.frontend,
		0x60, &dev->i2c_adap,
		&kworld_pc150u_tda18271_config);
		}
		break;
		case SAA7134_BOARD_FLYDVBS_LR300:
		fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
		&dev->i2c_adap);