Commit 8485adf1 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: imx: Remove imx device directory 



arch/arm/mach-imx/devices/ contains utilities for registering devices
in board file. Now that board files are gone, get rid of the devices
directory.

Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent e8d992fb

arch/arm/mach-imx/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -270,6 +270,4 @@ endchoice 


endif



source "arch/arm/mach-imx/devices/Kconfig"



endif

arch/arm/mach-imx/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -68,5 +68,3 @@ obj-$(CONFIG_SOC_IMX53) += mach-imx53.o 
obj-$(CONFIG_SOC_VF610) += mach-vf610.o



obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o
 


obj-y += devices/

arch/arm/mach-imx/devices/Kconfig

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config IMX_HAVE_PLATFORM_FEC

	bool

	default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35



config IMX_HAVE_PLATFORM_FLEXCAN

	bool



config IMX_HAVE_PLATFORM_FSL_USB2_UDC

	bool



config IMX_HAVE_PLATFORM_GPIO_KEYS

	bool



config IMX_HAVE_PLATFORM_IMX21_HCD

	bool



config IMX_HAVE_PLATFORM_IMX27_CODA

	bool

	default y if SOC_IMX27



config IMX_HAVE_PLATFORM_IMX2_WDT

	bool



config IMX_HAVE_PLATFORM_IMX_FB

	bool



config IMX_HAVE_PLATFORM_IMX_I2C

	bool



config IMX_HAVE_PLATFORM_IMX_KEYPAD

	bool



config IMX_HAVE_PLATFORM_PATA_IMX

	bool



config IMX_HAVE_PLATFORM_IMX_SSI

	bool



config IMX_HAVE_PLATFORM_IMX_UART

	bool



config IMX_HAVE_PLATFORM_IPU_CORE

	bool



config IMX_HAVE_PLATFORM_MX2_CAMERA

	bool



config IMX_HAVE_PLATFORM_MX2_EMMA

	bool



config IMX_HAVE_PLATFORM_MXC_EHCI

	bool



config IMX_HAVE_PLATFORM_MXC_MMC

	bool



config IMX_HAVE_PLATFORM_MXC_NAND

	bool



config IMX_HAVE_PLATFORM_MXC_RTC

	bool



config IMX_HAVE_PLATFORM_MXC_W1

	bool



config IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	bool



config IMX_HAVE_PLATFORM_SPI_IMX

	bool

arch/arm/mach-imx/devices/Makefile

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y := devices.o



obj-$(CONFIG_IMX_HAVE_PLATFORM_FEC) += platform-fec.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC) += platform-fsl-usb2-udc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS) += platform-gpio_keys.o

obj-y += platform-gpio-mxc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX21_HCD) += platform-imx21-hcd.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX27_CODA) += platform-imx27-coda.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT) += platform-imx2-wdt.o

obj-y += platform-imx-dma.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_FB) += platform-imx-fb.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD) += platform-imx-keypad.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_PATA_IMX) += platform-pata_imx.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_RTC) += platform-mxc_rtc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX) += platform-sdhci-esdhc-imx.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) +=  platform-spi_imx.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_EMMA) += platform-mx2-emma.o

arch/arm/mach-imx/devices/devices-common.h

deleted100644 → 0
+0 −293
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2009-2010 Pengutronix

 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>

 */

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/init.h>

#include <linux/gpio/machine.h>

#include <linux/platform_data/dma-imx-sdma.h>



extern struct device mxc_aips_bus;

extern struct device mxc_ahb_bus;



static inline struct platform_device *imx_add_platform_device_dmamask(

		const char *name, int id,

		const struct resource *res, unsigned int num_resources,

		const void *data, size_t size_data, u64 dmamask)

{

	struct platform_device_info pdevinfo = {

		.name = name,

		.id = id,

		.res = res,

		.num_res = num_resources,

		.data = data,

		.size_data = size_data,

		.dma_mask = dmamask,

	};

	return platform_device_register_full(&pdevinfo);

}



static inline struct platform_device *imx_add_platform_device(

		const char *name, int id,

		const struct resource *res, unsigned int num_resources,

		const void *data, size_t size_data)

{

	return imx_add_platform_device_dmamask(

			name, id, res, num_resources, data, size_data, 0);

}



#include <linux/fec.h>

struct imx_fec_data {

	const char *devid;

	resource_size_t iobase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_fec(

		const struct imx_fec_data *data,

		const struct fec_platform_data *pdata);



struct imx_flexcan_data {

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_flexcan(

		const struct imx_flexcan_data *data);



#include <linux/fsl_devices.h>

struct imx_fsl_usb2_udc_data {

	const char *devid;

	resource_size_t iobase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_fsl_usb2_udc(

		const struct imx_fsl_usb2_udc_data *data,

		const struct fsl_usb2_platform_data *pdata);



#include <linux/gpio_keys.h>

struct platform_device *__init imx_add_gpio_keys(

		const struct gpio_keys_platform_data *pdata);



#include <linux/platform_data/usb-mx2.h>

struct imx_imx21_hcd_data {

	resource_size_t iobase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_imx21_hcd(

		const struct imx_imx21_hcd_data *data,

		const struct mx21_usbh_platform_data *pdata);



struct imx_imx27_coda_data {

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_imx27_coda(

		const struct imx_imx27_coda_data *data);



struct imx_imx2_wdt_data {

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

};

struct platform_device *__init imx_add_imx2_wdt(

		const struct imx_imx2_wdt_data *data);



struct imx_imxdi_rtc_data {

