media: rcar-csi2: Rename confirm_start() to phy_post_init() to match its usage
authorNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Thu, 11 Jun 2020 19:32:32 +0000 (21:32 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Sat, 4 Jul 2020 10:43:00 +0000 (12:43 +0200)
Since the driver was picked-up the starting of the PHY have changed
quiet a bit. An artifact of these changes is the now poorly named
callback confirm_start(). It used to confirm start of the PHY but now
performs post PHY start initialization, rename it to phy_post_init() to
reflect this.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/rcar-vin/rcar-csi2.c

index 45fdf4e..c6cc4f4 100644 (file)
@@ -345,7 +345,7 @@ enum rcar_csi2_pads {
 
 struct rcar_csi2_info {
        int (*init_phtw)(struct rcar_csi2 *priv, unsigned int mbps);
-       int (*confirm_start)(struct rcar_csi2 *priv);
+       int (*phy_post_init)(struct rcar_csi2 *priv);
        const struct rcsi2_mbps_reg *hsfreqrange;
        unsigned int csi0clkfreqrange;
        unsigned int num_channels;
@@ -576,9 +576,9 @@ static int rcsi2_start_receiver(struct rcar_csi2 *priv)
        if (ret)
                return ret;
 
-       /* Confirm start */
-       if (priv->info->confirm_start) {
-               ret = priv->info->confirm_start(priv);
+       /* Run post PHY start initialization, if needed. */
+       if (priv->info->phy_post_init) {
+               ret = priv->info->phy_post_init(priv);
                if (ret)
                        return ret;
        }
@@ -976,7 +976,7 @@ static int rcsi2_init_phtw_v3m_e3(struct rcar_csi2 *priv, unsigned int mbps)
        return rcsi2_phtw_write_mbps(priv, mbps, phtw_mbps_v3m_e3, 0x44);
 }
 
-static int rcsi2_confirm_start_v3m_e3(struct rcar_csi2 *priv)
+static int rcsi2_phy_post_init_v3m_e3(struct rcar_csi2 *priv)
 {
        static const struct phtw_value step1[] = {
                { .data = 0xee, .code = 0x34 },
@@ -1060,7 +1060,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77965 = {
 
 static const struct rcar_csi2_info rcar_csi2_info_r8a77970 = {
        .init_phtw = rcsi2_init_phtw_v3m_e3,
-       .confirm_start = rcsi2_confirm_start_v3m_e3,
+       .phy_post_init = rcsi2_phy_post_init_v3m_e3,
        .num_channels = 4,
 };
 
@@ -1073,7 +1073,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77980 = {
 
 static const struct rcar_csi2_info rcar_csi2_info_r8a77990 = {
        .init_phtw = rcsi2_init_phtw_v3m_e3,
-       .confirm_start = rcsi2_confirm_start_v3m_e3,
+       .phy_post_init = rcsi2_phy_post_init_v3m_e3,
        .num_channels = 2,
 };