Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils

[pandora-kernel.git] / include / linux / stmmac.h

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 9529e49..0dddc9e 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -28,11 +28,21 @@
 
 #include <linux/platform_device.h>
 
-/* platform data for platform device structure's platform_data field */
+/* Platfrom data for platform device structure's platform_data field */
+
+struct stmmac_mdio_bus_data {
+       int bus_id;
+       int (*phy_reset)(void *priv);
+       unsigned int phy_mask;
+       int *irqs;
+       int probed_phy_irq;
+};
 
-/* Private data for the STM on-board ethernet driver */
 struct plat_stmmacenet_data {
        int bus_id;
+       int phy_addr;
+       int interface;
+       struct stmmac_mdio_bus_data *mdio_bus_data;
        int pbl;
        int clk_csr;
        int has_gmac;
@@ -40,6 +50,7 @@ struct plat_stmmacenet_data {
        int tx_coe;
        int bugged_jumbo;
        int pmt;
+       int force_sf_dma_mode;
        void (*fix_mac_speed)(void *priv, unsigned int speed);
        void (*bus_setup)(void __iomem *ioaddr);
        int (*init)(struct platform_device *pdev);
@@ -47,14 +58,4 @@ struct plat_stmmacenet_data {
        void *custom_cfg;
        void *bsp_priv;
 };
-
-struct plat_stmmacphy_data {
-       int bus_id;
-       int phy_addr;
-       unsigned int phy_mask;
-       int interface;
-       int (*phy_reset)(void *priv);
-       void *priv;
-};
 #endif
-