	resource_size_t iobase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_imxdi_rtc(

		const struct imx_imxdi_rtc_data *data);



#include <linux/platform_data/video-imxfb.h>

struct imx_imx_fb_data {

	const char *devid;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_imx_fb(

		const struct imx_imx_fb_data *data,

		const struct imx_fb_platform_data *pdata);



#include <linux/platform_data/i2c-imx.h>

struct imx_imx_i2c_data {

	const char *devid;

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_imx_i2c(

		const struct imx_imx_i2c_data *data,

		const struct imxi2c_platform_data *pdata);



#include <linux/input/matrix_keypad.h>

struct imx_imx_keypad_data {

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_imx_keypad(

		const struct imx_imx_keypad_data *data,

		const struct matrix_keymap_data *pdata);



#include <linux/platform_data/asoc-imx-ssi.h>

struct imx_imx_ssi_data {

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

	resource_size_t dmatx0;

	resource_size_t dmarx0;

	resource_size_t dmatx1;

	resource_size_t dmarx1;

};

struct platform_device *__init imx_add_imx_ssi(

		const struct imx_imx_ssi_data *data,

		const struct imx_ssi_platform_data *pdata);



#include <linux/platform_data/serial-imx.h>

struct imx_imx_uart_1irq_data {

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_imx_uart_1irq(

		const struct imx_imx_uart_1irq_data *data,

		const struct imxuart_platform_data *pdata);



#include <linux/platform_data/video-mx3fb.h>

#include <linux/platform_data/media/camera-mx3.h>

struct imx_ipu_core_data {

	resource_size_t iobase;

	resource_size_t synirq;

	resource_size_t errirq;

};

struct platform_device *__init imx_add_ipu_core(

		const struct imx_ipu_core_data *data);

struct platform_device *__init imx_alloc_mx3_camera(

		const struct imx_ipu_core_data *data,

		const struct mx3_camera_pdata *pdata);

struct platform_device *__init imx_add_mx3_sdc_fb(

		const struct imx_ipu_core_data *data,

		struct mx3fb_platform_data *pdata);



#include <linux/platform_data/media/camera-mx2.h>

struct imx_mx2_camera_data {

	const char *devid;

	resource_size_t iobasecsi;

	resource_size_t iosizecsi;

	resource_size_t irqcsi;

	resource_size_t iobaseemmaprp;

	resource_size_t iosizeemmaprp;

	resource_size_t irqemmaprp;

};

struct platform_device *__init imx_add_mx2_camera(

		const struct imx_mx2_camera_data *data,

		const struct mx2_camera_platform_data *pdata);





struct imx_mx2_emma_data {

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_mx2_emmaprp(

		const struct imx_mx2_emma_data *data);



#include <linux/platform_data/usb-ehci-mxc.h>

struct imx_mxc_ehci_data {

	int id;

	resource_size_t iobase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_mxc_ehci(

		const struct imx_mxc_ehci_data *data,

		const struct mxc_usbh_platform_data *pdata);



#include <linux/platform_data/mmc-mxcmmc.h>

struct imx_mxc_mmc_data {

	const char *devid;

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

	resource_size_t dmareq;

};

struct platform_device *__init imx_add_mxc_mmc(

		const struct imx_mxc_mmc_data *data,

		const struct imxmmc_platform_data *pdata);



#include <linux/platform_data/mtd-mxc_nand.h>

struct imx_mxc_nand_data {

	const char *devid;

	/*

	 * id is traditionally 0, but -1 is more appropriate.  We use -1 for new

	 * machines but don't change existing devices as the nand device usually

	 * appears in the kernel command line to pass its partitioning.

	 */

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t axibase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_mxc_nand(

		const struct imx_mxc_nand_data *data,

		const struct mxc_nand_platform_data *pdata);



struct imx_pata_imx_data {

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_pata_imx(

		const struct imx_pata_imx_data *data);



/* mxc_rtc */

struct imx_mxc_rtc_data {

	const char *devid;

	resource_size_t iobase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_mxc_rtc(

		const struct imx_mxc_rtc_data *data);



/* mxc_w1 */

struct imx_mxc_w1_data {

	resource_size_t iobase;

};

struct platform_device *__init imx_add_mxc_w1(

		const struct imx_mxc_w1_data *data);



#include <linux/platform_data/mmc-esdhc-imx.h>

struct imx_sdhci_esdhc_imx_data {

	const char *devid;

	int id;

	resource_size_t iobase;

	resource_size_t irq;

};

struct platform_device *__init imx_add_sdhci_esdhc_imx(

		const struct imx_sdhci_esdhc_imx_data *data,

		const struct esdhc_platform_data *pdata);



struct imx_spi_imx_data {

	const char *devid;

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	int irq;

};

struct platform_device *__init imx_add_spi_imx(

	const struct imx_spi_imx_data *data, struct gpiod_lookup_table *gtable);



struct platform_device *imx_add_imx_dma(char *name, resource_size_t iobase,

					int irq);

struct platform_device *imx_add_imx_sdma(char *name,

	resource_size_t iobase, int irq, struct sdma_platform_data *pdata);

CRA Git | Maintained and supported by SUSTech CRA and CCSE