arm64: dts: qcom: add gpu_zap_shader label

Patching existing DT nodes based on full path is error prone and
generally not recommended. Follow the pattern introduced in the last
platforms, add gpu_zap_shader label to the ZAP node and use it in the
board files.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: David Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20251028-dt-zap-shader-v1-7-7eccb823b986@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2025-10-28 23:00:06 +02:00 committed by Bjorn Andersson
parent d994ae0427
commit 2377626fd2
64 changed files with 162 additions and 175 deletions

View File

@ -201,10 +201,10 @@ &camss {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/apq8096/a530_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/apq8096/a530_zap.mbn";
};
&hsusb_phy1 {

View File

@ -27,10 +27,10 @@ &battery {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/msm8996/oneplus3/a530_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/msm8996/oneplus3/a530_zap.mbn";
};
&mss_pil {

View File

@ -28,10 +28,10 @@ &battery {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/msm8996/oneplus3t/a530_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/msm8996/oneplus3t/a530_zap.mbn";
};
&mss_pil {

View File

@ -91,10 +91,8 @@ synaptics@20 {
};
&gpu {
zap-shader {
firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
};
&mdss_dsi0 {

View File

@ -1333,7 +1333,7 @@ opp-133000000 {
};
};
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};
};

View File

@ -39,10 +39,8 @@ touchscreen@20 {
};
};
&gpu {
zap-shader {
firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
};
&mdss_dsi0 {

View File

@ -91,10 +91,8 @@ touchscreen: atmel-mxt-ts@4a {
};
};
&gpu {
zap-shader {
firmware-name = "qcom/msm8996/scorpio/a530_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/msm8996/scorpio/a530_zap.mbn";
};
&mdp_smmu {

View File

@ -1625,7 +1625,7 @@ gpu: gpu@5900000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};

View File

@ -261,10 +261,10 @@ &gpi_dma0 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/qcm2290/a702_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/qcm2290/a702_zap.mbn";
};
&i2c2_gpio {

View File

@ -245,10 +245,10 @@ &gpi_dma0 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/qrb4210/a610_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/qrb4210/a610_zap.mbn";
};
&i2c2_gpio {

View File

@ -594,10 +594,10 @@ &gmu {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8250/a650_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8250/a650_zap.mbn";
};
/* LS-I2C0 */

View File

@ -338,10 +338,10 @@ &gmu {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sa8295p/a690_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sa8295p/a690_zap.mbn";
};
&gpu_smmu {

View File

@ -350,10 +350,10 @@ vreg_l16e_3p0: ldo16 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn";
};
&i2c1 {

View File

@ -444,10 +444,10 @@ vreg_l16e_3p0: ldo16 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sc8180x/qcdxkmsuc8180.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sc8180x/qcdxkmsuc8180.mbn";
};
&i2c1 {

View File

@ -2279,7 +2279,7 @@ gpu: gpu@2c00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};

View File

@ -504,10 +504,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn";
};
&mdss0 {

View File

@ -8,10 +8,8 @@
/plugin/;
/* We can't and don't need to use zap shader in EL2 as linux can zap the gpu on it's own. */
&gpu {
zap-shader {
status = "disabled";
};
&gpu_zap_shader {
status = "disabled";
};
/*

View File

@ -595,10 +595,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn";
};
&i2c4 {

View File

@ -717,10 +717,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn";
};
&mdss0 {

View File

@ -457,10 +457,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn";
};
&mdss0 {

View File

@ -574,10 +574,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn";
};
&mdss0 {

View File

@ -3371,7 +3371,7 @@ gpu: gpu@3d00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};

View File

@ -404,10 +404,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm670/sargo/a615_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm670/sargo/a615_zap.mbn";
};
&i2c9 {

View File

@ -1382,7 +1382,7 @@ gpu: gpu@5000000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};

View File

@ -455,9 +455,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
zap-shader {
firmware-name = "qcom/sdm845/a630_zap.mbn";
};
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/a630_zap.mbn";
};
&i2c10 {

View File

@ -47,10 +47,8 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/judyln/cdsp.mbn";
};
&gpu {
zap-shader {
firmware-name = "qcom/sdm845/judyln/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/judyln/a630_zap.mbn";
};
&mss_pil {

View File

@ -33,10 +33,8 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/judyp/cdsp.mbn";
};
&gpu {
zap-shader {
firmware-name = "qcom/sdm845/judyp/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/judyp/a630_zap.mbn";
};
&mss_pil {

View File

@ -416,10 +416,10 @@ &gcc {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm845/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/a630_zap.mbn";
};
&i2c10 {

View File

@ -339,10 +339,10 @@ &gcc {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
};
&i2c10 {

View File

@ -251,10 +251,10 @@ vib_pwm: pwm {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm845/starqltechn/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/starqltechn/a630_zap.mbn";
};
&mdss {

View File

@ -423,10 +423,10 @@ &gcc {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm845/axolotl/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/axolotl/a630_zap.mbn";
};
&i2c5 {

View File

@ -426,10 +426,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm845/Sony/tama/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/Sony/tama/a630_zap.mbn";
};
&i2c5 {

View File

@ -246,10 +246,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm845/beryllium/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/beryllium/a630_zap.mbn";
};
&ibb {

View File

@ -392,10 +392,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm845/polaris/a630_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm845/polaris/a630_zap.mbn";
};
&ibb {

View File

@ -4902,7 +4902,7 @@ gpu: gpu@5000000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};

View File

@ -488,10 +488,10 @@ &gcc {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn";
};
&i2c5 {

View File

@ -356,10 +356,10 @@ &gcc {
};
&gpu {
status = "okay";
zap-shader {
firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
};
status = "okay";};
&gpu_zap_shader {
firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
};
&i2c1 {

View File

@ -121,10 +121,10 @@ &gpi_dma0 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm6115/Fxtec/QX1050/a610_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm6115/Fxtec/QX1050/a610_zap.mbn";
};
&i2c1 {

View File

@ -1745,7 +1745,7 @@ gpu: gpu@5900000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};

View File

@ -67,10 +67,10 @@ ramoops@ffc00000 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm6115/LENOVO/J606F/a610_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm6115/LENOVO/J606F/a610_zap.mbn";
};
&mdss {

View File

@ -2255,7 +2255,7 @@ gpu: gpu@2c00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};

View File

@ -484,10 +484,10 @@ &gmu {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8250/a650_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8250/a650_zap.mbn";
};
&i2c1 {

View File

@ -554,10 +554,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8250/xiaomi/elish/a650_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8250/xiaomi/elish/a650_zap.mbn";
};
&i2c0 {

View File

@ -424,10 +424,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8250/xiaomi/pipa/a650_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8250/xiaomi/pipa/a650_zap.mbn";
};
&i2c11 {

View File

@ -2944,7 +2944,7 @@ gpu: gpu@3d00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};

View File

@ -403,10 +403,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8350/a660_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8350/a660_zap.mbn";
};
&i2c13 {

View File

@ -2051,7 +2051,7 @@ gpu: gpu@3d00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};

View File

@ -643,10 +643,10 @@ vreg_l7e_2p8: ldo7 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8450/a730_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8450/a730_zap.mbn";
};
&i2c9 {

View File

@ -2459,7 +2459,7 @@ gpu: gpu@3d00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_micro_code_mem>;
};

View File

@ -955,10 +955,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&lpass_tlmm {

View File

@ -642,10 +642,10 @@ vreg_l7n_2p96: ldo7 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&i2c_master_hub_0 {

View File

@ -835,10 +835,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&lpass_tlmm {

View File

@ -2491,7 +2491,7 @@ gpu: gpu@3d00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_micro_code_mem>;
};

View File

@ -900,10 +900,10 @@ &iris {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8650/gen70900_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8650/gen70900_zap.mbn";
};
&lpass_tlmm {

View File

@ -830,10 +830,10 @@ &iris {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/sm8650/gen70900_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/sm8650/gen70900_zap.mbn";
};
&lpass_tlmm {

View File

@ -4158,7 +4158,7 @@ gpu: gpu@3d00000 {
status = "disabled";
zap-shader {
gpu_zap_shader: zap-shader {
memory-region = <&gpu_micro_code_mem>;
};

View File

@ -763,10 +763,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/x1e80100/Thundercomm/DEVKIT/qcdxkmsuc8380.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/x1e80100/Thundercomm/DEVKIT/qcdxkmsuc8380.mbn";
};
&i2c1 {

View File

@ -722,10 +722,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn";
};
&i2c0 {

View File

@ -479,10 +479,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn";
};
&i2c0 {

View File

@ -676,10 +676,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/x1e80100/dell/xps13-9345/qcdxkmsuc8380.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/x1e80100/dell/xps13-9345/qcdxkmsuc8380.mbn";
};
&i2c0 {

View File

@ -9,10 +9,8 @@ / {
compatible = "hp,elitebook-ultra-g1q", "qcom,x1e80100";
};
&gpu {
zap-shader {
firmware-name = "qcom/x1e80100/hp/elitebook-ultra-g1q/qcdxkmsuc8380.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/x1e80100/hp/elitebook-ultra-g1q/qcdxkmsuc8380.mbn";
};
&remoteproc_adsp {

View File

@ -799,10 +799,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn";
};
&i2c0 {

View File

@ -861,11 +861,11 @@ vreg_l3j: ldo3 {
&gpu {
status = "okay";
};
zap-shader {
memory-region = <&gpu_microcode_mem>;
firmware-name = "qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn";
};
&gpu_zap_shader {
memory-region = <&gpu_microcode_mem>;
firmware-name = "qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn";
};
&i2c0 {

View File

@ -831,10 +831,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
};
zap-shader {
firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
};
&gpu_zap_shader {
firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
};
&i2c5 {