Revert "media: atomisp: keep the ISP powered on when setting it"

mchehab · mchehab · commit 0d6db85131e0 · 2020-07-19T13:31:53.000+02:00
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>
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -766,17 +766,13 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)`
`766`	`766`	`/* Workaround for pmu_nc_set_power_state not ready in MRFLD */`
`767`	`767`	`int atomisp_mrfld_power_down(struct atomisp_device *isp)`
`768`	`768`	`{`
`769`		`- return 0;`
`770`		`-// FIXME: at least with ISP2401, the code below causes the driver to break`
`771`		`-// return atomisp_mrfld_power(isp, false);`
	`769`	`+ return atomisp_mrfld_power(isp, false);`
`772`	`770`	`}`
`773`	`771`
`774`	`772`	`/* Workaround for pmu_nc_set_power_state not ready in MRFLD */`
`775`	`773`	`int atomisp_mrfld_power_up(struct atomisp_device *isp)`
`776`	`774`	`{`
`777`		`- return 0;`
`778`		`-// FIXME: at least with ISP2401, the code below causes the driver to break`
`779`		`-// return atomisp_mrfld_power(isp, true);`
	`775`	`+ return atomisp_mrfld_power(isp, true);`
`780`	`776`	`}`
`781`	`777`
`782`	`778`	`int atomisp_runtime_suspend(struct device *dev)`