Skip to contentSkip to conversation

add thermal sensor driver for A64, A83T, H3, H5, H6, R40

PATCH Superseded Vasily Khoruzhick 4 participants 16 messages Dec 18, 2019 – Dec 19, 2019

Subsystems (4)

v7 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Vasily Khoruzhick

author maintainer
#0 lore raw

v7 cover add thermal sensor driver for A64, A83T, H3, H5, H6, R40

This patchset adds driver for thermal sensor in A64, A83T, H3, H5, H6 and R40 SoCs.

v7:
- [vasily] Address Maxime's comments for dt-schema
- [vasily] Move common part of H3 and H5 dts into sunxi-h3-h5.dtsi
- [vasily] Add Maxime's a-b to the driver patch

v6:
- [ondrej, vasily] Squash all driver related changes into a single patch
- [ondrej] Rename calib -> calibration
- [ondrej] Fix thermal zone registration check
- [ondrej] Lower rate of sensor data interrupts to 4/sec/sensor
- [ondrej] Rework scale/offset values, H6 calibration
- [ondrej] Explicitly set mod clock to 24 MHz
- [ondrej] Set undocumented bits in CTRL0 for H6
- [ondrej] Add support for A83T
- [ondrej] Add dts changes for A83T, H3, H5, H6
- [vasily] Add dts changes for A64
- [vasily] Address Maxime's comments for YAML scheme
- [vasily] Make .calc_temp callback mandatory
- [vasily] Set .max_register in regmap config, so regs can be inspected using debugfs

Ondrej Jirman (4):
ARM: dts: sun8i-a83t: Add thermal sensor and thermal zones
ARM: dts: sun8i-h3: Add thermal sensor and thermal zones
arm64: dts: allwinner: h5: Add thermal sensor and thermal zones
arm64: dts: allwinner: h6: Add thermal sensor and thermal zones

Vasily Khoruzhick (1):
arm64: dts: allwinner: a64: Add thermal sensors and thermal zones

Yangtao Li (2):
thermal: sun8i: add thermal driver for H6/H5/H3/A64/A83T/R40
dt-bindings: thermal: add YAML schema for sun8i-thermal driver
bindings

 .../thermal/allwinner,sun8i-a83t-ths.yaml     | 146 ++++
 MAINTAINERS                                   |   7 +
 arch/arm/boot/dts/sun8i-a83t.dtsi             |  36 +
 arch/arm/boot/dts/sun8i-h3.dtsi               |  20 +
 arch/arm/boot/dts/sunxi-h3-h5.dtsi            |   6 +
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi |  42 ++
 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi  |  26 +
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi  |  33 +
 drivers/thermal/Kconfig                       |  14 +
 drivers/thermal/Makefile                      |   1 +
 drivers/thermal/sun8i_thermal.c               | 639 ++++++++++++++++++
 11 files changed, 970 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
 create mode 100644 drivers/thermal/sun8i_thermal.c
Signature · 1 line
2.24.1
author maintainer
#1 lore raw

PATCH v7 1/7 thermal: sun8i: add thermal driver for H6/H5/H3/A64/A83T/R40

From: Yangtao Li <[email protected]>

This patch adds the support for allwinner thermal sensor, within allwinner SoC. It will register sensors for thermal framework and use device tree to bind cooling device.

---
 MAINTAINERS                     |   7 +
 drivers/thermal/Kconfig         |  14 +
 drivers/thermal/Makefile        |   1 +
 drivers/thermal/sun8i_thermal.c | 639 ++++++++++++++++++++++++++++++++
 4 files changed, 661 insertions(+)
 create mode 100644 drivers/thermal/sun8i_thermal.c
MAINTAINERS +7 -0
index a049abccaa26..ed023d3e8e4c 100644
@@ -694,6 +694,13 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/crypto/allwinner/
 
+ALLWINNER THERMAL DRIVER
+M:	Yangtao Li <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
+F:	drivers/thermal/sun8i_thermal.c
+
 ALLWINNER VPU DRIVER
 M:	Maxime Ripard <[email protected]>
 M:	Paul Kocialkowski <[email protected]>
drivers/thermal/Kconfig +14 -0
index 79b27865c6f4..8cef77fdef5a 100644
@@ -263,6 +263,20 @@ config SPEAR_THERMAL
 	  Enable this to plug the SPEAr thermal sensor driver into the Linux
 	  thermal framework.
 
