Merge "wcnss: fix the wcnss power up sequence after ssr" (65c5178b) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/wcnss/wcnss_vreg.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ int validate_iris_chip_id(u32 reg)
		}
		}

		static void wcnss_free_regulator(void)
		void wcnss_free_regulator(void)
		{
		int vreg_i;

		@@ -587,13 +587,8 @@ static void wcnss_vregs_off(struct vregs_info regulators[], uint size,
		pr_err("vreg %s disable failed (%d)\n",
		regulators[i].name, rc);
		}

		/* Free the regulator source */
		if (regulators[i].state & VREG_GET_REGULATOR_MASK)
		regulator_put(regulators[i].regulator);

		regulators[i].state = VREG_NULL_CONFIG;
		}

		}

		/* Common helper routine to turn on all WCNSS & IRIS vregs */

+3 −2

Original line number	Diff line number	Diff line
		@@ -2177,7 +2177,7 @@ static void wcnssctrl_rx_handler(struct work_struct *worker)
		return;
		}
		if (len < sizeof(struct smd_msg_hdr)) {
		pr_err("wcnss: incomplete header available len = %d\n", len);
		pr_debug("wcnss: incomplete header available len = %d\n", len);
		return;
		}

		@@ -3329,7 +3329,7 @@ static int wcnss_notif_cb(struct notifier_block *this, unsigned long code,
		return NOTIFY_DONE;
		}

		pr_debug("%s: wcnss notification event: %lu : %s\n",
		pr_info("%s: wcnss notification event: %lu : %s\n",
		__func__, code, wcnss_subsys_notif_type[code]);

		if (code == SUBSYS_PROXY_VOTE) {
		@@ -3524,6 +3524,7 @@ wcnss_wlan_probe(struct platform_device *pdev)
		static int
		wcnss_wlan_remove(struct platform_device *pdev)
		{
		wcnss_free_regulator();
		if (penv->wcnss_notif_hdle)
		subsys_notif_unregister_notifier(penv->wcnss_notif_hdle, &wnb);
		wcnss_cdev_unregister(pdev);

+1 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ int wcnss_device_ready(void);
		bool wcnss_cbc_complete(void);
		int wcnss_device_is_shutdown(void);
		void wcnss_riva_dump_pmic_regs(void);
		void wcnss_free_regulator(void);
		int wcnss_xo_auto_detect_enabled(void);
		u32 wcnss_get_wlan_rx_buff_count(void);
		int wcnss_wlan_iris_xo_mode(void);