Commit b7dbe349 authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Viresh Kumar
Browse files

ARM: dts: omap34xx & omap36xx: replace opp-v1 tables by opp-v2 for 



With the driver installed, we can change the opp-v1 table format
to opp-v2.

In addition, move omap3 from whitelist to blacklist in cpufreq-dt-platdev
in the same patch, because doing either first breaks operation and
may make trouble in bisect.

We also can remove opp-v1 table for omap3-n950-n9 since its 1GHz
capability is now automatically detected.

We also fix a wrong OPP4 voltage for omap3430 which must be
0.6V + 54*12.5mV = 1275mV. Otherwise the twl4030 driver will reject
this OPP.

Note: the high speed OPPs that were not available in the opp-v1 tables
are tagged "turbo-mode;" which means they are not automatically
activated by the govenors or cpu-freq.

To enable you have to write

echo 1 >/sys/devices/system/cpu/cpufreq/boost

Note: to hard disable an OPP in a board.dts file use e.g.

&cpu0_opp_table: {
	/delete-node/ opp1g-1000000000;	/* do not use */
};

or alternatively:

&cpu0_opp_table: {
	opp1g-1000000000 {
		status = "disabled";	/* do not use */
	};
};

Signed-off-by: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarAdam Ford <aford173@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent b4bc9f9e

arch/arm/boot/dts/omap3-n950-n9.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
	cpus {

		cpu@0 {

			cpu0-supply = <&vcc>;

			operating-points = <

				/* kHz    uV */

				300000  1012500

				600000  1200000

				800000  1325000

				1000000	1375000

			>;

		};

	};

arch/arm/boot/dts/omap34xx.dtsi

+57 −9
Original line number Diff line number Diff line
@@ -16,19 +16,67 @@ 
/ {

	cpus {

		cpu: cpu@0 {

			/* OMAP343x/OMAP35xx variants OPP1-5 */

			operating-points = <

				/* kHz    uV */

				125000   975000

				250000  1075000

				500000  1200000

				550000  1270000

				600000  1350000

			>;

			/* OMAP343x/OMAP35xx variants OPP1-6 */

			operating-points-v2 = <&cpu0_opp_table>;



			clock-latency = <300000>; /* From legacy driver */

		};

	};



	/* see Documentation/devicetree/bindings/opp/opp.txt */

	cpu0_opp_table: opp-table {

		compatible = "operating-points-v2-ti-cpu";

		syscon = <&scm_conf>;



		opp1-125000000 {

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

			/*

			 * we currently only select the max voltage from table

			 * Table 3-3 of the omap3530 Data sheet (SPRS507F).

			 * Format is: <target min max>

			 */

			opp-microvolt = <975000 975000 975000>;

			/*

			 * first value is silicon revision bit mask

			 * second one 720MHz Device Identification bit mask

			 */

			opp-supported-hw = <0xffffffff 3>;

		};



		opp2-250000000 {

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

			opp-microvolt = <1075000 1075000 1075000>;

			opp-supported-hw = <0xffffffff 3>;

			opp-suspend;

		};



		opp3-500000000 {

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

			opp-microvolt = <1200000 1200000 1200000>;

			opp-supported-hw = <0xffffffff 3>;

		};



		opp4-550000000 {

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

			opp-microvolt = <1275000 1275000 1275000>;

			opp-supported-hw = <0xffffffff 3>;

		};



		opp5-600000000 {

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

			opp-microvolt = <1350000 1350000 1350000>;

			opp-supported-hw = <0xffffffff 3>;

		};



		opp6-720000000 {

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

			opp-microvolt = <1350000 1350000 1350000>;

			/* only high-speed grade omap3530 devices */

			opp-supported-hw = <0xffffffff 2>;

			turbo-mode;

		};

	};



	ocp@68000000 {

		omap3_pmx_core2: pinmux@480025d8 {

			compatible = "ti,omap3-padconf", "pinctrl-single";

arch/arm/boot/dts/omap36xx.dtsi

+46 −8
Original line number Diff line number Diff line
@@ -19,15 +19,53 @@ 
	};



	cpus {

		/* OMAP3630/OMAP37xx 'standard device' variants OPP50 to OPP130 */

		/* OMAP3630/OMAP37xx variants OPP50 to OPP130 and OPP1G */

		cpu: cpu@0 {

			operating-points = <

				/* kHz    uV */

				300000  1012500

				600000  1200000

				800000  1325000

			>;

			clock-latency = <300000>; /* From legacy driver */

			operating-points-v2 = <&cpu0_opp_table>;



			clock-latency = <300000>; /* From omap-cpufreq driver */

		};

	};



	/* see Documentation/devicetree/bindings/opp/opp.txt */

	cpu0_opp_table: opp-table {

		compatible = "operating-points-v2-ti-cpu";

		syscon = <&scm_conf>;



		opp50-300000000 {

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

			/*

			 * we currently only select the max voltage from table

			 * Table 4-19 of the DM3730 Data sheet (SPRS685B)

			 * Format is: <target min max>

			 */

			opp-microvolt = <1012500 1012500 1012500>;

			/*

			 * first value is silicon revision bit mask

			 * second one is "speed binned" bit mask

			 */

			opp-supported-hw = <0xffffffff 3>;

			opp-suspend;

		};



		opp100-600000000 {

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

			opp-microvolt = <1200000 1200000 1200000>;

			opp-supported-hw = <0xffffffff 3>;

		};



		opp130-800000000 {

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

			opp-microvolt = <1325000 1325000 1325000>;

			opp-supported-hw = <0xffffffff 3>;

		};



		opp1g-1000000000 {

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

			opp-microvolt = <1375000 1375000 1375000>;

			/* only on am/dm37x with speed-binned bit set */

			opp-supported-hw = <0xffffffff 2>;

			turbo-mode;

		};

	};

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ static const struct of_device_id whitelist[] __initconst = { 
	{ .compatible = "st-ericsson,u9540", },



	{ .compatible = "ti,omap2", },

	{ .compatible = "ti,omap3", },

	{ .compatible = "ti,omap4", },

	{ .compatible = "ti,omap5", },
@@ -137,6 +136,7 @@ static const struct of_device_id blacklist[] __initconst = { 
	{ .compatible = "ti,am33xx", },

	{ .compatible = "ti,am43", },

	{ .compatible = "ti,dra7", },

	{ .compatible = "ti,omap3", },



	{ }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE