Convert the Qualcomm QPNP PMIC Temperature Alarm to DT Schema.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../thermal/qcom,spmi-temp-alarm.yaml | 85 +++++++++++++++++++
.../bindings/thermal/qcom-spmi-temp-alarm.txt | 51 -----------
2 files changed, 85 insertions(+), 51 deletions(-)
create mode 100644 Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
diff --git a/Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml b/Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
new file mode 100644
index 000000000000..5f08b6e59b8a
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
@@ -0,0 +1,85 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/qcom,spmi-temp-alarm.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm QPNP PMIC Temperature Alarm
+
+maintainers:
+ - Bjorn Andersson <[email protected]>
+
+description:
+ QPNP temperature alarm peripherals are found inside of Qualcomm PMIC chips
+ that utilize the Qualcomm SPMI implementation. These peripherals provide an
+ interrupt signal and status register to identify high PMIC die temperature.
+
+allOf:
+ - $ref: thermal-sensor.yaml#
+
+properties:
+ compatible:
+ const: qcom,spmi-temp-alarm
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ io-channels:
+ items:
+ - description: ADC channel, which reports chip die temperature
+
+ io-channel-names:
+ items:
+ - const: thermal
+
+ '#thermal-sensor-cells':
+ const: 0
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - '#thermal-sensor-cells'
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ pmic {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm8350_temp_alarm: temperature-sensor@a00 {
+ compatible = "qcom,spmi-temp-alarm";
+ reg = <0xa00>;
+ interrupts = <0x1 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
+ #thermal-sensor-cells = <0>;
+ };
+ };
+
+ thermal-zones {
+ pm8350_thermal: pm8350c-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
+ thermal-sensors = <&pm8350_temp_alarm>;
+
+ trips {
+ pm8350_trip0: trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
+
+ pm8350_crit: pm8350c-crit {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "critical";
+ };
+ };
+ };
+ };
diff --git a/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt b/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
deleted file mode 100644
index 2d5b2ad03314..000000000000
--- a/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Qualcomm QPNP PMIC Temperature Alarm
-
-QPNP temperature alarm peripherals are found inside of Qualcomm PMIC chips
-that utilize the Qualcomm SPMI implementation. These peripherals provide an
-interrupt signal and status register to identify high PMIC die temperature.
-
-Required properties:
-- compatible: Should contain "qcom,spmi-temp-alarm".
-- reg: Specifies the SPMI address.
-- interrupts: PMIC temperature alarm interrupt.
-- #thermal-sensor-cells: Should be 0. See Documentation/devicetree/bindings/thermal/thermal-sensor.yaml for a description.
-
-Optional properties:
-- io-channels: Should contain IIO channel specifier for the ADC channel,
- which report chip die temperature.
-- io-channel-names: Should contain "thermal".
-
-Example:
-
- pm8941_temp: thermal-alarm@2400 {
- compatible = "qcom,spmi-temp-alarm";
- reg = <0x2400>;
- interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
- #thermal-sensor-cells = <0>;
-
- io-channels = <&pm8941_vadc VADC_DIE_TEMP>;
- io-channel-names = "thermal";
- };
-
- thermal-zones {
- pm8941 {
- polling-delay-passive = <250>;
- polling-delay = <1000>;
-
- thermal-sensors = <&pm8941_temp>;
-
- trips {
- stage1 {
- temperature = <105000>;
- hysteresis = <2000>;
- type = "passive";
- };
- stage2 {
- temperature = <125000>;
- hysteresis = <2000>;
- type = "critical";
- };
- };
- };
- };
-
--
2.34.1
The PM8841 temperature sensor has to define thermal-sensor-cells.
Fixes: dab8134ca072 ("ARM: dts: qcom: Add PM8841 functions device nodes")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/qcom-pm8841.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom-pm8841.dtsi
index 2caf71eacb52..b5cdde034d18 100644
--- a/arch/arm/boot/dts/qcom-pm8841.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8841.dtsi
@@ -24,6 +24,7 @@ temp-alarm@2400 {
compatible = "qcom,spmi-temp-alarm";
reg = <0x2400>;
interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>;
+ #thermal-sensor-cells = <0>;
};
};
--
2.34.1
On 08/06/2022 15:45, Rob Herring wrote:
> On Wed, 08 Jun 2022 13:27:01 +0200, Krzysztof Kozlowski wrote:
>> Convert the Qualcomm QPNP PMIC Temperature Alarm to DT Schema.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>> ---
>> .../thermal/qcom,spmi-temp-alarm.yaml | 85 +++++++++++++++++++
>> .../bindings/thermal/qcom-spmi-temp-alarm.txt | 51 -----------
>> 2 files changed, 85 insertions(+), 51 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
>> delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
>>
>
> Running 'make dtbs_check' with the schema in this patch gives the
> following warnings. Consider if they are expected or the schema is
> incorrect. These may not be new warnings.
>
> Note that it is not yet a requirement to have 0 warnings for dtbs_check.
> This will change in the future.
>
> Full log is available here: https://patchwork.ozlabs.org/patch/
>
>
> temp-alarm@2400: '#thermal-sensor-cells' is a required property
I should have ordered the patches differently. This is fixed in second
patch.
Best regards,
Krzysztof
On Wed, 08 Jun 2022 13:27:01 +0200, Krzysztof Kozlowski wrote:
> Convert the Qualcomm QPNP PMIC Temperature Alarm to DT Schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../thermal/qcom,spmi-temp-alarm.yaml | 85 +++++++++++++++++++
> .../bindings/thermal/qcom-spmi-temp-alarm.txt | 51 -----------
> 2 files changed, 85 insertions(+), 51 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
> delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
>
Reviewed-by: Rob Herring <[email protected]>
On 14/06/2022 21:17, Krzysztof Kozlowski wrote:
> On 14/06/2022 12:01, Daniel Lezcano wrote:
>> On 08/06/2022 13:27, Krzysztof Kozlowski wrote:
>>> Convert the Qualcomm QPNP PMIC Temperature Alarm to DT Schema.
>>>
>>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>>> ---
>>> .../thermal/qcom,spmi-temp-alarm.yaml | 85 +++++++++++++++++++
>>> .../bindings/thermal/qcom-spmi-temp-alarm.txt | 51 -----------
>>> 2 files changed, 85 insertions(+), 51 deletions(-)
>>> create mode 100644 Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
>>> delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
>>
>> Applied this patch.
>>
>> I can pick patch 2/2 if needed, just let me know
>
> Thanks Daniel. I guess Bjorn will pick up the DTS patch.
Ok, thanks
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On 08/06/2022 13:27, Krzysztof Kozlowski wrote:
> Convert the Qualcomm QPNP PMIC Temperature Alarm to DT Schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../thermal/qcom,spmi-temp-alarm.yaml | 85 +++++++++++++++++++
> .../bindings/thermal/qcom-spmi-temp-alarm.txt | 51 -----------
> 2 files changed, 85 insertions(+), 51 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
> delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
Applied this patch.
I can pick patch 2/2 if needed, just let me know
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On 14/06/2022 12:01, Daniel Lezcano wrote:
> On 08/06/2022 13:27, Krzysztof Kozlowski wrote:
>> Convert the Qualcomm QPNP PMIC Temperature Alarm to DT Schema.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>> ---
>> .../thermal/qcom,spmi-temp-alarm.yaml | 85 +++++++++++++++++++
>> .../bindings/thermal/qcom-spmi-temp-alarm.txt | 51 -----------
>> 2 files changed, 85 insertions(+), 51 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
>> delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
>
> Applied this patch.
>
> I can pick patch 2/2 if needed, just let me know
Thanks Daniel. I guess Bjorn will pick up the DTS patch.
Best regards,
Krzysztof
On Wed, 8 Jun 2022 13:27:02 +0200, Krzysztof Kozlowski wrote:
> The PM8841 temperature sensor has to define thermal-sensor-cells.
>
>
Applied, thanks!
[2/2] ARM: dts: qcom: pm8841: add required thermal-sensor-cells
commit: e2759fa0676c9a32bbddb9aff955b54bb35066ad
Best regards,
--
Bjorn Andersson <[email protected]>