Procházet zdrojové kódy

imx: reorganize IMX code as other SOCs

Change is consistent with other SOCs and it is in preparation
for adding SOMs. SOC's related files are moved from cpu/ to
mach-imx/<SOC>.

This change is also coherent with the structure in kernel.

Signed-off-by: Stefano Babic <sbabic@denx.de>

CC: Fabio Estevam <fabio.estevam@nxp.com>
CC: Akshay Bhat <akshaybhat@timesys.com>
CC: Ken Lin <Ken.Lin@advantech.com.tw>
CC: Marek Vasut <marek.vasut@gmail.com>
CC: Heiko Schocher <hs@denx.de>
CC: "Sébastien Szymanski" <sebastien.szymanski@armadeus.com>
CC: Christian Gmeiner <christian.gmeiner@gmail.com>
CC: Stefan Roese <sr@denx.de>
CC: Patrick Bruenn <p.bruenn@beckhoff.com>
CC: Troy Kisky <troy.kisky@boundarydevices.com>
CC: Nikita Kiryanov <nikita@compulab.co.il>
CC: Otavio Salvador <otavio@ossystems.com.br>
CC: "Eric Bénard" <eric@eukrea.com>
CC: Jagan Teki <jagan@amarulasolutions.com>
CC: Ye Li <ye.li@nxp.com>
CC: Peng Fan <peng.fan@nxp.com>
CC: Adrian Alonso <adrian.alonso@nxp.com>
CC: Alison Wang <b18965@freescale.com>
CC: Tim Harvey <tharvey@gateworks.com>
CC: Martin Donnelly <martin.donnelly@ge.com>
CC: Marcin Niestroj <m.niestroj@grinn-global.com>
CC: Lukasz Majewski <lukma@denx.de>
CC: Adam Ford <aford173@gmail.com>
CC: "Albert ARIBAUD (3ADEV)" <albert.aribaud@3adev.fr>
CC: Boris Brezillon <boris.brezillon@free-electrons.com>
CC: Soeren Moch <smoch@web.de>
CC: Richard Hu <richard.hu@technexion.com>
CC: Wig Cheng <wig.cheng@technexion.com>
CC: Vanessa Maegima <vanessa.maegima@nxp.com>
CC: Max Krummenacher <max.krummenacher@toradex.com>
CC: Stefan Agner <stefan.agner@toradex.com>
CC: Markus Niebel <Markus.Niebel@tq-group.com>
CC: Breno Lima <breno.lima@nxp.com>
CC: Francesco Montefoschi <francesco.montefoschi@udoo.org>
CC: Jaehoon Chung <jh80.chung@samsung.com>
CC: Scott Wood <oss@buserror.net>
CC: Joe Hershberger <joe.hershberger@ni.com>
CC: Anatolij Gustschin <agust@denx.de>
CC: Simon Glass <sjg@chromium.org>
CC: "Andrew F. Davis" <afd@ti.com>
CC: "Łukasz Majewski" <l.majewski@samsung.com>
CC: Patrice Chotard <patrice.chotard@st.com>
CC: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Hans de Goede <hdegoede@redhat.com>
CC: Masahiro Yamada <yamada.masahiro@socionext.com>
CC: Stephen Warren <swarren@nvidia.com>
CC: Andre Przywara <andre.przywara@arm.com>
CC: "Álvaro Fernández Rojas" <noltari@gmail.com>
CC: York Sun <york.sun@nxp.com>
CC: Xiaoliang Yang <xiaoliang.yang@nxp.com>
CC: Chen-Yu Tsai <wens@csie.org>
CC: George McCollister <george.mccollister@gmail.com>
CC: Sven Ebenfeld <sven.ebenfeld@gmail.com>
CC: Filip Brozovic <fbrozovic@gmail.com>
CC: Petr Kulhavy <brain@jikos.cz>
CC: Eric Nelson <eric@nelint.com>
CC: Bai Ping <ping.bai@nxp.com>
CC: Anson Huang <Anson.Huang@nxp.com>
CC: Sanchayan Maity <maitysanchayan@gmail.com>
CC: Lokesh Vutla <lokeshvutla@ti.com>
CC: Patrick Delaunay <patrick.delaunay@st.com>
CC: Gary Bisson <gary.bisson@boundarydevices.com>
CC: Alexander Graf <agraf@suse.de>
CC: u-boot@lists.denx.de
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Stefano Babic před 7 roky
rodič
revize
552a848e4f
100 změnil soubory, kde provedl 87 přidání a 85 odebrání
  1. 2 2
      MAINTAINERS
  2. 3 3
      Makefile
  3. 5 5
      arch/arm/Kconfig
  4. 2 2
      arch/arm/Makefile
  5. 1 1
      arch/arm/cpu/arm926ejs/mx27/generic.c
  6. 1 1
      arch/arm/cpu/arm926ejs/mxs/mxs.c
  7. 0 4
      arch/arm/cpu/armv7/Makefile
  8. 1 1
      arch/arm/cpu/armv7/vf610/generic.c
  9. 1 1
      arch/arm/include/asm/arch-mx25/gpio.h
  10. 1 1
      arch/arm/include/asm/arch-mx25/iomux-mx25.h
  11. 1 1
      arch/arm/include/asm/arch-mx31/gpio.h
  12. 1 1
      arch/arm/include/asm/arch-mx31/sys_proto.h
  13. 1 1
      arch/arm/include/asm/arch-mx35/gpio.h
  14. 1 1
      arch/arm/include/asm/arch-mx35/iomux-mx35.h
  15. 1 1
      arch/arm/include/asm/arch-mx35/sys_proto.h
  16. 1 1
      arch/arm/include/asm/arch-mx5/gpio.h
  17. 1 1
      arch/arm/include/asm/arch-mx5/iomux-mx51.h
  18. 1 1
      arch/arm/include/asm/arch-mx5/iomux-mx53.h
  19. 1 1
      arch/arm/include/asm/arch-mx5/sys_proto.h
  20. 1 1
      arch/arm/include/asm/arch-mx6/gpio.h
  21. 1 1
      arch/arm/include/asm/arch-mx6/imx-regs.h
  22. 1 1
      arch/arm/include/asm/arch-mx6/mx6-pins.h
  23. 1 1
      arch/arm/include/asm/arch-mx6/mx6sl_pins.h
  24. 1 1
      arch/arm/include/asm/arch-mx6/mx6sll_pins.h
  25. 1 1
      arch/arm/include/asm/arch-mx6/mx6sx_pins.h
  26. 1 1
      arch/arm/include/asm/arch-mx6/mx6ul_pins.h
  27. 1 1
      arch/arm/include/asm/arch-mx6/mx6ull_pins.h
  28. 1 1
      arch/arm/include/asm/arch-mx6/sys_proto.h
  29. 1 1
      arch/arm/include/asm/arch-mx7/gpio.h
  30. 1 1
      arch/arm/include/asm/arch-mx7/imx-regs.h
  31. 1 1
      arch/arm/include/asm/arch-mx7/mx7-pins.h
  32. 1 1
      arch/arm/include/asm/arch-mx7/mx7d_pins.h
  33. 1 1
      arch/arm/include/asm/arch-mx7/sys_proto.h
  34. 1 1
      arch/arm/include/asm/arch-mx7ulp/sys_proto.h
  35. 4 4
      arch/arm/include/asm/arch-mxs/imx-regs.h
  36. 1 1
      arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
  37. 1 1
      arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
  38. 1 1
      arch/arm/include/asm/arch-mxs/regs-digctl.h
  39. 1 1
      arch/arm/include/asm/arch-mxs/regs-i2c.h
  40. 1 1
      arch/arm/include/asm/arch-mxs/regs-lradc.h
  41. 1 1
      arch/arm/include/asm/arch-mxs/regs-ocotp.h
  42. 1 1
      arch/arm/include/asm/arch-mxs/regs-pinctrl.h
  43. 1 1
      arch/arm/include/asm/arch-mxs/regs-power-mx23.h
  44. 1 1
      arch/arm/include/asm/arch-mxs/regs-power-mx28.h
  45. 1 1
      arch/arm/include/asm/arch-mxs/regs-rtc.h
  46. 1 1
      arch/arm/include/asm/arch-mxs/regs-ssp.h
  47. 1 1
      arch/arm/include/asm/arch-mxs/regs-timrot.h
  48. 1 1
      arch/arm/include/asm/arch-mxs/regs-uartapp.h
  49. 1 1
      arch/arm/include/asm/arch-mxs/sys_proto.h
  50. 1 1
      arch/arm/include/asm/arch-vf610/iomux-vf610.h
  51. 0 0
      arch/arm/include/asm/mach-imx/boot_mode.h
  52. 0 0
      arch/arm/include/asm/mach-imx/dma.h
  53. 0 0
      arch/arm/include/asm/mach-imx/gpio.h
  54. 0 0
      arch/arm/include/asm/mach-imx/hab.h
  55. 0 0
      arch/arm/include/asm/mach-imx/imximage.cfg
  56. 0 0
      arch/arm/include/asm/mach-imx/iomux-v3.h
  57. 0 0
      arch/arm/include/asm/mach-imx/mx5_video.h
  58. 1 1
      arch/arm/include/asm/mach-imx/mxc_i2c.h
  59. 0 0
      arch/arm/include/asm/mach-imx/rdc-sema.h
  60. 1 1
      arch/arm/include/asm/mach-imx/regs-apbh.h
  61. 1 1
      arch/arm/include/asm/mach-imx/regs-bch.h
  62. 0 0
      arch/arm/include/asm/mach-imx/regs-common.h
  63. 1 1
      arch/arm/include/asm/mach-imx/regs-gpmi.h
  64. 1 1
      arch/arm/include/asm/mach-imx/regs-lcdif.h
  65. 0 0
      arch/arm/include/asm/mach-imx/regs-usbphy.h
  66. 0 0
      arch/arm/include/asm/mach-imx/sata.h
  67. 0 0
      arch/arm/include/asm/mach-imx/spi.h
  68. 1 1
      arch/arm/include/asm/mach-imx/sys_proto.h
  69. 0 0
      arch/arm/include/asm/mach-imx/syscounter.h
  70. 0 0
      arch/arm/include/asm/mach-imx/video.h
  71. 0 0
      arch/arm/mach-imx/Kconfig
  72. 6 0
      arch/arm/mach-imx/Makefile
  73. 1 1
      arch/arm/mach-imx/cache.c
  74. 1 1
      arch/arm/mach-imx/cmd_bmode.c
  75. 0 0
      arch/arm/mach-imx/cmd_dek.c
  76. 0 0
      arch/arm/mach-imx/cmd_hdmidet.c
  77. 0 0
      arch/arm/mach-imx/cpu.c
  78. 0 0
      arch/arm/mach-imx/ddrmc-vf610.c
  79. 1 1
      arch/arm/mach-imx/hab.c
  80. 1 1
      arch/arm/mach-imx/i2c-mxv7.c
  81. 0 0
      arch/arm/mach-imx/imx_bootaux.c
  82. 1 1
      arch/arm/mach-imx/init.c
  83. 2 2
      arch/arm/mach-imx/iomux-v3.c
  84. 1 1
      arch/arm/mach-imx/misc.c
  85. 0 0
      arch/arm/mach-imx/mx5/Kconfig
  86. 0 0
      arch/arm/mach-imx/mx5/Makefile
  87. 0 0
      arch/arm/mach-imx/mx5/clock.c
  88. 0 0
      arch/arm/mach-imx/mx5/lowlevel_init.S
  89. 1 1
      arch/arm/mach-imx/mx5/soc.c
  90. 0 0
      arch/arm/mach-imx/mx6/Kconfig
  91. 0 0
      arch/arm/mach-imx/mx6/Makefile
  92. 0 0
      arch/arm/mach-imx/mx6/clock.c
  93. 0 0
      arch/arm/mach-imx/mx6/ddr.c
  94. 2 2
      arch/arm/mach-imx/mx6/litesom.c
  95. 0 0
      arch/arm/mach-imx/mx6/mp.c
  96. 1 1
      arch/arm/mach-imx/mx6/opos6ul.c
  97. 3 3
      arch/arm/mach-imx/mx6/soc.c
  98. 0 0
      arch/arm/mach-imx/mx7/Kconfig
  99. 0 0
      arch/arm/mach-imx/mx7/Makefile
  100. 0 0
      arch/arm/mach-imx/mx7/clock.c

