Commit c6d4a897 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

ARM: tegra: Rename CPU and EMC OPP table device-tree nodes 



OPP table name now should start with "opp-table" and OPP entries
shouldn't contain commas and @ signs in accordance to the new schema
requirement. Reorganize CPU and EMC OPP table device-tree nodes.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 272c5c3a

arch/arm/boot/dts/tegra124-apalis-emc.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1477,9 +1477,9 @@ timing-924000000 { 
};



&emc_icc_dvfs_opp_table {

	/delete-node/ opp@1200000000,1100;

	/delete-node/ opp-1200000000-1100;

};



&emc_bw_dfs_opp_table {

	/delete-node/ opp@1200000000;

	/delete-node/ opp-1200000000;

};

arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -2432,9 +2432,9 @@ timing-924000000 { 
};



&emc_icc_dvfs_opp_table {

	/delete-node/ opp@1200000000,1100;

	/delete-node/ opp-1200000000-1100;

};



&emc_bw_dfs_opp_table {

	/delete-node/ opp@1200000000;

	/delete-node/ opp-1200000000;

};

arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -6681,11 +6681,11 @@ timing-792000000 { 
};



&emc_icc_dvfs_opp_table {

	/delete-node/ opp@924000000,1100;

	/delete-node/ opp@1200000000,1100;

	/delete-node/ opp-924000000-1100;

	/delete-node/ opp-1200000000-1100;

};



&emc_bw_dfs_opp_table {

	/delete-node/ opp@924000000;

	/delete-node/ opp@1200000000;

	/delete-node/ opp-924000000;

	/delete-node/ opp-1200000000;

};

arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -2058,11 +2058,11 @@ timing-792000000 { 
};



&emc_icc_dvfs_opp_table {

	/delete-node/ opp@924000000,1100;

	/delete-node/ opp@1200000000,1100;

	/delete-node/ opp-924000000-1100;

	/delete-node/ opp-1200000000-1100;

};



&emc_bw_dfs_opp_table {

	/delete-node/ opp@924000000;

	/delete-node/ opp@1200000000;

	/delete-node/ opp-924000000;

	/delete-node/ opp-1200000000;

};

arch/arm/boot/dts/tegra124-peripherals-opp.dtsi

