[PATCH 0/3] AS3645A fixes

[PATCH 0/3] AS3645A fixes

[Sakari Ailus]

Hi folks,

Here are a few fixes for the as3645a DTS as well as changes in bindings.
The driver is not in a release yet. I'd like to get these in as through
the media tree fixes branch.

Sakari Ailus (3):
  as3645a: Use ams,input-max-microamp as documented in DT bindings
  dt: bindings: as3645a: Use LED number to refer to LEDs
  as3645a: Use integer numbers for parsing LEDs

 .../devicetree/bindings/leds/ams,as3645a.txt       | 28 ++++++++++++++--------
 arch/arm/boot/dts/omap3-n950-n9.dtsi               | 10 +++++---
 drivers/leds/leds-as3645a.c                        | 28 +++++++++++++++++++---
 3 files changed, 50 insertions(+), 16 deletions(-)

-- 
2.11.0

[PATCH 1/3] as3645a: Use ams,input-max-microamp as documented in DT bindings

[Sakari Ailus]

DT bindings document the property "ams,input-max-microamp" that limits the
chip's maximum input current. The driver and the DTS however used
"peak-current-limit" property. Fix this by using the property documented
in DT binding documentation.

Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
 arch/arm/boot/dts/omap3-n950-n9.dtsi | 2 +-
 drivers/leds/leds-as3645a.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index cb47ae79a5f9..b86fc83a5a65 100644
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -273,7 +273,7 @@
 			flash-timeout-us = <150000>;
 			flash-max-microamp = <320000>;
 			led-max-microamp = <60000>;