+config SUN8I_THERMAL
+	tristate "Allwinner sun8i thermal driver"
+	depends on ARCH_SUNXI || COMPILE_TEST
+	depends on HAS_IOMEM
+	depends on NVMEM
+	depends on OF
+	depends on RESET_CONTROLLER
+	help
+	  Support for the sun8i thermal sensor driver into the Linux thermal
+	  framework.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
 	tristate "Rockchip thermal driver"
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/thermal/Makefile +1 -0
index baeb70bf0568..939301195b9e 100644
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
 obj-y				+= broadcom/
 obj-$(CONFIG_THERMAL_MMIO)		+= thermal_mmio.o
 obj-$(CONFIG_SPEAR_THERMAL)	+= spear_thermal.o
+obj-$(CONFIG_SUN8I_THERMAL)     += sun8i_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)	+= rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)	+= rcar_thermal.o
 obj-$(CONFIG_RCAR_GEN3_THERMAL)	+= rcar_gen3_thermal.o
drivers/thermal/sun8i_thermal.c new file +639 -0

639 lines not on this page · raw message

Signature · 1 line
2.24.1
author maintainer
#2 lore raw

PATCH v7 2/7 dt-bindings: thermal: add YAML schema for sun8i-thermal driver bindings

In reply to Vasily Khoruzhick

From: Yangtao Li <[email protected]>

sun8i-thermal driver supports thermal sensor in wide range of Allwinner SoCs. Add YAML schema for its bindings.

---
 .../thermal/allwinner,sun8i-a83t-ths.yaml     | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +146 -0
new file mode 100644
index 000000000000..8768c2450633
@@ -0,0 +1,146 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/allwinner,sun8i-a83t-ths.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner SUN8I Thermal Controller Device Tree Bindings
+
+maintainers:
+  - Yangtao Li <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - allwinner,sun8i-a83t-ths
+      - allwinner,sun8i-h3-ths
+      - allwinner,sun8i-r40-ths
+      - allwinner,sun50i-a64-ths
+      - allwinner,sun50i-h5-ths
+      - allwinner,sun50i-h6-ths
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  nvmem-cells:
+    maxItems: 1
+    description: Calibration data for thermal sensors
+
+  nvmem-cell-names:
+    const: calibration
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun50i-h6-ths
+
+    then:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 1
+
+        clock-names:
+          minItems: 1
+          maxItems: 1
+          items:
+            - const: bus
+
+    else:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 2
+
+        clock-names:
+          minItems: 1
+          maxItems: 2
+          items:
+            - const: bus
+            - const: mod
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun8i-h3-ths
+
+    then:
+      properties:
+        "#thermal-sensor-cells":
+          const: 0
+
+    else:
+      properties:
+        "#thermal-sensor-cells":
+          const: 1
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - const: allwinner,sun8i-h3-ths
+              - const: allwinner,sun8i-r40-ths
+              - const: allwinner,sun50i-a64-ths
+              - const: allwinner,sun50i-h5-ths
+              - const: allwinner,sun50i-h6-ths
+
+    then:
+      required:
+        - clocks
+        - clock-names
+        - resets
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - '#thermal-sensor-cells'
+
+examples:
+  - |
+    thermal-sensor@1f04000 {
+         compatible = "allwinner,sun8i-a83t-ths";
+         reg = <0x01f04000 0x100>;
+         interrupts = <0 31 0>;
+         nvmem-cells = <&ths_calibration>;
+         nvmem-cell-names = "calibration";
+         #thermal-sensor-cells = <1>;
+    };
+
+  - |
+    thermal-sensor@1c25000 {
+         compatible = "allwinner,sun8i-h3-ths";
+         reg = <0x01c25000 0x400>;
+         clocks = <&ccu 0>, <&ccu 1>;
+         clock-names = "bus", "mod";
+         resets = <&ccu 2>;
+         interrupts = <0 31 0>;
+         nvmem-cells = <&ths_calibration>;
+         nvmem-cell-names = "calibration";
+         #thermal-sensor-cells = <0>;
+    };
+
+  - |
+    thermal-sensor@5070400 {
+         compatible = "allwinner,sun50i-h6-ths";
+         reg = <0x05070400 0x100>;
+         clocks = <&ccu 0>;
+         clock-names = "bus";
+         resets = <&ccu 2>;
+         interrupts = <0 15 0>;
+         nvmem-cells = <&ths_calibration>;
+         nvmem-cell-names = "calibration";
+         #thermal-sensor-cells = <1>;
+    };
+
+...
Signature · 1 line
2.24.1
#3 lore raw

Re: [PATCH v7 2/7] dt-bindings: thermal: add YAML schema for sun8i-thermal driver bindings

Hi,

Quoted 57 lines · Vasily Khoruzhick

From: Yangtao Li <[email protected]>

