All of lore.kernel.org
 help / color / mirror / Atom feed
From: William Towle <william.towle@codethink.co.uk>
To: linux-media@vger.kernel.org, linux-kernel@lists.codethink.co.uk
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
	Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
	Hans Verkuil <hverkuil@xs4all.nl>
Subject: [PATCH 06/15] media: adv7604: ability to read default input port from DT
Date: Wed, 27 May 2015 17:10:44 +0100	[thread overview]
Message-ID: <1432743053-13479-7-git-send-email-william.towle@codethink.co.uk> (raw)
In-Reply-To: <1432743053-13479-1-git-send-email-william.towle@codethink.co.uk>

From: Ian Molton <ian.molton@codethink.co.uk>

Adds support to the adv7604 driver for specifying the default input
port in the Device tree. If no value is provided, the driver will be
unable to select an input without help from userspace.

Tested-by: William Towle <william.towle@codethink.co.uk>
Signed-off-by: Ian Molton <ian.molton@codethink.co.uk>
---
 Documentation/devicetree/bindings/media/i2c/adv7604.txt |    3 +++
 drivers/media/i2c/adv7604.c                             |    8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.txt b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
index 7eafdbc..8337f75 100644
--- a/Documentation/devicetree/bindings/media/i2c/adv7604.txt
+++ b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
@@ -47,6 +47,7 @@ Optional Endpoint Properties:
   If none of hsync-active, vsync-active and pclk-sample is specified the
   endpoint will use embedded BT.656 synchronization.
 
+  - default-input: Select which input is selected after reset.
 
 Example:
 
@@ -60,6 +61,8 @@ Example:
 		#address-cells = <1>;
 		#size-cells = <0>;
 
+		default-input = <0>;
+
 		port@0 {
 			reg = <0>;
 		};
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index c5a1566..ec8161d 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -2745,6 +2745,7 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
 	struct device_node *endpoint;
 	struct device_node *np;
 	unsigned int flags;
+	u32 v;
 
 	np = state->i2c_clients[ADV76XX_PAGE_IO]->dev.of_node;
 
@@ -2754,6 +2755,12 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
 		return -EINVAL;
 
 	v4l2_of_parse_endpoint(endpoint, &bus_cfg);
+
+	if (!of_property_read_u32(endpoint, "default-input", &v))
+		state->pdata.default_input = v;
+	else
+		state->pdata.default_input = -1;
+
 	of_node_put(endpoint);
 
 	flags = bus_cfg.bus.parallel.flags;
@@ -2792,7 +2799,6 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
 	/* Hardcode the remaining platform data fields. */
 	state->pdata.disable_pwrdnb = 0;
 	state->pdata.disable_cable_det_rst = 0;
-	state->pdata.default_input = -1;
 	state->pdata.blank_data = 1;
 	state->pdata.alt_data_sat = 1;
 	state->pdata.op_format_mode_sel = ADV7604_OP_FORMAT_MODE0;
-- 
1.7.10.4


  parent reply	other threads:[~2015-05-27 16:10 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-27 16:10 HDMI and Composite capture on Lager, for kernel 4.1, version 2 William Towle
2015-05-27 16:10 ` [PATCH 01/15] ARM: shmobile: lager dts: Add entries for VIN HDMI input support William Towle
2015-05-27 16:10 ` [PATCH 02/15] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 " William Towle
2015-05-27 16:10 ` [PATCH 03/15] media: adv7180: add of match table William Towle
2015-05-27 16:10 ` [PATCH 04/15] media: adv7604: chip info and formats for ADV7612 William Towle
2015-05-27 16:10 ` [PATCH 05/15] media: adv7604: document support for ADV7612 dual HDMI input decoder William Towle
2015-05-27 16:10 ` William Towle [this message]
2015-05-27 16:10 ` [PATCH 07/15] ARM: shmobile: lager dts: specify default-input for ADV7612 William Towle
2015-05-27 16:10 ` [PATCH 08/15] v4l: subdev: Add pad config allocator and init William Towle
2015-05-27 16:10 ` [PATCH 09/15] media: soc_camera pad-aware driver initialisation William Towle
2015-05-27 16:10 ` [PATCH 10/15] media: rcar_vin: Use correct pad number in try_fmt William Towle
2015-05-29 10:24   ` Hans Verkuil
2015-05-27 16:10 ` [PATCH 11/15] media: soc_camera: soc_scale_crop: Use correct pad when calling subdev try_fmt William Towle
2015-05-27 16:10 ` [PATCH 12/15] media: soc_camera: Fill std field in enum_input William Towle
2015-05-27 16:10 ` [PATCH 13/15] media: soc_camera: Fix error reporting in expbuf William Towle
2015-05-27 16:10 ` [PATCH 14/15] media: soc_camera: v4l2-compliance fixes for querycap William Towle
2015-05-27 16:10 ` [PATCH 15/15] media: rcar_vin: Reject videobufs that are too small for current format William Towle
2015-06-03 13:59 HDMI and Composite capture on Lager, for kernel 4.1, version 3 William Towle
2015-06-03 13:59 ` [PATCH 06/15] media: adv7604: ability to read default input port from DT William Towle
2015-06-12  6:29   ` Hans Verkuil
2015-06-25  9:30 HDMI and Composite capture on Lager, for kernel 4.1, version 4 William Towle
2015-06-25  9:31 ` [PATCH 06/15] media: adv7604: ability to read default input port from DT William Towle

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=1432743053-13479-7-git-send-email-william.towle@codethink.co.uk \
    --to=william.towle@codethink.co.uk \
    --cc=g.liakhovetski@gmx.de \
    --cc=hverkuil@xs4all.nl \
    --cc=linux-kernel@lists.codethink.co.uk \
    --cc=linux-media@vger.kernel.org \
    --cc=sergei.shtylyov@cogentembedded.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.