dt-bindings: move backlight bindings under leds
authorRob Herring <robh@kernel.org>
Mon, 21 Sep 2015 15:50:52 +0000 (10:50 -0500)
committerRob Herring <robh@kernel.org>
Thu, 22 Oct 2015 14:21:22 +0000 (09:21 -0500)
Backlights are generally a subtype of LEDs at least from a software
point of view if not always electrically. Move the bindings from the
video directory to underneath the leds dir.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
17 files changed:
Documentation/devicetree/bindings/leds/backlight/88pm860x.txt [new file with mode: 0644]
Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt [new file with mode: 0644]
Documentation/devicetree/bindings/leds/backlight/lp855x.txt [new file with mode: 0644]
Documentation/devicetree/bindings/leds/backlight/max8925-backlight.txt [new file with mode: 0644]
Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt [new file with mode: 0644]
Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt [new file with mode: 0644]
Documentation/devicetree/bindings/leds/backlight/sky81452-backlight.txt [new file with mode: 0644]
Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt [new file with mode: 0644]
Documentation/devicetree/bindings/mfd/sky81452.txt
Documentation/devicetree/bindings/video/backlight/88pm860x.txt [deleted file]
Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt [deleted file]
Documentation/devicetree/bindings/video/backlight/lp855x.txt [deleted file]
Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt [deleted file]
Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt [deleted file]
Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt [deleted file]
Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt [deleted file]
Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt [deleted file]

