Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / include / linux / davinci_emac.h

diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h
index a04fd8c9fbdfd5743d76c000f377b676631cbd78..5dd428532f794c387533633cba57e6e12957cb01 100644 (file)
--- a/include/linux/davinci_emac.h
+++ b/include/linux/davinci_emac.h
@@ -24,10 +24,16 @@ struct emac_platform_data {
        u32 ctrl_mod_reg_offset;
        u32 ctrl_ram_offset;
        u32 hw_ram_addr;
-       u32 mdio_reg_offset;
        u32 ctrl_ram_size;
-       u32 phy_mask;
-       u32 mdio_max_freq;
+
+       /*
+        * phy_id can be one of the following:
+        *   - NULL             : use the first phy on the bus,
+        *   - ""               : force to 100/full, no mdio control
+        *   - "<bus>:<addr>"   : use the specified bus and phy
+        */
+       const char *phy_id;
+
        u8 rmii_en;
        u8 version;
        void (*interrupt_enable) (void);