media: i2c: adv748x: Register only enabled inputs

The adv748x assumes input endpoints are always enabled, and registers
a subdevice for each of them when the corresponding output subdevice
is registered.

Fix this by conditionally registering the input subdevice only if it is
actually described in device tree.

Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
index 05b336bcb5362d0c35721a678ba9415bca435f71..6ce21542ed48581150c96e045f777657166e5ce2 100644 (file)
--- a/drivers/media/i2c/adv748x/adv748x-csi2.c
+++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
@@ -78,15 +78,15 @@ static int adv748x_csi2_registered(struct v4l2_subdev *sd)
         *
         * Link HDMI->TXA, and AFE->TXB directly.
         */
-       if (is_txa(tx)) {
+       if (is_txa(tx) && is_hdmi_enabled(state))
                return adv748x_csi2_register_link(tx, sd->v4l2_dev,
                                                  &state->hdmi.sd,
                                                  ADV748X_HDMI_SOURCE);
-       } else {
+       if (!is_txa(tx) && is_afe_enabled(state))
                return adv748x_csi2_register_link(tx, sd->v4l2_dev,
                                                  &state->afe.sd,
                                                  ADV748X_AFE_SOURCE);
-       }
+       return 0;
 }
 
 static const struct v4l2_subdev_internal_ops adv748x_csi2_internal_ops = {

diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
index dccae76a0fdcd5c0b1fb52b9e9932851cba9584f..39c2fdc3b41667d8ff23f082ed7d81c7bdc4cfe0 100644 (file)
--- a/drivers/media/i2c/adv748x/adv748x.h
+++ b/drivers/media/i2c/adv748x/adv748x.h
@@ -90,6 +90,16 @@ struct adv748x_csi2 {
 #define adv748x_sd_to_csi2(sd) container_of(sd, struct adv748x_csi2, sd)
 #define is_tx_enabled(_tx) ((_tx)->state->endpoints[(_tx)->port] != NULL)
 #define is_txa(_tx) ((_tx) == &(_tx)->state->txa)
+#define is_afe_enabled(_state)                                 \
+       ((_state)->endpoints[ADV748X_PORT_AIN0] != NULL ||      \
+        (_state)->endpoints[ADV748X_PORT_AIN1] != NULL ||      \
+        (_state)->endpoints[ADV748X_PORT_AIN2] != NULL ||      \
+        (_state)->endpoints[ADV748X_PORT_AIN3] != NULL ||      \
+        (_state)->endpoints[ADV748X_PORT_AIN4] != NULL ||      \
+        (_state)->endpoints[ADV748X_PORT_AIN5] != NULL ||      \
+        (_state)->endpoints[ADV748X_PORT_AIN6] != NULL ||      \
+        (_state)->endpoints[ADV748X_PORT_AIN7] != NULL)
+#define is_hdmi_enabled(_state) ((_state)->endpoints[ADV748X_PORT_HDMI] != NULL)
 
 enum adv748x_hdmi_pads {
        ADV748X_HDMI_SINK,