* [PATCH v2 1/3] dt-bindings: leds: skyworks,aat1290: convert to dtschema
2022-06-20 17:50 [PATCH v2 0/3] leds/arm: dts: leds on Samsung Galaxy S3 Krzysztof Kozlowski
@ 2022-06-20 17:50 ` Krzysztof Kozlowski
2022-06-20 17:53 ` Krzysztof Kozlowski
2022-06-20 17:50 ` [PATCH v2 2/3] ARM: dts: exynos: align aat1290 flash LED node with bindings in Galaxy S3 Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-06-20 17:50 UTC (permalink / raw)
To: Pavel Machek, Rob Herring, Krzysztof Kozlowski, Alim Akhtar,
Jacek Anaszewski, linux-leds, devicetree, linux-kernel,
linux-arm-kernel, linux-samsung-soc
Cc: Krzysztof Kozlowski
Convert the Skyworks Solutions, Inc. AAT1290 Current Regulator bindings
to DT Schema.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../devicetree/bindings/leds/leds-aat1290.txt | 77 ---------------
.../bindings/leds/skyworks,aat1290.yaml | 95 +++++++++++++++++++
2 files changed, 95 insertions(+), 77 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/leds/leds-aat1290.txt
create mode 100644 Documentation/devicetree/bindings/leds/skyworks,aat1290.yaml
diff --git a/Documentation/devicetree/bindings/leds/leds-aat1290.txt b/Documentation/devicetree/bindings/leds/leds-aat1290.txt
deleted file mode 100644
index 62ed17ec075b..000000000000
--- a/Documentation/devicetree/bindings/leds/leds-aat1290.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-* Skyworks Solutions, Inc. AAT1290 Current Regulator for Flash LEDs
-
-The device is controlled through two pins: FL_EN and EN_SET. The pins when,
-asserted high, enable flash strobe and movie mode (max 1/2 of flash current)
-respectively. In order to add a capability of selecting the strobe signal source
-(e.g. CPU or camera sensor) there is an additional switch required, independent
-of the flash chip. The switch is controlled with pin control.
-
-Required properties:
-
-- compatible : Must be "skyworks,aat1290".
-- flen-gpios : Must be device tree identifier of the flash device FL_EN pin.
-- enset-gpios : Must be device tree identifier of the flash device EN_SET pin.
-
-Optional properties:
-- pinctrl-names : Must contain entries: "default", "host", "isp". Entries
- "default" and "host" must refer to the same pin configuration
- node, which sets the host as a strobe signal provider. Entry
- "isp" must refer to the pin configuration node, which sets the
- ISP as a strobe signal provider.
-
-A discrete LED element connected to the device must be represented by a child
-node - see Documentation/devicetree/bindings/leds/common.txt.
-
-Required properties of the LED child node:
-- led-max-microamp : see Documentation/devicetree/bindings/leds/common.txt
-- flash-max-microamp : see Documentation/devicetree/bindings/leds/common.txt
- Maximum flash LED supply current can be calculated using
- following formula: I = 1A * 162kohm / Rset.
-- flash-max-timeout-us : see Documentation/devicetree/bindings/leds/common.txt
- Maximum flash timeout can be calculated using following
- formula: T = 8.82 * 10^9 * Ct.
-
-Optional properties of the LED child node:
-- function : see Documentation/devicetree/bindings/leds/common.txt
-- color : see Documentation/devicetree/bindings/leds/common.txt
-- label : see Documentation/devicetree/bindings/leds/common.txt (deprecated)
-
-Example (by Ct = 220nF, Rset = 160kohm and exynos4412-trats2 board with
-a switch that allows for routing strobe signal either from the host or from
-the camera sensor):
-
-#include "exynos4412.dtsi"
-#include <dt-bindings/leds/common.h>
-
-led-controller {
- compatible = "skyworks,aat1290";
- flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>;
- enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>;
-
- pinctrl-names = "default", "host", "isp";
- pinctrl-0 = <&camera_flash_host>;
- pinctrl-1 = <&camera_flash_host>;
- pinctrl-2 = <&camera_flash_isp>;
-
- camera_flash: led {
- function = LED_FUNCTION_FLASH;
- color = <LED_COLOR_ID_WHITE>;
- led-max-microamp = <520833>;
- flash-max-microamp = <1012500>;
- flash-max-timeout-us = <1940000>;
- };
-};
-
-&pinctrl_0 {
- camera_flash_host: camera-flash-host {
- samsung,pins = "gpj1-0";
- samsung,pin-function = <1>;
- samsung,pin-val = <0>;
- };
-
- camera_flash_isp: camera-flash-isp {
- samsung,pins = "gpj1-0";
- samsung,pin-function = <1>;
- samsung,pin-val = <1>;
- };
-};
diff --git a/Documentation/devicetree/bindings/leds/skyworks,aat1290.yaml b/Documentation/devicetree/bindings/leds/skyworks,aat1290.yaml
new file mode 100644
index 000000000000..a6aaa92dbccd
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/skyworks,aat1290.yaml
@@ -0,0 +1,95 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/leds/skyworks,aat1290.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Skyworks Solutions, Inc. AAT1290 Current Regulator for Flash LEDs
+
+maintainers:
+ - Jacek Anaszewski <jacek.anaszewski@gmail.com>
+ - Krzysztof Kozlowski <krzk@kernel.org>
+
+description: |
+ The device is controlled through two pins:: FL_EN and EN_SET. The pins when,
+ asserted high, enable flash strobe and movie mode (max 1/2 of flash current)
+ respectively. In order to add a capability of selecting the strobe signal
+ source (e.g. CPU or camera sensor) there is an additional switch required,
+ independent of the flash chip. The switch is controlled with pin control.
+
+properties:
+ compatible:
+ const: skyworks,aat1290
+
+ enset-gpios:
+ maxItems: 1
+ description: EN_SET pin
+
+ flen-gpios:
+ maxItems: 1
+ description: FL_EN pin
+
+ led:
+ $ref: common.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ led-max-microamp: true
+
+ flash-max-microamp:
+ description: |
+ Maximum flash LED supply current can be calculated using following
+ formula:: I = 1A * 162 kOhm / Rset.
+
+ flash-max-timeout-us:
+ description: |
+ Maximum flash timeout can be calculated using following formula::
+ T = 8.82 * 10^9 * Ct.
+
+ required:
+ - flash-max-microamp
+ - flash-max-timeout-us
+ - led-max-microamp
+
+ pinctrl-names:
+ items:
+ - const: default
+ - const: host
+ - const: isp
+
+ pinctrl-0: true
+ pinctrl-1: true
+ pinctrl-2: true
+
+required:
+ - compatible
+ - enset-gpios
+ - flen-gpios
+ - led
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/leds/common.h>
+
+ // Ct = 220 nF, Rset = 160 kOhm
+ led-controller {
+ compatible = "skyworks,aat1290";
+ flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>;
+ enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>;
+
+ pinctrl-names = "default", "host", "isp";
+ pinctrl-0 = <&camera_flash_host>;
+ pinctrl-1 = <&camera_flash_host>;
+ pinctrl-2 = <&camera_flash_isp>;
+
+ led {
+ function = LED_FUNCTION_FLASH;
+ color = <LED_COLOR_ID_WHITE>;
+ led-max-microamp = <520833>;
+ flash-max-microamp = <1012500>;
+ flash-max-timeout-us = <1940000>;
+ };
+ };
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] ARM: dts: exynos: align aat1290 flash LED node with bindings in Galaxy S3
2022-06-20 17:50 [PATCH v2 0/3] leds/arm: dts: leds on Samsung Galaxy S3 Krzysztof Kozlowski
2022-06-20 17:50 ` [PATCH v2 1/3] dt-bindings: leds: skyworks,aat1290: convert to dtschema Krzysztof Kozlowski
@ 2022-06-20 17:50 ` Krzysztof Kozlowski
2022-06-22 11:58 ` (subset) " Krzysztof Kozlowski
2022-06-20 17:50 ` [PATCH v2 3/3] ARM: dts: exynos: add function and color to aat1290 flash LED node " Krzysztof Kozlowski
2022-06-20 17:54 ` [PATCH v2 0/3] leds/arm: dts: leds on Samsung " Jacek Anaszewski
3 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-06-20 17:50 UTC (permalink / raw)
To: Pavel Machek, Rob Herring, Krzysztof Kozlowski, Alim Akhtar,
Jacek Anaszewski, linux-leds, devicetree, linux-kernel,
linux-arm-kernel, linux-samsung-soc
Cc: Krzysztof Kozlowski
The bindings expect aat1290 flash LED child node to be named "led".
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index aa7de6de8e19..46640b490a8c 100644
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -25,7 +25,7 @@ led-controller {
pinctrl-1 = <&camera_flash_host>;
pinctrl-2 = <&camera_flash_isp>;
- flash-led {
+ led {
label = "flash";
led-max-microamp = <520833>;
flash-max-microamp = <1012500>;
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 3/3] ARM: dts: exynos: add function and color to aat1290 flash LED node in Galaxy S3
2022-06-20 17:50 [PATCH v2 0/3] leds/arm: dts: leds on Samsung Galaxy S3 Krzysztof Kozlowski
2022-06-20 17:50 ` [PATCH v2 1/3] dt-bindings: leds: skyworks,aat1290: convert to dtschema Krzysztof Kozlowski
2022-06-20 17:50 ` [PATCH v2 2/3] ARM: dts: exynos: align aat1290 flash LED node with bindings in Galaxy S3 Krzysztof Kozlowski
@ 2022-06-20 17:50 ` Krzysztof Kozlowski
2022-06-22 11:58 ` (subset) " Krzysztof Kozlowski
2022-06-20 17:54 ` [PATCH v2 0/3] leds/arm: dts: leds on Samsung " Jacek Anaszewski
3 siblings, 1 reply; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-06-20 17:50 UTC (permalink / raw)
To: Pavel Machek, Rob Herring, Krzysztof Kozlowski, Alim Akhtar,
Jacek Anaszewski, linux-leds, devicetree, linux-kernel,
linux-arm-kernel, linux-samsung-soc
Cc: Krzysztof Kozlowski
Add common LED properties - the function and color - to aat1290 flash
LED node in Galaxy S3, so we can drop deprecated label property.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index 46640b490a8c..94122e9c6625 100644
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -7,6 +7,7 @@
*/
/dts-v1/;
+#include <dt-bindings/leds/common.h>
#include "exynos4412-midas.dtsi"
/ {
@@ -26,7 +27,8 @@ led-controller {
pinctrl-2 = <&camera_flash_isp>;
led {
- label = "flash";
+ function = LED_FUNCTION_FLASH;
+ color = <LED_COLOR_ID_WHITE>;
led-max-microamp = <520833>;
flash-max-microamp = <1012500>;
flash-max-timeout-us = <1940000>;
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 0/3] leds/arm: dts: leds on Samsung Galaxy S3
2022-06-20 17:50 [PATCH v2 0/3] leds/arm: dts: leds on Samsung Galaxy S3 Krzysztof Kozlowski
` (2 preceding siblings ...)
2022-06-20 17:50 ` [PATCH v2 3/3] ARM: dts: exynos: add function and color to aat1290 flash LED node " Krzysztof Kozlowski
@ 2022-06-20 17:54 ` Jacek Anaszewski
3 siblings, 0 replies; 8+ messages in thread
From: Jacek Anaszewski @ 2022-06-20 17:54 UTC (permalink / raw)
To: Krzysztof Kozlowski, Pavel Machek, Rob Herring,
Krzysztof Kozlowski, Alim Akhtar, linux-leds, devicetree,
linux-kernel, linux-arm-kernel, linux-samsung-soc
Hi Krzysztof,
On 6/20/22 19:50, Krzysztof Kozlowski wrote:
> Hi,
>
> Merging
> =======
> 1. Bindings patch: via leds tree.
> 2. DTS patches: I will take them via Samsung SoC tree.
>
> Changes since v1
> ================
> 1. Drop the label from example and DTS, per discussions with Jacek.
>
> Best regards,
> Krzysztof
>
> Krzysztof Kozlowski (3):
> dt-bindings: leds: skyworks,aat1290: convert to dtschema
> ARM: dts: exynos: align aat1290 flash LED node with bindings in Galaxy
> S3
> ARM: dts: exynos: add function and color to aat1290 flash LED node in
> Galaxy S3
>
> .../devicetree/bindings/leds/leds-aat1290.txt | 77 ---------------
> .../bindings/leds/skyworks,aat1290.yaml | 95 +++++++++++++++++++
> arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 6 +-
> 3 files changed, 99 insertions(+), 79 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/leds/leds-aat1290.txt
> create mode 100644 Documentation/devicetree/bindings/leds/skyworks,aat1290.yaml
>
For the whole set:
Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
--
Best regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 8+ messages in thread