From patchwork Tue Jul 9 18:39:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Pieter van Woerkom X-Patchwork-Id: 11037351 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70445912 for ; Tue, 9 Jul 2019 18:39:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D253286AC for ; Tue, 9 Jul 2019 18:39:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E9BC2886C; Tue, 9 Jul 2019 18:39:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 403A9286AC for ; Tue, 9 Jul 2019 18:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726585AbfGISje (ORCPT ); Tue, 9 Jul 2019 14:39:34 -0400 Received: from jpvw.nl ([80.127.100.2]:39694 "EHLO jpvw.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbfGISje (ORCPT ); Tue, 9 Jul 2019 14:39:34 -0400 Received: from jp by jpvw.nl with local (Exim 4.92) (envelope-from ) id 1hkv1Y-0000cF-VX; Tue, 09 Jul 2019 20:39:32 +0200 Date: Tue, 9 Jul 2019 20:39:32 +0200 From: Jan Pieter van Woerkom To: linux-media@vger.kernel.org Cc: Michael Ira Krufky , Antti Palosaari , Sean Young , Frantisek Rysanek Subject: PATCH V3.5 1/2] dvbsky: add support for "Mygica T230C v2" Message-ID: <20190709183932.GA2311@jpvw.nl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jan Pieter van Woerkom Adds support for the "Mygica T230C v2" into the "dvbsky" driver. A small enhancement is also needed in the si2168 demodulator driver, and a USB device ID in dvb-usb-ids.h . This is v3.5 of the proposed patch, based on feedback from Sean Young and Antti Palosaari. Tested by patch author on DVB(T/T2/C). Tested by Frank Rysanek on a T230C v2: can tune into locally available DVB-T and DVB-T2 muxes, video and audio playback works. Applies cleanly against Linux 5.2 . The T230C v2 hardware needs a mode of the si2168 chip to be set for which the si2168 driver previously had no support. This patch uses a specific measure to configure this on the T230C v2 hardware only - see the flag passed via the ts_mode attribute and its dependency on USB_PID_MYGICA_T230C2. Other devices using the si2168 demodulator driver are not affected. Signed-off-by: Jan Pieter van Woerkom Tested-by: Frank Rysanek diff -ru a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c --- a/drivers/media/dvb-frontends/si2168.c 2019-07-08 00:41:56.000000000 +0200 +++ b/drivers/media/dvb-frontends/si2168.c 2019-07-09 18:47:59.514873658 +0200 @@ -82,8 +82,18 @@ dev_dbg(&client->dev, "%s acquire: %d\n", __func__, acquire); + /* set manual value */ + if (dev->ts_mode & SI2168_TS_CLK_MANUAL) { + memcpy(cmd.args, "\x14\x00\x0d\x10\xe8\x03", 6); + cmd.wlen = 6; + cmd.rlen = 4; + ret = si2168_cmd_execute(client, &cmd); + if (ret) + return ret; + } /* set TS_MODE property */ - memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6); + memcpy(cmd.args, "\x14\x00\x01\x10\x00\x00", 6); + cmd.args[4] = dev->ts_mode & (SI2168_TS_CLK_AUTO|SI2168_TS_CLK_MANUAL); if (acquire) cmd.args[4] |= dev->ts_mode; else diff -ru a/drivers/media/dvb-frontends/si2168.h b/drivers/media/dvb-frontends/si2168.h --- a/drivers/media/dvb-frontends/si2168.h 2019-07-08 00:41:56.000000000 +0200 +++ b/drivers/media/dvb-frontends/si2168.h 2019-07-09 18:47:59.514873658 +0200 @@ -30,6 +30,8 @@ #define SI2168_TS_PARALLEL 0x06 #define SI2168_TS_SERIAL 0x03 #define SI2168_TS_TRISTATE 0x00 +#define SI2168_TS_CLK_AUTO 0x10 +#define SI2168_TS_CLK_MANUAL 0x20 u8 ts_mode; /* TS clock inverted */ From patchwork Tue Jul 9 18:42:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Pieter van Woerkom X-Patchwork-Id: 11037367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8ABFB912 for ; Tue, 9 Jul 2019 18:42:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 789B928871 for ; Tue, 9 Jul 2019 18:42:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CEB528874; Tue, 9 Jul 2019 18:42:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B14028871 for ; Tue, 9 Jul 2019 18:42:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729303AbfGISmv (ORCPT ); Tue, 9 Jul 2019 14:42:51 -0400 Received: from jpvw.nl ([80.127.100.2]:39704 "EHLO jpvw.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726592AbfGISmv (ORCPT ); Tue, 9 Jul 2019 14:42:51 -0400 Received: from jp by jpvw.nl with local (Exim 4.92) (envelope-from ) id 1hkv4k-0000cr-72; Tue, 09 Jul 2019 20:42:50 +0200 Date: Tue, 9 Jul 2019 20:42:50 +0200 From: Jan Pieter van Woerkom To: linux-media@vger.kernel.org Cc: Michael Ira Krufky , Antti Palosaari , Sean Young , Frantisek Rysanek Subject: [PATCH V3.5 2/2] dvbsky: add support for "Mygica T230C v2" Message-ID: <20190709184250.GA2379@jpvw.nl> References: <20190709183932.GA2311@jpvw.nl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190709183932.GA2311@jpvw.nl> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jan Pieter van Woerkom Adds support for the "Mygica T230C v2" into the "dvbsky" driver. Signed-off-by: Jan Pieter van Woerkom Tested-by: Frank Rysanek diff -ru a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c --- a/drivers/media/usb/dvb-usb-v2/dvbsky.c 2019-07-08 00:41:56.000000000 +0200 +++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c 2019-07-09 18:48:08.442890061 +0200 @@ -551,6 +551,8 @@ si2168_config.i2c_adapter = &i2c_adapter; si2168_config.fe = &adap->fe[0]; si2168_config.ts_mode = SI2168_TS_PARALLEL; + if (le16_to_cpu(d->udev->descriptor.idProduct) == USB_PID_MYGICA_T230C2) + si2168_config.ts_mode |= SI2168_TS_CLK_MANUAL; si2168_config.ts_clock_inv = 1; state->i2c_client_demod = dvb_module_probe("si2168", NULL, @@ -790,6 +792,9 @@ { DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C, &mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C", RC_MAP_TOTAL_MEDIA_IN_HAND_02) }, + { DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C2, + &mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C v2", + RC_MAP_TOTAL_MEDIA_IN_HAND_02) }, { } }; MODULE_DEVICE_TABLE(usb, dvbsky_id_table); diff -ru a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h --- a/include/media/dvb-usb-ids.h 2019-07-08 00:41:56.000000000 +0200 +++ b/include/media/dvb-usb-ids.h 2019-07-09 18:48:08.442890061 +0200 @@ -388,6 +388,7 @@ #define USB_PID_MYGICA_D689 0xd811 #define USB_PID_MYGICA_T230 0xc688 #define USB_PID_MYGICA_T230C 0xc689 +#define USB_PID_MYGICA_T230C2 0xc68a #define USB_PID_ELGATO_EYETV_DIVERSITY 0x0011 #define USB_PID_ELGATO_EYETV_DTT 0x0021 #define USB_PID_ELGATO_EYETV_DTT_2 0x003f