Commit b6a4c8f0 authored by Jan Kiszka's avatar Jan Kiszka Committed by David S. Miller

stmmac: pci: Use stmmac_pci_info for all devices

Make stmmac_default_data compatible with stmmac_pci_info.setup and use
an info structure for all devices. This allows to make the probing more
regular.
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5d5287e
...@@ -100,7 +100,9 @@ static void common_default_data(struct plat_stmmacenet_data *plat) ...@@ -100,7 +100,9 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
plat->rx_queues_cfg[0].pkt_route = 0x0; plat->rx_queues_cfg[0].pkt_route = 0x0;
} }
static void stmmac_default_data(struct plat_stmmacenet_data *plat) static int stmmac_default_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat,
const struct stmmac_pci_info *info)
{ {
/* Set common default data first */ /* Set common default data first */
common_default_data(plat); common_default_data(plat);
...@@ -112,8 +114,14 @@ static void stmmac_default_data(struct plat_stmmacenet_data *plat) ...@@ -112,8 +114,14 @@ static void stmmac_default_data(struct plat_stmmacenet_data *plat)
plat->dma_cfg->pbl = 32; plat->dma_cfg->pbl = 32;
plat->dma_cfg->pblx8 = true; plat->dma_cfg->pblx8 = true;
/* TODO: AXI */ /* TODO: AXI */
return 0;
} }
static const struct stmmac_pci_info stmmac_pci_info = {
.setup = stmmac_default_data,
};
static int quark_default_data(struct pci_dev *pdev, static int quark_default_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat, struct plat_stmmacenet_data *plat,
const struct stmmac_pci_info *info) const struct stmmac_pci_info *info)
...@@ -236,14 +244,9 @@ static int stmmac_pci_probe(struct pci_dev *pdev, ...@@ -236,14 +244,9 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
pci_set_master(pdev); pci_set_master(pdev);
if (info) { ret = info->setup(pdev, plat, info);
if (info->setup) { if (ret)
ret = info->setup(pdev, plat, info); return ret;
if (ret)
return ret;
}
} else
stmmac_default_data(plat);
pci_enable_msi(pdev); pci_enable_msi(pdev);
...@@ -269,14 +272,21 @@ static void stmmac_pci_remove(struct pci_dev *pdev) ...@@ -269,14 +272,21 @@ static void stmmac_pci_remove(struct pci_dev *pdev)
static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_suspend, stmmac_resume); static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_suspend, stmmac_resume);
#define STMMAC_VENDOR_ID 0x700 /* synthetic ID, no official vendor */
#define PCI_VENDOR_ID_STMMAC 0x700
#define STMMAC_QUARK_ID 0x0937 #define STMMAC_QUARK_ID 0x0937
#define STMMAC_DEVICE_ID 0x1108 #define STMMAC_DEVICE_ID 0x1108
#define STMMAC_DEVICE(vendor_id, dev_id, info) { \
PCI_VDEVICE(vendor_id, dev_id), \
.driver_data = (kernel_ulong_t)&info \
}
static const struct pci_device_id stmmac_id_table[] = { static const struct pci_device_id stmmac_id_table[] = {
{PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)}, STMMAC_DEVICE(STMMAC, STMMAC_DEVICE_ID, stmmac_pci_info),
{PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_MAC)}, STMMAC_DEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_MAC, stmmac_pci_info),
{PCI_VDEVICE(INTEL, STMMAC_QUARK_ID), (kernel_ulong_t)&quark_pci_info}, STMMAC_DEVICE(INTEL, STMMAC_QUARK_ID, quark_pci_info),
{} {}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment