From patchwork Tue Mar 24 21:12:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 6085901 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 6B706BF90F for ; Tue, 24 Mar 2015 21:13:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89CFD201FE for ; Tue, 24 Mar 2015 21:13:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 805CE201EC for ; Tue, 24 Mar 2015 21:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752387AbbCXVNP (ORCPT ); Tue, 24 Mar 2015 17:13:15 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:44465 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753002AbbCXVNJ (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-Fw; Tue, 24 Mar 2015 23:13:08 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Antti Palosaari , Nibble Max Subject: [PATCH 5/8] smipcie: switch ts2022 to ts2020 driver Date: Tue, 24 Mar 2015 23:12:10 +0200 Message-Id: <1427231533-4277-6-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 tuner chip models. Cc: Nibble Max Signed-off-by: Antti Palosaari --- drivers/media/pci/smipcie/Kconfig | 2 +- drivers/media/pci/smipcie/smipcie.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/media/pci/smipcie/Kconfig b/drivers/media/pci/smipcie/Kconfig index c8de53f..21a1583 100644 --- a/drivers/media/pci/smipcie/Kconfig +++ b/drivers/media/pci/smipcie/Kconfig @@ -4,7 +4,7 @@ config DVB_SMIPCIE select I2C_ALGOBIT select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT - select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT + select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT help diff --git a/drivers/media/pci/smipcie/smipcie.c b/drivers/media/pci/smipcie/smipcie.c index 36c8ed7..4115925 100644 --- a/drivers/media/pci/smipcie/smipcie.c +++ b/drivers/media/pci/smipcie/smipcie.c @@ -16,7 +16,7 @@ #include "smipcie.h" #include "m88ds3103.h" -#include "m88ts2022.h" +#include "ts2020.h" #include "m88rs6000t.h" #include "si2168.h" #include "si2157.h" @@ -532,9 +532,7 @@ static int smi_dvbsky_m88ds3103_fe_attach(struct smi_port *port) struct i2c_adapter *tuner_i2c_adapter; struct i2c_client *tuner_client; struct i2c_board_info tuner_info; - struct m88ts2022_config m88ts2022_config = { - .clock = 27000000, - }; + struct ts2020_config ts2020_config = {}; memset(&tuner_info, 0, sizeof(struct i2c_board_info)); i2c = (port->idx == 0) ? &dev->i2c_bus[0] : &dev->i2c_bus[1]; @@ -546,10 +544,10 @@ static int smi_dvbsky_m88ds3103_fe_attach(struct smi_port *port) return ret; } /* attach tuner */ - m88ts2022_config.fe = port->fe; - strlcpy(tuner_info.type, "m88ts2022", I2C_NAME_SIZE); + ts2020_config.fe = port->fe; + strlcpy(tuner_info.type, "ts2020", I2C_NAME_SIZE); tuner_info.addr = 0x60; - tuner_info.platform_data = &m88ts2022_config; + tuner_info.platform_data = &ts2020_config; tuner_client = smi_add_i2c_client(tuner_i2c_adapter, &tuner_info); if (!tuner_client) { ret = -ENODEV;