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: 39260 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cb8ru-0002wr-UG; Tue, 07 Feb 2017 16:43:50 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-5) with esmtp id 1cb8rs-0002W1-8o; Tue, 07 Feb 2017 17:43:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755228AbdBGQn1 (ORCPT + 1 other); Tue, 7 Feb 2017 11:43:27 -0500 Received: from mail-wr0-f172.google.com ([209.85.128.172]:36443 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755378AbdBGQl7 (ORCPT ); Tue, 7 Feb 2017 11:41:59 -0500 Received: by mail-wr0-f172.google.com with SMTP id k90so41813766wrc.3 for ; Tue, 07 Feb 2017 08:41:58 -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=JNnwnYcz9PAhBYi5RvlYDSNFBd+4655bhcF/tq+pxX3Iwdvx1kFHMthTSWCZv0oCd6 JT1yxhAd5FHlZl/glJCqQtQc6ihfdon7aO583kSXTI3QfTSUA+m2+54jGhHr6iuG2IFg uBH5utVV1OPmkh6/A9lJR+hllqvr9Dr72kWFfS+TlA2YvR3kNij8yydRqtXPUbjQRdZl ZHXhF906bit9Z7Dqi2YnQfrWTcq1C2czDTUTG4vn+0A9QaXKLllcsxTAeGLPS0bHTH/H Ir0Y3l7QrU+hwTDeFERz/owZe+yWAdCxOBuWs0Ed0PeLWeDKX1inGZroAW8eUyqR7gEh 4T5A== X-Gm-Message-State: AIkVDXI9ciJoeWztU1NMzz2tmPvgjRHPylVte0KIvlrZA9+i1QeTTuTQ8t0DIwWeX7wGwgra 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 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, Bartosz Golaszewski 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> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.2.7.163617 X-PMX-Spam: Gauge=X, Probability=10%, Report=' HASHBUSTER_BLOCK_V2 0.5, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FROM_DOMAIN_IN_ANY_TO2 0, __FROM_DOMAIN_IN_RCPT 0, __HASHBUSTER_BLOCK_V2_1 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' 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) {