diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-09-23 02:11:00 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-23 02:12:15 +0300 |
| commit | db29dc7d3346328b3fc61057d224a242f9928289 (patch) | |
| tree | b3d0f23e28e895f45c38065deca7716b257dc6a8 /drivers/pwm/pwm-lpss-platform.c | |
| parent | 511d2ffd35ff75f51816aa219ce0412864f9563d (diff) | |
| parent | 8fea92536e3efff14fa4cde7ed37c595b40a52b5 (diff) | |
| download | linux-db29dc7d3346328b3fc61057d224a242f9928289.tar.xz | |
Merge tag 'drm-intel-next-2020-09-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Driver Changes:
- Reduce INTEL_DISPLAY_ENABLED to just removed outputs treating it as disconnected (Ville)
- Introducing new AUX, DVO, and TC ports and refactoring code around hot plug interrupts for those. (Ville)
- Centralize PLL_ENABLE register lookup (Anusha)
- Improvements around DP downstream facing ports (DFP). (Ville)
- Enable YCbCr 444->420 conversion for HDMI DFPs. Ville
- Remove the old global state on Display's atomic modeset (Ville)
- Nuke force_min_cdclk_changed (Ville)
- Extend a TGL W/A to all SKUs and to RKL (Swathi)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200918173013.GA748558@intel.com
Diffstat (limited to 'drivers/pwm/pwm-lpss-platform.c')
| -rw-r--r-- | drivers/pwm/pwm-lpss-platform.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-lpss-platform.c b/drivers/pwm/pwm-lpss-platform.c index 48f34d20aecd..c6502cf7a7af 100644 --- a/drivers/pwm/pwm-lpss-platform.c +++ b/drivers/pwm/pwm-lpss-platform.c @@ -89,7 +89,6 @@ static int pwm_lpss_prepare(struct device *dev) static const struct dev_pm_ops pwm_lpss_platform_pm_ops = { .prepare = pwm_lpss_prepare, - SET_SYSTEM_SLEEP_PM_OPS(pwm_lpss_suspend, pwm_lpss_resume) }; static const struct acpi_device_id pwm_lpss_acpi_match[] = { |