[PATCH 3/9] include: Move designware eth platform_data to include/platform_data

Sascha Hauer s.hauer at pengutronix.de
Thu Apr 14 23:49:12 PDT 2016


Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/mach-socfpga/generic.c        |  1 -
 drivers/net/designware.c               |  2 +-
 include/net/designware.h               | 13 -------------
 include/platform_data/eth-designware.h | 13 +++++++++++++
 4 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 include/net/designware.h
 create mode 100644 include/platform_data/eth-designware.h

diff --git a/arch/arm/mach-socfpga/generic.c b/arch/arm/mach-socfpga/generic.c
index 906bc63..c920bd6 100644
--- a/arch/arm/mach-socfpga/generic.c
+++ b/arch/arm/mach-socfpga/generic.c
@@ -4,7 +4,6 @@
 #include <init.h>
 #include <io.h>
 #include <fs.h>
-#include <net/designware.h>
 #include <linux/clkdev.h>
 #include <linux/clk.h>
 #include <linux/stat.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 3b21244..1d662a7 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -27,7 +27,7 @@
 #include <io.h>
 #include <net.h>
 #include <of_net.h>
-#include <net/designware.h>
+#include <platform_data/eth-designware.h>
 #include <linux/phy.h>
 #include <linux/err.h>
 #include "designware.h"
diff --git a/include/net/designware.h b/include/net/designware.h
deleted file mode 100644
index 7a7a26a..0000000
--- a/include/net/designware.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __DWC_UNIMAC_H
-#define __DWC_UNIMAC_H
-
-#include <linux/phy.h>
-
-struct dwc_ether_platform_data {
-	int phy_addr;
-	phy_interface_t interface;
-	void (*fix_mac_speed)(int speed);
-	bool enh_desc;	/* use Alternate/Enhanced Descriptor configurations */
-};
-
-#endif
diff --git a/include/platform_data/eth-designware.h b/include/platform_data/eth-designware.h
new file mode 100644
index 0000000..7a7a26a
--- /dev/null
+++ b/include/platform_data/eth-designware.h
@@ -0,0 +1,13 @@
+#ifndef __DWC_UNIMAC_H
+#define __DWC_UNIMAC_H
+
+#include <linux/phy.h>
+
+struct dwc_ether_platform_data {
+	int phy_addr;
+	phy_interface_t interface;
+	void (*fix_mac_speed)(int speed);
+	bool enh_desc;	/* use Alternate/Enhanced Descriptor configurations */
+};
+
+#endif
-- 
2.7.0




More information about the barebox mailing list