From patchwork Tue Mar 24 21:12:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 6085921 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CA0DEBF90F for ; Tue, 24 Mar 2015 21:13:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCEE2201EC for ; Tue, 24 Mar 2015 21:13:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5C7820212 for ; Tue, 24 Mar 2015 21:13:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753196AbbCXVNM (ORCPT ); Tue, 24 Mar 2015 17:13:12 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:54547 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbbCXVNJ (ORCPT ); Tue, 24 Mar 2015 17:13:09 -0400 Received: from dyn3-82-128-188-243.psoas.suomi.net ([82.128.188.243] helo=localhost.localdomain.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1YaW8K-0000up-BB; Tue, 24 Mar 2015 23:13:08 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari , Olli Salonen , Nibble Max Subject: [PATCH 4/8] cx23885: switch ts2022 to ts2020 driver Date: Tue, 24 Mar 2015 23:12:09 +0200 Message-Id: <1427231533-4277-5-git-send-email-crope@iki.fi> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427231533-4277-1-git-send-email-crope@iki.fi> References: <1427231533-4277-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.188.243 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change ts2022 driver to ts2020 driver. ts2020 driver supports both chip models. Cc: Olli Salonen Cc: Nibble Max Signed-off-by: Antti Palosaari --- drivers/media/pci/cx23885/Kconfig | 1 - drivers/media/pci/cx23885/cx23885-dvb.c | 30 +++++++++++++----------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig index 74d774e..2e1b88c 100644 --- a/drivers/media/pci/cx23885/Kconfig +++ b/drivers/media/pci/cx23885/Kconfig @@ -40,7 +40,6 @@ config VIDEO_CX23885 select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT - select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT select DVB_TUNER_DIB0070 if MEDIA_SUBDRV_AUTOSELECT ---help--- diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 45fbe1e..745caab 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -73,7 +73,6 @@ #include "si2157.h" #include "sp2.h" #include "m88ds3103.h" -#include "m88ts2022.h" #include "m88rs6000t.h" static unsigned int debug; @@ -1187,7 +1186,7 @@ static int dvb_register(struct cx23885_tsport *port) struct vb2_dvb_frontend *fe0, *fe1 = NULL; struct si2168_config si2168_config; struct si2157_config si2157_config; - struct m88ts2022_config m88ts2022_config; + struct ts2020_config ts2020_config; struct i2c_board_info info; struct i2c_adapter *adapter; struct i2c_client *client_demod = NULL, *client_tuner = NULL; @@ -1856,13 +1855,12 @@ static int dvb_register(struct cx23885_tsport *port) break; /* attach tuner */ - memset(&m88ts2022_config, 0, sizeof(m88ts2022_config)); - m88ts2022_config.fe = fe0->dvb.frontend; - m88ts2022_config.clock = 27000000; + memset(&ts2020_config, 0, sizeof(ts2020_config)); + ts2020_config.fe = fe0->dvb.frontend; memset(&info, 0, sizeof(struct i2c_board_info)); - strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE); + strlcpy(info.type, "ts2020", I2C_NAME_SIZE); info.addr = 0x60; - info.platform_data = &m88ts2022_config; + info.platform_data = &ts2020_config; request_module(info.type); client_tuner = i2c_new_device(adapter, &info); if (client_tuner == NULL || @@ -1986,13 +1984,12 @@ static int dvb_register(struct cx23885_tsport *port) break; /* attach tuner */ - memset(&m88ts2022_config, 0, sizeof(m88ts2022_config)); - m88ts2022_config.fe = fe0->dvb.frontend; - m88ts2022_config.clock = 27000000; + memset(&ts2020_config, 0, sizeof(ts2020_config)); + ts2020_config.fe = fe0->dvb.frontend; memset(&info, 0, sizeof(struct i2c_board_info)); - strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE); + strlcpy(info.type, "ts2020", I2C_NAME_SIZE); info.addr = 0x60; - info.platform_data = &m88ts2022_config; + info.platform_data = &ts2020_config; request_module(info.type); client_tuner = i2c_new_device(adapter, &info); if (client_tuner == NULL || client_tuner->dev.driver == NULL) @@ -2032,13 +2029,12 @@ static int dvb_register(struct cx23885_tsport *port) break; /* attach tuner */ - memset(&m88ts2022_config, 0, sizeof(m88ts2022_config)); - m88ts2022_config.fe = fe0->dvb.frontend; - m88ts2022_config.clock = 27000000; + memset(&ts2020_config, 0, sizeof(ts2020_config)); + ts2020_config.fe = fe0->dvb.frontend; memset(&info, 0, sizeof(struct i2c_board_info)); - strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE); + strlcpy(info.type, "ts2020", I2C_NAME_SIZE); info.addr = 0x60; - info.platform_data = &m88ts2022_config; + info.platform_data = &ts2020_config; request_module(info.type); client_tuner = i2c_new_device(adapter, &info); if (client_tuner == NULL || client_tuner->dev.driver == NULL)