+ 2 - 2
MAINTAINERS

@@ -96,11 +96,11 @@ F:	arch/arm/cpu/arm1136/mx*/
 F:	arch/arm/cpu/arm926ejs/mx*/
 F:	arch/arm/cpu/armv7/mx*/
 F:	arch/arm/cpu/armv7/vf610/
-F:	arch/arm/imx-common/
+F:	arch/arm/mach-imx/
 F:	arch/arm/include/asm/arch-imx/
 F:	arch/arm/include/asm/arch-mx*/
 F:	arch/arm/include/asm/arch-vf610/
-F:	arch/arm/include/asm/imx-common/
+F:	arch/arm/include/asm/mach-imx/
 F:	board/freescale/*mx*/
 
 ARM HISILICON

+ 3 - 3
Makefile

@@ -899,7 +899,7 @@ u-boot.bin: u-boot-nodtb.bin FORCE
 endif
 
 %.imx: %.bin
-	$(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+	$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
 
 %.vyb: %.imx
 	$(Q)$(MAKE) $(build)=arch/arm/cpu/armv7/vf610 $@
@@ -1064,10 +1064,10 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE
 	$(call if_changed,pad_cat)
 
 SPL: spl/u-boot-spl.bin FORCE
-	$(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+	$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
 
 u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL u-boot.bin FORCE
-	$(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+	$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
 
 MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE)
 

+ 5 - 5
arch/arm/Kconfig

@@ -1098,13 +1098,13 @@ source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/cpu/armv7/ls102xa/Kconfig"
 
-source "arch/arm/cpu/armv7/mx7ulp/Kconfig"
+source "arch/arm/mach-imx/mx7ulp/Kconfig"
 
-source "arch/arm/cpu/armv7/mx7/Kconfig"
+source "arch/arm/mach-imx/mx7/Kconfig"
 
-source "arch/arm/cpu/armv7/mx6/Kconfig"
+source "arch/arm/mach-imx/mx6/Kconfig"
 
-source "arch/arm/cpu/armv7/mx5/Kconfig"
+source "arch/arm/mach-imx/mx5/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"
 
@@ -1144,7 +1144,7 @@ source "arch/arm/cpu/armv8/zynqmp/Kconfig"
 
 source "arch/arm/cpu/armv8/Kconfig"
 
-source "arch/arm/imx-common/Kconfig"
+source "arch/arm/mach-imx/Kconfig"
 
 source "board/aries/m28evk/Kconfig"
 source "board/bosch/shc/Kconfig"

+ 2 - 2
arch/arm/Makefile

@@ -96,11 +96,11 @@ libs-y += arch/arm/lib/
 
 ifeq ($(CONFIG_SPL_BUILD),y)
 ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35))
