mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
ARM: imx: 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 imx 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: Sascha Hauer <kernel@pengutronix.de> Acked-by: Vinod Koul <vinod.koul@linux.intel.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Dan Williams <djbw@fb.com> Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> Cc: Chris Ball <cjb@laptop.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Alan Cox <alan@linux.intel.com> Cc: Felipe Balbi <balbi@ti.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Liam Girdwood <lrg@ti.com> Cc: Javier Martin <javier.martin@vista-silicon.com> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
This commit is contained in:
parent
a3b2924547
commit
82906b13a6
47 changed files with 49 additions and 49 deletions
|
@ -17,7 +17,7 @@
|
|||
#include <linux/io.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mxc_ehci.h>
|
||||
#include <linux/platform_data/usb-ehci-mxc.h>
|
||||
|
||||
#define USBCTRL_OTGBASE_OFFSET 0x600
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/io.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mxc_ehci.h>
|
||||
#include <linux/platform_data/usb-ehci-mxc.h>
|
||||
|
||||
#define USBCTRL_OTGBASE_OFFSET 0x600
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/io.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mxc_ehci.h>
|
||||
#include <linux/platform_data/usb-ehci-mxc.h>
|
||||
|
||||
#define USBCTRL_OTGBASE_OFFSET 0x600
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/io.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mxc_ehci.h>
|
||||
#include <linux/platform_data/usb-ehci-mxc.h>
|
||||
|
||||
#define USBCTRL_OTGBASE_OFFSET 0x600
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/io.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mxc_ehci.h>
|
||||
#include <linux/platform_data/usb-ehci-mxc.h>
|
||||
|
||||
#define MXC_OTG_OFFSET 0
|
||||
#define MXC_H1_OFFSET 0x200
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include <mach/hardware.h>
|
||||
#include <mach/iomux-mx3.h>
|
||||
#include <mach/ulpi.h>
|
||||
#include <mach/ssi.h>
|
||||
#include <linux/platform_data/asoc-imx-ssi.h>
|
||||
|
||||
#include "devices-imx31.h"
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <mach/mx1_camera.h>
|
||||
#include <linux/platform_data/camera-mx1.h>
|
||||
|
||||
/* IMX camera FIQ handler */
|
||||
EXPORT_SYMBOL(mx1_camera_sof_fiq_start);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/devices-common.h>
|
||||
#include <mach/esdhc.h>
|
||||
#include <linux/platform_data/mmc-esdhc-imx.h>
|
||||
|
||||
#define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \
|
||||
{ \
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/init.h>
|
||||
#include <mach/sdma.h>
|
||||
#include <linux/platform_data/dma-imx-sdma.h>
|
||||
|
||||
extern struct device mxc_aips_bus;
|
||||
extern struct device mxc_ahb_bus;
|
||||
|
@ -74,7 +74,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc(
|
|||
struct platform_device *__init imx_add_gpio_keys(
|
||||
const struct gpio_keys_platform_data *pdata);
|
||||
|
||||
#include <mach/mx21-usbhost.h>
|
||||
#include <linux/platform_data/usb-mx2.h>
|
||||
struct imx_imx21_hcd_data {
|
||||
resource_size_t iobase;
|
||||
resource_size_t irq;
|
||||
|
@ -98,7 +98,7 @@ struct imx_imxdi_rtc_data {
|
|||
struct platform_device *__init imx_add_imxdi_rtc(
|
||||
const struct imx_imxdi_rtc_data *data);
|
||||
|
||||
#include <mach/imxfb.h>
|
||||
#include <linux/platform_data/video-imxfb.h>
|
||||
struct imx_imx_fb_data {
|
||||
resource_size_t iobase;
|
||||
resource_size_t iosize;
|
||||
|
@ -108,7 +108,7 @@ struct platform_device *__init imx_add_imx_fb(
|
|||
const struct imx_imx_fb_data *data,
|
||||
const struct imx_fb_platform_data *pdata);
|
||||
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-imx.h>
|
||||
struct imx_imx_i2c_data {
|
||||
int id;
|
||||
resource_size_t iobase;
|
||||
|
@ -129,7 +129,7 @@ struct platform_device *__init imx_add_imx_keypad(
|
|||
const struct imx_imx_keypad_data *data,
|
||||
const struct matrix_keymap_data *pdata);
|
||||
|
||||
#include <mach/ssi.h>
|
||||
#include <linux/platform_data/asoc-imx-ssi.h>
|
||||
struct imx_imx_ssi_data {
|
||||
int id;
|
||||
resource_size_t iobase;
|
||||
|
@ -144,7 +144,7 @@ struct platform_device *__init imx_add_imx_ssi(
|
|||
const struct imx_imx_ssi_data *data,
|
||||
const struct imx_ssi_platform_data *pdata);
|
||||
|
||||
#include <mach/imx-uart.h>
|
||||
#include <linux/platform_data/serial-imx.h>
|
||||
struct imx_imx_uart_3irq_data {
|
||||
int id;
|
||||
resource_size_t iobase;
|
||||
|
@ -167,7 +167,7 @@ struct platform_device *__init imx_add_imx_uart_1irq(
|
|||
const struct imx_imx_uart_1irq_data *data,
|
||||
const struct imxuart_platform_data *pdata);
|
||||
|
||||
#include <mach/usb.h>
|
||||
#include <linux/platform_data/usb-imx_udc.h>
|
||||
struct imx_imx_udc_data {
|
||||
resource_size_t iobase;
|
||||
resource_size_t iosize;
|
||||
|
@ -183,8 +183,8 @@ struct platform_device *__init imx_add_imx_udc(
|
|||
const struct imx_imx_udc_data *data,
|
||||
const struct imxusb_platform_data *pdata);
|
||||
|
||||
#include <mach/mx3fb.h>
|
||||
#include <mach/mx3_camera.h>
|
||||
#include <linux/platform_data/video-mx3fb.h>
|
||||
#include <linux/platform_data/camera-mx3.h>
|
||||
struct imx_ipu_core_data {
|
||||
resource_size_t iobase;
|
||||
resource_size_t synirq;
|
||||
|
@ -199,7 +199,7 @@ struct platform_device *__init imx_add_mx3_sdc_fb(
|
|||
const struct imx_ipu_core_data *data,
|
||||
struct mx3fb_platform_data *pdata);
|
||||
|
||||
#include <mach/mx1_camera.h>
|
||||
#include <linux/platform_data/camera-mx1.h>
|
||||
struct imx_mx1_camera_data {
|
||||
resource_size_t iobase;
|
||||
resource_size_t iosize;
|
||||
|
@ -209,7 +209,7 @@ struct platform_device *__init imx_add_mx1_camera(
|
|||
const struct imx_mx1_camera_data *data,
|
||||
const struct mx1_camera_pdata *pdata);
|
||||
|
||||
#include <mach/mx2_cam.h>
|
||||
#include <linux/platform_data/camera-mx2.h>
|
||||
struct imx_mx2_camera_data {
|
||||
resource_size_t iobasecsi;
|
||||
resource_size_t iosizecsi;
|
||||
|
@ -224,7 +224,7 @@ struct platform_device *__init imx_add_mx2_camera(
|
|||
struct platform_device *__init imx_add_mx2_emmaprp(
|
||||
const struct imx_mx2_camera_data *data);
|
||||
|
||||
#include <mach/mxc_ehci.h>
|
||||
#include <linux/platform_data/usb-ehci-mxc.h>
|
||||
struct imx_mxc_ehci_data {
|
||||
int id;
|
||||
resource_size_t iobase;
|
||||
|
@ -234,7 +234,7 @@ struct platform_device *__init imx_add_mxc_ehci(
|
|||
const struct imx_mxc_ehci_data *data,
|
||||
const struct mxc_usbh_platform_data *pdata);
|
||||
|
||||
#include <mach/mmc.h>
|
||||
#include <linux/platform_data/mmc-mxcmmc.h>
|
||||
struct imx_mxc_mmc_data {
|
||||
int id;
|
||||
resource_size_t iobase;
|
||||
|
@ -246,7 +246,7 @@ struct platform_device *__init imx_add_mxc_mmc(
|
|||
const struct imx_mxc_mmc_data *data,
|
||||
const struct imxmmc_platform_data *pdata);
|
||||
|
||||
#include <mach/mxc_nand.h>
|
||||
#include <linux/platform_data/mtd-mxc_nand.h>
|
||||
struct imx_mxc_nand_data {
|
||||
/*
|
||||
* id is traditionally 0, but -1 is more appropriate. We use -1 for new
|
||||
|
@ -295,7 +295,7 @@ struct imx_mxc_w1_data {
|
|||
struct platform_device *__init imx_add_mxc_w1(
|
||||
const struct imx_mxc_w1_data *data);
|
||||
|
||||
#include <mach/esdhc.h>
|
||||
#include <linux/platform_data/mmc-esdhc-imx.h>
|
||||
struct imx_sdhci_esdhc_imx_data {
|
||||
const char *devid;
|
||||
int id;
|
||||
|
@ -306,7 +306,7 @@ struct platform_device *__init imx_add_sdhci_esdhc_imx(
|
|||
const struct imx_sdhci_esdhc_imx_data *data,
|
||||
const struct esdhc_platform_data *pdata);
|
||||
|
||||
#include <mach/spi.h>
|
||||
#include <linux/platform_data/spi-imx.h>
|
||||
struct imx_spi_imx_data {
|
||||
const char *devid;
|
||||
int id;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <mach/ssi.h>
|
||||
#include <linux/platform_data/asoc-imx-ssi.h>
|
||||
|
||||
EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer);
|
||||
EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer);
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <linux/module.h>
|
||||
|
||||
#include <asm/irq.h>
|
||||
#include <mach/dma.h>
|
||||
#include <linux/platform_data/dma-imx.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include "dmaengine.h"
|
||||
|
|
|
@ -38,8 +38,8 @@
|
|||
#include <linux/of_device.h>
|
||||
|
||||
#include <asm/irq.h>
|
||||
#include <mach/sdma.h>
|
||||
#include <mach/dma.h>
|
||||
#include <linux/platform_data/dma-imx-sdma.h>
|
||||
#include <linux/platform_data/dma-imx.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include "dmaengine.h"
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#include <linux/pinctrl/consumer.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/i2c.h>
|
||||
#include <linux/platform_data/i2c-imx.h>
|
||||
|
||||
/** Defines ********************************************************************
|
||||
*******************************************************************************/
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include <mach/dma-mx1-mx2.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/mx1_camera.h>
|
||||
#include <linux/platform_data/camera-mx1.h>
|
||||
|
||||
/*
|
||||
* CSI registers
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include <linux/videodev2.h>
|
||||
|
||||
#include <mach/mx2_cam.h>
|
||||
#include <linux/platform_data/camera-mx2.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include <asm/dma.h>
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
#include <media/soc_mediabus.h>
|
||||
|
||||
#include <mach/ipu.h>
|
||||
#include <mach/mx3_camera.h>
|
||||
#include <mach/dma.h>
|
||||
#include <linux/platform_data/camera-mx3.h>
|
||||
#include <linux/platform_data/dma-imx.h>
|
||||
|
||||
#define MX3_CAM_DRV_NAME "mx3-camera"
|
||||
|
||||
|
|
|
@ -38,9 +38,9 @@
|
|||
#include <asm/dma.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/sizes.h>
|
||||
#include <mach/mmc.h>
|
||||
#include <linux/platform_data/mmc-mxcmmc.h>
|
||||
|
||||
#include <mach/dma.h>
|
||||
#include <linux/platform_data/dma-imx.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#define DRIVER_NAME "mxc-mmc"
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <linux/of_device.h>
|
||||
#include <linux/of_gpio.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
#include <mach/esdhc.h>
|
||||
#include <linux/platform_data/mmc-esdhc-imx.h>
|
||||
#include "sdhci-pltfm.h"
|
||||
#include "sdhci-esdhc.h"
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include <linux/of_mtd.h>
|
||||
|
||||
#include <asm/mach/flash.h>
|
||||
#include <mach/mxc_nand.h>
|
||||
#include <linux/platform_data/mtd-mxc_nand.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#define DRIVER_NAME "mxc_nand"
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include <linux/of_gpio.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
|
||||
#include <mach/spi.h>
|
||||
#include <linux/platform_data/spi-imx.h>
|
||||
|
||||
#define DRIVER_NAME "spi_imx"
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <mach/imx-uart.h>
|
||||
#include <linux/platform_data/serial-imx.h>
|
||||
|
||||
/* Register definitions */
|
||||
#define URXD0 0x0 /* Receiver Register */
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <linux/usb/ch9.h>
|
||||
#include <linux/usb/gadget.h>
|
||||
|
||||
#include <mach/usb.h>
|
||||
#include <linux/platform_data/usb-imx_udc.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include "imx_udc.h"
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <linux/slab.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mxc_ehci.h>
|
||||
#include <linux/platform_data/usb-ehci-mxc.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef __LINUX_IMX21_HCD_H__
|
||||
#define __LINUX_IMX21_HCD_H__
|
||||
|
||||
#include <mach/mx21-usbhost.h>
|
||||
#include <linux/platform_data/usb-mx2.h>
|
||||
|
||||
#define NUM_ISO_ETDS 2
|
||||
#define USB_NUM_ETD 32
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/math64.h>
|
||||
|
||||
#include <mach/imxfb.h>
|
||||
#include <linux/platform_data/video-imxfb.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -27,10 +27,10 @@
|
|||
#include <linux/clk.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#include <mach/dma.h>
|
||||
#include <linux/platform_data/dma-imx.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/ipu.h>
|
||||
#include <mach/mx3fb.h>
|
||||
#include <linux/platform_data/video-mx3fb.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <sound/soc.h>
|
||||
#include <sound/dmaengine_pcm.h>
|
||||
|
||||
#include <mach/dma.h>
|
||||
#include <linux/platform_data/dma-imx.h>
|
||||
|
||||
#include "imx-pcm.h"
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <asm/fiq.h>
|
||||
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/ssi.h>
|
||||
#include <linux/platform_data/asoc-imx-ssi.h>
|
||||
|
||||
#include "imx-ssi.h"
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include <sound/pcm_params.h>
|
||||
#include <sound/soc.h>
|
||||
|
||||
#include <mach/ssi.h>
|
||||
#include <linux/platform_data/asoc-imx-ssi.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include "imx-ssi.h"
|
||||
|
|
|
@ -186,7 +186,7 @@
|
|||
#define DRV_NAME "imx-ssi"
|
||||
|
||||
#include <linux/dmaengine.h>
|
||||
#include <mach/dma.h>
|
||||
#include <linux/platform_data/dma-imx.h>
|
||||
#include "imx-pcm.h"
|
||||
|
||||
struct imx_ssi {
|
||||
|
|
Loading…
Reference in a new issue