From 9a0bf528b4d66b605f02634236da085595c22101 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 13 Aug 2012 23:13:41 -0300 Subject: [media] move the dvb/frontends to drivers/media/dvb-frontends Raise the DVB frontends one level up, as the intention is to remove the drivers/media/dvb directory. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/Kconfig | 4 - drivers/media/dvb/Makefile | 3 +- drivers/media/dvb/b2c2/Makefile | 2 +- drivers/media/dvb/bt8xx/Makefile | 2 +- drivers/media/dvb/ddbridge/Makefile | 2 +- drivers/media/dvb/dm1105/Makefile | 2 +- drivers/media/dvb/dvb-usb-v2/Makefile | 2 +- drivers/media/dvb/dvb-usb/Makefile | 2 +- drivers/media/dvb/frontends/Kconfig | 756 --- drivers/media/dvb/frontends/Makefile | 105 - drivers/media/dvb/frontends/a8293.c | 167 - drivers/media/dvb/frontends/a8293.h | 41 - drivers/media/dvb/frontends/af9013.c | 1524 ------ drivers/media/dvb/frontends/af9013.h | 118 - drivers/media/dvb/frontends/af9013_priv.h | 922 ---- drivers/media/dvb/frontends/af9033.c | 980 ---- drivers/media/dvb/frontends/af9033.h | 75 - drivers/media/dvb/frontends/af9033_priv.h | 470 -- drivers/media/dvb/frontends/atbm8830.c | 508 -- drivers/media/dvb/frontends/atbm8830.h | 76 - drivers/media/dvb/frontends/atbm8830_priv.h | 75 - drivers/media/dvb/frontends/au8522.h | 98 - drivers/media/dvb/frontends/au8522_common.c | 277 - drivers/media/dvb/frontends/au8522_decoder.c | 839 --- drivers/media/dvb/frontends/au8522_dig.c | 828 --- drivers/media/dvb/frontends/au8522_priv.h | 446 -- drivers/media/dvb/frontends/bcm3510.c | 856 --- drivers/media/dvb/frontends/bcm3510.h | 49 - drivers/media/dvb/frontends/bcm3510_priv.h | 460 -- drivers/media/dvb/frontends/bsbe1-d01a.h | 146 - drivers/media/dvb/frontends/bsbe1.h | 106 - drivers/media/dvb/frontends/bsru6.h | 143 - drivers/media/dvb/frontends/cx22700.c | 443 -- drivers/media/dvb/frontends/cx22700.h | 46 - drivers/media/dvb/frontends/cx22702.c | 653 --- drivers/media/dvb/frontends/cx22702.h | 58 - drivers/media/dvb/frontends/cx24110.c | 666 --- drivers/media/dvb/frontends/cx24110.h | 61 - drivers/media/dvb/frontends/cx24113.c | 618 --- drivers/media/dvb/frontends/cx24113.h | 53 - drivers/media/dvb/frontends/cx24116.c | 1508 ----- drivers/media/dvb/frontends/cx24116.h | 58 - drivers/media/dvb/frontends/cx24123.c | 1165 ---- drivers/media/dvb/frontends/cx24123.h | 61 - drivers/media/dvb/frontends/cxd2820r.h | 94 - drivers/media/dvb/frontends/cxd2820r_c.c | 346 -- drivers/media/dvb/frontends/cxd2820r_core.c | 646 --- drivers/media/dvb/frontends/cxd2820r_priv.h | 156 - drivers/media/dvb/frontends/cxd2820r_t.c | 452 -- drivers/media/dvb/frontends/cxd2820r_t2.c | 426 -- drivers/media/dvb/frontends/dib0070.c | 780 --- drivers/media/dvb/frontends/dib0070.h | 76 - drivers/media/dvb/frontends/dib0090.c | 2686 --------- drivers/media/dvb/frontends/dib0090.h | 187 - drivers/media/dvb/frontends/dib3000.h | 56 - drivers/media/dvb/frontends/dib3000mb.c | 829 --- drivers/media/dvb/frontends/dib3000mb_priv.h | 556 -- drivers/media/dvb/frontends/dib3000mc.c | 940 ---- drivers/media/dvb/frontends/dib3000mc.h | 85 - drivers/media/dvb/frontends/dib7000m.c | 1473 ----- drivers/media/dvb/frontends/dib7000m.h | 90 - drivers/media/dvb/frontends/dib7000p.c | 2457 --------- drivers/media/dvb/frontends/dib7000p.h | 158 - drivers/media/dvb/frontends/dib8000.c | 3560 ------------ drivers/media/dvb/frontends/dib8000.h | 174 - drivers/media/dvb/frontends/dib9000.c | 2590 --------- drivers/media/dvb/frontends/dib9000.h | 131 - drivers/media/dvb/frontends/dibx000_common.c | 515 -- drivers/media/dvb/frontends/dibx000_common.h | 280 - drivers/media/dvb/frontends/drxd.h | 73 - drivers/media/dvb/frontends/drxd_firm.c | 929 ---- drivers/media/dvb/frontends/drxd_firm.h | 115 - drivers/media/dvb/frontends/drxd_hard.c | 2992 ---------- drivers/media/dvb/frontends/drxd_map_firm.h | 1013 ---- drivers/media/dvb/frontends/drxk.h | 66 - drivers/media/dvb/frontends/drxk_hard.c | 6637 ----------------------- drivers/media/dvb/frontends/drxk_hard.h | 364 -- drivers/media/dvb/frontends/drxk_map.h | 451 -- drivers/media/dvb/frontends/ds3000.c | 1312 ----- drivers/media/dvb/frontends/ds3000.h | 48 - drivers/media/dvb/frontends/dvb-pll.c | 820 --- drivers/media/dvb/frontends/dvb-pll.h | 57 - drivers/media/dvb/frontends/dvb_dummy_fe.c | 276 - drivers/media/dvb/frontends/dvb_dummy_fe.h | 51 - drivers/media/dvb/frontends/ec100.c | 335 -- drivers/media/dvb/frontends/ec100.h | 46 - drivers/media/dvb/frontends/ec100_priv.h | 39 - drivers/media/dvb/frontends/eds1547.h | 133 - drivers/media/dvb/frontends/hd29l2.c | 861 --- drivers/media/dvb/frontends/hd29l2.h | 66 - drivers/media/dvb/frontends/hd29l2_priv.h | 314 -- drivers/media/dvb/frontends/isl6405.c | 164 - drivers/media/dvb/frontends/isl6405.h | 74 - drivers/media/dvb/frontends/isl6421.c | 141 - drivers/media/dvb/frontends/isl6421.h | 55 - drivers/media/dvb/frontends/isl6423.c | 308 -- drivers/media/dvb/frontends/isl6423.h | 63 - drivers/media/dvb/frontends/it913x-fe-priv.h | 1051 ---- drivers/media/dvb/frontends/it913x-fe.c | 1045 ---- drivers/media/dvb/frontends/it913x-fe.h | 237 - drivers/media/dvb/frontends/itd1000.c | 399 -- drivers/media/dvb/frontends/itd1000.h | 42 - drivers/media/dvb/frontends/itd1000_priv.h | 88 - drivers/media/dvb/frontends/ix2505v.c | 325 -- drivers/media/dvb/frontends/ix2505v.h | 64 - drivers/media/dvb/frontends/l64781.c | 609 --- drivers/media/dvb/frontends/l64781.h | 46 - drivers/media/dvb/frontends/lg2160.c | 1468 ----- drivers/media/dvb/frontends/lg2160.h | 84 - drivers/media/dvb/frontends/lgdt3305.c | 1222 ----- drivers/media/dvb/frontends/lgdt3305.h | 91 - drivers/media/dvb/frontends/lgdt330x.c | 831 --- drivers/media/dvb/frontends/lgdt330x.h | 73 - drivers/media/dvb/frontends/lgdt330x_priv.h | 77 - drivers/media/dvb/frontends/lgs8gl5.c | 453 -- drivers/media/dvb/frontends/lgs8gl5.h | 45 - drivers/media/dvb/frontends/lgs8gxx.c | 1075 ---- drivers/media/dvb/frontends/lgs8gxx.h | 95 - drivers/media/dvb/frontends/lgs8gxx_priv.h | 70 - drivers/media/dvb/frontends/lnbh24.h | 55 - drivers/media/dvb/frontends/lnbp21.c | 188 - drivers/media/dvb/frontends/lnbp21.h | 75 - drivers/media/dvb/frontends/lnbp22.c | 148 - drivers/media/dvb/frontends/lnbp22.h | 57 - drivers/media/dvb/frontends/m88rs2000.c | 919 ---- drivers/media/dvb/frontends/m88rs2000.h | 66 - drivers/media/dvb/frontends/mb86a16.c | 1878 ------- drivers/media/dvb/frontends/mb86a16.h | 52 - drivers/media/dvb/frontends/mb86a16_priv.h | 151 - drivers/media/dvb/frontends/mb86a20s.c | 701 --- drivers/media/dvb/frontends/mb86a20s.h | 52 - drivers/media/dvb/frontends/mt312.c | 839 --- drivers/media/dvb/frontends/mt312.h | 51 - drivers/media/dvb/frontends/mt312_priv.h | 165 - drivers/media/dvb/frontends/mt352.c | 610 --- drivers/media/dvb/frontends/mt352.h | 73 - drivers/media/dvb/frontends/mt352_priv.h | 127 - drivers/media/dvb/frontends/nxt200x.c | 1242 ----- drivers/media/dvb/frontends/nxt200x.h | 63 - drivers/media/dvb/frontends/nxt6000.c | 616 --- drivers/media/dvb/frontends/nxt6000.h | 48 - drivers/media/dvb/frontends/nxt6000_priv.h | 286 - drivers/media/dvb/frontends/or51132.c | 631 --- drivers/media/dvb/frontends/or51132.h | 55 - drivers/media/dvb/frontends/or51211.c | 581 -- drivers/media/dvb/frontends/or51211.h | 53 - drivers/media/dvb/frontends/rtl2830.c | 757 --- drivers/media/dvb/frontends/rtl2830.h | 97 - drivers/media/dvb/frontends/rtl2830_priv.h | 58 - drivers/media/dvb/frontends/rtl2832.c | 789 --- drivers/media/dvb/frontends/rtl2832.h | 74 - drivers/media/dvb/frontends/rtl2832_priv.h | 260 - drivers/media/dvb/frontends/s5h1409.c | 1029 ---- drivers/media/dvb/frontends/s5h1409.h | 88 - drivers/media/dvb/frontends/s5h1411.c | 951 ---- drivers/media/dvb/frontends/s5h1411.h | 90 - drivers/media/dvb/frontends/s5h1420.c | 960 ---- drivers/media/dvb/frontends/s5h1420.h | 61 - drivers/media/dvb/frontends/s5h1420_priv.h | 102 - drivers/media/dvb/frontends/s5h1432.c | 407 -- drivers/media/dvb/frontends/s5h1432.h | 91 - drivers/media/dvb/frontends/s921.c | 549 -- drivers/media/dvb/frontends/s921.h | 47 - drivers/media/dvb/frontends/si21xx.c | 951 ---- drivers/media/dvb/frontends/si21xx.h | 37 - drivers/media/dvb/frontends/sp8870.c | 620 --- drivers/media/dvb/frontends/sp8870.h | 50 - drivers/media/dvb/frontends/sp887x.c | 629 --- drivers/media/dvb/frontends/sp887x.h | 32 - drivers/media/dvb/frontends/stb0899_algo.c | 1525 ------ drivers/media/dvb/frontends/stb0899_cfg.h | 287 - drivers/media/dvb/frontends/stb0899_drv.c | 1651 ------ drivers/media/dvb/frontends/stb0899_drv.h | 162 - drivers/media/dvb/frontends/stb0899_priv.h | 263 - drivers/media/dvb/frontends/stb0899_reg.h | 2027 ------- drivers/media/dvb/frontends/stb6000.c | 256 - drivers/media/dvb/frontends/stb6000.h | 51 - drivers/media/dvb/frontends/stb6100.c | 611 --- drivers/media/dvb/frontends/stb6100.h | 115 - drivers/media/dvb/frontends/stb6100_cfg.h | 104 - drivers/media/dvb/frontends/stb6100_proc.h | 138 - drivers/media/dvb/frontends/stv0288.c | 626 --- drivers/media/dvb/frontends/stv0288.h | 67 - drivers/media/dvb/frontends/stv0297.c | 722 --- drivers/media/dvb/frontends/stv0297.h | 57 - drivers/media/dvb/frontends/stv0299.c | 762 --- drivers/media/dvb/frontends/stv0299.h | 118 - drivers/media/dvb/frontends/stv0367.c | 3450 ------------ drivers/media/dvb/frontends/stv0367.h | 66 - drivers/media/dvb/frontends/stv0367_priv.h | 212 - drivers/media/dvb/frontends/stv0367_regs.h | 3614 ------------ drivers/media/dvb/frontends/stv0900.h | 74 - drivers/media/dvb/frontends/stv0900_core.c | 1959 ------- drivers/media/dvb/frontends/stv0900_init.h | 584 -- drivers/media/dvb/frontends/stv0900_priv.h | 408 -- drivers/media/dvb/frontends/stv0900_reg.h | 3981 -------------- drivers/media/dvb/frontends/stv0900_sw.c | 2032 ------- drivers/media/dvb/frontends/stv090x.c | 4823 ---------------- drivers/media/dvb/frontends/stv090x.h | 134 - drivers/media/dvb/frontends/stv090x_priv.h | 279 - drivers/media/dvb/frontends/stv090x_reg.h | 2371 -------- drivers/media/dvb/frontends/stv6110.c | 451 -- drivers/media/dvb/frontends/stv6110.h | 63 - drivers/media/dvb/frontends/stv6110x.c | 405 -- drivers/media/dvb/frontends/stv6110x.h | 73 - drivers/media/dvb/frontends/stv6110x_priv.h | 76 - drivers/media/dvb/frontends/stv6110x_reg.h | 82 - drivers/media/dvb/frontends/tda10021.c | 528 -- drivers/media/dvb/frontends/tda10023.c | 610 --- drivers/media/dvb/frontends/tda1002x.h | 87 - drivers/media/dvb/frontends/tda10048.c | 1191 ---- drivers/media/dvb/frontends/tda10048.h | 90 - drivers/media/dvb/frontends/tda1004x.c | 1381 ----- drivers/media/dvb/frontends/tda1004x.h | 149 - drivers/media/dvb/frontends/tda10071.c | 1284 ----- drivers/media/dvb/frontends/tda10071.h | 81 - drivers/media/dvb/frontends/tda10071_priv.h | 109 - drivers/media/dvb/frontends/tda10086.c | 777 --- drivers/media/dvb/frontends/tda10086.h | 61 - drivers/media/dvb/frontends/tda18271c2dd.c | 1246 ----- drivers/media/dvb/frontends/tda18271c2dd.h | 16 - drivers/media/dvb/frontends/tda18271c2dd_maps.h | 814 --- drivers/media/dvb/frontends/tda665x.c | 258 - drivers/media/dvb/frontends/tda665x.h | 52 - drivers/media/dvb/frontends/tda8083.c | 487 -- drivers/media/dvb/frontends/tda8083.h | 50 - drivers/media/dvb/frontends/tda8261.c | 230 - drivers/media/dvb/frontends/tda8261.h | 55 - drivers/media/dvb/frontends/tda8261_cfg.h | 84 - drivers/media/dvb/frontends/tda826x.c | 188 - drivers/media/dvb/frontends/tda826x.h | 53 - drivers/media/dvb/frontends/tdhd1.h | 74 - drivers/media/dvb/frontends/tua6100.c | 206 - drivers/media/dvb/frontends/tua6100.h | 47 - drivers/media/dvb/frontends/ves1820.c | 447 -- drivers/media/dvb/frontends/ves1820.h | 56 - drivers/media/dvb/frontends/ves1x93.c | 553 -- drivers/media/dvb/frontends/ves1x93.h | 55 - drivers/media/dvb/frontends/z0194a.h | 85 - drivers/media/dvb/frontends/zl10036.c | 520 -- drivers/media/dvb/frontends/zl10036.h | 53 - drivers/media/dvb/frontends/zl10039.c | 307 -- drivers/media/dvb/frontends/zl10039.h | 40 - drivers/media/dvb/frontends/zl10353.c | 684 --- drivers/media/dvb/frontends/zl10353.h | 62 - drivers/media/dvb/frontends/zl10353_priv.h | 79 - drivers/media/dvb/mantis/Makefile | 2 +- drivers/media/dvb/ngene/Makefile | 2 +- drivers/media/dvb/pluto2/Makefile | 2 +- drivers/media/dvb/pt1/Makefile | 2 +- drivers/media/dvb/ttpci/Makefile | 2 +- drivers/media/dvb/ttusb-budget/Makefile | 2 +- 252 files changed, 13 insertions(+), 128848 deletions(-) delete mode 100644 drivers/media/dvb/frontends/Kconfig delete mode 100644 drivers/media/dvb/frontends/Makefile delete mode 100644 drivers/media/dvb/frontends/a8293.c delete mode 100644 drivers/media/dvb/frontends/a8293.h delete mode 100644 drivers/media/dvb/frontends/af9013.c delete mode 100644 drivers/media/dvb/frontends/af9013.h delete mode 100644 drivers/media/dvb/frontends/af9013_priv.h delete mode 100644 drivers/media/dvb/frontends/af9033.c delete mode 100644 drivers/media/dvb/frontends/af9033.h delete mode 100644 drivers/media/dvb/frontends/af9033_priv.h delete mode 100644 drivers/media/dvb/frontends/atbm8830.c delete mode 100644 drivers/media/dvb/frontends/atbm8830.h delete mode 100644 drivers/media/dvb/frontends/atbm8830_priv.h delete mode 100644 drivers/media/dvb/frontends/au8522.h delete mode 100644 drivers/media/dvb/frontends/au8522_common.c delete mode 100644 drivers/media/dvb/frontends/au8522_decoder.c delete mode 100644 drivers/media/dvb/frontends/au8522_dig.c delete mode 100644 drivers/media/dvb/frontends/au8522_priv.h delete mode 100644 drivers/media/dvb/frontends/bcm3510.c delete mode 100644 drivers/media/dvb/frontends/bcm3510.h delete mode 100644 drivers/media/dvb/frontends/bcm3510_priv.h delete mode 100644 drivers/media/dvb/frontends/bsbe1-d01a.h delete mode 100644 drivers/media/dvb/frontends/bsbe1.h delete mode 100644 drivers/media/dvb/frontends/bsru6.h delete mode 100644 drivers/media/dvb/frontends/cx22700.c delete mode 100644 drivers/media/dvb/frontends/cx22700.h delete mode 100644 drivers/media/dvb/frontends/cx22702.c delete mode 100644 drivers/media/dvb/frontends/cx22702.h delete mode 100644 drivers/media/dvb/frontends/cx24110.c delete mode 100644 drivers/media/dvb/frontends/cx24110.h delete mode 100644 drivers/media/dvb/frontends/cx24113.c delete mode 100644 drivers/media/dvb/frontends/cx24113.h delete mode 100644 drivers/media/dvb/frontends/cx24116.c delete mode 100644 drivers/media/dvb/frontends/cx24116.h delete mode 100644 drivers/media/dvb/frontends/cx24123.c delete mode 100644 drivers/media/dvb/frontends/cx24123.h delete mode 100644 drivers/media/dvb/frontends/cxd2820r.h delete mode 100644 drivers/media/dvb/frontends/cxd2820r_c.c delete mode 100644 drivers/media/dvb/frontends/cxd2820r_core.c delete mode 100644 drivers/media/dvb/frontends/cxd2820r_priv.h delete mode 100644 drivers/media/dvb/frontends/cxd2820r_t.c delete mode 100644 drivers/media/dvb/frontends/cxd2820r_t2.c delete mode 100644 drivers/media/dvb/frontends/dib0070.c delete mode 100644 drivers/media/dvb/frontends/dib0070.h delete mode 100644 drivers/media/dvb/frontends/dib0090.c delete mode 100644 drivers/media/dvb/frontends/dib0090.h delete mode 100644 drivers/media/dvb/frontends/dib3000.h delete mode 100644 drivers/media/dvb/frontends/dib3000mb.c delete mode 100644 drivers/media/dvb/frontends/dib3000mb_priv.h delete mode 100644 drivers/media/dvb/frontends/dib3000mc.c delete mode 100644 drivers/media/dvb/frontends/dib3000mc.h delete mode 100644 drivers/media/dvb/frontends/dib7000m.c delete mode 100644 drivers/media/dvb/frontends/dib7000m.h delete mode 100644 drivers/media/dvb/frontends/dib7000p.c delete mode 100644 drivers/media/dvb/frontends/dib7000p.h delete mode 100644 drivers/media/dvb/frontends/dib8000.c delete mode 100644 drivers/media/dvb/frontends/dib8000.h delete mode 100644 drivers/media/dvb/frontends/dib9000.c delete mode 100644 drivers/media/dvb/frontends/dib9000.h delete mode 100644 drivers/media/dvb/frontends/dibx000_common.c delete mode 100644 drivers/media/dvb/frontends/dibx000_common.h delete mode 100644 drivers/media/dvb/frontends/drxd.h delete mode 100644 drivers/media/dvb/frontends/drxd_firm.c delete mode 100644 drivers/media/dvb/frontends/drxd_firm.h delete mode 100644 drivers/media/dvb/frontends/drxd_hard.c delete mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h delete mode 100644 drivers/media/dvb/frontends/drxk.h delete mode 100644 drivers/media/dvb/frontends/drxk_hard.c delete mode 100644 drivers/media/dvb/frontends/drxk_hard.h delete mode 100644 drivers/media/dvb/frontends/drxk_map.h delete mode 100644 drivers/media/dvb/frontends/ds3000.c delete mode 100644 drivers/media/dvb/frontends/ds3000.h delete mode 100644 drivers/media/dvb/frontends/dvb-pll.c delete mode 100644 drivers/media/dvb/frontends/dvb-pll.h delete mode 100644 drivers/media/dvb/frontends/dvb_dummy_fe.c delete mode 100644 drivers/media/dvb/frontends/dvb_dummy_fe.h delete mode 100644 drivers/media/dvb/frontends/ec100.c delete mode 100644 drivers/media/dvb/frontends/ec100.h delete mode 100644 drivers/media/dvb/frontends/ec100_priv.h delete mode 100644 drivers/media/dvb/frontends/eds1547.h delete mode 100644 drivers/media/dvb/frontends/hd29l2.c delete mode 100644 drivers/media/dvb/frontends/hd29l2.h delete mode 100644 drivers/media/dvb/frontends/hd29l2_priv.h delete mode 100644 drivers/media/dvb/frontends/isl6405.c delete mode 100644 drivers/media/dvb/frontends/isl6405.h delete mode 100644 drivers/media/dvb/frontends/isl6421.c delete mode 100644 drivers/media/dvb/frontends/isl6421.h delete mode 100644 drivers/media/dvb/frontends/isl6423.c delete mode 100644 drivers/media/dvb/frontends/isl6423.h delete mode 100644 drivers/media/dvb/frontends/it913x-fe-priv.h delete mode 100644 drivers/media/dvb/frontends/it913x-fe.c delete mode 100644 drivers/media/dvb/frontends/it913x-fe.h delete mode 100644 drivers/media/dvb/frontends/itd1000.c delete mode 100644 drivers/media/dvb/frontends/itd1000.h delete mode 100644 drivers/media/dvb/frontends/itd1000_priv.h delete mode 100644 drivers/media/dvb/frontends/ix2505v.c delete mode 100644 drivers/media/dvb/frontends/ix2505v.h delete mode 100644 drivers/media/dvb/frontends/l64781.c delete mode 100644 drivers/media/dvb/frontends/l64781.h delete mode 100644 drivers/media/dvb/frontends/lg2160.c delete mode 100644 drivers/media/dvb/frontends/lg2160.h delete mode 100644 drivers/media/dvb/frontends/lgdt3305.c delete mode 100644 drivers/media/dvb/frontends/lgdt3305.h delete mode 100644 drivers/media/dvb/frontends/lgdt330x.c delete mode 100644 drivers/media/dvb/frontends/lgdt330x.h delete mode 100644 drivers/media/dvb/frontends/lgdt330x_priv.h delete mode 100644 drivers/media/dvb/frontends/lgs8gl5.c delete mode 100644 drivers/media/dvb/frontends/lgs8gl5.h delete mode 100644 drivers/media/dvb/frontends/lgs8gxx.c delete mode 100644 drivers/media/dvb/frontends/lgs8gxx.h delete mode 100644 drivers/media/dvb/frontends/lgs8gxx_priv.h delete mode 100644 drivers/media/dvb/frontends/lnbh24.h delete mode 100644 drivers/media/dvb/frontends/lnbp21.c delete mode 100644 drivers/media/dvb/frontends/lnbp21.h delete mode 100644 drivers/media/dvb/frontends/lnbp22.c delete mode 100644 drivers/media/dvb/frontends/lnbp22.h delete mode 100644 drivers/media/dvb/frontends/m88rs2000.c delete mode 100644 drivers/media/dvb/frontends/m88rs2000.h delete mode 100644 drivers/media/dvb/frontends/mb86a16.c delete mode 100644 drivers/media/dvb/frontends/mb86a16.h delete mode 100644 drivers/media/dvb/frontends/mb86a16_priv.h delete mode 100644 drivers/media/dvb/frontends/mb86a20s.c delete mode 100644 drivers/media/dvb/frontends/mb86a20s.h delete mode 100644 drivers/media/dvb/frontends/mt312.c delete mode 100644 drivers/media/dvb/frontends/mt312.h delete mode 100644 drivers/media/dvb/frontends/mt312_priv.h delete mode 100644 drivers/media/dvb/frontends/mt352.c delete mode 100644 drivers/media/dvb/frontends/mt352.h delete mode 100644 drivers/media/dvb/frontends/mt352_priv.h delete mode 100644 drivers/media/dvb/frontends/nxt200x.c delete mode 100644 drivers/media/dvb/frontends/nxt200x.h delete mode 100644 drivers/media/dvb/frontends/nxt6000.c delete mode 100644 drivers/media/dvb/frontends/nxt6000.h delete mode 100644 drivers/media/dvb/frontends/nxt6000_priv.h delete mode 100644 drivers/media/dvb/frontends/or51132.c delete mode 100644 drivers/media/dvb/frontends/or51132.h delete mode 100644 drivers/media/dvb/frontends/or51211.c delete mode 100644 drivers/media/dvb/frontends/or51211.h delete mode 100644 drivers/media/dvb/frontends/rtl2830.c delete mode 100644 drivers/media/dvb/frontends/rtl2830.h delete mode 100644 drivers/media/dvb/frontends/rtl2830_priv.h delete mode 100644 drivers/media/dvb/frontends/rtl2832.c delete mode 100644 drivers/media/dvb/frontends/rtl2832.h delete mode 100644 drivers/media/dvb/frontends/rtl2832_priv.h delete mode 100644 drivers/media/dvb/frontends/s5h1409.c delete mode 100644 drivers/media/dvb/frontends/s5h1409.h delete mode 100644 drivers/media/dvb/frontends/s5h1411.c delete mode 100644 drivers/media/dvb/frontends/s5h1411.h delete mode 100644 drivers/media/dvb/frontends/s5h1420.c delete mode 100644 drivers/media/dvb/frontends/s5h1420.h delete mode 100644 drivers/media/dvb/frontends/s5h1420_priv.h delete mode 100644 drivers/media/dvb/frontends/s5h1432.c delete mode 100644 drivers/media/dvb/frontends/s5h1432.h delete mode 100644 drivers/media/dvb/frontends/s921.c delete mode 100644 drivers/media/dvb/frontends/s921.h delete mode 100644 drivers/media/dvb/frontends/si21xx.c delete mode 100644 drivers/media/dvb/frontends/si21xx.h delete mode 100644 drivers/media/dvb/frontends/sp8870.c delete mode 100644 drivers/media/dvb/frontends/sp8870.h delete mode 100644 drivers/media/dvb/frontends/sp887x.c delete mode 100644 drivers/media/dvb/frontends/sp887x.h delete mode 100644 drivers/media/dvb/frontends/stb0899_algo.c delete mode 100644 drivers/media/dvb/frontends/stb0899_cfg.h delete mode 100644 drivers/media/dvb/frontends/stb0899_drv.c delete mode 100644 drivers/media/dvb/frontends/stb0899_drv.h delete mode 100644 drivers/media/dvb/frontends/stb0899_priv.h delete mode 100644 drivers/media/dvb/frontends/stb0899_reg.h delete mode 100644 drivers/media/dvb/frontends/stb6000.c delete mode 100644 drivers/media/dvb/frontends/stb6000.h delete mode 100644 drivers/media/dvb/frontends/stb6100.c delete mode 100644 drivers/media/dvb/frontends/stb6100.h delete mode 100644 drivers/media/dvb/frontends/stb6100_cfg.h delete mode 100644 drivers/media/dvb/frontends/stb6100_proc.h delete mode 100644 drivers/media/dvb/frontends/stv0288.c delete mode 100644 drivers/media/dvb/frontends/stv0288.h delete mode 100644 drivers/media/dvb/frontends/stv0297.c delete mode 100644 drivers/media/dvb/frontends/stv0297.h delete mode 100644 drivers/media/dvb/frontends/stv0299.c delete mode 100644 drivers/media/dvb/frontends/stv0299.h delete mode 100644 drivers/media/dvb/frontends/stv0367.c delete mode 100644 drivers/media/dvb/frontends/stv0367.h delete mode 100644 drivers/media/dvb/frontends/stv0367_priv.h delete mode 100644 drivers/media/dvb/frontends/stv0367_regs.h delete mode 100644 drivers/media/dvb/frontends/stv0900.h delete mode 100644 drivers/media/dvb/frontends/stv0900_core.c delete mode 100644 drivers/media/dvb/frontends/stv0900_init.h delete mode 100644 drivers/media/dvb/frontends/stv0900_priv.h delete mode 100644 drivers/media/dvb/frontends/stv0900_reg.h delete mode 100644 drivers/media/dvb/frontends/stv0900_sw.c delete mode 100644 drivers/media/dvb/frontends/stv090x.c delete mode 100644 drivers/media/dvb/frontends/stv090x.h delete mode 100644 drivers/media/dvb/frontends/stv090x_priv.h delete mode 100644 drivers/media/dvb/frontends/stv090x_reg.h delete mode 100644 drivers/media/dvb/frontends/stv6110.c delete mode 100644 drivers/media/dvb/frontends/stv6110.h delete mode 100644 drivers/media/dvb/frontends/stv6110x.c delete mode 100644 drivers/media/dvb/frontends/stv6110x.h delete mode 100644 drivers/media/dvb/frontends/stv6110x_priv.h delete mode 100644 drivers/media/dvb/frontends/stv6110x_reg.h delete mode 100644 drivers/media/dvb/frontends/tda10021.c delete mode 100644 drivers/media/dvb/frontends/tda10023.c delete mode 100644 drivers/media/dvb/frontends/tda1002x.h delete mode 100644 drivers/media/dvb/frontends/tda10048.c delete mode 100644 drivers/media/dvb/frontends/tda10048.h delete mode 100644 drivers/media/dvb/frontends/tda1004x.c delete mode 100644 drivers/media/dvb/frontends/tda1004x.h delete mode 100644 drivers/media/dvb/frontends/tda10071.c delete mode 100644 drivers/media/dvb/frontends/tda10071.h delete mode 100644 drivers/media/dvb/frontends/tda10071_priv.h delete mode 100644 drivers/media/dvb/frontends/tda10086.c delete mode 100644 drivers/media/dvb/frontends/tda10086.h delete mode 100644 drivers/media/dvb/frontends/tda18271c2dd.c delete mode 100644 drivers/media/dvb/frontends/tda18271c2dd.h delete mode 100644 drivers/media/dvb/frontends/tda18271c2dd_maps.h delete mode 100644 drivers/media/dvb/frontends/tda665x.c delete mode 100644 drivers/media/dvb/frontends/tda665x.h delete mode 100644 drivers/media/dvb/frontends/tda8083.c delete mode 100644 drivers/media/dvb/frontends/tda8083.h delete mode 100644 drivers/media/dvb/frontends/tda8261.c delete mode 100644 drivers/media/dvb/frontends/tda8261.h delete mode 100644 drivers/media/dvb/frontends/tda8261_cfg.h delete mode 100644 drivers/media/dvb/frontends/tda826x.c delete mode 100644 drivers/media/dvb/frontends/tda826x.h delete mode 100644 drivers/media/dvb/frontends/tdhd1.h delete mode 100644 drivers/media/dvb/frontends/tua6100.c delete mode 100644 drivers/media/dvb/frontends/tua6100.h delete mode 100644 drivers/media/dvb/frontends/ves1820.c delete mode 100644 drivers/media/dvb/frontends/ves1820.h delete mode 100644 drivers/media/dvb/frontends/ves1x93.c delete mode 100644 drivers/media/dvb/frontends/ves1x93.h delete mode 100644 drivers/media/dvb/frontends/z0194a.h delete mode 100644 drivers/media/dvb/frontends/zl10036.c delete mode 100644 drivers/media/dvb/frontends/zl10036.h delete mode 100644 drivers/media/dvb/frontends/zl10039.c delete mode 100644 drivers/media/dvb/frontends/zl10039.h delete mode 100644 drivers/media/dvb/frontends/zl10353.c delete mode 100644 drivers/media/dvb/frontends/zl10353.h delete mode 100644 drivers/media/dvb/frontends/zl10353_priv.h (limited to 'drivers/media/dvb') diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index 5a2c4bd75480..e610c361d185 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig @@ -59,8 +59,4 @@ comment "Supported ddbridge ('Octopus') Adapters" depends on DVB_CORE && PCI && I2C source "drivers/media/dvb/ddbridge/Kconfig" -comment "Supported DVB Frontends" - depends on DVB_CORE -source "drivers/media/dvb/frontends/Kconfig" - endif # DVB_CAPTURE_DRIVERS diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile index b14aa9dd0156..0cee8f82a5d4 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/dvb/Makefile @@ -2,8 +2,7 @@ # Makefile for the kernel multimedia device drivers. # -obj-y := frontends/ \ - ttpci/ \ +obj-y := ttpci/ \ ttusb-dec/ \ ttusb-budget/ \ b2c2/ \ diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile index e4291e4aba23..7a1f5ce6d322 100644 --- a/drivers/media/dvb/b2c2/Makefile +++ b/drivers/media/dvb/b2c2/Makefile @@ -12,5 +12,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o b2c2-flexcop-usb-objs = flexcop-usb.o obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o -ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/ +ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/ ccflags-y += -Idrivers/media/common/tuners/ diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile index 7c2dd04d37e4..36591ae505f4 100644 --- a/drivers/media/dvb/bt8xx/Makefile +++ b/drivers/media/dvb/bt8xx/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o ccflags-y += -Idrivers/media/dvb-core -ccflags-y += -Idrivers/media/dvb/frontends +ccflags-y += -Idrivers/media/dvb-frontends ccflags-y += -Idrivers/media/video/bt8xx ccflags-y += -Idrivers/media/common/tuners diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile index 9eca27dd7328..9d083c98ce58 100644 --- a/drivers/media/dvb/ddbridge/Makefile +++ b/drivers/media/dvb/ddbridge/Makefile @@ -7,7 +7,7 @@ ddbridge-objs := ddbridge-core.o obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o ccflags-y += -Idrivers/media/dvb-core/ -ccflags-y += -Idrivers/media/dvb/frontends/ +ccflags-y += -Idrivers/media/dvb-frontends/ ccflags-y += -Idrivers/media/common/tuners/ # For the staging CI driver cxd2099 diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/dvb/dm1105/Makefile index 0dc5963ee807..327585143c83 100644 --- a/drivers/media/dvb/dm1105/Makefile +++ b/drivers/media/dvb/dm1105/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_DVB_DM1105) += dm1105.o -ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends +ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends diff --git a/drivers/media/dvb/dvb-usb-v2/Makefile b/drivers/media/dvb/dvb-usb-v2/Makefile index 9fef543dac21..24248b3acd4f 100644 --- a/drivers/media/dvb/dvb-usb-v2/Makefile +++ b/drivers/media/dvb/dvb-usb-v2/Makefile @@ -43,6 +43,6 @@ dvb-usb-rtl28xxu-objs = rtl28xxu.o obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o ccflags-y += -I$(srctree)/drivers/media/dvb-core -ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/ +ccflags-y += -I$(srctree)/drivers/media/dvb-frontends ccflags-y += -I$(srctree)/drivers/media/common/tuners diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile index cc95b116bbc2..a5630e30eadc 100644 --- a/drivers/media/dvb/dvb-usb/Makefile +++ b/drivers/media/dvb/dvb-usb/Makefile @@ -76,7 +76,7 @@ dvb-usb-technisat-usb2-objs = technisat-usb2.o obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o ccflags-y += -I$(srctree)/drivers/media/dvb-core -ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/ +ccflags-y += -I$(srctree)/drivers/media/dvb-frontends/ # due to tuner-xc3028 ccflags-y += -I$(srctree)/drivers/media/common/tuners ccflags-y += -I$(srctree)/drivers/media/dvb/ttpci diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig deleted file mode 100644 index a08c2152d0ee..000000000000 --- a/drivers/media/dvb/frontends/Kconfig +++ /dev/null @@ -1,756 +0,0 @@ -config DVB_FE_CUSTOMISE - bool "Customise the frontend modules to build" - depends on DVB_CORE - depends on EXPERT - default y if EXPERT - help - This allows the user to select/deselect frontend drivers for their - hardware from the build. - - Use this option with care as deselecting frontends which are in fact - necessary will result in DVB devices which cannot be tuned due to lack - of driver support. - - If unsure say N. - -menu "Customise DVB Frontends" - visible if DVB_FE_CUSTOMISE - -comment "Multistandard (satellite) frontends" - depends on DVB_CORE - -config DVB_STB0899 - tristate "STB0899 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S/S2/DSS Multistandard demodulator. Say Y when you want - to support this demodulator based frontends - -config DVB_STB6100 - tristate "STB6100 based tuners" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A Silicon tuner from ST used in conjunction with the STB0899 - demodulator. Say Y when you want to support this tuner. - -config DVB_STV090x - tristate "STV0900/STV0903(A/B) based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - DVB-S/S2/DSS Multistandard Professional/Broadcast demodulators. - Say Y when you want to support these frontends. - -config DVB_STV6110x - tristate "STV6110/(A) based tuners" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A Silicon tuner that supports DVB-S and DVB-S2 modes - -comment "Multistandard (cable + terrestrial) frontends" - depends on DVB_CORE - -config DVB_DRXK - tristate "Micronas DRXK based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Micronas DRX-K DVB-C/T demodulator. - - Say Y when you want to support this frontend. - -config DVB_TDA18271C2DD - tristate "NXP TDA18271C2 silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - NXP TDA18271 silicon tuner. - - Say Y when you want to support this tuner. - -comment "DVB-S (satellite) frontends" - depends on DVB_CORE - -config DVB_CX24110 - tristate "Conexant CX24110 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_CX24123 - tristate "Conexant CX24123 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_MT312 - tristate "Zarlink VP310/MT312/ZL10313 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_ZL10036 - tristate "Zarlink ZL10036 silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_ZL10039 - tristate "Zarlink ZL10039 silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_S5H1420 - tristate "Samsung S5H1420 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_STV0288 - tristate "ST STV0288 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_STB6000 - tristate "ST STB6000 silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S silicon tuner module. Say Y when you want to support this tuner. - -config DVB_STV0299 - tristate "ST STV0299 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_STV6110 - tristate "ST STV6110 silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S silicon tuner module. Say Y when you want to support this tuner. - -config DVB_STV0900 - tristate "ST STV0900 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S/S2 demodulator. Say Y when you want to support this frontend. - -config DVB_TDA8083 - tristate "Philips TDA8083 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_TDA10086 - tristate "Philips TDA10086 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_TDA8261 - tristate "Philips TDA8261 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_VES1X93 - tristate "VLSI VES1893 or VES1993 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_TUNER_ITD1000 - tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_TUNER_CX24113 - tristate "Conexant CX24113/CX24128 tuner for DVB-S/DSS" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - - -config DVB_TDA826X - tristate "Philips TDA826X silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S silicon tuner module. Say Y when you want to support this tuner. - -config DVB_TUA6100 - tristate "Infineon TUA6100 PLL" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S PLL chip. - -config DVB_CX24116 - tristate "Conexant CX24116 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S/S2 tuner module. Say Y when you want to support this frontend. - -config DVB_SI21XX - tristate "Silicon Labs SI21XX based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_DS3000 - tristate "Montage Tehnology DS3000 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S/S2 tuner module. Say Y when you want to support this frontend. - -config DVB_MB86A16 - tristate "Fujitsu MB86A16 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S/DSS Direct Conversion reveiver. - Say Y when you want to support this frontend. - -config DVB_TDA10071 - tristate "NXP TDA10071" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Say Y when you want to support this frontend. - -comment "DVB-T (terrestrial) frontends" - depends on DVB_CORE - -config DVB_SP8870 - tristate "Spase sp8870 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - - This driver needs external firmware. Please use the command - "/Documentation/dvb/get_dvb_firmware sp8870" to - download/extract it, and then copy it to /usr/lib/hotplug/firmware - or /lib/firmware (depending on configuration of firmware hotplug). - -config DVB_SP887X - tristate "Spase sp887x based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - - This driver needs external firmware. Please use the command - "/Documentation/dvb/get_dvb_firmware sp887x" to - download/extract it, and then copy it to /usr/lib/hotplug/firmware - or /lib/firmware (depending on configuration of firmware hotplug). - -config DVB_CX22700 - tristate "Conexant CX22700 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_CX22702 - tristate "Conexant cx22702 demodulator (OFDM)" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_S5H1432 - tristate "Samsung s5h1432 demodulator (OFDM)" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_DRXD - tristate "Micronas DRXD driver" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - - Note: this driver was based on vendor driver reference code (released - under the GPL) as opposed to the existing drx397xd driver, which - was written via reverse engineering. - -config DVB_L64781 - tristate "LSI L64781" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_TDA1004X - tristate "Philips TDA10045H/TDA10046H based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - - This driver needs external firmware. Please use the commands - "/Documentation/dvb/get_dvb_firmware tda10045", - "/Documentation/dvb/get_dvb_firmware tda10046" to - download/extract them, and then copy them to /usr/lib/hotplug/firmware - or /lib/firmware (depending on configuration of firmware hotplug). - -config DVB_NXT6000 - tristate "NxtWave Communications NXT6000 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_MT352 - tristate "Zarlink MT352 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_ZL10353 - tristate "Zarlink ZL10353 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_DIB3000MB - tristate "DiBcom 3000M-B" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Designed for mobile usage. Say Y when you want - to support this frontend. - -config DVB_DIB3000MC - tristate "DiBcom 3000P/M-C" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Designed for mobile usage. Say Y when you want - to support this frontend. - -config DVB_DIB7000M - tristate "DiBcom 7000MA/MB/PA/PB/MC" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Designed for mobile usage. Say Y when you want - to support this frontend. - -config DVB_DIB7000P - tristate "DiBcom 7000PC" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Designed for mobile usage. Say Y when you want - to support this frontend. - -config DVB_DIB9000 - tristate "DiBcom 9000" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Designed for mobile usage. Say Y when you want - to support this frontend. - -config DVB_TDA10048 - tristate "Philips TDA10048HN based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. Say Y when you want to support this frontend. - -config DVB_AF9013 - tristate "Afatech AF9013 demodulator" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Say Y when you want to support this frontend. - -config DVB_EC100 - tristate "E3C EC100" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Say Y when you want to support this frontend. - -config DVB_HD29L2 - tristate "HDIC HD29L2" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Say Y when you want to support this frontend. - -config DVB_STV0367 - tristate "ST STV0367 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T/C tuner module. Say Y when you want to support this frontend. - -config DVB_CXD2820R - tristate "Sony CXD2820R" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Say Y when you want to support this frontend. - -config DVB_RTL2830 - tristate "Realtek RTL2830 DVB-T" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Say Y when you want to support this frontend. - -config DVB_RTL2832 - tristate "Realtek RTL2832 DVB-T" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Say Y when you want to support this frontend. - -comment "DVB-C (cable) frontends" - depends on DVB_CORE - -config DVB_VES1820 - tristate "VLSI VES1820 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-C tuner module. Say Y when you want to support this frontend. - -config DVB_TDA10021 - tristate "Philips TDA10021 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-C tuner module. Say Y when you want to support this frontend. - -config DVB_TDA10023 - tristate "Philips TDA10023 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-C tuner module. Say Y when you want to support this frontend. - -config DVB_STV0297 - tristate "ST STV0297 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-C tuner module. Say Y when you want to support this frontend. - -comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends" - depends on DVB_CORE - -config DVB_NXT200X - tristate "NxtWave Communications NXT2002/NXT2004 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want - to support this frontend. - - This driver needs external firmware. Please use the commands - "/Documentation/dvb/get_dvb_firmware nxt2002" and - "/Documentation/dvb/get_dvb_firmware nxt2004" to - download/extract them, and then copy them to /usr/lib/hotplug/firmware - or /lib/firmware (depending on configuration of firmware hotplug). - -config DVB_OR51211 - tristate "Oren OR51211 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB tuner module. Say Y when you want to support this frontend. - - This driver needs external firmware. Please use the command - "/Documentation/dvb/get_dvb_firmware or51211" to - download it, and then copy it to /usr/lib/hotplug/firmware - or /lib/firmware (depending on configuration of firmware hotplug). - -config DVB_OR51132 - tristate "Oren OR51132 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want - to support this frontend. - - This driver needs external firmware. Please use the commands - "/Documentation/dvb/get_dvb_firmware or51132_vsb" and/or - "/Documentation/dvb/get_dvb_firmware or51132_qam" to - download firmwares for 8VSB and QAM64/256, respectively. Copy them to - /usr/lib/hotplug/firmware or /lib/firmware (depending on - configuration of firmware hotplug). - -config DVB_BCM3510 - tristate "Broadcom BCM3510" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to - support this frontend. - -config DVB_LGDT330X - tristate "LG Electronics LGDT3302/LGDT3303 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want - to support this frontend. - -config DVB_LGDT3305 - tristate "LG Electronics LGDT3304 and LGDT3305 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want - to support this frontend. - -config DVB_LG2160 - tristate "LG Electronics LG216x based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC/MH demodulator module. Say Y when you want - to support this frontend. - -config DVB_S5H1409 - tristate "Samsung S5H1409 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want - to support this frontend. - -config DVB_AU8522 - depends on I2C - tristate - -config DVB_AU8522_DTV - tristate "Auvitek AU8522 based DTV demod" - depends on DVB_CORE && I2C - select DVB_AU8522 - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB, QAM64/256 & NTSC demodulator module. Say Y when - you want to enable DTV demodulation support for this frontend. - -config DVB_AU8522_V4L - tristate "Auvitek AU8522 based ATV demod" - depends on VIDEO_V4L2 && I2C - select DVB_AU8522 - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB, QAM64/256 & NTSC demodulator module. Say Y when - you want to enable ATV demodulation support for this frontend. - -config DVB_S5H1411 - tristate "Samsung S5H1411 based" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want - to support this frontend. - -comment "ISDB-T (terrestrial) frontends" - depends on DVB_CORE - -config DVB_S921 - tristate "Sharp S921 frontend" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - AN ISDB-T DQPSK, QPSK, 16QAM and 64QAM 1seg tuner module. - Say Y when you want to support this frontend. - -config DVB_DIB8000 - tristate "DiBcom 8000MB/MC" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A driver for DiBcom's DiB8000 ISDB-T/ISDB-Tsb demodulator. - Say Y when you want to support this frontend. - -config DVB_MB86A20S - tristate "Fujitsu mb86a20s" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A driver for Fujitsu mb86a20s ISDB-T/ISDB-Tsb demodulator. - Say Y when you want to support this frontend. - -comment "Digital terrestrial only tuners/PLL" - depends on DVB_CORE - -config DVB_PLL - tristate "Generic I2C PLL based tuners" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - This module drives a number of tuners based on PLL chips with a - common I2C interface. Say Y when you want to support these tuners. - -config DVB_TUNER_DIB0070 - tristate "DiBcom DiB0070 silicon base-band tuner" - depends on I2C - default m if DVB_FE_CUSTOMISE - help - A driver for the silicon baseband tuner DiB0070 from DiBcom. - This device is only used inside a SiP called together with a - demodulator for now. - -config DVB_TUNER_DIB0090 - tristate "DiBcom DiB0090 silicon base-band tuner" - depends on I2C - default m if DVB_FE_CUSTOMISE - help - A driver for the silicon baseband tuner DiB0090 from DiBcom. - This device is only used inside a SiP called together with a - demodulator for now. - -comment "SEC control devices for DVB-S" - depends on DVB_CORE - -config DVB_LNBP21 - tristate "LNBP21/LNBH24 SEC controllers" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An SEC control chips. - -config DVB_LNBP22 - tristate "LNBP22 SEC controllers" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - LNB power supply and control voltage - regulator chip with step-up converter - and I2C interface. - Say Y when you want to support this chip. - -config DVB_ISL6405 - tristate "ISL6405 SEC controller" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An SEC control chip. - -config DVB_ISL6421 - tristate "ISL6421 SEC controller" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - An SEC control chip. - -config DVB_ISL6423 - tristate "ISL6423 SEC controller" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A SEC controller chip from Intersil - -config DVB_A8293 - tristate "Allegro A8293" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - -config DVB_LGS8GL5 - tristate "Silicon Legend LGS-8GL5 demodulator (OFDM)" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DMB-TH tuner module. Say Y when you want to support this frontend. - -config DVB_LGS8GXX - tristate "Legend Silicon LGS8913/LGS8GL5/LGS8GXX DMB-TH demodulator" - depends on DVB_CORE && I2C - select FW_LOADER - default m if DVB_FE_CUSTOMISE - help - A DMB-TH tuner module. Say Y when you want to support this frontend. - -config DVB_ATBM8830 - tristate "AltoBeam ATBM8830/8831 DMB-TH demodulator" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DMB-TH tuner module. Say Y when you want to support this frontend. - -config DVB_TDA665x - tristate "TDA665x tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - Support for tuner modules based on Philips TDA6650/TDA6651 chips. - Say Y when you want to support this chip. - - Currently supported tuners: - * Panasonic ENV57H12D5 (ET-50DT) - -config DVB_IX2505V - tristate "Sharp IX2505V silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - -config DVB_IT913X_FE - tristate "it913x frontend and it9137 tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-T tuner module. - Say Y when you want to support this frontend. - -config DVB_M88RS2000 - tristate "M88RS2000 DVB-S demodulator and tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A DVB-S tuner module. - Say Y when you want to support this frontend. - -config DVB_AF9033 - tristate "Afatech AF9033 DVB-T demodulator" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - -comment "Tools to develop new frontends" - -config DVB_DUMMY_FE - tristate "Dummy frontend driver" - default n -endmenu diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile deleted file mode 100644 index a378c5293764..000000000000 --- a/drivers/media/dvb/frontends/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -# -# Makefile for the kernel DVB frontend device drivers. -# - -ccflags-y += -I$(srctree)/drivers/media/dvb-core/ -ccflags-y += -I$(srctree)/drivers/media/common/tuners/ - -stb0899-objs = stb0899_drv.o stb0899_algo.o -stv0900-objs = stv0900_core.o stv0900_sw.o -drxd-objs = drxd_firm.o drxd_hard.o -cxd2820r-objs = cxd2820r_core.o cxd2820r_c.o cxd2820r_t.o cxd2820r_t2.o -drxk-objs := drxk_hard.o - -obj-$(CONFIG_DVB_PLL) += dvb-pll.o -obj-$(CONFIG_DVB_STV0299) += stv0299.o -obj-$(CONFIG_DVB_STB0899) += stb0899.o -obj-$(CONFIG_DVB_STB6100) += stb6100.o -obj-$(CONFIG_DVB_SP8870) += sp8870.o -obj-$(CONFIG_DVB_CX22700) += cx22700.o -obj-$(CONFIG_DVB_S5H1432) += s5h1432.o -obj-$(CONFIG_DVB_CX24110) += cx24110.o -obj-$(CONFIG_DVB_TDA8083) += tda8083.o -obj-$(CONFIG_DVB_L64781) += l64781.o -obj-$(CONFIG_DVB_DIB3000MB) += dib3000mb.o -obj-$(CONFIG_DVB_DIB3000MC) += dib3000mc.o dibx000_common.o -obj-$(CONFIG_DVB_DIB7000M) += dib7000m.o dibx000_common.o -obj-$(CONFIG_DVB_DIB7000P) += dib7000p.o dibx000_common.o -obj-$(CONFIG_DVB_DIB8000) += dib8000.o dibx000_common.o -obj-$(CONFIG_DVB_DIB9000) += dib9000.o dibx000_common.o -obj-$(CONFIG_DVB_MT312) += mt312.o -obj-$(CONFIG_DVB_VES1820) += ves1820.o -obj-$(CONFIG_DVB_VES1X93) += ves1x93.o -obj-$(CONFIG_DVB_TDA1004X) += tda1004x.o -obj-$(CONFIG_DVB_SP887X) += sp887x.o -obj-$(CONFIG_DVB_NXT6000) += nxt6000.o -obj-$(CONFIG_DVB_MT352) += mt352.o -obj-$(CONFIG_DVB_ZL10036) += zl10036.o -obj-$(CONFIG_DVB_ZL10039) += zl10039.o -obj-$(CONFIG_DVB_ZL10353) += zl10353.o -obj-$(CONFIG_DVB_CX22702) += cx22702.o -obj-$(CONFIG_DVB_DRXD) += drxd.o -obj-$(CONFIG_DVB_TDA10021) += tda10021.o -obj-$(CONFIG_DVB_TDA10023) += tda10023.o -obj-$(CONFIG_DVB_STV0297) += stv0297.o -obj-$(CONFIG_DVB_NXT200X) += nxt200x.o -obj-$(CONFIG_DVB_OR51211) += or51211.o -obj-$(CONFIG_DVB_OR51132) += or51132.o -obj-$(CONFIG_DVB_BCM3510) += bcm3510.o -obj-$(CONFIG_DVB_S5H1420) += s5h1420.o -obj-$(CONFIG_DVB_LGDT330X) += lgdt330x.o -obj-$(CONFIG_DVB_LGDT3305) += lgdt3305.o -obj-$(CONFIG_DVB_LG2160) += lg2160.o -obj-$(CONFIG_DVB_CX24123) += cx24123.o -obj-$(CONFIG_DVB_LNBP21) += lnbp21.o -obj-$(CONFIG_DVB_LNBP22) += lnbp22.o -obj-$(CONFIG_DVB_ISL6405) += isl6405.o -obj-$(CONFIG_DVB_ISL6421) += isl6421.o -obj-$(CONFIG_DVB_TDA10086) += tda10086.o -obj-$(CONFIG_DVB_TDA826X) += tda826x.o -obj-$(CONFIG_DVB_TDA8261) += tda8261.o -obj-$(CONFIG_DVB_TUNER_DIB0070) += dib0070.o -obj-$(CONFIG_DVB_TUNER_DIB0090) += dib0090.o -obj-$(CONFIG_DVB_TUA6100) += tua6100.o -obj-$(CONFIG_DVB_S5H1409) += s5h1409.o -obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o -obj-$(CONFIG_DVB_AU8522) += au8522_common.o -obj-$(CONFIG_DVB_AU8522_DTV) += au8522_dig.o -obj-$(CONFIG_DVB_AU8522_V4L) += au8522_decoder.o -obj-$(CONFIG_DVB_TDA10048) += tda10048.o -obj-$(CONFIG_DVB_TUNER_CX24113) += cx24113.o -obj-$(CONFIG_DVB_S5H1411) += s5h1411.o -obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o -obj-$(CONFIG_DVB_TDA665x) += tda665x.o -obj-$(CONFIG_DVB_LGS8GXX) += lgs8gxx.o -obj-$(CONFIG_DVB_ATBM8830) += atbm8830.o -obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o -obj-$(CONFIG_DVB_AF9013) += af9013.o -obj-$(CONFIG_DVB_CX24116) += cx24116.o -obj-$(CONFIG_DVB_SI21XX) += si21xx.o -obj-$(CONFIG_DVB_STV0288) += stv0288.o -obj-$(CONFIG_DVB_STB6000) += stb6000.o -obj-$(CONFIG_DVB_S921) += s921.o -obj-$(CONFIG_DVB_STV6110) += stv6110.o -obj-$(CONFIG_DVB_STV0900) += stv0900.o -obj-$(CONFIG_DVB_STV090x) += stv090x.o -obj-$(CONFIG_DVB_STV6110x) += stv6110x.o -obj-$(CONFIG_DVB_ISL6423) += isl6423.o -obj-$(CONFIG_DVB_EC100) += ec100.o -obj-$(CONFIG_DVB_HD29L2) += hd29l2.o -obj-$(CONFIG_DVB_DS3000) += ds3000.o -obj-$(CONFIG_DVB_MB86A16) += mb86a16.o -obj-$(CONFIG_DVB_MB86A20S) += mb86a20s.o -obj-$(CONFIG_DVB_IX2505V) += ix2505v.o -obj-$(CONFIG_DVB_STV0367) += stv0367.o -obj-$(CONFIG_DVB_CXD2820R) += cxd2820r.o -obj-$(CONFIG_DVB_DRXK) += drxk.o -obj-$(CONFIG_DVB_TDA18271C2DD) += tda18271c2dd.o -obj-$(CONFIG_DVB_IT913X_FE) += it913x-fe.o -obj-$(CONFIG_DVB_A8293) += a8293.o -obj-$(CONFIG_DVB_TDA10071) += tda10071.o -obj-$(CONFIG_DVB_RTL2830) += rtl2830.o -obj-$(CONFIG_DVB_RTL2832) += rtl2832.o -obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o -obj-$(CONFIG_DVB_AF9033) += af9033.o - diff --git a/drivers/media/dvb/frontends/a8293.c b/drivers/media/dvb/frontends/a8293.c deleted file mode 100644 index cff44a389b40..000000000000 --- a/drivers/media/dvb/frontends/a8293.c +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Allegro A8293 SEC driver - * - * Copyright (C) 2011 Antti Palosaari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "dvb_frontend.h" -#include "a8293.h" - -struct a8293_priv { - struct i2c_adapter *i2c; - const struct a8293_config *cfg; - u8 reg[2]; -}; - -static int a8293_i2c(struct a8293_priv *priv, u8 *val, int len, bool rd) -{ - int ret; - struct i2c_msg msg[1] = { - { - .addr = priv->cfg->i2c_addr, - .len = len, - .buf = val, - } - }; - - if (rd) - msg[0].flags = I2C_M_RD; - else - msg[0].flags = 0; - - ret = i2c_transfer(priv->i2c, msg, 1); - if (ret == 1) { - ret = 0; - } else { - dev_warn(&priv->i2c->dev, "%s: i2c failed=%d rd=%d\n", - KBUILD_MODNAME, ret, rd); - ret = -EREMOTEIO; - } - - return ret; -} - -static int a8293_wr(struct a8293_priv *priv, u8 *val, int len) -{ - return a8293_i2c(priv, val, len, 0); -} - -static int a8293_rd(struct a8293_priv *priv, u8 *val, int len) -{ - return a8293_i2c(priv, val, len, 1); -} - -static int a8293_set_voltage(struct dvb_frontend *fe, - fe_sec_voltage_t fe_sec_voltage) -{ - struct a8293_priv *priv = fe->sec_priv; - int ret; - - dev_dbg(&priv->i2c->dev, "%s: fe_sec_voltage=%d\n", __func__, - fe_sec_voltage); - - switch (fe_sec_voltage) { - case SEC_VOLTAGE_OFF: - /* ENB=0 */ - priv->reg[0] = 0x10; - break; - case SEC_VOLTAGE_13: - /* VSEL0=1, VSEL1=0, VSEL2=0, VSEL3=0, ENB=1*/ - priv->reg[0] = 0x31; - break; - case SEC_VOLTAGE_18: - /* VSEL0=0, VSEL1=0, VSEL2=0, VSEL3=1, ENB=1*/ - priv->reg[0] = 0x38; - break; - default: - ret = -EINVAL; - goto err; - }; - - ret = a8293_wr(priv, &priv->reg[0], 1); - if (ret) - goto err; - - return ret; -err: - dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); - return ret; -} - -static void a8293_release_sec(struct dvb_frontend *fe) -{ - a8293_set_voltage(fe, SEC_VOLTAGE_OFF); - - kfree(fe->sec_priv); - fe->sec_priv = NULL; -} - -struct dvb_frontend *a8293_attach(struct dvb_frontend *fe, - struct i2c_adapter *i2c, const struct a8293_config *cfg) -{ - int ret; - struct a8293_priv *priv = NULL; - u8 buf[2]; - - /* allocate memory for the internal priv */ - priv = kzalloc(sizeof(struct a8293_priv), GFP_KERNEL); - if (priv == NULL) { - ret = -ENOMEM; - goto err; - } - - /* setup the priv */ - priv->i2c = i2c; - priv->cfg = cfg; - fe->sec_priv = priv; - - /* check if the SEC is there */ - ret = a8293_rd(priv, buf, 2); - if (ret) - goto err; - - /* ENB=0 */ - priv->reg[0] = 0x10; - ret = a8293_wr(priv, &priv->reg[0], 1); - if (ret) - goto err; - - /* TMODE=0, TGATE=1 */ - priv->reg[1] = 0x82; - ret = a8293_wr(priv, &priv->reg[1], 1); - if (ret) - goto err; - - fe->ops.release_sec = a8293_release_sec; - - /* override frontend ops */ - fe->ops.set_voltage = a8293_set_voltage; - - dev_info(&priv->i2c->dev, "%s: Allegro A8293 SEC attached\n", - KBUILD_MODNAME); - - return fe; -err: - dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret); - kfree(priv); - return NULL; -} -EXPORT_SYMBOL(a8293_attach); - -MODULE_AUTHOR("Antti Palosaari "); -MODULE_DESCRIPTION("Allegro A8293 SEC driver"); -MODULE_LICENSE("GPL"); diff --git a/drivers/media/dvb/frontends/a8293.h b/drivers/media/dvb/frontends/a8293.h deleted file mode 100644 index ed29e5504f76..000000000000 --- a/drivers/media/dvb/frontends/a8293.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Allegro A8293 SEC driver - * - * Copyright (C) 2011 Antti Palosaari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301