diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-07-24 07:30:04 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-07-24 07:30:04 +0300 |
| commit | ce4c464b93187d3faffd9048f0ee0ec7bf9aa2a9 (patch) | |
| tree | d57801433cc36446b505ba03e0cba3e254a4d9f6 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | f60de9767490a73b54c2754e1de83fc68eb7d9a0 (diff) | |
| parent | 04cbfe68c3190f23bcfec230bfd832b533f35554 (diff) | |
| download | linux-ce4c464b93187d3faffd9048f0ee0ec7bf9aa2a9.tar.xz | |
Merge tag 'topic/crc-pmic-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-next
crystalcove pmic support from Shobhit. Patch series has all acks/r-bs from
other mainainers so ok to pull into drm-next. But I'm cc'ing all other
maintainers as fyi and in case they want to pull it into their trees too
to avoid conflicts.
* tag 'topic/crc-pmic-2015-07-23' of git://anongit.freedesktop.org/drm-intel:
mfd: Add GPIOLIB dependency if INTEL_SOC_PMIC is to be enabled
drm/i915: Backlight control using CRC PMIC based PWM driver
drm/i915: Use the CRC gpio for panel enable/disable
pwm: crc: Add Crystalcove (CRC) PWM driver
mfd: intel_soc_pmic_core: ADD PWM lookup table for CRC PMIC based PWM
mfd: intel_soc_pmic_crc: Add PWM cell device for Crystalcove PMIC
mfd: intel_soc_pmic_core: Add lookup table for Panel Control as GPIO signal
gpiolib: Add support for removing registered consumer lookup table
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 3b00d00c0bc0..47cef0e6c79c 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -177,6 +177,10 @@ struct intel_panel { bool enabled; bool combination_mode; /* gen 2/4 only */ bool active_low_pwm; + + /* PWM chip */ + struct pwm_device *pwm; + struct backlight_device *device; } backlight; |