sun8i-thermal driver supports thermal sensor in wide range of Allwinner SoCs. Add YAML schema for its bindings.

---
 .../thermal/allwinner,sun8i-a83t-ths.yaml     | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +39 -0
new file mode 100644
index 000000000000..8768c2450633
@@ -0,0 +1,146 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/allwinner,sun8i-a83t-ths.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner SUN8I Thermal Controller Device Tree Bindings
+
+maintainers:
+  - Yangtao Li <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - allwinner,sun8i-a83t-ths
+      - allwinner,sun8i-h3-ths
+      - allwinner,sun8i-r40-ths
+      - allwinner,sun50i-a64-ths
+      - allwinner,sun50i-h5-ths
+      - allwinner,sun50i-h6-ths
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  nvmem-cells:
+    maxItems: 1
+    description: Calibration data for thermal sensors
+
+  nvmem-cell-names:
+    const: calibration
+
+allOf:
+  - if:

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 49

Quoted 10 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +10 -0
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun50i-h6-ths
+
+    then:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 1

When minItems and maxItems are equal, you can only set one, the other will be filled automatically.

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 55

Quoted 6 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +6 -0
+
+        clock-names:
+          minItems: 1
+          maxItems: 1
+          items:
+            - const: bus

And this can even be just

clock-names:
const: bus

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 68

Quoted 13 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +13 -0
+
+    else:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 2
+
+        clock-names:
+          minItems: 1
+          maxItems: 2
+          items:
+            - const: bus
+            - const: mod

I'm not sure why you need the minItems set to 1 here though?

it's always 2 for the !H6 case, right?

if so, then we should even do something like:

properties:
...

# This is needed because we will need to check both the H6 and !H6 # case, and it must validate. So we make sure we match against the

  # union of both cases.
  clocks:
    minItems: 1
    maxItems: 2
    items:
      - description: Bus Clock
      - description: Module Clock

# Same story here
clock-names:
minItems: 1
maxItems: 2
items:
- const: bus
- const: mod

allOf:
- if:
properties:
compatible:
contains:
const: allwinner,sun50i-h6-ths

# Here we validate in the H6 case we only have one clock then:
properties:
clocks:
maxItems: 1

clock-names:
maxItems: 1

# and here that in the other case we have two clocks, the names # being validated by the schema above
else:
properties:
clocks:
maxItems: 2

clock-names:
maxItems: 2

# And now we can set this since all our properties will have been

# expressed in the upper level schema
additionalProperties: false
Quoted 6 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +6 -0
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun8i-h3-ths

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 84

Quoted 10 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +10 -0
+
+    then:
+      properties:
+        "#thermal-sensor-cells":
+          const: 0
+
+    else:
+      properties:
+        "#thermal-sensor-cells":
+          const: 1

Same thing here, you should have an enum accepting both values in the upper schema, the condition here only making further checks. Also, in the case where #thermal-sensor-cells is one, then you need to document what that argument is.

Thanks!
Maxime

author maintainer
#4 lore raw

Re: [PATCH v7 2/7] dt-bindings: thermal: add YAML schema for sun8i-thermal driver bindings

Quoted 66 lines · Maxime Ripard

Hi,

Quoted 62 lines · Vasily Khoruzhick

From: Yangtao Li <[email protected]>

sun8i-thermal driver supports thermal sensor in wide range of Allwinner SoCs. Add YAML schema for its bindings.

---
 .../thermal/allwinner,sun8i-a83t-ths.yaml     | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +44 -0
new file mode 100644
index 000000000000..8768c2450633
@@ -0,0 +1,146 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/allwinner,sun8i-a83t-ths.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner SUN8I Thermal Controller Device Tree Bindings
+
+maintainers:
+  - Yangtao Li <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - allwinner,sun8i-a83t-ths
+      - allwinner,sun8i-h3-ths
+      - allwinner,sun8i-r40-ths
+      - allwinner,sun50i-a64-ths
+      - allwinner,sun50i-h5-ths
+      - allwinner,sun50i-h6-ths
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  nvmem-cells:
+    maxItems: 1
+    description: Calibration data for thermal sensors
+
+  nvmem-cell-names:
+    const: calibration
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun50i-h6-ths
+
Quoted 8 lines

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 49

Quoted 5 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +5 -0
+    then:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 1

When minItems and maxItems are equal, you can only set one, the other will be filled automatically.

Is it documented anywhere? I have a feeling like I'm shooting in the dark. So far I've read Documentation/devicetree/writing-schema.rst, Documentation/devicetree/bindings/example-schema.yaml and few other schemas for inspiration but yet I don't have solid understanding how it's supposed to be written. Examples are pretty scarce and figuring out why certain construction doesn't work is pretty tricky.

