[PATCH v4 1/3] mwifiex: register platform specific driver
From: Amitkumar Karwar <hidden>
Date: 2016-02-16 09:20:28
Also in:
linux-bluetooth, lkml
Subsystem:
marvell mwifiex wireless driver, networking drivers (wireless), open firmware and flattened device tree bindings, the rest · Maintainers:
Brian Norris, Johannes Berg, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Linus Torvalds
From: Xinming Hu <redacted>
Platform device and driver provides easy way to interact with
device-tree-enabled system.
This patch registers platform driver and reorganise existing device
tree specific code. Corresponding device tree binding file is also
created.
Signed-off-by: Xinming Hu <redacted>
Signed-off-by: Amitkumar Karwar <redacted>
---
v3: Don't update adapter->dt_node if mwifiex_plt_dev is NULL
v4: Corrected the 'name' and 'compatible' property names.(Arnd Bergmann and Rob
Herring)
Patch description wraped in 72 columns(Rob Herring)
Moved DT binding file to bindings/net/wireless/(Rob Herring)
---
.../bindings/net/wireless/marvell-sd8xxx.txt | 29 +++++++++++
drivers/net/wireless/marvell/mwifiex/Makefile | 1 +
drivers/net/wireless/marvell/mwifiex/main.c | 2 +
drivers/net/wireless/marvell/mwifiex/main.h | 14 +++++
.../net/wireless/marvell/mwifiex/platform_drv.c | 59 ++++++++++++++++++++++
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 +-
6 files changed, 107 insertions(+), 2 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt
create mode 100644 drivers/net/wireless/marvell/mwifiex/platform_drv.c
diff --git a/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt b/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt
new file mode 100644
index 0000000..f7671ae
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt@@ -0,0 +1,29 @@ +Marvell Sd8xxx Wireless devices +------ + +Required properties: + + - name : must be "wlan" + - compatible : must be "marvell,sd8xxx" + +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. + + +Example: + +Tx power limit calibration data is configured in below example. +The calibration data is an array of unsigned values, the length +can vary between hw versions. + +wlan { + compatible = "marvell,sd8xxx"; + + marvell,caldata_00_txpwrlimit_2g_cfg_set = /bits/ 8 < +0x01 0x00 0x06 0x00 0x08 0x02 0x89 0x01 ...>; + +}; +
diff --git a/drivers/net/wireless/marvell/mwifiex/Makefile b/drivers/net/wireless/marvell/mwifiex/Makefile
index fdfd9bf..1444fd1 100644
--- a/drivers/net/wireless/marvell/mwifiex/Makefile
+++ b/drivers/net/wireless/marvell/mwifiex/Makefile@@ -42,6 +42,7 @@ mwifiex-y += cfg80211.o mwifiex-y += ethtool.o mwifiex-y += 11h.o mwifiex-y += tdls.o +mwifiex-y += platform_drv.o mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o obj-$(CONFIG_MWIFIEX) += mwifiex.o
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 3cfa946..b93ae69 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c@@ -1538,6 +1538,7 @@ EXPORT_SYMBOL_GPL(_mwifiex_dbg); static int mwifiex_init_module(void) { + mwifiex_platform_drv_init(); #ifdef CONFIG_DEBUG_FS mwifiex_debugfs_init(); #endif
@@ -1552,6 +1553,7 @@ mwifiex_init_module(void) static void mwifiex_cleanup_module(void) { + mwifiex_platform_drv_exit(); #ifdef CONFIG_DEBUG_FS mwifiex_debugfs_remove(); #endif
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index aea7aee..464d79f 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h@@ -37,6 +37,16 @@ #include <linux/idr.h> #include <linux/inetdevice.h> #include <linux/devcoredump.h> +#include <linux/err.h> +#include <linux/gpio.h> +#include <linux/gfp.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/of_gpio.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> #include "decl.h" #include "ioctl.h"
@@ -47,6 +57,7 @@ #include "sdio.h" extern const char driver_version[]; +extern struct platform_device *mwifiex_plt_dev; struct mwifiex_adapter; struct mwifiex_private;
@@ -1597,6 +1608,9 @@ void mwifiex_process_multi_chan_event(struct mwifiex_private *priv, struct sk_buff *event_skb); void mwifiex_multi_chan_resync(struct mwifiex_adapter *adapter); +int mwifiex_platform_drv_init(void); +void mwifiex_platform_drv_exit(void); + #ifdef CONFIG_DEBUG_FS void mwifiex_debugfs_init(void); void mwifiex_debugfs_remove(void);
diff --git a/drivers/net/wireless/marvell/mwifiex/platform_drv.c b/drivers/net/wireless/marvell/mwifiex/platform_drv.c
new file mode 100644
index 0000000..5fd5d80
--- /dev/null
+++ b/drivers/net/wireless/marvell/mwifiex/platform_drv.c@@ -0,0 +1,59 @@ +/* Marvell wireless LAN device driver: platform specific driver + * + * Copyright (C) 2015, Marvell International Ltd. + * + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which + * is available on the worldwide web at + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * this warranty disclaimer. + */ +#include "main.h" + +struct platform_device *mwifiex_plt_dev; + +static int mwifiex_plt_probe(struct platform_device *pdev) +{ + mwifiex_plt_dev = pdev; + return 0; +} + +static int mwifiex_plt_remove(struct platform_device *pdev) +{ + mwifiex_plt_dev = NULL; + return 0; +} + +static const struct of_device_id mwifiex_dt_match[] = { + { + .compatible = "marvell,sd8xxx", + }, + {}, +}; + +MODULE_DEVICE_TABLE(of, mwifiex_dt_match); + +static struct platform_driver mwifiex_platform_driver = { + .probe = mwifiex_plt_probe, + .remove = mwifiex_plt_remove, + .driver = { + .name = "mwifiex_plt", + .of_match_table = mwifiex_dt_match, + } +}; + +int mwifiex_platform_drv_init(void) +{ + return platform_driver_register(&mwifiex_platform_driver); +} + +void mwifiex_platform_drv_exit(void) +{ + platform_driver_unregister(&mwifiex_platform_driver); +}
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 30f1526..238fe4f 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c@@ -2154,8 +2154,8 @@ 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. */ - adapter->dt_node = - of_find_node_by_name(NULL, "marvell_cfgdata"); + adapter->dt_node = mwifiex_plt_dev ? + mwifiex_plt_dev->dev.of_node : NULL; if (adapter->dt_node) { ret = mwifiex_dnld_dt_cfgdata(priv, adapter->dt_node, "marvell,caldata");
--
1.8.1.4