[PATCH 2/5] temac: dma init for Virtex4

[gfilip@ee.ethz.ch]

This patch belongs to a set of patches which extends the temac driver to support Virtex4-FX. It was successfully tested on the ML403 evaluation board.

Signed-off-by: Filip Gospodinov <gfilip@ee.ethz.ch>
---
 drivers/net/ll_temac.h      |    4 ++++
 drivers/net/ll_temac_main.c |   17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ll_temac.h b/drivers/net/ll_temac.h
index 95dd650..51824a8 100644
--- a/drivers/net/ll_temac.h
+++ b/drivers/net/ll_temac.h
@@ -383,7 +383,11 @@ struct temac_local {
 
 	/* IO registers and IRQs */
 	void __iomem *regs;
+#ifdef CONFIG_XILINX_VIRTEX_4_FX
+	void __iomem *dma_regs;
+#else
 	dcr_host_t sdma_dcrs;
+#endif
 	int tx_irq;
 	int rx_irq;
 	int emac_num;
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index a8522bd..0d4b1c5 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -812,7 +812,6 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
 	struct net_device *ndev;
 	const void *addr;
 	int size, rc = 0;
-	unsigned int dcrs;
 
 	/* Init network device structure */
 	ndev = alloc_etherdev(sizeof(*lp));
@@ -862,6 +861,21 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
 		goto nodev;
 	}
 
+#ifdef CONFIG_XILINX_VIRTEX_4_FX
+	unsigned int ds;
+	const u32 *dr = of_get_property(np, "reg", &ds);
+	if (dr == NULL || ds & 1 || 0 >= ds ) {
+		dev_err(&op->dev, "could not get DMA register address\n");
+		goto nodev;
+	}
+	lp->dma_regs = (u32) ioremap(*dr, 4096);
+	if (!lp->dma_regs) {
+		dev_err(&op->dev, "could not get DMA virtual address\n");
+		goto nodev;
+	}
+	dev_dbg(&op->dev, "DMA base: %x\n", lp->dma_regs);
+#else	/*CONFIG_XILINX_VIRTEX_4_FX*/
+	unsigned int dcrs;
 	dcrs = dcr_resource_start(np, 0);
 	if (dcrs == 0) {
 		dev_err(&op->dev, "could not get DMA register address\n");
@@ -869,6 +883,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
 	}
 	lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));
 	dev_dbg(&op->dev, "DCR base: %x\n", dcrs);
+#endif /*CONFIG_XILINX_VIRTEX_4_FX*/'
 
 	lp->rx_irq = irq_of_parse_and_map(np, 0);
 	lp->tx_irq = irq_of_parse_and_map(np, 1);
-- 
1.6.4.4