Quoted 11 lines

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 55

Quoted 6 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +6 -0
+
+        clock-names:
+          minItems: 1
+          maxItems: 1
+          items:
+            - const: bus

And this can even be just

clock-names:
const: bus

OK

Quoted 64 lines

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 68

Quoted 13 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +13 -0
+
+    else:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 2
+
+        clock-names:
+          minItems: 1
+          maxItems: 2
+          items:
+            - const: bus
+            - const: mod

I'm not sure why you need the minItems set to 1 here though?

it's always 2 for the !H6 case, right?

if so, then we should even do something like:

properties:
...

# This is needed because we will need to check both the H6 and !H6 # case, and it must validate. So we make sure we match against the

  # union of both cases.
  clocks:
    minItems: 1
    maxItems: 2
    items:
      - description: Bus Clock
      - description: Module Clock

# Same story here
clock-names:
minItems: 1
maxItems: 2
items:
- const: bus
- const: mod

allOf:
- if:
properties:
compatible:
contains:
const: allwinner,sun50i-h6-ths

# Here we validate in the H6 case we only have one clock then:
properties:
clocks:
maxItems: 1

clock-names:
maxItems: 1

# and here that in the other case we have two clocks, the names # being validated by the schema above
else:
properties:
clocks:
maxItems: 2

Quoted 6 lines

clock-names:
maxItems: 2

# And now we can set this since all our properties will have been

# expressed in the upper level schema
additionalProperties: false

OK

Quoted 13 lines
Quoted 13 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +13 -0
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun8i-h3-ths
+
+    then:
+      properties:
+        "#thermal-sensor-cells":
+          const: 0
+
+    else:
Quoted 8 lines

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 84

Quoted 3 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +3 -0
+      properties:
+        "#thermal-sensor-cells":
+          const: 1

Same thing here, you should have an enum accepting both values in the upper schema, the condition here only making further checks. Also, in the case where #thermal-sensor-cells is one, then you need to document what that argument is.

OK

Quoted 3 lines

Thanks!
Maxime

#5 lore raw

Re: [PATCH v7 2/7] dt-bindings: thermal: add YAML schema for sun8i-thermal driver bindings

Quoted 73 lines · Vasily Khoruzhick
Quoted 63 lines · Maxime Ripard
Quoted 62 lines · Vasily Khoruzhick

From: Yangtao Li <[email protected]>

sun8i-thermal driver supports thermal sensor in wide range of Allwinner SoCs. Add YAML schema for its bindings.

---
 .../thermal/allwinner,sun8i-a83t-ths.yaml     | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +44 -0
new file mode 100644
index 000000000000..8768c2450633
@@ -0,0 +1,146 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/thermal/allwinner,sun8i-a83t-ths.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner SUN8I Thermal Controller Device Tree Bindings
+
+maintainers:
+  - Yangtao Li <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - allwinner,sun8i-a83t-ths
+      - allwinner,sun8i-h3-ths
+      - allwinner,sun8i-r40-ths
+      - allwinner,sun50i-a64-ths
+      - allwinner,sun50i-h5-ths
+      - allwinner,sun50i-h6-ths
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  nvmem-cells:
+    maxItems: 1
+    description: Calibration data for thermal sensors
+
+  nvmem-cell-names:
+    const: calibration
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,sun50i-h6-ths
+
Quoted 8 lines

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml line 49

Quoted 5 lines
Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml new file +5 -0
+    then:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 1

When minItems and maxItems are equal, you can only set one, the other will be filled automatically.

Quoted 6 lines

Is it documented anywhere? I have a feeling like I'm shooting in the dark. So far I've read Documentation/devicetree/writing-schema.rst, Documentation/devicetree/bindings/example-schema.yaml and few other schemas for inspiration but yet I don't have solid understanding how it's supposed to be written. Examples are pretty scarce and figuring out why certain construction doesn't work is pretty tricky.

It's somewhat documented with
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/example-schema.yaml#n80
and
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/example-schema.yaml#n102

But I guess it wasn't clear enough? Feel free to update it to something that would be better

Maxime

author maintainer
#6 lore raw

PATCH v7 3/7 ARM: dts: sun8i-a83t: Add thermal sensor and thermal zones

In reply to Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are three sensors, two for each CPU cluster, one for GPU.

---
 arch/arm/boot/dts/sun8i-a83t.dtsi | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
arch/arm/boot/dts/sun8i-a83t.dtsi +36 -0
index 53c38deb8a08..93a6df11cb18 100644
@@ -50,6 +50,7 @@
 #include <dt-bindings/reset/sun8i-a83t-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
 #include <dt-bindings/reset/sun8i-r-ccu.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
 	interrupt-parent = <&gic>;
