diff mbox

[v8,11/12] leds: Kconfig for Palmas LEDs

Message ID 1362662276-20792-11-git-send-email-ian@slimlogic.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Lartey March 7, 2013, 1:17 p.m. UTC 
Add the Kconfig and Makefile for the Palmas LED driver.

Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Ian Lartey <ian@slimlogic.co.uk>
---
 drivers/leds/Kconfig  |    9 +++++++++
 drivers/leds/Makefile |    1 +
 2 files changed, 10 insertions(+), 0 deletions(-)

Comments

Kim, Milo March 8, 2013, 1:13 a.m. UTC | #1 
> Add the Kconfig and Makefile for the Palmas LED driver.

It would be better if the Palmas LED driver files are combined into one patch.
[PATCH v8 09/12] leds: Add support for Palmas LEDs
[PATCH v8 11/12] leds: Kconfig for Palmas LEDs

Best Regards,
Milo
Ian Lartey March 8, 2013, 5:13 p.m. UTC | #2 
On 08/03/13 01:13, Kim, Milo wrote:
>> Add the Kconfig and Makefile for the Palmas LED driver.
>
> It would be better if the Palmas LED driver files are combined into one patch.
> [PATCH v8 09/12] leds: Add support for Palmas LEDs
> [PATCH v8 11/12] leds: Kconfig for Palmas LEDs

[PATCH v8 11/12] leds: Kconfig for Palmas LEDs
can often cause a merge conflict if there are already
additional drivers/files in the leds directory

[PATCH v8 09/12] leds: Add support for Palmas LEDs
has more chance of being applied without any issues
(unless the person taking the patch already has
their own leds-palmas.c.

>
> Best Regards,
> Milo
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Stephen Warren March 13, 2013, 8:31 p.m. UTC | #3 
On 03/08/2013 10:13 AM, Ian Lartey wrote:
> On 08/03/13 01:13, Kim, Milo wrote:
>>> Add the Kconfig and Makefile for the Palmas LED driver.
>>
>> It would be better if the Palmas LED driver files are combined into
>> one patch.
>> [PATCH v8 09/12] leds: Add support for Palmas LEDs
>> [PATCH v8 11/12] leds: Kconfig for Palmas LEDs
> 
> [PATCH v8 11/12] leds: Kconfig for Palmas LEDs
> can often cause a merge conflict if there are already
> additional drivers/files in the leds directory
> 
> [PATCH v8 09/12] leds: Add support for Palmas LEDs
> has more chance of being applied without any issues
> (unless the person taking the patch already has
> their own leds-palmas.c.

A merge conflict isn't really influenced at all by how many other files
are included in the patch that causes it, and both files are going to
end up going through the same tree at the same time. So, there's no
benefit at all that I can see from splitting the C file and Kconfig.
Ian Lartey March 13, 2013, 11:48 p.m. UTC | #4 
On 13/03/13 20:31, Stephen Warren wrote:
> On 03/08/2013 10:13 AM, Ian Lartey wrote:
>> On 08/03/13 01:13, Kim, Milo wrote:
>>>> Add the Kconfig and Makefile for the Palmas LED driver.
>>>
>>> It would be better if the Palmas LED driver files are combined into
>>> one patch.
>>> [PATCH v8 09/12] leds: Add support for Palmas LEDs
>>> [PATCH v8 11/12] leds: Kconfig for Palmas LEDs
>>
>> [PATCH v8 11/12] leds: Kconfig for Palmas LEDs
>> can often cause a merge conflict if there are already
>> additional drivers/files in the leds directory
>>
>> [PATCH v8 09/12] leds: Add support for Palmas LEDs
>> has more chance of being applied without any issues
>> (unless the person taking the patch already has
>> their own leds-palmas.c.
>
> A merge conflict isn't really influenced at all by how many other files
> are included in the patch that causes it,

Ah, I was thinking more of additional files in the destination
directory of the patch compared to when the patch was generated
giving a higher likelihood of multiple changes to the Makefile and 
Kconfig clashing with the Makefile and Kconfig patch changes.

> and both files are going to
> end up going through the same tree at the same time. So, there's no
> benefit at all that I can see from splitting the C file and Kconfig.

At least one of the LED maintainers has agreed with both of you
so it looks like I'm making things worse (not better as intended !)
I'll merge for the next patch mail.


Thanks for this and your other review comments.

Ian
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
diff mbox

Patch

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index ec50824..a070e29 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -469,6 +469,15 @@  config LEDS_BLINKM
 	  This option enables support for the BlinkM RGB LED connected
 	  through I2C. Say Y to enable support for the BlinkM LED.
 
+config LEDS_PALMAS
+	bool "LED support for the Palmas family of PMICs"
+	depends on LEDS_CLASS
+	depends on MFD_PALMAS
+	help
+	  This option enables the driver for LED1 & LED2 pins on Palmas PMIC
+	  if these pins are enabled in the mux configuration. The driver support
+	  ON/OFF and blinking with hardware control.
+
 config LEDS_TRIGGERS
 	bool "LED Trigger support"
 	depends on LEDS_CLASS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 215e7e3..233023e 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -52,6 +52,7 @@  obj-$(CONFIG_LEDS_RENESAS_TPU)		+= leds-renesas-tpu.o
 obj-$(CONFIG_LEDS_MAX8997)		+= leds-max8997.o
 obj-$(CONFIG_LEDS_LM355x)		+= leds-lm355x.o
 obj-$(CONFIG_LEDS_BLINKM)		+= leds-blinkm.o
+obj-$(CONFIG_LEDS_PALMAS)		+= leds-palmas.o
 
 # LED SPI Drivers
 obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o