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

Commit 757adfe8 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Rename ipa_loaduc on sm8150"

parents 54c0d57c b556c2df

Documentation/devicetree/bindings/platform/msm/rmnet_ipa3.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ Required properties: 




Optional:

Optional:

- qcom,rmnet-ipa-ssr: determine if modem SSR is supported

- qcom,rmnet-ipa-ssr: determine if modem SSR is supported

- qcom,ipa-loaduC: indicate that ipa uC should be loaded

- qcom,ipa-platform-type-msm: indicates the platform type is msm or not

- qcom,ipa-advertise-sg-support: determine how to respond to a query

- qcom,ipa-advertise-sg-support: determine how to respond to a query

regarding scatter-gather capability

regarding scatter-gather capability

- qcom,ipa-napi-enable: Boolean context flag to indicate whether

- qcom,ipa-napi-enable: Boolean context flag to indicate whether

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -3238,7 +3238,7 @@ 
	qcom,rmnet-ipa {

	qcom,rmnet-ipa {

		compatible = "qcom,rmnet-ipa3";

		compatible = "qcom,rmnet-ipa3";

		qcom,rmnet-ipa-ssr;

		qcom,rmnet-ipa-ssr;

		qcom,ipa-loaduC;

		qcom,ipa-platform-type-msm;

		qcom,ipa-advertise-sg-support;

		qcom,ipa-advertise-sg-support;

		qcom,ipa-napi-enable;

		qcom,ipa-napi-enable;

	};

	};

drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ enum ipa3_wwan_device_status { 




struct ipa3_rmnet_plat_drv_res {

struct ipa3_rmnet_plat_drv_res {

	bool ipa_rmnet_ssr;

	bool ipa_rmnet_ssr;

	bool ipa_loaduC;

	bool is_platform_type_msm;

	bool ipa_advertise_sg_support;

	bool ipa_advertise_sg_support;

	bool ipa_napi_enable;

	bool ipa_napi_enable;

	u32 wan_rx_desc_size;

	u32 wan_rx_desc_size;
@@ -2106,11 +2106,11 @@ static int get_ipa_rmnet_dts_configuration(struct platform_device *pdev, 
			"qcom,rmnet-ipa-ssr");

			"qcom,rmnet-ipa-ssr");

	pr_info("IPA SSR support = %s\n",

	pr_info("IPA SSR support = %s\n",

		ipa_rmnet_drv_res->ipa_rmnet_ssr ? "True" : "False");

		ipa_rmnet_drv_res->ipa_rmnet_ssr ? "True" : "False");

	ipa_rmnet_drv_res->ipa_loaduC =

	ipa_rmnet_drv_res->is_platform_type_msm =

			of_property_read_bool(pdev->dev.of_node,

			of_property_read_bool(pdev->dev.of_node,

			"qcom,ipa-loaduC");

			"qcom,ipa-platform-type-msm");

	pr_info("IPA ipa-loaduC = %s\n",

	pr_info("IPA is_platform_type_msm = %s\n",

		ipa_rmnet_drv_res->ipa_loaduC ? "True" : "False");

		ipa_rmnet_drv_res->is_platform_type_msm ? "True" : "False");





	ipa_rmnet_drv_res->ipa_advertise_sg_support =

	ipa_rmnet_drv_res->ipa_advertise_sg_support =

		of_property_read_bool(pdev->dev.of_node,

		of_property_read_bool(pdev->dev.of_node,
@@ -2335,7 +2335,7 @@ static int ipa3_wwan_probe(struct platform_device *pdev) 
				sizeof(struct ipa3_rmnet_mux_val));

				sizeof(struct ipa3_rmnet_mux_val));





	/* start A7 QMI service/client */

	/* start A7 QMI service/client */

	if (ipa3_rmnet_res.ipa_loaduC)

	if (ipa3_rmnet_res.is_platform_type_msm)

		/* Android platform loads uC */

		/* Android platform loads uC */

		ipa3_qmi_service_init(QMI_IPA_PLATFORM_TYPE_MSM_ANDROID_V01);

		ipa3_qmi_service_init(QMI_IPA_PLATFORM_TYPE_MSM_ANDROID_V01);

	else

	else