Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
d642f2f3
Commit
d642f2f3
authored
Jan 19, 2011
by
Mauro Carvalho Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[media] add support for Encore FM3
Signed-off-by:
Mauro Carvalho Chehab
<
mchehab@redhat.com
>
parent
99fb079a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
0 deletions
+41
-0
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-cards.c
+39
-0
drivers/media/video/saa7134/saa7134-input.c
drivers/media/video/saa7134/saa7134-input.c
+1
-0
drivers/media/video/saa7134/saa7134.h
drivers/media/video/saa7134/saa7134.h
+1
-0
No files found.
drivers/media/video/saa7134/saa7134-cards.c
View file @
d642f2f3
...
@@ -3620,6 +3620,38 @@ struct saa7134_board saa7134_boards[] = {
...
@@ -3620,6 +3620,38 @@ struct saa7134_board saa7134_boards[] = {
.
amux
=
0
,
.
amux
=
0
,
},
},
},
},
[
SAA7134_BOARD_ENCORE_ENLTV_FM3
]
=
{
.
name
=
"Encore ENLTV-FM 3"
,
.
audio_clock
=
0x02187de7
,
.
tuner_type
=
TUNER_TENA_TNF_5337
,
.
radio_type
=
TUNER_TEA5767
,
.
tuner_addr
=
0x61
,
.
radio_addr
=
0x60
,
.
inputs
=
{
{
.
name
=
name_tv
,
.
vmux
=
1
,
.
amux
=
LINE2
,
.
tv
=
1
,
},
{
.
name
=
name_comp1
,
.
vmux
=
3
,
.
amux
=
LINE1
,
},
{
.
name
=
name_svideo
,
.
vmux
=
8
,
.
amux
=
LINE1
,
}
},
.
radio
=
{
.
name
=
name_radio
,
.
vmux
=
1
,
.
amux
=
LINE1
,
},
.
mute
=
{
.
name
=
name_mute
,
.
amux
=
LINE1
,
.
gpio
=
0x43000
,
},
},
[
SAA7134_BOARD_CINERGY_HT_PCI
]
=
{
[
SAA7134_BOARD_CINERGY_HT_PCI
]
=
{
.
name
=
"Terratec Cinergy HT PCI"
,
.
name
=
"Terratec Cinergy HT PCI"
,
.
audio_clock
=
0x00187de7
,
.
audio_clock
=
0x00187de7
,
...
@@ -6385,6 +6417,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
...
@@ -6385,6 +6417,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.
subvendor
=
0x1a7f
,
.
subvendor
=
0x1a7f
,
.
subdevice
=
0x2008
,
.
subdevice
=
0x2008
,
.
driver_data
=
SAA7134_BOARD_ENCORE_ENLTV_FM53
,
.
driver_data
=
SAA7134_BOARD_ENCORE_ENLTV_FM53
,
},
{
.
vendor
=
PCI_VENDOR_ID_PHILIPS
,
.
device
=
PCI_DEVICE_ID_PHILIPS_SAA7134
,
.
subvendor
=
0x1a7f
,
.
subdevice
=
0x2108
,
.
driver_data
=
SAA7134_BOARD_ENCORE_ENLTV_FM3
,
},
{
},
{
.
vendor
=
PCI_VENDOR_ID_PHILIPS
,
.
vendor
=
PCI_VENDOR_ID_PHILIPS
,
.
device
=
PCI_DEVICE_ID_PHILIPS_SAA7133
,
.
device
=
PCI_DEVICE_ID_PHILIPS_SAA7133
,
...
@@ -7102,6 +7140,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
...
@@ -7102,6 +7140,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
case
SAA7134_BOARD_ENCORE_ENLTV
:
case
SAA7134_BOARD_ENCORE_ENLTV
:
case
SAA7134_BOARD_ENCORE_ENLTV_FM
:
case
SAA7134_BOARD_ENCORE_ENLTV_FM
:
case
SAA7134_BOARD_ENCORE_ENLTV_FM53
:
case
SAA7134_BOARD_ENCORE_ENLTV_FM53
:
case
SAA7134_BOARD_ENCORE_ENLTV_FM3
:
case
SAA7134_BOARD_10MOONSTVMASTER3
:
case
SAA7134_BOARD_10MOONSTVMASTER3
:
case
SAA7134_BOARD_BEHOLD_401
:
case
SAA7134_BOARD_BEHOLD_401
:
case
SAA7134_BOARD_BEHOLD_403
:
case
SAA7134_BOARD_BEHOLD_403
:
...
...
drivers/media/video/saa7134/saa7134-input.c
View file @
d642f2f3
...
@@ -681,6 +681,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
...
@@ -681,6 +681,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
polling
=
50
;
// ms
polling
=
50
;
// ms
break
;
break
;
case
SAA7134_BOARD_ENCORE_ENLTV_FM53
:
case
SAA7134_BOARD_ENCORE_ENLTV_FM53
:
case
SAA7134_BOARD_ENCORE_ENLTV_FM3
:
ir_codes
=
RC_MAP_ENCORE_ENLTV_FM53
;
ir_codes
=
RC_MAP_ENCORE_ENLTV_FM53
;
mask_keydown
=
0x0040000
;
/* Enable GPIO18 line on both edges */
mask_keydown
=
0x0040000
;
/* Enable GPIO18 line on both edges */
mask_keyup
=
0x0040000
;
mask_keyup
=
0x0040000
;
...
...
drivers/media/video/saa7134/saa7134.h
View file @
d642f2f3
...
@@ -327,6 +327,7 @@ struct saa7134_card_ir {
...
@@ -327,6 +327,7 @@ struct saa7134_card_ir {
#define SAA7134_BOARD_TECHNOTREND_BUDGET_T3000 181
#define SAA7134_BOARD_TECHNOTREND_BUDGET_T3000 181
#define SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG 182
#define SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG 182
#define SAA7134_BOARD_VIDEOMATE_M1F 183
#define SAA7134_BOARD_VIDEOMATE_M1F 183
#define SAA7134_BOARD_ENCORE_ENLTV_FM3 184
#define SAA7134_MAXBOARDS 32
#define SAA7134_MAXBOARDS 32
#define SAA7134_INPUT_MAX 8
#define SAA7134_INPUT_MAX 8
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment