Skip to contentSkip to conversation

ARM: dts: omap: Drop references to opp.txt

PATCH Applied Rob Herring 4 participants 6 messages Jul 20, 2021 – Jul 26, 2021

Subsystems (13)
lore
Share & tools
lore
author maintainer
#1 lore raw

PATCH v3 2/3 dt-bindings: Clean-up OPP binding node names in examples

In reply to Rob Herring

In preparation to convert OPP bindings to DT schema, clean-up a few OPP binding node names in the binding examples.

---
 Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml   | 2 +-
 Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml   | 2 +-
 .../devicetree/bindings/interconnect/fsl,imx8m-noc.yaml       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml +1 -1
index 0f73f436bea7..4bea51d1e7ea 100644
@@ -136,7 +136,7 @@ examples:
       resets = <&reset 0>, <&reset 1>;
     };
 
-    gpu_opp_table: opp_table0 {
+    gpu_opp_table: opp-table {
       compatible = "operating-points-v2";
 
       opp-533000000 {
Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml +1 -1
index 696c17aedbbe..d209f272625d 100644
@@ -160,7 +160,7 @@ examples:
       #cooling-cells = <2>;
     };
 
-    gpu_opp_table: opp_table0 {
+    gpu_opp_table: opp-table {
       compatible = "operating-points-v2";
 
       opp-533000000 {
Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml +2 -2
index a8873739d61a..b8204ed22dd5 100644
@@ -81,10 +81,10 @@ examples:
         noc_opp_table: opp-table {
             compatible = "operating-points-v2";
 
-            opp-133M {
+            opp-133333333 {
                 opp-hz = /bits/ 64 <133333333>;
             };
-            opp-800M {
+            opp-800000000 {
                 opp-hz = /bits/ 64 <800000000>;
             };
         };
Signature · 1 line
2.27.0
author maintainer
#3 lore raw

PATCH v3 3/3 dt-bindings: opp: Convert to DT schema

In reply to Rob Herring

Convert the OPP v1 and v2 bindings to DT schema format. As the OPPv2 binding can be extended by vendors, we need to split the common part out from the "operating-points-v2" conforming compatible.

---
v3:
- Update opp.txt references
- Change vendor,cpu-type to foo,cpu-type to avoid compatible warning

v2:
- move opp-peak-kBps next to opp-avg-kBps. Also add a dependency schema.
- Correct the opp-microamp schemas. It's always a single value for each regulator.
- Add missing type for '^opp-microamp-'

---
 .../bindings/cpufreq/cpufreq-dt.txt           |   2 +-
 .../bindings/cpufreq/cpufreq-mediatek.txt     |   2 +-
 .../bindings/cpufreq/cpufreq-st.txt           |   6 +-
 .../cpufreq/nvidia,tegra20-cpufreq.txt        |   2 +-
 .../bindings/devfreq/rk3399_dmc.txt           |   2 +-
 .../allwinner,sun50i-h6-operating-points.yaml |   4 +
 .../devicetree/bindings/opp/opp-v1.yaml       |  51 ++
 .../devicetree/bindings/opp/opp-v2-base.yaml  | 214 ++++++
 .../devicetree/bindings/opp/opp-v2.yaml       | 475 +++++++++++++
 Documentation/devicetree/bindings/opp/opp.txt | 622 ------------------
 .../devicetree/bindings/opp/qcom-opp.txt      |   2 +-
 .../bindings/opp/ti-omap5-opp-supply.txt      |   2 +-
 .../bindings/power/power-domain.yaml          |   2 +-
 13 files changed, 753 insertions(+), 633 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/opp/opp-v1.yaml
 create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-base.yaml
 create mode 100644 Documentation/devicetree/bindings/opp/opp-v2.yaml
 delete mode 100644 Documentation/devicetree/bindings/opp/opp.txt
Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt +1 -1
index 56f442374383..1d7e49167666 100644
@@ -11,7 +11,7 @@ Required properties:
 - None
 
 Optional properties:
-- operating-points: Refer to Documentation/devicetree/bindings/opp/opp.txt for
+- operating-points: Refer to Documentation/devicetree/bindings/opp/opp-v1.yaml for
   details. OPPs *must* be supplied either via DT, i.e. this property, or
   populated at runtime.
 - clock-latency: Specify the possible maximum transition latency for clock,
Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek.txt +1 -1
index ef68711716fb..b8233ec91d3d 100644
@@ -10,7 +10,7 @@ Required properties:
 			  transition and not stable yet.
 	Please refer to Documentation/devicetree/bindings/clock/clock-bindings.txt for
 	generic clock consumer properties.
-- operating-points-v2: Please refer to Documentation/devicetree/bindings/opp/opp.txt
+- operating-points-v2: Please refer to Documentation/devicetree/bindings/opp/opp-v2.yaml
 	for detail.
 - proc-supply: Regulator for Vproc of CPU cluster.
 
Documentation/devicetree/bindings/cpufreq/cpufreq-st.txt +2 -4
index d91a02a3b6b0..6b0b452acef0 100644
@@ -6,8 +6,6 @@ from the SoC, then supplies the OPP framework with 'prop' and 'supported
 hardware' information respectively.  The framework is then able to read
 the DT and operate in the usual way.
 
-For more information about the expected DT format [See: ../opp/opp.txt].
-
 Frequency Scaling only
 ----------------------
 
@@ -15,7 +13,7 @@ No vendor specific driver required for this.
 
 Located in CPU's node:
 
-- operating-points		: [See: ../power/opp.txt]
+- operating-points		: [See: ../power/opp-v1.yaml]
 
 Example [safe]
 --------------
@@ -37,7 +35,7 @@ This requires the ST CPUFreq driver to supply 'process' and 'version' info.
 
 Located in CPU's node:
 
-- operating-points-v2		: [See ../power/opp.txt]
+- operating-points-v2		: [See ../power/opp-v2.yaml]
 
 Example [unsafe]
 ----------------
Documentation/devicetree/bindings/cpufreq/nvidia,tegra20-cpufreq.txt +1 -1
index 52a24b82fd86..bdbfd7c36101 100644
@@ -4,7 +4,7 @@ Binding for NVIDIA Tegra20 CPUFreq
 Required properties:
 - clocks: Must contain an entry for the CPU clock.
   See ../clocks/clock-bindings.txt for details.
-- operating-points-v2: See ../bindings/opp/opp.txt for details.
+- operating-points-v2: See ../bindings/opp/opp-v2.yaml for details.
 - #cooling-cells: Should be 2. See ../thermal/thermal-cooling-devices.yaml for details.
 
 For each opp entry in 'operating-points-v2' table:
Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt +1 -1
index ac189dd82b08..3fbeb3733c48 100644
@@ -8,7 +8,7 @@ Required properties:
 - clocks:		 Phandles for clock specified in "clock-names" property
 - clock-names :		 The name of clock used by the DFI, must be
 			 "pclk_ddr_mon";
-- operating-points-v2:	 Refer to Documentation/devicetree/bindings/opp/opp.txt
+- operating-points-v2:	 Refer to Documentation/devicetree/bindings/opp/opp-v2.yaml
 			 for details.
 - center-supply:	 DMC supply node.
 - status:		 Marks the node enabled/disabled.
Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml +4 -0
index aeff2bd774dd..729ae97b63d9 100644
@@ -18,6 +18,9 @@ description: |
   sun50i-cpufreq-nvmem driver reads the efuse value from the SoC to
   provide the OPP framework with required information.
 
+allOf:
+  - $ref: opp-v2-base.yaml#
+
 properties:
   compatible:
     const: allwinner,sun50i-h6-operating-points
@@ -43,6 +46,7 @@ patternProperties:
 
     properties:
       opp-hz: true
+      clock-latency-ns: true
 
     patternProperties:
       "opp-microvolt-.*": true
Documentation/devicetree/bindings/opp/opp-v1.yaml new file +51 -0

51 lines not on this page · raw message

Documentation/devicetree/bindings/opp/opp-v2-base.yaml new file +214 -0

214 lines not on this page · raw message

Documentation/devicetree/bindings/opp/opp-v2.yaml new file +475 -0

475 lines not on this page · raw message

Documentation/devicetree/bindings/opp/opp.txt deleted +0 -622

622 lines not on this page · raw message

Documentation/devicetree/bindings/opp/qcom-opp.txt +1 -1
index 32eb0793c7e6..41d3e4ff2dc3 100644
@@ -1,7 +1,7 @@
 Qualcomm OPP bindings to describe OPP nodes
 
 The bindings are based on top of the operating-points-v2 bindings
-described in Documentation/devicetree/bindings/opp/opp.txt
+described in Documentation/devicetree/bindings/opp/opp-v2-base.yaml
 Additional properties are described below.
 
 * OPP Table Node
Documentation/devicetree/bindings/opp/ti-omap5-opp-supply.txt +1 -1
index 832346e489a3..b70d326117cd 100644
@@ -13,7 +13,7 @@ regulators to the device that will undergo OPP transitions we can make use
 of the multi regulator binding that is part of the OPP core described here [1]
 to describe both regulators needed by the platform.
 
-[1] Documentation/devicetree/bindings/opp/opp.txt
+[1] Documentation/devicetree/bindings/opp/opp-v2.yaml
 
 Required Properties for Device Node:
 - vdd-supply: phandle to regulator controlling VDD supply
Documentation/devicetree/bindings/power/power-domain.yaml +1 -1
index aed51e9dcb11..3143ed9a3313 100644
@@ -46,7 +46,7 @@ properties:
       Phandles to the OPP tables of power domains provided by a power domain
       provider. If the provider provides a single power domain only or all
       the power domains provided by the provider have identical OPP tables,
-      then this shall contain a single phandle. Refer to ../opp/opp.txt
+      then this shall contain a single phandle. Refer to ../opp/opp-v2-base.yaml
       for more information.
 
   "#power-domain-cells":
Signature · 7 lines
2.27.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Acked-by on v3 3/3
#4 lore raw

Re: [PATCH v3 3/3] dt-bindings: opp: Convert to DT schema

Quoted 4 lines · Rob Herring

Convert the OPP v1 and v2 bindings to DT schema format. As the OPPv2 binding can be extended by vendors, we need to split the common part out from the "operating-points-v2" conforming compatible.

Quoted 9 lines

I spent some time a couple of weeks ago trying to figure it out, I'm glad you ended up doing it :)

Thanks!

Maxime

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

Rob Herring

author maintainer
#0 lore raw

PATCH v3 1/3 ARM: dts: omap: Drop references to opp.txt

opp.txt is getting removed with the OPP binding converted to DT schema. As it is unusual to reference a binding doc from a dts file, let's just remove the reference.

Cc "Benoît Cousson" <[email protected]>
Cc Tony Lindgren <[email protected]>
---
 arch/arm/boot/dts/omap34xx.dtsi | 1 -
 arch/arm/boot/dts/omap36xx.dtsi | 1 -
 2 files changed, 2 deletions(-)
arch/arm/boot/dts/omap34xx.dtsi +0 -1
index feaa43b78535..8b8451399784 100644
@@ -24,7 +24,6 @@ cpu: cpu@0 {
 		};
 	};
 
-	/* see Documentation/devicetree/bindings/opp/opp.txt */
 	cpu0_opp_table: opp-table {
 		compatible = "operating-points-v2-ti-cpu";
 		syscon = <&scm_conf>;
arch/arm/boot/dts/omap36xx.dtsi +0 -1
index 20844dbc002e..22b33098b1a2 100644
@@ -29,7 +29,6 @@ cpu: cpu@0 {
 		};
 	};
 
-	/* see Documentation/devicetree/bindings/opp/opp.txt */
 	cpu0_opp_table: opp-table {
 		compatible = "operating-points-v2-ti-cpu";
 		syscon = <&scm_conf>;
Signature · 1 line
2.27.0
maintainer Acked-by on v3 2/3
#2 lore raw

Re: [PATCH v3 2/3] dt-bindings: Clean-up OPP binding node names in examples

In reply to Rob Herring
Quoted 11 lines · Rob Herring

In preparation to convert OPP bindings to DT schema, clean-up a few OPP binding node names in the binding examples.

Quoted 50 lines
---
  Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml   | 2 +-
  Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml   | 2 +-
  .../devicetree/bindings/interconnect/fsl,imx8m-noc.yaml       | 4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml +1 -1
index 0f73f436bea7..4bea51d1e7ea 100644
@@ -136,7 +136,7 @@ examples:
        resets = <&reset 0>, <&reset 1>;
      };
 
-    gpu_opp_table: opp_table0 {
+    gpu_opp_table: opp-table {
        compatible = "operating-points-v2";
 
        opp-533000000 {
Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml +1 -1
index 696c17aedbbe..d209f272625d 100644
@@ -160,7 +160,7 @@ examples:
        #cooling-cells = <2>;
      };
 
-    gpu_opp_table: opp_table0 {
+    gpu_opp_table: opp-table {
        compatible = "operating-points-v2";
 
        opp-533000000 {
Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml +2 -2
index a8873739d61a..b8204ed22dd5 100644
@@ -81,10 +81,10 @@ examples:
          noc_opp_table: opp-table {
              compatible = "operating-points-v2";
 
-            opp-133M {
+            opp-133333333 {
                  opp-hz = /bits/ 64 <133333333>;
              };
-            opp-800M {
+            opp-800000000 {
                  opp-hz = /bits/ 64 <800000000>;
              };
          };
maintainer Applied
#5 lore raw
In reply to Rob Herring
Quoted 4 lines · Rob Herring

opp.txt is getting removed with the OPP binding converted to DT schema. As it is unusual to reference a binding doc from a dts file, let's just remove the reference.

Quoted 8 lines
Cc "Benoît Cousson" <[email protected]>
Cc Tony Lindgren <[email protected]>
---
 arch/arm/boot/dts/omap34xx.dtsi | 1 -
 arch/arm/boot/dts/omap36xx.dtsi | 1 -
 2 files changed, 2 deletions(-)

Applied all 3. Thanks.

Signature · 1 line
viresh