[media] Support for Asus MyCinema U3100Mini Plus
This is initial support for the Asus MyCinema U3100Mini Plus. The driver in its current form gets detected and loads properly. Scanning using dvbscan works without problems, Locking onto a channel using tzap also works fine. Only playback using tzap -r + mplayer was tested and was fully functional. It uses the af9035 USB Bridge chip, with an af9033 demodulator. The tuner used is the FCI FC2580. Signed-off-by: Oliver Schinagl <oliver@schinagl.nl> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Oliver Schinagl
Mauro Carvalho Chehab
parent
3d8a60d5de
commit
d67ceb3398
|
|
@ -329,6 +329,7 @@
|
|||
#define USB_PID_ASUS_U3000 0x171f
|
||||
#define USB_PID_ASUS_U3000H 0x1736
|
||||
#define USB_PID_ASUS_U3100 0x173f
|
||||
#define USB_PID_ASUS_U3100MINI_PLUS 0x1779
|
||||
#define USB_PID_YUAN_EC372S 0x1edc
|
||||
#define USB_PID_YUAN_STK7700PH 0x1f08
|
||||
#define USB_PID_YUAN_PD378S 0x2edc
|
||||
|
|
|
|||
|
|
@ -314,6 +314,10 @@ static int af9033_init(struct dvb_frontend *fe)
|
|||
len = ARRAY_SIZE(tuner_init_tda18218);
|
||||
init = tuner_init_tda18218;
|
||||
break;
|
||||
case AF9033_TUNER_FC2580:
|
||||
len = ARRAY_SIZE(tuner_init_fc2580);
|
||||
init = tuner_init_fc2580;
|
||||
break;
|
||||
default:
|
||||
dev_dbg(&state->i2c->dev, "%s: unsupported tuner ID=%d\n",
|
||||
__func__, state->cfg.tuner);
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ struct af9033_config {
|
|||
#define AF9033_TUNER_FC0011 0x28 /* Fitipower FC0011 */
|
||||
#define AF9033_TUNER_MXL5007T 0xa0 /* MaxLinear MxL5007T */
|
||||
#define AF9033_TUNER_TDA18218 0xa1 /* NXP TDA 18218HN */
|
||||
#define AF9033_TUNER_FC2580 0x32 /* FCI FC2580 */
|
||||
u8 tuner;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -466,5 +466,42 @@ static const struct reg_val tuner_init_tda18218[] = {
|
|||
{0x80f1e6, 0x00},
|
||||
};
|
||||
|
||||
/* FCI FC2580 tuner init */
|
||||
static const struct reg_val tuner_init_fc2580[] = {
|
||||
{ 0x800046, 0x32 },
|
||||
{ 0x800057, 0x01 },
|
||||
{ 0x800058, 0x00 },
|
||||
{ 0x80005f, 0x00 },
|
||||
{ 0x800060, 0x00 },
|
||||
{ 0x800071, 0x05 },
|
||||
{ 0x800072, 0x02 },
|
||||
{ 0x800074, 0x01 },
|
||||
{ 0x800079, 0x01 },
|
||||
{ 0x800093, 0x00 },
|
||||
{ 0x800094, 0x00 },
|
||||
{ 0x800095, 0x00 },
|
||||
{ 0x800096, 0x05 },
|
||||
{ 0x8000b3, 0x01 },
|
||||
{ 0x8000c3, 0x01 },
|
||||
{ 0x8000c4, 0x00 },
|
||||
{ 0x80f007, 0x00 },
|
||||
{ 0x80f00c, 0x19 },
|
||||
{ 0x80f00d, 0x1A },
|
||||
{ 0x80f00e, 0x00 },
|
||||
{ 0x80f00f, 0x02 },
|
||||
{ 0x80f010, 0x00 },
|
||||
{ 0x80f011, 0x02 },
|
||||
{ 0x80f012, 0x00 },
|
||||
{ 0x80f013, 0x02 },
|
||||
{ 0x80f014, 0x00 },
|
||||
{ 0x80f015, 0x02 },
|
||||
{ 0x80f01f, 0x96 },
|
||||
{ 0x80f020, 0x00 },
|
||||
{ 0x80f029, 0x96 },
|
||||
{ 0x80f02a, 0x00 },
|
||||
{ 0x80f077, 0x01 },
|
||||
{ 0x80f1e6, 0x01 },
|
||||
};
|
||||
|
||||
#endif /* AF9033_PRIV_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -498,8 +498,9 @@ struct dvb_frontend *fc2580_attach(struct dvb_frontend *fe,
|
|||
|
||||
dev_dbg(&priv->i2c->dev, "%s: chip_id=%02x\n", __func__, chip_id);
|
||||
|
||||
if (chip_id != 0x56)
|
||||
if ((chip_id != 0x56) && (chip_id != 0x5a)) {
|
||||
goto err;
|
||||
}
|
||||
|
||||
dev_info(&priv->i2c->dev,
|
||||
"%s: FCI FC2580 successfully identified\n",
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ config DVB_USB_AF9035
|
|||
select MEDIA_TUNER_FC0011 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select MEDIA_TUNER_MXL5007T if MEDIA_SUBDRV_AUTOSELECT
|
||||
select MEDIA_TUNER_TDA18218 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select MEDIA_TUNER_FC2580 if MEDIA_SUBDRV_AUTOSELECT
|
||||
help
|
||||
Say Y here to support the Afatech AF9035 based DVB USB receiver.
|
||||
|
||||
|
|
|
|||
|
|
@ -513,6 +513,7 @@ static int af9035_read_config(struct dvb_usb_device *d)
|
|||
case AF9033_TUNER_FC0011:
|
||||
case AF9033_TUNER_MXL5007T:
|
||||
case AF9033_TUNER_TDA18218:
|
||||
case AF9033_TUNER_FC2580:
|
||||
state->af9033_config[i].spec_inv = 1;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -798,6 +799,11 @@ static struct tda18218_config af9035_tda18218_config = {
|
|||
.i2c_wr_max = 21,
|
||||
};
|
||||
|
||||
static const struct fc2580_config af9035_fc2580_config = {
|
||||
.i2c_addr = 0x56,
|
||||
.clock = 16384000,
|
||||
};
|
||||
|
||||
static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
|
||||
{
|
||||
struct state *state = adap_to_priv(adap);
|
||||
|
|
@ -882,6 +888,25 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
|
|||
fe = dvb_attach(tda18218_attach, adap->fe[0],
|
||||
&d->i2c_adap, &af9035_tda18218_config);
|
||||
break;
|
||||
case AF9033_TUNER_FC2580:
|
||||
/* Tuner enable using gpiot2_o, gpiot2_en and gpiot2_on */
|
||||
ret = af9035_wr_reg_mask(d, 0xd8eb, 0x01, 0x01);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
ret = af9035_wr_reg_mask(d, 0xd8ec, 0x01, 0x01);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
ret = af9035_wr_reg_mask(d, 0xd8ed, 0x01, 0x01);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
usleep_range(10000, 50000);
|
||||
/* attach tuner */
|
||||
fe = dvb_attach(fc2580_attach, adap->fe[0],
|
||||
&d->i2c_adap, &af9035_fc2580_config);
|
||||
break;
|
||||
default:
|
||||
fe = NULL;
|
||||
}
|
||||
|
|
@ -1106,6 +1131,8 @@ static const struct usb_device_id af9035_id_table[] = {
|
|||
&af9035_props, "AVerMedia HD Volar (A867)", NULL) },
|
||||
{ DVB_USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_TWINSTAR,
|
||||
&af9035_props, "AVerMedia Twinstar (A825)", NULL) },
|
||||
{ DVB_USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100MINI_PLUS,
|
||||
&af9035_props, "Asus U3100Mini Plus", NULL) },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(usb, af9035_id_table);
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "fc0011.h"
|
||||
#include "mxl5007t.h"
|
||||
#include "tda18218.h"
|
||||
#include "fc2580.h"
|
||||
|
||||
struct reg_val {
|
||||
u32 reg;
|
||||
|
|
|
|||
Loading…
Reference in New Issue