Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 293b2da1 authored Aug 24, 2012 by Arnd Bergmann

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

parent 2960ed34

arch/arm/mach-mmp/aspenite.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@
	#include <mach/irqs.h>		#include <mach/irqs.h>
	#include <video/pxa168fb.h>		#include <video/pxa168fb.h>
	#include <linux/input.h>		#include <linux/input.h>
	#include <plat/pxa27x_keypad.h>		#include <linux/platform_data/keypad-pxa27x.h>

	#include "common.h"		#include "common.h"

arch/arm/mach-mmp/include/mach/mmp2.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@ extern void mmp2_clear_pmic_int(void);
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/i2c/pxa-i2c.h>		#include <linux/i2c/pxa-i2c.h>
	#include <mach/devices.h>		#include <mach/devices.h>
	#include <mach/sram.h>		#include <linux/platform_data/dma-mmp_tdma.h>

	extern struct pxa_device_desc mmp2_device_uart1;		extern struct pxa_device_desc mmp2_device_uart1;
	extern struct pxa_device_desc mmp2_device_uart2;		extern struct pxa_device_desc mmp2_device_uart2;

arch/arm/mach-mmp/include/mach/pxa168.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11,9 +11,9 @@ extern void pxa168_clear_keypad_wakeup(void);
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/i2c/pxa-i2c.h>		#include <linux/i2c/pxa-i2c.h>
	#include <mach/devices.h>		#include <mach/devices.h>
	#include <plat/pxa3xx_nand.h>		#include <linux/platform_data/mtd-nand-pxa3xx.h>
	#include <video/pxa168fb.h>		#include <video/pxa168fb.h>
	#include <plat/pxa27x_keypad.h>		#include <linux/platform_data/keypad-pxa27x.h>
	#include <mach/cputype.h>		#include <mach/cputype.h>
	#include <linux/pxa168_eth.h>		#include <linux/pxa168_eth.h>
	#include <linux/platform_data/mv_usb.h>		#include <linux/platform_data/mv_usb.h>

arch/arm/mach-mmp/include/mach/pxa910.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ extern void __init pxa910_init_irq(void);
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/i2c/pxa-i2c.h>		#include <linux/i2c/pxa-i2c.h>
	#include <mach/devices.h>		#include <mach/devices.h>
	#include <plat/pxa3xx_nand.h>		#include <linux/platform_data/mtd-nand-pxa3xx.h>

	extern struct pxa_device_desc pxa910_device_uart1;		extern struct pxa_device_desc pxa910_device_uart1;
	extern struct pxa_device_desc pxa910_device_uart2;		extern struct pxa_device_desc pxa910_device_uart2;

arch/arm/mach-mmp/sram.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/genalloc.h>		#include <linux/genalloc.h>

	#include <mach/sram.h>		#include <linux/platform_data/dma-mmp_tdma.h>

	struct sram_bank_info {		struct sram_bank_info {
	char *pool_name;		char *pool_name;