* arm: move plat-orion platform_data headers to the right place
@ 2012-08-28 18:59 Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 1/8] sound: kirkwood: remove useless <plat/audio.h> include Thomas Petazzoni
` (9 more replies)
0 siblings, 10 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
plat-orion/include/plat contains a bunch of headers with platform_data
structure definitions. Those headers should now be in
<linux/platform_data/...>, so this patch series is moving them
here. This impacts the MTD, USB EHCI, sound, MMC, DMA XOR drivers.
Moreover, this series takes this opportunity to move two other
platform_data headers that were in <linux/...>. This impacts the I2C
and Ethernet drivers.
This series has been built tested for orion5x_defconfig,
dove_defconfig, kirkwood_defconfig and mv78x00_defconfig.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/8] sound: kirkwood: remove useless <plat/audio.h> include
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 2/8] sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h> Thomas Petazzoni
` (8 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
kirkwood-openrd.c and kirkwood-t5325.c are not using the platform_data
structure defined in <plat/audio.h>, so there's no point in including
this header file.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
sound/soc/kirkwood/kirkwood-openrd.c | 1 -
sound/soc/kirkwood/kirkwood-t5325.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
index 80bd59c..98a9157 100644
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -17,7 +17,6 @@
#include <linux/slab.h>
#include <sound/soc.h>
#include <mach/kirkwood.h>
-#include <plat/audio.h>
#include <asm/mach-types.h>
#include "../codecs/cs42l51.h"
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
index f898363..5213ee9 100644
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -16,7 +16,6 @@
#include <linux/slab.h>
#include <sound/soc.h>
#include <mach/kirkwood.h>
-#include <plat/audio.h>
#include <asm/mach-types.h>
#include "../codecs/alc5623.h"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/8] sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h>
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 1/8] sound: kirkwood: remove useless <plat/audio.h> include Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 3/8] usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h> Thomas Petazzoni
` (7 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/plat-orion/include/plat/audio.h | 7 -------
include/linux/platform_data/kirkwood-audio.h | 7 +++++++
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
delete mode 100644 arch/arm/plat-orion/include/plat/audio.h
create mode 100644 include/linux/platform_data/kirkwood-audio.h
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index c4b64ad..138ba47 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -18,6 +18,7 @@
#include <linux/clk-provider.h>
#include <linux/spinlock.h>
#include <linux/mv643xx_i2c.h>
+#include <linux/platform_data/kirkwood-audio.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/timex.h>
@@ -26,7 +27,6 @@
#include <asm/mach/time.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
-#include <plat/audio.h>
#include <plat/cache-feroceon-l2.h>
#include <plat/mvsdio.h>
#include <plat/orion_nand.h>
diff --git a/arch/arm/plat-orion/include/plat/audio.h b/arch/arm/plat-orion/include/plat/audio.h
deleted file mode 100644
index d6a55bd..0000000
--- a/arch/arm/plat-orion/include/plat/audio.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __PLAT_AUDIO_H
-#define __PLAT_AUDIO_H
-
-struct kirkwood_asoc_platform_data {
- int burst;
-};
-#endif
diff --git a/include/linux/platform_data/kirkwood-audio.h b/include/linux/platform_data/kirkwood-audio.h
new file mode 100644
index 0000000..a2c25da
--- /dev/null
+++ b/include/linux/platform_data/kirkwood-audio.h
@@ -0,0 +1,7 @@
+#ifndef __KIRKWOOD_AUDIO_PDATA_H
+#define __KIRKWOOD_AUDIO_PDATA_H
+
+struct kirkwood_asoc_platform_data {
+ int burst;
+};
+#endif
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 7646dd7..c4dd2f1 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -21,7 +21,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
-#include <plat/audio.h>
+#include <linux/platform_data/kirkwood-audio.h>
#include "kirkwood.h"
#define DRV_NAME "kirkwood-i2s"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/8] usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h>
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 1/8] sound: kirkwood: remove useless <plat/audio.h> include Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 2/8] sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h> Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 4/8] mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h> Thomas Petazzoni
` (6 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/mach-dove/common.c | 2 +-
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 2 +-
arch/arm/mach-orion5x/common.c | 2 +-
arch/arm/plat-orion/common.c | 2 +-
drivers/usb/host/ehci-orion.c | 2 +-
.../linux/platform_data}/ehci-orion.h | 6 ++----
7 files changed, 8 insertions(+), 10 deletions(-)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%)
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 4db5de5..c8e657b 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -16,6 +16,7 @@
#include <linux/clk-provider.h>
#include <linux/ata_platform.h>
#include <linux/gpio.h>
+#include <linux/platform_data/ehci-orion.h>
#include <asm/page.h>
#include <asm/setup.h>
#include <asm/timex.h>
@@ -28,7 +29,6 @@
#include <asm/mach/arch.h>
#include <linux/irq.h>
#include <plat/time.h>
-#include <plat/ehci-orion.h>
#include <plat/common.h>
#include <plat/addr-map.h>
#include "common.h"
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 138ba47..833fe07 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -19,6 +19,7 @@
#include <linux/spinlock.h>
#include <linux/mv643xx_i2c.h>
#include <linux/platform_data/kirkwood-audio.h>
+#include <linux/platform_data/ehci-orion.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/timex.h>
@@ -30,7 +31,6 @@
#include <plat/cache-feroceon-l2.h>
#include <plat/mvsdio.h>
#include <plat/orion_nand.h>
-#include <plat/ehci-orion.h>
#include <plat/common.h>
#include <plat/time.h>
#include <plat/addr-map.h>
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index b4c53b8..7413c35 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -15,12 +15,12 @@
#include <linux/ata_platform.h>
#include <linux/clk-provider.h>
#include <linux/ethtool.h>
+#include <linux/platform_data/ehci-orion.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <mach/mv78xx0.h>
#include <mach/bridge-regs.h>
#include <plat/cache-feroceon-l2.h>
-#include <plat/ehci-orion.h>
#include <plat/orion_nand.h>
#include <plat/time.h>
#include <plat/common.h>
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 9148b22..7228eaa 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -19,6 +19,7 @@
#include <linux/ata_platform.h>
#include <linux/delay.h>
#include <linux/clk-provider.h>
+#include <linux/platform_data/ehci-orion.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/setup.h>
@@ -31,7 +32,6 @@
#include <mach/hardware.h>
#include <mach/orion5x.h>
#include <plat/orion_nand.h>
-#include <plat/ehci-orion.h>
#include <plat/time.h>
#include <plat/common.h>
#include <plat/addr-map.h>
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index d245a87..ebcf727 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -18,9 +18,9 @@
#include <linux/clkdev.h>
#include <linux/mv643xx_eth.h>
#include <linux/mv643xx_i2c.h>
+#include <linux/platform_data/ehci-orion.h>
#include <net/dsa.h>
#include <plat/mv_xor.h>
-#include <plat/ehci-orion.h>
#include <mach/bridge-regs.h>
/* Create a clkdev entry for a given device/clk */
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 8892d36..b34b928 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/mbus.h>
#include <linux/clk.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/ehci-orion.h>
#define rdl(off) __raw_readl(hcd->regs + (off))
#define wrl(off, val) __raw_writel((val), hcd->regs + (off))
diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/include/linux/platform_data/ehci-orion.h
similarity index 78%
rename from arch/arm/plat-orion/include/plat/ehci-orion.h
rename to include/linux/platform_data/ehci-orion.h
index 6fc78e4..f01933d 100644
--- a/arch/arm/plat-orion/include/plat/ehci-orion.h
+++ b/include/linux/platform_data/ehci-orion.h
@@ -1,13 +1,11 @@
/*
- * arch/arm/plat-orion/include/plat/ehci-orion.h
- *
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-#ifndef __PLAT_EHCI_ORION_H
-#define __PLAT_EHCI_ORION_H
+#ifndef __EHCI_ORION_PDATA_H
+#define __EHCI_ORION_PDATA_H
#include <linux/mbus.h>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/8] mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h>
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
` (2 preceding siblings ...)
2012-08-28 18:59 ` [PATCH 3/8] usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h> Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 5/8] dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h> Thomas Petazzoni
` (5 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/mach-kirkwood/board-dreamplug.c | 2 +-
arch/arm/mach-kirkwood/board-goflexnet.c | 2 +-
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +-
drivers/mmc/host/mvsdio.c | 2 +-
.../plat => include/linux/platform_data}/mvsdio.h | 6 ++----
11 files changed, 12 insertions(+), 14 deletions(-)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%)
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c
index aeb234d..5256c1f 100644
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -25,12 +25,12 @@
#include <linux/mtd/physmap.h>
#include <linux/spi/flash.h>
#include <linux/spi/spi.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
index 413e2c8..3d4ba64 100644
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -27,12 +27,12 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/gpio.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 833fe07..e04bd6f 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -20,6 +20,7 @@
#include <linux/mv643xx_i2c.h>
#include <linux/platform_data/kirkwood-audio.h>
#include <linux/platform_data/ehci-orion.h>
+#include <linux/platform_data/mvsdio.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/timex.h>
@@ -29,7 +30,6 @@
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
#include <plat/cache-feroceon-l2.h>
-#include <plat/mvsdio.h>
#include <plat/orion_nand.h>
#include <plat/common.h>
#include <plat/time.h>
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
index d933593..c0a367b 100644
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -14,10 +14,10 @@
#include <linux/mtd/partitions.h>
#include <linux/ata_platform.h>
#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
index 61d9a55..819cad1 100644
--- a/arch/arm/mach-kirkwood/dockstar-setup.c
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c
@@ -16,10 +16,10 @@
#include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/leds.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
index bdaed38..be2b8fe 100644
--- a/arch/arm/mach-kirkwood/guruplug-setup.c
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c
@@ -16,10 +16,10 @@
#include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/leds.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 7e99c3f..3b36ae7 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -17,10 +17,10 @@
#include <linux/mv643xx_eth.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index ef92207..78e1541 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -16,11 +16,11 @@
#include <linux/ata_platform.h>
#include <linux/mv643xx_eth.h>
#include <linux/ethtool.h>
+#include <linux/platform_data/mvsdio.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 4ea70e5..006dc69 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -16,10 +16,10 @@
#include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/leds.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
#include "common.h"
#include "mpp.h"
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a61cb5f..0ae0a53 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -22,10 +22,10 @@
#include <linux/clk.h>
#include <linux/gpio.h>
#include <linux/mmc/host.h>
+#include <linux/platform_data/mvsdio.h>
#include <asm/sizes.h>
#include <asm/unaligned.h>
-#include <plat/mvsdio.h>
#include "mvsdio.h"
diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/include/linux/platform_data/mvsdio.h
similarity index 77%
rename from arch/arm/plat-orion/include/plat/mvsdio.h
rename to include/linux/platform_data/mvsdio.h
index 1190efe..a44eb86 100644
--- a/arch/arm/plat-orion/include/plat/mvsdio.h
+++ b/include/linux/platform_data/mvsdio.h
@@ -1,13 +1,11 @@
/*
- * arch/arm/plat-orion/include/plat/mvsdio.h
- *
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-#ifndef __MACH_MVSDIO_H
-#define __MACH_MVSDIO_H
+#ifndef __MVSDIO_PDATA_H
+#define __MVSDIO_PDATA_H
#include <linux/mbus.h>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/8] dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h>
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
` (3 preceding siblings ...)
2012-08-28 18:59 ` [PATCH 4/8] mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h> Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 6/8] mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h> Thomas Petazzoni
` (4 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/plat-orion/common.c | 2 +-
drivers/dma/mv_xor.c | 2 +-
.../plat => include/linux/platform_data}/mv_xor.h | 6 ++----
4 files changed, 5 insertions(+), 7 deletions(-)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%)
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index e04bd6f..a3d8836 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -21,6 +21,7 @@
#include <linux/platform_data/kirkwood-audio.h>
#include <linux/platform_data/ehci-orion.h>
#include <linux/platform_data/mvsdio.h>
+#include <linux/platform_data/mv_xor.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/timex.h>
@@ -34,7 +35,6 @@
#include <plat/common.h>
#include <plat/time.h>
#include <plat/addr-map.h>
-#include <plat/mv_xor.h>
#include "common.h"
/*****************************************************************************
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index ebcf727..88dac08 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -19,8 +19,8 @@
#include <linux/mv643xx_eth.h>
#include <linux/mv643xx_i2c.h>
#include <linux/platform_data/ehci-orion.h>
+#include <linux/platform_data/mv_xor.h>
#include <net/dsa.h>
-#include <plat/mv_xor.h>
#include <mach/bridge-regs.h>
/* Create a clkdev entry for a given device/clk */
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 0b12e68..ec9c570 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -26,7 +26,7 @@
#include <linux/platform_device.h>
#include <linux/memory.h>
#include <linux/clk.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/mv_xor.h>
#include "dmaengine.h"
#include "mv_xor.h"
diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/include/linux/platform_data/mv_xor.h
similarity index 77%
rename from arch/arm/plat-orion/include/plat/mv_xor.h
rename to include/linux/platform_data/mv_xor.h
index 2ba1f7d..cbfc6e1 100644
--- a/arch/arm/plat-orion/include/plat/mv_xor.h
+++ b/include/linux/platform_data/mv_xor.h
@@ -1,11 +1,9 @@
/*
- * arch/arm/plat-orion/include/plat/mv_xor.h
- *
* Marvell XOR platform device data definition file.
*/
-#ifndef __PLAT_MV_XOR_H
-#define __PLAT_MV_XOR_H
+#ifndef __MV_XOR_PDATA_H
+#define __MV_XOR_PDATA_H
#include <linux/dmaengine.h>
#include <linux/mbus.h>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 6/8] mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h>
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
` (4 preceding siblings ...)
2012-08-28 18:59 ` [PATCH 5/8] dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h> Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 7/8] i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h> Thomas Petazzoni
` (3 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 2 +-
arch/arm/mach-orion5x/common.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +-
drivers/mtd/nand/orion_nand.c | 2 +-
.../linux/platform_data}/orion_nand.h | 6 ++----
7 files changed, 8 insertions(+), 10 deletions(-)
rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index a3d8836..3e14dfc 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -22,6 +22,7 @@
#include <linux/platform_data/ehci-orion.h>
#include <linux/platform_data/mvsdio.h>
#include <linux/platform_data/mv_xor.h>
+#include <linux/platform_data/orion_nand.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/timex.h>
@@ -31,7 +32,6 @@
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
#include <plat/cache-feroceon-l2.h>
-#include <plat/orion_nand.h>
#include <plat/common.h>
#include <plat/time.h>
#include <plat/addr-map.h>
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 7413c35..acc0791 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -16,12 +16,12 @@
#include <linux/clk-provider.h>
#include <linux/ethtool.h>
#include <linux/platform_data/ehci-orion.h>
+#include <linux/platform_data/orion_nand.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <mach/mv78xx0.h>
#include <mach/bridge-regs.h>
#include <plat/cache-feroceon-l2.h>
-#include <plat/orion_nand.h>
#include <plat/time.h>
#include <plat/common.h>
#include <plat/addr-map.h>
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 7228eaa..e0db313 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -20,6 +20,7 @@
#include <linux/delay.h>
#include <linux/clk-provider.h>
#include <linux/platform_data/ehci-orion.h>
+#include <linux/platform_data/orion_nand.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/setup.h>
@@ -31,7 +32,6 @@
#include <mach/bridge-regs.h>
#include <mach/hardware.h>
#include <mach/orion5x.h>
-#include <plat/orion_nand.h>
#include <plat/time.h>
#include <plat/common.h>
#include <plat/addr-map.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 49a3fd6..be3080e 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -20,11 +20,11 @@
#include <linux/timer.h>
#include <linux/mv643xx_eth.h>
#include <linux/i2c.h>
+#include <linux/platform_data/orion_nand.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
-#include <plat/orion_nand.h>
#include "common.h"
#include "mpp.h"
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 1e458ef..82cf706 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -20,11 +20,11 @@
#include <linux/i2c.h>
#include <linux/serial_reg.h>
#include <linux/ata_platform.h>
+#include <linux/platform_data/orion_nand.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
-#include <plat/orion_nand.h>
#include "common.h"
#include "mpp.h"
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index fc5a868..eaf8fc7 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -19,10 +19,10 @@
#include <linux/mtd/partitions.h>
#include <linux/clk.h>
#include <linux/err.h>
+#include <linux/platform_data/orion_nand.h>
#include <asm/io.h>
#include <asm/sizes.h>
#include <mach/hardware.h>
-#include <plat/orion_nand.h>
static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
{
diff --git a/arch/arm/plat-orion/include/plat/orion_nand.h b/include/linux/platform_data/orion_nand.h
similarity index 82%
rename from arch/arm/plat-orion/include/plat/orion_nand.h
rename to include/linux/platform_data/orion_nand.h
index 9f3c180..baa1860 100644
--- a/arch/arm/plat-orion/include/plat/orion_nand.h
+++ b/include/linux/platform_data/orion_nand.h
@@ -1,13 +1,11 @@
/*
- * arch/arm/plat-orion/include/plat/orion_nand.h
- *
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-#ifndef __PLAT_ORION_NAND_H
-#define __PLAT_ORION_NAND_H
+#ifndef __ORION_NAND_PDATA_H
+#define __ORION_NAND_PDATA_H
/*
* Device bus NAND private data
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 7/8] i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h>
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
` (5 preceding siblings ...)
2012-08-28 18:59 ` [PATCH 6/8] mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h> Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 8/8] net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h> Thomas Petazzoni
` (2 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Even though this platform_data header was already in <linux/...> and
not in <plat/...>, it makes sense to move it as well to
<linux/platform_data/...>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/mach-orion5x/common.c | 2 +-
arch/arm/plat-orion/common.c | 2 +-
drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
include/linux/mv643xx.h | 2 +-
include/linux/{ => platform_data}/mv643xx_i2c.h | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%)
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 3e14dfc..7981012 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -17,11 +17,11 @@
#include <linux/dma-mapping.h>
#include <linux/clk-provider.h>
#include <linux/spinlock.h>
-#include <linux/mv643xx_i2c.h>
#include <linux/platform_data/kirkwood-audio.h>
#include <linux/platform_data/ehci-orion.h>
#include <linux/platform_data/mvsdio.h>
#include <linux/platform_data/mv_xor.h>
+#include <linux/platform_data/mv643xx_i2c.h>
#include <linux/platform_data/orion_nand.h>
#include <net/dsa.h>
#include <asm/page.h>
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index e0db313..43ae1b7 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -15,11 +15,11 @@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/serial_8250.h>
-#include <linux/mv643xx_i2c.h>
#include <linux/ata_platform.h>
#include <linux/delay.h>
#include <linux/clk-provider.h>
#include <linux/platform_data/ehci-orion.h>
+#include <linux/platform_data/mv643xx_i2c.h>
#include <linux/platform_data/orion_nand.h>
#include <net/dsa.h>
#include <asm/page.h>
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 88dac08..3aeb28f 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -17,9 +17,9 @@
#include <linux/clk.h>
#include <linux/clkdev.h>
#include <linux/mv643xx_eth.h>
-#include <linux/mv643xx_i2c.h>
#include <linux/platform_data/ehci-orion.h>
#include <linux/platform_data/mv_xor.h>
+#include <linux/platform_data/mv643xx_i2c.h>
#include <net/dsa.h>
#include <mach/bridge-regs.h>
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 2e9d567..c5e6993 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -15,7 +15,6 @@
#include <linux/spinlock.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
-#include <linux/mv643xx_i2c.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/of.h>
@@ -23,6 +22,7 @@
#include <linux/of_i2c.h>
#include <linux/clk.h>
#include <linux/err.h>
+#include <linux/platform_data/mv643xx_i2c.h>
/* Register defines */
#define MV64XXX_I2C_REG_SLAVE_ADDR 0x00
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index 69327b7..7e293ce 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -15,7 +15,7 @@
#include <asm/types.h>
#include <linux/mv643xx_eth.h>
-#include <linux/mv643xx_i2c.h>
+#include <linux/platform_data/mv643xx_i2c.h>
/****************************************/
/* Processor Address Space */
diff --git a/include/linux/mv643xx_i2c.h b/include/linux/platform_data/mv643xx_i2c.h
similarity index 89%
rename from include/linux/mv643xx_i2c.h
rename to include/linux/platform_data/mv643xx_i2c.h
index 5db5152..a00c687 100644
--- a/include/linux/mv643xx_i2c.h
+++ b/include/linux/platform_data/mv643xx_i2c.h
@@ -5,8 +5,8 @@
* option) any later version.
*/
-#ifndef _MV64XXX_I2C_H_
-#define _MV64XXX_I2C_H_
+#ifndef _MV64XXX_I2C_PDATA_H_
+#define _MV64XXX_I2C_PDATA_H_
#include <linux/types.h>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 8/8] net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h>
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
` (6 preceding siblings ...)
2012-08-28 18:59 ` [PATCH 7/8] i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h> Thomas Petazzoni
@ 2012-08-28 18:59 ` Thomas Petazzoni
2012-08-28 20:11 ` arm: move plat-orion platform_data headers to the right place Andrew Lunn
2012-08-29 0:02 ` Jason Cooper
9 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 18:59 UTC (permalink / raw)
To: linux-arm-kernel
Even though this platform_data header was already in <linux/...> and
not in <plat/...>, it makes sense to move it as well to
<linux/platform_data/...>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
arch/arm/mach-dove/cm-a510.c | 2 +-
arch/arm/mach-dove/dove-db-setup.c | 2 +-
arch/arm/mach-kirkwood/board-dnskw.c | 2 +-
arch/arm/mach-kirkwood/board-dreamplug.c | 2 +-
arch/arm/mach-kirkwood/board-goflexnet.c | 2 +-
arch/arm/mach-kirkwood/board-ib62x0.c | 2 +-
arch/arm/mach-kirkwood/board-iconnect.c | 2 +-
arch/arm/mach-kirkwood/board-lsxl.c | 2 +-
arch/arm/mach-kirkwood/board-ts219.c | 2 +-
arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +-
arch/arm/mach-kirkwood/dockstar-setup.c | 2 +-
arch/arm/mach-kirkwood/guruplug-setup.c | 2 +-
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +-
arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +-
arch/arm/mach-kirkwood/openrd-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +-
arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +-
arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +-
arch/arm/mach-kirkwood/t5325-setup.c | 2 +-
arch/arm/mach-kirkwood/ts219-setup.c | 2 +-
arch/arm/mach-kirkwood/ts41x-setup.c | 2 +-
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +-
arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +-
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +-
arch/arm/mach-orion5x/d2net-setup.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
arch/arm/mach-orion5x/dns323-setup.c | 2 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +-
arch/arm/mach-orion5x/ls-chl-setup.c | 2 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +-
arch/arm/mach-orion5x/lsmini-setup.c | 2 +-
arch/arm/mach-orion5x/mss2-setup.c | 2 +-
arch/arm/mach-orion5x/mv2120-setup.c | 2 +-
arch/arm/mach-orion5x/net2big-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 2 +-
arch/arm/mach-orion5x/ts409-setup.c | 2 +-
arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
arch/arm/mach-orion5x/tsx09-common.c | 2 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 2 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +-
arch/arm/plat-orion/common.c | 2 +-
arch/arm/plat-orion/include/plat/common.h | 2 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
include/linux/mv643xx.h | 2 +-
include/linux/{ => platform_data}/mv643xx_eth.h | 4 ++--
53 files changed, 54 insertions(+), 54 deletions(-)
rename include/linux/{ => platform_data}/mv643xx_eth.h (96%)
diff --git a/arch/arm/mach-dove/cm-a510.c b/arch/arm/mach-dove/cm-a510.c
index 792b4e2..bb887b8 100644
--- a/arch/arm/mach-dove/cm-a510.c
+++ b/arch/arm/mach-dove/cm-a510.c
@@ -15,7 +15,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
index bc2867f..60cac4d 100644
--- a/arch/arm/mach-dove/dove-db-setup.c
+++ b/arch/arm/mach-dove/dove-db-setup.c
@@ -16,7 +16,7 @@
#include <linux/mtd/nand.h>
#include <linux/timer.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/i2c.h>
#include <linux/pci.h>
#include <linux/spi/spi.h>
diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c
index 4ab3506..8103961 100644
--- a/arch/arm/mach-kirkwood/board-dnskw.c
+++ b/arch/arm/mach-kirkwood/board-dnskw.c
@@ -15,7 +15,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/of.h>
#include <linux/gpio.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c
index 5256c1f..b5a4922 100644
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -15,7 +15,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_fdt.h>
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
index 3d4ba64..52cde7c 100644
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -20,7 +20,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_fdt.h>
diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c
index cfc47f8..4304a44 100644
--- a/arch/arm/mach-kirkwood/board-ib62x0.c
+++ b/arch/arm/mach-kirkwood/board-ib62x0.c
@@ -16,7 +16,7 @@
#include <linux/platform_device.h>
#include <linux/mtd/partitions.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/input.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
index d7a9198..108bfc5 100644
--- a/arch/arm/mach-kirkwood/board-iconnect.c
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
@@ -17,7 +17,7 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/mtd/partitions.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c
index 83d8975..bf247f0 100644
--- a/arch/arm/mach-kirkwood/board-lsxl.c
+++ b/arch/arm/mach-kirkwood/board-lsxl.c
@@ -18,7 +18,7 @@
#include <linux/ata_platform.h>
#include <linux/spi/flash.h>
#include <linux/spi/spi.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/gpio-fan.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
index 1750e68..304ba38 100644
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@ -18,7 +18,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
index 6e1bac9..d8f615c 100644
--- a/arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c
@@ -24,7 +24,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/input.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
index c0a367b..fdfe211 100644
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/mtd/partitions.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/platform_data/mvsdio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
index 819cad1..0f4c340 100644
--- a/arch/arm/mach-kirkwood/dockstar-setup.c
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
#include <linux/mtd/partitions.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/leds.h>
#include <linux/platform_data/mvsdio.h>
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
index be2b8fe..4de18b8 100644
--- a/arch/arm/mach-kirkwood/guruplug-setup.c
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/mtd/partitions.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/leds.h>
#include <linux/platform_data/mvsdio.h>
diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
index 6d8364a..faf50bf 100644
--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
@@ -15,7 +15,7 @@
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
#include <linux/timer.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/gpio.h>
#include <linux/leds.h>
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
index e6bba01..1f307e7 100644
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c
@@ -25,7 +25,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/input.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
index 31ae8de..a970001 100644
--- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
@@ -24,7 +24,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/input.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 3b36ae7..a967c32 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -14,7 +14,7 @@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/platform_data/mvsdio.h>
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
index f742a66..f757ab0 100644
--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/spi/flash.h>
#include <linux/spi/spi.h>
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index 78e1541..81cdc0c 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -14,7 +14,7 @@
#include <linux/irq.h>
#include <linux/mtd/partitions.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/platform_data/mvsdio.h>
#include <net/dsa.h>
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 006dc69..c80b660 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
#include <linux/mtd/partitions.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/leds.h>
#include <linux/platform_data/mvsdio.h>
diff --git a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c
index bad738e..d3dda63 100644
--- a/arch/arm/mach-kirkwood/t5325-setup.c
+++ b/arch/arm/mach-kirkwood/t5325-setup.c
@@ -17,7 +17,7 @@
#include <linux/spi/flash.h>
#include <linux/spi/spi.h>
#include <linux/i2c.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
index 73e2b6c..3cf2266 100644
--- a/arch/arm/mach-kirkwood/ts219-setup.c
+++ b/arch/arm/mach-kirkwood/ts219-setup.c
@@ -15,7 +15,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
index 5bbca26..0ce35ed 100644
--- a/arch/arm/mach-kirkwood/ts41x-setup.c
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c
@@ -15,7 +15,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h>
diff --git a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
index ee74ec9..1fce054 100644
--- a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
+++ b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/i2c.h>
#include <mach/mv78xx0.h>
diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c
index 4d6d48b..c2ffbb3 100644
--- a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c
+++ b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/i2c.h>
#include <mach/mv78xx0.h>
diff --git a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
index 9a88270..2423f74 100644
--- a/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
+++ b/arch/arm/mach-mv78xx0/rd78x00-masa-setup.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <mach/mv78xx0.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c
index d75dcfa..9f31bbe 100644
--- a/arch/arm/mach-orion5x/d2net-setup.c
+++ b/arch/arm/mach-orion5x/d2net-setup.c
@@ -16,7 +16,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index be3080e..051bd16 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -18,7 +18,7 @@
#include <linux/mtd/physmap.h>
#include <linux/mtd/nand.h>
#include <linux/timer.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/i2c.h>
#include <linux/platform_data/orion_nand.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index d470864..cdc34e5 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -21,7 +21,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c
index 355e962..cf47458 100644
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@ -24,7 +24,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 82cf706..bac1f57 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -16,7 +16,7 @@
#include <linux/delay.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/nand.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/i2c.h>
#include <linux/serial_reg.h>
#include <linux/ata_platform.h>
diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c
index 0c9e413..e24835f 100644
--- a/arch/arm/mach-orion5x/ls-chl-setup.c
+++ b/arch/arm/mach-orion5x/ls-chl-setup.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/gpio-fan.h>
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c
index c1b5d8a..97ba200 100644
--- a/arch/arm/mach-orion5x/ls_hgl-setup.c
+++ b/arch/arm/mach-orion5x/ls_hgl-setup.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c
index 949eaa8..f73c9d7 100644
--- a/arch/arm/mach-orion5x/lsmini-setup.c
+++ b/arch/arm/mach-orion5x/lsmini-setup.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index 1c16d04..10eb517 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -15,7 +15,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c
index c87fde4..4c1d86f 100644
--- a/arch/arm/mach-orion5x/mv2120-setup.c
+++ b/arch/arm/mach-orion5x/mv2120-setup.c
@@ -13,7 +13,7 @@
#include <linux/platform_device.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c
index 0180c39..d10fa5a 100644
--- a/arch/arm/mach-orion5x/net2big-setup.c
+++ b/arch/arm/mach-orion5x/net2big-setup.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 78a6a11..c1e874b 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -14,7 +14,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index 2f5dc54..6551cd5 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -14,7 +14,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/i2c.h>
#include <net/dsa.h>
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 399130f..22d423e 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -16,7 +16,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/i2c.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index 92df49c..a8cbd4e 100644
--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@ -14,7 +14,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <linux/ethtool.h>
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index 90e571d..33f1fd5 100644
--- a/arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -16,7 +16,7 @@
#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/i2c.h>
#include <linux/serial_reg.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index b184f68..55b59f0 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -16,7 +16,7 @@
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/nand.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/i2c.h>
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
index a5c2e64..a4b5be0 100644
--- a/arch/arm/mach-orion5x/ts409-setup.c
+++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -18,7 +18,7 @@
#include <linux/pci.h>
#include <linux/irq.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index b420327..28e2fe0 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/sysfs.h>
#include <linux/platform_device.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/m48t86.h>
#include <linux/mtd/nand.h>
diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c
index 7189827..9e917bd 100644
--- a/arch/arm/mach-orion5x/tsx09-common.c
+++ b/arch/arm/mach-orion5x/tsx09-common.c
@@ -12,7 +12,7 @@
#include <linux/kernel.h>
#include <linux/pci.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/timex.h>
#include <linux/serial_reg.h>
#include <mach/orion5x.h>
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index 754c12b..f815dac 100644
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -13,7 +13,7 @@
#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <net/dsa.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index 45c2125..61dec34 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -13,7 +13,7 @@
#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/leds.h>
#include <linux/gpio_keys.h>
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 3aeb28f..4585815 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -16,7 +16,7 @@
#include <linux/ata_platform.h>
#include <linux/clk.h>
#include <linux/clkdev.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/platform_data/ehci-orion.h>
#include <linux/platform_data/mv_xor.h>
#include <linux/platform_data/mv643xx_i2c.h>
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index e00fdb2..2a57984 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -9,7 +9,7 @@
*/
#ifndef __PLAT_COMMON_H
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
struct dsa_platform_data;
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 087b9e0..9e5c179 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -52,12 +52,12 @@
#include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <linux/phy.h>
-#include <linux/mv643xx_eth.h>
#include <linux/io.h>
#include <linux/types.h>
#include <linux/inet_lro.h>
#include <linux/slab.h>
#include <linux/clk.h>
+#include <linux/platform_data/mv643xx_eth.h>
static char mv643xx_eth_driver_name[] = "mv643xx_eth";
static char mv643xx_eth_driver_version[] = "1.4";
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index 7e293ce..21a1a74 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -14,7 +14,7 @@
#define __ASM_MV643XX_H
#include <asm/types.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/platform_data/mv643xx_eth.h>
#include <linux/platform_data/mv643xx_i2c.h>
/****************************************/
diff --git a/include/linux/mv643xx_eth.h b/include/linux/platform_data/mv643xx_eth.h
similarity index 96%
rename from include/linux/mv643xx_eth.h
rename to include/linux/platform_data/mv643xx_eth.h
index 51bf8ad..6c6cfe6 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/platform_data/mv643xx_eth.h
@@ -2,8 +2,8 @@
* MV-643XX ethernet platform device data definition file.
*/
-#ifndef __LINUX_MV643XX_ETH_H
-#define __LINUX_MV643XX_ETH_H
+#ifndef __MV643XX_ETH_PDATA_H
+#define __MV643XX_ETH_PDATA_H
#include <linux/mbus.h>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* arm: move plat-orion platform_data headers to the right place
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
` (7 preceding siblings ...)
2012-08-28 18:59 ` [PATCH 8/8] net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h> Thomas Petazzoni
@ 2012-08-28 20:11 ` Andrew Lunn
2012-08-28 20:25 ` Jason Cooper
2012-08-29 0:02 ` Jason Cooper
9 siblings, 1 reply; 14+ messages in thread
From: Andrew Lunn @ 2012-08-28 20:11 UTC (permalink / raw)
To: linux-arm-kernel
> This series has been built tested for orion5x_defconfig,
> dove_defconfig, kirkwood_defconfig and mv78x00_defconfig.
Hi Thomas
It would be nice if you could also build test the affected powerpc
platforms.
Thanks
Andrew
^ permalink raw reply [flat|nested] 14+ messages in thread
* arm: move plat-orion platform_data headers to the right place
2012-08-28 20:11 ` arm: move plat-orion platform_data headers to the right place Andrew Lunn
@ 2012-08-28 20:25 ` Jason Cooper
2012-08-28 21:15 ` Jason Cooper
0 siblings, 1 reply; 14+ messages in thread
From: Jason Cooper @ 2012-08-28 20:25 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 28, 2012 at 10:11:34PM +0200, Andrew Lunn wrote:
> > This series has been built tested for orion5x_defconfig,
> > dove_defconfig, kirkwood_defconfig and mv78x00_defconfig.
>
> Hi Thomas
>
> It would be nice if you could also build test the affected powerpc
> platforms.
If my toolchain builds, I'll test it.
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread
* arm: move plat-orion platform_data headers to the right place
2012-08-28 20:25 ` Jason Cooper
@ 2012-08-28 21:15 ` Jason Cooper
2012-08-28 21:57 ` Thomas Petazzoni
0 siblings, 1 reply; 14+ messages in thread
From: Jason Cooper @ 2012-08-28 21:15 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 28, 2012 at 04:25:34PM -0400, Jason Cooper wrote:
> On Tue, Aug 28, 2012 at 10:11:34PM +0200, Andrew Lunn wrote:
> > > This series has been built tested for orion5x_defconfig,
> > > dove_defconfig, kirkwood_defconfig and mv78x00_defconfig.
> >
> > It would be nice if you could also build test the affected powerpc
> > platforms.
>
> If my toolchain builds, I'll test it.
Ok, built the following defconfigs with a generic powerpc toolchain:
c2k_defconfig
chrp32_defconfig
prpmc2800_defconfig
This exercises I2C_MV64XXX and MV643XX_ETH. The others don't appear to
be used in powerpc. But I don't use powerpc so take it for what it's
worth.
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread
* arm: move plat-orion platform_data headers to the right place
2012-08-28 21:15 ` Jason Cooper
@ 2012-08-28 21:57 ` Thomas Petazzoni
0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2012-08-28 21:57 UTC (permalink / raw)
To: linux-arm-kernel
Le Tue, 28 Aug 2012 17:15:03 -0400,
Jason Cooper <jason@lakedaemon.net> a ?crit :
> Ok, built the following defconfigs with a generic powerpc toolchain:
>
> c2k_defconfig
> chrp32_defconfig
> prpmc2800_defconfig
I also built the following PowerPW defconfigs, which had either the I2C
or the Ethernet Marvell drivers enabled, or both:
c2k
chroma
chrp32
mpc7448_hpc2
pasemi
ppc6xx
prpmc2800
All of them built, except mpc7448_hpc2, but the build failure was
completely unrelated.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* arm: move plat-orion platform_data headers to the right place
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
` (8 preceding siblings ...)
2012-08-28 20:11 ` arm: move plat-orion platform_data headers to the right place Andrew Lunn
@ 2012-08-29 0:02 ` Jason Cooper
9 siblings, 0 replies; 14+ messages in thread
From: Jason Cooper @ 2012-08-29 0:02 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 28, 2012 at 08:59:01PM +0200, Thomas Petazzoni wrote:
> Hello,
>
> plat-orion/include/plat contains a bunch of headers with platform_data
> structure definitions. Those headers should now be in
> <linux/platform_data/...>, so this patch series is moving them
> here. This impacts the MTD, USB EHCI, sound, MMC, DMA XOR drivers.
>
> Moreover, this series takes this opportunity to move two other
> platform_data headers that were in <linux/...>. This impacts the I2C
> and Ethernet drivers.
>
> This series has been built tested for orion5x_defconfig,
> dove_defconfig, kirkwood_defconfig and mv78x00_defconfig.
>
> Thanks,
>
> Thomas
Entire series applied to:
git://git.infradead.org/users/jcooper/linux.git boards-for-v3.7-v2
thx,
Jason.
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-08-29 0:02 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-28 18:59 arm: move plat-orion platform_data headers to the right place Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 1/8] sound: kirkwood: remove useless <plat/audio.h> include Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 2/8] sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h> Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 3/8] usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h> Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 4/8] mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h> Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 5/8] dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h> Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 6/8] mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h> Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 7/8] i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h> Thomas Petazzoni
2012-08-28 18:59 ` [PATCH 8/8] net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h> Thomas Petazzoni
2012-08-28 20:11 ` arm: move plat-orion platform_data headers to the right place Andrew Lunn
2012-08-28 20:25 ` Jason Cooper
2012-08-28 21:15 ` Jason Cooper
2012-08-28 21:57 ` Thomas Petazzoni
2012-08-29 0:02 ` Jason Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).