Hi Laurent,
On Sun May 16, 2021 at 3:18 AM WEST, Laurent Pinchart wrote:
> On Sun, May 16, 2021 at 04:44:38AM +0300, Laurent Pinchart wrote:
> > Move the PHY regulator and reset handling to dedicated functions. This
> > groups all related code together, and prepares for i.MX8 support that
> > doesn't require control of the PHY regulator and reset.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> > Acked-by: Rui Miguel Silva <rmfrfs@xxxxxxxxx>
>
> My apologies, this is a new patch in v2, and Rui hasn't acked it. I'll
> thus wait for acks and reviews before sending a pull request.
Looks good. Thanks for the heads up.
Acked-by: Rui Miguel Silva <rmfrfs@xxxxxxxxx>
------
Cheers,
Rui
>
> > ---
> > drivers/staging/media/imx/imx7-mipi-csis.c | 64 +++++++++++++---------
> > 1 file changed, 38 insertions(+), 26 deletions(-)
> >
> > diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
> > index 6e235c86e0aa..a8da8d6ddb7d 100644
> > --- a/drivers/staging/media/imx/imx7-mipi-csis.c
> > +++ b/drivers/staging/media/imx/imx7-mipi-csis.c
> > @@ -457,25 +457,6 @@ static void mipi_csis_sw_reset(struct csi_state *state)
> > usleep_range(10, 20);
> > }
> >
> > -static int mipi_csis_phy_init(struct csi_state *state)
> > -{
> > - state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
> > - if (IS_ERR(state->mipi_phy_regulator))
> > - return PTR_ERR(state->mipi_phy_regulator);
> > -
> > - return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
> > - 1000000);
> > -}
> > -
> > -static void mipi_csis_phy_reset(struct csi_state *state)
> > -{
> > - reset_control_assert(state->mrst);
> > -
> > - msleep(20);
> > -
> > - reset_control_deassert(state->mrst);
> > -}
> > -
> > static void mipi_csis_system_enable(struct csi_state *state, int on)
> > {
> > u32 val, mask;
> > @@ -679,6 +660,42 @@ static irqreturn_t mipi_csis_irq_handler(int irq, void *dev_id)
> > return IRQ_HANDLED;
> > }
> >
> > +/* -----------------------------------------------------------------------------
> > + * PHY regulator and reset
> > + */
> > +
> > +static int mipi_csis_phy_enable(struct csi_state *state)
> > +{
> > + return regulator_enable(state->mipi_phy_regulator);
> > +}
> > +
> > +static int mipi_csis_phy_disable(struct csi_state *state)
> > +{
> > + return regulator_disable(state->mipi_phy_regulator);
> > +}
> > +
> > +static void mipi_csis_phy_reset(struct csi_state *state)
> > +{
> > + reset_control_assert(state->mrst);
> > + msleep(20);
> > + reset_control_deassert(state->mrst);
> > +}
> > +
> > +static int mipi_csis_phy_init(struct csi_state *state)
> > +{
> > + /* Get MIPI PHY reset and regulator. */
> > + state->mrst = devm_reset_control_get_exclusive(state->dev, NULL);
> > + if (IS_ERR(state->mrst))
> > + return PTR_ERR(state->mrst);
> > +
> > + state->mipi_phy_regulator = devm_regulator_get(state->dev, "phy");
> > + if (IS_ERR(state->mipi_phy_regulator))
> > + return PTR_ERR(state->mipi_phy_regulator);
> > +
> > + return regulator_set_voltage(state->mipi_phy_regulator, 1000000,
> > + 1000000);
> > +}
> > +
> > /* -----------------------------------------------------------------------------
> > * Debug
> > */
> > @@ -1178,7 +1195,7 @@ static int mipi_csis_pm_suspend(struct device *dev, bool runtime)
> > mutex_lock(&state->lock);
> > if (state->state & ST_POWERED) {
> > mipi_csis_stop_stream(state);
> > - ret = regulator_disable(state->mipi_phy_regulator);
> > + ret = mipi_csis_phy_disable(state);
> > if (ret)
> > goto unlock;
> > mipi_csis_clk_disable(state);
> > @@ -1204,7 +1221,7 @@ static int mipi_csis_pm_resume(struct device *dev, bool runtime)
> > goto unlock;
> >
> > if (!(state->state & ST_POWERED)) {
> > - ret = regulator_enable(state->mipi_phy_regulator);
> > + ret = mipi_csis_phy_enable(state);
> > if (ret)
> > goto unlock;
> >
> > @@ -1288,11 +1305,6 @@ static int mipi_csis_parse_dt(struct csi_state *state)
> > &state->clk_frequency))
> > state->clk_frequency = DEFAULT_SCLK_CSIS_FREQ;
> >
> > - /* Get MIPI PHY resets */
> > - state->mrst = devm_reset_control_get_exclusive(state->dev, NULL);
> > - if (IS_ERR(state->mrst))
> > - return PTR_ERR(state->mrst);
> > -
> > return 0;
> > }
> >
>
> --
> Regards,
>
> Laurent Pinchart
