From: Amitkumar Karwar <akarwar@marvell.com>
To: <linux-bluetooth@vger.kernel.org>
Cc: Nishant Sarmukadam <nishants@marvell.com>, <wnhuang@chromium.com>,
<devicetree@vger.kernel.org>, Cathy Luo <cluo@marvell.com>,
<linux-kernel@vger.kernel.org>, Xinming Hu <huxm@marvell.com>,
Amitkumar Karwar <akarwar@marvell.com>
Subject: [PATCH v4 2/3] mwifiex: parse chip specific gpio from device tree
Date: Tue, 16 Feb 2016 01:14:38 -0800 [thread overview]
Message-ID: <1455614079-4263-2-git-send-email-akarwar@marvell.com> (raw)
In-Reply-To: <1455614079-4263-1-git-send-email-akarwar@marvell.com>
From: Xinming Hu <huxm@marvell.com>
This patch parse chip specific gpio parameter from device
tree. Corresponding binding file is also updated.
Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
---
v4: Renamed "mwifiex,chip-gpio" to "marvell,wakeup-gpios"(Rob Herring/
Arnd Bergmann)
---
.../devicetree/bindings/net/wireless/marvell-sd8xxx.txt | 6 ++++--
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 9 +++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt b/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt
index f7671ae..c337fab 100644
--- a/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt
+++ b/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt
@@ -11,7 +11,9 @@ Optional properties:
- marvell,caldata* : A series of properties with marvell,caldata prefix,
represent Calibration data downloaded to the device during
initialization. This is an array of unsigned values.
-
+ - marvell,wakeup-gpios : Chip's wakeup gpio pin number. This needs to be downloaded
+ to to firmware. Chip notifies wifi wakeup signal to SOC
+ through this pin.
Example:
@@ -24,6 +26,6 @@ wlan {
marvell,caldata_00_txpwrlimit_2g_cfg_set = /bits/ 8 <
0x01 0x00 0x06 0x00 0x08 0x02 0x89 0x01 ...>;
-
+ marvell,wakeup-gpios = <3>;
};
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 238fe4f..fce3f98 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -2134,6 +2134,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
enum state_11d_t state_11d;
struct mwifiex_ds_11n_tx_cfg tx_cfg;
u8 sdio_sp_rx_aggr_enable;
+ u32 data;
if (first_sta) {
if (priv->adapter->iface_type == MWIFIEX_PCIE) {
@@ -2157,6 +2158,14 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
adapter->dt_node = mwifiex_plt_dev ?
mwifiex_plt_dev->dev.of_node : NULL;
if (adapter->dt_node) {
+ if (of_property_read_u32(adapter->dt_node,
+ "marvell,wakeup-gpios",
+ &data) == 0) {
+ mwifiex_dbg(adapter, INFO,
+ "Wakeup gpio = 0x%x\n", data);
+ adapter->hs_cfg.gpio = data;
+ }
+
ret = mwifiex_dnld_dt_cfgdata(priv, adapter->dt_node,
"marvell,caldata");
if (ret)
--
1.8.1.4
next prev parent reply other threads:[~2016-02-16 9:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 9:14 [PATCH v4 1/3] mwifiex: register platform specific driver Amitkumar Karwar
2016-02-16 9:14 ` Amitkumar Karwar [this message]
2016-02-18 14:37 ` [PATCH v4 2/3] mwifiex: parse chip specific gpio from device tree Rob Herring
2016-02-16 9:14 ` [PATCH v4 3/3] mwifiex: parse host wakeup configuration from device Amitkumar Karwar
2016-02-18 14:37 ` Rob Herring
2016-02-16 11:28 ` [PATCH v4 1/3] mwifiex: register platform specific driver Arnd Bergmann
2016-02-18 14:38 ` Rob Herring
2016-02-29 14:04 ` Amitkumar Karwar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455614079-4263-2-git-send-email-akarwar@marvell.com \
--to=akarwar@marvell.com \
--cc=cluo@marvell.com \
--cc=devicetree@vger.kernel.org \
--cc=huxm@marvell.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nishants@marvell.com \
--cc=wnhuang@chromium.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox