sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file

[safe/jmp/linux-2.6] / include / linux / mv643xx_eth.h

diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 9f3a603..cbbbe9b 100644 (file)
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -7,8 +7,8 @@
 
 #include <linux/mbus.h>
 
-#define MV643XX_ETH_SHARED_NAME                "mv643xx_eth_shared"
-#define MV643XX_ETH_NAME               "mv643xx_eth"
+#define MV643XX_ETH_SHARED_NAME                "mv643xx_eth"
+#define MV643XX_ETH_NAME               "mv643xx_eth_port"
 #define MV643XX_ETH_SHARED_REGS                0x2000
 #define MV643XX_ETH_SHARED_REGS_SIZE   0x2000
 #define MV643XX_ETH_BAR_4              0x2220
@@ -17,28 +17,62 @@
 
 struct mv643xx_eth_shared_platform_data {
        struct mbus_dram_target_info    *dram;
-       unsigned int    t_clk;
+       struct platform_device  *shared_smi;
+       unsigned int            t_clk;
 };
 
+#define MV643XX_ETH_PHY_ADDR_DEFAULT   0
+#define MV643XX_ETH_PHY_ADDR(x)                (0x80 | (x))
+#define MV643XX_ETH_PHY_NONE           0xff
+
 struct mv643xx_eth_platform_data {
+       /*
+        * Pointer back to our parent instance, and our port number.
+        */
        struct platform_device  *shared;
-       int             port_number;
-
-       u16             force_phy_addr; /* force override if phy_addr == 0 */
-       u16             phy_addr;
-
-       /* If speed is 0, then speed and duplex are autonegotiated. */
-       int             speed;          /* 0, SPEED_10, SPEED_100, SPEED_1000 */
-       int             duplex;         /* DUPLEX_HALF or DUPLEX_FULL */
-
-       /* non-zero values of the following fields override defaults */
-       u32             tx_queue_size;
-       u32             rx_queue_size;
-       u32             tx_sram_addr;
-       u32             tx_sram_size;
-       u32             rx_sram_addr;
-       u32             rx_sram_size;
-       u8              mac_addr[6];    /* mac address if non-zero*/
+       int                     port_number;
+
+       /*
+        * Whether a PHY is present, and if yes, at which address.
+        */
+       int                     phy_addr;
+
+       /*
+        * Use this MAC address if it is valid, overriding the
+        * address that is already in the hardware.
+        */
+       u8                      mac_addr[6];
+
+       /*
+        * If speed is 0, autonegotiation is enabled.
+        *   Valid values for speed: 0, SPEED_10, SPEED_100, SPEED_1000.
+        *   Valid values for duplex: DUPLEX_HALF, DUPLEX_FULL.
+        */
+       int                     speed;
+       int                     duplex;
+
+       /*
+        * How many RX/TX queues to use.
+        */
+       int                     rx_queue_count;
+       int                     tx_queue_count;
+
+       /*
+        * Override default RX/TX queue sizes if nonzero.
+        */
+       int                     rx_queue_size;
+       int                     tx_queue_size;
+
+       /*
+        * Use on-chip SRAM for RX/TX descriptors if size is nonzero
+        * and sufficient to contain all descriptors for the requested
+        * ring sizes.
+        */
+       unsigned long           rx_sram_addr;
+       int                     rx_sram_size;
+       unsigned long           tx_sram_addr;
+       int                     tx_sram_size;
 };
 
-#endif /* __LINUX_MV643XX_ETH_H */
+
+#endif