Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: orion: move platform_data definitions

Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.

This moves such data out of the orion include directories

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Bryan Wu <bryan.wu@canonical.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>

+34 -34
+1 -1
arch/arm/mach-dove/common.c
··· 28 28 #include <asm/mach/arch.h> 29 29 #include <linux/irq.h> 30 30 #include <plat/time.h> 31 - #include <plat/ehci-orion.h> 31 + #include <linux/platform_data/usb-ehci-orion.h> 32 32 #include <plat/common.h> 33 33 #include <plat/addr-map.h> 34 34 #include "common.h"
+1 -1
arch/arm/mach-kirkwood/board-dreamplug.c
··· 30 30 #include <asm/mach/map.h> 31 31 #include <mach/kirkwood.h> 32 32 #include <mach/bridge-regs.h> 33 - #include <plat/mvsdio.h> 33 + #include <linux/platform_data/mmc-mvsdio.h> 34 34 #include "common.h" 35 35 #include "mpp.h" 36 36
+1 -1
arch/arm/mach-kirkwood/board-goflexnet.c
··· 32 32 #include <asm/mach/map.h> 33 33 #include <mach/kirkwood.h> 34 34 #include <mach/bridge-regs.h> 35 - #include <plat/mvsdio.h> 35 + #include <linux/platform_data/mmc-mvsdio.h> 36 36 #include "common.h" 37 37 #include "mpp.h" 38 38
+5 -5
arch/arm/mach-kirkwood/common.c
··· 26 26 #include <asm/mach/time.h> 27 27 #include <mach/kirkwood.h> 28 28 #include <mach/bridge-regs.h> 29 - #include <plat/audio.h> 29 + #include <linux/platform_data/asoc-kirkwood.h> 30 30 #include <plat/cache-feroceon-l2.h> 31 - #include <plat/mvsdio.h> 32 - #include <plat/orion_nand.h> 33 - #include <plat/ehci-orion.h> 31 + #include <linux/platform_data/mmc-mvsdio.h> 32 + #include <linux/platform_data/mtd-orion_nand.h> 33 + #include <linux/platform_data/usb-ehci-orion.h> 34 34 #include <plat/common.h> 35 35 #include <plat/time.h> 36 36 #include <plat/addr-map.h> 37 - #include <plat/mv_xor.h> 37 + #include <linux/platform_data/dma-mv_xor.h> 38 38 #include "common.h" 39 39 40 40 /*****************************************************************************
+1 -1
arch/arm/mach-kirkwood/d2net_v2-setup.c
··· 32 32 #include <asm/mach-types.h> 33 33 #include <asm/mach/arch.h> 34 34 #include <mach/kirkwood.h> 35 - #include <mach/leds-ns2.h> 35 + #include <linux/platform_data/leds-kirkwood-ns2.h> 36 36 #include "common.h" 37 37 #include "mpp.h" 38 38 #include "lacie_v2-common.h"
+1 -1
arch/arm/mach-kirkwood/db88f6281-bp-setup.c
··· 17 17 #include <asm/mach-types.h> 18 18 #include <asm/mach/arch.h> 19 19 #include <mach/kirkwood.h> 20 - #include <plat/mvsdio.h> 20 + #include <linux/platform_data/mmc-mvsdio.h> 21 21 #include "common.h" 22 22 #include "mpp.h" 23 23
+1 -1
arch/arm/mach-kirkwood/dockstar-setup.c
··· 19 19 #include <asm/mach-types.h> 20 20 #include <asm/mach/arch.h> 21 21 #include <mach/kirkwood.h> 22 - #include <plat/mvsdio.h> 22 + #include <linux/platform_data/mmc-mvsdio.h> 23 23 #include "common.h" 24 24 #include "mpp.h" 25 25
+1 -1
arch/arm/mach-kirkwood/guruplug-setup.c
··· 19 19 #include <asm/mach-types.h> 20 20 #include <asm/mach/arch.h> 21 21 #include <mach/kirkwood.h> 22 - #include <plat/mvsdio.h> 22 + #include <linux/platform_data/mmc-mvsdio.h> 23 23 #include "common.h" 24 24 #include "mpp.h" 25 25
arch/arm/mach-kirkwood/include/mach/leds-netxbig.h include/linux/platform_data/leds-kirkwood-netxbig.h
arch/arm/mach-kirkwood/include/mach/leds-ns2.h include/linux/platform_data/leds-kirkwood-ns2.h
+1 -1
arch/arm/mach-kirkwood/netspace_v2-setup.c
··· 34 34 #include <asm/mach-types.h> 35 35 #include <asm/mach/arch.h> 36 36 #include <mach/kirkwood.h> 37 - #include <mach/leds-ns2.h> 37 + #include <linux/platform_data/leds-kirkwood-ns2.h> 38 38 #include "common.h" 39 39 #include "mpp.h" 40 40 #include "lacie_v2-common.h"
+1 -1
arch/arm/mach-kirkwood/netxbig_v2-setup.c
··· 32 32 #include <asm/mach-types.h> 33 33 #include <asm/mach/arch.h> 34 34 #include <mach/kirkwood.h> 35 - #include <mach/leds-netxbig.h> 35 + #include <linux/platform_data/leds-kirkwood-netxbig.h> 36 36 #include "common.h" 37 37 #include "mpp.h" 38 38 #include "lacie_v2-common.h"
+1 -1
arch/arm/mach-kirkwood/openrd-setup.c
··· 20 20 #include <asm/mach-types.h> 21 21 #include <asm/mach/arch.h> 22 22 #include <mach/kirkwood.h> 23 - #include <plat/mvsdio.h> 23 + #include <linux/platform_data/mmc-mvsdio.h> 24 24 #include "common.h" 25 25 #include "mpp.h" 26 26
+1 -1
arch/arm/mach-kirkwood/rd88f6281-setup.c
··· 20 20 #include <asm/mach-types.h> 21 21 #include <asm/mach/arch.h> 22 22 #include <mach/kirkwood.h> 23 - #include <plat/mvsdio.h> 23 + #include <linux/platform_data/mmc-mvsdio.h> 24 24 #include "common.h" 25 25 #include "mpp.h" 26 26
+1 -1
arch/arm/mach-kirkwood/sheevaplug-setup.c
··· 19 19 #include <asm/mach-types.h> 20 20 #include <asm/mach/arch.h> 21 21 #include <mach/kirkwood.h> 22 - #include <plat/mvsdio.h> 22 + #include <linux/platform_data/mmc-mvsdio.h> 23 23 #include "common.h" 24 24 #include "mpp.h" 25 25
+2 -2
arch/arm/mach-mv78xx0/common.c
··· 20 20 #include <mach/mv78xx0.h> 21 21 #include <mach/bridge-regs.h> 22 22 #include <plat/cache-feroceon-l2.h> 23 - #include <plat/ehci-orion.h> 24 - #include <plat/orion_nand.h> 23 + #include <linux/platform_data/usb-ehci-orion.h> 24 + #include <linux/platform_data/mtd-orion_nand.h> 25 25 #include <plat/time.h> 26 26 #include <plat/common.h> 27 27 #include <plat/addr-map.h>
+2 -2
arch/arm/mach-orion5x/common.c
··· 30 30 #include <mach/bridge-regs.h> 31 31 #include <mach/hardware.h> 32 32 #include <mach/orion5x.h> 33 - #include <plat/orion_nand.h> 34 - #include <plat/ehci-orion.h> 33 + #include <linux/platform_data/mtd-orion_nand.h> 34 + #include <linux/platform_data/usb-ehci-orion.h> 35 35 #include <plat/time.h> 36 36 #include <plat/common.h> 37 37 #include <plat/addr-map.h>
+1 -1
arch/arm/mach-orion5x/db88f5281-setup.c
··· 24 24 #include <asm/mach/arch.h> 25 25 #include <asm/mach/pci.h> 26 26 #include <mach/orion5x.h> 27 - #include <plat/orion_nand.h> 27 + #include <linux/platform_data/mtd-orion_nand.h> 28 28 #include "common.h" 29 29 #include "mpp.h" 30 30
+1 -1
arch/arm/mach-orion5x/kurobox_pro-setup.c
··· 24 24 #include <asm/mach/arch.h> 25 25 #include <asm/mach/pci.h> 26 26 #include <mach/orion5x.h> 27 - #include <plat/orion_nand.h> 27 + #include <linux/platform_data/mtd-orion_nand.h> 28 28 #include "common.h" 29 29 #include "mpp.h" 30 30
+2 -2
arch/arm/plat-orion/common.c
··· 19 19 #include <linux/mv643xx_eth.h> 20 20 #include <linux/mv643xx_i2c.h> 21 21 #include <net/dsa.h> 22 - #include <plat/mv_xor.h> 23 - #include <plat/ehci-orion.h> 22 + #include <linux/platform_data/dma-mv_xor.h> 23 + #include <linux/platform_data/usb-ehci-orion.h> 24 24 #include <mach/bridge-regs.h> 25 25 26 26 /* Create a clkdev entry for a given device/clk */
arch/arm/plat-orion/include/plat/audio.h include/linux/platform_data/asoc-kirkwood.h
arch/arm/plat-orion/include/plat/ehci-orion.h include/linux/platform_data/usb-ehci-orion.h
arch/arm/plat-orion/include/plat/mv_xor.h include/linux/platform_data/dma-mv_xor.h
arch/arm/plat-orion/include/plat/mvsdio.h include/linux/platform_data/mmc-mvsdio.h
arch/arm/plat-orion/include/plat/orion_nand.h include/linux/platform_data/mtd-orion_nand.h
+1 -1
drivers/dma/mv_xor.c
··· 26 26 #include <linux/platform_device.h> 27 27 #include <linux/memory.h> 28 28 #include <linux/clk.h> 29 - #include <plat/mv_xor.h> 29 + #include <linux/platform_data/dma-mv_xor.h> 30 30 31 31 #include "dmaengine.h" 32 32 #include "mv_xor.h"
+1 -1
drivers/leds/leds-netxbig.c
··· 28 28 #include <linux/platform_device.h> 29 29 #include <linux/gpio.h> 30 30 #include <linux/leds.h> 31 - #include <mach/leds-netxbig.h> 31 + #include <linux/platform_data/leds-kirkwood-netxbig.h> 32 32 33 33 /* 34 34 * GPIO extension bus.
+1 -1
drivers/leds/leds-ns2.c
··· 29 29 #include <linux/gpio.h> 30 30 #include <linux/leds.h> 31 31 #include <linux/module.h> 32 - #include <mach/leds-ns2.h> 32 + #include <linux/platform_data/leds-kirkwood-ns2.h> 33 33 34 34 /* 35 35 * The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in
+1 -1
drivers/mmc/host/mvsdio.c
··· 25 25 26 26 #include <asm/sizes.h> 27 27 #include <asm/unaligned.h> 28 - #include <plat/mvsdio.h> 28 + #include <linux/platform_data/mmc-mvsdio.h> 29 29 30 30 #include "mvsdio.h" 31 31
+1 -1
drivers/mtd/nand/orion_nand.c
··· 22 22 #include <asm/io.h> 23 23 #include <asm/sizes.h> 24 24 #include <mach/hardware.h> 25 - #include <plat/orion_nand.h> 25 + #include <linux/platform_data/mtd-orion_nand.h> 26 26 27 27 static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) 28 28 {
+1 -1
drivers/usb/host/ehci-orion.c
··· 13 13 #include <linux/platform_device.h> 14 14 #include <linux/mbus.h> 15 15 #include <linux/clk.h> 16 - #include <plat/ehci-orion.h> 16 + #include <linux/platform_data/usb-ehci-orion.h> 17 17 18 18 #define rdl(off) __raw_readl(hcd->regs + (off)) 19 19 #define wrl(off, val) __raw_writel((val), hcd->regs + (off))
+1 -1
sound/soc/kirkwood/kirkwood-i2s.c
··· 21 21 #include <sound/pcm.h> 22 22 #include <sound/pcm_params.h> 23 23 #include <sound/soc.h> 24 - #include <plat/audio.h> 24 + #include <linux/platform_data/asoc-kirkwood.h> 25 25 #include "kirkwood.h" 26 26 27 27 #define DRV_NAME "kirkwood-i2s"
+1 -1
sound/soc/kirkwood/kirkwood-openrd.c
··· 17 17 #include <linux/slab.h> 18 18 #include <sound/soc.h> 19 19 #include <mach/kirkwood.h> 20 - #include <plat/audio.h> 20 + #include <linux/platform_data/asoc-kirkwood.h> 21 21 #include <asm/mach-types.h> 22 22 #include "../codecs/cs42l51.h" 23 23
+1 -1
sound/soc/kirkwood/kirkwood-t5325.c
··· 16 16 #include <linux/slab.h> 17 17 #include <sound/soc.h> 18 18 #include <mach/kirkwood.h> 19 - #include <plat/audio.h> 19 + #include <linux/platform_data/asoc-kirkwood.h> 20 20 #include <asm/mach-types.h> 21 21 #include "../codecs/alc5623.h" 22 22