mwifiex: parse device tree node for PCIe
This patch derives device tree node from pcie bus layer framework. Device tree bindings file has been renamed(marvell-sd8xxx.txt -> marvell-8xxx.txt) to accommodate PCIe changes. Signed-off-by: Xinming Hu <huxm@marvell.com> Signed-off-by: Rajat Jain <rajatja@google.com> Reviewed-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
parent
66b9c18253
commit
6b4480d109
|
@ -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.
|
||||
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"
|
||||
|
||||
Optional properties:
|
||||
|
|
@ -37,6 +37,22 @@ static struct mwifiex_if_ops pcie_ops;
|
|||
|
||||
static struct semaphore add_remove_card_sem;
|
||||
|
||||
static const struct of_device_id mwifiex_pcie_of_match_table[] = {
|
||||
{ .compatible = "pci11ab,2b42" },
|
||||
{ .compatible = "pci1b4b,2b42" },
|
||||
{ }
|
||||
};
|
||||
|
||||
static int mwifiex_pcie_probe_of(struct device *dev)
|
||||
{
|
||||
if (!of_match_node(mwifiex_pcie_of_match_table, dev->of_node)) {
|
||||
dev_err(dev, "required compatible string missing\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,
|
||||
size_t size, int flags)
|
||||
|
@ -185,6 +201,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
|||
const struct pci_device_id *ent)
|
||||
{
|
||||
struct pcie_service_card *card;
|
||||
int ret;
|
||||
|
||||
pr_debug("info: vendor=0x%4.04X device=0x%4.04X rev=%d\n",
|
||||
pdev->vendor, pdev->device, pdev->revision);
|
||||
|
@ -206,6 +223,13 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
|||
card->pcie.can_ext_scan = data->can_ext_scan;
|
||||
}
|
||||
|
||||
/* device tree node parsing and platform specific configuration*/
|
||||
if (pdev->dev.of_node) {
|
||||
ret = mwifiex_pcie_probe_of(&pdev->dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (mwifiex_add_card(card, &add_remove_card_sem, &pcie_ops,
|
||||
MWIFIEX_PCIE)) {
|
||||
pr_err("%s failed\n", __func__);
|
||||
|
|
|
@ -2235,7 +2235,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.
|
||||
*/
|
||||
if (priv->adapter->iface_type == MWIFIEX_SDIO &&
|
||||
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 (of_property_read_u32(adapter->dt_node,
|
||||
|
|
Loading…
Reference in a new issue