Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / fs_enet_pd.h

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 51b7934..efb0596 100644 (file)
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -16,8 +16,10 @@
 #ifndef FS_ENET_PD_H
 #define FS_ENET_PD_H
 
+#include <linux/clk.h>
 #include <linux/string.h>
 #include <linux/of_mdio.h>
+#include <linux/if_ether.h>
 #include <asm/types.h>
 
 #define FS_ENET_NAME   "fs_enet"
@@ -135,13 +137,15 @@ struct fs_platform_info {
        const struct fs_mii_bus_info *bus_info;
 
        int rx_ring, tx_ring;   /* number of buffers on rx     */
-       __u8 macaddr[6];        /* mac address                 */
+       __u8 macaddr[ETH_ALEN]; /* mac address                 */
        int rx_copybreak;       /* limit we copy small frames  */
        int use_napi;           /* use NAPI                    */
        int napi_weight;        /* NAPI weight                 */
 
        int use_rmii;           /* use RMII mode               */
        int has_phy;            /* if the network is phy container as well...*/
+
+       struct clk *clk_per;    /* 'per' clock for register access */
 };
 struct fs_mii_fec_platform_info {
        u32 irq[32];