-			peak-current-limit = <1750000>;
+			ams,input-max-microamp = <1750000>;
 		};
 		indicator {
 			led-max-microamp = <10000>;
diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c
index bbbbe0898233..e3f89c6130d2 100644
--- a/drivers/leds/leds-as3645a.c
+++ b/drivers/leds/leds-as3645a.c
@@ -534,7 +534,7 @@ static int as3645a_parse_node(struct as3645a *flash,
 	of_property_read_u32(flash->flash_node, "voltage-reference",
 			     &cfg->voltage_reference);
 
-	of_property_read_u32(flash->flash_node, "peak-current-limit",
+	of_property_read_u32(flash->flash_node, "ams,input-max-microamp",
 			     &cfg->peak);
 	cfg->peak = AS_PEAK_mA_TO_REG(cfg->peak);
 
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] as3645a: Use ams,input-max-microamp as documented in DT bindings

[Pavel Machek]

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

On Fri 2017-09-08 15:42:11, Sakari Ailus wrote:
> DT bindings document the property "ams,input-max-microamp" that limits the
> chip's maximum input current. The driver and the DTS however used
> "peak-current-limit" property. Fix this by using the property documented
> in DT binding documentation.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

Acked-by: Pavel Machek <pavel@ucw.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[PATCH 3/3] as3645a: Use integer numbers for parsing LEDs

[Sakari Ailus]

Use integer numbers for LEDs, 0 is the flash and 1 is the indicator.

Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
 arch/arm/boot/dts/omap3-n950-n9.dtsi |  8 ++++++--
 drivers/leds/leds-as3645a.c          | 26 ++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index b86fc83a5a65..1b0bd72945f2 100644
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -267,15 +267,19 @@
 	clock-frequency = <400000>;
 
 	as3645a@30 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		reg = <0x30>;
 		compatible = "ams,as3645a";
-		flash {
+		flash@0 {
+			reg = <0x0>;
 			flash-timeout-us = <150000>;
 			flash-max-microamp = <320000>;
 			led-max-microamp = <60000>;
 			ams,input-max-microamp = <1750000>;
 		};
-		indicator {
+		indicator@1 {
+			reg = <0x1>;
 			led-max-microamp = <10000>;
 		};
 	};
diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c
index e3f89c6130d2..605e0c64e974 100644
--- a/drivers/leds/leds-as3645a.c
+++ b/drivers/leds/leds-as3645a.c
@@ -112,6 +112,10 @@
 #define AS_PEAK_mA_TO_REG(a) \
 	((min_t(u32, AS_PEAK_mA_MAX, a) - 1250) / 250)
 
+/* LED numbers for Devicetree */
+#define AS_LED_FLASH				0
+#define AS_LED_INDICATOR			1
+
 enum as_mode {
 	AS_MODE_EXT_TORCH = 0 << AS_CONTROL_MODE_SETTING_SHIFT,
 	AS_MODE_INDICATOR = 1 << AS_CONTROL_MODE_SETTING_SHIFT,
@@ -491,10 +495,29 @@ static int as3645a_parse_node(struct as3645a *flash,
 			      struct device_node *node)
 {
 	struct as3645a_config *cfg = &flash->cfg;
+	struct device_node *child;
 	const char *name;
 	int rval;
 
-	flash->flash_node = of_get_child_by_name(node, "flash");
+	for_each_child_of_node(node, child) {
+		u32 id = 0;
+
+		of_property_read_u32(child, "reg", &id);
+
+		switch (id) {
+		case AS_LED_FLASH:
+			flash->flash_node = of_node_get(child);
+			break;
+		case AS_LED_INDICATOR:
+			flash->indicator_node = of_node_get(child);
+			break;
+		default:
+			dev_warn(&flash->client->dev,
+				 "unknown LED %u encountered, ignoring\n", id);
+			break;
+		}
+	}
+
 	if (!flash->flash_node) {
 		dev_err(&flash->client->dev, "can't find flash node\n");
 		return -ENODEV;
@@ -538,7 +561,6 @@ static int as3645a_parse_node(struct as3645a *flash,
 			     &cfg->peak);
 	cfg->peak = AS_PEAK_mA_TO_REG(cfg->peak);
 
-	flash->indicator_node = of_get_child_by_name(node, "indicator");
 	if (!flash->indicator_node) {
 		dev_warn(&flash->client->dev,
 			 "can't find indicator node\n");
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/3] as3645a: Use integer numbers for parsing LEDs

[Pavel Machek]

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

On Fri 2017-09-08 15:42:13, Sakari Ailus wrote:
> Use integer numbers for LEDs, 0 is the flash and 1 is the indicator.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

Dunno. Old code is shorter, old device tree is shorter, ... IMO both
versions are fine, because the LEDs are really different. Do we have
documentation somewhere saying that reg= should be used for this? Are
you doing this for consistency?

Best regards,
									Pavel

>  arch/arm/boot/dts/omap3-n950-n9.dtsi |  8 ++++++--
>  drivers/leds/leds-as3645a.c          | 26 ++++++++++++++++++++++++--


> @@ -267,15 +267,19 @@
>  	clock-frequency = <400000>;
>  
>  	as3645a@30 {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
>  		reg = <0x30>;
>  		compatible = "ams,as3645a";
> -		flash {
> +		flash@0 {
> +			reg = <0x0>;
>  			flash-timeout-us = <150000>;
>  			flash-max-microamp = <320000>;
>  			led-max-microamp = <60000>;
>  			ams,input-max-microamp = <1750000>;
>  		};
> -		indicator {
> +		indicator@1 {
> +			reg = <0x1>;
>  			led-max-microamp = <10000>;
>  		};
>  	};
> diff --git a/drivers/leds/leds-as3645a.c b/drivers/leds/leds-as3645a.c
> index e3f89c6130d2..605e0c64e974 100644
> --- a/drivers/leds/leds-as3645a.c
> +++ b/drivers/leds/leds-as3645a.c
> @@ -112,6 +112,10 @@
>  #define AS_PEAK_mA_TO_REG(a) \
>  	((min_t(u32, AS_PEAK_mA_MAX, a) - 1250) / 250)
>  
> +/* LED numbers for Devicetree */
> +#define AS_LED_FLASH				0
> +#define AS_LED_INDICATOR			1
> +
>  enum as_mode {
>  	AS_MODE_EXT_TORCH = 0 << AS_CONTROL_MODE_SETTING_SHIFT,
>  	AS_MODE_INDICATOR = 1 << AS_CONTROL_MODE_SETTING_SHIFT,
> @@ -491,10 +495,29 @@ static int as3645a_parse_node(struct as3645a *flash,
>  			      struct device_node *node)
>  {
>  	struct as3645a_config *cfg = &flash->cfg;
> +	struct device_node *child;
>  	const char *name;
>  	int rval;
>  
> -	flash->flash_node = of_get_child_by_name(node, "flash");
> +	for_each_child_of_node(node, child) {
> +		u32 id = 0;
> +
> +		of_property_read_u32(child, "reg", &id);
> +
> +		switch (id) {
> +		case AS_LED_FLASH:
> +			flash->flash_node = of_node_get(child);
> +			break;
> +		case AS_LED_INDICATOR:
> +			flash->indicator_node = of_node_get(child);
> +			break;
> +		default:
> +			dev_warn(&flash->client->dev,
> +				 "unknown LED %u encountered, ignoring\n", id);
> +			break;
> +		}
> +	}
> +
>  	if (!flash->flash_node) {
>  		dev_err(&flash->client->dev, "can't find flash node\n");
>  		return -ENODEV;
> @@ -538,7 +561,6 @@ static int as3645a_parse_node(struct as3645a *flash,
>  			     &cfg->peak);
>  	cfg->peak = AS_PEAK_mA_TO_REG(cfg->peak);
>  
> -	flash->indicator_node = of_get_child_by_name(node, "indicator");
>  	if (!flash->indicator_node) {
>  		dev_warn(&flash->client->dev,
>  			 "can't find indicator node\n");

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH 3/3] as3645a: Use integer numbers for parsing LEDs

[Sakari Ailus]

Hi Pavel,

Thanks for the review.

On Fri, Sep 08, 2017 at 03:17:58PM +0200, Pavel Machek wrote:
> On Fri 2017-09-08 15:42:13, Sakari Ailus wrote:
> > Use integer numbers for LEDs, 0 is the flash and 1 is the indicator.
> > 
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> 
> Dunno. Old code is shorter, old device tree is shorter, ... IMO both
> versions are fine, because the LEDs are really different. Do we have
> documentation somewhere saying that reg= should be used for this? Are
> you doing this for consistency?

Well, actually for ACPI support. :-) It requires less driver changes this
way. See 17th and 18th patches in "[PATCH v9 00/23] Unified fwnode endpoint
parser, async sub-device notifier support, N9 flash DTS".

A number of chips have LED binding that is aligned, see e.g.
Documentation/devicetree/bindings/leds/leds-bcm6328.txt .

-- 
Regards,

Sakari Ailus
e-mail: sakari.ailus@iki.fi

Re: [PATCH 3/3] as3645a: Use integer numbers for parsing LEDs

[Pavel Machek]

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

On Fri 2017-09-08 16:23:34, Sakari Ailus wrote:
> Hi Pavel,
> 
> Thanks for the review.
> 
> On Fri, Sep 08, 2017 at 03:17:58PM +0200, Pavel Machek wrote:
> > On Fri 2017-09-08 15:42:13, Sakari Ailus wrote:
> > > Use integer numbers for LEDs, 0 is the flash and 1 is the indicator.
> > > 
> > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > 
> > Dunno. Old code is shorter, old device tree is shorter, ... IMO both
> > versions are fine, because the LEDs are really different. Do we have
> > documentation somewhere saying that reg= should be used for this? Are
> > you doing this for consistency?
> 
> Well, actually for ACPI support. :-) It requires less driver changes this
> way. See 17th and 18th patches in "[PATCH v9 00/23] Unified fwnode endpoint
> parser, async sub-device notifier support, N9 flash DTS".

ACPI, I hate ACPI.

> A number of chips have LED binding that is aligned, see e.g.
> Documentation/devicetree/bindings/leds/leds-bcm6328.txt .

Ok, yes, that's common way LED controllers are handled. Usually all
the LEDs are "same", but...

Acked-by: Pavel Machek <pavel@ucw.cz>

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH 3/3] as3645a: Use integer numbers for parsing LEDs

[Sakari Ailus]

On Fri, Sep 08, 2017 at 03:38:41PM +0200, Pavel Machek wrote:
> On Fri 2017-09-08 16:23:34, Sakari Ailus wrote:
> > Hi Pavel,
> > 
> > Thanks for the review.
> > 
> > On Fri, Sep 08, 2017 at 03:17:58PM +0200, Pavel Machek wrote:
> > > On Fri 2017-09-08 15:42:13, Sakari Ailus wrote:
> > > > Use integer numbers for LEDs, 0 is the flash and 1 is the indicator.
> > > > 
> > > > Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > > 
> > > Dunno. Old code is shorter, old device tree is shorter, ... IMO both
> > > versions are fine, because the LEDs are really different. Do we have
> > > documentation somewhere saying that reg= should be used for this? Are
> > > you doing this for consistency?
> > 
> > Well, actually for ACPI support. :-) It requires less driver changes this
> > way. See 17th and 18th patches in "[PATCH v9 00/23] Unified fwnode endpoint
> > parser, async sub-device notifier support, N9 flash DTS".
> 
> ACPI, I hate ACPI.

:-D

> 
> > A number of chips have LED binding that is aligned, see e.g.
> > Documentation/devicetree/bindings/leds/leds-bcm6328.txt .
> 
> Ok, yes, that's common way LED controllers are handled. Usually all
> the LEDs are "same", but...

I presume that's the case with most LED driver chips: all the outputs are
alike.

> 
> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>

Thanks!

-- 
Regards,

Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/3] dt: bindings: as3645a: Use LED number to refer to LEDs

[Sakari Ailus]

Use integers (reg property) to tell the number of the LED to the driver
instead of the node name. While both of these approaches are currently
used by the LED bindings, using integers will require less driver changes
for ACPI support. Additionally, it will make possible LED naming using
chip and LED node names, effectively making the label property most useful
for human-readable names only.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 .../devicetree/bindings/leds/ams,as3645a.txt       | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/leds/ams,as3645a.txt b/Documentation/devicetree/bindings/leds/ams,as3645a.txt
index 12c5ef26ec73..fdc40e354a64 100644
--- a/Documentation/devicetree/bindings/leds/ams,as3645a.txt
+++ b/Documentation/devicetree/bindings/leds/ams,as3645a.txt
@@ -15,11 +15,14 @@ Required properties
 
 compatible	: Must be "ams,as3645a".
 reg		: The I2C address of the device. Typically 0x30.
+#address-cells	: 1
+#size-cells	: 0
 
 
-Required properties of the "flash" child node
-=============================================
+Required properties of the flash child node (0)
+===============================================
 
+reg: 0
 flash-timeout-us: Flash timeout in microseconds. The value must be in
 		  the range [100000, 850000] and divisible by 50000.
 flash-max-microamp: Maximum flash current in microamperes. Has to be
@@ -33,20 +36,21 @@ ams,input-max-microamp: Maximum flash controller input current. The
 			and divisible by 50000.
 
 
-Optional properties of the "flash" child node
-=============================================
+Optional properties of the flash child node
+===========================================
 
 label		: The label of the flash LED.
 
 
-Required properties of the "indicator" child node
-=================================================
+Required properties of the indicator child node (1)
+===================================================
 
+reg: 1
 led-max-microamp: Maximum indicator current. The allowed values are
 		  2500, 5000, 7500 and 10000.
 
-Optional properties of the "indicator" child node
-=================================================
+Optional properties of the indicator child node
+===============================================
 
 label		: The label of the indicator LED.
 
@@ -55,16 +59,20 @@ Example
 =======
 
 	as3645a@30 {
+		#address-cells: 1
+		#size-cells: 0
 		reg = <0x30>;
 		compatible = "ams,as3645a";
-		flash {
+		flash@0 {
+			reg = <0x0>;
 			flash-timeout-us = <150000>;
 			flash-max-microamp = <320000>;
 			led-max-microamp = <60000>;
 			ams,input-max-microamp = <1750000>;
 			label = "as3645a:flash";
 		};
-		indicator {
+		indicator@1 {
+			reg = <0x1>;
 			led-max-microamp = <10000>;
 			label = "as3645a:indicator";
 		};
-- 
2.11.0

Re: [PATCH 2/3] dt: bindings: as3645a: Use LED number to refer to LEDs

[Rob Herring]

On Fri, Sep 08, 2017 at 03:42:12PM +0300, Sakari Ailus wrote:
> Use integers (reg property) to tell the number of the LED to the driver
> instead of the node name. While both of these approaches are currently
> used by the LED bindings, using integers will require less driver changes
> for ACPI support. Additionally, it will make possible LED naming using
> chip and LED node names, effectively making the label property most useful
> for human-readable names only.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  .../devicetree/bindings/leds/ams,as3645a.txt       | 28 ++++++++++++++--------
>  1 file changed, 18 insertions(+), 10 deletions(-)

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 0/3] AS3645A fixes

[Jacek Anaszewski]

Hi Sakari,

Thanks for the patch set.

On 09/08/2017 02:42 PM, Sakari Ailus wrote:
> Hi folks,
> 
> Here are a few fixes for the as3645a DTS as well as changes in bindings.
> The driver is not in a release yet. I'd like to get these in as through
> the media tree fixes branch.
> 
> Sakari Ailus (3):
>   as3645a: Use ams,input-max-microamp as documented in DT bindings
>   dt: bindings: as3645a: Use LED number to refer to LEDs
>   as3645a: Use integer numbers for parsing LEDs
> 
>  .../devicetree/bindings/leds/ams,as3645a.txt       | 28 ++++++++++++++--------
>  arch/arm/boot/dts/omap3-n950-n9.dtsi               | 10 +++++---
>  drivers/leds/leds-as3645a.c                        | 28 +++++++++++++++++++---
>  3 files changed, 50 insertions(+), 16 deletions(-)
> 

Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>

-- 
Best regards,
Jacek Anaszewski