Add support for WLED5
Subsystems (5)
v4 cover Add support for WLED5
Currently, WLED driver supports only WLED4 peripherals that is present on pmi8998 and pm660L. This patch series converts the existing WLED4 bindings from .txt to .yaml format and adds the support for WLED5 peripheral that is present on PM8150L.
PM8150L WLED supports the following.
- Two modulators and each sink can use any of the modulator
- Multiple CABC selection options
- Multiple brightness width selection (12 bits to 15 bits)
Changes from V1:
- Rebased on top of the below commit.
backlight: qcom-wled: Fix unsigned comparison to zero
Changes from V2:
- Addressed Bjorn's comments by splitting the WLED4 changes in a seperate patch.
- Added WLED5 auto calibration support
Changes from V3:
- Addressed comments from Daniel Thompson and Rob Herring
- Seperated the WLED5 bindings from the driver changes
- Squashed wled5 auto string detection and wled5 basic changes to avoid the NULL callback function pointer issue.
Kiran Gunda (3):
backlight: qcom-wled: convert the wled bindings to .yaml format
backlight: qcom-wled: Add callback functions
backlight: qcom-wled: Add WLED5 bindings
Subbaraman Narayanamurthy (1):
backlight: qcom-wled: Add support for WLED5 peripheral in PM8150L
.../bindings/leds/backlight/qcom-wled.txt | 154 ------ .../bindings/leds/backlight/qcom-wled.yaml | 223 ++++++++ drivers/video/backlight/qcom-wled.c | 613 ++++++++++++++++++--- 3 files changed, 764 insertions(+), 226 deletions(-) delete mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt create mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v4 1/4 backlight: qcom-wled: convert the wled bindings to .yaml format
Convert the qcom-wled bindings from .txt to .yaml format.
--- .../bindings/leds/backlight/qcom-wled.txt | 154 ----------------- .../bindings/leds/backlight/qcom-wled.yaml | 184 +++++++++++++++++++++ 2 files changed, 184 insertions(+), 154 deletions(-) delete mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt create mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt deleted +0 -154
@@ -1,154 +0,0 @@ -Binding for Qualcomm Technologies, Inc. WLED driver - -WLED (White Light Emitting Diode) driver is used for controlling display -backlight that is part of PMIC on Qualcomm Technologies, Inc. reference -platforms. The PMIC is connected to the host processor via SPMI bus. - -- compatible - Usage: required - Value type: <string> - Definition: should be one of: - "qcom,pm8941-wled" - "qcom,pmi8998-wled" - "qcom,pm660l-wled" - -- reg - Usage: required - Value type: <prop encoded array> - Definition: Base address of the WLED modules. - -- default-brightness - Usage: optional - Value type: <u32> - Definition: brightness value on boot, value from: 0-4095. - Default: 2048 - -- label - Usage: required - Value type: <string> - Definition: The name of the backlight device - -- qcom,cs-out - Usage: optional - Value type: <bool> - Definition: enable current sink output. - This property is supported only for PM8941. - -- qcom,cabc - Usage: optional - Value type: <bool> - Definition: enable content adaptive backlight control. - -- qcom,ext-gen - Usage: optional - Value type: <bool> - Definition: use externally generated modulator signal to dim. - This property is supported only for PM8941. - -- qcom,current-limit - Usage: optional - Value type: <u32> - Definition: mA; per-string current limit; value from 0 to 25 with - 1 mA step. Default 20 mA. - This property is supported only for pm8941. - -- qcom,current-limit-microamp - Usage: optional - Value type: <u32> - Definition: uA; per-string current limit; value from 0 to 30000 with - 2500 uA step. Default 25 mA. - -- qcom,current-boost-limit - Usage: optional - Value type: <u32> - Definition: mA; boost current limit. - For pm8941: one of: 105, 385, 525, 805, 980, 1260, 1400, - 1680. Default: 805 mA. - For pmi8998: one of: 105, 280, 450, 620, 970, 1150, 1300, - 1500. Default: 970 mA. - -- qcom,switching-freq - Usage: optional - Value type: <u32> - Definition: kHz; switching frequency; one of: 600, 640, 685, 738, - 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, - 4800, 9600. - Default: for pm8941: 1600 kHz - for pmi8998: 800 kHz - -- qcom,ovp - Usage: optional - Value type: <u32> - Definition: V; Over-voltage protection limit; one of: - 27, 29, 32, 35. Default: 29V - This property is supported only for PM8941. - -- qcom,ovp-millivolt - Usage: optional - Value type: <u32> - Definition: mV; Over-voltage protection limit; - For pmi8998: one of 18100, 19600, 29600, 31100. - Default 29600 mV. - If this property is not specified for PM8941, it - falls back to "qcom,ovp" property. - -- qcom,num-strings - Usage: optional - Value type: <u32> - Definition: #; number of led strings attached; - value: For PM8941 from 1 to 3. Default: 2 - For PMI8998 from 1 to 4. - -- interrupts - Usage: optional - Value type: <prop encoded array> - Definition: Interrupts associated with WLED. This should be - "short" and "ovp" interrupts. Interrupts can be - specified as per the encoding listed under - Documentation/devicetree/bindings/spmi/ - qcom,spmi-pmic-arb.txt. - -- interrupt-names - Usage: optional - Value type: <string> - Definition: Interrupt names associated with the interrupts. - Must be "short" and "ovp". The short circuit detection - is not supported for PM8941. - -- qcom,enabled-strings - Usage: optional - Value tyoe: <u32 array> - Definition: Array of the WLED strings numbered from 0 to 3. Each - string of leds are operated individually. Specify the - list of strings used by the device. Any combination of - led strings can be used. - -- qcom,external-pfet - Usage: optional - Value type: <bool> - Definition: Specify if external PFET control for short circuit - protection is used. This property is supported only - for PMI8998. - -- qcom,auto-string-detection - Usage: optional - Value type: <bool> - Definition: Enables auto-detection of the WLED string configuration. - This feature is not supported for PM8941. - - -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>; - qcom,enabled-strings = <0 1>; -};
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +184 -0
184 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Rob Herring
maintainerRe: [PATCH V4 1/4] backlight: qcom-wled: convert the wled bindings to .yaml format
Quoted 18 lines · Kiran Gunda
Convert the qcom-wled bindings from .txt to .yaml format.
Signed-off-by Kiran Gunda <[email protected]>Signed-off-by Subbaraman Narayanamurthy <[email protected]>Acked-by Daniel Thompson <[email protected]>--- .../bindings/leds/backlight/qcom-wled.txt | 154 ----------------- .../bindings/leds/backlight/qcom-wled.yaml | 184 +++++++++++++++++++++ 2 files changed, 184 insertions(+), 154 deletions(-) delete mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt create mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlDocumentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +0
-0
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 10
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +10
-0@@ -0,0 +1,184 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/backlight/qcom-wled.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binding for Qualcomm Technologies, Inc. WLED driver + +maintainers: + - Lee Jones <[email protected]>
Should be the h/w owner (you), not who applies patches.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 18
Quoted 8 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +8
-0+ +description: | + WLED (White Light Emitting Diode) driver is used for controlling display + backlight that is part of PMIC on Qualcomm Technologies, Inc. reference + platforms. The PMIC is connected to the host processor via SPMI bus. + +properties: + compatible :
Drop the space ^
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 22
Quoted 4 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0+ enum: + - qcom,pm8941-wled + - qcom,pmi8998-wled + - qcom,pm660l-wled
Wrong indent (1 space too many).
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 28
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ + reg: + maxItems: 1 + + default-brightness: + maxItems: 1
maxItems is for arrays and this is a single scalar.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 30
Quoted 2 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +2
-0+ description: + brightness value on boot, value from 0-4095.
0-4095 sounds like a constraint.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 32
Quoted 2 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +2
-0+ allOf: + - $ref: /schemas/types.yaml#/definitions/uint32
There should be a common definition for this.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 40
Quoted 8 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +8
-0+ default: 2048 + + label: + maxItems: 1 + description: + The name of the backlight device. + allOf: + - $ref: /schemas/types.yaml#/definitions/string
Already has a type. Just 'label: true' is enough.
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +10
-0+ + qcom,cs-out: + description: + enable current sink output. + This property is supported only for PM8941. + type: boolean + + qcom,cabc: + description: + enable content adaptive backlight control.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 60
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +10
-0+ type: boolean + + qcom,ext-gen: + description: + use externally generated modulator signal to dim. + This property is supported only for PM8941. + type: boolean + + qcom,current-limit: + maxItems: 1
Not an array.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 64
Quoted 4 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0+ allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + mA; per-string current limit; value from 0 to 25 with
25 sounds like a constraint.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 71
Quoted 7 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +7
-0+ 1 mA step. This property is supported only for pm8941. + default: 20 + + qcom,current-limit-microamp: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32
properties with unit suffix already have a type.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 74
Quoted 3 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +3
-0+ description: + uA; per-string current limit; value from 0 to 30000 with + 2500 uA step.
steps can be expressed using 'multipleOf'
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 75
Quoted 1 line
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +1
-0+ default: 25
25 can never be a multiple of 2500
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 86
Quoted 11 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +11
-0+ + qcom,current-boost-limit: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + mA; boost current limit. + For pm8941 one of 105, 385, 525, 805, 980, 1260, 1400, 1680. + Default, 805 mA. + For pmi8998 one of 105, 280, 450, 620, 970, 1150, 1300, + 1500. Default 970 mA.
Constraints.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 97
Quoted 11 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +11
-0+ + qcom,switching-freq: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + kHz; switching frequency; one of 600, 640, 685, 738, + 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, + 4800, 9600. + Default for pm8941 1600 kHz + for pmi8998 800 kHz
Constraints!
Quoted 21 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +21
-0+ + qcom,ovp: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + V; Over-voltage protection limit; one of 27, 29, 32, 35. Default 29V + This property is supported only for PM8941. + + qcom,ovp-millivolt: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + mV; Over-voltage protection limit; + For pmi8998 one of 18100, 19600, 29600, 31100. + Default 29600 mV. + If this property is not specified for PM8941, it + falls back to "qcom,ovp" property. + + qcom,num-strings:
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 128
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +10
-0+ maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + number of led strings attached; + value for PM8941 from 1 to 3. Default 2 + For PMI8998 from 1 to 4. + + interrupts: + maxItems: 2
items:
- description: ...
- description: ...
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 134
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ description: + Interrupts associated with WLED. This should be + "short" and "ovp" interrupts. Interrupts can be + specified as per the encoding listed under + Documentation/devicetree/bindings/spmi/ + qcom,spmi-pmic-arb.txt.
encoding is outside the scope of the binding.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 140
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ + interrupt-names: + description: + Interrupt names associated with the interrupts. + Must be "short" and "ovp". The short circuit detection + is not supported for PM8941.
Names should be constraints.
Quoted 22 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +22
-0+ + qcom,enabled-strings: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Array of the WLED strings numbered from 0 to 3. Each + string of leds are operated individually. Specify the + list of strings used by the device. Any combination of + led strings can be used. + + qcom,external-pfet: + description: + Specify if external PFET control for short circuit + protection is used. This property is supported only + for PMI8998. + type: boolean + + qcom,auto-string-detection: + description: + Enables auto-detection of the WLED string configuration. + This feature is not supported for PM8941.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 172
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +10
-0+ type: boolean + +required: + - compatible + - reg + - label + +examples: + - | + pm8941-wled@d800 {
backlight@...
Quoted 16 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +12
-0+ compatible = "qcom,pm8941-wled"; + reg = <0xd800 0x100>; + 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>; + qcom,enabled-strings = <0 1>; + };Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH V4 1/4] backlight: qcom-wled: convert the wled bindings to .yaml format
Quoted 27 lines · Rob Herring
Quoted 26 lines · Kiran Gunda
Convert the qcom-wled bindings from .txt to .yaml format.
Signed-off-by Kiran Gunda <[email protected]>Signed-off-by Subbaraman Narayanamurthy <[email protected]>Acked-by Daniel Thompson <[email protected]>--- .../bindings/leds/backlight/qcom-wled.txt | 154 ----------------- .../bindings/leds/backlight/qcom-wled.yaml | 184 +++++++++++++++++++++ 2 files changed, 184 insertions(+), 154 deletions(-) delete mode 100644 Documentation/devicetree/bindings/leds/backlight/qcom-wled.txt create mode 100644
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlDocumentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0@@ -0,0 +1,184 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/backlight/qcom-wled.yaml#
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 10
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binding for Qualcomm Technologies, Inc. WLED driver + +maintainers: + - Lee Jones <[email protected]>Should be the h/w owner (you), not who applies patches.
will address in next post.
Quoted 5 lines
Quoted 5 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +3
-0+ +description: | + WLED (White Light Emitting Diode) driver is used for controllingdisplay
+ backlight that is part of PMIC on Qualcomm Technologies, Inc.
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 18
Quoted 6 lines
reference
+ platforms. The PMIC is connected to the host processor via SPMI bus.Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +3
-0+ +properties: + compatible :Drop the space ^
will address in next post.
Quoted 7 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 22
Quoted 4 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0+ enum: + - qcom,pm8941-wled + - qcom,pmi8998-wled + - qcom,pm660l-wledWrong indent (1 space too many).
will address in next post.
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 28
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ + reg: + maxItems: 1 + + default-brightness: + maxItems: 1maxItems is for arrays and this is a single scalar.
Quoted 5 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 30
Quoted 2 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +2
-0+ description: + brightness value on boot, value from 0-4095.0-4095 sounds like a constraint.
will address in next post.
Quoted 5 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
Quoted 2 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +2
-0+ allOf: + - $ref: /schemas/types.yaml#/definitions/uint32There should be a common definition for this.
will address in next post.
Quoted 11 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 40
Quoted 8 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +8
-0+ default: 2048 + + label: + maxItems: 1 + description: + The name of the backlight device. + allOf: + - $ref: /schemas/types.yaml#/definitions/stringAlready has a type. Just 'label: true' is enough.
will address in next post.
Quoted 14 lines
Quoted 14 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +14
-0+ + qcom,cs-out: + description: + enable current sink output. + This property is supported only for PM8941. + type: boolean + + qcom,cabc: + description: + enable content adaptive backlight control. + type: boolean + + qcom,ext-gen: + description:
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 60
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ use externally generated modulator signal to dim. + This property is supported only for PM8941. + type: boolean + + qcom,current-limit: + maxItems: 1Not an array.
will address in next post.
Quoted 7 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 64
Quoted 4 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0+ allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + mA; per-string current limit; value from 0 to 25 with25 sounds like a constraint.
will address in next post.
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 71
Quoted 7 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +7
-0+ 1 mA step. This property is supported only for pm8941. + default: 20 + + qcom,current-limit-microamp: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32properties with unit suffix already have a type.
will address in next post.
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 74
Quoted 3 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +3
-0+ description: + uA; per-string current limit; value from 0 to 30000 with + 2500 uA step.steps can be expressed using 'multipleOf'
will address in next post.
Quoted 4 lines
Quoted 1 line
+ default: 25
25 can never be a multiple of 2500
will correct in next post.
Quoted 12 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 86
Quoted 11 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +11
-0+ + qcom,current-boost-limit: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + mA; boost current limit. + For pm8941 one of 105, 385, 525, 805, 980, 1260, 1400, 1680. + Default, 805 mA. + For pmi8998 one of 105, 280, 450, 620, 970, 1150, 1300, + 1500. Default 970 mA.
Quoted 2 lines
Constraints.
will address in next post.
Quoted 12 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 97
Quoted 11 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +11
-0+ + qcom,switching-freq: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + kHz; switching frequency; one of 600, 640, 685, 738, + 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, + 4800, 9600. + Default for pm8941 1600 kHz + for pmi8998 800 kHz
Quoted 2 lines
Constraints!
will address in next post.
Quoted 28 lines
Quoted 28 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +7
-0+ + qcom,ovp: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + V; Over-voltage protection limit; one of 27, 29, 32, 35.Default 29V
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +20
-0+ This property is supported only for PM8941. + + qcom,ovp-millivolt: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + mV; Over-voltage protection limit; + For pmi8998 one of 18100, 19600, 29600, 31100. + Default 29600 mV. + If this property is not specified for PM8941, it + falls back to "qcom,ovp" property. + + qcom,num-strings: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + number of led strings attached; + value for PM8941 from 1 to 3. Default 2
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 128
Quoted 4 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0+ For PMI8998 from 1 to 4. + + interrupts: + maxItems: 2items:
- description: ...
- description: ...
will address in next post.
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 134
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ description: + Interrupts associated with WLED. This should be + "short" and "ovp" interrupts. Interrupts can be + specified as per the encoding listed under + Documentation/devicetree/bindings/spmi/ + qcom,spmi-pmic-arb.txt.encoding is outside the scope of the binding.
will address in next post.
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 140
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ + interrupt-names: + description: + Interrupt names associated with the interrupts. + Must be "short" and "ovp". The short circuit detection + is not supported for PM8941.Names should be constraints.
will address in next post.
Quoted 26 lines
Quoted 26 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +26
-0+ + qcom,enabled-strings: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32-array + description: + Array of the WLED strings numbered from 0 to 3. Each + string of leds are operated individually. Specify the + list of strings used by the device. Any combination of + led strings can be used. + + qcom,external-pfet: + description: + Specify if external PFET control for short circuit + protection is used. This property is supported only + for PMI8998. + type: boolean + + qcom,auto-string-detection: + description: + Enables auto-detection of the WLED string configuration. + This feature is not supported for PM8941. + type: boolean + +required: + - compatible
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 172
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+ - reg + - label + +examples: + - | + pm8941-wled@d800 {backlight@...
will add in next post.
Quoted 16 lines
Quoted 16 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +12
-1+ compatible = "qcom,pm8941-wled"; + reg = <0xd800 0x100>; + 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>; + qcom,enabled-strings = <0 1>; + }; --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Re: [PATCH V4 1/4] backlight: qcom-wled: convert the wled bindings to .yaml format
Quoted 32 lines · On Fri, Apr 03, 2020 at 04:45:49PM +0530, [email protected] wrote:
Quoted 13 lines · Rob Herring
Quoted 12 lines · Kiran Gunda
diff --git
a/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlb/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlnew file mode 100644
index 0000000..8a388bfDocumentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0@@ -0,0 +1,184 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/backlight/qcom-wled.yaml#Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 10
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binding for Qualcomm Technologies, Inc. WLED driver + +maintainers: + - Lee Jones <[email protected]>Should be the h/w owner (you), not who applies patches.
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
Quoted 8 lines
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
If you agree on all points raised I doubt there is any need for a point by point reply since everyone who reads it will have to scroll down simply to find out that you agree on all points.
Better just to acknowledge the feedback and reply to the first one saying you'll agree on all points and will address all feedback in the next revision (and then trim the reply to keep it short).
Daniel.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V4 1/4] backlight: qcom-wled: convert the wled bindings to .yaml format
Quoted 42 lines · Daniel Thompson
Quoted 32 lines · On Fri, Apr 03, 2020 at 04:45:49PM +0530, [email protected] wrote:
Quoted 13 lines · Rob Herring
Quoted 12 lines · Kiran Gunda
diff --git
a/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlb/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlnew file mode 100644
index 0000000..8a388bfDocumentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0@@ -0,0 +1,184 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/backlight/qcom-wled.yaml#Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 10
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binding for Qualcomm Technologies, Inc. WLED driver + +maintainers: + - Lee Jones <[email protected]>Should be the h/w owner (you), not who applies patches.
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.Quoted 8 lines
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
Quoted 7 lines
If you agree on all points raised I doubt there is any need for a point by point reply since everyone who reads it will have to scroll down simply to find out that you agree on all points.
Better just to acknowledge the feedback and reply to the first one saying you'll agree on all points and will address all feedback in the next revision (and then trim the reply to keep it short).
Or better still, just submit the next revision with all the fixes. :)
Signature · 8 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V4 1/4] backlight: qcom-wled: convert the wled bindings to .yaml format
Quoted 48 lines · Lee Jones
Quoted 46 lines · Daniel Thompson
Quoted 32 lines · On Fri, Apr 03, 2020 at 04:45:49PM +0530, [email protected] wrote:
Quoted 13 lines · Rob Herring
Quoted 12 lines · Kiran Gunda
diff --git
a/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlb/Documentation/devicetree/bindings/leds/backlight/qcom-wled.yamlnew file mode 100644
index 0000000..8a388bfDocumentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +4
-0@@ -0,0 +1,184 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/backlight/qcom-wled.yaml#Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml line 10
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml new file +6
-0+$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binding for Qualcomm Technologies, Inc. WLED driver + +maintainers: + - Lee Jones <[email protected]>Should be the h/w owner (you), not who applies patches.
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.Quoted 8 lines
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.
<snip>
will address in next post.If you agree on all points raised I doubt there is any need for a point by point reply since everyone who reads it will have to scroll down simply to find out that you agree on all points.
Quoted 5 lines
Quoted 3 lines
Better just to acknowledge the feedback and reply to the first one saying you'll agree on all points and will address all feedback in the next revision (and then trim the reply to keep it short).
Or better still, just submit the next revision with all the fixes. :)
Noted.
PATCH v4 2/4 backlight: qcom-wled: Add callback functions
In reply to Kiran GundaAdd wled_cabc_config, wled_sync_toggle, wled_ovp_fault_status and wled_ovp_delay callback functions to prepare the driver for adding WLED5 support.
wled_cabc_config() ===> Used to configure the cabc register.
It is applicable for wled4 and wled5.
wled_sync_toggle() ===> used to toggle the Sync register bit for the
brightness update to take place. It is applicable for WLED3, WLED4 and WLED5.
wled_ovp_fault_status() ===> Used to determine if the OVP fault is triggered.
It is applicable for WLED4 and WLED5.
wled_ovp_delay() ===> Provides the time to wait before checking the OVP status
after wled module enable.
It is applicable for WLED4 and WLED5.
--- drivers/video/backlight/qcom-wled.c | 188 ++++++++++++++++++++++-------------- 1 file changed, 118 insertions(+), 70 deletions(-)
drivers/video/backlight/qcom-wled.c +118 -70
@@ -147,6 +147,7 @@ struct wled {u32 max_brightness;u32 short_count;u32 auto_detect_count; +u32 version;bool disabled_by_short;bool has_short_detect;int short_irq;
@@ -155,6 +156,10 @@ struct wled {struct wled_config cfg;struct delayed_work ovp_work;int (*wled_set_brightness)(struct wled *wled,u16 brightness); +int (*wled_cabc_config)(struct wled *wled,bool enable); +int (*wled_sync_toggle)(struct wled *wled); +int (*wled_ovp_fault_status)(struct wled *wled,bool *fault_set); +int (*wled_ovp_delay)(struct wled *wled); };static int wled3_set_brightness (struct wled *wled,u16 brightness)
@@ -237,7 +242,7 @@ static int wled_module_enable(struct wled *wled, int val)return 0 ; } -static int wled_sync_toggle (struct wled *wled) +static int wled3_sync_toggle (struct wled *wled) {int rc;unsigned int mask =GENMASK (wled->max_string_count -1 ,0 );
@@ -255,6 +260,46 @@ static int wled_sync_toggle(struct wled *wled)return rc; } +static int wled4_ovp_fault_status (struct wled *wled,bool *fault_set) +{ +int rc; +u32 int_rt_sts, fault_sts; + + *fault_set = false; + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_INT_RT_STS , + &int_rt_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read INT_RT_STS rc=%d\n" , rc); +return rc; + } + + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_FAULT_STATUS , + &fault_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read FAULT_STATUS rc=%d\n" , rc); +return rc; + } + +if (int_rt_sts &WLED3_CTRL_REG_OVP_FAULT_STATUS ) + *fault_set = true; + +if (fault_sts &WLED3_CTRL_REG_OVP_FAULT_BIT ) + *fault_set = true; + +if (*fault_set) +dev_dbg (wled->dev,"WLED OVP fault detected, int_rt_sts=0x%x fault_sts=0x%x\n" , + int_rt_sts, fault_sts); + +return rc; +} + +static int wled4_ovp_delay (struct wled *wled) +{ +return WLED_SOFT_START_DLY_US ; +} +static int wled_update_status (struct backlight_device *bl) {struct wled *wled =bl_get_data (bl);
@@ -275,7 +320,7 @@ static int wled_update_status(struct backlight_device *bl) goto unlock_mutex; } - rc =wled_sync_toggle (wled); + rc = wled->wled_sync_toggle (wled);if (rc <0 ) {dev_err (wled->dev,"wled sync failed rc:%d\n" , rc); goto unlock_mutex;
@@ -298,6 +343,25 @@ static int wled_update_status(struct backlight_device *bl)return rc; } +static int wled4_cabc_config (struct wled *wled,bool enable) +{ +int i, j, rc; +u8 val; + +for (i =0 ; i < wled->cfg.num_strings; i++) { + j = wled->cfg.enabled_strings[i]; + + val = enable ?WLED4_SINK_REG_STR_CABC_MASK :0 ; + rc =regmap_update_bits (wled->regmap, wled->sink_addr + +WLED4_SINK_REG_STR_CABC (j), +WLED4_SINK_REG_STR_CABC_MASK , val); +if (rc <0 ) +return rc; + } + +return 0 ; +} +#define WLED_SHORT_DLY_MS 20#define WLED_SHORT_CNT_MAX 5#define WLED_SHORT_RESET_CNT_DLY_US USEC_PER_SEC
@@ -345,9 +409,10 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled)static void wled_auto_string_detection (struct wled *wled) { -int rc =0 , i; -u32 sink_config =0 , int_sts; +int rc =0 , i, delay_time_us; +u32 sink_config =0 ;u8 sink_test =0 , sink_valid =0 , val; +bool fault_set;/* Read configured sink configuration */ rc = regmap_read(wled->regmap, wled->sink_addr +
@@ -376,14 +441,9 @@ static void wled_auto_string_detection(struct wled *wled) }if (wled->cfg.cabc) { -for (i =0 ; i < wled->cfg.num_strings; i++) { - rc =regmap_update_bits (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_CABC (i), -WLED4_SINK_REG_STR_CABC_MASK , -0 ); -if (rc <0 ) - goto failed_detect; - } + rc = wled->wled_cabc_config (wled,0 ); +if (rc <0 ) + goto failed_detect; }/* Disable all sinks */
@@ -427,18 +487,17 @@ static void wled_auto_string_detection(struct wled *wled) goto failed_detect; } -usleep_range (WLED_SOFT_START_DLY_US , -WLED_SOFT_START_DLY_US +1000 ); + delay_time_us = wled->wled_ovp_delay (wled); +usleep_range (delay_time_us, delay_time_us +1000 ); - rc =regmap_read (wled->regmap, wled->ctrl_addr + -WLED3_CTRL_REG_INT_RT_STS , &int_sts); + rc = wled->wled_ovp_fault_status (wled, &fault_set);if (rc <0 ) { -dev_err (wled->dev,"Error in reading WLED3_CTRL_INT_RT_STS rc=%d\n" , +dev_err (wled->dev,"Error in getting OVP fault_sts, rc=%d\n" , rc); goto failed_detect; } -if (int_sts &WLED3_CTRL_REG_OVP_FAULT_STATUS ) +if (fault_set)dev_dbg (wled->dev,"WLED OVP fault detected with SINK %d\n" , i +1 );else
@@ -478,30 +537,30 @@ static void wled_auto_string_detection(struct wled *wled) }/* Enable valid sinks */ -for (i =0 ; i < wled->cfg.num_strings; i++) { -if (wled->cfg.cabc) { - rc =regmap_update_bits (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_CABC (i), -WLED4_SINK_REG_STR_CABC_MASK , -WLED4_SINK_REG_STR_CABC_MASK ); -if (rc <0 ) +if (wled->version ==4 ) { +for (i =0 ; i < wled->cfg.num_strings; i++) { +if (sink_config & +BIT (WLED4_SINK_REG_CURR_SINK_SHFT + i)) + val =WLED4_SINK_REG_STR_MOD_MASK ; +else +/* Disable modulator_en for unused sink */ + val =0x0 ; + + rc =regmap_write (wled->regmap, wled->sink_addr + +WLED4_SINK_REG_STR_MOD_EN (i), val); +if (rc <0 ) { +dev_err (wled->dev,"Failed to configure MODULATOR_EN rc=%d\n" , + rc); goto failed_detect; - } - -if (sink_config &BIT (WLED4_SINK_REG_CURR_SINK_SHFT + i)) - val =WLED4_SINK_REG_STR_MOD_MASK ; -else - val =0x0 ;/* Disable modulator_en for unused sink */ - - rc =regmap_write (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_MOD_EN (i), val); -if (rc <0 ) { -dev_err (wled->dev,"Failed to configure MODULATOR_EN rc=%d\n" , - rc); - goto failed_detect; + } } } +/* Enable CABC if it needs to be enabled */ + rc = wled->wled_cabc_config (wled, true); +if (rc <0 ) + goto failed_detect; +/* Restore the feedback setting */ rc =regmap_write (wled->regmap, wled->ctrl_addr +WLED3_CTRL_REG_FEEDBACK_CONTROL ,0 );
@@ -570,29 +629,19 @@ static bool wled_auto_detection_required(struct wled *wled)static int wled_auto_detection_at_init (struct wled *wled) {int rc; -u32 fault_status, rt_status; +bool fault_set;if (!wled->cfg.auto_detection_enabled)return 0 ; - rc =regmap_read (wled->regmap, - wled->ctrl_addr +WLED3_CTRL_REG_INT_RT_STS , - &rt_status); + rc = wled->wled_ovp_fault_status (wled, &fault_set);if (rc <0 ) { -dev_err (wled->dev,"Failed to read RT status rc=%d\n" , rc); -return rc; - } - - rc =regmap_read (wled->regmap, - wled->ctrl_addr +WLED3_CTRL_REG_FAULT_STATUS , - &fault_status); -if (rc <0 ) { -dev_err (wled->dev,"Failed to read fault status rc=%d\n" , rc); +dev_err (wled->dev,"Error in getting OVP fault_sts, rc=%d\n" , + rc);return rc; } -if ((rt_status &WLED3_CTRL_REG_OVP_FAULT_STATUS ) || - (fault_status &WLED3_CTRL_REG_OVP_FAULT_BIT )) { +if (fault_set) {mutex_lock (&wled->lock);wled_auto_string_detection (wled);mutex_unlock (&wled->lock);
@@ -811,17 +860,12 @@ static int wled4_setup(struct wled *wled) wled->cfg.string_i_limit);if (rc <0 )return rc; - - addr = wled->sink_addr + -WLED4_SINK_REG_STR_CABC (j); - rc =regmap_update_bits (wled->regmap, addr, -WLED4_SINK_REG_STR_CABC_MASK , - wled->cfg.cabc ? -WLED4_SINK_REG_STR_CABC_MASK :0 ); -if (rc <0 ) -return rc; } + rc =wled4_cabc_config (wled, wled->cfg.en_cabc); +if (rc <0 ) +return rc; + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, WLED3_CTRL_REG_MOD_EN_MASK,
@@ -835,7 +879,7 @@ static int wled4_setup(struct wled *wled)if (rc <0 )return rc; - rc =wled_sync_toggle (wled); + rc = wled->wled_sync_toggle (wled);if (rc <0 ) {dev_err (wled->dev,"Failed to toggle sync reg rc:%d\n" , rc);return rc;
@@ -951,7 +995,7 @@ static u32 wled_values(const struct wled_var_cfg *cfg, u32 idx)return idx; } -static int wled_configure (struct wled *wled,int version) +static int wled_configure (struct wled *wled) {struct wled_config *cfg = &wled->cfg;struct device *dev = wled->dev;
@@ -1035,12 +1079,13 @@ static int wled_configure(struct wled *wled, int version)if (rc) wled->name =devm_kasprintf (dev,GFP_KERNEL ,"%pOFn" , dev->of_node); -switch (version) { +switch (wled->version) {case 3 : u32_opts = wled3_opts; size =ARRAY_SIZE (wled3_opts); *cfg = wled3_config_defaults; wled->wled_set_brightness = wled3_set_brightness; + wled->wled_sync_toggle = wled3_sync_toggle; wled->max_string_count =3 ; wled->sink_addr = wled->ctrl_addr;break ;
@@ -1050,6 +1095,10 @@ static int wled_configure(struct wled *wled, int version) size =ARRAY_SIZE (wled4_opts); *cfg = wled4_config_defaults; wled->wled_set_brightness = wled4_set_brightness; + wled->wled_sync_toggle = wled3_sync_toggle; + wled->wled_cabc_config = wled4_cabc_config; + wled->wled_ovp_fault_status = wled4_ovp_fault_status; + wled->wled_ovp_delay = wled4_ovp_delay; wled->max_string_count =4 ; prop_addr =of_get_address (dev->of_node,1 ,NULL ,NULL );
@@ -1186,7 +1235,6 @@ static int wled_probe(struct platform_device *pdev)struct backlight_device *bl;struct wled *wled;struct regmap *regmap; -int version;u32 val;int rc;
@@ -1203,18 +1251,18 @@ static int wled_probe(struct platform_device *pdev) wled->regmap = regmap; wled->dev = &pdev->dev; - version = (uintptr_t )of_device_get_match_data (&pdev->dev); -if (!version) { + wled->version = (uintptr_t )of_device_get_match_data (&pdev->dev); +if (!wled->version) {dev_err (&pdev->dev,"Unknown device version\n" );return -ENODEV ; }mutex_init (&wled->lock); - rc =wled_configure (wled, version); + rc =wled_configure (wled);if (rc)return rc; -switch (version) { +switch (wled->version) {case 3 : wled->cfg.auto_detection_enabled = false; rc =wled3_setup (wled);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH V4 2/4] backlight: qcom-wled: Add callback functions
Quoted 11 lines · Kiran Gunda
Add
wled_cabc_config,wled_sync_toggle,wled_ovp_fault_statusandwled_ovp_delaycallback functions to prepare the driver for adding WLED5 support.
wled_cabc_config()==> Used to configure the cabc register.
It is applicable for wled4 and wled5.
wled_sync_toggle()==> used to toggle the Sync register bit for the
brightness update to take place. It is applicable for WLED3, WLED4 and WLED5.
Quoted 6 lines
wled_ovp_fault_status()==> Used to determine if the OVP fault is triggered.
It is applicable for WLED4 and WLED5.
wled_ovp_delay()==> Provides the time to wait before checking the OVP status
after wled module enable.
It is applicable for WLED4 and WLED5.
These look like comments to me. Move them out of the patch header and make them into real comments!
Quoted 1 line
Signed-off-by Kiran Gunda <[email protected]>
This patch does not compile. Please fix this.
drivers/video/backlight/qcom-wled.c struct wled { · line 150
Quoted 13 lines
--- drivers/video/backlight/qcom-wled.c | 188 ++++++++++++++++++++++-------------- 1 file changed, 118 insertions(+), 70 deletions(-)drivers/video/backlight/qcom-wled.c +1
-0@@ -147,6 +147,7 @@ struct wled {u32 max_brightness;u32 short_count;u32 auto_detect_count; +u32 version;
Why does some of the changes here use function pointers and other parts use if/else networks (wled->version = X) ?
Overall I almost wonder if the reduced clarify that comes from function pointers is actually adding much value?
Quoted 121 lines
drivers/video/backlight/qcom-wled.c +68
-4bool disabled_by_short;bool has_short_detect;int short_irq;@@ -155,6 +156,10 @@ struct wled {struct wled_config cfg;struct delayed_work ovp_work;int (*wled_set_brightness)(struct wled *wled,u16 brightness); +int (*wled_cabc_config)(struct wled *wled,bool enable); +int (*wled_sync_toggle)(struct wled *wled); +int (*wled_ovp_fault_status)(struct wled *wled,bool *fault_set); +int (*wled_ovp_delay)(struct wled *wled); };static int wled3_set_brightness (struct wled *wled,u16 brightness)@@ -237,7 +242,7 @@ static int wled_module_enable(struct wled *wled, int val)return 0 ; } -static int wled_sync_toggle (struct wled *wled) +static int wled3_sync_toggle (struct wled *wled) {int rc;unsigned int mask =GENMASK (wled->max_string_count -1 ,0 );@@ -255,6 +260,46 @@ static int wled_sync_toggle(struct wled *wled)return rc; } +static int wled4_ovp_fault_status (struct wled *wled,bool *fault_set) +{ +int rc; +u32 int_rt_sts, fault_sts; + + *fault_set = false; + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_INT_RT_STS , + &int_rt_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read INT_RT_STS rc=%d\n" , rc); +return rc; + } + + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_FAULT_STATUS , + &fault_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read FAULT_STATUS rc=%d\n" , rc); +return rc; + } + +if (int_rt_sts &WLED3_CTRL_REG_OVP_FAULT_STATUS ) + *fault_set = true; + +if (fault_sts &WLED3_CTRL_REG_OVP_FAULT_BIT ) + *fault_set = true; + +if (*fault_set) +dev_dbg (wled->dev,"WLED OVP fault detected, int_rt_sts=0x%x fault_sts=0x%x\n" , + int_rt_sts, fault_sts); + +return rc; +} + +static int wled4_ovp_delay (struct wled *wled) +{ +return WLED_SOFT_START_DLY_US ; +} +static int wled_update_status (struct backlight_device *bl) {struct wled *wled =bl_get_data (bl);@@ -275,7 +320,7 @@ static int wled_update_status(struct backlight_device *bl) goto unlock_mutex; } - rc =wled_sync_toggle (wled); + rc = wled->wled_sync_toggle (wled);if (rc <0 ) {dev_err (wled->dev,"wled sync failed rc:%d\n" , rc); goto unlock_mutex;@@ -298,6 +343,25 @@ static int wled_update_status(struct backlight_device *bl)return rc; } +static int wled4_cabc_config (struct wled *wled,bool enable) +{ +int i, j, rc; +u8 val; + +for (i =0 ; i < wled->cfg.num_strings; i++) { + j = wled->cfg.enabled_strings[i]; + + val = enable ?WLED4_SINK_REG_STR_CABC_MASK :0 ; + rc =regmap_update_bits (wled->regmap, wled->sink_addr + +WLED4_SINK_REG_STR_CABC (j), +WLED4_SINK_REG_STR_CABC_MASK , val); +if (rc <0 ) +return rc; + } + +return 0 ; +} +#define WLED_SHORT_DLY_MS 20#define WLED_SHORT_CNT_MAX 5#define WLED_SHORT_RESET_CNT_DLY_US USEC_PER_SEC@@ -345,9 +409,10 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled)static void wled_auto_string_detection (struct wled *wled) { -int rc =0 , i; -u32 sink_config =0 , int_sts; +int rc =0 , i, delay_time_us; +u32 sink_config =0 ;u8 sink_test =0 , sink_valid =0 , val; +bool fault_set;/* Read configured sink configuration */ rc = regmap_read(wled->regmap, wled->sink_addr +@@ -376,14 +441,9 @@ static void wled_auto_string_detection(struct wled *wled) }
drivers/video/backlight/qcom-wled.c static void wled_auto_string_detection(struct wled *wled) · line 444
Quoted 10 lines
drivers/video/backlight/qcom-wled.c +1
-8if (wled->cfg.cabc) { -for (i =0 ; i < wled->cfg.num_strings; i++) { - rc =regmap_update_bits (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_CABC (i), -WLED4_SINK_REG_STR_CABC_MASK , -0 ); -if (rc <0 ) - goto failed_detect; - } + rc = wled->wled_cabc_config (wled,0 );
Be consistent with the argument (elsewhere it is true/false).
Quoted 65 lines
drivers/video/backlight/qcom-wled.c +7
-6+if (rc <0 ) + goto failed_detect; }/* Disable all sinks */ @@ -427,18 +487,17 @@ static void wled_auto_string_detection(struct wled *wled) goto failed_detect; } -usleep_range (WLED_SOFT_START_DLY_US , -WLED_SOFT_START_DLY_US +1000 ); + delay_time_us = wled->wled_ovp_delay (wled); +usleep_range (delay_time_us, delay_time_us +1000 ); - rc =regmap_read (wled->regmap, wled->ctrl_addr + -WLED3_CTRL_REG_INT_RT_STS , &int_sts); + rc = wled->wled_ovp_fault_status (wled, &fault_set);if (rc <0 ) { -dev_err (wled->dev,"Error in reading WLED3_CTRL_INT_RT_STS rc=%d\n" , +dev_err (wled->dev,"Error in getting OVP fault_sts, rc=%d\n" , rc); goto failed_detect; } -if (int_sts &WLED3_CTRL_REG_OVP_FAULT_STATUS ) +if (fault_set) dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n",drivers/video/backlight/qcom-wled.c +14
-15i + 1); else@@ -478,30 +537,30 @@ static void wled_auto_string_detection(struct wled *wled) }/* Enable valid sinks */ -for (i =0 ; i < wled->cfg.num_strings; i++) { -if (wled->cfg.cabc) { - rc =regmap_update_bits (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_CABC (i), -WLED4_SINK_REG_STR_CABC_MASK , -WLED4_SINK_REG_STR_CABC_MASK ); -if (rc <0 ) +if (wled->version =4 ) { +for (i =0 ; i < wled->cfg.num_strings; i++) { +if (sink_config & +BIT (WLED4_SINK_REG_CURR_SINK_SHFT + i)) + val =WLED4_SINK_REG_STR_MOD_MASK ; +else +/* Disable modulator_en for unused sink */ + val =0x0 ; + + rc =regmap_write (wled->regmap, wled->sink_addr + +WLED4_SINK_REG_STR_MOD_EN (i), val); +if (rc <0 ) { +dev_err (wled->dev,"Failed to configure MODULATOR_EN rc=%d\n" , + rc); goto failed_detect; - } - -if (sink_config &BIT (WLED4_SINK_REG_CURR_SINK_SHFT + i)) - val =WLED4_SINK_REG_STR_MOD_MASK ; -else - val =0x0 ;/* Disable modulator_en for unused sink */ - - rc = regmap_write(wled->regmap, wled->sink_addr +
drivers/video/backlight/qcom-wled.c static void wled_auto_string_detection(struct wled *wled) · line 559
Quoted 10 lines
drivers/video/backlight/qcom-wled.c +2
-5- WLED4_SINK_REG_STR_MOD_EN(i), val); -if (rc <0 ) { -dev_err (wled->dev,"Failed to configure MODULATOR_EN rc=%d\n" , - rc); - goto failed_detect; + } } } +/* Enable CABC if it needs to be enabled */
If it needs to be enabled?
Quoted 142 lines
drivers/video/backlight/qcom-wled.c +25
-32+ rc = wled->wled_cabc_config (wled, true); +if (rc <0 ) + goto failed_detect; +/* Restore the feedback setting */ rc =regmap_write (wled->regmap, wled->ctrl_addr +WLED3_CTRL_REG_FEEDBACK_CONTROL ,0 );@@ -570,29 +629,19 @@ static bool wled_auto_detection_required(struct wled *wled)static int wled_auto_detection_at_init (struct wled *wled) {int rc; -u32 fault_status, rt_status; +bool fault_set;if (!wled->cfg.auto_detection_enabled)return 0 ; - rc =regmap_read (wled->regmap, - wled->ctrl_addr +WLED3_CTRL_REG_INT_RT_STS , - &rt_status); + rc = wled->wled_ovp_fault_status (wled, &fault_set);if (rc <0 ) { -dev_err (wled->dev,"Failed to read RT status rc=%d\n" , rc); -return rc; - } - - rc =regmap_read (wled->regmap, - wled->ctrl_addr +WLED3_CTRL_REG_FAULT_STATUS , - &fault_status); -if (rc <0 ) { -dev_err (wled->dev,"Failed to read fault status rc=%d\n" , rc); +dev_err (wled->dev,"Error in getting OVP fault_sts, rc=%d\n" , + rc);return rc; } -if ((rt_status &WLED3_CTRL_REG_OVP_FAULT_STATUS ) || - (fault_status &WLED3_CTRL_REG_OVP_FAULT_BIT )) { +if (fault_set) {mutex_lock (&wled->lock);wled_auto_string_detection (wled);mutex_unlock (&wled->lock);@@ -811,17 +860,12 @@ static int wled4_setup(struct wled *wled) wled->cfg.string_i_limit);if (rc <0 )return rc; - - addr = wled->sink_addr + -WLED4_SINK_REG_STR_CABC (j); - rc =regmap_update_bits (wled->regmap, addr, -WLED4_SINK_REG_STR_CABC_MASK , - wled->cfg.cabc ? -WLED4_SINK_REG_STR_CABC_MASK :0 ); -if (rc <0 ) -return rc; } + rc =wled4_cabc_config (wled, wled->cfg.en_cabc); +if (rc <0 ) +return rc; + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, WLED3_CTRL_REG_MOD_EN_MASK,@@ -835,7 +879,7 @@ static int wled4_setup(struct wled *wled)if (rc <0 )return rc; - rc =wled_sync_toggle (wled); + rc = wled->wled_sync_toggle (wled);if (rc <0 ) {dev_err (wled->dev,"Failed to toggle sync reg rc:%d\n" , rc);return rc;@@ -951,7 +995,7 @@ static u32 wled_values(const struct wled_var_cfg *cfg, u32 idx)return idx; } -static int wled_configure (struct wled *wled,int version) +static int wled_configure (struct wled *wled) {struct wled_config *cfg = &wled->cfg;struct device *dev = wled->dev;@@ -1035,12 +1079,13 @@ static int wled_configure(struct wled *wled, int version)if (rc) wled->name =devm_kasprintf (dev,GFP_KERNEL ,"%pOFn" , dev->of_node); -switch (version) { +switch (wled->version) {case 3 : u32_opts = wled3_opts; size =ARRAY_SIZE (wled3_opts); *cfg = wled3_config_defaults; wled->wled_set_brightness = wled3_set_brightness; + wled->wled_sync_toggle = wled3_sync_toggle; wled->max_string_count =3 ; wled->sink_addr = wled->ctrl_addr;break ;@@ -1050,6 +1095,10 @@ static int wled_configure(struct wled *wled, int version) size =ARRAY_SIZE (wled4_opts); *cfg = wled4_config_defaults; wled->wled_set_brightness = wled4_set_brightness; + wled->wled_sync_toggle = wled3_sync_toggle; + wled->wled_cabc_config = wled4_cabc_config; + wled->wled_ovp_fault_status = wled4_ovp_fault_status; + wled->wled_ovp_delay = wled4_ovp_delay; wled->max_string_count =4 ; prop_addr =of_get_address (dev->of_node,1 ,NULL ,NULL );@@ -1186,7 +1235,6 @@ static int wled_probe(struct platform_device *pdev)struct backlight_device *bl;struct wled *wled;struct regmap *regmap; -int version;u32 val;int rc;@@ -1203,18 +1251,18 @@ static int wled_probe(struct platform_device *pdev) wled->regmap = regmap; wled->dev = &pdev->dev; - version = (uintptr_t )of_device_get_match_data (&pdev->dev); -if (!version) { + wled->version = (uintptr_t )of_device_get_match_data (&pdev->dev); +if (!wled->version) {dev_err (&pdev->dev,"Unknown device version\n" );return -ENODEV ; }mutex_init (&wled->lock); - rc =wled_configure (wled, version); + rc =wled_configure (wled);if (rc)return rc; -switch (version) { +switch (wled->version) {case 3 : wled->cfg.auto_detection_enabled = false; rc =wled3_setup (wled);Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH V4 2/4] backlight: qcom-wled: Add callback functions
Quoted 15 lines · Daniel Thompson
Quoted 14 lines · Kiran Gunda
Add
wled_cabc_config,wled_sync_toggle,wled_ovp_fault_statusandwled_ovp_delaycallback functions to prepare the driver for adding WLED5 support.
wled_cabc_config()===> Used to configure the cabc register.
It is applicable for wled4 and wled5.
wled_sync_toggle()===> used to toggle the Sync register bit for the
brightness update to take place. It is applicable for WLED3, WLED4 and WLED5.
wled_ovp_fault_status()===> Used to determine if the OVP fault is triggered.
It is applicable for WLED4 and WLED5.
Quoted 7 lines
Quoted 3 lines
wled_ovp_delay()===> Provides the time to wait before checking the OVP status
after wled module enable.
It is applicable for WLED4 and WLED5.These look like comments to me. Move them out of the patch header and make them into real comments!
Sure. Will do it in next post.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Kiran Gunda <[email protected]>This patch does not compile. Please fix this.
Sorry for that. Some how it didn't show up in my compilation. Will fix it in next post.
Quoted 5 lines
Quoted 5 lines
--- drivers/video/backlight/qcom-wled.c | 188 ++++++++++++++++++++++-------------- 1 file changed, 118 insertions(+), 70 deletions(-)
Quoted 13 lines
drivers/video/backlight/qcom-wled.c struct wled { · line 150
Quoted 9 lines
drivers/video/backlight/qcom-wled.c +1
-0@@ -147,6 +147,7 @@ struct wled {u32 max_brightness;u32 short_count;u32 auto_detect_count; +u32 version;Why does some of the changes here use function pointers and other parts use if/else networks (
wled->version== X) ?
There is one place (in auto_string_detection) where we have to add the if (version == 4) because the per string modulator_enable is present only for WLED4 and there is no equivalent functionality available for WLED5.
There is another place, that i can convert it to the function pointer (auto_detection_required).
Quoted 3 lines
Overall I almost wonder if the reduced clarify that comes from function pointers is actually adding much value?
I believe adding the function pointer makes it cleaner and the same approach is used for WLED4/WLED3 also.
Quoted 128 lines
Quoted 128 lines
drivers/video/backlight/qcom-wled.c +5
-1bool disabled_by_short;bool has_short_detect;int short_irq;@@ -155,6 +156,10 @@ struct wled {struct wled_config cfg;struct delayed_work ovp_work;int (*wled_set_brightness)(struct wled *wled,u16 brightness); +int (*wled_cabc_config)(struct wled *wled,bool enable); +int (*wled_sync_toggle)(struct wled *wled); +int (*wled_ovp_fault_status)(struct wled *wled,bool *fault_set); +int (*wled_ovp_delay)(struct wled *wled); };static int wled3_set_brightness (struct wled *wled,u16 brightness)@@ -237,7 +242,7 @@ static int wled_module_enable(struct wled *wled, int val)return 0 ; } -static int wled_sync_toggle (struct wled *wled) +static int wled3_sync_toggle (struct wled *wled) {int rc;drivers/video/backlight/qcom-wled.c +40
-0unsigned int mask =GENMASK (wled->max_string_count -1 ,0 );@@ -255,6 +260,46 @@ static int wled_sync_toggle(struct wled *wled)return rc; } +static int wled4_ovp_fault_status (struct wled *wled,bool *fault_set) +{ +int rc; +u32 int_rt_sts, fault_sts; + + *fault_set = false; + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_INT_RT_STS , + &int_rt_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read INT_RT_STS rc=%d\n" , rc); +return rc; + } + + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_FAULT_STATUS , + &fault_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read FAULT_STATUS rc=%d\n" , rc); +return rc; + } + +if (int_rt_sts &WLED3_CTRL_REG_OVP_FAULT_STATUS ) + *fault_set = true; + +if (fault_sts &WLED3_CTRL_REG_OVP_FAULT_BIT ) + *fault_set = true; + +if (*fault_set) + dev_dbg(wled->dev, "WLED OVP fault detected, int_rt_sts=0x%x fault_sts=0x%x\n", + int_rt_sts, fault_sts); + +return rc; +} + +static int wled4_ovp_delay (struct wled *wled) +{ +return WLED_SOFT_START_DLY_US ; +} +static int wled_update_status (struct backlight_device *bl) {drivers/video/backlight/qcom-wled.c +1
-1struct wled *wled =bl_get_data (bl);@@ -275,7 +320,7 @@ static int wled_update_status(struct backlight_device *bl) goto unlock_mutex; } - rc =wled_sync_toggle (wled); + rc = wled->wled_sync_toggle (wled);if (rc <0 ) {dev_err (wled->dev,"wled sync failed rc:%d\n" , rc);drivers/video/backlight/qcom-wled.c +19
-0goto unlock_mutex;@@ -298,6 +343,25 @@ static int wled_update_status(struct backlight_device *bl)return rc; } +static int wled4_cabc_config (struct wled *wled,bool enable) +{ +int i, j, rc; +u8 val; + +for (i =0 ; i < wled->cfg.num_strings; i++) { + j = wled->cfg.enabled_strings[i]; + + val = enable ?WLED4_SINK_REG_STR_CABC_MASK :0 ; + rc =regmap_update_bits (wled->regmap, wled->sink_addr + +WLED4_SINK_REG_STR_CABC (j), +WLED4_SINK_REG_STR_CABC_MASK , val); +if (rc <0 ) +return rc; + } + +return 0 ; +} +#define WLED_SHORT_DLY_MS 20#define WLED_SHORT_CNT_MAX 5#define
WLED_SHORT_RESET_CNT_DLY_USUSEC_PER_SECdrivers/video/backlight/qcom-wled.c +3
-2@@ -345,9 +409,10 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled)static void wled_auto_string_detection (struct wled *wled) { -int rc =0 , i; -u32 sink_config =0 , int_sts; +int rc =0 , i, delay_time_us; +u32 sink_config =0 ;u8 sink_test =0 , sink_valid =0 , val; +bool fault_set;/* Read configured sink configuration */ drivers/video/backlight/qcom-wled.c +0
-0rc = regmap_read(wled->regmap, wled->sink_addr +@@ -376,14 +441,9 @@ static void wled_auto_string_detection(struct wled *wled) }
Quoted 13 lines
drivers/video/backlight/qcom-wled.c static void wled_auto_string_detection(struct wled *wled) · line 444
Quoted 10 lines
drivers/video/backlight/qcom-wled.c +1
-8if (wled->cfg.cabc) { -for (i =0 ; i < wled->cfg.num_strings; i++) { - rc =regmap_update_bits (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_CABC (i), -WLED4_SINK_REG_STR_CABC_MASK , -0 ); -if (rc <0 ) - goto failed_detect; - } + rc = wled->wled_cabc_config (wled,0 );Be consistent with the argument (elsewhere it is true/false).
Will address in the next post.
Quoted 78 lines
Quoted 78 lines
drivers/video/backlight/qcom-wled.c +2
-0+if (rc <0 ) + goto failed_detect; }drivers/video/backlight/qcom-wled.c +20
-26/* Disable all sinks */ @@ -427,18 +487,17 @@ static void wled_auto_string_detection(struct wled *wled) goto failed_detect; } -usleep_range (WLED_SOFT_START_DLY_US , -WLED_SOFT_START_DLY_US +1000 ); + delay_time_us = wled->wled_ovp_delay (wled); +usleep_range (delay_time_us, delay_time_us +1000 ); - rc =regmap_read (wled->regmap, wled->ctrl_addr + -WLED3_CTRL_REG_INT_RT_STS , &int_sts); + rc = wled->wled_ovp_fault_status (wled, &fault_set);if (rc <0 ) { -dev_err (wled->dev,"Error in reading WLED3_CTRL_INT_RT_STS rc=%d\n", + dev_err(wled->dev,"Error in getting OVP fault_sts, rc=%d\n" , rc); goto failed_detect; } -if (int_sts &WLED3_CTRL_REG_OVP_FAULT_STATUS ) +if (fault_set)dev_dbg (wled->dev,"WLED OVP fault detected with SINK %d\n" , i +1 );else @@ -478,30 +537,30 @@ static void wled_auto_string_detection(struct wled *wled) }/* Enable valid sinks */ -for (i =0 ; i < wled->cfg.num_strings; i++) { -if (wled->cfg.cabc) { - rc =regmap_update_bits (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_CABC (i), -WLED4_SINK_REG_STR_CABC_MASK , -WLED4_SINK_REG_STR_CABC_MASK ); -if (rc <0 ) +if (wled->version ==4 ) { +for (i =0 ; i < wled->cfg.num_strings; i++) { +if (sink_config & +BIT (WLED4_SINK_REG_CURR_SINK_SHFT + i)) + val =WLED4_SINK_REG_STR_MOD_MASK ; +else +/* Disable modulator_en for unused sink */ + val =0x0 ; + + rc =regmap_write (wled->regmap, wled->sink_addr + +WLED4_SINK_REG_STR_MOD_EN (i), val); +if (rc <0 ) { +dev_err (wled->dev,"Failed to configure MODULATOR_EN rc=%d\n" , + rc); goto failed_detect; - } - -if (sink_config &BIT (WLED4_SINK_REG_CURR_SINK_SHFT + i)) - val =WLED4_SINK_REG_STR_MOD_MASK ; -else - val =0x0 ;/* Disable modulator_en for unused sink */ - - rc =regmap_write (wled->regmap, wled->sink_addr + -WLED4_SINK_REG_STR_MOD_EN (i), val); -if (rc <0 ) { -dev_err (wled->dev,"Failed to configure MODULATOR_EN rc=%d\n" , - rc); - goto failed_detect; + } } }
Quoted 4 lines
drivers/video/backlight/qcom-wled.c static void wled_auto_string_detection(struct wled *wled) · line 559
Quoted 1 line
drivers/video/backlight/qcom-wled.c +1
-0+/* Enable CABC if it needs to be enabled */ If it needs to be enabled?
Ok. Actually Enable CABC should be enough. I will remove the latter part in the next post.
Quoted 150 lines
Quoted 150 lines
drivers/video/backlight/qcom-wled.c +4
-0+ rc = wled->wled_cabc_config (wled, true); +if (rc <0 ) + goto failed_detect; +/* Restore the feedback setting */ rc = regmap_write(wled->regmap,drivers/video/backlight/qcom-wled.c +5
-15wled->ctrl_addr + WLED3_CTRL_REG_FEEDBACK_CONTROL, 0);@@ -570,29 +629,19 @@ static bool wled_auto_detection_required(struct wled *wled)static int wled_auto_detection_at_init (struct wled *wled) {int rc; -u32 fault_status, rt_status; +bool fault_set;if (!wled->cfg.auto_detection_enabled)return 0 ; - rc =regmap_read (wled->regmap, - wled->ctrl_addr +WLED3_CTRL_REG_INT_RT_STS , - &rt_status); + rc = wled->wled_ovp_fault_status (wled, &fault_set);if (rc <0 ) { -dev_err (wled->dev,"Failed to read RT status rc=%d\n" , rc); -return rc; - } - - rc =regmap_read (wled->regmap, - wled->ctrl_addr +WLED3_CTRL_REG_FAULT_STATUS , - &fault_status); -if (rc <0 ) { -dev_err (wled->dev,"Failed to read fault status rc=%d\n" , rc); +dev_err (wled->dev,"Error in getting OVP fault_sts, rc=%d\n" , + rc);return rc; } -if ((rt_status &WLED3_CTRL_REG_OVP_FAULT_STATUS ) || - (fault_status &WLED3_CTRL_REG_OVP_FAULT_BIT )) { +if (fault_set) {mutex_lock (&wled->lock);wled_auto_string_detection (wled);drivers/video/backlight/qcom-wled.c +6
-11mutex_unlock (&wled->lock);@@ -811,17 +860,12 @@ static int wled4_setup(struct wled *wled) wled->cfg.string_i_limit);if (rc <0 )return rc; - - addr = wled->sink_addr + -WLED4_SINK_REG_STR_CABC (j); - rc =regmap_update_bits (wled->regmap, addr, -WLED4_SINK_REG_STR_CABC_MASK , - wled->cfg.cabc ? -WLED4_SINK_REG_STR_CABC_MASK :0 ); -if (rc <0 ) -return rc; } + rc =wled4_cabc_config (wled, wled->cfg.en_cabc); +if (rc <0 ) +return rc; + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, WLED3_CTRL_REG_MOD_EN_MASK,@@ -835,7 +879,7 @@ static int wled4_setup(struct wled *wled)if (rc <0 )return rc; - rc =wled_sync_toggle (wled); + rc = wled->wled_sync_toggle (wled);if (rc <0 ) {dev_err (wled->dev,"Failed to toggle sync reg rc:%d\n" , rc);return rc;@@ -951,7 +995,7 @@ static u32 wled_values(const struct wled_var_cfg *cfg, u32 idx)return idx; } -static int wled_configure (struct wled *wled,int version) +static int wled_configure (struct wled *wled) {struct wled_config *cfg = &wled->cfg;drivers/video/backlight/qcom-wled.c +2
-1struct device *dev = wled->dev;@@ -1035,12 +1079,13 @@ static int wled_configure(struct wled *wled, int version)if (rc) wled->name =devm_kasprintf (dev,GFP_KERNEL ,"%pOFn" , dev->of_node); -switch (version) { +switch (wled->version) {case 3 : u32_opts = wled3_opts; size =ARRAY_SIZE (wled3_opts); *cfg = wled3_config_defaults; wled->wled_set_brightness = wled3_set_brightness; + wled->wled_sync_toggle = wled3_sync_toggle; wled->max_string_count =3 ;drivers/video/backlight/qcom-wled.c +4
-0wled->sink_addr = wled->ctrl_addr;break ;@@ -1050,6 +1095,10 @@ static int wled_configure(struct wled *wled, int version) size =ARRAY_SIZE (wled4_opts); *cfg = wled4_config_defaults; wled->wled_set_brightness = wled4_set_brightness; + wled->wled_sync_toggle = wled3_sync_toggle; + wled->wled_cabc_config = wled4_cabc_config; + wled->wled_ovp_fault_status = wled4_ovp_fault_status; + wled->wled_ovp_delay = wled4_ovp_delay; wled->max_string_count =4 ;drivers/video/backlight/qcom-wled.c +4
-5prop_addr =of_get_address (dev->of_node,1 ,NULL ,NULL );@@ -1186,7 +1235,6 @@ static int wled_probe(struct platform_device *pdev)struct backlight_device *bl;struct wled *wled;struct regmap *regmap; -int version;u32 val;int rc;@@ -1203,18 +1251,18 @@ static int wled_probe(struct platform_device *pdev) wled->regmap = regmap; wled->dev = &pdev->dev; - version = (uintptr_t )of_device_get_match_data (&pdev->dev); -if (!version) { + wled->version = (uintptr_t )of_device_get_match_data (&pdev->dev); +if (!wled->version) {dev_err (&pdev->dev,"Unknown device version\n" );return -ENODEV ; }mutex_init (&wled->lock); - rc =wled_configure (wled, version); + rc =wled_configure (wled);if (rc)return rc; -switch (version) { +switch (wled->version) {case 3 : wled->cfg.auto_detection_enabled = false;rc =
wled3_setup(wled);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
PATCH v4 3/4 backlight: qcom-wled: Add WLED5 bindings
In reply to Kiran GundaAdd WLED5 specific bindings.
--- .../bindings/leds/backlight/qcom-wled.yaml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+)
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +39 -0
@@ -20,6 +20,7 @@ properties: - qcom,pm8941-wled - qcom,pmi8998-wled - qcom,pm660l-wled + - qcom,pm8150l-wled reg: maxItems: 1
@@ -28,10 +29,23 @@ properties: maxItems: 1 description: brightness value on boot, value from 0-4095. + For pm8150l this value vary from 0-4095 or 0-32767 + depending on the brightness control mode. If CABC is + enabled 0-4095 range is used. allOf: - $ref: /schemas/types.yaml#/definitions/uint32 default: 2048 + max-brightness: + maxItems: 1 + description: + Maximum brightness level. Allowed values are, + for pmi8998 it is 0-4095. + For pm8150l, this can be either 4095 or 32767. + If CABC is enabled, this is capped to 4095. + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + label: maxItems: 1 description:
@@ -124,6 +138,31 @@ properties: value for PM8941 from 1 to 3. Default 2 For PMI8998 from 1 to 4. + qcom,modulator-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the modulator used for brightness modulation. + Allowed values are, + 0 - Modulator A + 1 - Modulator B + If not specified, then modulator A will be used by default. + This property is applicable only to WLED5 peripheral. + + qcom,cabc-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the CABC pin signal used for brightness modulation. + Allowed values are, + 0 - CABC disabled + 1 - CABC 1 + 2 - CABC 2 + 3 - External signal (e.g. LPG) is used for dimming + This property is applicable only to WLED5 peripheral. + interrupts: maxItems: 2 description:
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH V4 3/4] backlight: qcom-wled: Add WLED5 bindings
Quoted 21 lines · Kiran Gunda
Add WLED5 specific bindings.
Signed-off-by Kiran Gunda <[email protected]>Signed-off-by Subbaraman Narayanamurthy <[email protected]>--- .../bindings/leds/backlight/qcom-wled.yaml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+)Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +1
-0@@ -20,6 +20,7 @@ properties: - qcom,pm8941-wled - qcom,pmi8998-wled - qcom,pm660l-wled + - qcom,pm8150l-wled reg: maxItems: 1
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 34
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +3
-0@@ -28,10 +29,23 @@ properties: maxItems: 1 description: brightness value on boot, value from 0-4095. + For pm8150l this value vary from 0-4095 or 0-32767 + depending on the brightness control mode. If CABC is + enabled 0-4095 range is used.
I rather dislike some of the property descriptions using PMIC version numbers to distinguish between peripheral versions and others using WLEDx version numbers.
Could the property description be rephrased to use WLED3/4/5 terminology instead?
Quoted 4 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +0
-0allOf: - $ref: /schemas/types.yaml#/definitions/uint32 default: 2048
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 48
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +10
-0+ max-brightness: + maxItems: 1 + description: + Maximum brightness level. Allowed values are, + for pmi8998 it is 0-4095. + For pm8150l, this can be either 4095 or 32767. + If CABC is enabled, this is capped to 4095. + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 +
Similar thing here, is PMI8998 simply a synonym for WLED4 or there something special about the PMIC versioning that requires it to be used?
Daniel.
Quoted 38 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +25
-0label: maxItems: 1 description:@@ -124,6 +138,31 @@ properties: value for PM8941 from 1 to 3. Default 2 For PMI8998 from 1 to 4. + qcom,modulator-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the modulator used for brightness modulation. + Allowed values are, + 0 - Modulator A + 1 - Modulator B + If not specified, then modulator A will be used by default. + This property is applicable only to WLED5 peripheral. + + qcom,cabc-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the CABC pin signal used for brightness modulation. + Allowed values are, + 0 - CABC disabled + 1 - CABC 1 + 2 - CABC 2 + 3 - External signal (e.g. LPG) is used for dimming + This property is applicable only to WLED5 peripheral. + interrupts: maxItems: 2 description:Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH V4 3/4] backlight: qcom-wled: Add WLED5 bindings
Quoted 34 lines · Daniel Thompson
Quoted 22 lines · Kiran Gunda
Add WLED5 specific bindings.
Signed-off-by Kiran Gunda <[email protected]>Signed-off-by Subbaraman Narayanamurthy <[email protected]>--- .../bindings/leds/backlight/qcom-wled.yaml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+)Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +1
-0@@ -20,6 +20,7 @@ properties: - qcom,pm8941-wled - qcom,pmi8998-wled - qcom,pm660l-wled + - qcom,pm8150l-wled reg: maxItems: 1Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 34
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +3
-0@@ -28,10 +29,23 @@ properties: maxItems: 1 description: brightness value on boot, value from 0-4095. + For pm8150l this value vary from 0-4095 or 0-32767 + depending on the brightness control mode. If CABC is + enabled 0-4095 range is used.I rather dislike some of the property descriptions using PMIC version numbers to distinguish between peripheral versions and others using WLEDx version numbers.
Quoted 3 lines
Could the property description be rephrased to use WLED3/4/5 terminology instead?
Sure. I will modify in the next post.
Quoted 16 lines
Quoted 5 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +0
-0allOf: - $ref: /schemas/types.yaml#/definitions/uint32 default: 2048Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 48
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +10
-0+ max-brightness: + maxItems: 1 + description: + Maximum brightness level. Allowed values are, + for pmi8998 it is 0-4095. + For pm8150l, this can be either 4095 or 32767. + If CABC is enabled, this is capped to 4095. + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 +
Quoted 6 lines
Similar thing here, is PMI8998 simply a synonym for WLED4 or there something special about the PMIC versioning that requires it to be used?
Daniel.
Sure. It is synonym for WLED4. I will modify in the next post.
Quoted 39 lines
Quoted 39 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +25
-1label: maxItems: 1 description:@@ -124,6 +138,31 @@ properties: value for PM8941 from 1 to 3. Default 2 For PMI8998 from 1 to 4. + qcom,modulator-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the modulator used for brightness modulation. + Allowed values are, + 0 - Modulator A + 1 - Modulator B + If not specified, then modulator A will be used by default. + This property is applicable only to WLED5 peripheral. + + qcom,cabc-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the CABC pin signal used for brightness modulation. + Allowed values are, + 0 - CABC disabled + 1 - CABC 1 + 2 - CABC 2 + 3 - External signal (e.g. LPG) is used for dimming + This property is applicable only to WLED5 peripheral. + interrupts: maxItems: 2 description: --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Rob Herring
maintainerRe: [PATCH V4 3/4] backlight: qcom-wled: Add WLED5 bindings
In reply to Kiran GundaQuoted 2 lines · Kiran Gunda
Add WLED5 specific bindings.
More of the same comments here...
Quoted 19 lines
Signed-off-by Kiran Gunda <[email protected]>Signed-off-by Subbaraman Narayanamurthy <[email protected]>--- .../bindings/leds/backlight/qcom-wled.yaml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+)Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +1
-0@@ -20,6 +20,7 @@ properties: - qcom,pm8941-wled - qcom,pmi8998-wled - qcom,pm660l-wled + - qcom,pm8150l-wled reg: maxItems: 1
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 34
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +3
-0@@ -28,10 +29,23 @@ properties: maxItems: 1 description: brightness value on boot, value from 0-4095. + For pm8150l this value vary from 0-4095 or 0-32767 + depending on the brightness control mode. If CABC is + enabled 0-4095 range is used.
Constraints.
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 44
Quoted 10 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +6
-0allOf: - $ref: /schemas/types.yaml#/definitions/uint32 default: 2048 + max-brightness: + maxItems: 1 + description: + Maximum brightness level. Allowed values are, + for pmi8998 it is 0-4095. + For pm8150l, this can be either 4095 or 32767.
Constraints!
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 47
Quoted 3 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +3
-0+ If CABC is enabled, this is capped to 4095. + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32
Standard property. Assume it has a type definition.'
Quoted 40 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +26
-0+ label: maxItems: 1 description:@@ -124,6 +138,31 @@ properties: value for PM8941 from 1 to 3. Default 2 For PMI8998 from 1 to 4. + qcom,modulator-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the modulator used for brightness modulation. + Allowed values are, + 0 - Modulator A + 1 - Modulator B + If not specified, then modulator A will be used by default. + This property is applicable only to WLED5 peripheral. + + qcom,cabc-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the CABC pin signal used for brightness modulation. + Allowed values are, + 0 - CABC disabled + 1 - CABC 1 + 2 - CABC 2 + 3 - External signal (e.g. LPG) is used for dimming + This property is applicable only to WLED5 peripheral. + interrupts: maxItems: 2 description:Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V4 3/4] backlight: qcom-wled: Add WLED5 bindings
Quoted 23 lines · Rob Herring
Quoted 2 lines · Kiran Gunda
Add WLED5 specific bindings.
More of the same comments here...
Quoted 17 lines
Signed-off-by Kiran Gunda <[email protected]>Signed-off-by Subbaraman Narayanamurthy <[email protected]>--- .../bindings/leds/backlight/qcom-wled.yaml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+)Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +1
-0@@ -20,6 +20,7 @@ properties: - qcom,pm8941-wled - qcom,pmi8998-wled - qcom,pm660l-wled + - qcom,pm8150l-wled
Quoted 12 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 34
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +3
-0reg: maxItems: 1@@ -28,10 +29,23 @@ properties: maxItems: 1 description: brightness value on boot, value from 0-4095. + For pm8150l this value vary from 0-4095 or 0-32767 + depending on the brightness control mode. If CABC is + enabled 0-4095 range is used.Constraints.
Will address it in next post.
Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +0
-0allOf: - $ref: /schemas/types.yaml#/definitions/uint32 default: 2048
Quoted 9 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 44
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +6
-0+ max-brightness: + maxItems: 1 + description: + Maximum brightness level. Allowed values are, + for pmi8998 it is 0-4095. + For pm8150l, this can be either 4095 or 32767.Constraints!
Will address it in next post.
Quoted 6 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml properties: · line 47
Quoted 3 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +3
-0+ If CABC is enabled, this is capped to 4095. + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32Standard property. Assume it has a type definition.'
Will address it in next post.
Quoted 40 lines
Quoted 40 lines
Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +26
-1+ label: maxItems: 1 description:@@ -124,6 +138,31 @@ properties: value for PM8941 from 1 to 3. Default 2 For PMI8998 from 1 to 4. + qcom,modulator-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the modulator used for brightness modulation. + Allowed values are, + 0 - Modulator A + 1 - Modulator B + If not specified, then modulator A will be used by default. + This property is applicable only to WLED5 peripheral. + + qcom,cabc-sel: + maxItems: 1 + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + description: + Selects the CABC pin signal used for brightness modulation. + Allowed values are, + 0 - CABC disabled + 1 - CABC 1 + 2 - CABC 2 + 3 - External signal (e.g. LPG) is used for dimming + This property is applicable only to WLED5 peripheral. + interrupts: maxItems: 2 description: --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
PATCH v4 4/4 backlight: qcom-wled: Add support for WLED5 peripheral in PM8150L
In reply to Kiran GundaFrom: Subbaraman Narayanamurthy <[email protected]>
Add support for WLED5 peripheral that is present on PM8150L PMICs.
PM8150L WLED supports the following:
- Two modulators and each sink can use any of the modulator
- Multiple CABC selection options from which one can be selected/enabled
- Multiple brightness width selection (12 bits to 15 bits)
--- drivers/video/backlight/qcom-wled.c | 427 +++++++++++++++++++++++++++++++++++- 1 file changed, 424 insertions(+), 3 deletions(-)
drivers/video/backlight/qcom-wled.c +424 -3
@@ -19,12 +19,15 @@#define WLED_DEFAULT_BRIGHTNESS 2048#define WLED_SOFT_START_DLY_US 10000#define WLED3_SINK_REG_BRIGHT_MAX 0xFFF +#define WLED5_SINK_REG_BRIGHT_MAX_12B 0xFFF +#define WLED5_SINK_REG_BRIGHT_MAX_15B 0x7FFF/* WLED3/WLED4 control registers */ #define WLED3_CTRL_REG_FAULT_STATUS 0x08#define WLED3_CTRL_REG_ILIM_FAULT_BIT BIT(0)#define WLED3_CTRL_REG_OVP_FAULT_BIT BIT(1)#define WLED4_CTRL_REG_SC_FAULT_BIT BIT(2) +#define WLED5_CTRL_REG_OVP_PRE_ALARM_BIT BIT(4)#define WLED3_CTRL_REG_INT_RT_STS 0x10#define WLED3_CTRL_REG_OVP_FAULT_STATUS BIT(1)
@@ -40,6 +43,7 @@#define WLED3_CTRL_REG_OVP 0x4d#define WLED3_CTRL_REG_OVP_MASK GENMASK(1, 0) +#define WLED5_CTRL_REG_OVP_MASK GENMASK(3, 0)#define WLED3_CTRL_REG_ILIMIT 0x4e#define WLED3_CTRL_REG_ILIMIT_MASK GENMASK(2, 0)
@@ -101,6 +105,44 @@#define WLED4_SINK_REG_BRIGHT (n) (0x57 + (n * 0x10)) +/* WLED5 specific control registers */ +#define WLED5_CTRL_REG_OVP_INT_CTL 0x5f +#define WLED5_CTRL_REG_OVP_INT_TIMER_MASK GENMASK(2, 0) + +/* WLED5 specific sink registers */ +#define WLED5_SINK_REG_MOD_A_EN 0x50 +#define WLED5_SINK_REG_MOD_B_EN 0x60 +#define WLED5_SINK_REG_MOD_EN_MASK BIT(7) + +#define WLED5_SINK_REG_MOD_A_SRC_SEL 0x51 +#define WLED5_SINK_REG_MOD_B_SRC_SEL 0x61 +#define WLED5_SINK_REG_MOD_SRC_SEL_HIGH 0 +#define WLED5_SINK_REG_MOD_SRC_SEL_EXT 0x03 +#define WLED5_SINK_REG_MOD_SRC_SEL_MASK GENMASK(1, 0) + +#define WLED5_SINK_REG_MOD_A_BRIGHTNESS_WIDTH_SEL 0x52 +#define WLED5_SINK_REG_MOD_B_BRIGHTNESS_WIDTH_SEL 0x62 +#define WLED5_SINK_REG_BRIGHTNESS_WIDTH_12B 0 +#define WLED5_SINK_REG_BRIGHTNESS_WIDTH_15B 1 + +#define WLED5_SINK_REG_MOD_A_BRIGHTNESS_LSB 0x53 +#define WLED5_SINK_REG_MOD_A_BRIGHTNESS_MSB 0x54 +#define WLED5_SINK_REG_MOD_B_BRIGHTNESS_LSB 0x63 +#define WLED5_SINK_REG_MOD_B_BRIGHTNESS_MSB 0x64 + +#define WLED5_SINK_REG_MOD_SYNC_BIT 0x65 +#define WLED5_SINK_REG_SYNC_MOD_A_BIT BIT(0) +#define WLED5_SINK_REG_SYNC_MOD_B_BIT BIT(1) +#define WLED5_SINK_REG_SYNC_MASK GENMASK(1, 0) + +/* WLED5 specific per-'string' registers below */ +#define WLED5_SINK_REG_STR_FULL_SCALE_CURR (n) (0x72 + (n * 0x10)) + +#define WLED5_SINK_REG_STR_SRC_SEL (n) (0x73 + (n * 0x10)) +#define WLED5_SINK_REG_SRC_SEL_MOD_A 0 +#define WLED5_SINK_REG_SRC_SEL_MOD_B 1 +#define WLED5_SINK_REG_SRC_SEL_MASK GENMASK(1, 0) +struct wled_var_cfg {const u32 *values;u32 (*fn)(u32 );
@@ -125,6 +167,8 @@ struct wled_config {u32 num_strings;u32 string_i_limit;u32 enabled_strings[WLED_MAX_STRINGS ]; +u32 mod_sel; +u32 cabc_sel;bool cs_out_en;bool ext_gen;bool cabc;
@@ -150,6 +194,7 @@ struct wled {u32 version;bool disabled_by_short;bool has_short_detect; +bool cabc_disabled;int short_irq;int ovp_irq;
@@ -162,6 +207,27 @@ struct wled {int (*wled_ovp_delay)(struct wled *wled); }; +enum wled5_mod_sel { +MOD_A , +MOD_B , +MOD_MAX , +}; + +static const u8 wled5_brightness_reg[MOD_MAX ] = { + [MOD_A ] =WLED5_SINK_REG_MOD_A_BRIGHTNESS_LSB , + [MOD_B ] =WLED5_SINK_REG_MOD_B_BRIGHTNESS_LSB , +}; + +static const u8 wled5_src_sel_reg[MOD_MAX ] = { + [MOD_A ] =WLED5_SINK_REG_MOD_A_SRC_SEL , + [MOD_B ] =WLED5_SINK_REG_MOD_B_SRC_SEL , +}; + +static const u8 wled5_brt_wid_sel_reg[MOD_MAX ] = { + [MOD_A ] =WLED5_SINK_REG_MOD_A_BRIGHTNESS_WIDTH_SEL , + [MOD_B ] =WLED5_SINK_REG_MOD_B_BRIGHTNESS_WIDTH_SEL , +}; +static int wled3_set_brightness (struct wled *wled,u16 brightness) {int rc, i;
@@ -203,6 +269,25 @@ static int wled4_set_brightness(struct wled *wled, u16 brightness)return 0 ; } +static int wled5_set_brightness (struct wled *wled,u16 brightness) +{ +int rc, offset; +u16 low_limit = wled->max_brightness *1 /1000 ; +u8 v[2 ]; + +/* WLED5's lower limit is 0.1% */ +if (brightness < low_limit) + brightness = low_limit; + + v[0 ] = brightness &0xff ; + v[1 ] = (brightness >>8 ) &0x7f ; + + offset = wled5_brightness_reg[wled->cfg.mod_sel]; + rc =regmap_bulk_write (wled->regmap, wled->sink_addr + offset, + v,2 ); +return rc; +} +static void wled_ovp_work (struct work_struct *work) { struct wled *wled = container_of(work,
@@ -260,6 +345,24 @@ static int wled3_sync_toggle(struct wled *wled)return rc; } +static int wled5_sync_toggle (struct wled *wled) +{ +int rc; +u8 val; + + val = (wled->cfg.mod_sel ==MOD_A ) ?WLED5_SINK_REG_SYNC_MOD_A_BIT : +WLED5_SINK_REG_SYNC_MOD_B_BIT ; + rc =regmap_update_bits (wled->regmap, + wled->sink_addr +WLED5_SINK_REG_MOD_SYNC_BIT , +WLED5_SINK_REG_SYNC_MASK , val); +if (rc <0 ) +return rc; + +return regmap_update_bits (wled->regmap, + wled->sink_addr +WLED5_SINK_REG_MOD_SYNC_BIT , +WLED5_SINK_REG_SYNC_MASK ,0 ); +} +static int wled4_ovp_fault_status (struct wled *wled,bool *fault_set) {int rc;
@@ -295,11 +398,67 @@ static int wled4_ovp_fault_status(struct wled *wled, bool *fault_set)return rc; } +static int wled5_ovp_fault_status (struct wled *wled,bool *fault_set) +{ +int rc; +u32 int_rt_sts, fault_sts; + + *fault_set = false; + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_INT_RT_STS , + &int_rt_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read INT_RT_STS rc=%d\n" , rc); +return rc; + } + + rc =regmap_read (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_FAULT_STATUS , + &fault_sts); +if (rc <0 ) { +dev_err (wled->dev,"Failed to read FAULT_STATUS rc=%d\n" , rc); +return rc; + } + +if (int_rt_sts &WLED3_CTRL_REG_OVP_FAULT_STATUS ) + *fault_set = true; + +if (fault_sts & (WLED3_CTRL_REG_OVP_FAULT_BIT | +WLED5_CTRL_REG_OVP_PRE_ALARM_BIT )) + *fault_set = true; + +if (*fault_set) +dev_dbg (wled->dev,"WLED OVP fault detected, int_rt_sts=0x%x fault_sts=0x%x\n" , + int_rt_sts, fault_sts); + +return rc; +} +static int wled4_ovp_delay (struct wled *wled) {return WLED_SOFT_START_DLY_US ; } +static int wled5_ovp_delay (struct wled *wled) +{ +int rc, delay_us; +u32 val; +u8 ovp_timer_ms[8 ] = {1 ,2 ,4 ,8 ,12 ,16 ,20 ,24 }; + +/* For WLED5, get the delay based on OVP timer */ + rc =regmap_read (wled->regmap, wled->ctrl_addr + +WLED5_CTRL_REG_OVP_INT_CTL , &val); +if (rc <0 ) + delay_us = + ovp_timer_ms[val &WLED5_CTRL_REG_OVP_INT_TIMER_MASK ] *1000 ; +else + delay_us =2 *WLED_SOFT_START_DLY_US ; + +dev_dbg (wled->dev,"delay_time_us: %d\n" , delay_us); + +return delay_us; +} +static int wled_update_status (struct backlight_device *bl) {struct wled *wled =bl_get_data (bl);
@@ -362,6 +521,29 @@ static int wled4_cabc_config(struct wled *wled, bool enable)return 0 ; } +static int wled5_cabc_config (struct wled *wled,bool enable) +{ +int rc, offset; +u8 reg; + +if (wled->cabc_disabled) +return 0 ; + + reg = enable ? wled->cfg.cabc_sel :0 ; + offset = wled5_src_sel_reg[wled->cfg.mod_sel]; + rc =regmap_update_bits (wled->regmap, wled->sink_addr + offset, +WLED5_SINK_REG_MOD_SRC_SEL_MASK , reg); +if (rc <0 ) { +pr_err ("Error in configuring CABC rc=%d\n" , rc); +return rc; + } + +if (!wled->cfg.cabc_sel) + wled->cabc_disabled = true; + +return 0 ; +} +#define WLED_SHORT_DLY_MS 20#define WLED_SHORT_CNT_MAX 5#define WLED_SHORT_RESET_CNT_DLY_US USEC_PER_SEC
@@ -608,7 +790,30 @@ static bool wled_auto_detection_required(struct wled *wled)if (!wled->auto_detection_ovp_count) { wled->start_ovp_fault_time =ktime_get (); wled->auto_detection_ovp_count++; - }else { +return false; + } + +if (wled->version ==5 ) { +/* +* WLED5 has OVP fault density interrupt configuration i.e. to +* count the number of OVP alarms for a certain duration before +* triggering OVP fault interrupt. By default, number of OVP +* fault events counted before an interrupt is fired is 32 and +* the time interval is 12 ms. If we see more than one OVP fault +* interrupt, then that should qualify for a real OVP fault +* condition to run auto calibration algorithm. +*/ + +if (wled->auto_detection_ovp_count >1 ) { + elapsed_time_us =ktime_us_delta (ktime_get (), + wled->start_ovp_fault_time); + wled->auto_detection_ovp_count =0 ; +dev_dbg (wled->dev,"Elapsed time: %lld us\n" , + elapsed_time_us); +return true; + } + wled->auto_detection_ovp_count++; + }else if (wled->version ==4 ) { elapsed_time_us =ktime_us_delta (ktime_get (), wled->start_ovp_fault_time);if (elapsed_time_us >WLED_AUTO_DETECT_CNT_DLY_US )
@@ -862,7 +1067,7 @@ static int wled4_setup(struct wled *wled)return rc; } - rc =wled4_cabc_config (wled, wled->cfg.en_cabc); + rc =wled4_cabc_config (wled, wled->cfg.cabc);if (rc <0 )return rc;
@@ -901,6 +1106,115 @@ static const struct wled_config wled4_config_defaults = { .auto_detection_enabled = false, }; +static int wled5_setup (struct wled *wled) +{ +int rc, temp, i, j; +u8 sink_en =0 ; +u16 addr; +u32 val; + + rc =regmap_update_bits (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_OVP , +WLED5_CTRL_REG_OVP_MASK , wled->cfg.ovp); +if (rc <0 ) +return rc; + + rc =regmap_update_bits (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_ILIMIT , +WLED3_CTRL_REG_ILIMIT_MASK , + wled->cfg.boost_i_limit); +if (rc <0 ) +return rc; + + rc =regmap_update_bits (wled->regmap, + wled->ctrl_addr +WLED3_CTRL_REG_FREQ , +WLED3_CTRL_REG_FREQ_MASK , + wled->cfg.switch_freq); +if (rc <0 ) +return rc; + +/* Per sink/string configuration */ +for (i =0 ; i < wled->cfg.num_strings; ++i) { + j = wled->cfg.enabled_strings[i]; + addr = wled->sink_addr + +WLED4_SINK_REG_STR_FULL_SCALE_CURR (j); + rc =regmap_update_bits (wled->regmap, addr, +WLED4_SINK_REG_STR_FULL_SCALE_CURR_MASK , + wled->cfg.string_i_limit); +if (rc <0 ) +return rc; + + addr = wled->sink_addr +WLED5_SINK_REG_STR_SRC_SEL (j); + rc =regmap_update_bits (wled->regmap, addr, +WLED5_SINK_REG_SRC_SEL_MASK , + wled->cfg.mod_sel ==MOD_A ? +WLED5_SINK_REG_SRC_SEL_MOD_A : +WLED5_SINK_REG_SRC_SEL_MOD_B ); + + temp = j +WLED4_SINK_REG_CURR_SINK_SHFT ; + sink_en |=1 << temp; + } + + rc =wled5_cabc_config (wled, wled->cfg.cabc_sel ? true : false); +if (rc <0 ) +return rc; + +/* Enable one of the modulators A or B based on mod_sel */ + addr = wled->sink_addr +WLED5_SINK_REG_MOD_A_EN ; + val = (wled->cfg.mod_sel ==MOD_A ) ?WLED5_SINK_REG_MOD_EN_MASK :0 ; + rc =regmap_update_bits (wled->regmap, addr, +WLED5_SINK_REG_MOD_EN_MASK , val); +if (rc <0 ) +return rc; + + addr = wled->sink_addr +WLED5_SINK_REG_MOD_B_EN ; + val = (wled->cfg.mod_sel ==MOD_B ) ?WLED5_SINK_REG_MOD_EN_MASK :0 ; + rc =regmap_update_bits (wled->regmap, addr, +WLED5_SINK_REG_MOD_EN_MASK , val); +if (rc <0 ) +return rc; + + addr = wled->sink_addr + wled5_brt_wid_sel_reg[wled->cfg.mod_sel]; + val = (wled->max_brightness ==WLED5_SINK_REG_BRIGHT_MAX_15B ) ? +WLED5_SINK_REG_BRIGHTNESS_WIDTH_15B : +WLED5_SINK_REG_BRIGHTNESS_WIDTH_12B ; + rc =regmap_write (wled->regmap, addr, val); +if (rc <0 ) +return rc; + + rc =regmap_update_bits (wled->regmap, + wled->sink_addr +WLED4_SINK_REG_CURR_SINK , +WLED4_SINK_REG_CURR_SINK_MASK , sink_en); +if (rc <0 ) +return rc; + +/* This updates only FSC configuration in WLED5 */ + rc = wled->wled_sync_toggle (wled); +if (rc <0 ) { +pr_err ("Failed to toggle sync reg rc:%d\n" , rc); +return rc; + } + + rc =wled_auto_detection_at_init (wled); +if (rc <0 ) +return rc; + +return 0 ; +} + +static const struct wled_config wled5_config_defaults = { + .boost_i_limit =5 , + .string_i_limit =10 , + .ovp =4 , + .num_strings =4 , + .switch_freq =11 , + .mod_sel =0 , + .cabc_sel =0 , + .cabc = false, + .external_pfet = false, + .auto_detection_enabled = false, +}; +static const u32 wled3_boost_i_limit_values[] = {105 ,385 ,525 ,805 ,980 ,1260 ,1400 ,1680 , };
@@ -919,6 +1233,16 @@ static const struct wled_var_cfg wled4_boost_i_limit_cfg = { .size = ARRAY_SIZE(wled4_boost_i_limit_values), }; +static inline u32 wled5_boost_i_limit_values_fn (u32 idx) +{ +return 525 + (idx *175 ); +} + +static const struct wled_var_cfg wled5_boost_i_limit_cfg = { + .fn = wled5_boost_i_limit_values_fn, + .size =8 , +}; +static const u32 wled3_ovp_values[] = {35 ,32 ,29 ,27 , };
@@ -937,6 +1261,21 @@ static const struct wled_var_cfg wled4_ovp_cfg = { .size = ARRAY_SIZE(wled4_ovp_values), }; +static inline u32 wled5_ovp_values_fn (u32 idx) +{ +/* +* 0000 - 38.5 V +* 0001 - 37 V .. +* 1111 - 16 V +*/ +return 38500 - (idx *1500 ); +} + +static const struct wled_var_cfg wled5_ovp_cfg = { + .fn = wled5_ovp_values_fn, + .size =16 , +}; +static u32 wled3_num_strings_values_fn (u32 idx) {return idx +1 ;
@@ -984,6 +1323,14 @@ static const struct wled_var_cfg wled4_string_cfg = { .size = 16, }; +static const struct wled_var_cfg wled5_mod_sel_cfg = { + .size =2 , +}; + +static const struct wled_var_cfg wled5_cabc_sel_cfg = { + .size =4 , +}; +static u32 wled_values (const struct wled_var_cfg *cfg,u32 idx) {if (idx >= cfg->size)
@@ -1060,6 +1407,44 @@ static int wled_configure(struct wled *wled) }, }; +const struct wled_u32_opts wled5_opts[] = { + { + .name ="qcom,current-boost-limit" , + .val_ptr = &cfg->boost_i_limit, + .cfg = &wled5_boost_i_limit_cfg, + }, + { + .name ="qcom,current-limit-microamp" , + .val_ptr = &cfg->string_i_limit, + .cfg = &wled4_string_i_limit_cfg, + }, + { + .name ="qcom,ovp-millivolt" , + .val_ptr = &cfg->ovp, + .cfg = &wled5_ovp_cfg, + }, + { + .name ="qcom,switching-freq" , + .val_ptr = &cfg->switch_freq, + .cfg = &wled3_switch_freq_cfg, + }, + { + .name ="qcom,num-strings" , + .val_ptr = &cfg->num_strings, + .cfg = &wled4_num_strings_cfg, + }, + { + .name ="qcom,modulator-sel" , + .val_ptr = &cfg->mod_sel, + .cfg = &wled5_mod_sel_cfg, + }, + { + .name ="qcom,cabc-sel" , + .val_ptr = &cfg->cabc_sel, + .cfg = &wled5_cabc_sel_cfg, + }, + }; +const struct wled_bool_opts bool_opts[] = { {"qcom,cs-out" , &cfg->cs_out_en, }, {"qcom,ext-gen" , &cfg->ext_gen, },
@@ -1109,6 +1494,25 @@ static int wled_configure(struct wled *wled) wled->sink_addr =be32_to_cpu (*prop_addr);break ; +case 5 : + u32_opts = wled5_opts; + size =ARRAY_SIZE (wled5_opts); + *cfg = wled5_config_defaults; + wled->wled_set_brightness = wled5_set_brightness; + wled->wled_sync_toggle = wled5_sync_toggle; + wled->wled_cabc_config = wled5_cabc_config; + wled->wled_ovp_fault_status = wled5_ovp_fault_status; + wled->wled_ovp_delay = wled5_ovp_delay; + wled->max_string_count =4 ; + + prop_addr =of_get_address (dev->of_node,1 ,NULL ,NULL ); +if (!prop_addr) { +dev_err (wled->dev,"invalid IO resources\n" ); +return -EINVAL ; + } + wled->sink_addr =be32_to_cpu (*prop_addr); +break ; +default :dev_err (wled->dev,"Invalid WLED version\n" );return -EINVAL ;
@@ -1262,6 +1666,10 @@ static int wled_probe(struct platform_device *pdev)if (rc)return rc; + val =WLED3_SINK_REG_BRIGHT_MAX ; +of_property_read_u32 (pdev->dev.of_node,"max-brightness" , &val); + wled->max_brightness = val; +switch (wled->version) {case 3 : wled->cfg.auto_detection_enabled = false;
@@ -1281,6 +1689,18 @@ static int wled_probe(struct platform_device *pdev) }break ; +case 5 : + wled->has_short_detect = true; +if (wled->cfg.cabc_sel) + wled->max_brightness =WLED5_SINK_REG_BRIGHT_MAX_12B ; + + rc =wled5_setup (wled); +if (rc) { +dev_err (&pdev->dev,"wled5_setup failed\n" ); +return rc; + } +break ; +default :dev_err (wled->dev,"Invalid WLED version\n" );break ;
@@ -1302,7 +1722,7 @@ static int wled_probe(struct platform_device *pdev)memset (&props,0 ,sizeof (struct backlight_properties )); props.type =BACKLIGHT_RAW ; props.brightness = val; - props.max_brightness =WLED3_SINK_REG_BRIGHT_MAX ; + props.max_brightness = wled->max_brightness; bl =devm_backlight_device_register (&pdev->dev, wled->name, &pdev->dev, wled, &wled_ops, &props);
@@ -1325,6 +1745,7 @@ static const struct of_device_id wled_match_table[] = { { .compatible = "qcom,pm8941-wled", .data = (void *)3 }, { .compatible = "qcom,pmi8998-wled", .data = (void *)4 }, { .compatible = "qcom,pm660l-wled", .data = (void *)4 }, + { .compatible = "qcom,pm8150l-wled", .data = (void *)5 }, {} };MODULE_DEVICE_TABLE (of, wled_match_table);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project