Revert "[media] Add device tree support to adp1653 flash driver"
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 9 Apr 2015 10:33:45 +0000 (07:33 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 9 Apr 2015 10:33:45 +0000 (07:33 -0300)
As requested by Sakari:

"The driver changes are still being reviewed.
 It's been proposed that the max-microamp property be renamed."

So, as the DT bindings are not agreed upstream yet, let's revert
it.

Requested-by: Sakari Ailus <sakari.ailus@iki.fi>
This reverts commit b6100f10bdc2019a65297d2597c388de2f7dd653.

Documentation/devicetree/bindings/media/i2c/adp1653.txt [deleted file]
drivers/media/i2c/adp1653.c

diff --git a/Documentation/devicetree/bindings/media/i2c/adp1653.txt b/Documentation/devicetree/bindings/media/i2c/adp1653.txt
deleted file mode 100644 (file)
index 0fc28a9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-* Analog Devices ADP1653 flash LED driver
-
-Required Properties:
-
-  - compatible: Must contain be "adi,adp1653"
-
-  - 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".
-
-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@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>;
-               };
-       };
Simple merge