brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
[openwrt/staging/rmilecki.git] / target / linux / brcm2708 / patches-3.10 / 0106-dvb-Add-support-for-CableStar-Device.patch
1 From 2a8704be59bf6566d55cdc7e2b905173e7a6b71c Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Wed, 27 Nov 2013 22:52:53 +0000
4 Subject: [PATCH 106/196] dvb: Add support for CableStar Device
5
6 ---
7 drivers/media/dvb-core/dvb-usb-ids.h | 1 +
8 drivers/media/usb/dvb-usb-v2/az6007.c | 59 +++++++++++++++++++++++++++++++++++
9 2 files changed, 60 insertions(+)
10
11 diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
12 index 335a8f4..110c197 100644
13 --- a/drivers/media/dvb-core/dvb-usb-ids.h
14 +++ b/drivers/media/dvb-core/dvb-usb-ids.h
15 @@ -365,6 +365,7 @@
16 #define USB_PID_TERRATEC_DVBS2CI_V2 0x10ac
17 #define USB_PID_TECHNISAT_USB2_HDCI_V1 0x0001
18 #define USB_PID_TECHNISAT_USB2_HDCI_V2 0x0002
19 +#define USB_PID_TECHNISAT_USB2_CABLESTAR_HDCI 0x0003
20 #define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2 0x0004
21 #define USB_PID_TECHNISAT_USB2_DVB_S2 0x0500
22 #endif
23 diff --git a/drivers/media/usb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c
24 index 44c64ef3..c1051c3 100644
25 --- a/drivers/media/usb/dvb-usb-v2/az6007.c
26 +++ b/drivers/media/usb/dvb-usb-v2/az6007.c
27 @@ -68,6 +68,19 @@ static struct drxk_config terratec_h7_drxk = {
28 .microcode_name = "dvb-usb-terratec-h7-drxk.fw",
29 };
30
31 +static struct drxk_config cablestar_hdci_drxk = {
32 + .adr = 0x29,
33 + .parallel_ts = true,
34 + .dynamic_clk = true,
35 + .single_master = true,
36 + .enable_merr_cfg = true,
37 + .no_i2c_bridge = false,
38 + .chunk_size = 64,
39 + .mpeg_out_clk_strength = 0x02,
40 + .qam_demod_parameter_count = 2,
41 + .microcode_name = "dvb-usb-technisat-cablestar-hdci-drxk.fw",
42 +};
43 +
44 static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)
45 {
46 struct az6007_device_state *st = fe_to_priv(fe);
47 @@ -630,6 +643,27 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
48 return 0;
49 }
50
51 +static int az6007_cablestar_hdci_frontend_attach(struct dvb_usb_adapter *adap)
52 +{
53 + struct az6007_device_state *st = adap_to_priv(adap);
54 + struct dvb_usb_device *d = adap_to_d(adap);
55 +
56 + pr_debug("attaching demod drxk\n");
57 +
58 + adap->fe[0] = dvb_attach(drxk_attach, &cablestar_hdci_drxk,
59 + &d->i2c_adap);
60 + if (!adap->fe[0])
61 + return -EINVAL;
62 +
63 + adap->fe[0]->sec_priv = adap;
64 + st->gate_ctrl = adap->fe[0]->ops.i2c_gate_ctrl;
65 + adap->fe[0]->ops.i2c_gate_ctrl = drxk_gate_ctrl;
66 +
67 + az6007_ci_init(adap);
68 +
69 + return 0;
70 +}
71 +
72 static int az6007_tuner_attach(struct dvb_usb_adapter *adap)
73 {
74 struct dvb_usb_device *d = adap_to_d(adap);
75 @@ -868,6 +902,29 @@ static struct dvb_usb_device_properties az6007_props = {
76 }
77 };
78
79 +static struct dvb_usb_device_properties az6007_cablestar_hdci_props = {
80 + .driver_name = KBUILD_MODNAME,
81 + .owner = THIS_MODULE,
82 + .firmware = AZ6007_FIRMWARE,
83 +
84 + .adapter_nr = adapter_nr,
85 + .size_of_priv = sizeof(struct az6007_device_state),
86 + .i2c_algo = &az6007_i2c_algo,
87 + .tuner_attach = az6007_tuner_attach,
88 + .frontend_attach = az6007_cablestar_hdci_frontend_attach,
89 + .streaming_ctrl = az6007_streaming_ctrl,
90 +/* ditch get_rc_config as it can't work (TS35 remote, I believe it's rc5) */
91 + .get_rc_config = NULL,
92 + .read_mac_address = az6007_read_mac_addr,
93 + .download_firmware = az6007_download_firmware,
94 + .identify_state = az6007_identify_state,
95 + .power_ctrl = az6007_power_ctrl,
96 + .num_adapters = 1,
97 + .adapter = {
98 + { .stream = DVB_USB_STREAM_BULK(0x02, 10, 4096), }
99 + }
100 +};
101 +
102 static struct usb_device_id az6007_usb_table[] = {
103 {DVB_USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_AZUREWAVE_6007,
104 &az6007_props, "Azurewave 6007", RC_MAP_EMPTY)},
105 @@ -875,6 +932,8 @@ static struct usb_device_id az6007_usb_table[] = {
106 &az6007_props, "Terratec H7", RC_MAP_NEC_TERRATEC_CINERGY_XS)},
107 {DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7_2,
108 &az6007_props, "Terratec H7", RC_MAP_NEC_TERRATEC_CINERGY_XS)},
109 + {DVB_USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_CABLESTAR_HDCI,
110 + &az6007_cablestar_hdci_props, "Technisat CableStar Combo HD CI", RC_MAP_EMPTY)},
111 {0},
112 };
113
114 --
115 1.9.1
116