diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-24 09:16:48 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 05:18:10 -0400 |
| commit | 293b2da1b61136813fc2764f43304c66ff8040e9 (patch) | |
| tree | 0edb35568fa88f853da9c14cd789a8403cda1b9d | |
| parent | 2960ed3468773b1a0b2533dd7a562673cc799437 (diff) | |
ARM: pxa: 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 pxa 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: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Paul Parsons <lost.distance@yahoo.com>
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
Acked-By: Stefan Schmidt <stefan@openezx.org>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Daniel Ribeiro <drwyrm@gmail.com>
Cc: Harald Welte <laforge@openezx.org>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Tomas Cech <sleep_walker@suse.cz>
Cc: Sergey Lapin <slapin@ossfans.org>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Dan Williams <djbw@fb.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: openezx-devel@lists.openezx.org
86 files changed, 188 insertions, 188 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index 223090b1444d..e5dba9c5dc54 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <mach/irqs.h> | 27 | #include <mach/irqs.h> |
| 28 | #include <video/pxa168fb.h> | 28 | #include <video/pxa168fb.h> |
| 29 | #include <linux/input.h> | 29 | #include <linux/input.h> |
| 30 | #include <plat/pxa27x_keypad.h> | 30 | #include <linux/platform_data/keypad-pxa27x.h> |
| 31 | 31 | ||
| 32 | #include "common.h" | 32 | #include "common.h" |
| 33 | 33 | ||
diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h index cba22fed2265..c4ca4d17194a 100644 --- a/arch/arm/mach-mmp/include/mach/mmp2.h +++ b/arch/arm/mach-mmp/include/mach/mmp2.h | |||
| @@ -13,7 +13,7 @@ extern void mmp2_clear_pmic_int(void); | |||
| 13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 14 | #include <linux/i2c/pxa-i2c.h> | 14 | #include <linux/i2c/pxa-i2c.h> |
| 15 | #include <mach/devices.h> | 15 | #include <mach/devices.h> |
| 16 | #include <mach/sram.h> | 16 | #include <linux/platform_data/dma-mmp_tdma.h> |
| 17 | 17 | ||
| 18 | extern struct pxa_device_desc mmp2_device_uart1; | 18 | extern struct pxa_device_desc mmp2_device_uart1; |
| 19 | extern struct pxa_device_desc mmp2_device_uart2; | 19 | extern struct pxa_device_desc mmp2_device_uart2; |
diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h index 09dcd6e2b6a8..37632d964d50 100644 --- a/arch/arm/mach-mmp/include/mach/pxa168.h +++ b/arch/arm/mach-mmp/include/mach/pxa168.h | |||
| @@ -11,9 +11,9 @@ extern void pxa168_clear_keypad_wakeup(void); | |||
| 11 | #include <linux/i2c.h> | 11 | #include <linux/i2c.h> |
| 12 | #include <linux/i2c/pxa-i2c.h> | 12 | #include <linux/i2c/pxa-i2c.h> |
| 13 | #include <mach/devices.h> | 13 | #include <mach/devices.h> |
| 14 | #include <plat/pxa3xx_nand.h> | 14 | #include <linux/platform_data/mtd-nand-pxa3xx.h> |
| 15 | #include <video/pxa168fb.h> | 15 | #include <video/pxa168fb.h> |
| 16 | #include <plat/pxa27x_keypad.h> | 16 | #include <linux/platform_data/keypad-pxa27x.h> |
| 17 | #include <mach/cputype.h> | 17 | #include <mach/cputype.h> |
| 18 | #include <linux/pxa168_eth.h> | 18 | #include <linux/pxa168_eth.h> |
| 19 | #include <linux/platform_data/mv_usb.h> | 19 | #include <linux/platform_data/mv_usb.h> |
