Skip to content

Commit f76c87e

Browse files
committed
Merge branch 'pm-opp'
* pm-opp: dt-bindings: opp: Convert to DT schema dt-bindings: Clean-up OPP binding node names in examples ARM: dts: omap: Drop references to opp.txt
2 parents eabf9e6 + 2a3441f commit f76c87e

18 files changed

+757
-639
lines changed

Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Required properties:
1111
- None
1212

1313
Optional properties:
14-
- operating-points: Refer to Documentation/devicetree/bindings/opp/opp.txt for
14+
- operating-points: Refer to Documentation/devicetree/bindings/opp/opp-v1.yaml for
1515
details. OPPs *must* be supplied either via DT, i.e. this property, or
1616
populated at runtime.
1717
- clock-latency: Specify the possible maximum transition latency for clock,

Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Required properties:
1010
transition and not stable yet.
1111
Please refer to Documentation/devicetree/bindings/clock/clock-bindings.txt for
1212
generic clock consumer properties.
13-
- operating-points-v2: Please refer to Documentation/devicetree/bindings/opp/opp.txt
13+
- operating-points-v2: Please refer to Documentation/devicetree/bindings/opp/opp-v2.yaml
1414
for detail.
1515
- proc-supply: Regulator for Vproc of CPU cluster.
1616

Documentation/devicetree/bindings/cpufreq/cpufreq-st.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ from the SoC, then supplies the OPP framework with 'prop' and 'supported
66
hardware' information respectively. The framework is then able to read
77
the DT and operate in the usual way.
88

9-
For more information about the expected DT format [See: ../opp/opp.txt].
10-
119
Frequency Scaling only
1210
----------------------
1311

1412
No vendor specific driver required for this.
1513

1614
Located in CPU's node:
1715

18-
- operating-points : [See: ../power/opp.txt]
16+
- operating-points : [See: ../power/opp-v1.yaml]
1917

2018
Example [safe]
2119
--------------
@@ -37,7 +35,7 @@ This requires the ST CPUFreq driver to supply 'process' and 'version' info.
3735

3836
Located in CPU's node:
3937

40-
- operating-points-v2 : [See ../power/opp.txt]
38+
- operating-points-v2 : [See ../power/opp-v2.yaml]
4139

4240
Example [unsafe]
4341
----------------

Documentation/devicetree/bindings/cpufreq/nvidia,tegra20-cpufreq.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Binding for NVIDIA Tegra20 CPUFreq
44
Required properties:
55
- clocks: Must contain an entry for the CPU clock.
66
See ../clocks/clock-bindings.txt for details.
7-
- operating-points-v2: See ../bindings/opp/opp.txt for details.
7+
- operating-points-v2: See ../bindings/opp/opp-v2.yaml for details.
88
- #cooling-cells: Should be 2. See ../thermal/thermal-cooling-devices.yaml for details.
99

1010
For each opp entry in 'operating-points-v2' table:

Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Required properties:
88
- clocks: Phandles for clock specified in "clock-names" property
99
- clock-names : The name of clock used by the DFI, must be
1010
"pclk_ddr_mon";
11-
- operating-points-v2: Refer to Documentation/devicetree/bindings/opp/opp.txt
11+
- operating-points-v2: Refer to Documentation/devicetree/bindings/opp/opp-v2.yaml
1212
for details.
1313
- center-supply: DMC supply node.
1414
- status: Marks the node enabled/disabled.

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ examples:
136136
resets = <&reset 0>, <&reset 1>;
137137
};
138138
139-
gpu_opp_table: opp_table0 {
139+
gpu_opp_table: opp-table {
140140
compatible = "operating-points-v2";
141141
142142
opp-533000000 {

Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ examples:
160160
#cooling-cells = <2>;
161161
};
162162
163-
gpu_opp_table: opp_table0 {
163+
gpu_opp_table: opp-table {
164164
compatible = "operating-points-v2";
165165
166166
opp-533000000 {

Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ examples:
8181
noc_opp_table: opp-table {
8282
compatible = "operating-points-v2";
8383
84-
opp-133M {
84+
opp-133333333 {
8585
opp-hz = /bits/ 64 <133333333>;
8686
};
87-
opp-800M {
87+
opp-800000000 {
8888
opp-hz = /bits/ 64 <800000000>;
8989
};
9090
};

Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ description: |
1818
sun50i-cpufreq-nvmem driver reads the efuse value from the SoC to
1919
provide the OPP framework with required information.
2020
21+
allOf:
22+
- $ref: opp-v2-base.yaml#
23+
2124
properties:
2225
compatible:
2326
const: allwinner,sun50i-h6-operating-points
@@ -43,6 +46,7 @@ patternProperties:
4346

4447
properties:
4548
opp-hz: true
49+
clock-latency-ns: true
4650

4751
patternProperties:
4852
"opp-microvolt-.*": true
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/opp/opp-v1.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Generic OPP (Operating Performance Points) v1 Bindings
8+
9+
maintainers:
10+
- Viresh Kumar <[email protected]>
11+
12+
description: |+
13+
Devices work at voltage-current-frequency combinations and some implementations
14+
have the liberty of choosing these. These combinations are called Operating
15+
Performance Points aka OPPs. This document defines bindings for these OPPs
16+
applicable across wide range of devices. For illustration purpose, this document
17+
uses CPU as a device.
18+
19+
This binding only supports voltage-frequency pairs.
20+
21+
select: true
22+
23+
properties:
24+
operating-points:
25+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
26+
items:
27+
items:
28+
- description: Frequency in kHz
29+
- description: Voltage for OPP in uV
30+
31+
32+
additionalProperties: true
33+
examples:
34+
- |
35+
cpus {
36+
#address-cells = <1>;
37+
#size-cells = <0>;
38+
39+
cpu@0 {
40+
compatible = "arm,cortex-a9";
41+
device_type = "cpu";
42+
reg = <0>;
43+
next-level-cache = <&L2>;
44+
operating-points =
45+
/* kHz uV */
46+
<792000 1100000>,
47+
<396000 950000>,
48+
<198000 850000>;
49+
};
50+
};
51+
...

0 commit comments

Comments
 (0)