|
@@ -23,6 +23,9 @@
|
|
|
#include "dib0090.h"
|
|
|
#include "lgdt3305.h"
|
|
|
#include "mxl5007t.h"
|
|
|
+#include "mn88472.h"
|
|
|
+#include "tda18250.h"
|
|
|
+
|
|
|
|
|
|
static int force_lna_activation;
|
|
|
module_param(force_lna_activation, int, 0644);
|
|
@@ -3725,6 +3728,90 @@ static int mxl5007t_tuner_attach(struct dvb_usb_adapter *adap)
|
|
|
&hcw_mxl5007t_config) == NULL ? -ENODEV : 0;
|
|
|
}
|
|
|
|
|
|
+static int xbox_one_attach(struct dvb_usb_adapter *adap)
|
|
|
+{
|
|
|
+ struct dib0700_state *st = adap->dev->priv;
|
|
|
+ struct i2c_client *client_demod, *client_tuner;
|
|
|
+ struct dvb_usb_device *d = adap->dev;
|
|
|
+ struct mn88472_config mn88472_config = { };
|
|
|
+ struct tda18250_config tda18250_config;
|
|
|
+ struct i2c_board_info info;
|
|
|
+
|
|
|
+ st->fw_use_new_i2c_api = 1;
|
|
|
+ st->disable_streaming_master_mode = 1;
|
|
|
+
|
|
|
+ /* fe power enable */
|
|
|
+ dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 0);
|
|
|
+ msleep(30);
|
|
|
+ dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1);
|
|
|
+ msleep(30);
|
|
|
+
|
|
|
+ /* demod reset */
|
|
|
+ dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1);
|
|
|
+ msleep(30);
|
|
|
+ dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0);
|
|
|
+ msleep(30);
|
|
|
+ dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1);
|
|
|
+ msleep(30);
|
|
|
+
|
|
|
+ /* attach demod */
|
|
|
+ mn88472_config.fe = &adap->fe_adap[0].fe;
|
|
|
+ mn88472_config.i2c_wr_max = 22;
|
|
|
+ mn88472_config.xtal = 20500000;
|
|
|
+ mn88472_config.ts_mode = PARALLEL_TS_MODE;
|
|
|
+ mn88472_config.ts_clock = FIXED_TS_CLOCK;
|
|
|
+ memset(&info, 0, sizeof(struct i2c_board_info));
|
|
|
+ strlcpy(info.type, "mn88472", I2C_NAME_SIZE);
|
|
|
+ info.addr = 0x18;
|
|
|
+ info.platform_data = &mn88472_config;
|
|
|
+ request_module(info.type);
|
|
|
+ client_demod = i2c_new_device(&d->i2c_adap, &info);
|
|
|
+ if (client_demod == NULL || client_demod->dev.driver == NULL)
|
|
|
+ goto fail_demod_device;
|
|
|
+ if (!try_module_get(client_demod->dev.driver->owner))
|
|
|
+ goto fail_demod_module;
|
|
|
+
|
|
|
+ st->i2c_client_demod = client_demod;
|
|
|
+
|
|
|
+ adap->fe_adap[0].fe = mn88472_config.get_dvb_frontend(client_demod);
|
|
|
+
|
|
|
+ /* attach tuner */
|
|
|
+ memset(&tda18250_config, 0, sizeof(tda18250_config));
|
|
|
+ tda18250_config.if_dvbt_6 = 3950;
|
|
|
+ tda18250_config.if_dvbt_7 = 4450;
|
|
|
+ tda18250_config.if_dvbt_8 = 4950;
|
|
|
+ tda18250_config.if_dvbc_6 = 4950;
|
|
|
+ tda18250_config.if_dvbc_8 = 4950;
|
|
|
+ tda18250_config.if_atsc = 4079;
|
|
|
+ tda18250_config.loopthrough = true;
|
|
|
+ tda18250_config.xtal_freq = TDA18250_XTAL_FREQ_27MHZ;
|
|
|
+ tda18250_config.fe = adap->fe_adap[0].fe;
|
|
|
+
|
|
|
+ memset(&info, 0, sizeof(struct i2c_board_info));
|
|
|
+ strlcpy(info.type, "tda18250", I2C_NAME_SIZE);
|
|
|
+ info.addr = 0x60;
|
|
|
+ info.platform_data = &tda18250_config;
|
|
|
+
|
|
|
+ request_module(info.type);
|
|
|
+ client_tuner = i2c_new_device(&adap->dev->i2c_adap, &info);
|
|
|
+ if (client_tuner == NULL || client_tuner->dev.driver == NULL)
|
|
|
+ goto fail_tuner_device;
|
|
|
+ if (!try_module_get(client_tuner->dev.driver->owner))
|
|
|
+ goto fail_tuner_module;
|
|
|
+
|
|
|
+ st->i2c_client_tuner = client_tuner;
|
|
|
+ return 0;
|
|
|
+
|
|
|
+fail_tuner_module:
|
|
|
+ i2c_unregister_device(client_tuner);
|
|
|
+fail_tuner_device:
|
|
|
+ module_put(client_demod->dev.driver->owner);
|
|
|
+fail_demod_module:
|
|
|
+ i2c_unregister_device(client_demod);
|
|
|
+fail_demod_device:
|
|
|
+ return -ENODEV;
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
/* DVB-USB and USB stuff follows */
|
|
|
struct usb_device_id dib0700_usb_id_table[] = {
|
|
@@ -3816,7 +3903,8 @@ struct usb_device_id dib0700_usb_id_table[] = {
|
|
|
{ USB_DEVICE(USB_VID_PCTV, USB_PID_PCTV_2002E_SE) },
|
|
|
{ USB_DEVICE(USB_VID_PCTV, USB_PID_DIBCOM_STK8096PVR) },
|
|
|
{ USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK8096PVR) },
|
|
|
- { USB_DEVICE(USB_VID_HAMA, USB_PID_HAMA_DVBT_HYBRID) },
|
|
|
+/* 85 */{ USB_DEVICE(USB_VID_HAMA, USB_PID_HAMA_DVBT_HYBRID) },
|
|
|
+ { USB_DEVICE(USB_VID_MICROSOFT, USB_PID_XBOX_ONE_TUNER) },
|
|
|
{ 0 } /* Terminating entry */
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
|
|
@@ -5040,6 +5128,25 @@ struct dvb_usb_device_properties dib0700_devices[] = {
|
|
|
RC_PROTO_BIT_NEC,
|
|
|
.change_protocol = dib0700_change_protocol,
|
|
|
},
|
|
|
+ }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
|
+ .num_adapters = 1,
|
|
|
+ .adapter = {
|
|
|
+ {
|
|
|
+ DIB0700_NUM_FRONTENDS(1),
|
|
|
+ .fe = {{
|
|
|
+ .frontend_attach = xbox_one_attach,
|
|
|
+
|
|
|
+ DIB0700_DEFAULT_STREAMING_CONFIG(0x82),
|
|
|
+ } },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ .num_device_descs = 1,
|
|
|
+ .devices = {
|
|
|
+ { "Microsoft Xbox One Digital TV Tuner",
|
|
|
+ { &dib0700_usb_id_table[86], NULL },
|
|
|
+ { NULL },
|
|
|
+ },
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
|