linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies
@ 2017-03-24  8:47 Sebastian Reichel
  2017-03-24  8:47 ` [PATCHv3 2/2] leds: cpcap: new driver Sebastian Reichel
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Sebastian Reichel @ 2017-03-24  8:47 UTC (permalink / raw)
  To: Sebastian Reichel, Richard Purdie, Jacek Anaszewski,
	Pavel Machek, Lee Jones
  Cc: Tony Lindgren, Rob Herring, Mark Rutland, linux-leds, devicetree,
	linux-kernel

This fixes compilation for files, that try to include the
cpcap header in alphabetically sorted #include lists.

Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
Changes since PATCHv2:
 - Add Acked-by from Tony & Pavel
---
 include/linux/mfd/motorola-cpcap.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/linux/mfd/motorola-cpcap.h b/include/linux/mfd/motorola-cpcap.h
index 793aa695faa0..aefc49cb7ba9 100644
--- a/include/linux/mfd/motorola-cpcap.h
+++ b/include/linux/mfd/motorola-cpcap.h
@@ -14,6 +14,9 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/device.h>
+#include <linux/regmap.h>
+
 #define CPCAP_VENDOR_ST		0
 #define CPCAP_VENDOR_TI		1
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCHv3 2/2] leds: cpcap: new driver
  2017-03-24  8:47 [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Sebastian Reichel
@ 2017-03-24  8:47 ` Sebastian Reichel
  2017-03-29 19:12   ` Jacek Anaszewski
  2017-03-24 20:44 ` [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Jacek Anaszewski
  2017-03-28  8:13 ` [GIT PULL] Immutable branch between MFD and LEDS due for the v4.12 merge window Lee Jones
  2 siblings, 1 reply; 10+ messages in thread
From: Sebastian Reichel @ 2017-03-24  8:47 UTC (permalink / raw)
  To: Sebastian Reichel, Richard Purdie, Jacek Anaszewski,
	Pavel Machek, Lee Jones
  Cc: Tony Lindgren, Rob Herring, Mark Rutland, linux-leds, devicetree,
	linux-kernel

Motorola CPCAP is a PMIC (power management integrated circuit) found
in multiple smartphones. This driver adds support for the chip's LED
controllers. This introduces support for all controllers used by the
Droid 4. According to Motorola's driver (no datasheets available)
there a couple of more LED controllers. I did not add support for
them, since I cannot verify that they work with my modifications.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
Changes since PATCHv1:
 - binding: reference common led binding for label
 - drop DEBUG define (leftover)
 - s/led/LED/g in debug prints
 - order includes alphabetically
 - introduce mutex, since led API is not atomic
 - register led class after initial register setup
 - use GPLv2+ in header
 - drop unsupported leds from driver

Changes since PATCHv2:
 - use standard defines instead CPCAP_LED_OFF and CPCAP_LED_ON

Notes:
 - The "motorola" vendor-prefix is added via rtc-next
---
 .../devicetree/bindings/leds/cpcap-leds.txt        |  29 +++
 drivers/leds/Kconfig                               |   9 +
 drivers/leds/Makefile                              |   1 +
 drivers/leds/leds-cpcap.c                          | 239 +++++++++++++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/leds/cpcap-leds.txt
 create mode 100644 drivers/leds/leds-cpcap.c

diff --git a/Documentation/devicetree/bindings/leds/cpcap-leds.txt b/Documentation/devicetree/bindings/leds/cpcap-leds.txt
new file mode 100644
index 000000000000..ebf7cdc7f70c
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/cpcap-leds.txt
@@ -0,0 +1,29 @@
+Motorola CPCAP PMIC LEDs
+------------------------
+
+This module is part of the CPCAP. For more details about the whole
+chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt.
+
+Requires node properties:
+- compatible: should be one of
+   * "motorola,cpcap-led-mdl"		(Main Display Lighting)
+   * "motorola,cpcap-led-kl"		(Keyboard Lighting)
+   * "motorola,cpcap-led-adl"		(Aux Display Lighting)
+   * "motorola,cpcap-led-red"		(Red Triode)
+   * "motorola,cpcap-led-green"		(Green Triode)
+   * "motorola,cpcap-led-blue"		(Blue Triode)
+   * "motorola,cpcap-led-cf"		(Camera Flash)
+   * "motorola,cpcap-led-bt"		(Bluetooth)
+   * "motorola,cpcap-led-cp"		(Camera Privacy LED)
+- label: see Documentation/devicetree/bindings/leds/common.txt
+- vdd-supply: A phandle to the regulator powering the LED
+
+Example:
+
+&cpcap {
+	cpcap_led_red: red-led {
+		compatible = "motorola,cpcap-led-red";
+		label = "cpcap:red";
+		vdd-supply = <&sw5>;
+	};
+};
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 275f467956ee..043f02a4fe73 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -76,6 +76,15 @@ config LEDS_BCM6358
 	  This option enables support for LEDs connected to the BCM6358
 	  LED HW controller accessed via MMIO registers.
 
+config LEDS_CPCAP
+	tristate "LED Support for Motorola CPCAP"
+	depends on LEDS_CLASS
+	depends on MFD_CPCAP
+	depends on OF
+	help
+	  This option enables support for LEDs offered by Motorola's
+	  CPCAP PMIC.
+
 config LEDS_LM3530
 	tristate "LCD Backlight driver for LM3530"
 	depends on LEDS_CLASS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 6b8273736478..333e84ce5d3b 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_AAT1290)		+= leds-aat1290.o
 obj-$(CONFIG_LEDS_BCM6328)		+= leds-bcm6328.o
 obj-$(CONFIG_LEDS_BCM6358)		+= leds-bcm6358.o
 obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o
+obj-$(CONFIG_LEDS_CPCAP)		+= leds-cpcap.o
 obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
 obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o
 obj-$(CONFIG_LEDS_LM3533)		+= leds-lm3533.o
diff --git a/drivers/leds/leds-cpcap.c b/drivers/leds/leds-cpcap.c
new file mode 100644
index 000000000000..1ead2cbb98ae
--- /dev/null
+++ b/drivers/leds/leds-cpcap.c
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2017 Sebastian Reichel <sre@kernel.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 or
+ * later as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/leds.h>
+#include <linux/mfd/motorola-cpcap.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+#define CPCAP_LED_NO_CURRENT 0x0001
+
+struct cpcap_led_info {
+	u16 reg;
+	u16 mask;
+	u16 limit;
+	u16 init_mask;
+	u16 init_val;
+};
+
+static const struct cpcap_led_info cpcap_led_red = {
+	.reg	= CPCAP_REG_REDC,
+	.mask	= 0x03FF,
+	.limit	= 31,
+};
+
+static const struct cpcap_led_info cpcap_led_green = {
+	.reg	= CPCAP_REG_GREENC,
+	.mask	= 0x03FF,
+	.limit	= 31,
+};
+
+static const struct cpcap_led_info cpcap_led_blue = {
+	.reg	= CPCAP_REG_BLUEC,
+	.mask	= 0x03FF,
+	.limit	= 31,
+};
+
+/* aux display light */
+static const struct cpcap_led_info cpcap_led_adl = {
+	.reg		= CPCAP_REG_ADLC,
+	.mask		= 0x000F,
+	.limit		= 1,
+	.init_mask	= 0x7FFF,
+	.init_val	= 0x5FF0,
+};
+
+/* camera privacy led */
+static const struct cpcap_led_info cpcap_led_cp = {
+	.reg		= CPCAP_REG_CLEDC,
+	.mask		= 0x0007,
+	.limit		= 1,
+	.init_mask	= 0x03FF,
+	.init_val	= 0x0008,
+};
+
+struct cpcap_led {
+	struct led_classdev led;
+	const struct cpcap_led_info *info;
+	struct device *dev;
+	struct regmap *regmap;
+	struct mutex update_lock;
+	struct regulator *vdd;
+	bool powered;
+
+	u32 current_limit;
+};
+
+static u16 cpcap_led_val(u8 current_limit, u8 duty_cycle)
+{
+	current_limit &= 0x1f; /* 5 bit */
+	duty_cycle &= 0x0f; /* 4 bit */
+
+	return current_limit << 4 | duty_cycle;
+}
+
+static int cpcap_led_set_power(struct cpcap_led *led, bool status)
+{
+	int err;
+
+	if (status == led->powered)
+		return 0;
+
+	if (status)
+		err = regulator_enable(led->vdd);
+	else
+		err = regulator_disable(led->vdd);
+
+	if (err) {
+		dev_err(led->dev, "regulator failure: %d", err);
+		return err;
+	}
+
+	led->powered = status;
+
+	return 0;
+}
+
+static int cpcap_led_set(struct led_classdev *ledc, enum led_brightness value)
+{
+	struct cpcap_led *led = container_of(ledc, struct cpcap_led, led);
+	int brightness;
+	int err;
+
+	mutex_lock(&led->update_lock);
+
+	if (value > LED_OFF) {
+		err = cpcap_led_set_power(led, true);
+		if (err)
+			goto exit;
+	}
+
+	if (value == LED_OFF) {
+		/* Avoid HW issue by turning off current before duty cycle */
+		err = regmap_update_bits(led->regmap,
+			led->info->reg, led->info->mask, CPCAP_LED_NO_CURRENT);
+		if (err) {
+			dev_err(led->dev, "regmap failed: %d", err);
+			goto exit;
+		}
+
+		brightness = cpcap_led_val(value, LED_OFF);;
+	} else {
+		brightness = cpcap_led_val(value, LED_ON);
+	}
+
+	err = regmap_update_bits(led->regmap, led->info->reg, led->info->mask,
+		brightness);
+	if (err) {
+		dev_err(led->dev, "regmap failed: %d", err);
+		goto exit;
+	}
+
+	if (value == LED_OFF) {
+		err = cpcap_led_set_power(led, false);
+		if (err)
+			goto exit;
+	}
+
+exit:
+	mutex_unlock(&led->update_lock);
+	return err;
+}
+
+static const struct of_device_id cpcap_led_of_match[] = {
+	{ .compatible = "motorola,cpcap-led-red", .data = &cpcap_led_red },
+	{ .compatible = "motorola,cpcap-led-green", .data = &cpcap_led_green },
+	{ .compatible = "motorola,cpcap-led-blue",  .data = &cpcap_led_blue },
+	{ .compatible = "motorola,cpcap-led-adl", .data = &cpcap_led_adl },
+	{ .compatible = "motorola,cpcap-led-cp", .data = &cpcap_led_cp },
+	{},
+};
+MODULE_DEVICE_TABLE(of, cpcap_led_of_match);
+
+static int cpcap_led_probe(struct platform_device *pdev)
+{
+	const struct of_device_id *match;
+	struct cpcap_led *led;
+	int err;
+
+	match = of_match_device(of_match_ptr(cpcap_led_of_match), &pdev->dev);
+	if (!match || !match->data)
+		return -EINVAL;
+
+	led = devm_kzalloc(&pdev->dev, sizeof(*led), GFP_KERNEL);
+	if (!led)
+		return -ENOMEM;
+	platform_set_drvdata(pdev, led);
+	led->info = match->data;
+	led->dev = &pdev->dev;
+
+	if (led->info->reg == 0x0000) {
+		dev_err(led->dev, "Unsupported LED");
+		return -ENODEV;
+	}
+
+	led->regmap = dev_get_regmap(pdev->dev.parent, NULL);
+	if (!led->regmap)
+		return -ENODEV;
+
+	led->vdd = devm_regulator_get(&pdev->dev, "vdd");
+	if (IS_ERR(led->vdd)) {
+		err = PTR_ERR(led->vdd);
+		dev_err(led->dev, "Couldn't get regulator: %d", err);
+		return err;
+	}
+
+	err = device_property_read_string(&pdev->dev, "label", &led->led.name);
+	if (err) {
+		dev_err(led->dev, "Couldn't read LED label: %d", err);
+		return err;
+	}
+
+	if (led->info->init_mask) {
+		err = regmap_update_bits(led->regmap, led->info->reg,
+			led->info->init_mask, led->info->init_val);
+		if (err) {
+			dev_err(led->dev, "regmap failed: %d", err);
+			return err;
+		}
+	}
+
+	mutex_init(&led->update_lock);
+
+	led->led.max_brightness = led->info->limit;
+	led->led.brightness_set_blocking = cpcap_led_set;
+	err = devm_led_classdev_register(&pdev->dev, &led->led);
+	if (err) {
+		dev_err(led->dev, "Couldn't register LED: %d", err);
+		return err;
+	}
+
+	return 0;
+}
+
+static struct platform_driver cpcap_led_driver = {
+	.probe = cpcap_led_probe,
+	.driver = {
+		.name = "cpcap-led",
+		.of_match_table = cpcap_led_of_match,
+	},
+};
+module_platform_driver(cpcap_led_driver);
+
+MODULE_DESCRIPTION("CPCAP LED driver");
+MODULE_AUTHOR("Sebastian Reichel <sre@kernel.org>");
+MODULE_LICENSE("GPL");
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies
  2017-03-24  8:47 [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Sebastian Reichel
  2017-03-24  8:47 ` [PATCHv3 2/2] leds: cpcap: new driver Sebastian Reichel
@ 2017-03-24 20:44 ` Jacek Anaszewski
  2017-03-27 14:26   ` Lee Jones
  2017-03-28  8:13 ` [GIT PULL] Immutable branch between MFD and LEDS due for the v4.12 merge window Lee Jones
  2 siblings, 1 reply; 10+ messages in thread
From: Jacek Anaszewski @ 2017-03-24 20:44 UTC (permalink / raw)
  To: Sebastian Reichel, Richard Purdie, Pavel Machek, Lee Jones
  Cc: Tony Lindgren, Rob Herring, Mark Rutland, linux-leds, devicetree,
	linux-kernel

Hi Sebastianm

On 03/24/2017 09:47 AM, Sebastian Reichel wrote:
> This fixes compilation for files, that try to include the
> cpcap header in alphabetically sorted #include lists.
> 
> Acked-by: Pavel Machek <pavel@ucw.cz>
> Acked-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Sebastian Reichel <sre@kernel.org>
> ---
> Changes since PATCHv2:
>  - Add Acked-by from Tony & Pavel
> ---
>  include/linux/mfd/motorola-cpcap.h | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/include/linux/mfd/motorola-cpcap.h b/include/linux/mfd/motorola-cpcap.h
> index 793aa695faa0..aefc49cb7ba9 100644
> --- a/include/linux/mfd/motorola-cpcap.h
> +++ b/include/linux/mfd/motorola-cpcap.h
> @@ -14,6 +14,9 @@
>   * published by the Free Software Foundation.
>   */
>  
> +#include <linux/device.h>
> +#include <linux/regmap.h>
> +
>  #define CPCAP_VENDOR_ST		0
>  #define CPCAP_VENDOR_TI		1
>  
> 

Both patches applied to the for-next branch of linux-leds.git, thanks.

-- 
Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies
  2017-03-24 20:44 ` [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Jacek Anaszewski
@ 2017-03-27 14:26   ` Lee Jones
  2017-03-27 18:38     ` Jacek Anaszewski
  0 siblings, 1 reply; 10+ messages in thread
From: Lee Jones @ 2017-03-27 14:26 UTC (permalink / raw)
  To: Jacek Anaszewski
  Cc: Sebastian Reichel, Richard Purdie, Pavel Machek, Tony Lindgren,
	Rob Herring, Mark Rutland, linux-leds, devicetree, linux-kernel

On Fri, 24 Mar 2017, Jacek Anaszewski wrote:
> On 03/24/2017 09:47 AM, Sebastian Reichel wrote:
> > This fixes compilation for files, that try to include the
> > cpcap header in alphabetically sorted #include lists.
> > 
> > Acked-by: Pavel Machek <pavel@ucw.cz>
> > Acked-by: Tony Lindgren <tony@atomide.com>
> > Signed-off-by: Sebastian Reichel <sre@kernel.org>
> > ---
> > Changes since PATCHv2:
> >  - Add Acked-by from Tony & Pavel
> > ---
> >  include/linux/mfd/motorola-cpcap.h | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/include/linux/mfd/motorola-cpcap.h b/include/linux/mfd/motorola-cpcap.h
> > index 793aa695faa0..aefc49cb7ba9 100644
> > --- a/include/linux/mfd/motorola-cpcap.h
> > +++ b/include/linux/mfd/motorola-cpcap.h
> > @@ -14,6 +14,9 @@
> >   * published by the Free Software Foundation.
> >   */
> >  
> > +#include <linux/device.h>
> > +#include <linux/regmap.h>
> > +
> >  #define CPCAP_VENDOR_ST		0
> >  #define CPCAP_VENDOR_TI		1
> 
> Both patches applied to the for-next branch of linux-leds.git, thanks.

Que?

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies
  2017-03-27 14:26   ` Lee Jones
@ 2017-03-27 18:38     ` Jacek Anaszewski
  2017-03-28  8:16       ` Lee Jones
  0 siblings, 1 reply; 10+ messages in thread
From: Jacek Anaszewski @ 2017-03-27 18:38 UTC (permalink / raw)
  To: Lee Jones
  Cc: Sebastian Reichel, Richard Purdie, Pavel Machek, Tony Lindgren,
	Rob Herring, Mark Rutland, linux-leds, devicetree, linux-kernel

On 03/27/2017 04:26 PM, Lee Jones wrote:
> On Fri, 24 Mar 2017, Jacek Anaszewski wrote:
>> On 03/24/2017 09:47 AM, Sebastian Reichel wrote:
>>> This fixes compilation for files, that try to include the
>>> cpcap header in alphabetically sorted #include lists.
>>>
>>> Acked-by: Pavel Machek <pavel@ucw.cz>
>>> Acked-by: Tony Lindgren <tony@atomide.com>
>>> Signed-off-by: Sebastian Reichel <sre@kernel.org>
>>> ---
>>> Changes since PATCHv2:
>>>  - Add Acked-by from Tony & Pavel
>>> ---
>>>  include/linux/mfd/motorola-cpcap.h | 3 +++
>>>  1 file changed, 3 insertions(+)
>>>
>>> diff --git a/include/linux/mfd/motorola-cpcap.h b/include/linux/mfd/motorola-cpcap.h
>>> index 793aa695faa0..aefc49cb7ba9 100644
>>> --- a/include/linux/mfd/motorola-cpcap.h
>>> +++ b/include/linux/mfd/motorola-cpcap.h
>>> @@ -14,6 +14,9 @@
>>>   * published by the Free Software Foundation.
>>>   */
>>>  
>>> +#include <linux/device.h>
>>> +#include <linux/regmap.h>
>>> +
>>>  #define CPCAP_VENDOR_ST		0
>>>  #define CPCAP_VENDOR_TI		1
>>
>> Both patches applied to the for-next branch of linux-leds.git, thanks.
> 
> Que?

Ah, sorry, for some reason I silently assumed that Tony gave ack on
your behalf :-) Probably due to lack of your activity in the subject
and Tony's understanding thereof [0].


Can I have your ack for this patch going through LED tree then?


[0] https://lkml.org/lkml/2017/3/23/413

-- 
Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [GIT PULL] Immutable branch between MFD and LEDS due for the v4.12 merge window
  2017-03-24  8:47 [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Sebastian Reichel
  2017-03-24  8:47 ` [PATCHv3 2/2] leds: cpcap: new driver Sebastian Reichel
  2017-03-24 20:44 ` [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Jacek Anaszewski
@ 2017-03-28  8:13 ` Lee Jones
  2017-03-28 19:37   ` Jacek Anaszewski
  2 siblings, 1 reply; 10+ messages in thread
From: Lee Jones @ 2017-03-28  8:13 UTC (permalink / raw)
  To: Sebastian Reichel
  Cc: Richard Purdie, Jacek Anaszewski, Pavel Machek, Tony Lindgren,
	Rob Herring, Mark Rutland, linux-leds, devicetree, linux-kernel

Enjoy!

The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:

  Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-leds-v4.12

for you to fetch changes up to 4f9ab0c1570800002e77515888600ca2e3dce4a9:

  mfd: cpcap: Add missing include dependencies (2017-03-28 09:09:50 +0100)

----------------------------------------------------------------
Immutable branch between MFD and LEDS due for the v4.12 merge window

----------------------------------------------------------------
Sebastian Reichel (1):
      mfd: cpcap: Add missing include dependencies

 include/linux/mfd/motorola-cpcap.h | 3 +++
 1 file changed, 3 insertions(+)

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies
  2017-03-27 18:38     ` Jacek Anaszewski
@ 2017-03-28  8:16       ` Lee Jones
  0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2017-03-28  8:16 UTC (permalink / raw)
  To: Jacek Anaszewski
  Cc: Sebastian Reichel, Richard Purdie, Pavel Machek, Tony Lindgren,
	Rob Herring, Mark Rutland, linux-leds, devicetree, linux-kernel

On Mon, 27 Mar 2017, Jacek Anaszewski wrote:
> On 03/27/2017 04:26 PM, Lee Jones wrote:
> > On Fri, 24 Mar 2017, Jacek Anaszewski wrote:
> >> On 03/24/2017 09:47 AM, Sebastian Reichel wrote:
> >>> This fixes compilation for files, that try to include the
> >>> cpcap header in alphabetically sorted #include lists.
> >>>
> >>> Acked-by: Pavel Machek <pavel@ucw.cz>
> >>> Acked-by: Tony Lindgren <tony@atomide.com>
> >>> Signed-off-by: Sebastian Reichel <sre@kernel.org>
> >>> ---
> >>> Changes since PATCHv2:
> >>>  - Add Acked-by from Tony & Pavel
> >>> ---
> >>>  include/linux/mfd/motorola-cpcap.h | 3 +++
> >>>  1 file changed, 3 insertions(+)
> >>>
> >>> diff --git a/include/linux/mfd/motorola-cpcap.h b/include/linux/mfd/motorola-cpcap.h
> >>> index 793aa695faa0..aefc49cb7ba9 100644
> >>> --- a/include/linux/mfd/motorola-cpcap.h
> >>> +++ b/include/linux/mfd/motorola-cpcap.h
> >>> @@ -14,6 +14,9 @@
> >>>   * published by the Free Software Foundation.
> >>>   */
> >>>  
> >>> +#include <linux/device.h>
> >>> +#include <linux/regmap.h>
> >>> +
> >>>  #define CPCAP_VENDOR_ST		0
> >>>  #define CPCAP_VENDOR_TI		1
> >>
> >> Both patches applied to the for-next branch of linux-leds.git, thanks.
> > 
> > Que?
> 
> Ah, sorry, for some reason I silently assumed that Tony gave ack on
> your behalf :-) Probably due to lack of your activity in the subject
> and Tony's understanding thereof [0].

Right, but you still need to align with other Maintainers despite
expert reviews, since they are in a better position to help avoid
potential merge conflicts.

> Can I have your ack for this patch going through LED tree then?

I've gone one better and provided you with a pull-request.  It's the
best way to avoid merge conflict, subsequently upsetting the Big
Penguin.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [GIT PULL] Immutable branch between MFD and LEDS due for the v4.12 merge window
  2017-03-28  8:13 ` [GIT PULL] Immutable branch between MFD and LEDS due for the v4.12 merge window Lee Jones
@ 2017-03-28 19:37   ` Jacek Anaszewski
  0 siblings, 0 replies; 10+ messages in thread
From: Jacek Anaszewski @ 2017-03-28 19:37 UTC (permalink / raw)
  To: Lee Jones, Sebastian Reichel
  Cc: Richard Purdie, Pavel Machek, Tony Lindgren, Rob Herring,
	Mark Rutland, linux-leds, devicetree, linux-kernel

On 03/28/2017 10:13 AM, Lee Jones wrote:
> Enjoy!
> 
> The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:
> 
>   Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-leds-v4.12
> 
> for you to fetch changes up to 4f9ab0c1570800002e77515888600ca2e3dce4a9:
> 
>   mfd: cpcap: Add missing include dependencies (2017-03-28 09:09:50 +0100)
> 
> ----------------------------------------------------------------
> Immutable branch between MFD and LEDS due for the v4.12 merge window
> 
> ----------------------------------------------------------------
> Sebastian Reichel (1):
>       mfd: cpcap: Add missing include dependencies
> 
>  include/linux/mfd/motorola-cpcap.h | 3 +++
>  1 file changed, 3 insertions(+)
> 

Pulled, thanks.

-- 
Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCHv3 2/2] leds: cpcap: new driver
  2017-03-24  8:47 ` [PATCHv3 2/2] leds: cpcap: new driver Sebastian Reichel
@ 2017-03-29 19:12   ` Jacek Anaszewski
  2017-03-29 21:38     ` Sebastian Reichel
  0 siblings, 1 reply; 10+ messages in thread
From: Jacek Anaszewski @ 2017-03-29 19:12 UTC (permalink / raw)
  To: Sebastian Reichel, Richard Purdie, Pavel Machek, Lee Jones
  Cc: Tony Lindgren, Rob Herring, Mark Rutland, linux-leds, devicetree,
	linux-kernel

Hi Sebastian,

On 03/24/2017 09:47 AM, Sebastian Reichel wrote:
> Motorola CPCAP is a PMIC (power management integrated circuit) found
> in multiple smartphones. This driver adds support for the chip's LED
> controllers. This introduces support for all controllers used by the
> Droid 4. According to Motorola's driver (no datasheets available)
> there a couple of more LED controllers. I did not add support for
> them, since I cannot verify that they work with my modifications.
> 
> Acked-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Sebastian Reichel <sre@kernel.org>
> ---
> Changes since PATCHv1:
>  - binding: reference common led binding for label
>  - drop DEBUG define (leftover)
>  - s/led/LED/g in debug prints
>  - order includes alphabetically
>  - introduce mutex, since led API is not atomic
>  - register led class after initial register setup
>  - use GPLv2+ in header
>  - drop unsupported leds from driver
> 
> Changes since PATCHv2:
>  - use standard defines instead CPCAP_LED_OFF and CPCAP_LED_ON
> 
> Notes:
>  - The "motorola" vendor-prefix is added via rtc-next
> ---
>  .../devicetree/bindings/leds/cpcap-leds.txt        |  29 +++
>  drivers/leds/Kconfig                               |   9 +
>  drivers/leds/Makefile                              |   1 +
>  drivers/leds/leds-cpcap.c                          | 239 +++++++++++++++++++++
>  4 files changed, 278 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/leds/cpcap-leds.txt
>  create mode 100644 drivers/leds/leds-cpcap.c
> 
> diff --git a/Documentation/devicetree/bindings/leds/cpcap-leds.txt b/Documentation/devicetree/bindings/leds/cpcap-leds.txt
> new file mode 100644
> index 000000000000..ebf7cdc7f70c
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/leds/cpcap-leds.txt

I've changed cpcap-leds.txt to leds-cpcap.txt to match the prevailing
pattern for LED DT bindings file names.

Please let me know if you have any objections.

-- 
Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCHv3 2/2] leds: cpcap: new driver
  2017-03-29 19:12   ` Jacek Anaszewski
@ 2017-03-29 21:38     ` Sebastian Reichel
  0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Reichel @ 2017-03-29 21:38 UTC (permalink / raw)
  To: Jacek Anaszewski
  Cc: Richard Purdie, Pavel Machek, Lee Jones, Tony Lindgren,
	Rob Herring, Mark Rutland, linux-leds, devicetree, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]

