Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd700a9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpufreq: Delete unused CPUBW and cache scaling code from cpufreq driver"

parents cd34f5e7 527ca23a

Documentation/devicetree/bindings/arm/msm/msm-cpufreq.txt

+24 −24
Original line number Diff line number Diff line 
Qualcomm MSM CPUfreq device



msm-cpufreq is a device that represents the list of useable CPU frequencies

and the cache frequency and/or memory bandwidth required for each of them. It

also captures the bus master/slave ports towards which the bus bandwidth

requests need to be made to ensure the required memory bandwidth.

msm-cpufreq is a device that represents the list of usable CPU frequencies

and provides a device handle for the CPUfreq driver to get the CPU and cache

clocks.



Required properties:

- compatible:		Must be "qcom,msm-cpufreq"

- qcom,cpufreq-table:	A list of tuples where each tuple consists of a

			usable CPU frequency (KHz), an optional cache

			frequency (KHz) and a mandatory memory bandwidth

			value (MBPS) listed in that order.  The cache

			frequencies shall not be listed if the device cannot

			run the cache asynchronous to one or more CPUs.

- qcom,cpufreq-table:	A list of usable CPU frequencies (KHz)



Optional properties:

- clock-names:		When DT based binding of clock is available, this

			provides a list of CPU subsystem clocks.

			"cpuX_clk" for every CPU that's present.

			"l2_clk" when an async cache/CCI is present.



Example:

	qcom,msm-cpufreq@0 {

		regs = <0 4>

		compatible = "qcom,msm-cpufreq";

		qcom,cpufreq-table =

			<  300000  300000  600 >,

			<  422400  422400 1200 >,

			<  652800  499200 1600 >,

			<  729600  576000 2456 >,

			<  883200  576000 2456 >,

			<  960000  960000 3680 >,

			< 1036800 1036800 3680 >,

			< 1190400 1036800 3680 >,

			< 1267200 1267200 6400 >,

			< 1497600 1497600 6400 >,

			< 1574400 1574400 6400 >,

			< 1728000 1651200 6400 >,

			< 1958400 1728000 7448 >,

			< 2265600 1728000 7448 >;

			<  300000 >,

			<  422400 >,

			<  652800 >,

			<  729600 >,

			<  883200 >,

			<  960000 >,

			< 1036800 >,

			< 1190400 >,

			< 1267200 >,

			< 1497600 >,

			< 1574400 >,

			< 1728000 >,

			< 1958400 >,

			< 2265600 >;

	};

arch/arm/boot/dts/qcom/apq8084.dtsi

+18 −18
Original line number Diff line number Diff line
@@ -2626,24 +2626,24 @@ 
			 <&clock_krait clk_krait2_clk>,

			 <&clock_krait clk_krait3_clk>;

		qcom,cpufreq-table =

			<  300000  300000  1144 >,

			<  422400  422400  2288 >,

			<  652800  499200  3051 >,

			<  729600  576000  5996 >,

			<  883200  576000  5996 >,

			<  960000  960000  8056 >,

			< 1036800 1036800  8056 >,

			< 1190400 1036800  8056 >,

			< 1267200 1036800 10101 >,

			< 1497600 1036800 10101 >,

			< 1574400 1574400 12145 >,

			< 1728000 1651200 12145 >,

			< 1958400 1728000 16250 >,

			< 2265600 1728000 16250 >,

			< 2457600 1728000 16250 >,

			< 2496000 1728000 16250 >,

			< 2572800 1728000 16250 >,

			< 2649600 1728000 16250 >;

			<  300000 >,

			<  422400 >,

			<  652800 >,

			<  729600 >,

			<  883200 >,

			<  960000 >,

			< 1036800 >,

			< 1190400 >,

			< 1267200 >,

			< 1497600 >,

			< 1574400 >,

			< 1728000 >,

			< 1958400 >,

			< 2265600 >,

			< 2457600 >,

			< 2496000 >,

			< 2572800 >,

			< 2649600 >;

	};



	usb_otg: usb@f9a55000 {

arch/arm/boot/dts/qcom/fsm9900.dtsi

+14 −14
Original line number Diff line number Diff line
@@ -737,20 +737,20 @@ 
			 <&clock_krait clk_krait2_clk>,

			 <&clock_krait clk_krait3_clk>;

		qcom,cpufreq-table =

			<  300000  300000  572 >,

			<  422400  422400 1144 >,

			<  576000  576000 2342 >,

			<  729600  729600 2342 >,

			<  883200  883200 2342 >,

			< 1036800 1036800 3509 >,

			< 1190400 1190400 3509 >,

			< 1344000 1344000 6103 >,

			< 1497600 1497600 6103 >,

			< 1651200 1651200 6103 >,

			< 1804800 1651200 6103 >,

			< 1958400 1651200 6103 >,

			< 2112000 1651200 6103 >,

			< 2265600 1651200 6103 >;

			<  300000 >,

			<  422400 >,

			<  576000 >,

			<  729600 >,

			<  883200 >,

			< 1036800 >,

			< 1190400 >,

			< 1344000 >,

			< 1497600 >,

			< 1651200 >,

			< 1804800 >,

			< 1958400 >,

			< 2112000 >,

			< 2265600 >;

	};



	clock_krait: qcom,clock-krait@f9016000 {

arch/arm/boot/dts/qcom/mdm9630.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -774,11 +774,11 @@ 
		reg = <0 4>;

		compatible = "qcom,msm-cpufreq";

		qcom,cpufreq-table =

			<  300000 1266 >,

			<  600000 1266 >,

			<  787200 2540 >,

			<  998400 3051 >,

			< 1152000 3051 >;

			<  300000 >,

			<  600000 >,

			<  787200 >,

			<  998400 >,

			< 1152000 >;

	};



	qcom,msm-thermal {

arch/arm/boot/dts/qcom/msm8226.dtsi

+14 −14
Original line number Diff line number Diff line
@@ -1027,20 +1027,20 @@ 
		reg = <0 4>;

		compatible = "qcom,msm-cpufreq";

		qcom,cpufreq-table =

			<  300000 1525 >,

			<  384000 1525 >,

			<  600000 1525 >,

			<  787200 1525 >,

			<  998400 4066 >,

			< 1094400 4066 >,

			< 1190400 4066 >,

			< 1305600 4066 >,

			< 1344000 4066 >,

			< 1401600 4066 >,

			< 1497600 4066 >,

			< 1593600 4066 >,

			< 1689600 4066 >,

			< 1785600 4066 >;

			<  300000 >,

			<  384000 >,

			<  600000 >,

			<  787200 >,

			<  998400 >,

			< 1094400 >,

			< 1190400 >,

			< 1305600 >,

			< 1344000 >,

			< 1401600 >,

			< 1497600 >,

			< 1593600 >,

			< 1689600 >,

			< 1785600 >;

	};



	qcom,ocmem@fdd00000 {