From patchwork Fri Nov 14 21:19:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: CrazyCat X-Patchwork-Id: 5309591 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 03E6AC11AC for ; Fri, 14 Nov 2014 21:27:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF06B20145 for ; Fri, 14 Nov 2014 21:27:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C5BE20131 for ; Fri, 14 Nov 2014 21:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161911AbaKNV1b (ORCPT ); Fri, 14 Nov 2014 16:27:31 -0500 Received: from forward3p.cmail.yandex.net ([77.88.31.18]:34174 "EHLO forward3p.cmail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754335AbaKNV1b (ORCPT ); Fri, 14 Nov 2014 16:27:31 -0500 X-Greylist: delayed 459 seconds by postgrey-1.27 at vger.kernel.org; Fri, 14 Nov 2014 16:27:30 EST Received: from smtp19.mail.yandex.net (smtp19.mail.yandex.net [95.108.252.19]) by forward3p.cmail.yandex.net (Yandex) with ESMTP id AF67211E3 for ; Sat, 15 Nov 2014 00:19:41 +0300 (MSK) Received: from smtp19.mail.yandex.net (localhost [127.0.0.1]) by smtp19.mail.yandex.net (Yandex) with ESMTP id 88C0DBE0380 for ; Sat, 15 Nov 2014 00:19:41 +0300 (MSK) Received: from 46-211-122-71-gprs.kyivstar.net (46-211-122-71-gprs.kyivstar.net [46.211.122.71]) by smtp19.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id qElYG7Fx0t-JeSCkbWA; Sat, 15 Nov 2014 00:19:40 +0300 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (Client certificate not present) X-Yandex-Uniq: a70d5309-d7ea-4f2b-8e29-e0f4e5e1a4df DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narod.ru; s=mail; t=1415999981; bh=lbGUe8WhHZN6f8lzuT+h6dw0QL3tx4NZZeplaa03rqE=; h=From:To:Subject:Date:Message-ID:User-Agent:MIME-Version: Content-Transfer-Encoding:Content-Type; b=hLfAc39W/m0FmY07jZOSLem0lhd03OB3lOT/NAuCojI8jJIWGFlcgWMlePpI9GWnQ WVFthqiRbP2OmADYlWACegsnYttuRuWrSWBi9dB9Y0odrbbiTlo4ZWK2b8cCNedjEj 9zMotJlA+C70uVbjkvhC/scaQ2+L0PWfZXKy8sq0= Authentication-Results: smtp19.mail.yandex.net; dkim=pass header.i=@narod.ru From: CrazyCat To: linux-media Subject: [PATCH 1/3] tuners: si2157: Si2148 support. Date: Fri, 14 Nov 2014 23:19:37 +0200 Message-ID: <1918522.5V5b9CGsli@computer> User-Agent: KMail/4.13.1 (Linux/3.13.0-24-generic; KDE/4.13.1; x86_64; ; ) MIME-Version: 1.0 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Si2148-A20 silicon tuner support. Signed-off-by: Evgeny Plehov --- drivers/media/tuners/si2157.c | 10 ++++++---- drivers/media/tuners/si2157.h | 2 +- drivers/media/tuners/si2157_priv.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index 25146fa..91f8290 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c @@ -1,5 +1,5 @@ /* - * Silicon Labs Si2147/2157/2158 silicon tuner driver + * Silicon Labs Si2147/2148/2157/2158 silicon tuner driver * * Copyright (C) 2014 Antti Palosaari * @@ -112,11 +112,13 @@ static int si2157_init(struct dvb_frontend *fe) cmd.args[4] << 0; #define SI2158_A20 ('A' << 24 | 58 << 16 | '2' << 8 | '0' << 0) + #define SI2148_A20 ('A' << 24 | 48 << 16 | '2' << 8 | '0' << 0) #define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0) #define SI2147_A30 ('A' << 24 | 47 << 16 | '3' << 8 | '0' << 0) switch (chip_id) { case SI2158_A20: + case SI2148_A20: fw_file = SI2158_A20_FIRMWARE; break; case SI2157_A30: @@ -309,7 +311,7 @@ static int si2157_get_if_frequency(struct dvb_frontend *fe, u32 *frequency) static const struct dvb_tuner_ops si2157_ops = { .info = { - .name = "Silicon Labs Si2157/Si2158", + .name = "Silicon Labs Si2147/2148/2157/Si2158", .frequency_min = 110000000, .frequency_max = 862000000, }, @@ -373,7 +375,7 @@ static int si2157_probe(struct i2c_client *client, i2c_set_clientdata(client, s); dev_info(&s->client->dev, - "Silicon Labs Si2157/Si2158 successfully attached\n"); + "Silicon Labs Si2147/2148/2157/Si2158 successfully attached\n"); return 0; err: dev_dbg(&client->dev, "failed=%d\n", ret); @@ -414,7 +416,7 @@ static struct i2c_driver si2157_driver = { module_i2c_driver(si2157_driver); -MODULE_DESCRIPTION("Silicon Labs Si2157/Si2158 silicon tuner driver"); +MODULE_DESCRIPTION("Silicon Labs Si2147/2148/2157/Si2158 silicon tuner driver"); MODULE_AUTHOR("Antti Palosaari "); MODULE_LICENSE("GPL"); MODULE_FIRMWARE(SI2158_A20_FIRMWARE); diff --git a/drivers/media/tuners/si2157.h b/drivers/media/tuners/si2157.h index d3b19ca..c439d0e 100644 --- a/drivers/media/tuners/si2157.h +++ b/drivers/media/tuners/si2157.h @@ -1,5 +1,5 @@ /* - * Silicon Labs Si2147/2157/2158 silicon tuner driver + * Silicon Labs Si2147/2148/2157/2158 silicon tuner driver * * Copyright (C) 2014 Antti Palosaari * diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h index e71ffaf..6d2aac4 100644 --- a/drivers/media/tuners/si2157_priv.h +++ b/drivers/media/tuners/si2157_priv.h @@ -1,5 +1,5 @@ /* - * Silicon Labs Si2147/2157/2158 silicon tuner driver + * Silicon Labs Si2147/2148/2157/2158 silicon tuner driver * * Copyright (C) 2014 Antti Palosaari *