diff options
| author | Alan Cox <alan@linux.intel.com> | 2017-03-10 11:34:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 14:48:20 +0100 |
| commit | f406d0338ea1bcd6005b1d41c656164f11aaaf29 (patch) | |
| tree | eb66189b44582d1f5fe0e7535b857808e8480bd0 /drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c | |
| parent | 5ac0a3447a3192f4664b9af4c28b24c634f0be21 (diff) | |
| download | op-kernel-dev-f406d0338ea1bcd6005b1d41c656164f11aaaf29.zip op-kernel-dev-f406d0338ea1bcd6005b1d41c656164f11aaaf29.tar.gz | |
atomisp: eliminate intel_mid_pm.h
We can do this because the only thing it is used for is identifying the
platform for power management purposes. The driver only supports Baytrail
and Cherrytrail and both of those always need the IPU to be power managed
directly not via PCI D3 states.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c index 46cdb0f..97103b4 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c @@ -1,7 +1,7 @@ /* * Support for Medifield PNW Camera Imaging ISP subsystem. * - * Copyright (c) 2010 Intel Corporation. All Rights Reserved. + * Copyright (c) 2010-2017 Intel Corporation. All Rights Reserved. * * Copyright (c) 2010 Silicon Hive www.siliconhive.com. * @@ -27,7 +27,6 @@ #include <linux/timer.h> #include <linux/delay.h> #include <linux/interrupt.h> -#include "../../include/linux/intel_mid_pm.h" #include "../../include/linux/atomisp_gmin_platform.h" @@ -47,15 +46,11 @@ #include "hrt/hive_isp_css_mm_hrt.h" #include "device_access.h" -#include "../../include/linux/intel_mid_pm.h" #include <asm/intel-mid.h> /* G-Min addition: pull this in from intel_mid_pm.h */ #define CSTATE_EXIT_LATENCY_C1 1 -/* Moorefield lacks PCI PM, BYT advertises it but it's broken, use PUNIT */ -#define ATOMISP_INTERNAL_PM (IS_MOFD || IS_BYT || IS_CHT) - #ifdef ISP2401 static uint skip_fwload = 0; module_param(skip_fwload, uint, 0644); @@ -526,8 +521,7 @@ int atomisp_runtime_suspend(struct device *dev) if (ret) return ret; pm_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE); - if (ATOMISP_INTERNAL_PM) - ret = atomisp_mrfld_power_down(isp); + ret = atomisp_mrfld_power_down(isp); return ret; } @@ -538,11 +532,9 @@ int atomisp_runtime_resume(struct device *dev) dev_get_drvdata(dev); int ret; - if (ATOMISP_INTERNAL_PM) { - ret = atomisp_mrfld_power_up(isp); - if (ret) + ret = atomisp_mrfld_power_up(isp); + if (ret) return ret; - } pm_qos_update_request(&isp->pm_qos, isp->max_isr_latency); if (isp->sw_contex.power_state == ATOM_ISP_POWER_DOWN) { @@ -597,8 +589,7 @@ static int atomisp_suspend(struct device *dev) return ret; } pm_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE); - if (ATOMISP_INTERNAL_PM) - ret = atomisp_mrfld_power_down(isp); + ret = atomisp_mrfld_power_down(isp); return ret; } @@ -609,11 +600,9 @@ static int atomisp_resume(struct device *dev) dev_get_drvdata(dev); int ret; - if (ATOMISP_INTERNAL_PM) { - ret = atomisp_mrfld_power_up(isp); - if (ret) - return ret; - } + ret = atomisp_mrfld_power_up(isp); + if (ret) + return ret; pm_qos_update_request(&isp->pm_qos, isp->max_isr_latency); @@ -1545,10 +1534,8 @@ load_fw_fail: atomisp_ospm_dphy_down(isp); /* Address later when we worry about the ...field chips */ - if (ATOMISP_INTERNAL_PM) { - if (atomisp_mrfld_power_down(isp)) - dev_err(&dev->dev, "Failed to switch off ISP\n"); - } + if (atomisp_mrfld_power_down(isp)) + dev_err(&dev->dev, "Failed to switch off ISP\n"); pci_dev_put(isp->pci_root); return err; } |
