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

Commit ec2a0833 authored Aug 24, 2012 by Arnd Bergmann

ARM: davinci: 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 davinci 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: Felipe Balbi <balbi@ti.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: "Ben Dooks" <ben-linux@fluff.org>
Cc: "Wolfram Sang" <w.sang@pengutronix.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Liam Girdwood <lrg@ti.com>
Cc: davinci-linux-open-source@linux.davincidsp.com

parent 7cdc39ee

arch/arm/mach-davinci/aemif.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		#include <linux/module.h>
		#include <linux/time.h>

		#include <mach/aemif.h>
		#include <linux/platform_data/mtd-davinci-aemif.h>

		/* Timing value configuration */

arch/arm/mach-davinci/board-da830-evm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,11 +28,11 @@

		#include <mach/cp_intc.h>
		#include <mach/mux.h>
		#include <mach/nand.h>
		#include <linux/platform_data/mtd-davinci.h>
		#include <mach/da8xx.h>
		#include <mach/usb.h>
		#include <mach/aemif.h>
		#include <mach/spi.h>
		#include <linux/platform_data/usb-davinci.h>
		#include <linux/platform_data/mtd-davinci-aemif.h>
		#include <linux/platform_data/spi-davinci.h>

		#define DA830_EVM_PHY_ID ""
		/*

arch/arm/mach-davinci/board-da850-evm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -40,10 +40,10 @@

		#include <mach/cp_intc.h>
		#include <mach/da8xx.h>
		#include <mach/nand.h>
		#include <linux/platform_data/mtd-davinci.h>
		#include <mach/mux.h>
		#include <mach/aemif.h>
		#include <mach/spi.h>
		#include <linux/platform_data/mtd-davinci-aemif.h>
		#include <linux/platform_data/spi-davinci.h>

		#define DA850_EVM_PHY_ID "davinci_mdio-0:00"
		#define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)

arch/arm/mach-davinci/board-dm355-evm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,11 +26,11 @@
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>

		#include <mach/i2c.h>
		#include <linux/platform_data/i2c-davinci.h>
		#include <mach/serial.h>
		#include <mach/nand.h>
		#include <mach/mmc.h>
		#include <mach/usb.h>
		#include <linux/platform_data/mtd-davinci.h>
		#include <linux/platform_data/mmc-davinci.h>
		#include <linux/platform_data/usb-davinci.h>

		#include "davinci.h"

arch/arm/mach-davinci/board-dm355-leopard.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,11 +23,11 @@
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>

		#include <mach/i2c.h>
		#include <linux/platform_data/i2c-davinci.h>
		#include <mach/serial.h>
		#include <mach/nand.h>
		#include <mach/mmc.h>
		#include <mach/usb.h>
		#include <linux/platform_data/mtd-davinci.h>
		#include <linux/platform_data/mmc-davinci.h>
		#include <linux/platform_data/usb-davinci.h>

		#include "davinci.h"