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

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

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

"- Do preparating cleaning and DT bindings for RK3588 support
   (Sebastian Reichel)

 - Add driver support for RK3588 (Finley Xiao)

 - Use devm_reset_control_array_get_exclusive() for the Rockchip driver
   (Ye Xingchen)

 - Detect power gated thermal zones and return -EAGAIN when reading the
   temperature (Mikko Perttunen)

 - Remove thermal_bind_params structure as it is unused (Zhang Rui)

 - Drop unneeded quotes in DT bindings allowing to run yamllint (Rob
   Herring)

 - Update the power allocator documentation according to the thermal
   trace relocation (Lukas Bulwahn)

 - Fix sensor 1 interrupt status bitmask for the Mediatek LVTS sensor
   (Chen-Yu Tsai)

 - Use the dev_err_probe() helper in the Amlogic driver (Ye Xingchen)

 - Add AP domain support to LVTS thermal controllers for mt8195
   (Balsam CHIHI)

 - Remove buggy call to thermal_of_zone_unregister() (Daniel Lezcano)

 - Make thermal_of_zone_[un]register() private to the thermal OF code
   (Daniel Lezcano)

 - Create a private copy of the thermal zone device parameters
   structure when registering a thermal zone (Daniel Lezcano)"

* tag 'thermal-v6.4-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/core: Alloc-copy-free the thermal zone parameters structure
  thermal/of: Unexport unused OF functions
  thermal/drivers/bcm2835: Remove buggy call to thermal_of_zone_unregister
  thermal/drivers/mediatek/lvts_thermal: Add AP domain for mt8195
  dt-bindings: thermal: mediatek: Add AP domain to LVTS thermal controllers for mt8195
  thermal: amlogic: Use dev_err_probe()
  thermal/drivers/mediatek/lvts_thermal: Fix sensor 1 interrupt status bitmask
  MAINTAINERS: adjust entry in THERMAL/POWER_ALLOCATOR after header movement
  dt-bindings: thermal: Drop unneeded quotes
  thermal/core: Remove thermal_bind_params structure
  thermal/drivers/tegra-bpmp: Handle offline zones
  thermal/drivers/rockchip: use devm_reset_control_array_get_exclusive()
  dt-bindings: rockchip-thermal: Support the RK3588 SoC compatible
  thermal/drivers/rockchip: Support RK3588 SoC in the thermal driver
  thermal/drivers/rockchip: Support dynamic sized sensor array
  thermal/drivers/rockchip: Simplify channel id logic
  thermal/drivers/rockchip: Use dev_err_probe
  thermal/drivers/rockchip: Simplify clock logic
  thermal/drivers/rockchip: Simplify getting match data
parents cfeeb7d3 3d439b1a

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ properties: 


  amlogic,ao-secure:

    description: phandle to the ao-secure syscon

    $ref: '/schemas/types.yaml#/definitions/phandle'

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



  '#thermal-sensor-cells':

    const: 0

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

+2 −2
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ properties: 
      - const: temp_grade



  fsl,tempmon:

    $ref: '/schemas/types.yaml#/definitions/phandle'

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

    description: Phandle to anatop system controller node.



  fsl,tempmon-data:

    $ref: '/schemas/types.yaml#/definitions/phandle'

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

    description: |

      Deprecated property, phandle pointer to fuse controller that contains

      TEMPMON calibration data, e.g. OCOTP on imx6q. The details about

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

+2 −2
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ properties: 
    maxItems: 1



  fsl,tmu-range:

    $ref: '/schemas/types.yaml#/definitions/uint32-array'

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

    description: |

      The values to be programmed into TTRnCR, as specified by the SoC

      reference manual. The first cell is TTR0CR, the second is TTR1CR, etc.

    maxItems: 4



  fsl,tmu-calibration:

    $ref: '/schemas/types.yaml#/definitions/uint32-matrix'

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

    description: |

      A list of cell pairs containing temperature calibration data, as

      specified by the SoC reference manual. The first cell of each pair

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

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

      - rockchip,rk3399-tsadc

      - rockchip,rk3568-tsadc

      - rockchip,rk3588-tsadc

      - rockchip,rv1108-tsadc



  reg:

Documentation/driver-api/thermal/sysfs-api.rst

+0 −40
Original line number Diff line number Diff line
@@ -304,42 +304,6 @@ temperature) and throttle appropriate devices. 
1.4 Thermal Zone Parameters

---------------------------



    ::



	struct thermal_bind_params



    This structure defines the following parameters that are used to bind

    a zone with a cooling device for a particular trip point.



    .cdev:

	     The cooling device pointer

    .weight:

	     The 'influence' of a particular cooling device on this

	     zone. This is relative to the rest of the cooling

	     devices. For example, if all cooling devices have a

	     weight of 1, then they all contribute the same. You can

	     use percentages if you want, but it's not mandatory. A

	     weight of 0 means that this cooling device doesn't

	     contribute to the cooling of this zone unless all cooling

	     devices have a weight of 0. If all weights are 0, then

	     they all contribute the same.

    .trip_mask:

	       This is a bit mask that gives the binding relation between

	       this thermal zone and cdev, for a particular trip point.

	       If nth bit is set, then the cdev and thermal zone are bound

	       for trip point n.

    .binding_limits:

		     This is an array of cooling state limits. Must have

		     exactly 2 * thermal_zone.number_of_trip_points. It is an

		     array consisting of tuples <lower-state upper-state> of

		     state limits. Each trip will be associated with one state

		     limit tuple when binding. A NULL pointer means

		     <THERMAL_NO_LIMITS THERMAL_NO_LIMITS> on all trips.

		     These limits are used when binding a cdev to a trip point.

    .match:

	    This call back returns success(0) if the 'tz and cdev' need to

	    be bound, as per platform data.



    ::



	struct thermal_zone_params
@@ -357,10 +321,6 @@ temperature) and throttle appropriate devices. 
	       will be created. when no_hwmon == true, nothing will be done.

	       In case the thermal_zone_params is NULL, the hwmon interface

	       will be created (for backward compatibility).

    .num_tbps:

	       Number of thermal_bind_params entries for this zone

    .tbp:

	       thermal_bind_params entries



2. sysfs attributes structure

=============================