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

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

Merge "icnss2: Add WCN6750 voltage regulator configurations"

parents 81512aff fcfdf1d0

drivers/soc/qcom/icnss2/main.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int icnss_driver_event_server_arrive(struct icnss_priv *priv, 
			goto err_power_on;

		}



		icnss_pr_dbg("MEM_BASE pa: %pa, va: 0x%pK\n",

		icnss_pr_dbg("Non-Secured Bar Address pa: %pa, va: 0x%pK\n",

			     &priv->mem_base_pa,

			     priv->mem_base_va);

drivers/soc/qcom/icnss2/power.c

+6 −18
Original line number Diff line number Diff line
@@ -12,22 +12,10 @@ 
#include "qmi.h"

#include "debug.h"



static struct icnss_vreg_cfg icnss_vreg_list[] = {

	{"vdd-wlan-core", 1300000, 1300000, 0, 0, 0, false},

	{"vdd-wlan-io", 1800000, 1800000, 0, 0, 0, false},

	{"vdd-wlan-xtal-aon", 0, 0, 0, 0, 0, false},

	{"vdd-wlan-xtal", 1800000, 1800000, 0, 2, 0, false},

	{"vdd-wlan", 0, 0, 0, 0, 0, false},

	{"vdd-wlan-ctrl1", 0, 0, 0, 0, 0, false},

	{"vdd-wlan-ctrl2", 0, 0, 0, 0, 0, false},

	{"vdd-wlan-sp2t", 2700000, 2700000, 0, 0, 0, false},

	{"wlan-ant-switch", 1800000, 1800000, 0, 0, 0, false},

	{"wlan-soc-swreg", 1200000, 1200000, 0, 0, 0, false},

	{"vdd-wlan-aon", 950000, 950000, 0, 0, 0, false},

	{"vdd-wlan-dig", 950000, 952000, 0, 0, 0, false},

	{"vdd-wlan-rfa1", 1900000, 1900000, 0, 0, 0, false},

	{"vdd-wlan-rfa2", 1350000, 1350000, 0, 0, 0, false},

	{"vdd-wlan-en", 0, 0, 0, 10, 0, false},

static struct icnss_vreg_cfg icnss_wcn6750_vreg_list[] = {

	{"vdd-cx-mx", 824000, 952000, 0, 0, 0, false},

	{"vdd-1.8-xo", 1872000, 1872000, 0, 0, 0, false},

	{"vdd-1.3-rfa", 1256000, 1352000, 0, 0, 0, false},

};



static struct icnss_vreg_cfg icnss_adrestea_vreg_list[] = {
@@ -46,7 +34,7 @@ static struct icnss_clk_cfg icnss_adrestea_clk_list[] = { 
	{"cxo_ref_clk_pin", 0, 0},

};



#define ICNSS_VREG_LIST_SIZE		ARRAY_SIZE(icnss_vreg_list)

#define ICNSS_VREG_LIST_SIZE		ARRAY_SIZE(icnss_wcn6750_vreg_list)

#define ICNSS_VREG_ADRESTEA_LIST_SIZE	ARRAY_SIZE(icnss_adrestea_vreg_list)

#define ICNSS_CLK_LIST_SIZE		ARRAY_SIZE(icnss_clk_list)

#define ICNSS_CLK_ADRESTEA_LIST_SIZE	ARRAY_SIZE(icnss_adrestea_clk_list)
@@ -286,7 +274,7 @@ static struct icnss_vreg_cfg *get_vreg_list(u32 *vreg_list_size, 
	switch (device_id) {

	case WCN6750_DEVICE_ID:

		*vreg_list_size = ICNSS_VREG_LIST_SIZE;

		return icnss_vreg_list;

		return icnss_wcn6750_vreg_list;



	case ADRASTEA_DEVICE_ID:

		*vreg_list_size = ICNSS_VREG_ADRESTEA_LIST_SIZE;

drivers/soc/qcom/icnss2/qmi.c

+2 −1
Original line number Diff line number Diff line
@@ -609,7 +609,8 @@ int wlfw_cap_send_sync_msg(struct icnss_priv *priv) 
	if (!priv)

		return -ENODEV;



	icnss_pr_dbg("Sending capability message, state: 0x%lx\n", priv->state);

	icnss_pr_dbg("Sending target capability message, state: 0x%lx\n",

		     priv->state);



	req = kzalloc(sizeof(*req), GFP_KERNEL);

	if (!req)