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

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

Merge "ARM: dts: msm: Update clock gfx node for MSMfalcon/Triton"

parents 57f5019a 406019ef

arch/arm/boot/dts/qcom/msmfalcon-rumi.dts

+5 −0
Original line number Diff line number Diff line
@@ -102,3 +102,8 @@ 
&pmfalcon_fg {

	status = "disabled";

};



&clock_gfx {

	compatible = "qcom,dummycc";

	clock-output-names = "gfx_clocks";

};

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

+17 −6
Original line number Diff line number Diff line
@@ -467,8 +467,21 @@ 
	};



	clock_gfx: clock-controller@5065000 {

		compatible = "qcom,dummycc";

		clock-output-names = "gfx_clocks";

		compatible = "qcom,gpucc-msmfalcon";

		reg = <0x5065000 0x10000>;

		vdd_dig_gfx-supply = <&pm2falcon_s3_level>;

		vdd_mx_gfx-supply = <&pm2falcon_s5_level>;

		vdd_gfx-supply = <&gfx_vreg_corner>;

		qcom,gfxfreq-corner =

			< 0         0>,

			< 160000000 1>,  /* MinSVS */

			< 266000000 2>,  /* LowSVS */

			< 370000000 3>,  /* SVS    */

			< 465000000 4>,  /* SVS_L1 */

			< 588000000 5>,  /* NOM    */

			< 647000000 6>,  /* NOM_L1 */

			< 700000000 7>,  /* TURBO */

			< 750000000 7>;  /* TURBO  */

		#clock-cells = <1>;

		#reset-cells = <1>;

	};
@@ -985,10 +998,8 @@ 
};



&gdsc_gpu_gx {

	clock-names = "bimc_core_clk", "core_clk", "core_root_clk";

	clocks = <&clock_gcc GCC_GPU_BIMC_GFX_CLK>,

		 <&clock_gfx GPUCC_GFX3D_CLK>,

		 <&clock_gfx GFX3D_CLK_SRC>;

	clock-names = "core_root_clk";

	clocks = <&clock_gfx GFX3D_CLK_SRC>;

	qcom,force-enable-root-clk;

	parent-supply = <&gfx_vreg_corner>;

	status = "ok";

arch/arm/boot/dts/qcom/msmtriton-rumi.dts

+5 −0
Original line number Diff line number Diff line
@@ -63,3 +63,8 @@ 
	compatible = "qcom,dummycc";

	clock-output-names = "gcc_clocks";

};



&clock_gfx {

	compatible = "qcom,dummycc";

	clock-output-names = "gfx_clocks";

};

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

+17 −6
Original line number Diff line number Diff line
@@ -382,8 +382,21 @@ 
	};



	clock_gfx: clock-controller@5065000 {

		compatible = "qcom,dummycc";

		clock-output-names = "gfx_clocks";

		compatible = "qcom,gpucc-msmfalcon";

		reg = <0x5065000 0x10000>;

		vdd_dig_gfx-supply = <&pm2falcon_s3_level>;

		vdd_mx_gfx-supply = <&pm2falcon_s5_level>;

		vdd_gfx-supply = <&gfx_vreg_corner>;

		qcom,gfxfreq-corner =

			< 0         0>,

			< 160000000 1>,  /* MinSVS */

			< 266000000 2>,  /* LowSVS */

			< 370000000 3>,  /* SVS    */

			< 465000000 4>,  /* SVS_L1 */

			< 588000000 5>,  /* NOM    */

			< 647000000 6>,  /* NOM_L1 */

			< 700000000 7>,  /* TURBO  */

			< 750000000 7>;  /* TURBO  */

		#clock-cells = <1>;

		#reset-cells = <1>;

	};
@@ -794,10 +807,8 @@ 
};



&gdsc_gpu_gx {

	clock-names = "bimc_core_clk", "core_clk", "core_root_clk";

	clocks = <&clock_gcc GCC_GPU_BIMC_GFX_CLK>,

		 <&clock_gfx GPUCC_GFX3D_CLK>,

		 <&clock_gfx GFX3D_CLK_SRC>;

	clock-names = "core_root_clk";

	clocks = <&clock_gfx GFX3D_CLK_SRC>;

	qcom,force-enable-root-clk;

	parent-supply = <&gfx_vreg_corner>;

	status = "ok";

arch/arm/configs/msmfalcon_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ CONFIG_RMNET_IPA3=y 
CONFIG_GPIO_USB_DETECT=y

CONFIG_USB_BAM=y

CONFIG_QCOM_CLK_SMD_RPM=y

CONFIG_MSM_GCC_FALCON=y

CONFIG_MSM_GPUCC_FALCON=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_DEBUG=y