* [PATCH 1/9] include: Move ep93xx eth platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 2/9] include: Move smc91111 " Sascha Hauer
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/edb93xx/edb93xx.c | 2 +-
drivers/net/ep93xx.c | 2 +-
include/net/ep93xx_eth.h | 26 --------------------------
include/platform_data/eth-ep93xx.h | 26 ++++++++++++++++++++++++++
4 files changed, 28 insertions(+), 28 deletions(-)
delete mode 100644 include/net/ep93xx_eth.h
create mode 100644 include/platform_data/eth-ep93xx.h
diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c
index 0fb93d2..cdc2009 100644
--- a/arch/arm/boards/edb93xx/edb93xx.c
+++ b/arch/arm/boards/edb93xx/edb93xx.c
@@ -27,7 +27,7 @@
#include <malloc.h>
#include <generated/mach-types.h>
#include <mach/ep93xx-regs.h>
-#include <net/ep93xx_eth.h>
+#include <platform_data/eth-ep93xx.h>
#include "edb93xx.h"
#define DEVCFG_U1EN (1 << 18)
diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c
index 0acb9b6..fd725a5 100644
--- a/drivers/net/ep93xx.c
+++ b/drivers/net/ep93xx.c
@@ -38,7 +38,7 @@
#include <linux/types.h>
#include <mach/ep93xx-regs.h>
#include <linux/phy.h>
-#include <net/ep93xx_eth.h>
+#include <platform_data/eth-ep93xx.h>
#include "ep93xx.h"
#define EP93XX_MAX_PKT_SIZE 1536
diff --git a/include/net/ep93xx_eth.h b/include/net/ep93xx_eth.h
deleted file mode 100644
index 0fb11d0..0000000
--- a/include/net/ep93xx_eth.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * (C) Copyright 2016 Alexander Kurz <akurz@blala.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __NET_EP93XX_ETH_H
-#define __NET_EP93XX_ETH_H
-
-#include <linux/phy.h>
-
-struct ep93xx_eth_platform_data {
- phy_interface_t xcv_type;
- int phy_addr;
-};
-
-#endif /* __NET_EP93XX_ETH_H */
diff --git a/include/platform_data/eth-ep93xx.h b/include/platform_data/eth-ep93xx.h
new file mode 100644
index 0000000..0fb11d0
--- /dev/null
+++ b/include/platform_data/eth-ep93xx.h
@@ -0,0 +1,26 @@
+/*
+ * (C) Copyright 2016 Alexander Kurz <akurz@blala.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __NET_EP93XX_ETH_H
+#define __NET_EP93XX_ETH_H
+
+#include <linux/phy.h>
+
+struct ep93xx_eth_platform_data {
+ phy_interface_t xcv_type;
+ int phy_addr;
+};
+
+#endif /* __NET_EP93XX_ETH_H */
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/9] include: Move smc91111 eth platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
2016-04-15 6:49 ` [PATCH 1/9] include: Move ep93xx eth " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 3/9] include: Move designware " Sascha Hauer
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/lubbock/board.c | 2 +-
arch/arm/boards/mainstone/board.c | 2 +-
arch/arm/boards/versatile/versatilepb.c | 2 +-
arch/arm/boards/zylonite/board.c | 2 +-
drivers/net/smc91111.c | 2 +-
include/net/smc91111.h | 19 -------------------
include/platform_data/eth-smc91111.h | 19 +++++++++++++++++++
7 files changed, 24 insertions(+), 24 deletions(-)
delete mode 100644 include/net/smc91111.h
create mode 100644 include/platform_data/eth-smc91111.h
diff --git a/arch/arm/boards/lubbock/board.c b/arch/arm/boards/lubbock/board.c
index 6f517d8..c2a0db7 100644
--- a/arch/arm/boards/lubbock/board.c
+++ b/arch/arm/boards/lubbock/board.c
@@ -33,7 +33,7 @@
#include <mach/udc_pxa2xx.h>
#include <mach/mci_pxa2xx.h>
-#include <net/smc91111.h>
+#include <platform_data/eth-smc91111.h>
#include <asm/armlinux.h>
#include <asm/io.h>
#include <asm/mmu.h>
diff --git a/arch/arm/boards/mainstone/board.c b/arch/arm/boards/mainstone/board.c
index c339bb9..0e48e79 100644
--- a/arch/arm/boards/mainstone/board.c
+++ b/arch/arm/boards/mainstone/board.c
@@ -33,7 +33,7 @@
#include <mach/udc_pxa2xx.h>
#include <mach/mci_pxa2xx.h>
-#include <net/smc91111.h>
+#include <platform_data/eth-smc91111.h>
#include <asm/armlinux.h>
#include <asm/io.h>
#include <asm/mmu.h>
diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c
index 3166cd4..8691a17 100644
--- a/arch/arm/boards/versatile/versatilepb.c
+++ b/arch/arm/boards/versatile/versatilepb.c
@@ -29,7 +29,7 @@
#include <environment.h>
#include <partition.h>
#include <linux/sizes.h>
-#include <net/smc91111.h>
+#include <platform_data/eth-smc91111.h>
static int vpb_console_init(void)
{
diff --git a/arch/arm/boards/zylonite/board.c b/arch/arm/boards/zylonite/board.c
index 2ff08b7..bd72cd1 100644
--- a/arch/arm/boards/zylonite/board.c
+++ b/arch/arm/boards/zylonite/board.c
@@ -25,7 +25,7 @@
#include <init.h>
#include <partition.h>
#include <led.h>
-#include <net/smc91111.h>
+#include <platform_data/eth-smc91111.h>
#include <platform_data/mtd-nand-mrvl.h>
#include <pwm.h>
#include <linux/clk.h>
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index b705591..e08e3dd 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -67,7 +67,7 @@
#include <io.h>
#include <linux/phy.h>
#include <linux/err.h>
-#include <net/smc91111.h>
+#include <platform_data/eth-smc91111.h>
/*---------------------------------------------------------------
.
diff --git a/include/net/smc91111.h b/include/net/smc91111.h
deleted file mode 100644
index 72193bf..0000000
--- a/include/net/smc91111.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
- *
- * Under GPLv2 only
- */
-
-#ifndef __SMC91111_H__
-#define __SMC91111_H__
-
-struct smc91c111_pdata {
- int qemu_fixup;
- int addr_shift;
- int bus_width;
- bool word_aligned_short_writes;
- int config_setup;
- int control_setup;
-};
-
-#endif /* __SMC91111_H__ */
diff --git a/include/platform_data/eth-smc91111.h b/include/platform_data/eth-smc91111.h
new file mode 100644
index 0000000..72193bf
--- /dev/null
+++ b/include/platform_data/eth-smc91111.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
+ *
+ * Under GPLv2 only
+ */
+
+#ifndef __SMC91111_H__
+#define __SMC91111_H__
+
+struct smc91c111_pdata {
+ int qemu_fixup;
+ int addr_shift;
+ int bus_width;
+ bool word_aligned_short_writes;
+ int config_setup;
+ int control_setup;
+};
+
+#endif /* __SMC91111_H__ */
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 3/9] include: Move designware eth platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
2016-04-15 6:49 ` [PATCH 1/9] include: Move ep93xx eth " Sascha Hauer
2016-04-15 6:49 ` [PATCH 2/9] include: Move smc91111 " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 4/9] include: Move davinci emac " Sascha Hauer
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@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
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 4/9] include: Move davinci emac platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
` (2 preceding siblings ...)
2016-04-15 6:49 ` [PATCH 3/9] include: Move designware " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 5/9] include: Move fec eth " Sascha Hauer
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/net/davinci_emac.c | 2 +-
include/net/davinci_emac.h | 10 ----------
include/platform_data/eth-davinci-emac.h | 10 ++++++++++
3 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100644 include/net/davinci_emac.h
create mode 100644 include/platform_data/eth-davinci-emac.h
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 3dc4b16..75a917a 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -49,7 +49,7 @@
#include <asm/system.h>
#include <linux/phy.h>
#include <mach/emac_defs.h>
-#include <net/davinci_emac.h>
+#include <platform_data/eth-davinci-emac.h>
#include "davinci_emac.h"
struct davinci_emac_priv {
diff --git a/include/net/davinci_emac.h b/include/net/davinci_emac.h
deleted file mode 100644
index caead1f..0000000
--- a/include/net/davinci_emac.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __NET_DAVINCI_EMAC_H__
-#define __NET_DAVINCI_EMAC_H__
-
-struct davinci_emac_platform_data {
- int phy_addr;
- bool force_link;
- bool interface_rmii;
-};
-
-#endif /* __NET_DAVINCI_EMAC_H__ */
diff --git a/include/platform_data/eth-davinci-emac.h b/include/platform_data/eth-davinci-emac.h
new file mode 100644
index 0000000..caead1f
--- /dev/null
+++ b/include/platform_data/eth-davinci-emac.h
@@ -0,0 +1,10 @@
+#ifndef __NET_DAVINCI_EMAC_H__
+#define __NET_DAVINCI_EMAC_H__
+
+struct davinci_emac_platform_data {
+ int phy_addr;
+ bool force_link;
+ bool interface_rmii;
+};
+
+#endif /* __NET_DAVINCI_EMAC_H__ */
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 5/9] include: Move fec eth platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
` (3 preceding siblings ...)
2016-04-15 6:49 ` [PATCH 4/9] include: Move davinci emac " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 6/9] include: Move ns16550 serial " Sascha Hauer
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/animeo_ip/init.c | 1 -
arch/arm/boards/at91sam9n12ek/init.c | 1 -
arch/arm/boards/at91sam9x5ek/init.c | 1 -
arch/arm/boards/ccxmx51/ccxmx51.c | 2 +-
arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 1 -
arch/arm/boards/datamodul-edm-qmx6/board.c | 1 -
arch/arm/boards/dss11/init.c | 1 -
arch/arm/boards/embedsky-e9/board.c | 1 -
arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c | 2 +-
arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c | 1 -
arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c | 2 +-
arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c | 2 +-
arch/arm/boards/freescale-mx25-3ds/3stack.c | 2 +-
arch/arm/boards/freescale-mx27-ads/imx27ads.c | 2 +-
arch/arm/boards/freescale-mx28-evk/mx28-evk.c | 2 +-
arch/arm/boards/freescale-mx35-3ds/3stack.c | 2 +-
arch/arm/boards/freescale-mx51-babbage/board.c | 1 -
arch/arm/boards/freescale-mx53-smd/board.c | 2 +-
arch/arm/boards/freescale-mx6-sabrelite/board.c | 1 -
arch/arm/boards/freescale-mx6-sabresd/board.c | 1 -
arch/arm/boards/guf-cupid/board.c | 2 +-
arch/arm/boards/guf-neso/board.c | 2 +-
arch/arm/boards/karo-tx28/tx28-stk5.c | 2 +-
arch/arm/boards/karo-tx51/tx51.c | 2 +-
arch/arm/boards/karo-tx53/board.c | 2 +-
arch/arm/boards/mmccpu/init.c | 1 -
arch/arm/boards/phytec-phycard-imx27/pca100.c | 1 -
arch/arm/boards/phytec-phycore-imx35/pcm043.c | 1 -
arch/arm/boards/phytec-som-imx6/board.c | 3 +-
arch/arm/boards/pm9263/init.c | 1 -
arch/arm/boards/tqma6x/board.c | 1 -
arch/arm/boards/udoo/board.c | 1 -
arch/arm/mach-imx/include/mach/devices.h | 2 +-
arch/ppc/boards/pcm030/pcm030.c | 2 +-
drivers/net/fec_imx.c | 2 +-
drivers/net/fec_mpc5200.c | 2 +-
include/fec.h | 37 -----------------------
include/platform_data/eth-fec.h | 37 +++++++++++++++++++++++
38 files changed, 57 insertions(+), 73 deletions(-)
delete mode 100644 include/fec.h
create mode 100644 include/platform_data/eth-fec.h
diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c
index 2069ab3..14b33dc 100644
--- a/arch/arm/boards/animeo_ip/init.c
+++ b/arch/arm/boards/animeo_ip/init.c
@@ -8,7 +8,6 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <fec.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <partition.h>
diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c
index 26d08ae..2ed58c1 100644
--- a/arch/arm/boards/at91sam9n12ek/init.c
+++ b/arch/arm/boards/at91sam9n12ek/init.c
@@ -18,7 +18,6 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <fec.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <partition.h>
diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c
index e0c11a1..1ef3580 100644
--- a/arch/arm/boards/at91sam9x5ek/init.c
+++ b/arch/arm/boards/at91sam9x5ek/init.c
@@ -18,7 +18,6 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <fec.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <partition.h>
diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c
index 40cf76d..71a51e1 100644
--- a/arch/arm/boards/ccxmx51/ccxmx51.c
+++ b/arch/arm/boards/ccxmx51/ccxmx51.c
@@ -20,7 +20,7 @@
#include <init.h>
#include <environment.h>
#include <mach/imx51-regs.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <partition.h>
diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
index 6e83570..947db7c 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
@@ -19,7 +19,6 @@
#include <environment.h>
#include <envfs.h>
#include <errno.h>
-#include <fec.h>
#include <gpio.h>
#include <init.h>
#include <mci.h>
diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c
index 96c7fbe..043a934 100644
--- a/arch/arm/boards/datamodul-edm-qmx6/board.c
+++ b/arch/arm/boards/datamodul-edm-qmx6/board.c
@@ -26,7 +26,6 @@
#include <linux/sizes.h>
#include <init.h>
#include <gpio.h>
-#include <fec.h>
#include <of.h>
#include <linux/micrel_phy.h>
diff --git a/arch/arm/boards/dss11/init.c b/arch/arm/boards/dss11/init.c
index feca909..321c383 100644
--- a/arch/arm/boards/dss11/init.c
+++ b/arch/arm/boards/dss11/init.c
@@ -17,7 +17,6 @@
#include <mci.h>
#include <init.h>
#include <environment.h>
-#include <fec.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <partition.h>
diff --git a/arch/arm/boards/embedsky-e9/board.c b/arch/arm/boards/embedsky-e9/board.c
index 23bfec1..1ba7be1 100644
--- a/arch/arm/boards/embedsky-e9/board.c
+++ b/arch/arm/boards/embedsky-e9/board.c
@@ -22,7 +22,6 @@
#include <init.h>
#include <environment.h>
#include <mach/imx6-regs.h>
-#include <fec.h>
#include <gpio.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
index 22bf740..9045191 100644
--- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
+++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
@@ -36,7 +36,7 @@
#include <mach/imx-nand.h>
#include <mach/imxfb.h>
#include <mach/iim.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <nand.h>
#include <mach/iomux-mx25.h>
#include <i2c/i2c.h>
diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
index 31422e6..b40ad13 100644
--- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -22,7 +22,6 @@
#include <init.h>
#include <environment.h>
#include <mach/imx27-regs.h>
-#include <fec.h>
#include <notifier.h>
#include <gpio.h>
#include <asm/armlinux.h>
diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
index 7b3993d..9c4ea13 100644
--- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
+++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
@@ -27,7 +27,7 @@
#include <environment.h>
#include <errno.h>
#include <fcntl.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <fs.h>
#include <init.h>
#include <nand.h>
diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c
index 75f3250..fc57f6c 100644
--- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c
+++ b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c
@@ -20,7 +20,7 @@
#include <init.h>
#include <environment.h>
#include <mach/imx51-regs.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <gpio.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
diff --git a/arch/arm/boards/freescale-mx25-3ds/3stack.c b/arch/arm/boards/freescale-mx25-3ds/3stack.c
index 6d0e382..36ad591 100644
--- a/arch/arm/boards/freescale-mx25-3ds/3stack.c
+++ b/arch/arm/boards/freescale-mx25-3ds/3stack.c
@@ -30,7 +30,7 @@
#include <partition.h>
#include <generated/mach-types.h>
#include <mach/imx-nand.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <nand.h>
#include <mach/iomux-mx25.h>
#include <mach/generic.h>
diff --git a/arch/arm/boards/freescale-mx27-ads/imx27ads.c b/arch/arm/boards/freescale-mx27-ads/imx27ads.c
index 9fb1760..109f7f9 100644
--- a/arch/arm/boards/freescale-mx27-ads/imx27ads.c
+++ b/arch/arm/boards/freescale-mx27-ads/imx27ads.c
@@ -21,7 +21,7 @@
#include <mach/imx27-regs.h>
#include <asm/armlinux.h>
#include <io.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <gpio.h>
#include <mach/weim.h>
#include <partition.h>
diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
index fc12375..9e5d612 100644
--- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
+++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
@@ -17,7 +17,7 @@
#include <common.h>
#include <environment.h>
#include <errno.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <gpio.h>
#include <init.h>
#include <mci.h>
diff --git a/arch/arm/boards/freescale-mx35-3ds/3stack.c b/arch/arm/boards/freescale-mx35-3ds/3stack.c
index cca0fe4..caeb3f7 100644
--- a/arch/arm/boards/freescale-mx35-3ds/3stack.c
+++ b/arch/arm/boards/freescale-mx35-3ds/3stack.c
@@ -25,7 +25,7 @@
#include <environment.h>
#include <errno.h>
#include <fcntl.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <fs.h>
#include <init.h>
#include <nand.h>
diff --git a/arch/arm/boards/freescale-mx51-babbage/board.c b/arch/arm/boards/freescale-mx51-babbage/board.c
index c4acb8e..9157485 100644
--- a/arch/arm/boards/freescale-mx51-babbage/board.c
+++ b/arch/arm/boards/freescale-mx51-babbage/board.c
@@ -20,7 +20,6 @@
#include <init.h>
#include <environment.h>
#include <mach/imx51-regs.h>
-#include <fec.h>
#include <gpio.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c
index 196d20a..354702d 100644
--- a/arch/arm/boards/freescale-mx53-smd/board.c
+++ b/arch/arm/boards/freescale-mx53-smd/board.c
@@ -17,7 +17,7 @@
#include <common.h>
#include <environment.h>
#include <fcntl.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <fs.h>
#include <init.h>
#include <nand.h>
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c
index d40f99b..63fa588 100644
--- a/arch/arm/boards/freescale-mx6-sabrelite/board.c
+++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c
@@ -18,7 +18,6 @@
#include <init.h>
#include <environment.h>
#include <mach/imx6-regs.h>
-#include <fec.h>
#include <gpio.h>
#include <mach/bbu.h>
#include <asm/armlinux.h>
diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c
index 734adde..595b1ea 100644
--- a/arch/arm/boards/freescale-mx6-sabresd/board.c
+++ b/arch/arm/boards/freescale-mx6-sabresd/board.c
@@ -19,7 +19,6 @@
#include <init.h>
#include <environment.h>
#include <mach/imx6-regs.h>
-#include <fec.h>
#include <gpio.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c
index 90f1627..6ec74eb 100644
--- a/arch/arm/boards/guf-cupid/board.c
+++ b/arch/arm/boards/guf-cupid/board.c
@@ -33,7 +33,7 @@
#include <nand.h>
#include <generated/mach-types.h>
#include <mach/imx-nand.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <fb.h>
#include <asm/mmu.h>
#include <mach/weim.h>
diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c
index f40f0d1..176d77e 100644
--- a/arch/arm/boards/guf-neso/board.c
+++ b/arch/arm/boards/guf-neso/board.c
@@ -18,7 +18,7 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <notifier.h>
#include <partition.h>
#include <gpio.h>
diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c
index d67607b..ec08262 100644
--- a/arch/arm/boards/karo-tx28/tx28-stk5.c
+++ b/arch/arm/boards/karo-tx28/tx28-stk5.c
@@ -18,7 +18,7 @@
#include <environment.h>
#include <errno.h>
#include <mci.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <linux/sizes.h>
#include <io.h>
#include <net.h>
diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c
index f5ebe46..913df68 100644
--- a/arch/arm/boards/karo-tx51/tx51.c
+++ b/arch/arm/boards/karo-tx51/tx51.c
@@ -19,7 +19,7 @@
#include <init.h>
#include <environment.h>
#include <mach/imx51-regs.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <gpio.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c
index 9e65a83..99aa9e7 100644
--- a/arch/arm/boards/karo-tx53/board.c
+++ b/arch/arm/boards/karo-tx53/board.c
@@ -16,7 +16,7 @@
#include <bootsource.h>
#include <environment.h>
#include <fcntl.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <fs.h>
#include <init.h>
#include <nand.h>
diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c
index 8979b81..747c4b2 100644
--- a/arch/arm/boards/mmccpu/init.c
+++ b/arch/arm/boards/mmccpu/init.c
@@ -18,7 +18,6 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <fec.h>
#include <gpio.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c
index 0481113..895fae8 100644
--- a/arch/arm/boards/phytec-phycard-imx27/pca100.c
+++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c
@@ -19,7 +19,6 @@
#include <init.h>
#include <environment.h>
#include <mach/imx27-regs.h>
-#include <fec.h>
#include <gpio.h>
#include <linux/sizes.h>
#include <asm/armlinux.h>
diff --git a/arch/arm/boards/phytec-phycore-imx35/pcm043.c b/arch/arm/boards/phytec-phycore-imx35/pcm043.c
index e31c79d..b83698b 100644
--- a/arch/arm/boards/phytec-phycore-imx35/pcm043.c
+++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.c
@@ -34,7 +34,6 @@
#include <nand.h>
#include <generated/mach-types.h>
#include <mach/imx-nand.h>
-#include <fec.h>
#include <fb.h>
#include <led.h>
#include <bootsource.h>
diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c
index 85ad8cb..6b81db4 100644
--- a/arch/arm/boards/phytec-som-imx6/board.c
+++ b/arch/arm/boards/phytec-som-imx6/board.c
@@ -29,7 +29,8 @@
#include <init.h>
#include <of.h>
#include <mach/bbu.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
+
#include <globalvar.h>
#include <linux/micrel_phy.h>
diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c
index 2b6b089..e9f8588 100644
--- a/arch/arm/boards/pm9263/init.c
+++ b/arch/arm/boards/pm9263/init.c
@@ -20,7 +20,6 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <fec.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <partition.h>
diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c
index 9c52c8a..8946a27 100644
--- a/arch/arm/boards/tqma6x/board.c
+++ b/arch/arm/boards/tqma6x/board.c
@@ -26,7 +26,6 @@
#include <linux/sizes.h>
#include <init.h>
#include <gpio.h>
-#include <fec.h>
#include <of.h>
#include <linux/micrel_phy.h>
diff --git a/arch/arm/boards/udoo/board.c b/arch/arm/boards/udoo/board.c
index f3668fe..f0befaf 100644
--- a/arch/arm/boards/udoo/board.c
+++ b/arch/arm/boards/udoo/board.c
@@ -19,7 +19,6 @@
#include <init.h>
#include <environment.h>
#include <mach/imx6-regs.h>
-#include <fec.h>
#include <gpio.h>
#include <mach/bbu.h>
#include <asm/armlinux.h>
diff --git a/arch/arm/mach-imx/include/mach/devices.h b/arch/arm/mach-imx/include/mach/devices.h
index 45bb0a5..6a045dd 100644
--- a/arch/arm/mach-imx/include/mach/devices.h
+++ b/arch/arm/mach-imx/include/mach/devices.h
@@ -1,5 +1,5 @@
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <input/matrix_keypad.h>
#include <i2c/i2c.h>
#include <mach/spi.h>
diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index 11b3beb..05c1ce9 100644
--- a/arch/ppc/boards/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
@@ -26,7 +26,7 @@
#include <common.h>
#include <driver.h>
#include <init.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <types.h>
#include <partition.h>
#include <memory.h>
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 83fdec6..8bc7c29 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -20,7 +20,7 @@
#include <net.h>
#include <init.h>
#include <driver.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <io.h>
#include <clock.h>
#include <xfuncs.h>
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index bb57c34..b99c23f 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -10,7 +10,7 @@
#include <mach/mpc5xxx.h>
#include <malloc.h>
#include <net.h>
-#include <fec.h>
+#include <platform_data/eth-fec.h>
#include <init.h>
#include <driver.h>
#include <mach/sdma.h>
diff --git a/include/fec.h b/include/fec.h
deleted file mode 100644
index 699761a..0000000
--- a/include/fec.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (C) Copyright 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
- * (C) Copyright 2007 Pengutronix, Juergen Beisert <j.beisert@pengutronix.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-/**
- * @file
- * @brief Shared structures and constants between i.MX27's and MPC52xx's FEC
- */
-#ifndef __INCLUDE_NETWORK_FEC_H
-#define __INCLUDE_NETWORK_FEC_H
-
-#include <linux/phy.h>
-
-/*
- * Define the phy connected externally for FEC drivers
- * (like MPC52xx and i.MX27)
- */
-struct fec_platform_data {
- phy_interface_t xcv_type;
- int phy_addr;
- void (*phy_init)(struct phy_device *dev);
-};
-
-#endif /* __INCLUDE_NETWORK_FEC_H */
-
diff --git a/include/platform_data/eth-fec.h b/include/platform_data/eth-fec.h
new file mode 100644
index 0000000..699761a
--- /dev/null
+++ b/include/platform_data/eth-fec.h
@@ -0,0 +1,37 @@
+/*
+ * (C) Copyright 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
+ * (C) Copyright 2007 Pengutronix, Juergen Beisert <j.beisert@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+/**
+ * @file
+ * @brief Shared structures and constants between i.MX27's and MPC52xx's FEC
+ */
+#ifndef __INCLUDE_NETWORK_FEC_H
+#define __INCLUDE_NETWORK_FEC_H
+
+#include <linux/phy.h>
+
+/*
+ * Define the phy connected externally for FEC drivers
+ * (like MPC52xx and i.MX27)
+ */
+struct fec_platform_data {
+ phy_interface_t xcv_type;
+ int phy_addr;
+ void (*phy_init)(struct phy_device *dev);
+};
+
+#endif /* __INCLUDE_NETWORK_FEC_H */
+
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 6/9] include: Move ns16550 serial platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
` (4 preceding siblings ...)
2016-04-15 6:49 ` [PATCH 5/9] include: Move fec eth " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 7/9] include: Move dm9000 eth " Sascha Hauer
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/archosg9/board.c | 1 -
arch/arm/boards/beagle/board.c | 1 -
arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c | 2 +-
arch/arm/boards/omap343xdsp/board.c | 1 -
arch/arm/boards/omap3evm/board.c | 1 -
arch/arm/boards/panda/board.c | 1 -
arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c | 1 -
arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c | 1 -
arch/arm/boards/phytec-phycore-omap4460/board.c | 1 -
arch/arm/mach-omap/omap_devices.c | 2 +-
arch/arm/mach-socfpga/xload.c | 2 +-
arch/arm/mach-tegra/tegra20.c | 1 -
arch/efi/efi/efi.c | 2 +-
arch/mips/mach-ar231x/ar231x.c | 2 +-
arch/ppc/boards/freescale-p1010rdb/p1010rdb.c | 2 +-
arch/ppc/boards/freescale-p1022ds/p1022ds.c | 2 +-
arch/ppc/boards/freescale-p2020rdb/p2020rdb.c | 2 +-
arch/ppc/boards/geip-da923rc/da923rc.c | 2 +-
arch/x86/boards/x86_generic/serial_ns16550.c | 2 +-
drivers/serial/serial_ns16550.c | 2 +-
include/ns16550.h | 39 -----------------------
include/platform_data/serial-ns16550.h | 39 +++++++++++++++++++++++
22 files changed, 50 insertions(+), 59 deletions(-)
delete mode 100644 include/ns16550.h
create mode 100644 include/platform_data/serial-ns16550.h
diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c
index 6f82f5e..52f7e86 100644
--- a/arch/arm/boards/archosg9/board.c
+++ b/arch/arm/boards/archosg9/board.c
@@ -13,7 +13,6 @@
#include <common.h>
#include <clock.h>
#include <init.h>
-#include <ns16550.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <mach/omap4-silicon.h>
diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
index 4ac9517..460f42a 100644
--- a/arch/arm/boards/beagle/board.c
+++ b/arch/arm/boards/beagle/board.c
@@ -23,7 +23,6 @@
#include <io.h>
#include <bbu.h>
#include <filetype.h>
-#include <ns16550.h>
#include <envfs.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
index b40ad13..07fee05 100644
--- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -38,7 +38,7 @@
#include <mach/imx-pll.h>
#include <mach/weim.h>
#include <mach/imxfb.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <asm/mmu.h>
#include <i2c/i2c.h>
#include <mfd/lp3972.h>
diff --git a/arch/arm/boards/omap343xdsp/board.c b/arch/arm/boards/omap343xdsp/board.c
index 1b1cb79..2fd0dee 100644
--- a/arch/arm/boards/omap343xdsp/board.c
+++ b/arch/arm/boards/omap343xdsp/board.c
@@ -20,7 +20,6 @@
#include <init.h>
#include <driver.h>
#include <io.h>
-#include <ns16550.h>
#include <asm/armlinux.h>
#include <mach/omap3-silicon.h>
#include <mach/omap3-devices.h>
diff --git a/arch/arm/boards/omap3evm/board.c b/arch/arm/boards/omap3evm/board.c
index 0fe69b6..eefb540 100644
--- a/arch/arm/boards/omap3evm/board.c
+++ b/arch/arm/boards/omap3evm/board.c
@@ -44,7 +44,6 @@
#include <driver.h>
#include <io.h>
#include <linux/sizes.h>
-#include <ns16550.h>
#include <asm/armlinux.h>
#include <mach/omap3-silicon.h>
#include <mach/omap3-mux.h>
diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c
index f7a3a0f..acba689 100644
--- a/arch/arm/boards/panda/board.c
+++ b/arch/arm/boards/panda/board.c
@@ -4,7 +4,6 @@
#include <driver.h>
#include <io.h>
#include <gpio.h>
-#include <ns16550.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <mach/omap4-silicon.h>
diff --git a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
index 1c2e7f7..930f3b9 100644
--- a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
+++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
@@ -44,7 +44,6 @@
#include <errno.h>
#include <init.h>
#include <nand.h>
-#include <ns16550.h>
#include <partition.h>
#include <linux/sizes.h>
#include <asm/armlinux.h>
diff --git a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
index 78890ba..c0e4448 100644
--- a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
+++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
@@ -20,7 +20,6 @@
#include <driver.h>
#include <io.h>
#include <gpio.h>
-#include <ns16550.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <mach/omap4-silicon.h>
diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c
index 6495a6f..807cdd6 100644
--- a/arch/arm/boards/phytec-phycore-omap4460/board.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/board.c
@@ -20,7 +20,6 @@
#include <driver.h>
#include <gpio.h>
#include <io.h>
-#include <ns16550.h>
#include <asm/armlinux.h>
#include <generated/mach-types.h>
#include <mach/omap4-silicon.h>
diff --git a/arch/arm/mach-omap/omap_devices.c b/arch/arm/mach-omap/omap_devices.c
index 9ed3dcf..f577fa6 100644
--- a/arch/arm/mach-omap/omap_devices.c
+++ b/arch/arm/mach-omap/omap_devices.c
@@ -1,5 +1,5 @@
#include <driver.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <asm/armlinux.h>
#include <mach/omap3-devices.h>
diff --git a/arch/arm/mach-socfpga/xload.c b/arch/arm/mach-socfpga/xload.c
index fd0d777..7f8f032 100644
--- a/arch/arm/mach-socfpga/xload.c
+++ b/arch/arm/mach-socfpga/xload.c
@@ -2,7 +2,7 @@
#include <platform_data/dw_mmc.h>
#include <bootsource.h>
#include <bootstrap.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <common.h>
#include <malloc.h>
#include <init.h>
diff --git a/arch/arm/mach-tegra/tegra20.c b/arch/arm/mach-tegra/tegra20.c
index 8d1cd5b..10c149a 100644
--- a/arch/arm/mach-tegra/tegra20.c
+++ b/arch/arm/mach-tegra/tegra20.c
@@ -16,7 +16,6 @@
#include <common.h>
#include <init.h>
-#include <ns16550.h>
#include <asm/memory.h>
#include <mach/iomap.h>
#include <mach/lowlevel.h>
diff --git a/arch/efi/efi/efi.c b/arch/efi/efi/efi.c
index 9c270a5..36ac016 100644
--- a/arch/efi/efi/efi.c
+++ b/arch/efi/efi/efi.c
@@ -26,7 +26,7 @@
#include <init.h>
#include <restart.h>
#include <driver.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <io.h>
#include <efi.h>
#include <malloc.h>
diff --git a/arch/mips/mach-ar231x/ar231x.c b/arch/mips/mach-ar231x/ar231x.c
index f714a11..3a0103b 100644
--- a/arch/mips/mach-ar231x/ar231x.c
+++ b/arch/mips/mach-ar231x/ar231x.c
@@ -16,7 +16,7 @@
#include <common.h>
#include <init.h>
#include <io.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <mach/ar231x_platform.h>
#include <mach/ar2312_regs.h>
diff --git a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c
index 60cae46..eab3aba 100644
--- a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c
+++ b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c
@@ -17,7 +17,7 @@
#include <common.h>
#include <init.h>
#include <driver.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <net.h>
#include <types.h>
#include <i2c/i2c.h>
diff --git a/arch/ppc/boards/freescale-p1022ds/p1022ds.c b/arch/ppc/boards/freescale-p1022ds/p1022ds.c
index 57e7953..95a7234 100644
--- a/arch/ppc/boards/freescale-p1022ds/p1022ds.c
+++ b/arch/ppc/boards/freescale-p1022ds/p1022ds.c
@@ -17,7 +17,7 @@
#include <common.h>
#include <init.h>
#include <driver.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <net.h>
#include <types.h>
#include <i2c/i2c.h>
diff --git a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
index 385a436..b03d791 100644
--- a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
+++ b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
@@ -20,7 +20,7 @@
#include <common.h>
#include <init.h>
#include <driver.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <types.h>
#include <i2c/i2c.h>
#include <partition.h>
diff --git a/arch/ppc/boards/geip-da923rc/da923rc.c b/arch/ppc/boards/geip-da923rc/da923rc.c
index b6b5d56..85c9747 100644
--- a/arch/ppc/boards/geip-da923rc/da923rc.c
+++ b/arch/ppc/boards/geip-da923rc/da923rc.c
@@ -22,7 +22,7 @@
#include <asm/io.h>
#include <net.h>
#include <gpio.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <partition.h>
#include <environment.h>
#include <i2c/i2c.h>
diff --git a/arch/x86/boards/x86_generic/serial_ns16550.c b/arch/x86/boards/x86_generic/serial_ns16550.c
index 3b284f3..abc1047 100644
--- a/arch/x86/boards/x86_generic/serial_ns16550.c
+++ b/arch/x86/boards/x86_generic/serial_ns16550.c
@@ -25,7 +25,7 @@
#include <driver.h>
#include <init.h>
#include <asm/syslib.h>
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
#include <linux/err.h>
static struct NS16550_plat serial_plat = {
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 4ad52ea..c6548e3 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -41,7 +41,7 @@
#include <linux/clk.h>
#include "serial_ns16550.h"
-#include <ns16550.h>
+#include <platform_data/serial-ns16550.h>
struct ns16550_priv {
struct console_device cdev;
diff --git a/include/ns16550.h b/include/ns16550.h
deleted file mode 100644
index ccf950b..0000000
--- a/include/ns16550.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * @file
- * @brief Serial NS16550 platform specific header
- *
- * FileName: include/ns16550.h
- * @code struct NS16550_plat @endcode
- * represents The specifics of the device present in the system.
- */
-/*
- * (C) Copyright 2008
- * Texas Instruments, <www.ti.com>
- * Nishanth Menon <x0nishan@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __NS16650_PLATFORM_H_
-#define __NS16650_PLATFORM_H_
-
-/**
- * @brief Platform dependent feature:
- * Pass pointer to this structure as part of device_d -> platform_data
- */
-struct NS16550_plat {
- /** Clock speed */
- unsigned int clock;
- int shift;
-};
-
-#endif /* __NS16650_PLATFORM_H_ */
diff --git a/include/platform_data/serial-ns16550.h b/include/platform_data/serial-ns16550.h
new file mode 100644
index 0000000..ccf950b
--- /dev/null
+++ b/include/platform_data/serial-ns16550.h
@@ -0,0 +1,39 @@
+/**
+ * @file
+ * @brief Serial NS16550 platform specific header
+ *
+ * FileName: include/ns16550.h
+ * @code struct NS16550_plat @endcode
+ * represents The specifics of the device present in the system.
+ */
+/*
+ * (C) Copyright 2008
+ * Texas Instruments, <www.ti.com>
+ * Nishanth Menon <x0nishan@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __NS16650_PLATFORM_H_
+#define __NS16650_PLATFORM_H_
+
+/**
+ * @brief Platform dependent feature:
+ * Pass pointer to this structure as part of device_d -> platform_data
+ */
+struct NS16550_plat {
+ /** Clock speed */
+ unsigned int clock;
+ int shift;
+};
+
+#endif /* __NS16650_PLATFORM_H_ */
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 7/9] include: Move dm9000 eth platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
` (5 preceding siblings ...)
2016-04-15 6:49 ` [PATCH 6/9] include: Move ns16550 serial " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 8/9] include: Move smc911x " Sascha Hauer
2016-04-15 6:49 ` [PATCH 9/9] include: Move ide " Sascha Hauer
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/at91sam9261ek/init.c | 2 +-
arch/arm/boards/friendlyarm-mini2440/mini2440.c | 2 +-
arch/arm/boards/friendlyarm-mini6410/mini6410.c | 2 +-
arch/arm/boards/friendlyarm-tiny210/tiny210.c | 1 -
arch/arm/boards/friendlyarm-tiny6410/development-board.c | 2 +-
arch/arm/boards/pm9261/init.c | 2 +-
arch/arm/boards/scb9328/scb9328.c | 2 +-
drivers/net/dm9k.c | 2 +-
include/dm9000.h | 10 ----------
include/platform_data/eth-dm9000.h | 10 ++++++++++
10 files changed, 17 insertions(+), 18 deletions(-)
delete mode 100644 include/dm9000.h
create mode 100644 include/platform_data/eth-dm9000.h
diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c
index 6cb1701..b9e4914 100644
--- a/arch/arm/boards/at91sam9261ek/init.c
+++ b/arch/arm/boards/at91sam9261ek/init.c
@@ -34,7 +34,7 @@
#include <mach/io.h>
#include <mach/iomux.h>
#include <mach/at91sam9_smc.h>
-#include <dm9000.h>
+#include <platform_data/eth-dm9000.h>
#include <gpio_keys.h>
#include <readkey.h>
#include <led.h>
diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c
index b59c836..7f59cb9 100644
--- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c
+++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c
@@ -21,7 +21,7 @@
#include <init.h>
#include <generated/mach-types.h>
#include <partition.h>
-#include <dm9000.h>
+#include <platform_data/eth-dm9000.h>
#include <nand.h>
#include <mci.h>
#include <fb.h>
diff --git a/arch/arm/boards/friendlyarm-mini6410/mini6410.c b/arch/arm/boards/friendlyarm-mini6410/mini6410.c
index a372db5..a85b1bd 100644
--- a/arch/arm/boards/friendlyarm-mini6410/mini6410.c
+++ b/arch/arm/boards/friendlyarm-mini6410/mini6410.c
@@ -14,7 +14,7 @@
#include <common.h>
#include <driver.h>
#include <init.h>
-#include <dm9000.h>
+#include <platform_data/eth-dm9000.h>
#include <gpio.h>
#include <generated/mach-types.h>
#include <asm/armlinux.h>
diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c
index d84b312..b40dc98 100644
--- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c
+++ b/arch/arm/boards/friendlyarm-tiny210/tiny210.c
@@ -29,7 +29,6 @@
#include <init.h>
#include <linux/sizes.h>
#include <generated/mach-types.h>
-#include <dm9000.h>
#include <gpio.h>
#include <led.h>
#include <io.h>
diff --git a/arch/arm/boards/friendlyarm-tiny6410/development-board.c b/arch/arm/boards/friendlyarm-tiny6410/development-board.c
index 773a423..5dd05e4 100644
--- a/arch/arm/boards/friendlyarm-tiny6410/development-board.c
+++ b/arch/arm/boards/friendlyarm-tiny6410/development-board.c
@@ -23,7 +23,7 @@
#include <driver.h>
#include <init.h>
#include <gpio.h>
-#include <dm9000.h>
+#include <platform_data/eth-dm9000.h>
#include <mach/devices-s3c64xx.h>
#include <mach/s3c-generic.h>
#include <mach/iomux.h>
diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c
index 63f4f19..177355b 100644
--- a/arch/arm/boards/pm9261/init.c
+++ b/arch/arm/boards/pm9261/init.c
@@ -35,7 +35,7 @@
#include <mach/iomux.h>
#include <mach/io.h>
#include <mach/at91sam9_smc.h>
-#include <dm9000.h>
+#include <platform_data/eth-dm9000.h>
#include <linux/w1-gpio.h>
#include <w1_mac_address.h>
diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c
index 3af1404..fda3b14 100644
--- a/arch/arm/boards/scb9328/scb9328.c
+++ b/arch/arm/boards/scb9328/scb9328.c
@@ -26,7 +26,7 @@
#include <partition.h>
#include <fs.h>
#include <fcntl.h>
-#include <dm9000.h>
+#include <platform_data/eth-dm9000.h>
#include <led.h>
#include <mach/iomux-mx1.h>
#include <mach/devices-imx1.h>
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index ad402e3..acc0abb 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -29,7 +29,7 @@
#include <net.h>
#include <io.h>
#include <xfuncs.h>
-#include <dm9000.h>
+#include <platform_data/eth-dm9000.h>
#include <errno.h>
#include <linux/phy.h>
diff --git a/include/dm9000.h b/include/dm9000.h
deleted file mode 100644
index a9a4635..0000000
--- a/include/dm9000.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#ifndef __DM9000_H__
-#define __DM9000_H__
-
-struct dm9000_platform_data {
- int srom;
-};
-
-#endif /* __DM9000_H__ */
-
diff --git a/include/platform_data/eth-dm9000.h b/include/platform_data/eth-dm9000.h
new file mode 100644
index 0000000..a9a4635
--- /dev/null
+++ b/include/platform_data/eth-dm9000.h
@@ -0,0 +1,10 @@
+
+#ifndef __DM9000_H__
+#define __DM9000_H__
+
+struct dm9000_platform_data {
+ int srom;
+};
+
+#endif /* __DM9000_H__ */
+
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 8/9] include: Move smc911x eth platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
` (6 preceding siblings ...)
2016-04-15 6:49 ` [PATCH 7/9] include: Move dm9000 eth " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
2016-04-15 6:49 ` [PATCH 9/9] include: Move ide " Sascha Hauer
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/phytec-phycore-imx31/pcm037.c | 2 +-
arch/blackfin/boards/ipe337/ipe337.c | 2 +-
drivers/net/smc911x.c | 2 +-
include/platform_data/eth-smc911x.h | 24 ++++++++++++++++++++++++
include/smc911x.h | 24 ------------------------
5 files changed, 27 insertions(+), 27 deletions(-)
create mode 100644 include/platform_data/eth-smc911x.h
delete mode 100644 include/smc911x.h
diff --git a/arch/arm/boards/phytec-phycore-imx31/pcm037.c b/arch/arm/boards/phytec-phycore-imx31/pcm037.c
index a1ffb2e..39e7838 100644
--- a/arch/arm/boards/phytec-phycore-imx31/pcm037.c
+++ b/arch/arm/boards/phytec-phycore-imx31/pcm037.c
@@ -31,7 +31,7 @@
#include <asm/sections.h>
#include <mach/weim.h>
#include <io.h>
-#include <smc911x.h>
+#include <platform_data/eth-smc911x.h>
#include <asm/mmu.h>
#include <partition.h>
#include <generated/mach-types.h>
diff --git a/arch/blackfin/boards/ipe337/ipe337.c b/arch/blackfin/boards/ipe337/ipe337.c
index 84cc786..604062a 100644
--- a/arch/blackfin/boards/ipe337/ipe337.c
+++ b/arch/blackfin/boards/ipe337/ipe337.c
@@ -4,7 +4,7 @@
#include <asm/cpu/cdefBF561.h>
#include <partition.h>
#include <fs.h>
-#include <smc911x.h>
+#include <platform_data/eth-smc911x.h>
struct smc911x_plat smcplat = {
.shift = 1,
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 9b1a38a..fe9d1df 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -28,7 +28,7 @@
#include <errno.h>
#include <clock.h>
#include <io.h>
-#include <smc911x.h>
+#include <platform_data/eth-smc911x.h>
#include <linux/phy.h>
#include "smc911x.h"
diff --git a/include/platform_data/eth-smc911x.h b/include/platform_data/eth-smc911x.h
new file mode 100644
index 0000000..4a802ee
--- /dev/null
+++ b/include/platform_data/eth-smc911x.h
@@ -0,0 +1,24 @@
+/*
+ * (C) Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#ifndef __SMC911X_PLATFORM_H_
+#define __SMC911X_PLATFORM_H_
+
+/**
+ * @brief Platform dependent feature:
+ * Pass pointer to this structure as part of device_d -> platform_data
+ */
+struct smc911x_plat {
+ int shift;
+ unsigned int flags;
+ unsigned int phy_mask; /* external PHY only: mask out PHYs,
+ e.g. ~(1 << 5) to use PHY addr 5 */
+};
+
+#define SMC911X_FORCE_INTERNAL_PHY 0x01
+#define SMC911X_FORCE_EXTERNAL_PHY 0x02
+
+#endif /* __SMC911X_PLATFORM_H_ */
diff --git a/include/smc911x.h b/include/smc911x.h
deleted file mode 100644
index 4a802ee..0000000
--- a/include/smc911x.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * (C) Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#ifndef __SMC911X_PLATFORM_H_
-#define __SMC911X_PLATFORM_H_
-
-/**
- * @brief Platform dependent feature:
- * Pass pointer to this structure as part of device_d -> platform_data
- */
-struct smc911x_plat {
- int shift;
- unsigned int flags;
- unsigned int phy_mask; /* external PHY only: mask out PHYs,
- e.g. ~(1 << 5) to use PHY addr 5 */
-};
-
-#define SMC911X_FORCE_INTERNAL_PHY 0x01
-#define SMC911X_FORCE_EXTERNAL_PHY 0x02
-
-#endif /* __SMC911X_PLATFORM_H_ */
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 9/9] include: Move ide platform_data to include/platform_data
2016-04-15 6:49 [PATCH] move platform_data to include/platform_data Sascha Hauer
` (7 preceding siblings ...)
2016-04-15 6:49 ` [PATCH 8/9] include: Move smc911x " Sascha Hauer
@ 2016-04-15 6:49 ` Sascha Hauer
8 siblings, 0 replies; 10+ messages in thread
From: Sascha Hauer @ 2016-04-15 6:49 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/phytec-phycore-imx27/pcm970.c | 2 +-
arch/x86/boards/x86_generic/intf_platform_ide.c | 2 +-
drivers/ata/intf_platform_ide.c | 2 +-
drivers/ata/pata-imx.c | 2 +-
include/platform_data/ide.h | 32 +++++++++++++++++++++++++
include/platform_ide.h | 32 -------------------------
6 files changed, 36 insertions(+), 36 deletions(-)
create mode 100644 include/platform_data/ide.h
delete mode 100644 include/platform_ide.h
diff --git a/arch/arm/boards/phytec-phycore-imx27/pcm970.c b/arch/arm/boards/phytec-phycore-imx27/pcm970.c
index 73df2ad..13bb7c1 100644
--- a/arch/arm/boards/phytec-phycore-imx27/pcm970.c
+++ b/arch/arm/boards/phytec-phycore-imx27/pcm970.c
@@ -15,7 +15,7 @@
#include <gpio.h>
#include <init.h>
#include <io.h>
-#include <platform_ide.h>
+#include <platform_data/ide.h>
#include <linux/sizes.h>
#include <mach/imx27-regs.h>
#include <mach/iomux-mx27.h>
diff --git a/arch/x86/boards/x86_generic/intf_platform_ide.c b/arch/x86/boards/x86_generic/intf_platform_ide.c
index 18a2620..528e721 100644
--- a/arch/x86/boards/x86_generic/intf_platform_ide.c
+++ b/arch/x86/boards/x86_generic/intf_platform_ide.c
@@ -24,7 +24,7 @@
#include <driver.h>
#include <init.h>
#include <linux/err.h>
-#include <platform_ide.h>
+#include <platform_data/ide.h>
#include "envsector.h"
static struct ide_port_info ide_plat = {
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index 6e74bfb..c3af083 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -27,7 +27,7 @@
#include <malloc.h>
#include <errno.h>
#include <ata_drive.h>
-#include <platform_ide.h>
+#include <platform_data/ide.h>
#include <linux/err.h>
#include <of.h>
diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c
index 8429573..c8098a5 100644
--- a/drivers/ata/pata-imx.c
+++ b/drivers/ata/pata-imx.c
@@ -28,7 +28,7 @@
#include <malloc.h>
#include <errno.h>
#include <ata_drive.h>
-#include <platform_ide.h>
+#include <platform_data/ide.h>
#include <io.h>
#include <of.h>
#include <linux/err.h>
diff --git a/include/platform_data/ide.h b/include/platform_data/ide.h
new file mode 100644
index 0000000..f71fbfb
--- /dev/null
+++ b/include/platform_data/ide.h
@@ -0,0 +1,32 @@
+/*
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __PLATFORM_IDE_H
+#define __PLATFORM_IDE_H
+
+struct ide_port_info {
+ /*
+ * I/O port shift, for platforms with ports that are
+ * constantly spaced and need larger than the 1-byte
+ * spacing
+ */
+ unsigned ioport_shift;
+ int dataif_be; /* true if 16 bit data register is big endian */
+
+ /* handle hard reset of this port */
+ void (*reset)(int); /* true: assert reset, false: de-assert reset */
+};
+
+#endif /* __PLATFORM_IDE_H */
diff --git a/include/platform_ide.h b/include/platform_ide.h
deleted file mode 100644
index f71fbfb..0000000
--- a/include/platform_ide.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#ifndef __PLATFORM_IDE_H
-#define __PLATFORM_IDE_H
-
-struct ide_port_info {
- /*
- * I/O port shift, for platforms with ports that are
- * constantly spaced and need larger than the 1-byte
- * spacing
- */
- unsigned ioport_shift;
- int dataif_be; /* true if 16 bit data register is big endian */
-
- /* handle hard reset of this port */
- void (*reset)(int); /* true: assert reset, false: de-assert reset */
-};
-
-#endif /* __PLATFORM_IDE_H */
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread