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

Commit b9250efe 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: Replace gdsc_hlos1_vote_gpu_smmu with gdsc_gpu_cx"

parents cf707de2 e8416d83

arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ 
			   <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,

			   <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,

			   <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

		vdd-supply = <&gdsc_hlos1_vote_gpu_smmu>;

		vdd-supply = <&gdsc_gpu_cx>;

		clocks = <&clock_gcc clk_gcc_bimc_gfx_clk>;

		clock-name = "kgsl_smmu_clk";

		#clock-cells = <1>;

arch/arm/boot/dts/qcom/msm-gdsc-cobalt.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -41,14 +41,6 @@ 
		status = "disabled";

	};



	gdsc_hlos1_vote_gpu_smmu: qcom,gdsc@17d024 {

		compatible = "qcom,gdsc";

		regulator-name = "gdsc_hlos1_vote_gpu_smmu";

		reg = <0x17d024 0x4>;

		qcom,no-status-check-on-disable;

		status = "disabled";

	};



	gdsc_hlos1_vote_lpass_adsp: qcom,gdsc@17d034 {

		compatible = "qcom,gdsc";

		regulator-name = "gdsc_hlos1_vote_lpass_adsp";

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

+0 −4
Original line number Diff line number Diff line
@@ -1111,10 +1111,6 @@ 
	status = "ok";

};



&gdsc_hlos1_vote_gpu_smmu {

	status = "ok";

};



&gdsc_hlos1_vote_lpass_adsp {

	status = "ok";

};