Commit a9a9e857 authored by Alex Elder's avatar Alex Elder Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: use qcom,gsi-loader for IPA 



Depending on the platform, either the modem or the AP must load GSI
firmware for IPA before it can be used.  To date, this has been
indicated by the presence or absence of a "modem-init" property.

That mechanism has been deprecated.  Instead, we indicate how GSI
firmware should be loaded by the value of the "qcom,gsi-loader"
property.

Update all arm64 platforms that use IPA to use the "qcom,gsi-loader"
property to specify how the GSI firmware is loaded.

Update the affected nodes so the status property is last.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
[bjorn: Moved sc7280 change herobrine-lte-sku]
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221231002716.2367375-3-elder@linaro.org
parent bf37b5bc

arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -19,12 +19,11 @@ 
};



&ipa {

	status = "okay";



	/*

	 * Trogdor doesn't have QHEE (Qualcomm's EL2 blob), so the

	 * modem needs to cover certain init steps (GSI init), and

	 * the AP needs to wait for it.

	 */

	modem-init;

	qcom,gsi-loader = "modem";

	status = "okay";

};

arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
};



&ipa {

	modem-init;

	qcom,gsi-loader = "modem";

	status = "okay";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -756,8 +756,8 @@ ap_ts_i2c: &i2c14 { 
};



&ipa {

	qcom,gsi-loader = "modem";

	status = "okay";

	modem-init;

};



&lpasscc {

arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ 
};



&ipa {

	qcom,gsi-loader = "modem";

	status = "okay";

	modem-init;

};



&mss_pil {

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

+2 −1
Original line number Diff line number Diff line
@@ -518,8 +518,9 @@ 
};



&ipa {

	status = "okay";

	qcom,gsi-loader = "self";

	memory-region = <&ipa_fw_mem>;

	status = "okay";

};



&mdss {