Commit f78723eb authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files

media: i2c: max9286: Rename reverse_channel_mv



Rename the reverse_channel_mv variable to init_rev_chan_mv as
the next patch will cache the reverse channel amplitude in
a new driver variable.

Signed-off-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 3de09c7a
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ struct max9286_priv {
	unsigned int mux_channel;
	bool mux_open;

	u32 reverse_channel_mv;
	/* The initial reverse control channel amplitude. */
	u32 init_rev_chan_mv;

	struct v4l2_ctrl_handler ctrls;
	struct v4l2_ctrl *pixelrate;
@@ -563,7 +564,7 @@ static int max9286_notify_bound(struct v4l2_async_notifier *notifier,
	 * - Disable auto-ack as communication on the control channel are now
	 *   stable.
	 */
	if (priv->reverse_channel_mv < 170)
	if (priv->init_rev_chan_mv < 170)
		max9286_reverse_channel_setup(priv, 170);
	max9286_check_config_link(priv, priv->source_mask);

@@ -972,7 +973,7 @@ static int max9286_setup(struct max9286_priv *priv)
	 * only. This should be disabled after the mux is initialised.
	 */
	max9286_configure_i2c(priv, true);
	max9286_reverse_channel_setup(priv, priv->reverse_channel_mv);
	max9286_reverse_channel_setup(priv, priv->init_rev_chan_mv);

	/*
	 * Enable GMSL links, mask unused ones and autodetect link
@@ -1237,9 +1238,9 @@ static int max9286_parse_dt(struct max9286_priv *priv)
	if (of_property_read_u32(dev->of_node,
				 "maxim,reverse-channel-microvolt",
				 &reverse_channel_microvolt))
		priv->reverse_channel_mv = 170;
		priv->init_rev_chan_mv = 170;
	else
		priv->reverse_channel_mv = reverse_channel_microvolt / 1000U;
		priv->init_rev_chan_mv = reverse_channel_microvolt / 1000U;

	priv->route_mask = priv->source_mask;