Commit dd235832 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'thermal-v6.4-rc1-3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux 

Pull more thermal control changes for 6.4-rc1 from Daniel Lezcano:

"- Add compatible strings DT bindings for imx6sll and imx6ul to fix
   dtbs check warning (Stefan Wahren)

 - Update the example in the DT bindings to reflect changes with the
   ADC node name for QCom TM and TM5 (Marijn Suijten)

 - Fix the comments for the cpuidle_cooling_register() function to
   match the function prototype (Chenggang Wang)

 - Fix inconsistent temperature read and some Mediatek variant board
   reboot by reverting a change and handling the temperature
   differently (AngeloGioacchino Del Regno)

 - Fix a memory leak in the initialization error path for the Mediatek
   driver (Kang Chen)

 - Use of_address_to_resource() in the Mediatek driver (Rob Herring)

 - Fix unit address in the QCom tsens driver DT bindings (Krzysztof
   Kozlowski)"

* tag 'thermal-v6.4-rc1-3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  dt-bindings: thermal: qcom-tsens: Correct unit address
  thermal/drivers/mediatek: Use of_address_to_resource()
  thermal/drivers/mediatek: Change clk_prepare_enable to devm_clk_get_enabled in mtk_thermal_probe
  thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe
  thermal/drivers/mediatek: Add temperature constraints to validate read
  Revert "thermal/drivers/mediatek: Add delay after thermal banks initialization"
  thermal/drivers/cpuidle_cooling: Delete unmatched comments
  dt-bindings: thermal: Use generic ADC node name in examples
  dt-bindings: imx-thermal: Add imx6sll and imx6ul compatible
parents 5e0ca0bf 2afa82d1

Documentation/devicetree/bindings/thermal/imx-thermal.yaml

+10 −4
Original line number Diff line number Diff line
@@ -12,10 +12,16 @@ maintainers: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - fsl,imx6q-tempmon

          - fsl,imx6sx-tempmon

          - fsl,imx7d-tempmon

      - items:

          - enum:

              - fsl,imx6sll-tempmon

              - fsl,imx6ul-tempmon

          - const: fsl,imx6sx-tempmon



  interrupts:

    description: |

Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml

+2 −2
Original line number Diff line number Diff line
@@ -124,8 +124,8 @@ examples: 
            #size-cells = <0>;

            #io-channel-cells = <1>;



            /* Other propreties are omitted */

            adc-chan@4c {

            /* Other properties are omitted */

            channel@4c {

                reg = <ADC5_XO_THERM_100K_PU>;

            };

        };

Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml

+6 −3
Original line number Diff line number Diff line
@@ -178,10 +178,11 @@ examples: 
            #io-channel-cells = <1>;



            /* Other properties are omitted */

            conn-therm@4f {

            channel@4f {

                reg = <ADC5_AMUX_THM3_100K_PU>;

                qcom,ratiometric;

                qcom,hw-settle-time = <200>;

                label = "conn_therm";

            };

        };
@@ -217,16 +218,18 @@ examples: 
            #io-channel-cells = <1>;



            /* Other properties are omitted */

            xo-therm@44 {

            channel@44 {

                reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;

                qcom,ratiometric;

                qcom,hw-settle-time = <200>;

                label = "xo_therm";

            };



            conn-therm@147 {

            channel@147 {

                reg = <PM8350_ADC7_AMUX_THM4_100K_PU(1)>;

                qcom,ratiometric;

                qcom,hw-settle-time = <200>;

                label = "conn_therm";

            };

        };

Documentation/devicetree/bindings/thermal/qcom-tsens.yaml

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ examples: 
  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    // Example 1 (new calbiration data: for pre v1 IP):

    thermal-sensor@900000 {

    thermal-sensor@4a9000 {

        compatible = "qcom,msm8916-tsens", "qcom,tsens-v0_1";

        reg = <0x4a9000 0x1000>, /* TM */

              <0x4a8000 0x1000>; /* SROT */
@@ -356,7 +356,7 @@ examples: 
  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    // Example 1 (legacy: for pre v1 IP):

    tsens1: thermal-sensor@900000 {

    tsens1: thermal-sensor@4a9000 {

           compatible = "qcom,msm8916-tsens", "qcom,tsens-v0_1";

           reg = <0x4a9000 0x1000>, /* TM */

                 <0x4a8000 0x1000>; /* SROT */

drivers/thermal/cpuidle_cooling.c

+0 −3
Original line number Diff line number Diff line
@@ -236,9 +236,6 @@ static int __cpuidle_cooling_register(struct device_node *np, 
 *

 * This function is in charge of creating a cooling device per cpuidle

 * driver and register it to the thermal framework.

 *

 * Return: zero on success, or negative value corresponding to the

 * error detected in the underlying subsystems.

 */

void cpuidle_cooling_register(struct cpuidle_driver *drv)

{