Revert "Add non-Virtex5 support for LL TEMAC driver"

This reverts commit 459569145516f7967b916c57445feb02c600668c.

Uses virt_to_bus() and breaks the build.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/ll_temac.h b/drivers/net/ll_temac.h
index c03358434acb..1af66a1e6911 100644
--- a/drivers/net/ll_temac.h
+++ b/drivers/net/ll_temac.h
@@ -5,11 +5,8 @@
 #include <linux/netdevice.h>
 #include <linux/of.h>
 #include <linux/spinlock.h>
-
-#ifdef CONFIG_PPC_DCR
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
-#endif
 
 /* packet size info */
 #define XTE_HDR_SIZE                    14      /* size of Ethernet header */
@@ -293,6 +290,9 @@ This option defaults to enabled (set) */
 
 #define TX_CONTROL_CALC_CSUM_MASK   1
 
+#define XTE_ALIGN       32
+#define BUFFER_ALIGN(adr) ((XTE_ALIGN - ((u32) adr)) % XTE_ALIGN)
+
 #define MULTICAST_CAM_TABLE_NUM 4
 
 /* TX/RX CURDESC_PTR points to first descriptor */
@@ -335,15 +335,9 @@ struct temac_local {
         struct mii_bus *mii_bus;        /* MII bus reference */
         int mdio_irqs[PHY_MAX_ADDR];    /* IRQs table for MDIO bus */
 
-        /* IO registers, dma functions and IRQs */
+        /* IO registers and IRQs */
         void __iomem *regs;
-        void __iomem *sdma_regs;
-#ifdef CONFIG_PPC_DCR
         dcr_host_t sdma_dcrs;
-#endif
-        u32 (*dma_in)(struct temac_local *, int);
-        void (*dma_out)(struct temac_local *, int, u32);
-
         int tx_irq;
         int rx_irq;
         int emac_num;