-libs-y += arch/arm/imx-common/
+libs-y += arch/arm/mach-imx/
 endif
 else
 ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs vf610))
-libs-y += arch/arm/imx-common/
+libs-y += arch/arm/mach-imx/
 endif
 endif
 

+ 1 - 1
arch/arm/cpu/arm926ejs/mx27/generic.c

@@ -12,7 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 #ifdef CONFIG_MMC_MXC
 #include <asm/arch/mxcmmc.h>
 #endif

+ 1 - 1
arch/arm/cpu/arm926ejs/mxs/mxs.c

@@ -14,7 +14,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>

+ 0 - 4
arch/arm/cpu/armv7/Makefile

@@ -33,10 +33,6 @@ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
 obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
 obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
 obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/
-obj-$(if $(filter mx5,$(SOC)),y) += mx5/
-obj-$(CONFIG_MX6) += mx6/
-obj-$(CONFIG_MX7) += mx7/
-obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/
 obj-$(CONFIG_RMOBILE) += rmobile/
 obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
 obj-$(CONFIG_ARCH_SUNXI) += sunxi/

+ 1 - 1
arch/arm/cpu/armv7/vf610/generic.c

@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 #include <netdev.h>
 #ifdef CONFIG_FSL_ESDHC
 #include <fsl_esdhc.h>