diff --git a/Documentation/devicetree/bindings/leds/backlight/88pm860x.txt b/Documentation/devicetree/bindings/leds/backlight/88pm860x.txt
new file mode 100644 (file)
index 0000000..261df27
--- /dev/null
@@ -0,0 +1,15 @@
+88pm860x-backlight bindings
+
+Optional properties:
+  - marvell,88pm860x-iset: Current supplies on backlight device.
+  - marvell,88pm860x-pwm: PWM frequency on backlight device.
+
+Example:
+
+       backlights {
+               backlight-0 {
+                       marvell,88pm860x-iset = <4>;
+                       marvell,88pm860x-pwm = <3>;
+               };
+               backlight-2 {
+               };
diff --git a/Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt
new file mode 100644 (file)
index 0000000..321be66
--- /dev/null
@@ -0,0 +1,16 @@
+gpio-backlight bindings
+
+Required properties:
+  - compatible: "gpio-backlight"
+  - gpios: describes the gpio that is used for enabling/disabling the backlight.
+    refer to bindings/gpio/gpio.txt for more details.
+
+Optional properties:
+  - default-on: enable the backlight at boot.
+
+Example:
+       backlight {
+               compatible = "gpio-backlight";
+               gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+               default-on;
+       };
diff --git a/Documentation/devicetree/bindings/leds/backlight/lp855x.txt b/Documentation/devicetree/bindings/leds/backlight/lp855x.txt
new file mode 100644 (file)
index 0000000..0a3ecbc
--- /dev/null
@@ -0,0 +1,70 @@
+lp855x bindings
+
+Required properties:
+  - compatible: "ti,lp8550", "ti,lp8551", "ti,lp8552", "ti,lp8553",
+                "ti,lp8555", "ti,lp8556", "ti,lp8557"
+  - reg: I2C slave address (u8)
+  - dev-ctrl: Value of DEVICE CONTROL register (u8). It depends on the device.
+
+Optional properties:
+  - bl-name: Backlight device name (string)
+  - init-brt: Initial value of backlight brightness (u8)
+  - pwm-period: PWM period value. Set only PWM input mode used (u32)
+  - rom-addr: Register address of ROM area to be updated (u8)
+  - rom-val: Register value to be updated (u8)
+  - power-supply: Regulator which controls the 3V rail
+
+Example:
+
+       /* LP8555 */
+       backlight@2c {
+               compatible = "ti,lp8555";
+               reg = <0x2c>;
+
+               dev-ctrl = /bits/ 8 <0x00>;
+               pwm-period = <10000>;
+
+               /* 4V OV, 4 output LED0 string enabled */
+               rom_14h {
+                       rom-addr = /bits/ 8 <0x14>;
+                       rom-val = /bits/ 8 <0xcf>;
+               };
+
+               /* Heavy smoothing, 24ms ramp time step */
+               rom_15h {
+                       rom-addr = /bits/ 8 <0x15>;
+                       rom-val = /bits/ 8 <0xc7>;
+               };
+
+               /* 4 output LED1 string enabled */
+               rom_19h {
+                       rom-addr = /bits/ 8 <0x19>;
+                       rom-val = /bits/ 8 <0x0f>;
+               };
+       };
+
+       /* LP8556 */
+       backlight@2c {
+               compatible = "ti,lp8556";
+               reg = <0x2c>;
+
+               bl-name = "lcd-bl";
+               dev-ctrl = /bits/ 8 <0x85>;
+               init-brt = /bits/ 8 <0x10>;
+       };
+
+       /* LP8557 */
+       backlight@2c {
+               compatible = "ti,lp8557";
+               reg = <0x2c>;
+               power-supply = <&backlight_vdd>;
+
+               dev-ctrl = /bits/ 8 <0x41>;
+               init-brt = /bits/ 8 <0x0a>;
+
+               /* 4V OV, 4 output LED string enabled */
+               rom_14h {
+                       rom-addr = /bits/ 8 <0x14>;
+                       rom-val = /bits/ 8 <0xcf>;
+               };
+       };
diff --git a/Documentation/devicetree/bindings/leds/backlight/max8925-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/max8925-backlight.txt
new file mode 100644 (file)
index 0000000..b4cffda
--- /dev/null
@@ -0,0 +1,10 @@
+88pm860x-backlight bindings
+
+Optional properties:
+  - maxim,max8925-dual-string: whether support dual string
+
+Example:
+
+       backlights {
+               maxim,max8925-dual-string = <0>;
+       };
diff --git a/Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt b/Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt
new file mode 100644 (file)
index 0000000..424f844
--- /dev/null
@@ -0,0 +1,40 @@
+Binding for Qualcomm PM8941 WLED driver
+
+Required properties:
+- compatible: should be "qcom,pm8941-wled"
+- reg: slave address
+
+Optional properties:
+- label: The name of the backlight device
+- qcom,cs-out: bool; enable current sink output
+- qcom,cabc: bool; enable content adaptive backlight control
+- qcom,ext-gen: bool; use externally generated modulator signal to dim
+- qcom,current-limit: mA; per-string current limit; value from 0 to 25
+       default: 20mA
+- qcom,current-boost-limit: mA; boost current limit; one of:
+       105, 385, 525, 805, 980, 1260, 1400, 1680
+       default: 805mA
+- qcom,switching-freq: kHz; switching frequency; one of:
+       600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371,
+       1600, 1920, 2400, 3200, 4800, 9600,
+       default: 1600kHz
+- qcom,ovp: V; Over-voltage protection limit; one of:
+       27, 29, 32, 35
+       default: 29V
+- qcom,num-strings: #; number of led strings attached; value from 1 to 3
+       default: 2
+
+Example:
+
+pm8941-wled@d800 {
+       compatible = "qcom,pm8941-wled";
+       reg = <0xd800>;
+       label = "backlight";
+
+       qcom,cs-out;
+       qcom,current-limit = <20>;
+       qcom,current-boost-limit = <805>;
+       qcom,switching-freq = <1600>;
+       qcom,ovp = <29>;
+       qcom,num-strings = <2>;
+};
diff --git a/Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt
new file mode 100644 (file)
index 0000000..764db86
--- /dev/null
@@ -0,0 +1,35 @@
+pwm-backlight bindings
+
+Required properties:
+  - compatible: "pwm-backlight"
+  - pwms: OF device-tree PWM specification (see PWM binding[0])
+  - brightness-levels: Array of distinct brightness levels. Typically these
+      are in the range from 0 to 255, but any range starting at 0 will do.
+      The actual brightness level (PWM duty cycle) will be interpolated
+      from these values. 0 means a 0% duty cycle (darkest/off), while the
+      last value in the array represents a 100% duty cycle (brightest).
+  - default-brightness-level: the default brightness level (index into the
+      array defined by the "brightness-levels" property)
+  - power-supply: regulator for supply voltage
+
+Optional properties:
+  - pwm-names: a list of names for the PWM devices specified in the
+               "pwms" property (see PWM binding[0])
+  - enable-gpios: contains a single GPIO specifier for the GPIO which enables
+                  and disables the backlight (see GPIO binding[1])
+
+[0]: Documentation/devicetree/bindings/pwm/pwm.txt
+[1]: Documentation/devicetree/bindings/gpio/gpio.txt
+
+Example:
+
+       backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm 0 5000000>;
+
+               brightness-levels = <0 4 8 16 32 64 128 255>;
+               default-brightness-level = <6>;
+
+               power-supply = <&vdd_bl_reg>;
+               enable-gpios = <&gpio 58 0>;
+       };
diff --git a/Documentation/devicetree/bindings/leds/backlight/sky81452-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/sky81452-backlight.txt
new file mode 100644 (file)
index 0000000..8bf2940
--- /dev/null
@@ -0,0 +1,29 @@
+SKY81452-backlight bindings
+
+Required properties:
+- compatible           : Must be "skyworks,sky81452-backlight"
+
+Optional properties:
+- name                 : Name of backlight device. Default is 'lcd-backlight'.
+- gpios                        : GPIO to use to EN pin.
+                       See Documentation/devicetree/bindings/gpio/gpio.txt
+- led-sources          : List of enabled channels from 0 to 5.
+                       See Documentation/devicetree/bindings/leds/common.txt
+- skyworks,ignore-pwm  : Ignore both PWM input
+- skyworks,dpwm-mode   : Enable DPWM dimming mode, otherwise Analog dimming.
+- skyworks,phase-shift : Enable phase shift mode
+- skyworks,short-detection-threshold-volt
+                       : It should be one of 4, 5, 6 and 7V.
+- skyworks,current-limit-mA
+                       : It should be 2300mA or 2750mA.
+
+Example:
+
+       backlight {
+               compatible = "skyworks,sky81452-backlight";
+               name = "pwm-backlight";
+               led-sources = <0 1 2 5>;
+               skyworks,ignore-pwm;
+               skyworks,phase-shift;
+               skyworks,current-limit-mA = <2300>;
+       };
diff --git a/Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt
new file mode 100644 (file)
index 0000000..5fb9279
--- /dev/null
@@ -0,0 +1,27 @@
+TPS65217 family of regulators
+
+The TPS65217 chip contains a boost converter and current sinks which can be
+used to drive LEDs for use as backlights.
+
+Required properties:
+- compatible: "ti,tps65217"
+- reg: I2C slave address
+- backlight: node for specifying WLED1 and WLED2 lines in TPS65217
+- isel: selection bit, valid values: 1 for ISEL1 (low-level) and 2 for ISEL2 (high-level)
+- fdim: PWM dimming frequency, valid values: 100, 200, 500, 1000
+- default-brightness: valid values: 0-100
+
+Each regulator is defined using the standard binding for regulators.
+
+Example:
+
+       tps: tps@24 {
+               reg = <0x24>;
+               compatible = "ti,tps65217";
+               backlight {
+                       isel = <1>;  /* 1 - ISET1, 2 ISET2 */
+                       fdim = <100>; /* TPS65217_BL_FDIM_100HZ */
+                       default-brightness = <50>;
+               };
+       };
+
index 35181794aa241b7f147dd8e0afdffa9db216e602..511764acd4d5f418664c014156788ebf8da06ec6 100644 (file)
@@ -6,7 +6,7 @@ Required properties:
 
 Required child nodes:
 - backlight    : container node for backlight following the binding
