From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755461AbdBGQn3 (ORCPT ); Tue, 7 Feb 2017 11:43:29 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:36007 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755380AbdBGQl7 (ORCPT ); Tue, 7 Feb 2017 11:41:59 -0500 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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) { -- 2.9.3