+ 1 - 1
arch/arm/include/asm/arch-mx25/gpio.h

@@ -9,6 +9,6 @@
 #ifndef __ASM_ARCH_MX25_GPIO_H
 #define __ASM_ARCH_MX25_GPIO_H
 
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #endif

+ 1 - 1
arch/arm/include/asm/arch-mx25/iomux-mx25.h

@@ -16,7 +16,7 @@
 #ifndef __IOMUX_MX25_H__
 #define __IOMUX_MX25_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 /* Pad control groupings */
 #define MX25_KPP_ROW_PAD_CTRL	PAD_CTL_PUS_100K_UP

+ 1 - 1
arch/arm/include/asm/arch-mx31/gpio.h

@@ -9,6 +9,6 @@
 #ifndef __ASM_ARCH_MX31_GPIO_H
 #define __ASM_ARCH_MX31_GPIO_H
 
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #endif

+ 1 - 1
arch/arm/include/asm/arch-mx31/sys_proto.h

@@ -8,7 +8,7 @@
 #ifndef _MX31_SYS_PROTO_H_
 #define _MX31_SYS_PROTO_H_
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 struct mxc_weimcs {
 	u32 upper;

+ 1 - 1
arch/arm/include/asm/arch-mx35/gpio.h

@@ -9,6 +9,6 @@
 #ifndef __ASM_ARCH_MX35_GPIO_H
 #define __ASM_ARCH_MX35_GPIO_H
 
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #endif

+ 1 - 1
arch/arm/include/asm/arch-mx35/iomux-mx35.h

@@ -11,7 +11,7 @@
 #ifndef __IOMUX_MX35_H__
 #define __IOMUX_MX35_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 /*
  * The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>

+ 1 - 1
arch/arm/include/asm/arch-mx35/sys_proto.h

@@ -8,7 +8,7 @@
 #ifndef _MX35_SYS_PROTO_H_
 #define _MX35_SYS_PROTO_H_
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 void mx3_setup_sdram_bank(u32 start_address, u32 ddr2_config, u32 row,
 			  u32 col, u32 dsize, u32 refresh);

+ 1 - 1
arch/arm/include/asm/arch-mx5/gpio.h

@@ -9,6 +9,6 @@
 #ifndef __ASM_ARCH_MX5_GPIO_H
 #define __ASM_ARCH_MX5_GPIO_H
 
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #endif

+ 1 - 1
arch/arm/include/asm/arch-mx5/iomux-mx51.h

@@ -19,7 +19,7 @@
 #ifndef __IOMUX_MX51_H__
 #define __IOMUX_MX51_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 /* Pad control groupings */
 #define MX51_UART_PAD_CTRL	(PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH | \

+ 1 - 1
arch/arm/include/asm/arch-mx5/iomux-mx53.h

@@ -11,7 +11,7 @@
 #ifndef __IOMUX_MX53_H__
 #define __IOMUX_MX53_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 /* Pad control groupings */
 #define MX53_UART_PAD_CTRL	(PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH | \

+ 1 - 1
arch/arm/include/asm/arch-mx5/sys_proto.h

@@ -5,4 +5,4 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>

+ 1 - 1
arch/arm/include/asm/arch-mx6/gpio.h

@@ -9,6 +9,6 @@
 #ifndef __ASM_ARCH_MX6_GPIO_H
 #define __ASM_ARCH_MX6_GPIO_H
 
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #endif	/* __ASM_ARCH_MX6_GPIO_H */

+ 1 - 1
arch/arm/include/asm/arch-mx6/imx-regs.h

@@ -359,7 +359,7 @@
 #endif
 #define FEC_QUIRK_ENET_MAC
 
-#include <asm/imx-common/regs-lcdif.h>
+#include <asm/mach-imx/regs-lcdif.h>
 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
 #include <asm/types.h>
 

+ 1 - 1
arch/arm/include/asm/arch-mx6/mx6-pins.h

@@ -6,7 +6,7 @@
 #ifndef __ASM_ARCH_MX6_PINS_H__
 #define __ASM_ARCH_MX6_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 #define MX6_PAD_DECLARE(prefix, name, pco, mc, mm, sio, si, pc) \
 	prefix##name = IOMUX_PAD(pco, mc, mm, sio, si, pc)

+ 1 - 1
arch/arm/include/asm/arch-mx6/mx6sl_pins.h

@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_MX6_MX6SL_PINS_H__
 #define __ASM_ARCH_MX6_MX6SL_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 enum {
 	MX6_PAD_ECSPI1_MISO__ECSPI_MISO				= IOMUX_PAD(0x0358, 0x0068, 0, 0x0684, 0, 0),

+ 1 - 1
arch/arm/include/asm/arch-mx6/mx6sll_pins.h

@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_IMX6SLL_PINS_H__
 #define __ASM_ARCH_IMX6SLL_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 enum {
 	MX6_PAD_WDOG_B__WDOG1_B                               = IOMUX_PAD(0x02DC, 0x0014, 0, 0x0000, 0, 0),

+ 1 - 1
arch/arm/include/asm/arch-mx6/mx6sx_pins.h

@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_MX6_MX6_PINS_H__
 #define __ASM_ARCH_MX6_MX6_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 enum {
 	 MX6_PAD_GPIO1_IO00__I2C1_SCL                           = IOMUX_PAD(0x035C, 0x0014, IOMUX_CONFIG_SION | 0, 0x07A8, 1, 0),

+ 1 - 1
arch/arm/include/asm/arch-mx6/mx6ul_pins.h

@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_IMX6UL_PINS_H__
 #define __ASM_ARCH_IMX6UL_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 enum {
 

+ 1 - 1
arch/arm/include/asm/arch-mx6/mx6ull_pins.h

@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_IMX6ULL_PINS_H__
 #define __ASM_ARCH_IMX6ULL_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 enum {
 	MX6_PAD_BOOT_MODE0__GPIO5_IO10	                       = IOMUX_PAD(0x0044, 0x0000, IOMUX_CONFIG_LPSR | 5, 0x0000, 0, 0),

+ 1 - 1
arch/arm/include/asm/arch-mx6/sys_proto.h

@@ -5,4 +5,4 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>

+ 1 - 1
arch/arm/include/asm/arch-mx7/gpio.h

@@ -7,6 +7,6 @@
 #ifndef __ASM_ARCH_MX7_GPIO_H
 #define __ASM_ARCH_MX7_GPIO_H
 
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #endif /* __ASM_ARCH_MX7_GPIO_H */

+ 1 - 1
arch/arm/include/asm/arch-mx7/imx-regs.h

@@ -224,7 +224,7 @@
 					 CONFIG_SYS_FSL_JR0_OFFSET)
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC   1
 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
