On Sun, Oct 30, 2016 at 1:41 PM, Rob Herring <robh@xxxxxxxxxx> wrote:
> On Fri, Oct 21, 2016 at 02:21:09PM -0700, Rajat Jain wrote:
>> From: Xinming Hu <huxm@xxxxxxxxxxx>
>>
>> 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 <huxm@xxxxxxxxxxx>
>> Signed-off-by: Amitkumar Karwar <akarwar@xxxxxxxxxxx>
>> Signed-off-by: Rajat Jain <rajatja@xxxxxxxxxx>
>> Reviewed-by: Brian Norris <briannorris@xxxxxxxxxxxx>
>> ---
>> 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/
>
>> +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"
>
Hi Rob,
> I think I already said this, but you have the vendor and product IDs
> reversed.
Actually Marvell has 2 vendor IDs assigned to it. In include/linux/pci_ids.h:
#define PCI_VENDOR_ID_MARVELL 0x11ab
#define PCI_VENDOR_ID_MARVELL_EXT 0x1b4b
So in this case the compatible property describes a single product ID,
with both possible vendor IDs.
Thanks,
Rajat
>
> Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
