Commit f489b13d authored by Rob Clark's avatar Rob Clark Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sdm845: move gpu zap nodes to per-device dts 



We want to specify per-device firmware-name, so move the zap node into
the .dts file for individual boards/devices.  This lets us get rid of
the /delete-node/ for cheza, which does not use zap.

Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20200112195405.1132288-5-robdclark@gmail.com


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent d0770627

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ panel_in_edp: endpoint { 
/delete-node/ &venus_mem;

/delete-node/ &cdsp_mem;

/delete-node/ &cdsp_pas;

/delete-node/ &zap_shader;

/delete-node/ &gpu_mem;



/* Increase the size from 120 MB to 128 MB */

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

+7 −0
Original line number Diff line number Diff line
@@ -352,6 +352,13 @@ &gcc { 
			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;

};



&gpu {

	zap-shader {

		memory-region = <&gpu_mem>;

		firmware-name = "qcom/sdm845/a630_zap.mbn";

	};

};



&mss_pil {

	status = "okay";

	firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";

arch/arm64/boot/dts/qcom/sdm845-mtp.dts

+7 −0
Original line number Diff line number Diff line
@@ -360,6 +360,13 @@ &gcc { 
			   <GCC_LPASS_SWAY_CLK>;

};



&gpu {

	zap-shader {

		memory-region = <&gpu_mem>;

		firmware-name = "qcom/sdm845/a630_zap.mbn";

	};

};



&i2c10 {

	status = "okay";

	clock-frequency = <400000>;

arch/arm64/boot/dts/qcom/sdm845.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -2807,7 +2807,7 @@ dsi1_phy: dsi-phy@ae96400 { 
			};

		};



		gpu@5000000 {

		gpu: gpu@5000000 {

			compatible = "qcom,adreno-630.2", "qcom,adreno";

			#stream-id-cells = <16>;
@@ -2827,10 +2827,6 @@ gpu@5000000 { 


			qcom,gmu = <&gmu>;



			zap_shader: zap-shader {

				memory-region = <&gpu_mem>;

			};



			gpu_opp_table: opp-table {

				compatible = "operating-points-v2";

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

+7 −0
Original line number Diff line number Diff line
@@ -245,6 +245,13 @@ &gcc { 
			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;

};



&gpu {

	zap-shader {

		memory-region = <&gpu_mem>;

		firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn";

	};

};



&i2c1 {

	status = "okay";

	clock-frequency = <400000>;