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

Commit 5e28e5fb authored by Rajat Jain's avatar Rajat Jain Committed by Kalle Valo
Browse files

mwifiex: Introduce mwifiex_probe_of() to parse common properties 



Introduce function mwifiex_probe_of() to parse common properties.
Interface drivers get to decide whether or not the device tree node
was a valid one (depending on the compatible property),
Lets fill "adapter->dt_node" in mwifiex_add_card().

The function mwifiex_probe_of() is currently only a place holder with
the next patch adding content to it.

Signed-off-by: default avatarRajat Jain <rajatja@google.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2e02b581

drivers/net/wireless/marvell/mwifiex/main.c

+12 −0
Original line number Diff line number Diff line
@@ -1552,6 +1552,16 @@ void mwifiex_do_flr(struct mwifiex_adapter *adapter, bool prepare) 
}

EXPORT_SYMBOL_GPL(mwifiex_do_flr);



static void mwifiex_probe_of(struct mwifiex_adapter *adapter)

{

	struct device *dev = adapter->dev;



	if (!dev->of_node)

		return;



	adapter->dt_node = dev->of_node;

}



/*

 * This function adds the card.

 *
@@ -1581,6 +1591,8 @@ mwifiex_add_card(void *card, struct semaphore *sem, 
	}



	adapter->dev = dev;

	mwifiex_probe_of(adapter);



	adapter->iface_type = iface_type;

	adapter->card_sem = sem;

drivers/net/wireless/marvell/mwifiex/sta_cmd.c

+1 −4
Original line number Diff line number Diff line
@@ -2235,10 +2235,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init) 
		 * The cal-data can be read from device tree and/or

		 * a configuration file and downloaded to firmware.

		 */

		if ((priv->adapter->iface_type == MWIFIEX_SDIO ||

		    priv->adapter->iface_type == MWIFIEX_PCIE) &&

		    adapter->dev->of_node) {

			adapter->dt_node = adapter->dev->of_node;

		if (adapter->dt_node) {

			if (of_property_read_u32(adapter->dt_node,

						 "marvell,wakeup-pin",

						 &data) == 0) {