tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Arnd Bergmann ec2a0833 7cdc39ee

+58 -58
+1 -1
arch/arm/mach-davinci/aemif.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/time.h> 17 17 18 - #include <mach/aemif.h> 18 + #include <linux/platform_data/mtd-davinci-aemif.h> 19 19 20 20 /* Timing value configuration */ 21 21
+4 -4
arch/arm/mach-davinci/board-da830-evm.c
··· 28 28 29 29 #include <mach/cp_intc.h> 30 30 #include <mach/mux.h> 31 - #include <mach/nand.h> 31 + #include <linux/platform_data/mtd-davinci.h> 32 32 #include <mach/da8xx.h> 33 - #include <mach/usb.h> 34 - #include <mach/aemif.h> 35 - #include <mach/spi.h> 33 + #include <linux/platform_data/usb-davinci.h> 34 + #include <linux/platform_data/mtd-davinci-aemif.h> 35 + #include <linux/platform_data/spi-davinci.h> 36 36 37 37 #define DA830_EVM_PHY_ID "" 38 38 /*
+3 -3
arch/arm/mach-davinci/board-da850-evm.c
··· 40 40 41 41 #include <mach/cp_intc.h> 42 42 #include <mach/da8xx.h> 43 - #include <mach/nand.h> 43 + #include <linux/platform_data/mtd-davinci.h> 44 44 #include <mach/mux.h> 45 - #include <mach/aemif.h> 46 - #include <mach/spi.h> 45 + #include <linux/platform_data/mtd-davinci-aemif.h> 46 + #include <linux/platform_data/spi-davinci.h> 47 47 48 48 #define DA850_EVM_PHY_ID "davinci_mdio-0:00" 49 49 #define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
+4 -4
arch/arm/mach-davinci/board-dm355-evm.c
··· 26 26 #include <asm/mach-types.h> 27 27 #include <asm/mach/arch.h> 28 28 29 - #include <mach/i2c.h> 29 + #include <linux/platform_data/i2c-davinci.h> 30 30 #include <mach/serial.h> 31 - #include <mach/nand.h> 32 - #include <mach/mmc.h> 33 - #include <mach/usb.h> 31 + #include <linux/platform_data/mtd-davinci.h> 32 + #include <linux/platform_data/mmc-davinci.h> 33 + #include <linux/platform_data/usb-davinci.h> 34 34 35 35 #include "davinci.h" 36 36
+4 -4
arch/arm/mach-davinci/board-dm355-leopard.c
··· 23 23 #include <asm/mach-types.h> 24 24 #include <asm/mach/arch.h> 25 25 26 - #include <mach/i2c.h> 26 + #include <linux/platform_data/i2c-davinci.h> 27 27 #include <mach/serial.h> 28 - #include <mach/nand.h> 29 - #include <mach/mmc.h> 30 - #include <mach/usb.h> 28 + #include <linux/platform_data/mtd-davinci.h> 29 + #include <linux/platform_data/mmc-davinci.h> 30 + #include <linux/platform_data/usb-davinci.h> 31 31 32 32 #include "davinci.h" 33 33
+4 -4
arch/arm/mach-davinci/board-dm365-evm.c
··· 33 33 34 34 #include <mach/mux.h> 35 35 #include <mach/common.h> 36 - #include <mach/i2c.h> 36 + #include <linux/platform_data/i2c-davinci.h> 37 37 #include <mach/serial.h> 38 - #include <mach/mmc.h> 39 - #include <mach/nand.h> 40 - #include <mach/keyscan.h> 38 + #include <linux/platform_data/mmc-davinci.h> 39 + #include <linux/platform_data/mtd-davinci.h> 40 + #include <linux/platform_data/keyscan-davinci.h> 41 41 42 42 #include <media/tvp514x.h> 43 43
+5 -5
arch/arm/mach-davinci/board-dm644x-evm.c
··· 31 31 #include <asm/mach/arch.h> 32 32 33 33 #include <mach/common.h> 34 - #include <mach/i2c.h> 34 + #include <linux/platform_data/i2c-davinci.h> 35 35 #include <mach/serial.h> 36 36 #include <mach/mux.h> 37 - #include <mach/nand.h> 38 - #include <mach/mmc.h> 39 - #include <mach/usb.h> 40 - #include <mach/aemif.h> 37 + #include <linux/platform_data/mtd-davinci.h> 38 + #include <linux/platform_data/mmc-davinci.h> 39 + #include <linux/platform_data/usb-davinci.h> 40 + #include <linux/platform_data/mtd-davinci-aemif.h> 41 41 42 42 #include "davinci.h" 43 43
+3 -3
arch/arm/mach-davinci/board-dm646x-evm.c
··· 38 38 39 39 #include <mach/common.h> 40 40 #include <mach/serial.h> 41 - #include <mach/i2c.h> 42 - #include <mach/nand.h> 41 + #include <linux/platform_data/i2c-davinci.h> 42 + #include <linux/platform_data/mtd-davinci.h> 43 43 #include <mach/clock.h> 44 44 #include <mach/cdce949.h> 45 - #include <mach/aemif.h> 45 + #include <linux/platform_data/mtd-davinci-aemif.h> 46 46 47 47 #include "davinci.h" 48 48 #include "clock.h"
+2 -2
arch/arm/mach-davinci/board-mityomapl138.c
··· 26 26 #include <mach/common.h> 27 27 #include <mach/cp_intc.h> 28 28 #include <mach/da8xx.h> 29 - #include <mach/nand.h> 29 + #include <linux/platform_data/mtd-davinci.h> 30 30 #include <mach/mux.h> 31 - #include <mach/spi.h> 31 + #include <linux/platform_data/spi-davinci.h> 32 32 33 33 #define MITYOMAPL138_PHY_ID "" 34 34
+4 -4
arch/arm/mach-davinci/board-neuros-osd2.c
··· 31 31 #include <asm/mach/arch.h> 32 32 33 33 #include <mach/common.h> 34 - #include <mach/i2c.h> 34 + #include <linux/platform_data/i2c-davinci.h> 35 35 #include <mach/serial.h> 36 36 #include <mach/mux.h> 37 - #include <mach/nand.h> 38 - #include <mach/mmc.h> 39 - #include <mach/usb.h> 37 + #include <linux/platform_data/mtd-davinci.h> 38 + #include <linux/platform_data/mmc-davinci.h> 39 + #include <linux/platform_data/usb-davinci.h> 40 40 41 41 #include "davinci.h" 42 42
+2 -2
arch/arm/mach-davinci/board-sffsdr.c
··· 36 36 #include <asm/mach/flash.h> 37 37 38 38 #include <mach/common.h> 39 - #include <mach/i2c.h> 39 + #include <linux/platform_data/i2c-davinci.h> 40 40 #include <mach/serial.h> 41 41 #include <mach/mux.h> 42 - #include <mach/usb.h> 42 + #include <linux/platform_data/usb-davinci.h> 43 43 44 44 #include "davinci.h" 45 45
+1 -1
arch/arm/mach-davinci/davinci.h
··· 24 24 #include <linux/spi/spi.h> 25 25 26 26 #include <mach/asp.h> 27 - #include <mach/keyscan.h> 27 + #include <linux/platform_data/keyscan-davinci.h> 28 28 #include <mach/hardware.h> 29 29 30 30 #include <media/davinci/vpfe_capture.h>
+2 -2
arch/arm/mach-davinci/devices.c
··· 15 15 #include <linux/io.h> 16 16 17 17 #include <mach/hardware.h> 18 - #include <mach/i2c.h> 18 + #include <linux/platform_data/i2c-davinci.h> 19 19 #include <mach/irqs.h> 20 20 #include <mach/cputype.h> 21 21 #include <mach/mux.h> 22 22 #include <mach/edma.h> 23 - #include <mach/mmc.h> 23 + #include <linux/platform_data/mmc-davinci.h> 24 24 #include <mach/time.h> 25 25 26 26 #include "davinci.h"
+1 -1
arch/arm/mach-davinci/dm355.c
··· 27 27 #include <mach/serial.h> 28 28 #include <mach/common.h> 29 29 #include <mach/asp.h> 30 - #include <mach/spi.h> 30 + #include <linux/platform_data/spi-davinci.h> 31 31 #include <mach/gpio-davinci.h> 32 32 33 33 #include "davinci.h"
+2 -2
arch/arm/mach-davinci/dm365.c
··· 30 30 #include <mach/serial.h> 31 31 #include <mach/common.h> 32 32 #include <mach/asp.h> 33 - #include <mach/keyscan.h> 34 - #include <mach/spi.h> 33 + #include <linux/platform_data/keyscan-davinci.h> 34 + #include <linux/platform_data/spi-davinci.h> 35 35 #include <mach/gpio-davinci.h> 36 36 37 37 #include "davinci.h"
arch/arm/mach-davinci/include/mach/aemif.h include/linux/platform_data/mtd-davinci-aemif.h
+4 -4
arch/arm/mach-davinci/include/mach/da8xx.h
··· 19 19 20 20 #include <mach/serial.h> 21 21 #include <mach/edma.h> 22 - #include <mach/i2c.h> 23 22 #include <mach/asp.h> 24 - #include <mach/mmc.h> 25 - #include <mach/usb.h> 26 23 #include <mach/pm.h> 27 - #include <mach/spi.h> 24 + #include <linux/platform_data/i2c-davinci.h> 25 + #include <linux/platform_data/mmc-davinci.h> 26 + #include <linux/platform_data/usb-davinci.h> 27 + #include <linux/platform_data/spi-davinci.h> 28 28 29 29 extern void __iomem *da8xx_syscfg0_base; 30 30 extern void __iomem *da8xx_syscfg1_base;
arch/arm/mach-davinci/include/mach/i2c.h include/linux/platform_data/i2c-davinci.h
arch/arm/mach-davinci/include/mach/keyscan.h include/linux/platform_data/keyscan-davinci.h
arch/arm/mach-davinci/include/mach/mmc.h include/linux/platform_data/mmc-davinci.h
arch/arm/mach-davinci/include/mach/nand.h include/linux/platform_data/mtd-davinci.h
arch/arm/mach-davinci/include/mach/spi.h include/linux/platform_data/spi-davinci.h
+2 -2
arch/arm/mach-davinci/include/mach/tnetv107x.h
··· 36 36 #include <linux/input/matrix_keypad.h> 37 37 #include <linux/mfd/ti_ssp.h> 38 38 39 - #include <mach/mmc.h> 40 - #include <mach/nand.h> 39 + #include <linux/platform_data/mmc-davinci.h> 40 + #include <linux/platform_data/mtd-davinci.h> 41 41 #include <mach/serial.h> 42 42 43 43 struct tnetv107x_device_info {
arch/arm/mach-davinci/include/mach/usb.h include/linux/platform_data/usb-davinci.h
+1 -1
arch/arm/mach-davinci/usb.c
··· 10 10 #include <mach/common.h> 11 11 #include <mach/irqs.h> 12 12 #include <mach/cputype.h> 13 - #include <mach/usb.h> 13 + #include <linux/platform_data/usb-davinci.h> 14 14 15 15 #define DAVINCI_USB_OTG_BASE 0x01c64000 16 16
+1 -1
drivers/i2c/busses/i2c-davinci.c
··· 40 40 #include <linux/gpio.h> 41 41 42 42 #include <mach/hardware.h> 43 - #include <mach/i2c.h> 43 + #include <linux/platform_data/i2c-davinci.h> 44 44 45 45 /* ----- global defines ----------------------------------------------- */ 46 46
+1 -1
drivers/input/keyboard/davinci_keyscan.c
··· 36 36 37 37 #include <mach/hardware.h> 38 38 #include <mach/irqs.h> 39 - #include <mach/keyscan.h> 39 + #include <linux/platform_data/keyscan-davinci.h> 40 40 41 41 /* Key scan registers */ 42 42 #define DAVINCI_KEYSCAN_KEYCTRL 0x0000
+1 -1
drivers/media/video/davinci/vpbe_venc.c
··· 27 27 28 28 #include <mach/hardware.h> 29 29 #include <mach/mux.h> 30 - #include <mach/i2c.h> 30 + #include <linux/platform_data/i2c-davinci.h> 31 31 32 32 #include <linux/io.h> 33 33
+1 -1
drivers/mmc/host/davinci_mmc.c
··· 33 33 #include <linux/dma-mapping.h> 34 34 #include <linux/mmc/mmc.h> 35 35 36 - #include <mach/mmc.h> 36 + #include <linux/platform_data/mmc-davinci.h> 37 37 #include <mach/edma.h> 38 38 39 39 /*
+2 -2
drivers/mtd/nand/davinci_nand.c
··· 34 34 #include <linux/mtd/partitions.h> 35 35 #include <linux/slab.h> 36 36 37 - #include <mach/nand.h> 38 - #include <mach/aemif.h> 37 + #include <linux/platform_data/mtd-davinci.h> 38 + #include <linux/platform_data/mtd-davinci-aemif.h> 39 39 40 40 /* 41 41 * This is a device driver for the NAND flash controller found on the
+1 -1
drivers/spi/spi-davinci.c
··· 30 30 #include <linux/spi/spi_bitbang.h> 31 31 #include <linux/slab.h> 32 32 33 - #include <mach/spi.h> 33 + #include <linux/platform_data/spi-davinci.h> 34 34 #include <mach/edma.h> 35 35 36 36 #define SPI_NO_RESOURCE ((resource_size_t)-1)
+1 -1
drivers/usb/host/ohci-da8xx.c
··· 17 17 #include <linux/clk.h> 18 18 19 19 #include <mach/da8xx.h> 20 - #include <mach/usb.h> 20 + #include <linux/platform_data/usb-davinci.h> 21 21 22 22 #ifndef CONFIG_ARCH_DAVINCI_DA8XX 23 23 #error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX."
+1 -1
drivers/usb/musb/da8xx.c
··· 35 35 #include <linux/dma-mapping.h> 36 36 37 37 #include <mach/da8xx.h> 38 - #include <mach/usb.h> 38 + #include <linux/platform_data/usb-davinci.h> 39 39 40 40 #include "musb_core.h" 41 41