@@ -581,6 +582,12 @@ mmc2: mmc@1c11000 {
 		sid: eeprom@1c14000 {
 			compatible = "allwinner,sun8i-a83t-sid";
 			reg = <0x1c14000 0x400>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ths_calibration: thermal-sensor-calibration@34 {
+				reg = <0x34 8>;
+			};
 		};
 
 		crypto: crypto@1c15000 {
@@ -1165,5 +1172,34 @@ r_rsb: rsb@1f03400 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 		};
+
+		ths: thermal-sensor@1f04000 {
+			compatible = "allwinner,sun8i-a83t-ths";
+			reg = <0x01f04000 0x100>;
+			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+			nvmem-cells = <&ths_calibration>;
+			nvmem-cell-names = "calibration";
+			#thermal-sensor-cells = <1>;
+		};
+	};
+
+	thermal-zones {
+		cpu0_thermal: cpu0-thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 0>;
+		};
+
+		cpu1_thermal: cpu1-thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 1>;
+		};
+
+		gpu_thermal: gpu-thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 2>;
+		};
 	};
 };
Signature · 1 line
2.24.1
author maintainer
#7 lore raw

PATCH v7 4/7 ARM: dts: sun8i-h3: Add thermal sensor and thermal zones

In reply to Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There is just one sensor for the CPU.

---
 arch/arm/boot/dts/sun8i-h3.dtsi    | 20 ++++++++++++++++++++
 arch/arm/boot/dts/sunxi-h3-h5.dtsi |  6 ++++++
 2 files changed, 26 insertions(+)
arch/arm/boot/dts/sun8i-h3.dtsi +20 -0
index fe773c72a69b..be8f601ab8cf 100644
@@ -199,6 +199,26 @@ mali: gpu@1c40000 {
 			assigned-clocks = <&ccu CLK_GPU>;
 			assigned-clock-rates = <384000000>;
 		};
+
+		ths: thermal-sensor@1c25000 {
+			compatible = "allwinner,sun8i-h3-ths";
+			reg = <0x01c25000 0x400>;
+			interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+			resets = <&ccu RST_BUS_THS>;
+			clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>;
+			clock-names = "bus", "mod";
+			nvmem-cells = <&ths_calibration>;
+			nvmem-cell-names = "calibration";
+			#thermal-sensor-cells = <0>;
+		};
+	};
+
+	thermal-zones {
+		cpu_thermal: cpu-thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 0>;
+		};
 	};
 };
 
arch/arm/boot/dts/sunxi-h3-h5.dtsi +6 -0
index 0afea59486c2..6e68ed831015 100644
@@ -231,6 +231,12 @@ mmc2: mmc@1c11000 {
 		sid: eeprom@1c14000 {
 			/* compatible is in per SoC .dtsi file */
 			reg = <0x1c14000 0x400>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ths_calibration: thermal-sensor-calibration@34 {
+				reg = <0x34 4>;
+			};
 		};
 
 		usb_otg: usb@1c19000 {
Signature · 1 line
2.24.1
author maintainer
#8 lore raw

PATCH v7 5/7 arm64: dts: allwinner: h5: Add thermal sensor and thermal zones

In reply to Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are two sensors, one for CPU, one for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +26 -0
index e92c4de5bf3b..f9df95b2d542 100644
@@ -176,6 +176,32 @@ mali: gpu@1e80000 {
 			assigned-clocks = <&ccu CLK_GPU>;
 			assigned-clock-rates = <384000000>;
 		};
+
+		ths: thermal-sensor@1c25000 {
+			compatible = "allwinner,sun50i-h5-ths";
+			reg = <0x01c25000 0x400>;
+			interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+			resets = <&ccu RST_BUS_THS>;
+			clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>;
+			clock-names = "bus", "mod";
+			nvmem-cells = <&ths_calibration>;
+			nvmem-cell-names = "calibration";
+			#thermal-sensor-cells = <1>;
+		};
+	};
+
+	thermal-zones {
+		cpu_thermal: cpu-thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 0>;
+		};
+
+		gpu_thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 1>;
+		};
 	};
 };
 
Signature · 1 line
2.24.1
author maintainer
#9 lore raw

PATCH v7 6/7 arm64: dts: allwinner: h6: Add thermal sensor and thermal zones

In reply to Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are two sensors, one for CPU, one for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +33 -0
index 29824081b43b..cdcb1a36301a 100644
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
 	interrupt-parent = <&gic>;
