From patchwork Wed May 30 09:09:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuhiro Suzuki X-Patchwork-Id: 137238 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5070111lji; Wed, 30 May 2018 02:10:55 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLPDIihZ1Qji8tLsdEHyU5uBhZeRlLGPAVTTnnU9p6ImAiCKiLgW4NrMyrW9CM/zvqiUwMt X-Received: by 2002:a63:350d:: with SMTP id c13-v6mr1613424pga.426.1527671454902; Wed, 30 May 2018 02:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527671454; cv=none; d=google.com; s=arc-20160816; b=ikG3g3n7gXm/Szrx8NofuGBaef/+mRvUtnH1eyEjZruaXiCRnh3voYBYWBdoacXdfI ed0SnHLdVDxalBQYsXLNtfLBmFLleeLOihczcdQ6/qAP7M06H0uh0AUuid5WKY2CoMdk p97R78jOCGyeS67aRCwbXxQzIbYEGXxIHAwofHPXlR30jbKIQEPh+4h+ZlNMZXW/54uh EOW7CIynglKfnrCxFQR+TZ6FhQz95p9v5sUqFCkn9UayNc89fackprs+U8/oM+MO4psi FPB9j/XERV780W5PFPV09024eWYRvKbfepnGs7NI7QfHVwos92IGieq4a5NhUdJ3NZIX v1SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=1UQNosmg2rUyWkTpF8eVJhixCQhy+6m9sSRT+lD2Qfw=; b=dT3fC95r8VhcMFDPCR2O7Fb9SZXM/vtFLHwqsxXYdEaTbzpDTbCn1Ag7OGGTfi1hf4 +6krxI7D4SdPHR+9f2hbX755OVUKBuomVljzpKmMDRDzOu/aRHbBjyb0HW6StIPfE6tY VFC6o3zxe9Ckq551ZE4Dzvgby7oDrbuVX2fJtV7gwFIzBXespW9xB8MZo2+q+2Q7CUkP Zmlse4mcJnplm/UQuW7LHyjAHKHUa2tD1Nrnz0nNy29Bs2igndwgABX0+T1HIUvElXY3 vmhJTPvdsY9p9H/sou7b2EdMbNTNtwMHBWC2ZPBmwrRXUyNbBHMR0di97kSFELoGBJkk s38A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p6-v6si16037851pgn.73.2018.05.30.02.10.54; Wed, 30 May 2018 02:10:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968753AbeE3JKx (ORCPT + 4 others); Wed, 30 May 2018 05:10:53 -0400 Received: from mx.socionext.com ([202.248.49.38]:35855 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968835AbeE3JJx (ORCPT ); Wed, 30 May 2018 05:09:53 -0400 Received: from unknown (HELO iyokan-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 30 May 2018 18:09:50 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by iyokan-ex.css.socionext.com (Postfix) with ESMTP id 39B516006F; Wed, 30 May 2018 18:09:50 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Wed, 30 May 2018 18:09:50 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by kinkan.css.socionext.com (Postfix) with ESMTP id B242C1A1309; Wed, 30 May 2018 18:09:49 +0900 (JST) Received: from aegis.e01.socionext.com (unknown [10.213.134.210]) by yuzu.css.socionext.com (Postfix) with ESMTP id 8C5AD120139; Wed, 30 May 2018 18:09:49 +0900 (JST) From: Katsuhiro Suzuki To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: Masami Hiramatsu , Jassi Brar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Katsuhiro Suzuki Subject: [PATCH 7/8] media: uniphier: add LD11 adapter driver for ISDB Date: Wed, 30 May 2018 18:09:45 +0900 Message-Id: <20180530090946.1635-8-suzuki.katsuhiro@socionext.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530090946.1635-1-suzuki.katsuhiro@socionext.com> References: <20180530090946.1635-1-suzuki.katsuhiro@socionext.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This patch adds UniPhier LD11 DVB adapter driver for ISDB-S/T that equipments SONY SUT-PJ series using CXD2858 tuner and Socionext MN884433 demodulator. Signed-off-by: Katsuhiro Suzuki --- drivers/media/platform/uniphier/Kconfig | 10 + drivers/media/platform/uniphier/Makefile | 1 + .../platform/uniphier/ld11-mn884433-helene.c | 265 ++++++++++++++++++ 3 files changed, 276 insertions(+) create mode 100644 drivers/media/platform/uniphier/ld11-mn884433-helene.c -- 2.17.0 diff --git a/drivers/media/platform/uniphier/Kconfig b/drivers/media/platform/uniphier/Kconfig index 8f3a662a391c..0fc9bbfc170b 100644 --- a/drivers/media/platform/uniphier/Kconfig +++ b/drivers/media/platform/uniphier/Kconfig @@ -15,3 +15,13 @@ config DVB_UNIPHIER_LD11 Driver for the HSC (High speed Stream Controller) for UniPhier LD11/LD20. Say Y when you want to support this hardware. + +config DVB_UNIPHIER_LD11_ISDB + bool "Support UniPhier LD11 ISDB adapters" + depends on DVB_UNIPHIER + help + Driver for LD11 ISDB-S/T adapters which use + Demux: Socionext LD11 HSC + Demod: Socionext MN884433 + Tuner: SONY HELENE (CXD2858ER) + Say Y when you want to support this adapters. diff --git a/drivers/media/platform/uniphier/Makefile b/drivers/media/platform/uniphier/Makefile index 9e75ad081b77..e4b06f8a37b5 100644 --- a/drivers/media/platform/uniphier/Makefile +++ b/drivers/media/platform/uniphier/Makefile @@ -8,3 +8,4 @@ ccflags-y += -Idrivers/media/dvb-frontends/ ccflags-y += -Idrivers/media/tuners/ uniphier-dvb-y += uniphier-adapter.o +uniphier-dvb-$(CONFIG_DVB_UNIPHIER_LD11_ISDB) += ld11-mn884433-helene.o diff --git a/drivers/media/platform/uniphier/ld11-mn884433-helene.c b/drivers/media/platform/uniphier/ld11-mn884433-helene.c new file mode 100644 index 000000000000..f4f48b6a0211 --- /dev/null +++ b/drivers/media/platform/uniphier/ld11-mn884433-helene.c @@ -0,0 +1,265 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Socionext UniPhier LD11 adapter driver for ISDB. +// Using Socionext MN884433 ISDB-S/ISDB-T demodulator and +// SONY HELENE tuner. +// +// Copyright (c) 2018 Socionext Inc. + +#include +#include +#include +#include +#include +#include + +#include "sc1501a.h" +#include "cxd2858.h" +#include "helene.h" +#include "hsc.h" +#include "uniphier-adapter.h" + +static struct sc1501a_config mn884433_conf[] = { + { .if_freq = LOW_IF_4MHZ, }, +}; + +static int uniphier_adapter_demod_probe(struct uniphier_adapter_priv *priv) +{ + const struct uniphier_adapter_spec *spec = priv->spec; + struct device *dev = &priv->pdev->dev; + struct device_node *node; + int ret, i; + + priv->demod_mclk = devm_clk_get(dev, "demod-mclk"); + if (IS_ERR(priv->demod_mclk)) { + dev_err(dev, "Failed to request demod-mclk: %ld\n", + PTR_ERR(priv->demod_mclk)); + return PTR_ERR(priv->demod_mclk); + } + + priv->demod_gpio = devm_gpiod_get_optional(dev, "reset-demod", + GPIOD_OUT_HIGH); + if (IS_ERR(priv->demod_gpio)) { + dev_err(dev, "Failed to request demod_gpio: %ld\n", + PTR_ERR(priv->demod_gpio)); + return PTR_ERR(priv->demod_gpio); + } + + node = of_parse_phandle(dev->of_node, "demod-i2c-bus", 0); + if (!node) { + dev_err(dev, "Failed to parse demod-i2c-bus\n"); + return -ENODEV; + } + + priv->demod_i2c_adapter = of_find_i2c_adapter_by_node(node); + if (!priv->demod_i2c_adapter) { + dev_err(dev, "Failed to find demod i2c adapter\n"); + of_node_put(node); + return -ENODEV; + } + of_node_put(node); + + mn884433_conf[0].reset_gpio = priv->demod_gpio; + for (i = 0; i < spec->adapters; i++) { + struct i2c_client *c; + + mn884433_conf[i].mclk = priv->demod_mclk; + mn884433_conf[i].fe = &priv->fe[i].fe; + + c = dvb_module_probe(spec->demod_i2c_info[i].type, NULL, + priv->demod_i2c_adapter, + spec->demod_i2c_info[i].addr, + &mn884433_conf[i]); + if (!c) { + dev_err(dev, "Failed to probe demod\n"); + ret = -ENODEV; + goto err_out; + } + priv->fe[i].demod_i2c = c; + } + + return 0; + +err_out: + for (i = 0; i < spec->adapters; i++) + dvb_module_release(priv->fe[i].demod_i2c); + + return ret; +} + +static struct helene_config helene_conf[] = { + { .xtal = SONY_HELENE_XTAL_16000, }, + { .xtal = SONY_HELENE_XTAL_16000, }, +}; + +static int uniphier_adapter_tuner_probe(struct uniphier_adapter_priv *priv) +{ + const struct uniphier_adapter_spec *spec = priv->spec; + struct device *dev = &priv->pdev->dev; + struct device_node *node; + int ret, i; + + priv->tuner_gpio = devm_gpiod_get_optional(dev, "reset-tuner", + GPIOD_OUT_HIGH); + if (IS_ERR(priv->tuner_gpio)) { + dev_err(dev, "Failed to request tuner_gpio: %ld\n", + PTR_ERR(priv->tuner_gpio)); + return PTR_ERR(priv->tuner_gpio); + } + gpiod_set_value_cansleep(priv->tuner_gpio, 0); + + node = of_parse_phandle(dev->of_node, "tuner-i2c-bus", 0); + if (!node) { + dev_err(dev, "Failed to parse tuner-i2c-bus\n"); + return -ENODEV; + } + + priv->tuner_i2c_adapter = of_find_i2c_adapter_by_node(node); + if (!priv->tuner_i2c_adapter) { + dev_err(dev, "Failed to find tuner i2c adapter\n"); + of_node_put(node); + return -ENODEV; + } + of_node_put(node); + + for (i = 0; i < priv->spec->adapters; i++) { + struct i2c_client *c; + + helene_conf[i].fe = priv->fe[i].fe; + + c = dvb_module_probe(spec->tuner_i2c_info[i].type, NULL, + priv->tuner_i2c_adapter, + spec->tuner_i2c_info[i].addr, + &helene_conf[i]); + if (!c) { + dev_err(dev, "Failed to probe tuner\n"); + ret = -ENODEV; + goto err_out; + } + priv->fe[i].tuner_i2c = c; + } + + return 0; + +err_out: + for (i = 0; i < spec->adapters; i++) + dvb_module_release(priv->fe[i].tuner_i2c); + + return ret; +} + +static int uniphier_adapter_probe(struct platform_device *pdev) +{ + struct uniphier_adapter_priv *priv; + struct device *dev = &pdev->dev; + int i, ret; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + priv->pdev = pdev; + + priv->spec = of_device_get_match_data(dev); + if (!priv->spec) + return -EINVAL; + + priv->fe = devm_kzalloc(dev, sizeof(*priv->fe) * priv->spec->adapters, + GFP_KERNEL); + if (!priv->fe) + return -ENOMEM; + + ret = uniphier_adapter_demux_probe(priv); + if (ret) + return ret; + + ret = uniphier_adapter_demod_probe(priv); + if (ret) + return ret; + + ret = uniphier_adapter_tuner_probe(priv); + if (ret) + return ret; + + platform_set_drvdata(pdev, priv); + + for (i = 0; i < priv->spec->adapters; i++) { + priv->chip->tsif[i].fe = priv->fe[i].fe; + + ret = hsc_register_dvb(&priv->chip->tsif[i]); + if (ret) { + dev_err(dev, "Failed to register adapter\n"); + goto err_out_if; + } + } + + return 0; + +err_out_if: + for (i = 0; i < priv->spec->adapters; i++) + hsc_unregister_dvb(&priv->chip->tsif[i]); + + return ret; +} + +static int uniphier_adapter_remove(struct platform_device *pdev) +{ + struct uniphier_adapter_priv *priv = platform_get_drvdata(pdev); + int i; + + for (i = 0; i < priv->spec->adapters; i++) { + hsc_dmaif_release(&priv->chip->dmaif[i]); + hsc_tsif_release(&priv->chip->tsif[i]); + hsc_unregister_dvb(&priv->chip->tsif[i]); + dvb_module_release(priv->fe[i].tuner_i2c); + dvb_module_release(priv->fe[i].demod_i2c); + } + + return 0; +} + +static const struct hsc_conf ld11_hsc_conf[] = { + { + .css_in = HSC_CSS_IN_SRLTS0, + .css_out = HSC_CSS_OUT_TSI0, + .dpll = HSC_DPLL0, + .dma_out = HSC_DMA_OUT0, + }, +}; + +static const struct i2c_board_info mn884433_i2c_info[] = { + { .type = "mn884433", .addr = 0x68, }, +}; + +static const struct i2c_board_info helene_i2c_info[] = { + { .type = "helene", .addr = 0x61, }, +}; + +static const struct uniphier_adapter_spec ld11_mn884433_helene_spec = { + .adapters = 1, + .hsc_conf = ld11_hsc_conf, + .demod_i2c_info = mn884433_i2c_info, + .tuner_i2c_info = helene_i2c_info, +}; + +static const struct of_device_id uniphier_hsc_adapter_of_match[] = { + { + .compatible = "socionext,uniphier-ld11-mn884433-helene", + .data = &ld11_mn884433_helene_spec, + }, + {}, +}; +MODULE_DEVICE_TABLE(of, uniphier_hsc_adapter_of_match); + +static struct platform_driver uniphier_hsc_adapter_driver = { + .driver = { + .name = "uniphier-ld11-isdb", + .of_match_table = of_match_ptr(uniphier_hsc_adapter_of_match), + }, + .probe = uniphier_adapter_probe, + .remove = uniphier_adapter_remove, +}; +module_platform_driver(uniphier_hsc_adapter_driver); + +MODULE_AUTHOR("Katsuhiro Suzuki "); +MODULE_DESCRIPTION("UniPhier LD11 adapter driver for ISDB."); +MODULE_LICENSE("GPL v2");