From patchwork Tue Feb 7 16:41:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9560657 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 0C5BB60434 for ; Tue, 7 Feb 2017 16:52:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2A04268AE for ; Tue, 7 Feb 2017 16:52:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6D3D28426; Tue, 7 Feb 2017 16:52:15 +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=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7E65D268AE for ; Tue, 7 Feb 2017 16:52:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cb8zw-0007k0-Hp; Tue, 07 Feb 2017 16:52:08 +0000 Received: from mail-wr0-f181.google.com ([209.85.128.181]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cb8rQ-0002B6-Q1 for linux-arm-kernel@lists.infradead.org; Tue, 07 Feb 2017 16:44:30 +0000 Received: by mail-wr0-f181.google.com with SMTP id o16so41961667wra.1 for ; Tue, 07 Feb 2017 08:42:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=daoeh+/oKGpVdSaPUvoQfA1G7b42/5xXNHAVxg+5338=; b=LjqVTwkBOpPILsZXoaciNNaAyz4lWo8SgXXL5zwrHxMPMqe+hFJ/BFnfRm8IGhGP/D Zd/5wH2vuv5pbuBYmdt8yfYqvX3ULxS5Qoq3sHhkDF9TnsTEL/o7XbpX+ZCSrqzu1EoE +5Yt/5VIM3+ODQJ69koU8I9DrOgMsoz3YunCa4A2KfWNhqGaIwA0laILWiBqWSik2qEi HJa1J/4MCV5gjOxcUG5TgHX94E5f8ZLiPsv3z9qQaZuLSly2WIWM+qoq7QlF+j4SvkeR TOa7mR2UfgC9r/xUfqrHFczGCiY4xlzo5CpovvuuNOUT5ObyThQRq4xSgjQPiDZL0XPt q3Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=daoeh+/oKGpVdSaPUvoQfA1G7b42/5xXNHAVxg+5338=; b=BPNwW3fJXGGDtXLTGT3ajO+SaOkdipW+y5lkeeXxuxB3UUy9a8WrPXdzFRkVJ87de8 Z+njzAVGIBA87kBb/W1T2hjPR4JccK2o/gO5UPi0YEbqmK/cLYW3C1FaQcn57TcZUDpm 8M/OAYqV3F4MKulD5ZF9ISC1MzJzdwucwC7wWyc8t2+EePHTFj5KKehB7AxQ2RCjA1PD Etu+Xtz4m/MfYJDTYz/4Hwovp6zPbeN8JbjnOFe+UCpFcC5a+mzT7+ZkHhXMmzkNiYmb Ehjm4xldcn8a2x27dVgLWcVzUSu8jHieKhRznx064aKQw6lMCs0VtQavj6gr8NKag6J6 JidA== X-Gm-Message-State: AIkVDXLL1p9VPN+EX26ZjVCtI3/BlOPfFEZxjZGprjt0Kv7W7hZH8iYb0xfZL39qX3NjbtJg X-Received: by 10.223.139.137 with SMTP id o9mr17072994wra.88.1486485717684; Tue, 07 Feb 2017 08:41:57 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 8sm3958185wmg.1.2017.02.07.08.41.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Feb 2017 08:41:57 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Sekhar Nori , Patrick Titiano , Michael Turquette , Rob Herring , Mark Rutland , Russell King , Alexandre Bailon , David Lechner , Laurent Pinchart , Mauro Carvalho Chehab , Lad Prabhakar Subject: [PATCH 10/10] ARM: davinci: add pdata-quirks for da850-evm vpif display Date: Tue, 7 Feb 2017 17:41:23 +0100 Message-Id: <1486485683-11427-11-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> References: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170207_084323_401799_ABC3E6DD X-CRM114-Status: GOOD ( 17.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Similarly to vpif capture: we need to register the vpif display driver and the corresponding adv7343 encoder in pdata-quirks as the DT support is not complete. Signed-off-by: Bartosz Golaszewski Reviewed-by: Kevin Hilman --- arch/arm/mach-davinci/pdata-quirks.c | 86 +++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c index 09f62ac..0a55546 100644 --- a/arch/arm/mach-davinci/pdata-quirks.c +++ b/arch/arm/mach-davinci/pdata-quirks.c @@ -9,13 +9,17 @@ */ #include #include +#include #include +#include #include #include #include +#define DA850_EVM_UI_EXP_SEL_VPIF_DISP 5 + struct pdata_init { const char *compatible; void (*fn)(void); @@ -107,7 +111,78 @@ static struct vpif_capture_config da850_vpif_capture_config = { }, .card_name = "DA850/OMAP-L138 Video Capture", }; +#endif /* IS_ENABLED(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) */ + +#if defined(CONFIG_DA850_UI_SD_VIDEO_PORT) +static void vpif_evm_display_setup(void) +{ + int gpio = DAVINCI_N_GPIO + DA850_EVM_UI_EXP_SEL_VPIF_DISP, ret; + + ret = gpio_request(gpio, "sel_c"); + if (ret) { + pr_warn("Cannot open UI expander pin %d\n", gpio); + return; + } + + gpio_direction_output(gpio, 0); +} + +static struct adv7343_platform_data adv7343_pdata = { + .mode_config = { + .dac = { 1, 1, 1 }, + }, + .sd_config = { + .sd_dac_out = { 1 }, + }, +}; + +static struct vpif_subdev_info da850_vpif_subdev[] = { + { + .name = "adv7343", + .board_info = { + I2C_BOARD_INFO("adv7343", 0x2a), + .platform_data = &adv7343_pdata, + }, + }, +}; +static const struct vpif_output da850_ch0_outputs[] = { + { + .output = { + .index = 0, + .name = "Composite", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_STD, + .std = V4L2_STD_ALL, + }, + .subdev_name = "adv7343", + .output_route = ADV7343_COMPOSITE_ID, + }, + { + .output = { + .index = 1, + .name = "S-Video", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_STD, + .std = V4L2_STD_ALL, + }, + .subdev_name = "adv7343", + .output_route = ADV7343_SVIDEO_ID, + }, +}; + +static struct vpif_display_config da850_vpif_display_config = { + .subdevinfo = da850_vpif_subdev, + .subdev_count = ARRAY_SIZE(da850_vpif_subdev), + .chan_config[0] = { + .outputs = da850_ch0_outputs, + .output_count = ARRAY_SIZE(da850_ch0_outputs), + }, + .card_name = "DA850/OMAP-L138 Video Display", +}; +#endif /* defined(CONFIG_DA850_UI_SD_VIDEO_PORT) */ + +#if IS_ENABLED(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) || defined(CONFIG_DA850_UI_SD_VIDEO_PORT) static void __init da850_vpif_legacy_init(void) { int ret; @@ -120,8 +195,17 @@ static void __init da850_vpif_legacy_init(void) if (ret) pr_warn("%s: VPIF capture setup failed: %d\n", __func__, ret); + + /* LCDK doesn't support VPIF display */ + if (of_machine_is_compatible("ti,da850-evm")) { + vpif_evm_display_setup(); + ret = da850_register_vpif_display(&da850_vpif_display_config); + if (ret) + pr_warn("%s: VPIF display setup failed: %d\n", + __func__, ret); + } } -#endif +#endif /* IS_ENABLED(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) || defined(CONFIG_DA850_UI_SD_VIDEO_PORT) */ static void pdata_quirks_check(struct pdata_init *quirks) {