@@ -233,6 +234,12 @@ dma: dma-controller@3002000 {
 		sid: efuse@3006000 {
 			compatible = "allwinner,sun50i-h6-sid";
 			reg = <0x03006000 0x400>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ths_calibration: thermal-sensor-calibration@14 {
+				reg = <0x14 0x6>;
+			};
 		};
 
 		watchdog: watchdog@30090a0 {
@@ -856,5 +863,31 @@ r_i2c: i2c@7081400 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 		};
+
+		ths: thermal-sensor@5070400 {
+			compatible = "allwinner,sun50i-h6-ths";
+			reg = <0x05070400 0x100>;
+			interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_THS>;
+			clock-names = "bus";
+			resets = <&ccu RST_BUS_THS>;
+			nvmem-cells = <&ths_calibration>;
+			nvmem-cell-names = "calibration";
+			#thermal-sensor-cells = <1>;
+		};
+	};
+
+	thermal-zones {
+		cpu-thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 0>;
+		};
+
+		gpu-thermal {
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 1>;
+		};
 	};
 };
Signature · 1 line
2.24.1
#10 lore raw

Re: [PATCH v7 6/7] arm64: dts: allwinner: h6: Add thermal sensor and thermal zones

Quoted 24 lines · Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are two sensors, one for CPU, one for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -0
index 29824081b43b..cdcb1a36301a 100644
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        interrupt-parent = <&gic>;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi dma: dma-controller@3002000 { · line 241

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
@@ -233,6 +234,12 @@ dma: dma-controller@3002000 {
                sid: efuse@3006000 {
                        compatible = "allwinner,sun50i-h6-sid";
                        reg = <0x03006000 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ths_calibration: thermal-sensor-calibration@14 {
+                               reg = <0x14 0x6>;

Nit: my preference is to use words as the smallest increment, so this would have a size of 8 instead of 6. Same goes for the A64 dts.

AFAICT this doesn't impact the driver in any way.

ChenYu

Quoted 39 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +27 -1
+                       };
                };
 
                watchdog: watchdog@30090a0 {
@@ -856,5 +863,31 @@ r_i2c: i2c@7081400 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
+
+               ths: thermal-sensor@5070400 {
+                       compatible = "allwinner,sun50i-h6-ths";
+                       reg = <0x05070400 0x100>;
+                       interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_THS>;
+                       clock-names = "bus";
+                       resets = <&ccu RST_BUS_THS>;
+                       nvmem-cells = <&ths_calibration>;
+                       nvmem-cell-names = "calibration";
+                       #thermal-sensor-cells = <1>;
+               };
+       };
+
+       thermal-zones {
+               cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 0>;
+               };
+
+               gpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 1>;
+               };
        };
 };
--

2.24.1

author maintainer
#11 lore raw

Re: [PATCH v7 6/7] arm64: dts: allwinner: h6: Add thermal sensor and thermal zones

Quoted 38 lines · Chen-Yu Tsai
Quoted 24 lines · Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are two sensors, one for CPU, one for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -0
index 29824081b43b..cdcb1a36301a 100644
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        interrupt-parent = <&gic>;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi dma: dma-controller@3002000 { · line 241

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
@@ -233,6 +234,12 @@ dma: dma-controller@3002000 {
                sid: efuse@3006000 {
                        compatible = "allwinner,sun50i-h6-sid";
                        reg = <0x03006000 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ths_calibration: thermal-sensor-calibration@14 {
+                               reg = <0x14 0x6>;

Nit: my preference is to use words as the smallest increment, so this would have a size of 8 instead of 6. Same goes for the A64 dts.

Quoted 1 line

AFAICT this doesn't impact the driver in any way.

H6 has only 2 sensors, so it should be 4. That's my overlook, I'll change it to 4 for H6 and to 8 for A64.

Quoted 43 lines

ChenYu

Quoted 39 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +27 -1
+                       };
                };
 
                watchdog: watchdog@30090a0 {
@@ -856,5 +863,31 @@ r_i2c: i2c@7081400 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
+
+               ths: thermal-sensor@5070400 {
+                       compatible = "allwinner,sun50i-h6-ths";
+                       reg = <0x05070400 0x100>;
+                       interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_THS>;
+                       clock-names = "bus";
+                       resets = <&ccu RST_BUS_THS>;
+                       nvmem-cells = <&ths_calibration>;
+                       nvmem-cell-names = "calibration";
+                       #thermal-sensor-cells = <1>;
+               };
+       };
+
+       thermal-zones {
+               cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 0>;
+               };
+
+               gpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 1>;
+               };
        };
 };
--

2.24.1

#12 lore raw