-#include <asm/imx-common/regs-lcdif.h>
+#include <asm/mach-imx/regs-lcdif.h>
 #include <asm/types.h>
 
 extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac);

+ 1 - 1
arch/arm/include/asm/arch-mx7/mx7-pins.h

@@ -6,7 +6,7 @@
 #ifndef __ASM_ARCH_MX7_PINS_H__
 #define __ASM_ARCH_MX7_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 #if defined(CONFIG_MX7D)
 #include "mx7d_pins.h"

+ 1 - 1
arch/arm/include/asm/arch-mx7/mx7d_pins.h

@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_IMX7D_PINS_H__
 #define __ASM_ARCH_IMX7D_PINS_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 enum {
 	MX7D_PAD_GPIO1_IO00__GPIO1_IO0                           = IOMUX_PAD(0x0030, 0x0000, IOMUX_CONFIG_LPSR | 0, 0x0000, 0, 0),

+ 1 - 1
arch/arm/include/asm/arch-mx7/sys_proto.h

@@ -4,6 +4,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 void set_wdog_reset(struct wdog_regs *wdog);

+ 1 - 1
arch/arm/include/asm/arch-mx7ulp/sys_proto.h

@@ -7,7 +7,7 @@
 #ifndef _SYS_PROTO_MX7ULP_H_
 #define _SYS_PROTO_MX7ULP_H_
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 #define BT0CFG_LPBOOT_MASK 0x1
 #define BT0CFG_DUALBOOT_MASK 0x2

