Merge branch 'master' of git://git.denx.de/u-boot-video

[platform/kernel/u-boot.git] / include / tsec.h

diff --git a/include/tsec.h b/include/tsec.h
index 7200229..fb27edf 100644 (file)
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -18,6 +18,8 @@
 #include <config.h>
 #include <phy.h>
 
+#ifndef CONFIG_DM_ETH
+
 #ifdef CONFIG_LS102XA
 #define TSEC_SIZE              0x40000
 #define TSEC_MDIO_OFFSET       0x40000
@@ -64,6 +66,8 @@
        x.mii_devname = DEFAULT_MII_NAME;\
 }
 
+#endif /* CONFIG_DM_ETH */
+
 #define MAC_ADDR_LEN           6
 
 /* #define TSEC_TIMEOUT        1000000 */
@@ -398,10 +402,16 @@ struct tsec_private {
        phy_interface_t interface;
        struct mii_dev *bus;
        uint phyaddr;
+       uint tbiaddr;
        char mii_devname[16];
        u32 flags;
        uint rx_idx;    /* index of the current RX buffer */
        uint tx_idx;    /* index of the current TX buffer */
+#ifndef CONFIG_DM_ETH
+       struct eth_device *dev;
+#else
+       struct udevice *dev;
+#endif
 };
 
 struct tsec_info_struct {
@@ -414,7 +424,9 @@ struct tsec_info_struct {
        u32 flags;
 };
 
+#ifndef CONFIG_DM_ETH
 int tsec_standard_init(bd_t *bis);
 int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsec_info, int num);
+#endif
 
 #endif /* __TSEC_H */