Re: [PATCH v6] mwifiex: parse device tree node for PCIe
flat view
From: Rob Herring <hidden>
Date: 2016-10-30 20:41:31
Also in:
linux-wireless
On Fri, Oct 21, 2016 at 02:21:09PM -0700, Rajat Jain wrote:
quoted hunk
From: Xinming Hu <redacted> This patch derives device tree node from pcie bus layer framework, and fixes a minor memory leak in mwifiex_pcie_probe() (in failure path). Device tree bindings file has been renamed(marvell-sd8xxx.txt -> marvell-8xxx.txt) to accommodate PCIe changes. Signed-off-by: Xinming Hu <redacted> Signed-off-by: Amitkumar Karwar <redacted> Signed-off-by: Rajat Jain <redacted> Reviewed-by: Brian Norris <redacted> --- v2: Included vendor and product IDs in compatible strings for PCIe chipsets(Rob Herring) v3: Patch is created using -M option so that it will only include diff of original and renamed files(Rob Herring) Resend v3: Resending the patch because I missed to include device tree mailing while sending v3. v4: Fix error handling, also move-on even if no device tree node is present. v5: Update commit log to include memory leak, return -EINVAL instead of -1. v6: Remove an unnecessary error print, fix typo in commit log .../{marvell-sd8xxx.txt => marvell-8xxx.txt} | 8 +++-- drivers/net/wireless/marvell/mwifiex/pcie.c | 36 +++++++++++++++++++--- drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 3 +- 3 files changed, 39 insertions(+), 8 deletions(-) rename Documentation/devicetree/bindings/net/wireless/{marvell-sd8xxx.txt => marvell-8xxx.txt} (91%)diff --git a/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt b/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt similarity index 91% rename from Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt rename to Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt index c421aba..dfe5f8e 100644 --- a/Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt +++ b/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt@@ -1,8 +1,8 @@ -Marvell 8897/8997 (sd8897/sd8997) SDIO devices +Marvell 8897/8997 (sd8897/sd8997/pcie8997) SDIO/PCIE devices ------ -This node provides properties for controlling the marvell sdio wireless device. -The node is expected to be specified as a child node to the SDIO controller that +This node provides properties for controlling the marvell sdio/pcie wireless device.
s/marvell/Marvell/ s/sdio\/pcie/SDIO\/PCIE/
quoted hunk
+The node is expected to be specified as a child node to the SDIO/PCIE controller that connects the device to the system. Required properties:@@ -10,6 +10,8 @@ Required properties: - compatible : should be one of the following: * "marvell,sd8897" * "marvell,sd8997" + * "pci11ab,2b42" + * "pci1b4b,2b42"
I think I already said this, but you have the vendor and product IDs reversed. Rob