+ 4 - 4
arch/arm/include/asm/arch-mxs/imx-regs.h

@@ -10,12 +10,12 @@
 #ifndef __IMX_REGS_H__
 #define __IMX_REGS_H__
 
-#include <asm/imx-common/regs-apbh.h>
+#include <asm/mach-imx/regs-apbh.h>
 #include <asm/arch/regs-base.h>
-#include <asm/imx-common/regs-bch.h>
+#include <asm/mach-imx/regs-bch.h>
 #include <asm/arch/regs-digctl.h>
-#include <asm/imx-common/regs-gpmi.h>
-#include <asm/imx-common/regs-lcdif.h>
+#include <asm/mach-imx/regs-gpmi.h>
+#include <asm/mach-imx/regs-lcdif.h>
 #include <asm/arch/regs-i2c.h>
 #include <asm/arch/regs-lradc.h>
 #include <asm/arch/regs-ocotp.h>

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h

@@ -13,7 +13,7 @@
 #ifndef __MX23_REGS_CLKCTRL_H__
 #define __MX23_REGS_CLKCTRL_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_clkctrl_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h

@@ -13,7 +13,7 @@
 #ifndef __MX28_REGS_CLKCTRL_H__
 #define __MX28_REGS_CLKCTRL_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_clkctrl_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-digctl.h

@@ -9,7 +9,7 @@
 #ifndef __MX28_REGS_DIGCTL_H__
 #define __MX28_REGS_DIGCTL_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_digctl_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-i2c.h

@@ -10,7 +10,7 @@
 #ifndef __MX28_REGS_I2C_H__
 #define __MX28_REGS_I2C_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_i2c_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-lradc.h

@@ -13,7 +13,7 @@
 #ifndef __MX28_REGS_LRADC_H__
 #define __MX28_REGS_LRADC_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_lradc_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-ocotp.h

@@ -13,7 +13,7 @@
 #ifndef __MX28_REGS_OCOTP_H__
 #define __MX28_REGS_OCOTP_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_ocotp_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-pinctrl.h

@@ -13,7 +13,7 @@
 #ifndef __MX28_REGS_PINCTRL_H__
 #define __MX28_REGS_PINCTRL_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_pinctrl_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-power-mx23.h

@@ -9,7 +9,7 @@
 #ifndef __MX23_REGS_POWER_H__
 #define __MX23_REGS_POWER_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_power_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-power-mx28.h

@@ -9,7 +9,7 @@
 #ifndef __MX28_REGS_POWER_H__
 #define __MX28_REGS_POWER_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_power_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-rtc.h

@@ -10,7 +10,7 @@
 #ifndef __MX28_REGS_RTC_H__
 #define __MX28_REGS_RTC_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_rtc_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-ssp.h

@@ -12,7 +12,7 @@
 #ifndef __MX28_REGS_SSP_H__
 #define __MX28_REGS_SSP_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 #if defined(CONFIG_MX23)

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-timrot.h

@@ -12,7 +12,7 @@
 #ifndef __MX28_REGS_TIMROT_H__
 #define __MX28_REGS_TIMROT_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_timrot_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/regs-uartapp.h

@@ -12,7 +12,7 @@
 #ifndef __ARCH_ARM___MXS_UARTAPP_H
 #define __ARCH_ARM___MXS_UARTAPP_H
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef __ASSEMBLY__
 struct mxs_uartapp_regs {

+ 1 - 1
arch/arm/include/asm/arch-mxs/sys_proto.h

@@ -10,7 +10,7 @@
 #ifndef __MXS_SYS_PROTO_H__
 #define __MXS_SYS_PROTO_H__
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int));
 

+ 1 - 1
arch/arm/include/asm/arch-vf610/iomux-vf610.h

@@ -7,7 +7,7 @@
 #ifndef __IOMUX_VF610_H__
 #define __IOMUX_VF610_H__
 
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 /* Pad control groupings */
 #define VF610_UART_PAD_CTRL	(PAD_CTL_PUS_100K_UP | PAD_CTL_DSE_25ohm | \

+ 0 - 0
arch/arm/include/asm/imx-common/boot_mode.h → arch/arm/include/asm/mach-imx/boot_mode.h