Re: [PATCH v7 6/7] arm64: dts: allwinner: h6: Add thermal sensor and thermal zones

Quoted 39 lines · Vasily Khoruzhick
Quoted 38 lines · Chen-Yu Tsai
Quoted 24 lines · Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are two sensors, one for CPU, one for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -0
index 29824081b43b..cdcb1a36301a 100644
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        interrupt-parent = <&gic>;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi dma: dma-controller@3002000 { · line 241

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
@@ -233,6 +234,12 @@ dma: dma-controller@3002000 {
                sid: efuse@3006000 {
                        compatible = "allwinner,sun50i-h6-sid";
                        reg = <0x03006000 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ths_calibration: thermal-sensor-calibration@14 {
+                               reg = <0x14 0x6>;

Nit: my preference is to use words as the smallest increment, so this would have a size of 8 instead of 6. Same goes for the A64 dts.

Quoted 4 lines
Quoted 1 line

AFAICT this doesn't impact the driver in any way.

H6 has only 2 sensors, so it should be 4. That's my overlook, I'll change it to 4 for H6 and to 8 for A64.

No it's correct. There's 2 bytes reference temperature and 2x 2 byte values for individual sensor calibration constants.

regards,

	o.
Quoted 43 lines
Quoted 43 lines

ChenYu

Quoted 39 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +27 -1
+                       };
                };
 
                watchdog: watchdog@30090a0 {
@@ -856,5 +863,31 @@ r_i2c: i2c@7081400 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
+
+               ths: thermal-sensor@5070400 {
+                       compatible = "allwinner,sun50i-h6-ths";
+                       reg = <0x05070400 0x100>;
+                       interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_THS>;
+                       clock-names = "bus";
+                       resets = <&ccu RST_BUS_THS>;
+                       nvmem-cells = <&ths_calibration>;
+                       nvmem-cell-names = "calibration";
+                       #thermal-sensor-cells = <1>;
+               };
+       };
+
+       thermal-zones {
+               cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 0>;
+               };
+
+               gpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 1>;
+               };
        };
 };
--

2.24.1

author maintainer
#13 lore raw

Re: [PATCH v7 6/7] arm64: dts: allwinner: h6: Add thermal sensor and thermal zones

Quoted 41 lines · Ondřej Jirman
Quoted 39 lines · Vasily Khoruzhick
Quoted 38 lines · Chen-Yu Tsai
Quoted 24 lines · Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are two sensors, one for CPU, one for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -0
index 29824081b43b..cdcb1a36301a 100644
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        interrupt-parent = <&gic>;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi dma: dma-controller@3002000 { · line 241

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
@@ -233,6 +234,12 @@ dma: dma-controller@3002000 {
                sid: efuse@3006000 {
                        compatible = "allwinner,sun50i-h6-sid";
                        reg = <0x03006000 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ths_calibration: thermal-sensor-calibration@14 {
+                               reg = <0x14 0x6>;

Nit: my preference is to use words as the smallest increment, so this would have a size of 8 instead of 6. Same goes for the A64 dts.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

AFAICT this doesn't impact the driver in any way.

H6 has only 2 sensors, so it should be 4. That's my overlook, I'll change it to 4 for H6 and to 8 for A64.

No it's correct. There's 2 bytes reference temperature and 2x 2 byte values for individual sensor calibration constants.

So it should be 8 if we round it up to word boundary?

Quoted 46 lines

regards,

        o.
Quoted 43 lines
Quoted 43 lines

ChenYu

Quoted 39 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +27 -1
+                       };
                };
 
                watchdog: watchdog@30090a0 {
@@ -856,5 +863,31 @@ r_i2c: i2c@7081400 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
+
+               ths: thermal-sensor@5070400 {
+                       compatible = "allwinner,sun50i-h6-ths";
+                       reg = <0x05070400 0x100>;
+                       interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_THS>;
+                       clock-names = "bus";
+                       resets = <&ccu RST_BUS_THS>;
+                       nvmem-cells = <&ths_calibration>;
+                       nvmem-cell-names = "calibration";
+                       #thermal-sensor-cells = <1>;
+               };
+       };
+
+       thermal-zones {
+               cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 0>;
+               };
+
+               gpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 1>;
+               };
        };
 };
--

2.24.1

#14 lore raw

Re: [PATCH v7 6/7] arm64: dts: allwinner: h6: Add thermal sensor and thermal zones

Quoted 45 lines · Vasily Khoruzhick
Quoted 43 lines · Ondřej Jirman
Quoted 41 lines · Vasily Khoruzhick
Quoted 39 lines · Chen-Yu Tsai
Quoted 24 lines · Vasily Khoruzhick

