2015-07-23 07:38:54

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PULL] topic/crc-pmic

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 <[email protected]> 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



--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch


2015-07-27 11:21:24

by Thierry Reding

[permalink] [raw]
Subject: Re: [PULL] topic/crc-pmic

On Thu, Jul 23, 2015 at 09:38:46AM +0200, Daniel Vetter wrote:
[...]
> On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter <[email protected]> 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


Attachments:
(No filename) (571.00 B)
signature.asc (819.00 B)
Download all attachments

2015-07-27 13:07:20

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PULL] topic/crc-pmic

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 <[email protected]> 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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

2015-07-27 13:21:12

by Thierry Reding

[permalink] [raw]
Subject: Re: [PULL] topic/crc-pmic

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 <[email protected]> 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


Attachments:
(No filename) (1.05 kB)
signature.asc (819.00 B)
Download all attachments

2015-07-28 03:35:11

by Kumar, Shobhit

[permalink] [raw]
Subject: Re: [Intel-gfx] [PULL] topic/crc-pmic



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 <[email protected]> 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
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>