+ 0 - 0
arch/arm/include/asm/imx-common/dma.h → arch/arm/include/asm/mach-imx/dma.h


+ 0 - 0
arch/arm/include/asm/imx-common/gpio.h → arch/arm/include/asm/mach-imx/gpio.h


+ 0 - 0
arch/arm/include/asm/imx-common/hab.h → arch/arm/include/asm/mach-imx/hab.h


+ 0 - 0
arch/arm/include/asm/imx-common/imximage.cfg → arch/arm/include/asm/mach-imx/imximage.cfg


+ 0 - 0
arch/arm/include/asm/imx-common/iomux-v3.h → arch/arm/include/asm/mach-imx/iomux-v3.h


+ 0 - 0
arch/arm/include/asm/imx-common/mx5_video.h → arch/arm/include/asm/mach-imx/mx5_video.h


+ 1 - 1
arch/arm/include/asm/imx-common/mxc_i2c.h → arch/arm/include/asm/mach-imx/mxc_i2c.h

@@ -6,7 +6,7 @@
 #ifndef __ASM_ARCH_MXC_MXC_I2C_H__
 #define __ASM_ARCH_MXC_MXC_I2C_H__
 #include <asm-generic/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 struct i2c_pin_ctrl {
 	iomux_v3_cfg_t i2c_mode;

+ 0 - 0
arch/arm/include/asm/imx-common/rdc-sema.h → arch/arm/include/asm/mach-imx/rdc-sema.h


+ 1 - 1
arch/arm/include/asm/imx-common/regs-apbh.h → arch/arm/include/asm/mach-imx/regs-apbh.h

@@ -13,7 +13,7 @@
 #ifndef __REGS_APBH_H__
 #define __REGS_APBH_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 

+ 1 - 1
arch/arm/include/asm/imx-common/regs-bch.h → arch/arm/include/asm/mach-imx/regs-bch.h

@@ -13,7 +13,7 @@
 #ifndef __MX28_REGS_BCH_H__
 #define __MX28_REGS_BCH_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_bch_regs {

+ 0 - 0
arch/arm/include/asm/imx-common/regs-common.h → arch/arm/include/asm/mach-imx/regs-common.h


+ 1 - 1
arch/arm/include/asm/imx-common/regs-gpmi.h → arch/arm/include/asm/mach-imx/regs-gpmi.h

