ARM: imx: move platform device code into mach-imx

It moves platform device code from plat-mxc into mach-imx. Along with that, header devices-common.h gets moved from plat-mxc/include/mach/ into mach-imx/devices/. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
2012-09-13 15:51:15 +08:00 · 2012-09-13 15:51:15 +08:00 · e0557c0d1a
commit e0557c0d1a
parent c45b1342b1
52 changed files with 51 additions and 49 deletions
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@ -772,3 +772,5 @@ config SOC_IMX6Q
 	  This enables support for Freescale i.MX6 Quad processor.

 endif
+
+source "arch/arm/mach-imx/devices/Kconfig"
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@ -92,3 +92,5 @@ obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o

 obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
 obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
+
+obj-y += devices/
--- a/arch/arm/mach-imx/devices-imx1.h
+++ b/arch/arm/mach-imx/devices-imx1.h
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_imx_fb_data imx1_imx_fb_data;
 #define imx1_add_imx_fb(pdata) \
--- a/arch/arm/mach-imx/devices-imx21.h
+++ b/arch/arm/mach-imx/devices-imx21.h
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data;
 #define imx21_add_imx21_hcd(pdata)	\
--- a/arch/arm/mach-imx/devices-imx25.h
+++ b/arch/arm/mach-imx/devices-imx25.h
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_fec_data imx25_fec_data;
 #define imx25_add_fec(pdata)	\
--- a/arch/arm/mach-imx/devices-imx27.h
+++ b/arch/arm/mach-imx/devices-imx27.h
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_fec_data imx27_fec_data;
 #define imx27_add_fec(pdata)	\
--- a/arch/arm/mach-imx/devices-imx31.h
+++ b/arch/arm/mach-imx/devices-imx31.h
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data;
 #define imx31_add_fsl_usb2_udc(pdata)	\
--- a/arch/arm/mach-imx/devices-imx35.h
+++ b/arch/arm/mach-imx/devices-imx35.h
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_fec_data imx35_fec_data;
 #define imx35_add_fec(pdata)	\
--- a/arch/arm/mach-imx/devices-imx50.h
+++ b/arch/arm/mach-imx/devices-imx50.h
@ -18,7 +18,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[];
 #define imx50_add_imx_uart(id, pdata)	\
--- a/arch/arm/mach-imx/devices-imx51.h
+++ b/arch/arm/mach-imx/devices-imx51.h
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices/devices-common.h"

 extern const struct imx_fec_data imx51_fec_data;
 #define imx51_add_fec(pdata)	\
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
--- a/arch/arm/mach-imx/devices/Makefile
+++ b/arch/arm/mach-imx/devices/Makefile
@ -1,3 +1,5 @@
+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
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
--- a/arch/arm/mach-imx/devices/devices.c
+++ b/arch/arm/mach-imx/devices/devices.c
--- a/arch/arm/mach-imx/devices/platform-ahci-imx.c
+++ b/arch/arm/mach-imx/devices/platform-ahci-imx.c
@ -25,7 +25,7 @@
 #include <linux/dma-mapping.h>
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_ahci_imx_data_entry_single(soc, _devid)		\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-fec.c
+++ b/arch/arm/mach-imx/devices/platform-fec.c
@ -9,7 +9,7 @@
 #include <linux/dma-mapping.h>
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_fec_data_entry_single(soc, _devid)				\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-flexcan.c
+++ b/arch/arm/mach-imx/devices/platform-flexcan.c
@ -6,7 +6,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_flexcan_data_entry_single(soc, _id, _hwid, _size)		\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
+++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
@ -8,7 +8,7 @@
 */
 #include <linux/dma-mapping.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_fsl_usb2_udc_data_entry_single(soc)				\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-gpio-mxc.c
+++ b/arch/arm/mach-imx/devices/platform-gpio-mxc.c
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices-common.h"

 struct platform_device *__init mxc_register_gpio(char *name, int id,
 	resource_size_t iobase, resource_size_t iosize, int irq, int irq_high)
--- a/arch/arm/mach-imx/devices/platform-gpio_keys.c
+++ b/arch/arm/mach-imx/devices/platform-gpio_keys.c
@ -17,7 +17,7 @@
 */
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 struct platform_device *__init imx_add_gpio_keys(
 		const struct gpio_keys_platform_data *pdata)
