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

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

Merge thermal driver updates for 6.17-rc1 from Daniel Lezcano:

"- Enable the stage 2 shutdown and support to more SPMI variants
   (Anjelique Melendez)

 - Constify thermal_zone_device_ops structure when possible in the
   different thermal drivers (Christophe Jaillet)

 - Use the dev_fwnode() helper instead of of_fwnode_handle() which is
   more adequate wherever is possible in the thermal drivers (Jiri
   Slaby)

 - Implement and document One-Time Programmable fuse support for the
   Rockchip driver in order to increase the precision of the
   measurements (Nicolas Frattaroli)

 - Change the way the Mediatek LTVS driver stores the initialization
   data sequence to support different sequences regarding the current
   platform. Introduce the mt7988 support with a new initialization
   sequence (Mason Chang)

 - Document the QCom TSens Milos Temperature Sensor DT bindings (Luca
   Weiss)

 - Add the fallback compatible string for MT7981 and MT8516 DT bindings
   (Aleksander Jan Bajkowski)

 - Add the compatible string for Tegra210B01 SOC_THERM driver (Aaron Kling)"

* tag 'thermal-v6.17-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  dt-bindings: thermal: tegra: Document Tegra210B01
  dt-bindings: thermal: mediatek: Add fallback compatible string for MT7981 and MT8516
  dt-bindings: thermal: qcom-tsens: document the Milos Temperature Sensor
  thermal/drivers/mediatek/lvts_thermal: Add mt7988 lvts commands
  thermal/drivers/mediatek/lvts_thermal: Add lvts commands and their sizes to driver data
  thermal/drivers/mediatek/lvts_thermal: Change lvts commands array to static const
  thermal/drivers/rockchip: Support reading trim values from OTP
  dt-bindings: thermal: rockchip: document otp thermal trim
  thermal/drivers/rockchip: Support RK3576 SoC in the thermal driver
  dt-bindings: rockchip-thermal: Add RK3576 compatible
  thermal/drivers/rockchip: Rename rk_tsadcv3_tshut_mode
  thermal: Use dev_fwnode()
  thermal: Constify struct thermal_zone_device_ops
  thermal/drivers/loongson2: Constify struct thermal_zone_device_ops
  thermal/drivers/qcom-spmi-temp-alarm: Add support for LITE PMIC peripherals
  thermal/drivers/qcom-spmi-temp-alarm: Add support for GEN2 rev 2 PMIC peripherals
  thermal/drivers/qcom-spmi-temp-alarm: Prepare to support additional Temp Alarm subtypes
  thermal/drivers/qcom-spmi-temp-alarm: Add temp alarm data struct based on HW subtype
  thermal/drivers/qcom-spmi-temp-alarm: Enable stage 2 shutdown when required
parents d7b8f8e2 1d264d3a

Documentation/devicetree/bindings/thermal/mediatek,thermal.yaml

+17 −10
Original line number Diff line number Diff line
@@ -20,16 +20,23 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - mediatek,mt2701-thermal

          - mediatek,mt2712-thermal

          - mediatek,mt7622-thermal

      - mediatek,mt7981-thermal

          - mediatek,mt7986-thermal

          - mediatek,mt8173-thermal

          - mediatek,mt8183-thermal

          - mediatek,mt8365-thermal

      - items:

          - enum:

              - mediatek,mt8516-thermal

          - const: mediatek,mt2701-thermal

      - items:

          - enum:

              - mediatek,mt7981-thermal

          - const: mediatek,mt7986-thermal



  reg:

    maxItems: 1

Documentation/devicetree/bindings/thermal/nvidia,tegra124-soctherm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - nvidia,tegra124-soctherm

      - nvidia,tegra132-soctherm

      - nvidia,tegra210-soctherm

      - nvidia,tegra210b01-soctherm



  reg:

    maxItems: 2
@@ -207,6 +208,7 @@ allOf: 
            enum:

              - nvidia,tegra124-soctherm

              - nvidia,tegra210-soctherm

              - nvidia,tegra210b01-soctherm

    then:

      properties:

        reg:

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

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ properties: 
      - description: v2 of TSENS

        items:

          - enum:

              - qcom,milos-tsens

              - qcom,msm8953-tsens

              - qcom,msm8996-tsens

              - qcom,msm8998-tsens

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

+62 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - rockchip,rk3368-tsadc

      - rockchip,rk3399-tsadc

      - rockchip,rk3568-tsadc

      - rockchip,rk3576-tsadc

      - rockchip,rk3588-tsadc

      - rockchip,rv1108-tsadc
@@ -39,6 +40,17 @@ properties: 
      - const: tsadc

      - const: apb_pclk



  nvmem-cells:

    items:

      - description: cell handle to where the trim's base temperature is stored

      - description:

          cell handle to where the trim's tenths of Celsius base value is stored



  nvmem-cell-names:

    items:

      - const: trim_base

      - const: trim_base_frac



  resets:

    minItems: 1

    maxItems: 3
@@ -50,6 +62,12 @@ properties: 
      - const: tsadc

      - const: tsadc-phy



  "#address-cells":

    const: 1



  "#size-cells":

    const: 0



  "#thermal-sensor-cells":

    const: 1
@@ -71,6 +89,27 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [0, 1]



patternProperties:

  "@[0-9a-f]+$":

    type: object

    properties:

      reg:

        maxItems: 1

        description: sensor ID, a.k.a. channel number



      nvmem-cells:

        items:

          - description: handle of cell containing calibration data



      nvmem-cell-names:

        items:

          - const: trim



    required:

      - reg



    unevaluatedProperties: false



required:

  - compatible

  - reg
@@ -79,6 +118,29 @@ required: 
  - clock-names

  - resets



allOf:

  - if:

      not:

        properties:

          compatible:

            contains:

              const: rockchip,rk3568-tsadc

    then:

      properties:

        nvmem-cells: false

        nvmem-cell-names: false

  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - rockchip,rk3568-tsadc

                - rockchip,rk3576-tsadc

    then:

      patternProperties:

        "@[0-9a-f]+$": false



unevaluatedProperties: false



examples:

drivers/thermal/armada_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal, 
	return ret;

}



static struct thermal_zone_device_ops legacy_ops = {

static const struct thermal_zone_device_ops legacy_ops = {

	.get_temp = armada_get_temp_legacy,

};