Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / rockchip / gmac / stmmac.h

diff --git a/drivers/net/ethernet/rockchip/gmac/stmmac.h b/drivers/net/ethernet/rockchip/gmac/stmmac.h
index ec6050bba7eb726b03cb0e34bb5f38957af57ad8..810d2b342741ddb29cd96a22549156b103ede1fd 100755 (executable)
--- a/drivers/net/ethernet/rockchip/gmac/stmmac.h
+++ b/drivers/net/ethernet/rockchip/gmac/stmmac.h
@@ -111,18 +111,22 @@ struct stmmac_priv {
 };
 
 enum {
-    RK3288_GMAC,
-    RK312X_GMAC
+       RK3288_GMAC,
+       RK312X_GMAC,
+       RK3368_GMAC
 };
 
 struct bsp_priv {
+       struct regmap *grf;
+       struct platform_device *pdev;
        bool power_ctrl_by_pmu;
        char pmu_regulator[32];
-       int pmu_enable_level;
        int power_io;
        int power_io_level;
        int reset_io;
        int reset_io_level;
+       int phyirq_io;
+       int phyirq_io_level;
        int phy_iface;
        bool clock_input;
        int chip;