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