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
This commit is contained in:
parent
7cdc39eead
commit
ec2a0833e5
@ -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 */
|
||||
|
||||
|
@ -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 ""
|
||||
/*
|
||||
|
@ -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)
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -33,11 +33,11 @@
|
||||
|
||||
#include <mach/mux.h>
|
||||
#include <mach/common.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
#include <mach/serial.h>
|
||||
#include <mach/mmc.h>
|
||||
#include <mach/nand.h>
|
||||
#include <mach/keyscan.h>
|
||||
#include <linux/platform_data/mmc-davinci.h>
|
||||
#include <linux/platform_data/mtd-davinci.h>
|
||||
#include <linux/platform_data/keyscan-davinci.h>
|
||||
|
||||
#include <media/tvp514x.h>
|
||||
|
||||
|
@ -31,13 +31,13 @@
|
||||
#include <asm/mach/arch.h>
|
||||
|
||||
#include <mach/common.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
#include <mach/serial.h>
|
||||
#include <mach/mux.h>
|
||||
#include <mach/nand.h>
|
||||
#include <mach/mmc.h>
|
||||
#include <mach/usb.h>
|
||||
#include <mach/aemif.h>
|
||||
#include <linux/platform_data/mtd-davinci.h>
|
||||
#include <linux/platform_data/mmc-davinci.h>
|
||||
#include <linux/platform_data/usb-davinci.h>
|
||||
#include <linux/platform_data/mtd-davinci-aemif.h>
|
||||
|
||||
#include "davinci.h"
|
||||
|
||||
|
@ -38,11 +38,11 @@
|
||||
|
||||
#include <mach/common.h>
|
||||
#include <mach/serial.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <mach/nand.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
#include <linux/platform_data/mtd-davinci.h>
|
||||
#include <mach/clock.h>
|
||||
#include <mach/cdce949.h>
|
||||
#include <mach/aemif.h>
|
||||
#include <linux/platform_data/mtd-davinci-aemif.h>
|
||||
|
||||
#include "davinci.h"
|
||||
#include "clock.h"
|
||||
|
@ -26,9 +26,9 @@
|
||||
#include <mach/common.h>
|
||||
#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/spi.h>
|
||||
#include <linux/platform_data/spi-davinci.h>
|
||||
|
||||
#define MITYOMAPL138_PHY_ID ""
|
||||
|
||||
|
@ -31,12 +31,12 @@
|
||||
#include <asm/mach/arch.h>
|
||||
|
||||
#include <mach/common.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
#include <mach/serial.h>
|
||||
#include <mach/mux.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"
|
||||
|
||||
|
@ -36,10 +36,10 @@
|
||||
#include <asm/mach/flash.h>
|
||||
|
||||
#include <mach/common.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
#include <mach/serial.h>
|
||||
#include <mach/mux.h>
|
||||
#include <mach/usb.h>
|
||||
#include <linux/platform_data/usb-davinci.h>
|
||||
|
||||
#include "davinci.h"
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <linux/spi/spi.h>
|
||||
|
||||
#include <mach/asp.h>
|
||||
#include <mach/keyscan.h>
|
||||
#include <linux/platform_data/keyscan-davinci.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include <media/davinci/vpfe_capture.h>
|
||||
|
@ -15,12 +15,12 @@
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/mux.h>
|
||||
#include <mach/edma.h>
|
||||
#include <mach/mmc.h>
|
||||
#include <linux/platform_data/mmc-davinci.h>
|
||||
#include <mach/time.h>
|
||||
|
||||
#include "davinci.h"
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <mach/serial.h>
|
||||
#include <mach/common.h>
|
||||
#include <mach/asp.h>
|
||||
#include <mach/spi.h>
|
||||
#include <linux/platform_data/spi-davinci.h>
|
||||
#include <mach/gpio-davinci.h>
|
||||
|
||||
#include "davinci.h"
|
||||
|
@ -30,8 +30,8 @@
|
||||
#include <mach/serial.h>
|
||||
#include <mach/common.h>
|
||||
#include <mach/asp.h>
|
||||
#include <mach/keyscan.h>
|
||||
#include <mach/spi.h>
|
||||
#include <linux/platform_data/keyscan-davinci.h>
|
||||
#include <linux/platform_data/spi-davinci.h>
|
||||
#include <mach/gpio-davinci.h>
|
||||
|
||||
#include "davinci.h"
|
||||
|
@ -19,12 +19,12 @@
|
||||
|
||||
#include <mach/serial.h>
|
||||
#include <mach/edma.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <mach/asp.h>
|
||||
#include <mach/mmc.h>
|
||||
#include <mach/usb.h>
|
||||
#include <mach/pm.h>
|
||||
#include <mach/spi.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
#include <linux/platform_data/mmc-davinci.h>
|
||||
#include <linux/platform_data/usb-davinci.h>
|
||||
#include <linux/platform_data/spi-davinci.h>
|
||||
|
||||
extern void __iomem *da8xx_syscfg0_base;
|
||||
extern void __iomem *da8xx_syscfg1_base;
|
||||
|
@ -36,8 +36,8 @@
|
||||
#include <linux/input/matrix_keypad.h>
|
||||
#include <linux/mfd/ti_ssp.h>
|
||||
|
||||
#include <mach/mmc.h>
|
||||
#include <mach/nand.h>
|
||||
#include <linux/platform_data/mmc-davinci.h>
|
||||
#include <linux/platform_data/mtd-davinci.h>
|
||||
#include <mach/serial.h>
|
||||
|
||||
struct tnetv107x_device_info {
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include <mach/common.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/usb.h>
|
||||
#include <linux/platform_data/usb-davinci.h>
|
||||
|
||||
#define DAVINCI_USB_OTG_BASE 0x01c64000
|
||||
|
||||
|
@ -40,7 +40,7 @@
|
||||
#include <linux/gpio.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
|
||||
/* ----- global defines ----------------------------------------------- */
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/keyscan.h>
|
||||
#include <linux/platform_data/keyscan-davinci.h>
|
||||
|
||||
/* Key scan registers */
|
||||
#define DAVINCI_KEYSCAN_KEYCTRL 0x0000
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mux.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-davinci.h>
|
||||
|
||||
#include <linux/io.h>
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/mmc/mmc.h>
|
||||
|
||||
#include <mach/mmc.h>
|
||||
#include <linux/platform_data/mmc-davinci.h>
|
||||
#include <mach/edma.h>
|
||||
|
||||
/*
|
||||
|
@ -34,8 +34,8 @@
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <mach/nand.h>
|
||||
#include <mach/aemif.h>
|
||||
#include <linux/platform_data/mtd-davinci.h>
|
||||
#include <linux/platform_data/mtd-davinci-aemif.h>
|
||||
|
||||
/*
|
||||
* This is a device driver for the NAND flash controller found on the
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include <linux/spi/spi_bitbang.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <mach/spi.h>
|
||||
#include <linux/platform_data/spi-davinci.h>
|
||||
#include <mach/edma.h>
|
||||
|
||||
#define SPI_NO_RESOURCE ((resource_size_t)-1)
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <linux/clk.h>
|
||||
|
||||
#include <mach/da8xx.h>
|
||||
#include <mach/usb.h>
|
||||
#include <linux/platform_data/usb-davinci.h>
|
||||
|
||||
#ifndef CONFIG_ARCH_DAVINCI_DA8XX
|
||||
#error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include <mach/da8xx.h>
|
||||
#include <mach/usb.h>
|
||||
#include <linux/platform_data/usb-davinci.h>
|
||||
|
||||
#include "musb_core.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user