aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Frolov <fralik@gmail.com>2013-01-30 03:14:59 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-08 11:50:33 -0500
commit9690fd80d3fb1bbfe04d7e1d8dde0cfd353c7b8d (patch)
treea0187d7f588ee51a9030026d560d6d450f6c67b0
parent88b404c435ffb6c103faf85cc1b41077dcd03bf9 (diff)
[media] saa7134: Add capture card Hawell HW-9004V1
This patch adds new capture board Hawell HW-9004V1. This card has 4 SAA71300 chips. In order to work it is needed to initialize its registers (gpio mask and value). The value of these registers were dumped under Windows using flytest. Signed-off-by: Vadim Frolov <fralik@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71341
-rw-r--r--drivers/media/pci/saa7134/saa7134-cards.c17
-rw-r--r--drivers/media/pci/saa7134/saa7134.h1
3 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 94d9025aa82d..b3ad68309109 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -189,3 +189,4 @@
189188 -> Sensoray 811/911 [6000:0811,6000:0911] 189188 -> Sensoray 811/911 [6000:0811,6000:0911]
190189 -> Kworld PC150-U [17de:a134] 190189 -> Kworld PC150-U [17de:a134]
191190 -> Asus My Cinema PS3-100 [1043:48cd] 191190 -> Asus My Cinema PS3-100 [1043:48cd]
192191 -> Hawell HW-9004V1
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index bc08f1dbc293..dc68cf1070f7 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -5773,6 +5773,23 @@ struct saa7134_board saa7134_boards[] = {
5773 .gpio = 0x0000000, 5773 .gpio = 0x0000000,
5774 }, 5774 },
5775 }, 5775 },
5776 [SAA7134_BOARD_HAWELL_HW_9004V1] = {
5777 /* Hawell HW-9004V1 */
5778 /* Vadim Frolov <fralik@gmail.com> */
5779 .name = "Hawell HW-9004V1",
5780 .audio_clock = 0x00200000,
5781 .tuner_type = UNSET,
5782 .radio_type = UNSET,
5783 .tuner_addr = ADDR_UNSET,
5784 .radio_addr = ADDR_UNSET,
5785 .gpiomask = 0x618E700,
5786 .inputs = {{
5787 .name = name_comp1,
5788 .vmux = 3,
5789 .amux = LINE1,
5790 .gpio = 0x6010000,
5791 } },
5792 },
5776 5793
5777}; 5794};
5778 5795
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index f804324e07fd..71eefef5e324 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -333,6 +333,7 @@ struct saa7134_card_ir {
333#define SAA7134_BOARD_SENSORAY811_911 188 333#define SAA7134_BOARD_SENSORAY811_911 188
334#define SAA7134_BOARD_KWORLD_PC150U 189 334#define SAA7134_BOARD_KWORLD_PC150U 189
335#define SAA7134_BOARD_ASUSTeK_PS3_100 190 335#define SAA7134_BOARD_ASUSTeK_PS3_100 190
336#define SAA7134_BOARD_HAWELL_HW_9004V1 191
336 337
337#define SAA7134_MAXBOARDS 32 338#define SAA7134_MAXBOARDS 32
338#define SAA7134_INPUT_MAX 8 339#define SAA7134_INPUT_MAX 8