Skip to content

Commit

Permalink
Revert "media: atomisp: keep the ISP powered on when setting it"
Browse files Browse the repository at this point in the history
changeset d0213061a501 ("media: atomisp: fix mask and shift operation on ISPSSPM0")
solved the existing issue with the IUNIT power on code.

So, the driver can now use the right code again.

This reverts commit 95d1f39.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  • Loading branch information
Mauro Carvalho Chehab committed Jul 19, 2020
1 parent 23988c9 commit 0d6db85
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/staging/media/atomisp/pci/atomisp_v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -766,17 +766,13 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)
/* Workaround for pmu_nc_set_power_state not ready in MRFLD */
int atomisp_mrfld_power_down(struct atomisp_device *isp)
{
return 0;
// FIXME: at least with ISP2401, the code below causes the driver to break
// return atomisp_mrfld_power(isp, false);
return atomisp_mrfld_power(isp, false);
}

/* Workaround for pmu_nc_set_power_state not ready in MRFLD */
int atomisp_mrfld_power_up(struct atomisp_device *isp)
{
return 0;
// FIXME: at least with ISP2401, the code below causes the driver to break
// return atomisp_mrfld_power(isp, true);
return atomisp_mrfld_power(isp, true);
}

int atomisp_runtime_suspend(struct device *dev)
Expand Down

0 comments on commit 0d6db85

Please sign in to comment.