summaryrefslogtreecommitdiff
path: root/drivers/media/i2c/adv748x/adv748x-core.c
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo+renesas@jmondi.org>2019-01-10 09:02:11 -0500
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-02-18 11:03:21 -0500
commit3361b9c4ed8790666875cbac1729d5a15e982947 (patch)
tree626a151927144d09aff2c6408dae6c8c9b890599 /drivers/media/i2c/adv748x/adv748x-core.c
parent21325e19cadec506bd48591d3944bd526f647d93 (diff)
media: adv748x: Store the source subdevice in TX
The power_up_tx() procedure needs to set a few registers conditionally to the selected video source, but it currently checks for the provided tx to be either TXA or TXB. With the introduction of dynamic routing between HDMI and AFE entities to TXA, checking which TX the function is operating on is not meaningful anymore. To fix this, store the subdevice of the source providing video data to the CSI-2 TX in the 'struct adv748x_csi2' representing the TX and check on it. Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/i2c/adv748x/adv748x-core.c')
-rw-r--r--drivers/media/i2c/adv748x/adv748x-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
index ba91db45547a..824bca3219b7 100644
--- a/drivers/media/i2c/adv748x/adv748x-core.c
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -254,7 +254,7 @@ static int adv748x_power_up_tx(struct adv748x_csi2 *tx)
adv748x_write_check(state, page, 0x00, 0xa0 | tx->num_lanes, &ret);
/* ADI Required Write */
- if (is_txa(tx)) {
+ if (tx->src == &state->hdmi.sd) {
adv748x_write_check(state, page, 0xdb, 0x10, &ret);
adv748x_write_check(state, page, 0xd6, 0x07, &ret);
} else {