[PATCHv2] media: i2c/adp1653: devicetree support for adp1653
From: Pavel Machek <hidden>
Date: 2015-01-04 09:00:43
Also in:
linux-devicetree, linux-media, linux-omap, lkml
Hi!
Thanks for the patch! A few comments below. On Wed, Dec 24, 2014 at 11:34:34PM +0100, Pavel Machek wrote:quoted
We are moving to device tree support on OMAP3, but that currently breaks ADP1653 driver. This adds device tree support, plus required documentation. Signed-off-by: Pavel Machek <redacted> --- Changed -microsec to -us, as requested by devicetree people. Fixed checkpatch issues.diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt index 2d88816..2c6c7c5 100644 --- a/Documentation/devicetree/bindings/leds/common.txt +++ b/Documentation/devicetree/bindings/leds/common.txt@@ -14,6 +14,15 @@ Optional properties for child nodes: "ide-disk" - LED indicates disk activity "timer" - LED flashes at a fixed, configurable rate +- max-microamp : maximum intensity in microamperes of the LED + (torch LED for flash devices)s/torch LED/torch mode/quoted
+- flash-max-microamp : maximum intensity in microamperes of the + flash LED; it is mandatory if the LED should + support the flash mode +- flash-timeout-microsec : timeout in microseconds after which the flash + LED is turned offThese should go to a different patch.
Actually these both should not be in this patch in the first place.
quoted
+ - reg: I2C slave address + + - gpios: References to the GPIO that controls the power for the chip. + +There are two led outputs available - flash and indicator. One led is +represented by one child node, nodes need to be named "flash" and "indicator".80 characters per line.
Count them. It is.
quoted
+ +Required properties of the LED child node: +- max-microamp : see Documentation/devicetree/bindings/leds/common.txt + +Required properties of the flash LED child node: + +- flash-max-microamp : see Documentation/devicetree/bindings/leds/common.txt +- flash-timeout-us : see Documentation/devicetree/bindings/leds/common.txt + +Example: + + adp1653: led-controller at 30 { + compatible = "adi,adp1653"; + reg = <0x30>; + gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* 88 */Please use tabs for indentation above (and below).
Ok.
quoted
--- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts@@ -553,6 +558,22 @@ ti,usb-charger-detection = <&isp1704>; }; + + adp1653: led-controller at 30 { + compatible = "adi,adp1653"; + reg = <0x30>; + gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* 88 */ + + flash { + flash-timeout-us = <500000>; + flash-max-microamp = <320000>; + max-microamp = <50000>; + }; + + indicator { + max-microamp = <17500>; + }; + };This should go to a separate patch as well.
How many patches do I need to do for one trivial change? :-(.
quoted
+ if (flash->platform_data->power) + ret = flash->platform_data->power(&flash->subdev, on);if () { } else { }
Ok.
quoted
+ else { + gpio_set_value(flash->platform_data->power_gpio, on);Shouldn't you add this to the platform data struct?
I don't see what you mean.
power_gpio is actually a poor name for this, as is the "power" callback. This is really "EN" gpio in the spec, I'd call it perhaps just "gpio", or "enable_gpio".
Feel free to clean that that up in followup patch.
quoted
+ if (on) { + /* Some delay is apparently required. */ + udelay(20);The driver should always handle the delay, platform data or not. This reminds me --- is there a need to retain the support for platform data? I don't think it's being used anywhere. I'm fine with both keeping and removing it.
Lets do that in followup patch, if needed.
quoted
+ child = of_get_child_by_name(node, "indicator"); + if (!child) + return -EINVAL;Do you require an indicator to be connected? I think it shouldn't be mandatory, at least the driver should work without it, even if it exposes the control (making that conditional would be a subject for another patch, but that doesn't need to be done now).
Another patch, if someone needs it, yes.
quoted
+ if (of_property_read_u32(child, "max-microamp", &val)) + return -EINVAL; + pd->max_indicator_intensity = val; + + if (!of_find_property(node, "gpios", NULL)) { + dev_err(&client->dev, "No gpio node\n"); + return -EINVAL; + } + + gpio = of_get_gpio_flags(node, 0, &flags);You could assign to pd->... here.
Ok. Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html