Update the leds/common.yaml to indicate that the max color ID is 9.
Reflect the same change in the leds-class-multicolor.yaml
Reported-by: Zhen Lei <[email protected]>
Signed-off-by: Dan Murphy <[email protected]>
---
Documentation/devicetree/bindings/leds/common.yaml | 2 +-
.../devicetree/bindings/leds/leds-class-multicolor.yaml | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/leds/common.yaml b/Documentation/devicetree/bindings/leds/common.yaml
index a2a541bca73c..0c9f912dfee6 100644
--- a/Documentation/devicetree/bindings/leds/common.yaml
+++ b/Documentation/devicetree/bindings/leds/common.yaml
@@ -43,7 +43,7 @@ properties:
LED_COLOR_ID available, add a new one.
$ref: /schemas/types.yaml#definitions/uint32
minimum: 0
- maximum: 8
+ maximum: 9
function-enumerator:
description:
diff --git a/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml b/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
index b55e1f1308a4..f8032e863ecb 100644
--- a/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
+++ b/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
@@ -16,7 +16,7 @@ description: |
modules. This is achieved by adding multi-led nodes layer to the
monochrome LED bindings.
The nodes and properties defined in this document are unique to the multicolor
- LED class. Common LED nodes and properties are inherited from the common.txt
+ LED class. Common LED nodes and properties are inherited from the common.yaml
within this documentation directory.
patternProperties:
@@ -25,10 +25,11 @@ patternProperties:
description: Represents the LEDs that are to be grouped.
properties:
color:
- const: 8 # LED_COLOR_ID_MULTI
+ const: 9 # LED_COLOR_ID_RGB
description: |
- For multicolor LED support this property should be defined as
- LED_COLOR_ID_MULTI which can be found in include/linux/leds/common.h.
+ For multicolor LED support this property should be defined as either
+ LED_COLOR_ID_RGB or LED_COLOR_ID_MULTI which can be found in
+ include/linux/leds/common.h.
$ref: "common.yaml#"
--
2.28.0.585.ge1cfff676549
On 2020/10/14 1:50, Dan Murphy wrote:
> Update the leds/common.yaml to indicate that the max color ID is 9.
> Reflect the same change in the leds-class-multicolor.yaml
>
> Reported-by: Zhen Lei <[email protected]>
> Signed-off-by: Dan Murphy <[email protected]>
> ---
> Documentation/devicetree/bindings/leds/common.yaml | 2 +-
> .../devicetree/bindings/leds/leds-class-multicolor.yaml | 9 +++++----
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/leds/common.yaml b/Documentation/devicetree/bindings/leds/common.yaml
> index a2a541bca73c..0c9f912dfee6 100644
> --- a/Documentation/devicetree/bindings/leds/common.yaml
> +++ b/Documentation/devicetree/bindings/leds/common.yaml
> @@ -43,7 +43,7 @@ properties:
> LED_COLOR_ID available, add a new one.
> $ref: /schemas/types.yaml#definitions/uint32
> minimum: 0
> - maximum: 8
> + maximum: 9
>
> function-enumerator:
> description:
> diff --git a/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml b/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
> index b55e1f1308a4..f8032e863ecb 100644
> --- a/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
> +++ b/Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
> @@ -16,7 +16,7 @@ description: |
> modules. This is achieved by adding multi-led nodes layer to the
> monochrome LED bindings.
> The nodes and properties defined in this document are unique to the multicolor
> - LED class. Common LED nodes and properties are inherited from the common.txt
> + LED class. Common LED nodes and properties are inherited from the common.yaml
> within this documentation directory.
>
> patternProperties:
> @@ -25,10 +25,11 @@ patternProperties:
> description: Represents the LEDs that are to be grouped.
> properties:
> color:
> - const: 8 # LED_COLOR_ID_MULTI
> + const: 9 # LED_COLOR_ID_RGB
This means only LED_COLOR_ID_RGB is allowed.
> description: |
> - For multicolor LED support this property should be defined as
> - LED_COLOR_ID_MULTI which can be found in include/linux/leds/common.h.
> + For multicolor LED support this property should be defined as either
> + LED_COLOR_ID_RGB or LED_COLOR_ID_MULTI which can be found in
If both LED_COLOR_ID_RGB and LED_COLOR_ID_MULTI are allowed, then we should use enum
list both of them.
> + include/linux/leds/common.h.
>
> $ref: "common.yaml#"
>
>