From f57c4e0dc32f59b380d48b2c53fb27734a289311 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 6 May 2013 10:27:22 +0200 Subject: [PATCH] linux: readd kernel 3.2 support for testing Signed-off-by: Stephan Raue --- packages/linux/meta | 4 +- .../3.2.44/linux-000_crosscompile.patch | 22 + .../linux-010-perf_crosscompiling.patch | 12 + .../3.2.44/linux-011-include_resource.h.patch | 11 + .../linux-052-aureal_remote_quirk-0.1.patch | 113 + .../linux-053-spinelplus-remote-0.1.patch | 148 + .../3.2.44/linux-056-Formosa-IR606.patch | 12 + ...-allow-specifying-a-default-keymap-s.patch | 84 + ...-add-support-for-Medion-X10-Digitain.patch | 328 ++ ...-add-keymap-for-Medion-X10-OR2x-remo.patch | 207 + ...-add-regular-up-down-buttons-to-Medi.patch | 48 + ...inux-071-silence_i915_agp-module-0.1.patch | 12 + ...linux-201-add_Anysee_T2C_support-0.1.patch | 845 ++++ .../linux-202-add_HVR930C_support-0.1.patch | 649 +++ ...x-203-stb0899_enable_low_symbol_rate.patch | 12 + .../3.2.44/linux-210-add_DVBSky_support.patch | 4215 +++++++++++++++++ .../linux-211-add_TeVii_s471_support.patch | 90 + ...linux-212-mantis_stb0899_faster_lock.patch | 141 + .../3.2.44/linux-213-cinergy_s2_usb_r2.patch | 46 + .../3.2.44/linux-214-hdtv-hvr930c.patch | 389 ++ .../linux-215-technisat-usb2-module.patch | 25 + .../3.2.44/linux-901_broken_bluetooth.patch | 13 + ...000_add_support_for_get_if_frequency.patch | 45 + ...Mon-Knob-event-interpretation-issues.patch | 59 + 24 files changed, 7529 insertions(+), 1 deletion(-) create mode 100644 packages/linux/patches/3.2.44/linux-000_crosscompile.patch create mode 100644 packages/linux/patches/3.2.44/linux-010-perf_crosscompiling.patch create mode 100644 packages/linux/patches/3.2.44/linux-011-include_resource.h.patch create mode 100644 packages/linux/patches/3.2.44/linux-052-aureal_remote_quirk-0.1.patch create mode 100644 packages/linux/patches/3.2.44/linux-053-spinelplus-remote-0.1.patch create mode 100644 packages/linux/patches/3.2.44/linux-056-Formosa-IR606.patch create mode 100644 packages/linux/patches/3.2.44/linux-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch create mode 100644 packages/linux/patches/3.2.44/linux-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch create mode 100644 packages/linux/patches/3.2.44/linux-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch create mode 100644 packages/linux/patches/3.2.44/linux-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch create mode 100644 packages/linux/patches/3.2.44/linux-071-silence_i915_agp-module-0.1.patch create mode 100644 packages/linux/patches/3.2.44/linux-201-add_Anysee_T2C_support-0.1.patch create mode 100644 packages/linux/patches/3.2.44/linux-202-add_HVR930C_support-0.1.patch create mode 100644 packages/linux/patches/3.2.44/linux-203-stb0899_enable_low_symbol_rate.patch create mode 100644 packages/linux/patches/3.2.44/linux-210-add_DVBSky_support.patch create mode 100644 packages/linux/patches/3.2.44/linux-211-add_TeVii_s471_support.patch create mode 100644 packages/linux/patches/3.2.44/linux-212-mantis_stb0899_faster_lock.patch create mode 100644 packages/linux/patches/3.2.44/linux-213-cinergy_s2_usb_r2.patch create mode 100644 packages/linux/patches/3.2.44/linux-214-hdtv-hvr930c.patch create mode 100644 packages/linux/patches/3.2.44/linux-215-technisat-usb2-module.patch create mode 100644 packages/linux/patches/3.2.44/linux-901_broken_bluetooth.patch create mode 100644 packages/linux/patches/3.2.44/linux-990-xc5000_add_support_for_get_if_frequency.patch create mode 100644 packages/linux/patches/3.2.44/linux-999-fix-iMon-Knob-event-interpretation-issues.patch diff --git a/packages/linux/meta b/packages/linux/meta index 0dabe25660..d5e14a04b7 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -20,7 +20,9 @@ PKG_NAME="linux" -if [ "$LINUX" = "3.6" ]; then +if [ "$LINUX" = "3.2" ]; then + PKG_VERSION="3.2.44" +elif [ "$LINUX" = "3.6" ]; then PKG_VERSION="3.6.11" elif [ "$LINUX" = "3.8" ]; then PKG_VERSION="3.8.11" diff --git a/packages/linux/patches/3.2.44/linux-000_crosscompile.patch b/packages/linux/patches/3.2.44/linux-000_crosscompile.patch new file mode 100644 index 0000000000..b4fc575828 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-000_crosscompile.patch @@ -0,0 +1,22 @@ +--- linux-2.6.24-rc2.orig/arch/x86/boot/tools/build.c 2007-10-06 12:26:14.000000000 +0200 ++++ linux-2.6.24-rc2/arch/x86/boot/tools/build.c 2007-10-06 12:27:36.000000000 +0200 +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -42,6 +41,11 @@ + #define DEFAULT_MAJOR_ROOT 0 + #define DEFAULT_MINOR_ROOT 0 + ++#undef major ++#define major(dev) ((int)(((dev) >> 8) & 0xff)) ++#undef minor ++#define minor(dev) ((int)((dev) & 0xff)) ++ + /* Minimal number of setup sectors */ + #define SETUP_SECT_MIN 5 + #define SETUP_SECT_MAX 64 diff --git a/packages/linux/patches/3.2.44/linux-010-perf_crosscompiling.patch b/packages/linux/patches/3.2.44/linux-010-perf_crosscompiling.patch new file mode 100644 index 0000000000..a4a1c918b4 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-010-perf_crosscompiling.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.6.11/tools/perf/Makefile linux-3.6.11.patch/tools/perf/Makefile +--- linux-3.6.11/tools/perf/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-3.6.11.patch/tools/perf/Makefile 2013-03-06 16:30:43.107805512 +0100 +@@ -496,8 +496,6 @@ + msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev); + BASIC_CFLAGS += -DNO_NEWT_SUPPORT + else +- # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h +- BASIC_CFLAGS += -I/usr/include/slang + EXTLIBS += -lnewt -lslang + LIB_OBJS += $(OUTPUT)ui/setup.o + LIB_OBJS += $(OUTPUT)ui/browser.o diff --git a/packages/linux/patches/3.2.44/linux-011-include_resource.h.patch b/packages/linux/patches/3.2.44/linux-011-include_resource.h.patch new file mode 100644 index 0000000000..b9d95e98cf --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-011-include_resource.h.patch @@ -0,0 +1,11 @@ +diff -Naur linux-3.2.44/tools/perf/builtin-sched.c linux-3.2.44.patch/tools/perf/builtin-sched.c +--- linux-3.2.44/tools/perf/builtin-sched.c 2013-04-25 21:25:51.000000000 +0200 ++++ linux-3.2.44.patch/tools/perf/builtin-sched.c 2013-05-06 03:29:10.327408347 +0200 +@@ -14,6 +14,7 @@ + #include "util/debug.h" + + #include ++#include + + #include + #include diff --git a/packages/linux/patches/3.2.44/linux-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/3.2.44/linux-052-aureal_remote_quirk-0.1.patch new file mode 100644 index 0000000000..60cdbf0938 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-052-aureal_remote_quirk-0.1.patch @@ -0,0 +1,113 @@ +diff -Naur linux-2.6.37/drivers/hid/hid-aureal.c linux-2.6.37.patch/drivers/hid/hid-aureal.c +--- linux-2.6.37/drivers/hid/hid-aureal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/hid-aureal.c 2011-01-07 22:35:31.413389936 +0100 +@@ -0,0 +1,60 @@ ++/* ++ * HID driver for some sunplus "special" devices ++ * ++ * Copyright (c) 1999 Andreas Gal ++ * Copyright (c) 2000-2005 Vojtech Pavlik ++ * Copyright (c) 2005 Michael Haboustak for Concept2, Inc ++ * Copyright (c) 2006-2007 Jiri Kosina ++ * Copyright (c) 2007 Paul Walmsley ++ * Copyright (c) 2008 Jiri Slaby ++ * Copyright (c) 2010 Franco Catrin ++ */ ++ ++/* ++ * 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. ++ */ ++ ++#include ++#include ++#include ++ ++#include "hid-ids.h" ++ ++static __u8 *aureal_report_fixup(struct hid_device *hdev, __u8 *rdesc, ++ unsigned int *rsize) ++{ ++ if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) { ++ dev_info(&hdev->dev, "fixing Aureal Cy se W-01RN USB_V3.1 " ++ "report descriptor. Keyboard Logical Maximum = 101\n"); ++ rdesc[53] = 0x65; ++ } return rdesc; ++} ++ ++static const struct hid_device_id aureal_devices[] = { ++ { HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) }, ++ { } ++}; ++MODULE_DEVICE_TABLE(hid, aureal_devices); ++ ++static struct hid_driver aureal_driver = { ++ .name = "aureal", ++ .id_table = aureal_devices, ++ .report_fixup = aureal_report_fixup, ++}; ++ ++static int __init aureal_init(void) ++{ ++ return hid_register_driver(&aureal_driver); ++} ++ ++static void __exit aureal_exit(void) ++{ ++ hid_unregister_driver(&aureal_driver); ++} ++ ++module_init(aureal_init); ++module_exit(aureal_exit); ++MODULE_LICENSE("GPL"); +diff -Naur linux-2.6.37/drivers/hid/hid-ids.h linux-2.6.37.patch/drivers/hid/hid-ids.h +--- linux-2.6.37/drivers/hid/hid-ids.h 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/hid-ids.h 2011-01-07 22:35:31.414389949 +0100 +@@ -6,6 +6,7 @@ + * Copyright (c) 2005 Michael Haboustak for Concept2, Inc + * Copyright (c) 2006-2007 Jiri Kosina + * Copyright (c) 2007 Paul Walmsley ++ * Copyright (c) 2010 Franco Catrin + */ + + /* +@@ -327,6 +328,9 @@ + #define USB_DEVICE_ID_KYE_ERGO_525V 0x0087 + #define USB_DEVICE_ID_KYE_GPEN_560 0x5003 + ++#define USB_VENDOR_ID_AUREAL 0x0755 ++#define USB_DEVICE_ID_AUREAL_W01RN 0x2626 ++ + #define USB_VENDOR_ID_LABTEC 0x1020 + #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006 + +diff -Naur linux-2.6.37/drivers/hid/Kconfig linux-2.6.37.patch/drivers/hid/Kconfig +--- linux-2.6.37/drivers/hid/Kconfig 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/Kconfig 2011-01-07 22:35:31.467390603 +0100 +@@ -87,6 +87,13 @@ + Say Y here if you want support for keyboards of Apple iBooks, PowerBooks, + MacBooks, MacBook Pros and Apple Aluminum. + ++config HID_AUREAL ++ tristate "Aureal" if EMBEDDED ++ depends on USB_HID ++ default !EMBEDDED ++ ---help--- ++ Support for Aureal Cy se W-01RN Remote Controller ++ + config HID_BELKIN + tristate "Belkin Flip KVM and Wireless keyboard" if EMBEDDED + depends on USB_HID +diff -Naur linux-2.6.37/drivers/hid/Makefile linux-2.6.37.patch/drivers/hid/Makefile +--- linux-2.6.37/drivers/hid/Makefile 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/Makefile 2011-01-07 22:35:31.547391590 +0100 +@@ -29,6 +29,7 @@ + obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o + obj-$(CONFIG_HID_ACRUX_FF) += hid-axff.o + obj-$(CONFIG_HID_APPLE) += hid-apple.o ++obj-$(CONFIG_HID_AUREAL) += hid-aureal.o + obj-$(CONFIG_HID_BELKIN) += hid-belkin.o + obj-$(CONFIG_HID_CANDO) += hid-cando.o + obj-$(CONFIG_HID_CHERRY) += hid-cherry.o diff --git a/packages/linux/patches/3.2.44/linux-053-spinelplus-remote-0.1.patch b/packages/linux/patches/3.2.44/linux-053-spinelplus-remote-0.1.patch new file mode 100644 index 0000000000..38b10267ec --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-053-spinelplus-remote-0.1.patch @@ -0,0 +1,148 @@ +diff -Naur linux-3.2.7/drivers/hid/hid-ids.h linux-3.2.7.patch/drivers/hid/hid-ids.h +--- linux-3.2.7/drivers/hid/hid-ids.h 2012-02-20 22:42:16.000000000 +0100 ++++ linux-3.2.7.patch/drivers/hid/hid-ids.h 2012-02-25 20:35:22.798844241 +0100 +@@ -577,6 +577,9 @@ + + #define USB_VENDOR_ID_PHILIPS 0x0471 + #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617 ++#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1 0x206c ++#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2 0x20cc ++#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3 0x0613 + + #define USB_VENDOR_ID_PI_ENGINEERING 0x05f3 + #define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff +diff -Naur linux-3.2.7/drivers/hid/hid-spinelplus.c linux-3.2.7.patch/drivers/hid/hid-spinelplus.c +--- linux-3.2.7/drivers/hid/hid-spinelplus.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.7.patch/drivers/hid/hid-spinelplus.c 2012-02-25 20:36:10.002787970 +0100 +@@ -0,0 +1,104 @@ ++/* ++ * HID driver for "PHILIPS MCE USB IR Receiver- Spinel plus" remotes ++ * ++ * Copyright (c) 2010 Panagiotis Skintzos ++ * ++ * Renamed to Spinel, cleanup and modified to also support ++ * Spinel Plus 0471:20CC by Stephan Raue 2012. ++ */ ++ ++/* ++ * 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. ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include "hid-ids.h" ++ ++#define spinelplus_map_key(c) set_bit(EV_REP, hi->input->evbit); \ ++ hid_map_usage_clear(hi, usage, bit, max, EV_KEY, (c)) ++ ++static int spinelplus_input_mapping(struct hid_device *hdev, ++ struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, ++ unsigned long **bit, int *max) ++{ ++ switch (usage->hid) { ++ case 0xffbc000d: spinelplus_map_key(KEY_MEDIA); break; ++ case 0xffbc0024: spinelplus_map_key(KEY_MEDIA); break; ++ case 0xffbc0027: spinelplus_map_key(KEY_ZOOM); break; ++ case 0xffbc0033: spinelplus_map_key(KEY_HOME); break; ++ case 0xffbc0035: spinelplus_map_key(KEY_CAMERA); break; ++ case 0xffbc0036: spinelplus_map_key(KEY_EPG); break; ++ case 0xffbc0037: spinelplus_map_key(KEY_DVD); break; ++ case 0xffbc0038: spinelplus_map_key(KEY_HOME); break; ++ case 0xffbc0039: spinelplus_map_key(KEY_MP3); break; ++ case 0xffbc003a: spinelplus_map_key(KEY_VIDEO); break; ++ case 0xffbc005a: spinelplus_map_key(KEY_TEXT); break; ++ case 0xffbc005b: spinelplus_map_key(KEY_RED); break; ++ case 0xffbc005c: spinelplus_map_key(KEY_GREEN); break; ++ case 0xffbc005d: spinelplus_map_key(KEY_YELLOW); break; ++ case 0xffbc005e: spinelplus_map_key(KEY_BLUE); break; ++ default: ++ return 0; ++ } ++ return 1; ++} ++ ++static int spinelplus_probe(struct hid_device *hdev, ++ const struct hid_device_id *id) ++{ ++ int ret; ++ /* Connect only to hid input (not hiddev & hidraw)*/ ++ unsigned int cmask = HID_CONNECT_HIDINPUT; ++ ++ ret = hid_parse(hdev); ++ if (ret) { ++ dev_err(&hdev->dev, "parse failed\n"); ++ goto err_free; ++ } ++ ++ ret = hid_hw_start(hdev, cmask); ++ if (ret) { ++ dev_err(&hdev->dev, "hw start failed\n"); ++ goto err_free; ++ } ++ ++ return 0; ++err_free: ++ return ret; ++} ++ ++static const struct hid_device_id spinelplus_devices[] = { ++ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3) }, ++ { } ++}; ++MODULE_DEVICE_TABLE(hid, spinelplus_devices); ++ ++static struct hid_driver spinelplus_driver = { ++ .name = "SpinelPlus", ++ .id_table = spinelplus_devices, ++ .input_mapping = spinelplus_input_mapping, ++ .probe = spinelplus_probe, ++}; ++ ++static int __init spinelplus_init(void) ++{ ++ return hid_register_driver(&spinelplus_driver); ++} ++ ++static void __exit spinelplus_exit(void) ++{ ++ hid_unregister_driver(&spinelplus_driver); ++} ++ ++module_init(spinelplus_init); ++module_exit(spinelplus_exit); ++MODULE_LICENSE("GPL"); +diff -Naur linux-3.2.7/drivers/hid/Kconfig linux-3.2.7.patch/drivers/hid/Kconfig +--- linux-3.2.7/drivers/hid/Kconfig 2012-02-20 22:42:16.000000000 +0100 ++++ linux-3.2.7.patch/drivers/hid/Kconfig 2012-02-25 20:34:59.490378243 +0100 +@@ -540,6 +540,12 @@ + ---help--- + Support for Speedlink Vicious and Divine Cezanne mouse. + ++config HID_SPINELPLUS ++ tristate "Spinel Plus remote control" ++ depends on USB_HID ++ ---help--- ++ Say Y here if you have a Spinel Plus (0471:206c/20cc/0613) remote ++ + config HID_SUNPLUS + tristate "Sunplus wireless desktop" + depends on USB_HID +diff -Naur linux-3.2.7/drivers/hid/Makefile linux-3.2.7.patch/drivers/hid/Makefile +--- linux-3.2.7/drivers/hid/Makefile 2012-02-20 22:42:16.000000000 +0100 ++++ linux-3.2.7.patch/drivers/hid/Makefile 2012-02-25 20:34:12.487438531 +0100 +@@ -67,6 +67,7 @@ + obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o + obj-$(CONFIG_HID_SONY) += hid-sony.o + obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o ++obj-$(CONFIG_HID_SPINELPLUS) += hid-spinelplus.o + obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o + obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o + obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o diff --git a/packages/linux/patches/3.2.44/linux-056-Formosa-IR606.patch b/packages/linux/patches/3.2.44/linux-056-Formosa-IR606.patch new file mode 100644 index 0000000000..bb17492572 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-056-Formosa-IR606.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.2.7/drivers/media/rc/mceusb.c linux-3.2.7.patch/drivers/media/rc/mceusb.c +--- linux-3.2.7/drivers/media/rc/mceusb.c 2012-02-20 22:42:16.000000000 +0100 ++++ linux-3.2.7.patch/drivers/media/rc/mceusb.c 2012-02-27 04:47:29.210888244 +0100 +@@ -361,6 +361,8 @@ + { USB_DEVICE(VENDOR_FORMOSA, 0xe03c) }, + /* Formosa Industrial Computing */ + { USB_DEVICE(VENDOR_FORMOSA, 0xe03e) }, ++ /* Formosa Industrial Computing AIM IR606 */ ++ { USB_DEVICE(VENDOR_FORMOSA, 0xe042) }, + /* Fintek eHome Infrared Transceiver (HP branded) */ + { USB_DEVICE(VENDOR_FINTEK, 0x5168) }, + /* Fintek eHome Infrared Transceiver */ diff --git a/packages/linux/patches/3.2.44/linux-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch b/packages/linux/patches/3.2.44/linux-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch new file mode 100644 index 0000000000..cae11c80b1 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-057.01-media-ati_remote-allow-specifying-a-default-keymap-s.patch @@ -0,0 +1,84 @@ +From 90732af5fa8dc91982c8a3381247567906986b4c Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Sun, 1 Apr 2012 20:26:45 +0300 +Subject: [PATCH 1/2] [media] ati_remote: allow specifying a default keymap + selector function + +Currently the ati_remote default keymap is selected directly based on +the USB device id. + +Add support for instead specifying a function returning the default +keymap, allowing more complex selection logic to be added when needed. + +This will be used for Medion X10 remotes in a following commit. + +Signed-off-by: Anssi Hannula +--- + drivers/media/rc/ati_remote.c | 36 ++++++++++++++++++++++++++---------- + 1 file changed, 26 insertions(+), 10 deletions(-) + +diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c +index baf907b..7a35f7a 100644 +--- a/drivers/media/rc/ati_remote.c ++++ b/drivers/media/rc/ati_remote.c +@@ -151,13 +151,23 @@ MODULE_PARM_DESC(mouse, "Enable mouse device, default = yes"); + #undef err + #define err(format, arg...) printk(KERN_ERR format , ## arg) + ++struct ati_receiver_type { ++ /* either default_keymap or get_default_keymap should be set */ ++ const char *default_keymap; ++ const char *(*get_default_keymap)(struct usb_interface *interface); ++}; ++ ++static const struct ati_receiver_type type_ati = { .default_keymap = RC_MAP_ATI_X10 }; ++static const struct ati_receiver_type type_medion = { .default_keymap = RC_MAP_MEDION_X10 }; ++static const struct ati_receiver_type type_firefly = { .default_keymap = RC_MAP_SNAPSTREAM_FIREFLY }; ++ + static struct usb_device_id ati_remote_table[] = { +- { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)RC_MAP_ATI_X10 }, +- { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA2_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)RC_MAP_ATI_X10 }, +- { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)RC_MAP_ATI_X10 }, +- { USB_DEVICE(ATI_REMOTE_VENDOR_ID, NVIDIA_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)RC_MAP_ATI_X10 }, +- { USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)RC_MAP_MEDION_X10 }, +- { USB_DEVICE(ATI_REMOTE_VENDOR_ID, FIREFLY_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)RC_MAP_SNAPSTREAM_FIREFLY }, ++ { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)&type_ati }, ++ { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA2_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)&type_ati }, ++ { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)&type_ati }, ++ { USB_DEVICE(ATI_REMOTE_VENDOR_ID, NVIDIA_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)&type_ati }, ++ { USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)&type_medion }, ++ { USB_DEVICE(ATI_REMOTE_VENDOR_ID, FIREFLY_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)&type_firefly }, + {} /* Terminating entry */ + }; + +@@ -766,6 +776,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de + struct usb_device *udev = interface_to_usbdev(interface); + struct usb_host_interface *iface_host = interface->cur_altsetting; + struct usb_endpoint_descriptor *endpoint_in, *endpoint_out; ++ struct ati_receiver_type *type = (struct ati_receiver_type *)id->driver_info; + struct ati_remote *ati_remote; + struct input_dev *input_dev; + struct rc_dev *rc_dev; +@@ -827,10 +838,15 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de + snprintf(ati_remote->mouse_name, sizeof(ati_remote->mouse_name), + "%s mouse", ati_remote->rc_name); + +- if (id->driver_info) +- rc_dev->map_name = (const char *)id->driver_info; +- else +- rc_dev->map_name = RC_MAP_ATI_X10; ++ rc_dev->map_name = RC_MAP_ATI_X10; /* default map */ ++ ++ /* set default keymap according to receiver model */ ++ if (type) { ++ if (type->default_keymap) ++ rc_dev->map_name = type->default_keymap; ++ else if (type->get_default_keymap) ++ rc_dev->map_name = type->get_default_keymap(interface); ++ } + + ati_remote_rc_init(ati_remote); + mutex_init(&ati_remote->open_mutex); +-- +1.7.9.3 + diff --git a/packages/linux/patches/3.2.44/linux-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch b/packages/linux/patches/3.2.44/linux-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch new file mode 100644 index 0000000000..05166901b7 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-057.02-media-ati_remote-add-support-for-Medion-X10-Digitain.patch @@ -0,0 +1,328 @@ +From 52d570e9e2d4e7e5637e6f8343fb9643fc6edb8b Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Sun, 1 Apr 2012 20:36:07 +0300 +Subject: [PATCH 2/2] [media] ati_remote: add support for Medion X10 + Digitainer remote +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add support for another Medion X10 remote. This was apparently +originally used with the Medion Digitainer box, but is now sold +separately without any Digitainer labeling. + +A peculiarity of this remote is a scrollwheel in place of up/down +buttons. Each direction is mapped to 8 different scancodes, each +corresponding to 1..8 notches, allowing multiple notches to the same +direction to be transmitted in a single scancode. The driver transforms +the multi-notch scancodes to multiple events of the single-notch +scancode. +(0x70..0x77 = 1..8 notches down, 0x78..0x7f = 1..8 notches up) + +Since the scrollwheel scancodes are the same that are used for mouse on +some other X10 (ati_remote) remotes, the driver will now check whether +the active keymap has a keycode defined for the single-notch scancode +when a mouse/scrollwheel scancode (0x70..0x7f) is received. If set, +scrollwheel is assumed, otherwise mouse is assumed. + +This remote ships with a different receiver than the already supported +Medion X10 remote, but they share the same USB ID. The only difference +in the USB descriptors is that the Digitainer receiver has the Remote +Wakeup bit set in bmAttributes of the Configuration Descriptor. +Therefore that is used to select the default keymap. + +Thanks to Stephan Raue from OpenELEC (www.openelec.tv) for providing me +both a Medion X10 Digitainer remote+receiver and an already supported +Medion X10 remote+receiver. Thanks to Martin Beyß for providing some +useful information about the remote (including the "Digitainer" name). + +Signed-off-by: Anssi Hannula +--- + drivers/media/rc/ati_remote.c | 90 ++++++++++----- + drivers/media/rc/keymaps/Makefile | 1 + + .../media/rc/keymaps/rc-medion-x10-digitainer.c | 115 ++++++++++++++++++++ + include/media/rc-map.h | 1 + + 4 files changed, 179 insertions(+), 28 deletions(-) + create mode 100644 drivers/media/rc/keymaps/rc-medion-x10-digitainer.c + +diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c +index 7a35f7a..26fa043 100644 +--- a/drivers/media/rc/ati_remote.c ++++ b/drivers/media/rc/ati_remote.c +@@ -1,7 +1,7 @@ + /* + * USB ATI Remote support + * +- * Copyright (c) 2011 Anssi Hannula ++ * Copyright (c) 2011, 2012 Anssi Hannula + * Version 2.2.0 Copyright (c) 2004 Torrey Hoffman + * Version 2.1.1 Copyright (c) 2002 Vladimir Dergachev + * +@@ -157,8 +157,20 @@ struct ati_receiver_type { + const char *(*get_default_keymap)(struct usb_interface *interface); + }; + ++static const char *get_medion_keymap(struct usb_interface *interface) ++{ ++ struct usb_device *udev = interface_to_usbdev(interface); ++ ++ /* The receiver shipped with the "Digitainer" variant helpfully has ++ * a single additional bit set in its descriptor. */ ++ if (udev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_WAKEUP) ++ return RC_MAP_MEDION_X10_DIGITAINER; ++ ++ return RC_MAP_MEDION_X10; ++} ++ + static const struct ati_receiver_type type_ati = { .default_keymap = RC_MAP_ATI_X10 }; +-static const struct ati_receiver_type type_medion = { .default_keymap = RC_MAP_MEDION_X10 }; ++static const struct ati_receiver_type type_medion = { .get_default_keymap = get_medion_keymap }; + static const struct ati_receiver_type type_firefly = { .default_keymap = RC_MAP_SNAPSTREAM_FIREFLY }; + + static struct usb_device_id ati_remote_table[] = { +@@ -455,6 +467,7 @@ static void ati_remote_input_report(struct urb *urb) + int acc; + int remote_num; + unsigned char scancode; ++ u32 wheel_keycode = KEY_RESERVED; + int i; + + /* +@@ -494,26 +507,33 @@ static void ati_remote_input_report(struct urb *urb) + */ + scancode = data[2] & 0x7f; + +- /* Look up event code index in the mouse translation table. */ +- for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) { +- if (scancode == ati_remote_tbl[i].data) { +- index = i; +- break; ++ dbginfo(&ati_remote->interface->dev, ++ "channel 0x%02x; key data %02x, scancode %02x\n", ++ remote_num, data[2], scancode); ++ ++ if (scancode >= 0x70) { ++ /* ++ * This is either a mouse or scrollwheel event, depending on ++ * the remote/keymap. ++ * Get the keycode assigned to scancode 0x78/0x70. If it is ++ * set, assume this is a scrollwheel up/down event. ++ */ ++ wheel_keycode = rc_g_keycode_from_table(ati_remote->rdev, ++ scancode & 0x78); ++ ++ if (wheel_keycode == KEY_RESERVED) { ++ /* scrollwheel was not mapped, assume mouse */ ++ ++ /* Look up event code index in the mouse translation table. */ ++ for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) { ++ if (scancode == ati_remote_tbl[i].data) { ++ index = i; ++ break; ++ } ++ } + } + } + +- if (index >= 0) { +- dbginfo(&ati_remote->interface->dev, +- "channel 0x%02x; mouse data %02x; index %d; keycode %d\n", +- remote_num, data[2], index, ati_remote_tbl[index].code); +- if (!dev) +- return; /* no mouse device */ +- } else +- dbginfo(&ati_remote->interface->dev, +- "channel 0x%02x; key data %02x, scancode %02x\n", +- remote_num, data[2], scancode); +- +- + if (index >= 0 && ati_remote_tbl[index].kind == KIND_LITERAL) { + input_event(dev, ati_remote_tbl[index].type, + ati_remote_tbl[index].code, +@@ -552,15 +572,29 @@ static void ati_remote_input_report(struct urb *urb) + + if (index < 0) { + /* Not a mouse event, hand it to rc-core. */ +- +- /* +- * We don't use the rc-core repeat handling yet as +- * it would cause ghost repeats which would be a +- * regression for this driver. +- */ +- rc_keydown_notimeout(ati_remote->rdev, scancode, +- data[2]); +- rc_keyup(ati_remote->rdev); ++ int count = 1; ++ ++ if (wheel_keycode != KEY_RESERVED) { ++ /* ++ * This is a scrollwheel event, send the ++ * scroll up (0x78) / down (0x70) scancode ++ * repeatedly as many times as indicated by ++ * rest of the scancode. ++ */ ++ count = (scancode & 0x07) + 1; ++ scancode &= 0x78; ++ } ++ ++ while (count--) { ++ /* ++ * We don't use the rc-core repeat handling yet as ++ * it would cause ghost repeats which would be a ++ * regression for this driver. ++ */ ++ rc_keydown_notimeout(ati_remote->rdev, scancode, ++ data[2]); ++ rc_keyup(ati_remote->rdev); ++ } + return; + } + +diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile +index 36e4d5e..c1d977c 100644 +--- a/drivers/media/rc/keymaps/Makefile ++++ b/drivers/media/rc/keymaps/Makefile +@@ -49,6 +49,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ + rc-lme2510.o \ + rc-manli.o \ + rc-medion-x10.o \ ++ rc-medion-x10-digitainer.o \ + rc-msi-digivox-ii.o \ + rc-msi-digivox-iii.o \ + rc-msi-tvanywhere.o \ +diff --git a/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c b/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c +new file mode 100644 +index 0000000..0a5ce84 +--- /dev/null ++++ b/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c +@@ -0,0 +1,115 @@ ++/* ++ * Medion X10 RF remote keytable (Digitainer variant) ++ * ++ * Copyright (C) 2012 Anssi Hannula ++ * ++ * This keymap is for a variant that has a distinctive scrollwheel instead of ++ * up/down buttons (tested with P/N 40009936 / 20018268), reportedly ++ * originally shipped with Medion Digitainer but now sold separately simply as ++ * an "X10" remote. ++ * ++ * 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 ++#include ++ ++static struct rc_map_table medion_x10_digitainer[] = { ++ { 0x02, KEY_POWER }, ++ ++ { 0x2c, KEY_TV }, ++ { 0x2d, KEY_VIDEO }, ++ { 0x04, KEY_DVD }, /* CD/DVD */ ++ { 0x16, KEY_TEXT }, /* "teletext" icon, i.e. a screen with lines */ ++ { 0x06, KEY_AUDIO }, ++ { 0x2e, KEY_RADIO }, ++ { 0x31, KEY_EPG }, /* a screen with an open book */ ++ { 0x05, KEY_IMAGES }, /* Photo */ ++ { 0x2f, KEY_INFO }, ++ ++ { 0x78, KEY_UP }, /* scrollwheel up 1 notch */ ++ /* 0x79..0x7f: 2-8 notches, driver repeats 0x78 entry */ ++ ++ { 0x70, KEY_DOWN }, /* scrollwheel down 1 notch */ ++ /* 0x71..0x77: 2-8 notches, driver repeats 0x70 entry */ ++ ++ { 0x19, KEY_MENU }, ++ { 0x1d, KEY_LEFT }, ++ { 0x1e, KEY_OK }, /* scrollwheel press */ ++ { 0x1f, KEY_RIGHT }, ++ { 0x20, KEY_BACK }, ++ ++ { 0x09, KEY_VOLUMEUP }, ++ { 0x08, KEY_VOLUMEDOWN }, ++ { 0x00, KEY_MUTE }, ++ ++ { 0x1b, KEY_SELECT }, /* also has "U" rotated 90 degrees CCW */ ++ ++ { 0x0b, KEY_CHANNELUP }, ++ { 0x0c, KEY_CHANNELDOWN }, ++ { 0x1c, KEY_LAST }, ++ ++ { 0x32, KEY_RED }, /* also Audio */ ++ { 0x33, KEY_GREEN }, /* also Subtitle */ ++ { 0x34, KEY_YELLOW }, /* also Angle */ ++ { 0x35, KEY_BLUE }, /* also Title */ ++ ++ { 0x28, KEY_STOP }, ++ { 0x29, KEY_PAUSE }, ++ { 0x25, KEY_PLAY }, ++ { 0x21, KEY_PREVIOUS }, ++ { 0x18, KEY_CAMERA }, ++ { 0x23, KEY_NEXT }, ++ { 0x24, KEY_REWIND }, ++ { 0x27, KEY_RECORD }, ++ { 0x26, KEY_FORWARD }, ++ ++ { 0x0d, KEY_1 }, ++ { 0x0e, KEY_2 }, ++ { 0x0f, KEY_3 }, ++ { 0x10, KEY_4 }, ++ { 0x11, KEY_5 }, ++ { 0x12, KEY_6 }, ++ { 0x13, KEY_7 }, ++ { 0x14, KEY_8 }, ++ { 0x15, KEY_9 }, ++ { 0x17, KEY_0 }, ++}; ++ ++static struct rc_map_list medion_x10_digitainer_map = { ++ .map = { ++ .scan = medion_x10_digitainer, ++ .size = ARRAY_SIZE(medion_x10_digitainer), ++ .rc_type = RC_TYPE_OTHER, ++ .name = RC_MAP_MEDION_X10_DIGITAINER, ++ } ++}; ++ ++static int __init init_rc_map_medion_x10_digitainer(void) ++{ ++ return rc_map_register(&medion_x10_digitainer_map); ++} ++ ++static void __exit exit_rc_map_medion_x10_digitainer(void) ++{ ++ rc_map_unregister(&medion_x10_digitainer_map); ++} ++ ++module_init(init_rc_map_medion_x10_digitainer) ++module_exit(exit_rc_map_medion_x10_digitainer) ++ ++MODULE_DESCRIPTION("Medion X10 RF remote keytable (Digitainer variant)"); ++MODULE_AUTHOR("Anssi Hannula "); ++MODULE_LICENSE("GPL"); +diff --git a/include/media/rc-map.h b/include/media/rc-map.h +index f688bde..902d29d 100644 +--- a/include/media/rc-map.h ++++ b/include/media/rc-map.h +@@ -110,6 +110,7 @@ void rc_map_init(void); + #define RC_MAP_LME2510 "rc-lme2510" + #define RC_MAP_MANLI "rc-manli" + #define RC_MAP_MEDION_X10 "rc-medion-x10" ++#define RC_MAP_MEDION_X10_DIGITAINER "rc-medion-x10-digitainer" + #define RC_MAP_MSI_DIGIVOX_II "rc-msi-digivox-ii" + #define RC_MAP_MSI_DIGIVOX_III "rc-msi-digivox-iii" + #define RC_MAP_MSI_TVANYWHERE_PLUS "rc-msi-tvanywhere-plus" +-- +1.7.9.3 + diff --git a/packages/linux/patches/3.2.44/linux-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch b/packages/linux/patches/3.2.44/linux-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch new file mode 100644 index 0000000000..be811f7d9b --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-057.03-media-ati_remote-add-keymap-for-Medion-X10-OR2x-remo.patch @@ -0,0 +1,207 @@ +From ba993a6e4af8ff0e3a2f865836ff9330e5ffa219 Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Mon, 23 Apr 2012 00:25:14 +0300 +Subject: [PATCH 3/4] [media] ati_remote: add keymap for Medion X10 OR2x + remotes + +Add another Medion X10 remote keymap. This is for the Medion OR2x +remotes with the Windows MCE button. + +The receiver shipped with this remote has the same USB ID as the other +Medion receivers, but the name is different and is therefore used to +detect this variant. + +[TODO: testing information] + +Signed-off-by: Anssi Hannula +--- + drivers/media/rc/ati_remote.c | 30 ++++++- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-medion-x10-or2x.c | 108 +++++++++++++++++++++++++ + include/media/rc-map.h | 1 + + 4 files changed, 136 insertions(+), 4 deletions(-) + create mode 100644 drivers/media/rc/keymaps/rc-medion-x10-or2x.c + +diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c +index 26fa043..2c70352 100644 +--- a/drivers/media/rc/ati_remote.c ++++ b/drivers/media/rc/ati_remote.c +@@ -161,11 +161,33 @@ static const char *get_medion_keymap(struct usb_interface *interface) + { + struct usb_device *udev = interface_to_usbdev(interface); + +- /* The receiver shipped with the "Digitainer" variant helpfully has +- * a single additional bit set in its descriptor. */ +- if (udev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_WAKEUP) +- return RC_MAP_MEDION_X10_DIGITAINER; ++ /* ++ * There are many different Medion remotes shipped with a receiver ++ * with the same usb id, but the receivers have subtle differences ++ * in the USB descriptors allowing us to detect them. ++ */ ++ ++ if (udev->manufacturer && udev->product) { ++ if (udev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_WAKEUP) { ++ ++ if (!strcmp(udev->manufacturer, "X10 Wireless Technology Inc") ++ && !strcmp(udev->product, "USB Receiver")) ++ return RC_MAP_MEDION_X10_DIGITAINER; ++ ++ if (!strcmp(udev->manufacturer, "X10 WTI") ++ && !strcmp(udev->product, "RF receiver")) ++ return RC_MAP_MEDION_X10_OR2X; ++ } else { ++ ++ if (!strcmp(udev->manufacturer, "X10 Wireless Technology Inc") ++ && !strcmp(udev->product, "USB Receiver")) ++ return RC_MAP_MEDION_X10; ++ } ++ } + ++ dev_info(&interface->dev, ++ "Unknown Medion X10 receiver, using default ati_remote Medion keymap\n"); ++ + return RC_MAP_MEDION_X10; + } + +diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile +index c1d977c..975e130 100644 +--- a/drivers/media/rc/keymaps/Makefile ++++ b/drivers/media/rc/keymaps/Makefile +@@ -50,6 +50,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ + rc-manli.o \ + rc-medion-x10.o \ + rc-medion-x10-digitainer.o \ ++ rc-medion-x10-or2x.o \ + rc-msi-digivox-ii.o \ + rc-msi-digivox-iii.o \ + rc-msi-tvanywhere.o \ +diff --git a/drivers/media/rc/keymaps/rc-medion-x10-or2x.c b/drivers/media/rc/keymaps/rc-medion-x10-or2x.c +new file mode 100644 +index 0000000..b077300 +--- /dev/null ++++ b/drivers/media/rc/keymaps/rc-medion-x10-or2x.c +@@ -0,0 +1,108 @@ ++/* ++ * Medion X10 OR22/OR24 RF remote keytable ++ * ++ * Copyright (C) 2012 Anssi Hannula ++ * ++ * This keymap is for several Medion X10 remotes that have the Windows MCE ++ * button. This has been tested with a "RF VISTA Remote Control", OR24V, ++ * P/N 20035335, but should work with other variants that have the same ++ * buttons, such as OR22V and OR24E. ++ * ++ * 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 ++#include ++ ++static struct rc_map_table medion_x10_or2x[] = { ++ { 0x02, KEY_POWER }, ++ { 0x16, KEY_TEXT }, /* "T" in a box, for teletext */ ++ ++ { 0x09, KEY_VOLUMEUP }, ++ { 0x08, KEY_VOLUMEDOWN }, ++ { 0x00, KEY_MUTE }, ++ { 0x0b, KEY_CHANNELUP }, ++ { 0x0c, KEY_CHANNELDOWN }, ++ ++ { 0x32, KEY_RED }, ++ { 0x33, KEY_GREEN }, ++ { 0x34, KEY_YELLOW }, ++ { 0x35, KEY_BLUE }, ++ ++ { 0x18, KEY_PVR }, /* record symbol inside a tv symbol */ ++ { 0x04, KEY_DVD }, /* disc symbol */ ++ { 0x31, KEY_EPG }, /* a tv schedule symbol */ ++ { 0x1c, KEY_TV }, /* play symbol inside a tv symbol */ ++ { 0x20, KEY_BACK }, ++ { 0x2f, KEY_INFO }, ++ ++ { 0x1a, KEY_UP }, ++ { 0x22, KEY_DOWN }, ++ { 0x1d, KEY_LEFT }, ++ { 0x1f, KEY_RIGHT }, ++ { 0x1e, KEY_OK }, ++ ++ { 0x1b, KEY_MEDIA }, /* Windows MCE button */ ++ ++ { 0x21, KEY_PREVIOUS }, ++ { 0x23, KEY_NEXT }, ++ { 0x24, KEY_REWIND }, ++ { 0x26, KEY_FORWARD }, ++ { 0x25, KEY_PLAY }, ++ { 0x28, KEY_STOP }, ++ { 0x29, KEY_PAUSE }, ++ { 0x27, KEY_RECORD }, ++ ++ { 0x0d, KEY_1 }, ++ { 0x0e, KEY_2 }, ++ { 0x0f, KEY_3 }, ++ { 0x10, KEY_4 }, ++ { 0x11, KEY_5 }, ++ { 0x12, KEY_6 }, ++ { 0x13, KEY_7 }, ++ { 0x14, KEY_8 }, ++ { 0x15, KEY_9 }, ++ { 0x17, KEY_0 }, ++ { 0x30, KEY_CLEAR }, ++ { 0x36, KEY_ENTER }, ++ { 0x37, KEY_NUMERIC_STAR }, ++ { 0x38, KEY_NUMERIC_POUND }, ++}; ++ ++static struct rc_map_list medion_x10_or2x_map = { ++ .map = { ++ .scan = medion_x10_or2x, ++ .size = ARRAY_SIZE(medion_x10_or2x), ++ .rc_type = RC_TYPE_OTHER, ++ .name = RC_MAP_MEDION_X10_OR2X, ++ } ++}; ++ ++static int __init init_rc_map_medion_x10_or2x(void) ++{ ++ return rc_map_register(&medion_x10_or2x_map); ++} ++ ++static void __exit exit_rc_map_medion_x10_or2x(void) ++{ ++ rc_map_unregister(&medion_x10_or2x_map); ++} ++ ++module_init(init_rc_map_medion_x10_or2x) ++module_exit(exit_rc_map_medion_x10_or2x) ++ ++MODULE_DESCRIPTION("Medion X10 OR22/OR24 RF remote keytable"); ++MODULE_AUTHOR("Anssi Hannula "); ++MODULE_LICENSE("GPL"); +diff --git a/include/media/rc-map.h b/include/media/rc-map.h +index 902d29d..20970ae 100644 +--- a/include/media/rc-map.h ++++ b/include/media/rc-map.h +@@ -111,6 +111,7 @@ void rc_map_init(void); + #define RC_MAP_MANLI "rc-manli" + #define RC_MAP_MEDION_X10 "rc-medion-x10" + #define RC_MAP_MEDION_X10_DIGITAINER "rc-medion-x10-digitainer" ++#define RC_MAP_MEDION_X10_OR2X "rc-medion-x10-or2x" + #define RC_MAP_MSI_DIGIVOX_II "rc-msi-digivox-ii" + #define RC_MAP_MSI_DIGIVOX_III "rc-msi-digivox-iii" + #define RC_MAP_MSI_TVANYWHERE_PLUS "rc-msi-tvanywhere-plus" +-- +1.7.10 + diff --git a/packages/linux/patches/3.2.44/linux-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch b/packages/linux/patches/3.2.44/linux-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch new file mode 100644 index 0000000000..10b412a339 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-057.04-media-ati_remote-add-regular-up-down-buttons-to-Medi.patch @@ -0,0 +1,48 @@ +From 3c90ed099a00fc9913665fab0ed3c4382a1b4d64 Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Mon, 23 Apr 2012 00:37:39 +0300 +Subject: [PATCH 4/4] [media] ati_remote: add regular up/down buttons to + Medion Digitainer keymap + +There are many different Medion X10 remotes that need slightly different +keymaps. We may not yet have all the needed keymaps, in which case a +wrong keymap may be used. This happened with Medion X10 OR2x remotes +before the keymap for them was added, causing the ati_remote driver to +select the Medion Digitainer keymap instead. Unfortunately, the Medion +Digitainer keymap doesn't have the standard X10 up/down scancodes +assigned to KEY_UP and KEY_DOWN keycodes, making wrongly assigned +remotes mostly unusable. + +Add the regular KEY_UP and KEY_DOWN scancodes to the Medion X10 +Digitainer keymap, making any Medion remote mostly usable even when +wrongly used with that keymap (standard buttons, such as +up/down/left/right, 0-9, play/stop/pause, have the same scancode in all +the X10 remotes). + +Signed-off-by: Anssi Hannula +--- + drivers/media/rc/keymaps/rc-medion-x10-digitainer.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c b/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c +index 0a5ce84..d405d8c 100644 +--- a/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c ++++ b/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c +@@ -86,6 +86,14 @@ static struct rc_map_table medion_x10_digitainer[] = { + { 0x14, KEY_8 }, + { 0x15, KEY_9 }, + { 0x17, KEY_0 }, ++ ++ /* these do not actually exist on this remote, but these scancodes ++ * exist on all other Medion X10 remotes and adding them here allows ++ * such remotes to be adequately usable with this keymap in case ++ * this keymap is wrongly used with them (which is quite possible as ++ * there are lots of different Medion X10 remotesi): */ ++ { 0x1a, KEY_UP }, ++ { 0x22, KEY_DOWN }, + }; + + static struct rc_map_list medion_x10_digitainer_map = { +-- +1.7.10 + diff --git a/packages/linux/patches/3.2.44/linux-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/3.2.44/linux-071-silence_i915_agp-module-0.1.patch new file mode 100644 index 0000000000..81bbc8c362 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-071-silence_i915_agp-module-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c 2011-04-27 05:48:50.000000000 +0200 ++++ linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c 2011-04-29 02:51:28.773622809 +0200 +@@ -760,7 +760,7 @@ + static int __init i915_init(void) + { + if (!intel_agp_enabled) { +- DRM_ERROR("drm/i915 can't work without intel_agp module!\n"); ++ DRM_INFO("drm/i915 can't work without intel_agp module!\n"); + return -ENODEV; + } + diff --git a/packages/linux/patches/3.2.44/linux-201-add_Anysee_T2C_support-0.1.patch b/packages/linux/patches/3.2.44/linux-201-add_Anysee_T2C_support-0.1.patch new file mode 100644 index 0000000000..4242e6b337 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-201-add_Anysee_T2C_support-0.1.patch @@ -0,0 +1,845 @@ +diff -Naur linux-3.2.1/drivers/media/common/tuners/tda18212.c linux-3.2.1.patch/drivers/media/common/tuners/tda18212.c +--- linux-3.2.1/drivers/media/common/tuners/tda18212.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/common/tuners/tda18212.c 2012-01-22 16:07:33.176264363 +0100 +@@ -25,6 +25,8 @@ + struct tda18212_priv { + struct tda18212_config *cfg; + struct i2c_adapter *i2c; ++ ++ u32 if_frequency; + }; + + #define dbg(fmt, arg...) \ +@@ -136,12 +138,24 @@ + int ret, i; + u32 if_khz; + u8 buf[9]; ++ #define DVBT_6 0 ++ #define DVBT_7 1 ++ #define DVBT_8 2 ++ #define DVBT2_6 3 ++ #define DVBT2_7 4 ++ #define DVBT2_8 5 ++ #define DVBC_6 6 ++ #define DVBC_8 7 + static const u8 bw_params[][3] = { +- /* 0f 13 23 */ +- { 0xb3, 0x20, 0x03 }, /* DVB-T 6 MHz */ +- { 0xb3, 0x31, 0x01 }, /* DVB-T 7 MHz */ +- { 0xb3, 0x22, 0x01 }, /* DVB-T 8 MHz */ +- { 0x92, 0x53, 0x03 }, /* DVB-C */ ++ /* reg: 0f 13 23 */ ++ [DVBT_6] = { 0xb3, 0x20, 0x03 }, ++ [DVBT_7] = { 0xb3, 0x31, 0x01 }, ++ [DVBT_8] = { 0xb3, 0x22, 0x01 }, ++ [DVBT2_6] = { 0xbc, 0x20, 0x03 }, ++ [DVBT2_7] = { 0xbc, 0x72, 0x03 }, ++ [DVBT2_8] = { 0xbc, 0x22, 0x01 }, ++ [DVBC_6] = { 0x92, 0x50, 0x03 }, ++ [DVBC_8] = { 0x92, 0x53, 0x03 }, + }; + + dbg("delsys=%d RF=%d BW=%d\n", +@@ -155,15 +169,34 @@ + switch (c->bandwidth_hz) { + case 6000000: + if_khz = priv->cfg->if_dvbt_6; +- i = 0; ++ i = DVBT_6; + break; + case 7000000: + if_khz = priv->cfg->if_dvbt_7; +- i = 1; ++ i = DVBT_7; + break; + case 8000000: + if_khz = priv->cfg->if_dvbt_8; +- i = 2; ++ i = DVBT_8; ++ break; ++ default: ++ ret = -EINVAL; ++ goto error; ++ } ++ break; ++ case SYS_DVBT2: ++ switch (c->bandwidth_hz) { ++ case 6000000: ++ if_khz = priv->cfg->if_dvbt2_6; ++ i = DVBT2_6; ++ break; ++ case 7000000: ++ if_khz = priv->cfg->if_dvbt2_7; ++ i = DVBT2_7; ++ break; ++ case 8000000: ++ if_khz = priv->cfg->if_dvbt2_8; ++ i = DVBT2_8; + break; + default: + ret = -EINVAL; +@@ -172,7 +205,7 @@ + break; + case SYS_DVBC_ANNEX_AC: + if_khz = priv->cfg->if_dvbc; +- i = 3; ++ i = DVBC_8; + break; + default: + ret = -EINVAL; +@@ -194,7 +227,7 @@ + buf[0] = 0x02; + buf[1] = bw_params[i][1]; + buf[2] = 0x03; /* default value */ +- buf[3] = if_khz / 50; ++ buf[3] = DIV_ROUND_CLOSEST(if_khz, 50); + buf[4] = ((c->frequency / 1000) >> 16) & 0xff; + buf[5] = ((c->frequency / 1000) >> 8) & 0xff; + buf[6] = ((c->frequency / 1000) >> 0) & 0xff; +@@ -204,6 +237,9 @@ + if (ret) + goto error; + ++ /* actual IF rounded as it is on register */ ++ priv->if_frequency = buf[3] * 50 * 1000; ++ + exit: + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */ +@@ -215,6 +251,15 @@ + goto exit; + } + ++static int tda18212_get_if_frequency(struct dvb_frontend *fe, u32 *frequency) ++{ ++ struct tda18212_priv *priv = fe->tuner_priv; ++ ++ *frequency = priv->if_frequency; ++ ++ return 0; ++} ++ + static int tda18212_release(struct dvb_frontend *fe) + { + kfree(fe->tuner_priv); +@@ -234,6 +279,7 @@ + .release = tda18212_release, + + .set_params = tda18212_set_params, ++ .get_if_frequency = tda18212_get_if_frequency, + }; + + struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe, +diff -Naur linux-3.2.1/drivers/media/common/tuners/tda18212.h linux-3.2.1.patch/drivers/media/common/tuners/tda18212.h +--- linux-3.2.1/drivers/media/common/tuners/tda18212.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/common/tuners/tda18212.h 2012-01-22 16:07:33.176264363 +0100 +@@ -29,6 +29,10 @@ + u16 if_dvbt_6; + u16 if_dvbt_7; + u16 if_dvbt_8; ++ u16 if_dvbt2_5; ++ u16 if_dvbt2_6; ++ u16 if_dvbt2_7; ++ u16 if_dvbt2_8; + u16 if_dvbc; + }; + +diff -Naur linux-3.2.1/drivers/media/dvb/dvb-usb/anysee.c linux-3.2.1.patch/drivers/media/dvb/dvb-usb/anysee.c +--- linux-3.2.1/drivers/media/dvb/dvb-usb/anysee.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/dvb-usb/anysee.c 2012-01-22 16:09:04.983927302 +0100 +@@ -41,6 +41,7 @@ + #include "stv0900.h" + #include "stv6110.h" + #include "isl6423.h" ++#include "cxd2820r.h" + + /* debug */ + static int dvb_usb_anysee_debug; +@@ -66,10 +67,12 @@ + if (mutex_lock_interruptible(&anysee_usb_mutex) < 0) + return -EAGAIN; + ++ deb_xfer(">>> "); ++ debug_dump(buf, slen, deb_xfer); ++ + /* We need receive one message more after dvb_usb_generic_rw due + to weird transaction flow, which is 1 x send + 2 x receive. */ + ret = dvb_usb_generic_rw(d, buf, sizeof(buf), buf, sizeof(buf), 0); +- + if (!ret) { + /* receive 2nd answer */ + ret = usb_bulk_msg(d->udev, usb_rcvbulkpipe(d->udev, +@@ -79,7 +82,10 @@ + err("%s: recv bulk message failed: %d", __func__, ret); + else { + deb_xfer("<<< "); +- debug_dump(buf, act_len, deb_xfer); ++ debug_dump(buf, rlen, deb_xfer); ++ ++ if (buf[63] != 0x4f) ++ deb_info("%s: cmd failed\n", __func__); + } + } + +@@ -129,6 +135,29 @@ + return anysee_write_reg(d, reg, val); + } + ++/* read single register with mask */ ++static int anysee_rd_reg_mask(struct dvb_usb_device *d, u16 reg, u8 *val, ++ u8 mask) ++{ ++ int ret, i; ++ u8 tmp; ++ ++ ret = anysee_read_reg(d, reg, &tmp); ++ if (ret) ++ return ret; ++ ++ tmp &= mask; ++ ++ /* find position of the first bit */ ++ for (i = 0; i < 8; i++) { ++ if ((mask >> i) & 0x01) ++ break; ++ } ++ *val = tmp >> i; ++ ++ return 0; ++} ++ + static int anysee_get_hw_info(struct dvb_usb_device *d, u8 *id) + { + u8 buf[] = {CMD_GET_HW_INFO}; +@@ -156,22 +185,6 @@ + return anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0); + } + +-static int anysee_init(struct dvb_usb_device *d) +-{ +- int ret; +- /* LED light */ +- ret = anysee_led_ctrl(d, 0x01, 0x03); +- if (ret) +- return ret; +- +- /* enable IR */ +- ret = anysee_ir_ctrl(d, 1); +- if (ret) +- return ret; +- +- return 0; +-} +- + /* I2C */ + static int anysee_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, + int num) +@@ -297,7 +310,7 @@ + .pll_m = 12, + .pll_p = 3, + .pll_n = 1, +- .output_mode = TDA10023_OUTPUT_MODE_PARALLEL_C, ++ .output_mode = TDA10023_OUTPUT_MODE_PARALLEL_B, + .deltaf = 0xba02, + }; + +@@ -309,6 +322,17 @@ + .if_dvbc = 5000, + }; + ++static struct tda18212_config anysee_tda18212_config2 = { ++ .i2c_address = 0x60 /* (0xc0 >> 1) */, ++ .if_dvbt_6 = 3550, ++ .if_dvbt_7 = 3700, ++ .if_dvbt_8 = 4150, ++ .if_dvbt2_6 = 3250, ++ .if_dvbt2_7 = 4000, ++ .if_dvbt2_8 = 4000, ++ .if_dvbc = 5000, ++}; ++ + static struct cx24116_config anysee_cx24116_config = { + .demod_address = (0xaa >> 1), + .mpg_clk_pos_pol = 0x00, +@@ -339,6 +363,18 @@ + .addr = (0x10 >> 1), + }; + ++static struct cxd2820r_config anysee_cxd2820r_config = { ++ .i2c_address = 0x6d, /* (0xda >> 1) */ ++ .ts_mode = 0x38, ++ .if_dvbt_6 = 3550, ++ .if_dvbt_7 = 3700, ++ .if_dvbt_8 = 4150, ++ .if_dvbt2_6 = 3250, ++ .if_dvbt2_7 = 4000, ++ .if_dvbt2_8 = 4000, ++ .if_dvbc = 5000, ++}; ++ + /* + * New USB device strings: Mfr=1, Product=2, SerialNumber=0 + * Manufacturer: AMT.CO.KR +@@ -421,6 +457,14 @@ + * IOA[7] TS 1=enabled + * IOE[5] STV0903 1=enabled + * ++ * E7 T2C VID=1c73 PID=861f HW=20 FW=0.1 AMTCI=0.5 "anysee-E7T2C(LP)" ++ * PCB: 508T2C (rev0.3) ++ * parts: DNOQ44QCH106A(CXD2820R, TDA18212), TDA8024 ++ * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff ++ * IOA=4d IOB=00 IOC=cc IOD=48 IOE=e4 ++ * IOA[7] TS 1=enabled ++ * IOE[5] CXD2820R 1=enabled ++ * + * E7 PTC VID=1c73 PID=861f HW=21 FW=0.1 AMTCI=?? "anysee-E7PTC(LP)" + * PCB: 508PTC (rev0.5) + * parts: ZL10353, TDA10023, DNOD44CDH086A(TDA18212) +@@ -437,7 +481,7 @@ + * IOD[6] ZL10353 1=enabled + * IOE[0] IF 0=enabled + * +- * E7 S2 VID=1c73 PID=861f HW=22 FW=0.1 AMTCI=?? "anysee-E7PS2(LP)" ++ * E7 PS2 VID=1c73 PID=861f HW=22 FW=0.1 AMTCI=?? "anysee-E7PS2(LP)" + * PCB: 508PS2 (rev0.4) + * parts: DNBU10512IST(STV0903, STV6110), ISL6423 + * OEA=80 OEB=00 OEC=03 OED=f7 OEE=ff +@@ -446,6 +490,16 @@ + * IOE[5] STV0903 1=enabled + */ + ++ ++/* external I2C gate used for DNOD44CDH086A(TDA18212) tuner module */ ++static int anysee_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) ++{ ++ struct dvb_usb_adapter *adap = fe->dvb->priv; ++ ++ /* enable / disable tuner access on IOE[4] */ ++ return anysee_wr_reg_mask(adap->dev, REG_IOE, (enable << 4), 0x10); ++} ++ + static int anysee_frontend_ctrl(struct dvb_frontend *fe, int onoff) + { + struct dvb_usb_adapter *adap = fe->dvb->priv; +@@ -577,7 +631,8 @@ + /* detect hardware only once */ + if (adap->fe_adap[0].fe == NULL) { + /* Check which hardware we have. +- * We must do this call two times to get reliable values (hw bug). ++ * We must do this call two times to get reliable values ++ * (hw/fw bug). + */ + ret = anysee_get_hw_info(adap->dev, hw_info); + if (ret) +@@ -606,14 +661,14 @@ + break; + + /* attach demod */ +- adap->fe_adap[0].fe = dvb_attach(mt352_attach, &anysee_mt352_config, +- &adap->dev->i2c_adap); ++ adap->fe_adap[0].fe = dvb_attach(mt352_attach, ++ &anysee_mt352_config, &adap->dev->i2c_adap); + if (adap->fe_adap[0].fe) + break; + + /* attach demod */ +- adap->fe_adap[0].fe = dvb_attach(zl10353_attach, &anysee_zl10353_config, +- &adap->dev->i2c_adap); ++ adap->fe_adap[0].fe = dvb_attach(zl10353_attach, ++ &anysee_zl10353_config, &adap->dev->i2c_adap); + + break; + case ANYSEE_HW_507CD: /* 6 */ +@@ -665,8 +720,8 @@ + goto error; + + /* attach demod */ +- adap->fe_adap[0].fe = dvb_attach(cx24116_attach, &anysee_cx24116_config, +- &adap->dev->i2c_adap); ++ adap->fe_adap[0].fe = dvb_attach(cx24116_attach, ++ &anysee_cx24116_config, &adap->dev->i2c_adap); + + break; + case ANYSEE_HW_507FA: /* 15 */ +@@ -747,17 +802,19 @@ + } + } + ++ /* I2C gate for DNOD44CDH086A(TDA18212) tuner module */ ++ if (tmp == 0xc7) { ++ if (adap->fe_adap[state->fe_id].fe) ++ adap->fe_adap[state->fe_id].fe->ops.i2c_gate_ctrl = ++ anysee_i2c_gate_ctrl; ++ } ++ + break; + case ANYSEE_HW_508TC: /* 18 */ + case ANYSEE_HW_508PTC: /* 21 */ + /* E7 TC */ + /* E7 PTC */ + +- /* enable transport stream on IOA[7] */ +- ret = anysee_wr_reg_mask(adap->dev, REG_IOA, (1 << 7), 0x80); +- if (ret) +- goto error; +- + if ((state->fe_id ^ dvb_usb_anysee_delsys) == 0) { + /* disable DVB-T demod on IOD[6] */ + ret = anysee_wr_reg_mask(adap->dev, REG_IOD, (0 << 6), +@@ -772,7 +829,8 @@ + goto error; + + /* attach demod */ +- adap->fe_adap[state->fe_id].fe = dvb_attach(tda10023_attach, ++ adap->fe_adap[state->fe_id].fe = ++ dvb_attach(tda10023_attach, + &anysee_tda10023_tda18212_config, + &adap->dev->i2c_adap, 0x48); + } else { +@@ -789,11 +847,19 @@ + goto error; + + /* attach demod */ +- adap->fe_adap[state->fe_id].fe = dvb_attach(zl10353_attach, ++ adap->fe_adap[state->fe_id].fe = ++ dvb_attach(zl10353_attach, + &anysee_zl10353_tda18212_config, + &adap->dev->i2c_adap); + } + ++ /* I2C gate for DNOD44CDH086A(TDA18212) tuner module */ ++ if (adap->fe_adap[state->fe_id].fe) ++ adap->fe_adap[state->fe_id].fe->ops.i2c_gate_ctrl = ++ anysee_i2c_gate_ctrl; ++ ++ state->has_ci = true; ++ + break; + case ANYSEE_HW_508S2: /* 19 */ + case ANYSEE_HW_508PS2: /* 22 */ +@@ -803,19 +869,35 @@ + if (state->fe_id) + break; + +- /* enable transport stream on IOA[7] */ +- ret = anysee_wr_reg_mask(adap->dev, REG_IOA, (1 << 7), 0x80); ++ /* enable DVB-S/S2 demod on IOE[5] */ ++ ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 5), 0x20); + if (ret) + goto error; + +- /* enable DVB-S/S2 demod on IOE[5] */ ++ /* attach demod */ ++ adap->fe_adap[0].fe = dvb_attach(stv0900_attach, ++ &anysee_stv0900_config, &adap->dev->i2c_adap, 0); ++ ++ state->has_ci = true; ++ ++ break; ++ case ANYSEE_HW_508T2C: /* 20 */ ++ /* E7 T2C */ ++ ++ if (state->fe_id) ++ break; ++ ++ /* enable DVB-T/T2/C demod on IOE[5] */ + ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 5), 0x20); + if (ret) + goto error; + + /* attach demod */ +- adap->fe_adap[0].fe = dvb_attach(stv0900_attach, &anysee_stv0900_config, +- &adap->dev->i2c_adap, 0); ++ adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach, ++ &anysee_cxd2820r_config, &adap->dev->i2c_adap, ++ NULL); ++ ++ state->has_ci = true; + + break; + } +@@ -842,24 +924,26 @@ + /* E30 */ + + /* attach tuner */ +- fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc2 >> 1), +- NULL, DVB_PLL_THOMSON_DTT7579); ++ fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, ++ (0xc2 >> 1), NULL, DVB_PLL_THOMSON_DTT7579); + + break; + case ANYSEE_HW_507CD: /* 6 */ + /* E30 Plus */ + + /* attach tuner */ +- fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc2 >> 1), +- &adap->dev->i2c_adap, DVB_PLL_THOMSON_DTT7579); ++ fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, ++ (0xc2 >> 1), &adap->dev->i2c_adap, ++ DVB_PLL_THOMSON_DTT7579); + + break; + case ANYSEE_HW_507DC: /* 10 */ + /* E30 C Plus */ + + /* attach tuner */ +- fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, (0xc0 >> 1), +- &adap->dev->i2c_adap, DVB_PLL_SAMSUNG_DTOS403IH102A); ++ fe = dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, ++ (0xc0 >> 1), &adap->dev->i2c_adap, ++ DVB_PLL_SAMSUNG_DTOS403IH102A); + + break; + case ANYSEE_HW_507SI: /* 11 */ +@@ -877,22 +961,12 @@ + /* Try first attach TDA18212 silicon tuner on IOE[4], if that + * fails attach old simple PLL. */ + +- /* enable tuner on IOE[4] */ +- ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 4), 0x10); +- if (ret) +- goto error; +- + /* attach tuner */ + fe = dvb_attach(tda18212_attach, adap->fe_adap[state->fe_id].fe, + &adap->dev->i2c_adap, &anysee_tda18212_config); + if (fe) + break; + +- /* disable tuner on IOE[4] */ +- ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (0 << 4), 0x10); +- if (ret) +- goto error; +- + /* attach tuner */ + fe = dvb_attach(dvb_pll_attach, adap->fe_adap[state->fe_id].fe, + (0xc0 >> 1), &adap->dev->i2c_adap, +@@ -904,11 +978,6 @@ + /* E7 TC */ + /* E7 PTC */ + +- /* enable tuner on IOE[4] */ +- ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 4), 0x10); +- if (ret) +- goto error; +- + /* attach tuner */ + fe = dvb_attach(tda18212_attach, adap->fe_adap[state->fe_id].fe, + &adap->dev->i2c_adap, &anysee_tda18212_config); +@@ -930,6 +999,15 @@ + } + + break; ++ ++ case ANYSEE_HW_508T2C: /* 20 */ ++ /* E7 T2C */ ++ ++ /* attach tuner */ ++ fe = dvb_attach(tda18212_attach, adap->fe_adap[state->fe_id].fe, ++ &adap->dev->i2c_adap, &anysee_tda18212_config2); ++ ++ break; + default: + fe = NULL; + } +@@ -939,7 +1017,6 @@ + else + ret = -ENODEV; + +-error: + return ret; + } + +@@ -969,6 +1046,201 @@ + return 0; + } + ++static int anysee_ci_read_attribute_mem(struct dvb_ca_en50221 *ci, int slot, ++ int addr) ++{ ++ struct dvb_usb_device *d = ci->data; ++ int ret; ++ u8 buf[] = {CMD_CI, 0x02, 0x40 | addr >> 8, addr & 0xff, 0x00, 1}; ++ u8 val; ++ ++ ret = anysee_ctrl_msg(d, buf, sizeof(buf), &val, 1); ++ if (ret) ++ return ret; ++ ++ return val; ++} ++ ++static int anysee_ci_write_attribute_mem(struct dvb_ca_en50221 *ci, int slot, ++ int addr, u8 val) ++{ ++ struct dvb_usb_device *d = ci->data; ++ int ret; ++ u8 buf[] = {CMD_CI, 0x03, 0x40 | addr >> 8, addr & 0xff, 0x00, 1, val}; ++ ++ ret = anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int anysee_ci_read_cam_control(struct dvb_ca_en50221 *ci, int slot, ++ u8 addr) ++{ ++ struct dvb_usb_device *d = ci->data; ++ int ret; ++ u8 buf[] = {CMD_CI, 0x04, 0x40, addr, 0x00, 1}; ++ u8 val; ++ ++ ret = anysee_ctrl_msg(d, buf, sizeof(buf), &val, 1); ++ if (ret) ++ return ret; ++ ++ return val; ++} ++ ++static int anysee_ci_write_cam_control(struct dvb_ca_en50221 *ci, int slot, ++ u8 addr, u8 val) ++{ ++ struct dvb_usb_device *d = ci->data; ++ int ret; ++ u8 buf[] = {CMD_CI, 0x05, 0x40, addr, 0x00, 1, val}; ++ ++ ret = anysee_ctrl_msg(d, buf, sizeof(buf), NULL, 0); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int anysee_ci_slot_reset(struct dvb_ca_en50221 *ci, int slot) ++{ ++ struct dvb_usb_device *d = ci->data; ++ int ret; ++ struct anysee_state *state = d->priv; ++ ++ state->ci_cam_ready = jiffies + msecs_to_jiffies(1000); ++ ++ ret = anysee_wr_reg_mask(d, REG_IOA, (0 << 7), 0x80); ++ if (ret) ++ return ret; ++ ++ msleep(300); ++ ++ ret = anysee_wr_reg_mask(d, REG_IOA, (1 << 7), 0x80); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int anysee_ci_slot_shutdown(struct dvb_ca_en50221 *ci, int slot) ++{ ++ struct dvb_usb_device *d = ci->data; ++ int ret; ++ ++ ret = anysee_wr_reg_mask(d, REG_IOA, (0 << 7), 0x80); ++ if (ret) ++ return ret; ++ ++ msleep(30); ++ ++ ret = anysee_wr_reg_mask(d, REG_IOA, (1 << 7), 0x80); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int anysee_ci_slot_ts_enable(struct dvb_ca_en50221 *ci, int slot) ++{ ++ struct dvb_usb_device *d = ci->data; ++ int ret; ++ ++ ret = anysee_wr_reg_mask(d, REG_IOD, (0 << 1), 0x02); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static int anysee_ci_poll_slot_status(struct dvb_ca_en50221 *ci, int slot, ++ int open) ++{ ++ struct dvb_usb_device *d = ci->data; ++ struct anysee_state *state = d->priv; ++ int ret; ++ u8 tmp; ++ ++ ret = anysee_rd_reg_mask(d, REG_IOC, &tmp, 0x40); ++ if (ret) ++ return ret; ++ ++ if (tmp == 0) { ++ ret = DVB_CA_EN50221_POLL_CAM_PRESENT; ++ if (time_after(jiffies, state->ci_cam_ready)) ++ ret |= DVB_CA_EN50221_POLL_CAM_READY; ++ } ++ ++ return ret; ++} ++ ++static int anysee_ci_init(struct dvb_usb_device *d) ++{ ++ struct anysee_state *state = d->priv; ++ int ret; ++ ++ state->ci.owner = THIS_MODULE; ++ state->ci.read_attribute_mem = anysee_ci_read_attribute_mem; ++ state->ci.write_attribute_mem = anysee_ci_write_attribute_mem; ++ state->ci.read_cam_control = anysee_ci_read_cam_control; ++ state->ci.write_cam_control = anysee_ci_write_cam_control; ++ state->ci.slot_reset = anysee_ci_slot_reset; ++ state->ci.slot_shutdown = anysee_ci_slot_shutdown; ++ state->ci.slot_ts_enable = anysee_ci_slot_ts_enable; ++ state->ci.poll_slot_status = anysee_ci_poll_slot_status; ++ state->ci.data = d; ++ ++ ret = anysee_wr_reg_mask(d, REG_IOA, (1 << 7), 0x80); ++ if (ret) ++ return ret; ++ ++ ret = dvb_ca_en50221_init(&d->adapter[0].dvb_adap, &state->ci, 0, 1); ++ if (ret) ++ return ret; ++ ++ return 0; ++} ++ ++static void anysee_ci_release(struct dvb_usb_device *d) ++{ ++ struct anysee_state *state = d->priv; ++ ++ /* detach CI */ ++ if (state->has_ci) ++ dvb_ca_en50221_release(&state->ci); ++ ++ return; ++} ++ ++static int anysee_init(struct dvb_usb_device *d) ++{ ++ struct anysee_state *state = d->priv; ++ int ret; ++ ++ /* LED light */ ++ ret = anysee_led_ctrl(d, 0x01, 0x03); ++ if (ret) ++ return ret; ++ ++ /* enable IR */ ++ ret = anysee_ir_ctrl(d, 1); ++ if (ret) ++ return ret; ++ ++ /* attach CI */ ++ if (state->has_ci) { ++ ret = anysee_ci_init(d); ++ if (ret) { ++ state->has_ci = false; ++ return ret; ++ } ++ } ++ ++ return 0; ++} ++ + /* DVB USB Driver stuff */ + static struct dvb_usb_device_properties anysee_properties; + +@@ -1010,6 +1282,16 @@ + return anysee_init(d); + } + ++static void anysee_disconnect(struct usb_interface *intf) ++{ ++ struct dvb_usb_device *d = usb_get_intfdata(intf); ++ ++ anysee_ci_release(d); ++ dvb_usb_device_exit(intf); ++ ++ return; ++} ++ + static struct usb_device_id anysee_table[] = { + { USB_DEVICE(USB_VID_CYPRESS, USB_PID_ANYSEE) }, + { USB_DEVICE(USB_VID_AMT, USB_PID_ANYSEE) }, +@@ -1029,7 +1311,7 @@ + { + .num_frontends = 2, + .frontend_ctrl = anysee_frontend_ctrl, +- .fe = {{ ++ .fe = { { + .streaming_ctrl = anysee_streaming_ctrl, + .frontend_attach = anysee_frontend_attach, + .tuner_attach = anysee_tuner_attach, +@@ -1057,7 +1339,7 @@ + } + } + }, +- }}, ++ } }, + } + }, + +@@ -1087,7 +1369,7 @@ + static struct usb_driver anysee_driver = { + .name = "dvb_usb_anysee", + .probe = anysee_probe, +- .disconnect = dvb_usb_device_exit, ++ .disconnect = anysee_disconnect, + .id_table = anysee_table, + }; + +diff -Naur linux-3.2.1/drivers/media/dvb/dvb-usb/anysee.h linux-3.2.1.patch/drivers/media/dvb/dvb-usb/anysee.h +--- linux-3.2.1/drivers/media/dvb/dvb-usb/anysee.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/dvb-usb/anysee.h 2012-01-22 16:07:33.178264400 +0100 +@@ -36,6 +36,7 @@ + + #define DVB_USB_LOG_PREFIX "anysee" + #include "dvb-usb.h" ++#include "dvb_ca_en50221.h" + + #define deb_info(args...) dprintk(dvb_usb_anysee_debug, 0x01, args) + #define deb_xfer(args...) dprintk(dvb_usb_anysee_debug, 0x02, args) +@@ -54,12 +55,16 @@ + CMD_GET_IR_CODE = 0x41, + CMD_GET_HW_INFO = 0x19, + CMD_SMARTCARD = 0x34, ++ CMD_CI = 0x37, + }; + + struct anysee_state { + u8 hw; /* PCB ID */ + u8 seq; + u8 fe_id:1; /* frondend ID */ ++ u8 has_ci:1; ++ struct dvb_ca_en50221 ci; ++ unsigned long ci_cam_ready; /* jiffies */ + }; + + #define ANYSEE_HW_507T 2 /* E30 */ +@@ -69,6 +74,7 @@ + #define ANYSEE_HW_507FA 15 /* E30 Combo Plus / E30 C Plus */ + #define ANYSEE_HW_508TC 18 /* E7 TC */ + #define ANYSEE_HW_508S2 19 /* E7 S2 */ ++#define ANYSEE_HW_508T2C 20 /* E7 T2C */ + #define ANYSEE_HW_508PTC 21 /* E7 PTC Plus */ + #define ANYSEE_HW_508PS2 22 /* E7 PS2 Plus */ + +diff -Naur linux-3.2.1/drivers/media/dvb/dvb-usb/Kconfig linux-3.2.1.patch/drivers/media/dvb/dvb-usb/Kconfig +--- linux-3.2.1/drivers/media/dvb/dvb-usb/Kconfig 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/dvb-usb/Kconfig 2012-01-22 16:07:33.179264419 +0100 +@@ -311,6 +311,7 @@ + select DVB_STV0900 if !DVB_FE_CUSTOMISE + select DVB_STV6110 if !DVB_FE_CUSTOMISE + select DVB_ISL6423 if !DVB_FE_CUSTOMISE ++ select DVB_CXD2820R if !DVB_FE_CUSTOMISE + help + Say Y here to support the Anysee E30, Anysee E30 Plus or + Anysee E30 C Plus DVB USB2.0 receiver. diff --git a/packages/linux/patches/3.2.44/linux-202-add_HVR930C_support-0.1.patch b/packages/linux/patches/3.2.44/linux-202-add_HVR930C_support-0.1.patch new file mode 100644 index 0000000000..d6aaf40408 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-202-add_HVR930C_support-0.1.patch @@ -0,0 +1,649 @@ +diff -Naur linux-3.2.1/Documentation/DocBook/media/dvb/dvbproperty.xml linux-3.2.1.patch/Documentation/DocBook/media/dvb/dvbproperty.xml +--- linux-3.2.1/Documentation/DocBook/media/dvb/dvbproperty.xml 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/Documentation/DocBook/media/dvb/dvbproperty.xml 2012-01-22 15:52:29.773509131 +0100 +@@ -311,6 +311,8 @@ + ROLLOFF_20, + ROLLOFF_25, + ROLLOFF_AUTO, ++ ROLLOFF_15, /* DVB-C Annex A */ ++ ROLLOFF_13, /* DVB-C Annex C */ + } fe_rolloff_t; + + +@@ -778,8 +780,10 @@ + DTV_MODULATION + DTV_INVERSION + DTV_SYMBOL_RATE ++ DTV_ROLLOFF + DTV_INNER_FEC + ++ The Rolloff of 0.15 (ROLLOFF_15) is assumed, as ITU-T J.83 Annex A is more common. For Annex C, rolloff should be 0.13 (ROLLOFF_13). All other values are invalid. + +
+ DVB-C Annex B delivery system +diff -Naur linux-3.2.1/Documentation/dvb/get_dvb_firmware linux-3.2.1.patch/Documentation/dvb/get_dvb_firmware +--- linux-3.2.1/Documentation/dvb/get_dvb_firmware 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/Documentation/dvb/get_dvb_firmware 2012-01-22 15:38:50.939309809 +0100 +@@ -27,8 +27,8 @@ + "or51211", "or51132_qam", "or51132_vsb", "bluebird", + "opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718", + "af9015", "ngene", "az6027", "lme2510_lg", "lme2510c_s7395", +- "lme2510c_s7395_old", "drxk", "drxk_terratec_h5", "tda10071", +- "it9135" ); ++ "lme2510c_s7395_old", "drxk", "drxk_terratec_h5", ++ "drxk_hauppauge_hvr930c", "tda10071", "it9135" ); + + # Check args + syntax() if (scalar(@ARGV) != 1); +@@ -643,6 +643,24 @@ + + "$fwfile" + } ++ ++sub drxk_hauppauge_hvr930c { ++ my $url = "http://www.wintvcd.co.uk/drivers/"; ++ my $zipfile = "HVR-9x0_5_10_325_28153_SIGNED.zip"; ++ my $hash = "83ab82e7e9480ec8bf1ae0155ca63c88"; ++ my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); ++ my $drvfile = "HVR-900/emOEM.sys"; ++ my $fwfile = "dvb-usb-hauppauge-hvr930c-drxk.fw"; ++ ++ checkstandard(); ++ ++ wgetfile($zipfile, $url . $zipfile); ++ verify($zipfile, $hash); ++ unzip($zipfile, $tmpdir); ++ extract("$tmpdir/$drvfile", 0x117b0, 42692, "$fwfile"); ++ ++ "$fwfile" ++} + + sub drxk_terratec_h5 { + my $url = "http://www.linuxtv.org/downloads/firmware/"; +diff -Naur linux-3.2.1/drivers/media/common/tuners/xc5000.c linux-3.2.1.patch/drivers/media/common/tuners/xc5000.c +--- linux-3.2.1/drivers/media/common/tuners/xc5000.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/common/tuners/xc5000.c 2012-01-22 15:38:54.115367896 +0100 +@@ -628,20 +628,12 @@ + dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality); + } + +-/* +- * As defined on EN 300 429, the DVB-C roll-off factor is 0.15. +- * So, the amount of the needed bandwith is given by: +- * Bw = Symbol_rate * (1 + 0.15) +- * As such, the maximum symbol rate supported by 6 MHz is given by: +- * max_symbol_rate = 6 MHz / 1.15 = 5217391 Bauds +- */ +-#define MAX_SYMBOL_RATE_6MHz 5217391 +- + static int xc5000_set_params(struct dvb_frontend *fe, + struct dvb_frontend_parameters *params) + { + struct xc5000_priv *priv = fe->tuner_priv; + int ret; ++ u32 bw; + + if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) { + if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) { +@@ -684,8 +676,10 @@ + priv->freq_hz = params->frequency - 1750000; + break; + case BANDWIDTH_7_MHZ: +- printk(KERN_ERR "xc5000 bandwidth 7MHz not supported\n"); +- return -EINVAL; ++ priv->bandwidth = BANDWIDTH_7_MHZ; ++ priv->video_standard = DTV7; ++ priv->freq_hz = params->frequency - 2250000; ++ break; + case BANDWIDTH_8_MHZ: + priv->bandwidth = BANDWIDTH_8_MHZ; + priv->video_standard = DTV8; +@@ -707,14 +701,26 @@ + dprintk(1, "%s() QAM modulation\n", __func__); + priv->rf_mode = XC_RF_MODE_CABLE; + /* +- * Using a 8MHz bandwidth sometimes fail +- * with 6MHz-spaced channels, due to inter-carrier +- * interference. So, use DTV6 firmware ++ * Using a higher bandwidth at the tuner filter may ++ * allow inter-carrier interference. ++ * So, determine the minimal channel spacing, in order ++ * to better adjust the tuner filter. ++ * According with ITU-T J.83, the bandwidth is given by: ++ * bw = Simbol Rate * (1 + roll_off), where the roll_off ++ * is equal to 0.15 for Annex A, and 0.13 for annex C + */ +- if (params->u.qam.symbol_rate <= MAX_SYMBOL_RATE_6MHz) { ++ if (fe->dtv_property_cache.rolloff == ROLLOFF_13) ++ bw = (params->u.qam.symbol_rate * 13) / 10; ++ else ++ bw = (params->u.qam.symbol_rate * 15) / 10; ++ if (bw <= 6000000) { + priv->bandwidth = BANDWIDTH_6_MHZ; + priv->video_standard = DTV6; + priv->freq_hz = params->frequency - 1750000; ++ } else if (bw <= 7000000) { ++ priv->bandwidth = BANDWIDTH_7_MHZ; ++ priv->video_standard = DTV7; ++ priv->freq_hz = params->frequency - 2250000; + } else { + priv->bandwidth = BANDWIDTH_8_MHZ; + priv->video_standard = DTV7_8; +@@ -996,6 +1002,8 @@ + struct xc5000_priv *priv = fe->tuner_priv; + int ret = 0; + ++ mutex_lock(&xc5000_list_mutex); ++ + if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) { + ret = xc5000_fwupload(fe); + if (ret != XC_RESULT_SUCCESS) +@@ -1015,6 +1023,8 @@ + /* Default to "CABLE" mode */ + ret |= xc_write_reg(priv, XREG_SIGNALSOURCE, XC_RF_MODE_CABLE); + ++ mutex_unlock(&xc5000_list_mutex); ++ + return ret; + } + +diff -Naur linux-3.2.1/drivers/media/dvb/dvb-core/dvb_frontend.c linux-3.2.1.patch/drivers/media/dvb/dvb-core/dvb_frontend.c +--- linux-3.2.1/drivers/media/dvb/dvb-core/dvb_frontend.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/dvb-core/dvb_frontend.c 2012-01-22 15:52:29.774509149 +0100 +@@ -876,6 +876,7 @@ + c->symbol_rate = QAM_AUTO; + c->code_rate_HP = FEC_AUTO; + c->code_rate_LP = FEC_AUTO; ++ c->rolloff = ROLLOFF_AUTO; + + c->isdbt_partial_reception = -1; + c->isdbt_sb_mode = -1; +@@ -1030,6 +1031,7 @@ + break; + case FE_QAM: + c->delivery_system = SYS_DVBC_ANNEX_AC; ++ c->rolloff = ROLLOFF_15; /* implied for Annex A */ + break; + case FE_OFDM: + c->delivery_system = SYS_DVBT; +diff -Naur linux-3.2.1/drivers/media/dvb/frontends/drxk.h linux-3.2.1.patch/drivers/media/dvb/frontends/drxk.h +--- linux-3.2.1/drivers/media/dvb/frontends/drxk.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/frontends/drxk.h 2012-01-22 15:38:45.923218078 +0100 +@@ -26,6 +26,8 @@ + bool antenna_dvbt; + u16 antenna_gpio; + ++ int chunk_size; ++ + const char *microcode_name; + }; + +diff -Naur linux-3.2.1/drivers/media/dvb/frontends/drxk_hard.c linux-3.2.1.patch/drivers/media/dvb/frontends/drxk_hard.c +--- linux-3.2.1/drivers/media/dvb/frontends/drxk_hard.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/frontends/drxk_hard.c 2012-01-22 15:39:13.797727862 +0100 +@@ -681,7 +681,8 @@ + state->m_hasOOB = false; + state->m_hasAudio = false; + +- state->m_ChunkSize = 124; ++ if (!state->m_ChunkSize) ++ state->m_ChunkSize = 124; + + state->m_oscClockFreq = 0; + state->m_smartAntInverted = false; +@@ -1846,6 +1847,7 @@ + */ + switch (oMode) { + case OM_DVBT: ++ dprintk(1, ": DVB-T\n"); + state->m_OperationMode = oMode; + status = SetDVBTStandard(state, oMode); + if (status < 0) +@@ -1853,6 +1855,8 @@ + break; + case OM_QAM_ITU_A: /* fallthrough */ + case OM_QAM_ITU_C: ++ dprintk(1, ": DVB-C Annex %c\n", ++ (state->m_OperationMode == OM_QAM_ITU_A) ? 'A' : 'C'); + state->m_OperationMode = oMode; + status = SetQAMStandard(state, oMode); + if (status < 0) +@@ -6182,7 +6186,10 @@ + dprintk(1, "\n"); + if (mutex_trylock(&state->ctlock) == 0) + return -EBUSY; +- SetOperationMode(state, OM_QAM_ITU_A); ++ if (state->m_itut_annex_c) ++ SetOperationMode(state, OM_QAM_ITU_C); ++ else ++ SetOperationMode(state, OM_QAM_ITU_A); + return 0; + } + +@@ -6218,6 +6225,12 @@ + return -EINVAL; + } + ++ if (fe->ops.info.type == FE_QAM) { ++ if (fe->dtv_property_cache.rolloff == ROLLOFF_13) ++ state->m_itut_annex_c = true; ++ else ++ state->m_itut_annex_c = false; ++ } + + if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 1); +@@ -6423,6 +6436,7 @@ + state->no_i2c_bridge = config->no_i2c_bridge; + state->antenna_gpio = config->antenna_gpio; + state->antenna_dvbt = config->antenna_dvbt; ++ state->m_ChunkSize = config->chunk_size; + + /* NOTE: as more UIO bits will be used, add them to the mask */ + state->UIO_mask = config->antenna_gpio; +diff -Naur linux-3.2.1/drivers/media/dvb/frontends/drxk_hard.h linux-3.2.1.patch/drivers/media/dvb/frontends/drxk_hard.h +--- linux-3.2.1/drivers/media/dvb/frontends/drxk_hard.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/frontends/drxk_hard.h 2012-01-22 15:39:13.798727880 +0100 +@@ -263,6 +263,8 @@ + u8 m_TSDataStrength; + u8 m_TSClockkStrength; + ++ bool m_itut_annex_c; /* If true, uses ITU-T DVB-C Annex C, instead of Annex A */ ++ + enum DRXMPEGStrWidth_t m_widthSTR; /**< MPEG start width */ + u32 m_mpegTsStaticBitrate; /**< Maximum bitrate in b/s in case + static clockrate is selected */ +diff -Naur linux-3.2.1/drivers/media/dvb/frontends/tda18271c2dd.c linux-3.2.1.patch/drivers/media/dvb/frontends/tda18271c2dd.c +--- linux-3.2.1/drivers/media/dvb/frontends/tda18271c2dd.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/frontends/tda18271c2dd.c 2012-01-22 15:38:39.024091895 +0100 +@@ -1123,20 +1123,6 @@ + return 0; + } + +-/* +- * As defined on EN 300 429 Annex A and on ITU-T J.83 annex A, the DVB-C +- * roll-off factor is 0.15. +- * According with the specs, the amount of the needed bandwith is given by: +- * Bw = Symbol_rate * (1 + 0.15) +- * As such, the maximum symbol rate supported by 6 MHz is +- * max_symbol_rate = 6 MHz / 1.15 = 5217391 Bauds +- *NOTE: For ITU-T J.83 Annex C, the roll-off factor is 0.13. So: +- * max_symbol_rate = 6 MHz / 1.13 = 5309735 Baud +- * That means that an adjustment is needed for Japan, +- * but, as currently DRX-K is hardcoded to Annex A, let's stick +- * with 0.15 roll-off factor. +- */ +-#define MAX_SYMBOL_RATE_6MHz 5217391 + + static int set_params(struct dvb_frontend *fe, + struct dvb_frontend_parameters *params) +@@ -1144,6 +1130,7 @@ + struct tda_state *state = fe->tuner_priv; + int status = 0; + int Standard; ++ u32 bw; + + state->m_Frequency = params->frequency; + +@@ -1161,8 +1148,23 @@ + break; + } + else if (fe->ops.info.type == FE_QAM) { +- if (params->u.qam.symbol_rate <= MAX_SYMBOL_RATE_6MHz) ++ /* ++ * Using a higher bandwidth at the tuner filter may ++ * allow inter-carrier interference. ++ * So, determine the minimal channel spacing, in order ++ * to better adjust the tuner filter. ++ * According with ITU-T J.83, the bandwidth is given by: ++ * bw = Simbol Rate * (1 + roll_off), where the roll_off ++ * is equal to 0.15 for Annex A, and 0.13 for annex C ++ */ ++ if (fe->dtv_property_cache.rolloff == ROLLOFF_13) ++ bw = (params->u.qam.symbol_rate * 13) / 10; ++ else ++ bw = (params->u.qam.symbol_rate * 15) / 10; ++ if (bw <= 6000000) + Standard = HF_DVBC_6MHZ; ++ else if (bw <= 7000000) ++ Standard = HF_DVBC_7MHZ; + else + Standard = HF_DVBC_8MHZ; + } else +diff -Naur linux-3.2.1/drivers/media/rc/keymaps/rc-hauppauge.c linux-3.2.1.patch/drivers/media/rc/keymaps/rc-hauppauge.c +--- linux-3.2.1/drivers/media/rc/keymaps/rc-hauppauge.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/rc/keymaps/rc-hauppauge.c 2012-01-22 15:39:04.767562712 +0100 +@@ -183,6 +183,57 @@ + { 0x1d3f, KEY_HOME }, + + /* ++ * Keycodes for PT# R-005 remote bundled with Haupauge HVR-930C ++ * Keycodes start with address = 0x1c ++ */ ++ { 0x1c3b, KEY_GOTO }, ++ { 0x1c3d, KEY_POWER }, ++ ++ { 0x1c14, KEY_UP }, ++ { 0x1c15, KEY_DOWN }, ++ { 0x1c16, KEY_LEFT }, ++ { 0x1c17, KEY_RIGHT }, ++ { 0x1c25, KEY_OK }, ++ ++ { 0x1c00, KEY_0 }, ++ { 0x1c01, KEY_1 }, ++ { 0x1c02, KEY_2 }, ++ { 0x1c03, KEY_3 }, ++ { 0x1c04, KEY_4 }, ++ { 0x1c05, KEY_5 }, ++ { 0x1c06, KEY_6 }, ++ { 0x1c07, KEY_7 }, ++ { 0x1c08, KEY_8 }, ++ { 0x1c09, KEY_9 }, ++ ++ { 0x1c1f, KEY_EXIT }, /* BACK */ ++ { 0x1c0d, KEY_MENU }, ++ { 0x1c1c, KEY_TV }, ++ ++ { 0x1c10, KEY_VOLUMEUP }, ++ { 0x1c11, KEY_VOLUMEDOWN }, ++ ++ { 0x1c20, KEY_CHANNELUP }, ++ { 0x1c21, KEY_CHANNELDOWN }, ++ ++ { 0x1c0f, KEY_MUTE }, ++ { 0x1c12, KEY_PREVIOUS }, /* Prev */ ++ ++ { 0x1c36, KEY_STOP }, ++ { 0x1c37, KEY_RECORD }, ++ ++ { 0x1c24, KEY_LAST }, /* <| */ ++ { 0x1c1e, KEY_NEXT }, /* >| */ ++ ++ { 0x1c0a, KEY_TEXT }, ++ { 0x1c0e, KEY_SUBTITLE }, /* CC */ ++ ++ { 0x1c32, KEY_REWIND }, ++ { 0x1c30, KEY_PAUSE }, ++ { 0x1c35, KEY_PLAY }, ++ { 0x1c34, KEY_FASTFORWARD }, ++ ++ /* + * Keycodes for the old Black Remote Controller + * This one also uses RC-5 protocol + * Keycodes start with address = 0x00 +diff -Naur linux-3.2.1/drivers/media/video/em28xx/em28xx-cards.c linux-3.2.1.patch/drivers/media/video/em28xx/em28xx-cards.c +--- linux-3.2.1/drivers/media/video/em28xx/em28xx-cards.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/video/em28xx/em28xx-cards.c 2012-01-22 15:39:04.921565528 +0100 +@@ -336,6 +336,23 @@ + { -1, -1, -1, -1}, + }; + ++static struct em28xx_reg_seq hauppauge_930c_gpio[] = { ++ {EM2874_R80_GPIO, 0x6f, 0xff, 10}, ++ {EM2874_R80_GPIO, 0x4f, 0xff, 10}, /* xc5000 reset */ ++ {EM2874_R80_GPIO, 0x6f, 0xff, 10}, ++ {EM2874_R80_GPIO, 0x4f, 0xff, 10}, ++ { -1, -1, -1, -1}, ++}; ++ ++#if 0 ++static struct em28xx_reg_seq hauppauge_930c_digital[] = { ++ {EM2874_R80_GPIO, 0xf6, 0xff, 10}, ++ {EM2874_R80_GPIO, 0xe6, 0xff, 100}, ++ {EM2874_R80_GPIO, 0xa6, 0xff, 10}, ++ { -1, -1, -1, -1}, ++}; ++#endif ++ + /* + * Board definitions + */ +@@ -887,7 +904,25 @@ + .tuner_addr = 0x41, + .dvb_gpio = terratec_h5_digital, /* FIXME: probably wrong */ + .tuner_gpio = terratec_h5_gpio, ++#else ++ .tuner_type = TUNER_ABSENT, ++#endif ++ .i2c_speed = EM2874_I2C_SECONDARY_BUS_SELECT | ++ EM28XX_I2C_CLK_WAIT_ENABLE | ++ EM28XX_I2C_FREQ_400_KHZ, ++ }, ++ [EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C] = { ++ .name = "Hauppauge WinTV HVR 930C", ++ .has_dvb = 1, ++#if 0 /* FIXME: Add analog support */ ++ .tuner_type = TUNER_XC5000, ++ .tuner_addr = 0x41, ++ .dvb_gpio = hauppauge_930c_digital, ++ .tuner_gpio = hauppauge_930c_gpio, ++#else ++ .tuner_type = TUNER_ABSENT, + #endif ++ .ir_codes = RC_MAP_HAUPPAUGE, + .i2c_speed = EM2874_I2C_SECONDARY_BUS_SELECT | + EM28XX_I2C_CLK_WAIT_ENABLE | + EM28XX_I2C_FREQ_400_KHZ, +@@ -1975,6 +2010,8 @@ + .driver_info = EM28174_BOARD_PCTV_290E }, + { USB_DEVICE(0x2013, 0x024c), + .driver_info = EM28174_BOARD_PCTV_460E }, ++ { USB_DEVICE(0x2040, 0x1605), ++ .driver_info = EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C }, + { }, + }; + MODULE_DEVICE_TABLE(usb, em28xx_id_table); +@@ -2028,10 +2065,10 @@ + int rc = 0; + struct em28xx *dev = ptr; + +- if (dev->tuner_type != TUNER_XC2028) ++ if (dev->tuner_type != TUNER_XC2028 && dev->tuner_type != TUNER_XC5000) + return 0; + +- if (command != XC2028_TUNER_RESET) ++ if (command != XC2028_TUNER_RESET && command != XC5000_TUNER_RESET) + return 0; + + rc = em28xx_gpio_set(dev, dev->board.tuner_gpio); +diff -Naur linux-3.2.1/drivers/media/video/em28xx/em28xx-dvb.c linux-3.2.1.patch/drivers/media/video/em28xx/em28xx-dvb.c +--- linux-3.2.1/drivers/media/video/em28xx/em28xx-dvb.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/video/em28xx/em28xx-dvb.c 2012-01-22 15:39:13.799727898 +0100 +@@ -316,6 +316,14 @@ + .microcode_name = "dvb-usb-terratec-h5-drxk.fw", + }; + ++struct drxk_config hauppauge_930c_drxk = { ++ .adr = 0x29, ++ .single_master = 1, ++ .no_i2c_bridge = 1, ++ .microcode_name = "dvb-usb-hauppauge-hvr930c-drxk.fw", ++ .chunk_size = 56, ++}; ++ + static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable) + { + struct em28xx_dvb *dvb = fe->sec_priv; +@@ -334,6 +342,73 @@ + return status; + } + ++static void hauppauge_hvr930c_init(struct em28xx *dev) ++{ ++ int i; ++ ++ struct em28xx_reg_seq hauppauge_hvr930c_init[] = { ++ {EM2874_R80_GPIO, 0xff, 0xff, 0x65}, ++ {EM2874_R80_GPIO, 0xfb, 0xff, 0x32}, ++ {EM2874_R80_GPIO, 0xff, 0xff, 0xb8}, ++ { -1, -1, -1, -1}, ++ }; ++ struct em28xx_reg_seq hauppauge_hvr930c_end[] = { ++ {EM2874_R80_GPIO, 0xef, 0xff, 0x01}, ++ {EM2874_R80_GPIO, 0xaf, 0xff, 0x65}, ++ {EM2874_R80_GPIO, 0xef, 0xff, 0x76}, ++ {EM2874_R80_GPIO, 0xef, 0xff, 0x01}, ++ {EM2874_R80_GPIO, 0xcf, 0xff, 0x0b}, ++ {EM2874_R80_GPIO, 0xef, 0xff, 0x40}, ++ ++ {EM2874_R80_GPIO, 0xcf, 0xff, 0x65}, ++ {EM2874_R80_GPIO, 0xef, 0xff, 0x65}, ++ {EM2874_R80_GPIO, 0xcf, 0xff, 0x0b}, ++ {EM2874_R80_GPIO, 0xef, 0xff, 0x65}, ++ ++ { -1, -1, -1, -1}, ++ }; ++ ++ struct { ++ unsigned char r[4]; ++ int len; ++ } regs[] = { ++ {{ 0x06, 0x02, 0x00, 0x31 }, 4}, ++ {{ 0x01, 0x02 }, 2}, ++ {{ 0x01, 0x02, 0x00, 0xc6 }, 4}, ++ {{ 0x01, 0x00 }, 2}, ++ {{ 0x01, 0x00, 0xff, 0xaf }, 4}, ++ {{ 0x01, 0x00, 0x03, 0xa0 }, 4}, ++ {{ 0x01, 0x00 }, 2}, ++ {{ 0x01, 0x00, 0x73, 0xaf }, 4}, ++ {{ 0x04, 0x00 }, 2}, ++ {{ 0x00, 0x04 }, 2}, ++ {{ 0x00, 0x04, 0x00, 0x0a }, 4}, ++ {{ 0x04, 0x14 }, 2}, ++ {{ 0x04, 0x14, 0x00, 0x00 }, 4}, ++ }; ++ ++ em28xx_gpio_set(dev, hauppauge_hvr930c_init); ++ em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x40); ++ msleep(10); ++ em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x44); ++ msleep(10); ++ ++ dev->i2c_client.addr = 0x82 >> 1; ++ ++ for (i = 0; i < ARRAY_SIZE(regs); i++) ++ i2c_master_send(&dev->i2c_client, regs[i].r, regs[i].len); ++ em28xx_gpio_set(dev, hauppauge_hvr930c_end); ++ ++ msleep(100); ++ ++ em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x44); ++ msleep(30); ++ ++ em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, 0x45); ++ msleep(10); ++ ++} ++ + static void terratec_h5_init(struct em28xx *dev) + { + int i; +@@ -788,6 +863,51 @@ + mfe_shared = 1; + } + break; ++ case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C: ++ hauppauge_hvr930c_init(dev); ++ ++ dvb->dont_attach_fe1 = 1; ++ ++ dvb->fe[0] = dvb_attach(drxk_attach, ++ &hauppauge_930c_drxk, &dev->i2c_adap, ++ &dvb->fe[1]); ++ if (!dvb->fe[0]) { ++ result = -EINVAL; ++ goto out_free; ++ } ++ /* FIXME: do we need a pll semaphore? */ ++ dvb->fe[0]->sec_priv = dvb; ++ sema_init(&dvb->pll_mutex, 1); ++ dvb->gate_ctrl = dvb->fe[0]->ops.i2c_gate_ctrl; ++ dvb->fe[0]->ops.i2c_gate_ctrl = drxk_gate_ctrl; ++ dvb->fe[1]->id = 1; ++ ++ /* Attach xc5000 */ ++ struct xc5000_config cfg; ++ memset(&cfg, 0, sizeof(cfg)); ++ cfg.i2c_address = 0x61; ++ cfg.if_khz = 4000; ++ ++ if (dvb->fe[0]->ops.i2c_gate_ctrl) ++ dvb->fe[0]->ops.i2c_gate_ctrl(dvb->fe[0], 1); ++ if (!dvb_attach(xc5000_attach, dvb->fe[0], &dev->i2c_adap, ++ &cfg)) { ++ result = -EINVAL; ++ goto out_free; ++ } ++ ++ if (dvb->fe[0]->ops.i2c_gate_ctrl) ++ dvb->fe[0]->ops.i2c_gate_ctrl(dvb->fe[0], 0); ++ ++ /* Hack - needed by drxk/tda18271c2dd */ ++ dvb->fe[1]->tuner_priv = dvb->fe[0]->tuner_priv; ++ memcpy(&dvb->fe[1]->ops.tuner_ops, ++ &dvb->fe[0]->ops.tuner_ops, ++ sizeof(dvb->fe[0]->ops.tuner_ops)); ++ ++ mfe_shared = 1; ++ ++ break; + case EM2884_BOARD_TERRATEC_H5: + terratec_h5_init(dev); + +@@ -798,7 +918,6 @@ + result = -EINVAL; + goto out_free; + } +- + /* FIXME: do we need a pll semaphore? */ + dvb->fe[0]->sec_priv = dvb; + sema_init(&dvb->pll_mutex, 1); +@@ -822,6 +941,8 @@ + &dvb->fe[0]->ops.tuner_ops, + sizeof(dvb->fe[0]->ops.tuner_ops)); + ++ mfe_shared = 1; ++ + break; + case EM28174_BOARD_PCTV_460E: + /* attach demod */ +@@ -845,6 +966,8 @@ + } + /* define general-purpose callback pointer */ + dvb->fe[0]->callback = em28xx_tuner_callback; ++ if (dvb->fe[1]) ++ dvb->fe[1]->callback = em28xx_tuner_callback; + + /* register everything */ + result = em28xx_register_dvb(dvb, THIS_MODULE, dev, &dev->udev->dev); +diff -Naur linux-3.2.1/drivers/media/video/em28xx/em28xx.h linux-3.2.1.patch/drivers/media/video/em28xx/em28xx.h +--- linux-3.2.1/drivers/media/video/em28xx/em28xx.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/video/em28xx/em28xx.h 2012-01-22 15:38:45.930218200 +0100 +@@ -38,6 +38,7 @@ + #include + #endif + #include "tuner-xc2028.h" ++#include "xc5000.h" + #include "em28xx-reg.h" + + /* Boards supported by driver */ +@@ -121,6 +122,7 @@ + #define EM28174_BOARD_PCTV_290E 78 + #define EM2884_BOARD_TERRATEC_H5 79 + #define EM28174_BOARD_PCTV_460E 80 ++#define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C 81 + + /* Limits minimum and default number of buffers */ + #define EM28XX_MIN_BUF 4 +diff -Naur linux-3.2.1/include/linux/dvb/frontend.h linux-3.2.1.patch/include/linux/dvb/frontend.h +--- linux-3.2.1/include/linux/dvb/frontend.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/include/linux/dvb/frontend.h 2012-01-22 15:52:29.793509493 +0100 +@@ -329,6 +329,8 @@ + ROLLOFF_20, + ROLLOFF_25, + ROLLOFF_AUTO, ++ ROLLOFF_15, /* DVB-C Annex A */ ++ ROLLOFF_13, /* DVB-C Annex C */ + } fe_rolloff_t; + + typedef enum fe_delivery_system { diff --git a/packages/linux/patches/3.2.44/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.2.44/linux-203-stb0899_enable_low_symbol_rate.patch new file mode 100644 index 0000000000..353893f011 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-203-stb0899_enable_low_symbol_rate.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.2.1/drivers/media/dvb/frontends/stb0899_drv.c linux-3.2.1.patch/drivers/media/dvb/frontends/stb0899_drv.c +--- linux-3.2.1/drivers/media/dvb/frontends/stb0899_drv.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/frontends/stb0899_drv.c 2012-01-23 10:47:29.311211860 +0100 +@@ -1614,7 +1614,7 @@ + .frequency_max = 2150000, + .frequency_stepsize = 0, + .frequency_tolerance = 0, +- .symbol_rate_min = 5000000, ++ .symbol_rate_min = 1000000, + .symbol_rate_max = 45000000, + + .caps = FE_CAN_INVERSION_AUTO | diff --git a/packages/linux/patches/3.2.44/linux-210-add_DVBSky_support.patch b/packages/linux/patches/3.2.44/linux-210-add_DVBSky_support.patch new file mode 100644 index 0000000000..90521d185b --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-210-add_DVBSky_support.patch @@ -0,0 +1,4215 @@ +diff -uprN linux-3.2.10.orig/drivers/media/dvb/dvb-usb/dw2102.c linux-3.2.10/drivers/media/dvb/dvb-usb/dw2102.c +--- linux-3.2.10.orig/drivers/media/dvb/dvb-usb/dw2102.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/dvb/dvb-usb/dw2102.c 2012-03-16 10:55:52.000000000 +0100 +@@ -3,6 +3,7 @@ + * TeVii S600, S630, S650, S660, S480, + * Prof 1100, 7500, + * Geniatech SU3000 Cards ++ * DVBSKY S860 + * Copyright (C) 2008-2011 Igor M. Liplianin (liplianin@me.by) + * + * This program is free software; you can redistribute it and/or modify it +@@ -19,6 +20,7 @@ + #include "stb6000.h" + #include "eds1547.h" + #include "cx24116.h" ++#include "m88ds3103.h" + #include "tda1002x.h" + #include "mt312.h" + #include "zl10039.h" +@@ -80,6 +82,9 @@ + #define DW2102_RC_QUERY (0x1a00) + #define DW2102_LED_CTRL (0x1b00) + ++/*Bst device index in table*/ ++#define BST_6830_Index 15 ++ + #define err_str "did not find the firmware file. (%s) " \ + "Please see linux/Documentation/dvb/ for more details " \ + "on firmware-problems." +@@ -881,6 +886,44 @@ static int s660_set_voltage(struct dvb_f + + return 0; + } ++ ++static int bstusb_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) ++{ ++ ++ struct dvb_usb_adapter *udev_adap = ++ (struct dvb_usb_adapter *)(fe->dvb->priv); ++ ++ u8 obuf[3] = { 0xe, 0x80, 0 }; ++ u8 ibuf[] = { 0 }; ++ ++ info("US6830: %s!\n", __func__); ++ ++ if (voltage == SEC_VOLTAGE_OFF) ++ obuf[2] = 0; ++ else ++ obuf[2] = 1; ++ ++ if (dvb_usb_generic_rw(udev_adap->dev, obuf, 3, ibuf, 1, 0) < 0) ++ err("command 0x0e transfer failed."); ++ ++ return 0; ++} ++ ++static int bstusb_restart(struct dvb_frontend *fe) ++{ ++ ++ struct dvb_usb_adapter *udev_adap = ++ (struct dvb_usb_adapter *)(fe->dvb->priv); ++ ++ u8 obuf[3] = { 0x36, 3, 0 }; ++ u8 ibuf[] = { 0 }; ++ ++ ++ if (dvb_usb_generic_rw(udev_adap->dev, obuf, 3, ibuf, 1, 0) < 0) ++ err("command 0x36 transfer failed."); ++ ++ return 0; ++} + + static void dw210x_led_ctrl(struct dvb_frontend *fe, int offon) + { +@@ -987,6 +1030,24 @@ static struct ds3000_config su3000_ds300 + .ci_mode = 1, + }; + ++static struct m88ds3103_config US6830_ds3103_config = { ++ .demod_address = 0x68, ++ .ci_mode = 1, ++ .pin_ctrl = 0x83, ++ .ts_mode = 0, ++ .start_ctrl = bstusb_restart, ++ .set_voltage = bstusb_set_voltage, ++}; ++ ++static struct m88ds3103_config US6832_ds3103_config = { ++ .demod_address = 0x68, ++ .ci_mode = 1, ++ .pin_ctrl = 0x80, ++ .ts_mode = 0, ++ .start_ctrl = bstusb_restart, ++ .set_voltage = bstusb_set_voltage, ++}; ++ + static int dw2104_frontend_attach(struct dvb_usb_adapter *d) + { + struct dvb_tuner_ops *tuner_ops = NULL; +@@ -1214,6 +1275,72 @@ static int su3000_frontend_attach(struct + return 0; + } + ++static int US6830_frontend_attach(struct dvb_usb_adapter *d) ++{ ++ u8 obuf[3] = { 0xe, 0x83, 0 }; ++ u8 ibuf[] = { 0 }; ++ ++ ++ info("US6830: %s!\n", __func__); ++ ++ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) ++ err("command 0x0e transfer failed."); ++ ++ obuf[0] = 0xe; ++ obuf[1] = 0x83; ++ obuf[2] = 1; ++ ++ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) ++ err("command 0x0e transfer failed."); ++ ++ obuf[0] = 0x51; ++ ++ if (dvb_usb_generic_rw(d->dev, obuf, 1, ibuf, 1, 0) < 0) ++ err("command 0x51 transfer failed."); ++ ++ d->fe_adap[0].fe = dvb_attach(m88ds3103_attach, &US6830_ds3103_config, ++ &d->dev->i2c_adap); ++ if (d->fe_adap[0].fe == NULL) ++ return -EIO; ++ ++ info("Attached DS3000!\n"); ++ ++ return 0; ++} ++ ++static int US6832_frontend_attach(struct dvb_usb_adapter *d) ++{ ++ u8 obuf[3] = { 0xe, 0x83, 0 }; ++ u8 ibuf[] = { 0 }; ++ ++ ++ info("US6832: %s!\n", __func__); ++ ++ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) ++ err("command 0x0e transfer failed."); ++ ++ obuf[0] = 0xe; ++ obuf[1] = 0x83; ++ obuf[2] = 1; ++ ++ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) ++ err("command 0x0e transfer failed."); ++ ++ obuf[0] = 0x51; ++ ++ if (dvb_usb_generic_rw(d->dev, obuf, 1, ibuf, 1, 0) < 0) ++ err("command 0x51 transfer failed."); ++ ++ d->fe_adap[0].fe = dvb_attach(m88ds3103_attach, &US6832_ds3103_config, ++ &d->dev->i2c_adap); ++ if (d->fe_adap[0].fe == NULL) ++ return -EIO; ++ ++ info("Attached DS3000!\n"); ++ ++ return 0; ++} ++ + static int dw2102_tuner_attach(struct dvb_usb_adapter *adap) + { + dvb_attach(dvb_pll_attach, adap->fe_adap[0].fe, 0x60, +@@ -1451,6 +1578,9 @@ static struct usb_device_id dw2102_table + {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)}, + {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)}, + {USB_DEVICE(0x1f4d, 0x3100)}, ++ {USB_DEVICE(0x0572, 0x6830)}, ++ {USB_DEVICE(0x0572, 0x6831)}, ++ {USB_DEVICE(0x0572, 0x6832)}, + { } + }; + +@@ -1856,6 +1986,107 @@ static struct dvb_usb_device_properties + } + }; + ++static struct dvb_usb_device_properties US6830_properties = { ++ .caps = DVB_USB_IS_AN_I2C_ADAPTER, ++ .usb_ctrl = DEVICE_SPECIFIC, ++ .size_of_priv = sizeof(struct su3000_state), ++ .power_ctrl = su3000_power_ctrl, ++ .num_adapters = 1, ++ .identify_state = su3000_identify_state, ++ .i2c_algo = &su3000_i2c_algo, ++ ++ .rc.legacy = { ++ .rc_map_table = rc_map_su3000_table, ++ .rc_map_size = ARRAY_SIZE(rc_map_su3000_table), ++ .rc_interval = 150, ++ .rc_query = dw2102_rc_query, ++ }, ++ ++ .read_mac_address = su3000_read_mac_address, ++ ++ .generic_bulk_ctrl_endpoint = 0x01, ++ ++ .adapter = { ++ { ++ .num_frontends = 1, ++ .fe = {{ ++ .streaming_ctrl = su3000_streaming_ctrl, ++ .frontend_attach = US6830_frontend_attach, ++ .stream = { ++ .type = USB_BULK, ++ .count = 8, ++ .endpoint = 0x82, ++ .u = { ++ .bulk = { ++ .buffersize = 4096, ++ } ++ } ++ } ++ }}, ++ } ++ }, ++ .num_device_descs = 2, ++ .devices = { ++ { "Bestunar US6830 HD", ++ { &dw2102_table[BST_6830_Index], NULL }, ++ { NULL }, ++ }, ++ { "Bestunar US6831 HD", ++ { &dw2102_table[BST_6830_Index+1], NULL }, ++ { NULL }, ++ }, ++ } ++}; ++ ++static struct dvb_usb_device_properties US6832_properties = { ++ .caps = DVB_USB_IS_AN_I2C_ADAPTER, ++ .usb_ctrl = DEVICE_SPECIFIC, ++ .size_of_priv = sizeof(struct su3000_state), ++ .power_ctrl = su3000_power_ctrl, ++ .num_adapters = 1, ++ .identify_state = su3000_identify_state, ++ .i2c_algo = &su3000_i2c_algo, ++ ++ .rc.legacy = { ++ .rc_map_table = rc_map_su3000_table, ++ .rc_map_size = ARRAY_SIZE(rc_map_su3000_table), ++ .rc_interval = 150, ++ .rc_query = dw2102_rc_query, ++ }, ++ ++ .read_mac_address = su3000_read_mac_address, ++ ++ .generic_bulk_ctrl_endpoint = 0x01, ++ ++ .adapter = { ++ { ++ .num_frontends = 1, ++ .fe = {{ ++ .streaming_ctrl = su3000_streaming_ctrl, ++ .frontend_attach = US6832_frontend_attach, ++ .stream = { ++ .type = USB_BULK, ++ .count = 8, ++ .endpoint = 0x82, ++ .u = { ++ .bulk = { ++ .buffersize = 4096, ++ } ++ } ++ } ++ }}, ++ } ++ }, ++ .num_device_descs = 1, ++ .devices = { ++ { "Bestunar US6832 HD", ++ { &dw2102_table[BST_6830_Index+2], NULL }, ++ { NULL }, ++ }, ++ ++ } ++}; ++ + static int dw2102_probe(struct usb_interface *intf, + const struct usb_device_id *id) + { +@@ -1915,6 +2146,10 @@ static int dw2102_probe(struct usb_inter + 0 == dvb_usb_device_init(intf, p7500, + THIS_MODULE, NULL, adapter_nr) || + 0 == dvb_usb_device_init(intf, &su3000_properties, ++ THIS_MODULE, NULL, adapter_nr) || ++ 0 == dvb_usb_device_init(intf, &US6830_properties, ++ THIS_MODULE, NULL, adapter_nr) || ++ 0 == dvb_usb_device_init(intf, &US6832_properties, + THIS_MODULE, NULL, adapter_nr)) + return 0; + +diff -uprN linux-3.2.10.orig/drivers/media/dvb/dvb-usb/Kconfig linux-3.2.10/drivers/media/dvb/dvb-usb/Kconfig +--- linux-3.2.10.orig/drivers/media/dvb/dvb-usb/Kconfig 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/dvb/dvb-usb/Kconfig 2012-03-16 10:55:52.000000000 +0100 +@@ -279,6 +279,7 @@ config DVB_USB_DW2102 + select DVB_STV0288 if !DVB_FE_CUSTOMISE + select DVB_STB6000 if !DVB_FE_CUSTOMISE + select DVB_CX24116 if !DVB_FE_CUSTOMISE ++ select DVB_M88DS3103 if !DVB_FE_CUSTOMISE + select DVB_SI21XX if !DVB_FE_CUSTOMISE + select DVB_TDA10023 if !DVB_FE_CUSTOMISE + select DVB_MT312 if !DVB_FE_CUSTOMISE +diff -uprN linux-3.2.10.orig/drivers/media/dvb/frontends/Kconfig linux-3.2.10/drivers/media/dvb/frontends/Kconfig +--- linux-3.2.10.orig/drivers/media/dvb/frontends/Kconfig 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/dvb/frontends/Kconfig 2012-03-16 10:55:57.000000000 +0100 +@@ -214,6 +214,13 @@ config DVB_CX24116 + help + A DVB-S/S2 tuner module. Say Y when you want to support this frontend. + ++config DVB_M88DS3103 ++ tristate "Montage DS3103 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 +diff -uprN linux-3.2.10.orig/drivers/media/dvb/frontends/m88ds3103.c linux-3.2.10/drivers/media/dvb/frontends/m88ds3103.c +--- linux-3.2.10.orig/drivers/media/dvb/frontends/m88ds3103.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.10/drivers/media/dvb/frontends/m88ds3103.c 2012-03-16 10:55:57.000000000 +0100 +@@ -0,0 +1,1811 @@ ++/* ++ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver ++ Copyright (C) 2011 Max nibble ++ Copyright (C) 2010 Montage Technology ++ ++ 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "dvb_frontend.h" ++#include "m88ds3103.h" ++ ++static int debug; ++module_param(debug, int, 0644); ++MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)"); ++ ++#define dprintk(args...) \ ++ do { \ ++ if (debug) \ ++ printk(KERN_INFO "m88ds3103: " args); \ ++ } while (0) ++ ++#define FW_DOWN_SIZE 32 ++#define FW_DOWN_LOOP (8192/FW_DOWN_SIZE) ++#define DS3103_DEFAULT_FIRMWARE "dvb-fe-ds3103.fw" ++#define DS3000_DEFAULT_FIRMWARE "dvb-fe-ds300x.fw" ++#define MT_FE_MCLK_KHZ 96000 /* in kHz */ ++#define MT_FE_CRYSTAL_KHZ 27000 /* in kHz */ ++#define FREQ_OFFSET_AT_SMALL_SYM_RATE_KHz 3000 ++#define DS3000_ID 0x3000 ++#define DS3103_ID 0x3103 ++#define TS2020_ID 0x2020 ++#define TS2022_ID 0x2022 ++#define UNKNOW_ID 0x0000 ++ ++/* For M88DS3103 demod dvbs mode.*/ ++static u8 ds3103_dvbs_init_tab[] = { ++ 0x23, 0x07, ++ 0x08, 0x03, ++ 0x0c, 0x02, ++ 0x21, 0x54, ++ 0x25, 0x82, ++ 0x27, 0x31, ++ 0x30, 0x08, ++ 0x31, 0x40, ++ 0x32, 0x32, ++ 0x33, 0x35, ++ 0x35, 0xff, ++ 0x3a, 0x00, ++ 0x37, 0x10, ++ 0x38, 0x10, ++ 0x39, 0x02, ++ 0x42, 0x60, ++ 0x4a, 0x80, ++ 0x4b, 0x04, ++ 0x4d, 0x91, ++ 0x5d, 0xc8, ++ 0x50, 0x36, ++ 0x51, 0x36, ++ 0x52, 0x36, ++ 0x53, 0x36, ++ 0x63, 0x0f, ++ 0x64, 0x30, ++ 0x65, 0x40, ++ 0x68, 0x26, ++ 0x69, 0x4c, ++ 0x70, 0x20, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x40, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x60, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x80, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0xa0, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x1f, ++ 0x76, 0x38, ++ 0x77, 0xa6, ++ 0x78, 0x0c, ++ 0x79, 0x80, ++ 0x7f, 0x14, ++ 0x7c, 0x00, ++ 0xae, 0x82, ++ 0x80, 0x64, ++ 0x81, 0x66, ++ 0x82, 0x44, ++ 0x85, 0x04, ++ 0xcd, 0xf4, ++ 0x90, 0x33, ++ 0xa0, 0x44, ++ 0xc0, 0x08, ++ 0xc3, 0x10, ++ 0xc4, 0x08, ++ 0xc5, 0xf0, ++ 0xc6, 0xff, ++ 0xc7, 0x00, ++ 0xc8, 0x1a, ++ 0xc9, 0x80, ++ 0xe0, 0xf8, ++ 0xe6, 0x8b, ++ 0xd0, 0x40, ++ 0xf8, 0x20, ++ 0xfa, 0x0f, ++ 0x00, 0x00, ++ 0xbd, 0x01, ++ 0xb8, 0x00, ++}; ++/* For M88DS3103 demod dvbs2 mode.*/ ++static u8 ds3103_dvbs2_init_tab[] = { ++ 0x23, 0x07, ++ 0x08, 0x07, ++ 0x0c, 0x02, ++ 0x21, 0x54, ++ 0x25, 0x82, ++ 0x27, 0x31, ++ 0x30, 0x08, ++ 0x32, 0x32, ++ 0x33, 0x35, ++ 0x35, 0xff, ++ 0x3a, 0x00, ++ 0x37, 0x10, ++ 0x38, 0x10, ++ 0x39, 0x02, ++ 0x42, 0x60, ++ 0x4a, 0x80, ++ 0x4b, 0x04, ++ 0x4d, 0x91, ++ 0x5d, 0xc8, ++ 0x50, 0x36, ++ 0x51, 0x36, ++ 0x52, 0x36, ++ 0x53, 0x36, ++ 0x63, 0x0f, ++ 0x64, 0x10, ++ 0x65, 0x20, ++ 0x68, 0x46, ++ 0x69, 0xcd, ++ 0x70, 0x20, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x40, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x60, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x80, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0xa0, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x1f, ++ 0x76, 0x38, ++ 0x77, 0xa6, ++ 0x78, 0x0c, ++ 0x79, 0x80, ++ 0x7f, 0x14, ++ 0x85, 0x08, ++ 0xcd, 0xf4, ++ 0x90, 0x33, ++ 0x86, 0x00, ++ 0x87, 0x0f, ++ 0x89, 0x00, ++ 0x8b, 0x44, ++ 0x8c, 0x66, ++ 0x9d, 0xc1, ++ 0x8a, 0x10, ++ 0xad, 0x40, ++ 0xa0, 0x44, ++ 0xc0, 0x08, ++ 0xc1, 0x10, ++ 0xc2, 0x08, ++ 0xc3, 0x10, ++ 0xc4, 0x08, ++ 0xc5, 0xf0, ++ 0xc6, 0xff, ++ 0xc7, 0x00, ++ 0xc8, 0x1a, ++ 0xc9, 0x80, ++ 0xca, 0x23, ++ 0xcb, 0x24, ++ 0xcc, 0xf4, ++ 0xce, 0x74, ++ 0x00, 0x00, ++ 0xbd, 0x01, ++ 0xb8, 0x00, ++}; ++ ++/* For M88DS3000 demod dvbs mode.*/ ++static u8 ds3000_dvbs_init_tab[] = { ++ 0x23, 0x05, ++ 0x08, 0x03, ++ 0x0c, 0x02, ++ 0x21, 0x54, ++ 0x25, 0x82, ++ 0x27, 0x31, ++ 0x30, 0x08, ++ 0x31, 0x40, ++ 0x32, 0x32, ++ 0x33, 0x35, ++ 0x35, 0xff, ++ 0x3a, 0x00, ++ 0x37, 0x10, ++ 0x38, 0x10, ++ 0x39, 0x02, ++ 0x42, 0x60, ++ 0x4a, 0x40, ++ 0x4b, 0x04, ++ 0x4d, 0x91, ++ 0x5d, 0xc8, ++ 0x50, 0x77, ++ 0x51, 0x77, ++ 0x52, 0x36, ++ 0x53, 0x36, ++ 0x56, 0x01, ++ 0x63, 0x47, ++ 0x64, 0x30, ++ 0x65, 0x40, ++ 0x68, 0x26, ++ 0x69, 0x4c, ++ 0x70, 0x20, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x40, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x60, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x80, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0xa0, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x1f, ++ 0x76, 0x00, ++ 0x77, 0xd1, ++ 0x78, 0x0c, ++ 0x79, 0x80, ++ 0x7f, 0x04, ++ 0x7c, 0x00, ++ 0x80, 0x86, ++ 0x81, 0xa6, ++ 0x85, 0x04, ++ 0xcd, 0xf4, ++ 0x90, 0x33, ++ 0xa0, 0x44, ++ 0xc0, 0x18, ++ 0xc3, 0x10, ++ 0xc4, 0x08, ++ 0xc5, 0x80, ++ 0xc6, 0x80, ++ 0xc7, 0x0a, ++ 0xc8, 0x1a, ++ 0xc9, 0x80, ++ 0xfe, 0xb6, ++ 0xe0, 0xf8, ++ 0xe6, 0x8b, ++ 0xd0, 0x40, ++ 0xf8, 0x20, ++ 0xfa, 0x0f, ++ 0xad, 0x20, ++ 0xae, 0x07, ++ 0xb8, 0x00, ++}; ++ ++/* For M88DS3000 demod dvbs2 mode.*/ ++static u8 ds3000_dvbs2_init_tab[] = { ++ 0x23, 0x0f, ++ 0x08, 0x07, ++ 0x0c, 0x02, ++ 0x21, 0x54, ++ 0x25, 0x82, ++ 0x27, 0x31, ++ 0x30, 0x08, ++ 0x31, 0x32, ++ 0x32, 0x32, ++ 0x33, 0x35, ++ 0x35, 0xff, ++ 0x3a, 0x00, ++ 0x37, 0x10, ++ 0x38, 0x10, ++ 0x39, 0x02, ++ 0x42, 0x60, ++ 0x4a, 0x80, ++ 0x4b, 0x04, ++ 0x4d, 0x91, ++ 0x5d, 0x88, ++ 0x50, 0x36, ++ 0x51, 0x36, ++ 0x52, 0x36, ++ 0x53, 0x36, ++ 0x63, 0x60, ++ 0x64, 0x10, ++ 0x65, 0x10, ++ 0x68, 0x04, ++ 0x69, 0x29, ++ 0x70, 0x20, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x40, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x60, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x80, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0xa0, ++ 0x71, 0x70, ++ 0x72, 0x04, ++ 0x73, 0x00, ++ 0x70, 0x1f, ++ 0xa0, 0x44, ++ 0xc0, 0x08, ++ 0xc1, 0x10, ++ 0xc2, 0x08, ++ 0xc3, 0x10, ++ 0xc4, 0x08, ++ 0xc5, 0xf0, ++ 0xc6, 0xf0, ++ 0xc7, 0x0a, ++ 0xc8, 0x1a, ++ 0xc9, 0x80, ++ 0xca, 0x23, ++ 0xcb, 0x24, ++ 0xce, 0x74, ++ 0x56, 0x01, ++ 0x90, 0x03, ++ 0x76, 0x80, ++ 0x77, 0x42, ++ 0x78, 0x0a, ++ 0x79, 0x80, ++ 0xad, 0x40, ++ 0xae, 0x07, ++ 0x7f, 0xd4, ++ 0x7c, 0x00, ++ 0x80, 0xa8, ++ 0x81, 0xda, ++ 0x7c, 0x01, ++ 0x80, 0xda, ++ 0x81, 0xec, ++ 0x7c, 0x02, ++ 0x80, 0xca, ++ 0x81, 0xeb, ++ 0x7c, 0x03, ++ 0x80, 0xba, ++ 0x81, 0xdb, ++ 0x85, 0x08, ++ 0x86, 0x00, ++ 0x87, 0x02, ++ 0x89, 0x80, ++ 0x8b, 0x44, ++ 0x8c, 0xaa, ++ 0x8a, 0x10, ++ 0xba, 0x00, ++ 0xf5, 0x04, ++ 0xd2, 0x32, ++ 0xb8, 0x00, ++}; ++ ++struct m88ds3103_state { ++ struct i2c_adapter *i2c; ++ const struct m88ds3103_config *config; ++ ++ struct dvb_frontend frontend; ++ ++ u32 preBer; ++ u8 skip_fw_load; ++ u8 first_lock; /* The first time of signal lock */ ++ u16 demod_id; /* demod chip type */ ++ u16 tuner_id; /* tuner chip type */ ++}; ++ ++/*demod register operations.*/ ++static int m88ds3103_writereg(struct m88ds3103_state *state, int reg, int data) ++{ ++ u8 buf[] = { reg, data }; ++ struct i2c_msg msg = { .addr = state->config->demod_address, ++ .flags = 0, .buf = buf, .len = 2 }; ++ int err; ++ ++ if (debug > 1) ++ printk("m88ds3103: %s: write reg 0x%02x, value 0x%02x\n", ++ __func__, reg, data); ++ ++ err = i2c_transfer(state->i2c, &msg, 1); ++ if (err != 1) { ++ printk(KERN_ERR "%s: writereg error(err == %i, reg == 0x%02x," ++ " value == 0x%02x)\n", __func__, err, reg, data); ++ return -EREMOTEIO; ++ } ++ return 0; ++} ++ ++static int m88ds3103_readreg(struct m88ds3103_state *state, u8 reg) ++{ ++ int ret; ++ u8 b0[] = { reg }; ++ u8 b1[] = { 0 }; ++ struct i2c_msg msg[] = { ++ { .addr = state->config->demod_address, .flags = 0, ++ .buf = b0, .len = 1 }, ++ { .addr = state->config->demod_address, .flags = I2C_M_RD, ++ .buf = b1, .len = 1 } ++ }; ++ ret = i2c_transfer(state->i2c, msg, 2); ++ ++ if (ret != 2) { ++ printk(KERN_ERR "%s: reg=0x%x (error=%d)\n", ++ __func__, reg, ret); ++ return ret; ++ } ++ ++ if (debug > 1) ++ printk(KERN_INFO "m88ds3103: read reg 0x%02x, value 0x%02x\n", ++ reg, b1[0]); ++ ++ return b1[0]; ++} ++ ++/*tuner register operations.*/ ++static int m88ds3103_tuner_writereg(struct m88ds3103_state *state, int reg, int data) ++{ ++ u8 buf[] = { reg, data }; ++ struct i2c_msg msg = { .addr = 0x60, ++ .flags = 0, .buf = buf, .len = 2 }; ++ int err; ++ ++ m88ds3103_writereg(state, 0x03, 0x11); ++ err = i2c_transfer(state->i2c, &msg, 1); ++ ++ if (err != 1) { ++ printk("%s: writereg error(err == %i, reg == 0x%02x," ++ " value == 0x%02x)\n", __func__, err, reg, data); ++ return -EREMOTEIO; ++ } ++ ++ return 0; ++} ++ ++static int m88ds3103_tuner_readreg(struct m88ds3103_state *state, u8 reg) ++{ ++ int ret; ++ u8 b0[] = { reg }; ++ u8 b1[] = { 0 }; ++ struct i2c_msg msg[] = { ++ { .addr = 0x60, .flags = 0, ++ .buf = b0, .len = 1 }, ++ { .addr = 0x60, .flags = I2C_M_RD, ++ .buf = b1, .len = 1 } ++ }; ++ ++ m88ds3103_writereg(state, 0x03, 0x11); ++ ret = i2c_transfer(state->i2c, msg, 2); ++ ++ if (ret != 2) { ++ printk(KERN_ERR "%s: reg=0x%x(error=%d)\n", __func__, reg, ret); ++ return ret; ++ } ++ ++ return b1[0]; ++} ++ ++/* Bulk demod I2C write, for firmware download. */ ++static int m88ds3103_writeregN(struct m88ds3103_state *state, int reg, ++ const u8 *data, u16 len) ++{ ++ int ret = -EREMOTEIO; ++ struct i2c_msg msg; ++ u8 *buf; ++ ++ buf = kmalloc(len + 1, GFP_KERNEL); ++ if (buf == NULL) { ++ printk("Unable to kmalloc\n"); ++ ret = -ENOMEM; ++ goto error; ++ } ++ ++ *(buf) = reg; ++ memcpy(buf + 1, data, len); ++ ++ msg.addr = state->config->demod_address; ++ msg.flags = 0; ++ msg.buf = buf; ++ msg.len = len + 1; ++ ++ if (debug > 1) ++ printk(KERN_INFO "m88ds3103: %s: write regN 0x%02x, len = %d\n", ++ __func__, reg, len); ++ ++ ret = i2c_transfer(state->i2c, &msg, 1); ++ if (ret != 1) { ++ printk(KERN_ERR "%s: writereg error(err == %i, reg == 0x%02x\n", ++ __func__, ret, reg); ++ ret = -EREMOTEIO; ++ } ++ ++error: ++ kfree(buf); ++ ++ return ret; ++} ++ ++static int m88ds3103_load_firmware(struct dvb_frontend *fe) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ const struct firmware *fw; ++ int i, ret = 0; ++ ++ dprintk("%s()\n", __func__); ++ ++ if (state->skip_fw_load) ++ return 0; ++ /* Load firmware */ ++ /* request the firmware, this will block until someone uploads it */ ++ if(state->demod_id == DS3000_ID){ ++ printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__, ++ DS3000_DEFAULT_FIRMWARE); ++ ret = request_firmware(&fw, DS3000_DEFAULT_FIRMWARE, ++ state->i2c->dev.parent); ++ }else if(state->demod_id == DS3103_ID){ ++ printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__, ++ DS3103_DEFAULT_FIRMWARE); ++ ret = request_firmware(&fw, DS3103_DEFAULT_FIRMWARE, ++ state->i2c->dev.parent); ++ } ++ ++ printk(KERN_INFO "%s: Waiting for firmware upload(2)...\n", __func__); ++ if (ret) { ++ printk(KERN_ERR "%s: No firmware uploaded (timeout or file not " ++ "found?)\n", __func__); ++ return ret; ++ } ++ ++ /* Make sure we don't recurse back through here during loading */ ++ state->skip_fw_load = 1; ++ ++ dprintk("Firmware is %zu bytes (%02x %02x .. %02x %02x)\n", ++ fw->size, ++ fw->data[0], ++ fw->data[1], ++ fw->data[fw->size - 2], ++ fw->data[fw->size - 1]); ++ ++ /* stop internal mcu. */ ++ m88ds3103_writereg(state, 0xb2, 0x01); ++ /* split firmware to download.*/ ++ for(i = 0; i < FW_DOWN_LOOP; i++){ ++ ret = m88ds3103_writeregN(state, 0xb0, &(fw->data[FW_DOWN_SIZE*i]), FW_DOWN_SIZE); ++ if(ret != 1) break; ++ } ++ /* start internal mcu. */ ++ if(ret == 1) ++ m88ds3103_writereg(state, 0xb2, 0x00); ++ ++ release_firmware(fw); ++ ++ dprintk("%s: Firmware upload %s\n", __func__, ++ ret == 1 ? "complete" : "failed"); ++ ++ if(ret == 1) ret = 0; ++ ++ /* Ensure firmware is always loaded if required */ ++ state->skip_fw_load = 0; ++ ++ return ret; ++} ++ ++ ++static int m88ds3103_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ u8 data; ++ ++ dprintk("%s(%d)\n", __func__, voltage); ++ ++ dprintk("m88ds3103:pin_ctrl = (%02x)\n", state->config->pin_ctrl); ++ ++ if(state->config->set_voltage) ++ state->config->set_voltage(fe, voltage); ++ ++ data = m88ds3103_readreg(state, 0xa2); ++ ++ if(state->config->pin_ctrl & 0x80){ /*If control pin is assigned.*/ ++ data &= ~0x03; /* bit0 V/H, bit1 off/on */ ++ if(state->config->pin_ctrl & 0x02) ++ data |= 0x02; ++ ++ switch (voltage) { ++ case SEC_VOLTAGE_18: ++ if((state->config->pin_ctrl & 0x01) == 0) ++ data |= 0x01; ++ break; ++ case SEC_VOLTAGE_13: ++ if(state->config->pin_ctrl & 0x01) ++ data |= 0x01; ++ break; ++ case SEC_VOLTAGE_OFF: ++ if(state->config->pin_ctrl & 0x02) ++ data &= ~0x02; ++ else ++ data |= 0x02; ++ break; ++ } ++ } ++ ++ m88ds3103_writereg(state, 0xa2, data); ++ ++ return 0; ++} ++ ++static int m88ds3103_read_status(struct dvb_frontend *fe, fe_status_t* status) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ struct dtv_frontend_properties *c = &fe->dtv_property_cache; ++ *status = 0; ++ dprintk("%s()\n", __func__); ++ ++ switch (c->delivery_system){ ++ case SYS_DVBS: ++ if ((m88ds3103_readreg(state, 0xd1) & 0x07) == 0x07){ ++ if((m88ds3103_readreg(state, 0x0d) & 0x07) == 0x07) ++ *status = FE_HAS_SIGNAL | FE_HAS_CARRIER ++ | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK; ++ } ++ break; ++ case SYS_DVBS2: ++ if ((m88ds3103_readreg(state, 0x0d) & 0x8f) == 0x8f) ++ *status = FE_HAS_SIGNAL | FE_HAS_CARRIER ++ | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK; ++ break; ++ default: ++ break; ++ } ++ ++ return 0; ++} ++ ++static int m88ds3103_read_ber(struct dvb_frontend *fe, u32* ber) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ struct dtv_frontend_properties *c = &fe->dtv_property_cache; ++ u8 tmp1, tmp2, tmp3; ++ u32 ldpc_frame_cnt, pre_err_packags, code_rate_fac = 0; ++ ++ dprintk("%s()\n", __func__); ++ ++ switch (c->delivery_system) { ++ case SYS_DVBS: ++ m88ds3103_writereg(state, 0xf9, 0x04); ++ tmp3 = m88ds3103_readreg(state, 0xf8); ++ if ((tmp3&0x10) == 0){ ++ tmp1 = m88ds3103_readreg(state, 0xf7); ++ tmp2 = m88ds3103_readreg(state, 0xf6); ++ tmp3 |= 0x10; ++ m88ds3103_writereg(state, 0xf8, tmp3); ++ state->preBer = (tmp1<<8) | tmp2; ++ } ++ break; ++ case SYS_DVBS2: ++ tmp1 = m88ds3103_readreg(state, 0x7e) & 0x0f; ++ switch(tmp1){ ++ case 0: code_rate_fac = 16008 - 80; break; ++ case 1: code_rate_fac = 21408 - 80; break; ++ case 2: code_rate_fac = 25728 - 80; break; ++ case 3: code_rate_fac = 32208 - 80; break; ++ case 4: code_rate_fac = 38688 - 80; break; ++ case 5: code_rate_fac = 43040 - 80; break; ++ case 6: code_rate_fac = 48408 - 80; break; ++ case 7: code_rate_fac = 51648 - 80; break; ++ case 8: code_rate_fac = 53840 - 80; break; ++ case 9: code_rate_fac = 57472 - 80; break; ++ case 10: code_rate_fac = 58192 - 80; break; ++ } ++ ++ tmp1 = m88ds3103_readreg(state, 0xd7) & 0xff; ++ tmp2 = m88ds3103_readreg(state, 0xd6) & 0xff; ++ tmp3 = m88ds3103_readreg(state, 0xd5) & 0xff; ++ ldpc_frame_cnt = (tmp1 << 16) | (tmp2 << 8) | tmp3; ++ ++ tmp1 = m88ds3103_readreg(state, 0xf8) & 0xff; ++ tmp2 = m88ds3103_readreg(state, 0xf7) & 0xff; ++ pre_err_packags = tmp1<<8 | tmp2; ++ ++ if (ldpc_frame_cnt > 1000){ ++ m88ds3103_writereg(state, 0xd1, 0x01); ++ m88ds3103_writereg(state, 0xf9, 0x01); ++ m88ds3103_writereg(state, 0xf9, 0x00); ++ m88ds3103_writereg(state, 0xd1, 0x00); ++ state->preBer = pre_err_packags; ++ } ++ break; ++ default: ++ break; ++ } ++ *ber = state->preBer; ++ ++ return 0; ++} ++ ++static int m88ds3103_read_signal_strength(struct dvb_frontend *fe, ++ u16 *signal_strength) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ u16 gain; ++ u8 gain1, gain2, gain3 = 0; ++ ++ dprintk("%s()\n", __func__); ++ ++ gain1 = m88ds3103_tuner_readreg(state, 0x3d) & 0x1f; ++ dprintk("%s: gain1 = 0x%02x \n", __func__, gain1); ++ ++ if (gain1 > 15) gain1 = 15; ++ gain2 = m88ds3103_tuner_readreg(state, 0x21) & 0x1f; ++ dprintk("%s: gain2 = 0x%02x \n", __func__, gain2); ++ ++ if(state->tuner_id == TS2022_ID){ ++ gain3 = (m88ds3103_tuner_readreg(state, 0x66)>>3) & 0x07; ++ dprintk("%s: gain3 = 0x%02x \n", __func__, gain3); ++ ++ if (gain2 > 16) gain2 = 16; ++ if (gain2 < 2) gain2 = 2; ++ if (gain3 > 6) gain3 = 6; ++ }else{ ++ if (gain2 > 13) gain2 = 13; ++ gain3 = 0; ++ } ++ ++ gain = gain1*23 + gain2*35 + gain3*29; ++ *signal_strength = 60000 - gain*55; ++ ++ return 0; ++} ++ ++ ++static int m88ds3103_read_snr(struct dvb_frontend *fe, u16 *p_snr) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ struct dtv_frontend_properties *c = &fe->dtv_property_cache; ++ u8 val, npow1, npow2, spow1, cnt; ++ u16 tmp, snr; ++ u32 npow, spow, snr_total; ++ static const u16 mes_log10[] ={ ++ 0, 3010, 4771, 6021, 6990, 7781, 8451, 9031, 9542, 10000, ++ 10414, 10792, 11139, 11461, 11761, 12041, 12304, 12553, 12788, 13010, ++ 13222, 13424, 13617, 13802, 13979, 14150, 14314, 14472, 14624, 14771, ++ 14914, 15052, 15185, 15315, 15441, 15563, 15682, 15798, 15911, 16021, ++ 16128, 16232, 16335, 16435, 16532, 16628, 16721, 16812, 16902, 16990, ++ 17076, 17160, 17243, 17324, 17404, 17482, 17559, 17634, 17709, 17782, ++ 17853, 17924, 17993, 18062, 18129, 18195, 18261, 18325, 18388, 18451, ++ 18513, 18573, 18633, 18692, 18751, 18808, 18865, 18921, 18976, 19031 ++ }; ++ static const u16 mes_loge[] ={ ++ 0, 6931, 10986, 13863, 16094, 17918, 19459, 20794, 21972, 23026, ++ 23979, 24849, 25649, 26391, 27081, 27726, 28332, 28904, 29444, 29957, ++ 30445, 30910, 31355, 31781, 32189, 32581, 32958, 33322, 33673, 34012, ++ 34340, 34657, ++ }; ++ ++ dprintk("%s()\n", __func__); ++ ++ switch (c->delivery_system){ ++ case SYS_DVBS: ++ cnt = 10; snr_total = 0; ++ while(cnt > 0){ ++ val = m88ds3103_readreg(state, 0xff); ++ snr_total += val; ++ cnt--; ++ } ++ tmp = (u16)(snr_total/80); ++ if(tmp > 0){ ++ if (tmp > 32) tmp = 32; ++ snr = (mes_loge[tmp - 1] * 100) / 45; ++ }else{ ++ snr = 0; ++ } ++ break; ++ case SYS_DVBS2: ++ cnt = 10; npow = 0; spow = 0; ++ while(cnt >0){ ++ npow1 = m88ds3103_readreg(state, 0x8c) & 0xff; ++ npow2 = m88ds3103_readreg(state, 0x8d) & 0xff; ++ npow += (((npow1 & 0x3f) + (u16)(npow2 << 6)) >> 2); ++ ++ spow1 = m88ds3103_readreg(state, 0x8e) & 0xff; ++ spow += ((spow1 * spow1) >> 1); ++ cnt--; ++ } ++ npow /= 10; spow /= 10; ++ if(spow == 0){ ++ snr = 0; ++ }else if(npow == 0){ ++ snr = 19; ++ }else{ ++ if(spow > npow){ ++ tmp = (u16)(spow / npow); ++ if (tmp > 80) tmp = 80; ++ snr = mes_log10[tmp - 1]*3; ++ }else{ ++ tmp = (u16)(npow / spow); ++ if (tmp > 80) tmp = 80; ++ snr = -(mes_log10[tmp - 1] / 1000); ++ } ++ } ++ break; ++ default: ++ break; ++ } ++ *p_snr = snr; ++ ++ return 0; ++} ++ ++ ++static int m88ds3103_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ struct dtv_frontend_properties *c = &fe->dtv_property_cache; ++ u8 tmp1, tmp2, tmp3, data; ++ ++ dprintk("%s()\n", __func__); ++ ++ switch (c->delivery_system) { ++ case SYS_DVBS: ++ data = m88ds3103_readreg(state, 0xf8); ++ data |= 0x40; ++ m88ds3103_writereg(state, 0xf8, data); ++ tmp1 = m88ds3103_readreg(state, 0xf5); ++ tmp2 = m88ds3103_readreg(state, 0xf4); ++ *ucblocks = (tmp1 <<8) | tmp2; ++ data &= ~0x20; ++ m88ds3103_writereg(state, 0xf8, data); ++ data |= 0x20; ++ m88ds3103_writereg(state, 0xf8, data); ++ data &= ~0x40; ++ m88ds3103_writereg(state, 0xf8, data); ++ break; ++ case SYS_DVBS2: ++ tmp1 = m88ds3103_readreg(state, 0xda); ++ tmp2 = m88ds3103_readreg(state, 0xd9); ++ tmp3 = m88ds3103_readreg(state, 0xd8); ++ *ucblocks = (tmp1 <<16)|(tmp2 <<8)|tmp3; ++ data = m88ds3103_readreg(state, 0xd1); ++ data |= 0x01; ++ m88ds3103_writereg(state, 0xd1, data); ++ data &= ~0x01; ++ m88ds3103_writereg(state, 0xd1, data); ++ break; ++ default: ++ break; ++ } ++ return 0; ++} ++ ++static int m88ds3103_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ u8 data_a1, data_a2; ++ ++ dprintk("%s(%d)\n", __func__, tone); ++ if ((tone != SEC_TONE_ON) && (tone != SEC_TONE_OFF)) { ++ printk(KERN_ERR "%s: Invalid, tone=%d\n", __func__, tone); ++ return -EINVAL; ++ } ++ ++ data_a1 = m88ds3103_readreg(state, 0xa1); ++ data_a2 = m88ds3103_readreg(state, 0xa2); ++ if(state->demod_id == DS3103_ID) ++ data_a2 &= 0xdf; /* Normal mode */ ++ switch (tone) { ++ case SEC_TONE_ON: ++ dprintk("%s: SEC_TONE_ON\n", __func__); ++ data_a1 |= 0x04; ++ data_a1 &= ~0x03; ++ data_a1 &= ~0x40; ++ data_a2 &= ~0xc0; ++ break; ++ case SEC_TONE_OFF: ++ dprintk("%s: SEC_TONE_OFF\n", __func__); ++ data_a2 &= ~0xc0; ++ data_a2 |= 0x80; ++ break; ++ } ++ m88ds3103_writereg(state, 0xa2, data_a2); ++ m88ds3103_writereg(state, 0xa1, data_a1); ++ return 0; ++} ++ ++static int m88ds3103_send_diseqc_msg(struct dvb_frontend *fe, ++ struct dvb_diseqc_master_cmd *d) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ int i, ret = 0; ++ u8 tmp, time_out; ++ ++ /* Dump DiSEqC message */ ++ if (debug) { ++ printk(KERN_INFO "m88ds3103: %s(", __func__); ++ for (i = 0 ; i < d->msg_len ;) { ++ printk(KERN_INFO "0x%02x", d->msg[i]); ++ if (++i < d->msg_len) ++ printk(KERN_INFO ", "); ++ } ++ } ++ ++ tmp = m88ds3103_readreg(state, 0xa2); ++ tmp &= ~0xc0; ++ if(state->demod_id == DS3103_ID) ++ tmp &= ~0x20; ++ m88ds3103_writereg(state, 0xa2, tmp); ++ ++ for (i = 0; i < d->msg_len; i ++) ++ m88ds3103_writereg(state, (0xa3+i), d->msg[i]); ++ ++ tmp = m88ds3103_readreg(state, 0xa1); ++ tmp &= ~0x38; ++ tmp &= ~0x40; ++ tmp |= ((d->msg_len-1) << 3) | 0x07; ++ tmp &= ~0x80; ++ m88ds3103_writereg(state, 0xa1, tmp); ++ /* 1.5 * 9 * 8 = 108ms */ ++ time_out = 150; ++ while (time_out > 0){ ++ msleep(10); ++ time_out -= 10; ++ tmp = m88ds3103_readreg(state, 0xa1); ++ if ((tmp & 0x40) == 0) ++ break; ++ } ++ if (time_out == 0){ ++ tmp = m88ds3103_readreg(state, 0xa1); ++ tmp &= ~0x80; ++ tmp |= 0x40; ++ m88ds3103_writereg(state, 0xa1, tmp); ++ ret = 1; ++ } ++ tmp = m88ds3103_readreg(state, 0xa2); ++ tmp &= ~0xc0; ++ tmp |= 0x80; ++ m88ds3103_writereg(state, 0xa2, tmp); ++ return ret; ++} ++ ++ ++static int m88ds3103_diseqc_send_burst(struct dvb_frontend *fe, ++ fe_sec_mini_cmd_t burst) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ u8 val, time_out; ++ ++ dprintk("%s()\n", __func__); ++ ++ val = m88ds3103_readreg(state, 0xa2); ++ val &= ~0xc0; ++ if(state->demod_id == DS3103_ID) ++ val &= 0xdf; /* Normal mode */ ++ m88ds3103_writereg(state, 0xa2, val); ++ /* DiSEqC burst */ ++ if (burst == SEC_MINI_B) ++ m88ds3103_writereg(state, 0xa1, 0x01); ++ else ++ m88ds3103_writereg(state, 0xa1, 0x02); ++ ++ msleep(13); ++ ++ time_out = 5; ++ do{ ++ val = m88ds3103_readreg(state, 0xa1); ++ if ((val & 0x40) == 0) ++ break; ++ msleep(1); ++ time_out --; ++ } while (time_out > 0); ++ ++ val = m88ds3103_readreg(state, 0xa2); ++ val &= ~0xc0; ++ val |= 0x80; ++ m88ds3103_writereg(state, 0xa2, val); ++ ++ return 0; ++} ++ ++static void m88ds3103_release(struct dvb_frontend *fe) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ ++ dprintk("%s\n", __func__); ++ kfree(state); ++} ++ ++static int m88ds3103_check_id(struct m88ds3103_state *state) ++{ ++ int val_00, val_01; ++ ++ /*check demod id*/ ++ val_01 = m88ds3103_readreg(state, 0x01); ++ printk(KERN_INFO "DS3000 chip version: %x attached.\n", val_01); ++ ++ if(val_01 == 0xD0) ++ state->demod_id = DS3103_ID; ++ else if(val_01 == 0xC0) ++ state->demod_id = DS3000_ID; ++ else ++ state->demod_id = UNKNOW_ID; ++ ++ /*check tuner id*/ ++ val_00 = m88ds3103_tuner_readreg(state, 0x00); ++ printk(KERN_INFO "TS202x chip version[1]: %x attached.\n", val_00); ++ val_00 &= 0x03; ++ if(val_00 == 0) ++ { ++ m88ds3103_tuner_writereg(state, 0x00, 0x01); ++ msleep(3); ++ } ++ m88ds3103_tuner_writereg(state, 0x00, 0x03); ++ msleep(5); ++ ++ val_00 = m88ds3103_tuner_readreg(state, 0x00); ++ printk(KERN_INFO "TS202x chip version[2]: %x attached.\n", val_00); ++ val_00 &= 0xff; ++ if((val_00 == 0x01) || (val_00 == 0x41) || (val_00 == 0x81)) ++ state->tuner_id = TS2020_ID; ++ else if(((val_00 & 0xc0)== 0xc0) || (val_00 == 0x83)) ++ state->tuner_id = TS2022_ID; ++ else ++ state->tuner_id = UNKNOW_ID; ++ ++ return state->demod_id; ++} ++ ++static struct dvb_frontend_ops m88ds3103_ops; ++static int m88ds3103_initilaze(struct dvb_frontend *fe); ++ ++struct dvb_frontend *m88ds3103_attach(const struct m88ds3103_config *config, ++ struct i2c_adapter *i2c) ++{ ++ struct m88ds3103_state *state = NULL; ++ ++ dprintk("%s\n", __func__); ++ ++ /* allocate memory for the internal state */ ++ state = kzalloc(sizeof(struct m88ds3103_state), GFP_KERNEL); ++ if (state == NULL) { ++ printk(KERN_ERR "Unable to kmalloc\n"); ++ goto error2; ++ } ++ ++ state->config = config; ++ state->i2c = i2c; ++ state->preBer = 0xffff; ++ ++ /* check demod id */ ++ if(m88ds3103_check_id(state) == UNKNOW_ID){ ++ printk(KERN_ERR "Unable to find Montage chip\n"); ++ goto error3; ++ } ++ ++ memcpy(&state->frontend.ops, &m88ds3103_ops, ++ sizeof(struct dvb_frontend_ops)); ++ state->frontend.demodulator_priv = state; ++ ++ m88ds3103_initilaze(&state->frontend); ++ ++ return &state->frontend; ++ ++error3: ++ kfree(state); ++error2: ++ return NULL; ++} ++EXPORT_SYMBOL(m88ds3103_attach); ++ ++static int m88ds3103_set_property(struct dvb_frontend *fe, ++ struct dtv_property *tvp) ++{ ++ dprintk("%s(..)\n", __func__); ++ return 0; ++} ++ ++static int m88ds3103_get_property(struct dvb_frontend *fe, ++ struct dtv_property *tvp) ++{ ++ dprintk("%s(..)\n", __func__); ++ return 0; ++} ++ ++static int m88ds3103_set_carrier_offset(struct dvb_frontend *fe, ++ s32 carrier_offset_khz) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ s32 tmp; ++ ++ tmp = carrier_offset_khz; ++ tmp *= 65536; ++ ++ tmp = (2*tmp + MT_FE_MCLK_KHZ) / (2*MT_FE_MCLK_KHZ); ++ ++ if (tmp < 0) ++ tmp += 65536; ++ ++ m88ds3103_writereg(state, 0x5f, tmp >> 8); ++ m88ds3103_writereg(state, 0x5e, tmp & 0xff); ++ ++ return 0; ++} ++ ++static int m88ds3103_set_symrate(struct dvb_frontend *fe) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ struct dtv_frontend_properties *c = &fe->dtv_property_cache; ++ u16 value; ++ ++ value = (((c->symbol_rate / 1000) << 15) + (MT_FE_MCLK_KHZ / 4)) / (MT_FE_MCLK_KHZ / 2); ++ m88ds3103_writereg(state, 0x61, value & 0x00ff); ++ m88ds3103_writereg(state, 0x62, (value & 0xff00) >> 8); ++ ++ return 0; ++} ++ ++static int m88ds3103_set_CCI(struct dvb_frontend *fe) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ u8 tmp; ++ ++ tmp = m88ds3103_readreg(state, 0x56); ++ tmp &= ~0x01; ++ m88ds3103_writereg(state, 0x56, tmp); ++ ++ tmp = m88ds3103_readreg(state, 0x76); ++ tmp &= ~0x80; ++ m88ds3103_writereg(state, 0x76, tmp); ++ ++ return 0; ++} ++ ++static int m88ds3103_init_reg(struct m88ds3103_state *state, const u8 *p_reg_tab, u32 size) ++{ ++ u32 i; ++ ++ for(i = 0; i < size; i+=2) ++ m88ds3103_writereg(state, p_reg_tab[i], p_reg_tab[i+1]); ++ ++ return 0; ++} ++ ++static int m88ds3103_set_frontend(struct dvb_frontend *fe, ++ struct dvb_frontend_parameters *p) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ struct dtv_frontend_properties *c = &fe->dtv_property_cache; ++ ++ int i; ++ fe_status_t status; ++ u8 lpf_mxdiv, mlpf_max, mlpf_min, nlpf, div4, capCode, changePLL; ++ s32 offset_khz; ++ u16 value, ndiv, lpf_coeff; ++ u32 f3db, gdiv28; ++ u8 val1,val2,data, RFgain; ++ ++ dprintk("%s() ", __func__); ++ ++ if (state->config->set_ts_params) ++ state->config->set_ts_params(fe, 0); ++ ++ div4 = 0; ++ if(state->tuner_id == TS2022_ID){ ++ m88ds3103_tuner_writereg(state, 0x10, 0x0a); ++ m88ds3103_tuner_writereg(state, 0x11, 0x40); ++ if (p->frequency < 1103000) { ++ m88ds3103_tuner_writereg(state, 0x10, 0x1b); ++ div4 = 1; ++ ndiv = (p->frequency * (6 + 8) * 4)/MT_FE_CRYSTAL_KHZ; ++ }else { ++ ndiv = (p->frequency * (6 + 8) * 2)/MT_FE_CRYSTAL_KHZ; ++ } ++ ndiv = ndiv + ndiv%2; ++ if(ndiv < 4095) ++ ndiv = ndiv - 1024; ++ else if (ndiv < 6143) ++ ndiv = ndiv + 1024; ++ else ++ ndiv = ndiv + 3072; ++ ++ m88ds3103_tuner_writereg(state, 0x01, (ndiv & 0x3f00) >> 8); ++ }else{ ++ m88ds3103_tuner_writereg(state, 0x10, 0x00); ++ if (p->frequency < 1146000){ ++ m88ds3103_tuner_writereg(state, 0x10, 0x11); ++ div4 = 1; ++ ndiv = (p->frequency * (6 + 8) * 4) / MT_FE_CRYSTAL_KHZ; ++ }else{ ++ m88ds3103_tuner_writereg(state, 0x10, 0x01); ++ ndiv = (p->frequency * (6 + 8) * 2) / MT_FE_CRYSTAL_KHZ; ++ } ++ ndiv = ndiv + ndiv%2; ++ ndiv = ndiv - 1024; ++ m88ds3103_tuner_writereg(state, 0x01, (ndiv>>8)&0x0f); ++ } ++ /* set pll */ ++ m88ds3103_tuner_writereg(state, 0x02, ndiv & 0x00ff); ++ m88ds3103_tuner_writereg(state, 0x03, 0x06); ++ m88ds3103_tuner_writereg(state, 0x51, 0x0f); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x10); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ ++ if(state->tuner_id == TS2022_ID){ ++ if(( p->frequency >= 1650000 ) && (p->frequency <= 1850000)){ ++ msleep(5); ++ value = m88ds3103_tuner_readreg(state, 0x14); ++ value &= 0x7f; ++ if(value < 64){ ++ m88ds3103_tuner_writereg(state, 0x10, 0x82); ++ m88ds3103_tuner_writereg(state, 0x11, 0x6f); ++ ++ m88ds3103_tuner_writereg(state, 0x51, 0x0f); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x10); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ } ++ } ++ msleep(5); ++ value = m88ds3103_tuner_readreg(state, 0x14); ++ value &= 0x1f; ++ ++ if(value > 19){ ++ value = m88ds3103_tuner_readreg(state, 0x10); ++ value &= 0x1d; ++ m88ds3103_tuner_writereg(state, 0x10, value); ++ } ++ }else{ ++ msleep(5); ++ value = m88ds3103_tuner_readreg(state, 0x66); ++ changePLL = (((value & 0x80) >> 7) != div4); ++ ++ if(changePLL){ ++ m88ds3103_tuner_writereg(state, 0x10, 0x11); ++ div4 = 1; ++ ndiv = (p->frequency * (6 + 8) * 4)/MT_FE_CRYSTAL_KHZ; ++ ndiv = ndiv + ndiv%2; ++ ndiv = ndiv - 1024; ++ ++ m88ds3103_tuner_writereg(state, 0x01, (ndiv>>8) & 0x0f); ++ m88ds3103_tuner_writereg(state, 0x02, ndiv & 0xff); ++ ++ m88ds3103_tuner_writereg(state, 0x51, 0x0f); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x10); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ } ++ } ++ /*set the RF gain*/ ++ if(state->tuner_id == TS2020_ID) ++ m88ds3103_tuner_writereg(state, 0x60, 0x79); ++ ++ m88ds3103_tuner_writereg(state, 0x51, 0x17); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x08); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ msleep(5); ++ ++ if(state->tuner_id == TS2020_ID){ ++ RFgain = m88ds3103_tuner_readreg(state, 0x3d); ++ RFgain &= 0x0f; ++ if(RFgain < 15){ ++ if(RFgain < 4) ++ RFgain = 0; ++ else ++ RFgain = RFgain -3; ++ value = ((RFgain << 3) | 0x01) & 0x79; ++ m88ds3103_tuner_writereg(state, 0x60, value); ++ m88ds3103_tuner_writereg(state, 0x51, 0x17); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x08); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ } ++ } ++ ++ /* set the LPF */ ++ if(state->tuner_id == TS2022_ID){ ++ m88ds3103_tuner_writereg(state, 0x25, 0x00); ++ m88ds3103_tuner_writereg(state, 0x27, 0x70); ++ m88ds3103_tuner_writereg(state, 0x41, 0x09); ++ m88ds3103_tuner_writereg(state, 0x08, 0x0b); ++ } ++ ++ f3db = ((c->symbol_rate / 1000) *135) / 200 + 2000; ++ f3db += FREQ_OFFSET_AT_SMALL_SYM_RATE_KHz; ++ if (f3db < 7000) ++ f3db = 7000; ++ if (f3db > 40000) ++ f3db = 40000; ++ ++ gdiv28 = (MT_FE_CRYSTAL_KHZ / 1000 * 1694 + 500) / 1000; ++ m88ds3103_tuner_writereg(state, 0x04, gdiv28 & 0xff); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1b); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x04); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ msleep(5); ++ ++ value = m88ds3103_tuner_readreg(state, 0x26); ++ capCode = value & 0x3f; ++ if(state->tuner_id == TS2022_ID){ ++ m88ds3103_tuner_writereg(state, 0x41, 0x0d); ++ ++ m88ds3103_tuner_writereg(state, 0x51, 0x1b); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x04); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ ++ msleep(2); ++ ++ value = m88ds3103_tuner_readreg(state, 0x26); ++ value &= 0x3f; ++ value = (capCode + value) / 2; ++ } ++ else ++ value = capCode; ++ ++ gdiv28 = gdiv28 * 207 / (value * 2 + 151); ++ mlpf_max = gdiv28 * 135 / 100; ++ mlpf_min = gdiv28 * 78 / 100; ++ if (mlpf_max > 63) ++ mlpf_max = 63; ++ ++ if(state->tuner_id == TS2022_ID) ++ lpf_coeff = 3200; ++ else ++ lpf_coeff = 2766; ++ ++ nlpf = (f3db * gdiv28 * 2 / lpf_coeff / (MT_FE_CRYSTAL_KHZ / 1000) + 1) / 2 ; ++ if (nlpf > 23) nlpf = 23; ++ if (nlpf < 1) nlpf = 1; ++ ++ lpf_mxdiv = (nlpf * (MT_FE_CRYSTAL_KHZ / 1000) * lpf_coeff * 2 / f3db + 1) / 2; ++ ++ if (lpf_mxdiv < mlpf_min){ ++ nlpf++; ++ lpf_mxdiv = (nlpf * (MT_FE_CRYSTAL_KHZ / 1000) * lpf_coeff * 2 / f3db + 1) / 2; ++ } ++ ++ if (lpf_mxdiv > mlpf_max) ++ lpf_mxdiv = mlpf_max; ++ ++ m88ds3103_tuner_writereg(state, 0x04, lpf_mxdiv); ++ m88ds3103_tuner_writereg(state, 0x06, nlpf); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1b); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x04); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ msleep(5); ++ ++ if(state->tuner_id == TS2022_ID){ ++ msleep(2); ++ value = m88ds3103_tuner_readreg(state, 0x26); ++ capCode = value & 0x3f; ++ ++ m88ds3103_tuner_writereg(state, 0x41, 0x09); ++ ++ m88ds3103_tuner_writereg(state, 0x51, 0x1b); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x04); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ ++ msleep(2); ++ value = m88ds3103_tuner_readreg(state, 0x26); ++ value &= 0x3f; ++ value = (capCode + value) / 2; ++ ++ value = value | 0x80; ++ m88ds3103_tuner_writereg(state, 0x25, value); ++ m88ds3103_tuner_writereg(state, 0x27, 0x30); ++ ++ m88ds3103_tuner_writereg(state, 0x08, 0x09); ++ } ++ ++ /* Set the BB gain */ ++ m88ds3103_tuner_writereg(state, 0x51, 0x1e); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x01); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ if(state->tuner_id == TS2020_ID){ ++ if(RFgain == 15){ ++ msleep(40); ++ value = m88ds3103_tuner_readreg(state, 0x21); ++ value &= 0x0f; ++ if(value < 3){ ++ m88ds3103_tuner_writereg(state, 0x60, 0x61); ++ m88ds3103_tuner_writereg(state, 0x51, 0x17); ++ m88ds3103_tuner_writereg(state, 0x51, 0x1f); ++ m88ds3103_tuner_writereg(state, 0x50, 0x08); ++ m88ds3103_tuner_writereg(state, 0x50, 0x00); ++ } ++ } ++ } ++ msleep(60); ++ ++ offset_khz = (ndiv - ndiv % 2 + 1024) * MT_FE_CRYSTAL_KHZ ++ / (6 + 8) / (div4 + 1) / 2 - p->frequency; ++ ++ /* ds3000 global reset */ ++ m88ds3103_writereg(state, 0x07, 0x80); ++ m88ds3103_writereg(state, 0x07, 0x00); ++ /* ds3000 build-in uC reset */ ++ m88ds3103_writereg(state, 0xb2, 0x01); ++ /* ds3000 software reset */ ++ m88ds3103_writereg(state, 0x00, 0x01); ++ ++ switch (c->delivery_system) { ++ case SYS_DVBS: ++ /* initialise the demod in DVB-S mode */ ++ if(state->demod_id == DS3000_ID){ ++ m88ds3103_init_reg(state, ds3000_dvbs_init_tab, sizeof(ds3000_dvbs_init_tab)); ++ ++ value = m88ds3103_readreg(state, 0xfe); ++ value &= 0xc0; ++ value |= 0x1b; ++ m88ds3103_writereg(state, 0xfe, value); ++ ++ if(state->config->ci_mode) ++ val1 = 0x80; ++ else if(state->config->ts_mode) ++ val1 = 0x60; ++ else ++ val1 = 0x20; ++ m88ds3103_writereg(state, 0xfd, val1); ++ ++ }else if(state->demod_id == DS3103_ID){ ++ m88ds3103_init_reg(state, ds3103_dvbs_init_tab, sizeof(ds3103_dvbs_init_tab)); ++ ++ /* set ts clock */ ++ if(state->config->ts_mode == 0) { ++ val1 = 3; val2 = 3; ++ }else{ ++ val1 = 0; val2 = 0; ++ } ++ val1 -= 1; val2 -= 1; ++ val1 &= 0x3f; val2 &= 0x3f; ++ data = m88ds3103_readreg(state, 0xfe); ++ data &= 0xf0; ++ data |= (val2 >> 2) & 0x0f; ++ m88ds3103_writereg(state, 0xfe, data); ++ data = (val2 & 0x03) << 6; ++ data |= val1; ++ m88ds3103_writereg(state, 0xea, data); ++ ++ m88ds3103_writereg(state, 0x4d, 0xfd & m88ds3103_readreg(state, 0x4d)); ++ m88ds3103_writereg(state, 0x30, 0xef & m88ds3103_readreg(state, 0x30)); ++ ++ /* set master clock */ ++ val1 = m88ds3103_readreg(state, 0x22); ++ val2 = m88ds3103_readreg(state, 0x24); ++ ++ val1 &= 0x3f; ++ val2 &= 0x3f; ++ val1 |= 0x80; ++ val2 |= 0x40; ++ ++ m88ds3103_writereg(state, 0x22, val1); ++ m88ds3103_writereg(state, 0x24, val2); ++ ++ if(state->config->ci_mode) ++ val1 = 0x03; ++ else if(state->config->ts_mode) ++ val1 = 0x06; ++ else ++ val1 = 0x42; ++ m88ds3103_writereg(state, 0xfd, val1); ++ } ++ break; ++ case SYS_DVBS2: ++ /* initialise the demod in DVB-S2 mode */ ++ if(state->demod_id == DS3000_ID){ ++ m88ds3103_init_reg(state, ds3000_dvbs2_init_tab, sizeof(ds3000_dvbs2_init_tab)); ++ ++ if (c->symbol_rate >= 30000000) ++ m88ds3103_writereg(state, 0xfe, 0x54); ++ else ++ m88ds3103_writereg(state, 0xfe, 0x98); ++ ++ }else if(state->demod_id == DS3103_ID){ ++ m88ds3103_init_reg(state, ds3103_dvbs2_init_tab, sizeof(ds3103_dvbs2_init_tab)); ++ ++ /* set ts clock */ ++ if(state->config->ts_mode == 0){ ++ val1 = 5; val2 = 4; ++ }else{ ++ val1 = 0; val2 = 0; ++ } ++ val1 -= 1; val2 -= 1; ++ val1 &= 0x3f; val2 &= 0x3f; ++ data = m88ds3103_readreg(state, 0xfe); ++ data &= 0xf0; ++ data |= (val2 >> 2) & 0x0f; ++ m88ds3103_writereg(state, 0xfe, data); ++ data = (val2 & 0x03) << 6; ++ data |= val1; ++ m88ds3103_writereg(state, 0xea, data); ++ ++ m88ds3103_writereg(state, 0x4d, 0xfd & m88ds3103_readreg(state, 0x4d)); ++ m88ds3103_writereg(state, 0x30, 0xef & m88ds3103_readreg(state, 0x30)); ++ ++ /* set master clock */ ++ val1 = m88ds3103_readreg(state, 0x22); ++ val2 = m88ds3103_readreg(state, 0x24); ++ ++ val1 &= 0x3f; ++ val2 &= 0x3f; ++ if(state->config->ts_mode == 1){ ++ val1 |= 0x80; ++ val2 |= 0x40; ++ }else{ ++ if (c->symbol_rate >= 28000000){ ++ val1 |= 0xc0; ++ }else if (c->symbol_rate >= 18000000){ ++ val2 |= 0x40; ++ }else{ ++ val1 |= 0x80; ++ val2 |= 0x40; ++ } ++ } ++ m88ds3103_writereg(state, 0x22, val1); ++ m88ds3103_writereg(state, 0x24, val2); ++ } ++ ++ if(state->config->ci_mode) ++ val1 = 0x03; ++ else if(state->config->ts_mode) ++ val1 = 0x06; ++ else ++ val1 = 0x42; ++ m88ds3103_writereg(state, 0xfd, val1); ++ ++ break; ++ default: ++ return 1; ++ } ++ /* disable 27MHz clock output */ ++ m88ds3103_writereg(state, 0x29, 0x80); ++ /* enable ac coupling */ ++ m88ds3103_writereg(state, 0x25, 0x8a); ++ ++ if ((c->symbol_rate / 1000) <= 3000){ ++ m88ds3103_writereg(state, 0xc3, 0x08); /* 8 * 32 * 100 / 64 = 400*/ ++ m88ds3103_writereg(state, 0xc8, 0x20); ++ m88ds3103_writereg(state, 0xc4, 0x08); /* 8 * 0 * 100 / 128 = 0*/ ++ m88ds3103_writereg(state, 0xc7, 0x00); ++ }else if((c->symbol_rate / 1000) <= 10000){ ++ m88ds3103_writereg(state, 0xc3, 0x08); /* 8 * 16 * 100 / 64 = 200*/ ++ m88ds3103_writereg(state, 0xc8, 0x10); ++ m88ds3103_writereg(state, 0xc4, 0x08); /* 8 * 0 * 100 / 128 = 0*/ ++ m88ds3103_writereg(state, 0xc7, 0x00); ++ }else{ ++ m88ds3103_writereg(state, 0xc3, 0x08); /* 8 * 6 * 100 / 64 = 75*/ ++ m88ds3103_writereg(state, 0xc8, 0x06); ++ m88ds3103_writereg(state, 0xc4, 0x08); /* 8 * 0 * 100 / 128 = 0*/ ++ m88ds3103_writereg(state, 0xc7, 0x00); ++ } ++ ++ m88ds3103_set_symrate(fe); ++ ++ m88ds3103_set_CCI(fe); ++ ++ m88ds3103_set_carrier_offset(fe, offset_khz); ++ ++ /* ds3000 out of software reset */ ++ m88ds3103_writereg(state, 0x00, 0x00); ++ /* start ds3000 build-in uC */ ++ m88ds3103_writereg(state, 0xb2, 0x00); ++ ++ for (i = 0; i < 30 ; i++) { ++ m88ds3103_read_status(fe, &status); ++ if (status && FE_HAS_LOCK){ ++ if(state->config->start_ctrl){ ++ if(state->first_lock == 0){ ++ state->config->start_ctrl(fe); ++ state->first_lock = 1; ++ } ++ } ++ break; ++ } ++ msleep(10); ++ } ++ return 0; ++} ++ ++static int m88ds3103_tune(struct dvb_frontend *fe, ++ struct dvb_frontend_parameters *params, ++ unsigned int mode_flags, ++ unsigned int *delay, ++ fe_status_t *status) ++{ ++ *delay = HZ / 5; ++ if (params) { ++ int ret = m88ds3103_set_frontend(fe, params); ++ if (ret) ++ return ret; ++ } ++ return m88ds3103_read_status(fe, status); ++} ++ ++static enum dvbfe_algo m88ds3103_get_algo(struct dvb_frontend *fe) ++{ ++ return DVBFE_ALGO_HW; ++} ++ ++ /* ++ * Power config will reset and load initial firmware if required ++ */ ++static int m88ds3103_initilaze(struct dvb_frontend *fe) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ int ret; ++ ++ dprintk("%s()\n", __func__); ++ /* hard reset */ ++ m88ds3103_writereg(state, 0x07, 0x80); ++ m88ds3103_writereg(state, 0x07, 0x00); ++ msleep(1); ++ ++ m88ds3103_writereg(state, 0x08, 0x01 | m88ds3103_readreg(state, 0x08)); ++ msleep(1); ++ ++ if(state->tuner_id == TS2020_ID){ ++ /* TS2020 init */ ++ m88ds3103_tuner_writereg(state, 0x42, 0x73); ++ msleep(2); ++ m88ds3103_tuner_writereg(state, 0x05, 0x01); ++ m88ds3103_tuner_writereg(state, 0x62, 0xb5); ++ m88ds3103_tuner_writereg(state, 0x07, 0x02); ++ m88ds3103_tuner_writereg(state, 0x08, 0x01); ++ } ++ else if(state->tuner_id == TS2022_ID){ ++ /* TS2022 init */ ++ m88ds3103_tuner_writereg(state, 0x62, 0x6c); ++ msleep(2); ++ m88ds3103_tuner_writereg(state, 0x42, 0x6c); ++ msleep(2); ++ m88ds3103_tuner_writereg(state, 0x7d, 0x9d); ++ m88ds3103_tuner_writereg(state, 0x7c, 0x9a); ++ m88ds3103_tuner_writereg(state, 0x7a, 0x76); ++ ++ m88ds3103_tuner_writereg(state, 0x3b, 0x01); ++ m88ds3103_tuner_writereg(state, 0x63, 0x88); ++ ++ m88ds3103_tuner_writereg(state, 0x61, 0x85); ++ m88ds3103_tuner_writereg(state, 0x22, 0x30); ++ m88ds3103_tuner_writereg(state, 0x30, 0x40); ++ m88ds3103_tuner_writereg(state, 0x20, 0x23); ++ m88ds3103_tuner_writereg(state, 0x24, 0x02); ++ m88ds3103_tuner_writereg(state, 0x12, 0xa0); ++ } ++ ++ if(state->demod_id == DS3103_ID){ ++ m88ds3103_writereg(state, 0x07, 0xe0); ++ m88ds3103_writereg(state, 0x07, 0x00); ++ msleep(1); ++ } ++ m88ds3103_writereg(state, 0xb2, 0x01); ++ ++ /* Load the firmware if required */ ++ ret = m88ds3103_load_firmware(fe); ++ if (ret != 0){ ++ printk(KERN_ERR "%s: Unable initialize firmware\n", __func__); ++ return ret; ++ } ++ if(state->demod_id == DS3103_ID){ ++ m88ds3103_writereg(state, 0x4d, 0xfd & m88ds3103_readreg(state, 0x4d)); ++ m88ds3103_writereg(state, 0x30, 0xef & m88ds3103_readreg(state, 0x30)); ++ } ++ ++ return 0; ++} ++ ++/* ++ * Initialise or wake up device ++ */ ++static int m88ds3103_initfe(struct dvb_frontend *fe) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ u8 val; ++ ++ dprintk("%s()\n", __func__); ++ ++ /* 1st step to wake up demod */ ++ m88ds3103_writereg(state, 0x08, 0x01 | m88ds3103_readreg(state, 0x08)); ++ m88ds3103_writereg(state, 0x04, 0xfe & m88ds3103_readreg(state, 0x04)); ++ m88ds3103_writereg(state, 0x23, 0xef & m88ds3103_readreg(state, 0x23)); ++ ++ /* 2nd step to wake up tuner */ ++ val = m88ds3103_tuner_readreg(state, 0x00) & 0xff; ++ if((val & 0x01) == 0){ ++ m88ds3103_tuner_writereg(state, 0x00, 0x01); ++ msleep(50); ++ } ++ m88ds3103_tuner_writereg(state, 0x00, 0x03); ++ msleep(50); ++ ++ return 0; ++} ++ ++/* Put device to sleep */ ++static int m88ds3103_sleep(struct dvb_frontend *fe) ++{ ++ struct m88ds3103_state *state = fe->demodulator_priv; ++ ++ dprintk("%s()\n", __func__); ++ ++ /* 1st step to sleep tuner */ ++ m88ds3103_tuner_writereg(state, 0x00, 0x00); ++ ++ /* 2nd step to sleep demod */ ++ m88ds3103_writereg(state, 0x08, 0xfe & m88ds3103_readreg(state, 0x08)); ++ m88ds3103_writereg(state, 0x04, 0x01 | m88ds3103_readreg(state, 0x04)); ++ m88ds3103_writereg(state, 0x23, 0x10 | m88ds3103_readreg(state, 0x23)); ++ ++ ++ return 0; ++} ++ ++static struct dvb_frontend_ops m88ds3103_ops = { ++ ++ .info = { ++ .name = "Montage DS3103/TS2022", ++ .type = FE_QPSK, ++ .frequency_min = 950000, ++ .frequency_max = 2150000, ++ .frequency_stepsize = 1011, /* kHz for QPSK frontends */ ++ .frequency_tolerance = 5000, ++ .symbol_rate_min = 1000000, ++ .symbol_rate_max = 45000000, ++ .caps = FE_CAN_INVERSION_AUTO | ++ FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | ++ FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 | ++ FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | ++ FE_CAN_2G_MODULATION | ++ FE_CAN_QPSK | FE_CAN_RECOVER ++ }, ++ ++ .release = m88ds3103_release, ++ ++ .init = m88ds3103_initfe, ++ .sleep = m88ds3103_sleep, ++ .read_status = m88ds3103_read_status, ++ .read_ber = m88ds3103_read_ber, ++ .read_signal_strength = m88ds3103_read_signal_strength, ++ .read_snr = m88ds3103_read_snr, ++ .read_ucblocks = m88ds3103_read_ucblocks, ++ .set_tone = m88ds3103_set_tone, ++ .set_voltage = m88ds3103_set_voltage, ++ .diseqc_send_master_cmd = m88ds3103_send_diseqc_msg, ++ .diseqc_send_burst = m88ds3103_diseqc_send_burst, ++ .get_frontend_algo = m88ds3103_get_algo, ++ .tune = m88ds3103_tune, ++ ++ .set_property = m88ds3103_set_property, ++ .get_property = m88ds3103_get_property, ++ .set_frontend = m88ds3103_set_frontend, ++}; ++ ++MODULE_DESCRIPTION("DVB Frontend module for Montage DS3103/TS2022 hardware"); ++MODULE_AUTHOR("Max nibble"); ++MODULE_LICENSE("GPL"); +diff -uprN linux-3.2.10.orig/drivers/media/dvb/frontends/m88ds3103.h linux-3.2.10/drivers/media/dvb/frontends/m88ds3103.h +--- linux-3.2.10.orig/drivers/media/dvb/frontends/m88ds3103.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.10/drivers/media/dvb/frontends/m88ds3103.h 2012-03-16 10:55:57.000000000 +0100 +@@ -0,0 +1,54 @@ ++/* ++ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver ++ Copyright (C) 2011 Max nibble ++ ++ 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef M88DS3103_H ++#define M88DS3103_H ++ ++#include ++ ++struct m88ds3103_config { ++ /* the demodulator's i2c address */ ++ u8 demod_address; ++ u8 ci_mode; ++ u8 pin_ctrl; ++ u8 ts_mode; /* 0: Parallel, 1: Serial */ ++ ++ /* Set device param to start dma */ ++ int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured); ++ /* Start to transfer data */ ++ int (*start_ctrl)(struct dvb_frontend *fe); ++ /* Set LNB voltage */ ++ int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage); ++}; ++ ++#if defined(CONFIG_DVB_M88DS3103) || \ ++ (defined(CONFIG_DVB_M88DS3103_MODULE) && defined(MODULE)) ++extern struct dvb_frontend *m88ds3103_attach( ++ const struct m88ds3103_config *config, ++ struct i2c_adapter *i2c); ++#else ++static inline struct dvb_frontend *m88ds3103_attach( ++ const struct m88ds3103_config *config, ++ struct i2c_adapter *i2c) ++{ ++ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); ++ return NULL; ++} ++#endif /* CONFIG_DVB_M88DS3103 */ ++#endif /* M88DS3103_H */ +diff -uprN linux-3.2.10.orig/drivers/media/dvb/frontends/Makefile linux-3.2.10/drivers/media/dvb/frontends/Makefile +--- linux-3.2.10.orig/drivers/media/dvb/frontends/Makefile 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/dvb/frontends/Makefile 2012-03-16 10:55:57.000000000 +0100 +@@ -95,4 +95,5 @@ obj-$(CONFIG_DVB_TDA18271C2DD) += tda182 + obj-$(CONFIG_DVB_IT913X_FE) += it913x-fe.o + obj-$(CONFIG_DVB_A8293) += a8293.o + obj-$(CONFIG_DVB_TDA10071) += tda10071.o ++obj-$(CONFIG_DVB_M88DS3103) += m88ds3103.o + +diff -uprN linux-3.2.10.orig/drivers/media/rc/keymaps/Makefile linux-3.2.10/drivers/media/rc/keymaps/Makefile +--- linux-3.2.10.orig/drivers/media/rc/keymaps/Makefile 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/rc/keymaps/Makefile 2012-03-16 10:56:16.000000000 +0100 +@@ -26,6 +26,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t + rc-dm1105-nec.o \ + rc-dntv-live-dvb-t.o \ + rc-dntv-live-dvbt-pro.o \ ++ rc-dvbsky.o \ + rc-em-terratec.o \ + rc-encore-enltv2.o \ + rc-encore-enltv.o \ +diff -uprN linux-3.2.10.orig/drivers/media/rc/keymaps/rc-dvbsky.c linux-3.2.10/drivers/media/rc/keymaps/rc-dvbsky.c +--- linux-3.2.10.orig/drivers/media/rc/keymaps/rc-dvbsky.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.10/drivers/media/rc/keymaps/rc-dvbsky.c 2012-03-16 11:57:45.000000000 +0100 +@@ -0,0 +1,80 @@ ++/* rc-dvbsky.c - Keytable for Dvbsky Remote Controllers ++ * ++ * keymap imported from ir-keymaps.c ++ * ++ * ++ * Copyright (c) 2010-2011 by Mauro Carvalho Chehab ++ * ++ * 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. ++ */ ++ ++#include ++ ++/* ++ * This table contains the complete RC5 code, instead of just the data part ++ */ ++ ++static struct rc_map_table rc5_dvbsky[] = { ++ { 0x0000, KEY_0 }, ++ { 0x0001, KEY_1 }, ++ { 0x0002, KEY_2 }, ++ { 0x0003, KEY_3 }, ++ { 0x0004, KEY_4 }, ++ { 0x0005, KEY_5 }, ++ { 0x0006, KEY_6 }, ++ { 0x0007, KEY_7 }, ++ { 0x0008, KEY_8 }, ++ { 0x0009, KEY_9 }, ++ { 0x000a, KEY_MUTE }, ++ { 0x000d, KEY_OK }, ++ { 0x000b, KEY_STOP }, ++ { 0x000c, KEY_EXIT }, ++ { 0x000e, KEY_CAMERA }, /*Snap shot*/ ++ { 0x000f, KEY_SUBTITLE }, /*PIP*/ ++ { 0x0010, KEY_VOLUMEUP }, ++ { 0x0011, KEY_VOLUMEDOWN }, ++ { 0x0012, KEY_FAVORITES }, ++ { 0x0013, KEY_LIST }, /*Info*/ ++ { 0x0016, KEY_PAUSE }, ++ { 0x0017, KEY_PLAY }, ++ { 0x001f, KEY_RECORD }, ++ { 0x0020, KEY_CHANNELDOWN }, ++ { 0x0021, KEY_CHANNELUP }, ++ { 0x0025, KEY_POWER2 }, ++ { 0x0026, KEY_REWIND }, ++ { 0x0027, KEY_FASTFORWARD }, ++ { 0x0029, KEY_LAST }, ++ { 0x002b, KEY_MENU }, ++ { 0x002c, KEY_EPG }, ++ { 0x002d, KEY_ZOOM }, ++}; ++ ++static struct rc_map_list rc5_dvbsky_map = { ++ .map = { ++ .scan = rc5_dvbsky, ++ .size = ARRAY_SIZE(rc5_dvbsky), ++ .rc_type = RC_TYPE_RC5, ++ .name = RC_MAP_DVBSKY, ++ } ++}; ++ ++static int __init init_rc_map_rc5_dvbsky(void) ++{ ++ return rc_map_register(&rc5_dvbsky_map); ++} ++ ++static void __exit exit_rc_map_rc5_dvbsky(void) ++{ ++ rc_map_unregister(&rc5_dvbsky_map); ++} ++ ++module_init(init_rc_map_rc5_dvbsky) ++module_exit(exit_rc_map_rc5_dvbsky) ++ ++/* outcommented cause build error ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Mauro Carvalho Chehab "); ++*/ +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-cards.c linux-3.2.10/drivers/media/video/cx23885/cx23885-cards.c +--- linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-cards.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/cx23885-cards.c 2012-03-16 10:55:17.000000000 +0100 +@@ -437,7 +437,21 @@ struct cx23885_board cx23885_boards[] = + .amux = CX25840_AUDIO7, + .gpio0 = 0, + } }, ++ }, ++ [CX23885_BOARD_BST_PS8512] = { ++ .name = "Bestunar PS8512", ++ .portb = CX23885_MPEG_DVB, ++ }, ++ [CX23885_BOARD_DVBSKY_S950] = { ++ .name = "DVBSKY S950", ++ .portb = CX23885_MPEG_DVB, + }, ++ [CX23885_BOARD_DVBSKY_S952] = { ++ .name = "DVBSKY S952", ++ .portb = CX23885_MPEG_DVB, ++ .portc = CX23885_MPEG_DVB, ++ }, ++ + }; + const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); + +@@ -637,6 +651,18 @@ struct cx23885_subid cx23885_subids[] = + .subvendor = 0x1b55, + .subdevice = 0xe2e4, + .card = CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF, ++ }, { ++ .subvendor = 0x14f1, ++ .subdevice = 0x8512, ++ .card = CX23885_BOARD_BST_PS8512, ++ }, { ++ .subvendor = 0x4254, ++ .subdevice = 0x0950, ++ .card = CX23885_BOARD_DVBSKY_S950, ++ }, { ++ .subvendor = 0x4254, ++ .subdevice = 0x0952, ++ .card = CX23885_BOARD_DVBSKY_S952, + }, + }; + const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); +@@ -1147,9 +1173,57 @@ void cx23885_gpio_setup(struct cx23885_d + /* enable irq */ + cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/ + break; ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_BST_PS8512: ++ cx23885_gpio_enable(dev, GPIO_2, 1); ++ cx23885_gpio_clear(dev, GPIO_2); ++ msleep(100); ++ cx23885_gpio_set(dev, GPIO_2); ++ break; ++ case CX23885_BOARD_DVBSKY_S952: ++ cx_write(MC417_CTL, 0x00000037);/* enable GPIO3-18 pins */ ++ ++ cx23885_gpio_enable(dev, GPIO_2, 1); ++ cx23885_gpio_enable(dev, GPIO_11, 1); ++ ++ cx23885_gpio_clear(dev, GPIO_2); ++ cx23885_gpio_clear(dev, GPIO_11); ++ msleep(100); ++ cx23885_gpio_set(dev, GPIO_2); ++ cx23885_gpio_set(dev, GPIO_11); ++ ++ break; + } + } + ++static int cx23885_ir_patch(struct i2c_adapter *i2c, u8 reg, u8 mask) ++{ ++ struct i2c_msg msgs[2]; ++ u8 tx_buf[2], rx_buf[1]; ++ /* Write register address */ ++ tx_buf[0] = reg; ++ msgs[0].addr = 0x4c; ++ msgs[0].flags = 0; ++ msgs[0].len = 1; ++ msgs[0].buf = (char *) tx_buf; ++ /* Read data from register */ ++ msgs[1].addr = 0x4c; ++ msgs[1].flags = I2C_M_RD; ++ msgs[1].len = 1; ++ msgs[1].buf = (char *) rx_buf; ++ ++ i2c_transfer(i2c, msgs, 2); ++ ++ tx_buf[0] = reg; ++ tx_buf[1] = rx_buf[0] | mask; ++ msgs[0].addr = 0x4c; ++ msgs[0].flags = 0; ++ msgs[0].len = 2; ++ msgs[0].buf = (char *) tx_buf; ++ ++ return i2c_transfer(i2c, msgs, 1); ++} ++ + int cx23885_ir_init(struct cx23885_dev *dev) + { + static struct v4l2_subdev_io_pin_config ir_rxtx_pin_cfg[] = { +@@ -1181,7 +1255,7 @@ int cx23885_ir_init(struct cx23885_dev * + const size_t ir_rx_pin_cfg_count = ARRAY_SIZE(ir_rx_pin_cfg); + + struct v4l2_subdev_ir_parameters params; +- int ret = 0; ++ int ret = 0; + switch (dev->board) { + case CX23885_BOARD_HAUPPAUGE_HVR1500: + case CX23885_BOARD_HAUPPAUGE_HVR1500Q: +@@ -1232,6 +1306,20 @@ int cx23885_ir_init(struct cx23885_dev * + v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config, + ir_rx_pin_cfg_count, ir_rx_pin_cfg); + break; ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_DVBSKY_S952: ++ dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE); ++ if (dev->sd_ir == NULL) { ++ ret = -ENODEV; ++ break; ++ } ++ v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config, ++ ir_rx_pin_cfg_count, ir_rx_pin_cfg); ++ ++ cx23885_ir_patch(&(dev->i2c_bus[2].i2c_adap),0x1f,0x80); ++ cx23885_ir_patch(&(dev->i2c_bus[2].i2c_adap),0x23,0x80); ++ break; + case CX23885_BOARD_HAUPPAUGE_HVR1250: + if (!enable_885_ir) + break; +@@ -1263,6 +1351,9 @@ void cx23885_ir_fini(struct cx23885_dev + break; + case CX23885_BOARD_TEVII_S470: + case CX23885_BOARD_HAUPPAUGE_HVR1250: ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_DVBSKY_S952: + cx23885_irq_remove(dev, PCI_MSK_AV_CORE); + /* sd_ir is a duplicate pointer to the AV Core, just clear it */ + dev->sd_ir = NULL; +@@ -1306,6 +1397,9 @@ void cx23885_ir_pci_int_enable(struct cx + break; + case CX23885_BOARD_TEVII_S470: + case CX23885_BOARD_HAUPPAUGE_HVR1250: ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_DVBSKY_S952: + if (dev->sd_ir) + cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE); + break; +@@ -1388,6 +1482,8 @@ void cx23885_card_setup(struct cx23885_d + ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */ + ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; + break; ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_TEVII_S470: + case CX23885_BOARD_DVBWORLD_2005: + ts1->gen_ctrl_val = 0x5; /* Parallel */ +@@ -1417,6 +1513,14 @@ void cx23885_card_setup(struct cx23885_d + ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ + ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; + break; ++ case CX23885_BOARD_DVBSKY_S952: ++ ts1->gen_ctrl_val = 0x5; /* Parallel */ ++ ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */ ++ ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; ++ ts2->gen_ctrl_val = 0xe; /* Serial bus + punctured clock */ ++ ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ ++ ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; ++ break; + case CX23885_BOARD_HAUPPAUGE_HVR1250: + case CX23885_BOARD_HAUPPAUGE_HVR1500: + case CX23885_BOARD_HAUPPAUGE_HVR1500Q: +@@ -1468,6 +1572,9 @@ void cx23885_card_setup(struct cx23885_d + case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID: + case CX23885_BOARD_HAUPPAUGE_HVR1500: + case CX23885_BOARD_MPX885: ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_DVBSKY_S952: + dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, + &dev->i2c_bus[2].i2c_adap, + "cx25840", 0x88 >> 1, NULL); +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-dvb.c linux-3.2.10/drivers/media/video/cx23885/cx23885-dvb.c +--- linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-dvb.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/cx23885-dvb.c 2012-03-16 10:55:17.000000000 +0100 +@@ -51,6 +51,7 @@ + #include "stv6110.h" + #include "lnbh24.h" + #include "cx24116.h" ++#include "m88ds3103.h" + #include "cimax2.h" + #include "lgs8gxx.h" + #include "netup-eeprom.h" +@@ -479,6 +480,30 @@ static struct xc5000_config mygica_x8506 + .if_khz = 5380, + }; + ++/* bestunar single dvb-s2 */ ++static struct m88ds3103_config bst_ds3103_config = { ++ .demod_address = 0x68, ++ .ci_mode = 0, ++ .pin_ctrl = 0x82, ++ .ts_mode = 0, ++ .set_voltage = bst_set_voltage, ++}; ++/* DVBSKY dual dvb-s2 */ ++static struct m88ds3103_config dvbsky_ds3103_config_pri = { ++ .demod_address = 0x68, ++ .ci_mode = 0, ++ .pin_ctrl = 0x82, ++ .ts_mode = 0, ++ .set_voltage = bst_set_voltage, ++}; ++static struct m88ds3103_config dvbsky_ds3103_config_sec = { ++ .demod_address = 0x68, ++ .ci_mode = 0, ++ .pin_ctrl = 0x82, ++ .ts_mode = 1, ++ .set_voltage = dvbsky_set_voltage_sec, ++}; ++ + static int cx23885_dvb_set_frontend(struct dvb_frontend *fe, + struct dvb_frontend_parameters *param) + { +@@ -1123,6 +1148,32 @@ static int dvb_register(struct cx23885_t + goto frontend_detach; + } + break; ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ i2c_bus = &dev->i2c_bus[1]; ++ fe0->dvb.frontend = dvb_attach(m88ds3103_attach, ++ &bst_ds3103_config, ++ &i2c_bus->i2c_adap); ++ break; ++ ++ case CX23885_BOARD_DVBSKY_S952: ++ switch (port->nr) { ++ /* port B */ ++ case 1: ++ i2c_bus = &dev->i2c_bus[1]; ++ fe0->dvb.frontend = dvb_attach(m88ds3103_attach, ++ &dvbsky_ds3103_config_pri, ++ &i2c_bus->i2c_adap); ++ break; ++ /* port C */ ++ case 2: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(m88ds3103_attach, ++ &dvbsky_ds3103_config_sec, ++ &i2c_bus->i2c_adap); ++ break; ++ } ++ break; + default: + printk(KERN_INFO "%s: The frontend of your DVB/ATSC card " + " isn't supported yet\n", +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-dvb.c.orig linux-3.2.10/drivers/media/video/cx23885/cx23885-dvb.c.orig +--- linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-dvb.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/cx23885-dvb.c.orig 2012-03-16 10:14:15.000000000 +0100 +@@ -0,0 +1,1294 @@ ++/* ++ * Driver for the Conexant CX23885 PCIe bridge ++ * ++ * Copyright (c) 2006 Steven Toth ++ * ++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "cx23885.h" ++#include ++ ++#include "dvb_ca_en50221.h" ++#include "s5h1409.h" ++#include "s5h1411.h" ++#include "mt2131.h" ++#include "tda8290.h" ++#include "tda18271.h" ++#include "lgdt330x.h" ++#include "xc4000.h" ++#include "xc5000.h" ++#include "max2165.h" ++#include "tda10048.h" ++#include "tuner-xc2028.h" ++#include "tuner-simple.h" ++#include "dib7000p.h" ++#include "dibx000_common.h" ++#include "zl10353.h" ++#include "stv0900.h" ++#include "stv0900_reg.h" ++#include "stv6110.h" ++#include "lnbh24.h" ++#include "cx24116.h" ++#include "cimax2.h" ++#include "lgs8gxx.h" ++#include "netup-eeprom.h" ++#include "netup-init.h" ++#include "lgdt3305.h" ++#include "atbm8830.h" ++#include "ds3000.h" ++#include "cx23885-f300.h" ++#include "altera-ci.h" ++#include "stv0367.h" ++ ++static unsigned int debug; ++ ++#define dprintk(level, fmt, arg...)\ ++ do { if (debug >= level)\ ++ printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\ ++ } while (0) ++ ++/* ------------------------------------------------------------------ */ ++ ++static unsigned int alt_tuner; ++module_param(alt_tuner, int, 0644); ++MODULE_PARM_DESC(alt_tuner, "Enable alternate tuner configuration"); ++ ++DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); ++ ++/* ------------------------------------------------------------------ */ ++ ++static int dvb_buf_setup(struct videobuf_queue *q, ++ unsigned int *count, unsigned int *size) ++{ ++ struct cx23885_tsport *port = q->priv_data; ++ ++ port->ts_packet_size = 188 * 4; ++ port->ts_packet_count = 32; ++ ++ *size = port->ts_packet_size * port->ts_packet_count; ++ *count = 32; ++ return 0; ++} ++ ++static int dvb_buf_prepare(struct videobuf_queue *q, ++ struct videobuf_buffer *vb, enum v4l2_field field) ++{ ++ struct cx23885_tsport *port = q->priv_data; ++ return cx23885_buf_prepare(q, port, (struct cx23885_buffer *)vb, field); ++} ++ ++static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) ++{ ++ struct cx23885_tsport *port = q->priv_data; ++ cx23885_buf_queue(port, (struct cx23885_buffer *)vb); ++} ++ ++static void dvb_buf_release(struct videobuf_queue *q, ++ struct videobuf_buffer *vb) ++{ ++ cx23885_free_buffer(q, (struct cx23885_buffer *)vb); ++} ++ ++static void cx23885_dvb_gate_ctrl(struct cx23885_tsport *port, int open) ++{ ++ struct videobuf_dvb_frontends *f; ++ struct videobuf_dvb_frontend *fe; ++ ++ f = &port->frontends; ++ ++ if (f->gate <= 1) /* undefined or fe0 */ ++ fe = videobuf_dvb_get_frontend(f, 1); ++ else ++ fe = videobuf_dvb_get_frontend(f, f->gate); ++ ++ if (fe && fe->dvb.frontend && fe->dvb.frontend->ops.i2c_gate_ctrl) ++ fe->dvb.frontend->ops.i2c_gate_ctrl(fe->dvb.frontend, open); ++} ++ ++static struct videobuf_queue_ops dvb_qops = { ++ .buf_setup = dvb_buf_setup, ++ .buf_prepare = dvb_buf_prepare, ++ .buf_queue = dvb_buf_queue, ++ .buf_release = dvb_buf_release, ++}; ++ ++static struct s5h1409_config hauppauge_generic_config = { ++ .demod_address = 0x32 >> 1, ++ .output_mode = S5H1409_SERIAL_OUTPUT, ++ .gpio = S5H1409_GPIO_ON, ++ .qam_if = 44000, ++ .inversion = S5H1409_INVERSION_OFF, ++ .status_mode = S5H1409_DEMODLOCKING, ++ .mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct tda10048_config hauppauge_hvr1200_config = { ++ .demod_address = 0x10 >> 1, ++ .output_mode = TDA10048_SERIAL_OUTPUT, ++ .fwbulkwritelen = TDA10048_BULKWRITE_200, ++ .inversion = TDA10048_INVERSION_ON, ++ .dtv6_if_freq_khz = TDA10048_IF_3300, ++ .dtv7_if_freq_khz = TDA10048_IF_3800, ++ .dtv8_if_freq_khz = TDA10048_IF_4300, ++ .clk_freq_khz = TDA10048_CLK_16000, ++}; ++ ++static struct tda10048_config hauppauge_hvr1210_config = { ++ .demod_address = 0x10 >> 1, ++ .output_mode = TDA10048_SERIAL_OUTPUT, ++ .fwbulkwritelen = TDA10048_BULKWRITE_200, ++ .inversion = TDA10048_INVERSION_ON, ++ .dtv6_if_freq_khz = TDA10048_IF_3300, ++ .dtv7_if_freq_khz = TDA10048_IF_3500, ++ .dtv8_if_freq_khz = TDA10048_IF_4000, ++ .clk_freq_khz = TDA10048_CLK_16000, ++}; ++ ++static struct s5h1409_config hauppauge_ezqam_config = { ++ .demod_address = 0x32 >> 1, ++ .output_mode = S5H1409_SERIAL_OUTPUT, ++ .gpio = S5H1409_GPIO_OFF, ++ .qam_if = 4000, ++ .inversion = S5H1409_INVERSION_ON, ++ .status_mode = S5H1409_DEMODLOCKING, ++ .mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct s5h1409_config hauppauge_hvr1800lp_config = { ++ .demod_address = 0x32 >> 1, ++ .output_mode = S5H1409_SERIAL_OUTPUT, ++ .gpio = S5H1409_GPIO_OFF, ++ .qam_if = 44000, ++ .inversion = S5H1409_INVERSION_OFF, ++ .status_mode = S5H1409_DEMODLOCKING, ++ .mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct s5h1409_config hauppauge_hvr1500_config = { ++ .demod_address = 0x32 >> 1, ++ .output_mode = S5H1409_SERIAL_OUTPUT, ++ .gpio = S5H1409_GPIO_OFF, ++ .inversion = S5H1409_INVERSION_OFF, ++ .status_mode = S5H1409_DEMODLOCKING, ++ .mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct mt2131_config hauppauge_generic_tunerconfig = { ++ 0x61 ++}; ++ ++static struct lgdt330x_config fusionhdtv_5_express = { ++ .demod_address = 0x0e, ++ .demod_chip = LGDT3303, ++ .serial_mpeg = 0x40, ++}; ++ ++static struct s5h1409_config hauppauge_hvr1500q_config = { ++ .demod_address = 0x32 >> 1, ++ .output_mode = S5H1409_SERIAL_OUTPUT, ++ .gpio = S5H1409_GPIO_ON, ++ .qam_if = 44000, ++ .inversion = S5H1409_INVERSION_OFF, ++ .status_mode = S5H1409_DEMODLOCKING, ++ .mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct s5h1409_config dvico_s5h1409_config = { ++ .demod_address = 0x32 >> 1, ++ .output_mode = S5H1409_SERIAL_OUTPUT, ++ .gpio = S5H1409_GPIO_ON, ++ .qam_if = 44000, ++ .inversion = S5H1409_INVERSION_OFF, ++ .status_mode = S5H1409_DEMODLOCKING, ++ .mpeg_timing = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct s5h1411_config dvico_s5h1411_config = { ++ .output_mode = S5H1411_SERIAL_OUTPUT, ++ .gpio = S5H1411_GPIO_ON, ++ .qam_if = S5H1411_IF_44000, ++ .vsb_if = S5H1411_IF_44000, ++ .inversion = S5H1411_INVERSION_OFF, ++ .status_mode = S5H1411_DEMODLOCKING, ++ .mpeg_timing = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct s5h1411_config hcw_s5h1411_config = { ++ .output_mode = S5H1411_SERIAL_OUTPUT, ++ .gpio = S5H1411_GPIO_OFF, ++ .vsb_if = S5H1411_IF_44000, ++ .qam_if = S5H1411_IF_4000, ++ .inversion = S5H1411_INVERSION_ON, ++ .status_mode = S5H1411_DEMODLOCKING, ++ .mpeg_timing = S5H1411_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK, ++}; ++ ++static struct xc5000_config hauppauge_hvr1500q_tunerconfig = { ++ .i2c_address = 0x61, ++ .if_khz = 5380, ++}; ++ ++static struct xc5000_config dvico_xc5000_tunerconfig = { ++ .i2c_address = 0x64, ++ .if_khz = 5380, ++}; ++ ++static struct tda829x_config tda829x_no_probe = { ++ .probe_tuner = TDA829X_DONT_PROBE, ++}; ++ ++static struct tda18271_std_map hauppauge_tda18271_std_map = { ++ .atsc_6 = { .if_freq = 5380, .agc_mode = 3, .std = 3, ++ .if_lvl = 6, .rfagc_top = 0x37 }, ++ .qam_6 = { .if_freq = 4000, .agc_mode = 3, .std = 0, ++ .if_lvl = 6, .rfagc_top = 0x37 }, ++}; ++ ++static struct tda18271_std_map hauppauge_hvr1200_tda18271_std_map = { ++ .dvbt_6 = { .if_freq = 3300, .agc_mode = 3, .std = 4, ++ .if_lvl = 1, .rfagc_top = 0x37, }, ++ .dvbt_7 = { .if_freq = 3800, .agc_mode = 3, .std = 5, ++ .if_lvl = 1, .rfagc_top = 0x37, }, ++ .dvbt_8 = { .if_freq = 4300, .agc_mode = 3, .std = 6, ++ .if_lvl = 1, .rfagc_top = 0x37, }, ++}; ++ ++static struct tda18271_config hauppauge_tda18271_config = { ++ .std_map = &hauppauge_tda18271_std_map, ++ .gate = TDA18271_GATE_ANALOG, ++ .output_opt = TDA18271_OUTPUT_LT_OFF, ++}; ++ ++static struct tda18271_config hauppauge_hvr1200_tuner_config = { ++ .std_map = &hauppauge_hvr1200_tda18271_std_map, ++ .gate = TDA18271_GATE_ANALOG, ++ .output_opt = TDA18271_OUTPUT_LT_OFF, ++}; ++ ++static struct tda18271_config hauppauge_hvr1210_tuner_config = { ++ .gate = TDA18271_GATE_DIGITAL, ++ .output_opt = TDA18271_OUTPUT_LT_OFF, ++}; ++ ++static struct tda18271_std_map hauppauge_hvr127x_std_map = { ++ .atsc_6 = { .if_freq = 3250, .agc_mode = 3, .std = 4, ++ .if_lvl = 1, .rfagc_top = 0x58 }, ++ .qam_6 = { .if_freq = 4000, .agc_mode = 3, .std = 5, ++ .if_lvl = 1, .rfagc_top = 0x58 }, ++}; ++ ++static struct tda18271_config hauppauge_hvr127x_config = { ++ .std_map = &hauppauge_hvr127x_std_map, ++ .output_opt = TDA18271_OUTPUT_LT_OFF, ++}; ++ ++static struct lgdt3305_config hauppauge_lgdt3305_config = { ++ .i2c_addr = 0x0e, ++ .mpeg_mode = LGDT3305_MPEG_SERIAL, ++ .tpclk_edge = LGDT3305_TPCLK_FALLING_EDGE, ++ .tpvalid_polarity = LGDT3305_TP_VALID_HIGH, ++ .deny_i2c_rptr = 1, ++ .spectral_inversion = 1, ++ .qam_if_khz = 4000, ++ .vsb_if_khz = 3250, ++}; ++ ++static struct dibx000_agc_config xc3028_agc_config = { ++ BAND_VHF | BAND_UHF, /* band_caps */ ++ ++ /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0, ++ * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0, ++ * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0, ++ * P_agc_nb_est=2, P_agc_write=0 ++ */ ++ (0 << 15) | (0 << 14) | (0 << 11) | (0 << 10) | (0 << 9) | (0 << 8) | ++ (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0), /* setup */ ++ ++ 712, /* inv_gain */ ++ 21, /* time_stabiliz */ ++ ++ 0, /* alpha_level */ ++ 118, /* thlock */ ++ ++ 0, /* wbd_inv */ ++ 2867, /* wbd_ref */ ++ 0, /* wbd_sel */ ++ 2, /* wbd_alpha */ ++ ++ 0, /* agc1_max */ ++ 0, /* agc1_min */ ++ 39718, /* agc2_max */ ++ 9930, /* agc2_min */ ++ 0, /* agc1_pt1 */ ++ 0, /* agc1_pt2 */ ++ 0, /* agc1_pt3 */ ++ 0, /* agc1_slope1 */ ++ 0, /* agc1_slope2 */ ++ 0, /* agc2_pt1 */ ++ 128, /* agc2_pt2 */ ++ 29, /* agc2_slope1 */ ++ 29, /* agc2_slope2 */ ++ ++ 17, /* alpha_mant */ ++ 27, /* alpha_exp */ ++ 23, /* beta_mant */ ++ 51, /* beta_exp */ ++ ++ 1, /* perform_agc_softsplit */ ++}; ++ ++/* PLL Configuration for COFDM BW_MHz = 8.000000 ++ * With external clock = 30.000000 */ ++static struct dibx000_bandwidth_config xc3028_bw_config = { ++ 60000, /* internal */ ++ 30000, /* sampling */ ++ 1, /* pll_cfg: prediv */ ++ 8, /* pll_cfg: ratio */ ++ 3, /* pll_cfg: range */ ++ 1, /* pll_cfg: reset */ ++ 0, /* pll_cfg: bypass */ ++ 0, /* misc: refdiv */ ++ 0, /* misc: bypclk_div */ ++ 1, /* misc: IO_CLK_en_core */ ++ 1, /* misc: ADClkSrc */ ++ 0, /* misc: modulo */ ++ (3 << 14) | (1 << 12) | (524 << 0), /* sad_cfg: refsel, sel, freq_15k */ ++ (1 << 25) | 5816102, /* ifreq = 5.200000 MHz */ ++ 20452225, /* timf */ ++ 30000000 /* xtal_hz */ ++}; ++ ++static struct dib7000p_config hauppauge_hvr1400_dib7000_config = { ++ .output_mpeg2_in_188_bytes = 1, ++ .hostbus_diversity = 1, ++ .tuner_is_baseband = 0, ++ .update_lna = NULL, ++ ++ .agc_config_count = 1, ++ .agc = &xc3028_agc_config, ++ .bw = &xc3028_bw_config, ++ ++ .gpio_dir = DIB7000P_GPIO_DEFAULT_DIRECTIONS, ++ .gpio_val = DIB7000P_GPIO_DEFAULT_VALUES, ++ .gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS, ++ ++ .pwm_freq_div = 0, ++ .agc_control = NULL, ++ .spur_protect = 0, ++ ++ .output_mode = OUTMODE_MPEG2_SERIAL, ++}; ++ ++static struct zl10353_config dvico_fusionhdtv_xc3028 = { ++ .demod_address = 0x0f, ++ .if2 = 45600, ++ .no_tuner = 1, ++ .disable_i2c_gate_ctrl = 1, ++}; ++ ++static struct stv0900_reg stv0900_ts_regs[] = { ++ { R0900_TSGENERAL, 0x00 }, ++ { R0900_P1_TSSPEED, 0x40 }, ++ { R0900_P2_TSSPEED, 0x40 }, ++ { R0900_P1_TSCFGM, 0xc0 }, ++ { R0900_P2_TSCFGM, 0xc0 }, ++ { R0900_P1_TSCFGH, 0xe0 }, ++ { R0900_P2_TSCFGH, 0xe0 }, ++ { R0900_P1_TSCFGL, 0x20 }, ++ { R0900_P2_TSCFGL, 0x20 }, ++ { 0xffff, 0xff }, /* terminate */ ++}; ++ ++static struct stv0900_config netup_stv0900_config = { ++ .demod_address = 0x68, ++ .demod_mode = 1, /* dual */ ++ .xtal = 8000000, ++ .clkmode = 3,/* 0-CLKI, 2-XTALI, else AUTO */ ++ .diseqc_mode = 2,/* 2/3 PWM */ ++ .ts_config_regs = stv0900_ts_regs, ++ .tun1_maddress = 0,/* 0x60 */ ++ .tun2_maddress = 3,/* 0x63 */ ++ .tun1_adc = 1,/* 1 Vpp */ ++ .tun2_adc = 1,/* 1 Vpp */ ++}; ++ ++static struct stv6110_config netup_stv6110_tunerconfig_a = { ++ .i2c_address = 0x60, ++ .mclk = 16000000, ++ .clk_div = 1, ++ .gain = 8, /* +16 dB - maximum gain */ ++}; ++ ++static struct stv6110_config netup_stv6110_tunerconfig_b = { ++ .i2c_address = 0x63, ++ .mclk = 16000000, ++ .clk_div = 1, ++ .gain = 8, /* +16 dB - maximum gain */ ++}; ++ ++static struct cx24116_config tbs_cx24116_config = { ++ .demod_address = 0x55, ++}; ++ ++static struct ds3000_config tevii_ds3000_config = { ++ .demod_address = 0x68, ++}; ++ ++static struct cx24116_config dvbworld_cx24116_config = { ++ .demod_address = 0x05, ++}; ++ ++static struct lgs8gxx_config mygica_x8506_lgs8gl5_config = { ++ .prod = LGS8GXX_PROD_LGS8GL5, ++ .demod_address = 0x19, ++ .serial_ts = 0, ++ .ts_clk_pol = 1, ++ .ts_clk_gated = 1, ++ .if_clk_freq = 30400, /* 30.4 MHz */ ++ .if_freq = 5380, /* 5.38 MHz */ ++ .if_neg_center = 1, ++ .ext_adc = 0, ++ .adc_signed = 0, ++ .if_neg_edge = 0, ++}; ++ ++static struct xc5000_config mygica_x8506_xc5000_config = { ++ .i2c_address = 0x61, ++ .if_khz = 5380, ++}; ++ ++static int cx23885_dvb_set_frontend(struct dvb_frontend *fe, ++ struct dvb_frontend_parameters *param) ++{ ++ struct cx23885_tsport *port = fe->dvb->priv; ++ struct cx23885_dev *dev = port->dev; ++ ++ switch (dev->board) { ++ case CX23885_BOARD_HAUPPAUGE_HVR1275: ++ switch (param->u.vsb.modulation) { ++ case VSB_8: ++ cx23885_gpio_clear(dev, GPIO_5); ++ break; ++ case QAM_64: ++ case QAM_256: ++ default: ++ cx23885_gpio_set(dev, GPIO_5); ++ break; ++ } ++ break; ++ case CX23885_BOARD_MYGICA_X8506: ++ case CX23885_BOARD_MAGICPRO_PROHDTVE2: ++ /* Select Digital TV */ ++ cx23885_gpio_set(dev, GPIO_0); ++ break; ++ } ++ return 0; ++} ++ ++static int cx23885_dvb_fe_ioctl_override(struct dvb_frontend *fe, ++ unsigned int cmd, void *parg, ++ unsigned int stage) ++{ ++ int err = 0; ++ ++ switch (stage) { ++ case DVB_FE_IOCTL_PRE: ++ ++ switch (cmd) { ++ case FE_SET_FRONTEND: ++ err = cx23885_dvb_set_frontend(fe, ++ (struct dvb_frontend_parameters *) parg); ++ break; ++ } ++ break; ++ ++ case DVB_FE_IOCTL_POST: ++ /* no post-ioctl handling required */ ++ break; ++ } ++ return err; ++}; ++ ++ ++static struct lgs8gxx_config magicpro_prohdtve2_lgs8g75_config = { ++ .prod = LGS8GXX_PROD_LGS8G75, ++ .demod_address = 0x19, ++ .serial_ts = 0, ++ .ts_clk_pol = 1, ++ .ts_clk_gated = 1, ++ .if_clk_freq = 30400, /* 30.4 MHz */ ++ .if_freq = 6500, /* 6.50 MHz */ ++ .if_neg_center = 1, ++ .ext_adc = 0, ++ .adc_signed = 1, ++ .adc_vpp = 2, /* 1.6 Vpp */ ++ .if_neg_edge = 1, ++}; ++ ++static struct xc5000_config magicpro_prohdtve2_xc5000_config = { ++ .i2c_address = 0x61, ++ .if_khz = 6500, ++}; ++ ++static struct atbm8830_config mygica_x8558pro_atbm8830_cfg1 = { ++ .prod = ATBM8830_PROD_8830, ++ .demod_address = 0x44, ++ .serial_ts = 0, ++ .ts_sampling_edge = 1, ++ .ts_clk_gated = 0, ++ .osc_clk_freq = 30400, /* in kHz */ ++ .if_freq = 0, /* zero IF */ ++ .zif_swap_iq = 1, ++ .agc_min = 0x2E, ++ .agc_max = 0xFF, ++ .agc_hold_loop = 0, ++}; ++ ++static struct max2165_config mygic_x8558pro_max2165_cfg1 = { ++ .i2c_address = 0x60, ++ .osc_clk = 20 ++}; ++ ++static struct atbm8830_config mygica_x8558pro_atbm8830_cfg2 = { ++ .prod = ATBM8830_PROD_8830, ++ .demod_address = 0x44, ++ .serial_ts = 1, ++ .ts_sampling_edge = 1, ++ .ts_clk_gated = 0, ++ .osc_clk_freq = 30400, /* in kHz */ ++ .if_freq = 0, /* zero IF */ ++ .zif_swap_iq = 1, ++ .agc_min = 0x2E, ++ .agc_max = 0xFF, ++ .agc_hold_loop = 0, ++}; ++ ++static struct max2165_config mygic_x8558pro_max2165_cfg2 = { ++ .i2c_address = 0x60, ++ .osc_clk = 20 ++}; ++static struct stv0367_config netup_stv0367_config[] = { ++ { ++ .demod_address = 0x1c, ++ .xtal = 27000000, ++ .if_khz = 4500, ++ .if_iq_mode = 0, ++ .ts_mode = 1, ++ .clk_pol = 0, ++ }, { ++ .demod_address = 0x1d, ++ .xtal = 27000000, ++ .if_khz = 4500, ++ .if_iq_mode = 0, ++ .ts_mode = 1, ++ .clk_pol = 0, ++ }, ++}; ++ ++static struct xc5000_config netup_xc5000_config[] = { ++ { ++ .i2c_address = 0x61, ++ .if_khz = 4500, ++ }, { ++ .i2c_address = 0x64, ++ .if_khz = 4500, ++ }, ++}; ++ ++int netup_altera_fpga_rw(void *device, int flag, int data, int read) ++{ ++ struct cx23885_dev *dev = (struct cx23885_dev *)device; ++ unsigned long timeout = jiffies + msecs_to_jiffies(1); ++ uint32_t mem = 0; ++ ++ mem = cx_read(MC417_RWD); ++ if (read) ++ cx_set(MC417_OEN, ALT_DATA); ++ else { ++ cx_clear(MC417_OEN, ALT_DATA);/* D0-D7 out */ ++ mem &= ~ALT_DATA; ++ mem |= (data & ALT_DATA); ++ } ++ ++ if (flag) ++ mem |= ALT_AD_RG; ++ else ++ mem &= ~ALT_AD_RG; ++ ++ mem &= ~ALT_CS; ++ if (read) ++ mem = (mem & ~ALT_RD) | ALT_WR; ++ else ++ mem = (mem & ~ALT_WR) | ALT_RD; ++ ++ cx_write(MC417_RWD, mem); /* start RW cycle */ ++ ++ for (;;) { ++ mem = cx_read(MC417_RWD); ++ if ((mem & ALT_RDY) == 0) ++ break; ++ if (time_after(jiffies, timeout)) ++ break; ++ udelay(1); ++ } ++ ++ cx_set(MC417_RWD, ALT_RD | ALT_WR | ALT_CS); ++ if (read) ++ return mem & ALT_DATA; ++ ++ return 0; ++}; ++ ++static int dvb_register(struct cx23885_tsport *port) ++{ ++ struct cx23885_dev *dev = port->dev; ++ struct cx23885_i2c *i2c_bus = NULL, *i2c_bus2 = NULL; ++ struct videobuf_dvb_frontend *fe0, *fe1 = NULL; ++ int mfe_shared = 0; /* bus not shared by default */ ++ int ret; ++ ++ /* Get the first frontend */ ++ fe0 = videobuf_dvb_get_frontend(&port->frontends, 1); ++ if (!fe0) ++ return -EINVAL; ++ ++ /* init struct videobuf_dvb */ ++ fe0->dvb.name = dev->name; ++ ++ /* multi-frontend gate control is undefined or defaults to fe0 */ ++ port->frontends.gate = 0; ++ ++ /* Sets the gate control callback to be used by i2c command calls */ ++ port->gate_ctrl = cx23885_dvb_gate_ctrl; ++ ++ /* init frontend */ ++ switch (dev->board) { ++ case CX23885_BOARD_HAUPPAUGE_HVR1250: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(s5h1409_attach, ++ &hauppauge_generic_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(mt2131_attach, fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &hauppauge_generic_tunerconfig, 0); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1270: ++ case CX23885_BOARD_HAUPPAUGE_HVR1275: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(lgdt3305_attach, ++ &hauppauge_lgdt3305_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(tda18271_attach, fe0->dvb.frontend, ++ 0x60, &dev->i2c_bus[1].i2c_adap, ++ &hauppauge_hvr127x_config); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1255: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(s5h1411_attach, ++ &hcw_s5h1411_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(tda18271_attach, fe0->dvb.frontend, ++ 0x60, &dev->i2c_bus[1].i2c_adap, ++ &hauppauge_tda18271_config); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1800: ++ i2c_bus = &dev->i2c_bus[0]; ++ switch (alt_tuner) { ++ case 1: ++ fe0->dvb.frontend = ++ dvb_attach(s5h1409_attach, ++ &hauppauge_ezqam_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(tda829x_attach, fe0->dvb.frontend, ++ &dev->i2c_bus[1].i2c_adap, 0x42, ++ &tda829x_no_probe); ++ dvb_attach(tda18271_attach, fe0->dvb.frontend, ++ 0x60, &dev->i2c_bus[1].i2c_adap, ++ &hauppauge_tda18271_config); ++ } ++ break; ++ case 0: ++ default: ++ fe0->dvb.frontend = ++ dvb_attach(s5h1409_attach, ++ &hauppauge_generic_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) ++ dvb_attach(mt2131_attach, fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &hauppauge_generic_tunerconfig, 0); ++ break; ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1800lp: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(s5h1409_attach, ++ &hauppauge_hvr1800lp_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(mt2131_attach, fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &hauppauge_generic_tunerconfig, 0); ++ } ++ break; ++ case CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(lgdt330x_attach, ++ &fusionhdtv_5_express, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(simple_tuner_attach, fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, 0x61, ++ TUNER_LG_TDVS_H06XF); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1500Q: ++ i2c_bus = &dev->i2c_bus[1]; ++ fe0->dvb.frontend = dvb_attach(s5h1409_attach, ++ &hauppauge_hvr1500q_config, ++ &dev->i2c_bus[0].i2c_adap); ++ if (fe0->dvb.frontend != NULL) ++ dvb_attach(xc5000_attach, fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &hauppauge_hvr1500q_tunerconfig); ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1500: ++ i2c_bus = &dev->i2c_bus[1]; ++ fe0->dvb.frontend = dvb_attach(s5h1409_attach, ++ &hauppauge_hvr1500_config, ++ &dev->i2c_bus[0].i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ struct dvb_frontend *fe; ++ struct xc2028_config cfg = { ++ .i2c_adap = &i2c_bus->i2c_adap, ++ .i2c_addr = 0x61, ++ }; ++ static struct xc2028_ctrl ctl = { ++ .fname = XC2028_DEFAULT_FIRMWARE, ++ .max_len = 64, ++ .demod = XC3028_FE_OREN538, ++ }; ++ ++ fe = dvb_attach(xc2028_attach, ++ fe0->dvb.frontend, &cfg); ++ if (fe != NULL && fe->ops.tuner_ops.set_config != NULL) ++ fe->ops.tuner_ops.set_config(fe, &ctl); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1200: ++ case CX23885_BOARD_HAUPPAUGE_HVR1700: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(tda10048_attach, ++ &hauppauge_hvr1200_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(tda829x_attach, fe0->dvb.frontend, ++ &dev->i2c_bus[1].i2c_adap, 0x42, ++ &tda829x_no_probe); ++ dvb_attach(tda18271_attach, fe0->dvb.frontend, ++ 0x60, &dev->i2c_bus[1].i2c_adap, ++ &hauppauge_hvr1200_tuner_config); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1210: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(tda10048_attach, ++ &hauppauge_hvr1210_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(tda18271_attach, fe0->dvb.frontend, ++ 0x60, &dev->i2c_bus[1].i2c_adap, ++ &hauppauge_hvr1210_tuner_config); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1400: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(dib7000p_attach, ++ &i2c_bus->i2c_adap, ++ 0x12, &hauppauge_hvr1400_dib7000_config); ++ if (fe0->dvb.frontend != NULL) { ++ struct dvb_frontend *fe; ++ struct xc2028_config cfg = { ++ .i2c_adap = &dev->i2c_bus[1].i2c_adap, ++ .i2c_addr = 0x64, ++ }; ++ static struct xc2028_ctrl ctl = { ++ .fname = XC3028L_DEFAULT_FIRMWARE, ++ .max_len = 64, ++ .demod = XC3028_FE_DIBCOM52, ++ /* This is true for all demods with ++ v36 firmware? */ ++ .type = XC2028_D2633, ++ }; ++ ++ fe = dvb_attach(xc2028_attach, ++ fe0->dvb.frontend, &cfg); ++ if (fe != NULL && fe->ops.tuner_ops.set_config != NULL) ++ fe->ops.tuner_ops.set_config(fe, &ctl); ++ } ++ break; ++ case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP: ++ i2c_bus = &dev->i2c_bus[port->nr - 1]; ++ ++ fe0->dvb.frontend = dvb_attach(s5h1409_attach, ++ &dvico_s5h1409_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend == NULL) ++ fe0->dvb.frontend = dvb_attach(s5h1411_attach, ++ &dvico_s5h1411_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) ++ dvb_attach(xc5000_attach, fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &dvico_xc5000_tunerconfig); ++ break; ++ case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: { ++ i2c_bus = &dev->i2c_bus[port->nr - 1]; ++ ++ fe0->dvb.frontend = dvb_attach(zl10353_attach, ++ &dvico_fusionhdtv_xc3028, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ struct dvb_frontend *fe; ++ struct xc2028_config cfg = { ++ .i2c_adap = &i2c_bus->i2c_adap, ++ .i2c_addr = 0x61, ++ }; ++ static struct xc2028_ctrl ctl = { ++ .fname = XC2028_DEFAULT_FIRMWARE, ++ .max_len = 64, ++ .demod = XC3028_FE_ZARLINK456, ++ }; ++ ++ fe = dvb_attach(xc2028_attach, fe0->dvb.frontend, ++ &cfg); ++ if (fe != NULL && fe->ops.tuner_ops.set_config != NULL) ++ fe->ops.tuner_ops.set_config(fe, &ctl); ++ } ++ break; ++ } ++ case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: ++ case CX23885_BOARD_COMPRO_VIDEOMATE_E650F: ++ case CX23885_BOARD_COMPRO_VIDEOMATE_E800: ++ i2c_bus = &dev->i2c_bus[0]; ++ ++ fe0->dvb.frontend = dvb_attach(zl10353_attach, ++ &dvico_fusionhdtv_xc3028, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ struct dvb_frontend *fe; ++ struct xc2028_config cfg = { ++ .i2c_adap = &dev->i2c_bus[1].i2c_adap, ++ .i2c_addr = 0x61, ++ }; ++ static struct xc2028_ctrl ctl = { ++ .fname = XC2028_DEFAULT_FIRMWARE, ++ .max_len = 64, ++ .demod = XC3028_FE_ZARLINK456, ++ }; ++ ++ fe = dvb_attach(xc2028_attach, fe0->dvb.frontend, ++ &cfg); ++ if (fe != NULL && fe->ops.tuner_ops.set_config != NULL) ++ fe->ops.tuner_ops.set_config(fe, &ctl); ++ } ++ break; ++ case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000: ++ i2c_bus = &dev->i2c_bus[0]; ++ ++ fe0->dvb.frontend = dvb_attach(zl10353_attach, ++ &dvico_fusionhdtv_xc3028, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ struct dvb_frontend *fe; ++ struct xc4000_config cfg = { ++ .i2c_address = 0x61, ++ .default_pm = 0, ++ .dvb_amplitude = 134, ++ .set_smoothedcvbs = 1, ++ .if_khz = 4560 ++ }; ++ ++ fe = dvb_attach(xc4000_attach, fe0->dvb.frontend, ++ &dev->i2c_bus[1].i2c_adap, &cfg); ++ if (!fe) { ++ printk(KERN_ERR "%s/2: xc4000 attach failed\n", ++ dev->name); ++ goto frontend_detach; ++ } ++ } ++ break; ++ case CX23885_BOARD_TBS_6920: ++ i2c_bus = &dev->i2c_bus[1]; ++ ++ fe0->dvb.frontend = dvb_attach(cx24116_attach, ++ &tbs_cx24116_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) ++ fe0->dvb.frontend->ops.set_voltage = f300_set_voltage; ++ ++ break; ++ case CX23885_BOARD_TEVII_S470: ++ i2c_bus = &dev->i2c_bus[1]; ++ ++ fe0->dvb.frontend = dvb_attach(ds3000_attach, ++ &tevii_ds3000_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) ++ fe0->dvb.frontend->ops.set_voltage = f300_set_voltage; ++ ++ break; ++ case CX23885_BOARD_DVBWORLD_2005: ++ i2c_bus = &dev->i2c_bus[1]; ++ ++ fe0->dvb.frontend = dvb_attach(cx24116_attach, ++ &dvbworld_cx24116_config, ++ &i2c_bus->i2c_adap); ++ break; ++ case CX23885_BOARD_NETUP_DUAL_DVBS2_CI: ++ i2c_bus = &dev->i2c_bus[0]; ++ switch (port->nr) { ++ /* port B */ ++ case 1: ++ fe0->dvb.frontend = dvb_attach(stv0900_attach, ++ &netup_stv0900_config, ++ &i2c_bus->i2c_adap, 0); ++ if (fe0->dvb.frontend != NULL) { ++ if (dvb_attach(stv6110_attach, ++ fe0->dvb.frontend, ++ &netup_stv6110_tunerconfig_a, ++ &i2c_bus->i2c_adap)) { ++ if (!dvb_attach(lnbh24_attach, ++ fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ LNBH24_PCL | LNBH24_TTX, ++ LNBH24_TEN, 0x09)) ++ printk(KERN_ERR ++ "No LNBH24 found!\n"); ++ ++ } ++ } ++ break; ++ /* port C */ ++ case 2: ++ fe0->dvb.frontend = dvb_attach(stv0900_attach, ++ &netup_stv0900_config, ++ &i2c_bus->i2c_adap, 1); ++ if (fe0->dvb.frontend != NULL) { ++ if (dvb_attach(stv6110_attach, ++ fe0->dvb.frontend, ++ &netup_stv6110_tunerconfig_b, ++ &i2c_bus->i2c_adap)) { ++ if (!dvb_attach(lnbh24_attach, ++ fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ LNBH24_PCL | LNBH24_TTX, ++ LNBH24_TEN, 0x0a)) ++ printk(KERN_ERR ++ "No LNBH24 found!\n"); ++ ++ } ++ } ++ break; ++ } ++ break; ++ case CX23885_BOARD_MYGICA_X8506: ++ i2c_bus = &dev->i2c_bus[0]; ++ i2c_bus2 = &dev->i2c_bus[1]; ++ fe0->dvb.frontend = dvb_attach(lgs8gxx_attach, ++ &mygica_x8506_lgs8gl5_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(xc5000_attach, ++ fe0->dvb.frontend, ++ &i2c_bus2->i2c_adap, ++ &mygica_x8506_xc5000_config); ++ } ++ break; ++ case CX23885_BOARD_MAGICPRO_PROHDTVE2: ++ i2c_bus = &dev->i2c_bus[0]; ++ i2c_bus2 = &dev->i2c_bus[1]; ++ fe0->dvb.frontend = dvb_attach(lgs8gxx_attach, ++ &magicpro_prohdtve2_lgs8g75_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(xc5000_attach, ++ fe0->dvb.frontend, ++ &i2c_bus2->i2c_adap, ++ &magicpro_prohdtve2_xc5000_config); ++ } ++ break; ++ case CX23885_BOARD_HAUPPAUGE_HVR1850: ++ case CX23885_BOARD_HAUPPAUGE_HVR1290: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(s5h1411_attach, ++ &hcw_s5h1411_config, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) ++ dvb_attach(tda18271_attach, fe0->dvb.frontend, ++ 0x60, &dev->i2c_bus[0].i2c_adap, ++ &hauppauge_tda18271_config); ++ break; ++ case CX23885_BOARD_MYGICA_X8558PRO: ++ switch (port->nr) { ++ /* port B */ ++ case 1: ++ i2c_bus = &dev->i2c_bus[0]; ++ fe0->dvb.frontend = dvb_attach(atbm8830_attach, ++ &mygica_x8558pro_atbm8830_cfg1, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(max2165_attach, ++ fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &mygic_x8558pro_max2165_cfg1); ++ } ++ break; ++ /* port C */ ++ case 2: ++ i2c_bus = &dev->i2c_bus[1]; ++ fe0->dvb.frontend = dvb_attach(atbm8830_attach, ++ &mygica_x8558pro_atbm8830_cfg2, ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ dvb_attach(max2165_attach, ++ fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &mygic_x8558pro_max2165_cfg2); ++ } ++ break; ++ } ++ break; ++ case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: ++ i2c_bus = &dev->i2c_bus[0]; ++ mfe_shared = 1;/* MFE */ ++ port->frontends.gate = 0;/* not clear for me yet */ ++ /* ports B, C */ ++ /* MFE frontend 1 DVB-T */ ++ fe0->dvb.frontend = dvb_attach(stv0367ter_attach, ++ &netup_stv0367_config[port->nr - 1], ++ &i2c_bus->i2c_adap); ++ if (fe0->dvb.frontend != NULL) { ++ if (NULL == dvb_attach(xc5000_attach, ++ fe0->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &netup_xc5000_config[port->nr - 1])) ++ goto frontend_detach; ++ /* load xc5000 firmware */ ++ fe0->dvb.frontend->ops.tuner_ops.init(fe0->dvb.frontend); ++ } ++ /* MFE frontend 2 */ ++ fe1 = videobuf_dvb_get_frontend(&port->frontends, 2); ++ if (fe1 == NULL) ++ goto frontend_detach; ++ /* DVB-C init */ ++ fe1->dvb.frontend = dvb_attach(stv0367cab_attach, ++ &netup_stv0367_config[port->nr - 1], ++ &i2c_bus->i2c_adap); ++ if (fe1->dvb.frontend != NULL) { ++ fe1->dvb.frontend->id = 1; ++ if (NULL == dvb_attach(xc5000_attach, ++ fe1->dvb.frontend, ++ &i2c_bus->i2c_adap, ++ &netup_xc5000_config[port->nr - 1])) ++ goto frontend_detach; ++ } ++ break; ++ default: ++ printk(KERN_INFO "%s: The frontend of your DVB/ATSC card " ++ " isn't supported yet\n", ++ dev->name); ++ break; ++ } ++ ++ if ((NULL == fe0->dvb.frontend) || (fe1 && NULL == fe1->dvb.frontend)) { ++ printk(KERN_ERR "%s: frontend initialization failed\n", ++ dev->name); ++ goto frontend_detach; ++ } ++ ++ /* define general-purpose callback pointer */ ++ fe0->dvb.frontend->callback = cx23885_tuner_callback; ++ if (fe1) ++ fe1->dvb.frontend->callback = cx23885_tuner_callback; ++#if 0 ++ /* Ensure all frontends negotiate bus access */ ++ fe0->dvb.frontend->ops.ts_bus_ctrl = cx23885_dvb_bus_ctrl; ++ if (fe1) ++ fe1->dvb.frontend->ops.ts_bus_ctrl = cx23885_dvb_bus_ctrl; ++#endif ++ ++ /* Put the analog decoder in standby to keep it quiet */ ++ call_all(dev, core, s_power, 0); ++ ++ if (fe0->dvb.frontend->ops.analog_ops.standby) ++ fe0->dvb.frontend->ops.analog_ops.standby(fe0->dvb.frontend); ++ ++ /* register everything */ ++ ret = videobuf_dvb_register_bus(&port->frontends, THIS_MODULE, port, ++ &dev->pci->dev, adapter_nr, mfe_shared, ++ cx23885_dvb_fe_ioctl_override); ++ if (ret) ++ goto frontend_detach; ++ ++ /* init CI & MAC */ ++ switch (dev->board) { ++ case CX23885_BOARD_NETUP_DUAL_DVBS2_CI: { ++ static struct netup_card_info cinfo; ++ ++ netup_get_card_info(&dev->i2c_bus[0].i2c_adap, &cinfo); ++ memcpy(port->frontends.adapter.proposed_mac, ++ cinfo.port[port->nr - 1].mac, 6); ++ printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC=%pM\n", ++ port->nr, port->frontends.adapter.proposed_mac); ++ ++ netup_ci_init(port); ++ break; ++ } ++ case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: { ++ struct altera_ci_config netup_ci_cfg = { ++ .dev = dev,/* magic number to identify*/ ++ .adapter = &port->frontends.adapter,/* for CI */ ++ .demux = &fe0->dvb.demux,/* for hw pid filter */ ++ .fpga_rw = netup_altera_fpga_rw, ++ }; ++ ++ altera_ci_init(&netup_ci_cfg, port->nr); ++ break; ++ } ++ case CX23885_BOARD_TEVII_S470: { ++ u8 eeprom[256]; /* 24C02 i2c eeprom */ ++ ++ if (port->nr != 1) ++ break; ++ ++ /* Read entire EEPROM */ ++ dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1; ++ tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom, sizeof(eeprom)); ++ printk(KERN_INFO "TeVii S470 MAC= %pM\n", eeprom + 0xa0); ++ memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6); ++ break; ++ } ++ } ++ ++ return ret; ++ ++frontend_detach: ++ port->gate_ctrl = NULL; ++ videobuf_dvb_dealloc_frontends(&port->frontends); ++ return -EINVAL; ++} ++ ++int cx23885_dvb_register(struct cx23885_tsport *port) ++{ ++ ++ struct videobuf_dvb_frontend *fe0; ++ struct cx23885_dev *dev = port->dev; ++ int err, i; ++ ++ /* Here we need to allocate the correct number of frontends, ++ * as reflected in the cards struct. The reality is that currently ++ * no cx23885 boards support this - yet. But, if we don't modify this ++ * code then the second frontend would never be allocated (later) ++ * and fail with error before the attach in dvb_register(). ++ * Without these changes we risk an OOPS later. The changes here ++ * are for safety, and should provide a good foundation for the ++ * future addition of any multi-frontend cx23885 based boards. ++ */ ++ printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, ++ port->num_frontends); ++ ++ for (i = 1; i <= port->num_frontends; i++) { ++ if (videobuf_dvb_alloc_frontend( ++ &port->frontends, i) == NULL) { ++ printk(KERN_ERR "%s() failed to alloc\n", __func__); ++ return -ENOMEM; ++ } ++ ++ fe0 = videobuf_dvb_get_frontend(&port->frontends, i); ++ if (!fe0) ++ err = -EINVAL; ++ ++ dprintk(1, "%s\n", __func__); ++ dprintk(1, " ->probed by Card=%d Name=%s, PCI %02x:%02x\n", ++ dev->board, ++ dev->name, ++ dev->pci_bus, ++ dev->pci_slot); ++ ++ err = -ENODEV; ++ ++ /* dvb stuff */ ++ /* We have to init the queue for each frontend on a port. */ ++ printk(KERN_INFO "%s: cx23885 based dvb card\n", dev->name); ++ videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops, ++ &dev->pci->dev, &port->slock, ++ V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP, ++ sizeof(struct cx23885_buffer), port, NULL); ++ } ++ err = dvb_register(port); ++ if (err != 0) ++ printk(KERN_ERR "%s() dvb_register failed err = %d\n", ++ __func__, err); ++ ++ return err; ++} ++ ++int cx23885_dvb_unregister(struct cx23885_tsport *port) ++{ ++ struct videobuf_dvb_frontend *fe0; ++ ++ /* FIXME: in an error condition where the we have ++ * an expected number of frontends (attach problem) ++ * then this might not clean up correctly, if 1 ++ * is invalid. ++ * This comment only applies to future boards IF they ++ * implement MFE support. ++ */ ++ fe0 = videobuf_dvb_get_frontend(&port->frontends, 1); ++ if (fe0 && fe0->dvb.frontend) ++ videobuf_dvb_unregister_bus(&port->frontends); ++ ++ switch (port->dev->board) { ++ case CX23885_BOARD_NETUP_DUAL_DVBS2_CI: ++ netup_ci_exit(port); ++ break; ++ case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: ++ altera_ci_release(port->dev, port->nr); ++ break; ++ } ++ ++ port->gate_ctrl = NULL; ++ ++ return 0; ++} ++ +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-f300.c linux-3.2.10/drivers/media/video/cx23885/cx23885-f300.c +--- linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-f300.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/cx23885-f300.c 2012-03-16 10:55:17.000000000 +0100 +@@ -175,3 +175,59 @@ int f300_set_voltage(struct dvb_frontend + + return f300_xfer(fe, buf); + } ++ ++/* bst control */ ++int bst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) ++{ ++ struct cx23885_tsport *port = fe->dvb->priv; ++ struct cx23885_dev *dev = port->dev; ++ ++ cx23885_gpio_enable(dev, GPIO_1, 1); ++ cx23885_gpio_enable(dev, GPIO_0, 1); ++ ++ switch (voltage) { ++ case SEC_VOLTAGE_13: ++ cx23885_gpio_set(dev, GPIO_1); ++ cx23885_gpio_clear(dev, GPIO_0); ++ break; ++ case SEC_VOLTAGE_18: ++ cx23885_gpio_set(dev, GPIO_1); ++ cx23885_gpio_set(dev, GPIO_0); ++ break; ++ case SEC_VOLTAGE_OFF: ++ cx23885_gpio_clear(dev, GPIO_1); ++ cx23885_gpio_clear(dev, GPIO_0); ++ break; ++ } ++ ++ ++ return 0; ++} ++ ++int dvbsky_set_voltage_sec(struct dvb_frontend *fe, fe_sec_voltage_t voltage) ++{ ++ struct cx23885_tsport *port = fe->dvb->priv; ++ struct cx23885_dev *dev = port->dev; ++ ++ cx23885_gpio_enable(dev, GPIO_12, 1); ++ cx23885_gpio_enable(dev, GPIO_13, 1); ++ ++ switch (voltage) { ++ case SEC_VOLTAGE_13: ++ cx23885_gpio_set(dev, GPIO_13); ++ cx23885_gpio_clear(dev, GPIO_12); ++ break; ++ case SEC_VOLTAGE_18: ++ cx23885_gpio_set(dev, GPIO_13); ++ cx23885_gpio_set(dev, GPIO_12); ++ break; ++ case SEC_VOLTAGE_OFF: ++ cx23885_gpio_clear(dev, GPIO_13); ++ cx23885_gpio_clear(dev, GPIO_12); ++ break; ++ } ++ ++ ++ return 0; ++} ++ +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-f300.h linux-3.2.10/drivers/media/video/cx23885/cx23885-f300.h +--- linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-f300.h 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/cx23885-f300.h 2012-03-16 10:55:17.000000000 +0100 +@@ -1,2 +1,8 @@ ++extern int dvbsky_set_voltage_sec(struct dvb_frontend *fe, ++ fe_sec_voltage_t voltage); ++ ++extern int bst_set_voltage(struct dvb_frontend *fe, ++ fe_sec_voltage_t voltage); ++ + extern int f300_set_voltage(struct dvb_frontend *fe, + fe_sec_voltage_t voltage); +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/cx23885.h linux-3.2.10/drivers/media/video/cx23885/cx23885.h +--- linux-3.2.10.orig/drivers/media/video/cx23885/cx23885.h 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/cx23885.h 2012-03-16 10:55:17.000000000 +0100 +@@ -87,6 +87,9 @@ + #define CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF 30 + #define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000 31 + #define CX23885_BOARD_MPX885 32 ++#define CX23885_BOARD_BST_PS8512 (CX23885_BOARD_MPX885+1) ++#define CX23885_BOARD_DVBSKY_S952 (CX23885_BOARD_BST_PS8512+1) ++#define CX23885_BOARD_DVBSKY_S950 (CX23885_BOARD_DVBSKY_S952+1) + + #define GPIO_0 0x00000001 + #define GPIO_1 0x00000002 +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-input.c linux-3.2.10/drivers/media/video/cx23885/cx23885-input.c +--- linux-3.2.10.orig/drivers/media/video/cx23885/cx23885-input.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/cx23885-input.c 2012-03-16 10:55:17.000000000 +0100 +@@ -87,6 +87,9 @@ void cx23885_input_rx_work_handler(struc + case CX23885_BOARD_HAUPPAUGE_HVR1290: + case CX23885_BOARD_TEVII_S470: + case CX23885_BOARD_HAUPPAUGE_HVR1250: ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_DVBSKY_S952: + /* + * The only boards we handle right now. However other boards + * using the CX2388x integrated IR controller should be similar +@@ -138,6 +141,9 @@ static int cx23885_input_ir_start(struct + case CX23885_BOARD_HAUPPAUGE_HVR1850: + case CX23885_BOARD_HAUPPAUGE_HVR1290: + case CX23885_BOARD_HAUPPAUGE_HVR1250: ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_DVBSKY_S952: + /* + * The IR controller on this board only returns pulse widths. + * Any other mode setting will fail to set up the device. +@@ -279,6 +285,15 @@ int cx23885_input_init(struct cx23885_de + /* A guess at the remote */ + rc_map = RC_MAP_TEVII_NEC; + break; ++ case CX23885_BOARD_BST_PS8512: ++ case CX23885_BOARD_DVBSKY_S950: ++ case CX23885_BOARD_DVBSKY_S952: ++ /* Integrated CX2388[58] IR controller */ ++ driver_type = RC_DRIVER_IR_RAW; ++ allowed_protos = RC_TYPE_ALL; ++ /* A guess at the remote */ ++ rc_map = RC_MAP_DVBSKY; ++ break; + default: + return -ENODEV; + } +diff -uprN linux-3.2.10.orig/drivers/media/video/cx23885/Kconfig linux-3.2.10/drivers/media/video/cx23885/Kconfig +--- linux-3.2.10.orig/drivers/media/video/cx23885/Kconfig 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx23885/Kconfig 2012-03-16 10:55:17.000000000 +0100 +@@ -20,6 +20,7 @@ config VIDEO_CX23885 + select DVB_LNBP21 if !DVB_FE_CUSTOMISE + select DVB_STV6110 if !DVB_FE_CUSTOMISE + select DVB_CX24116 if !DVB_FE_CUSTOMISE ++ select DVB_M88DS3103 if !DVB_FE_CUSTOMISE + select DVB_STV0900 if !DVB_FE_CUSTOMISE + select DVB_DS3000 if !DVB_FE_CUSTOMISE + select DVB_STV0367 if !DVB_FE_CUSTOMISE +diff -uprN linux-3.2.10.orig/drivers/media/video/cx88/cx88-cards.c linux-3.2.10/drivers/media/video/cx88/cx88-cards.c +--- linux-3.2.10.orig/drivers/media/video/cx88/cx88-cards.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx88/cx88-cards.c 2012-03-16 10:55:35.000000000 +0100 +@@ -2237,6 +2237,18 @@ static const struct cx88_board cx88_boar + } }, + .mpeg = CX88_MPEG_DVB, + }, ++ [CX88_BOARD_BST_PS8312] = { ++ .name = "Bestunar PS8312 DVB-S/S2", ++ .tuner_type = UNSET, ++ .radio_type = UNSET, ++ .tuner_addr = ADDR_UNSET, ++ .radio_addr = ADDR_UNSET, ++ .input = {{ ++ .type = CX88_VMUX_DVB, ++ .vmux = 0, ++ } }, ++ .mpeg = CX88_MPEG_DVB, ++ }, + }; + + /* ------------------------------------------------------------------ */ +@@ -2726,6 +2738,10 @@ static const struct cx88_subid cx88_subi + .subvendor = 0x1822, + .subdevice = 0x0023, + .card = CX88_BOARD_TWINHAN_VP1027_DVBS, ++ }, { ++ .subvendor = 0x14f1, ++ .subdevice = 0x8312, ++ .card = CX88_BOARD_BST_PS8312, + }, + }; + +@@ -3454,7 +3470,13 @@ static void cx88_card_setup(struct cx88_ + msleep(100); + cx_write(MO_SRST_IO, 1); + msleep(100); +- break; ++ break; ++ case CX88_BOARD_BST_PS8312: ++ cx_write(MO_GP1_IO, 0x808000); ++ msleep(100); ++ cx_write(MO_GP1_IO, 0x808080); ++ msleep(100); ++ break; + } /*end switch() */ + + +diff -uprN linux-3.2.10.orig/drivers/media/video/cx88/cx88-dvb.c linux-3.2.10/drivers/media/video/cx88/cx88-dvb.c +--- linux-3.2.10.orig/drivers/media/video/cx88/cx88-dvb.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx88/cx88-dvb.c 2012-03-16 10:55:35.000000000 +0100 +@@ -54,6 +54,7 @@ + #include "stv0288.h" + #include "stb6000.h" + #include "cx24116.h" ++#include "m88ds3103.h" + #include "stv0900.h" + #include "stb6100.h" + #include "stb6100_proc.h" +@@ -458,6 +459,56 @@ static int tevii_dvbs_set_voltage(struct + return core->prev_set_voltage(fe, voltage); + return 0; + } ++/*CX88_BOARD_BST_PS8312*/ ++static int bst_dvbs_set_voltage(struct dvb_frontend *fe, ++ fe_sec_voltage_t voltage) ++{ ++ struct cx8802_dev *dev= fe->dvb->priv; ++ struct cx88_core *core = dev->core; ++ ++ cx_write(MO_GP1_IO, 0x111111); ++ switch (voltage) { ++ case SEC_VOLTAGE_13: ++ cx_write(MO_GP1_IO, 0x020200); ++ break; ++ case SEC_VOLTAGE_18: ++ cx_write(MO_GP1_IO, 0x020202); ++ break; ++ case SEC_VOLTAGE_OFF: ++ cx_write(MO_GP1_IO, 0x111100); ++ break; ++ } ++ ++ if (core->prev_set_voltage) ++ return core->prev_set_voltage(fe, voltage); ++ return 0; ++} ++ ++static int bst_dvbs_set_voltage_v2(struct dvb_frontend *fe, ++ fe_sec_voltage_t voltage) ++{ ++ struct cx8802_dev *dev= fe->dvb->priv; ++ struct cx88_core *core = dev->core; ++ ++ cx_write(MO_GP1_IO, 0x111101); ++ switch (voltage) { ++ case SEC_VOLTAGE_13: ++ cx_write(MO_GP1_IO, 0x020200); ++ break; ++ case SEC_VOLTAGE_18: ++ ++ cx_write(MO_GP1_IO, 0x020202); ++ break; ++ case SEC_VOLTAGE_OFF: ++ ++ cx_write(MO_GP1_IO, 0x111110); ++ break; ++ } ++ ++ if (core->prev_set_voltage) ++ return core->prev_set_voltage(fe, voltage); ++ return 0; ++} + + static int vp1027_set_voltage(struct dvb_frontend *fe, + fe_sec_voltage_t voltage) +@@ -700,6 +751,11 @@ static struct ds3000_config tevii_ds3000 + .set_ts_params = ds3000_set_ts_param, + }; + ++static struct m88ds3103_config dvbsky_ds3103_config = { ++ .demod_address = 0x68, ++ .set_ts_params = ds3000_set_ts_param, ++}; ++ + static const struct stv0900_config prof_7301_stv0900_config = { + .demod_address = 0x6a, + /* demod_mode = 0,*/ +@@ -1458,6 +1514,36 @@ static int dvb_register(struct cx8802_de + if (fe0->dvb.frontend != NULL) + fe0->dvb.frontend->ops.set_voltage = + tevii_dvbs_set_voltage; ++ break; ++ case CX88_BOARD_BST_PS8312: ++ fe0->dvb.frontend = dvb_attach(m88ds3103_attach, ++ &dvbsky_ds3103_config, ++ &core->i2c_adap); ++ if (fe0->dvb.frontend != NULL) ++ { ++ int ret; ++ u8 b0[] = { 0x60 }; ++ u8 b1[2] = { 0 }; ++ struct i2c_msg msg[] = { ++ { ++ .addr = 0x50, ++ .flags = 0, ++ .buf = b0, ++ .len = 1 ++ }, { ++ .addr = 0x50, ++ .flags = I2C_M_RD, ++ .buf = b1, ++ .len = 2 ++ } ++ }; ++ ret = i2c_transfer(&core->i2c_adap, msg, 2); ++ printk("PS8312: config = %02x, %02x", b1[0],b1[1]); ++ if(b1[0] == 0xaa) ++ fe0->dvb.frontend->ops.set_voltage = bst_dvbs_set_voltage_v2; ++ else ++ fe0->dvb.frontend->ops.set_voltage = bst_dvbs_set_voltage; ++ } + break; + case CX88_BOARD_OMICOM_SS4_PCI: + case CX88_BOARD_TBS_8920: +diff -uprN linux-3.2.10.orig/drivers/media/video/cx88/cx88.h linux-3.2.10/drivers/media/video/cx88/cx88.h +--- linux-3.2.10.orig/drivers/media/video/cx88/cx88.h 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx88/cx88.h 2012-03-16 10:55:35.000000000 +0100 +@@ -244,6 +244,7 @@ extern const struct sram_channel const c + #define CX88_BOARD_TEVII_S464 86 + #define CX88_BOARD_WINFAST_DTV2000H_PLUS 87 + #define CX88_BOARD_WINFAST_DTV1800H_XC4000 88 ++#define CX88_BOARD_BST_PS8312 (CX88_BOARD_WINFAST_DTV1800H_XC4000+1) + + enum cx88_itype { + CX88_VMUX_COMPOSITE1 = 1, +diff -uprN linux-3.2.10.orig/drivers/media/video/cx88/cx88-input.c linux-3.2.10/drivers/media/video/cx88/cx88-input.c +--- linux-3.2.10.orig/drivers/media/video/cx88/cx88-input.c 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx88/cx88-input.c 2012-03-16 10:55:35.000000000 +0100 +@@ -415,6 +415,10 @@ int cx88_ir_init(struct cx88_core *core, + rc_type = RC_TYPE_NEC; + ir->sampling = 0xff00; /* address */ + break; ++ case CX88_BOARD_BST_PS8312: ++ ir_codes = RC_MAP_DVBSKY; ++ ir->sampling = 0xff00; /* address */ ++ break; + } + + if (!ir_codes) { +diff -uprN linux-3.2.10.orig/drivers/media/video/cx88/Kconfig linux-3.2.10/drivers/media/video/cx88/Kconfig +--- linux-3.2.10.orig/drivers/media/video/cx88/Kconfig 2012-03-16 10:41:16.000000000 +0100 ++++ linux-3.2.10/drivers/media/video/cx88/Kconfig 2012-03-16 10:55:35.000000000 +0100 +@@ -57,6 +57,7 @@ config VIDEO_CX88_DVB + select DVB_ISL6421 if !DVB_FE_CUSTOMISE + select DVB_S5H1411 if !DVB_FE_CUSTOMISE + select DVB_CX24116 if !DVB_FE_CUSTOMISE ++ select DVB_M88DS3103 if !DVB_FE_CUSTOMISE + select DVB_STV0299 if !DVB_FE_CUSTOMISE + select DVB_STV0288 if !DVB_FE_CUSTOMISE + select DVB_STB6000 if !DVB_FE_CUSTOMISE +diff -uprN linux-3.2.10.orig/include/media/rc-map.h linux-3.2.10/include/media/rc-map.h +--- linux-3.2.10.orig/include/media/rc-map.h 2012-03-16 10:41:11.000000000 +0100 ++++ linux-3.2.10/include/media/rc-map.h 2012-03-16 10:56:20.000000000 +0100 +@@ -83,6 +83,7 @@ void rc_map_init(void); + #define RC_MAP_DM1105_NEC "rc-dm1105-nec" + #define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro" + #define RC_MAP_DNTV_LIVE_DVB_T "rc-dntv-live-dvb-t" ++#define RC_MAP_DVBSKY "rc-dvbsky" + #define RC_MAP_EMPTY "rc-empty" + #define RC_MAP_EM_TERRATEC "rc-em-terratec" + #define RC_MAP_ENCORE_ENLTV2 "rc-encore-enltv2" diff --git a/packages/linux/patches/3.2.44/linux-211-add_TeVii_s471_support.patch b/packages/linux/patches/3.2.44/linux-211-add_TeVii_s471_support.patch new file mode 100644 index 0000000000..264bc2fca4 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-211-add_TeVii_s471_support.patch @@ -0,0 +1,90 @@ +cx23885: add TeVii s471 card. + +From: Igor M. Liplianin + +New TeVii s471 card is like s470 model, +but there is different LNB power control. + +Signed-off-by: Igor M. Liplianin + +diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c +index 90bf573..6f4901a 100644 +--- a/drivers/media/dvb/frontends/ds3000.c ++++ b/drivers/media/dvb/frontends/ds3000.c +@@ -1129,7 +1129,10 @@ static int ds3000_set_frontend(struct dvb_frontend *fe, + ds3000_writereg(state, + ds3000_dvbs2_init_tab[i], + ds3000_dvbs2_init_tab[i + 1]); +- ds3000_writereg(state, 0xfe, 0x98); ++ if (c->symbol_rate >= 30000000) ++ ds3000_writereg(state, 0xfe, 0x54); ++ else ++ ds3000_writereg(state, 0xfe, 0x98); + break; + default: + return 1; +diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c +index ab8be9a..76e83e4 100644 +--- a/drivers/media/video/cx23885/cx23885-cards.c ++++ b/drivers/media/video/cx23885/cx23885-cards.c +@@ -452,6 +452,10 @@ struct cx23885_board cx23885_boards[] = { + .portc = CX23885_MPEG_DVB, + }, + ++ [CX23885_BOARD_TEVII_S471] = { ++ .name = "TeVii S471", ++ .portb = CX23885_MPEG_DVB, ++ }, + }; + const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); + +@@ -663,6 +667,10 @@ struct cx23885_subid cx23885_subids[] = { + .subvendor = 0x4254, + .subdevice = 0x0952, + .card = CX23885_BOARD_DVBSKY_S952, ++ }, { ++ .subvendor = 0xd471, ++ .subdevice = 0x9022, ++ .card = CX23885_BOARD_TEVII_S471, + }, + }; + const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); +@@ -1485,6 +1493,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) + case CX23885_BOARD_BST_PS8512: + case CX23885_BOARD_DVBSKY_S950: + case CX23885_BOARD_TEVII_S470: ++ case CX23885_BOARD_TEVII_S471: + case CX23885_BOARD_DVBWORLD_2005: + ts1->gen_ctrl_val = 0x5; /* Parallel */ + ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */ +diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c +index af9c459..9f68250 100644 +--- a/drivers/media/video/cx23885/cx23885-dvb.c ++++ b/drivers/media/video/cx23885/cx23885-dvb.c +@@ -1174,6 +1174,14 @@ static int dvb_register(struct cx23885_tsport *port) + break; + } + break; ++ case CX23885_BOARD_TEVII_S471: ++ i2c_bus = &dev->i2c_bus[1]; ++ ++ fe0->dvb.frontend = dvb_attach(ds3000_attach, ++ &tevii_ds3000_config, ++ &i2c_bus->i2c_adap); ++ break; ++ + default: + printk(KERN_INFO "%s: The frontend of your DVB/ATSC card " + " isn't supported yet\n", +diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h +index 6f058f1..19cebdf 100644 +--- a/drivers/media/video/cx23885/cx23885.h ++++ b/drivers/media/video/cx23885/cx23885.h +@@ -90,6 +90,7 @@ + #define CX23885_BOARD_BST_PS8512 (CX23885_BOARD_MPX885+1) + #define CX23885_BOARD_DVBSKY_S952 (CX23885_BOARD_BST_PS8512+1) + #define CX23885_BOARD_DVBSKY_S950 (CX23885_BOARD_DVBSKY_S952+1) ++#define CX23885_BOARD_TEVII_S471 (CX23885_BOARD_DVBSKY_S950+1) + + #define GPIO_0 0x00000001 + #define GPIO_1 0x00000002 diff --git a/packages/linux/patches/3.2.44/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.2.44/linux-212-mantis_stb0899_faster_lock.patch new file mode 100644 index 0000000000..23e28aea88 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-212-mantis_stb0899_faster_lock.patch @@ -0,0 +1,141 @@ +diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c +index 2da55ec..3efde1e 100644 +--- a/drivers/media/dvb/frontends/stb0899_algo.c ++++ b/drivers/media/dvb/frontends/stb0899_algo.c +@@ -206,7 +206,6 @@ static enum stb0899_status stb0899_check_tmg(struct stb0899_state *state) + static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state) + { + struct stb0899_internal *internal = &state->internal; +- struct stb0899_params *params = &state->params; + + short int derot_step, derot_freq = 0, derot_limit, next_loop = 3; + int index = 0; +@@ -216,10 +215,9 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state) + + /* timing loop computation & symbol rate optimisation */ + derot_limit = (internal->sub_range / 2L) / internal->mclk; +- derot_step = (params->srate / 2L) / internal->mclk; ++ derot_step = internal->derot_step * 4; /* dertot_step = decreasing delta */ + + while ((stb0899_check_tmg(state) != TIMINGOK) && next_loop) { +- index++; + derot_freq += index * internal->direction * derot_step; /* next derot zig zag position */ + + if (abs(derot_freq) > derot_limit) +@@ -230,6 +228,7 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state) + STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq)); + stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */ + } ++ index++; + internal->direction = -internal->direction; /* Change zigzag direction */ + } + +@@ -278,14 +277,18 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state) + { + struct stb0899_internal *internal = &state->internal; + +- short int derot_freq = 0, last_derot_freq = 0, derot_limit, next_loop = 3; ++ short int derot_freq = 0, last_derot_freq = 0, derot_limit, derot_step, next_loop = 3; + int index = 0; ++ int base_freq; + u8 cfr[2]; + u8 reg; + + internal->status = NOCARRIER; + derot_limit = (internal->sub_range / 2L) / internal->mclk; + derot_freq = internal->derot_freq; ++ derot_step = internal->derot_step * 2; ++ last_derot_freq = internal->derot_freq; ++ base_freq = internal->derot_freq; + + reg = stb0899_read_reg(state, STB0899_CFD); + STB0899_SETFIELD_VAL(CFD_ON, reg, 1); +@@ -294,11 +297,10 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state) + do { + dprintk(state->verbose, FE_DEBUG, 1, "Derot Freq=%d, mclk=%d", derot_freq, internal->mclk); + if (stb0899_check_carrier(state) == NOCARRIER) { +- index++; + last_derot_freq = derot_freq; +- derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */ ++ derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */ + +- if(abs(derot_freq) > derot_limit) ++ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit) + next_loop--; + + if (next_loop) { +@@ -310,9 +312,10 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state) + STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq)); + stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */ + } ++ index++; ++ internal->direction = -internal->direction; /* Change zigzag direction */ + } + +- internal->direction = -internal->direction; /* Change zigzag direction */ + } while ((internal->status != CARRIEROK) && next_loop); + + if (internal->status == CARRIEROK) { +@@ -338,6 +341,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state) + int lock = 0, index = 0, dataTime = 500, loop; + u8 reg; + ++ msleep(1); + internal->status = NODATA; + + /* RESET FEC */ +@@ -348,6 +352,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state) + reg = stb0899_read_reg(state, STB0899_TSTRES); + STB0899_SETFIELD_VAL(FRESACS, reg, 0); + stb0899_write_reg(state, STB0899_TSTRES, reg); ++ msleep(1); + + if (params->srate <= 2000000) + dataTime = 2000; +@@ -360,6 +365,7 @@ static enum stb0899_status stb0899_check_data(struct stb0899_state *state) + + stb0899_write_reg(state, STB0899_DSTATUS2, 0x00); /* force search loop */ + while (1) { ++ msleep(1); // Alex: added 1 mSec + /* WARNING! VIT LOCKED has to be tested before VIT_END_LOOOP */ + reg = stb0899_read_reg(state, STB0899_VSTATUS); + lock = STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg); +@@ -387,20 +393,21 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state) + short int derot_freq, derot_step, derot_limit, next_loop = 3; + u8 cfr[2]; + u8 reg; +- int index = 1; ++ int index = 0; ++ int base_freq; + + struct stb0899_internal *internal = &state->internal; +- struct stb0899_params *params = &state->params; + +- derot_step = (params->srate / 4L) / internal->mclk; ++ derot_step = internal->derot_step; + derot_limit = (internal->sub_range / 2L) / internal->mclk; + derot_freq = internal->derot_freq; ++ base_freq = internal->derot_freq; + + do { + if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) { + + derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */ +- if (abs(derot_freq) > derot_limit) ++ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit) + next_loop--; + + if (next_loop) { +@@ -414,9 +421,9 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state) + stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */ + + stb0899_check_carrier(state); +- index++; + } + } ++ index++; + internal->direction = -internal->direction; /* change zig zag direction */ + } while ((internal->status != DATAOK) && next_loop); + +-- +1.7.1 diff --git a/packages/linux/patches/3.2.44/linux-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/3.2.44/linux-213-cinergy_s2_usb_r2.patch new file mode 100644 index 0000000000..155e5311f7 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-213-cinergy_s2_usb_r2.patch @@ -0,0 +1,46 @@ +diff -Naur linux-3.2.21/drivers/media/dvb/dvb-usb/dw2102.c linux-3.2.21.patch/drivers/media/dvb/dvb-usb/dw2102.c +--- linux-3.2.21/drivers/media/dvb/dvb-usb/dw2102.c 2012-06-20 00:18:30.000000000 +0200 ++++ linux-3.2.21.patch/drivers/media/dvb/dvb-usb/dw2102.c 2012-06-28 14:08:50.721691934 +0200 +@@ -1181,6 +1181,14 @@ + { + u8 obuf[3] = { 0xe, 0x80, 0 }; + u8 ibuf[] = { 0 }; ++ ++ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) ++ err("command 0x0e transfer failed."); ++ ++ //power on su3000 ++ obuf[0] = 0xe; ++ obuf[1] = 0x02; ++ obuf[2] = 1; + + if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0) + err("command 0x0e transfer failed."); +@@ -1448,6 +1456,7 @@ + {USB_DEVICE(0x3034, 0x7500)}, + {USB_DEVICE(0x1f4d, 0x3000)}, + {USB_DEVICE(USB_VID_TERRATEC, 0x00a8)}, ++ {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)}, + {USB_DEVICE(0x9022, USB_PID_TEVII_S480_1)}, + {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)}, + {USB_DEVICE(0x1f4d, 0x3100)}, +@@ -1839,7 +1848,7 @@ + }}, + } + }, +- .num_device_descs = 3, ++ .num_device_descs = 4, + .devices = { + { "SU3000HD DVB-S USB2.0", + { &dw2102_table[10], NULL }, +@@ -1853,6 +1862,10 @@ + { &dw2102_table[14], NULL }, + { NULL }, + }, ++ { "Terratec Cinergy S2 USB HD Rev.2", ++ { &dw2102_table[17], NULL }, ++ { NULL }, ++ }, + } + }; + diff --git a/packages/linux/patches/3.2.44/linux-214-hdtv-hvr930c.patch b/packages/linux/patches/3.2.44/linux-214-hdtv-hvr930c.patch new file mode 100644 index 0000000000..e84c2495ee --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-214-hdtv-hvr930c.patch @@ -0,0 +1,389 @@ +From 8ab3362665a699bd54fc489ff7fb6372678b94c1 Mon Sep 17 00:00:00 2001 +From: Holger Nelson +Date: Wed, 28 Dec 2011 18:55:41 -0300 +Subject: [PATCH] [media] em28xx: Reworked probe code to get rid of some hacks + +Reworked device probing to get rid of hacks to guess the maximum size of +dvb iso transfer packets. The new code also selects the first alternate +config which supports the largest possible iso transfers for dvb. + +[mchehab@redhat.com: Fix a few checkpatch.pl CodingStyle compliants] +Signed-off-by: Holger Nelson +Signed-off-by: Mauro Carvalho Chehab +--- + drivers/media/video/em28xx/em28xx-audio.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 148 ++++++++++++++--------------- + drivers/media/video/em28xx/em28xx-core.c | 59 +----------- + drivers/media/video/em28xx/em28xx-dvb.c | 4 +- + drivers/media/video/em28xx/em28xx-reg.h | 5 + + drivers/media/video/em28xx/em28xx.h | 2 + + 6 files changed, 84 insertions(+), 136 deletions(-) + +diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c +index cff0768..e2a7b77 100644 +--- a/drivers/media/video/em28xx/em28xx-audio.c ++++ b/drivers/media/video/em28xx/em28xx-audio.c +@@ -193,7 +193,7 @@ static int em28xx_init_audio_isoc(struct em28xx *dev) + + urb->dev = dev->udev; + urb->context = dev; +- urb->pipe = usb_rcvisocpipe(dev->udev, 0x83); ++ urb->pipe = usb_rcvisocpipe(dev->udev, EM28XX_EP_AUDIO); + urb->transfer_flags = URB_ISO_ASAP; + urb->transfer_buffer = dev->adev.transfer_buffer[i]; + urb->interval = 1; +diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c +index b95e661..0adaf84 100644 +--- a/drivers/media/video/em28xx/em28xx-cards.c ++++ b/drivers/media/video/em28xx/em28xx-cards.c +@@ -3111,12 +3111,11 @@ unregister_dev: + static int em28xx_usb_probe(struct usb_interface *interface, + const struct usb_device_id *id) + { +- const struct usb_endpoint_descriptor *endpoint; + struct usb_device *udev; + struct em28xx *dev = NULL; + int retval; +- bool is_audio_only = false, has_audio = false; +- int i, nr, isoc_pipe; ++ bool has_audio = false, has_video = false, has_dvb = false; ++ int i, nr; + const int ifnum = interface->altsetting[0].desc.bInterfaceNumber; + char *speed; + char descr[255] = ""; +@@ -3148,54 +3147,65 @@ static int em28xx_usb_probe(struct usb_interface *interface, + goto err; + } + ++ /* allocate memory for our device state and initialize it */ ++ dev = kzalloc(sizeof(*dev), GFP_KERNEL); ++ if (dev == NULL) { ++ em28xx_err(DRIVER_NAME ": out of memory!\n"); ++ retval = -ENOMEM; ++ goto err; ++ } ++ ++ /* compute alternate max packet sizes */ ++ dev->alt_max_pkt_size = kmalloc(sizeof(dev->alt_max_pkt_size[0]) * ++ interface->num_altsetting, GFP_KERNEL); ++ if (dev->alt_max_pkt_size == NULL) { ++ em28xx_errdev("out of memory!\n"); ++ kfree(dev); ++ retval = -ENOMEM; ++ goto err; ++ } ++ + /* Get endpoints */ + for (i = 0; i < interface->num_altsetting; i++) { + int ep; + + for (ep = 0; ep < interface->altsetting[i].desc.bNumEndpoints; ep++) { +- struct usb_host_endpoint *e; +- e = &interface->altsetting[i].endpoint[ep]; +- +- if (e->desc.bEndpointAddress == 0x83) +- has_audio = true; ++ const struct usb_endpoint_descriptor *e; ++ int sizedescr, size; ++ ++ e = &interface->altsetting[i].endpoint[ep].desc; ++ ++ sizedescr = le16_to_cpu(e->wMaxPacketSize); ++ size = sizedescr & 0x7ff; ++ ++ if (udev->speed == USB_SPEED_HIGH) ++ size = size * hb_mult(sizedescr); ++ ++ if (usb_endpoint_xfer_isoc(e) && ++ usb_endpoint_dir_in(e)) { ++ switch (e->bEndpointAddress) { ++ case EM28XX_EP_AUDIO: ++ has_audio = true; ++ break; ++ case EM28XX_EP_ANALOG: ++ has_video = true; ++ dev->alt_max_pkt_size[i] = size; ++ break; ++ case EM28XX_EP_DIGITAL: ++ has_dvb = true; ++ if (size > dev->dvb_max_pkt_size) { ++ dev->dvb_max_pkt_size = size; ++ dev->dvb_alt = i; ++ } ++ break; ++ } ++ } + } + } + +- endpoint = &interface->cur_altsetting->endpoint[0].desc; +- +- /* check if the device has the iso in endpoint at the correct place */ +- if (usb_endpoint_xfer_isoc(endpoint) +- && +- (interface->altsetting[1].endpoint[0].desc.wMaxPacketSize == 940)) { +- /* It's a newer em2874/em2875 device */ +- isoc_pipe = 0; +- } else { +- int check_interface = 1; +- isoc_pipe = 1; +- endpoint = &interface->cur_altsetting->endpoint[1].desc; +- if (!usb_endpoint_xfer_isoc(endpoint)) +- check_interface = 0; +- +- if (usb_endpoint_dir_out(endpoint)) +- check_interface = 0; +- +- if (!check_interface) { +- if (has_audio) { +- is_audio_only = true; +- } else { +- em28xx_err(DRIVER_NAME " video device (%04x:%04x): " +- "interface %i, class %i found.\n", +- le16_to_cpu(udev->descriptor.idVendor), +- le16_to_cpu(udev->descriptor.idProduct), +- ifnum, +- interface->altsetting[0].desc.bInterfaceClass); +- em28xx_err(DRIVER_NAME " This is an anciliary " +- "interface not used by the driver\n"); +- +- retval = -ENODEV; +- goto err; +- } +- } ++ if (!(has_audio || has_video || has_dvb)) { ++ retval = -ENODEV; ++ goto err_free; + } + + switch (udev->speed) { +@@ -3221,6 +3231,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, + strlcat(descr, " ", sizeof(descr)); + strlcat(descr, udev->product, sizeof(descr)); + } ++ + if (*descr) + strlcat(descr, " ", sizeof(descr)); + +@@ -3237,6 +3248,14 @@ static int em28xx_usb_probe(struct usb_interface *interface, + printk(KERN_INFO DRIVER_NAME + ": Audio Vendor Class interface %i found\n", + ifnum); ++ if (has_video) ++ printk(KERN_INFO DRIVER_NAME ++ ": Video interface %i found\n", ++ ifnum); ++ if (has_dvb) ++ printk(KERN_INFO DRIVER_NAME ++ ": DVB interface %i found\n", ++ ifnum); + + /* + * Make sure we have 480 Mbps of bandwidth, otherwise things like +@@ -3248,22 +3267,14 @@ static int em28xx_usb_probe(struct usb_interface *interface, + printk(DRIVER_NAME ": Device must be connected to a high-speed" + " USB 2.0 port.\n"); + retval = -ENODEV; +- goto err; +- } +- +- /* allocate memory for our device state and initialize it */ +- dev = kzalloc(sizeof(*dev), GFP_KERNEL); +- if (dev == NULL) { +- em28xx_err(DRIVER_NAME ": out of memory!\n"); +- retval = -ENOMEM; +- goto err; ++ goto err_free; + } + + snprintf(dev->name, sizeof(dev->name), "em28xx #%d", nr); + dev->devno = nr; + dev->model = id->driver_info; + dev->alt = -1; +- dev->is_audio_only = is_audio_only; ++ dev->is_audio_only = has_audio && !(has_video || has_dvb); + dev->has_alsa_audio = has_audio; + dev->audio_ifnum = ifnum; + +@@ -3276,26 +3287,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, + } + } + +- /* compute alternate max packet sizes */ + dev->num_alt = interface->num_altsetting; +- dev->alt_max_pkt_size = kmalloc(32 * dev->num_alt, GFP_KERNEL); +- +- if (dev->alt_max_pkt_size == NULL) { +- em28xx_errdev("out of memory!\n"); +- kfree(dev); +- retval = -ENOMEM; +- goto err; +- } +- +- for (i = 0; i < dev->num_alt ; i++) { +- u16 tmp = le16_to_cpu(interface->altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize); +- unsigned int size = tmp & 0x7ff; +- +- if (udev->speed == USB_SPEED_HIGH) +- size = size * hb_mult(tmp); +- +- dev->alt_max_pkt_size[i] = size; +- } + + if ((card[nr] >= 0) && (card[nr] < em28xx_bcount)) + dev->model = card[nr]; +@@ -3308,10 +3300,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, + mutex_lock(&dev->lock); + retval = em28xx_init_dev(&dev, udev, interface, nr); + if (retval) { +- mutex_unlock(&dev->lock); +- kfree(dev->alt_max_pkt_size); +- kfree(dev); +- goto err; ++ goto unlock_and_free; + } + + request_modules(dev); +@@ -3330,6 +3319,13 @@ static int em28xx_usb_probe(struct usb_interface *interface, + + return 0; + ++unlock_and_free: ++ mutex_unlock(&dev->lock); ++ ++err_free: ++ kfree(dev->alt_max_pkt_size); ++ kfree(dev); ++ + err: + clear_bit(nr, &em28xx_devused); + +diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c +index 2982a06..0aacc96 100644 +--- a/drivers/media/video/em28xx/em28xx-core.c ++++ b/drivers/media/video/em28xx/em28xx-core.c +@@ -1070,7 +1070,8 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets, + should also be using 'desc.bInterval' + */ + pipe = usb_rcvisocpipe(dev->udev, +- dev->mode == EM28XX_ANALOG_MODE ? 0x82 : 0x84); ++ dev->mode == EM28XX_ANALOG_MODE ? ++ EM28XX_EP_ANALOG : EM28XX_EP_DIGITAL); + + usb_fill_int_urb(urb, dev->udev, pipe, + dev->isoc_ctl.transfer_buffer[i], sb_size, +@@ -1108,62 +1109,6 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets, + } + EXPORT_SYMBOL_GPL(em28xx_init_isoc); + +-/* Determine the packet size for the DVB stream for the given device +- (underlying value programmed into the eeprom) */ +-int em28xx_isoc_dvb_max_packetsize(struct em28xx *dev) +-{ +- unsigned int chip_cfg2; +- unsigned int packet_size; +- +- switch (dev->chip_id) { +- case CHIP_ID_EM2710: +- case CHIP_ID_EM2750: +- case CHIP_ID_EM2800: +- case CHIP_ID_EM2820: +- case CHIP_ID_EM2840: +- case CHIP_ID_EM2860: +- /* No DVB support */ +- return -EINVAL; +- case CHIP_ID_EM2870: +- case CHIP_ID_EM2883: +- /* TS max packet size stored in bits 1-0 of R01 */ +- chip_cfg2 = em28xx_read_reg(dev, EM28XX_R01_CHIPCFG2); +- switch (chip_cfg2 & EM28XX_CHIPCFG2_TS_PACKETSIZE_MASK) { +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_188: +- packet_size = 188; +- break; +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_376: +- packet_size = 376; +- break; +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_564: +- packet_size = 564; +- break; +- case EM28XX_CHIPCFG2_TS_PACKETSIZE_752: +- packet_size = 752; +- break; +- } +- break; +- case CHIP_ID_EM2874: +- /* +- * FIXME: for now assumes 564 like it was before, but the +- * em2874 code should be added to return the proper value +- */ +- packet_size = 564; +- break; +- case CHIP_ID_EM2884: +- case CHIP_ID_EM28174: +- default: +- /* +- * FIXME: same as em2874. 564 was enough for 22 Mbit DVB-T +- * but not enough for 44 Mbit DVB-C. +- */ +- packet_size = 752; +- } +- +- return packet_size; +-} +-EXPORT_SYMBOL_GPL(em28xx_isoc_dvb_max_packetsize); +- + /* + * em28xx_wake_i2c() + * configure i2c attached devices +diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c +index ac55de9..9449423 100644 +--- a/drivers/media/video/em28xx/em28xx-dvb.c ++++ b/drivers/media/video/em28xx/em28xx-dvb.c +@@ -164,12 +164,12 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb) + struct em28xx *dev = dvb->adapter.priv; + int max_dvb_packet_size; + +- usb_set_interface(dev->udev, 0, 1); ++ usb_set_interface(dev->udev, 0, dev->dvb_alt); + rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE); + if (rc < 0) + return rc; + +- max_dvb_packet_size = em28xx_isoc_dvb_max_packetsize(dev); ++ max_dvb_packet_size = dev->dvb_max_pkt_size; + if (max_dvb_packet_size < 0) + return max_dvb_packet_size; + dprintk(1, "Using %d buffers each with %d bytes\n", +diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h +index 66f7923..2f62685 100644 +--- a/drivers/media/video/em28xx/em28xx-reg.h ++++ b/drivers/media/video/em28xx/em28xx-reg.h +@@ -12,6 +12,11 @@ + #define EM_GPO_2 (1 << 2) + #define EM_GPO_3 (1 << 3) + ++/* em28xx endpoints */ ++#define EM28XX_EP_ANALOG 0x82 ++#define EM28XX_EP_AUDIO 0x83 ++#define EM28XX_EP_DIGITAL 0x84 ++ + /* em2800 registers */ + #define EM2800_R08_AUDIOSRC 0x08 + +diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h +index 2dbb12c..7c3ebe2 100644 +--- a/drivers/media/video/em28xx/em28xx.h ++++ b/drivers/media/video/em28xx/em28xx.h +@@ -598,6 +598,8 @@ struct em28xx { + int max_pkt_size; /* max packet size of isoc transaction */ + int num_alt; /* Number of alternative settings */ + unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ ++ int dvb_alt; /* alternate for DVB */ ++ unsigned int dvb_max_pkt_size; /* wMaxPacketSize for DVB */ + struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ + char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc + transfer */ +-- +1.7.6.5 + + diff --git a/packages/linux/patches/3.2.44/linux-215-technisat-usb2-module.patch b/packages/linux/patches/3.2.44/linux-215-technisat-usb2-module.patch new file mode 100644 index 0000000000..acc664e699 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-215-technisat-usb2-module.patch @@ -0,0 +1,25 @@ +This patch adds a module-device-table-entry to the +technisat-usb2-driver which will help udev to on-demand load the +driver. This was obviously forgotten during initial commit. + +Signed-off-by: Patrick Boettcher +--- + drivers/media/dvb/dvb-usb/technisat-usb2.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c +index acefaa8..7a8c8c1 100644 +--- a/drivers/media/dvb/dvb-usb/technisat-usb2.c ++++ b/drivers/media/dvb/dvb-usb/technisat-usb2.c +@@ -677,6 +677,7 @@ static struct usb_device_id technisat_usb2_id_table[] = { + { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_DVB_S2) }, + { 0 } /* Terminating entry */ + }; ++MODULE_DEVICE_TABLE(usb, technisat_usb2_id_table); + + /* device description */ + static struct dvb_usb_device_properties technisat_usb2_devices = { +-- +1.7.9.5 + +-- diff --git a/packages/linux/patches/3.2.44/linux-901_broken_bluetooth.patch b/packages/linux/patches/3.2.44/linux-901_broken_bluetooth.patch new file mode 100644 index 0000000000..f57a395502 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-901_broken_bluetooth.patch @@ -0,0 +1,13 @@ +diff -Naur linux-3.2-rc7/net/bluetooth/hci_event.c linux-3.2-rc7.patch/net/bluetooth/hci_event.c +--- linux-3.2-rc7/net/bluetooth/hci_event.c 2011-12-24 06:51:06.000000000 +0100 ++++ linux-3.2-rc7.patch/net/bluetooth/hci_event.c 2012-01-01 15:50:48.745287438 +0100 +@@ -695,7 +695,8 @@ + if (rp->status) + return; + +- memcpy(hdev->extfeatures, rp->features, 8); ++ if (rp->page == 1) ++ memcpy(hdev->extfeatures, rp->features, 8); + + hci_req_complete(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, rp->status); + } diff --git a/packages/linux/patches/3.2.44/linux-990-xc5000_add_support_for_get_if_frequency.patch b/packages/linux/patches/3.2.44/linux-990-xc5000_add_support_for_get_if_frequency.patch new file mode 100644 index 0000000000..6f5c3dcb22 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-990-xc5000_add_support_for_get_if_frequency.patch @@ -0,0 +1,45 @@ +From 35621030c0bd5cb4f1a345cf2b4a97e290bc244a Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Fri, 23 Sep 2011 13:03:42 -0300 +Subject: [PATCH] [media] xc5000: Add support for get_if_frequency + +This is needed for devices with DRX-K and xc5000. + +Tested with a HVR 930C hardware. + +Signed-off-by: Mauro Carvalho Chehab +--- + drivers/media/common/tuners/xc5000.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c +index 88b329c..ecd1f95 100644 +--- a/drivers/media/common/tuners/xc5000.c ++++ b/drivers/media/common/tuners/xc5000.c +@@ -968,6 +968,14 @@ static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq) + return 0; + } + ++static int xc5000_get_if_frequency(struct dvb_frontend *fe, u32 *freq) ++{ ++ struct xc5000_priv *priv = fe->tuner_priv; ++ dprintk(1, "%s()\n", __func__); ++ *freq = priv->if_khz * 1000; ++ return 0; ++} ++ + static int xc5000_get_bandwidth(struct dvb_frontend *fe, u32 *bw) + { + struct xc5000_priv *priv = fe->tuner_priv; +@@ -1108,6 +1116,7 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = { + .set_params = xc5000_set_params, + .set_analog_params = xc5000_set_analog_params, + .get_frequency = xc5000_get_frequency, ++ .get_if_frequency = xc5000_get_if_frequency, + .get_bandwidth = xc5000_get_bandwidth, + .get_status = xc5000_get_status + }; +-- +1.7.2.5 + + diff --git a/packages/linux/patches/3.2.44/linux-999-fix-iMon-Knob-event-interpretation-issues.patch b/packages/linux/patches/3.2.44/linux-999-fix-iMon-Knob-event-interpretation-issues.patch new file mode 100644 index 0000000000..1f9db71463 --- /dev/null +++ b/packages/linux/patches/3.2.44/linux-999-fix-iMon-Knob-event-interpretation-issues.patch @@ -0,0 +1,59 @@ +From cca7718a9902a4d5cffbf158b5853980a08ef930 Mon Sep 17 00:00:00 2001 +From: Alexandre Lissy +Date: Sun, 2 Sep 2012 20:35:20 +0200 +Subject: [PATCH] fix: iMon Knob event interpretation issues + +Events for the iMon Knob pad where not correctly interpreted, resulting +in buggy mouse movements (cursor going straight out of the screen), key +pad only generating KEY_RIGHT and KEY_DOWN events. A reproducer is: + +int main(int argc, char ** argv) +{ + char rel_x = 0x00; printf("rel_x:%d @%s:%d\n", rel_x, __FILE__, __LINE__); + rel_x = 0x0f; printf("rel_x:%d @%s:%d\n", rel_x, __FILE__, __LINE__); + rel_x |= ~0x0f; printf("rel_x:%d @%s:%d\n", rel_x, __FILE__, __LINE__); + + return 0; +} + +(running on x86 or amd64) +$ ./test +rel_x:0 @test.c:6 +rel_x:15 @test.c:7 +rel_x:-1 @test.c:8 + +(running on armv6) +rel_x:0 @test.c:6 +rel_x:15 @test.c:7 +rel_x:255 @test.c:8 + +Forcing the rel_x and rel_y variables as signed char fixes the issue. +--- + drivers/media/rc/imon.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c +index 5dd0386..9d30ca9 100644 +--- a/drivers/media/rc/imon.c ++++ b/drivers/media/rc/imon.c +@@ -1225,7 +1225,7 @@ static u32 imon_panel_key_lookup(u64 code) + static bool imon_mouse_event(struct imon_context *ictx, + unsigned char *buf, int len) + { +- char rel_x = 0x00, rel_y = 0x00; ++ signed char rel_x = 0x00, rel_y = 0x00; + u8 right_shift = 1; + bool mouse_input = true; + int dir = 0; +@@ -1301,7 +1301,7 @@ static void imon_touch_event(struct imon_context *ictx, unsigned char *buf) + static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf) + { + int dir = 0; +- char rel_x = 0x00, rel_y = 0x00; ++ signed char rel_x = 0x00, rel_y = 0x00; + u16 timeout, threshold; + u32 scancode = KEY_RESERVED; + unsigned long flags; +-- +1.7.9.5 +