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

Commit 474f32dd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wcnss: add condition to check for pronto ver3 hardware"

parents 974ee3fb 2ed06d52

Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ using a smaller count for this buffer will reduce the memory usage. 
- qcom,is-pronto-vt: boolean flag to determine the pronto hardware version

in use. subsequently Pronto and IRIS voltage regulator range is configured

according to the ponto HW version

- qcom,is-pronto-v3: boolean flag to determine the pronto hardware version

in use. subsequently correct workqueue will be used by DXE engine to push frames

in TX data path.

- qcom,wcnss-pm : <Core rail LDO#, PA rail LDO#, XO settling time,

		   RPM power collapse enabled, standalone power collapse enabled>

	Power manager related parameter for LDO configuration.

drivers/net/wireless/wcnss/wcnss_wlan.c

+13 −0
Original line number Diff line number Diff line
@@ -1474,6 +1474,14 @@ struct wcnss_wlan_config *wcnss_get_wlan_config(void) 
}

EXPORT_SYMBOL(wcnss_get_wlan_config);



int wcnss_is_hw_pronto_ver3(void)

{

	if (penv && penv->pdev)

		return penv->wlan_config.is_pronto_v3;

	return 0;

}

EXPORT_SYMBOL(wcnss_is_hw_pronto_ver3);



int wcnss_device_ready(void)

{

	if (penv && penv->pdev && penv->nv_downloaded &&
@@ -2568,6 +2576,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
	struct qcom_wcnss_opts *pdata;

	struct resource *res;

	int is_pronto_vt;

	int is_pronto_v3;

	int pil_retry = 0;

	int has_pronto_hw = of_property_read_bool(pdev->dev.of_node,

							"qcom,has-pronto-hw");
@@ -2575,6 +2584,9 @@ wcnss_trigger_config(struct platform_device *pdev) 
	is_pronto_vt = of_property_read_bool(pdev->dev.of_node,

							"qcom,is-pronto-vt");



	is_pronto_v3 = of_property_read_bool(pdev->dev.of_node,

							"qcom,is-pronto-v3");



	if (of_property_read_u32(pdev->dev.of_node,

			"qcom,wlan-rx-buff-count", &penv->wlan_rx_buff_count)) {

		penv->wlan_rx_buff_count = WCNSS_DEF_WLAN_RX_BUFF_COUNT;
@@ -2598,6 +2610,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
	penv->wcnss_hw_type = (has_pronto_hw) ? WCNSS_PRONTO_HW : WCNSS_RIVA_HW;

	penv->wlan_config.use_48mhz_xo = has_48mhz_xo;

	penv->wlan_config.is_pronto_vt = is_pronto_vt;

	penv->wlan_config.is_pronto_v3 = is_pronto_v3;



	if (WCNSS_CONFIG_UNSPECIFIED == has_autodetect_xo && has_pronto_hw) {

		has_autodetect_xo = of_property_read_bool(pdev->dev.of_node,

include/linux/wcnss_wlan.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ enum wcnss_hw_type { 
struct wcnss_wlan_config {

	int	use_48mhz_xo;

	int	is_pronto_vt;

	int	is_pronto_v3;

	void __iomem	*msm_wcnss_base;

};
@@ -101,6 +102,7 @@ void wcnss_suspend_notify(void); 
void wcnss_resume_notify(void);

void wcnss_riva_log_debug_regs(void);

void wcnss_pronto_log_debug_regs(void);

int wcnss_is_hw_pronto_ver3(void);

int wcnss_device_ready(void);

int wcnss_cbc_complete(void);

int wcnss_device_is_shutdown(void);