Oops, somehow removed the mailing lists from Cc: when adding all other maintainers. Fixed that now. -Daniel
On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
Hi Dave,
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.
Cheers, Daniel
The following changes since commit 52721d9d3334c1cb1f76219a161084094ec634dc:
Linux 4.2-rc3 (2015-07-19 14:45:02 -0700)
are available in the git repository at:
git://anongit.freedesktop.org/drm-intel tags/topic/crc-pmic-2015-07-23
for you to fetch changes up to 04cbfe68c3190f23bcfec230bfd832b533f35554:
mfd: Add GPIOLIB dependency if INTEL_SOC_PMIC is to be enabled (2015-07-22 11:18:41 +0200)
Shobhit Kumar (8): gpiolib: Add support for removing registered consumer lookup table mfd: intel_soc_pmic_core: Add lookup table for Panel Control as GPIO signal mfd: intel_soc_pmic_crc: Add PWM cell device for Crystalcove PMIC mfd: intel_soc_pmic_core: ADD PWM lookup table for CRC PMIC based PWM pwm: crc: Add Crystalcove (CRC) PWM driver drm/i915: Use the CRC gpio for panel enable/disable drm/i915: Backlight control using CRC PMIC based PWM driver mfd: Add GPIOLIB dependency if INTEL_SOC_PMIC is to be enabled
drivers/gpio/gpiolib.c | 13 ++++ drivers/gpu/drm/i915/intel_bios.h | 7 ++ drivers/gpu/drm/i915/intel_drv.h | 4 ++ drivers/gpu/drm/i915/intel_dsi.c | 37 +++++++++- drivers/gpu/drm/i915/intel_dsi.h | 3 + drivers/gpu/drm/i915/intel_panel.c | 94 ++++++++++++++++++++++-- drivers/mfd/Kconfig | 1 + drivers/mfd/intel_soc_pmic_core.c | 29 ++++++++ drivers/mfd/intel_soc_pmic_crc.c | 3 + drivers/pwm/Kconfig | 7 ++ drivers/pwm/Makefile | 1 + drivers/pwm/pwm-crc.c | 143 +++++++++++++++++++++++++++++++++++++ include/linux/gpio/machine.h | 1 + 13 files changed, 336 insertions(+), 7 deletions(-) create mode 100644 drivers/pwm/pwm-crc.c
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
On Thu, Jul 23, 2015 at 09:38:46AM +0200, Daniel Vetter wrote: [...]
On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
[...]
Shobhit Kumar (8):
[...]
pwm: crc: Add Crystalcove (CRC) PWM driver
Would you mind removing this from your branch? I ended up manually applying a couple of changes that I had requested but ended up not getting addressed.
When you drop it, let me know so I can push my branch to -next and have it not collide with your tree immediately. I assume it's in a branch that feeds into linux-next?
Thierry
On Mon, Jul 27, 2015 at 01:21:01PM +0200, Thierry Reding wrote:
On Thu, Jul 23, 2015 at 09:38:46AM +0200, Daniel Vetter wrote: [...]
On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
[...]
Shobhit Kumar (8):
[...]
pwm: crc: Add Crystalcove (CRC) PWM driver
Would you mind removing this from your branch? I ended up manually applying a couple of changes that I had requested but ended up not getting addressed.
When you drop it, let me know so I can push my branch to -next and have it not collide with your tree immediately. I assume it's in a branch that feeds into linux-next?
Oops sorry I missed that there was still review pending. Unfortuntely Dave already pulled this into drm-next so it's baked in. I guess best would be to pull this into your pwm branch too and resolve the conflicts in the merge explicitly. Sorry about the mess I've caused here for you. -Daniel
On Mon, Jul 27, 2015 at 03:09:54PM +0200, Daniel Vetter wrote:
On Mon, Jul 27, 2015 at 01:21:01PM +0200, Thierry Reding wrote:
On Thu, Jul 23, 2015 at 09:38:46AM +0200, Daniel Vetter wrote: [...]
On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
[...]
Shobhit Kumar (8):
[...]
pwm: crc: Add Crystalcove (CRC) PWM driver
Would you mind removing this from your branch? I ended up manually applying a couple of changes that I had requested but ended up not getting addressed.
When you drop it, let me know so I can push my branch to -next and have it not collide with your tree immediately. I assume it's in a branch that feeds into linux-next?
Oops sorry I missed that there was still review pending. Unfortuntely Dave already pulled this into drm-next so it's baked in. I guess best would be to pull this into your pwm branch too and resolve the conflicts in the merge explicitly. Sorry about the mess I've caused here for you.
Oh well, nevermind.
Thierry
On Monday 27 July 2015 04:51 PM, Thierry Reding wrote:
On Thu, Jul 23, 2015 at 09:38:46AM +0200, Daniel Vetter wrote: [...]
On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter daniel.vetter@ffwll.ch wrote:
[...]
Shobhit Kumar (8):
[...]
pwm: crc: Add Crystalcove (CRC) PWM driver
Would you mind removing this from your branch? I ended up manually applying a couple of changes that I had requested but ended up not getting addressed.
Sorry if I missed, but I thought I had addressed all your comments in my last patch and did not see any further comments from you.
Regards Shobhit
When you drop it, let me know so I can push my branch to -next and have it not collide with your tree immediately. I assume it's in a branch that feeds into linux-next?
Thierry
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
dri-devel@lists.freedesktop.org