Merge "ARM: dts: msm: vote for chain1 regulator sdmmagpie" (0c74b816) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -2734,6 +2734,7 @@
		vdd-1.8-xo-supply = <&pm6150l_l1>;
		vdd-1.3-rfa-supply = <&pm6150l_l2>;
		vdd-3.3-ch0-supply = <&pm6150l_l10>;
		vdd-3.3-ch1-supply = <&pm6150l_l11>;
		qcom,vdd-cx-mx-config = <640000 640000>;
		qcom,smp2p_map_wlan_1_in {
		interrupts-extended = <&smp2p_wlan_1_in 0 0>,

+7 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -490,9 +490,14 @@ int wlfw_wlan_mode_send_sync_msg(struct icnss_priv *priv,
		icnss_qmi_fatal_err("Mode resp wait failed with ret %d\n", ret);
		goto out;
		} else if (resp->resp.result != QMI_RESULT_SUCCESS_V01) {
		ret = -resp->resp.result;
		if (resp->resp.error == QMI_ERR_PLAT_CCPM_CLK_INIT_FAILED) {
		icnss_pr_err("QMI Mode req rejected as CCPM init failed, result:%d error:%d\n",
		resp->resp.result, resp->resp.error);
		goto out;
		}
		icnss_qmi_fatal_err("QMI Mode request rejected, result:%d error:%d\n",
		resp->resp.result, resp->resp.error);
		ret = -resp->resp.result;
		goto out;
		}