From: Ondrej Jirman <[email protected]>

There are two sensors, one for CPU, one for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -0
index 29824081b43b..cdcb1a36301a 100644
@@ -11,6 +11,7 @@
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
 #include <dt-bindings/reset/sun50i-h6-r-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        interrupt-parent = <&gic>;

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi dma: dma-controller@3002000 { · line 241

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +5 -0
@@ -233,6 +234,12 @@ dma: dma-controller@3002000 {
                sid: efuse@3006000 {
                        compatible = "allwinner,sun50i-h6-sid";
                        reg = <0x03006000 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ths_calibration: thermal-sensor-calibration@14 {
+                               reg = <0x14 0x6>;

Nit: my preference is to use words as the smallest increment, so this would have a size of 8 instead of 6. Same goes for the A64 dts.

AFAICT this doesn't impact the driver in any way.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

H6 has only 2 sensors, so it should be 4. That's my overlook, I'll change it to 4 for H6 and to 8 for A64.

No it's correct. There's 2 bytes reference temperature and 2x 2 byte values for individual sensor calibration constants.

So it should be 8 if we round it up to word boundary?

That is correct.

Quoted 51 lines
Quoted 38 lines

regards,

        o.
Quoted 35 lines
Quoted 35 lines

ChenYu

Quoted 31 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +24 -0
+                       };
                };
 
                watchdog: watchdog@30090a0 {
@@ -856,5 +863,31 @@ r_i2c: i2c@7081400 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
+
+               ths: thermal-sensor@5070400 {
+                       compatible = "allwinner,sun50i-h6-ths";
+                       reg = <0x05070400 0x100>;
+                       interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&ccu CLK_BUS_THS>;
+                       clock-names = "bus";
+                       resets = <&ccu RST_BUS_THS>;
+                       nvmem-cells = <&ths_calibration>;
+                       nvmem-cell-names = "calibration";
+                       #thermal-sensor-cells = <1>;
+               };
+       };
+
+       thermal-zones {
+               cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 0>;
+               };
+
+               gpu-thermal {
+                       polling-delay-passive = <0>;
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +3 -1
+                       polling-delay = <0>;
+                       thermal-sensors = <&ths 1>;
+               };
        };
 };
--

2.24.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#15 lore raw

PATCH v7 7/7 arm64: dts: allwinner: a64: Add thermal sensors and thermal zones

In reply to Vasily Khoruzhick

A64 has 3 thermal sensors: 1 for CPU, 2 for GPU.

---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +42 -0
index 27e48234f1c2..e6556c6d7777 100644
@@ -49,6 +49,7 @@
 #include <dt-bindings/reset/sun50i-a64-ccu.h>
 #include <dt-bindings/reset/sun8i-de2.h>
 #include <dt-bindings/reset/sun8i-r-ccu.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
 	interrupt-parent = <&gic>;
@@ -211,6 +212,29 @@ timer {
 			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	thermal-zones {
+		cpu_thermal: cpu0-thermal {
+			/* milliseconds */
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 0>;
+		};
+
+		gpu0_thermal: gpu0-thermal {
+			/* milliseconds */
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 1>;
+		};
+
+		gpu1_thermal: gpu1-thermal {
+			/* milliseconds */
+			polling-delay-passive = <0>;
+			polling-delay = <0>;
+			thermal-sensors = <&ths 2>;
+		};
+	};
+
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -485,6 +509,12 @@ mmc2: mmc@1c11000 {
 		sid: eeprom@1c14000 {
 			compatible = "allwinner,sun50i-a64-sid";
 			reg = <0x1c14000 0x400>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ths_calibration: thermal-sensor-calibration@34 {
+				reg = <0x34 0x6>;
+			};
 		};
 
 		crypto: crypto@1c15000 {
@@ -810,6 +840,18 @@ codec: codec@1c22e00 {
 			status = "disabled";
 		};
 
+		ths: thermal-sensor@1c25000 {
+			compatible = "allwinner,sun50i-a64-ths";
+			reg = <0x01c25000 0x100>;
+			clocks = <&ccu CLK_BUS_THS>, <&ccu CLK_THS>;
+			clock-names = "bus", "mod";
+			interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+			resets = <&ccu RST_BUS_THS>;
+			nvmem-cells = <&ths_calibration>;
+			nvmem-cell-names = "calibration";
+			#thermal-sensor-cells = <1>;
+		};
+
 		uart0: serial@1c28000 {
 			compatible = "snps,dw-apb-uart";
 			reg = <0x01c28000 0x400>;
Signature · 1 line
2.24.1