To support NAND on the iMX6 this patch moves some headers into i.MX common locations. Instead of creating new files in the imx6 include directory containing nearly the same content.
Here the diffstat:
Stefan Roese (4): imx: Move some header files from arch-mxs to imx-common imx: Move some i.MX common functions into the imx-common directory dma: Add i.MX6 support to drivers/dma/apbh_dma.c mtd: mxs_nand: Add support for i.MX6
Makefile | 2 +- arch/arm/cpu/arm926ejs/mxs/mxs.c | 65 +---------------- arch/arm/cpu/armv7/mx6/soc.c | 7 ++ arch/arm/imx-common/Makefile | 3 + arch/arm/imx-common/misc.c | 84 ++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/imx-regs.h | 4 ++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +++ arch/arm/include/asm/arch-mxs/imx-regs.h | 6 +- arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h | 2 +- arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h | 2 +- arch/arm/include/asm/arch-mxs/regs-digctl.h | 2 +- arch/arm/include/asm/arch-mxs/regs-i2c.h | 2 +- arch/arm/include/asm/arch-mxs/regs-lcdif.h | 2 +- arch/arm/include/asm/arch-mxs/regs-lradc.h | 2 +- arch/arm/include/asm/arch-mxs/regs-ocotp.h | 2 +- arch/arm/include/asm/arch-mxs/regs-pinctrl.h | 2 +- arch/arm/include/asm/arch-mxs/regs-power-mx23.h | 2 +- arch/arm/include/asm/arch-mxs/regs-power-mx28.h | 2 +- arch/arm/include/asm/arch-mxs/regs-rtc.h | 2 +- arch/arm/include/asm/arch-mxs/regs-ssp.h | 2 +- arch/arm/include/asm/arch-mxs/regs-timrot.h | 2 +- .../arm/include/asm/{arch-mxs => imx-common}/dma.h | 12 ++++ .../asm/{arch-mxs => imx-common}/regs-apbh.h | 19 ++++- .../asm/{arch-mxs => imx-common}/regs-bch.h | 12 +++- .../asm/{arch-mxs => imx-common}/regs-common.h | 0 .../asm/{arch-mxs => imx-common}/regs-gpmi.h | 2 +- drivers/dma/apbh_dma.c | 5 +- drivers/mmc/mxsmmc.c | 2 +- drivers/mtd/nand/mxs_nand.c | 15 +++- drivers/spi/mxs_spi.c | 2 +- spl/Makefile | 4 ++ 31 files changed, 188 insertions(+), 92 deletions(-) create mode 100644 arch/arm/imx-common/misc.c rename arch/arm/include/asm/{arch-mxs => imx-common}/dma.h (93%) rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-apbh.h (97%) rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-bch.h (96%) rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-common.h (100%) rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-gpmi.h (99%)
Comments welcome.
Thanks, Stefan
Cc: Stefano Babic sbabic@denx.de Cc: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@freescale.com Cc: Scott Wood scottwood@freescale.com