From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: devicetree@vger.kernel.org, slongerbeam@gmail.com,
niklas.soderlund@ragnatech.se
Subject: [PATCH 18/21] v4l: fwnode: Use V4L2 fwnode endpoint media bus type if set
Date: Mon, 23 Jul 2018 16:47:03 +0300 [thread overview]
Message-ID: <20180723134706.15334-19-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20180723134706.15334-1-sakari.ailus@linux.intel.com>
Use the given media bus type set by the caller. If none is given (i.e. the
mbus type is V4L2_MBUS_UNKNOWN, or 0), fall back to the old behaviour.
This is to obtain the information from the DT or try to guess the bus
type.
-ENXIO is returned if the caller sets the bus type but that does not match
with what's in DT.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 8914abd20ee8..56e3b6395171 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -409,7 +409,7 @@ v4l2_fwnode_endpoint_parse_csi1_bus(struct fwnode_handle *fwnode,
static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
struct v4l2_fwnode_endpoint *vep)
{
- u32 bus_type = 0;
+ u32 bus_type = V4L2_FWNODE_BUS_TYPE_GUESS;
enum v4l2_mbus_type mbus_type;
int rval;
@@ -432,13 +432,24 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
v4l2_fwnode_bus_type_to_string(bus_type), bus_type,
v4l2_fwnode_mbus_type_to_string(vep->bus_type),
vep->bus_type);
-
mbus_type = v4l2_fwnode_bus_type_to_mbus(bus_type);
- switch (mbus_type) {
+ if (vep->bus_type != V4L2_MBUS_UNKNOWN) {
+ if (mbus_type != V4L2_MBUS_UNKNOWN &&
+ vep->bus_type != mbus_type) {
+ pr_debug("expecting bus type %s\n",
+ v4l2_fwnode_mbus_type_to_string(
+ vep->bus_type));
+ return -ENXIO;
+ }
+ } else {
+ vep->bus_type = mbus_type;
+ }
+
+ switch (vep->bus_type) {
case V4L2_MBUS_UNKNOWN:
rval = v4l2_fwnode_endpoint_parse_csi2_bus(fwnode, vep,
- mbus_type);
+ V4L2_MBUS_UNKNOWN);
if (rval)
return rval;
@@ -457,20 +468,19 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
case V4L2_MBUS_CCP2:
case V4L2_MBUS_CSI1:
- v4l2_fwnode_endpoint_parse_csi1_bus(fwnode, vep, mbus_type);
+ v4l2_fwnode_endpoint_parse_csi1_bus(fwnode, vep, vep->bus_type);
break;
case V4L2_MBUS_CSI2_DPHY:
- vep->bus_type = V4L2_MBUS_CSI2_DPHY;
rval = v4l2_fwnode_endpoint_parse_csi2_bus(fwnode, vep,
- mbus_type);
+ vep->bus_type);
if (rval)
return rval;
break;
case V4L2_MBUS_PARALLEL:
case V4L2_MBUS_BT656:
- v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep, mbus_type);
+ v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep, vep->bus_type);
break;
default:
--
2.11.0
next prev parent reply other threads:[~2018-07-23 14:48 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 13:46 [PATCH 00/21] V4L2 fwnode rework; support for default configuration Sakari Ailus
2018-07-23 13:46 ` [PATCH 01/21] v4l: fwnode: Add debug prints for V4L2 endpoint property parsing Sakari Ailus
2018-07-23 13:46 ` [PATCH 02/21] v4l: fwnode: Use fwnode_graph_for_each_endpoint Sakari Ailus
2018-07-23 13:46 ` [PATCH 03/21] v4l: fwnode: Detect bus type correctly Sakari Ailus
2018-07-23 13:46 ` [PATCH 04/21] v4l: fwnode: The CSI-2 clock is continuous if it's not non-continuous Sakari Ailus
2018-07-23 13:46 ` [PATCH 05/21] dt-bindings: media: Specify bus type for MIPI D-PHY, others, explicitly Sakari Ailus
2018-07-31 21:32 ` Rob Herring
2018-08-01 11:16 ` Sakari Ailus
2018-08-16 9:17 ` Sakari Ailus
2018-08-16 13:48 ` Rob Herring
2018-08-16 14:16 ` Sakari Ailus
2018-07-23 13:46 ` [PATCH 06/21] v4l: fwnode: Add definitions for CSI-2 D-PHY, parallel and Bt.656 busses Sakari Ailus
2018-07-23 13:46 ` [PATCH 07/21] v4l: mediabus: Recognise CSI-2 D-PHY and C-PHY Sakari Ailus
2018-07-23 13:46 ` [PATCH 08/21] v4l: fwnode: Make use of newly specified bus types Sakari Ailus
2018-07-23 13:46 ` [PATCH 09/21] v4l: fwnode: Read lane inversion information despite lane numbering Sakari Ailus
2018-07-23 13:46 ` [PATCH 10/21] v4l: fwnode: Only assign configuration if there is no error Sakari Ailus
2018-07-23 13:46 ` [PATCH 11/21] v4l: fwnode: Support driver-defined lane mapping defaults Sakari Ailus
2018-07-23 13:46 ` [PATCH 12/21] v4l: fwnode: Support default CSI-2 lane mapping for drivers Sakari Ailus
2018-07-23 13:46 ` [PATCH 13/21] v4l: fwnode: Parse the graph endpoint as last Sakari Ailus
2018-07-23 13:46 ` [PATCH 14/21] v4l: fwnode: Use default parallel flags Sakari Ailus
2018-07-23 13:47 ` [PATCH 15/21] v4l: fwnode: Allow setting default parameters Sakari Ailus
2018-07-23 13:47 ` [PATCH 16/21] v4l: fwnode: Use media bus type for bus parser selection Sakari Ailus
2018-07-23 13:47 ` [PATCH 17/21] v4l: fwnode: Print bus type Sakari Ailus
2018-07-23 13:47 ` Sakari Ailus [this message]
2018-07-23 13:47 ` [PATCH 19/21] v4l: fwnode: Support parsing of CSI-2 C-PHY endpoints Sakari Ailus
2018-07-23 13:47 ` [PATCH 20/21] v4l: fwnode: Update V4L2 fwnode endpoint parsing documentation Sakari Ailus
2018-07-23 13:47 ` [PATCH 21/21] smiapp: Query the V4L2 endpoint for a specific bus type Sakari Ailus
2018-08-10 10:38 ` [PATCH 00/21] V4L2 fwnode rework; support for default configuration jacopo mondi
2018-08-13 7:31 ` Sakari Ailus
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=20180723134706.15334-19-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=slongerbeam@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox