diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-24 09:14:29 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 05:17:21 -0400 |
commit | 82906b13a6f4f42edec92f0a3e480e1bdd9b3f91 (patch) | |
tree | 7df9b785e51bc00963b9a0f9a58f053ada866b91 /drivers | |
parent | a3b2924547a79cb6dba683d737501c01476f9fb3 (diff) |
ARM: imx: 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 imx 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>
Acked-by: Sascha Hauer <kernel@pengutronix.de>
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Dan Williams <djbw@fb.com>
Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dma/imx-dma.c | 2 | ||||
-rw-r--r-- | drivers/dma/imx-sdma.c | 4 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 2 | ||||
-rw-r--r-- | drivers/media/video/mx1_camera.c | 2 | ||||
-rw-r--r-- | drivers/media/video/mx2_camera.c | 2 | ||||
-rw-r--r-- | drivers/media/video/mx3_camera.c | 4 | ||||
-rw-r--r-- | drivers/mmc/host/mxcmmc.c | 4 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-imx.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/imx.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/imx_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-mxc.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/imx21-hcd.h | 2 | ||||
-rw-r--r-- | drivers/video/imxfb.c | 2 | ||||
-rw-r--r-- | drivers/video/mx3fb.c | 4 |
16 files changed, 20 insertions, 20 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 5084975d793c..b90aaec4ccc4 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | 29 | ||
30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
31 | #include <mach/dma.h> | 31 | #include <linux/platform_data/dma-imx.h> |
32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
33 | 33 | ||
34 | #include "dmaengine.h" | 34 | #include "dmaengine.h" |
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 1dc2a4ad0026..1b781d6ac425 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c | |||
@@ -38,8 +38,8 @@ | |||
38 | #include <linux/of_device.h> | 38 | #include <linux/of_device.h> |
39 | 39 | ||
40 | #include <asm/irq.h> | 40 | #include <asm/irq.h> |
41 | #include <mach/sdma.h> | 41 | #include <linux/platform_data/dma-imx-sdma.h> |
42 | #include <mach/dma.h> | 42 | #include <linux/platform_data/dma-imx.h> |
43 | #include <mach/hardware.h> | 43 | #include <mach/hardware.h> |
44 | 44 | ||
45 | #include "dmaengine.h" | 45 | #include "dmaengine.h" |
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 0722f869465c..b7907ba7448a 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include <linux/pinctrl/consumer.h> | 54 | #include <linux/pinctrl/consumer.h> |
55 | 55 | ||
56 | #include <mach/hardware.h> | 56 | #include <mach/hardware.h> |
57 | #include <mach/i2c.h> | 57 | #include <linux/platform_data/i2c-imx.h> |
58 | 58 | ||
59 | /** Defines ******************************************************************** | 59 | /** Defines ******************************************************************** |
60 | *******************************************************************************/ | 60 | *******************************************************************************/ |
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c index 560a65aa7038..bbe70991d30b 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/video/mx1_camera.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <mach/dma-mx1-mx2.h> | 44 | #include <mach/dma-mx1-mx2.h> |
45 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
46 | #include <mach/irqs.h> | 46 | #include <mach/irqs.h> |
47 | #include <mach/mx1_camera.h> | 47 | #include <linux/platform_data/camera-mx1.h> |
48 | 48 | ||
49 | /* | 49 | /* |
50 | * CSI registers | 50 | * CSI registers |
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index ac175406e582..965427f279a5 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include <linux/videodev2.h> | 41 | #include <linux/videodev2.h> |
42 | 42 | ||
43 | #include <mach/mx2_cam.h> | 43 | #include <linux/platform_data/camera-mx2.h> |
44 | #include <mach/hardware.h> | 44 | #include <mach/hardware.h> |
45 | 45 | ||
46 | #include <asm/dma.h> | 46 | #include <asm/dma.h> |
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index af2297dd49c8..1481b0d419da 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <media/soc_mediabus.h> | 25 | #include <media/soc_mediabus.h> |
26 | 26 | ||
27 | #include <mach/ipu.h> | 27 | #include <mach/ipu.h> |
28 | #include <mach/mx3_camera.h> | 28 | #include <linux/platform_data/camera-mx3.h> |
29 | #include <mach/dma.h> | 29 | #include <linux/platform_data/dma-imx.h> |
30 | 30 | ||
31 | #define MX3_CAM_DRV_NAME "mx3-camera" | 31 | #define MX3_CAM_DRV_NAME "mx3-camera" |
32 | 32 | ||
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index 28ed52d58f7f..7b1161de01d6 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c | |||
@@ -38,9 +38,9 @@ | |||
38 | #include <asm/dma.h> | 38 | #include <asm/dma.h> |
39 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
40 | #include <asm/sizes.h> | 40 | #include <asm/sizes.h> |
41 | #include <mach/mmc.h> | 41 | #include <linux/platform_data/mmc-mxcmmc.h> |
42 | 42 | ||
43 | #include <mach/dma.h> | 43 | #include <linux/platform_data/dma-imx.h> |
44 | #include <mach/hardware.h> | 44 | #include <mach/hardware.h> |
45 | 45 | ||
46 | #define DRIVER_NAME "mxc-mmc" | 46 | #define DRIVER_NAME "mxc-mmc" |
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index e23f8134591c..c4c504c4802b 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/of_device.h> | 25 | #include <linux/of_device.h> |
26 | #include <linux/of_gpio.h> | 26 | #include <linux/of_gpio.h> |
27 | #include <linux/pinctrl/consumer.h> | 27 | #include <linux/pinctrl/consumer.h> |
28 | #include <mach/esdhc.h> | 28 | #include <linux/platform_data/mmc-esdhc-imx.h> |
29 | #include "sdhci-pltfm.h" | 29 | #include "sdhci-pltfm.h" |
30 | #include "sdhci-esdhc.h" | 30 | #include "sdhci-esdhc.h" |
31 | 31 | ||
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 6acc790c2fbb..5683604967d7 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <linux/of_mtd.h> | 36 | #include <linux/of_mtd.h> |
37 | 37 | ||
38 | #include <asm/mach/flash.h> | 38 | #include <asm/mach/flash.h> |
39 | #include <mach/mxc_nand.h> | 39 | #include <linux/platform_data/mtd-mxc_nand.h> |
40 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
41 | 41 | ||
42 | #define DRIVER_NAME "mxc_nand" | 42 | #define DRIVER_NAME "mxc_nand" |
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index e834ff8c0188..63e7fc9801cd 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <linux/of_gpio.h> | 39 | #include <linux/of_gpio.h> |
40 | #include <linux/pinctrl/consumer.h> | 40 | #include <linux/pinctrl/consumer.h> |
41 | 41 | ||
42 | #include <mach/spi.h> | 42 | #include <linux/platform_data/spi-imx.h> |
43 | 43 | ||
44 | #define DRIVER_NAME "spi_imx" | 44 | #define DRIVER_NAME "spi_imx" |
45 | 45 | ||
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index d5c689d6217e..fc65ba2c2d50 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c | |||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | #include <asm/io.h> | 52 | #include <asm/io.h> |
53 | #include <asm/irq.h> | 53 | #include <asm/irq.h> |
54 | #include <mach/imx-uart.h> | 54 | #include <linux/platform_data/serial-imx.h> |
55 | 55 | ||
56 | /* Register definitions */ | 56 | /* Register definitions */ |
57 | #define URXD0 0x0 /* Receiver Register */ | 57 | #define URXD0 0x0 /* Receiver Register */ |
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c index dc5334856afe..a0eb85794fd4 100644 --- a/drivers/usb/gadget/imx_udc.c +++ b/drivers/usb/gadget/imx_udc.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <linux/usb/ch9.h> | 35 | #include <linux/usb/ch9.h> |
36 | #include <linux/usb/gadget.h> | 36 | #include <linux/usb/gadget.h> |
37 | 37 | ||
38 | #include <mach/usb.h> | 38 | #include <linux/platform_data/usb-imx_udc.h> |
39 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
40 | 40 | ||
41 | #include "imx_udc.h" | 41 | #include "imx_udc.h" |
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index 34201372c85f..a6e2ea4ef8fd 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | 26 | ||
27 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <mach/mxc_ehci.h> | 28 | #include <linux/platform_data/usb-ehci-mxc.h> |
29 | 29 | ||
30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
31 | 31 | ||
diff --git a/drivers/usb/host/imx21-hcd.h b/drivers/usb/host/imx21-hcd.h index 87b29fd971b4..c005770a73e9 100644 --- a/drivers/usb/host/imx21-hcd.h +++ b/drivers/usb/host/imx21-hcd.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifndef __LINUX_IMX21_HCD_H__ | 24 | #ifndef __LINUX_IMX21_HCD_H__ |
25 | #define __LINUX_IMX21_HCD_H__ | 25 | #define __LINUX_IMX21_HCD_H__ |
26 | 26 | ||
27 | #include <mach/mx21-usbhost.h> | 27 | #include <linux/platform_data/usb-mx2.h> |
28 | 28 | ||
29 | #define NUM_ISO_ETDS 2 | 29 | #define NUM_ISO_ETDS 2 |
30 | #define USB_NUM_ETD 32 | 30 | #define USB_NUM_ETD 32 |
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index caad3689b4e6..53ffdfc82a75 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
33 | #include <linux/math64.h> | 33 | #include <linux/math64.h> |
34 | 34 | ||
35 | #include <mach/imxfb.h> | 35 | #include <linux/platform_data/video-imxfb.h> |
36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
37 | 37 | ||
38 | /* | 38 | /* |
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index c89f8a8d36d2..d7381088a180 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c | |||
@@ -27,10 +27,10 @@ | |||
27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
29 | 29 | ||
30 | #include <mach/dma.h> | 30 | #include <linux/platform_data/dma-imx.h> |
31 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
32 | #include <mach/ipu.h> | 32 | #include <mach/ipu.h> |
33 | #include <mach/mx3fb.h> | 33 | #include <linux/platform_data/video-mx3fb.h> |
34 | 34 | ||
35 | #include <asm/io.h> | 35 | #include <asm/io.h> |
36 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |