Commit ec050e02 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab

media: rcar-csi2: Rename confirm_start() to phy_post_init() to match its usage

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: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 874b8055
...@@ -345,7 +345,7 @@ enum rcar_csi2_pads { ...@@ -345,7 +345,7 @@ enum rcar_csi2_pads {
struct rcar_csi2_info { struct rcar_csi2_info {
int (*init_phtw)(struct rcar_csi2 *priv, unsigned int mbps); 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; const struct rcsi2_mbps_reg *hsfreqrange;
unsigned int csi0clkfreqrange; unsigned int csi0clkfreqrange;
unsigned int num_channels; unsigned int num_channels;
...@@ -576,9 +576,9 @@ static int rcsi2_start_receiver(struct rcar_csi2 *priv) ...@@ -576,9 +576,9 @@ static int rcsi2_start_receiver(struct rcar_csi2 *priv)
if (ret) if (ret)
return ret; return ret;
/* Confirm start */ /* Run post PHY start initialization, if needed. */
if (priv->info->confirm_start) { if (priv->info->phy_post_init) {
ret = priv->info->confirm_start(priv); ret = priv->info->phy_post_init(priv);
if (ret) if (ret)
return ret; return ret;
} }
...@@ -976,7 +976,7 @@ static int rcsi2_init_phtw_v3m_e3(struct rcar_csi2 *priv, unsigned int mbps) ...@@ -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); 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[] = { static const struct phtw_value step1[] = {
{ .data = 0xee, .code = 0x34 }, { .data = 0xee, .code = 0x34 },
...@@ -1060,7 +1060,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77965 = { ...@@ -1060,7 +1060,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77965 = {
static const struct rcar_csi2_info rcar_csi2_info_r8a77970 = { static const struct rcar_csi2_info rcar_csi2_info_r8a77970 = {
.init_phtw = rcsi2_init_phtw_v3m_e3, .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, .num_channels = 4,
}; };
...@@ -1073,7 +1073,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77980 = { ...@@ -1073,7 +1073,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a77980 = {
static const struct rcar_csi2_info rcar_csi2_info_r8a77990 = { static const struct rcar_csi2_info rcar_csi2_info_r8a77990 = {
.init_phtw = rcsi2_init_phtw_v3m_e3, .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, .num_channels = 2,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment