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

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

Merge thermal control (ARM drivers mostly) updates for 6.7-rc1 from
Daniel Lezcano:

"- Add support for Mediatek LVTS MT8192 driver along with the
   suspend/resume routines (Balsam Chihi)

 - Fix probe for THERMAL_V2 for the Mediatek LVTS driver (Markus
   Schneider-Pargmann)

 - Remove duplicate error message in the max76620 driver when
   thermal_of_zone_register() fails as the sub routine already show one
   (Thierry Reding)

 - Add i.MX7D compatible bindings to fix a warning from dtbs_check for
   the imx6ul platform (Alexander Stein)

 - Add sa8775p compatible for the QCom tsens driver (Priyansh Jain)

 - Fix error check in lvts_debugfs_init() which is checking against
   NULL instead of PTR_ERR() on the LVTS Mediatek driver (Minjie Du)

 - Remove unused variable in the thermal/tools (Kuan-Wei Chiu)

 - Document the imx8dl thermal sensor (Fabio Estevam)

 - Add variable names in callback prototypes to prevent warning from
   checkpatch.pl for the imx8mm driver (Bragatheswaran Manickavel)

 - Add missing unevaluatedProperties on child node schemas for tegra124
  (Rob Herring)

 - Add mt7988 support for the Mediatek LVTS driver (Frank Wunderlich)"

* tag 'thermal-v6.7-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/qcom/tsens: Drop ops_v0_1
  thermal/drivers/mediatek/lvts_thermal: Update calibration data documentation
  thermal/drivers/mediatek/lvts_thermal: Add mt8192 support
  thermal/drivers/mediatek/lvts_thermal: Add suspend and resume
  dt-bindings: thermal: mediatek: Add LVTS thermal controller definition for mt8192
  thermal/drivers/mediatek: Fix probe for THERMAL_V2
  thermal/drivers/max77620: Remove duplicate error message
  dt-bindings: timer: add imx7d compatible
  dt-bindings: net: microchip: Allow nvmem-cell usage
  dt-bindings: imx-thermal: Add #thermal-sensor-cells property
  dt-bindings: thermal: tsens: Add sa8775p compatible
  thermal/drivers/mediatek/lvts_thermal: Fix error check in lvts_debugfs_init()
  tools/thermal: Remove unused 'mds' and 'nrhandler' variables
  dt-bindings: thermal: fsl,scu-thermal: Document imx8dl
  thermal/drivers/imx8mm_thermal: Fix function pointer declaration by adding identifier name
  dt-bindings: thermal: nvidia,tegra124-soctherm: Add missing unevaluatedProperties on child node schemas
  thermal/drivers/mediatek/lvts_thermal: Add mt7988 support
  thermal/drivers/mediatek/lvts_thermal: Make coeff configurable
  dt-bindings: thermal: mediatek: Add LVTS thermal sensors for mt7988
  dt-bindings: thermal: mediatek: Add mt7988 lvts compatible
parents 8aa49284 9618efe3

Documentation/devicetree/bindings/net/microchip,lan95xx.yaml

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ properties: 


  local-mac-address: true

  mac-address: true

  nvmem-cells: true

  nvmem-cell-names: true



required:

  - compatible

Documentation/devicetree/bindings/thermal/fsl,scu-thermal.yaml

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ allOf: 
properties:

  compatible:

    items:

      - const: fsl,imx8qxp-sc-thermal

      - enum:

          - fsl,imx8dxl-sc-thermal

          - fsl,imx8qxp-sc-thermal

      - const: fsl,imx-sc-thermal



  '#thermal-sensor-cells':

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

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ properties: 
  clocks:

    maxItems: 1



  "#thermal-sensor-cells":

    const: 0



required:

  - compatible

  - interrupts
@@ -67,6 +70,9 @@ required: 
  - nvmem-cells

  - nvmem-cell-names



allOf:

  - $ref: thermal-sensor.yaml#



additionalProperties: false



examples:
@@ -104,5 +110,6 @@ examples: 
             nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;

             nvmem-cell-names = "calib", "temp_grade";

             clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;

             #thermal-sensor-cells = <0>;

        };

    };

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

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ description: | 
properties:

  compatible:

    enum:

      - mediatek,mt7988-lvts-ap

      - mediatek,mt8192-lvts-ap

      - mediatek,mt8192-lvts-mcu

      - mediatek,mt8195-lvts-ap

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

+5 −0
Original line number Diff line number Diff line
@@ -68,7 +68,12 @@ properties: 
    patternProperties:

      "^(light|heavy|oc1)$":

        type: object

        additionalProperties: false



        properties:

          "#cooling-cells":

            const: 2



          nvidia,priority:

            $ref: /schemas/types.yaml#/definitions/uint32

            minimum: 1