net: fs_enet: Move struct fs_platform_info into fs_enet.h

struct fs_platform_info is only used in fs_enet ethernet driver since
commit 3dd82a1ea724 ("[POWERPC] CPM: Always use new binding.").

Stale prototypes using fs_platform_info were left over in
arch/powerpc/sysdev/fsl_soc.c but they are now removed by
previous patch.

Move struct fs_platform_info into fs_enet.h

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/f882d6b0b7075d0d8435310634ceaa2cc8e9938f.1691155347.git.christophe.leroy@csgroup.eu
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index cb419aef8d1b89c1c81160635c9982bba1c0d8bd..d371072fff60820eaa48c890dd292278535ff140 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
@@ -2,6 +2,7 @@
 #ifndef FS_ENET_H
 #define FS_ENET_H
 
+#include <linux/clk.h>
 #include <linux/mii.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>
@@ -9,7 +10,6 @@
 #include <linux/phy.h>
 #include <linux/dma-mapping.h>
 
-#include <linux/fs_enet_pd.h>
 #include <asm/fs_pd.h>
 
 #ifdef CONFIG_CPM1
@@ -118,6 +118,23 @@ struct phy_info {
 #define ENET_RX_ALIGN  16
 #define ENET_RX_FRSIZE L1_CACHE_ALIGN(PKT_MAXBUF_SIZE + ENET_RX_ALIGN - 1)
 
+struct fs_platform_info {
+       /* device specific information */
+       u32 cp_command;         /* CPM page/sblock/mcn */
+
+       u32 dpram_offset;
+
+       struct device_node *phy_node;
+
+       int rx_ring, tx_ring;   /* number of buffers on rx      */
+       int rx_copybreak;       /* limit we copy small frames   */
+       int napi_weight;        /* NAPI weight                  */
+
+       int use_rmii;           /* use RMII mode                */
+
+       struct clk *clk_per;    /* 'per' clock for register access */
+};
+
 struct fs_enet_private {
        struct napi_struct napi;
        struct device *dev;     /* pointer back to the device (must be initialized first) */

diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index 1910df250c33e295848c1d6412dd71e9e26eeeb2..a1e777a4b75f669590f90007bd5a10a2996dece9 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -31,6 +31,7 @@
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
 #include <linux/of_address.h>
+#include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 #include <linux/pgtable.h>
 

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 2b351b676467c71a4321605373d8df6f1443987e..7c9897dab558dcfc4717c6cc8505cc625db7635a 100644 (file)
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -110,22 +110,6 @@ struct fs_mii_bb_platform_info {
        int irq[32];    /* irqs per phy's */
 };
 
-struct fs_platform_info {
-       /* device specific information */
-       u32 cp_command;         /* CPM page/sblock/mcn */
-
-       u32 dpram_offset;
-       
-       struct device_node *phy_node;
-
-       int rx_ring, tx_ring;   /* number of buffers on rx     */
-       int rx_copybreak;       /* limit we copy small frames  */
-       int napi_weight;        /* NAPI weight                 */
-
-       int use_rmii;           /* use RMII mode               */
-
-       struct clk *clk_per;    /* 'per' clock for register access */
-};
 struct fs_mii_fec_platform_info {
        u32 irq[32];
        u32 mii_speed;