Hi,

On Wed, Mar 29, 2017 at 09:12:57PM +0200, Jacek Anaszewski wrote:
> On 03/24/2017 09:47 AM, Sebastian Reichel wrote:
> > Motorola CPCAP is a PMIC (power management integrated circuit) found
> > in multiple smartphones. This driver adds support for the chip's LED
> > controllers. This introduces support for all controllers used by the
> > Droid 4. According to Motorola's driver (no datasheets available)
> > there a couple of more LED controllers. I did not add support for
> > them, since I cannot verify that they work with my modifications.
> > 
> > Acked-by: Pavel Machek <pavel@ucw.cz>
> > Signed-off-by: Sebastian Reichel <sre@kernel.org>
> > ---
> > Changes since PATCHv1:
> >  - binding: reference common led binding for label
> >  - drop DEBUG define (leftover)
> >  - s/led/LED/g in debug prints
> >  - order includes alphabetically
> >  - introduce mutex, since led API is not atomic
> >  - register led class after initial register setup
> >  - use GPLv2+ in header
> >  - drop unsupported leds from driver
> > 
> > Changes since PATCHv2:
> >  - use standard defines instead CPCAP_LED_OFF and CPCAP_LED_ON
> > 
> > Notes:
> >  - The "motorola" vendor-prefix is added via rtc-next
> > ---
> >  .../devicetree/bindings/leds/cpcap-leds.txt        |  29 +++
> >  drivers/leds/Kconfig                               |   9 +
> >  drivers/leds/Makefile                              |   1 +
> >  drivers/leds/leds-cpcap.c                          | 239 +++++++++++++++++++++
> >  4 files changed, 278 insertions(+)
> >  create mode 100644 Documentation/devicetree/bindings/leds/cpcap-leds.txt
> >  create mode 100644 drivers/leds/leds-cpcap.c
> > 
> > diff --git a/Documentation/devicetree/bindings/leds/cpcap-leds.txt b/Documentation/devicetree/bindings/leds/cpcap-leds.txt
> > new file mode 100644
> > index 000000000000..ebf7cdc7f70c
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/leds/cpcap-leds.txt
> 
> I've changed cpcap-leds.txt to leds-cpcap.txt to match the prevailing
> pattern for LED DT bindings file names.
> 
> Please let me know if you have any objections.

Acked-by: Sebastian Reichel <sre@kernel.org>

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-03-29 21:38 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-24  8:47 [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Sebastian Reichel
2017-03-24  8:47 ` [PATCHv3 2/2] leds: cpcap: new driver Sebastian Reichel
2017-03-29 19:12   ` Jacek Anaszewski
2017-03-29 21:38     ` Sebastian Reichel
2017-03-24 20:44 ` [PATCHv3 1/2] mfd: cpcap: Add missing include dependencies Jacek Anaszewski
2017-03-27 14:26   ` Lee Jones
2017-03-27 18:38     ` Jacek Anaszewski
2017-03-28  8:16       ` Lee Jones
2017-03-28  8:13 ` [GIT PULL] Immutable branch between MFD and LEDS due for the v4.12 merge window Lee Jones
2017-03-28 19:37   ` Jacek Anaszewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).