1 files changed, 21 insertions, 29 deletions
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 783c476b8674..74ed35a00a94 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -69,34 +69,21 @@ enum fs_ioport {
        fsiop_porte,
 };
-struct fs_mii_bus_info {
+struct fs_mii_bit {
-        int method;             /* mii method                  */
+        u32 offset;
-        int id;                 /* the id of the mii_bus       */
+        u8 bit;
-        int disable_aneg;       /* if the controller needs to negothiate speed & duplex */
+        u8 polarity;
-        int lpa;                /* the default board-specific vallues will be applied otherwise */
+};
+struct fs_mii_bb_platform_info {
-        union {
+        struct fs_mii_bit       mdio_dir;
-                struct {
+        struct fs_mii_bit       mdio_dat;
-                        int duplex;
+        struct fs_mii_bit       mdc_dat;
-                        int speed;
+        int mdio_port;  /* port & bit for MDIO */
-                } fixed;
+        int mdio_bit;
+        int mdc_port;   /* port & bit for MDC  */
-                struct {
+        int mdc_bit;
-                        /* nothing */
+        int delay;      /* delay in us         */
-                } fec;
+        int irq[32];    /* irqs per phy's */
-                
-                struct {
-                        /* nothing */
-                } scc;
-                struct {
-                        int mdio_port;  /* port & bit for MDIO */
-                        int mdio_bit;
-                        int mdc_port;   /* port & bit for MDC  */
-                        int mdc_bit;
-                        int delay;      /* delay in us         */
-                } bitbang;
-        } i;
 };
 struct fs_platform_info {
@@ -119,6 +106,7 @@ struct fs_platform_info {
        u32 device_flags;
        int phy_addr;           /* the phy address (-1 no phy) */
+        const char*     bus_id;
        int phy_irq;            /* the phy irq (if it exists)  */
        const struct fs_mii_bus_info *bus_info;
@@ -130,6 +118,10 @@ struct fs_platform_info {
        int napi_weight;        /* NAPI weight                 */
        int use_rmii;           /* use RMII mode               */
+        int has_phy;            /* if the network is phy container as well...*/
+};
+struct fs_mii_fec_platform_info {
+        u32 irq[32];
+        u32 mii_speed;
 };
 #endif

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h index 783c476b8674..74ed35a00a94 100644 --- a/include/linux/fs_enet_pd.h +++ b/include/linux/fs_enet_pd.h
@@ -69,34 +69,21 @@ enum fs_ioport {
69	fsiop_porte,	69	fsiop_porte,
70	};	70	};
71		71
72	struct fs_mii_bus_info {	72	struct fs_mii_bit {
73	int method; /* mii method */	73	u32 offset;
74	int id; /* the id of the mii_bus */	74	u8 bit;
75	int disable_aneg; /* if the controller needs to negothiate speed & duplex */	75	u8 polarity;
76	int lpa; /* the default board-specific vallues will be applied otherwise */	76	};
77		77	struct fs_mii_bb_platform_info {
78	union {	78	struct fs_mii_bit mdio_dir;
79	struct {	79	struct fs_mii_bit mdio_dat;
80	int duplex;	80	struct fs_mii_bit mdc_dat;
81	int speed;	81	int mdio_port; /* port & bit for MDIO */
82	} fixed;	82	int mdio_bit;
83		83	int mdc_port; /* port & bit for MDC */
84	struct {	84	int mdc_bit;
85	/* nothing */	85	int delay; /* delay in us */
86	} fec;	86	int irq[32]; /* irqs per phy's */
87
88	struct {
89	/* nothing */
90	} scc;
91
92	struct {
93	int mdio_port; /* port & bit for MDIO */
94	int mdio_bit;
95	int mdc_port; /* port & bit for MDC */
96	int mdc_bit;
97	int delay; /* delay in us */
98	} bitbang;
99	} i;
100	};	87	};
101		88
102	struct fs_platform_info {	89	struct fs_platform_info {
@@ -119,6 +106,7 @@ struct fs_platform_info {
119	u32 device_flags;	106	u32 device_flags;
120		107
121	int phy_addr; /* the phy address (-1 no phy) */	108	int phy_addr; /* the phy address (-1 no phy) */
		109	const char* bus_id;
122	int phy_irq; /* the phy irq (if it exists) */	110	int phy_irq; /* the phy irq (if it exists) */
123		111
124	const struct fs_mii_bus_info *bus_info;	112	const struct fs_mii_bus_info *bus_info;
@@ -130,6 +118,10 @@ struct fs_platform_info {
130	int napi_weight; /* NAPI weight */	118	int napi_weight; /* NAPI weight */
131		119
132	int use_rmii; /* use RMII mode */	120	int use_rmii; /* use RMII mode */
		121	int has_phy; /* if the network is phy container as well...*/
		122	};
		123	struct fs_mii_fec_platform_info {
		124	u32 irq[32];
		125	u32 mii_speed;
133	};	126	};
134
135	#endif	127	#endif