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

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

Merge "cnss2: Add fallback support for device specific path loading"

parents 5b863f1f 57ae1861

arch/arm64/configs/vendor/kona-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ CONFIG_CNSS2=y 
CONFIG_CNSS2_QMI=y

CONFIG_CNSS_ASYNC=y

CONFIG_BUS_AUTO_SUSPEND=y

CONFIG_CNSS_QCA6390=y

CONFIG_CNSS_GENL=y

CONFIG_NVM=y

CONFIG_NVM_PBLK=y

arch/arm64/configs/vendor/kona_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ CONFIG_CNSS2_DEBUG=y 
CONFIG_CNSS2_QMI=y

CONFIG_CNSS_ASYNC=y

CONFIG_BUS_AUTO_SUSPEND=y

CONFIG_CNSS_QCA6390=y

CONFIG_CNSS_GENL=y

CONFIG_NVM=y

CONFIG_NVM_PBLK=y

drivers/net/wireless/cnss2/bus.c

+17 −0
Original line number Diff line number Diff line
@@ -95,6 +95,23 @@ void cnss_bus_deinit(struct cnss_plat_data *plat_priv) 
	}

}



void cnss_bus_add_fw_prefix_name(struct cnss_plat_data *plat_priv,

				 char *prefix_name, char *name)

{

	if (!plat_priv)

		return;



	switch (plat_priv->bus_type) {

	case CNSS_BUS_PCI:

		return cnss_pci_add_fw_prefix_name(plat_priv->bus_priv,

						   prefix_name, name);

	default:

		cnss_pr_err("Unsupported bus type: %d\n",

			    plat_priv->bus_type);

		return;

	}

}



int cnss_bus_load_m3(struct cnss_plat_data *plat_priv)

{

	if (!plat_priv)

drivers/net/wireless/cnss2/bus.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ void *cnss_bus_dev_to_bus_priv(struct device *dev); 
struct cnss_plat_data *cnss_bus_dev_to_plat_priv(struct device *dev);

int cnss_bus_init(struct cnss_plat_data *plat_priv);

void cnss_bus_deinit(struct cnss_plat_data *plat_priv);

void cnss_bus_add_fw_prefix_name(struct cnss_plat_data *plat_priv,

				 char *prefix_name, char *name);

int cnss_bus_load_m3(struct cnss_plat_data *plat_priv);

int cnss_bus_alloc_fw_mem(struct cnss_plat_data *plat_priv);

int cnss_bus_alloc_qdss_mem(struct cnss_plat_data *plat_priv);

drivers/net/wireless/cnss2/main.c

+8 −0
Original line number Diff line number Diff line
@@ -2205,6 +2205,12 @@ static void cnss_get_wlaon_pwr_ctrl_info(struct cnss_plat_data *plat_priv) 
		    plat_priv->set_wlaon_pwr_ctrl);

}



static bool cnss_use_fw_path_with_prefix(struct cnss_plat_data *plat_priv)

{

	return of_property_read_bool(plat_priv->plat_dev->dev.of_node,

				     "qcom,converged-dt");

}



static const struct platform_device_id cnss_platform_id_table[] = {

	{ .name = "qca6174", .driver_data = QCA6174_DEVICE_ID, },

	{ .name = "qca6290", .driver_data = QCA6290_DEVICE_ID, },
@@ -2270,6 +2276,8 @@ static int cnss_probe(struct platform_device *plat_dev) 
	plat_priv->device_id = device_id->driver_data;

	plat_priv->bus_type = cnss_get_bus_type(plat_priv->device_id);

	plat_priv->use_nv_mac = cnss_use_nv_mac(plat_priv);

	plat_priv->use_fw_path_with_prefix =

		cnss_use_fw_path_with_prefix(plat_priv);

	cnss_set_plat_priv(plat_dev, plat_priv);

	platform_set_drvdata(plat_dev, plat_priv);

	INIT_LIST_HEAD(&plat_priv->vreg_list);