+70 −70
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/ {

	emc_icc_dvfs_opp_table: emc-dvfs-opp-table {

	emc_icc_dvfs_opp_table: opp-table-emc {

		compatible = "operating-points-v2";



		opp@12750000,800 {

		opp-12750000-800 {

			opp-microvolt = <800000 800000 1150000>;

			opp-hz = /bits/ 64 <12750000>;

			opp-supported-hw = <0x0003>;

		};



		opp@12750000,950 {

		opp-12750000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <12750000>;

			opp-supported-hw = <0x0008>;

		};



		opp@12750000,1050 {

		opp-12750000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <12750000>;

			opp-supported-hw = <0x0010>;

		};



		opp@12750000,1110 {

		opp-12750000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <12750000>;

			opp-supported-hw = <0x0004>;

		};



		opp@20400000,800 {

		opp-20400000-800 {

			opp-microvolt = <800000 800000 1150000>;

			opp-hz = /bits/ 64 <20400000>;

			opp-supported-hw = <0x0003>;

		};



		opp@20400000,950 {

		opp-20400000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <20400000>;

			opp-supported-hw = <0x0008>;

		};



		opp@20400000,1050 {

		opp-20400000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <20400000>;

			opp-supported-hw = <0x0010>;

		};



		opp@20400000,1110 {

		opp-20400000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <20400000>;

			opp-supported-hw = <0x0004>;

		};



		opp@40800000,800 {

		opp-40800000-800 {

			opp-microvolt = <800000 800000 1150000>;

			opp-hz = /bits/ 64 <40800000>;

			opp-supported-hw = <0x0003>;

		};



		opp@40800000,950 {

		opp-40800000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <40800000>;

			opp-supported-hw = <0x0008>;

		};



		opp@40800000,1050 {

		opp-40800000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <40800000>;

			opp-supported-hw = <0x0010>;

		};



		opp@40800000,1110 {

		opp-40800000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <40800000>;

			opp-supported-hw = <0x0004>;

		};



		opp@68000000,800 {

		opp-68000000-800 {

			opp-microvolt = <800000 800000 1150000>;

			opp-hz = /bits/ 64 <68000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@68000000,950 {

		opp-68000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <68000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@68000000,1050 {

		opp-68000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <68000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@68000000,1110 {

		opp-68000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <68000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@102000000,800 {

		opp-102000000-800 {

			opp-microvolt = <800000 800000 1150000>;

			opp-hz = /bits/ 64 <102000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@102000000,950 {

		opp-102000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <102000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@102000000,1050 {

		opp-102000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <102000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@102000000,1110 {

		opp-102000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <102000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@204000000,800 {

		opp-204000000-800 {

			opp-microvolt = <800000 800000 1150000>;

			opp-hz = /bits/ 64 <204000000>;

			opp-supported-hw = <0x0003>;

			opp-suspend;

		};



		opp@204000000,950 {

		opp-204000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <204000000>;

			opp-supported-hw = <0x0008>;

			opp-suspend;

		};



		opp@204000000,1050 {

		opp-204000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <204000000>;

			opp-supported-hw = <0x0010>;

			opp-suspend;

		};



		opp@204000000,1110 {

		opp-204000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <204000000>;

			opp-supported-hw = <0x0004>;

			opp-suspend;

		};



		opp@264000000,800 {

		opp-264000000-800 {

			opp-microvolt = <800000 800000 1150000>;

			opp-hz = /bits/ 64 <264000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@264000000,950 {

		opp-264000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <264000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@264000000,1050 {

		opp-264000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <264000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@264000000,1110 {

		opp-264000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <264000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@300000000,850 {

		opp-300000000-850 {

			opp-microvolt = <850000 850000 1150000>;

			opp-hz = /bits/ 64 <300000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@300000000,950 {

		opp-300000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <300000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@300000000,1050 {

		opp-300000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <300000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@300000000,1110 {

		opp-300000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <300000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@348000000,850 {

		opp-348000000-850 {

			opp-microvolt = <850000 850000 1150000>;

			opp-hz = /bits/ 64 <348000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@348000000,950 {

		opp-348000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <348000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@348000000,1050 {

		opp-348000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <348000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@348000000,1110 {

		opp-348000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <348000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@396000000,950 {

		opp-396000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <396000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@396000000,1000 {

		opp-396000000-1000 {

			opp-microvolt = <1000000 1000000 1150000>;

			opp-hz = /bits/ 64 <396000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@396000000,1050 {

		opp-396000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <396000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@396000000,1110 {

		opp-396000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <396000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@528000000,950 {

		opp-528000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <528000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@528000000,1000 {

		opp-528000000-1000 {

			opp-microvolt = <1000000 1000000 1150000>;

			opp-hz = /bits/ 64 <528000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@528000000,1050 {

		opp-528000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <528000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@528000000,1110 {

		opp-528000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <528000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@600000000,950 {

		opp-600000000-950 {

			opp-microvolt = <950000 950000 1150000>;

			opp-hz = /bits/ 64 <600000000>;

			opp-supported-hw = <0x0008>;

		};



		opp@600000000,1000 {

		opp-600000000-1000 {

			opp-microvolt = <1000000 1000000 1150000>;

			opp-hz = /bits/ 64 <600000000>;

			opp-supported-hw = <0x0003>;

		};



		opp@600000000,1050 {

		opp-600000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <600000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@600000000,1110 {

		opp-600000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <600000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@792000000,1000 {

		opp-792000000-1000 {

			opp-microvolt = <1000000 1000000 1150000>;

			opp-hz = /bits/ 64 <792000000>;

			opp-supported-hw = <0x000B>;

		};



		opp@792000000,1050 {

		opp-792000000-1050 {

			opp-microvolt = <1050000 1050000 1150000>;

			opp-hz = /bits/ 64 <792000000>;

			opp-supported-hw = <0x0010>;

		};



		opp@792000000,1110 {

		opp-792000000-1110 {

			opp-microvolt = <1110000 1110000 1150000>;

			opp-hz = /bits/ 64 <792000000>;

			opp-supported-hw = <0x0004>;

		};



		opp@924000000,1100 {

		opp-924000000-1100 {

			opp-microvolt = <1100000 1100000 1150000>;

			opp-hz = /bits/ 64 <924000000>;

			opp-supported-hw = <0x0013>;

		};



		opp@1200000000,1100 {

		opp-1200000000-1100 {

			opp-microvolt = <1100000 1100000 1150000>;

			opp-hz = /bits/ 64 <1200000000>;

			opp-supported-hw = <0x0003>;

		};

	};



	emc_bw_dfs_opp_table: emc-bandwidth-opp-table {

	emc_bw_dfs_opp_table: opp-table-actmon {

		compatible = "operating-points-v2";



		opp@12750000 {

		opp-12750000 {

			opp-hz = /bits/ 64 <12750000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <204000>;

		};



		opp@20400000 {

		opp-20400000 {

			opp-hz = /bits/ 64 <20400000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <326400>;

		};



		opp@40800000 {

		opp-40800000 {

			opp-hz = /bits/ 64 <40800000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <652800>;

		};



		opp@68000000 {

		opp-68000000 {

			opp-hz = /bits/ 64 <68000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <1088000>;

		};



		opp@102000000 {

		opp-102000000 {

			opp-hz = /bits/ 64 <102000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <1632000>;

		};



		opp@204000000 {

		opp-204000000 {

			opp-hz = /bits/ 64 <204000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <3264000>;

			opp-suspend;

		};



		opp@264000000 {

		opp-264000000 {

			opp-hz = /bits/ 64 <264000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <4224000>;

		};



		opp@300000000 {

		opp-300000000 {

			opp-hz = /bits/ 64 <300000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <4800000>;

		};



		opp@348000000 {

		opp-348000000 {

			opp-hz = /bits/ 64 <348000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <5568000>;

		};



		opp@396000000 {

		opp-396000000 {

			opp-hz = /bits/ 64 <396000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <6336000>;

		};



		opp@528000000 {

		opp-528000000 {

			opp-hz = /bits/ 64 <528000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <8448000>;

		};



		opp@600000000 {

		opp-600000000 {

			opp-hz = /bits/ 64 <600000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <9600000>;

		};



		opp@792000000 {

		opp-792000000 {

			opp-hz = /bits/ 64 <792000000>;

			opp-supported-hw = <0x001F>;

			opp-peak-kBps = <12672000>;

		};



		opp@924000000 {

		opp-924000000 {

			opp-hz = /bits/ 64 <924000000>;

			opp-supported-hw = <0x0013>;

			opp-peak-kBps = <14784000>;

		};



		opp@1200000000 {

		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-supported-hw = <0x0003>;

			opp-peak-kBps = <19200000>;