aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDevin Heitmueller <devin.heitmueller@gmail.com>2008-09-16 01:02:12 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-04 21:43:41 -0400
commit5ea7fe48a95084897786b0f20109d0611bdababc (patch)
tree8ab41416034223075262e20ab767d35692274349 /drivers/media
parenta1c4530e4e5b73e60ed96c413902c6a46e812494 (diff)
V4L/DVB (8967): Use correct XC3028L firmware for AMD ATI TV Wonder 600
The AMD ATI TV Wonder 600 has an XC3028L and *not* an XC3028, so we need to load the proper firmware to prevent the device from overheating. Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/tuners/tuner-xc2028.h1
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/common/tuners/tuner-xc2028.h
index 216025cf5d4b..2c5b6282b569 100644
--- a/drivers/media/common/tuners/tuner-xc2028.h
+++ b/drivers/media/common/tuners/tuner-xc2028.h
@@ -10,6 +10,7 @@
10#include "dvb_frontend.h" 10#include "dvb_frontend.h"
11 11
12#define XC2028_DEFAULT_FIRMWARE "xc3028-v27.fw" 12#define XC2028_DEFAULT_FIRMWARE "xc3028-v27.fw"
13#define XC3028L_DEFAULT_FIRMWARE "xc3028L-v36.fw"
13 14
14/* Dmoduler IF (kHz) */ 15/* Dmoduler IF (kHz) */
15#define XC3028_FE_DEFAULT 0 /* Don't load SCODE */ 16#define XC3028_FE_DEFAULT 0 /* Don't load SCODE */
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 4d20cda7a1fa..c7456e976655 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1530,9 +1530,12 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
1530 /* djh - Not sure which demod we need here */ 1530 /* djh - Not sure which demod we need here */
1531 ctl->demod = XC3028_FE_DEFAULT; 1531 ctl->demod = XC3028_FE_DEFAULT;
1532 break; 1532 break;
1533 case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
1534 ctl->demod = XC3028_FE_DEFAULT;
1535 ctl->fname = XC3028L_DEFAULT_FIRMWARE;
1536 break;
1533 case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950: 1537 case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
1534 case EM2880_BOARD_PINNACLE_PCTV_HD_PRO: 1538 case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:
1535 case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:
1536 /* FIXME: Better to specify the needed IF */ 1539 /* FIXME: Better to specify the needed IF */
1537 ctl->demod = XC3028_FE_DEFAULT; 1540 ctl->demod = XC3028_FE_DEFAULT;
1538 break; 1541 break;