From d8ad961d31913fe8452bebbf3cb6fbdce8cb5654 Mon Sep 17 00:00:00 2001 From: Finley Xiao Date: Wed, 3 May 2017 11:35:50 +0800 Subject: [PATCH] arm64: dts: rockchip: Rename OPP nodes as opp- Compiling the DT file with W=1, DTC warns like follows: Warning (unit_address_vs_reg): Node /opp_table0/opp@1000000000 has a unit name, but no reg property Fix this by replacing '@' with '-' as the OPP nodes will never have a "reg" property. Change-Id: I5748be7888db149633c3980c3f5e9715cd256a52 Signed-off-by: Finley Xiao --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 20 ++++---- arch/arm64/boot/dts/rockchip/rk3366.dtsi | 22 ++++---- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 38 +++++++------- .../dts/rockchip/rk3399-box-rev1-disvr.dts | 10 ++-- .../dts/rockchip/rk3399-box-rev2-disvr.dts | 10 ++-- .../dts/rockchip/rk3399-disvr-android.dts | 10 ++-- .../boot/dts/rockchip/rk3399-early-opp.dtsi | 28 +++++------ arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 50 +++++++++---------- 8 files changed, 94 insertions(+), 94 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 568cfd7e88cd..51c5ae61df12 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -107,33 +107,33 @@ compatible = "operating-points-v2"; opp-shared; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <950000>; clock-latency-ns = <40000>; opp-suspend; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <950000>; clock-latency-ns = <40000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <1000000>; clock-latency-ns = <40000>; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <1100000>; clock-latency-ns = <40000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <1225000>; clock-latency-ns = <40000>; }; - opp@1296000000 { + opp-1296000000 { opp-hz = /bits/ 64 <1296000000>; opp-microvolt = <1300000>; clock-latency-ns = <40000>; @@ -599,19 +599,19 @@ gpu_opp_table: opp-table2 { compatible = "operating-points-v2"; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <1050000>; }; - opp@300000000 { + opp-300000000 { opp-hz = /bits/ 64 <300000000>; opp-microvolt = <1050000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <1050000>; }; - opp@500000000 { + opp-500000000 { opp-hz = /bits/ 64 <500000000>; opp-microvolt = <1100000>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3366.dtsi b/arch/arm64/boot/dts/rockchip/rk3366.dtsi index 91c6d6c1b60e..f6159bac35ac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3366.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3366.dtsi @@ -131,29 +131,29 @@ compatible = "operating-points-v2"; opp-shared; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <950000>; clock-latency-ns = <40000>; opp-suspend; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <950000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <1000000>; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <1075000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <1175000>; }; - opp@1296000000 { + opp-1296000000 { opp-hz = /bits/ 64 <1296000000>; opp-microvolt = <1250000>; }; @@ -1712,23 +1712,23 @@ compatible = "operating-points-v2"; opp-shared; - opp@96000000 { + opp-96000000 { opp-hz = /bits/ 64 <96000000>; opp-microvolt = <1100000>; }; - opp@192000000 { + opp-192000000 { opp-hz = /bits/ 64 <192000000>; opp-microvolt = <1100000>; }; - opp@288000000 { + opp-288000000 { opp-hz = /bits/ 64 <288000000>; opp-microvolt = <1100000>; }; - opp@375000000 { + opp-375000000 { opp-hz = /bits/ 64 <375000000>; opp-microvolt = <1125000>; }; - opp@480000000 { + opp-480000000 { opp-hz = /bits/ 64 <480000000>; opp-microvolt = <1200000>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index 01376650fd38..d1a7c7547a2d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -223,7 +223,7 @@ nvmem-cells = <&cpu_leakage>; nvmem-cell-names = "cpu_leakage"; - opp@216000000 { + opp-216000000 { opp-hz = /bits/ 64 <216000000>; opp-microvolt = <950000 950000 1350000>; opp-microvolt-L0 = <1050000 1050000 1350000>; @@ -231,35 +231,35 @@ clock-latency-ns = <40000>; opp-suspend; }; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <950000 950000 1350000>; opp-microvolt-L0 = <1050000 1050000 1350000>; opp-microvolt-L1 = <950000 950000 1350000>; clock-latency-ns = <40000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <950000 950000 1350000>; opp-microvolt-L0 = <1050000 1050000 1350000>; opp-microvolt-L1 = <950000 950000 1350000>; clock-latency-ns = <40000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <1025000 1025000 1350000>; opp-microvolt-L0 = <1125000 1125000 1350000>; opp-microvolt-L1 = <1025000 1025000 1350000>; clock-latency-ns = <40000>; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <1125000 1125000 1350000>; opp-microvolt-L0 = <1225000 1225000 1350000>; opp-microvolt-L1 = <1125000 1125000 1350000>; clock-latency-ns = <40000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <1225000 1225000 1350000>; opp-microvolt-L0 = <1325000 1325000 1350000>; @@ -283,7 +283,7 @@ nvmem-cells = <&cpu_leakage>; nvmem-cell-names = "cpu_leakage"; - opp@216000000 { + opp-216000000 { opp-hz = /bits/ 64 <216000000>; opp-microvolt = <950000 950000 1350000>; opp-microvolt-L0 = <1050000 1050000 1350000>; @@ -291,56 +291,56 @@ clock-latency-ns = <40000>; opp-suspend; }; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <950000 950000 1350000>; opp-microvolt-L0 = <1050000 1050000 1350000>; opp-microvolt-L1 = <950000 950000 1350000>; clock-latency-ns = <40000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <950000 950000 1350000>; opp-microvolt-L0 = <1050000 1050000 1350000>; opp-microvolt-L1 = <950000 950000 1350000>; clock-latency-ns = <40000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <975000 975000 1350000>; opp-microvolt-L0 = <1075000 1075000 1350000>; opp-microvolt-L1 = <975000 975000 1350000>; clock-latency-ns = <40000>; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <1050000 1050000 1350000>; opp-microvolt-L0 = <1150000 1150000 1350000>; opp-microvolt-L1 = <1050000 1050000 1350000>; clock-latency-ns = <40000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <1150000 1150000 1350000>; opp-microvolt-L0 = <1250000 1250000 1350000>; opp-microvolt-L1 = <1150000 1150000 1350000>; clock-latency-ns = <40000>; }; - opp@1296000000 { + opp-1296000000 { opp-hz = /bits/ 64 <1296000000>; opp-microvolt = <1225000 1225000 1350000>; opp-microvolt-L0 = <1350000 1350000 1350000>; opp-microvolt-L1 = <1225000 1225000 1350000>; clock-latency-ns = <40000>; }; - opp@1416000000 { + opp-1416000000 { opp-hz = /bits/ 64 <1416000000>; opp-microvolt = <1300000 1300000 1350000>; opp-microvolt-L0 = <1350000 1350000 1350000>; opp-microvolt-L1 = <1300000 1300000 1350000>; clock-latency-ns = <40000>; }; - opp@1512000000 { + opp-1512000000 { opp-hz = /bits/ 64 <1512000000>; opp-microvolt = <1350000 1350000 1350000>; opp-microvolt-L0 = <1350000 1350000 1350000>; @@ -1589,19 +1589,19 @@ compatible = "operating-points-v2"; opp-shared; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <1100000>; }; - opp@288000000 { + opp-288000000 { opp-hz = /bits/ 64 <288000000>; opp-microvolt = <1100000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <1100000>; }; - opp@576000000 { + opp-576000000 { opp-hz = /bits/ 64 <576000000>; opp-microvolt = <1200000>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-disvr.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-disvr.dts index e98d091827e0..1ae09d1ad145 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-disvr.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-disvr.dts @@ -196,22 +196,22 @@ * and cpu(cluster1_opp) frequence. */ &gpu_opp_table { - opp@200000000 { + opp-200000000 { status = "disabled"; }; - opp@297000000 { + opp-297000000 { status = "disabled"; }; }; &cluster1_opp { - opp@408000000 { + opp-408000000 { status = "disabled"; }; - opp@600000000 { + opp-600000000 { status = "disabled"; }; - opp@816000000 { + opp-816000000 { status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-disvr.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-disvr.dts index 8fc423139d78..99275c8261ae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-disvr.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-disvr.dts @@ -234,22 +234,22 @@ * and cpu(cluster1_opp) frequence. */ &gpu_opp_table { - opp@200000000 { + opp-200000000 { status = "disabled"; }; - opp@297000000 { + opp-297000000 { status = "disabled"; }; }; &cluster1_opp { - opp@408000000 { + opp-408000000 { status = "disabled"; }; - opp@600000000 { + opp-600000000 { status = "disabled"; }; - opp@816000000 { + opp-816000000 { status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts index e6a5f72b074c..ebbcef85606b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-disvr-android.dts @@ -839,22 +839,22 @@ * and cpu(cluster1_opp) frequence. */ &gpu_opp_table { - opp@200000000 { + opp-200000000 { status = "disabled"; }; - opp@297000000 { + opp-297000000 { status = "disabled"; }; }; &cluster1_opp { - opp@408000000 { + opp-408000000 { status = "disabled"; }; - opp@600000000 { + opp-600000000 { status = "disabled"; }; - opp@816000000 { + opp-816000000 { status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi index ac848c3a00a9..ae1007705f36 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-early-opp.dtsi @@ -54,28 +54,28 @@ compatible = "operating-points-v2"; opp-shared; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <900000>; clock-latency-ns = <40000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <900000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <900000>; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <900000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <950000>; }; - opp@1416000000 { + opp-1416000000 { opp-hz = /bits/ 64 <1416000000>; opp-microvolt = <1050000>; }; @@ -85,24 +85,24 @@ compatible = "operating-points-v2"; opp-shared; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <900000>; clock-latency-ns = <40000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <900000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <900000>; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <950000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <100000>; }; @@ -111,15 +111,15 @@ gpu_opp_table: opp-table2 { compatible = "operating-points-v2"; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <900000>; }; - opp@297000000 { + opp-297000000 { opp-hz = /bits/ 64 <297000000>; opp-microvolt = <900000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <900000>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi index d3a5171b121d..b7bc017e676d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi @@ -47,33 +47,33 @@ compatible = "operating-points-v2"; opp-shared; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <800000>; clock-latency-ns = <40000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <800000>; clock-latency-ns = <40000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <850000>; clock-latency-ns = <40000>; opp-suspend; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <925000>; clock-latency-ns = <40000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <1000000>; clock-latency-ns = <40000>; }; - opp@1416000000 { + opp-1416000000 { opp-hz = /bits/ 64 <1416000000>; opp-microvolt = <1125000>; clock-latency-ns = <40000>; @@ -84,43 +84,43 @@ compatible = "operating-points-v2"; opp-shared; - opp@408000000 { + opp-408000000 { opp-hz = /bits/ 64 <408000000>; opp-microvolt = <800000>; clock-latency-ns = <40000>; }; - opp@600000000 { + opp-600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <800000>; clock-latency-ns = <40000>; }; - opp@816000000 { + opp-816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <825000>; clock-latency-ns = <40000>; opp-suspend; }; - opp@1008000000 { + opp-1008000000 { opp-hz = /bits/ 64 <1008000000>; opp-microvolt = <875000>; clock-latency-ns = <40000>; }; - opp@1200000000 { + opp-1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <950000>; clock-latency-ns = <40000>; }; - opp@1416000000 { + opp-1416000000 { opp-hz = /bits/ 64 <1416000000>; opp-microvolt = <1025000>; clock-latency-ns = <40000>; }; - opp@1608000000 { + opp-1608000000 { opp-hz = /bits/ 64 <1608000000>; opp-microvolt = <1100000>; clock-latency-ns = <40000>; }; - opp@1800000000 { + opp-1800000000 { opp-hz = /bits/ 64 <1800000000>; opp-microvolt = <1200000>; clock-latency-ns = <40000>; @@ -130,27 +130,27 @@ gpu_opp_table: opp-table2 { compatible = "operating-points-v2"; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <800000>; }; - opp@297000000 { + opp-297000000 { opp-hz = /bits/ 64 <297000000>; opp-microvolt = <800000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <825000>; }; - opp@500000000 { + opp-500000000 { opp-hz = /bits/ 64 <500000000>; opp-microvolt = <875000>; }; - opp@594000000 { + opp-594000000 { opp-hz = /bits/ 64 <594000000>; opp-microvolt = <925000>; }; - opp@800000000 { + opp-800000000 { opp-hz = /bits/ 64 <800000000>; opp-microvolt = <1100000>; }; @@ -159,23 +159,23 @@ dmc_opp_table: opp-table3 { compatible = "operating-points-v2"; - opp@200000000 { + opp-200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <825000>; }; - opp@297000000 { + opp-297000000 { opp-hz = /bits/ 64 <297000000>; opp-microvolt = <850000>; }; - opp@400000000 { + opp-400000000 { opp-hz = /bits/ 64 <400000000>; opp-microvolt = <850000>; }; - opp@594000000 { + opp-594000000 { opp-hz = /bits/ 64 <594000000>; opp-microvolt = <900000>; }; - opp@800000000 { + opp-800000000 { opp-hz = /bits/ 64 <800000000>; opp-microvolt = <900000>; }; -- 2.34.1