-               in video/backlight/sky81452-backlight.txt
+               in leds/backlight/sky81452-backlight.txt
 - regulator    : container node for regulators following the binding
                in regulator/sky81452-regulator.txt
 
diff --git a/Documentation/devicetree/bindings/video/backlight/88pm860x.txt b/Documentation/devicetree/bindings/video/backlight/88pm860x.txt
deleted file mode 100644 (file)
index 261df27..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-88pm860x-backlight bindings
-
-Optional properties:
-  - marvell,88pm860x-iset: Current supplies on backlight device.
-  - marvell,88pm860x-pwm: PWM frequency on backlight device.
-
-Example:
-
-       backlights {
-               backlight-0 {
-                       marvell,88pm860x-iset = <4>;
-                       marvell,88pm860x-pwm = <3>;
-               };
-               backlight-2 {
-               };
diff --git a/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt b/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt
deleted file mode 100644 (file)
index 321be66..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-gpio-backlight bindings
-
-Required properties:
-  - compatible: "gpio-backlight"
-  - gpios: describes the gpio that is used for enabling/disabling the backlight.
-    refer to bindings/gpio/gpio.txt for more details.
-
-Optional properties:
-  - default-on: enable the backlight at boot.
-
-Example:
-       backlight {
-               compatible = "gpio-backlight";
-               gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
-               default-on;
-       };
diff --git a/Documentation/devicetree/bindings/video/backlight/lp855x.txt b/Documentation/devicetree/bindings/video/backlight/lp855x.txt
deleted file mode 100644 (file)
index 0a3ecbc..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-lp855x bindings
-
-Required properties:
-  - compatible: "ti,lp8550", "ti,lp8551", "ti,lp8552", "ti,lp8553",
-                "ti,lp8555", "ti,lp8556", "ti,lp8557"
-  - reg: I2C slave address (u8)
-  - dev-ctrl: Value of DEVICE CONTROL register (u8). It depends on the device.
-
-Optional properties:
-  - bl-name: Backlight device name (string)
-  - init-brt: Initial value of backlight brightness (u8)
-  - pwm-period: PWM period value. Set only PWM input mode used (u32)
-  - rom-addr: Register address of ROM area to be updated (u8)
-  - rom-val: Register value to be updated (u8)
-  - power-supply: Regulator which controls the 3V rail
-
-Example:
-
-       /* LP8555 */
-       backlight@2c {
-               compatible = "ti,lp8555";
-               reg = <0x2c>;
-
-               dev-ctrl = /bits/ 8 <0x00>;
-               pwm-period = <10000>;
-
-               /* 4V OV, 4 output LED0 string enabled */
-               rom_14h {
-                       rom-addr = /bits/ 8 <0x14>;
-                       rom-val = /bits/ 8 <0xcf>;
-               };
-
-               /* Heavy smoothing, 24ms ramp time step */
-               rom_15h {
-                       rom-addr = /bits/ 8 <0x15>;
-                       rom-val = /bits/ 8 <0xc7>;
-               };
-
-               /* 4 output LED1 string enabled */
-               rom_19h {
-                       rom-addr = /bits/ 8 <0x19>;
-                       rom-val = /bits/ 8 <0x0f>;
-               };
-       };
-
-       /* LP8556 */
-       backlight@2c {
-               compatible = "ti,lp8556";
-               reg = <0x2c>;
-
-               bl-name = "lcd-bl";
-               dev-ctrl = /bits/ 8 <0x85>;
-               init-brt = /bits/ 8 <0x10>;
-       };
-
-       /* LP8557 */
-       backlight@2c {
-               compatible = "ti,lp8557";
-               reg = <0x2c>;
-               power-supply = <&backlight_vdd>;
-
-               dev-ctrl = /bits/ 8 <0x41>;
-               init-brt = /bits/ 8 <0x0a>;
-
-               /* 4V OV, 4 output LED string enabled */
-               rom_14h {
-                       rom-addr = /bits/ 8 <0x14>;
-                       rom-val = /bits/ 8 <0xcf>;
-               };
-       };
diff --git a/Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt b/Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt
deleted file mode 100644 (file)
index b4cffda..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-88pm860x-backlight bindings
-
-Optional properties:
-  - maxim,max8925-dual-string: whether support dual string
-
-Example:
-
-       backlights {
-               maxim,max8925-dual-string = <0>;
-       };
diff --git a/Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt b/Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt
deleted file mode 100644 (file)
index 424f844..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-Binding for Qualcomm PM8941 WLED driver
-
-Required properties:
-- compatible: should be "qcom,pm8941-wled"
-- reg: slave address
-
-Optional properties:
-- label: The name of the backlight device
-- qcom,cs-out: bool; enable current sink output
-- qcom,cabc: bool; enable content adaptive backlight control
-- qcom,ext-gen: bool; use externally generated modulator signal to dim
-- qcom,current-limit: mA; per-string current limit; value from 0 to 25
-       default: 20mA
-- qcom,current-boost-limit: mA; boost current limit; one of:
-       105, 385, 525, 805, 980, 1260, 1400, 1680
-       default: 805mA
-- qcom,switching-freq: kHz; switching frequency; one of:
-       600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371,
-       1600, 1920, 2400, 3200, 4800, 9600,
-       default: 1600kHz
-- qcom,ovp: V; Over-voltage protection limit; one of:
-       27, 29, 32, 35
-       default: 29V
-- qcom,num-strings: #; number of led strings attached; value from 1 to 3
-       default: 2
-
-Example:
-
-pm8941-wled@d800 {
-       compatible = "qcom,pm8941-wled";
-       reg = <0xd800>;
-       label = "backlight";
-
-       qcom,cs-out;
-       qcom,current-limit = <20>;
-       qcom,current-boost-limit = <805>;
-       qcom,switching-freq = <1600>;
-       qcom,ovp = <29>;
-       qcom,num-strings = <2>;
-};
diff --git a/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt b/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
deleted file mode 100644 (file)
index 764db86..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-pwm-backlight bindings
-
-Required properties:
-  - compatible: "pwm-backlight"
-  - pwms: OF device-tree PWM specification (see PWM binding[0])
-  - brightness-levels: Array of distinct brightness levels. Typically these
-      are in the range from 0 to 255, but any range starting at 0 will do.
-      The actual brightness level (PWM duty cycle) will be interpolated
-      from these values. 0 means a 0% duty cycle (darkest/off), while the
-      last value in the array represents a 100% duty cycle (brightest).
-  - default-brightness-level: the default brightness level (index into the
-      array defined by the "brightness-levels" property)
-  - power-supply: regulator for supply voltage
-
-Optional properties:
-  - pwm-names: a list of names for the PWM devices specified in the
-               "pwms" property (see PWM binding[0])
-  - enable-gpios: contains a single GPIO specifier for the GPIO which enables
-                  and disables the backlight (see GPIO binding[1])
-
-[0]: Documentation/devicetree/bindings/pwm/pwm.txt
-[1]: Documentation/devicetree/bindings/gpio/gpio.txt
-
-Example:
-
-       backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm 0 5000000>;
-
-               brightness-levels = <0 4 8 16 32 64 128 255>;
-               default-brightness-level = <6>;
-
-               power-supply = <&vdd_bl_reg>;
-               enable-gpios = <&gpio 58 0>;
-       };
diff --git a/Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt b/Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt
deleted file mode 100644 (file)
index 8bf2940..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-SKY81452-backlight bindings
-
-Required properties:
-- compatible           : Must be "skyworks,sky81452-backlight"
-
-Optional properties:
-- name                 : Name of backlight device. Default is 'lcd-backlight'.
-- gpios                        : GPIO to use to EN pin.
-                       See Documentation/devicetree/bindings/gpio/gpio.txt
-- led-sources          : List of enabled channels from 0 to 5.
-                       See Documentation/devicetree/bindings/leds/common.txt
-- skyworks,ignore-pwm  : Ignore both PWM input
-- skyworks,dpwm-mode   : Enable DPWM dimming mode, otherwise Analog dimming.
-- skyworks,phase-shift : Enable phase shift mode
-- skyworks,short-detection-threshold-volt
-                       : It should be one of 4, 5, 6 and 7V.
-- skyworks,current-limit-mA
-                       : It should be 2300mA or 2750mA.
-
-Example:
-
-       backlight {
-               compatible = "skyworks,sky81452-backlight";
-               name = "pwm-backlight";
-               led-sources = <0 1 2 5>;
-               skyworks,ignore-pwm;
-               skyworks,phase-shift;
-               skyworks,current-limit-mA = <2300>;
-       };
diff --git a/Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt b/Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt
deleted file mode 100644 (file)
index 5fb9279..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-TPS65217 family of regulators
-
-The TPS65217 chip contains a boost converter and current sinks which can be
-used to drive LEDs for use as backlights.
-
-Required properties:
-- compatible: "ti,tps65217"
-- reg: I2C slave address
-- backlight: node for specifying WLED1 and WLED2 lines in TPS65217
-- isel: selection bit, valid values: 1 for ISEL1 (low-level) and 2 for ISEL2 (high-level)
-- fdim: PWM dimming frequency, valid values: 100, 200, 500, 1000
-- default-brightness: valid values: 0-100
-
-Each regulator is defined using the standard binding for regulators.
-
-Example:
-
-       tps: tps@24 {
-               reg = <0x24>;
-               compatible = "ti,tps65217";
-               backlight {
-                       isel = <1>;  /* 1 - ISET1, 2 ISET2 */
-                       fdim = <100>; /* TPS65217_BL_FDIM_100HZ */
-                       default-brightness = <50>;
-               };
-       };
-