| Message ID | 20200611193232.128721-1-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ec050e022f8da39c2c9d6f4eb8c7f343fe2664ad |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | rcar-csi2: Rename confirm_start() to phy_post_init() to match its usage | expand |
Hi Niklas, On Thu, Jun 11, 2020 at 09:32:32PM +0200, Niklas Söderlund wrote: > 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> Seems reasonable Acked-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Thanks j > --- > drivers/media/platform/rcar-vin/rcar-csi2.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c > index 151e6a90c5fbc70e..6dbfac9dcf775f84 100644 > --- a/drivers/media/platform/rcar-vin/rcar-csi2.c > +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c > @@ -344,7 +344,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; > @@ -575,9 +575,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; > } > @@ -975,7 +975,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 }, > @@ -1059,7 +1059,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, > }; > > @@ -1072,7 +1072,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, > }; > > -- > 2.27.0 >
diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c index 151e6a90c5fbc70e..6dbfac9dcf775f84 100644 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c @@ -344,7 +344,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; @@ -575,9 +575,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; } @@ -975,7 +975,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 }, @@ -1059,7 +1059,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, }; @@ -1072,7 +1072,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, };
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> --- drivers/media/platform/rcar-vin/rcar-csi2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)