@@ -13,7 +13,7 @@
 #ifndef __MX28_REGS_GPMI_H__
 #define __MX28_REGS_GPMI_H__
 
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 #ifndef	__ASSEMBLY__
 struct mxs_gpmi_regs {

+ 1 - 1
arch/arm/include/asm/imx-common/regs-lcdif.h → arch/arm/include/asm/mach-imx/regs-lcdif.h

@@ -14,7 +14,7 @@
 #define __IMX_REGS_LCDIF_H__
 
 #ifndef	__ASSEMBLY__
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 struct mxs_lcdif_regs {
 	mxs_reg_32(hw_lcdif_ctrl)		/* 0x00 */

+ 0 - 0
arch/arm/include/asm/imx-common/regs-usbphy.h → arch/arm/include/asm/mach-imx/regs-usbphy.h


+ 0 - 0
arch/arm/include/asm/imx-common/sata.h → arch/arm/include/asm/mach-imx/sata.h


+ 0 - 0
arch/arm/include/asm/imx-common/spi.h → arch/arm/include/asm/mach-imx/spi.h


+ 1 - 1
arch/arm/include/asm/imx-common/sys_proto.h → arch/arm/include/asm/mach-imx/sys_proto.h

@@ -9,7 +9,7 @@
 #define _SYS_PROTO_H_
 
 #include <asm/io.h>
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 #include <common.h>
 #include "../arch-imx/cpu.h"
 

+ 0 - 0
arch/arm/include/asm/imx-common/syscounter.h → arch/arm/include/asm/mach-imx/syscounter.h


+ 0 - 0
arch/arm/include/asm/imx-common/video.h → arch/arm/include/asm/mach-imx/video.h


+ 0 - 0
arch/arm/imx-common/Kconfig → arch/arm/mach-imx/Kconfig


+ 6 - 0
arch/arm/imx-common/Makefile → arch/arm/mach-imx/Makefile

@@ -120,3 +120,9 @@ spl/u-boot-nand-spl.imx: SPL FORCE
 	$(call if_changed,u-boot-nand-spl_imx)
 
 targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx)
+
+obj-$(CONFIG_MX5) += mx5/
+obj-$(CONFIG_MX6) += mx6/
+obj-$(CONFIG_MX7) += mx7/
+obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/
+

+ 1 - 1
arch/arm/imx-common/cache.c → arch/arm/mach-imx/cache.c

@@ -8,7 +8,7 @@
 #include <asm/armv7.h>
 #include <asm/pl310.h>
 #include <asm/io.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 #ifndef CONFIG_SYS_DCACHE_OFF
 void enable_caches(void)

+ 1 - 1
arch/arm/imx-common/cmd_bmode.c → arch/arm/mach-imx/cmd_bmode.c

@@ -6,7 +6,7 @@
 #include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <malloc.h>
 #include <command.h>
 

+ 0 - 0
arch/arm/imx-common/cmd_dek.c → arch/arm/mach-imx/cmd_dek.c


+ 0 - 0
arch/arm/imx-common/cmd_hdmidet.c → arch/arm/mach-imx/cmd_hdmidet.c


+ 0 - 0
arch/arm/imx-common/cpu.c → arch/arm/mach-imx/cpu.c


+ 0 - 0
arch/arm/imx-common/ddrmc-vf610.c → arch/arm/mach-imx/ddrmc-vf610.c


+ 1 - 1
arch/arm/imx-common/hab.c → arch/arm/mach-imx/hab.c

@@ -11,7 +11,7 @@
 #include <asm/system.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/hab.h>
+#include <asm/mach-imx/hab.h>
 
 /* -------- start of HAB API updates ------------*/
 

+ 1 - 1
arch/arm/imx-common/i2c-mxv7.c → arch/arm/mach-imx/i2c-mxv7.c

@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <watchdog.h>
 
 int force_idle_bus(void *priv)

+ 0 - 0
arch/arm/imx-common/imx_bootaux.c → arch/arm/mach-imx/imx_bootaux.c


+ 1 - 1
arch/arm/imx-common/init.c → arch/arm/mach-imx/init.c

@@ -8,7 +8,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/crm_regs.h>
 
 void init_aips(void)

+ 2 - 2
arch/arm/imx-common/iomux-v3.c → arch/arm/mach-imx/iomux-v3.c

@@ -11,8 +11,8 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sys_proto.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 

+ 1 - 1
arch/arm/imx-common/misc.c → arch/arm/mach-imx/misc.c

@@ -8,7 +8,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
 #include <asm/io.h>
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
 
 /* 1 second delay should be plenty of time for block reset. */
 #define	RESET_MAX_TIMEOUT	1000000

+ 0 - 0
arch/arm/cpu/armv7/mx5/Kconfig → arch/arm/mach-imx/mx5/Kconfig


+ 0 - 0
arch/arm/cpu/armv7/mx5/Makefile → arch/arm/mach-imx/mx5/Makefile


+ 0 - 0
arch/arm/cpu/armv7/mx5/clock.c → arch/arm/mach-imx/mx5/clock.c


+ 0 - 0
arch/arm/cpu/armv7/mx5/lowlevel_init.S → arch/arm/mach-imx/mx5/lowlevel_init.S


+ 1 - 1
arch/arm/cpu/armv7/mx5/soc.c → arch/arm/mach-imx/mx5/soc.c

@@ -14,7 +14,7 @@
 
 #include <linux/errno.h>
 #include <asm/io.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
 
 #if !(defined(CONFIG_MX51) || defined(CONFIG_MX53))
 #error "CPU_TYPE not defined"

+ 0 - 0
arch/arm/cpu/armv7/mx6/Kconfig → arch/arm/mach-imx/mx6/Kconfig


+ 0 - 0
arch/arm/cpu/armv7/mx6/Makefile → arch/arm/mach-imx/mx6/Makefile


+ 0 - 0
arch/arm/cpu/armv7/mx6/clock.c → arch/arm/mach-imx/mx6/clock.c


+ 0 - 0
arch/arm/cpu/armv7/mx6/ddr.c → arch/arm/mach-imx/mx6/ddr.c


+ 2 - 2
arch/arm/cpu/armv7/mx6/litesom.c → arch/arm/mach-imx/mx6/litesom.c

@@ -13,8 +13,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_esdhc.h>

+ 0 - 0
arch/arm/cpu/armv7/mx6/mp.c → arch/arm/mach-imx/mx6/mp.c


+ 1 - 1
arch/arm/cpu/armv7/mx6/opos6ul.c → arch/arm/mach-imx/mx6/opos6ul.c

@@ -12,7 +12,7 @@
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
 #include <environment.h>

+ 3 - 3
arch/arm/cpu/armv7/mx6/soc.c → arch/arm/mach-imx/mx6/soc.c

@@ -13,9 +13,9 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/dma.h>
-#include <asm/imx-common/hab.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/dma.h>
+#include <asm/mach-imx/hab.h>
 #include <stdbool.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/crm_regs.h>

+ 0 - 0
arch/arm/cpu/armv7/mx7/Kconfig → arch/arm/mach-imx/mx7/Kconfig


+ 0 - 0
arch/arm/cpu/armv7/mx7/Makefile → arch/arm/mach-imx/mx7/Makefile


+ 0 - 0
arch/arm/cpu/armv7/mx7/clock.c → arch/arm/mach-imx/mx7/clock.c


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů