Hi Niklas,
On 14/12/17 19:08, Niklas Söderlund wrote:
> The adv748x afe have eight analog sink pads, currently one of them is
s/have/has/
> chosen to be the active route based on device tree configuration. Whit
s/Whit/With/
> the new routeing API it's possible to control which of the eight sink
> pads are routed to the source pad.
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
Aha, I had been wondering how we would handle this...
Other than the minor nits, this is otherwise looking good
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/adv748x/adv748x-afe.c | 66 +++++++++++++++++++++++++++++++++
> 1 file changed, 66 insertions(+)
>
> diff --git a/drivers/media/i2c/adv748x/adv748x-afe.c b/drivers/media/i2c/adv748x/adv748x-afe.c
> index 5188178588c9067d..5dda85c707f6efd7 100644
> --- a/drivers/media/i2c/adv748x/adv748x-afe.c
> +++ b/drivers/media/i2c/adv748x/adv748x-afe.c
> @@ -43,6 +43,9 @@
> #define ADV748X_AFE_STD_PAL_SECAM 0xe
> #define ADV748X_AFE_STD_PAL_SECAM_PED 0xf
>
> +#define ADV748X_AFE_ROUTES_MAX ((ADV748X_AFE_SINK_AIN7 - \
> + ADV748X_AFE_SINK_AIN0) + 1)
> +
> static int adv748x_afe_read_ro_map(struct adv748x_state *state, u8 reg)
> {
> int ret;
> @@ -386,10 +389,73 @@ static int adv748x_afe_set_format(struct v4l2_subdev *sd,
> return 0;
> }
>
> +
No need for that extra line..
> +static int adv748x_afe_get_routing(struct v4l2_subdev *sd,
> + struct v4l2_subdev_routing *routing)
> +{
> + struct adv748x_afe *afe = adv748x_sd_to_afe(sd);
> + struct v4l2_subdev_route *r = routing->routes;
> + unsigned int i;
> +
> + /* There are one possible route from each sink */
There is one possible ...
> + if (routing->num_routes < ADV748X_AFE_ROUTES_MAX) {
> + routing->num_routes = ADV748X_AFE_ROUTES_MAX;
> + return -ENOSPC;
> + }
> +
> + routing->num_routes = ADV748X_AFE_ROUTES_MAX;
> +
> + for (i = ADV748X_AFE_SINK_AIN0; i <= ADV748X_AFE_SINK_AIN7; i++) {
> + r->sink_pad = i;
> + r->sink_stream = 0;
> + r->source_pad = ADV748X_AFE_SOURCE;
> + r->source_stream = 0;
> + r->flags = afe->input == i ? V4L2_SUBDEV_ROUTE_FL_ACTIVE : 0;
> + r++;
> + }
> +
> + return 0;
> +}
> +
> +static int adv748x_afe_set_routing(struct v4l2_subdev *sd,
> + struct v4l2_subdev_routing *routing)
> +{
> + struct adv748x_afe *afe = adv748x_sd_to_afe(sd);
> + struct v4l2_subdev_route *r = routing->routes;
> + int input = -1;
> + unsigned int i;
> +
> + if (routing->num_routes > ADV748X_AFE_ROUTES_MAX)
> + return -ENOSPC;
> +
> + for (i = 0; i < routing->num_routes; i++) {
> + if (r->sink_pad > ADV748X_AFE_SINK_AIN7 ||
> + r->sink_stream != 0 ||
> + r->source_pad != ADV748X_AFE_SOURCE ||
> + r->source_stream != 0)
> + return -EINVAL;
> +
> + if (r->flags & V4L2_SUBDEV_ROUTE_FL_ACTIVE) {
> + if (input != -1)
> + return -EMLINK;
> +
> + input = r->sink_pad;
> + }
> + r++;
> + }
> +
> + if (input != -1)
> + afe->input = input;> +
> + return 0;
> +}
> +
> static const struct v4l2_subdev_pad_ops adv748x_afe_pad_ops = {
> .enum_mbus_code = adv748x_afe_enum_mbus_code,
> .set_fmt = adv748x_afe_set_format,
> .get_fmt = adv748x_afe_get_format,
> + .get_routing = adv748x_afe_get_routing,
> + .set_routing = adv748x_afe_set_routing,
> };
>
> /* -----------------------------------------------------------------------------
>
