From patchwork Mon Apr 2 18:24:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scheller X-Patchwork-Id: 10320167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9338C60116 for ; Mon, 2 Apr 2018 18:24:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 837AF28A4C for ; Mon, 2 Apr 2018 18:24:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 761C628A67; Mon, 2 Apr 2018 18:24:56 +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.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 1171C28A4C for ; Mon, 2 Apr 2018 18:24:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754175AbeDBSYx (ORCPT ); Mon, 2 Apr 2018 14:24:53 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35381 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753138AbeDBSYr (ORCPT ); Mon, 2 Apr 2018 14:24:47 -0400 Received: by mail-wm0-f67.google.com with SMTP id r82so29280405wme.0 for ; Mon, 02 Apr 2018 11:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=PELYrCQgm2yL8yDyAtfB8CYAFGXTx5z/zkdbsl2hy5o=; b=jJY7BJogtzMje7HHaSkCC8Jvx7FoAO4LJQzTPik6nAB3x+3iCLEPzTGbZ6AyOgwUbe NmUi5n7YRp8chuJe48qJHvN20KKLAtr7+/REkRTWIt1GTvDgLpTtqOWkmoQmEACeOQXF DcDVoqfTf+Q8KiTYpC2p+4LwyP5W05G3m5FMQI5fH5ayBqkyWzp57mmt+TrC45JIRJNZ eV7R2VrO+mT+uQqVvSArNeMMqlebtMxXv2eAUKHzLRKr4A7y2T/jHUcgYCjOR0GDaRLJ ALeM5w543Soynja5saJYBzpIA0XGQyIYOZa3aiNtZalMqVWCbLcV/lBVZQlOJLFhR2Vp a15g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PELYrCQgm2yL8yDyAtfB8CYAFGXTx5z/zkdbsl2hy5o=; b=B5xyrROIeJ9SWoJsh5j+K4b8yT4jiuRosNtW8Hx9V3aqcpO1C1KfQPnLYWOJ8nQ/DL O9OmVYWaKWTM2qAQAyI3BByLeU9uy2fqbxkGPWRMb4VuS4lgsH6bHmk8+XuW5k0eyMtN iu0Ga3PiJ1dZLHFKAeYYeROcTnJuV/jFgC37qHHT7HOeQeXCgS9S0WfqWRnsKn9knAh5 C88kHlz+1Y8zs8rC692c20meumg3L3sYv7X92z9ynkGn5Pm7CXfSZITqPgMDH6yrJZyg Oty/5syAqO2HJZj8fptI3Tgvi4xMV3XJ9V6vzA3mUBmMHWIwoOMimRjt6Dqiy2vSdGTm R7CQ== X-Gm-Message-State: AElRT7E+dU1wyCn2BVi9tEJYknXI/81hHdyjzkqR2UIi6vU/U/Mn615x Wb8CUVoyz9v7b9AA/1N54r6Xpw== X-Google-Smtp-Source: AIpwx4/sXY0CdO1vIhpI/NynclKGDiVRA9Irs66Jri7cQeot2D1Y8fowbwTfkHOLW2MRi2AITcQ+uA== X-Received: by 10.28.21.4 with SMTP id 4mr1580615wmv.34.1522693486224; Mon, 02 Apr 2018 11:24:46 -0700 (PDT) Received: from dvbdev.wuest.de (ip-84-118-193-200.unity-media.net. [84.118.193.200]) by smtp.gmail.com with ESMTPSA id x9sm2368273wrb.18.2018.04.02.11.24.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 11:24:45 -0700 (PDT) From: Daniel Scheller To: linux-media@vger.kernel.org, mchehab@kernel.org, mchehab@s-opensource.com Subject: [PATCH 18/20] [media] ddbridge: add hardware defs and PCI IDs for MCI cards Date: Mon, 2 Apr 2018 20:24:25 +0200 Message-Id: <20180402182427.20918-19-d.scheller.oss@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180402182427.20918-1-d.scheller.oss@gmail.com> References: <20180402182427.20918-1-d.scheller.oss@gmail.com> 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: Daniel Scheller Add PCI IDs and ddb_info for the new MCI-based MaxSX8 cards. Also add needed defines so the cards can be hooked up into ddbridge's probe and attach handling. Picked up from the upstream dddvb-0.9.33 release. Signed-off-by: Daniel Scheller --- drivers/media/pci/ddbridge/ddbridge-hw.c | 11 +++++++++++ drivers/media/pci/ddbridge/ddbridge-main.c | 1 + drivers/media/pci/ddbridge/ddbridge.h | 11 +++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/media/pci/ddbridge/ddbridge-hw.c b/drivers/media/pci/ddbridge/ddbridge-hw.c index c6d14925e2fc..1d3ee6accdd5 100644 --- a/drivers/media/pci/ddbridge/ddbridge-hw.c +++ b/drivers/media/pci/ddbridge/ddbridge-hw.c @@ -311,6 +311,16 @@ static const struct ddb_info ddb_s2_48 = { .tempmon_irq = 24, }; +static const struct ddb_info ddb_s2x_48 = { + .type = DDB_OCTOPUS_MCI, + .name = "Digital Devices MAX SX8", + .regmap = &octopus_map, + .port_num = 4, + .i2c_mask = 0x00, + .tempmon_irq = 24, + .mci = 4 +}; + /****************************************************************************/ /****************************************************************************/ /****************************************************************************/ @@ -346,6 +356,7 @@ static const struct ddb_device_id ddb_device_ids[] = { DDB_DEVID(0x0008, 0x0036, ddb_isdbt_8), DDB_DEVID(0x0008, 0x0037, ddb_c2t2i_v0_8), DDB_DEVID(0x0008, 0x0038, ddb_c2t2i_8), + DDB_DEVID(0x0009, 0x0025, ddb_s2x_48), DDB_DEVID(0x0006, 0x0039, ddb_ctv7), DDB_DEVID(0x0011, 0x0040, ddb_ci), DDB_DEVID(0x0011, 0x0041, ddb_cis), diff --git a/drivers/media/pci/ddbridge/ddbridge-main.c b/drivers/media/pci/ddbridge/ddbridge-main.c index 6356b48b3874..f4748cfd904b 100644 --- a/drivers/media/pci/ddbridge/ddbridge-main.c +++ b/drivers/media/pci/ddbridge/ddbridge-main.c @@ -264,6 +264,7 @@ static const struct pci_device_id ddb_id_table[] = { DDB_DEVICE_ANY(0x0006), DDB_DEVICE_ANY(0x0007), DDB_DEVICE_ANY(0x0008), + DDB_DEVICE_ANY(0x0009), DDB_DEVICE_ANY(0x0011), DDB_DEVICE_ANY(0x0012), DDB_DEVICE_ANY(0x0013), diff --git a/drivers/media/pci/ddbridge/ddbridge.h b/drivers/media/pci/ddbridge/ddbridge.h index cb69021a3443..72fe33cb72b9 100644 --- a/drivers/media/pci/ddbridge/ddbridge.h +++ b/drivers/media/pci/ddbridge/ddbridge.h @@ -112,11 +112,12 @@ struct ddb_ids { struct ddb_info { int type; -#define DDB_NONE 0 -#define DDB_OCTOPUS 1 -#define DDB_OCTOPUS_CI 2 -#define DDB_OCTOPUS_MAX 5 +#define DDB_NONE 0 +#define DDB_OCTOPUS 1 +#define DDB_OCTOPUS_CI 2 +#define DDB_OCTOPUS_MAX 5 #define DDB_OCTOPUS_MAX_CT 6 +#define DDB_OCTOPUS_MCI 9 char *name; u32 i2c_mask; u8 port_num; @@ -133,6 +134,7 @@ struct ddb_info { #define TS_QUIRK_REVERSED 2 #define TS_QUIRK_ALT_OSC 8 u32 tempmon_irq; + u8 mci; const struct ddb_regmap *regmap; }; @@ -253,6 +255,7 @@ struct ddb_port { #define DDB_CI_EXTERNAL_XO2_B 13 #define DDB_TUNER_DVBS_STV0910_PR 14 #define DDB_TUNER_DVBC2T2I_SONY_P 15 +#define DDB_TUNER_MCI 16 #define DDB_TUNER_XO2 32 #define DDB_TUNER_DVBS_STV0910 (DDB_TUNER_XO2 + 0)