From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: Kevin Hilman <khilman@kernel.org>, Sekhar Nori <nsekhar@ti.com>,
Patrick Titiano <ptitiano@baylibre.com>,
Michael Turquette <mturquette@baylibre.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Russell King <linux@armlinux.org.uk>,
Alexandre Bailon <abailon@baylibre.com>,
David Lechner <david@lechnology.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Lad Prabhakar <prabhakar.csengg@gmail.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 10/10] ARM: davinci: add pdata-quirks for da850-evm vpif display
Date: Tue, 7 Feb 2017 17:41:23 +0100 [thread overview]
Message-ID: <1486485683-11427-11-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com>
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 <bgolaszewski@baylibre.com>
---
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 <linux/kernel.h>
#include <linux/of_platform.h>
+#include <linux/gpio.h>
#include <media/i2c/tvp514x.h>
+#include <media/i2c/adv7343.h>
#include <mach/common.h>
#include <mach/da8xx.h>
#include <mach/mux.h>
+#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
next prev parent reply other threads:[~2017-02-07 16:43 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 16:41 [PATCH 00/10] ARM: davinci: add vpif display support Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 01/10] media: dt-bindings: vpif: fix whitespace errors Bartosz Golaszewski
2017-02-15 22:01 ` Rob Herring
2017-02-07 16:41 ` [PATCH 02/10] ARM: dts: da850-evm: " Bartosz Golaszewski
2017-02-13 18:28 ` Kevin Hilman
2017-02-13 18:35 ` Kevin Hilman
2017-02-13 21:01 ` Kevin Hilman
2017-02-14 6:30 ` Sekhar Nori
2017-02-07 16:41 ` [PATCH 03/10] media: dt-bindings: vpif: extend the example with an output port Bartosz Golaszewski
2017-02-15 22:03 ` Rob Herring
2017-02-15 22:08 ` Rob Herring
2017-02-16 7:32 ` Laurent Pinchart
2017-02-16 16:06 ` Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 04/10] ARM: dts: da850-evm: add the output port to the vpif node Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 05/10] ARM: dts: da850: add vpif video display pins Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 06/10] ARM: davinci_all_defconfig: enable VPIF display modules Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 07/10] ARM: davinci: fix a whitespace error Bartosz Golaszewski
2017-02-13 18:36 ` Kevin Hilman
2017-02-13 21:04 ` Kevin Hilman
2017-02-07 16:41 ` [PATCH 08/10] ARM: davinci: fix the DT boot on da850-evm Bartosz Golaszewski
2017-02-07 18:21 ` Kevin Hilman
2017-02-09 15:23 ` Sekhar Nori
2017-02-09 16:44 ` Bartosz Golaszewski
2017-02-13 18:35 ` Kevin Hilman
2017-02-07 16:41 ` [PATCH 09/10] media: vpif: use a configurable i2c_adapter_id for vpif display Bartosz Golaszewski
2017-02-07 18:16 ` Kevin Hilman
2017-02-07 16:41 ` Bartosz Golaszewski [this message]
2017-02-07 18:20 ` [PATCH 10/10] ARM: davinci: add pdata-quirks for da850-evm " Kevin Hilman
2017-02-08 13:26 ` Bartosz Golaszewski
2017-02-10 19:40 ` Kevin Hilman
2017-02-13 9:22 ` [PATCH 00/10] ARM: davinci: add vpif display support Sekhar Nori
2017-02-16 17:48 ` Bartosz Golaszewski
2017-03-09 10:53 ` Hans Verkuil
2017-03-09 11:00 ` Bartosz Golaszewski
2017-03-09 12:05 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1486485683-11427-11-git-send-email-bgolaszewski@baylibre.com \
--to=bgolaszewski@baylibre.com \
--cc=abailon@baylibre.com \
--cc=david@lechnology.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@kernel.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=mturquette@baylibre.com \
--cc=nsekhar@ti.com \
--cc=prabhakar.csengg@gmail.com \
--cc=ptitiano@baylibre.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).