--- a/arch/arm/mach-imx/devices/platform-imx-dma.c
+++ b/arch/arm/mach-imx/devices/platform-imx-dma.c
@ -6,7 +6,7 @@
 * the terms of the GNU General Public License version 2 as published by the
 * Free Software Foundation.
 */
-#include <mach/devices-common.h>
+#include "devices-common.h"

 struct platform_device __init __maybe_unused *imx_add_imx_dma(void)
 {
--- a/arch/arm/mach-imx/devices/platform-imx-fb.c
+++ b/arch/arm/mach-imx/devices/platform-imx-fb.c
@ -8,7 +8,7 @@
 */
 #include <linux/dma-mapping.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx_fb_data_entry_single(soc, _size)			\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-imx-i2c.c
+++ b/arch/arm/mach-imx/devices/platform-imx-i2c.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx_i2c_data_entry_single(soc, _id, _hwid, _size)		\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-imx-keypad.c
+++ b/arch/arm/mach-imx/devices/platform-imx-keypad.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx_keypad_data_entry_single(soc, _size)			\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-imx-ssi.c
+++ b/arch/arm/mach-imx/devices/platform-imx-ssi.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx_ssi_data_entry(soc, _id, _hwid, _size)			\
 	[_id] = {							\
--- a/arch/arm/mach-imx/devices/platform-imx-uart.c
+++ b/arch/arm/mach-imx/devices/platform-imx-uart.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx_uart_3irq_data_entry(soc, _id, _hwid, _size)		\
 	[_id] = {							\
--- a/arch/arm/mach-imx/devices/platform-imx2-wdt.c
+++ b/arch/arm/mach-imx/devices/platform-imx2-wdt.c
@ -8,7 +8,7 @@
 */
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx2_wdt_data_entry_single(soc, _id, _hwid, _size)		\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-imx21-hcd.c
+++ b/arch/arm/mach-imx/devices/platform-imx21-hcd.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx21_hcd_data_entry_single(soc)				\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-imx27-coda.c
+++ b/arch/arm/mach-imx/devices/platform-imx27-coda.c
@ -8,7 +8,7 @@
 */

 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #ifdef CONFIG_SOC_IMX27
 const struct imx_imx27_coda_data imx27_coda_data __initconst = {
--- a/arch/arm/mach-imx/devices/platform-imx_udc.c
+++ b/arch/arm/mach-imx/devices/platform-imx_udc.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imx_udc_data_entry_single(soc, _size)			\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-imxdi_rtc.c
+++ b/arch/arm/mach-imx/devices/platform-imxdi_rtc.c
@ -8,7 +8,7 @@
 */
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_imxdi_rtc_data_entry_single(soc)				\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-ipu-core.c
+++ b/arch/arm/mach-imx/devices/platform-ipu-core.c
@ -8,7 +8,7 @@
 */
 #include <linux/dma-mapping.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_ipu_core_entry_single(soc)					\
 {									\
--- a/arch/arm/mach-imx/devices/platform-mx1-camera.c
+++ b/arch/arm/mach-imx/devices/platform-mx1-camera.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mx1_camera_data_entry_single(soc, _size)			\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-mx2-camera.c
+++ b/arch/arm/mach-imx/devices/platform-mx2-camera.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mx2_camera_data_entry_single(soc)				\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-mxc-ehci.c
+++ b/arch/arm/mach-imx/devices/platform-mxc-ehci.c
@ -8,7 +8,7 @@
 */
 #include <linux/dma-mapping.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mxc_ehci_data_entry_single(soc, _id, hs)			\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-mxc-mmc.c
+++ b/arch/arm/mach-imx/devices/platform-mxc-mmc.c
@ -8,7 +8,7 @@
 */
 #include <linux/dma-mapping.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mxc_mmc_data_entry_single(soc, _id, _hwid, _size)		\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-mxc_nand.c
+++ b/arch/arm/mach-imx/devices/platform-mxc_nand.c
@ -8,7 +8,7 @@
 */
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mxc_nand_data_entry_single(soc, _size)			\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-mxc_pwm.c
+++ b/arch/arm/mach-imx/devices/platform-mxc_pwm.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size)		\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-mxc_rnga.c
+++ b/arch/arm/mach-imx/devices/platform-mxc_rnga.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 struct imx_mxc_rnga_data {
 	resource_size_t iobase;
--- a/arch/arm/mach-imx/devices/platform-mxc_rtc.c
+++ b/arch/arm/mach-imx/devices/platform-mxc_rtc.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mxc_rtc_data_entry_single(soc)				\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-mxc_w1.c
+++ b/arch/arm/mach-imx/devices/platform-mxc_w1.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_mxc_w1_data_entry_single(soc)				\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-pata_imx.c
+++ b/arch/arm/mach-imx/devices/platform-pata_imx.c
@ -4,7 +4,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_pata_imx_data_entry_single(soc, _size)			\
 	{								\
--- a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
+++ b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
@ -7,8 +7,8 @@
 */

 #include <mach/hardware.h>
-#include <mach/devices-common.h>
 #include <linux/platform_data/mmc-esdhc-imx.h>
+#include "devices-common.h"

 #define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \
 	{								\
--- a/arch/arm/mach-imx/devices/platform-spi_imx.c
+++ b/arch/arm/mach-imx/devices/platform-spi_imx.c
@ -7,7 +7,7 @@
 * Free Software Foundation.
 */
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "devices-common.h"

 #define imx_spi_imx_data_entry_single(soc, type, _devid, _id, hwid, _size) \
 	{								\
--- a/arch/arm/mach-imx/mm-imx21.c
+++ b/arch/arm/mach-imx/mm-imx21.c
@ -23,10 +23,10 @@
 #include <linux/pinctrl/machine.h>
 #include <mach/hardware.h>
 #include <mach/common.h>
-#include <mach/devices-common.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>

+#include "devices/devices-common.h"
 #include "iomux-v1.h"

 /* MX21 memory map definition */
--- a/arch/arm/mach-imx/mm-imx25.c
+++ b/arch/arm/mach-imx/mm-imx25.c
@ -25,10 +25,10 @@
 #include <asm/mach/map.h>

 #include <mach/common.h>
-#include <mach/devices-common.h>
 #include <mach/hardware.h>
 #include <mach/mx25.h>

+#include "devices/devices-common.h"
 #include "iomux-v3.h"

 /*
--- a/arch/arm/mach-imx/mm-imx27.c
+++ b/arch/arm/mach-imx/mm-imx27.c
@ -23,10 +23,10 @@
 #include <linux/pinctrl/machine.h>
 #include <mach/hardware.h>
 #include <mach/common.h>
-#include <mach/devices-common.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>

+#include "devices/devices-common.h"
 #include "iomux-v1.h"

 /* MX27 memory map definition */
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@ -27,10 +27,10 @@
 #include <asm/mach/map.h>

 #include <mach/common.h>
-#include <mach/devices-common.h>
 #include <mach/hardware.h>

 #include "crmregs-imx3.h"
+#include "devices/devices-common.h"
 #include "iomux-v3.h"

 void __iomem *mx3_ccm_base;
--- a/arch/arm/mach-imx/mm-imx5.c
+++ b/arch/arm/mach-imx/mm-imx5.c
@ -20,8 +20,8 @@

 #include <mach/hardware.h>
 #include <mach/common.h>
-#include <mach/devices-common.h>

+#include "devices/devices-common.h"
 #include "iomux-v3.h"

 /*
--- a/arch/arm/mach-imx/pm-imx3.c
+++ b/arch/arm/mach-imx/pm-imx3.c
@ -11,8 +11,8 @@
 #include <linux/io.h>
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/devices-common.h>
 #include "crmregs-imx3.h"
+#include "devices/devices-common.h"

 /*
 * Set cpu low power mode before WFI instruction. This function is called
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@ -1,7 +1,5 @@
 if ARCH_MXC

-source "arch/arm/plat-mxc/devices/Kconfig"
-
 menu "Freescale MXC Implementations"

 choice
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@ -3,7 +3,7 @@
 #

 # Common support
-obj-y := time.o devices.o cpu.o system.o irq-common.o
+obj-y := time.o cpu.o system.o irq-common.o

 obj-$(CONFIG_MXC_TZIC) += tzic.o
 obj-$(CONFIG_MXC_AVIC) += avic.o
@ -18,5 +18,3 @@ ifdef CONFIG_SND_IMX_SOC
 obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
 endif
-
-obj-y += devices/