From 472e36c752de840404ae43d76e2aef865c5a8a9e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 09:59:12 +0200 Subject: include: Move ep93xx eth platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 0fb93d23dc..cdc2009b1e 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/arch/arm/boards/edb93xx/edb93xx.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "edb93xx.h" #define DEVCFG_U1EN (1 << 18) diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c index 0acb9b692f..fd725a56ee 100644 --- a/drivers/net/ep93xx.c +++ b/drivers/net/ep93xx.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #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 0fb11d0acd..0000000000 --- a/include/net/ep93xx_eth.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (C) Copyright 2016 Alexander Kurz - * - * 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 - -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 0000000000..0fb11d0acd --- /dev/null +++ b/include/platform_data/eth-ep93xx.h @@ -0,0 +1,26 @@ +/* + * (C) Copyright 2016 Alexander Kurz + * + * 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 + +struct ep93xx_eth_platform_data { + phy_interface_t xcv_type; + int phy_addr; +}; + +#endif /* __NET_EP93XX_ETH_H */ -- cgit v1.2.3 From a1c43792a53a14732ad903d279a8ae87ef8a7662 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 09:59:51 +0200 Subject: include: Move smc91111 eth platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 6f517d8926..c2a0db7bd8 100644 --- a/arch/arm/boards/lubbock/board.c +++ b/arch/arm/boards/lubbock/board.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/mainstone/board.c b/arch/arm/boards/mainstone/board.c index c339bb9315..0e48e79967 100644 --- a/arch/arm/boards/mainstone/board.c +++ b/arch/arm/boards/mainstone/board.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c index 3166cd4fed..8691a171e1 100644 --- a/arch/arm/boards/versatile/versatilepb.c +++ b/arch/arm/boards/versatile/versatilepb.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include static int vpb_console_init(void) { diff --git a/arch/arm/boards/zylonite/board.c b/arch/arm/boards/zylonite/board.c index 2ff08b7934..bd72cd1992 100644 --- a/arch/arm/boards/zylonite/board.c +++ b/arch/arm/boards/zylonite/board.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index b7055910eb..e08e3dd1b5 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -67,7 +67,7 @@ #include #include #include -#include +#include /*--------------------------------------------------------------- . diff --git a/include/net/smc91111.h b/include/net/smc91111.h deleted file mode 100644 index 72193bf972..0000000000 --- a/include/net/smc91111.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD - * - * 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 0000000000..72193bf972 --- /dev/null +++ b/include/platform_data/eth-smc91111.h @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD + * + * 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__ */ -- cgit v1.2.3 From 423204c619cfe719bc4bd73555ceec388a65e3aa Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 10:00:18 +0200 Subject: include: Move designware eth platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 906bc63330..c920bd658f 100644 --- a/arch/arm/mach-socfpga/generic.c +++ b/arch/arm/mach-socfpga/generic.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 3b21244478..1d662a71d9 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include "designware.h" diff --git a/include/net/designware.h b/include/net/designware.h deleted file mode 100644 index 7a7a26abfd..0000000000 --- a/include/net/designware.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __DWC_UNIMAC_H -#define __DWC_UNIMAC_H - -#include - -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 0000000000..7a7a26abfd --- /dev/null +++ b/include/platform_data/eth-designware.h @@ -0,0 +1,13 @@ +#ifndef __DWC_UNIMAC_H +#define __DWC_UNIMAC_H + +#include + +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 -- cgit v1.2.3 From 4fc192f6be10348024eeb357494c4dbc937deabd Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 10:00:37 +0200 Subject: include: Move davinci emac platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 3dc4b16b67..75a917a76d 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #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 caead1fecf..0000000000 --- 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 0000000000..caead1fecf --- /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__ */ -- cgit v1.2.3 From 51b03f48448ec6fe99929a75d792cedc4def4a51 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 10:09:08 +0200 Subject: include: Move fec eth platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 2069ab3764..14b33dc691 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c index 26d08ae659..2ed58c1995 100644 --- a/arch/arm/boards/at91sam9n12ek/init.c +++ b/arch/arm/boards/at91sam9n12ek/init.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index e0c11a11e1..1ef35803f7 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/arch/arm/boards/at91sam9x5ek/init.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 40cf76dc5a..71a51e1927 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index 6e83570c55..947db7cff6 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c index 96c7fbe4bf..043a93461b 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/board.c +++ b/arch/arm/boards/datamodul-edm-qmx6/board.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/boards/dss11/init.c b/arch/arm/boards/dss11/init.c index feca909c27..321c383ffc 100644 --- a/arch/arm/boards/dss11/init.c +++ b/arch/arm/boards/dss11/init.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/embedsky-e9/board.c b/arch/arm/boards/embedsky-e9/board.c index 23bfec1b77..1ba7be1e42 100644 --- a/arch/arm/boards/embedsky-e9/board.c +++ b/arch/arm/boards/embedsky-e9/board.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index 22bf7409a2..90451911e4 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index 31422e64a0..b40ad134a3 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index 7b3993d506..9c4ea13d8e 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c index 75f325001b..fc57f6c157 100644 --- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c +++ b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/freescale-mx25-3ds/3stack.c b/arch/arm/boards/freescale-mx25-3ds/3stack.c index 6d0e38205a..36ad591cc0 100644 --- a/arch/arm/boards/freescale-mx25-3ds/3stack.c +++ b/arch/arm/boards/freescale-mx25-3ds/3stack.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/freescale-mx27-ads/imx27ads.c b/arch/arm/boards/freescale-mx27-ads/imx27ads.c index 9fb1760602..109f7f9cca 100644 --- a/arch/arm/boards/freescale-mx27-ads/imx27ads.c +++ b/arch/arm/boards/freescale-mx27-ads/imx27ads.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index fc1237588f..9e5d612bda 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 #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/freescale-mx35-3ds/3stack.c b/arch/arm/boards/freescale-mx35-3ds/3stack.c index cca0fe49eb..caeb3f75e8 100644 --- a/arch/arm/boards/freescale-mx35-3ds/3stack.c +++ b/arch/arm/boards/freescale-mx35-3ds/3stack.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/freescale-mx51-babbage/board.c b/arch/arm/boards/freescale-mx51-babbage/board.c index c4acb8ee16..915748528d 100644 --- a/arch/arm/boards/freescale-mx51-babbage/board.c +++ b/arch/arm/boards/freescale-mx51-babbage/board.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c index 196d20a45d..354702dea1 100644 --- a/arch/arm/boards/freescale-mx53-smd/board.c +++ b/arch/arm/boards/freescale-mx53-smd/board.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index d40f99bb93..63fa58886c 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c index 734adde070..595b1eae0b 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/board.c +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c index 90f16272fd..6ec74eb49b 100644 --- a/arch/arm/boards/guf-cupid/board.c +++ b/arch/arm/boards/guf-cupid/board.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index f40f0d1591..176d77e7b3 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/arch/arm/boards/guf-neso/board.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index d67607b717..ec0826297b 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c index f5ebe46a2b..913df68cc9 100644 --- a/arch/arm/boards/karo-tx51/tx51.c +++ b/arch/arm/boards/karo-tx51/tx51.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c index 9e65a839ad..99aa9e74f5 100644 --- a/arch/arm/boards/karo-tx53/board.c +++ b/arch/arm/boards/karo-tx53/board.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c index 8979b818b0..747c4b2742 100644 --- a/arch/arm/boards/mmccpu/init.c +++ b/arch/arm/boards/mmccpu/init.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c index 0481113c65..895fae8a06 100644 --- a/arch/arm/boards/phytec-phycard-imx27/pca100.c +++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/phytec-phycore-imx35/pcm043.c b/arch/arm/boards/phytec-phycore-imx35/pcm043.c index e31c79d15f..b83698b90a 100644 --- a/arch/arm/boards/phytec-phycore-imx35/pcm043.c +++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index 85ad8cb5e2..6b81db45cf 100644 --- a/arch/arm/boards/phytec-som-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -29,7 +29,8 @@ #include #include #include -#include +#include + #include #include diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index 2b6b0891f5..e9f8588649 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/arch/arm/boards/pm9263/init.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c index 9c52c8ae7a..8946a27b69 100644 --- a/arch/arm/boards/tqma6x/board.c +++ b/arch/arm/boards/tqma6x/board.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/boards/udoo/board.c b/arch/arm/boards/udoo/board.c index f3668fef0b..f0befaf3a9 100644 --- a/arch/arm/boards/udoo/board.c +++ b/arch/arm/boards/udoo/board.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/mach-imx/include/mach/devices.h b/arch/arm/mach-imx/include/mach/devices.h index 45bb0a51ee..6a045dd070 100644 --- a/arch/arm/mach-imx/include/mach/devices.h +++ b/arch/arm/mach-imx/include/mach/devices.h @@ -1,5 +1,5 @@ -#include +#include #include #include #include diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c index 11b3beb20f..05c1ce9ca8 100644 --- a/arch/ppc/boards/pcm030/pcm030.c +++ b/arch/ppc/boards/pcm030/pcm030.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 83fdec66d7..8bc7c2993a 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index bb57c34502..b99c23f7d4 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/fec.h b/include/fec.h deleted file mode 100644 index 699761a998..0000000000 --- a/include/fec.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * (C) Copyright 2007 Pengutronix, Sascha Hauer - * (C) Copyright 2007 Pengutronix, Juergen Beisert - * - * 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 - -/* - * 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 0000000000..699761a998 --- /dev/null +++ b/include/platform_data/eth-fec.h @@ -0,0 +1,37 @@ +/* + * (C) Copyright 2007 Pengutronix, Sascha Hauer + * (C) Copyright 2007 Pengutronix, Juergen Beisert + * + * 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 + +/* + * 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 */ + -- cgit v1.2.3 From 041155f11ca06360e61c567280f9b9f00773b608 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 10:14:35 +0200 Subject: include: Move ns16550 serial platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 6f82f5ee26..52f7e86fbe 100644 --- a/arch/arm/boards/archosg9/board.c +++ b/arch/arm/boards/archosg9/board.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c index 4ac9517dbe..460f42ac2d 100644 --- a/arch/arm/boards/beagle/board.c +++ b/arch/arm/boards/beagle/board.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index b40ad134a3..07fee0599e 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/omap343xdsp/board.c b/arch/arm/boards/omap343xdsp/board.c index 1b1cb79212..2fd0dee194 100644 --- a/arch/arm/boards/omap343xdsp/board.c +++ b/arch/arm/boards/omap343xdsp/board.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/omap3evm/board.c b/arch/arm/boards/omap3evm/board.c index 0fe69b61a7..eefb540fc1 100644 --- a/arch/arm/boards/omap3evm/board.c +++ b/arch/arm/boards/omap3evm/board.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index f7a3a0fa28..acba689623 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include 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 1c2e7f7429..930f3b9c7c 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 #include #include -#include #include #include #include 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 78890ba5a9..c0e4448a00 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 #include #include -#include #include #include #include diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c index 6495a6f6ab..807cdd677d 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/board.c +++ b/arch/arm/boards/phytec-phycore-omap4460/board.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/mach-omap/omap_devices.c b/arch/arm/mach-omap/omap_devices.c index 9ed3dcf619..f577fa6ea7 100644 --- a/arch/arm/mach-omap/omap_devices.c +++ b/arch/arm/mach-omap/omap_devices.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/arch/arm/mach-socfpga/xload.c b/arch/arm/mach-socfpga/xload.c index fd0d777add..7f8f0320ca 100644 --- a/arch/arm/mach-socfpga/xload.c +++ b/arch/arm/mach-socfpga/xload.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-tegra/tegra20.c b/arch/arm/mach-tegra/tegra20.c index 8d1cd5b2fb..10c149a955 100644 --- a/arch/arm/mach-tegra/tegra20.c +++ b/arch/arm/mach-tegra/tegra20.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/arch/efi/efi/efi.c b/arch/efi/efi/efi.c index 9c270a597e..36ac016a91 100644 --- a/arch/efi/efi/efi.c +++ b/arch/efi/efi/efi.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/mips/mach-ar231x/ar231x.c b/arch/mips/mach-ar231x/ar231x.c index f714a11e92..3a0103b5ce 100644 --- a/arch/mips/mach-ar231x/ar231x.c +++ b/arch/mips/mach-ar231x/ar231x.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c index 60cae46d25..eab3abac70 100644 --- a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c +++ b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/ppc/boards/freescale-p1022ds/p1022ds.c b/arch/ppc/boards/freescale-p1022ds/p1022ds.c index 57e7953fb1..95a7234d4b 100644 --- a/arch/ppc/boards/freescale-p1022ds/p1022ds.c +++ b/arch/ppc/boards/freescale-p1022ds/p1022ds.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c index 385a436459..b03d791eb1 100644 --- a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c +++ b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/ppc/boards/geip-da923rc/da923rc.c b/arch/ppc/boards/geip-da923rc/da923rc.c index b6b5d56acd..85c974780d 100644 --- a/arch/ppc/boards/geip-da923rc/da923rc.c +++ b/arch/ppc/boards/geip-da923rc/da923rc.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/boards/x86_generic/serial_ns16550.c b/arch/x86/boards/x86_generic/serial_ns16550.c index 3b284f3d3d..abc1047a50 100644 --- a/arch/x86/boards/x86_generic/serial_ns16550.c +++ b/arch/x86/boards/x86_generic/serial_ns16550.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include static struct NS16550_plat serial_plat = { diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 4ad52ea79c..c6548e3b85 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -41,7 +41,7 @@ #include #include "serial_ns16550.h" -#include +#include struct ns16550_priv { struct console_device cdev; diff --git a/include/ns16550.h b/include/ns16550.h deleted file mode 100644 index ccf950b077..0000000000 --- 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, - * Nishanth Menon - * - * 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 0000000000..ccf950b077 --- /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, + * Nishanth Menon + * + * 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_ */ -- cgit v1.2.3 From 044058fe907d5f9d383ef0c96a2be3e7716f7f12 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 10:17:11 +0200 Subject: include: Move dm9000 eth platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 6cb170192a..b9e4914376 100644 --- a/arch/arm/boards/at91sam9261ek/init.c +++ b/arch/arm/boards/at91sam9261ek/init.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index b59c8367f3..7f59cb99b2 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/friendlyarm-mini6410/mini6410.c b/arch/arm/boards/friendlyarm-mini6410/mini6410.c index a372db5471..a85b1bd920 100644 --- a/arch/arm/boards/friendlyarm-mini6410/mini6410.c +++ b/arch/arm/boards/friendlyarm-mini6410/mini6410.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c index d84b3128ad..b40dc98c5b 100644 --- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c +++ b/arch/arm/boards/friendlyarm-tiny210/tiny210.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/boards/friendlyarm-tiny6410/development-board.c b/arch/arm/boards/friendlyarm-tiny6410/development-board.c index 773a423ea0..5dd05e4cc8 100644 --- a/arch/arm/boards/friendlyarm-tiny6410/development-board.c +++ b/arch/arm/boards/friendlyarm-tiny6410/development-board.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c index 63f4f19b3f..177355b633 100644 --- a/arch/arm/boards/pm9261/init.c +++ b/arch/arm/boards/pm9261/init.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c index 3af140423f..fda3b1432c 100644 --- a/arch/arm/boards/scb9328/scb9328.c +++ b/arch/arm/boards/scb9328/scb9328.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c index ad402e3efc..acc0abbc48 100644 --- a/drivers/net/dm9k.c +++ b/drivers/net/dm9k.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/dm9000.h b/include/dm9000.h deleted file mode 100644 index a9a4635d2a..0000000000 --- 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 0000000000..a9a4635d2a --- /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__ */ + -- cgit v1.2.3 From a45ab7100cdc386fa9d372960c7016635b20cca0 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 10:18:40 +0200 Subject: include: Move smc911x eth platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 a1ffb2e73e..39e7838be0 100644 --- a/arch/arm/boards/phytec-phycore-imx31/pcm037.c +++ b/arch/arm/boards/phytec-phycore-imx31/pcm037.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/blackfin/boards/ipe337/ipe337.c b/arch/blackfin/boards/ipe337/ipe337.c index 84cc786f85..604062a54b 100644 --- a/arch/blackfin/boards/ipe337/ipe337.c +++ b/arch/blackfin/boards/ipe337/ipe337.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include struct smc911x_plat smcplat = { .shift = 1, diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 9b1a38ae21..fe9d1df502 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "smc911x.h" diff --git a/include/platform_data/eth-smc911x.h b/include/platform_data/eth-smc911x.h new file mode 100644 index 0000000000..4a802ee52c --- /dev/null +++ b/include/platform_data/eth-smc911x.h @@ -0,0 +1,24 @@ +/* + * (C) Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD + * + * 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 4a802ee52c..0000000000 --- a/include/smc911x.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * (C) Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD - * - * 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_ */ -- cgit v1.2.3 From dd8244a422bce7ff9ff79ab1ca2632e1aad6e35a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 12 Apr 2016 10:20:09 +0200 Subject: include: Move ide platform_data to include/platform_data Signed-off-by: Sascha Hauer --- 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 73df2ad2a8..13bb7c1cf5 100644 --- a/arch/arm/boards/phytec-phycore-imx27/pcm970.c +++ b/arch/arm/boards/phytec-phycore-imx27/pcm970.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/boards/x86_generic/intf_platform_ide.c b/arch/x86/boards/x86_generic/intf_platform_ide.c index 18a2620ce0..528e721d56 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 #include #include -#include +#include #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 6e74bfb089..c3af0833ba 100644 --- a/drivers/ata/intf_platform_ide.c +++ b/drivers/ata/intf_platform_ide.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c index 842957331e..c8098a537f 100644 --- a/drivers/ata/pata-imx.c +++ b/drivers/ata/pata-imx.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/platform_data/ide.h b/include/platform_data/ide.h new file mode 100644 index 0000000000..f71fbfbc01 --- /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 f71fbfbc01..0000000000 --- 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 */ -- cgit v1.2.3