The patch titled
v4l: saa7134: add support for 10moons TM300 card
has been added to the -mm tree. Its filename is
v4l-saa7134-add-support-for-10moons-tm300-card.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: v4l: saa7134: add support for 10moons TM300 card
From: Tony Wan <wankai@xxxxxxxx>
Support the 10moons TM300 TV card (so called TV Master 3), which is a 10moons
saa7130 based board. Here not include features for the IR-remote.
It has been tested using TVTIME. The card was auto-detected and all the input
sources worked correct with sound.
Signed-off-by: Tony Wan <wankai@xxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/media/video/saa7134/saa7134-cards.c | 38 ++++++++++++++++++
drivers/media/video/saa7134/saa7134.h | 1
2 files changed, 39 insertions(+)
diff -puN drivers/media/video/saa7134/saa7134-cards.c~v4l-saa7134-add-support-for-10moons-tm300-card drivers/media/video/saa7134/saa7134-cards.c
--- a/drivers/media/video/saa7134/saa7134-cards.c~v4l-saa7134-add-support-for-10moons-tm300-card
+++ a/drivers/media/video/saa7134/saa7134-cards.c
@@ -3502,6 +3502,38 @@ struct saa7134_board saa7134_boards[] =
.amux = TV,
},
},
+ [SAA7134_BOARD_10MOONSTVMASTER3] = {
+ /* Tony Wan <aloha_cn@xxxxxxxxxxx> */
+ .name = "10MOONS TM300 TV Card",
+ .audio_clock = 0x00200000,
+ .tuner_type = TUNER_LG_PAL_NEW_TAPC,
+ .radio_type = UNSET,
+ .tuner_addr = ADDR_UNSET,
+ .radio_addr = ADDR_UNSET,
+ .gpiomask = 0x7000,
+ .inputs = {{
+ .name = name_tv,
+ .vmux = 1,
+ .amux = LINE2,
+ .gpio = 0x0000,
+ .tv = 1,
+ },{
+ .name = name_comp1,
+ .vmux = 3,
+ .amux = LINE1,
+ .gpio = 0x2000,
+ },{
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE1,
+ .gpio = 0x2000,
+ }},
+ .mute = {
+ .name = name_mute,
+ .amux = LINE2,
+ .gpio = 0x3000,
+ },
+ },
};
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4219,6 +4251,12 @@ struct pci_device_id saa7134_pci_tbl[] =
.subdevice = 0x2003, /* OEM cardbus */
.driver_data = SAA7134_BOARD_SABRENT_TV_PCB05,
},{
+ .vendor = PCI_VENDOR_ID_PHILIPS,
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
+ .subvendor = PCI_VENDOR_ID_PHILIPS,
+ .subdevice = 0x2304,
+ .driver_data = SAA7134_BOARD_10MOONSTVMASTER3,
+ },{
/* --- boards without eeprom + subsystem ID --- */
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
diff -puN drivers/media/video/saa7134/saa7134.h~v4l-saa7134-add-support-for-10moons-tm300-card drivers/media/video/saa7134/saa7134.h
--- a/drivers/media/video/saa7134/saa7134.h~v4l-saa7134-add-support-for-10moons-tm300-card
+++ a/drivers/media/video/saa7134/saa7134.h
@@ -238,6 +238,7 @@ struct saa7134_format {
#define SAA7134_BOARD_ECS_TVP3XP_4CB6 113
#define SAA7134_BOARD_KWORLD_DVBT_210 114
#define SAA7134_BOARD_SABRENT_TV_PCB05 115
+#define SAA7134_BOARD_10MOONSTVMASTER3 116
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8
_
Patches currently in -mm which might be from wankai@xxxxxxxx are
v4l-saa7134-add-support-for-10moons-tm300-card.patch
v4l-saa7134-enable-ir-remote-for-10moons-tm300-card.patch
v4l-enlarge-the-size-of-ir-key-table-to-256.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
