From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EFDCC04AB6 for ; Fri, 31 May 2019 18:25:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55D8B26DD3 for ; Fri, 31 May 2019 18:25:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nextdimension.cc header.i=@nextdimension.cc header.b="ku6Od5W6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727012AbfEaSZh (ORCPT ); Fri, 31 May 2019 14:25:37 -0400 Received: from bonobo.maple.relay.mailchannels.net ([23.83.214.22]:25462 "EHLO bonobo.maple.relay.mailchannels.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726983AbfEaSZh (ORCPT ); Fri, 31 May 2019 14:25:37 -0400 X-Sender-Id: dreamhost|x-authsender|brad@b-rad.cc Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B5E49502789; Fri, 31 May 2019 18:25:34 +0000 (UTC) Received: from pdx1-sub0-mail-a61.g.dreamhost.com (100-96-28-110.trex.outbound.svc.cluster.local [100.96.28.110]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 40507500E34; Fri, 31 May 2019 18:25:32 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|brad@b-rad.cc Received: from pdx1-sub0-mail-a61.g.dreamhost.com ([TEMPUNAVAIL]. [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.17.2); Fri, 31 May 2019 18:25:34 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|brad@b-rad.cc X-MailChannels-Auth-Id: dreamhost X-Grain-Arithmetic: 286b50f81e3f8fe2_1559327134567_1830576015 X-MC-Loop-Signature: 1559327134567:2480674581 X-MC-Ingress-Time: 1559327134566 Received: from pdx1-sub0-mail-a61.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a61.g.dreamhost.com (Postfix) with ESMTP id 8D0E48019F; Fri, 31 May 2019 11:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=nextdimension.cc; h= subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-type:content-transfer-encoding; s= nextdimension.cc; bh=Vqx2lmpTSqk7laDGWMNiJYQTbnk=; b=ku6Od5W6y1s tO2XO1VusnoIRmfTJzLN3HqKiHfG/qBZGolfdKJY6tl34LjsMolbT9AUbVBqY9dM s+Bw5L2ReCRwwQOGw/hj1TN0cOa7kPNEv9x0bB1DcJUgciWHqWsI4xAI4cW/XZSH jc2Y6QU4rVxkDtzMq7sSNxVKx8UUM7pc= Received: from [192.168.0.21] (67-198-57-188.static.grandenetworks.net [67.198.57.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: brad@b-rad.cc) by pdx1-sub0-mail-a61.g.dreamhost.com (Postfix) with ESMTPSA id E53FE80199; Fri, 31 May 2019 11:25:23 -0700 (PDT) Subject: Re: [PATCH v4 4/4] pvrusb2: Add Hauppauge HVR1955/1975 devices To: Brad Love , Sean Young Cc: linux-media@vger.kernel.org References: <1545421223-3577-1-git-send-email-brad@nextdimension.cc> <1551294966-12564-1-git-send-email-brad@nextdimension.cc> <1551294966-12564-5-git-send-email-brad@nextdimension.cc> <20190405152423.76fsvdrpzz4kwxsg@gofer.mess.org> <7b429935-cc00-ba02-e321-c976efeb6e49@nextdimension.cc> X-DH-BACKEND: pdx1-sub0-mail-a61 From: Brad Love Openpgp: preference=signencrypt Autocrypt: addr=brad@nextdimension.cc; prefer-encrypt=mutual; keydata= mQINBFjBn7UBEADLu822UvzHuo/b/8T+oTBQ7qLGq8OAb/GFDdttJSMreILjzfZvt6Zs8hRO PsUZ3djhOQB5pxrDA+wQgFsQ3T7jSC14bPq/IrKsb7WOaD12SozhgcgkMjoV/R4p9WciBU39 an5AU6WGBRUE5+Q1Yul20x1R9N9wciFCxVDAh1ibFfBqNbPLTAjd1PGj5Hqoa4oV6OaFDFj9 Qu1Xfu7TVq5mwrBgstsQtkJwug2adNjqN8eqJ3U8Fkrb7LDE7qbozKunlLQzr+YeiSLpu4SQ Li88JvKqVqLbQAOoGFb9lVHnbBSVU+XX8mSqhU1rh/NYJ4PdToFS7BpL+JeEFOmVlU20LwvD aJ8SpJrbT5bSQS12GXKp4MvKvVMfsdu+18kodTLxxFMhWRUFpZ1kh6NLfeAXRulmMQjxhJHp yZRJ2aSzNugOT18xBI25N/leOKfrcGgTDaFnL80MrwTs5b0sNvCqYzx1SObfkWkDPaejbWxu JEtQbtqeBSfi9R+DxRIqWIY8hODB9H6T2OINor+flABE1ucQ+dRzKyrJio8Ec2QIatFdymgw stPjDO/EYENf7oHhQW8GHfdN2exZ+V+2IGNpMKe20DHGEm96/GoEVVe/5u5T52k5e5dqrgTo k1HvhjYmfJGxDfilx2om2nHOQ4zP1bitgNZ8rLzAkJQ5U/2mZwARAQABtCdCcmFkIExvdmUg KE9TUykgPGJyYWRAbmV4dGRpbWVuc2lvbi5jYz6JAjcEEwEIACEFAljBn7UCGwMFCwkIBwIG FQgJCgsCBBYCAwECHgECF4AACgkQnzntUMfs451sThAAxflSKnPvRsSn3gqqghTcqSxPzkqL C8KFs4+No1ELUfu9HpEzRTC9+B9v+Ny2ajVkPHqdai3wY6FQmUx0mvBcLi3IZ99FKkESLLrP ys5PwDdaP14Yp9JajPOZ09KlJ07vdFTUdW+OiZ+lZRhog4wUR7JnnG6QjFFf/j0Akt7kzmUO GVz+J6Wn33Q1H6hU2EUtf0BLTxMQ4WSQGHLhUcSzlhZy35P4dLb6yRgoDFqYkrUpy5iDQLwK ZC98cgF9gsviY5soHhp63Xz6h62aB8m+0jGMNZj39Yy1hvnpOjON2wwL/277G1rDtKe8RZr4 Ii02Py2u1ikSNRxGL/Y6AMsMpoB/WyJgTfX86eE8kMBAmMRJfGpR5TkaiXLSvdJVhLn+rsIb qgQ9g2xjafZn7419T1q6OMzaQ9B24fKL9kdHJ4iqpPpXIr9+JI9PEIP9K5xD8axYjOQQ8J7E KvBU5XjGujG7wH1UPY+ZbeIF5oI82eGIOKhEktbSrbH48BrAzhCe8o7bBLvmKOoSkezzCFTn HP45IePANrh+4i+zffngfCykrSbsxRfIUZD7GlpYH5hYUVVPh8PDa5tZFu3wQ7yALks7WdNF nBuXXDoHBceTM5mozKwnmaGdSj4Gzda/1dGvJqbZcF/lICYpjFPRSh/meHrKRh2Z6vgziOci C7PrGGO5Ag0EWMGftQEQANXBRd4Fwwl7MY5NpDwtvA+wi0le0YgTfWJTbD5y6IFgdKVDfMRK todmjgFP6utdwsHY+AvY6hdfXpKnaRGJC3e4kFNa/MSGJvfvAcfSO/N3eda88DcCmL4Rgl/d 5gErzrcYeN+O76+oSwMJU3fBiHVtLJqt8DgvWa8TrVNBemPXF+u8cWs0MjMOFFRHP8FnXOkv Fz6qk7oKuNJgo679b0b80CQKn2mpWg0HL9MZdhANYSDwKSf8PtLK7mZ7onydhmcW9TKM3Hqd IA8jQfAxws1srJHEhCaK7k6uQDPGkaeKErYalZc9k45uoJ9JfqleRysh0vMYCpOP9yTG9G+e RNIxK5EVMMmTTwejaJuWUvHrv1oTU7CDJJRXEVlbp5NFgg4D+RsJl+0DtYwHJple0ibSMINA nCMPAcqNhka3LARYq19Akz616Ggpek4FWnZyAQMWQaYrfkid0jaexdIIKMD9viR2l2vlwv4k SJbxtp6Z/1stCen6UQPno61zDIB0o4n+VE+gUEccec7LO78DlRQ54Ph6wXnPwAklMOwQNvQW ALefZn/G2OKozmEG0fP8HsRd0waLkrA0U7vJ3PiVEhJR/3u6F5FFgcUMMgOkps2j3IfWmdt4 c4p7tHTWtONMiMv65fQoTN03vfAmluInHcNsmtJaZjCW4mINpKYp5z+tABEBAAGJAh8EGAEI AAkFAljBn7UCGwwACgkQnzntUMfs450Yzg//d385d7DYyA4pH5maHEZVV86CDm2dSSHo262J 55eH49++ox8xbe3Ov46T5eKVkBVBQ99OacO2dLkzsMfngC+vM6TeqR1JVy62wmNaccy7HDBa aMdrIM0AnWABbOR4K5i2jAGcoXIlbDtRZ0Rnrp6Ql7Ah/SvdymD0qOh0Rs4+tI+ujN9OPNU3 BR2DFUKl3+X1T9RvPwX2egLSTG672hi99noLhFzqz/G8ae5ylMIJMvKzR3tUOApwOgd62e3K 1q+wDo4C7+DgLazGknZnjn/4eKJBah27njKr44qVx0CG4dCazkBwlwqKZEzqKLKo8PlyOHwA sQCREcTcE7lFsrf7z/G7PaluElEm5mH5uVFSWDYQzn6ZX18hjGuW+hkRgy1k/246X+D6FG+W MJu0Divd5Cd+Ly7cMF2WT3NQYET5Ma75h1JxTyXQ9HNQqumy0kyws4EL9ARaZDYO3F5JwkKK Om93LaUGEs5Cqb/hUv9k6eqjjQre9mB0ImDsGXkuuP0X6eN6yrstcaPAYl82NW+PGJ1Zz2ai AHkvsjIskeau68XRcm301QJI3qAZghhD7uJUH/NWBlr+w+F9vLlCgKvJLpahrd3PGHwgJnfV 1qqhouQNjsUrwpkXdQjTbSwtZaDPzCeSUSMArNjQMp21IYg/LhafLMzBqVODgaTsFDuVyRg= Message-ID: <17a789fd-7a39-b914-89df-5ca0ef549f8b@nextdimension.cc> Date: Fri, 31 May 2019 13:25:22 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <7b429935-cc00-ba02-e321-c976efeb6e49@nextdimension.cc> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-GB X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -70 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduuddrudefuddguddvkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhepuffvfhfhkffffgggjggtgfesthejredttdefjeenucfhrhhomhepuehrrgguucfnohhvvgcuoegsrhgrugesnhgvgihtughimhgvnhhsihhonhdrtggtqeenucfkphepieejrdduleekrdehjedrudekkeenucfrrghrrghmpehmohguvgepshhmthhppdhhvghloheplgduledvrdduieekrddtrddvudgnpdhinhgvthepieejrdduleekrdehjedrudekkedprhgvthhurhhnqdhprghthhepuehrrgguucfnohhvvgcuoegsrhgrugesnhgvgihtughimhgvnhhsihhonhdrtggtqedpmhgrihhlfhhrohhmpegsrhgrugesnhgvgihtughimhgvnhhsihhonhdrtggtpdhnrhgtphhtthhopegsrhgrugesnhgvgihtughimhgvnhhsihhonhdrtggtnecuvehluhhsthgvrhfuihiivgeptd Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Sean, Discussed this with Mauro on irc. I went ahead and made the le16_to_cpu fixes and set up v6. The series should be good to go now. Cheers, Brad On 31/05/2019 12.20, Brad Love wrote: > Hi Shawn, > > Just found time to get back to this. I fixed all the checkpatch strict > warnings, no problem. Then I noticed a few comments of yours that I > somehow missed first time around. I've replied inline to those. > > > On 05/04/2019 10.24, Sean Young wrote: >> On Wed, Feb 27, 2019 at 01:16:06PM -0600, Brad Love wrote: >>> Includes support to identify and use two Hauppauge device. >>> HVR-1955: >>> - LGDT3306a ATSC/QAM demod >>> - si2177 tuner >>> - cx25840 decoder for analog tv/composite/s-video/audio >>> >>> HVR-1975 dual-frontend: >>> - LGDT3306a ATSC/QAM demod >>> - si2168 DVB-C/T/T2 demod >>> - si2177 tuner >>> - cx25840 decoder for analog tv/composite/s-video/audio >>> >>> Signed-off-by: Brad Love >> First of all there are bunch of checkpatch.pl --strict warnings and checks >> that need resolving. >> >>> --- >>> Since v2: >>> - Fix build with VIDEO_PVRUSB2_DVB enabled >>> Changes since v1: >>> - Fix build with VIDEO_PVRUSB2_DVB disabled >>> - Insert 160xxx code lower, so 75xxx profile is not split >>> - Reorganize 160xxx board profile >>> - Share config where possible >>> >>> drivers/media/usb/pvrusb2/Kconfig | 2 + >>> drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 25 ++++ >>> drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 164 ++++++++++++++++++++++++ >>> drivers/media/usb/pvrusb2/pvrusb2-devattr.h | 1 + >>> drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h | 4 + >>> drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 36 +++++- >>> 6 files changed, 231 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/media/usb/pvrusb2/Kconfig b/drivers/media/usb/pvrusb2/Kconfig >>> index 1ad913f..144631c 100644 >>> --- a/drivers/media/usb/pvrusb2/Kconfig >>> +++ b/drivers/media/usb/pvrusb2/Kconfig >>> @@ -40,6 +40,8 @@ config VIDEO_PVRUSB2_DVB >>> select DVB_S5H1409 if MEDIA_SUBDRV_AUTOSELECT >>> select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT >>> select DVB_TDA10048 if MEDIA_SUBDRV_AUTOSELECT >>> + select DVB_LGDT3306A if MEDIA_SUBDRV_AUTOSELECT >>> + select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT >>> select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT >>> select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT >>> select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT >>> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c >>> index d5bec0f..36016ab 100644 >>> --- a/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c >>> +++ b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c >>> @@ -111,10 +111,35 @@ static const struct routing_scheme routing_defav400 = { >>> .cnt = ARRAY_SIZE(routing_schemeav400), >>> }; >>> >>> +static const struct routing_scheme_item routing_scheme160xxx[] = { >>> + [PVR2_CVAL_INPUT_TV] = { >>> + .vid = CX25840_COMPOSITE7, >>> + .aud = CX25840_AUDIO8, >>> + }, >>> + [PVR2_CVAL_INPUT_RADIO] = { >>> + .vid = CX25840_COMPOSITE4, >>> + .aud = CX25840_AUDIO6, >>> + }, >>> + [PVR2_CVAL_INPUT_COMPOSITE] = { >>> + .vid = CX25840_COMPOSITE3, >>> + .aud = CX25840_AUDIO_SERIAL, >>> + }, >>> + [PVR2_CVAL_INPUT_SVIDEO] = { >>> + .vid = CX25840_SVIDEO1, >>> + .aud = CX25840_AUDIO_SERIAL, >>> + }, >>> +}; >>> + >>> +static const struct routing_scheme routing_def160xxx = { >>> + .def = routing_scheme160xxx, >>> + .cnt = ARRAY_SIZE(routing_scheme160xxx), >>> +}; >>> + >>> static const struct routing_scheme *routing_schemes[] = { >>> [PVR2_ROUTING_SCHEME_HAUPPAUGE] = &routing_def0, >>> [PVR2_ROUTING_SCHEME_GOTVIEW] = &routing_defgv, >>> [PVR2_ROUTING_SCHEME_AV400] = &routing_defav400, >>> + [PVR2_ROUTING_SCHEME_HAUP160XXX] = &routing_def160xxx, >>> }; >>> >>> void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) >>> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-devattr.c b/drivers/media/usb/pvrusb2/pvrusb2-devattr.c >>> index ef36b62..97b4fc8 100644 >>> --- a/drivers/media/usb/pvrusb2/pvrusb2-devattr.c >>> +++ b/drivers/media/usb/pvrusb2/pvrusb2-devattr.c >>> @@ -37,6 +37,9 @@ pvr2_device_desc structures. >>> #include "tda18271.h" >>> #include "tda8290.h" >>> #include "tuner-simple.h" >>> +#include "si2157.h" >>> +#include "lgdt3306a.h" >>> +#include "si2168.h" >>> #endif >>> >>> >>> @@ -525,7 +528,164 @@ static const struct pvr2_device_desc pvr2_device_751xx = { >>> #endif >>> }; >>> >>> +/*------------------------------------------------------------------------*/ >>> +/* Hauppauge PVR-USB2 Model 160000 / 160111 -- HVR-1955 / HVR-1975 */ >>> + >>> +#ifdef CONFIG_VIDEO_PVRUSB2_DVB >>> +static int pvr2_si2157_attach(struct pvr2_dvb_adapter *adap); >>> +static int pvr2_si2168_attach(struct pvr2_dvb_adapter *adap); >>> +static int pvr2_dual_fe_attach(struct pvr2_dvb_adapter *adap); >>> +static int pvr2_lgdt3306a_attach(struct pvr2_dvb_adapter *adap); >>> + >>> +static const struct pvr2_dvb_props pvr2_160000_dvb_props = { >>> + .frontend_attach = pvr2_dual_fe_attach, >>> + .tuner_attach = pvr2_si2157_attach, >>> +}; >> Newline. >> >>> +static const struct pvr2_dvb_props pvr2_160111_dvb_props = { >>> + .frontend_attach = pvr2_lgdt3306a_attach, >>> + .tuner_attach = pvr2_si2157_attach, >>> +}; >>> + >>> +static int pvr2_si2157_attach(struct pvr2_dvb_adapter *adap) >>> +{ >>> + struct si2157_config si2157_config = {}; >>> + >>> + si2157_config.inversion = 1; >>> + si2157_config.fe = adap->fe[0]; >>> + >>> + adap->i2c_client_tuner = dvb_module_probe("si2157", "si2177", >>> + &adap->channel.hdw->i2c_adap, >>> + 0x60, &si2157_config); >> Indentation. >> >>> + >>> + if (!adap->i2c_client_tuner) >>> + return -ENODEV; >>> + >>> + return 0; >>> +} >>> + >>> +static int pvr2_si2168_attach(struct pvr2_dvb_adapter *adap) >>> +{ >>> + struct si2168_config si2168_config = {}; >>> + struct i2c_adapter *adapter; >>> + >>> + pr_debug("%s()\n", __func__); >>> + >>> + si2168_config.fe = &adap->fe[1]; >>> + si2168_config.i2c_adapter = &adapter; >>> + si2168_config.ts_mode = SI2168_TS_PARALLEL; /*2, 1-serial, 2-parallel.*/ >>> + si2168_config.ts_clock_gapped = 1; /*0-disabled, 1-enabled.*/ >>> + si2168_config.ts_clock_inv = 0; /*0-not-invert, 1-invert*/ >>> + si2168_config.spectral_inversion = 1; /*0-not-invert, 1-invert*/ >>> + >>> + adap->i2c_client_demod[1] = dvb_module_probe("si2168", NULL, >>> + &adap->channel.hdw->i2c_adap, >>> + 0x64, &si2168_config); >> Indentation. >> >>> >>> + if (!adap->i2c_client_demod[1]) >>> + return -ENODEV; >>> + >>> + return 0; >>> +} >>> + >>> +static int pvr2_lgdt3306a_attach(struct pvr2_dvb_adapter *adap) >>> +{ >>> + struct lgdt3306a_config lgdt3306a_config; >>> + struct i2c_adapter *adapter; >>> + >>> + pr_debug("%s()\n", __func__); >>> + >>> + lgdt3306a_config.fe = &adap->fe[0]; >>> + lgdt3306a_config.i2c_adapter = &adapter; >>> + lgdt3306a_config.deny_i2c_rptr = 1; >>> + lgdt3306a_config.spectral_inversion = 1; >>> + lgdt3306a_config.qam_if_khz = 4000; >>> + lgdt3306a_config.vsb_if_khz = 3250; >>> + lgdt3306a_config.mpeg_mode = LGDT3306A_MPEG_PARALLEL; >>> + lgdt3306a_config.tpclk_edge = LGDT3306A_TPCLK_FALLING_EDGE; >>> + lgdt3306a_config.tpvalid_polarity = LGDT3306A_TP_VALID_LOW; >>> + lgdt3306a_config.xtalMHz = 25, /* demod clock MHz; 24/25 supported */ >>> + >>> + adap->i2c_client_demod[0] = dvb_module_probe("lgdt3306a", NULL, >>> + &adap->channel.hdw->i2c_adap, >>> + 0x59, &lgdt3306a_config); >>> + >>> + if (!adap->i2c_client_demod[0]) >>> + return -ENODEV; >>> + >>> + return 0; >>> +} >>> + >>> +static int pvr2_dual_fe_attach(struct pvr2_dvb_adapter *adap) >>> +{ >>> + pr_debug("%s()\n", __func__); >>> + >>> + if (pvr2_lgdt3306a_attach(adap) != 0) >>> + return -ENODEV; >>> + >>> + if (pvr2_si2168_attach(adap) != 0) { >>> + dvb_module_release(adap->i2c_client_demod[0]); >>> + return -ENODEV; >>> + } >>> + >>> + return 0; >>> +} >>> +#endif >>> + >>> +#define PVR2_FIRMWARE_160xxx "v4l-pvrusb2-160xxx-01.fw" >>> +static const char *pvr2_fw1_names_160xxx[] = { >>> + PVR2_FIRMWARE_160xxx, >>> +}; >>> + >>> +static const struct pvr2_device_client_desc pvr2_cli_160xxx[] = { >>> + { .module_id = PVR2_CLIENT_ID_CX25840 }, >>> +}; >>> + >>> +static const struct pvr2_device_desc pvr2_device_160000 = { >>> + .description = "WinTV HVR-1975 Model 160000", >>> + .shortname = "160000", >>> + .client_table.lst = pvr2_cli_160xxx, >>> + .client_table.cnt = ARRAY_SIZE(pvr2_cli_160xxx), >>> + .fx2_firmware.lst = pvr2_fw1_names_160xxx, >>> + .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_160xxx), >>> + .default_tuner_type = TUNER_ABSENT, >>> + .flag_has_cx25840 = !0, >>> + .flag_has_hauppauge_rom = !0, >>> + .flag_has_analogtuner = !0, >>> + .flag_has_composite = !0, >>> + .flag_has_svideo = !0, >>> + .flag_fx2_16kb = !0, >> Why are we writing 1 in such a way? > > > I did not originate the board profile part. I do see the similar > notation used throughout this particular driver, but I cannot state the > rational in setting it like that. In v5 I have this just set these > properties to 1. > > > > > >>> + .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, >>> + .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, >>> + .default_std_mask = V4L2_STD_NTSC_M, >>> + .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE, >>> + .ir_scheme = PVR2_IR_SCHEME_ZILOG, >>> +#ifdef CONFIG_VIDEO_PVRUSB2_DVB >>> + .dvb_props = &pvr2_160000_dvb_props, >>> +#endif >>> +}; >> Newline needed. >> >>> +static const struct pvr2_device_desc pvr2_device_160111 = { >>> + .description = "WinTV HVR-1955 Model 160111", >>> + .shortname = "160111", >>> + .client_table.lst = pvr2_cli_160xxx, >>> + .client_table.cnt = ARRAY_SIZE(pvr2_cli_160xxx), >>> + .fx2_firmware.lst = pvr2_fw1_names_160xxx, >>> + .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_160xxx), >>> + .default_tuner_type = TUNER_ABSENT, >>> + .flag_has_cx25840 = !0, >>> + .flag_has_hauppauge_rom = !0, >>> + .flag_has_analogtuner = !0, >>> + .flag_has_composite = !0, >>> + .flag_has_svideo = !0, >>> + .flag_fx2_16kb = !0, >>> + .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, >>> + .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, >>> + .default_std_mask = V4L2_STD_NTSC_M, >>> + .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE, >>> + .ir_scheme = PVR2_IR_SCHEME_ZILOG, >>> +#ifdef CONFIG_VIDEO_PVRUSB2_DVB >>> + .dvb_props = &pvr2_160111_dvb_props, >>> +#endif >>> +}; >>> >>> /*------------------------------------------------------------------------*/ >>> >>> @@ -552,6 +712,10 @@ struct usb_device_id pvr2_device_table[] = { >>> .driver_info = (kernel_ulong_t)&pvr2_device_751xx}, >>> { USB_DEVICE(0x0ccd, 0x0039), >>> .driver_info = (kernel_ulong_t)&pvr2_device_av400}, >>> + { USB_DEVICE(0x2040, 0x7502), >>> + .driver_info = (kernel_ulong_t)&pvr2_device_160111}, >>> + { USB_DEVICE(0x2040, 0x7510), >>> + .driver_info = (kernel_ulong_t)&pvr2_device_160000}, >>> { } >>> }; >>> >>> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-devattr.h b/drivers/media/usb/pvrusb2/pvrusb2-devattr.h >>> index c1e7d48..ea0b2bf 100644 >>> --- a/drivers/media/usb/pvrusb2/pvrusb2-devattr.h >>> +++ b/drivers/media/usb/pvrusb2/pvrusb2-devattr.h >>> @@ -66,6 +66,7 @@ struct pvr2_string_table { >>> #define PVR2_ROUTING_SCHEME_GOTVIEW 1 >>> #define PVR2_ROUTING_SCHEME_ONAIR 2 >>> #define PVR2_ROUTING_SCHEME_AV400 3 >>> +#define PVR2_ROUTING_SCHEME_HAUP160XXX 4 >>> >>> #define PVR2_DIGITAL_SCHEME_NONE 0 >>> #define PVR2_DIGITAL_SCHEME_HAUPPAUGE 1 >>> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h b/drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h >>> index 0a01de4..640b033 100644 >>> --- a/drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h >>> +++ b/drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h >>> @@ -38,6 +38,10 @@ >>> >>> #define FX2CMD_FWPOST1 0x52u >>> >>> +/* These 2 only exist on Model 160xxx */ >>> +#define FX2CMD_HCW_DEMOD_RESET_PIN 0xd4u >>> +#define FX2CMD_HCW_MAKO_SLEEP_PIN 0xd5u >>> + >>> #define FX2CMD_POWER_OFF 0xdcu >>> #define FX2CMD_POWER_ON 0xdeu >>> >>> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c >>> index 446a999..ab9e822 100644 >>> --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c >>> +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c >>> @@ -316,6 +316,8 @@ static const struct pvr2_fx2cmd_descdef pvr2_fx2cmd_desc[] = { >>> {FX2CMD_ONAIR_DTV_STREAMING_OFF, "onair dtv stream off"}, >>> {FX2CMD_ONAIR_DTV_POWER_ON, "onair dtv power on"}, >>> {FX2CMD_ONAIR_DTV_POWER_OFF, "onair dtv power off"}, >>> + {FX2CMD_HCW_DEMOD_RESET_PIN, "hcw demod reset pin"}, >>> + {FX2CMD_HCW_MAKO_SLEEP_PIN, "hcw mako sleep pin"}, >>> }; >>> >>> >>> @@ -2137,10 +2139,28 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw) >>> ((0) << 16)); >>> } >>> >>> - // This step MUST happen after the earlier powerup step. >>> + /* This step MUST happen after the earlier powerup step */ >>> pvr2_i2c_core_init(hdw); >>> if (!pvr2_hdw_dev_ok(hdw)) return; >>> >>> + /* Reset demod only on Hauppauge 160xxx platform */ >>> + if (hdw->usb_dev->descriptor.idVendor == 0x2040 && >>> + (hdw->usb_dev->descriptor.idProduct == 0x7502 || >>> + hdw->usb_dev->descriptor.idProduct == 0x7510)) { >> These need le16_to_cpu() else it will not work on big-endian machines. > > > Are you sure about this? This isn't doing byte order comparison, this is > a simple number equivalence. The compiler should be taking the two byte > hex values, and inserting them into memory however the architecture > dictates, correct? All constant values are interpreted by the compiler > as little endian, but they're stored based on endianess. > > > > > >>> + pr_info("%s(): resetting 160xxx demod\n", __func__); >>> + /* TODO: not sure this is proper place to reset once only */ >>> + pvr2_issue_simple_cmd(hdw, >>> + FX2CMD_HCW_DEMOD_RESET_PIN | >>> + (1 << 8) | >>> + ((0) << 16)); >>> + msleep(10); >> usleep_range() is preferred (for delays <= 10), I think. Maybe 10ms is too >> long anyway and msleep(1) is enough. >> >>> + pvr2_issue_simple_cmd(hdw, >>> + FX2CMD_HCW_DEMOD_RESET_PIN | >>> + (1 << 8) | >>> + ((1) << 16)); >>> + msleep(10); >>> + } >>> + >>> pvr2_hdw_load_modules(hdw); >>> if (!pvr2_hdw_dev_ok(hdw)) return; >>> >>> @@ -4011,6 +4031,20 @@ int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *hdw) >>> static int pvr2_hdw_cmd_hcw_demod_reset(struct pvr2_hdw *hdw, int onoff) >>> { >>> hdw->flag_ok = !0; >>> + >>> + /* Use this for Hauppauge 160xxx only */ >>> + if (hdw->usb_dev->descriptor.idVendor == 0x2040 && >>> + (hdw->usb_dev->descriptor.idProduct == 0x7502 || >>> + hdw->usb_dev->descriptor.idProduct == 0x7510)) { >> Same as above. le16_to_cpu() needed. > > Same comment here. The rest of your concerns have been handled. > > I'm pushing up a v5 of this series now, without the le16_to_cpu bit > done, until that detail is reviewed again. > > Cheers, > > Brad > > > > >>> + pr_debug("%s(): resetting demod on Hauppauge 160xxx platform skipped\n", >>> + __func__); >>> + /* Can't reset 160xxx or it will trash Demod tristate */ >>> + return pvr2_issue_simple_cmd(hdw, >>> + FX2CMD_HCW_MAKO_SLEEP_PIN | >>> + (1 << 8) | >>> + ((onoff ? 1 : 0) << 16)); >>> + } >>> + >>> return pvr2_issue_simple_cmd(hdw, >>> FX2CMD_HCW_DEMOD_RESETIN | >>> (1 << 8) | >>> -- >>> 2.7.4