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

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

Merge "msm: kgsl: Fix direct references to HZ"

parents 4abbb102 1b669de7

Documentation/devicetree/bindings/gpu/adreno.txt

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ Optional Properties: 
			   bus width and actual bus transactions.

- qcom,gpubw-dev:	   a phandle to a device representing bus bandwidth requirements

			   (see devdw.txt)

- qcom,idle-timeout:	   This property represents the time in microseconds for idle timeout.

- qcom,deep-nap-timeout:   This property represents the time in microseconds for entering deeper

- qcom,idle-timeout:	   This property represents the time in milliseconds for idle timeout.

- qcom,deep-nap-timeout:   This property represents the time in milliseconds for entering deeper

			   power state.

- qcom,chipid:		   If it exists this property is used to replace

			   the chip identification read from the GPU hardware.

arch/arm/boot/dts/qcom/msm8937-gpu.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


		qcom,initial-pwrlevel = <2>;



		qcom,idle-timeout = <8>; //<HZ/12>

		qcom,idle-timeout = <80>; //msecs

		qcom,strtstp-sleepwake;



		clocks = <&clock_gcc clk_gcc_oxili_gfx3d_clk>,

arch/arm/boot/dts/qcom/msm8952-gpu.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


		qcom,initial-pwrlevel = <3>;



		qcom,idle-timeout = <8>; //<HZ/12>

		qcom,idle-timeout = <80>; //msecs

		qcom,strtstp-sleepwake;



		clocks = <&clock_gcc clk_gcc_oxili_gfx3d_clk>,

arch/arm/boot/dts/qcom/msm8996-gpu.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ 


		qcom,initial-pwrlevel = <2>;



		qcom,idle-timeout = <8>; //<HZ/12>

		qcom,idle-timeout = <80>; //msecs

		/*

		 * Timeout to enter deeper power saving state

		 * from NAP.

		 */

		qcom,deep-nap-timeout = <2>; //<HZ/50>

		qcom,deep-nap-timeout = <20>; //msecs

		qcom,strtstp-sleepwake;



		/* Trace bus */

arch/arm/boot/dts/qcom/msmtitanium-gpu.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


		qcom,initial-pwrlevel = <4>;



		qcom,idle-timeout = <8>; //<HZ/12>

		qcom,idle-timeout = <80>; //msecs

		qcom,strtstp-sleepwake;



		clocks = <&clock_gcc_gfx clk_gcc_oxili_gfx3d_clk>,