From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Subject: [PATCH v2 02/17] smiapp: Explicitly define number of pads in initialisation
Date: Thu, 15 Sep 2016 14:22:16 +0300 [thread overview]
Message-ID: <1473938551-14503-3-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1473938551-14503-1-git-send-email-sakari.ailus@linux.intel.com>
Define the number of pads explicitly in initialising the sub-devices.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/smiapp/smiapp-core.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 862017e..be74ba3 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2536,7 +2536,8 @@ static void smiapp_cleanup(struct smiapp_sensor *sensor)
}
static void smiapp_create_subdev(struct smiapp_sensor *sensor,
- struct smiapp_subdev *ssd, const char *name)
+ struct smiapp_subdev *ssd, const char *name,
+ unsigned short num_pads)
{
struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
@@ -2545,12 +2546,8 @@ static void smiapp_create_subdev(struct smiapp_sensor *sensor,
ssd->sensor = sensor;
- if (ssd == sensor->pixel_array) {
- ssd->npads = 1;
- } else {
- ssd->npads = 2;
- ssd->source_pad = 1;
- }
+ ssd->npads = num_pads;
+ ssd->source_pad = num_pads - 1;
snprintf(ssd->sd.name,
sizeof(ssd->sd.name), "%s %s %d-%4.4x", sensor->minfo.name,
@@ -2745,9 +2742,9 @@ static int smiapp_init(struct smiapp_sensor *sensor)
pll->flags |= SMIAPP_PLL_FLAG_NO_OP_CLOCKS;
if (sensor->scaler)
- smiapp_create_subdev(sensor, sensor->scaler, "scaler");
- smiapp_create_subdev(sensor, sensor->binner, "binner");
- smiapp_create_subdev(sensor, sensor->pixel_array, "pixel_array");
+ smiapp_create_subdev(sensor, sensor->scaler, "scaler", 2);
+ smiapp_create_subdev(sensor, sensor->binner, "binner", 2);
+ smiapp_create_subdev(sensor, sensor->pixel_array, "pixel_array", 1);
dev_dbg(&client->dev, "profile %d\n", sensor->minfo.smiapp_profile);
--
2.1.4
next prev parent reply other threads:[~2016-09-15 11:22 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 11:22 [PATCH v2 00/17] More smiapp cleanups, fixes Sakari Ailus
2016-09-15 11:22 ` [PATCH v2 01/17] smiapp: Move sub-device initialisation into a separate function Sakari Ailus
2016-09-19 20:11 ` Sebastian Reichel
2016-09-19 20:58 ` Sakari Ailus
2016-09-15 11:22 ` Sakari Ailus [this message]
2016-09-19 20:12 ` [PATCH v2 02/17] smiapp: Explicitly define number of pads in initialisation Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 03/17] smiapp: Initialise media entity after sensor init Sakari Ailus
2016-09-19 22:02 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 04/17] smiapp: Split off sub-device registration into two Sakari Ailus
2016-09-19 20:30 ` Sebastian Reichel
2016-09-19 20:50 ` Sakari Ailus
2016-09-19 21:02 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 05/17] smiapp: Provide a common function to obtain native pixel array size Sakari Ailus
2016-09-19 20:33 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 06/17] smiapp: Remove unnecessary BUG_ON()'s Sakari Ailus
2016-09-19 20:39 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 07/17] smiapp: Always initialise the sensor in probe Sakari Ailus
2016-09-19 20:59 ` Sebastian Reichel
2016-09-19 21:09 ` Sakari Ailus
2016-09-15 11:22 ` [PATCH v2 08/17] smiapp: Merge smiapp_init() with smiapp_probe() Sakari Ailus
2016-09-19 21:09 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 09/17] smiapp: Read frame format earlier Sakari Ailus
2016-09-19 21:14 ` Sebastian Reichel
2016-09-19 21:19 ` Sakari Ailus
2016-09-19 21:23 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 10/17] smiapp: Unify setting up sub-devices Sakari Ailus
2016-09-19 21:16 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 11/17] smiapp: Use SMIAPP_PADS when referring to number of pads Sakari Ailus
2016-09-19 21:16 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 12/17] smiapp: Obtain frame layout from the frame descriptor Sakari Ailus
2016-09-19 21:21 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 13/17] smiapp: Improve debug messages from frame layout reading Sakari Ailus
2016-09-19 21:28 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 14/17] smiapp: Remove useless newlines and other small cleanups Sakari Ailus
2016-09-19 21:30 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 15/17] smiapp: Obtain correct media bus code for try format Sakari Ailus
2016-09-19 21:33 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 16/17] smiapp: Drop a debug print on frame size and bit depth Sakari Ailus
2016-09-19 21:39 ` Sebastian Reichel
2016-09-15 11:22 ` [PATCH v2 17/17] smiapp-pll: Don't complain aloud about failing PLL calculation Sakari Ailus
2016-09-19 21:48 ` Sebastian Reichel
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=1473938551-14503-3-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=linux-media@vger.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).