]> git.sur5r.net Git - u-boot/commitdiff
imx: reorganize IMX code as other SOCs
authorStefano Babic <sbabic@denx.de>
Thu, 29 Jun 2017 08:16:06 +0000 (10:16 +0200)
committerStefano Babic <sbabic@denx.de>
Wed, 12 Jul 2017 08:17:44 +0000 (10:17 +0200)
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>
328 files changed:
MAINTAINERS
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/cpu/arm926ejs/mx27/generic.c
arch/arm/cpu/arm926ejs/mxs/mxs.c
arch/arm/cpu/armv7/Makefile
arch/arm/cpu/armv7/mx5/Kconfig [deleted file]
arch/arm/cpu/armv7/mx5/Makefile [deleted file]
arch/arm/cpu/armv7/mx5/clock.c [deleted file]
arch/arm/cpu/armv7/mx5/lowlevel_init.S [deleted file]
arch/arm/cpu/armv7/mx5/soc.c [deleted file]
arch/arm/cpu/armv7/mx6/Kconfig [deleted file]
arch/arm/cpu/armv7/mx6/Makefile [deleted file]
arch/arm/cpu/armv7/mx6/clock.c [deleted file]
arch/arm/cpu/armv7/mx6/ddr.c [deleted file]
arch/arm/cpu/armv7/mx6/litesom.c [deleted file]
arch/arm/cpu/armv7/mx6/mp.c [deleted file]
arch/arm/cpu/armv7/mx6/opos6ul.c [deleted file]
arch/arm/cpu/armv7/mx6/soc.c [deleted file]
arch/arm/cpu/armv7/mx7/Kconfig [deleted file]
arch/arm/cpu/armv7/mx7/Makefile [deleted file]
arch/arm/cpu/armv7/mx7/clock.c [deleted file]
arch/arm/cpu/armv7/mx7/clock_slice.c [deleted file]
arch/arm/cpu/armv7/mx7/psci-mx7.c [deleted file]
arch/arm/cpu/armv7/mx7/psci.S [deleted file]
arch/arm/cpu/armv7/mx7/soc.c [deleted file]
arch/arm/cpu/armv7/mx7ulp/Kconfig [deleted file]
arch/arm/cpu/armv7/mx7ulp/Makefile [deleted file]
arch/arm/cpu/armv7/mx7ulp/clock.c [deleted file]
arch/arm/cpu/armv7/mx7ulp/iomux.c [deleted file]
arch/arm/cpu/armv7/mx7ulp/pcc.c [deleted file]
arch/arm/cpu/armv7/mx7ulp/scg.c [deleted file]
arch/arm/cpu/armv7/mx7ulp/soc.c [deleted file]
arch/arm/cpu/armv7/vf610/generic.c
arch/arm/imx-common/Kconfig [deleted file]
arch/arm/imx-common/Makefile [deleted file]
arch/arm/imx-common/cache.c [deleted file]
arch/arm/imx-common/cmd_bmode.c [deleted file]
arch/arm/imx-common/cmd_dek.c [deleted file]
arch/arm/imx-common/cmd_hdmidet.c [deleted file]
arch/arm/imx-common/cpu.c [deleted file]
arch/arm/imx-common/ddrmc-vf610.c [deleted file]
arch/arm/imx-common/hab.c [deleted file]
arch/arm/imx-common/i2c-mxv7.c [deleted file]
arch/arm/imx-common/imx_bootaux.c [deleted file]
arch/arm/imx-common/init.c [deleted file]
arch/arm/imx-common/iomux-v3.c [deleted file]
arch/arm/imx-common/misc.c [deleted file]
arch/arm/imx-common/rdc-sema.c [deleted file]
arch/arm/imx-common/sata.c [deleted file]
arch/arm/imx-common/speed.c [deleted file]
arch/arm/imx-common/spl.c [deleted file]
arch/arm/imx-common/spl_sd.cfg [deleted file]
arch/arm/imx-common/syscounter.c [deleted file]
arch/arm/imx-common/timer.c [deleted file]
arch/arm/imx-common/video.c [deleted file]
arch/arm/include/asm/arch-mx25/gpio.h
arch/arm/include/asm/arch-mx25/iomux-mx25.h
arch/arm/include/asm/arch-mx31/gpio.h
arch/arm/include/asm/arch-mx31/sys_proto.h
arch/arm/include/asm/arch-mx35/gpio.h
arch/arm/include/asm/arch-mx35/iomux-mx35.h
arch/arm/include/asm/arch-mx35/sys_proto.h
arch/arm/include/asm/arch-mx5/gpio.h
arch/arm/include/asm/arch-mx5/iomux-mx51.h
arch/arm/include/asm/arch-mx5/iomux-mx53.h
arch/arm/include/asm/arch-mx5/sys_proto.h
arch/arm/include/asm/arch-mx6/gpio.h
arch/arm/include/asm/arch-mx6/imx-regs.h
arch/arm/include/asm/arch-mx6/mx6-pins.h
arch/arm/include/asm/arch-mx6/mx6sl_pins.h
arch/arm/include/asm/arch-mx6/mx6sll_pins.h
arch/arm/include/asm/arch-mx6/mx6sx_pins.h
arch/arm/include/asm/arch-mx6/mx6ul_pins.h
arch/arm/include/asm/arch-mx6/mx6ull_pins.h
arch/arm/include/asm/arch-mx6/sys_proto.h
arch/arm/include/asm/arch-mx7/gpio.h
arch/arm/include/asm/arch-mx7/imx-regs.h
arch/arm/include/asm/arch-mx7/mx7-pins.h
arch/arm/include/asm/arch-mx7/mx7d_pins.h
arch/arm/include/asm/arch-mx7/sys_proto.h
arch/arm/include/asm/arch-mx7ulp/sys_proto.h
arch/arm/include/asm/arch-mxs/imx-regs.h
arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
arch/arm/include/asm/arch-mxs/regs-digctl.h
arch/arm/include/asm/arch-mxs/regs-i2c.h
arch/arm/include/asm/arch-mxs/regs-lradc.h
arch/arm/include/asm/arch-mxs/regs-ocotp.h
arch/arm/include/asm/arch-mxs/regs-pinctrl.h
arch/arm/include/asm/arch-mxs/regs-power-mx23.h
arch/arm/include/asm/arch-mxs/regs-power-mx28.h
arch/arm/include/asm/arch-mxs/regs-rtc.h
arch/arm/include/asm/arch-mxs/regs-ssp.h
arch/arm/include/asm/arch-mxs/regs-timrot.h
arch/arm/include/asm/arch-mxs/regs-uartapp.h
arch/arm/include/asm/arch-mxs/sys_proto.h
arch/arm/include/asm/arch-vf610/iomux-vf610.h
arch/arm/include/asm/imx-common/boot_mode.h [deleted file]
arch/arm/include/asm/imx-common/dma.h [deleted file]
arch/arm/include/asm/imx-common/gpio.h [deleted file]
arch/arm/include/asm/imx-common/hab.h [deleted file]
arch/arm/include/asm/imx-common/imximage.cfg [deleted file]
arch/arm/include/asm/imx-common/iomux-v3.h [deleted file]
arch/arm/include/asm/imx-common/mx5_video.h [deleted file]
arch/arm/include/asm/imx-common/mxc_i2c.h [deleted file]
arch/arm/include/asm/imx-common/rdc-sema.h [deleted file]
arch/arm/include/asm/imx-common/regs-apbh.h [deleted file]
arch/arm/include/asm/imx-common/regs-bch.h [deleted file]
arch/arm/include/asm/imx-common/regs-common.h [deleted file]
arch/arm/include/asm/imx-common/regs-gpmi.h [deleted file]
arch/arm/include/asm/imx-common/regs-lcdif.h [deleted file]
arch/arm/include/asm/imx-common/regs-usbphy.h [deleted file]
arch/arm/include/asm/imx-common/sata.h [deleted file]
arch/arm/include/asm/imx-common/spi.h [deleted file]
arch/arm/include/asm/imx-common/sys_proto.h [deleted file]
arch/arm/include/asm/imx-common/syscounter.h [deleted file]
arch/arm/include/asm/imx-common/video.h [deleted file]
arch/arm/include/asm/mach-imx/boot_mode.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/dma.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/gpio.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/hab.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/imximage.cfg [new file with mode: 0644]
arch/arm/include/asm/mach-imx/iomux-v3.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/mx5_video.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/mxc_i2c.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/rdc-sema.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/regs-apbh.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/regs-bch.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/regs-common.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/regs-gpmi.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/regs-lcdif.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/regs-usbphy.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/sata.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/spi.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/sys_proto.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/syscounter.h [new file with mode: 0644]
arch/arm/include/asm/mach-imx/video.h [new file with mode: 0644]
arch/arm/mach-imx/Kconfig [new file with mode: 0644]
arch/arm/mach-imx/Makefile [new file with mode: 0644]
arch/arm/mach-imx/cache.c [new file with mode: 0644]
arch/arm/mach-imx/cmd_bmode.c [new file with mode: 0644]
arch/arm/mach-imx/cmd_dek.c [new file with mode: 0644]
arch/arm/mach-imx/cmd_hdmidet.c [new file with mode: 0644]
arch/arm/mach-imx/cpu.c [new file with mode: 0644]
arch/arm/mach-imx/ddrmc-vf610.c [new file with mode: 0644]
arch/arm/mach-imx/hab.c [new file with mode: 0644]
arch/arm/mach-imx/i2c-mxv7.c [new file with mode: 0644]
arch/arm/mach-imx/imx_bootaux.c [new file with mode: 0644]
arch/arm/mach-imx/init.c [new file with mode: 0644]
arch/arm/mach-imx/iomux-v3.c [new file with mode: 0644]
arch/arm/mach-imx/misc.c [new file with mode: 0644]
arch/arm/mach-imx/mx5/Kconfig [new file with mode: 0644]
arch/arm/mach-imx/mx5/Makefile [new file with mode: 0644]
arch/arm/mach-imx/mx5/clock.c [new file with mode: 0644]
arch/arm/mach-imx/mx5/lowlevel_init.S [new file with mode: 0644]
arch/arm/mach-imx/mx5/soc.c [new file with mode: 0644]
arch/arm/mach-imx/mx6/Kconfig [new file with mode: 0644]
arch/arm/mach-imx/mx6/Makefile [new file with mode: 0644]
arch/arm/mach-imx/mx6/clock.c [new file with mode: 0644]
arch/arm/mach-imx/mx6/ddr.c [new file with mode: 0644]
arch/arm/mach-imx/mx6/litesom.c [new file with mode: 0644]
arch/arm/mach-imx/mx6/mp.c [new file with mode: 0644]
arch/arm/mach-imx/mx6/opos6ul.c [new file with mode: 0644]
arch/arm/mach-imx/mx6/soc.c [new file with mode: 0644]
arch/arm/mach-imx/mx7/Kconfig [new file with mode: 0644]
arch/arm/mach-imx/mx7/Makefile [new file with mode: 0644]
arch/arm/mach-imx/mx7/clock.c [new file with mode: 0644]
arch/arm/mach-imx/mx7/clock_slice.c [new file with mode: 0644]
arch/arm/mach-imx/mx7/psci-mx7.c [new file with mode: 0644]
arch/arm/mach-imx/mx7/psci.S [new file with mode: 0644]
arch/arm/mach-imx/mx7/soc.c [new file with mode: 0644]
arch/arm/mach-imx/mx7ulp/Kconfig [new file with mode: 0644]
arch/arm/mach-imx/mx7ulp/Makefile [new file with mode: 0644]
arch/arm/mach-imx/mx7ulp/clock.c [new file with mode: 0644]
arch/arm/mach-imx/mx7ulp/iomux.c [new file with mode: 0644]
arch/arm/mach-imx/mx7ulp/pcc.c [new file with mode: 0644]
arch/arm/mach-imx/mx7ulp/scg.c [new file with mode: 0644]
arch/arm/mach-imx/mx7ulp/soc.c [new file with mode: 0644]
arch/arm/mach-imx/rdc-sema.c [new file with mode: 0644]
arch/arm/mach-imx/sata.c [new file with mode: 0644]
arch/arm/mach-imx/speed.c [new file with mode: 0644]
arch/arm/mach-imx/spl.c [new file with mode: 0644]
arch/arm/mach-imx/spl_sd.cfg [new file with mode: 0644]
arch/arm/mach-imx/syscounter.c [new file with mode: 0644]
arch/arm/mach-imx/timer.c [new file with mode: 0644]
arch/arm/mach-imx/video.c [new file with mode: 0644]
board/advantech/dms-ba16/dms-ba16.c
board/aries/m53evk/imximage.cfg
board/aries/m53evk/m53evk.c
board/aristainetos/aristainetos-v1.c
board/aristainetos/aristainetos-v2.c
board/aristainetos/aristainetos.c
board/armadeus/opos6uldev/Kconfig
board/armadeus/opos6uldev/board.c
board/bachmann/ot1200/ot1200.c
board/barco/platinum/platinum.c
board/barco/platinum/platinum_picon.c
board/barco/platinum/platinum_titanium.c
board/barco/platinum/spl_picon.c
board/barco/platinum/spl_titanium.c
board/barco/titanium/titanium.c
board/beckhoff/mx53cx9020/mx53cx9020.c
board/boundary/nitrogen6x/nitrogen6x.c
board/ccv/xpress/xpress.c
board/compulab/cm_fx6/cm_fx6.c
board/compulab/cm_fx6/common.c
board/compulab/cm_fx6/spl.c
board/congatec/cgtqmx6eval/cgtqmx6eval.c
board/el/el6x/el6x.c
board/embest/mx6boards/mx6boards.c
board/engicam/common/spl.c
board/engicam/geam6ul/geam6ul.c
board/engicam/icorem6/icorem6.c
board/engicam/icorem6_rqs/icorem6_rqs.c
board/engicam/isiotmx6ul/isiotmx6ul.c
board/freescale/mx51evk/mx51evk.c
board/freescale/mx53evk/mx53evk.c
board/freescale/mx53loco/mx53loco.c
board/freescale/mx6qarm2/mx6qarm2.c
board/freescale/mx6sabreauto/mx6sabreauto.c
board/freescale/mx6sabresd/mx6sabresd.c
board/freescale/mx6slevk/mx6slevk.c
board/freescale/mx6sllevk/mx6sllevk.c
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
board/freescale/mx6sxsabresd/mx6sxsabresd.c
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
board/freescale/mx6ullevk/mx6ullevk.c
board/freescale/mx7dsabresd/mx7dsabresd.c
board/freescale/s32v234evb/s32v234evb.cfg
board/freescale/vf610twr/imximage.cfg
board/gateworks/gw_ventana/common.c
board/gateworks/gw_ventana/gw_ventana.c
board/gateworks/gw_ventana/gw_ventana_spl.c
board/ge/bx50v3/bx50v3.c
board/grinn/liteboard/board.c
board/kosagi/novena/novena.c
board/kosagi/novena/novena_spl.c
board/kosagi/novena/video.c
board/liebherr/mccmon6/mccmon6.c
board/liebherr/mccmon6/spl.c
board/logicpd/imx6/imx6logic.c
board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg
board/phytec/pcm052/imximage.cfg
board/phytec/pcm058/pcm058.c
board/samtec/vining_2000/vining_2000.c
board/seco/common/mx6.c
board/seco/mx6quq7/mx6quq7.c
board/solidrun/mx6cuboxi/mx6cuboxi.c
board/tbs/tbs2910/tbs2910.c
board/technexion/pico-imx6ul/pico-imx6ul.c
board/technexion/pico-imx7d/pico-imx7d.c
board/technologic/ts4800/ts4800.c
board/toradex/apalis_imx6/apalis_imx6.c
board/toradex/apalis_imx6/pf0100.c
board/toradex/colibri_imx6/colibri_imx6.c
board/toradex/colibri_imx6/pf0100.c
board/toradex/colibri_imx7/colibri_imx7.c
board/toradex/colibri_vf/imximage.cfg
board/tqc/tqma6/tqma6.c
board/tqc/tqma6/tqma6_mba6.c
board/tqc/tqma6/tqma6_wru4.c
board/udoo/neo/neo.c
board/udoo/udoo.c
board/udoo/udoo_spl.c
board/wandboard/spl.c
board/wandboard/wandboard.c
board/warp/warp.c
board/warp7/warp7.c
configs/apalis_imx6_defconfig
configs/cgtqmx6eval_defconfig
configs/cm_fx6_defconfig
configs/colibri_imx6_defconfig
configs/gwventana_emmc_defconfig
configs/gwventana_gw5904_defconfig
configs/gwventana_nand_defconfig
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_nand_defconfig
configs/imx6qdl_icore_rqs_defconfig
configs/imx6ul_geam_mmc_defconfig
configs/imx6ul_geam_nand_defconfig
configs/imx6ul_isiot_emmc_defconfig
configs/imx6ul_isiot_mmc_defconfig
configs/imx6ul_isiot_nand_defconfig
configs/liteboard_defconfig
configs/mx6cuboxi_defconfig
configs/mx6sabreauto_defconfig
configs/mx6sabresd_defconfig
configs/mx6slevk_spl_defconfig
configs/mx6sxsabresd_spl_defconfig
configs/mx6ul_14x14_evk_defconfig
configs/mx6ul_9x9_evk_defconfig
configs/novena_defconfig
configs/ot1200_spl_defconfig
configs/pcm058_defconfig
configs/platinum_picon_defconfig
configs/platinum_titanium_defconfig
configs/udoo_defconfig
configs/udoo_neo_defconfig
configs/wandboard_defconfig
configs/xpress_spl_defconfig
configs/zc5202_defconfig
configs/zc5601_defconfig
doc/README.imximage
drivers/dma/apbh_dma.c
drivers/gpio/vybrid_gpio.c
drivers/i2c/mxc_i2c.c
drivers/misc/mxc_ocotp.c
drivers/mmc/mxsmmc.c
drivers/mtd/nand/mxs_nand.c
drivers/net/fec_mxc.c
drivers/spi/mxc_spi.c
drivers/spi/mxs_spi.c
drivers/usb/host/ehci-mx6.c
drivers/usb/host/ehci-vf.c
drivers/video/mxsfb.c
include/configs/advantech_dms-ba16.h
include/configs/apalis_imx6.h
include/configs/colibri_imx6.h
include/configs/ge_bx50v3.h
include/configs/mx6_common.h
include/configs/mx6ul_14x14_evk.h
include/configs/mx6ullevk.h
include/configs/mx7_common.h
include/configs/pico-imx6ul.h
include/configs/xpress.h
tools/imximage.h

index 1e8d7d9bb625e3d7746d9037809bb826ee629416..ffdb98a8ae4104e18fa72fb53277648546b30485 100644 (file)
@@ -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
index 4c4c8d86e6d8c1d6245cb3d03d6a040fe0a47ca8..452596485dd34269be12b593381be1455682001f 100644 (file)
--- a/Makefile
+++ b/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)
 
index d43aaac2a029766bf48359f7cf8825d8d2b55030..f7b44392ac89ee76e2b9475b8ecb061da854c7bb 100644 (file)
@@ -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"
index 3e93fd6e6add420a2ee2d778ea2f0353e4115af8..0e0ae77822890bbf51e5335ab55f38b399cfa32d 100644 (file)
@@ -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
 
index 3b4326afefa20b4edf8744fb67ce3d24067d731e..86798e3bcbd466cc6a805a1167fc57c393e0e7e4 100644 (file)
@@ -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
index 840dd9edbd2c68d67d540802bf7b5bf0446d1fe8..7a68a8f3ca74e370491131640d051f97ba338a7c 100644 (file)
@@ -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>
index 45dd3caec6b316b801afd6810e277b1b7932b1d4..b14ee54519db4a31be6cbd843ff0e398b1819953 100644 (file)
@@ -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/
diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig
deleted file mode 100644 (file)
index ef37c35..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-if ARCH_MX5
-
-config MX5
-       bool
-       default y
-
-config MX51
-       bool
-
-config MX53
-       bool
-
-choice
-       prompt "MX5 board select"
-       optional
-
-config TARGET_M53EVK
-       bool "Support m53evk"
-       select MX53
-       select SUPPORT_SPL
-
-config TARGET_MX51EVK
-       bool "Support mx51evk"
-       select BOARD_LATE_INIT
-       select MX51
-
-config TARGET_MX53ARD
-       bool "Support mx53ard"
-       select MX53
-
-config TARGET_MX53CX9020
-       bool "Support CX9020"
-       select BOARD_LATE_INIT
-       select MX53
-       select DM
-       select DM_SERIAL
-
-config TARGET_MX53EVK
-       bool "Support mx53evk"
-       select BOARD_LATE_INIT
-       select MX53
-
-config TARGET_MX53LOCO
-       bool "Support mx53loco"
-       select BOARD_LATE_INIT
-       select MX53
-
-config TARGET_MX53SMD
-       bool "Support mx53smd"
-       select MX53
-
-config TARGET_TS4800
-       bool "Support TS4800"
-       select MX51
-       select SYS_FSL_ERRATUM_ESDHC_A001
-
-config TARGET_USBARMORY
-       bool "Support USB armory"
-       select MX53
-
-endchoice
-
-config SYS_SOC
-       default "mx5"
-
-source "board/aries/m53evk/Kconfig"
-source "board/beckhoff/mx53cx9020/Kconfig"
-source "board/freescale/mx51evk/Kconfig"
-source "board/freescale/mx53ard/Kconfig"
-source "board/freescale/mx53evk/Kconfig"
-source "board/freescale/mx53loco/Kconfig"
-source "board/freescale/mx53smd/Kconfig"
-source "board/inversepath/usbarmory/Kconfig"
-source "board/technologic/ts4800/Kconfig"
-
-endif
diff --git a/arch/arm/cpu/armv7/mx5/Makefile b/arch/arm/cpu/armv7/mx5/Makefile
deleted file mode 100644 (file)
index d021842..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2009 Freescale Semiconductor, Inc.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y := soc.o clock.o
-obj-y += lowlevel_init.o
diff --git a/arch/arm/cpu/armv7/mx5/clock.c b/arch/arm/cpu/armv7/mx5/clock.c
deleted file mode 100644 (file)
index 610098c..0000000
+++ /dev/null
@@ -1,949 +0,0 @@
-/*
- * (C) Copyright 2007
- * Sascha Hauer, Pengutronix
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <linux/errno.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/clock.h>
-#include <div64.h>
-#include <asm/arch/sys_proto.h>
-
-enum pll_clocks {
-       PLL1_CLOCK = 0,
-       PLL2_CLOCK,
-       PLL3_CLOCK,
-#ifdef CONFIG_MX53
-       PLL4_CLOCK,
-#endif
-       PLL_CLOCKS,
-};
-
-struct mxc_pll_reg *mxc_plls[PLL_CLOCKS] = {
-       [PLL1_CLOCK] = (struct mxc_pll_reg *)PLL1_BASE_ADDR,
-       [PLL2_CLOCK] = (struct mxc_pll_reg *)PLL2_BASE_ADDR,
-       [PLL3_CLOCK] = (struct mxc_pll_reg *)PLL3_BASE_ADDR,
-#ifdef CONFIG_MX53
-       [PLL4_CLOCK] = (struct mxc_pll_reg *)PLL4_BASE_ADDR,
-#endif
-};
-
-#define AHB_CLK_ROOT    133333333
-#define SZ_DEC_1M       1000000
-#define PLL_PD_MAX      16      /* Actual pd+1 */
-#define PLL_MFI_MAX     15
-#define PLL_MFI_MIN     5
-#define ARM_DIV_MAX     8
-#define IPG_DIV_MAX     4
-#define AHB_DIV_MAX     8
-#define EMI_DIV_MAX     8
-#define NFC_DIV_MAX     8
-
-#define MX5_CBCMR      0x00015154
-#define MX5_CBCDR      0x02888945
-
-struct fixed_pll_mfd {
-       u32 ref_clk_hz;
-       u32 mfd;
-};
-
-const struct fixed_pll_mfd fixed_mfd[] = {
-       {MXC_HCLK, 24 * 16},
-};
-
-struct pll_param {
-       u32 pd;
-       u32 mfi;
-       u32 mfn;
-       u32 mfd;
-};
-
-#define PLL_FREQ_MAX(ref_clk)  (4 * (ref_clk) * PLL_MFI_MAX)
-#define PLL_FREQ_MIN(ref_clk) \
-               ((2 * (ref_clk) * (PLL_MFI_MIN - 1)) / PLL_PD_MAX)
-#define MAX_DDR_CLK     420000000
-#define NFC_CLK_MAX     34000000
-
-struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
-
-void set_usboh3_clk(void)
-{
-       clrsetbits_le32(&mxc_ccm->cscmr1,
-                       MXC_CCM_CSCMR1_USBOH3_CLK_SEL_MASK,
-                       MXC_CCM_CSCMR1_USBOH3_CLK_SEL(1));
-       clrsetbits_le32(&mxc_ccm->cscdr1,
-                       MXC_CCM_CSCDR1_USBOH3_CLK_PODF_MASK |
-                       MXC_CCM_CSCDR1_USBOH3_CLK_PRED_MASK,
-                       MXC_CCM_CSCDR1_USBOH3_CLK_PRED(4) |
-                       MXC_CCM_CSCDR1_USBOH3_CLK_PODF(1));
-}
-
-void enable_usboh3_clk(bool enable)
-{
-       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
-
-       clrsetbits_le32(&mxc_ccm->CCGR2,
-                       MXC_CCM_CCGR2_USBOH3_60M(MXC_CCM_CCGR_CG_MASK),
-                       MXC_CCM_CCGR2_USBOH3_60M(cg));
-}
-
-#ifdef CONFIG_SYS_I2C_MXC
-/* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */
-int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
-{
-       u32 mask;
-
-#if defined(CONFIG_MX51)
-       if (i2c_num > 1)
-#elif defined(CONFIG_MX53)
-       if (i2c_num > 2)
-#endif
-               return -EINVAL;
-       mask = MXC_CCM_CCGR_CG_MASK <<
-                       (MXC_CCM_CCGR1_I2C1_OFFSET + (i2c_num << 1));
-       if (enable)
-               setbits_le32(&mxc_ccm->CCGR1, mask);
-       else
-               clrbits_le32(&mxc_ccm->CCGR1, mask);
-       return 0;
-}
-#endif
-
-void set_usb_phy_clk(void)
-{
-       clrbits_le32(&mxc_ccm->cscmr1, MXC_CCM_CSCMR1_USB_PHY_CLK_SEL);
-}
-
-#if defined(CONFIG_MX51)
-void enable_usb_phy1_clk(bool enable)
-{
-       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
-
-       clrsetbits_le32(&mxc_ccm->CCGR2,
-                       MXC_CCM_CCGR2_USB_PHY(MXC_CCM_CCGR_CG_MASK),
-                       MXC_CCM_CCGR2_USB_PHY(cg));
-}
-
-void enable_usb_phy2_clk(bool enable)
-{
-       /* i.MX51 has a single USB PHY clock, so do nothing here. */
-}
-#elif defined(CONFIG_MX53)
-void enable_usb_phy1_clk(bool enable)
-{
-       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
-
-       clrsetbits_le32(&mxc_ccm->CCGR4,
-                       MXC_CCM_CCGR4_USB_PHY1(MXC_CCM_CCGR_CG_MASK),
-                       MXC_CCM_CCGR4_USB_PHY1(cg));
-}
-
-void enable_usb_phy2_clk(bool enable)
-{
-       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
-
-       clrsetbits_le32(&mxc_ccm->CCGR4,
-                       MXC_CCM_CCGR4_USB_PHY2(MXC_CCM_CCGR_CG_MASK),
-                       MXC_CCM_CCGR4_USB_PHY2(cg));
-}
-#endif
-
-/*
- * Calculate the frequency of PLLn.
- */
-static uint32_t decode_pll(struct mxc_pll_reg *pll, uint32_t infreq)
-{
-       uint32_t ctrl, op, mfd, mfn, mfi, pdf, ret;
-       uint64_t refclk, temp;
-       int32_t mfn_abs;
-
-       ctrl = readl(&pll->ctrl);
-
-       if (ctrl & MXC_DPLLC_CTL_HFSM) {
-               mfn = readl(&pll->hfs_mfn);
-               mfd = readl(&pll->hfs_mfd);
-               op = readl(&pll->hfs_op);
-       } else {
-               mfn = readl(&pll->mfn);
-               mfd = readl(&pll->mfd);
-               op = readl(&pll->op);
-       }
-
-       mfd &= MXC_DPLLC_MFD_MFD_MASK;
-       mfn &= MXC_DPLLC_MFN_MFN_MASK;
-       pdf = op & MXC_DPLLC_OP_PDF_MASK;
-       mfi = MXC_DPLLC_OP_MFI_RD(op);
-
-       /* 21.2.3 */
-       if (mfi < 5)
-               mfi = 5;
-
-       /* Sign extend */
-       if (mfn >= 0x04000000) {
-               mfn |= 0xfc000000;
-               mfn_abs = -mfn;
-       } else
-               mfn_abs = mfn;
-
-       refclk = infreq * 2;
-       if (ctrl & MXC_DPLLC_CTL_DPDCK0_2_EN)
-               refclk *= 2;
-
-       do_div(refclk, pdf + 1);
-       temp = refclk * mfn_abs;
-       do_div(temp, mfd + 1);
-       ret = refclk * mfi;
-
-       if ((int)mfn < 0)
-               ret -= temp;
-       else
-               ret += temp;
-
-       return ret;
-}
-
-#ifdef CONFIG_MX51
-/*
- * This function returns the Frequency Pre-Multiplier clock.
- */
-static u32 get_fpm(void)
-{
-       u32 mult;
-       u32 ccr = readl(&mxc_ccm->ccr);
-
-       if (ccr & MXC_CCM_CCR_FPM_MULT)
-               mult = 1024;
-       else
-               mult = 512;
-
-       return MXC_CLK32 * mult;
-}
-#endif
-
-/*
- * This function returns the low power audio clock.
- */
-static u32 get_lp_apm(void)
-{
-       u32 ret_val = 0;
-       u32 ccsr = readl(&mxc_ccm->ccsr);
-
-       if (ccsr & MXC_CCM_CCSR_LP_APM)
-#if defined(CONFIG_MX51)
-               ret_val = get_fpm();
-#elif defined(CONFIG_MX53)
-               ret_val = decode_pll(mxc_plls[PLL4_CLOCK], MXC_HCLK);
-#endif
-       else
-               ret_val = MXC_HCLK;
-
-       return ret_val;
-}
-
-/*
- * Get mcu main rate
- */
-u32 get_mcu_main_clk(void)
-{
-       u32 reg, freq;
-
-       reg = MXC_CCM_CACRR_ARM_PODF_RD(readl(&mxc_ccm->cacrr));
-       freq = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
-       return freq / (reg + 1);
-}
-
-/*
- * Get the rate of peripheral's root clock.
- */
-u32 get_periph_clk(void)
-{
-       u32 reg;
-
-       reg = readl(&mxc_ccm->cbcdr);
-       if (!(reg & MXC_CCM_CBCDR_PERIPH_CLK_SEL))
-               return decode_pll(mxc_plls[PLL2_CLOCK], MXC_HCLK);
-       reg = readl(&mxc_ccm->cbcmr);
-       switch (MXC_CCM_CBCMR_PERIPH_CLK_SEL_RD(reg)) {
-       case 0:
-               return decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
-       case 1:
-               return decode_pll(mxc_plls[PLL3_CLOCK], MXC_HCLK);
-       case 2:
-               return get_lp_apm();
-       default:
-               return 0;
-       }
-       /* NOTREACHED */
-}
-
-/*
- * Get the rate of ipg clock.
- */
-static u32 get_ipg_clk(void)
-{
-       uint32_t freq, reg, div;
-
-       freq = get_ahb_clk();
-
-       reg = readl(&mxc_ccm->cbcdr);
-       div = MXC_CCM_CBCDR_IPG_PODF_RD(reg) + 1;
-
-       return freq / div;
-}
-
-/*
- * Get the rate of ipg_per clock.
- */
-static u32 get_ipg_per_clk(void)
-{
-       u32 freq, pred1, pred2, podf;
-
-       if (readl(&mxc_ccm->cbcmr) & MXC_CCM_CBCMR_PERCLK_IPG_CLK_SEL)
-               return get_ipg_clk();
-
-       if (readl(&mxc_ccm->cbcmr) & MXC_CCM_CBCMR_PERCLK_LP_APM_CLK_SEL)
-               freq = get_lp_apm();
-       else
-               freq = get_periph_clk();
-       podf = readl(&mxc_ccm->cbcdr);
-       pred1 = MXC_CCM_CBCDR_PERCLK_PRED1_RD(podf);
-       pred2 = MXC_CCM_CBCDR_PERCLK_PRED2_RD(podf);
-       podf = MXC_CCM_CBCDR_PERCLK_PODF_RD(podf);
-       return freq / ((pred1 + 1) * (pred2 + 1) * (podf + 1));
-}
-
-/* Get the output clock rate of a standard PLL MUX for peripherals. */
-static u32 get_standard_pll_sel_clk(u32 clk_sel)
-{
-       u32 freq = 0;
-
-       switch (clk_sel & 0x3) {
-       case 0:
-               freq = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
-               break;
-       case 1:
-               freq = decode_pll(mxc_plls[PLL2_CLOCK], MXC_HCLK);
-               break;
-       case 2:
-               freq = decode_pll(mxc_plls[PLL3_CLOCK], MXC_HCLK);
-               break;
-       case 3:
-               freq = get_lp_apm();
-               break;
-       }
-
-       return freq;
-}
-
-/*
- * Get the rate of uart clk.
- */
-static u32 get_uart_clk(void)
-{
-       unsigned int clk_sel, freq, reg, pred, podf;
-
-       reg = readl(&mxc_ccm->cscmr1);
-       clk_sel = MXC_CCM_CSCMR1_UART_CLK_SEL_RD(reg);
-       freq = get_standard_pll_sel_clk(clk_sel);
-
-       reg = readl(&mxc_ccm->cscdr1);
-       pred = MXC_CCM_CSCDR1_UART_CLK_PRED_RD(reg);
-       podf = MXC_CCM_CSCDR1_UART_CLK_PODF_RD(reg);
-       freq /= (pred + 1) * (podf + 1);
-
-       return freq;
-}
-
-/*
- * get cspi clock rate.
- */
-static u32 imx_get_cspiclk(void)
-{
-       u32 ret_val = 0, pdf, pre_pdf, clk_sel, freq;
-       u32 cscmr1 = readl(&mxc_ccm->cscmr1);
-       u32 cscdr2 = readl(&mxc_ccm->cscdr2);
-
-       pre_pdf = MXC_CCM_CSCDR2_CSPI_CLK_PRED_RD(cscdr2);
-       pdf = MXC_CCM_CSCDR2_CSPI_CLK_PODF_RD(cscdr2);
-       clk_sel = MXC_CCM_CSCMR1_CSPI_CLK_SEL_RD(cscmr1);
-       freq = get_standard_pll_sel_clk(clk_sel);
-       ret_val = freq / ((pre_pdf + 1) * (pdf + 1));
-       return ret_val;
-}
-
-/*
- * get esdhc clock rate.
- */
-static u32 get_esdhc_clk(u32 port)
-{
-       u32 clk_sel = 0, pred = 0, podf = 0, freq = 0;
-       u32 cscmr1 = readl(&mxc_ccm->cscmr1);
-       u32 cscdr1 = readl(&mxc_ccm->cscdr1);
-
-       switch (port) {
-       case 0:
-               clk_sel = MXC_CCM_CSCMR1_ESDHC1_MSHC1_CLK_SEL_RD(cscmr1);
-               pred = MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PRED_RD(cscdr1);
-               podf = MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PODF_RD(cscdr1);
-               break;
-       case 1:
-               clk_sel = MXC_CCM_CSCMR1_ESDHC2_MSHC2_CLK_SEL_RD(cscmr1);
-               pred = MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PRED_RD(cscdr1);
-               podf = MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PODF_RD(cscdr1);
-               break;
-       case 2:
-               if (cscmr1 & MXC_CCM_CSCMR1_ESDHC3_CLK_SEL)
-                       return get_esdhc_clk(1);
-               else
-                       return get_esdhc_clk(0);
-       case 3:
-               if (cscmr1 & MXC_CCM_CSCMR1_ESDHC4_CLK_SEL)
-                       return get_esdhc_clk(1);
-               else
-                       return get_esdhc_clk(0);
-       default:
-               break;
-       }
-
-       freq = get_standard_pll_sel_clk(clk_sel) / ((pred + 1) * (podf + 1));
-       return freq;
-}
-
-static u32 get_axi_a_clk(void)
-{
-       u32 cbcdr = readl(&mxc_ccm->cbcdr);
-       u32 pdf = MXC_CCM_CBCDR_AXI_A_PODF_RD(cbcdr);
-
-       return  get_periph_clk() / (pdf + 1);
-}
-
-static u32 get_axi_b_clk(void)
-{
-       u32 cbcdr = readl(&mxc_ccm->cbcdr);
-       u32 pdf = MXC_CCM_CBCDR_AXI_B_PODF_RD(cbcdr);
-
-       return  get_periph_clk() / (pdf + 1);
-}
-
-static u32 get_emi_slow_clk(void)
-{
-       u32 cbcdr = readl(&mxc_ccm->cbcdr);
-       u32 emi_clk_sel = cbcdr & MXC_CCM_CBCDR_EMI_CLK_SEL;
-       u32 pdf = MXC_CCM_CBCDR_EMI_PODF_RD(cbcdr);
-
-       if (emi_clk_sel)
-               return  get_ahb_clk() / (pdf + 1);
-
-       return  get_periph_clk() / (pdf + 1);
-}
-
-static u32 get_ddr_clk(void)
-{
-       u32 ret_val = 0;
-       u32 cbcmr = readl(&mxc_ccm->cbcmr);
-       u32 ddr_clk_sel = MXC_CCM_CBCMR_DDR_CLK_SEL_RD(cbcmr);
-#ifdef CONFIG_MX51
-       u32 cbcdr = readl(&mxc_ccm->cbcdr);
-       if (cbcdr & MXC_CCM_CBCDR_DDR_HIFREQ_SEL) {
-               u32 ddr_clk_podf = MXC_CCM_CBCDR_DDR_PODF_RD(cbcdr);
-
-               ret_val = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
-               ret_val /= ddr_clk_podf + 1;
-
-               return ret_val;
-       }
-#endif
-       switch (ddr_clk_sel) {
-       case 0:
-               ret_val = get_axi_a_clk();
-               break;
-       case 1:
-               ret_val = get_axi_b_clk();
-               break;
-       case 2:
-               ret_val = get_emi_slow_clk();
-               break;
-       case 3:
-               ret_val = get_ahb_clk();
-               break;
-       default:
-               break;
-       }
-
-       return ret_val;
-}
-
-/*
- * The API of get mxc clocks.
- */
-unsigned int mxc_get_clock(enum mxc_clock clk)
-{
-       switch (clk) {
-       case MXC_ARM_CLK:
-               return get_mcu_main_clk();
-       case MXC_AHB_CLK:
-               return get_ahb_clk();
-       case MXC_IPG_CLK:
-               return get_ipg_clk();
-       case MXC_IPG_PERCLK:
-       case MXC_I2C_CLK:
-               return get_ipg_per_clk();
-       case MXC_UART_CLK:
-               return get_uart_clk();
-       case MXC_CSPI_CLK:
-               return imx_get_cspiclk();
-       case MXC_ESDHC_CLK:
-               return get_esdhc_clk(0);
-       case MXC_ESDHC2_CLK:
-               return get_esdhc_clk(1);
-       case MXC_ESDHC3_CLK:
-               return get_esdhc_clk(2);
-       case MXC_ESDHC4_CLK:
-               return get_esdhc_clk(3);
-       case MXC_FEC_CLK:
-               return get_ipg_clk();
-       case MXC_SATA_CLK:
-               return get_ahb_clk();
-       case MXC_DDR_CLK:
-               return get_ddr_clk();
-       default:
-               break;
-       }
-       return -EINVAL;
-}
-
-u32 imx_get_uartclk(void)
-{
-       return get_uart_clk();
-}
-
-u32 imx_get_fecclk(void)
-{
-       return get_ipg_clk();
-}
-
-static int gcd(int m, int n)
-{
-       int t;
-       while (m > 0) {
-               if (n > m) {
-                       t = m;
-                       m = n;
-                       n = t;
-               } /* swap */
-               m -= n;
-       }
-       return n;
-}
-
-/*
- * This is to calculate various parameters based on reference clock and
- * targeted clock based on the equation:
- *      t_clk = 2*ref_freq*(mfi + mfn/(mfd+1))/(pd+1)
- * This calculation is based on a fixed MFD value for simplicity.
- */
-static int calc_pll_params(u32 ref, u32 target, struct pll_param *pll)
-{
-       u64 pd, mfi = 1, mfn, mfd, t1;
-       u32 n_target = target;
-       u32 n_ref = ref, i;
-
-       /*
-        * Make sure targeted freq is in the valid range.
-        * Otherwise the following calculation might be wrong!!!
-        */
-       if (n_target < PLL_FREQ_MIN(ref) ||
-               n_target > PLL_FREQ_MAX(ref)) {
-               printf("Targeted peripheral clock should be"
-                       "within [%d - %d]\n",
-                       PLL_FREQ_MIN(ref) / SZ_DEC_1M,
-                       PLL_FREQ_MAX(ref) / SZ_DEC_1M);
-               return -EINVAL;
-       }
-
-       for (i = 0; i < ARRAY_SIZE(fixed_mfd); i++) {
-               if (fixed_mfd[i].ref_clk_hz == ref) {
-                       mfd = fixed_mfd[i].mfd;
-                       break;
-               }
-       }
-
-       if (i == ARRAY_SIZE(fixed_mfd))
-               return -EINVAL;
-
-       /* Use n_target and n_ref to avoid overflow */
-       for (pd = 1; pd <= PLL_PD_MAX; pd++) {
-               t1 = n_target * pd;
-               do_div(t1, (4 * n_ref));
-               mfi = t1;
-               if (mfi > PLL_MFI_MAX)
-                       return -EINVAL;
-               else if (mfi < 5)
-                       continue;
-               break;
-       }
-       /*
-        * Now got pd and mfi already
-        *
-        * mfn = (((n_target * pd) / 4 - n_ref * mfi) * mfd) / n_ref;
-        */
-       t1 = n_target * pd;
-       do_div(t1, 4);
-       t1 -= n_ref * mfi;
-       t1 *= mfd;
-       do_div(t1, n_ref);
-       mfn = t1;
-       debug("ref=%d, target=%d, pd=%d," "mfi=%d,mfn=%d, mfd=%d\n",
-               ref, n_target, (u32)pd, (u32)mfi, (u32)mfn, (u32)mfd);
-       i = 1;
-       if (mfn != 0)
-               i = gcd(mfd, mfn);
-       pll->pd = (u32)pd;
-       pll->mfi = (u32)mfi;
-       do_div(mfn, i);
-       pll->mfn = (u32)mfn;
-       do_div(mfd, i);
-       pll->mfd = (u32)mfd;
-
-       return 0;
-}
-
-#define calc_div(tgt_clk, src_clk, limit) ({           \
-               u32 v = 0;                              \
-               if (((src_clk) % (tgt_clk)) <= 100)     \
-                       v = (src_clk) / (tgt_clk);      \
-               else                                    \
-                       v = ((src_clk) / (tgt_clk)) + 1;\
-               if (v > limit)                          \
-                       v = limit;                      \
-               (v - 1);                                \
-       })
-
-#define CHANGE_PLL_SETTINGS(pll, pd, fi, fn, fd) \
-       {       \
-               writel(0x1232, &pll->ctrl);             \
-               writel(0x2, &pll->config);              \
-               writel((((pd) - 1) << 0) | ((fi) << 4), \
-                       &pll->op);                      \
-               writel(fn, &(pll->mfn));                \
-               writel((fd) - 1, &pll->mfd);            \
-               writel((((pd) - 1) << 0) | ((fi) << 4), \
-                       &pll->hfs_op);                  \
-               writel(fn, &pll->hfs_mfn);              \
-               writel((fd) - 1, &pll->hfs_mfd);        \
-               writel(0x1232, &pll->ctrl);             \
-               while (!readl(&pll->ctrl) & 0x1)        \
-                       ;\
-       }
-
-static int config_pll_clk(enum pll_clocks index, struct pll_param *pll_param)
-{
-       u32 ccsr = readl(&mxc_ccm->ccsr);
-       struct mxc_pll_reg *pll = mxc_plls[index];
-
-       switch (index) {
-       case PLL1_CLOCK:
-               /* Switch ARM to PLL2 clock */
-               writel(ccsr | MXC_CCM_CCSR_PLL1_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
-                                       pll_param->mfi, pll_param->mfn,
-                                       pll_param->mfd);
-               /* Switch back */
-               writel(ccsr & ~MXC_CCM_CCSR_PLL1_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               break;
-       case PLL2_CLOCK:
-               /* Switch to pll2 bypass clock */
-               writel(ccsr | MXC_CCM_CCSR_PLL2_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
-                                       pll_param->mfi, pll_param->mfn,
-                                       pll_param->mfd);
-               /* Switch back */
-               writel(ccsr & ~MXC_CCM_CCSR_PLL2_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               break;
-       case PLL3_CLOCK:
-               /* Switch to pll3 bypass clock */
-               writel(ccsr | MXC_CCM_CCSR_PLL3_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
-                                       pll_param->mfi, pll_param->mfn,
-                                       pll_param->mfd);
-               /* Switch back */
-               writel(ccsr & ~MXC_CCM_CCSR_PLL3_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               break;
-#ifdef CONFIG_MX53
-       case PLL4_CLOCK:
-               /* Switch to pll4 bypass clock */
-               writel(ccsr | MXC_CCM_CCSR_PLL4_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
-                                       pll_param->mfi, pll_param->mfn,
-                                       pll_param->mfd);
-               /* Switch back */
-               writel(ccsr & ~MXC_CCM_CCSR_PLL4_SW_CLK_SEL,
-                               &mxc_ccm->ccsr);
-               break;
-#endif
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-/* Config CPU clock */
-static int config_core_clk(u32 ref, u32 freq)
-{
-       int ret = 0;
-       struct pll_param pll_param;
-
-       memset(&pll_param, 0, sizeof(struct pll_param));
-
-       /* The case that periph uses PLL1 is not considered here */
-       ret = calc_pll_params(ref, freq, &pll_param);
-       if (ret != 0) {
-               printf("Error:Can't find pll parameters: %d\n", ret);
-               return ret;
-       }
-
-       return config_pll_clk(PLL1_CLOCK, &pll_param);
-}
-
-static int config_nfc_clk(u32 nfc_clk)
-{
-       u32 parent_rate = get_emi_slow_clk();
-       u32 div;
-
-       if (nfc_clk == 0)
-               return -EINVAL;
-       div = parent_rate / nfc_clk;
-       if (div == 0)
-               div++;
-       if (parent_rate / div > NFC_CLK_MAX)
-               div++;
-       clrsetbits_le32(&mxc_ccm->cbcdr,
-                       MXC_CCM_CBCDR_NFC_PODF_MASK,
-                       MXC_CCM_CBCDR_NFC_PODF(div - 1));
-       while (readl(&mxc_ccm->cdhipr) != 0)
-               ;
-       return 0;
-}
-
-void enable_nfc_clk(unsigned char enable)
-{
-       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
-
-       clrsetbits_le32(&mxc_ccm->CCGR5,
-               MXC_CCM_CCGR5_EMI_ENFC(MXC_CCM_CCGR_CG_MASK),
-               MXC_CCM_CCGR5_EMI_ENFC(cg));
-}
-
-#ifdef CONFIG_FSL_IIM
-void enable_efuse_prog_supply(bool enable)
-{
-       if (enable)
-               setbits_le32(&mxc_ccm->cgpr,
-                            MXC_CCM_CGPR_EFUSE_PROG_SUPPLY_GATE);
-       else
-               clrbits_le32(&mxc_ccm->cgpr,
-                            MXC_CCM_CGPR_EFUSE_PROG_SUPPLY_GATE);
-}
-#endif
-
-/* Config main_bus_clock for periphs */
-static int config_periph_clk(u32 ref, u32 freq)
-{
-       int ret = 0;
-       struct pll_param pll_param;
-
-       memset(&pll_param, 0, sizeof(struct pll_param));
-
-       if (readl(&mxc_ccm->cbcdr) & MXC_CCM_CBCDR_PERIPH_CLK_SEL) {
-               ret = calc_pll_params(ref, freq, &pll_param);
-               if (ret != 0) {
-                       printf("Error:Can't find pll parameters: %d\n",
-                               ret);
-                       return ret;
-               }
-               switch (MXC_CCM_CBCMR_PERIPH_CLK_SEL_RD(
-                               readl(&mxc_ccm->cbcmr))) {
-               case 0:
-                       return config_pll_clk(PLL1_CLOCK, &pll_param);
-                       break;
-               case 1:
-                       return config_pll_clk(PLL3_CLOCK, &pll_param);
-                       break;
-               default:
-                       return -EINVAL;
-               }
-       }
-
-       return 0;
-}
-
-static int config_ddr_clk(u32 emi_clk)
-{
-       u32 clk_src;
-       s32 shift = 0, clk_sel, div = 1;
-       u32 cbcmr = readl(&mxc_ccm->cbcmr);
-
-       if (emi_clk > MAX_DDR_CLK) {
-               printf("Warning:DDR clock should not exceed %d MHz\n",
-                       MAX_DDR_CLK / SZ_DEC_1M);
-               emi_clk = MAX_DDR_CLK;
-       }
-
-       clk_src = get_periph_clk();
-       /* Find DDR clock input */
-       clk_sel = MXC_CCM_CBCMR_DDR_CLK_SEL_RD(cbcmr);
-       switch (clk_sel) {
-       case 0:
-               shift = 16;
-               break;
-       case 1:
-               shift = 19;
-               break;
-       case 2:
-               shift = 22;
-               break;
-       case 3:
-               shift = 10;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       if ((clk_src % emi_clk) < 10000000)
-               div = clk_src / emi_clk;
-       else
-               div = (clk_src / emi_clk) + 1;
-       if (div > 8)
-               div = 8;
-
-       clrsetbits_le32(&mxc_ccm->cbcdr, 0x7 << shift, (div - 1) << shift);
-       while (readl(&mxc_ccm->cdhipr) != 0)
-               ;
-       writel(0x0, &mxc_ccm->ccdr);
-
-       return 0;
-}
-
-/*
- * This function assumes the expected core clock has to be changed by
- * modifying the PLL. This is NOT true always but for most of the times,
- * it is. So it assumes the PLL output freq is the same as the expected
- * core clock (presc=1) unless the core clock is less than PLL_FREQ_MIN.
- * In the latter case, it will try to increase the presc value until
- * (presc*core_clk) is greater than PLL_FREQ_MIN. It then makes call to
- * calc_pll_params() and obtains the values of PD, MFI,MFN, MFD based
- * on the targeted PLL and reference input clock to the PLL. Lastly,
- * it sets the register based on these values along with the dividers.
- * Note 1) There is no value checking for the passed-in divider values
- *         so the caller has to make sure those values are sensible.
- *      2) Also adjust the NFC divider such that the NFC clock doesn't
- *         exceed NFC_CLK_MAX.
- *      3) IPU HSP clock is independent of AHB clock. Even it can go up to
- *         177MHz for higher voltage, this function fixes the max to 133MHz.
- *      4) This function should not have allowed diag_printf() calls since
- *         the serial driver has been stoped. But leave then here to allow
- *         easy debugging by NOT calling the cyg_hal_plf_serial_stop().
- */
-int mxc_set_clock(u32 ref, u32 freq, enum mxc_clock clk)
-{
-       freq *= SZ_DEC_1M;
-
-       switch (clk) {
-       case MXC_ARM_CLK:
-               if (config_core_clk(ref, freq))
-                       return -EINVAL;
-               break;
-       case MXC_PERIPH_CLK:
-               if (config_periph_clk(ref, freq))
-                       return -EINVAL;
-               break;
-       case MXC_DDR_CLK:
-               if (config_ddr_clk(freq))
-                       return -EINVAL;
-               break;
-       case MXC_NFC_CLK:
-               if (config_nfc_clk(freq))
-                       return -EINVAL;
-               break;
-       default:
-               printf("Warning:Unsupported or invalid clock type\n");
-       }
-
-       return 0;
-}
-
-#ifdef CONFIG_MX53
-/*
- * The clock for the external interface can be set to use internal clock
- * if fuse bank 4, row 3, bit 2 is set.
- * This is an undocumented feature and it was confirmed by Freescale's support:
- * Fuses (but not pins) may be used to configure SATA clocks.
- * Particularly the i.MX53 Fuse_Map contains the next information
- * about configuring SATA clocks :  SATA_ALT_REF_CLK[1:0] (offset 0x180C)
- * '00' - 100MHz (External)
- * '01' - 50MHz (External)
- * '10' - 120MHz, internal (USB PHY)
- * '11' - Reserved
-*/
-void mxc_set_sata_internal_clock(void)
-{
-       u32 *tmp_base =
-               (u32 *)(IIM_BASE_ADDR + 0x180c);
-
-       set_usb_phy_clk();
-
-       clrsetbits_le32(tmp_base, 0x6, 0x4);
-}
-#endif
-
-/*
- * Dump some core clockes.
- */
-int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       u32 freq;
-
-       freq = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
-       printf("PLL1       %8d MHz\n", freq / 1000000);
-       freq = decode_pll(mxc_plls[PLL2_CLOCK], MXC_HCLK);
-       printf("PLL2       %8d MHz\n", freq / 1000000);
-       freq = decode_pll(mxc_plls[PLL3_CLOCK], MXC_HCLK);
-       printf("PLL3       %8d MHz\n", freq / 1000000);
-#ifdef CONFIG_MX53
-       freq = decode_pll(mxc_plls[PLL4_CLOCK], MXC_HCLK);
-       printf("PLL4       %8d MHz\n", freq / 1000000);
-#endif
-
-       printf("\n");
-       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
-       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
-       printf("IPG PERCLK %8d kHz\n", mxc_get_clock(MXC_IPG_PERCLK) / 1000);
-       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
-#ifdef CONFIG_MXC_SPI
-       printf("CSPI       %8d kHz\n", mxc_get_clock(MXC_CSPI_CLK) / 1000);
-#endif
-       return 0;
-}
-
-/***************************************************/
-
-U_BOOT_CMD(
-       clocks, CONFIG_SYS_MAXARGS, 1, do_mx5_showclocks,
-       "display clocks",
-       ""
-);
diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S
deleted file mode 100644 (file)
index f5bc672..0000000
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <config.h>
-#include <asm/arch/imx-regs.h>
-#include <generated/asm-offsets.h>
-#include <linux/linkage.h>
-
-.section ".text.init", "x"
-
-.macro init_arm_erratum
-       /* ARM erratum ID #468414 */
-       mrc 15, 0, r1, c1, c0, 1
-       orr r1, r1, #(1 << 5)    /* enable L1NEON bit */
-       mcr 15, 0, r1, c1, c0, 1
-.endm
-
-/*
- * L2CC Cache setup/invalidation/disable
- */
-.macro init_l2cc
-       /* explicitly disable L2 cache */
-       mrc 15, 0, r0, c1, c0, 1
-       bic r0, r0, #0x2
-       mcr 15, 0, r0, c1, c0, 1
-
-       /* reconfigure L2 cache aux control reg */
-       ldr r0, =0xC0 |                 /* tag RAM */ \
-                0x4 |                  /* data RAM */ \
-                1 << 24 |              /* disable write allocate delay */ \
-                1 << 23 |              /* disable write allocate combine */ \
-                1 << 22                /* disable write allocate */
-
-#if defined(CONFIG_MX51)
-       ldr r3, [r4, #ROM_SI_REV]
-       cmp r3, #0x10
-
-       /* disable write combine for TO 2 and lower revs */
-       orrls r0, r0, #1 << 25
-#endif
-
-       mcr 15, 1, r0, c9, c0, 2
-
-       /* enable L2 cache */
-       mrc 15, 0, r0, c1, c0, 1
-       orr r0, r0, #2
-       mcr 15, 0, r0, c1, c0, 1
-
-.endm /* init_l2cc */
-
-/* AIPS setup - Only setup MPROTx registers.
- * The PACR default values are good.*/
-.macro init_aips
-       /*
-        * Set all MPROTx to be non-bufferable, trusted for R/W,
-        * not forced to user-mode.
-        */
-       ldr r0, =AIPS1_BASE_ADDR
-       ldr r1, =0x77777777
-       str r1, [r0, #0x0]
-       str r1, [r0, #0x4]
-       ldr r0, =AIPS2_BASE_ADDR
-       str r1, [r0, #0x0]
-       str r1, [r0, #0x4]
-       /*
-        * Clear the on and off peripheral modules Supervisor Protect bit
-        * for SDMA to access them. Did not change the AIPS control registers
-        * (offset 0x20) access type
-        */
-.endm /* init_aips */
-
-/* M4IF setup */
-.macro init_m4if
-#ifdef CONFIG_MX51
-       /* VPU and IPU given higher priority (0x4)
-        * IPU accesses with ID=0x1 given highest priority (=0xA)
-        */
-       ldr r0, =M4IF_BASE_ADDR
-
-       ldr r1, =0x00000203
-       str r1, [r0, #0x40]
-
-       str r4, [r0, #0x44]
-
-       ldr r1, =0x00120125
-       str r1, [r0, #0x9C]
-
-       ldr r1, =0x001901A3
-       str r1, [r0, #0x48]
-
-#endif
-.endm /* init_m4if */
-
-.macro setup_pll pll, freq
-       ldr r0, =\pll
-       adr r2, W_DP_\freq
-       bl setup_pll_func
-.endm
-
-#define W_DP_OP                0
-#define W_DP_MFD       4
-#define W_DP_MFN       8
-
-setup_pll_func:
-       ldr r1, =0x00001232
-       str r1, [r0, #PLL_DP_CTL] /* Set DPLL ON (set UPEN bit): BRMO=1 */
-       mov r1, #0x2
-       str r1, [r0, #PLL_DP_CONFIG] /* Enable auto-restart AREN bit */
-
-       ldr r1, [r2, #W_DP_OP]
-       str r1, [r0, #PLL_DP_OP]
-       str r1, [r0, #PLL_DP_HFS_OP]
-
-       ldr r1, [r2, #W_DP_MFD]
-       str r1, [r0, #PLL_DP_MFD]
-       str r1, [r0, #PLL_DP_HFS_MFD]
-
-       ldr r1, [r2, #W_DP_MFN]
-       str r1, [r0, #PLL_DP_MFN]
-       str r1, [r0, #PLL_DP_HFS_MFN]
-
-       ldr r1, =0x00001232
-       str r1, [r0, #PLL_DP_CTL]
-1:     ldr r1, [r0, #PLL_DP_CTL]
-       ands r1, r1, #0x1
-       beq 1b
-
-       /* r10 saved upper lr */
-       mov pc, lr
-
-.macro setup_pll_errata pll, freq
-       ldr r2, =\pll
-       str r4, [r2, #PLL_DP_CONFIG] /* Disable auto-restart AREN bit */
-       ldr r1, =0x00001236
-       str r1, [r2, #PLL_DP_CTL]    /* Restart PLL with PLM=1 */
-1:     ldr r1, [r2, #PLL_DP_CTL]    /* Wait for lock */
-       ands r1, r1, #0x1
-       beq 1b
-
-       ldr r5, \freq
-       str r5, [r2, #PLL_DP_MFN]    /* Modify MFN value */
-       str r5, [r2, #PLL_DP_HFS_MFN]
-
-       mov r1, #0x1
-       str r1, [r2, #PLL_DP_CONFIG] /* Reload MFN value */
-
-2:     ldr r1, [r2, #PLL_DP_CONFIG]
-       tst r1, #1
-       bne 2b
-
-       ldr r1, =100                 /* Wait at least 4 us */
-3:     subs r1, r1, #1
-       bge 3b
-
-       mov r1, #0x2
-       str r1, [r2, #PLL_DP_CONFIG] /* Enable auto-restart AREN bit */
-.endm
-
-.macro init_clock
-#if defined (CONFIG_MX51)
-       ldr r0, =CCM_BASE_ADDR
-
-       /* Gate of clocks to the peripherals first */
-       ldr r1, =0x3FFFFFFF
-       str r1, [r0, #CLKCTL_CCGR0]
-       str r4, [r0, #CLKCTL_CCGR1]
-       str r4, [r0, #CLKCTL_CCGR2]
-       str r4, [r0, #CLKCTL_CCGR3]
-
-       ldr r1, =0x00030000
-       str r1, [r0, #CLKCTL_CCGR4]
-       ldr r1, =0x00FFF030
-       str r1, [r0, #CLKCTL_CCGR5]
-       ldr r1, =0x00000300
-       str r1, [r0, #CLKCTL_CCGR6]
-
-       /* Disable IPU and HSC dividers */
-       mov r1, #0x60000
-       str r1, [r0, #CLKCTL_CCDR]
-
-       /* Make sure to switch the DDR away from PLL 1 */
-       ldr r1, =0x19239145
-       str r1, [r0, #CLKCTL_CBCDR]
-       /* make sure divider effective */
-1:     ldr r1, [r0, #CLKCTL_CDHIPR]
-       cmp r1, #0x0
-       bne 1b
-
-       /* Switch ARM to step clock */
-       mov r1, #0x4
-       str r1, [r0, #CLKCTL_CCSR]
-
-#if defined(CONFIG_MX51_PLL_ERRATA)
-       setup_pll PLL1_BASE_ADDR, 864
-       setup_pll_errata PLL1_BASE_ADDR, W_DP_MFN_800_DIT
-#else
-       setup_pll PLL1_BASE_ADDR, 800
-#endif
-
-       setup_pll PLL3_BASE_ADDR, 665
-
-       /* Switch peripheral to PLL 3 */
-       ldr r0, =CCM_BASE_ADDR
-       ldr r1, =0x000010C0 | CONFIG_SYS_DDR_CLKSEL
-       str r1, [r0, #CLKCTL_CBCMR]
-       ldr r1, =0x13239145
-       str r1, [r0, #CLKCTL_CBCDR]
-       setup_pll PLL2_BASE_ADDR, 665
-
-       /* Switch peripheral to PLL2 */
-       ldr r0, =CCM_BASE_ADDR
-       ldr r1, =0x19239145
-       str r1, [r0, #CLKCTL_CBCDR]
-       ldr r1, =0x000020C0 | CONFIG_SYS_DDR_CLKSEL
-       str r1, [r0, #CLKCTL_CBCMR]
-
-       setup_pll PLL3_BASE_ADDR, 216
-
-       /* Set the platform clock dividers */
-       ldr r0, =ARM_BASE_ADDR
-       ldr r1, =0x00000725
-       str r1, [r0, #0x14]
-
-       ldr r0, =CCM_BASE_ADDR
-
-       /* Run 3.0 at Full speed, for other TO's wait till we increase VDDGP */
-       ldr r3, [r4, #ROM_SI_REV]
-       cmp r3, #0x10
-       movls r1, #0x1
-       movhi r1, #0
-
-       str r1, [r0, #CLKCTL_CACRR]
-
-       /* Switch ARM back to PLL 1 */
-       str r4, [r0, #CLKCTL_CCSR]
-
-       /* setup the rest */
-       /* Use lp_apm (24MHz) source for perclk */
-       ldr r1, =0x000020C2 | CONFIG_SYS_DDR_CLKSEL
-       str r1, [r0, #CLKCTL_CBCMR]
-       /* ddr clock from PLL 1, all perclk dividers are 1 since using 24MHz */
-       ldr r1, =CONFIG_SYS_CLKTL_CBCDR
-       str r1, [r0, #CLKCTL_CBCDR]
-
-       /* Restore the default values in the Gate registers */
-       ldr r1, =0xFFFFFFFF
-       str r1, [r0, #CLKCTL_CCGR0]
-       str r1, [r0, #CLKCTL_CCGR1]
-       str r1, [r0, #CLKCTL_CCGR2]
-       str r1, [r0, #CLKCTL_CCGR3]
-       str r1, [r0, #CLKCTL_CCGR4]
-       str r1, [r0, #CLKCTL_CCGR5]
-       str r1, [r0, #CLKCTL_CCGR6]
-
-       /* Use PLL 2 for UART's, get 66.5MHz from it */
-       ldr r1, =0xA5A2A020
-       str r1, [r0, #CLKCTL_CSCMR1]
-       ldr r1, =0x00C30321
-       str r1, [r0, #CLKCTL_CSCDR1]
-       /* make sure divider effective */
-1:     ldr r1, [r0, #CLKCTL_CDHIPR]
-       cmp r1, #0x0
-       bne 1b
-
-       str r4, [r0, #CLKCTL_CCDR]
-
-       /* for cko - for ARM div by 8 */
-       mov r1, #0x000A0000
-       add r1, r1, #0x00000F0
-       str r1, [r0, #CLKCTL_CCOSR]
-#else  /* CONFIG_MX53 */
-       ldr r0, =CCM_BASE_ADDR
-
-       /* Gate of clocks to the peripherals first */
-       ldr r1, =0x3FFFFFFF
-       str r1, [r0, #CLKCTL_CCGR0]
-       str r4, [r0, #CLKCTL_CCGR1]
-       str r4, [r0, #CLKCTL_CCGR2]
-       str r4, [r0, #CLKCTL_CCGR3]
-       str r4, [r0, #CLKCTL_CCGR7]
-       ldr r1, =0x00030000
-       str r1, [r0, #CLKCTL_CCGR4]
-       ldr r1, =0x00FFF030
-       str r1, [r0, #CLKCTL_CCGR5]
-       ldr r1, =0x0F00030F
-       str r1, [r0, #CLKCTL_CCGR6]
-
-       /* Switch ARM to step clock */
-       mov r1, #0x4
-       str r1, [r0, #CLKCTL_CCSR]
-
-       setup_pll PLL1_BASE_ADDR, 800
-
-       setup_pll PLL3_BASE_ADDR, 400
-
-       /* Switch peripheral to PLL3 */
-       ldr r0, =CCM_BASE_ADDR
-       ldr r1, =0x00015154
-       str r1, [r0, #CLKCTL_CBCMR]
-       ldr r1, =0x02898945
-       str r1, [r0, #CLKCTL_CBCDR]
-       /* make sure change is effective */
-1:      ldr r1, [r0, #CLKCTL_CDHIPR]
-       cmp r1, #0x0
-       bne 1b
-
-       setup_pll PLL2_BASE_ADDR, 400
-
-       /* Switch peripheral to PLL2 */
-       ldr r0, =CCM_BASE_ADDR
-       ldr r1, =0x00888945
-       str r1, [r0, #CLKCTL_CBCDR]
-
-       ldr r1, =0x00016154
-       str r1, [r0, #CLKCTL_CBCMR]
-
-       /*change uart clk parent to pll2*/
-       ldr r1, [r0, #CLKCTL_CSCMR1]
-       and r1, r1, #0xfcffffff
-       orr r1, r1, #0x01000000
-       str r1, [r0, #CLKCTL_CSCMR1]
-
-       /* make sure change is effective */
-1:      ldr r1, [r0, #CLKCTL_CDHIPR]
-       cmp r1, #0x0
-       bne 1b
-
-       setup_pll PLL3_BASE_ADDR, 216
-
-       setup_pll PLL4_BASE_ADDR, 455
-
-       /* Set the platform clock dividers */
-       ldr r0, =ARM_BASE_ADDR
-       ldr r1, =0x00000124
-       str r1, [r0, #0x14]
-
-       ldr r0, =CCM_BASE_ADDR
-       mov r1, #0
-       str r1, [r0, #CLKCTL_CACRR]
-
-       /* Switch ARM back to PLL 1. */
-       mov r1, #0x0
-       str r1, [r0, #CLKCTL_CCSR]
-
-       /* make uart div=6 */
-       ldr r1, [r0, #CLKCTL_CSCDR1]
-       and r1, r1, #0xffffffc0
-       orr r1, r1, #0x0a
-       str r1, [r0, #CLKCTL_CSCDR1]
-
-       /* Restore the default values in the Gate registers */
-       ldr r1, =0xFFFFFFFF
-       str r1, [r0, #CLKCTL_CCGR0]
-       str r1, [r0, #CLKCTL_CCGR1]
-       str r1, [r0, #CLKCTL_CCGR2]
-       str r1, [r0, #CLKCTL_CCGR3]
-       str r1, [r0, #CLKCTL_CCGR4]
-       str r1, [r0, #CLKCTL_CCGR5]
-       str r1, [r0, #CLKCTL_CCGR6]
-       str r1, [r0, #CLKCTL_CCGR7]
-
-       mov r1, #0x00000
-       str r1, [r0, #CLKCTL_CCDR]
-
-       /* for cko - for ARM div by 8 */
-       mov r1, #0x000A0000
-       add r1, r1, #0x00000F0
-       str r1, [r0, #CLKCTL_CCOSR]
-
-#endif /* CONFIG_MX53 */
-.endm
-
-ENTRY(lowlevel_init)
-       mov r10, lr
-       mov r4, #0      /* Fix R4 to 0 */
-
-#if defined(CONFIG_SYS_MAIN_PWR_ON)
-       ldr r0, =GPIO1_BASE_ADDR
-       ldr r1, [r0, #0x0]
-       orr r1, r1, #1 << 23
-       str r1, [r0, #0x0]
-       ldr r1, [r0, #0x4]
-       orr r1, r1, #1 << 23
-       str r1, [r0, #0x4]
-#endif
-
-       init_arm_erratum
-
-       init_l2cc
-
-       init_aips
-
-       init_m4if
-
-       init_clock
-
-       mov pc, r10
-ENDPROC(lowlevel_init)
-
-/* Board level setting value */
-#if defined(CONFIG_MX51_PLL_ERRATA)
-W_DP_864:              .word DP_OP_864
-                       .word DP_MFD_864
-                       .word DP_MFN_864
-W_DP_MFN_800_DIT:      .word DP_MFN_800_DIT
-#else
-W_DP_800:              .word DP_OP_800
-                       .word DP_MFD_800
-                       .word DP_MFN_800
-#endif
-#if defined(CONFIG_MX51)
-W_DP_665:              .word DP_OP_665
-                       .word DP_MFD_665
-                       .word DP_MFN_665
-#endif
-W_DP_216:              .word DP_OP_216
-                       .word DP_MFD_216
-                       .word DP_MFN_216
-W_DP_400:               .word DP_OP_400
-                       .word DP_MFD_400
-                       .word DP_MFN_400
-W_DP_455:               .word DP_OP_455
-                       .word DP_MFD_455
-                       .word DP_MFN_455
diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c
deleted file mode 100644 (file)
index e6cc7cb..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * (C) Copyright 2007
- * Sascha Hauer, Pengutronix
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/imx-common/boot_mode.h>
-
-#if !(defined(CONFIG_MX51) || defined(CONFIG_MX53))
-#error "CPU_TYPE not defined"
-#endif
-
-u32 get_cpu_rev(void)
-{
-#ifdef CONFIG_MX51
-       int system_rev = 0x51000;
-#else
-       int system_rev = 0x53000;
-#endif
-       int reg = __raw_readl(ROM_SI_REV);
-
-#if defined(CONFIG_MX51)
-       switch (reg) {
-       case 0x02:
-               system_rev |= CHIP_REV_1_1;
-               break;
-       case 0x10:
-               if ((__raw_readl(GPIO1_BASE_ADDR + 0x0) & (0x1 << 22)) == 0)
-                       system_rev |= CHIP_REV_2_5;
-               else
-                       system_rev |= CHIP_REV_2_0;
-               break;
-       case 0x20:
-               system_rev |= CHIP_REV_3_0;
-               break;
-       default:
-               system_rev |= CHIP_REV_1_0;
-               break;
-       }
-#else
-       if (reg < 0x20)
-               system_rev |= CHIP_REV_1_0;
-       else
-               system_rev |= reg;
-#endif
-       return system_rev;
-}
-
-#ifdef CONFIG_REVISION_TAG
-u32 __weak get_board_rev(void)
-{
-       return get_cpu_rev();
-}
-#endif
-
-#ifndef CONFIG_SYS_DCACHE_OFF
-void enable_caches(void)
-{
-       /* Enable D-cache. I-cache is already enabled in start.S */
-       dcache_enable();
-}
-#endif
-
-#if defined(CONFIG_FEC_MXC)
-void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
-{
-       int i;
-       struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
-       struct fuse_bank *bank = &iim->bank[1];
-       struct fuse_bank1_regs *fuse =
-                       (struct fuse_bank1_regs *)bank->fuse_regs;
-
-       for (i = 0; i < 6; i++)
-               mac[i] = readl(&fuse->mac_addr[i]) & 0xff;
-}
-#endif
-
-#ifdef CONFIG_MX53
-void boot_mode_apply(unsigned cfg_val)
-{
-       writel(cfg_val, &((struct srtc_regs *)SRTC_BASE_ADDR)->lpgr);
-}
-/*
- * cfg_val will be used for
- * Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0]
- *
- * If bit 28 of LPGR is set upon watchdog reset,
- * bits[25:0] of LPGR will move to SBMR.
- */
-const struct boot_mode soc_boot_modes[] = {
-       {"normal",      MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)},
-       /* usb or serial download */
-       {"usb",         MAKE_CFGVAL(0x00, 0x00, 0x00, 0x13)},
-       {"sata",        MAKE_CFGVAL(0x28, 0x00, 0x00, 0x12)},
-       {"escpi1:0",    MAKE_CFGVAL(0x38, 0x20, 0x00, 0x12)},
-       {"escpi1:1",    MAKE_CFGVAL(0x38, 0x20, 0x04, 0x12)},
-       {"escpi1:2",    MAKE_CFGVAL(0x38, 0x20, 0x08, 0x12)},
-       {"escpi1:3",    MAKE_CFGVAL(0x38, 0x20, 0x0c, 0x12)},
-       /* 4 bit bus width */
-       {"esdhc1",      MAKE_CFGVAL(0x40, 0x20, 0x00, 0x12)},
-       {"esdhc2",      MAKE_CFGVAL(0x40, 0x20, 0x08, 0x12)},
-       {"esdhc3",      MAKE_CFGVAL(0x40, 0x20, 0x10, 0x12)},
-       {"esdhc4",      MAKE_CFGVAL(0x40, 0x20, 0x18, 0x12)},
-       {NULL,          0},
-};
-#endif
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
deleted file mode 100644 (file)
index 1595a76..0000000
+++ /dev/null
@@ -1,447 +0,0 @@
-if ARCH_MX6
-
-config MX6
-       bool
-       default y
-       select ARM_ERRATA_743622 if !MX6UL
-       select ARM_ERRATA_751472 if !MX6UL
-       select ARM_ERRATA_761320 if !MX6UL
-       select ARM_ERRATA_794072 if !MX6UL
-       imply CMD_FUSE
-
-config MX6D
-       bool
-
-config MX6DL
-       bool
-
-config MX6Q
-       bool
-
-config MX6QDL
-       bool
-
-config MX6S
-       bool
-
-config MX6SL
-       bool
-
-config MX6SX
-       select ROM_UNIFIED_SECTIONS
-       bool
-
-config MX6SLL
-       select ROM_UNIFIED_SECTIONS
-       bool
-
-config MX6UL
-       select SYS_L2CACHE_OFF
-       select ROM_UNIFIED_SECTIONS
-       bool
-
-config MX6UL_LITESOM
-       bool
-       select MX6UL
-       select DM
-       select DM_THERMAL
-       select SUPPORT_SPL
-
-config MX6UL_OPOS6UL
-       bool
-       select MX6UL
-       select BOARD_LATE_INIT
-       select DM
-       select DM_GPIO
-       select DM_MMC
-       select DM_THERMAL
-       select SUPPORT_SPL
-
-config MX6ULL
-       bool
-       select MX6UL
-
-config MX6_DDRCAL
-       bool "Include dynamic DDR calibration routines"
-       depends on SPL
-       default n
-       help
-         Say "Y" if your board uses dynamic (per-boot) DDR calibration.
-         If unsure, say N.
-
-choice
-       prompt "MX6 board select"
-       optional
-
-config TARGET_ADVANTECH_DMS_BA16
-       bool "Advantech dms-ba16"
-       select BOARD_LATE_INIT
-       select MX6Q
-       imply CMD_SATA
-
-config TARGET_APALIS_IMX6
-       bool "Toradex Apalis iMX6 board"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select DM
-       select DM_SERIAL
-       select DM_THERMAL
-       imply CMD_SATA
-
-config TARGET_ARISTAINETOS
-       bool "aristainetos"
-
-config TARGET_ARISTAINETOS2
-       bool "aristainetos2"
-       select BOARD_LATE_INIT
-
-config TARGET_ARISTAINETOS2B
-       bool "Support aristainetos2-revB"
-       select BOARD_LATE_INIT
-
-config TARGET_CGTQMX6EVAL
-       bool "cgtqmx6eval"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-
-config TARGET_CM_FX6
-       bool "CM-FX6"
-       select SUPPORT_SPL
-       select DM
-       select DM_SERIAL
-       select DM_GPIO
-
-config TARGET_COLIBRI_IMX6
-       bool "Toradex Colibri iMX6 board"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select DM
-       select DM_SERIAL
-       select DM_THERMAL
-
-config TARGET_EMBESTMX6BOARDS
-       bool "embestmx6boards"
-       select BOARD_LATE_INIT
-
-config TARGET_GE_B450V3
-       bool "General Electric B450v3"
-       select BOARD_LATE_INIT
-       select MX6Q
-
-config TARGET_GE_B650V3
-       bool "General Electric B650v3"
-       select BOARD_LATE_INIT
-       select MX6Q
-
-config TARGET_GE_B850V3
-       bool "General Electric B850v3"
-       select BOARD_LATE_INIT
-       select MX6Q
-
-config TARGET_GW_VENTANA
-       bool "gw_ventana"
-       select SUPPORT_SPL
-       imply CMD_SATA
-
-config TARGET_KOSAGI_NOVENA
-       bool "Kosagi Novena"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-
-config TARGET_MCCMON6
-       bool "mccmon6"
-       select SUPPORT_SPL
-
-config TARGET_MX6CUBOXI
-       bool "Solid-run mx6 boards"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-
-config TARGET_MX6LOGICPD
-       bool "Logic PD i.MX6 SOM"
-       select BOARD_EARLY_INIT_F
-       select BOARD_LATE_INIT
-       select DM
-       select DM_ETH
-       select DM_GPIO
-       select DM_I2C
-       select DM_MMC
-       select DM_PMIC
-       select DM_REGULATOR
-       select OF_CONTROL
-
-config TARGET_MX6QARM2
-       bool "mx6qarm2"
-
-config TARGET_MX6Q_ICORE
-       bool "Support Engicam i.Core"
-       select BOARD_LATE_INIT
-       select MX6QDL
-       select OF_CONTROL
-       select SPL_OF_LIBFDT
-       select DM
-       select DM_ETH
-       select DM_GPIO
-       select DM_I2C
-       select DM_MMC
-       select DM_THERMAL
-       select SUPPORT_SPL
-       select SPL_LOAD_FIT
-
-config TARGET_MX6Q_ICORE_RQS
-       bool "Support Engicam i.Core RQS"
-       select BOARD_LATE_INIT
-       select MX6QDL
-       select OF_CONTROL
-       select SPL_OF_LIBFDT
-       select DM
-       select DM_ETH
-       select DM_GPIO
-       select DM_I2C
-       select DM_MMC
-       select DM_THERMAL
-       select SUPPORT_SPL
-       select SPL_LOAD_FIT
-
-config TARGET_MX6SABREAUTO
-       bool "mx6sabreauto"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX6SABRESD
-       bool "mx6sabresd"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX6SLEVK
-       bool "mx6slevk"
-       select SUPPORT_SPL
-
-config TARGET_MX6SLLEVK
-        bool "mx6sll evk"
-       select BOARD_LATE_INIT
-        select MX6SLL
-        select DM
-        select DM_THERMAL
-
-config TARGET_MX6SXSABRESD
-       bool "mx6sxsabresd"
-       select MX6SX
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX6SXSABREAUTO
-        bool "mx6sxsabreauto"
-       select BOARD_LATE_INIT
-       select MX6SX
-        select DM
-        select DM_THERMAL
-       select BOARD_EARLY_INIT_F
-
-config TARGET_MX6UL_9X9_EVK
-       bool "mx6ul_9x9_evk"
-       select BOARD_LATE_INIT
-       select MX6UL
-       select DM
-       select DM_THERMAL
-       select SUPPORT_SPL
-
-config TARGET_MX6UL_14X14_EVK
-       select BOARD_LATE_INIT
-       bool "mx6ul_14x14_evk"
-       select MX6UL
-       select DM
-       select DM_THERMAL
-       select SUPPORT_SPL
-
-config TARGET_MX6UL_GEAM
-       bool "Support Engicam GEAM6UL"
-       select BOARD_LATE_INIT
-       select MX6UL
-       select OF_CONTROL
-       select DM
-       select DM_ETH
-       select DM_GPIO
-       select DM_I2C
-       select DM_MMC
-       select DM_THERMAL
-       select SUPPORT_SPL
-config TARGET_MX6UL_ISIOT
-       bool "Support Engicam Is.IoT MX6UL"
-       select BOARD_LATE_INIT
-       select MX6UL
-       select OF_CONTROL
-       select DM
-       select DM_ETH
-       select DM_GPIO
-       select DM_I2C
-       select DM_MMC
-       select DM_THERMAL
-       select SUPPORT_SPL
-
-config TARGET_MX6ULL_14X14_EVK
-       bool "Support mx6ull_14x14_evk"
-       select BOARD_LATE_INIT
-       select MX6ULL
-       select DM
-       select DM_THERMAL
-
-config TARGET_NITROGEN6X
-       bool "nitrogen6x"
-
-config TARGET_OPOS6ULDEV
-       bool "Armadeus OPOS6ULDev board"
-       select MX6UL_OPOS6UL
-
-config TARGET_OT1200
-       bool "Bachmann OT1200"
-       select SUPPORT_SPL
-       imply CMD_SATA
-
-config TARGET_PICO_IMX6UL
-       bool "PICO-IMX6UL-EMMC"
-       select MX6UL
-
-config TARGET_LITEBOARD
-       bool "Grinn liteBoard (i.MX6UL)"
-       select BOARD_LATE_INIT
-       select MX6UL_LITESOM
-
-config TARGET_PLATINUM_PICON
-       bool "platinum-picon"
-       select SUPPORT_SPL
-
-config TARGET_PLATINUM_TITANIUM
-       bool "platinum-titanium"
-       select SUPPORT_SPL
-
-config TARGET_PCM058
-       bool "Phytec PCM058 i.MX6 Quad"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-
-config TARGET_SECOMX6
-       bool "secomx6 boards"
-
-config TARGET_TBS2910
-       bool "TBS2910 Matrix ARM mini PC"
-
-config TARGET_TITANIUM
-       bool "titanium"
-
-config TARGET_TQMA6
-       bool "TQ Systems TQMa6 board"
-       select BOARD_LATE_INIT
-
-config TARGET_UDOO
-       bool "udoo"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-
-config TARGET_UDOO_NEO
-       bool "UDOO Neo"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select MX6SX
-       select DM
-       select DM_THERMAL
-
-config TARGET_SAMTEC_VINING_2000
-       bool "samtec VIN|ING 2000"
-       select BOARD_LATE_INIT
-       select MX6SX
-       select DM
-       select DM_THERMAL
-
-config TARGET_WANDBOARD
-       bool "wandboard"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-
-config TARGET_WARP
-       bool "WaRP"
-       select BOARD_LATE_INIT
-
-config TARGET_XPRESS
-       bool "CCV xPress"
-       select BOARD_LATE_INIT
-       select MX6UL
-       select DM
-       select DM_THERMAL
-       select SUPPORT_SPL
-
-config TARGET_ZC5202
-       bool "zc5202"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-
-config TARGET_ZC5601
-       bool "zc5601"
-       select BOARD_LATE_INIT
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-
-endchoice
-
-config SYS_SOC
-       default "mx6"
-
-source "board/ge/bx50v3/Kconfig"
-source "board/advantech/dms-ba16/Kconfig"
-source "board/aristainetos/Kconfig"
-source "board/armadeus/opos6uldev/Kconfig"
-source "board/bachmann/ot1200/Kconfig"
-source "board/barco/platinum/Kconfig"
-source "board/barco/titanium/Kconfig"
-source "board/boundary/nitrogen6x/Kconfig"
-source "board/ccv/xpress/Kconfig"
-source "board/compulab/cm_fx6/Kconfig"
-source "board/congatec/cgtqmx6eval/Kconfig"
-source "board/el/el6x/Kconfig"
-source "board/embest/mx6boards/Kconfig"
-source "board/engicam/geam6ul/Kconfig"
-source "board/engicam/icorem6/Kconfig"
-source "board/engicam/icorem6_rqs/Kconfig"
-source "board/engicam/isiotmx6ul/Kconfig"
-source "board/freescale/mx6qarm2/Kconfig"
-source "board/freescale/mx6sabreauto/Kconfig"
-source "board/freescale/mx6sabresd/Kconfig"
-source "board/freescale/mx6slevk/Kconfig"
-source "board/freescale/mx6sllevk/Kconfig"
-source "board/freescale/mx6sxsabresd/Kconfig"
-source "board/freescale/mx6sxsabreauto/Kconfig"
-source "board/freescale/mx6ul_14x14_evk/Kconfig"
-source "board/freescale/mx6ullevk/Kconfig"
-source "board/grinn/liteboard/Kconfig"
-source "board/phytec/pcm058/Kconfig"
-source "board/gateworks/gw_ventana/Kconfig"
-source "board/kosagi/novena/Kconfig"
-source "board/samtec/vining_2000/Kconfig"
-source "board/liebherr/mccmon6/Kconfig"
-source "board/logicpd/imx6/Kconfig"
-source "board/seco/Kconfig"
-source "board/solidrun/mx6cuboxi/Kconfig"
-source "board/technexion/pico-imx6ul/Kconfig"
-source "board/tbs/tbs2910/Kconfig"
-source "board/tqc/tqma6/Kconfig"
-source "board/toradex/apalis_imx6/Kconfig"
-source "board/toradex/colibri_imx6/Kconfig"
-source "board/udoo/Kconfig"
-source "board/udoo/neo/Kconfig"
-source "board/wandboard/Kconfig"
-source "board/warp/Kconfig"
-
-endif
diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile
deleted file mode 100644 (file)
index c183eb4..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2011 Freescale Semiconductor, Inc.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y  := soc.o clock.o
-obj-$(CONFIG_SPL_BUILD)             += ddr.o
-obj-$(CONFIG_MP)             += mp.o
-obj-$(CONFIG_MX6UL_LITESOM)  += litesom.o
-obj-$(CONFIG_MX6UL_OPOS6UL)  += opos6ul.o
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
deleted file mode 100644 (file)
index 1f2739e..0000000
+++ /dev/null
@@ -1,1486 +0,0 @@
-/*
- * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <div64.h>
-#include <asm/io.h>
-#include <linux/errno.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-
-enum pll_clocks {
-       PLL_SYS,        /* System PLL */
-       PLL_BUS,        /* System Bus PLL*/
-       PLL_USBOTG,     /* OTG USB PLL */
-       PLL_ENET,       /* ENET PLL */
-       PLL_AUDIO,      /* AUDIO PLL */
-       PLL_VIDEO,      /* AUDIO PLL */
-};
-
-struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-#ifdef CONFIG_MXC_OCOTP
-void enable_ocotp_clk(unsigned char enable)
-{
-       u32 reg;
-
-       reg = __raw_readl(&imx_ccm->CCGR2);
-       if (enable)
-               reg |= MXC_CCM_CCGR2_OCOTP_CTRL_MASK;
-       else
-               reg &= ~MXC_CCM_CCGR2_OCOTP_CTRL_MASK;
-       __raw_writel(reg, &imx_ccm->CCGR2);
-}
-#endif
-
-#ifdef CONFIG_NAND_MXS
-void setup_gpmi_io_clk(u32 cfg)
-{
-       /* Disable clocks per ERR007177 from MX6 errata */
-       clrbits_le32(&imx_ccm->CCGR4,
-                    MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-                    MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
-
-#if defined(CONFIG_MX6SX)
-       clrbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK);
-
-       clrsetbits_le32(&imx_ccm->cs2cdr,
-                       MXC_CCM_CS2CDR_QSPI2_CLK_PODF_MASK |
-                       MXC_CCM_CS2CDR_QSPI2_CLK_PRED_MASK |
-                       MXC_CCM_CS2CDR_QSPI2_CLK_SEL_MASK,
-                       cfg);
-
-       setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK);
-#else
-       clrbits_le32(&imx_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK);
-
-       clrsetbits_le32(&imx_ccm->cs2cdr,
-                       MXC_CCM_CS2CDR_ENFC_CLK_PODF_MASK |
-                       MXC_CCM_CS2CDR_ENFC_CLK_PRED_MASK |
-                       MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK,
-                       cfg);
-
-       setbits_le32(&imx_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK);
-#endif
-       setbits_le32(&imx_ccm->CCGR4,
-                    MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
-                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-                    MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
-}
-#endif
-
-void enable_usboh3_clk(unsigned char enable)
-{
-       u32 reg;
-
-       reg = __raw_readl(&imx_ccm->CCGR6);
-       if (enable)
-               reg |= MXC_CCM_CCGR6_USBOH3_MASK;
-       else
-               reg &= ~(MXC_CCM_CCGR6_USBOH3_MASK);
-       __raw_writel(reg, &imx_ccm->CCGR6);
-
-}
-
-#if defined(CONFIG_FEC_MXC) && !defined(CONFIG_MX6SX)
-void enable_enet_clk(unsigned char enable)
-{
-       u32 mask, *addr;
-
-       if (is_mx6ull()) {
-               mask = MXC_CCM_CCGR0_ENET_CLK_ENABLE_MASK;
-               addr = &imx_ccm->CCGR0;
-       } else if (is_mx6ul()) {
-               mask = MXC_CCM_CCGR3_ENET_MASK;
-               addr = &imx_ccm->CCGR3;
-       } else {
-               mask = MXC_CCM_CCGR1_ENET_MASK;
-               addr = &imx_ccm->CCGR1;
-       }
-
-       if (enable)
-               setbits_le32(addr, mask);
-       else
-               clrbits_le32(addr, mask);
-}
-#endif
-
-#ifdef CONFIG_MXC_UART
-void enable_uart_clk(unsigned char enable)
-{
-       u32 mask;
-
-       if (is_mx6ul() || is_mx6ull())
-               mask = MXC_CCM_CCGR5_UART_MASK;
-       else
-               mask = MXC_CCM_CCGR5_UART_MASK | MXC_CCM_CCGR5_UART_SERIAL_MASK;
-
-       if (enable)
-               setbits_le32(&imx_ccm->CCGR5, mask);
-       else
-               clrbits_le32(&imx_ccm->CCGR5, mask);
-}
-#endif
-
-#ifdef CONFIG_MMC
-int enable_usdhc_clk(unsigned char enable, unsigned bus_num)
-{
-       u32 mask;
-
-       if (bus_num > 3)
-               return -EINVAL;
-
-       mask = MXC_CCM_CCGR_CG_MASK << (bus_num * 2 + 2);
-       if (enable)
-               setbits_le32(&imx_ccm->CCGR6, mask);
-       else
-               clrbits_le32(&imx_ccm->CCGR6, mask);
-
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_SYS_I2C_MXC
-/* i2c_num can be from 0 - 3 */
-int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
-{
-       u32 reg;
-       u32 mask;
-       u32 *addr;
-
-       if (i2c_num > 3)
-               return -EINVAL;
-       if (i2c_num < 3) {
-               mask = MXC_CCM_CCGR_CG_MASK
-                       << (MXC_CCM_CCGR2_I2C1_SERIAL_OFFSET
-                       + (i2c_num << 1));
-               reg = __raw_readl(&imx_ccm->CCGR2);
-               if (enable)
-                       reg |= mask;
-               else
-                       reg &= ~mask;
-               __raw_writel(reg, &imx_ccm->CCGR2);
-       } else {
-               if (is_mx6sll())
-                       return -EINVAL;
-               if (is_mx6sx() || is_mx6ul() || is_mx6ull()) {
-                       mask = MXC_CCM_CCGR6_I2C4_MASK;
-                       addr = &imx_ccm->CCGR6;
-               } else {
-                       mask = MXC_CCM_CCGR1_I2C4_SERIAL_MASK;
-                       addr = &imx_ccm->CCGR1;
-               }
-               reg = __raw_readl(addr);
-               if (enable)
-                       reg |= mask;
-               else
-                       reg &= ~mask;
-               __raw_writel(reg, addr);
-       }
-       return 0;
-}
-#endif
-
-/* spi_num can be from 0 - SPI_MAX_NUM */
-int enable_spi_clk(unsigned char enable, unsigned spi_num)
-{
-       u32 reg;
-       u32 mask;
-
-       if (spi_num > SPI_MAX_NUM)
-               return -EINVAL;
-
-       mask = MXC_CCM_CCGR_CG_MASK << (spi_num << 1);
-       reg = __raw_readl(&imx_ccm->CCGR1);
-       if (enable)
-               reg |= mask;
-       else
-               reg &= ~mask;
-       __raw_writel(reg, &imx_ccm->CCGR1);
-       return 0;
-}
-static u32 decode_pll(enum pll_clocks pll, u32 infreq)
-{
-       u32 div, test_div, pll_num, pll_denom;
-
-       switch (pll) {
-       case PLL_SYS:
-               div = __raw_readl(&imx_ccm->analog_pll_sys);
-               div &= BM_ANADIG_PLL_SYS_DIV_SELECT;
-
-               return (infreq * div) >> 1;
-       case PLL_BUS:
-               div = __raw_readl(&imx_ccm->analog_pll_528);
-               div &= BM_ANADIG_PLL_528_DIV_SELECT;
-
-               return infreq * (20 + (div << 1));
-       case PLL_USBOTG:
-               div = __raw_readl(&imx_ccm->analog_usb1_pll_480_ctrl);
-               div &= BM_ANADIG_USB1_PLL_480_CTRL_DIV_SELECT;
-
-               return infreq * (20 + (div << 1));
-       case PLL_ENET:
-               div = __raw_readl(&imx_ccm->analog_pll_enet);
-               div &= BM_ANADIG_PLL_ENET_DIV_SELECT;
-
-               return 25000000 * (div + (div >> 1) + 1);
-       case PLL_AUDIO:
-               div = __raw_readl(&imx_ccm->analog_pll_audio);
-               if (!(div & BM_ANADIG_PLL_AUDIO_ENABLE))
-                       return 0;
-               /* BM_ANADIG_PLL_AUDIO_BYPASS_CLK_SRC is ignored */
-               if (div & BM_ANADIG_PLL_AUDIO_BYPASS)
-                       return MXC_HCLK;
-               pll_num = __raw_readl(&imx_ccm->analog_pll_audio_num);
-               pll_denom = __raw_readl(&imx_ccm->analog_pll_audio_denom);
-               test_div = (div & BM_ANADIG_PLL_AUDIO_TEST_DIV_SELECT) >>
-                       BP_ANADIG_PLL_AUDIO_TEST_DIV_SELECT;
-               div &= BM_ANADIG_PLL_AUDIO_DIV_SELECT;
-               if (test_div == 3) {
-                       debug("Error test_div\n");
-                       return 0;
-               }
-               test_div = 1 << (2 - test_div);
-
-               return infreq * (div + pll_num / pll_denom) / test_div;
-       case PLL_VIDEO:
-               div = __raw_readl(&imx_ccm->analog_pll_video);
-               if (!(div & BM_ANADIG_PLL_VIDEO_ENABLE))
-                       return 0;
-               /* BM_ANADIG_PLL_AUDIO_BYPASS_CLK_SRC is ignored */
-               if (div & BM_ANADIG_PLL_VIDEO_BYPASS)
-                       return MXC_HCLK;
-               pll_num = __raw_readl(&imx_ccm->analog_pll_video_num);
-               pll_denom = __raw_readl(&imx_ccm->analog_pll_video_denom);
-               test_div = (div & BM_ANADIG_PLL_VIDEO_POST_DIV_SELECT) >>
-                       BP_ANADIG_PLL_VIDEO_POST_DIV_SELECT;
-               div &= BM_ANADIG_PLL_VIDEO_DIV_SELECT;
-               if (test_div == 3) {
-                       debug("Error test_div\n");
-                       return 0;
-               }
-               test_div = 1 << (2 - test_div);
-
-               return infreq * (div + pll_num / pll_denom) / test_div;
-       default:
-               return 0;
-       }
-       /* NOTREACHED */
-}
-static u32 mxc_get_pll_pfd(enum pll_clocks pll, int pfd_num)
-{
-       u32 div;
-       u64 freq;
-
-       switch (pll) {
-       case PLL_BUS:
-               if (!is_mx6ul() && !is_mx6ull()) {
-                       if (pfd_num == 3) {
-                               /* No PFD3 on PLL2 */
-                               return 0;
-                       }
-               }
-               div = __raw_readl(&imx_ccm->analog_pfd_528);
-               freq = (u64)decode_pll(PLL_BUS, MXC_HCLK);
-               break;
-       case PLL_USBOTG:
-               div = __raw_readl(&imx_ccm->analog_pfd_480);
-               freq = (u64)decode_pll(PLL_USBOTG, MXC_HCLK);
-               break;
-       default:
-               /* No PFD on other PLL                                       */
-               return 0;
-       }
-
-       return lldiv(freq * 18, (div & ANATOP_PFD_FRAC_MASK(pfd_num)) >>
-                             ANATOP_PFD_FRAC_SHIFT(pfd_num));
-}
-
-static u32 get_mcu_main_clk(void)
-{
-       u32 reg, freq;
-
-       reg = __raw_readl(&imx_ccm->cacrr);
-       reg &= MXC_CCM_CACRR_ARM_PODF_MASK;
-       reg >>= MXC_CCM_CACRR_ARM_PODF_OFFSET;
-       freq = decode_pll(PLL_SYS, MXC_HCLK);
-
-       return freq / (reg + 1);
-}
-
-u32 get_periph_clk(void)
-{
-       u32 reg, div = 0, freq = 0;
-
-       reg = __raw_readl(&imx_ccm->cbcdr);
-       if (reg & MXC_CCM_CBCDR_PERIPH_CLK_SEL) {
-               div = (reg & MXC_CCM_CBCDR_PERIPH_CLK2_PODF_MASK) >>
-                      MXC_CCM_CBCDR_PERIPH_CLK2_PODF_OFFSET;
-               reg = __raw_readl(&imx_ccm->cbcmr);
-               reg &= MXC_CCM_CBCMR_PERIPH_CLK2_SEL_MASK;
-               reg >>= MXC_CCM_CBCMR_PERIPH_CLK2_SEL_OFFSET;
-
-               switch (reg) {
-               case 0:
-                       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
-                       break;
-               case 1:
-               case 2:
-                       freq = MXC_HCLK;
-                       break;
-               default:
-                       break;
-               }
-       } else {
-               reg = __raw_readl(&imx_ccm->cbcmr);
-               reg &= MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_MASK;
-               reg >>= MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_OFFSET;
-
-               switch (reg) {
-               case 0:
-                       freq = decode_pll(PLL_BUS, MXC_HCLK);
-                       break;
-               case 1:
-                       freq = mxc_get_pll_pfd(PLL_BUS, 2);
-                       break;
-               case 2:
-                       freq = mxc_get_pll_pfd(PLL_BUS, 0);
-                       break;
-               case 3:
-                       /* static / 2 divider */
-                       freq = mxc_get_pll_pfd(PLL_BUS, 2) / 2;
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       return freq / (div + 1);
-}
-
-static u32 get_ipg_clk(void)
-{
-       u32 reg, ipg_podf;
-
-       reg = __raw_readl(&imx_ccm->cbcdr);
-       reg &= MXC_CCM_CBCDR_IPG_PODF_MASK;
-       ipg_podf = reg >> MXC_CCM_CBCDR_IPG_PODF_OFFSET;
-
-       return get_ahb_clk() / (ipg_podf + 1);
-}
-
-static u32 get_ipg_per_clk(void)
-{
-       u32 reg, perclk_podf;
-
-       reg = __raw_readl(&imx_ccm->cscmr1);
-       if (is_mx6sll() || is_mx6sl() || is_mx6sx() ||
-           is_mx6dqp() || is_mx6ul() || is_mx6ull()) {
-               if (reg & MXC_CCM_CSCMR1_PER_CLK_SEL_MASK)
-                       return MXC_HCLK; /* OSC 24Mhz */
-       }
-
-       perclk_podf = reg & MXC_CCM_CSCMR1_PERCLK_PODF_MASK;
-
-       return get_ipg_clk() / (perclk_podf + 1);
-}
-
-static u32 get_uart_clk(void)
-{
-       u32 reg, uart_podf;
-       u32 freq = decode_pll(PLL_USBOTG, MXC_HCLK) / 6; /* static divider */
-       reg = __raw_readl(&imx_ccm->cscdr1);
-
-       if (is_mx6sl() || is_mx6sx() || is_mx6dqp() || is_mx6ul() ||
-           is_mx6sll() || is_mx6ull()) {
-               if (reg & MXC_CCM_CSCDR1_UART_CLK_SEL)
-                       freq = MXC_HCLK;
-       }
-
-       reg &= MXC_CCM_CSCDR1_UART_CLK_PODF_MASK;
-       uart_podf = reg >> MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET;
-
-       return freq / (uart_podf + 1);
-}
-
-static u32 get_cspi_clk(void)
-{
-       u32 reg, cspi_podf;
-
-       reg = __raw_readl(&imx_ccm->cscdr2);
-       cspi_podf = (reg & MXC_CCM_CSCDR2_ECSPI_CLK_PODF_MASK) >>
-                    MXC_CCM_CSCDR2_ECSPI_CLK_PODF_OFFSET;
-
-       if (is_mx6dqp() || is_mx6sl() || is_mx6sx() || is_mx6ul() ||
-           is_mx6sll() || is_mx6ull()) {
-               if (reg & MXC_CCM_CSCDR2_ECSPI_CLK_SEL_MASK)
-                       return MXC_HCLK / (cspi_podf + 1);
-       }
-
-       return  decode_pll(PLL_USBOTG, MXC_HCLK) / (8 * (cspi_podf + 1));
-}
-
-static u32 get_axi_clk(void)
-{
-       u32 root_freq, axi_podf;
-       u32 cbcdr =  __raw_readl(&imx_ccm->cbcdr);
-
-       axi_podf = cbcdr & MXC_CCM_CBCDR_AXI_PODF_MASK;
-       axi_podf >>= MXC_CCM_CBCDR_AXI_PODF_OFFSET;
-
-       if (cbcdr & MXC_CCM_CBCDR_AXI_SEL) {
-               if (cbcdr & MXC_CCM_CBCDR_AXI_ALT_SEL)
-                       root_freq = mxc_get_pll_pfd(PLL_USBOTG, 1);
-               else
-                       root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
-       } else
-               root_freq = get_periph_clk();
-
-       return  root_freq / (axi_podf + 1);
-}
-
-static u32 get_emi_slow_clk(void)
-{
-       u32 emi_clk_sel, emi_slow_podf, cscmr1, root_freq = 0;
-
-       cscmr1 =  __raw_readl(&imx_ccm->cscmr1);
-       emi_clk_sel = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_MASK;
-       emi_clk_sel >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_OFFSET;
-       emi_slow_podf = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_MASK;
-       emi_slow_podf >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_OFFSET;
-
-       switch (emi_clk_sel) {
-       case 0:
-               root_freq = get_axi_clk();
-               break;
-       case 1:
-               root_freq = decode_pll(PLL_USBOTG, MXC_HCLK);
-               break;
-       case 2:
-               root_freq =  mxc_get_pll_pfd(PLL_BUS, 2);
-               break;
-       case 3:
-               root_freq =  mxc_get_pll_pfd(PLL_BUS, 0);
-               break;
-       }
-
-       return root_freq / (emi_slow_podf + 1);
-}
-
-static u32 get_mmdc_ch0_clk(void)
-{
-       u32 cbcmr = __raw_readl(&imx_ccm->cbcmr);
-       u32 cbcdr = __raw_readl(&imx_ccm->cbcdr);
-
-       u32 freq, podf, per2_clk2_podf, pmu_misc2_audio_div;
-
-       if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sl() ||
-           is_mx6sll()) {
-               podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH1_PODF_MASK) >>
-                       MXC_CCM_CBCDR_MMDC_CH1_PODF_OFFSET;
-               if (cbcdr & MXC_CCM_CBCDR_PERIPH2_CLK_SEL) {
-                       per2_clk2_podf = (cbcdr & MXC_CCM_CBCDR_PERIPH2_CLK2_PODF_MASK) >>
-                               MXC_CCM_CBCDR_PERIPH2_CLK2_PODF_OFFSET;
-                       if (is_mx6sl()) {
-                               if (cbcmr & MXC_CCM_CBCMR_PERIPH2_CLK2_SEL)
-                                       freq = MXC_HCLK;
-                               else
-                                       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
-                       } else {
-                               if (cbcmr & MXC_CCM_CBCMR_PERIPH2_CLK2_SEL)
-                                       freq = decode_pll(PLL_BUS, MXC_HCLK);
-                               else
-                                       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
-                       }
-               } else {
-                       per2_clk2_podf = 0;
-                       switch ((cbcmr &
-                               MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_MASK) >>
-                               MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_OFFSET) {
-                       case 0:
-                               freq = decode_pll(PLL_BUS, MXC_HCLK);
-                               break;
-                       case 1:
-                               freq = mxc_get_pll_pfd(PLL_BUS, 2);
-                               break;
-                       case 2:
-                               freq = mxc_get_pll_pfd(PLL_BUS, 0);
-                               break;
-                       case 3:
-                               if (is_mx6sl()) {
-                                       freq = mxc_get_pll_pfd(PLL_BUS, 2) >> 1;
-                                       break;
-                               }
-
-                               pmu_misc2_audio_div = PMU_MISC2_AUDIO_DIV(__raw_readl(&imx_ccm->pmu_misc2));
-                               switch (pmu_misc2_audio_div) {
-                               case 0:
-                               case 2:
-                                       pmu_misc2_audio_div = 1;
-                                       break;
-                               case 1:
-                                       pmu_misc2_audio_div = 2;
-                                       break;
-                               case 3:
-                                       pmu_misc2_audio_div = 4;
-                                       break;
-                               }
-                               freq = decode_pll(PLL_AUDIO, MXC_HCLK) /
-                                       pmu_misc2_audio_div;
-                               break;
-                       }
-               }
-               return freq / (podf + 1) / (per2_clk2_podf + 1);
-       } else {
-               podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH0_PODF_MASK) >>
-                       MXC_CCM_CBCDR_MMDC_CH0_PODF_OFFSET;
-               return get_periph_clk() / (podf + 1);
-       }
-}
-
-#if defined(CONFIG_VIDEO_MXS)
-static int enable_pll_video(u32 pll_div, u32 pll_num, u32 pll_denom,
-                           u32 post_div)
-{
-       u32 reg = 0;
-       ulong start;
-
-       debug("pll5 div = %d, num = %d, denom = %d\n",
-             pll_div, pll_num, pll_denom);
-
-       /* Power up PLL5 video */
-       writel(BM_ANADIG_PLL_VIDEO_POWERDOWN |
-              BM_ANADIG_PLL_VIDEO_BYPASS |
-              BM_ANADIG_PLL_VIDEO_DIV_SELECT |
-              BM_ANADIG_PLL_VIDEO_POST_DIV_SELECT,
-              &imx_ccm->analog_pll_video_clr);
-
-       /* Set div, num and denom */
-       switch (post_div) {
-       case 1:
-               writel(BF_ANADIG_PLL_VIDEO_DIV_SELECT(pll_div) |
-                      BF_ANADIG_PLL_VIDEO_POST_DIV_SELECT(0x2),
-                      &imx_ccm->analog_pll_video_set);
-               break;
-       case 2:
-               writel(BF_ANADIG_PLL_VIDEO_DIV_SELECT(pll_div) |
-                      BF_ANADIG_PLL_VIDEO_POST_DIV_SELECT(0x1),
-                      &imx_ccm->analog_pll_video_set);
-               break;
-       case 4:
-               writel(BF_ANADIG_PLL_VIDEO_DIV_SELECT(pll_div) |
-                      BF_ANADIG_PLL_VIDEO_POST_DIV_SELECT(0x0),
-                      &imx_ccm->analog_pll_video_set);
-               break;
-       default:
-               puts("Wrong test_div!\n");
-               return -EINVAL;
-       }
-
-       writel(BF_ANADIG_PLL_VIDEO_NUM_A(pll_num),
-              &imx_ccm->analog_pll_video_num);
-       writel(BF_ANADIG_PLL_VIDEO_DENOM_B(pll_denom),
-              &imx_ccm->analog_pll_video_denom);
-
-       /* Wait PLL5 lock */
-       start = get_timer(0);   /* Get current timestamp */
-
-       do {
-               reg = readl(&imx_ccm->analog_pll_video);
-               if (reg & BM_ANADIG_PLL_VIDEO_LOCK) {
-                       /* Enable PLL out */
-                       writel(BM_ANADIG_PLL_VIDEO_ENABLE,
-                              &imx_ccm->analog_pll_video_set);
-                       return 0;
-               }
-       } while (get_timer(0) < (start + 10)); /* Wait 10ms */
-
-       puts("Lock PLL5 timeout\n");
-
-       return -ETIME;
-}
-
-/*
- * 24M--> PLL_VIDEO -> LCDIFx_PRED -> LCDIFx_PODF -> LCD
- *
- * 'freq' using KHz as unit, see driver/video/mxsfb.c.
- */
-void mxs_set_lcdclk(u32 base_addr, u32 freq)
-{
-       u32 reg = 0;
-       u32 hck = MXC_HCLK / 1000;
-       /* DIV_SELECT ranges from 27 to 54 */
-       u32 min = hck * 27;
-       u32 max = hck * 54;
-       u32 temp, best = 0;
-       u32 i, j, max_pred = 8, max_postd = 8, pred = 1, postd = 1;
-       u32 pll_div, pll_num, pll_denom, post_div = 1;
-
-       debug("mxs_set_lcdclk, freq = %dKHz\n", freq);
-
-       if (!is_mx6sx() && !is_mx6ul() && !is_mx6ull() && !is_mx6sl() &&
-           !is_mx6sll()) {
-               debug("This chip not support lcd!\n");
-               return;
-       }
-
-       if (!is_mx6sl()) {
-               if (base_addr == LCDIF1_BASE_ADDR) {
-                       reg = readl(&imx_ccm->cscdr2);
-                       /* Can't change clocks when clock not from pre-mux */
-                       if ((reg & MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_MASK) != 0)
-                               return;
-               }
-       }
-
-       if (is_mx6sx()) {
-               reg = readl(&imx_ccm->cscdr2);
-               /* Can't change clocks when clock not from pre-mux */
-               if ((reg & MXC_CCM_CSCDR2_LCDIF2_CLK_SEL_MASK) != 0)
-                       return;
-       }
-
-       temp = freq * max_pred * max_postd;
-       if (temp < min) {
-               /*
-                * Register: PLL_VIDEO
-                * Bit Field: POST_DIV_SELECT
-                * 00 — Divide by 4.
-                * 01 — Divide by 2.
-                * 10 — Divide by 1.
-                * 11 — Reserved
-                * No need to check post_div(1)
-                */
-               for (post_div = 2; post_div <= 4; post_div <<= 1) {
-                       if ((temp * post_div) > min) {
-                               freq *= post_div;
-                               break;
-                       }
-               }
-
-               if (post_div > 4) {
-                       printf("Fail to set rate to %dkhz", freq);
-                       return;
-               }
-       }
-
-       /* Choose the best pred and postd to match freq for lcd */
-       for (i = 1; i <= max_pred; i++) {
-               for (j = 1; j <= max_postd; j++) {
-                       temp = freq * i * j;
-                       if (temp > max || temp < min)
-                               continue;
-                       if (best == 0 || temp < best) {
-                               best = temp;
-                               pred = i;
-                               postd = j;
-                       }
-               }
-       }
-
-       if (best == 0) {
-               printf("Fail to set rate to %dKHz", freq);
-               return;
-       }
-
-       debug("best %d, pred = %d, postd = %d\n", best, pred, postd);
-
-       pll_div = best / hck;
-       pll_denom = 1000000;
-       pll_num = (best - hck * pll_div) * pll_denom / hck;
-
-       /*
-        *                                  pll_num
-        *             (24MHz * (pll_div + --------- ))
-        *                                 pll_denom
-        *freq KHz =  --------------------------------
-        *             post_div * pred * postd * 1000
-        */
-
-       if (base_addr == LCDIF1_BASE_ADDR) {
-               if (enable_pll_video(pll_div, pll_num, pll_denom, post_div))
-                       return;
-
-               enable_lcdif_clock(base_addr, 0);
-               if (!is_mx6sl()) {
-                       /* Select pre-lcd clock to PLL5 and set pre divider */
-                       clrsetbits_le32(&imx_ccm->cscdr2,
-                                       MXC_CCM_CSCDR2_LCDIF1_PRED_SEL_MASK |
-                                       MXC_CCM_CSCDR2_LCDIF1_PRE_DIV_MASK,
-                                       (0x2 << MXC_CCM_CSCDR2_LCDIF1_PRED_SEL_OFFSET) |
-                                       ((pred - 1) <<
-                                        MXC_CCM_CSCDR2_LCDIF1_PRE_DIV_OFFSET));
-
-                       /* Set the post divider */
-                       clrsetbits_le32(&imx_ccm->cbcmr,
-                                       MXC_CCM_CBCMR_LCDIF1_PODF_MASK,
-                                       ((postd - 1) <<
-                                       MXC_CCM_CBCMR_LCDIF1_PODF_OFFSET));
-               } else {
-                       /* Select pre-lcd clock to PLL5 and set pre divider */
-                       clrsetbits_le32(&imx_ccm->cscdr2,
-                                       MXC_CCM_CSCDR2_LCDIF_PIX_CLK_SEL_MASK |
-                                       MXC_CCM_CSCDR2_LCDIF_PIX_PRE_DIV_MASK,
-                                       (0x2 << MXC_CCM_CSCDR2_LCDIF_PIX_CLK_SEL_OFFSET) |
-                                       ((pred - 1) <<
-                                        MXC_CCM_CSCDR2_LCDIF_PIX_PRE_DIV_OFFSET));
-
-                       /* Set the post divider */
-                       clrsetbits_le32(&imx_ccm->cscmr1,
-                                       MXC_CCM_CSCMR1_LCDIF_PIX_PODF_MASK,
-                                       (((postd - 1)^0x6) <<
-                                        MXC_CCM_CSCMR1_LCDIF_PIX_PODF_OFFSET));
-               }
-
-               enable_lcdif_clock(base_addr, 1);
-       } else if (is_mx6sx()) {
-               /* Setting LCDIF2 for i.MX6SX */
-               if (enable_pll_video(pll_div, pll_num, pll_denom, post_div))
-                       return;
-
-               enable_lcdif_clock(base_addr, 0);
-               /* Select pre-lcd clock to PLL5 and set pre divider */
-               clrsetbits_le32(&imx_ccm->cscdr2,
-                               MXC_CCM_CSCDR2_LCDIF2_PRED_SEL_MASK |
-                               MXC_CCM_CSCDR2_LCDIF2_PRE_DIV_MASK,
-                               (0x2 << MXC_CCM_CSCDR2_LCDIF2_PRED_SEL_OFFSET) |
-                               ((pred - 1) <<
-                                MXC_CCM_CSCDR2_LCDIF2_PRE_DIV_OFFSET));
-
-               /* Set the post divider */
-               clrsetbits_le32(&imx_ccm->cscmr1,
-                               MXC_CCM_CSCMR1_LCDIF2_PODF_MASK,
-                               ((postd - 1) <<
-                                MXC_CCM_CSCMR1_LCDIF2_PODF_OFFSET));
-
-               enable_lcdif_clock(base_addr, 1);
-       }
-}
-
-int enable_lcdif_clock(u32 base_addr, bool enable)
-{
-       u32 reg = 0;
-       u32 lcdif_clk_sel_mask, lcdif_ccgr3_mask;
-
-       if (is_mx6sx()) {
-               if ((base_addr != LCDIF1_BASE_ADDR) &&
-                   (base_addr != LCDIF2_BASE_ADDR)) {
-                       puts("Wrong LCD interface!\n");
-                       return -EINVAL;
-               }
-               /* Set to pre-mux clock at default */
-               lcdif_clk_sel_mask = (base_addr == LCDIF2_BASE_ADDR) ?
-                       MXC_CCM_CSCDR2_LCDIF2_CLK_SEL_MASK :
-                       MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_MASK;
-               lcdif_ccgr3_mask = (base_addr == LCDIF2_BASE_ADDR) ?
-                       (MXC_CCM_CCGR3_LCDIF2_PIX_MASK |
-                        MXC_CCM_CCGR3_DISP_AXI_MASK) :
-                       (MXC_CCM_CCGR3_LCDIF1_PIX_MASK |
-                        MXC_CCM_CCGR3_DISP_AXI_MASK);
-       } else if (is_mx6ul() || is_mx6ull() || is_mx6sll()) {
-               if (base_addr != LCDIF1_BASE_ADDR) {
-                       puts("Wrong LCD interface!\n");
-                       return -EINVAL;
-               }
-               /* Set to pre-mux clock at default */
-               lcdif_clk_sel_mask = MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_MASK;
-               lcdif_ccgr3_mask =  MXC_CCM_CCGR3_LCDIF1_PIX_MASK;
-       } else if (is_mx6sl()) {
-               if (base_addr != LCDIF1_BASE_ADDR) {
-                       puts("Wrong LCD interface!\n");
-                       return -EINVAL;
-               }
-
-               reg = readl(&imx_ccm->CCGR3);
-               reg &= ~(MXC_CCM_CCGR3_LCDIF_AXI_MASK |
-                        MXC_CCM_CCGR3_LCDIF_PIX_MASK);
-               writel(reg, &imx_ccm->CCGR3);
-
-               if (enable) {
-                       reg = readl(&imx_ccm->cscdr3);
-                       reg &= ~MXC_CCM_CSCDR3_LCDIF_AXI_CLK_SEL_MASK;
-                       reg |= 1 << MXC_CCM_CSCDR3_LCDIF_AXI_CLK_SEL_OFFSET;
-                       writel(reg, &imx_ccm->cscdr3);
-
-                       reg = readl(&imx_ccm->CCGR3);
-                       reg |= MXC_CCM_CCGR3_LCDIF_AXI_MASK |
-                               MXC_CCM_CCGR3_LCDIF_PIX_MASK;
-                       writel(reg, &imx_ccm->CCGR3);
-               }
-
-               return 0;
-       } else {
-               return 0;
-       }
-
-       /* Gate LCDIF clock first */
-       reg = readl(&imx_ccm->CCGR3);
-       reg &= ~lcdif_ccgr3_mask;
-       writel(reg, &imx_ccm->CCGR3);
-
-       reg = readl(&imx_ccm->CCGR2);
-       reg &= ~MXC_CCM_CCGR2_LCD_MASK;
-       writel(reg, &imx_ccm->CCGR2);
-
-       if (enable) {
-               /* Select pre-mux */
-               reg = readl(&imx_ccm->cscdr2);
-               reg &= ~lcdif_clk_sel_mask;
-               writel(reg, &imx_ccm->cscdr2);
-
-               /* Enable the LCDIF pix clock */
-               reg = readl(&imx_ccm->CCGR3);
-               reg |= lcdif_ccgr3_mask;
-               writel(reg, &imx_ccm->CCGR3);
-
-               reg = readl(&imx_ccm->CCGR2);
-               reg |= MXC_CCM_CCGR2_LCD_MASK;
-               writel(reg, &imx_ccm->CCGR2);
-       }
-
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_FSL_QSPI
-/* qspi_num can be from 0 - 1 */
-void enable_qspi_clk(int qspi_num)
-{
-       u32 reg = 0;
-       /* Enable QuadSPI clock */
-       switch (qspi_num) {
-       case 0:
-               /* disable the clock gate */
-               clrbits_le32(&imx_ccm->CCGR3, MXC_CCM_CCGR3_QSPI1_MASK);
-
-               /* set 50M  : (50 = 396 / 2 / 4) */
-               reg = readl(&imx_ccm->cscmr1);
-               reg &= ~(MXC_CCM_CSCMR1_QSPI1_PODF_MASK |
-                        MXC_CCM_CSCMR1_QSPI1_CLK_SEL_MASK);
-               reg |= ((1 << MXC_CCM_CSCMR1_QSPI1_PODF_OFFSET) |
-                       (2 << MXC_CCM_CSCMR1_QSPI1_CLK_SEL_OFFSET));
-               writel(reg, &imx_ccm->cscmr1);
-
-               /* enable the clock gate */
-               setbits_le32(&imx_ccm->CCGR3, MXC_CCM_CCGR3_QSPI1_MASK);
-               break;
-       case 1:
-               /*
-                * disable the clock gate
-                * QSPI2 and GPMI_BCH_INPUT_GPMI_IO share the same clock gate,
-                * disable both of them.
-                */
-               clrbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK |
-                            MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK);
-
-               /* set 50M  : (50 = 396 / 2 / 4) */
-               reg = readl(&imx_ccm->cs2cdr);
-               reg &= ~(MXC_CCM_CS2CDR_QSPI2_CLK_PODF_MASK |
-                        MXC_CCM_CS2CDR_QSPI2_CLK_PRED_MASK |
-                        MXC_CCM_CS2CDR_QSPI2_CLK_SEL_MASK);
-               reg |= (MXC_CCM_CS2CDR_QSPI2_CLK_PRED(0x1) |
-                       MXC_CCM_CS2CDR_QSPI2_CLK_SEL(0x3));
-               writel(reg, &imx_ccm->cs2cdr);
-
-               /*enable the clock gate*/
-               setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK |
-                            MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK);
-               break;
-       default:
-               break;
-       }
-}
-#endif
-
-#ifdef CONFIG_FEC_MXC
-int enable_fec_anatop_clock(int fec_id, enum enet_freq freq)
-{
-       u32 reg = 0;
-       s32 timeout = 100000;
-
-       struct anatop_regs __iomem *anatop =
-               (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
-
-       if (freq < ENET_25MHZ || freq > ENET_125MHZ)
-               return -EINVAL;
-
-       reg = readl(&anatop->pll_enet);
-
-       if (fec_id == 0) {
-               reg &= ~BM_ANADIG_PLL_ENET_DIV_SELECT;
-               reg |= BF_ANADIG_PLL_ENET_DIV_SELECT(freq);
-       } else if (fec_id == 1) {
-               /* Only i.MX6SX/UL support ENET2 */
-               if (!(is_mx6sx() || is_mx6ul() || is_mx6ull()))
-                       return -EINVAL;
-               reg &= ~BM_ANADIG_PLL_ENET2_DIV_SELECT;
-               reg |= BF_ANADIG_PLL_ENET2_DIV_SELECT(freq);
-       } else {
-               return -EINVAL;
-       }
-
-       if ((reg & BM_ANADIG_PLL_ENET_POWERDOWN) ||
-           (!(reg & BM_ANADIG_PLL_ENET_LOCK))) {
-               reg &= ~BM_ANADIG_PLL_ENET_POWERDOWN;
-               writel(reg, &anatop->pll_enet);
-               while (timeout--) {
-                       if (readl(&anatop->pll_enet) & BM_ANADIG_PLL_ENET_LOCK)
-                               break;
-               }
-               if (timeout < 0)
-                       return -ETIMEDOUT;
-       }
-
-       /* Enable FEC clock */
-       if (fec_id == 0)
-               reg |= BM_ANADIG_PLL_ENET_ENABLE;
-       else
-               reg |= BM_ANADIG_PLL_ENET2_ENABLE;
-       reg &= ~BM_ANADIG_PLL_ENET_BYPASS;
-       writel(reg, &anatop->pll_enet);
-
-#ifdef CONFIG_MX6SX
-       /* Disable enet system clcok before switching clock parent */
-       reg = readl(&imx_ccm->CCGR3);
-       reg &= ~MXC_CCM_CCGR3_ENET_MASK;
-       writel(reg, &imx_ccm->CCGR3);
-
-       /*
-        * Set enet ahb clock to 200MHz
-        * pll2_pfd2_396m-> ENET_PODF-> ENET_AHB
-        */
-       reg = readl(&imx_ccm->chsccdr);
-       reg &= ~(MXC_CCM_CHSCCDR_ENET_PRE_CLK_SEL_MASK
-                | MXC_CCM_CHSCCDR_ENET_PODF_MASK
-                | MXC_CCM_CHSCCDR_ENET_CLK_SEL_MASK);
-       /* PLL2 PFD2 */
-       reg |= (4 << MXC_CCM_CHSCCDR_ENET_PRE_CLK_SEL_OFFSET);
-       /* Div = 2*/
-       reg |= (1 << MXC_CCM_CHSCCDR_ENET_PODF_OFFSET);
-       reg |= (0 << MXC_CCM_CHSCCDR_ENET_CLK_SEL_OFFSET);
-       writel(reg, &imx_ccm->chsccdr);
-
-       /* Enable enet system clock */
-       reg = readl(&imx_ccm->CCGR3);
-       reg |= MXC_CCM_CCGR3_ENET_MASK;
-       writel(reg, &imx_ccm->CCGR3);
-#endif
-       return 0;
-}
-#endif
-
-static u32 get_usdhc_clk(u32 port)
-{
-       u32 root_freq = 0, usdhc_podf = 0, clk_sel = 0;
-       u32 cscmr1 = __raw_readl(&imx_ccm->cscmr1);
-       u32 cscdr1 = __raw_readl(&imx_ccm->cscdr1);
-
-       if (is_mx6ul() || is_mx6ull()) {
-               if (port > 1)
-                       return 0;
-       }
-
-       if (is_mx6sll()) {
-               if (port > 2)
-                       return 0;
-       }
-
-       switch (port) {
-       case 0:
-               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC1_PODF_MASK) >>
-                                       MXC_CCM_CSCDR1_USDHC1_PODF_OFFSET;
-               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC1_CLK_SEL;
-
-               break;
-       case 1:
-               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC2_PODF_MASK) >>
-                                       MXC_CCM_CSCDR1_USDHC2_PODF_OFFSET;
-               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC2_CLK_SEL;
-
-               break;
-       case 2:
-               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC3_PODF_MASK) >>
-                                       MXC_CCM_CSCDR1_USDHC3_PODF_OFFSET;
-               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC3_CLK_SEL;
-
-               break;
-       case 3:
-               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC4_PODF_MASK) >>
-                                       MXC_CCM_CSCDR1_USDHC4_PODF_OFFSET;
-               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC4_CLK_SEL;
-
-               break;
-       default:
-               break;
-       }
-
-       if (clk_sel)
-               root_freq = mxc_get_pll_pfd(PLL_BUS, 0);
-       else
-               root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
-
-       return root_freq / (usdhc_podf + 1);
-}
-
-u32 imx_get_uartclk(void)
-{
-       return get_uart_clk();
-}
-
-u32 imx_get_fecclk(void)
-{
-       return mxc_get_clock(MXC_IPG_CLK);
-}
-
-#if defined(CONFIG_SATA) || defined(CONFIG_PCIE_IMX)
-static int enable_enet_pll(uint32_t en)
-{
-       struct mxc_ccm_reg *const imx_ccm
-               = (struct mxc_ccm_reg *) CCM_BASE_ADDR;
-       s32 timeout = 100000;
-       u32 reg = 0;
-
-       /* Enable PLLs */
-       reg = readl(&imx_ccm->analog_pll_enet);
-       reg &= ~BM_ANADIG_PLL_SYS_POWERDOWN;
-       writel(reg, &imx_ccm->analog_pll_enet);
-       reg |= BM_ANADIG_PLL_SYS_ENABLE;
-       while (timeout--) {
-               if (readl(&imx_ccm->analog_pll_enet) & BM_ANADIG_PLL_SYS_LOCK)
-                       break;
-       }
-       if (timeout <= 0)
-               return -EIO;
-       reg &= ~BM_ANADIG_PLL_SYS_BYPASS;
-       writel(reg, &imx_ccm->analog_pll_enet);
-       reg |= en;
-       writel(reg, &imx_ccm->analog_pll_enet);
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_SATA
-static void ungate_sata_clock(void)
-{
-       struct mxc_ccm_reg *const imx_ccm =
-               (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-       /* Enable SATA clock. */
-       setbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK);
-}
-
-int enable_sata_clock(void)
-{
-       ungate_sata_clock();
-       return enable_enet_pll(BM_ANADIG_PLL_ENET_ENABLE_SATA);
-}
-
-void disable_sata_clock(void)
-{
-       struct mxc_ccm_reg *const imx_ccm =
-               (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-       clrbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK);
-}
-#endif
-
-#ifdef CONFIG_PCIE_IMX
-static void ungate_pcie_clock(void)
-{
-       struct mxc_ccm_reg *const imx_ccm =
-               (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-       /* Enable PCIe clock. */
-       setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_PCIE_MASK);
-}
-
-int enable_pcie_clock(void)
-{
-       struct anatop_regs *anatop_regs =
-               (struct anatop_regs *)ANATOP_BASE_ADDR;
-       struct mxc_ccm_reg *ccm_regs = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       u32 lvds1_clk_sel;
-
-       /*
-        * Here be dragons!
-        *
-        * The register ANATOP_MISC1 is not documented in the Freescale
-        * MX6RM. The register that is mapped in the ANATOP space and
-        * marked as ANATOP_MISC1 is actually documented in the PMU section
-        * of the datasheet as PMU_MISC1.
-        *
-        * Switch LVDS clock source to SATA (0xb) on mx6q/dl or PCI (0xa) on
-        * mx6sx, disable clock INPUT and enable clock OUTPUT. This is important
-        * for PCI express link that is clocked from the i.MX6.
-        */
-#define ANADIG_ANA_MISC1_LVDSCLK1_IBEN         (1 << 12)
-#define ANADIG_ANA_MISC1_LVDSCLK1_OBEN         (1 << 10)
-#define ANADIG_ANA_MISC1_LVDS1_CLK_SEL_MASK    0x0000001F
-#define ANADIG_ANA_MISC1_LVDS1_CLK_SEL_PCIE_REF        0xa
-#define ANADIG_ANA_MISC1_LVDS1_CLK_SEL_SATA_REF        0xb
-
-       if (is_mx6sx())
-               lvds1_clk_sel = ANADIG_ANA_MISC1_LVDS1_CLK_SEL_PCIE_REF;
-       else
-               lvds1_clk_sel = ANADIG_ANA_MISC1_LVDS1_CLK_SEL_SATA_REF;
-
-       clrsetbits_le32(&anatop_regs->ana_misc1,
-                       ANADIG_ANA_MISC1_LVDSCLK1_IBEN |
-                       ANADIG_ANA_MISC1_LVDS1_CLK_SEL_MASK,
-                       ANADIG_ANA_MISC1_LVDSCLK1_OBEN | lvds1_clk_sel);
-
-       /* PCIe reference clock sourced from AXI. */
-       clrbits_le32(&ccm_regs->cbcmr, MXC_CCM_CBCMR_PCIE_AXI_CLK_SEL);
-
-       /* Party time! Ungate the clock to the PCIe. */
-#ifdef CONFIG_SATA
-       ungate_sata_clock();
-#endif
-       ungate_pcie_clock();
-
-       return enable_enet_pll(BM_ANADIG_PLL_ENET_ENABLE_SATA |
-                              BM_ANADIG_PLL_ENET_ENABLE_PCIE);
-}
-#endif
-
-#ifdef CONFIG_SECURE_BOOT
-void hab_caam_clock_enable(unsigned char enable)
-{
-       u32 reg;
-
-       if (is_mx6ull() || is_mx6sll()) {
-               /* CG5, DCP clock */
-               reg = __raw_readl(&imx_ccm->CCGR0);
-               if (enable)
-                       reg |= MXC_CCM_CCGR0_DCP_CLK_MASK;
-               else
-                       reg &= ~MXC_CCM_CCGR0_DCP_CLK_MASK;
-               __raw_writel(reg, &imx_ccm->CCGR0);
-       } else {
-               /* CG4 ~ CG6, CAAM clocks */
-               reg = __raw_readl(&imx_ccm->CCGR0);
-               if (enable)
-                       reg |= (MXC_CCM_CCGR0_CAAM_WRAPPER_IPG_MASK |
-                               MXC_CCM_CCGR0_CAAM_WRAPPER_ACLK_MASK |
-                               MXC_CCM_CCGR0_CAAM_SECURE_MEM_MASK);
-               else
-                       reg &= ~(MXC_CCM_CCGR0_CAAM_WRAPPER_IPG_MASK |
-                               MXC_CCM_CCGR0_CAAM_WRAPPER_ACLK_MASK |
-                               MXC_CCM_CCGR0_CAAM_SECURE_MEM_MASK);
-               __raw_writel(reg, &imx_ccm->CCGR0);
-       }
-
-       /* EMI slow clk */
-       reg = __raw_readl(&imx_ccm->CCGR6);
-       if (enable)
-               reg |= MXC_CCM_CCGR6_EMI_SLOW_MASK;
-       else
-               reg &= ~MXC_CCM_CCGR6_EMI_SLOW_MASK;
-       __raw_writel(reg, &imx_ccm->CCGR6);
-}
-#endif
-
-static void enable_pll3(void)
-{
-       struct anatop_regs __iomem *anatop =
-               (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
-
-       /* make sure pll3 is enabled */
-       if ((readl(&anatop->usb1_pll_480_ctrl) &
-                       BM_ANADIG_USB1_PLL_480_CTRL_LOCK) == 0) {
-               /* enable pll's power */
-               writel(BM_ANADIG_USB1_PLL_480_CTRL_POWER,
-                      &anatop->usb1_pll_480_ctrl_set);
-               writel(0x80, &anatop->ana_misc2_clr);
-               /* wait for pll lock */
-               while ((readl(&anatop->usb1_pll_480_ctrl) &
-                       BM_ANADIG_USB1_PLL_480_CTRL_LOCK) == 0)
-                       ;
-               /* disable bypass */
-               writel(BM_ANADIG_USB1_PLL_480_CTRL_BYPASS,
-                      &anatop->usb1_pll_480_ctrl_clr);
-               /* enable pll output */
-               writel(BM_ANADIG_USB1_PLL_480_CTRL_ENABLE,
-                      &anatop->usb1_pll_480_ctrl_set);
-       }
-}
-
-void enable_thermal_clk(void)
-{
-       enable_pll3();
-}
-
-unsigned int mxc_get_clock(enum mxc_clock clk)
-{
-       switch (clk) {
-       case MXC_ARM_CLK:
-               return get_mcu_main_clk();
-       case MXC_PER_CLK:
-               return get_periph_clk();
-       case MXC_AHB_CLK:
-               return get_ahb_clk();
-       case MXC_IPG_CLK:
-               return get_ipg_clk();
-       case MXC_IPG_PERCLK:
-       case MXC_I2C_CLK:
-               return get_ipg_per_clk();
-       case MXC_UART_CLK:
-               return get_uart_clk();
-       case MXC_CSPI_CLK:
-               return get_cspi_clk();
-       case MXC_AXI_CLK:
-               return get_axi_clk();
-       case MXC_EMI_SLOW_CLK:
-               return get_emi_slow_clk();
-       case MXC_DDR_CLK:
-               return get_mmdc_ch0_clk();
-       case MXC_ESDHC_CLK:
-               return get_usdhc_clk(0);
-       case MXC_ESDHC2_CLK:
-               return get_usdhc_clk(1);
-       case MXC_ESDHC3_CLK:
-               return get_usdhc_clk(2);
-       case MXC_ESDHC4_CLK:
-               return get_usdhc_clk(3);
-       case MXC_SATA_CLK:
-               return get_ahb_clk();
-       default:
-               printf("Unsupported MXC CLK: %d\n", clk);
-               break;
-       }
-
-       return 0;
-}
-
-/*
- * Dump some core clockes.
- */
-int do_mx6_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       u32 freq;
-       freq = decode_pll(PLL_SYS, MXC_HCLK);
-       printf("PLL_SYS    %8d MHz\n", freq / 1000000);
-       freq = decode_pll(PLL_BUS, MXC_HCLK);
-       printf("PLL_BUS    %8d MHz\n", freq / 1000000);
-       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
-       printf("PLL_OTG    %8d MHz\n", freq / 1000000);
-       freq = decode_pll(PLL_ENET, MXC_HCLK);
-       printf("PLL_NET    %8d MHz\n", freq / 1000000);
-
-       printf("\n");
-       printf("ARM        %8d kHz\n", mxc_get_clock(MXC_ARM_CLK) / 1000);
-       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
-       printf("UART       %8d kHz\n", mxc_get_clock(MXC_UART_CLK) / 1000);
-#ifdef CONFIG_MXC_SPI
-       printf("CSPI       %8d kHz\n", mxc_get_clock(MXC_CSPI_CLK) / 1000);
-#endif
-       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
-       printf("AXI        %8d kHz\n", mxc_get_clock(MXC_AXI_CLK) / 1000);
-       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
-       printf("USDHC1     %8d kHz\n", mxc_get_clock(MXC_ESDHC_CLK) / 1000);
-       printf("USDHC2     %8d kHz\n", mxc_get_clock(MXC_ESDHC2_CLK) / 1000);
-       printf("USDHC3     %8d kHz\n", mxc_get_clock(MXC_ESDHC3_CLK) / 1000);
-       printf("USDHC4     %8d kHz\n", mxc_get_clock(MXC_ESDHC4_CLK) / 1000);
-       printf("EMI SLOW   %8d kHz\n", mxc_get_clock(MXC_EMI_SLOW_CLK) / 1000);
-       printf("IPG PERCLK %8d kHz\n", mxc_get_clock(MXC_IPG_PERCLK) / 1000);
-
-       return 0;
-}
-
-#ifndef CONFIG_MX6SX
-void enable_ipu_clock(void)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       int reg;
-       reg = readl(&mxc_ccm->CCGR3);
-       reg |= MXC_CCM_CCGR3_IPU1_IPU_MASK;
-       writel(reg, &mxc_ccm->CCGR3);
-
-       if (is_mx6dqp()) {
-               setbits_le32(&mxc_ccm->CCGR6, MXC_CCM_CCGR6_PRG_CLK0_MASK);
-               setbits_le32(&mxc_ccm->CCGR3, MXC_CCM_CCGR3_IPU2_IPU_MASK);
-       }
-}
-#endif
-
-#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) || defined(CONFIG_MX6DL) || \
-       defined(CONFIG_MX6S)
-static void disable_ldb_di_clock_sources(void)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       int reg;
-
-       /* Make sure PFDs are disabled at boot. */
-       reg = readl(&mxc_ccm->analog_pfd_528);
-       /* Cannot disable pll2_pfd2_396M, as it is the MMDC clock in iMX6DL */
-       if (is_mx6sdl())
-               reg |= 0x80008080;
-       else
-               reg |= 0x80808080;
-       writel(reg, &mxc_ccm->analog_pfd_528);
-
-       /* Disable PLL3 PFDs */
-       reg = readl(&mxc_ccm->analog_pfd_480);
-       reg |= 0x80808080;
-       writel(reg, &mxc_ccm->analog_pfd_480);
-
-       /* Disable PLL5 */
-       reg = readl(&mxc_ccm->analog_pll_video);
-       reg &= ~(1 << 13);
-       writel(reg, &mxc_ccm->analog_pll_video);
-}
-
-static void enable_ldb_di_clock_sources(void)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       int reg;
-
-       reg = readl(&mxc_ccm->analog_pfd_528);
-       if (is_mx6sdl())
-               reg &= ~(0x80008080);
-       else
-               reg &= ~(0x80808080);
-       writel(reg, &mxc_ccm->analog_pfd_528);
-
-       reg = readl(&mxc_ccm->analog_pfd_480);
-       reg &= ~(0x80808080);
-       writel(reg, &mxc_ccm->analog_pfd_480);
-}
-
-/*
- * Try call this function as early in the boot process as possible since the
- * function temporarily disables PLL2 PFD's, PLL3 PFD's and PLL5.
- */
-void select_ldb_di_clock_source(enum ldb_di_clock clk)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       int reg;
-
-       /*
-        * Need to follow a strict procedure when changing the LDB
-        * clock, else we can introduce a glitch. Things to keep in
-        * mind:
-        * 1. The current and new parent clocks must be disabled.
-        * 2. The default clock for ldb_dio_clk is mmdc_ch1 which has
-        * no CG bit.
-        * 3. In the RTL implementation of the LDB_DI_CLK_SEL mux
-        * the top four options are in one mux and the PLL3 option along
-        * with another option is in the second mux. There is third mux
-        * used to decide between the first and second mux.
-        * The code below switches the parent to the bottom mux first
-        * and then manipulates the top mux. This ensures that no glitch
-        * will enter the divider.
-        *
-        * Need to disable MMDC_CH1 clock manually as there is no CG bit
-        * for this clock. The only way to disable this clock is to move
-        * it to pll3_sw_clk and then to disable pll3_sw_clk
-        * Make sure periph2_clk2_sel is set to pll3_sw_clk
-        */
-
-       /* Disable all ldb_di clock parents */
-       disable_ldb_di_clock_sources();
-
-       /* Set MMDC_CH1 mask bit */
-       reg = readl(&mxc_ccm->ccdr);
-       reg |= MXC_CCM_CCDR_MMDC_CH1_HS_MASK;
-       writel(reg, &mxc_ccm->ccdr);
-
-       /* Set periph2_clk2_sel to be sourced from PLL3_sw_clk */
-       reg = readl(&mxc_ccm->cbcmr);
-       reg &= ~MXC_CCM_CBCMR_PERIPH2_CLK2_SEL;
-       writel(reg, &mxc_ccm->cbcmr);
-
-       /*
-        * Set the periph2_clk_sel to the top mux so that
-        * mmdc_ch1 is from pll3_sw_clk.
-        */
-       reg = readl(&mxc_ccm->cbcdr);
-       reg |= MXC_CCM_CBCDR_PERIPH2_CLK_SEL;
-       writel(reg, &mxc_ccm->cbcdr);
-
-       /* Wait for the clock switch */
-       while (readl(&mxc_ccm->cdhipr))
-               ;
-       /* Disable pll3_sw_clk by selecting bypass clock source */
-       reg = readl(&mxc_ccm->ccsr);
-       reg |= MXC_CCM_CCSR_PLL3_SW_CLK_SEL;
-       writel(reg, &mxc_ccm->ccsr);
-
-       /* Set the ldb_di0_clk and ldb_di1_clk to 111b */
-       reg = readl(&mxc_ccm->cs2cdr);
-       reg |= ((7 << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET)
-             | (7 << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET));
-       writel(reg, &mxc_ccm->cs2cdr);
-
-       /* Set the ldb_di0_clk and ldb_di1_clk to 100b */
-       reg = readl(&mxc_ccm->cs2cdr);
-       reg &= ~(MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK
-             | MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK);
-       reg |= ((4 << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET)
-             | (4 << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET));
-       writel(reg, &mxc_ccm->cs2cdr);
-
-       /* Set the ldb_di0_clk and ldb_di1_clk to desired source */
-       reg = readl(&mxc_ccm->cs2cdr);
-       reg &= ~(MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK
-             | MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK);
-       reg |= ((clk << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET)
-             | (clk << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET));
-       writel(reg, &mxc_ccm->cs2cdr);
-
-       /* Unbypass pll3_sw_clk */
-       reg = readl(&mxc_ccm->ccsr);
-       reg &= ~MXC_CCM_CCSR_PLL3_SW_CLK_SEL;
-       writel(reg, &mxc_ccm->ccsr);
-
-       /*
-        * Set the periph2_clk_sel back to the bottom mux so that
-        * mmdc_ch1 is from its original parent.
-        */
-       reg = readl(&mxc_ccm->cbcdr);
-       reg &= ~MXC_CCM_CBCDR_PERIPH2_CLK_SEL;
-       writel(reg, &mxc_ccm->cbcdr);
-
-       /* Wait for the clock switch */
-       while (readl(&mxc_ccm->cdhipr))
-               ;
-       /* Clear MMDC_CH1 mask bit */
-       reg = readl(&mxc_ccm->ccdr);
-       reg &= ~MXC_CCM_CCDR_MMDC_CH1_HS_MASK;
-       writel(reg, &mxc_ccm->ccdr);
-
-       enable_ldb_di_clock_sources();
-}
-#endif
-
-#ifdef CONFIG_MTD_NOR_FLASH
-void enable_eim_clk(unsigned char enable)
-{
-       u32 reg;
-
-       reg = __raw_readl(&imx_ccm->CCGR6);
-       if (enable)
-               reg |= MXC_CCM_CCGR6_EMI_SLOW_MASK;
-       else
-               reg &= ~MXC_CCM_CCGR6_EMI_SLOW_MASK;
-       __raw_writel(reg, &imx_ccm->CCGR6);
-}
-#endif
-
-/***************************************************/
-
-U_BOOT_CMD(
-       clocks, CONFIG_SYS_MAXARGS, 1, do_mx6_showclocks,
-       "display clocks",
-       ""
-);
diff --git a/arch/arm/cpu/armv7/mx6/ddr.c b/arch/arm/cpu/armv7/mx6/ddr.c
deleted file mode 100644 (file)
index 0cf391e..0000000
+++ /dev/null
@@ -1,1538 +0,0 @@
-/*
- * Copyright (C) 2014 Gateworks Corporation
- * Author: Tim Harvey <tharvey@gateworks.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <linux/types.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/mx6-ddr.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/io.h>
-#include <asm/types.h>
-#include <wait_bit.h>
-
-#if defined(CONFIG_MX6_DDRCAL)
-static void reset_read_data_fifos(void)
-{
-       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-
-       /* Reset data FIFOs twice. */
-       setbits_le32(&mmdc0->mpdgctrl0, 1 << 31);
-       wait_for_bit("MMDC", &mmdc0->mpdgctrl0, 1 << 31, 0, 100, 0);
-
-       setbits_le32(&mmdc0->mpdgctrl0, 1 << 31);
-       wait_for_bit("MMDC", &mmdc0->mpdgctrl0, 1 << 31, 0, 100, 0);
-}
-
-static void precharge_all(const bool cs0_enable, const bool cs1_enable)
-{
-       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-
-       /*
-        * Issue the Precharge-All command to the DDR device for both
-        * chip selects. Note, CON_REQ bit should also remain set. If
-        * only using one chip select, then precharge only the desired
-        * chip select.
-        */
-       if (cs0_enable) { /* CS0 */
-               writel(0x04008050, &mmdc0->mdscr);
-               wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 1, 100, 0);
-       }
-
-       if (cs1_enable) { /* CS1 */
-               writel(0x04008058, &mmdc0->mdscr);
-               wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 1, 100, 0);
-       }
-}
-
-static void force_delay_measurement(int bus_size)
-{
-       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
-
-       writel(0x800, &mmdc0->mpmur0);
-       if (bus_size == 0x2)
-               writel(0x800, &mmdc1->mpmur0);
-}
-
-static void modify_dg_result(u32 *reg_st0, u32 *reg_st1, u32 *reg_ctrl)
-{
-       u32 dg_tmp_val, dg_dl_abs_offset, dg_hc_del, val_ctrl;
-
-       /*
-        * DQS gating absolute offset should be modified from reflecting
-        * (HW_DG_LOWx + HW_DG_UPx)/2 to reflecting (HW_DG_UPx - 0x80)
-        */
-
-       val_ctrl = readl(reg_ctrl);
-       val_ctrl &= 0xf0000000;
-
-       dg_tmp_val = ((readl(reg_st0) & 0x07ff0000) >> 16) - 0xc0;
-       dg_dl_abs_offset = dg_tmp_val & 0x7f;
-       dg_hc_del = (dg_tmp_val & 0x780) << 1;
-
-       val_ctrl |= dg_dl_abs_offset + dg_hc_del;
-
-       dg_tmp_val = ((readl(reg_st1) & 0x07ff0000) >> 16) - 0xc0;
-       dg_dl_abs_offset = dg_tmp_val & 0x7f;
-       dg_hc_del = (dg_tmp_val & 0x780) << 1;
-
-       val_ctrl |= (dg_dl_abs_offset + dg_hc_del) << 16;
-
-       writel(val_ctrl, reg_ctrl);
-}
-
-int mmdc_do_write_level_calibration(struct mx6_ddr_sysinfo const *sysinfo)
-{
-       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
-       u32 esdmisc_val, zq_val;
-       u32 errors = 0;
-       u32 ldectrl[4] = {0};
-       u32 ddr_mr1 = 0x4;
-       u32 rwalat_max;
-
-       /*
-        * Stash old values in case calibration fails,
-        * we need to restore them
-        */
-       ldectrl[0] = readl(&mmdc0->mpwldectrl0);
-       ldectrl[1] = readl(&mmdc0->mpwldectrl1);
-       if (sysinfo->dsize == 2) {
-               ldectrl[2] = readl(&mmdc1->mpwldectrl0);
-               ldectrl[3] = readl(&mmdc1->mpwldectrl1);
-       }
-
-       /* disable DDR logic power down timer */
-       clrbits_le32(&mmdc0->mdpdc, 0xff00);
-
-       /* disable Adopt power down timer */
-       setbits_le32(&mmdc0->mapsr, 0x1);
-
-       debug("Starting write leveling calibration.\n");
-
-       /*
-        * 2. disable auto refresh and ZQ calibration
-        * before proceeding with Write Leveling calibration
-        */
-       esdmisc_val = readl(&mmdc0->mdref);
-       writel(0x0000C000, &mmdc0->mdref);
-       zq_val = readl(&mmdc0->mpzqhwctrl);
-       writel(zq_val & ~0x3, &mmdc0->mpzqhwctrl);
-
-       /* 3. increase walat and ralat to maximum */
-       rwalat_max = (1 << 6) | (1 << 7) | (1 << 8) | (1 << 16) | (1 << 17);
-       setbits_le32(&mmdc0->mdmisc, rwalat_max);
-       if (sysinfo->dsize == 2)
-               setbits_le32(&mmdc1->mdmisc, rwalat_max);
-       /*
-        * 4 & 5. Configure the external DDR device to enter write-leveling
-        * mode through Load Mode Register command.
-        * Register setting:
-        * Bits[31:16] MR1 value (0x0080 write leveling enable)
-        * Bit[9] set WL_EN to enable MMDC DQS output
-        * Bits[6:4] set CMD bits for Load Mode Register programming
-        * Bits[2:0] set CMD_BA to 0x1 for DDR MR1 programming
-        */
-       writel(0x00808231, &mmdc0->mdscr);
-
-       /* 6. Activate automatic calibration by setting MPWLGCR[HW_WL_EN] */
-       writel(0x00000001, &mmdc0->mpwlgcr);
-
-       /*
-        * 7. Upon completion of this process the MMDC de-asserts
-        * the MPWLGCR[HW_WL_EN]
-        */
-       wait_for_bit("MMDC", &mmdc0->mpwlgcr, 1 << 0, 0, 100, 0);
-
-       /*
-        * 8. check for any errors: check both PHYs for x64 configuration,
-        * if x32, check only PHY0
-        */
-       if (readl(&mmdc0->mpwlgcr) & 0x00000F00)
-               errors |= 1;
-       if (sysinfo->dsize == 2)
-               if (readl(&mmdc1->mpwlgcr) & 0x00000F00)
-                       errors |= 2;
-
-       debug("Ending write leveling calibration. Error mask: 0x%x\n", errors);
-
-       /* check to see if cal failed */
-       if ((readl(&mmdc0->mpwldectrl0) == 0x001F001F) &&
-           (readl(&mmdc0->mpwldectrl1) == 0x001F001F) &&
-           ((sysinfo->dsize < 2) ||
-            ((readl(&mmdc1->mpwldectrl0) == 0x001F001F) &&
-             (readl(&mmdc1->mpwldectrl1) == 0x001F001F)))) {
-               debug("Cal seems to have soft-failed due to memory not supporting write leveling on all channels. Restoring original write leveling values.\n");
-               writel(ldectrl[0], &mmdc0->mpwldectrl0);
-               writel(ldectrl[1], &mmdc0->mpwldectrl1);
-               if (sysinfo->dsize == 2) {
-                       writel(ldectrl[2], &mmdc1->mpwldectrl0);
-                       writel(ldectrl[3], &mmdc1->mpwldectrl1);
-               }
-               errors |= 4;
-       }
-
-       /*
-        * User should issue MRS command to exit write leveling mode
-        * through Load Mode Register command
-        * Register setting:
-        * Bits[31:16] MR1 value "ddr_mr1" value from initialization
-        * Bit[9] clear WL_EN to disable MMDC DQS output
-        * Bits[6:4] set CMD bits for Load Mode Register programming
-        * Bits[2:0] set CMD_BA to 0x1 for DDR MR1 programming
-        */
-       writel((ddr_mr1 << 16) + 0x8031, &mmdc0->mdscr);
-
-       /* re-enable auto refresh and zq cal */
-       writel(esdmisc_val, &mmdc0->mdref);
-       writel(zq_val, &mmdc0->mpzqhwctrl);
-
-       debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08X\n",
-             readl(&mmdc0->mpwldectrl0));
-       debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08X\n",
-             readl(&mmdc0->mpwldectrl1));
-       if (sysinfo->dsize == 2) {
-               debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08X\n",
-                     readl(&mmdc1->mpwldectrl0));
-               debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08X\n",
-                     readl(&mmdc1->mpwldectrl1));
-       }
-
-       /* We must force a readback of these values, to get them to stick */
-       readl(&mmdc0->mpwldectrl0);
-       readl(&mmdc0->mpwldectrl1);
-       if (sysinfo->dsize == 2) {
-               readl(&mmdc1->mpwldectrl0);
-               readl(&mmdc1->mpwldectrl1);
-       }
-
-       /* enable DDR logic power down timer: */
-       setbits_le32(&mmdc0->mdpdc, 0x00005500);
-
-       /* Enable Adopt power down timer: */
-       clrbits_le32(&mmdc0->mapsr, 0x1);
-
-       /* Clear CON_REQ */
-       writel(0, &mmdc0->mdscr);
-
-       return errors;
-}
-
-int mmdc_do_dqs_calibration(struct mx6_ddr_sysinfo const *sysinfo)
-{
-       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
-       struct mx6dq_iomux_ddr_regs *mx6_ddr_iomux =
-               (struct mx6dq_iomux_ddr_regs *)MX6DQ_IOM_DDR_BASE;
-       bool cs0_enable;
-       bool cs1_enable;
-       bool cs0_enable_initial;
-       bool cs1_enable_initial;
-       u32 esdmisc_val;
-       u32 temp_ref;
-       u32 pddword = 0x00ffff00; /* best so far, place into MPPDCMPR1 */
-       u32 errors = 0;
-       u32 initdelay = 0x40404040;
-
-       /* check to see which chip selects are enabled */
-       cs0_enable_initial = readl(&mmdc0->mdctl) & 0x80000000;
-       cs1_enable_initial = readl(&mmdc0->mdctl) & 0x40000000;
-
-       /* disable DDR logic power down timer: */
-       clrbits_le32(&mmdc0->mdpdc, 0xff00);
-
-       /* disable Adopt power down timer: */
-       setbits_le32(&mmdc0->mapsr, 0x1);
-
-       /* set DQS pull ups */
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs0, 0x7000);
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs1, 0x7000);
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs2, 0x7000);
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs3, 0x7000);
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs4, 0x7000);
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs5, 0x7000);
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs6, 0x7000);
-       setbits_le32(&mx6_ddr_iomux->dram_sdqs7, 0x7000);
-
-       /* Save old RALAT and WALAT values */
-       esdmisc_val = readl(&mmdc0->mdmisc);
-
-       setbits_le32(&mmdc0->mdmisc,
-                    (1 << 6) | (1 << 7) | (1 << 8) | (1 << 16) | (1 << 17));
-
-       /* Disable auto refresh before proceeding with calibration */
-       temp_ref = readl(&mmdc0->mdref);
-       writel(0x0000c000, &mmdc0->mdref);
-
-       /*
-        * Per the ref manual, issue one refresh cycle MDSCR[CMD]= 0x2,
-        * this also sets the CON_REQ bit.
-        */
-       if (cs0_enable_initial)
-               writel(0x00008020, &mmdc0->mdscr);
-       if (cs1_enable_initial)
-               writel(0x00008028, &mmdc0->mdscr);
-
-       /* poll to make sure the con_ack bit was asserted */
-       wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 1, 100, 0);
-
-       /*
-        * Check MDMISC register CALIB_PER_CS to see which CS calibration
-        * is targeted to (under normal cases, it should be cleared
-        * as this is the default value, indicating calibration is directed
-        * to CS0).
-        * Disable the other chip select not being target for calibration
-        * to avoid any potential issues.  This will get re-enabled at end
-        * of calibration.
-        */
-       if ((readl(&mmdc0->mdmisc) & 0x00100000) == 0)
-               clrbits_le32(&mmdc0->mdctl, 1 << 30);   /* clear SDE_1 */
-       else
-               clrbits_le32(&mmdc0->mdctl, 1 << 31);   /* clear SDE_0 */
-
-       /*
-        * Check to see which chip selects are now enabled for
-        * the remainder of the calibration.
-        */
-       cs0_enable = readl(&mmdc0->mdctl) & 0x80000000;
-       cs1_enable = readl(&mmdc0->mdctl) & 0x40000000;
-
-       precharge_all(cs0_enable, cs1_enable);
-
-       /* Write the pre-defined value into MPPDCMPR1 */
-       writel(pddword, &mmdc0->mppdcmpr1);
-
-       /*
-        * Issue a write access to the external DDR device by setting
-        * the bit SW_DUMMY_WR (bit 0) in the MPSWDAR0 and then poll
-        * this bit until it clears to indicate completion of the write access.
-        */
-       setbits_le32(&mmdc0->mpswdar0, 1);
-       wait_for_bit("MMDC", &mmdc0->mpswdar0, 1 << 0, 0, 100, 0);
-
-       /* Set the RD_DL_ABS# bits to their default values
-        * (will be calibrated later in the read delay-line calibration).
-        * Both PHYs for x64 configuration, if x32, do only PHY0.
-        */
-       writel(initdelay, &mmdc0->mprddlctl);
-       if (sysinfo->dsize == 0x2)
-               writel(initdelay, &mmdc1->mprddlctl);
-
-       /* Force a measurment, for previous delay setup to take effect. */
-       force_delay_measurement(sysinfo->dsize);
-
-       /*
-        * ***************************
-        * Read DQS Gating calibration
-        * ***************************
-        */
-       debug("Starting Read DQS Gating calibration.\n");
-
-       /*
-        * Reset the read data FIFOs (two resets); only need to issue reset
-        * to PHY0 since in x64 mode, the reset will also go to PHY1.
-        */
-       reset_read_data_fifos();
-
-       /*
-        * Start the automatic read DQS gating calibration process by
-        * asserting MPDGCTRL0[HW_DG_EN] and MPDGCTRL0[DG_CMP_CYC]
-        * and then poll MPDGCTRL0[HW_DG_EN]] until this bit clears
-        * to indicate completion.
-        * Also, ensure that MPDGCTRL0[HW_DG_ERR] is clear to indicate
-        * no errors were seen during calibration.
-        */
-
-       /*
-        * Set bit 30: chooses option to wait 32 cycles instead of
-        * 16 before comparing read data.
-        */
-       setbits_le32(&mmdc0->mpdgctrl0, 1 << 30);
-       if (sysinfo->dsize == 2)
-               setbits_le32(&mmdc1->mpdgctrl0, 1 << 30);
-
-       /* Set bit 28 to start automatic read DQS gating calibration */
-       setbits_le32(&mmdc0->mpdgctrl0, 5 << 28);
-
-       /* Poll for completion.  MPDGCTRL0[HW_DG_EN] should be 0 */
-       wait_for_bit("MMDC", &mmdc0->mpdgctrl0, 1 << 28, 0, 100, 0);
-
-       /*
-        * Check to see if any errors were encountered during calibration
-        * (check MPDGCTRL0[HW_DG_ERR]).
-        * Check both PHYs for x64 configuration, if x32, check only PHY0.
-        */
-       if (readl(&mmdc0->mpdgctrl0) & 0x00001000)
-               errors |= 1;
-
-       if ((sysinfo->dsize == 0x2) && (readl(&mmdc1->mpdgctrl0) & 0x00001000))
-               errors |= 2;
-
-       /* now disable mpdgctrl0[DG_CMP_CYC] */
-       clrbits_le32(&mmdc0->mpdgctrl0, 1 << 30);
-       if (sysinfo->dsize == 2)
-               clrbits_le32(&mmdc1->mpdgctrl0, 1 << 30);
-
-       /*
-        * DQS gating absolute offset should be modified from
-        * reflecting (HW_DG_LOWx + HW_DG_UPx)/2 to
-        * reflecting (HW_DG_UPx - 0x80)
-        */
-       modify_dg_result(&mmdc0->mpdghwst0, &mmdc0->mpdghwst1,
-                        &mmdc0->mpdgctrl0);
-       modify_dg_result(&mmdc0->mpdghwst2, &mmdc0->mpdghwst3,
-                        &mmdc0->mpdgctrl1);
-       if (sysinfo->dsize == 0x2) {
-               modify_dg_result(&mmdc1->mpdghwst0, &mmdc1->mpdghwst1,
-                                &mmdc1->mpdgctrl0);
-               modify_dg_result(&mmdc1->mpdghwst2, &mmdc1->mpdghwst3,
-                                &mmdc1->mpdgctrl1);
-       }
-       debug("Ending Read DQS Gating calibration. Error mask: 0x%x\n", errors);
-
-       /*
-        * **********************
-        * Read Delay calibration
-        * **********************
-        */
-       debug("Starting Read Delay calibration.\n");
-
-       reset_read_data_fifos();
-
-       /*
-        * 4. Issue the Precharge-All command to the DDR device for both
-        * chip selects.  If only using one chip select, then precharge
-        * only the desired chip select.
-        */
-       precharge_all(cs0_enable, cs1_enable);
-
-       /*
-        * 9. Read delay-line calibration
-        * Start the automatic read calibration process by asserting
-        * MPRDDLHWCTL[HW_RD_DL_EN].
-        */
-       writel(0x00000030, &mmdc0->mprddlhwctl);
-
-       /*
-        * 10. poll for completion
-        * MMDC indicates that the write data calibration had finished by
-        * setting MPRDDLHWCTL[HW_RD_DL_EN] = 0.   Also, ensure that
-        * no error bits were set.
-        */
-       wait_for_bit("MMDC", &mmdc0->mprddlhwctl, 1 << 4, 0, 100, 0);
-
-       /* check both PHYs for x64 configuration, if x32, check only PHY0 */
-       if (readl(&mmdc0->mprddlhwctl) & 0x0000000f)
-               errors |= 4;
-
-       if ((sysinfo->dsize == 0x2) &&
-           (readl(&mmdc1->mprddlhwctl) & 0x0000000f))
-               errors |= 8;
-
-       debug("Ending Read Delay calibration. Error mask: 0x%x\n", errors);
-
-       /*
-        * ***********************
-        * Write Delay Calibration
-        * ***********************
-        */
-       debug("Starting Write Delay calibration.\n");
-
-       reset_read_data_fifos();
-
-       /*
-        * 4. Issue the Precharge-All command to the DDR device for both
-        * chip selects. If only using one chip select, then precharge
-        * only the desired chip select.
-        */
-       precharge_all(cs0_enable, cs1_enable);
-
-       /*
-        * 8. Set the WR_DL_ABS# bits to their default values.
-        * Both PHYs for x64 configuration, if x32, do only PHY0.
-        */
-       writel(initdelay, &mmdc0->mpwrdlctl);
-       if (sysinfo->dsize == 0x2)
-               writel(initdelay, &mmdc1->mpwrdlctl);
-
-       /*
-        * XXX This isn't in the manual. Force a measurement,
-        * for previous delay setup to effect.
-        */
-       force_delay_measurement(sysinfo->dsize);
-
-       /*
-        * 9. 10. Start the automatic write calibration process
-        * by asserting MPWRDLHWCTL0[HW_WR_DL_EN].
-        */
-       writel(0x00000030, &mmdc0->mpwrdlhwctl);
-
-       /*
-        * Poll for completion.
-        * MMDC indicates that the write data calibration had finished
-        * by setting MPWRDLHWCTL[HW_WR_DL_EN] = 0.
-        * Also, ensure that no error bits were set.
-        */
-       wait_for_bit("MMDC", &mmdc0->mpwrdlhwctl, 1 << 4, 0, 100, 0);
-
-       /* Check both PHYs for x64 configuration, if x32, check only PHY0 */
-       if (readl(&mmdc0->mpwrdlhwctl) & 0x0000000f)
-               errors |= 16;
-
-       if ((sysinfo->dsize == 0x2) &&
-           (readl(&mmdc1->mpwrdlhwctl) & 0x0000000f))
-               errors |= 32;
-
-       debug("Ending Write Delay calibration. Error mask: 0x%x\n", errors);
-
-       reset_read_data_fifos();
-
-       /* Enable DDR logic power down timer */
-       setbits_le32(&mmdc0->mdpdc, 0x00005500);
-
-       /* Enable Adopt power down timer */
-       clrbits_le32(&mmdc0->mapsr, 0x1);
-
-       /* Restore MDMISC value (RALAT, WALAT) to MMDCP1 */
-       writel(esdmisc_val, &mmdc0->mdmisc);
-
-       /* Clear DQS pull ups */
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs0, 0x7000);
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs1, 0x7000);
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs2, 0x7000);
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs3, 0x7000);
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs4, 0x7000);
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs5, 0x7000);
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs6, 0x7000);
-       clrbits_le32(&mx6_ddr_iomux->dram_sdqs7, 0x7000);
-
-       /* Re-enable SDE (chip selects) if they were set initially */
-       if (cs1_enable_initial)
-               /* Set SDE_1 */
-               setbits_le32(&mmdc0->mdctl, 1 << 30);
-
-       if (cs0_enable_initial)
-               /* Set SDE_0 */
-               setbits_le32(&mmdc0->mdctl, 1 << 31);
-
-       /* Re-enable to auto refresh */
-       writel(temp_ref, &mmdc0->mdref);
-
-       /* Clear the MDSCR (including the con_req bit) */
-       writel(0x0, &mmdc0->mdscr);     /* CS0 */
-
-       /* Poll to make sure the con_ack bit is clear */
-       wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 0, 100, 0);
-
-       /*
-        * Print out the registers that were updated as a result
-        * of the calibration process.
-        */
-       debug("MMDC registers updated from calibration\n");
-       debug("Read DQS gating calibration:\n");
-       debug("\tMPDGCTRL0 PHY0 = 0x%08X\n", readl(&mmdc0->mpdgctrl0));
-       debug("\tMPDGCTRL1 PHY0 = 0x%08X\n", readl(&mmdc0->mpdgctrl1));
-       if (sysinfo->dsize == 2) {
-               debug("\tMPDGCTRL0 PHY1 = 0x%08X\n", readl(&mmdc1->mpdgctrl0));
-               debug("\tMPDGCTRL1 PHY1 = 0x%08X\n", readl(&mmdc1->mpdgctrl1));
-       }
-       debug("Read calibration:\n");
-       debug("\tMPRDDLCTL PHY0 = 0x%08X\n", readl(&mmdc0->mprddlctl));
-       if (sysinfo->dsize == 2)
-               debug("\tMPRDDLCTL PHY1 = 0x%08X\n", readl(&mmdc1->mprddlctl));
-       debug("Write calibration:\n");
-       debug("\tMPWRDLCTL PHY0 = 0x%08X\n", readl(&mmdc0->mpwrdlctl));
-       if (sysinfo->dsize == 2)
-               debug("\tMPWRDLCTL PHY1 = 0x%08X\n", readl(&mmdc1->mpwrdlctl));
-
-       /*
-        * Registers below are for debugging purposes.  These print out
-        * the upper and lower boundaries captured during
-        * read DQS gating calibration.
-        */
-       debug("Status registers bounds for read DQS gating:\n");
-       debug("\tMPDGHWST0 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst0));
-       debug("\tMPDGHWST1 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst1));
-       debug("\tMPDGHWST2 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst2));
-       debug("\tMPDGHWST3 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst3));
-       if (sysinfo->dsize == 2) {
-               debug("\tMPDGHWST0 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst0));
-               debug("\tMPDGHWST1 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst1));
-               debug("\tMPDGHWST2 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst2));
-               debug("\tMPDGHWST3 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst3));
-       }
-
-       debug("Final do_dqs_calibration error mask: 0x%x\n", errors);
-
-       return errors;
-}
-#endif
-
-#if defined(CONFIG_MX6SX)
-/* Configure MX6SX mmdc iomux */
-void mx6sx_dram_iocfg(unsigned width,
-                     const struct mx6sx_iomux_ddr_regs *ddr,
-                     const struct mx6sx_iomux_grp_regs *grp)
-{
-       struct mx6sx_iomux_ddr_regs *mx6_ddr_iomux;
-       struct mx6sx_iomux_grp_regs *mx6_grp_iomux;
-
-       mx6_ddr_iomux = (struct mx6sx_iomux_ddr_regs *)MX6SX_IOM_DDR_BASE;
-       mx6_grp_iomux = (struct mx6sx_iomux_grp_regs *)MX6SX_IOM_GRP_BASE;
-
-       /* DDR IO TYPE */
-       writel(grp->grp_ddr_type, &mx6_grp_iomux->grp_ddr_type);
-       writel(grp->grp_ddrpke, &mx6_grp_iomux->grp_ddrpke);
-
-       /* CLOCK */
-       writel(ddr->dram_sdclk_0, &mx6_ddr_iomux->dram_sdclk_0);
-
-       /* ADDRESS */
-       writel(ddr->dram_cas, &mx6_ddr_iomux->dram_cas);
-       writel(ddr->dram_ras, &mx6_ddr_iomux->dram_ras);
-       writel(grp->grp_addds, &mx6_grp_iomux->grp_addds);
-
-       /* Control */
-       writel(ddr->dram_reset, &mx6_ddr_iomux->dram_reset);
-       writel(ddr->dram_sdba2, &mx6_ddr_iomux->dram_sdba2);
-       writel(ddr->dram_sdcke0, &mx6_ddr_iomux->dram_sdcke0);
-       writel(ddr->dram_sdcke1, &mx6_ddr_iomux->dram_sdcke1);
-       writel(ddr->dram_odt0, &mx6_ddr_iomux->dram_odt0);
-       writel(ddr->dram_odt1, &mx6_ddr_iomux->dram_odt1);
-       writel(grp->grp_ctlds, &mx6_grp_iomux->grp_ctlds);
-
-       /* Data Strobes */
-       writel(grp->grp_ddrmode_ctl, &mx6_grp_iomux->grp_ddrmode_ctl);
-       writel(ddr->dram_sdqs0, &mx6_ddr_iomux->dram_sdqs0);
-       writel(ddr->dram_sdqs1, &mx6_ddr_iomux->dram_sdqs1);
-       if (width >= 32) {
-               writel(ddr->dram_sdqs2, &mx6_ddr_iomux->dram_sdqs2);
-               writel(ddr->dram_sdqs3, &mx6_ddr_iomux->dram_sdqs3);
-       }
-
-       /* Data */
-       writel(grp->grp_ddrmode, &mx6_grp_iomux->grp_ddrmode);
-       writel(grp->grp_b0ds, &mx6_grp_iomux->grp_b0ds);
-       writel(grp->grp_b1ds, &mx6_grp_iomux->grp_b1ds);
-       if (width >= 32) {
-               writel(grp->grp_b2ds, &mx6_grp_iomux->grp_b2ds);
-               writel(grp->grp_b3ds, &mx6_grp_iomux->grp_b3ds);
-       }
-       writel(ddr->dram_dqm0, &mx6_ddr_iomux->dram_dqm0);
-       writel(ddr->dram_dqm1, &mx6_ddr_iomux->dram_dqm1);
-       if (width >= 32) {
-               writel(ddr->dram_dqm2, &mx6_ddr_iomux->dram_dqm2);
-               writel(ddr->dram_dqm3, &mx6_ddr_iomux->dram_dqm3);
-       }
-}
-#endif
-
-#ifdef CONFIG_MX6UL
-void mx6ul_dram_iocfg(unsigned width,
-                     const struct mx6ul_iomux_ddr_regs *ddr,
-                     const struct mx6ul_iomux_grp_regs *grp)
-{
-       struct mx6ul_iomux_ddr_regs *mx6_ddr_iomux;
-       struct mx6ul_iomux_grp_regs *mx6_grp_iomux;
-
-       mx6_ddr_iomux = (struct mx6ul_iomux_ddr_regs *)MX6UL_IOM_DDR_BASE;
-       mx6_grp_iomux = (struct mx6ul_iomux_grp_regs *)MX6UL_IOM_GRP_BASE;
-
-       /* DDR IO TYPE */
-       writel(grp->grp_ddr_type, &mx6_grp_iomux->grp_ddr_type);
-       writel(grp->grp_ddrpke, &mx6_grp_iomux->grp_ddrpke);
-
-       /* CLOCK */
-       writel(ddr->dram_sdclk_0, &mx6_ddr_iomux->dram_sdclk_0);
-
-       /* ADDRESS */
-       writel(ddr->dram_cas, &mx6_ddr_iomux->dram_cas);
-       writel(ddr->dram_ras, &mx6_ddr_iomux->dram_ras);
-       writel(grp->grp_addds, &mx6_grp_iomux->grp_addds);
-
-       /* Control */
-       writel(ddr->dram_reset, &mx6_ddr_iomux->dram_reset);
-       writel(ddr->dram_sdba2, &mx6_ddr_iomux->dram_sdba2);
-       writel(ddr->dram_odt0, &mx6_ddr_iomux->dram_odt0);
-       writel(ddr->dram_odt1, &mx6_ddr_iomux->dram_odt1);
-       writel(grp->grp_ctlds, &mx6_grp_iomux->grp_ctlds);
-
-       /* Data Strobes */
-       writel(grp->grp_ddrmode_ctl, &mx6_grp_iomux->grp_ddrmode_ctl);
-       writel(ddr->dram_sdqs0, &mx6_ddr_iomux->dram_sdqs0);
-       writel(ddr->dram_sdqs1, &mx6_ddr_iomux->dram_sdqs1);
-
-       /* Data */
-       writel(grp->grp_ddrmode, &mx6_grp_iomux->grp_ddrmode);
-       writel(grp->grp_b0ds, &mx6_grp_iomux->grp_b0ds);
-       writel(grp->grp_b1ds, &mx6_grp_iomux->grp_b1ds);
-       writel(ddr->dram_dqm0, &mx6_ddr_iomux->dram_dqm0);
-       writel(ddr->dram_dqm1, &mx6_ddr_iomux->dram_dqm1);
-}
-#endif
-
-#if defined(CONFIG_MX6SL)
-void mx6sl_dram_iocfg(unsigned width,
-                     const struct mx6sl_iomux_ddr_regs *ddr,
-                     const struct mx6sl_iomux_grp_regs *grp)
-{
-       struct mx6sl_iomux_ddr_regs *mx6_ddr_iomux;
-       struct mx6sl_iomux_grp_regs *mx6_grp_iomux;
-
-       mx6_ddr_iomux = (struct mx6sl_iomux_ddr_regs *)MX6SL_IOM_DDR_BASE;
-       mx6_grp_iomux = (struct mx6sl_iomux_grp_regs *)MX6SL_IOM_GRP_BASE;
-
-       /* DDR IO TYPE */
-       mx6_grp_iomux->grp_ddr_type = grp->grp_ddr_type;
-       mx6_grp_iomux->grp_ddrpke = grp->grp_ddrpke;
-
-       /* CLOCK */
-       mx6_ddr_iomux->dram_sdclk_0 = ddr->dram_sdclk_0;
-
-       /* ADDRESS */
-       mx6_ddr_iomux->dram_cas = ddr->dram_cas;
-       mx6_ddr_iomux->dram_ras = ddr->dram_ras;
-       mx6_grp_iomux->grp_addds = grp->grp_addds;
-
-       /* Control */
-       mx6_ddr_iomux->dram_reset = ddr->dram_reset;
-       mx6_ddr_iomux->dram_sdba2 = ddr->dram_sdba2;
-       mx6_grp_iomux->grp_ctlds = grp->grp_ctlds;
-
-       /* Data Strobes */
-       mx6_grp_iomux->grp_ddrmode_ctl = grp->grp_ddrmode_ctl;
-       mx6_ddr_iomux->dram_sdqs0 = ddr->dram_sdqs0;
-       mx6_ddr_iomux->dram_sdqs1 = ddr->dram_sdqs1;
-       if (width >= 32) {
-               mx6_ddr_iomux->dram_sdqs2 = ddr->dram_sdqs2;
-               mx6_ddr_iomux->dram_sdqs3 = ddr->dram_sdqs3;
-       }
-
-       /* Data */
-       mx6_grp_iomux->grp_ddrmode = grp->grp_ddrmode;
-       mx6_grp_iomux->grp_b0ds = grp->grp_b0ds;
-       mx6_grp_iomux->grp_b1ds = grp->grp_b1ds;
-       if (width >= 32) {
-               mx6_grp_iomux->grp_b2ds = grp->grp_b2ds;
-               mx6_grp_iomux->grp_b3ds = grp->grp_b3ds;
-       }
-
-       mx6_ddr_iomux->dram_dqm0 = ddr->dram_dqm0;
-       mx6_ddr_iomux->dram_dqm1 = ddr->dram_dqm1;
-       if (width >= 32) {
-               mx6_ddr_iomux->dram_dqm2 = ddr->dram_dqm2;
-               mx6_ddr_iomux->dram_dqm3 = ddr->dram_dqm3;
-       }
-}
-#endif
-
-#if defined(CONFIG_MX6QDL) || defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
-/* Configure MX6DQ mmdc iomux */
-void mx6dq_dram_iocfg(unsigned width,
-                     const struct mx6dq_iomux_ddr_regs *ddr,
-                     const struct mx6dq_iomux_grp_regs *grp)
-{
-       volatile struct mx6dq_iomux_ddr_regs *mx6_ddr_iomux;
-       volatile struct mx6dq_iomux_grp_regs *mx6_grp_iomux;
-
-       mx6_ddr_iomux = (struct mx6dq_iomux_ddr_regs *)MX6DQ_IOM_DDR_BASE;
-       mx6_grp_iomux = (struct mx6dq_iomux_grp_regs *)MX6DQ_IOM_GRP_BASE;
-
-       /* DDR IO Type */
-       mx6_grp_iomux->grp_ddr_type = grp->grp_ddr_type;
-       mx6_grp_iomux->grp_ddrpke = grp->grp_ddrpke;
-
-       /* Clock */
-       mx6_ddr_iomux->dram_sdclk_0 = ddr->dram_sdclk_0;
-       mx6_ddr_iomux->dram_sdclk_1 = ddr->dram_sdclk_1;
-
-       /* Address */
-       mx6_ddr_iomux->dram_cas = ddr->dram_cas;
-       mx6_ddr_iomux->dram_ras = ddr->dram_ras;
-       mx6_grp_iomux->grp_addds = grp->grp_addds;
-
-       /* Control */
-       mx6_ddr_iomux->dram_reset = ddr->dram_reset;
-       mx6_ddr_iomux->dram_sdcke0 = ddr->dram_sdcke0;
-       mx6_ddr_iomux->dram_sdcke1 = ddr->dram_sdcke1;
-       mx6_ddr_iomux->dram_sdba2 = ddr->dram_sdba2;
-       mx6_ddr_iomux->dram_sdodt0 = ddr->dram_sdodt0;
-       mx6_ddr_iomux->dram_sdodt1 = ddr->dram_sdodt1;
-       mx6_grp_iomux->grp_ctlds = grp->grp_ctlds;
-
-       /* Data Strobes */
-       mx6_grp_iomux->grp_ddrmode_ctl = grp->grp_ddrmode_ctl;
-       mx6_ddr_iomux->dram_sdqs0 = ddr->dram_sdqs0;
-       mx6_ddr_iomux->dram_sdqs1 = ddr->dram_sdqs1;
-       if (width >= 32) {
-               mx6_ddr_iomux->dram_sdqs2 = ddr->dram_sdqs2;
-               mx6_ddr_iomux->dram_sdqs3 = ddr->dram_sdqs3;
-       }
-       if (width >= 64) {
-               mx6_ddr_iomux->dram_sdqs4 = ddr->dram_sdqs4;
-               mx6_ddr_iomux->dram_sdqs5 = ddr->dram_sdqs5;
-               mx6_ddr_iomux->dram_sdqs6 = ddr->dram_sdqs6;
-               mx6_ddr_iomux->dram_sdqs7 = ddr->dram_sdqs7;
-       }
-
-       /* Data */
-       mx6_grp_iomux->grp_ddrmode = grp->grp_ddrmode;
-       mx6_grp_iomux->grp_b0ds = grp->grp_b0ds;
-       mx6_grp_iomux->grp_b1ds = grp->grp_b1ds;
-       if (width >= 32) {
-               mx6_grp_iomux->grp_b2ds = grp->grp_b2ds;
-               mx6_grp_iomux->grp_b3ds = grp->grp_b3ds;
-       }
-       if (width >= 64) {
-               mx6_grp_iomux->grp_b4ds = grp->grp_b4ds;
-               mx6_grp_iomux->grp_b5ds = grp->grp_b5ds;
-               mx6_grp_iomux->grp_b6ds = grp->grp_b6ds;
-               mx6_grp_iomux->grp_b7ds = grp->grp_b7ds;
-       }
-       mx6_ddr_iomux->dram_dqm0 = ddr->dram_dqm0;
-       mx6_ddr_iomux->dram_dqm1 = ddr->dram_dqm1;
-       if (width >= 32) {
-               mx6_ddr_iomux->dram_dqm2 = ddr->dram_dqm2;
-               mx6_ddr_iomux->dram_dqm3 = ddr->dram_dqm3;
-       }
-       if (width >= 64) {
-               mx6_ddr_iomux->dram_dqm4 = ddr->dram_dqm4;
-               mx6_ddr_iomux->dram_dqm5 = ddr->dram_dqm5;
-               mx6_ddr_iomux->dram_dqm6 = ddr->dram_dqm6;
-               mx6_ddr_iomux->dram_dqm7 = ddr->dram_dqm7;
-       }
-}
-#endif
-
-#if defined(CONFIG_MX6QDL) || defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
-/* Configure MX6SDL mmdc iomux */
-void mx6sdl_dram_iocfg(unsigned width,
-                      const struct mx6sdl_iomux_ddr_regs *ddr,
-                      const struct mx6sdl_iomux_grp_regs *grp)
-{
-       volatile struct mx6sdl_iomux_ddr_regs *mx6_ddr_iomux;
-       volatile struct mx6sdl_iomux_grp_regs *mx6_grp_iomux;
-
-       mx6_ddr_iomux = (struct mx6sdl_iomux_ddr_regs *)MX6SDL_IOM_DDR_BASE;
-       mx6_grp_iomux = (struct mx6sdl_iomux_grp_regs *)MX6SDL_IOM_GRP_BASE;
-
-       /* DDR IO Type */
-       mx6_grp_iomux->grp_ddr_type = grp->grp_ddr_type;
-       mx6_grp_iomux->grp_ddrpke = grp->grp_ddrpke;
-
-       /* Clock */
-       mx6_ddr_iomux->dram_sdclk_0 = ddr->dram_sdclk_0;
-       mx6_ddr_iomux->dram_sdclk_1 = ddr->dram_sdclk_1;
-
-       /* Address */
-       mx6_ddr_iomux->dram_cas = ddr->dram_cas;
-       mx6_ddr_iomux->dram_ras = ddr->dram_ras;
-       mx6_grp_iomux->grp_addds = grp->grp_addds;
-
-       /* Control */
-       mx6_ddr_iomux->dram_reset = ddr->dram_reset;
-       mx6_ddr_iomux->dram_sdcke0 = ddr->dram_sdcke0;
-       mx6_ddr_iomux->dram_sdcke1 = ddr->dram_sdcke1;
-       mx6_ddr_iomux->dram_sdba2 = ddr->dram_sdba2;
-       mx6_ddr_iomux->dram_sdodt0 = ddr->dram_sdodt0;
-       mx6_ddr_iomux->dram_sdodt1 = ddr->dram_sdodt1;
-       mx6_grp_iomux->grp_ctlds = grp->grp_ctlds;
-
-       /* Data Strobes */
-       mx6_grp_iomux->grp_ddrmode_ctl = grp->grp_ddrmode_ctl;
-       mx6_ddr_iomux->dram_sdqs0 = ddr->dram_sdqs0;
-       mx6_ddr_iomux->dram_sdqs1 = ddr->dram_sdqs1;
-       if (width >= 32) {
-               mx6_ddr_iomux->dram_sdqs2 = ddr->dram_sdqs2;
-               mx6_ddr_iomux->dram_sdqs3 = ddr->dram_sdqs3;
-       }
-       if (width >= 64) {
-               mx6_ddr_iomux->dram_sdqs4 = ddr->dram_sdqs4;
-               mx6_ddr_iomux->dram_sdqs5 = ddr->dram_sdqs5;
-               mx6_ddr_iomux->dram_sdqs6 = ddr->dram_sdqs6;
-               mx6_ddr_iomux->dram_sdqs7 = ddr->dram_sdqs7;
-       }
-
-       /* Data */
-       mx6_grp_iomux->grp_ddrmode = grp->grp_ddrmode;
-       mx6_grp_iomux->grp_b0ds = grp->grp_b0ds;
-       mx6_grp_iomux->grp_b1ds = grp->grp_b1ds;
-       if (width >= 32) {
-               mx6_grp_iomux->grp_b2ds = grp->grp_b2ds;
-               mx6_grp_iomux->grp_b3ds = grp->grp_b3ds;
-       }
-       if (width >= 64) {
-               mx6_grp_iomux->grp_b4ds = grp->grp_b4ds;
-               mx6_grp_iomux->grp_b5ds = grp->grp_b5ds;
-               mx6_grp_iomux->grp_b6ds = grp->grp_b6ds;
-               mx6_grp_iomux->grp_b7ds = grp->grp_b7ds;
-       }
-       mx6_ddr_iomux->dram_dqm0 = ddr->dram_dqm0;
-       mx6_ddr_iomux->dram_dqm1 = ddr->dram_dqm1;
-       if (width >= 32) {
-               mx6_ddr_iomux->dram_dqm2 = ddr->dram_dqm2;
-               mx6_ddr_iomux->dram_dqm3 = ddr->dram_dqm3;
-       }
-       if (width >= 64) {
-               mx6_ddr_iomux->dram_dqm4 = ddr->dram_dqm4;
-               mx6_ddr_iomux->dram_dqm5 = ddr->dram_dqm5;
-               mx6_ddr_iomux->dram_dqm6 = ddr->dram_dqm6;
-               mx6_ddr_iomux->dram_dqm7 = ddr->dram_dqm7;
-       }
-}
-#endif
-
-/*
- * Configure mx6 mmdc registers based on:
- *  - board-specific memory configuration
- *  - board-specific calibration data
- *  - ddr3/lpddr2 chip details
- *
- * The various calculations here are derived from the Freescale
- * 1. i.Mx6DQSDL DDR3 Script Aid spreadsheet (DOC-94917) designed to generate
- *    MMDC configuration registers based on memory system and memory chip
- *    parameters.
- *
- * 2. i.Mx6SL LPDDR2 Script Aid spreadsheet V0.04 designed to generate MMDC
- *    configuration registers based on memory system and memory chip
- *    parameters.
- *
- * The defaults here are those which were specified in the spreadsheet.
- * For details on each register, refer to the IMX6DQRM and/or IMX6SDLRM
- * and/or IMX6SLRM section titled MMDC initialization.
- */
-#define MR(val, ba, cmd, cs1) \
-       ((val << 16) | (1 << 15) | (cmd << 4) | (cs1 << 3) | ba)
-#define MMDC1(entry, value) do {                                         \
-       if (!is_mx6sx() && !is_mx6ul() && !is_mx6sl())                    \
-               mmdc1->entry = value;                                     \
-       } while (0)
-
-/*
- * According JESD209-2B-LPDDR2: Table 103
- * WL: write latency
- */
-static int lpddr2_wl(uint32_t mem_speed)
-{
-       switch (mem_speed) {
-       case 1066:
-       case 933:
-               return 4;
-       case 800:
-               return 3;
-       case 677:
-       case 533:
-               return 2;
-       case 400:
-       case 333:
-               return 1;
-       default:
-               puts("invalid memory speed\n");
-               hang();
-       }
-
-       return 0;
-}
-
-/*
- * According JESD209-2B-LPDDR2: Table 103
- * RL: read latency
- */
-static int lpddr2_rl(uint32_t mem_speed)
-{
-       switch (mem_speed) {
-       case 1066:
-               return 8;
-       case 933:
-               return 7;
-       case 800:
-               return 6;
-       case 677:
-               return 5;
-       case 533:
-               return 4;
-       case 400:
-       case 333:
-               return 3;
-       default:
-               puts("invalid memory speed\n");
-               hang();
-       }
-
-       return 0;
-}
-
-void mx6_lpddr2_cfg(const struct mx6_ddr_sysinfo *sysinfo,
-                   const struct mx6_mmdc_calibration *calib,
-                   const struct mx6_lpddr2_cfg *lpddr2_cfg)
-{
-       volatile struct mmdc_p_regs *mmdc0;
-       u32 val;
-       u8 tcke, tcksrx, tcksre, trrd;
-       u8 twl, txp, tfaw, tcl;
-       u16 tras, twr, tmrd, trtp, twtr, trfc, txsr;
-       u16 trcd_lp, trppb_lp, trpab_lp, trc_lp;
-       u16 cs0_end;
-       u8 coladdr;
-       int clkper; /* clock period in picoseconds */
-       int clock;  /* clock freq in mHz */
-       int cs;
-
-       /* only support 16/32 bits */
-       if (sysinfo->dsize > 1)
-               hang();
-
-       mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-
-       clock = mxc_get_clock(MXC_DDR_CLK) / 1000000U;
-       clkper = (1000 * 1000) / clock; /* pico seconds */
-
-       twl = lpddr2_wl(lpddr2_cfg->mem_speed) - 1;
-
-       /* LPDDR2-S2 and LPDDR2-S4 have the same tRFC value. */
-       switch (lpddr2_cfg->density) {
-       case 1:
-       case 2:
-       case 4:
-               trfc = DIV_ROUND_UP(130000, clkper) - 1;
-               txsr = DIV_ROUND_UP(140000, clkper) - 1;
-               break;
-       case 8:
-               trfc = DIV_ROUND_UP(210000, clkper) - 1;
-               txsr = DIV_ROUND_UP(220000, clkper) - 1;
-               break;
-       default:
-               /*
-                * 64Mb, 128Mb, 256Mb, 512Mb are not supported currently.
-                */
-               hang();
-               break;
-       }
-       /*
-        * txpdll, txpr, taonpd and taofpd are not relevant in LPDDR2 mode,
-        * set them to 0. */
-       txp = DIV_ROUND_UP(7500, clkper) - 1;
-       tcke = 3;
-       if (lpddr2_cfg->mem_speed == 333)
-               tfaw = DIV_ROUND_UP(60000, clkper) - 1;
-       else
-               tfaw = DIV_ROUND_UP(50000, clkper) - 1;
-       trrd = DIV_ROUND_UP(10000, clkper) - 1;
-
-       /* tckesr for LPDDR2 */
-       tcksre = DIV_ROUND_UP(15000, clkper);
-       tcksrx = tcksre;
-       twr  = DIV_ROUND_UP(15000, clkper) - 1;
-       /*
-        * tMRR: 2, tMRW: 5
-        * tMRD should be set to max(tMRR, tMRW)
-        */
-       tmrd = 5;
-       tras = DIV_ROUND_UP(lpddr2_cfg->trasmin, clkper / 10) - 1;
-       /* LPDDR2 mode use tRCD_LP filed in MDCFG3. */
-       trcd_lp = DIV_ROUND_UP(lpddr2_cfg->trcd_lp, clkper / 10) - 1;
-       trc_lp = DIV_ROUND_UP(lpddr2_cfg->trasmin + lpddr2_cfg->trppb_lp,
-                             clkper / 10) - 1;
-       trppb_lp = DIV_ROUND_UP(lpddr2_cfg->trppb_lp, clkper / 10) - 1;
-       trpab_lp = DIV_ROUND_UP(lpddr2_cfg->trpab_lp, clkper / 10) - 1;
-       /* To LPDDR2, CL in MDCFG0 refers to RL */
-       tcl = lpddr2_rl(lpddr2_cfg->mem_speed) - 3;
-       twtr = DIV_ROUND_UP(7500, clkper) - 1;
-       trtp = DIV_ROUND_UP(7500, clkper) - 1;
-
-       cs0_end = 4 * sysinfo->cs_density - 1;
-
-       debug("density:%d Gb (%d Gb per chip)\n",
-             sysinfo->cs_density, lpddr2_cfg->density);
-       debug("clock: %dMHz (%d ps)\n", clock, clkper);
-       debug("memspd:%d\n", lpddr2_cfg->mem_speed);
-       debug("trcd_lp=%d\n", trcd_lp);
-       debug("trppb_lp=%d\n", trppb_lp);
-       debug("trpab_lp=%d\n", trpab_lp);
-       debug("trc_lp=%d\n", trc_lp);
-       debug("tcke=%d\n", tcke);
-       debug("tcksrx=%d\n", tcksrx);
-       debug("tcksre=%d\n", tcksre);
-       debug("trfc=%d\n", trfc);
-       debug("txsr=%d\n", txsr);
-       debug("txp=%d\n", txp);
-       debug("tfaw=%d\n", tfaw);
-       debug("tcl=%d\n", tcl);
-       debug("tras=%d\n", tras);
-       debug("twr=%d\n", twr);
-       debug("tmrd=%d\n", tmrd);
-       debug("twl=%d\n", twl);
-       debug("trtp=%d\n", trtp);
-       debug("twtr=%d\n", twtr);
-       debug("trrd=%d\n", trrd);
-       debug("cs0_end=%d\n", cs0_end);
-       debug("ncs=%d\n", sysinfo->ncs);
-
-       /*
-        * board-specific configuration:
-        *  These values are determined empirically and vary per board layout
-        */
-       mmdc0->mpwldectrl0 = calib->p0_mpwldectrl0;
-       mmdc0->mpwldectrl1 = calib->p0_mpwldectrl1;
-       mmdc0->mpdgctrl0 = calib->p0_mpdgctrl0;
-       mmdc0->mpdgctrl1 = calib->p0_mpdgctrl1;
-       mmdc0->mprddlctl = calib->p0_mprddlctl;
-       mmdc0->mpwrdlctl = calib->p0_mpwrdlctl;
-       mmdc0->mpzqlp2ctl = calib->mpzqlp2ctl;
-
-       /* Read data DQ Byte0-3 delay */
-       mmdc0->mprddqby0dl = 0x33333333;
-       mmdc0->mprddqby1dl = 0x33333333;
-       if (sysinfo->dsize > 0) {
-               mmdc0->mprddqby2dl = 0x33333333;
-               mmdc0->mprddqby3dl = 0x33333333;
-       }
-
-       /* Write data DQ Byte0-3 delay */
-       mmdc0->mpwrdqby0dl = 0xf3333333;
-       mmdc0->mpwrdqby1dl = 0xf3333333;
-       if (sysinfo->dsize > 0) {
-               mmdc0->mpwrdqby2dl = 0xf3333333;
-               mmdc0->mpwrdqby3dl = 0xf3333333;
-       }
-
-       /*
-        * In LPDDR2 mode this register should be cleared,
-        * so no termination will be activated.
-        */
-       mmdc0->mpodtctrl = 0;
-
-       /* complete calibration */
-       val = (1 << 11); /* Force measurement on delay-lines */
-       mmdc0->mpmur0 = val;
-
-       /* Step 1: configuration request */
-       mmdc0->mdscr = (u32)(1 << 15); /* config request */
-
-       /* Step 2: Timing configuration */
-       mmdc0->mdcfg0 = (trfc << 24) | (txsr << 16) | (txp << 13) |
-                       (tfaw << 4) | tcl;
-       mmdc0->mdcfg1 = (tras << 16) | (twr << 9) | (tmrd << 5) | twl;
-       mmdc0->mdcfg2 = (trtp << 6) | (twtr << 3) | trrd;
-       mmdc0->mdcfg3lp = (trc_lp << 16) | (trcd_lp << 8) |
-                         (trppb_lp << 4) | trpab_lp;
-       mmdc0->mdotc = 0;
-
-       mmdc0->mdasp = cs0_end; /* CS addressing */
-
-       /* Step 3: Configure DDR type */
-       mmdc0->mdmisc = (sysinfo->cs1_mirror << 19) | (sysinfo->walat << 16) |
-                       (sysinfo->bi_on << 12) | (sysinfo->mif3_mode << 9) |
-                       (sysinfo->ralat << 6) | (1 << 3);
-
-       /* Step 4: Configure delay while leaving reset */
-       mmdc0->mdor = (sysinfo->sde_to_rst << 8) |
-                     (sysinfo->rst_to_cke << 0);
-
-       /* Step 5: Configure DDR physical parameters (density and burst len) */
-       coladdr = lpddr2_cfg->coladdr;
-       if (lpddr2_cfg->coladdr == 8)           /* 8-bit COL is 0x3 */
-               coladdr += 4;
-       else if (lpddr2_cfg->coladdr == 12)     /* 12-bit COL is 0x4 */
-               coladdr += 1;
-       mmdc0->mdctl =  (lpddr2_cfg->rowaddr - 11) << 24 |      /* ROW */
-                       (coladdr - 9) << 20 |                   /* COL */
-                       (0 << 19) |     /* Burst Length = 4 for LPDDR2 */
-                       (sysinfo->dsize << 16); /* DDR data bus size */
-
-       /* Step 6: Perform ZQ calibration */
-       val = 0xa1390003; /* one-time HW ZQ calib */
-       mmdc0->mpzqhwctrl = val;
-
-       /* Step 7: Enable MMDC with desired chip select */
-       mmdc0->mdctl |= (1 << 31) |                          /* SDE_0 for CS0 */
-                       ((sysinfo->ncs == 2) ? 1 : 0) << 30; /* SDE_1 for CS1 */
-
-       /* Step 8: Write Mode Registers to Init LPDDR2 devices */
-       for (cs = 0; cs < sysinfo->ncs; cs++) {
-               /* MR63: reset */
-               mmdc0->mdscr = MR(63, 0, 3, cs);
-               /* MR10: calibration,
-                * 0xff is calibration command after intilization.
-                */
-               val = 0xA | (0xff << 8);
-               mmdc0->mdscr = MR(val, 0, 3, cs);
-               /* MR1 */
-               val = 0x1 | (0x82 << 8);
-               mmdc0->mdscr = MR(val, 0, 3, cs);
-               /* MR2 */
-               val = 0x2 | (0x04 << 8);
-               mmdc0->mdscr = MR(val, 0, 3, cs);
-               /* MR3 */
-               val = 0x3 | (0x02 << 8);
-               mmdc0->mdscr = MR(val, 0, 3, cs);
-       }
-
-       /* Step 10: Power down control and self-refresh */
-       mmdc0->mdpdc = (tcke & 0x7) << 16 |
-                       5            << 12 |  /* PWDT_1: 256 cycles */
-                       5            <<  8 |  /* PWDT_0: 256 cycles */
-                       1            <<  6 |  /* BOTH_CS_PD */
-                       (tcksrx & 0x7) << 3 |
-                       (tcksre & 0x7);
-       mmdc0->mapsr = 0x00001006; /* ADOPT power down enabled */
-
-       /* Step 11: Configure ZQ calibration: one-time and periodic 1ms */
-       val = 0xa1310003;
-       mmdc0->mpzqhwctrl = val;
-
-       /* Step 12: Configure and activate periodic refresh */
-       mmdc0->mdref = (sysinfo->refsel << 14) | (sysinfo->refr << 11);
-
-       /* Step 13: Deassert config request - init complete */
-       mmdc0->mdscr = 0x00000000;
-
-       /* wait for auto-ZQ calibration to complete */
-       mdelay(1);
-}
-
-void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo,
-                 const struct mx6_mmdc_calibration *calib,
-                 const struct mx6_ddr3_cfg *ddr3_cfg)
-{
-       volatile struct mmdc_p_regs *mmdc0;
-       volatile struct mmdc_p_regs *mmdc1;
-       u32 val;
-       u8 tcke, tcksrx, tcksre, txpdll, taofpd, taonpd, trrd;
-       u8 todtlon, taxpd, tanpd, tcwl, txp, tfaw, tcl;
-       u8 todt_idle_off = 0x4; /* from DDR3 Script Aid spreadsheet */
-       u16 trcd, trc, tras, twr, tmrd, trtp, trp, twtr, trfc, txs, txpr;
-       u16 cs0_end;
-       u16 tdllk = 0x1ff; /* DLL locking time: 512 cycles (JEDEC DDR3) */
-       u8 coladdr;
-       int clkper; /* clock period in picoseconds */
-       int clock; /* clock freq in MHz */
-       int cs;
-       u16 mem_speed = ddr3_cfg->mem_speed;
-
-       mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-       if (!is_mx6sx() && !is_mx6ul() && !is_mx6sl())
-               mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
-
-       /* Limit mem_speed for MX6D/MX6Q */
-       if (is_mx6dq() || is_mx6dqp()) {
-               if (mem_speed > 1066)
-                       mem_speed = 1066; /* 1066 MT/s */
-
-               tcwl = 4;
-       }
-       /* Limit mem_speed for MX6S/MX6DL */
-       else {
-               if (mem_speed > 800)
-                       mem_speed = 800;  /* 800 MT/s */
-
-               tcwl = 3;
-       }
-
-       clock = mem_speed / 2;
-       /*
-        * Data rate of 1066 MT/s requires 533 MHz DDR3 clock, but MX6D/Q supports
-        * up to 528 MHz, so reduce the clock to fit chip specs
-        */
-       if (is_mx6dq() || is_mx6dqp()) {
-               if (clock > 528)
-                       clock = 528; /* 528 MHz */
-       }
-
-       clkper = (1000 * 1000) / clock; /* pico seconds */
-       todtlon = tcwl;
-       taxpd = tcwl;
-       tanpd = tcwl;
-
-       switch (ddr3_cfg->density) {
-       case 1: /* 1Gb per chip */
-               trfc = DIV_ROUND_UP(110000, clkper) - 1;
-               txs = DIV_ROUND_UP(120000, clkper) - 1;
-               break;
-       case 2: /* 2Gb per chip */
-               trfc = DIV_ROUND_UP(160000, clkper) - 1;
-               txs = DIV_ROUND_UP(170000, clkper) - 1;
-               break;
-       case 4: /* 4Gb per chip */
-               trfc = DIV_ROUND_UP(260000, clkper) - 1;
-               txs = DIV_ROUND_UP(270000, clkper) - 1;
-               break;
-       case 8: /* 8Gb per chip */
-               trfc = DIV_ROUND_UP(350000, clkper) - 1;
-               txs = DIV_ROUND_UP(360000, clkper) - 1;
-               break;
-       default:
-               /* invalid density */
-               puts("invalid chip density\n");
-               hang();
-               break;
-       }
-       txpr = txs;
-
-       switch (mem_speed) {
-       case 800:
-               txp = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
-               tcke = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
-               if (ddr3_cfg->pagesz == 1) {
-                       tfaw = DIV_ROUND_UP(40000, clkper) - 1;
-                       trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
-               } else {
-                       tfaw = DIV_ROUND_UP(50000, clkper) - 1;
-                       trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
-               }
-               break;
-       case 1066:
-               txp = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
-               tcke = DIV_ROUND_UP(max(3 * clkper, 5625), clkper) - 1;
-               if (ddr3_cfg->pagesz == 1) {
-                       tfaw = DIV_ROUND_UP(37500, clkper) - 1;
-                       trrd = DIV_ROUND_UP(max(4 * clkper, 7500), clkper) - 1;
-               } else {
-                       tfaw = DIV_ROUND_UP(50000, clkper) - 1;
-                       trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
-               }
-               break;
-       default:
-               puts("invalid memory speed\n");
-               hang();
-               break;
-       }
-       txpdll = DIV_ROUND_UP(max(10 * clkper, 24000), clkper) - 1;
-       tcksre = DIV_ROUND_UP(max(5 * clkper, 10000), clkper);
-       taonpd = DIV_ROUND_UP(2000, clkper) - 1;
-       tcksrx = tcksre;
-       taofpd = taonpd;
-       twr  = DIV_ROUND_UP(15000, clkper) - 1;
-       tmrd = DIV_ROUND_UP(max(12 * clkper, 15000), clkper) - 1;
-       trc  = DIV_ROUND_UP(ddr3_cfg->trcmin, clkper / 10) - 1;
-       tras = DIV_ROUND_UP(ddr3_cfg->trasmin, clkper / 10) - 1;
-       tcl  = DIV_ROUND_UP(ddr3_cfg->trcd, clkper / 10) - 3;
-       trp  = DIV_ROUND_UP(ddr3_cfg->trcd, clkper / 10) - 1;
-       twtr = ROUND(max(4 * clkper, 7500) / clkper, 1) - 1;
-       trcd = trp;
-       trtp = twtr;
-       cs0_end = 4 * sysinfo->cs_density - 1;
-
-       debug("density:%d Gb (%d Gb per chip)\n",
-             sysinfo->cs_density, ddr3_cfg->density);
-       debug("clock: %dMHz (%d ps)\n", clock, clkper);
-       debug("memspd:%d\n", mem_speed);
-       debug("tcke=%d\n", tcke);
-       debug("tcksrx=%d\n", tcksrx);
-       debug("tcksre=%d\n", tcksre);
-       debug("taofpd=%d\n", taofpd);
-       debug("taonpd=%d\n", taonpd);
-       debug("todtlon=%d\n", todtlon);
-       debug("tanpd=%d\n", tanpd);
-       debug("taxpd=%d\n", taxpd);
-       debug("trfc=%d\n", trfc);
-       debug("txs=%d\n", txs);
-       debug("txp=%d\n", txp);
-       debug("txpdll=%d\n", txpdll);
-       debug("tfaw=%d\n", tfaw);
-       debug("tcl=%d\n", tcl);
-       debug("trcd=%d\n", trcd);
-       debug("trp=%d\n", trp);
-       debug("trc=%d\n", trc);
-       debug("tras=%d\n", tras);
-       debug("twr=%d\n", twr);
-       debug("tmrd=%d\n", tmrd);
-       debug("tcwl=%d\n", tcwl);
-       debug("tdllk=%d\n", tdllk);
-       debug("trtp=%d\n", trtp);
-       debug("twtr=%d\n", twtr);
-       debug("trrd=%d\n", trrd);
-       debug("txpr=%d\n", txpr);
-       debug("cs0_end=%d\n", cs0_end);
-       debug("ncs=%d\n", sysinfo->ncs);
-       debug("Rtt_wr=%d\n", sysinfo->rtt_wr);
-       debug("Rtt_nom=%d\n", sysinfo->rtt_nom);
-       debug("SRT=%d\n", ddr3_cfg->SRT);
-       debug("twr=%d\n", twr);
-
-       /*
-        * board-specific configuration:
-        *  These values are determined empirically and vary per board layout
-        *  see:
-        *   appnote, ddr3 spreadsheet
-        */
-       mmdc0->mpwldectrl0 = calib->p0_mpwldectrl0;
-       mmdc0->mpwldectrl1 = calib->p0_mpwldectrl1;
-       mmdc0->mpdgctrl0 = calib->p0_mpdgctrl0;
-       mmdc0->mpdgctrl1 = calib->p0_mpdgctrl1;
-       mmdc0->mprddlctl = calib->p0_mprddlctl;
-       mmdc0->mpwrdlctl = calib->p0_mpwrdlctl;
-       if (sysinfo->dsize > 1) {
-               MMDC1(mpwldectrl0, calib->p1_mpwldectrl0);
-               MMDC1(mpwldectrl1, calib->p1_mpwldectrl1);
-               MMDC1(mpdgctrl0, calib->p1_mpdgctrl0);
-               MMDC1(mpdgctrl1, calib->p1_mpdgctrl1);
-               MMDC1(mprddlctl, calib->p1_mprddlctl);
-               MMDC1(mpwrdlctl, calib->p1_mpwrdlctl);
-       }
-
-       /* Read data DQ Byte0-3 delay */
-       mmdc0->mprddqby0dl = 0x33333333;
-       mmdc0->mprddqby1dl = 0x33333333;
-       if (sysinfo->dsize > 0) {
-               mmdc0->mprddqby2dl = 0x33333333;
-               mmdc0->mprddqby3dl = 0x33333333;
-       }
-
-       if (sysinfo->dsize > 1) {
-               MMDC1(mprddqby0dl, 0x33333333);
-               MMDC1(mprddqby1dl, 0x33333333);
-               MMDC1(mprddqby2dl, 0x33333333);
-               MMDC1(mprddqby3dl, 0x33333333);
-       }
-
-       /* MMDC Termination: rtt_nom:2 RZQ/2(120ohm), rtt_nom:1 RZQ/4(60ohm) */
-       val = (sysinfo->rtt_nom == 2) ? 0x00011117 : 0x00022227;
-       mmdc0->mpodtctrl = val;
-       if (sysinfo->dsize > 1)
-               MMDC1(mpodtctrl, val);
-
-       /* complete calibration */
-       val = (1 << 11); /* Force measurement on delay-lines */
-       mmdc0->mpmur0 = val;
-       if (sysinfo->dsize > 1)
-               MMDC1(mpmur0, val);
-
-       /* Step 1: configuration request */
-       mmdc0->mdscr = (u32)(1 << 15); /* config request */
-
-       /* Step 2: Timing configuration */
-       mmdc0->mdcfg0 = (trfc << 24) | (txs << 16) | (txp << 13) |
-                       (txpdll << 9) | (tfaw << 4) | tcl;
-       mmdc0->mdcfg1 = (trcd << 29) | (trp << 26) | (trc << 21) |
-                       (tras << 16) | (1 << 15) /* trpa */ |
-                       (twr << 9) | (tmrd << 5) | tcwl;
-       mmdc0->mdcfg2 = (tdllk << 16) | (trtp << 6) | (twtr << 3) | trrd;
-       mmdc0->mdotc = (taofpd << 27) | (taonpd << 24) | (tanpd << 20) |
-                      (taxpd << 16) | (todtlon << 12) | (todt_idle_off << 4);
-       mmdc0->mdasp = cs0_end; /* CS addressing */
-
-       /* Step 3: Configure DDR type */
-       mmdc0->mdmisc = (sysinfo->cs1_mirror << 19) | (sysinfo->walat << 16) |
-                       (sysinfo->bi_on << 12) | (sysinfo->mif3_mode << 9) |
-                       (sysinfo->ralat << 6);
-
-       /* Step 4: Configure delay while leaving reset */
-       mmdc0->mdor = (txpr << 16) | (sysinfo->sde_to_rst << 8) |
-                     (sysinfo->rst_to_cke << 0);
-
-       /* Step 5: Configure DDR physical parameters (density and burst len) */
-       coladdr = ddr3_cfg->coladdr;
-       if (ddr3_cfg->coladdr == 8)             /* 8-bit COL is 0x3 */
-               coladdr += 4;
-       else if (ddr3_cfg->coladdr == 12)       /* 12-bit COL is 0x4 */
-               coladdr += 1;
-       mmdc0->mdctl =  (ddr3_cfg->rowaddr - 11) << 24 |        /* ROW */
-                       (coladdr - 9) << 20 |                   /* COL */
-                       (1 << 19) |             /* Burst Length = 8 for DDR3 */
-                       (sysinfo->dsize << 16);         /* DDR data bus size */
-
-       /* Step 6: Perform ZQ calibration */
-       val = 0xa1390001; /* one-time HW ZQ calib */
-       mmdc0->mpzqhwctrl = val;
-       if (sysinfo->dsize > 1)
-               MMDC1(mpzqhwctrl, val);
-
-       /* Step 7: Enable MMDC with desired chip select */
-       mmdc0->mdctl |= (1 << 31) |                          /* SDE_0 for CS0 */
-                       ((sysinfo->ncs == 2) ? 1 : 0) << 30; /* SDE_1 for CS1 */
-
-       /* Step 8: Write Mode Registers to Init DDR3 devices */
-       for (cs = 0; cs < sysinfo->ncs; cs++) {
-               /* MR2 */
-               val = (sysinfo->rtt_wr & 3) << 9 | (ddr3_cfg->SRT & 1) << 7 |
-                     ((tcwl - 3) & 3) << 3;
-               debug("MR2 CS%d: 0x%08x\n", cs, (u32)MR(val, 2, 3, cs));
-               mmdc0->mdscr = MR(val, 2, 3, cs);
-               /* MR3 */
-               debug("MR3 CS%d: 0x%08x\n", cs, (u32)MR(0, 3, 3, cs));
-               mmdc0->mdscr = MR(0, 3, 3, cs);
-               /* MR1 */
-               val = ((sysinfo->rtt_nom & 1) ? 1 : 0) << 2 |
-                     ((sysinfo->rtt_nom & 2) ? 1 : 0) << 6;
-               debug("MR1 CS%d: 0x%08x\n", cs, (u32)MR(val, 1, 3, cs));
-               mmdc0->mdscr = MR(val, 1, 3, cs);
-               /* MR0 */
-               val = ((tcl - 1) << 4) |        /* CAS */
-                     (1 << 8)   |              /* DLL Reset */
-                     ((twr - 3) << 9) |        /* Write Recovery */
-                     (sysinfo->pd_fast_exit << 12); /* Precharge PD PLL on */
-               debug("MR0 CS%d: 0x%08x\n", cs, (u32)MR(val, 0, 3, cs));
-               mmdc0->mdscr = MR(val, 0, 3, cs);
-               /* ZQ calibration */
-               val = (1 << 10);
-               mmdc0->mdscr = MR(val, 0, 4, cs);
-       }
-
-       /* Step 10: Power down control and self-refresh */
-       mmdc0->mdpdc = (tcke & 0x7) << 16 |
-                       5            << 12 |  /* PWDT_1: 256 cycles */
-                       5            <<  8 |  /* PWDT_0: 256 cycles */
-                       1            <<  6 |  /* BOTH_CS_PD */
-                       (tcksrx & 0x7) << 3 |
-                       (tcksre & 0x7);
-       if (!sysinfo->pd_fast_exit)
-               mmdc0->mdpdc |= (1 << 7); /* SLOW_PD */
-       mmdc0->mapsr = 0x00001006; /* ADOPT power down enabled */
-
-       /* Step 11: Configure ZQ calibration: one-time and periodic 1ms */
-       val = 0xa1390003;
-       mmdc0->mpzqhwctrl = val;
-       if (sysinfo->dsize > 1)
-               MMDC1(mpzqhwctrl, val);
-
-       /* Step 12: Configure and activate periodic refresh */
-       mmdc0->mdref = (sysinfo->refsel << 14) | (sysinfo->refr << 11);
-
-       /* Step 13: Deassert config request - init complete */
-       mmdc0->mdscr = 0x00000000;
-
-       /* wait for auto-ZQ calibration to complete */
-       mdelay(1);
-}
-
-void mmdc_read_calibration(struct mx6_ddr_sysinfo const *sysinfo,
-                           struct mx6_mmdc_calibration *calib)
-{
-       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
-       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
-
-       calib->p0_mpwldectrl0 = readl(&mmdc0->mpwldectrl0);
-       calib->p0_mpwldectrl1 = readl(&mmdc0->mpwldectrl1);
-       calib->p0_mpdgctrl0 = readl(&mmdc0->mpdgctrl0);
-       calib->p0_mpdgctrl1 = readl(&mmdc0->mpdgctrl1);
-       calib->p0_mprddlctl = readl(&mmdc0->mprddlctl);
-       calib->p0_mpwrdlctl = readl(&mmdc0->mpwrdlctl);
-
-       if (sysinfo->dsize == 2) {
-               calib->p1_mpwldectrl0 = readl(&mmdc1->mpwldectrl0);
-               calib->p1_mpwldectrl1 = readl(&mmdc1->mpwldectrl1);
-               calib->p1_mpdgctrl0 = readl(&mmdc1->mpdgctrl0);
-               calib->p1_mpdgctrl1 = readl(&mmdc1->mpdgctrl1);
-               calib->p1_mprddlctl = readl(&mmdc1->mprddlctl);
-               calib->p1_mpwrdlctl = readl(&mmdc1->mpwrdlctl);
-       }
-}
-
-void mx6_dram_cfg(const struct mx6_ddr_sysinfo *sysinfo,
-                 const struct mx6_mmdc_calibration *calib,
-                 const void *ddr_cfg)
-{
-       if (sysinfo->ddr_type == DDR_TYPE_DDR3) {
-               mx6_ddr3_cfg(sysinfo, calib, ddr_cfg);
-       } else if (sysinfo->ddr_type == DDR_TYPE_LPDDR2) {
-               mx6_lpddr2_cfg(sysinfo, calib, ddr_cfg);
-       } else {
-               puts("Unsupported ddr type\n");
-               hang();
-       }
-}
diff --git a/arch/arm/cpu/armv7/mx6/litesom.c b/arch/arm/cpu/armv7/mx6/litesom.c
deleted file mode 100644 (file)
index ac2eccf..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
- * Copyright (C) 2016 Grinn
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm/arch/clock.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/mx6ul_pins.h>
-#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/io.h>
-#include <common.h>
-#include <fsl_esdhc.h>
-#include <linux/sizes.h>
-#include <mmc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |            \
-       PAD_CTL_PUS_22K_UP  | PAD_CTL_SPEED_LOW |               \
-       PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
-int dram_init(void)
-{
-       gd->ram_size = imx_ddr_size();
-
-       return 0;
-}
-
-static iomux_v3_cfg_t const emmc_pads[] = {
-       MX6_PAD_NAND_RE_B__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_WE_B__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA00__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA01__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA02__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA03__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA04__USDHC2_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA05__USDHC2_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA06__USDHC2_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_DATA07__USDHC2_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-
-       /* RST_B */
-       MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-#ifdef CONFIG_FSL_ESDHC
-static struct fsl_esdhc_cfg emmc_cfg = {USDHC2_BASE_ADDR, 0, 8};
-
-#define EMMC_PWR_GPIO  IMX_GPIO_NR(4, 10)
-
-int litesom_mmc_init(bd_t *bis)
-{
-       int ret;
-
-       /* eMMC */
-       imx_iomux_v3_setup_multiple_pads(emmc_pads, ARRAY_SIZE(emmc_pads));
-       gpio_direction_output(EMMC_PWR_GPIO, 0);
-       udelay(500);
-       gpio_direction_output(EMMC_PWR_GPIO, 1);
-       emmc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-
-       ret = fsl_esdhc_initialize(bis, &emmc_cfg);
-       if (ret) {
-               printf("Warning: failed to initialize mmc dev 1 (eMMC)\n");
-               return ret;
-       }
-
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_SPL_BUILD
-#include <libfdt.h>
-#include <spl.h>
-#include <asm/arch/mx6-ddr.h>
-
-
-static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = {
-       .grp_addds = 0x00000030,
-       .grp_ddrmode_ctl = 0x00020000,
-       .grp_b0ds = 0x00000030,
-       .grp_ctlds = 0x00000030,
-       .grp_b1ds = 0x00000030,
-       .grp_ddrpke = 0x00000000,
-       .grp_ddrmode = 0x00020000,
-       .grp_ddr_type = 0x000c0000,
-};
-
-static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = {
-       .dram_dqm0 = 0x00000030,
-       .dram_dqm1 = 0x00000030,
-       .dram_ras = 0x00000030,
-       .dram_cas = 0x00000030,
-       .dram_odt0 = 0x00000030,
-       .dram_odt1 = 0x00000030,
-       .dram_sdba2 = 0x00000000,
-       .dram_sdclk_0 = 0x00000030,
-       .dram_sdqs0 = 0x00000030,
-       .dram_sdqs1 = 0x00000030,
-       .dram_reset = 0x00000030,
-};
-
-static struct mx6_mmdc_calibration mx6_mmcd_calib = {
-       .p0_mpwldectrl0 = 0x00000000,
-       .p0_mpdgctrl0 = 0x41570155,
-       .p0_mprddlctl = 0x4040474A,
-       .p0_mpwrdlctl = 0x40405550,
-};
-
-struct mx6_ddr_sysinfo ddr_sysinfo = {
-       .dsize = 0,
-       .cs_density = 20,
-       .ncs = 1,
-       .cs1_mirror = 0,
-       .rtt_wr = 2,
-       .rtt_nom = 1,           /* RTT_Nom = RZQ/2 */
-       .walat = 0,             /* Write additional latency */
-       .ralat = 5,             /* Read additional latency */
-       .mif3_mode = 3,         /* Command prediction working mode */
-       .bi_on = 1,             /* Bank interleaving enabled */
-       .sde_to_rst = 0x10,     /* 14 cycles, 200us (JEDEC default) */
-       .rst_to_cke = 0x23,     /* 33 cycles, 500us (JEDEC default) */
-       .ddr_type = DDR_TYPE_DDR3,
-       .refsel = 0,            /* Refresh cycles at 64KHz */
-       .refr = 1,              /* 2 refresh commands per refresh cycle */
-};
-
-static struct mx6_ddr3_cfg mem_ddr = {
-       .mem_speed = 800,
-       .density = 4,
-       .width = 16,
-       .banks = 8,
-       .rowaddr = 15,
-       .coladdr = 10,
-       .pagesz = 2,
-       .trcd = 1375,
-       .trcmin = 4875,
-       .trasmin = 3500,
-};
-
-static void ccgr_init(void)
-{
-       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-       writel(0xFFFFFFFF, &ccm->CCGR0);
-       writel(0xFFFFFFFF, &ccm->CCGR1);
-       writel(0xFFFFFFFF, &ccm->CCGR2);
-       writel(0xFFFFFFFF, &ccm->CCGR3);
-       writel(0xFFFFFFFF, &ccm->CCGR4);
-       writel(0xFFFFFFFF, &ccm->CCGR5);
-       writel(0xFFFFFFFF, &ccm->CCGR6);
-       writel(0xFFFFFFFF, &ccm->CCGR7);
-}
-
-static void spl_dram_init(void)
-{
-       unsigned long ram_size;
-
-       mx6ul_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs);
-       mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
-
-       /*
-        * Get actual RAM size, so we can adjust DDR row size for <512M
-        * memories
-        */
-       ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_512M);
-       if (ram_size < SZ_512M) {
-               mem_ddr.rowaddr = 14;
-               mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
-       }
-}
-
-void litesom_init_f(void)
-{
-       ccgr_init();
-
-       /* setup AIPS and disable watchdog */
-       arch_cpu_init();
-
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-       board_early_init_f();
-#endif
-
-       /* setup GP timer */
-       timer_init();
-
-       /* UART clocks enabled and gd valid - init serial console */
-       preloader_console_init();
-
-       /* DDR initialization */
-       spl_dram_init();
-}
-#endif
diff --git a/arch/arm/cpu/armv7/mx6/mp.c b/arch/arm/cpu/armv7/mx6/mp.c
deleted file mode 100644 (file)
index e28018b..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * (C) Copyright 2014
- * Gabriel Huau <contact@huau-gabriel.fr>
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <linux/errno.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/imx-regs.h>
-
-#define MAX_CPUS 4
-static struct src *src = (struct src *)SRC_BASE_ADDR;
-
-static uint32_t cpu_reset_mask[MAX_CPUS] = {
-       0, /* We don't really want to modify the cpu0 */
-       SRC_SCR_CORE_1_RESET_MASK,
-       SRC_SCR_CORE_2_RESET_MASK,
-       SRC_SCR_CORE_3_RESET_MASK
-};
-
-static uint32_t cpu_ctrl_mask[MAX_CPUS] = {
-       0, /* We don't really want to modify the cpu0 */
-       SRC_SCR_CORE_1_ENABLE_MASK,
-       SRC_SCR_CORE_2_ENABLE_MASK,
-       SRC_SCR_CORE_3_ENABLE_MASK
-};
-
-int cpu_reset(int nr)
-{
-       /* Software reset of the CPU N */
-       src->scr |= cpu_reset_mask[nr];
-       return 0;
-}
-
-int cpu_status(int nr)
-{
-       printf("core %d => %d\n", nr, !!(src->scr & cpu_ctrl_mask[nr]));
-       return 0;
-}
-
-int cpu_release(int nr, int argc, char *const argv[])
-{
-       uint32_t boot_addr;
-
-       boot_addr = simple_strtoul(argv[0], NULL, 16);
-
-       switch (nr) {
-       case 1:
-               src->gpr3 = boot_addr;
-               break;
-       case 2:
-               src->gpr5 = boot_addr;
-               break;
-       case 3:
-               src->gpr7 = boot_addr;
-               break;
-       default:
-               return 1;
-       }
-
-       /* CPU N is ready to start */
-       src->scr |= cpu_ctrl_mask[nr];
-
-       return 0;
-}
-
-int is_core_valid(unsigned int core)
-{
-       uint32_t nr_cores = get_nr_cpus();
-
-       if (core > nr_cores)
-               return 0;
-
-       return 1;
-}
-
-int cpu_disable(int nr)
-{
-       /* Disable the CPU N */
-       src->scr &= ~cpu_ctrl_mask[nr];
-       return 0;
-}
diff --git a/arch/arm/cpu/armv7/mx6/opos6ul.c b/arch/arm/cpu/armv7/mx6/opos6ul.c
deleted file mode 100644 (file)
index ea2f0ec..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (C) 2017 Armadeus Systems
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm/arch/clock.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/mx6-pins.h>
-#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/io.h>
-#include <common.h>
-#include <environment.h>
-#include <fsl_esdhc.h>
-#include <mmc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_FEC_MXC
-#include <miiphy.h>
-
-#define MDIO_PAD_CTRL ( \
-       PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-       PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_PAD_CTRL_PU ( \
-       PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-       PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_PAD_CTRL_PD ( \
-       PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | \
-       PAD_CTL_DSE_40ohm \
-)
-
-#define ENET_CLK_PAD_CTRL ( \
-       PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \
-       PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST \
-)
-
-static iomux_v3_cfg_t const fec1_pads[] = {
-       MX6_PAD_GPIO1_IO06__ENET1_MDIO        | MUX_PAD_CTRL(MDIO_PAD_CTRL),
-       MX6_PAD_GPIO1_IO07__ENET1_MDC         | MUX_PAD_CTRL(MDIO_PAD_CTRL),
-       MX6_PAD_ENET1_RX_ER__ENET1_RX_ER      | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-       MX6_PAD_ENET1_RX_EN__ENET1_RX_EN      | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-       MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-       MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-       MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-       MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-       MX6_PAD_ENET1_TX_EN__ENET1_TX_EN      | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-       /* PHY Int */
-       MX6_PAD_NAND_DQS__GPIO4_IO16          | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
-       /* PHY Reset */
-       MX6_PAD_NAND_DATA00__GPIO4_IO02       | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
-       MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
-};
-
-int board_phy_config(struct phy_device *phydev)
-{
-       phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190);
-
-       if (phydev->drv->config)
-               phydev->drv->config(phydev);
-
-       return 0;
-}
-
-int board_eth_init(bd_t *bis)
-{
-       struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
-       struct gpio_desc rst;
-       int ret;
-
-       /* Use 50M anatop loopback REF_CLK1 for ENET1,
-        * clear gpr1[13], set gpr1[17] */
-       clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK,
-                       IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK);
-
-       ret = enable_fec_anatop_clock(0, ENET_50MHZ);
-       if (ret)
-               return ret;
-
-       enable_enet_clk(1);
-
-       imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
-
-       ret = dm_gpio_lookup_name("GPIO4_2", &rst);
-       if (ret) {
-               printf("Cannot get GPIO4_2\n");
-               return ret;
-       }
-
-       ret = dm_gpio_request(&rst, "phy-rst");
-       if (ret) {
-               printf("Cannot request GPIO4_2\n");
-               return ret;
-       }
-
-       dm_gpio_set_dir_flags(&rst, GPIOD_IS_OUT);
-       dm_gpio_set_value(&rst, 0);
-       udelay(1000);
-       dm_gpio_set_value(&rst, 1);
-
-       return fecmxc_initialize(bis);
-}
-#endif /* CONFIG_FEC_MXC */
-
-int board_init(void)
-{
-       /* Address of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-       return 0;
-}
-
-int __weak opos6ul_board_late_init(void)
-{
-       return 0;
-}
-
-int board_late_init(void)
-{
-       struct src *psrc = (struct src *)SRC_BASE_ADDR;
-       unsigned reg = readl(&psrc->sbmr2);
-
-       /* In bootstrap don't use the env vars */
-       if (((reg & 0x3000000) >> 24) == 0x1) {
-               set_default_env(NULL);
-               setenv("preboot", "");
-       }
-
-       return opos6ul_board_late_init();
-}
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-       return cfg->esdhc_base == USDHC1_BASE_ADDR;
-}
-
-int dram_init(void)
-{
-       gd->ram_size = imx_ddr_size();
-
-       return 0;
-}
-
-#ifdef CONFIG_SPL_BUILD
-#include <asm/arch/mx6-ddr.h>
-#include <asm/arch/opos6ul.h>
-#include <libfdt.h>
-#include <spl.h>
-
-#define USDHC_PAD_CTRL (                                       \
-       PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_MED | \
-       PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST                   \
-)
-
-struct fsl_esdhc_cfg usdhc_cfg[1] = {
-       {USDHC1_BASE_ADDR, 0, 8},
-};
-
-static iomux_v3_cfg_t const usdhc1_pads[] = {
-       MX6_PAD_SD1_CLK__USDHC1_CLK        | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD1_CMD__USDHC1_CMD        | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD1_DATA0__USDHC1_DATA0    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD1_DATA1__USDHC1_DATA1    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD1_DATA2__USDHC1_DATA2    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_SD1_DATA3__USDHC1_DATA3    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_READY_B__USDHC1_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_CE0_B__USDHC1_DATA5   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_CE1_B__USDHC1_DATA6   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       MX6_PAD_NAND_CLE__USDHC1_DATA7     | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-};
-
-static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = {
-       .grp_addds = 0x00000030,
-       .grp_ddrmode_ctl = 0x00020000,
-       .grp_b0ds = 0x00000030,
-       .grp_ctlds = 0x00000030,
-       .grp_b1ds = 0x00000030,
-       .grp_ddrpke = 0x00000000,
-       .grp_ddrmode = 0x00020000,
-       .grp_ddr_type = 0x000c0000,
-};
-
-static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = {
-       .dram_dqm0 = 0x00000030,
-       .dram_dqm1 = 0x00000030,
-       .dram_ras = 0x00000030,
-       .dram_cas = 0x00000030,
-       .dram_odt0 = 0x00000030,
-       .dram_odt1 = 0x00000030,
-       .dram_sdba2 = 0x00000000,
-       .dram_sdclk_0 = 0x00000008,
-       .dram_sdqs0 = 0x00000038,
-       .dram_sdqs1 = 0x00000030,
-       .dram_reset = 0x00000030,
-};
-
-static struct mx6_mmdc_calibration mx6_mmcd_calib = {
-       .p0_mpwldectrl0 = 0x00070007,
-       .p0_mpdgctrl0 = 0x41490145,
-       .p0_mprddlctl = 0x40404546,
-       .p0_mpwrdlctl = 0x4040524D,
-};
-
-struct mx6_ddr_sysinfo ddr_sysinfo = {
-       .dsize = 0,
-       .cs_density = 20,
-       .ncs = 1,
-       .cs1_mirror = 0,
-       .rtt_wr = 2,
-       .rtt_nom = 1,           /* RTT_Nom = RZQ/2 */
-       .walat = 1,             /* Write additional latency */
-       .ralat = 5,             /* Read additional latency */
-       .mif3_mode = 3,         /* Command prediction working mode */
-       .bi_on = 1,             /* Bank interleaving enabled */
-       .sde_to_rst = 0x10,     /* 14 cycles, 200us (JEDEC default) */
-       .rst_to_cke = 0x23,     /* 33 cycles, 500us (JEDEC default) */
-       .ddr_type = DDR_TYPE_DDR3,
-};
-
-static struct mx6_ddr3_cfg mem_ddr = {
-       .mem_speed = 800,
-       .density = 2,
-       .width = 16,
-       .banks = 8,
-       .rowaddr = 14,
-       .coladdr = 10,
-       .pagesz = 2,
-       .trcd = 1500,
-       .trcmin = 5250,
-       .trasmin = 3750,
-};
-
-int board_mmc_init(bd_t *bis)
-{
-       imx_iomux_v3_setup_multiple_pads(usdhc1_pads, ARRAY_SIZE(usdhc1_pads));
-       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-       return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
-}
-
-static void ccgr_init(void)
-{
-       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-       writel(0xFFFFFFFF, &ccm->CCGR0);
-       writel(0xFFFFFFFF, &ccm->CCGR1);
-       writel(0xFFFFFFFF, &ccm->CCGR2);
-       writel(0xFFFFFFFF, &ccm->CCGR3);
-       writel(0xFFFFFFFF, &ccm->CCGR4);
-       writel(0xFFFFFFFF, &ccm->CCGR5);
-       writel(0xFFFFFFFF, &ccm->CCGR6);
-       writel(0xFFFFFFFF, &ccm->CCGR7);
-}
-
-static void spl_dram_init(void)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[4];
-       struct fuse_bank4_regs *fuse =
-               (struct fuse_bank4_regs *)bank->fuse_regs;
-       int reg = readl(&fuse->gp1);
-
-       /* 512MB of RAM */
-       if (reg & 0x1) {
-               mem_ddr.density = 4;
-               mem_ddr.rowaddr = 15;
-               mem_ddr.trcd = 1375;
-               mem_ddr.trcmin = 4875;
-               mem_ddr.trasmin = 3500;
-       }
-
-       mx6ul_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs);
-       mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
-}
-
-void board_init_f(ulong dummy)
-{
-       ccgr_init();
-
-       /* setup AIPS and disable watchdog */
-       arch_cpu_init();
-
-       /* setup GP timer */
-       timer_init();
-
-       /* UART clocks enabled and gd valid - init serial console */
-       opos6ul_setup_uart_debug();
-       preloader_console_init();
-
-       /* DDR initialization */
-       spl_dram_init();
-}
-#endif /* CONFIG_SPL_BUILD */
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
deleted file mode 100644 (file)
index 832ef25..0000000
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * (C) Copyright 2007
- * Sascha Hauer, Pengutronix
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#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 <stdbool.h>
-#include <asm/arch/mxc_hdmi.h>
-#include <asm/arch/crm_regs.h>
-#include <dm.h>
-#include <imx_thermal.h>
-#include <mmc.h>
-
-enum ldo_reg {
-       LDO_ARM,
-       LDO_SOC,
-       LDO_PU,
-};
-
-struct scu_regs {
-       u32     ctrl;
-       u32     config;
-       u32     status;
-       u32     invalidate;
-       u32     fpga_rev;
-};
-
-#if defined(CONFIG_IMX_THERMAL)
-static const struct imx_thermal_plat imx6_thermal_plat = {
-       .regs = (void *)ANATOP_BASE_ADDR,
-       .fuse_bank = 1,
-       .fuse_word = 6,
-};
-
-U_BOOT_DEVICE(imx6_thermal) = {
-       .name = "imx_thermal",
-       .platdata = &imx6_thermal_plat,
-};
-#endif
-
-#if defined(CONFIG_SECURE_BOOT)
-struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
-       .bank = 0,
-       .word = 6,
-};
-#endif
-
-u32 get_nr_cpus(void)
-{
-       struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
-       return readl(&scu->config) & 3;
-}
-
-u32 get_cpu_rev(void)
-{
-       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
-       u32 reg = readl(&anatop->digprog_sololite);
-       u32 type = ((reg >> 16) & 0xff);
-       u32 major, cfg = 0;
-
-       if (type != MXC_CPU_MX6SL) {
-               reg = readl(&anatop->digprog);
-               struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
-               cfg = readl(&scu->config) & 3;
-               type = ((reg >> 16) & 0xff);
-               if (type == MXC_CPU_MX6DL) {
-                       if (!cfg)
-                               type = MXC_CPU_MX6SOLO;
-               }
-
-               if (type == MXC_CPU_MX6Q) {
-                       if (cfg == 1)
-                               type = MXC_CPU_MX6D;
-               }
-
-       }
-       major = ((reg >> 8) & 0xff);
-       if ((major >= 1) &&
-           ((type == MXC_CPU_MX6Q) || (type == MXC_CPU_MX6D))) {
-               major--;
-               type = MXC_CPU_MX6QP;
-               if (cfg == 1)
-                       type = MXC_CPU_MX6DP;
-       }
-       reg &= 0xff;            /* mx6 silicon revision */
-       return (type << 12) | (reg + (0x10 * (major + 1)));
-}
-
-/*
- * OCOTP_CFG3[17:16] (see Fusemap Description Table offset 0x440)
- * defines a 2-bit SPEED_GRADING
- */
-#define OCOTP_CFG3_SPEED_SHIFT 16
-#define OCOTP_CFG3_SPEED_800MHZ        0
-#define OCOTP_CFG3_SPEED_850MHZ        1
-#define OCOTP_CFG3_SPEED_1GHZ  2
-#define OCOTP_CFG3_SPEED_1P2GHZ        3
-
-/*
- * For i.MX6UL
- */
-#define OCOTP_CFG3_SPEED_528MHZ 1
-#define OCOTP_CFG3_SPEED_696MHZ 2
-
-u32 get_cpu_speed_grade_hz(void)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[0];
-       struct fuse_bank0_regs *fuse =
-               (struct fuse_bank0_regs *)bank->fuse_regs;
-       uint32_t val;
-
-       val = readl(&fuse->cfg3);
-       val >>= OCOTP_CFG3_SPEED_SHIFT;
-       val &= 0x3;
-
-       if (is_mx6ul() || is_mx6ull()) {
-               if (val == OCOTP_CFG3_SPEED_528MHZ)
-                       return 528000000;
-               else if (val == OCOTP_CFG3_SPEED_696MHZ)
-                       return 69600000;
-               else
-                       return 0;
-       }
-
-       switch (val) {
-       /* Valid for IMX6DQ */
-       case OCOTP_CFG3_SPEED_1P2GHZ:
-               if (is_mx6dq() || is_mx6dqp())
-                       return 1200000000;
-       /* Valid for IMX6SX/IMX6SDL/IMX6DQ */
-       case OCOTP_CFG3_SPEED_1GHZ:
-               return 996000000;
-       /* Valid for IMX6DQ */
-       case OCOTP_CFG3_SPEED_850MHZ:
-               if (is_mx6dq() || is_mx6dqp())
-                       return 852000000;
-       /* Valid for IMX6SX/IMX6SDL/IMX6DQ */
-       case OCOTP_CFG3_SPEED_800MHZ:
-               return 792000000;
-       }
-       return 0;
-}
-
-/*
- * OCOTP_MEM0[7:6] (see Fusemap Description Table offset 0x480)
- * defines a 2-bit Temperature Grade
- *
- * return temperature grade and min/max temperature in Celsius
- */
-#define OCOTP_MEM0_TEMP_SHIFT          6
-
-u32 get_cpu_temp_grade(int *minc, int *maxc)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[1];
-       struct fuse_bank1_regs *fuse =
-               (struct fuse_bank1_regs *)bank->fuse_regs;
-       uint32_t val;
-
-       val = readl(&fuse->mem0);
-       val >>= OCOTP_MEM0_TEMP_SHIFT;
-       val &= 0x3;
-
-       if (minc && maxc) {
-               if (val == TEMP_AUTOMOTIVE) {
-                       *minc = -40;
-                       *maxc = 125;
-               } else if (val == TEMP_INDUSTRIAL) {
-                       *minc = -40;
-                       *maxc = 105;
-               } else if (val == TEMP_EXTCOMMERCIAL) {
-                       *minc = -20;
-                       *maxc = 105;
-               } else {
-                       *minc = 0;
-                       *maxc = 95;
-               }
-       }
-       return val;
-}
-
-#ifdef CONFIG_REVISION_TAG
-u32 __weak get_board_rev(void)
-{
-       u32 cpurev = get_cpu_rev();
-       u32 type = ((cpurev >> 12) & 0xff);
-       if (type == MXC_CPU_MX6SOLO)
-               cpurev = (MXC_CPU_MX6DL) << 12 | (cpurev & 0xFFF);
-
-       if (type == MXC_CPU_MX6D)
-               cpurev = (MXC_CPU_MX6Q) << 12 | (cpurev & 0xFFF);
-
-       return cpurev;
-}
-#endif
-
-static void clear_ldo_ramp(void)
-{
-       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
-       int reg;
-
-       /* ROM may modify LDO ramp up time according to fuse setting, so in
-        * order to be in the safe side we neeed to reset these settings to
-        * match the reset value: 0'b00
-        */
-       reg = readl(&anatop->ana_misc2);
-       reg &= ~(0x3f << 24);
-       writel(reg, &anatop->ana_misc2);
-}
-
-/*
- * Set the PMU_REG_CORE register
- *
- * Set LDO_SOC/PU/ARM regulators to the specified millivolt level.
- * Possible values are from 0.725V to 1.450V in steps of
- * 0.025V (25mV).
- */
-static int set_ldo_voltage(enum ldo_reg ldo, u32 mv)
-{
-       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
-       u32 val, step, old, reg = readl(&anatop->reg_core);
-       u8 shift;
-
-       if (mv < 725)
-               val = 0x00;     /* Power gated off */
-       else if (mv > 1450)
-               val = 0x1F;     /* Power FET switched full on. No regulation */
-       else
-               val = (mv - 700) / 25;
-
-       clear_ldo_ramp();
-
-       switch (ldo) {
-       case LDO_SOC:
-               shift = 18;
-               break;
-       case LDO_PU:
-               shift = 9;
-               break;
-       case LDO_ARM:
-               shift = 0;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       old = (reg & (0x1F << shift)) >> shift;
-       step = abs(val - old);
-       if (step == 0)
-               return 0;
-
-       reg = (reg & ~(0x1F << shift)) | (val << shift);
-       writel(reg, &anatop->reg_core);
-
-       /*
-        * The LDO ramp-up is based on 64 clock cycles of 24 MHz = 2.6 us per
-        * step
-        */
-       udelay(3 * step);
-
-       return 0;
-}
-
-static void set_ahb_rate(u32 val)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       u32 reg, div;
-
-       div = get_periph_clk() / val - 1;
-       reg = readl(&mxc_ccm->cbcdr);
-
-       writel((reg & (~MXC_CCM_CBCDR_AHB_PODF_MASK)) |
-               (div << MXC_CCM_CBCDR_AHB_PODF_OFFSET), &mxc_ccm->cbcdr);
-}
-
-static void clear_mmdc_ch_mask(void)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       u32 reg;
-       reg = readl(&mxc_ccm->ccdr);
-
-       /* Clear MMDC channel mask */
-       if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sl())
-               reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK);
-       else
-               reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK | MXC_CCM_CCDR_MMDC_CH0_HS_MASK);
-       writel(reg, &mxc_ccm->ccdr);
-}
-
-#define OCOTP_MEM0_REFTOP_TRIM_SHIFT          8
-
-static void init_bandgap(void)
-{
-       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[1];
-       struct fuse_bank1_regs *fuse =
-               (struct fuse_bank1_regs *)bank->fuse_regs;
-       uint32_t val;
-
-       /*
-        * Ensure the bandgap has stabilized.
-        */
-       while (!(readl(&anatop->ana_misc0) & 0x80))
-               ;
-       /*
-        * For best noise performance of the analog blocks using the
-        * outputs of the bandgap, the reftop_selfbiasoff bit should
-        * be set.
-        */
-       writel(BM_ANADIG_ANA_MISC0_REFTOP_SELBIASOFF, &anatop->ana_misc0_set);
-       /*
-        * On i.MX6ULL,we need to set VBGADJ bits according to the
-        * REFTOP_TRIM[3:0] in fuse table
-        *      000 - set REFTOP_VBGADJ[2:0] to 3b'110,
-        *      110 - set REFTOP_VBGADJ[2:0] to 3b'000,
-        *      001 - set REFTOP_VBGADJ[2:0] to 3b'001,
-        *      010 - set REFTOP_VBGADJ[2:0] to 3b'010,
-        *      011 - set REFTOP_VBGADJ[2:0] to 3b'011,
-        *      100 - set REFTOP_VBGADJ[2:0] to 3b'100,
-        *      101 - set REFTOP_VBGADJ[2:0] to 3b'101,
-        *      111 - set REFTOP_VBGADJ[2:0] to 3b'111,
-        */
-       if (is_mx6ull()) {
-               val = readl(&fuse->mem0);
-               val >>= OCOTP_MEM0_REFTOP_TRIM_SHIFT;
-               val &= 0x7;
-
-               writel(val << BM_ANADIG_ANA_MISC0_REFTOP_VBGADJ_SHIFT,
-                      &anatop->ana_misc0_set);
-       }
-}
-
-#ifdef CONFIG_MX6SL
-static void set_preclk_from_osc(void)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       u32 reg;
-
-       reg = readl(&mxc_ccm->cscmr1);
-       reg |= MXC_CCM_CSCMR1_PER_CLK_SEL_MASK;
-       writel(reg, &mxc_ccm->cscmr1);
-}
-#endif
-
-int arch_cpu_init(void)
-{
-       init_aips();
-
-       /* Need to clear MMDC_CHx_MASK to make warm reset work. */
-       clear_mmdc_ch_mask();
-
-       /*
-        * Disable self-bias circuit in the analog bandap.
-        * The self-bias circuit is used by the bandgap during startup.
-        * This bit should be set after the bandgap has initialized.
-        */
-       init_bandgap();
-
-       if (!is_mx6ul() && !is_mx6ull()) {
-               /*
-                * When low freq boot is enabled, ROM will not set AHB
-                * freq, so we need to ensure AHB freq is 132MHz in such
-                * scenario.
-                *
-                * To i.MX6UL, when power up, default ARM core and
-                * AHB rate is 396M and 132M.
-                */
-               if (mxc_get_clock(MXC_ARM_CLK) == 396000000)
-                       set_ahb_rate(132000000);
-       }
-
-       if (is_mx6ul()) {
-               if (is_soc_rev(CHIP_REV_1_0) == 0) {
-                       /*
-                        * According to the design team's requirement on
-                        * i.MX6UL,the PMIC_STBY_REQ PAD should be configured
-                        * as open drain 100K (0x0000b8a0).
-                        * Only exists on TO1.0
-                        */
-                       writel(0x0000b8a0, IOMUXC_BASE_ADDR + 0x29c);
-               } else {
-                       /*
-                        * From TO1.1, SNVS adds internal pull up control
-                        * for POR_B, the register filed is GPBIT[1:0],
-                        * after system boot up, it can be set to 2b'01
-                        * to disable internal pull up.It can save about
-                        * 30uA power in SNVS mode.
-                        */
-                       writel((readl(MX6UL_SNVS_LP_BASE_ADDR + 0x10) &
-                              (~0x1400)) | 0x400,
-                              MX6UL_SNVS_LP_BASE_ADDR + 0x10);
-               }
-       }
-
-       if (is_mx6ull()) {
-               /*
-                * GPBIT[1:0] is suggested to set to 2'b11:
-                * 2'b00 : always PUP100K
-                * 2'b01 : PUP100K when PMIC_ON_REQ or SOC_NOT_FAIL
-                * 2'b10 : always disable PUP100K
-                * 2'b11 : PDN100K when SOC_FAIL, PUP100K when SOC_NOT_FAIL
-                * register offset is different from i.MX6UL, since
-                * i.MX6UL is fixed by ECO.
-                */
-               writel(readl(MX6UL_SNVS_LP_BASE_ADDR) |
-                       0x3, MX6UL_SNVS_LP_BASE_ADDR);
-       }
-
-       /* Set perclk to source from OSC 24MHz */
-#if defined(CONFIG_MX6SL)
-       set_preclk_from_osc();
-#endif
-
-       imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */
-
-       init_src();
-
-       return 0;
-}
-
-#ifdef CONFIG_ENV_IS_IN_MMC
-__weak int board_mmc_get_env_dev(int devno)
-{
-       return CONFIG_SYS_MMC_ENV_DEV;
-}
-
-static int mmc_get_boot_dev(void)
-{
-       struct src *src_regs = (struct src *)SRC_BASE_ADDR;
-       u32 soc_sbmr = readl(&src_regs->sbmr1);
-       u32 bootsel;
-       int devno;
-
-       /*
-        * Refer to
-        * "i.MX 6Dual/6Quad Applications Processor Reference Manual"
-        * Chapter "8.5.3.1 Expansion Device eFUSE Configuration"
-        * i.MX6SL/SX/UL has same layout.
-        */
-       bootsel = (soc_sbmr & 0x000000FF) >> 6;
-
-       /* No boot from sd/mmc */
-       if (bootsel != 1)
-               return -1;
-
-       /* BOOT_CFG2[3] and BOOT_CFG2[4] */
-       devno = (soc_sbmr & 0x00001800) >> 11;
-
-       return devno;
-}
-
-int mmc_get_env_dev(void)
-{
-       int devno = mmc_get_boot_dev();
-
-       /* If not boot from sd/mmc, use default value */
-       if (devno < 0)
-               return CONFIG_SYS_MMC_ENV_DEV;
-
-       return board_mmc_get_env_dev(devno);
-}
-
-#ifdef CONFIG_SYS_MMC_ENV_PART
-__weak int board_mmc_get_env_part(int devno)
-{
-       return CONFIG_SYS_MMC_ENV_PART;
-}
-
-uint mmc_get_env_part(struct mmc *mmc)
-{
-       int devno = mmc_get_boot_dev();
-
-       /* If not boot from sd/mmc, use default value */
-       if (devno < 0)
-               return CONFIG_SYS_MMC_ENV_PART;
-
-       return board_mmc_get_env_part(devno);
-}
-#endif
-#endif
-
-int board_postclk_init(void)
-{
-       set_ldo_voltage(LDO_SOC, 1175); /* Set VDDSOC to 1.175V */
-
-       return 0;
-}
-
-#if defined(CONFIG_FEC_MXC)
-void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[4];
-       struct fuse_bank4_regs *fuse =
-                       (struct fuse_bank4_regs *)bank->fuse_regs;
-
-       if ((is_mx6sx() || is_mx6ul() || is_mx6ull()) && dev_id == 1) {
-               u32 value = readl(&fuse->mac_addr2);
-               mac[0] = value >> 24 ;
-               mac[1] = value >> 16 ;
-               mac[2] = value >> 8 ;
-               mac[3] = value ;
-
-               value = readl(&fuse->mac_addr1);
-               mac[4] = value >> 24 ;
-               mac[5] = value >> 16 ;
-               
-       } else {
-               u32 value = readl(&fuse->mac_addr1);
-               mac[0] = (value >> 8);
-               mac[1] = value ;
-
-               value = readl(&fuse->mac_addr0);
-               mac[2] = value >> 24 ;
-               mac[3] = value >> 16 ;
-               mac[4] = value >> 8 ;
-               mac[5] = value ;
-       }
-
-}
-#endif
-
-/*
- * cfg_val will be used for
- * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0]
- * After reset, if GPR10[28] is 1, ROM will use GPR9[25:0]
- * instead of SBMR1 to determine the boot device.
- */
-const struct boot_mode soc_boot_modes[] = {
-       {"normal",      MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)},
-       /* reserved value should start rom usb */
-#if defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
-       {"usb",         MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)},
-#else
-       {"usb",         MAKE_CFGVAL(0x10, 0x00, 0x00, 0x00)},
-#endif
-       {"sata",        MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)},
-       {"ecspi1:0",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x08)},
-       {"ecspi1:1",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x18)},
-       {"ecspi1:2",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x28)},
-       {"ecspi1:3",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x38)},
-       /* 4 bit bus width */
-       {"esdhc1",      MAKE_CFGVAL(0x40, 0x20, 0x00, 0x00)},
-       {"esdhc2",      MAKE_CFGVAL(0x40, 0x28, 0x00, 0x00)},
-       {"esdhc3",      MAKE_CFGVAL(0x40, 0x30, 0x00, 0x00)},
-       {"esdhc4",      MAKE_CFGVAL(0x40, 0x38, 0x00, 0x00)},
-       {NULL,          0},
-};
-
-void reset_misc(void)
-{
-#ifdef CONFIG_VIDEO_MXS
-       lcdif_power_down();
-#endif
-}
-
-void s_init(void)
-{
-       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
-       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       u32 mask480;
-       u32 mask528;
-       u32 reg, periph1, periph2;
-
-       if (is_mx6sx() || is_mx6ul() || is_mx6ull())
-               return;
-
-       /* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs
-        * to make sure PFD is working right, otherwise, PFDs may
-        * not output clock after reset, MX6DL and MX6SL have added 396M pfd
-        * workaround in ROM code, as bus clock need it
-        */
-
-       mask480 = ANATOP_PFD_CLKGATE_MASK(0) |
-               ANATOP_PFD_CLKGATE_MASK(1) |
-               ANATOP_PFD_CLKGATE_MASK(2) |
-               ANATOP_PFD_CLKGATE_MASK(3);
-       mask528 = ANATOP_PFD_CLKGATE_MASK(1) |
-               ANATOP_PFD_CLKGATE_MASK(3);
-
-       reg = readl(&ccm->cbcmr);
-       periph2 = ((reg & MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_MASK)
-               >> MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_OFFSET);
-       periph1 = ((reg & MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_MASK)
-               >> MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_OFFSET);
-
-       /* Checking if PLL2 PFD0 or PLL2 PFD2 is using for periph clock */
-       if ((periph2 != 0x2) && (periph1 != 0x2))
-               mask528 |= ANATOP_PFD_CLKGATE_MASK(0);
-
-       if ((periph2 != 0x1) && (periph1 != 0x1) &&
-               (periph2 != 0x3) && (periph1 != 0x3))
-               mask528 |= ANATOP_PFD_CLKGATE_MASK(2);
-
-       writel(mask480, &anatop->pfd_480_set);
-       writel(mask528, &anatop->pfd_528_set);
-       writel(mask480, &anatop->pfd_480_clr);
-       writel(mask528, &anatop->pfd_528_clr);
-}
-
-#ifdef CONFIG_IMX_HDMI
-void imx_enable_hdmi_phy(void)
-{
-       struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
-       u8 reg;
-       reg = readb(&hdmi->phy_conf0);
-       reg |= HDMI_PHY_CONF0_PDZ_MASK;
-       writeb(reg, &hdmi->phy_conf0);
-       udelay(3000);
-       reg |= HDMI_PHY_CONF0_ENTMDS_MASK;
-       writeb(reg, &hdmi->phy_conf0);
-       udelay(3000);
-       reg |= HDMI_PHY_CONF0_GEN2_TXPWRON_MASK;
-       writeb(reg, &hdmi->phy_conf0);
-       writeb(HDMI_MC_PHYRSTZ_ASSERT, &hdmi->mc_phyrstz);
-}
-
-void imx_setup_hdmi(void)
-{
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
-       int reg, count;
-       u8 val;
-
-       /* Turn on HDMI PHY clock */
-       reg = readl(&mxc_ccm->CCGR2);
-       reg |=  MXC_CCM_CCGR2_HDMI_TX_IAHBCLK_MASK|
-                MXC_CCM_CCGR2_HDMI_TX_ISFRCLK_MASK;
-       writel(reg, &mxc_ccm->CCGR2);
-       writeb(HDMI_MC_PHYRSTZ_DEASSERT, &hdmi->mc_phyrstz);
-       reg = readl(&mxc_ccm->chsccdr);
-       reg &= ~(MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_MASK|
-                MXC_CCM_CHSCCDR_IPU1_DI0_PODF_MASK|
-                MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_MASK);
-       reg |= (CHSCCDR_PODF_DIVIDE_BY_3
-                << MXC_CCM_CHSCCDR_IPU1_DI0_PODF_OFFSET)
-                |(CHSCCDR_IPU_PRE_CLK_540M_PFD
-                << MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_OFFSET);
-       writel(reg, &mxc_ccm->chsccdr);
-
-       /* Clear the overflow condition */
-       if (readb(&hdmi->ih_fc_stat2) & HDMI_IH_FC_STAT2_OVERFLOW_MASK) {
-               /* TMDS software reset */
-               writeb((u8)~HDMI_MC_SWRSTZ_TMDSSWRST_REQ, &hdmi->mc_swrstz);
-               val = readb(&hdmi->fc_invidconf);
-               /* Need minimum 3 times to write to clear the register */
-               for (count = 0 ; count < 5 ; count++)
-                       writeb(val, &hdmi->fc_invidconf);
-       }
-}
-#endif
-
-#ifdef CONFIG_IMX_BOOTAUX
-int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
-{
-       struct src *src_reg;
-       u32 stack, pc;
-
-       if (!boot_private_data)
-               return -EINVAL;
-
-       stack = *(u32 *)boot_private_data;
-       pc = *(u32 *)(boot_private_data + 4);
-
-       /* Set the stack and pc to M4 bootROM */
-       writel(stack, M4_BOOTROM_BASE_ADDR);
-       writel(pc, M4_BOOTROM_BASE_ADDR + 4);
-
-       /* Enable M4 */
-       src_reg = (struct src *)SRC_BASE_ADDR;
-       clrsetbits_le32(&src_reg->scr, SRC_SCR_M4C_NON_SCLR_RST_MASK,
-                       SRC_SCR_M4_ENABLE_MASK);
-
-       return 0;
-}
-
-int arch_auxiliary_core_check_up(u32 core_id)
-{
-       struct src *src_reg = (struct src *)SRC_BASE_ADDR;
-       unsigned val;
-
-       val = readl(&src_reg->scr);
-
-       if (val & SRC_SCR_M4C_NON_SCLR_RST_MASK)
-               return 0;  /* assert in reset */
-
-       return 1;
-}
-#endif
diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig
deleted file mode 100644 (file)
index aea8526..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-if ARCH_MX7
-
-config MX7
-       bool
-       select ROM_UNIFIED_SECTIONS
-       select CPU_V7_HAS_VIRT
-       select CPU_V7_HAS_NONSEC
-       select ARCH_SUPPORT_PSCI
-       imply CMD_FUSE
-       default y
-
-config MX7D
-       select ROM_UNIFIED_SECTIONS
-       imply CMD_FUSE
-       bool
-
-choice
-       prompt "MX7 board select"
-       optional
-
-config TARGET_MX7DSABRESD
-       bool "mx7dsabresd"
-       select BOARD_LATE_INIT
-       select MX7D
-       select DM
-       select DM_THERMAL
-
-config TARGET_PICO_IMX7D
-       bool "pico-imx7d"
-       select BOARD_LATE_INIT
-       select MX7D
-       select DM
-       select DM_THERMAL
-
-config TARGET_WARP7
-       bool "warp7"
-       select BOARD_LATE_INIT
-       select MX7D
-       select DM
-       select DM_THERMAL
-
-config TARGET_COLIBRI_IMX7
-       bool "Support Colibri iMX7S/iMX7D modules"
-       select BOARD_LATE_INIT
-       select DM
-       select DM_SERIAL
-       select DM_THERMAL
-
-endchoice
-
-config SYS_SOC
-       default "mx7"
-
-source "board/freescale/mx7dsabresd/Kconfig"
-source "board/technexion/pico-imx7d/Kconfig"
-source "board/toradex/colibri_imx7/Kconfig"
-source "board/warp7/Kconfig"
-
-endif
diff --git a/arch/arm/cpu/armv7/mx7/Makefile b/arch/arm/cpu/armv7/mx7/Makefile
deleted file mode 100644 (file)
index d21f87f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# (C) Copyright 2015 Freescale Semiconductor, Inc.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-#
-
-obj-y  := soc.o clock.o clock_slice.o
-
-ifdef CONFIG_ARMV7_PSCI
-obj-y  += psci-mx7.o psci.o
-endif
diff --git a/arch/arm/cpu/armv7/mx7/clock.c b/arch/arm/cpu/armv7/mx7/clock.c
deleted file mode 100644 (file)
index 2cfde46..0000000
+++ /dev/null
@@ -1,1133 +0,0 @@
-/*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * Author:
- *     Peng Fan <Peng.Fan@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <div64.h>
-#include <asm/io.h>
-#include <linux/errno.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-
-struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
-                                        ANATOP_BASE_ADDR;
-struct mxc_ccm_reg *ccm_reg = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-#ifdef CONFIG_FSL_ESDHC
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
-int get_clocks(void)
-{
-#ifdef CONFIG_FSL_ESDHC
-#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC3_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-#else
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-#endif
-#endif
-       return 0;
-}
-
-u32 get_ahb_clk(void)
-{
-       return get_root_clk(AHB_CLK_ROOT);
-}
-
-static u32 get_ipg_clk(void)
-{
-       /*
-        * The AHB and IPG are fixed at 2:1 ratio, and synchronized to
-        * each other.
-        */
-       return get_ahb_clk() / 2;
-}
-
-u32 imx_get_uartclk(void)
-{
-       return get_root_clk(UART1_CLK_ROOT);
-}
-
-u32 imx_get_fecclk(void)
-{
-       return get_root_clk(ENET_AXI_CLK_ROOT);
-}
-
-#ifdef CONFIG_MXC_OCOTP
-void enable_ocotp_clk(unsigned char enable)
-{
-       clock_enable(CCGR_OCOTP, enable);
-}
-
-void enable_thermal_clk(void)
-{
-       enable_ocotp_clk(1);
-}
-#endif
-
-void enable_usboh3_clk(unsigned char enable)
-{
-       u32 target;
-
-       if (enable) {
-               /* disable the clock gate first */
-               clock_enable(CCGR_USB_HSIC, 0);
-
-               /* 120Mhz */
-               target = CLK_ROOT_ON |
-                        USB_HSIC_CLK_ROOT_FROM_PLL_SYS_MAIN_480M_CLK |
-                        CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                        CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-               clock_set_target_val(USB_HSIC_CLK_ROOT, target);
-
-               /* enable the clock gate */
-               clock_enable(CCGR_USB_CTRL, 1);
-               clock_enable(CCGR_USB_HSIC, 1);
-               clock_enable(CCGR_USB_PHY1, 1);
-               clock_enable(CCGR_USB_PHY2, 1);
-       } else {
-               clock_enable(CCGR_USB_CTRL, 0);
-               clock_enable(CCGR_USB_HSIC, 0);
-               clock_enable(CCGR_USB_PHY1, 0);
-               clock_enable(CCGR_USB_PHY2, 0);
-       }
-}
-
-static u32 decode_pll(enum pll_clocks pll, u32 infreq)
-{
-       u32 reg, div_sel;
-       u32 num, denom;
-
-       /*
-        * Alought there are four choices for the bypass src,
-        * we choose OSC_24M which is the default set in ROM.
-        */
-       switch (pll) {
-       case PLL_CORE:
-               reg = readl(&ccm_anatop->pll_arm);
-
-               if (reg & CCM_ANALOG_PLL_ARM_POWERDOWN_MASK)
-                       return 0;
-
-               if (reg & CCM_ANALOG_PLL_ARM_BYPASS_MASK)
-                       return MXC_HCLK;
-
-               div_sel = (reg & CCM_ANALOG_PLL_ARM_DIV_SELECT_MASK) >>
-                          CCM_ANALOG_PLL_ARM_DIV_SELECT_SHIFT;
-
-               return (infreq * div_sel) / 2;
-
-       case PLL_SYS:
-               reg = readl(&ccm_anatop->pll_480);
-
-               if (reg & CCM_ANALOG_PLL_480_POWERDOWN_MASK)
-                       return 0;
-
-               if (reg & CCM_ANALOG_PLL_480_BYPASS_MASK)
-                       return MXC_HCLK;
-
-               if (((reg & CCM_ANALOG_PLL_480_DIV_SELECT_MASK) >>
-                       CCM_ANALOG_PLL_480_DIV_SELECT_SHIFT) == 0)
-                       return 480000000u;
-               else
-                       return 528000000u;
-
-       case PLL_ENET:
-               reg = readl(&ccm_anatop->pll_enet);
-
-               if (reg & CCM_ANALOG_PLL_ENET_POWERDOWN_MASK)
-                       return 0;
-
-               if (reg & CCM_ANALOG_PLL_ENET_BYPASS_MASK)
-                       return MXC_HCLK;
-
-               return 1000000000u;
-
-       case PLL_DDR:
-               reg = readl(&ccm_anatop->pll_ddr);
-
-               if (reg & CCM_ANALOG_PLL_DDR_POWERDOWN_MASK)
-                       return 0;
-
-               num = ccm_anatop->pll_ddr_num;
-               denom = ccm_anatop->pll_ddr_denom;
-
-               if (reg & CCM_ANALOG_PLL_DDR_BYPASS_MASK)
-                       return MXC_HCLK;
-
-               div_sel = (reg & CCM_ANALOG_PLL_DDR_DIV_SELECT_MASK) >>
-                          CCM_ANALOG_PLL_DDR_DIV_SELECT_SHIFT;
-
-               return infreq * (div_sel + num / denom);
-
-       case PLL_USB:
-               return 480000000u;
-
-       default:
-               printf("Unsupported pll clocks %d\n", pll);
-               break;
-       }
-
-       return 0;
-}
-
-static u32 mxc_get_pll_sys_derive(int derive)
-{
-       u32 freq, div, frac;
-       u32 reg;
-
-       div = 1;
-       reg = readl(&ccm_anatop->pll_480);
-       freq = decode_pll(PLL_SYS, MXC_HCLK);
-
-       switch (derive) {
-       case PLL_SYS_MAIN_480M_CLK:
-               if (reg & CCM_ANALOG_PLL_480_MAIN_DIV1_CLKGATE_MASK)
-                       return 0;
-               else
-                       return freq;
-       case PLL_SYS_MAIN_240M_CLK:
-               if (reg & CCM_ANALOG_PLL_480_MAIN_DIV2_CLKGATE_MASK)
-                       return 0;
-               else
-                       return freq / 2;
-       case PLL_SYS_MAIN_120M_CLK:
-               if (reg & CCM_ANALOG_PLL_480_MAIN_DIV4_CLKGATE_MASK)
-                       return 0;
-               else
-                       return freq / 4;
-       case PLL_SYS_PFD0_392M_CLK:
-               reg = readl(&ccm_anatop->pfd_480a);
-               if (reg & CCM_ANALOG_PFD_480A_PFD0_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480A_PFD0_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480A_PFD0_FRAC_SHIFT;
-               break;
-       case PLL_SYS_PFD0_196M_CLK:
-               if (reg & CCM_ANALOG_PLL_480_PFD0_DIV2_CLKGATE_MASK)
-                       return 0;
-               reg = readl(&ccm_anatop->pfd_480a);
-               frac = (reg & CCM_ANALOG_PFD_480A_PFD0_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480A_PFD0_FRAC_SHIFT;
-               div = 2;
-               break;
-       case PLL_SYS_PFD1_332M_CLK:
-               reg = readl(&ccm_anatop->pfd_480a);
-               if (reg & CCM_ANALOG_PFD_480A_PFD1_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480A_PFD1_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480A_PFD1_FRAC_SHIFT;
-               break;
-       case PLL_SYS_PFD1_166M_CLK:
-               if (reg & CCM_ANALOG_PLL_480_PFD1_DIV2_CLKGATE_MASK)
-                       return 0;
-               reg = readl(&ccm_anatop->pfd_480a);
-               frac = (reg & CCM_ANALOG_PFD_480A_PFD1_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480A_PFD1_FRAC_SHIFT;
-               div = 2;
-               break;
-       case PLL_SYS_PFD2_270M_CLK:
-               reg = readl(&ccm_anatop->pfd_480a);
-               if (reg & CCM_ANALOG_PFD_480A_PFD2_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480A_PFD2_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480A_PFD2_FRAC_SHIFT;
-               break;
-       case PLL_SYS_PFD2_135M_CLK:
-               if (reg & CCM_ANALOG_PLL_480_PFD2_DIV2_CLKGATE_MASK)
-                       return 0;
-               reg = readl(&ccm_anatop->pfd_480a);
-               frac = (reg & CCM_ANALOG_PFD_480A_PFD2_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480A_PFD2_FRAC_SHIFT;
-               div = 2;
-               break;
-       case PLL_SYS_PFD3_CLK:
-               reg = readl(&ccm_anatop->pfd_480a);
-               if (reg & CCM_ANALOG_PFD_480A_PFD3_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480A_PFD3_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480A_PFD3_FRAC_SHIFT;
-               break;
-       case PLL_SYS_PFD4_CLK:
-               reg = readl(&ccm_anatop->pfd_480b);
-               if (reg & CCM_ANALOG_PFD_480B_PFD4_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480B_PFD4_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480B_PFD4_FRAC_SHIFT;
-               break;
-       case PLL_SYS_PFD5_CLK:
-               reg = readl(&ccm_anatop->pfd_480b);
-               if (reg & CCM_ANALOG_PFD_480B_PFD5_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480B_PFD5_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480B_PFD5_FRAC_SHIFT;
-               break;
-       case PLL_SYS_PFD6_CLK:
-               reg = readl(&ccm_anatop->pfd_480b);
-               if (reg & CCM_ANALOG_PFD_480B_PFD6_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480B_PFD6_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480B_PFD6_FRAC_SHIFT;
-               break;
-       case PLL_SYS_PFD7_CLK:
-               reg = readl(&ccm_anatop->pfd_480b);
-               if (reg & CCM_ANALOG_PFD_480B_PFD7_DIV1_CLKGATE_MASK)
-                       return 0;
-               frac = (reg & CCM_ANALOG_PFD_480B_PFD7_FRAC_MASK) >>
-                       CCM_ANALOG_PFD_480B_PFD7_FRAC_SHIFT;
-               break;
-       default:
-               printf("Error derived pll_sys clock %d\n", derive);
-               return 0;
-       }
-
-       return ((freq / frac) * 18) / div;
-}
-
-static u32 mxc_get_pll_enet_derive(int derive)
-{
-       u32 freq, reg;
-
-       freq = decode_pll(PLL_ENET, MXC_HCLK);
-       reg = readl(&ccm_anatop->pll_enet);
-
-       switch (derive) {
-       case PLL_ENET_MAIN_500M_CLK:
-               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_500MHZ_MASK)
-                       return freq / 2;
-               break;
-       case PLL_ENET_MAIN_250M_CLK:
-               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_250MHZ_MASK)
-                       return freq / 4;
-               break;
-       case PLL_ENET_MAIN_125M_CLK:
-               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_125MHZ_MASK)
-                       return freq / 8;
-               break;
-       case PLL_ENET_MAIN_100M_CLK:
-               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_100MHZ_MASK)
-                       return freq / 10;
-               break;
-       case PLL_ENET_MAIN_50M_CLK:
-               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_50MHZ_MASK)
-                       return freq / 20;
-               break;
-       case PLL_ENET_MAIN_40M_CLK:
-               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_40MHZ_MASK)
-                       return freq / 25;
-               break;
-       case PLL_ENET_MAIN_25M_CLK:
-               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_25MHZ_MASK)
-                       return freq / 40;
-               break;
-       default:
-               printf("Error derived pll_enet clock %d\n", derive);
-               break;
-       }
-
-       return 0;
-}
-
-static u32 mxc_get_pll_ddr_derive(int derive)
-{
-       u32 freq, reg;
-
-       freq = decode_pll(PLL_DDR, MXC_HCLK);
-       reg = readl(&ccm_anatop->pll_ddr);
-
-       switch (derive) {
-       case PLL_DRAM_MAIN_1066M_CLK:
-               return freq;
-       case PLL_DRAM_MAIN_533M_CLK:
-               if (reg & CCM_ANALOG_PLL_DDR_DIV2_ENABLE_CLK_MASK)
-                       return freq / 2;
-               break;
-       default:
-               printf("Error derived pll_ddr clock %d\n", derive);
-               break;
-       }
-
-       return 0;
-}
-
-static u32 mxc_get_pll_derive(enum pll_clocks pll, int derive)
-{
-       switch (pll) {
-       case PLL_SYS:
-               return mxc_get_pll_sys_derive(derive);
-       case PLL_ENET:
-               return mxc_get_pll_enet_derive(derive);
-       case PLL_DDR:
-               return mxc_get_pll_ddr_derive(derive);
-       default:
-               printf("Error pll.\n");
-               return 0;
-       }
-}
-
-static u32 get_root_src_clk(enum clk_root_src root_src)
-{
-       switch (root_src) {
-       case OSC_24M_CLK:
-               return 24000000u;
-       case PLL_ARM_MAIN_800M_CLK:
-               return decode_pll(PLL_CORE, MXC_HCLK);
-
-       case PLL_SYS_MAIN_480M_CLK:
-       case PLL_SYS_MAIN_240M_CLK:
-       case PLL_SYS_MAIN_120M_CLK:
-       case PLL_SYS_PFD0_392M_CLK:
-       case PLL_SYS_PFD0_196M_CLK:
-       case PLL_SYS_PFD1_332M_CLK:
-       case PLL_SYS_PFD1_166M_CLK:
-       case PLL_SYS_PFD2_270M_CLK:
-       case PLL_SYS_PFD2_135M_CLK:
-       case PLL_SYS_PFD3_CLK:
-       case PLL_SYS_PFD4_CLK:
-       case PLL_SYS_PFD5_CLK:
-       case PLL_SYS_PFD6_CLK:
-       case PLL_SYS_PFD7_CLK:
-               return mxc_get_pll_derive(PLL_SYS, root_src);
-
-       case PLL_ENET_MAIN_500M_CLK:
-       case PLL_ENET_MAIN_250M_CLK:
-       case PLL_ENET_MAIN_125M_CLK:
-       case PLL_ENET_MAIN_100M_CLK:
-       case PLL_ENET_MAIN_50M_CLK:
-       case PLL_ENET_MAIN_40M_CLK:
-       case PLL_ENET_MAIN_25M_CLK:
-               return mxc_get_pll_derive(PLL_ENET, root_src);
-
-       case PLL_DRAM_MAIN_1066M_CLK:
-       case PLL_DRAM_MAIN_533M_CLK:
-               return mxc_get_pll_derive(PLL_DDR, root_src);
-
-       case PLL_AUDIO_MAIN_CLK:
-               return decode_pll(PLL_AUDIO, MXC_HCLK);
-       case PLL_VIDEO_MAIN_CLK:
-               return decode_pll(PLL_VIDEO, MXC_HCLK);
-
-       case PLL_USB_MAIN_480M_CLK:
-               return decode_pll(PLL_USB, MXC_HCLK);
-
-       case REF_1M_CLK:
-               return 1000000;
-       case OSC_32K_CLK:
-               return MXC_CLK32;
-
-       case EXT_CLK_1:
-       case EXT_CLK_2:
-       case EXT_CLK_3:
-       case EXT_CLK_4:
-               printf("No EXT CLK supported??\n");
-               break;
-       };
-
-       return 0;
-}
-
-u32 get_root_clk(enum clk_root_index clock_id)
-{
-       enum clk_root_src root_src;
-       u32 post_podf, pre_podf, auto_podf, root_src_clk;
-       int auto_en;
-
-       if (clock_root_enabled(clock_id) <= 0)
-               return 0;
-
-       if (clock_get_prediv(clock_id, &pre_podf) < 0)
-               return 0;
-
-       if (clock_get_postdiv(clock_id, &post_podf) < 0)
-               return 0;
-
-       if (clock_get_autopostdiv(clock_id, &auto_podf, &auto_en) < 0)
-               return 0;
-
-       if (auto_en == 0)
-               auto_podf = 0;
-
-       if (clock_get_src(clock_id, &root_src) < 0)
-               return 0;
-
-       root_src_clk = get_root_src_clk(root_src);
-
-       /*
-        * bypass clk is ignored.
-        */
-
-       return root_src_clk / (post_podf + 1) / (pre_podf + 1) /
-               (auto_podf + 1);
-}
-
-static u32 get_ddrc_clk(void)
-{
-       u32 reg, freq;
-       enum root_post_div post_div;
-
-       reg = readl(&ccm_reg->root[DRAM_CLK_ROOT].target_root);
-       if (reg & CLK_ROOT_MUX_MASK)
-               /* DRAM_ALT_CLK_ROOT */
-               freq = get_root_clk(DRAM_ALT_CLK_ROOT);
-       else
-               /* PLL_DRAM_MAIN_1066M_CLK */
-               freq = mxc_get_pll_derive(PLL_DDR, PLL_DRAM_MAIN_1066M_CLK);
-
-       post_div = reg & DRAM_CLK_ROOT_POST_DIV_MASK;
-
-       return freq / (post_div + 1) / 2;
-}
-
-unsigned int mxc_get_clock(enum mxc_clock clk)
-{
-       switch (clk) {
-       case MXC_ARM_CLK:
-               return get_root_clk(ARM_A7_CLK_ROOT);
-       case MXC_AXI_CLK:
-               return get_root_clk(MAIN_AXI_CLK_ROOT);
-       case MXC_AHB_CLK:
-               return get_root_clk(AHB_CLK_ROOT);
-       case MXC_IPG_CLK:
-               return get_ipg_clk();
-       case MXC_I2C_CLK:
-               return get_root_clk(I2C1_CLK_ROOT);
-       case MXC_UART_CLK:
-               return get_root_clk(UART1_CLK_ROOT);
-       case MXC_CSPI_CLK:
-               return get_root_clk(ECSPI1_CLK_ROOT);
-       case MXC_DDR_CLK:
-               return get_ddrc_clk();
-       case MXC_ESDHC_CLK:
-               return get_root_clk(USDHC1_CLK_ROOT);
-       case MXC_ESDHC2_CLK:
-               return get_root_clk(USDHC2_CLK_ROOT);
-       case MXC_ESDHC3_CLK:
-               return get_root_clk(USDHC3_CLK_ROOT);
-       default:
-               printf("Unsupported mxc_clock %d\n", clk);
-               break;
-       }
-
-       return 0;
-}
-
-#ifdef CONFIG_SYS_I2C_MXC
-/* i2c_num can be 0 - 3 */
-int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
-{
-       u32 target;
-
-       if (i2c_num >= 4)
-               return -EINVAL;
-
-       if (enable) {
-               clock_enable(CCGR_I2C1 + i2c_num, 0);
-
-               /* Set i2c root clock to PLL_SYS_MAIN_120M_CLK */
-
-               target = CLK_ROOT_ON |
-                        I2C1_CLK_ROOT_FROM_PLL_SYS_MAIN_120M_CLK |
-                        CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                        CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
-               clock_set_target_val(I2C1_CLK_ROOT + i2c_num, target);
-
-               clock_enable(CCGR_I2C1 + i2c_num, 1);
-       } else {
-               clock_enable(CCGR_I2C1 + i2c_num, 0);
-       }
-
-       return 0;
-}
-#endif
-
-static void init_clk_esdhc(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_USDHC1, 0);
-       clock_enable(CCGR_USDHC2, 0);
-       clock_enable(CCGR_USDHC3, 0);
-
-       /* 196: 392/2 */
-       target = CLK_ROOT_ON | USDHC1_CLK_ROOT_FROM_PLL_SYS_PFD0_392M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
-       clock_set_target_val(USDHC1_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | USDHC1_CLK_ROOT_FROM_PLL_SYS_PFD0_392M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
-       clock_set_target_val(USDHC2_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | USDHC1_CLK_ROOT_FROM_PLL_SYS_PFD0_392M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
-       clock_set_target_val(USDHC3_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_USDHC1, 1);
-       clock_enable(CCGR_USDHC2, 1);
-       clock_enable(CCGR_USDHC3, 1);
-}
-
-static void init_clk_uart(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_UART1, 0);
-       clock_enable(CCGR_UART2, 0);
-       clock_enable(CCGR_UART3, 0);
-       clock_enable(CCGR_UART4, 0);
-       clock_enable(CCGR_UART5, 0);
-       clock_enable(CCGR_UART6, 0);
-       clock_enable(CCGR_UART7, 0);
-
-       /* 24Mhz */
-       target = CLK_ROOT_ON | UART1_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(UART1_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | UART2_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(UART2_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | UART3_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(UART3_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | UART4_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(UART4_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | UART5_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(UART5_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | UART6_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(UART6_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | UART7_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(UART7_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_UART1, 1);
-       clock_enable(CCGR_UART2, 1);
-       clock_enable(CCGR_UART3, 1);
-       clock_enable(CCGR_UART4, 1);
-       clock_enable(CCGR_UART5, 1);
-       clock_enable(CCGR_UART6, 1);
-       clock_enable(CCGR_UART7, 1);
-}
-
-static void init_clk_weim(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_WEIM, 0);
-
-       /* 120Mhz */
-       target = CLK_ROOT_ON | EIM_CLK_ROOT_FROM_PLL_SYS_MAIN_120M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(EIM_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_WEIM, 1);
-}
-
-static void init_clk_ecspi(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_ECSPI1, 0);
-       clock_enable(CCGR_ECSPI2, 0);
-       clock_enable(CCGR_ECSPI3, 0);
-       clock_enable(CCGR_ECSPI4, 0);
-
-       /* 60Mhz: 240/4 */
-       target = CLK_ROOT_ON | ECSPI1_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
-       clock_set_target_val(ECSPI1_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | ECSPI2_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
-       clock_set_target_val(ECSPI2_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | ECSPI3_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
-       clock_set_target_val(ECSPI3_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | ECSPI4_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
-       clock_set_target_val(ECSPI4_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_ECSPI1, 1);
-       clock_enable(CCGR_ECSPI2, 1);
-       clock_enable(CCGR_ECSPI3, 1);
-       clock_enable(CCGR_ECSPI4, 1);
-}
-
-static void init_clk_wdog(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_WDOG1, 0);
-       clock_enable(CCGR_WDOG2, 0);
-       clock_enable(CCGR_WDOG3, 0);
-       clock_enable(CCGR_WDOG4, 0);
-
-       /* 24Mhz */
-       target = CLK_ROOT_ON | WDOG_CLK_ROOT_FROM_OSC_24M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(WDOG_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_WDOG1, 1);
-       clock_enable(CCGR_WDOG2, 1);
-       clock_enable(CCGR_WDOG3, 1);
-       clock_enable(CCGR_WDOG4, 1);
-}
-
-#ifdef CONFIG_MXC_EPDC
-static void init_clk_epdc(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_EPDC, 0);
-
-       /* 24Mhz */
-       target = CLK_ROOT_ON | EPDC_PIXEL_CLK_ROOT_FROM_PLL_SYS_MAIN_480M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV12);
-       clock_set_target_val(EPDC_PIXEL_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_EPDC, 1);
-}
-#endif
-
-static int enable_pll_enet(void)
-{
-       u32 reg;
-       s32 timeout = 100000;
-
-       reg = readl(&ccm_anatop->pll_enet);
-       /* If pll_enet powered up, no need to set it again */
-       if (reg & ANADIG_PLL_ENET_PWDN_MASK) {
-               reg &= ~ANADIG_PLL_ENET_PWDN_MASK;
-               writel(reg, &ccm_anatop->pll_enet);
-
-               while (timeout--) {
-                       if (readl(&ccm_anatop->pll_enet) & ANADIG_PLL_LOCK)
-                               break;
-               }
-
-               if (timeout <= 0) {
-                       /* If timeout, we set pwdn for pll_enet. */
-                       reg |= ANADIG_PLL_ENET_PWDN_MASK;
-                       return -ETIME;
-               }
-       }
-
-       /* Clear bypass */
-       writel(CCM_ANALOG_PLL_ENET_BYPASS_MASK, &ccm_anatop->pll_enet_clr);
-
-       writel((CCM_ANALOG_PLL_ENET_ENABLE_CLK_500MHZ_MASK
-               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_250MHZ_MASK
-               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_125MHZ_MASK
-               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_100MHZ_MASK
-               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_50MHZ_MASK
-               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_40MHZ_MASK
-               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_25MHZ_MASK),
-              &ccm_anatop->pll_enet_set);
-
-       return 0;
-}
-static int enable_pll_video(u32 pll_div, u32 pll_num, u32 pll_denom,
-       u32 post_div)
-{
-       u32 reg = 0;
-       ulong start;
-
-       debug("pll5 div = %d, num = %d, denom = %d\n",
-               pll_div, pll_num, pll_denom);
-
-       /* Power up PLL5 video and disable its output */
-       writel(CCM_ANALOG_PLL_VIDEO_CLR_ENABLE_CLK_MASK |
-               CCM_ANALOG_PLL_VIDEO_CLR_POWERDOWN_MASK |
-               CCM_ANALOG_PLL_VIDEO_CLR_BYPASS_MASK |
-               CCM_ANALOG_PLL_VIDEO_CLR_DIV_SELECT_MASK |
-               CCM_ANALOG_PLL_VIDEO_CLR_POST_DIV_SEL_MASK |
-               CCM_ANALOG_PLL_VIDEO_CLR_TEST_DIV_SELECT_MASK,
-               &ccm_anatop->pll_video_clr);
-
-       /* Set div, num and denom */
-       switch (post_div) {
-       case 1:
-               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
-                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x1) |
-                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x0),
-                       &ccm_anatop->pll_video_set);
-               break;
-       case 2:
-               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
-                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x0) |
-                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x0),
-                       &ccm_anatop->pll_video_set);
-               break;
-       case 3:
-               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
-                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x0) |
-                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x1),
-                       &ccm_anatop->pll_video_set);
-               break;
-       case 4:
-               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
-                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x0) |
-                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x3),
-                       &ccm_anatop->pll_video_set);
-               break;
-       case 0:
-       default:
-               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
-                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x2) |
-                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x0),
-                       &ccm_anatop->pll_video_set);
-               break;
-       }
-
-       writel(CCM_ANALOG_PLL_VIDEO_NUM_A(pll_num),
-               &ccm_anatop->pll_video_num);
-
-       writel(CCM_ANALOG_PLL_VIDEO_DENOM_B(pll_denom),
-               &ccm_anatop->pll_video_denom);
-
-       /* Wait PLL5 lock */
-       start = get_timer(0);   /* Get current timestamp */
-
-       do {
-               reg = readl(&ccm_anatop->pll_video);
-               if (reg & CCM_ANALOG_PLL_VIDEO_LOCK_MASK) {
-                       /* Enable PLL out */
-                       writel(CCM_ANALOG_PLL_VIDEO_CLR_ENABLE_CLK_MASK,
-                                       &ccm_anatop->pll_video_set);
-                       return 0;
-               }
-       } while (get_timer(0) < (start + 10)); /* Wait 10ms */
-
-       printf("Lock PLL5 timeout\n");
-
-       return 1;
-}
-
-int set_clk_qspi(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_QSPI, 0);
-
-       /* 49M: 392/2/4 */
-       target = CLK_ROOT_ON | QSPI_CLK_ROOT_FROM_PLL_SYS_PFD4_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
-       clock_set_target_val(QSPI_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_QSPI, 1);
-
-       return 0;
-}
-
-int set_clk_nand(void)
-{
-       u32 target;
-
-       /* disable the clock gate first */
-       clock_enable(CCGR_RAWNAND, 0);
-
-       enable_pll_enet();
-       /* 100: 500/5 */
-       target = CLK_ROOT_ON | NAND_CLK_ROOT_FROM_PLL_ENET_MAIN_500M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV5);
-       clock_set_target_val(NAND_CLK_ROOT, target);
-
-       /* enable the clock gate */
-       clock_enable(CCGR_RAWNAND, 1);
-
-       return 0;
-}
-
-void mxs_set_lcdclk(uint32_t base_addr, uint32_t freq)
-{
-       u32 hck = MXC_HCLK/1000;
-       u32 min = hck * 27;
-       u32 max = hck * 54;
-       u32 temp, best = 0;
-       u32 i, j, pred = 1, postd = 1;
-       u32 pll_div, pll_num, pll_denom, post_div = 0;
-       u32 target;
-
-       debug("mxs_set_lcdclk, freq = %d\n", freq);
-
-       clock_enable(CCGR_LCDIF, 0);
-
-       temp = (freq * 8 * 8);
-       if (temp < min) {
-               for (i = 1; i <= 4; i++) {
-                       if ((temp * (1 << i)) > min) {
-                               post_div = i;
-                               freq = (freq * (1 << i));
-                               break;
-                       }
-               }
-
-               if (5 == i) {
-                       printf("Fail to set rate to %dkhz", freq);
-                       return;
-               }
-       }
-
-       for (i = 1; i <= 8; i++) {
-               for (j = 1; j <= 8; j++) {
-                       temp = freq * i * j;
-                       if (temp > max || temp < min)
-                               continue;
-
-                       if (best == 0 || temp < best) {
-                               best = temp;
-                               pred = i;
-                               postd = j;
-                       }
-               }
-       }
-
-       if (best == 0) {
-               printf("Fail to set rate to %dkhz", freq);
-               return;
-       }
-
-       debug("best %d, pred = %d, postd = %d\n", best, pred, postd);
-
-       pll_div = best / hck;
-       pll_denom = 1000000;
-       pll_num = (best - hck * pll_div) * pll_denom / hck;
-
-       if (enable_pll_video(pll_div, pll_num, pll_denom, post_div))
-               return;
-
-       target = CLK_ROOT_ON | LCDIF_PIXEL_CLK_ROOT_FROM_PLL_VIDEO_MAIN_CLK |
-                CLK_ROOT_PRE_DIV((pred - 1)) | CLK_ROOT_POST_DIV((postd - 1));
-       clock_set_target_val(LCDIF_PIXEL_CLK_ROOT, target);
-
-       clock_enable(CCGR_LCDIF, 1);
-}
-
-#ifdef CONFIG_FEC_MXC
-int set_clk_enet(enum enet_freq type)
-{
-       u32 target;
-       int ret;
-       u32 enet1_ref, enet2_ref;
-
-       /* disable the clock first */
-       clock_enable(CCGR_ENET1, 0);
-       clock_enable(CCGR_ENET2, 0);
-
-       switch (type) {
-       case ENET_125MHz:
-               enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
-               enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
-               break;
-       case ENET_50MHz:
-               enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
-               enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
-               break;
-       case ENET_25MHz:
-               enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
-               enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       ret = enable_pll_enet();
-       if (ret != 0)
-               return ret;
-
-       /* set enet axi clock 196M: 392/2 */
-       target = CLK_ROOT_ON | ENET_AXI_CLK_ROOT_FROM_PLL_SYS_PFD4_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
-       clock_set_target_val(ENET_AXI_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | enet1_ref |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(ENET1_REF_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | ENET1_TIME_CLK_ROOT_FROM_PLL_ENET_MAIN_100M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
-       clock_set_target_val(ENET1_TIME_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | enet2_ref |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(ENET2_REF_CLK_ROOT, target);
-
-       target = CLK_ROOT_ON | ENET2_TIME_CLK_ROOT_FROM_PLL_ENET_MAIN_100M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
-       clock_set_target_val(ENET2_TIME_CLK_ROOT, target);
-
-#ifdef CONFIG_FEC_MXC_25M_REF_CLK
-       target = CLK_ROOT_ON |
-                ENET_PHY_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK |
-                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
-                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
-       clock_set_target_val(ENET_PHY_REF_CLK_ROOT, target);
-#endif
-       /* enable clock */
-       clock_enable(CCGR_ENET1, 1);
-       clock_enable(CCGR_ENET2, 1);
-
-       return 0;
-}
-#endif
-
-/* Configure PLL/PFD freq */
-void clock_init(void)
-{
-/* Rom has enabled PLL_ARM, PLL_DDR, PLL_SYS, PLL_ENET
- *   In u-boot, we have to:
- *   1. Configure PFD3- PFD7 for freq we needed in u-boot
- *   2. Set clock root for peripherals (ip channel) used in u-boot but without set rate
- *       interface.  The clocks for these peripherals are enabled after this intialization.
- *   3. Other peripherals with set clock rate interface does not be set in this function.
- */
-       u32 reg;
-
-       /*
-        * Configure PFD4 to 392M
-        * 480M * 18 / 0x16 = 392M
-        */
-       reg = readl(&ccm_anatop->pfd_480b);
-
-       reg &= ~(ANATOP_PFD480B_PFD4_FRAC_MASK |
-                CCM_ANALOG_PFD_480B_PFD4_DIV1_CLKGATE_MASK);
-       reg |= ANATOP_PFD480B_PFD4_FRAC_392M_VAL;
-
-       writel(reg, &ccm_anatop->pfd_480b);
-
-       init_clk_esdhc();
-       init_clk_uart();
-       init_clk_weim();
-       init_clk_ecspi();
-       init_clk_wdog();
-#ifdef CONFIG_MXC_EPDC
-       init_clk_epdc();
-#endif
-
-       enable_usboh3_clk(1);
-
-       clock_enable(CCGR_SNVS, 1);
-
-#ifdef CONFIG_NAND_MXS
-       clock_enable(CCGR_RAWNAND, 1);
-#endif
-
-       if (IS_ENABLED(CONFIG_IMX_RDC)) {
-               clock_enable(CCGR_RDC, 1);
-               clock_enable(CCGR_SEMA1, 1);
-               clock_enable(CCGR_SEMA2, 1);
-       }
-}
-
-#ifdef CONFIG_SECURE_BOOT
-void hab_caam_clock_enable(unsigned char enable)
-{
-       if (enable)
-               clock_enable(CCGR_CAAM, 1);
-       else
-               clock_enable(CCGR_CAAM, 0);
-}
-#endif
-
-#ifdef CONFIG_MXC_EPDC
-void epdc_clock_enable(void)
-{
-       clock_enable(CCGR_EPDC, 1);
-}
-void epdc_clock_disable(void)
-{
-       clock_enable(CCGR_EPDC, 0);
-}
-#endif
-
-/*
- * Dump some core clockes.
- */
-int do_mx7_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       u32 freq;
-       freq = decode_pll(PLL_CORE, MXC_HCLK);
-       printf("PLL_CORE    %8d MHz\n", freq / 1000000);
-       freq = decode_pll(PLL_SYS, MXC_HCLK);
-       printf("PLL_SYS    %8d MHz\n", freq / 1000000);
-       freq = decode_pll(PLL_ENET, MXC_HCLK);
-       printf("PLL_NET    %8d MHz\n", freq / 1000000);
-
-       printf("\n");
-
-       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
-       printf("UART       %8d kHz\n", mxc_get_clock(MXC_UART_CLK) / 1000);
-#ifdef CONFIG_MXC_SPI
-       printf("CSPI       %8d kHz\n", mxc_get_clock(MXC_CSPI_CLK) / 1000);
-#endif
-       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
-       printf("AXI        %8d kHz\n", mxc_get_clock(MXC_AXI_CLK) / 1000);
-       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
-       printf("USDHC1     %8d kHz\n", mxc_get_clock(MXC_ESDHC_CLK) / 1000);
-       printf("USDHC2     %8d kHz\n", mxc_get_clock(MXC_ESDHC2_CLK) / 1000);
-       printf("USDHC3     %8d kHz\n", mxc_get_clock(MXC_ESDHC3_CLK) / 1000);
-
-       return 0;
-}
-
-U_BOOT_CMD(
-       clocks, CONFIG_SYS_MAXARGS, 1, do_mx7_showclocks,
-       "display clocks",
-       ""
-);
diff --git a/arch/arm/cpu/armv7/mx7/clock_slice.c b/arch/arm/cpu/armv7/mx7/clock_slice.c
deleted file mode 100644 (file)
index 68a7005..0000000
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * Author:
- *     Peng Fan <Peng.Fan@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <div64.h>
-#include <asm/io.h>
-#include <linux/errno.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-
-struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-static struct clk_root_map root_array[] = {
-       {ARM_A7_CLK_ROOT, CCM_CORE_CHANNEL,
-        {OSC_24M_CLK, PLL_ARM_MAIN_800M_CLK, PLL_ENET_MAIN_500M_CLK,
-         PLL_DRAM_MAIN_1066M_CLK, PLL_SYS_MAIN_480M_CLK,
-         PLL_SYS_PFD0_392M_CLK, PLL_AUDIO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {ARM_M4_CLK_ROOT, CCM_BUS_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_250M_CLK,
-         PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {ARM_M0_CLK_ROOT, CCM_BUS_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_125M_CLK,
-         PLL_SYS_PFD2_135M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {MAIN_AXI_CLK_ROOT, CCM_BUS_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_SYS_PFD5_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {DISP_AXI_CLK_ROOT, CCM_BUS_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK,
-         PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {ENET_AXI_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK}
-       },
-       {NAND_USDHC_BUS_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_SYS_MAIN_240M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_PFD6_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_AUDIO_MAIN_CLK}
-       },
-       {AHB_CLK_ROOT, CCM_AHB_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_SYS_PFD0_392M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK,
-         PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {DRAM_PHYM_CLK_ROOT, CCM_DRAM_PHYM_CHANNEL,
-        {PLL_DRAM_MAIN_1066M_CLK, DRAM_PHYM_ALT_CLK_ROOT}
-       },
-       {DRAM_CLK_ROOT, CCM_DRAM_CHANNEL,
-        {PLL_DRAM_MAIN_1066M_CLK, DRAM_ALT_CLK_ROOT}
-       },
-       {DRAM_PHYM_ALT_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_SYS_MAIN_480M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD7_CLK,
-         PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {DRAM_ALT_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_SYS_MAIN_480M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_ENET_MAIN_250M_CLK,
-         PLL_SYS_PFD0_392M_CLK, PLL_AUDIO_MAIN_CLK, PLL_SYS_PFD2_270M_CLK}
-       },
-       {USB_HSIC_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_USB_MAIN_480M_CLK,
-         PLL_SYS_PFD3_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD5_CLK,
-         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {PCIE_CTRL_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_250M_CLK, PLL_SYS_MAIN_240M_CLK,
-         PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_SYS_PFD6_CLK}
-       },
-       {PCIE_PHY_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_ENET_MAIN_500M_CLK,
-         EXT_CLK_1, EXT_CLK_2, EXT_CLK_3,
-         EXT_CLK_4, PLL_SYS_PFD0_392M_CLK}
-       },
-       {EPDC_PIXEL_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD5_CLK, PLL_SYS_PFD6_CLK,
-         PLL_SYS_PFD7_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {LCDIF_PIXEL_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD5_CLK, PLL_DRAM_MAIN_533M_CLK,
-         EXT_CLK_3, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {MIPI_DSI_EXTSER_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD5_CLK, PLL_SYS_PFD3_CLK,
-         PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD0_196M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_AUDIO_MAIN_CLK}
-       },
-       {MIPI_CSI_WARP_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD3_CLK,
-         PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD0_196M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_AUDIO_MAIN_CLK}
-       },
-       {MIPI_DPHY_REF_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_SYS_PFD5_CLK, REF_1M_CLK, EXT_CLK_2,
-         PLL_VIDEO_MAIN_CLK, EXT_CLK_3}
-       },
-       {SAI1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_125M_CLK, EXT_CLK_2}
-       },
-       {SAI2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_125M_CLK, EXT_CLK_2}
-       },
-       {SAI3_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_125M_CLK, EXT_CLK_3}
-       },
-       {SPDIF_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_125M_CLK, EXT_CLK_3}
-       },
-       {ENET1_REF_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_ENET_MAIN_50M_CLK,
-         PLL_ENET_MAIN_25M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, EXT_CLK_4}
-       },
-       {ENET1_TIME_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_AUDIO_MAIN_CLK,
-         EXT_CLK_1, EXT_CLK_2, EXT_CLK_3,
-         EXT_CLK_4, PLL_VIDEO_MAIN_CLK}
-       },
-       {ENET2_REF_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_ENET_MAIN_50M_CLK,
-         PLL_ENET_MAIN_25M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, EXT_CLK_4}
-       },
-       {ENET2_TIME_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_AUDIO_MAIN_CLK,
-         EXT_CLK_1, EXT_CLK_2, EXT_CLK_3,
-         EXT_CLK_4, PLL_VIDEO_MAIN_CLK}
-       },
-       {ENET_PHY_REF_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_25M_CLK, PLL_ENET_MAIN_50M_CLK,
-         PLL_ENET_MAIN_125M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD3_CLK}
-       },
-       {EIM_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_SYS_PFD3_CLK,
-         PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {NAND_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_SYS_PFD0_392M_CLK, PLL_SYS_PFD3_CLK, PLL_ENET_MAIN_500M_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {QSPI_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD4_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD3_CLK, PLL_SYS_PFD2_270M_CLK,
-         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {USDHC1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD0_392M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
-         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {USDHC2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD0_392M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
-         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {USDHC3_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD0_392M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
-         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {CAN1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_SYS_MAIN_480M_CLK, PLL_ENET_MAIN_40M_CLK, PLL_USB_MAIN_480M_CLK,
-         EXT_CLK_1, EXT_CLK_4}
-       },
-       {CAN2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_SYS_MAIN_480M_CLK, PLL_ENET_MAIN_40M_CLK, PLL_USB_MAIN_480M_CLK,
-         EXT_CLK_1, EXT_CLK_3}
-       },
-       {I2C1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
-         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
-       },
-       {I2C2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
-         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
-       },
-       {I2C3_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
-         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
-       },
-       {I2C4_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
-         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
-       },
-       {UART1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
-         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
-       },
-       {UART2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
-         EXT_CLK_3, PLL_USB_MAIN_480M_CLK}
-       },
-       {UART3_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
-         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
-       },
-       {UART4_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
-         EXT_CLK_3, PLL_USB_MAIN_480M_CLK}
-       },
-       {UART5_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
-         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
-       },
-       {UART6_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
-         EXT_CLK_3, PLL_USB_MAIN_480M_CLK}
-       },
-       {UART7_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
-         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
-       },
-       {ECSPI1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {ECSPI2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {ECSPI3_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {ECSPI4_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
-         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
-         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {PWM1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_1,
-         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {PWM2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_1,
-         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {PWM3_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_2,
-         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {PWM4_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_2,
-         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {FLEXTIMER1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_3,
-         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {FLEXTIMER2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_3,
-         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
-       },
-       {SIM1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_USB_MAIN_480M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_ENET_MAIN_125M_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {SIM2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_USB_MAIN_480M_CLK, PLL_VIDEO_MAIN_CLK,
-         PLL_ENET_MAIN_125M_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {GPT1_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
-         PLL_AUDIO_MAIN_CLK, EXT_CLK_1}
-       },
-       {GPT2_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
-         PLL_AUDIO_MAIN_CLK, EXT_CLK_2}
-       },
-       {GPT3_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
-         PLL_AUDIO_MAIN_CLK, EXT_CLK_3}
-       },
-       {GPT4_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
-         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
-         PLL_AUDIO_MAIN_CLK, EXT_CLK_4}
-       },
-       {TRACE_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK,
-         EXT_CLK_1, EXT_CLK_3}
-       },
-       {WDOG_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK,
-         REF_1M_CLK, PLL_SYS_PFD1_166M_CLK}
-       },
-       {CSI_MCLK_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {AUDIO_MCLK_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
-       },
-       {WRCLK_CLK_ROOT, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_ENET_MAIN_40M_CLK, PLL_DRAM_MAIN_533M_CLK,
-         PLL_USB_MAIN_480M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_SYS_PFD2_270M_CLK,
-         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD7_CLK}
-       },
-       {IPP_DO_CLKO1, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_MAIN_240M_CLK,
-         PLL_SYS_PFD0_196M_CLK, PLL_SYS_PFD3_CLK, PLL_ENET_MAIN_500M_CLK,
-         PLL_DRAM_MAIN_533M_CLK, REF_1M_CLK}
-       },
-       {IPP_DO_CLKO2, CCM_IP_CHANNEL,
-        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_SYS_PFD0_392M_CLK,
-         PLL_SYS_PFD1_166M_CLK, PLL_SYS_PFD4_CLK, PLL_AUDIO_MAIN_CLK,
-         PLL_VIDEO_MAIN_CLK, OSC_32K_CLK}
-       },
-};
-
-/* select which entry of root_array */
-static int select(enum clk_root_index clock_id)
-{
-       int i, size;
-       struct clk_root_map *p = root_array;
-
-       size = ARRAY_SIZE(root_array);
-
-       for (i = 0; i < size; i++, p++) {
-               if (clock_id == p->entry)
-                       return i;
-       }
-
-       return -EINVAL;
-}
-
-static int src_supported(int entry, enum clk_root_src clock_src)
-{
-       int i, size;
-       struct clk_root_map *p = &root_array[entry];
-
-       if ((p->type == CCM_DRAM_PHYM_CHANNEL) || (p->type == CCM_DRAM_CHANNEL))
-               size = 2;
-       else
-               size = 8;
-
-       for (i = 0; i < size; i++) {
-               if (p->src_mux[i] == clock_src)
-                       return i;
-       }
-
-       return -EINVAL;
-}
-
-/* Set src for clock root slice. */
-int clock_set_src(enum clk_root_index clock_id, enum clk_root_src clock_src)
-{
-       int root_entry, src_entry;
-       u32 reg;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       root_entry = select(clock_id);
-       if (root_entry < 0)
-               return -EINVAL;
-
-       src_entry = src_supported(root_entry, clock_src);
-       if (src_entry < 0)
-               return -EINVAL;
-
-       reg = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       reg &= ~CLK_ROOT_MUX_MASK;
-       reg |= src_entry << CLK_ROOT_MUX_SHIFT;
-       __raw_writel(reg, &imx_ccm->root[clock_id].target_root);
-
-       return 0;
-}
-
-/* Get src of a clock root slice. */
-int clock_get_src(enum clk_root_index clock_id, enum clk_root_src *p_clock_src)
-{
-       u32 val;
-       int root_entry;
-       struct clk_root_map *p;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       val &= CLK_ROOT_MUX_MASK;
-       val >>= CLK_ROOT_MUX_SHIFT;
-
-       root_entry = select(clock_id);
-       if (root_entry < 0)
-               return -EINVAL;
-
-       p = &root_array[root_entry];
-       *p_clock_src = p->src_mux[val];
-
-       return 0;
-}
-
-int clock_set_prediv(enum clk_root_index clock_id, enum root_pre_div pre_div)
-{
-       int root_entry;
-       struct clk_root_map *p;
-       u32 reg;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       root_entry = select(clock_id);
-       if (root_entry < 0)
-               return -EINVAL;
-
-       p = &root_array[root_entry];
-
-       if ((p->type == CCM_CORE_CHANNEL) ||
-           (p->type == CCM_DRAM_PHYM_CHANNEL) ||
-           (p->type == CCM_DRAM_CHANNEL)) {
-               if (pre_div != CLK_ROOT_PRE_DIV1) {
-                       printf("Error pre div!\n");
-                       return -EINVAL;
-               }
-       }
-
-       reg = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       reg &= ~CLK_ROOT_PRE_DIV_MASK;
-       reg |= pre_div << CLK_ROOT_PRE_DIV_SHIFT;
-       __raw_writel(reg, &imx_ccm->root[clock_id].target_root);
-
-       return 0;
-}
-
-int clock_get_prediv(enum clk_root_index clock_id, enum root_pre_div *pre_div)
-{
-       u32 val;
-       int root_entry;
-       struct clk_root_map *p;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       root_entry = select(clock_id);
-       if (root_entry < 0)
-               return -EINVAL;
-
-       p = &root_array[root_entry];
-
-       if ((p->type == CCM_CORE_CHANNEL) ||
-           (p->type == CCM_DRAM_PHYM_CHANNEL) ||
-           (p->type == CCM_DRAM_CHANNEL)) {
-               *pre_div = 0;
-               return 0;
-       }
-
-       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       val &= CLK_ROOT_PRE_DIV_MASK;
-       val >>= CLK_ROOT_PRE_DIV_SHIFT;
-
-       *pre_div = val;
-
-       return 0;
-}
-
-int clock_set_postdiv(enum clk_root_index clock_id, enum root_post_div div)
-{
-       u32 reg;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       if (clock_id == DRAM_PHYM_CLK_ROOT) {
-               if (div != CLK_ROOT_POST_DIV1) {
-                       printf("Error post div!\n");
-                       return -EINVAL;
-               }
-       }
-
-       /* Only 3 bit post div. */
-       if ((clock_id == DRAM_CLK_ROOT) && (div > CLK_ROOT_POST_DIV7)) {
-               printf("Error post div!\n");
-               return -EINVAL;
-       }
-
-       reg = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       reg &= ~CLK_ROOT_POST_DIV_MASK;
-       reg |= div << CLK_ROOT_POST_DIV_SHIFT;
-       __raw_writel(reg, &imx_ccm->root[clock_id].target_root);
-
-       return 0;
-}
-
-int clock_get_postdiv(enum clk_root_index clock_id, enum root_post_div *div)
-{
-       u32 val;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       if (clock_id == DRAM_PHYM_CLK_ROOT) {
-               *div = 0;
-               return 0;
-       }
-
-       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       if (clock_id == DRAM_CLK_ROOT)
-               val &= DRAM_CLK_ROOT_POST_DIV_MASK;
-       else
-               val &= CLK_ROOT_POST_DIV_MASK;
-       val >>= CLK_ROOT_POST_DIV_SHIFT;
-
-       *div = val;
-
-       return 0;
-}
-
-int clock_set_autopostdiv(enum clk_root_index clock_id, enum root_auto_div div,
-                         int auto_en)
-{
-       u32 val;
-       int root_entry;
-       struct clk_root_map *p;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       root_entry = select(clock_id);
-       if (root_entry < 0)
-               return -EINVAL;
-
-       p = &root_array[root_entry];
-
-       if ((p->type != CCM_BUS_CHANNEL) && (p->type != CCM_AHB_CHANNEL)) {
-               printf("Auto postdiv not supported.!\n");
-               return -EINVAL;
-       }
-
-       /*
-        * Each time only one filed can be changed, no use target_root_set.
-        */
-       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       val &= ~CLK_ROOT_AUTO_DIV_MASK;
-       val |= (div << CLK_ROOT_AUTO_DIV_SHIFT);
-
-       if (auto_en)
-               val |= CLK_ROOT_AUTO_EN;
-       else
-               val &= ~CLK_ROOT_AUTO_EN;
-
-       __raw_writel(val, &imx_ccm->root[clock_id].target_root);
-
-       return 0;
-}
-
-int clock_get_autopostdiv(enum clk_root_index clock_id, enum root_auto_div *div,
-                         int *auto_en)
-{
-       u32 val;
-       int root_entry;
-       struct clk_root_map *p;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       root_entry = select(clock_id);
-       if (root_entry < 0)
-               return -EINVAL;
-
-       p = &root_array[root_entry];
-
-       /*
-        * Only bus/ahb channel supports auto div.
-        * If unsupported, just set auto_en and div with 0.
-        */
-       if ((p->type != CCM_BUS_CHANNEL) && (p->type != CCM_AHB_CHANNEL)) {
-               *auto_en = 0;
-               *div = 0;
-               return 0;
-       }
-
-       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
-       if ((val & CLK_ROOT_AUTO_EN_MASK) == 0)
-               *auto_en = 0;
-       else
-               *auto_en = 1;
-
-       val &= CLK_ROOT_AUTO_DIV_MASK;
-       val >>= CLK_ROOT_AUTO_DIV_SHIFT;
-
-       *div = val;
-
-       return 0;
-}
-
-int clock_get_target_val(enum clk_root_index clock_id, u32 *val)
-{
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       *val = __raw_readl(&imx_ccm->root[clock_id].target_root);
-
-       return 0;
-}
-
-int clock_set_target_val(enum clk_root_index clock_id, u32 val)
-{
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       __raw_writel(val, &imx_ccm->root[clock_id].target_root);
-
-       return 0;
-}
-
-/* Auto_div and auto_en is ignored, they are rarely used. */
-int clock_root_cfg(enum clk_root_index clock_id, enum root_pre_div pre_div,
-                  enum root_post_div post_div, enum clk_root_src clock_src)
-{
-       u32 val;
-       int root_entry, src_entry;
-       struct clk_root_map *p;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       root_entry = select(clock_id);
-       if (root_entry < 0)
-               return -EINVAL;
-
-       p = &root_array[root_entry];
-
-       if ((p->type == CCM_CORE_CHANNEL) ||
-           (p->type == CCM_DRAM_PHYM_CHANNEL) ||
-           (p->type == CCM_DRAM_CHANNEL)) {
-               if (pre_div != CLK_ROOT_PRE_DIV1) {
-                       printf("Error pre div!\n");
-                       return -EINVAL;
-               }
-       }
-
-       /* Only 3 bit post div. */
-       if (p->type == CCM_DRAM_CHANNEL) {
-               if (post_div > CLK_ROOT_POST_DIV7) {
-                       printf("Error post div!\n");
-                       return -EINVAL;
-               }
-       }
-
-       if (p->type == CCM_DRAM_PHYM_CHANNEL) {
-               if (post_div != CLK_ROOT_POST_DIV1) {
-                       printf("Error post div!\n");
-                       return -EINVAL;
-               }
-       }
-
-       src_entry = src_supported(root_entry, clock_src);
-       if (src_entry < 0)
-               return -EINVAL;
-
-       val = CLK_ROOT_ON | pre_div << CLK_ROOT_PRE_DIV_SHIFT |
-             post_div << CLK_ROOT_POST_DIV_SHIFT |
-             src_entry << CLK_ROOT_MUX_SHIFT;
-
-       __raw_writel(val, &imx_ccm->root[clock_id].target_root);
-
-       return 0;
-}
-
-int clock_root_enabled(enum clk_root_index clock_id)
-{
-       u32 val;
-
-       if (clock_id >= CLK_ROOT_MAX)
-               return -EINVAL;
-
-       /*
-        * No enable bit for DRAM controller and PHY. Just return enabled.
-        */
-       if ((clock_id == DRAM_PHYM_CLK_ROOT) || (clock_id == DRAM_CLK_ROOT))
-               return 1;
-
-       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
-
-       return (val & CLK_ROOT_ENABLE_MASK) ? 1 : 0;
-}
-
-/* CCGR gate operation */
-int clock_enable(enum clk_ccgr_index index, bool enable)
-{
-       if (index >= CCGR_MAX)
-               return -EINVAL;
-
-       if (enable)
-               __raw_writel(CCM_CLK_ON_MSK,
-                            &imx_ccm->ccgr_array[index].ccgr_set);
-       else
-               __raw_writel(CCM_CLK_ON_MSK,
-                            &imx_ccm->ccgr_array[index].ccgr_clr);
-
-       return 0;
-}
diff --git a/arch/arm/cpu/armv7/mx7/psci-mx7.c b/arch/arm/cpu/armv7/mx7/psci-mx7.c
deleted file mode 100644 (file)
index 502552d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <asm/io.h>
-#include <asm/psci.h>
-#include <asm/secure.h>
-#include <asm/arch/imx-regs.h>
-#include <common.h>
-
-
-#define GPC_CPU_PGC_SW_PDN_REQ 0xfc
-#define GPC_CPU_PGC_SW_PUP_REQ 0xf0
-#define GPC_PGC_C1             0x840
-
-#define BM_CPU_PGC_SW_PDN_PUP_REQ_CORE1_A7     0x2
-
-/* below is for i.MX7D */
-#define SRC_GPR1_MX7D          0x074
-#define SRC_A7RCR0             0x004
-#define SRC_A7RCR1             0x008
-
-#define BP_SRC_A7RCR0_A7_CORE_RESET0   0
-#define BP_SRC_A7RCR1_A7_CORE1_ENABLE  1
-
-static inline void imx_gpcv2_set_m_core_pgc(bool enable, u32 offset)
-{
-       writel(enable, GPC_IPS_BASE_ADDR + offset);
-}
-
-__secure void imx_gpcv2_set_core1_power(bool pdn)
-{
-       u32 reg = pdn ? GPC_CPU_PGC_SW_PUP_REQ : GPC_CPU_PGC_SW_PDN_REQ;
-       u32 val;
-
-       imx_gpcv2_set_m_core_pgc(true, GPC_PGC_C1);
-
-       val = readl(GPC_IPS_BASE_ADDR + reg);
-       val |= BM_CPU_PGC_SW_PDN_PUP_REQ_CORE1_A7;
-       writel(val, GPC_IPS_BASE_ADDR + reg);
-
-       while ((readl(GPC_IPS_BASE_ADDR + reg) &
-              BM_CPU_PGC_SW_PDN_PUP_REQ_CORE1_A7) != 0)
-               ;
-
-       imx_gpcv2_set_m_core_pgc(false, GPC_PGC_C1);
-}
-
-__secure void imx_enable_cpu_ca7(int cpu, bool enable)
-{
-       u32 mask, val;
-
-       mask = 1 << (BP_SRC_A7RCR1_A7_CORE1_ENABLE + cpu - 1);
-       val = readl(SRC_BASE_ADDR + SRC_A7RCR1);
-       val = enable ? val | mask : val & ~mask;
-       writel(val, SRC_BASE_ADDR + SRC_A7RCR1);
-}
-
-__secure int imx_cpu_on(int fn, int cpu, int pc)
-{
-       writel(pc, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D);
-       imx_gpcv2_set_core1_power(true);
-       imx_enable_cpu_ca7(cpu, true);
-       return 0;
-}
-
-__secure int imx_cpu_off(int cpu)
-{
-       imx_enable_cpu_ca7(cpu, false);
-       imx_gpcv2_set_core1_power(false);
-       writel(0, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D + 4);
-       return 0;
-}
diff --git a/arch/arm/cpu/armv7/mx7/psci.S b/arch/arm/cpu/armv7/mx7/psci.S
deleted file mode 100644 (file)
index 96e88d6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <config.h>
-#include <linux/linkage.h>
-
-#include <asm/armv7.h>
-#include <asm/arch-armv7/generictimer.h>
-#include <asm/psci.h>
-
-       .pushsection ._secure.text, "ax"
-
-       .arch_extension sec
-
-.globl psci_cpu_on
-psci_cpu_on:
-       push    {r4, r5, lr}
-
-       mov     r4, r0
-       mov     r5, r1
-       mov     r0, r1
-       mov     r1, r2
-       bl      psci_save_target_pc
-
-       mov     r0, r4
-       mov     r1, r5
-       ldr     r2, =psci_cpu_entry
-       bl      imx_cpu_on
-
-       pop     {r4, r5, pc}
-
-.globl psci_cpu_off
-psci_cpu_off:
-
-       bl      psci_cpu_off_common
-       bl      psci_get_cpu_id
-       bl      imx_cpu_off
-
-1:     wfi
-       b 1b
-
-       .popsection
diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/cpu/armv7/mx7/soc.c
deleted file mode 100644 (file)
index 8422f24..0000000
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#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/imx-common/rdc-sema.h>
-#include <asm/arch/imx-rdc.h>
-#include <asm/arch/crm_regs.h>
-#include <dm.h>
-#include <imx_thermal.h>
-
-#if defined(CONFIG_IMX_THERMAL)
-static const struct imx_thermal_plat imx7_thermal_plat = {
-       .regs = (void *)ANATOP_BASE_ADDR,
-       .fuse_bank = 3,
-       .fuse_word = 3,
-};
-
-U_BOOT_DEVICE(imx7_thermal) = {
-       .name = "imx_thermal",
-       .platdata = &imx7_thermal_plat,
-};
-#endif
-
-#ifdef CONFIG_IMX_RDC
-/*
- * In current design, if any peripheral was assigned to both A7 and M4,
- * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter
- * low power mode. So M4 sleep will cause some peripherals fail to work
- * at A7 core side. At default, all resources are in domain 0 - 3.
- *
- * There are 26 peripherals impacted by this IC issue:
- * SIM2(sim2/emvsim2)
- * SIM1(sim1/emvsim1)
- * UART1/UART2/UART3/UART4/UART5/UART6/UART7
- * SAI1/SAI2/SAI3
- * WDOG1/WDOG2/WDOG3/WDOG4
- * GPT1/GPT2/GPT3/GPT4
- * PWM1/PWM2/PWM3/PWM4
- * ENET1/ENET2
- * Software Workaround:
- * Here we setup some resources to domain 0 where M4 codes will move
- * the M4 out of this domain. Then M4 is not able to access them any longer.
- * This is a workaround for ic issue. So the peripherals are not shared
- * by them. This way requires the uboot implemented the RDC driver and
- * set the 26 IPs above to domain 0 only. M4 code will assign resource
- * to its own domain, if it want to use the resource.
- */
-static rdc_peri_cfg_t const resources[] = {
-       (RDC_PER_SIM1 | RDC_DOMAIN(0)),
-       (RDC_PER_SIM2 | RDC_DOMAIN(0)),
-       (RDC_PER_UART1 | RDC_DOMAIN(0)),
-       (RDC_PER_UART2 | RDC_DOMAIN(0)),
-       (RDC_PER_UART3 | RDC_DOMAIN(0)),
-       (RDC_PER_UART4 | RDC_DOMAIN(0)),
-       (RDC_PER_UART5 | RDC_DOMAIN(0)),
-       (RDC_PER_UART6 | RDC_DOMAIN(0)),
-       (RDC_PER_UART7 | RDC_DOMAIN(0)),
-       (RDC_PER_SAI1 | RDC_DOMAIN(0)),
-       (RDC_PER_SAI2 | RDC_DOMAIN(0)),
-       (RDC_PER_SAI3 | RDC_DOMAIN(0)),
-       (RDC_PER_WDOG1 | RDC_DOMAIN(0)),
-       (RDC_PER_WDOG2 | RDC_DOMAIN(0)),
-       (RDC_PER_WDOG3 | RDC_DOMAIN(0)),
-       (RDC_PER_WDOG4 | RDC_DOMAIN(0)),
-       (RDC_PER_GPT1 | RDC_DOMAIN(0)),
-       (RDC_PER_GPT2 | RDC_DOMAIN(0)),
-       (RDC_PER_GPT3 | RDC_DOMAIN(0)),
-       (RDC_PER_GPT4 | RDC_DOMAIN(0)),
-       (RDC_PER_PWM1 | RDC_DOMAIN(0)),
-       (RDC_PER_PWM2 | RDC_DOMAIN(0)),
-       (RDC_PER_PWM3 | RDC_DOMAIN(0)),
-       (RDC_PER_PWM4 | RDC_DOMAIN(0)),
-       (RDC_PER_ENET1 | RDC_DOMAIN(0)),
-       (RDC_PER_ENET2 | RDC_DOMAIN(0)),
-};
-
-static void isolate_resource(void)
-{
-       imx_rdc_setup_peripherals(resources, ARRAY_SIZE(resources));
-}
-#endif
-
-#if defined(CONFIG_SECURE_BOOT)
-struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
-       .bank = 1,
-       .word = 3,
-};
-#endif
-
-/*
- * OCOTP_TESTER3[9:8] (see Fusemap Description Table offset 0x440)
- * defines a 2-bit SPEED_GRADING
- */
-#define OCOTP_TESTER3_SPEED_SHIFT      8
-#define OCOTP_TESTER3_SPEED_800MHZ     0
-#define OCOTP_TESTER3_SPEED_500MHZ     1
-#define OCOTP_TESTER3_SPEED_1GHZ       2
-#define OCOTP_TESTER3_SPEED_1P2GHZ     3
-
-u32 get_cpu_speed_grade_hz(void)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[1];
-       struct fuse_bank1_regs *fuse =
-               (struct fuse_bank1_regs *)bank->fuse_regs;
-       uint32_t val;
-
-       val = readl(&fuse->tester3);
-       val >>= OCOTP_TESTER3_SPEED_SHIFT;
-       val &= 0x3;
-
-       switch(val) {
-       case OCOTP_TESTER3_SPEED_800MHZ:
-               return 800000000;
-       case OCOTP_TESTER3_SPEED_500MHZ:
-               return 500000000;
-       case OCOTP_TESTER3_SPEED_1GHZ:
-               return 1000000000;
-       case OCOTP_TESTER3_SPEED_1P2GHZ:
-               return 1200000000;
-       }
-       return 0;
-}
-
-/*
- * OCOTP_TESTER3[7:6] (see Fusemap Description Table offset 0x440)
- * defines a 2-bit SPEED_GRADING
- */
-#define OCOTP_TESTER3_TEMP_SHIFT       6
-
-u32 get_cpu_temp_grade(int *minc, int *maxc)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[1];
-       struct fuse_bank1_regs *fuse =
-               (struct fuse_bank1_regs *)bank->fuse_regs;
-       uint32_t val;
-
-       val = readl(&fuse->tester3);
-       val >>= OCOTP_TESTER3_TEMP_SHIFT;
-       val &= 0x3;
-
-       if (minc && maxc) {
-               if (val == TEMP_AUTOMOTIVE) {
-                       *minc = -40;
-                       *maxc = 125;
-               } else if (val == TEMP_INDUSTRIAL) {
-                       *minc = -40;
-                       *maxc = 105;
-               } else if (val == TEMP_EXTCOMMERCIAL) {
-                       *minc = -20;
-                       *maxc = 105;
-               } else {
-                       *minc = 0;
-                       *maxc = 95;
-               }
-       }
-       return val;
-}
-
-static bool is_mx7d(void)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[1];
-       struct fuse_bank1_regs *fuse =
-               (struct fuse_bank1_regs *)bank->fuse_regs;
-       int val;
-
-       val = readl(&fuse->tester4);
-       if (val & 1)
-               return false;
-       else
-               return true;
-}
-
-u32 get_cpu_rev(void)
-{
-       struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
-                                                ANATOP_BASE_ADDR;
-       u32 reg = readl(&ccm_anatop->digprog);
-       u32 type = (reg >> 16) & 0xff;
-
-       if (!is_mx7d())
-               type = MXC_CPU_MX7S;
-
-       reg &= 0xff;
-       return (type << 12) | reg;
-}
-
-#ifdef CONFIG_REVISION_TAG
-u32 __weak get_board_rev(void)
-{
-       return get_cpu_rev();
-}
-#endif
-
-/* enable all periherial can be accessed in nosec mode */
-static void init_csu(void)
-{
-       int i = 0;
-       for (i = 0; i < CSU_NUM_REGS; i++)
-               writel(CSU_INIT_SEC_LEVEL0, CSU_IPS_BASE_ADDR + i * 4);
-}
-
-static void imx_enet_mdio_fixup(void)
-{
-       struct iomuxc_gpr_base_regs *gpr_regs =
-               (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR;
-
-       /*
-        * The management data input/output (MDIO) requires open-drain,
-        * i.MX7D TO1.0 ENET MDIO pin has no open drain, but TO1.1 supports
-        * this feature. So to TO1.1, need to enable open drain by setting
-        * bits GPR0[8:7].
-        */
-
-       if (soc_rev() >= CHIP_REV_1_1) {
-               setbits_le32(&gpr_regs->gpr[0],
-                            IOMUXC_GPR_GPR0_ENET_MDIO_OPEN_DRAIN_MASK);
-       }
-}
-
-int arch_cpu_init(void)
-{
-       init_aips();
-
-       init_csu();
-       /* Disable PDE bit of WMCR register */
-       imx_set_wdog_powerdown(false);
-
-       imx_enet_mdio_fixup();
-
-#ifdef CONFIG_APBH_DMA
-       /* Start APBH DMA */
-       mxs_dma_init();
-#endif
-
-       if (IS_ENABLED(CONFIG_IMX_RDC))
-               isolate_resource();
-
-       return 0;
-}
-
-#ifdef CONFIG_ARCH_MISC_INIT
-int arch_misc_init(void)
-{
-#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       if (is_mx7d())
-               setenv("soc", "imx7d");
-       else
-               setenv("soc", "imx7s");
-#endif
-
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_SERIAL_TAG
-void get_board_serial(struct tag_serialnr *serialnr)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[0];
-       struct fuse_bank0_regs *fuse =
-               (struct fuse_bank0_regs *)bank->fuse_regs;
-
-       serialnr->low = fuse->tester0;
-       serialnr->high = fuse->tester1;
-}
-#endif
-
-#if defined(CONFIG_FEC_MXC)
-void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
-{
-       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
-       struct fuse_bank *bank = &ocotp->bank[9];
-       struct fuse_bank9_regs *fuse =
-               (struct fuse_bank9_regs *)bank->fuse_regs;
-
-       if (0 == dev_id) {
-               u32 value = readl(&fuse->mac_addr1);
-               mac[0] = (value >> 8);
-               mac[1] = value;
-
-               value = readl(&fuse->mac_addr0);
-               mac[2] = value >> 24;
-               mac[3] = value >> 16;
-               mac[4] = value >> 8;
-               mac[5] = value;
-       } else {
-               u32 value = readl(&fuse->mac_addr2);
-               mac[0] = value >> 24;
-               mac[1] = value >> 16;
-               mac[2] = value >> 8;
-               mac[3] = value;
-
-               value = readl(&fuse->mac_addr1);
-               mac[4] = value >> 24;
-               mac[5] = value >> 16;
-       }
-}
-#endif
-
-#ifdef CONFIG_IMX_BOOTAUX
-int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
-{
-       u32 stack, pc;
-       struct src *src_reg = (struct src *)SRC_BASE_ADDR;
-
-       if (!boot_private_data)
-               return 1;
-
-       stack = *(u32 *)boot_private_data;
-       pc = *(u32 *)(boot_private_data + 4);
-
-       /* Set the stack and pc to M4 bootROM */
-       writel(stack, M4_BOOTROM_BASE_ADDR);
-       writel(pc, M4_BOOTROM_BASE_ADDR + 4);
-
-       /* Enable M4 */
-       clrsetbits_le32(&src_reg->m4rcr, SRC_M4RCR_M4C_NON_SCLR_RST_MASK,
-                       SRC_M4RCR_ENABLE_M4_MASK);
-
-       return 0;
-}
-
-int arch_auxiliary_core_check_up(u32 core_id)
-{
-       uint32_t val;
-       struct src *src_reg = (struct src *)SRC_BASE_ADDR;
-
-       val = readl(&src_reg->m4rcr);
-       if (val & 0x00000001)
-               return 0; /* assert in reset */
-
-       return 1;
-}
-#endif
-
-void set_wdog_reset(struct wdog_regs *wdog)
-{
-       u32 reg = readw(&wdog->wcr);
-       /*
-        * Output WDOG_B signal to reset external pmic or POR_B decided by
-        * the board desgin. Without external reset, the peripherals/DDR/
-        * PMIC are not reset, that may cause system working abnormal.
-        */
-       reg = readw(&wdog->wcr);
-       reg |= 1 << 3;
-       /*
-        * WDZST bit is write-once only bit. Align this bit in kernel,
-        * otherwise kernel code will have no chance to set this bit.
-        */
-       reg |= 1 << 0;
-       writew(reg, &wdog->wcr);
-}
-
-/*
- * cfg_val will be used for
- * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0]
- * After reset, if GPR10[28] is 1, ROM will copy GPR9[25:0]
- * to SBMR1, which will determine the boot device.
- */
-const struct boot_mode soc_boot_modes[] = {
-       {"ecspi1:0",    MAKE_CFGVAL(0x00, 0x60, 0x00, 0x00)},
-       {"ecspi1:1",    MAKE_CFGVAL(0x40, 0x62, 0x00, 0x00)},
-       {"ecspi1:2",    MAKE_CFGVAL(0x80, 0x64, 0x00, 0x00)},
-       {"ecspi1:3",    MAKE_CFGVAL(0xc0, 0x66, 0x00, 0x00)},
-
-       {"weim",        MAKE_CFGVAL(0x00, 0x50, 0x00, 0x00)},
-       {"qspi1",       MAKE_CFGVAL(0x10, 0x40, 0x00, 0x00)},
-       /* 4 bit bus width */
-       {"usdhc1",      MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)},
-       {"usdhc2",      MAKE_CFGVAL(0x10, 0x14, 0x00, 0x00)},
-       {"usdhc3",      MAKE_CFGVAL(0x10, 0x18, 0x00, 0x00)},
-       {"mmc1",        MAKE_CFGVAL(0x10, 0x20, 0x00, 0x00)},
-       {"mmc2",        MAKE_CFGVAL(0x10, 0x24, 0x00, 0x00)},
-       {"mmc3",        MAKE_CFGVAL(0x10, 0x28, 0x00, 0x00)},
-       {NULL,          0},
-};
-
-enum boot_device get_boot_device(void)
-{
-       struct bootrom_sw_info **p =
-               (struct bootrom_sw_info **)ROM_SW_INFO_ADDR;
-
-       enum boot_device boot_dev = SD1_BOOT;
-       u8 boot_type = (*p)->boot_dev_type;
-       u8 boot_instance = (*p)->boot_dev_instance;
-
-       switch (boot_type) {
-       case BOOT_TYPE_SD:
-               boot_dev = boot_instance + SD1_BOOT;
-               break;
-       case BOOT_TYPE_MMC:
-               boot_dev = boot_instance + MMC1_BOOT;
-               break;
-       case BOOT_TYPE_NAND:
-               boot_dev = NAND_BOOT;
-               break;
-       case BOOT_TYPE_QSPI:
-               boot_dev = QSPI_BOOT;
-               break;
-       case BOOT_TYPE_WEIM:
-               boot_dev = WEIM_NOR_BOOT;
-               break;
-       case BOOT_TYPE_SPINOR:
-               boot_dev = SPI_NOR_BOOT;
-               break;
-       default:
-               break;
-       }
-
-       return boot_dev;
-}
-
-#ifdef CONFIG_ENV_IS_IN_MMC
-__weak int board_mmc_get_env_dev(int devno)
-{
-       return CONFIG_SYS_MMC_ENV_DEV;
-}
-
-int mmc_get_env_dev(void)
-{
-       struct bootrom_sw_info **p =
-               (struct bootrom_sw_info **)ROM_SW_INFO_ADDR;
-       int devno = (*p)->boot_dev_instance;
-       u8 boot_type = (*p)->boot_dev_type;
-
-       /* If not boot from sd/mmc, use default value */
-       if ((boot_type != BOOT_TYPE_SD) && (boot_type != BOOT_TYPE_MMC))
-               return CONFIG_SYS_MMC_ENV_DEV;
-
-       return board_mmc_get_env_dev(devno);
-}
-#endif
-
-void s_init(void)
-{
-#if !defined CONFIG_SPL_BUILD
-       /* Enable SMP mode for CPU0, by setting bit 6 of Auxiliary Ctl reg */
-       asm volatile(
-                       "mrc p15, 0, r0, c1, c0, 1\n"
-                       "orr r0, r0, #1 << 6\n"
-                       "mcr p15, 0, r0, c1, c0, 1\n");
-#endif
-       /* clock configuration. */
-       clock_init();
-
-       return;
-}
-
-void reset_misc(void)
-{
-#ifdef CONFIG_VIDEO_MXS
-       lcdif_power_down();
-#endif
-}
-
diff --git a/arch/arm/cpu/armv7/mx7ulp/Kconfig b/arch/arm/cpu/armv7/mx7ulp/Kconfig
deleted file mode 100644 (file)
index 1bdc85a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-if ARCH_MX7ULP
-
-config SYS_SOC
-       default "mx7ulp"
-
-choice
-       prompt "MX7ULP board select"
-       optional
-
-config TARGET_MX7ULP_EVK
-        bool "Support mx7ulp EVK board"
-
-endchoice
-
-source "board/freescale/mx7ulp_evk/Kconfig"
-
-endif
diff --git a/arch/arm/cpu/armv7/mx7ulp/Makefile b/arch/arm/cpu/armv7/mx7ulp/Makefile
deleted file mode 100644 (file)
index 0248ea8..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2016 Freescale Semiconductor, Inc.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-#
-
-obj-y  := soc.o clock.o iomux.o pcc.o scg.o
diff --git a/arch/arm/cpu/armv7/mx7ulp/clock.c b/arch/arm/cpu/armv7/mx7ulp/clock.c
deleted file mode 100644 (file)
index 77b282a..0000000
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <div64.h>
-#include <asm/io.h>
-#include <errno.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int get_clocks(void)
-{
-#ifdef CONFIG_FSL_ESDHC
-#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC0_RBASE
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC1_RBASE
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-#endif
-#endif
-       return 0;
-}
-
-static u32 get_fast_plat_clk(void)
-{
-       return scg_clk_get_rate(SCG_NIC0_CLK);
-}
-
-static u32 get_slow_plat_clk(void)
-{
-       return scg_clk_get_rate(SCG_NIC1_CLK);
-}
-
-static u32 get_ipg_clk(void)
-{
-       return scg_clk_get_rate(SCG_NIC1_BUS_CLK);
-}
-
-u32 get_lpuart_clk(void)
-{
-       int index = 0;
-
-       const u32 lpuart_array[] = {
-               LPUART0_RBASE,
-               LPUART1_RBASE,
-               LPUART2_RBASE,
-               LPUART3_RBASE,
-               LPUART4_RBASE,
-               LPUART5_RBASE,
-               LPUART6_RBASE,
-               LPUART7_RBASE,
-       };
-
-       const enum pcc_clk lpuart_pcc_clks[] = {
-               PER_CLK_LPUART4,
-               PER_CLK_LPUART5,
-               PER_CLK_LPUART6,
-               PER_CLK_LPUART7,
-       };
-
-       for (index = 0; index < 8; index++) {
-               if (lpuart_array[index] == LPUART_BASE)
-                       break;
-       }
-
-       if (index < 4 || index > 7)
-               return 0;
-
-       return pcc_clock_get_rate(lpuart_pcc_clks[index - 4]);
-}
-
-#ifdef CONFIG_SYS_LPI2C_IMX
-int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
-{
-       /* Set parent to FIRC DIV2 clock */
-       const enum pcc_clk lpi2c_pcc_clks[] = {
-               PER_CLK_LPI2C4,
-               PER_CLK_LPI2C5,
-               PER_CLK_LPI2C6,
-               PER_CLK_LPI2C7,
-       };
-
-       if (i2c_num < 4 || i2c_num > 7)
-               return -EINVAL;
-
-       if (enable) {
-               pcc_clock_enable(lpi2c_pcc_clks[i2c_num - 4], false);
-               pcc_clock_sel(lpi2c_pcc_clks[i2c_num - 4], SCG_FIRC_DIV2_CLK);
-               pcc_clock_enable(lpi2c_pcc_clks[i2c_num - 4], true);
-       } else {
-               pcc_clock_enable(lpi2c_pcc_clks[i2c_num - 4], false);
-       }
-       return 0;
-}
-
-u32 imx_get_i2cclk(unsigned i2c_num)
-{
-       const enum pcc_clk lpi2c_pcc_clks[] = {
-               PER_CLK_LPI2C4,
-               PER_CLK_LPI2C5,
-               PER_CLK_LPI2C6,
-               PER_CLK_LPI2C7,
-       };
-
-       if (i2c_num < 4 || i2c_num > 7)
-               return 0;
-
-       return pcc_clock_get_rate(lpi2c_pcc_clks[i2c_num - 4]);
-}
-#endif
-
-unsigned int mxc_get_clock(enum mxc_clock clk)
-{
-       switch (clk) {
-       case MXC_ARM_CLK:
-               return scg_clk_get_rate(SCG_CORE_CLK);
-       case MXC_AXI_CLK:
-               return get_fast_plat_clk();
-       case MXC_AHB_CLK:
-               return get_slow_plat_clk();
-       case MXC_IPG_CLK:
-               return get_ipg_clk();
-       case MXC_I2C_CLK:
-               return pcc_clock_get_rate(PER_CLK_LPI2C4);
-       case MXC_UART_CLK:
-               return get_lpuart_clk();
-       case MXC_ESDHC_CLK:
-               return pcc_clock_get_rate(PER_CLK_USDHC0);
-       case MXC_ESDHC2_CLK:
-               return pcc_clock_get_rate(PER_CLK_USDHC1);
-       case MXC_DDR_CLK:
-               return scg_clk_get_rate(SCG_DDR_CLK);
-       default:
-               printf("Unsupported mxc_clock %d\n", clk);
-               break;
-       }
-
-       return 0;
-}
-
-void init_clk_usdhc(u32 index)
-{
-       switch (index) {
-       case 0:
-               /*Disable the clock before configure it */
-               pcc_clock_enable(PER_CLK_USDHC0, false);
-
-               /* 158MHz / 1 = 158MHz */
-               pcc_clock_sel(PER_CLK_USDHC0, SCG_NIC1_CLK);
-               pcc_clock_div_config(PER_CLK_USDHC0, false, 1);
-               pcc_clock_enable(PER_CLK_USDHC0, true);
-               break;
-       case 1:
-               /*Disable the clock before configure it */
-               pcc_clock_enable(PER_CLK_USDHC1, false);
-
-               /* 158MHz / 1 = 158MHz */
-               pcc_clock_sel(PER_CLK_USDHC1, SCG_NIC1_CLK);
-               pcc_clock_div_config(PER_CLK_USDHC1, false, 1);
-               pcc_clock_enable(PER_CLK_USDHC1, true);
-               break;
-       default:
-               printf("Invalid index for USDHC %d\n", index);
-               break;
-       }
-}
-
-#ifdef CONFIG_MXC_OCOTP
-
-#define OCOTP_CTRL_PCC1_SLOT           (38)
-#define OCOTP_CTRL_HIGH4K_PCC1_SLOT    (39)
-
-void enable_ocotp_clk(unsigned char enable)
-{
-       u32 val;
-
-       /*
-        * Seems the OCOTP CLOCKs have been enabled at default,
-        * check its inuse flag
-        */
-
-       val = readl(PCC1_RBASE + 4 * OCOTP_CTRL_PCC1_SLOT);
-       if (!(val & PCC_INUSE_MASK))
-               writel(PCC_CGC_MASK, (PCC1_RBASE + 4 * OCOTP_CTRL_PCC1_SLOT));
-
-       val = readl(PCC1_RBASE + 4 * OCOTP_CTRL_HIGH4K_PCC1_SLOT);
-       if (!(val & PCC_INUSE_MASK))
-               writel(PCC_CGC_MASK,
-                      (PCC1_RBASE + 4 * OCOTP_CTRL_HIGH4K_PCC1_SLOT));
-}
-#endif
-
-void enable_usboh3_clk(unsigned char enable)
-{
-       if (enable) {
-               pcc_clock_enable(PER_CLK_USB0, false);
-               pcc_clock_sel(PER_CLK_USB0, SCG_NIC1_BUS_CLK);
-               pcc_clock_enable(PER_CLK_USB0, true);
-
-#ifdef CONFIG_USB_MAX_CONTROLLER_COUNT
-               if (CONFIG_USB_MAX_CONTROLLER_COUNT > 1) {
-                       pcc_clock_enable(PER_CLK_USB1, false);
-                       pcc_clock_sel(PER_CLK_USB1, SCG_NIC1_BUS_CLK);
-                       pcc_clock_enable(PER_CLK_USB1, true);
-               }
-#endif
-
-               pcc_clock_enable(PER_CLK_USB_PHY, true);
-               pcc_clock_enable(PER_CLK_USB_PL301, true);
-       } else {
-               pcc_clock_enable(PER_CLK_USB0, false);
-               pcc_clock_enable(PER_CLK_USB1, false);
-               pcc_clock_enable(PER_CLK_USB_PHY, false);
-               pcc_clock_enable(PER_CLK_USB_PL301, false);
-       }
-}
-
-static void lpuart_set_clk(uint32_t index, enum scg_clk clk)
-{
-       const enum pcc_clk lpuart_pcc_clks[] = {
-               PER_CLK_LPUART4,
-               PER_CLK_LPUART5,
-               PER_CLK_LPUART6,
-               PER_CLK_LPUART7,
-       };
-
-       if (index < 4 || index > 7)
-               return;
-
-#ifndef CONFIG_CLK_DEBUG
-       pcc_clock_enable(lpuart_pcc_clks[index - 4], false);
-#endif
-       pcc_clock_sel(lpuart_pcc_clks[index - 4], clk);
-       pcc_clock_enable(lpuart_pcc_clks[index - 4], true);
-}
-
-static void init_clk_lpuart(void)
-{
-       u32 index = 0, i;
-
-       const u32 lpuart_array[] = {
-               LPUART0_RBASE,
-               LPUART1_RBASE,
-               LPUART2_RBASE,
-               LPUART3_RBASE,
-               LPUART4_RBASE,
-               LPUART5_RBASE,
-               LPUART6_RBASE,
-               LPUART7_RBASE,
-       };
-
-       for (i = 0; i < 8; i++) {
-               if (lpuart_array[i] == LPUART_BASE) {
-                       index = i;
-                       break;
-               }
-       }
-
-       lpuart_set_clk(index, SCG_SOSC_DIV2_CLK);
-}
-
-static void init_clk_rgpio2p(void)
-{
-       /*Enable RGPIO2P1 clock */
-       pcc_clock_enable(PER_CLK_RGPIO2P1, true);
-
-       /*
-        * Hard code to enable RGPIO2P0 clock since it is not
-        * in clock frame for A7 domain
-        */
-       writel(PCC_CGC_MASK, (PCC0_RBASE + 0x3C));
-}
-
-/* Configure PLL/PFD freq */
-void clock_init(void)
-{
-       /*
-        * ROM has enabled clocks:
-        * A4 side: SIRC 16Mhz (DIV1-3 off),  FIRC 48Mhz (DIV1-2 on),
-        *          Non-LP-boot:  SOSC, SPLL PFD0 (scs selected)
-        * A7 side:  SPLL PFD0 (scs selected, 413Mhz),
-        *           APLL PFD0 (352Mhz), DDRCLK, all NIC clocks
-        *           A7 Plat0 (NIC0) = 176Mhz, Plat1 (NIC1) = 176Mhz,
-        *           IP BUS (NIC1_BUS) = 58.6Mhz
-        *
-        * In u-boot:
-        * 1. Enable PFD1-3 of APLL for A7 side. Enable FIRC and DIVs.
-        * 2. Enable USB PLL
-        * 3. Init the clocks of peripherals used in u-boot bu
-        *    without set rate interface.The clocks for these
-        *    peripherals are enabled in this intialization.
-        * 4.Other peripherals with set clock rate interface
-        *   does not be set in this function.
-        */
-
-       scg_a7_firc_init();
-
-       scg_a7_soscdiv_init();
-
-       /* APLL PFD1 = 270Mhz, PFD2=480Mhz, PFD3=800Mhz */
-       scg_enable_pll_pfd(SCG_APLL_PFD1_CLK, 35);
-       scg_enable_pll_pfd(SCG_APLL_PFD2_CLK, 20);
-       scg_enable_pll_pfd(SCG_APLL_PFD3_CLK, 12);
-
-       init_clk_lpuart();
-
-       init_clk_rgpio2p();
-
-       enable_usboh3_clk(1);
-}
-
-#ifdef CONFIG_SECURE_BOOT
-void hab_caam_clock_enable(unsigned char enable)
-{
-       if (enable)
-              pcc_clock_enable(PER_CLK_CAAM, true);
-       else
-              pcc_clock_enable(PER_CLK_CAAM, false);
-}
-#endif
-
-/*
- * Dump some core clockes.
- */
-int do_mx7_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       u32 addr = 0;
-       u32 freq;
-       freq = decode_pll(PLL_A7_SPLL);
-       printf("PLL_A7_SPLL    %8d MHz\n", freq / 1000000);
-
-       freq = decode_pll(PLL_A7_APLL);
-       printf("PLL_A7_APLL    %8d MHz\n", freq / 1000000);
-
-       freq = decode_pll(PLL_USB);
-       printf("PLL_USB    %8d MHz\n", freq / 1000000);
-
-       printf("\n");
-
-       printf("CORE       %8d kHz\n", scg_clk_get_rate(SCG_CORE_CLK) / 1000);
-       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
-       printf("UART       %8d kHz\n", mxc_get_clock(MXC_UART_CLK) / 1000);
-       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
-       printf("AXI        %8d kHz\n", mxc_get_clock(MXC_AXI_CLK) / 1000);
-       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
-       printf("USDHC1     %8d kHz\n", mxc_get_clock(MXC_ESDHC_CLK) / 1000);
-       printf("USDHC2     %8d kHz\n", mxc_get_clock(MXC_ESDHC2_CLK) / 1000);
-       printf("I2C4       %8d kHz\n", mxc_get_clock(MXC_I2C_CLK) / 1000);
-
-       addr = (u32) clock_init;
-       printf("[%s] addr = 0x%08X\r\n", __func__, addr);
-       scg_a7_info();
-
-       return 0;
-}
-
-U_BOOT_CMD(
-       clocks, CONFIG_SYS_MAXARGS, 1, do_mx7_showclocks,
-       "display clocks",
-       ""
-);
diff --git a/arch/arm/cpu/armv7/mx7ulp/iomux.c b/arch/arm/cpu/armv7/mx7ulp/iomux.c
deleted file mode 100644 (file)
index 1eba24e..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux.h>
-
-static void *base = (void *)IOMUXC_BASE_ADDR;
-
-/*
- * iomuxc0 base address. In imx7ulp-pins.h,
- * the offsets of pins in iomuxc0 are from 0xD000,
- * so we set the base address to (0x4103D000 - 0xD000 = 0x41030000)
- */
-static void *base_mports = (void *)(AIPS0_BASE + 0x30000);
-
-/*
- * configures a single pad in the iomuxer
- */
-void mx7ulp_iomux_setup_pad(iomux_cfg_t pad)
-{
-       u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
-       u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
-       u32 sel_input_ofs =
-               (pad & MUX_SEL_INPUT_OFS_MASK) >> MUX_SEL_INPUT_OFS_SHIFT;
-       u32 sel_input =
-               (pad & MUX_SEL_INPUT_MASK) >> MUX_SEL_INPUT_SHIFT;
-       u32 pad_ctrl_ofs = mux_ctrl_ofs;
-       u32 pad_ctrl = (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT;
-
-       debug("[PAD CFG] = 0x%16llX \r\n\tmux_ctl = 0x%X(0x%X) sel_input = 0x%X(0x%X) pad_ctrl = 0x%X(0x%X)\r\n",
-             pad, mux_ctrl_ofs, mux_mode, sel_input_ofs, sel_input,
-             pad_ctrl_ofs, pad_ctrl);
-
-       if (mux_mode & IOMUX_CONFIG_MPORTS) {
-               mux_mode &= ~IOMUX_CONFIG_MPORTS;
-               base = base_mports;
-       } else {
-               base = (void *)IOMUXC_BASE_ADDR;
-       }
-
-       __raw_writel(((mux_mode << IOMUXC_PCR_MUX_ALT_SHIFT) &
-                    IOMUXC_PCR_MUX_ALT_MASK), base + mux_ctrl_ofs);
-
-       if (sel_input_ofs)
-               __raw_writel((sel_input << IOMUXC_PSMI_IMUX_ALT_SHIFT),
-                       base + sel_input_ofs);
-
-       if (!(pad_ctrl & NO_PAD_CTRL))
-               __raw_writel(((mux_mode << IOMUXC_PCR_MUX_ALT_SHIFT) &
-                            IOMUXC_PCR_MUX_ALT_MASK) |
-                            (pad_ctrl & (~IOMUXC_PCR_MUX_ALT_MASK)),
-                            base + pad_ctrl_ofs);
-}
-
-/* configures a list of pads within declared with IOMUX_PADS macro */
-void mx7ulp_iomux_setup_multiple_pads(iomux_cfg_t const *pad_list,
-                                     unsigned count)
-{
-       iomux_cfg_t const *p = pad_list;
-       int i;
-
-       for (i = 0; i < count; i++) {
-               mx7ulp_iomux_setup_pad(*p);
-               p++;
-       }
-}
diff --git a/arch/arm/cpu/armv7/mx7ulp/pcc.c b/arch/arm/cpu/armv7/mx7ulp/pcc.c
deleted file mode 100644 (file)
index edd84e5..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <div64.h>
-#include <asm/io.h>
-#include <errno.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/pcc.h>
-#include <asm/arch/sys_proto.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define PCC_CLKSRC_TYPES 2
-#define PCC_CLKSRC_NUM 7
-
-static enum scg_clk pcc_clksrc[PCC_CLKSRC_TYPES][PCC_CLKSRC_NUM] = {
-       {       SCG_NIC1_BUS_CLK,
-               SCG_NIC1_CLK,
-               SCG_DDR_CLK,
-               SCG_APLL_PFD2_CLK,
-               SCG_APLL_PFD1_CLK,
-               SCG_APLL_PFD0_CLK,
-               USB_PLL_OUT,
-       },
-       {       SCG_SOSC_DIV2_CLK,  /* SOSC BUS clock */
-               MIPI_PLL_OUT,
-               SCG_FIRC_DIV2_CLK,  /* FIRC BUS clock */
-               SCG_ROSC_CLK,
-               SCG_NIC1_BUS_CLK,
-               SCG_NIC1_CLK,
-               SCG_APLL_PFD3_CLK,
-       },
-};
-
-static struct pcc_entry pcc_arrays[] = {
-       {PCC2_RBASE, DMA1_PCC2_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, RGPIO1_PCC2_SLOT,          CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, FLEXBUS0_PCC2_SLOT,        CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, SEMA42_1_PCC2_SLOT,        CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, DMA1_CH_MUX0_PCC2_SLOT,    CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, SNVS_PCC2_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, CAAM_PCC2_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, LPTPM4_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPTPM5_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPIT1_PCC2_SLOT,           CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPSPI2_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPSPI3_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPI2C4_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPI2C5_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPUART4_PCC2_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, LPUART5_PCC2_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, FLEXIO1_PCC2_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC2_RBASE, USBOTG0_PCC2_SLOT,         CLKSRC_PER_PLAT, PCC_HAS_DIV},
-       {PCC2_RBASE, USBOTG1_PCC2_SLOT,         CLKSRC_PER_PLAT, PCC_HAS_DIV},
-       {PCC2_RBASE, USBPHY_PCC2_SLOT,          CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, USB_PL301_PCC2_SLOT,       CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC2_RBASE, USDHC0_PCC2_SLOT,          CLKSRC_PER_PLAT, PCC_HAS_DIV},
-       {PCC2_RBASE, USDHC1_PCC2_SLOT,          CLKSRC_PER_PLAT, PCC_HAS_DIV},
-       {PCC2_RBASE, WDG1_PCC2_SLOT,            CLKSRC_PER_BUS, PCC_HAS_DIV},
-       {PCC2_RBASE, WDG2_PCC2_SLOT,            CLKSRC_PER_BUS, PCC_HAS_DIV},
-
-       {PCC3_RBASE, LPTPM6_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC3_RBASE, LPTPM7_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC3_RBASE, LPI2C6_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC3_RBASE, LPI2C7_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC3_RBASE, LPUART6_PCC3_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC3_RBASE, LPUART7_PCC3_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
-       {PCC3_RBASE, VIU0_PCC3_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC3_RBASE, DSI0_PCC3_SLOT,            CLKSRC_PER_BUS, PCC_HAS_DIV},
-       {PCC3_RBASE, LCDIF0_PCC3_SLOT,          CLKSRC_PER_PLAT, PCC_HAS_DIV},
-       {PCC3_RBASE, MMDC0_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC3_RBASE, PORTC_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC3_RBASE, PORTD_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC3_RBASE, PORTE_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC3_RBASE, PORTF_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
-       {PCC3_RBASE, GPU3D_PCC3_SLOT,           CLKSRC_PER_PLAT, PCC_NO_DIV},
-       {PCC3_RBASE, GPU2D_PCC3_SLOT,           CLKSRC_PER_PLAT, PCC_NO_DIV},
-};
-
-int pcc_clock_enable(enum pcc_clk clk, bool enable)
-{
-       u32 reg, val;
-
-       if (clk >= ARRAY_SIZE(pcc_arrays))
-               return -EINVAL;
-
-       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
-
-       val = readl(reg);
-
-       clk_debug("pcc_clock_enable: clk %d, reg 0x%x, val 0x%x, enable %d\n",
-                 clk, reg, val, enable);
-
-       if (!(val & PCC_PR_MASK) || (val & PCC_INUSE_MASK))
-               return -EPERM;
-
-       if (enable)
-               val |= PCC_CGC_MASK;
-       else
-               val &= ~PCC_CGC_MASK;
-
-       writel(val, reg);
-
-       clk_debug("pcc_clock_enable: val 0x%x\n", val);
-
-       return 0;
-}
-
-/* The clock source select needs clock is disabled */
-int pcc_clock_sel(enum pcc_clk clk, enum scg_clk src)
-{
-       u32 reg, val, i, clksrc_type;
-
-       if (clk >= ARRAY_SIZE(pcc_arrays))
-               return -EINVAL;
-
-       clksrc_type = pcc_arrays[clk].clksrc;
-       if (clksrc_type >= CLKSRC_NO_PCS) {
-               printf("No PCS field for the PCC %d, clksrc type %d\n",
-                      clk, clksrc_type);
-               return -EPERM;
-       }
-
-       for (i = 0; i < PCC_CLKSRC_NUM; i++) {
-               if (pcc_clksrc[clksrc_type][i] == src) {
-                       /* Find the clock src, then set it to PCS */
-                       break;
-               }
-       }
-
-       if (i == PCC_CLKSRC_NUM) {
-               printf("Not find the parent scg_clk in PCS of PCC %d, invalid scg_clk %d\n", clk, src);
-               return -EINVAL;
-       }
-
-       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
-
-       val = readl(reg);
-
-       clk_debug("pcc_clock_sel: clk %d, reg 0x%x, val 0x%x, clksrc_type %d\n",
-                 clk, reg, val, clksrc_type);
-
-       if (!(val & PCC_PR_MASK) || (val & PCC_INUSE_MASK) ||
-           (val & PCC_CGC_MASK)) {
-               printf("Not permit to select clock source val = 0x%x\n", val);
-               return -EPERM;
-       }
-
-       val &= ~PCC_PCS_MASK;
-       val |= ((i + 1) << PCC_PCS_OFFSET);
-
-       writel(val, reg);
-
-       clk_debug("pcc_clock_sel: val 0x%x\n", val);
-
-       return 0;
-}
-
-int pcc_clock_div_config(enum pcc_clk clk, bool frac, u8 div)
-{
-       u32 reg, val;
-
-       if (clk >= ARRAY_SIZE(pcc_arrays) || div > 8 ||
-           (div == 1 && frac != 0))
-               return -EINVAL;
-
-       if (pcc_arrays[clk].div >= PCC_NO_DIV) {
-               printf("No DIV/FRAC field for the PCC %d\n", clk);
-               return -EPERM;
-       }
-
-       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
-
-       val = readl(reg);
-
-       if (!(val & PCC_PR_MASK) || (val & PCC_INUSE_MASK) ||
-           (val & PCC_CGC_MASK)) {
-               printf("Not permit to set div/frac val = 0x%x\n", val);
-               return -EPERM;
-       }
-
-       if (frac)
-               val |= PCC_FRAC_MASK;
-       else
-               val &= ~PCC_FRAC_MASK;
-
-       val &= ~PCC_PCD_MASK;
-       val |= (div - 1) & PCC_PCD_MASK;
-
-       writel(val, reg);
-
-       return 0;
-}
-
-bool pcc_clock_is_enable(enum pcc_clk clk)
-{
-       u32 reg, val;
-
-       if (clk >= ARRAY_SIZE(pcc_arrays))
-               return -EINVAL;
-
-       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
-       val = readl(reg);
-
-       if ((val & PCC_INUSE_MASK) || (val & PCC_CGC_MASK))
-               return true;
-
-       return false;
-}
-
-int pcc_clock_get_clksrc(enum pcc_clk clk, enum scg_clk *src)
-{
-       u32 reg, val, clksrc_type;
-
-       if (clk >= ARRAY_SIZE(pcc_arrays))
-               return -EINVAL;
-
-       clksrc_type = pcc_arrays[clk].clksrc;
-       if (clksrc_type >= CLKSRC_NO_PCS) {
-               printf("No PCS field for the PCC %d, clksrc type %d\n",
-                      clk, clksrc_type);
-               return -EPERM;
-       }
-
-       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
-
-       val = readl(reg);
-
-       clk_debug("pcc_clock_get_clksrc: clk %d, reg 0x%x, val 0x%x, type %d\n",
-                 clk, reg, val, clksrc_type);
-
-       if (!(val & PCC_PR_MASK)) {
-               printf("This pcc slot is not present = 0x%x\n", val);
-               return -EPERM;
-       }
-
-       val &= PCC_PCS_MASK;
-       val = (val >> PCC_PCS_OFFSET);
-
-       if (!val) {
-               printf("Clock source is off\n");
-               return -EIO;
-       }
-
-       *src = pcc_clksrc[clksrc_type][val - 1];
-
-       clk_debug("pcc_clock_get_clksrc: parent scg clk %d\n", *src);
-
-       return 0;
-}
-
-u32 pcc_clock_get_rate(enum pcc_clk clk)
-{
-       u32 reg, val, rate, frac, div;
-       enum scg_clk parent;
-       int ret;
-
-       ret = pcc_clock_get_clksrc(clk, &parent);
-       if (ret)
-               return 0;
-
-       rate = scg_clk_get_rate(parent);
-
-       clk_debug("pcc_clock_get_rate: parent rate %u\n", rate);
-
-       if (pcc_arrays[clk].div == PCC_HAS_DIV) {
-               reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
-               val = readl(reg);
-
-               frac = (val & PCC_FRAC_MASK) >> PCC_FRAC_OFFSET;
-               div = (val & PCC_PCD_MASK) >> PCC_PCD_OFFSET;
-
-               /*
-                * Theoretically don't have overflow in the calc,
-                * the rate won't exceed 2G
-                */
-               rate = rate * (frac + 1) / (div + 1);
-       }
-
-       clk_debug("pcc_clock_get_rate: rate %u\n", rate);
-       return rate;
-}
diff --git a/arch/arm/cpu/armv7/mx7ulp/scg.c b/arch/arm/cpu/armv7/mx7ulp/scg.c
deleted file mode 100644 (file)
index c117af0..0000000
+++ /dev/null
@@ -1,1090 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <div64.h>
-#include <asm/io.h>
-#include <errno.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/pcc.h>
-#include <asm/arch/sys_proto.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-scg_p scg1_regs = (scg_p)SCG1_RBASE;
-
-static u32 scg_src_get_rate(enum scg_clk clksrc)
-{
-       u32 reg;
-
-       switch (clksrc) {
-       case SCG_SOSC_CLK:
-               reg = readl(&scg1_regs->sosccsr);
-               if (!(reg & SCG_SOSC_CSR_SOSCVLD_MASK))
-                       return 0;
-
-               return 24000000;
-       case SCG_FIRC_CLK:
-               reg = readl(&scg1_regs->firccsr);
-               if (!(reg & SCG_FIRC_CSR_FIRCVLD_MASK))
-                       return 0;
-
-               return 48000000;
-       case SCG_SIRC_CLK:
-               reg = readl(&scg1_regs->sirccsr);
-               if (!(reg & SCG_SIRC_CSR_SIRCVLD_MASK))
-                       return 0;
-
-               return 16000000;
-       case SCG_ROSC_CLK:
-               reg = readl(&scg1_regs->rtccsr);
-               if (!(reg & SCG_ROSC_CSR_ROSCVLD_MASK))
-                       return 0;
-
-               return 32768;
-       default:
-               break;
-       }
-
-       return 0;
-}
-
-static u32 scg_sircdiv_get_rate(enum scg_clk clk)
-{
-       u32 reg, val, rate;
-       u32 shift, mask;
-
-       switch (clk) {
-       case SCG_SIRC_DIV1_CLK:
-               mask = SCG_SIRCDIV_DIV1_MASK;
-               shift = SCG_SIRCDIV_DIV1_SHIFT;
-               break;
-       case SCG_SIRC_DIV2_CLK:
-               mask = SCG_SIRCDIV_DIV2_MASK;
-               shift = SCG_SIRCDIV_DIV2_SHIFT;
-               break;
-       case SCG_SIRC_DIV3_CLK:
-               mask = SCG_SIRCDIV_DIV3_MASK;
-               shift = SCG_SIRCDIV_DIV3_SHIFT;
-               break;
-       default:
-               return 0;
-       }
-
-       reg = readl(&scg1_regs->sirccsr);
-       if (!(reg & SCG_SIRC_CSR_SIRCVLD_MASK))
-               return 0;
-
-       reg = readl(&scg1_regs->sircdiv);
-       val = (reg & mask) >> shift;
-
-       if (!val) /*clock disabled*/
-               return 0;
-
-       rate = scg_src_get_rate(SCG_SIRC_CLK);
-       rate = rate / (1 << (val - 1));
-
-       return rate;
-}
-
-static u32 scg_fircdiv_get_rate(enum scg_clk clk)
-{
-       u32 reg, val, rate;
-       u32 shift, mask;
-
-       switch (clk) {
-       case SCG_FIRC_DIV1_CLK:
-               mask = SCG_FIRCDIV_DIV1_MASK;
-               shift = SCG_FIRCDIV_DIV1_SHIFT;
-               break;
-       case SCG_FIRC_DIV2_CLK:
-               mask = SCG_FIRCDIV_DIV2_MASK;
-               shift = SCG_FIRCDIV_DIV2_SHIFT;
-               break;
-       case SCG_FIRC_DIV3_CLK:
-               mask = SCG_FIRCDIV_DIV3_MASK;
-               shift = SCG_FIRCDIV_DIV3_SHIFT;
-               break;
-       default:
-               return 0;
-       }
-
-       reg = readl(&scg1_regs->firccsr);
-       if (!(reg & SCG_FIRC_CSR_FIRCVLD_MASK))
-               return 0;
-
-       reg = readl(&scg1_regs->fircdiv);
-       val = (reg & mask) >> shift;
-
-       if (!val) /*clock disabled*/
-               return 0;
-
-       rate = scg_src_get_rate(SCG_FIRC_CLK);
-       rate = rate / (1 << (val - 1));
-
-       return rate;
-}
-
-static u32 scg_soscdiv_get_rate(enum scg_clk clk)
-{
-       u32 reg, val, rate;
-       u32 shift, mask;
-
-       switch (clk) {
-       case SCG_SOSC_DIV1_CLK:
-               mask = SCG_SOSCDIV_DIV1_MASK;
-               shift = SCG_SOSCDIV_DIV1_SHIFT;
-               break;
-       case SCG_SOSC_DIV2_CLK:
-               mask = SCG_SOSCDIV_DIV2_MASK;
-               shift = SCG_SOSCDIV_DIV2_SHIFT;
-               break;
-       case SCG_SOSC_DIV3_CLK:
-               mask = SCG_SOSCDIV_DIV3_MASK;
-               shift = SCG_SOSCDIV_DIV3_SHIFT;
-               break;
-       default:
-               return 0;
-       }
-
-       reg = readl(&scg1_regs->sosccsr);
-       if (!(reg & SCG_SOSC_CSR_SOSCVLD_MASK))
-               return 0;
-
-       reg = readl(&scg1_regs->soscdiv);
-       val = (reg & mask) >> shift;
-
-       if (!val) /*clock disabled*/
-               return 0;
-
-       rate = scg_src_get_rate(SCG_SOSC_CLK);
-       rate = rate / (1 << (val - 1));
-
-       return rate;
-}
-
-static u32 scg_apll_pfd_get_rate(enum scg_clk clk)
-{
-       u32 reg, val, rate;
-       u32 shift, mask, gate, valid;
-
-       switch (clk) {
-       case SCG_APLL_PFD0_CLK:
-               gate = SCG_PLL_PFD0_GATE_MASK;
-               valid = SCG_PLL_PFD0_VALID_MASK;
-               mask = SCG_PLL_PFD0_FRAC_MASK;
-               shift = SCG_PLL_PFD0_FRAC_SHIFT;
-               break;
-       case SCG_APLL_PFD1_CLK:
-               gate = SCG_PLL_PFD1_GATE_MASK;
-               valid = SCG_PLL_PFD1_VALID_MASK;
-               mask = SCG_PLL_PFD1_FRAC_MASK;
-               shift = SCG_PLL_PFD1_FRAC_SHIFT;
-               break;
-       case SCG_APLL_PFD2_CLK:
-               gate = SCG_PLL_PFD2_GATE_MASK;
-               valid = SCG_PLL_PFD2_VALID_MASK;
-               mask = SCG_PLL_PFD2_FRAC_MASK;
-               shift = SCG_PLL_PFD2_FRAC_SHIFT;
-               break;
-       case SCG_APLL_PFD3_CLK:
-               gate = SCG_PLL_PFD3_GATE_MASK;
-               valid = SCG_PLL_PFD3_VALID_MASK;
-               mask = SCG_PLL_PFD3_FRAC_MASK;
-               shift = SCG_PLL_PFD3_FRAC_SHIFT;
-               break;
-       default:
-               return 0;
-       }
-
-       reg = readl(&scg1_regs->apllpfd);
-       if (reg & gate || !(reg & valid))
-               return 0;
-
-       clk_debug("scg_apll_pfd_get_rate reg 0x%x\n", reg);
-
-       val = (reg & mask) >> shift;
-       rate = decode_pll(PLL_A7_APLL);
-
-       rate = rate / val * 18;
-
-       clk_debug("scg_apll_pfd_get_rate rate %u\n", rate);
-
-       return rate;
-}
-
-static u32 scg_spll_pfd_get_rate(enum scg_clk clk)
-{
-       u32 reg, val, rate;
-       u32 shift, mask, gate, valid;
-
-       switch (clk) {
-       case SCG_SPLL_PFD0_CLK:
-               gate = SCG_PLL_PFD0_GATE_MASK;
-               valid = SCG_PLL_PFD0_VALID_MASK;
-               mask = SCG_PLL_PFD0_FRAC_MASK;
-               shift = SCG_PLL_PFD0_FRAC_SHIFT;
-               break;
-       case SCG_SPLL_PFD1_CLK:
-               gate = SCG_PLL_PFD1_GATE_MASK;
-               valid = SCG_PLL_PFD1_VALID_MASK;
-               mask = SCG_PLL_PFD1_FRAC_MASK;
-               shift = SCG_PLL_PFD1_FRAC_SHIFT;
-               break;
-       case SCG_SPLL_PFD2_CLK:
-               gate = SCG_PLL_PFD2_GATE_MASK;
-               valid = SCG_PLL_PFD2_VALID_MASK;
-               mask = SCG_PLL_PFD2_FRAC_MASK;
-               shift = SCG_PLL_PFD2_FRAC_SHIFT;
-               break;
-       case SCG_SPLL_PFD3_CLK:
-               gate = SCG_PLL_PFD3_GATE_MASK;
-               valid = SCG_PLL_PFD3_VALID_MASK;
-               mask = SCG_PLL_PFD3_FRAC_MASK;
-               shift = SCG_PLL_PFD3_FRAC_SHIFT;
-               break;
-       default:
-               return 0;
-       }
-
-       reg = readl(&scg1_regs->spllpfd);
-       if (reg & gate || !(reg & valid))
-               return 0;
-
-       clk_debug("scg_spll_pfd_get_rate reg 0x%x\n", reg);
-
-       val = (reg & mask) >> shift;
-       rate = decode_pll(PLL_A7_SPLL);
-
-       rate = rate / val * 18;
-
-       clk_debug("scg_spll_pfd_get_rate rate %u\n", rate);
-
-       return rate;
-}
-
-static u32 scg_apll_get_rate(void)
-{
-       u32 reg, val, rate;
-
-       reg = readl(&scg1_regs->apllcfg);
-       val = (reg & SCG_PLL_CFG_PLLSEL_MASK) >> SCG_PLL_CFG_PLLSEL_SHIFT;
-
-       if (!val) {
-               /* APLL clock after two dividers */
-               rate = decode_pll(PLL_A7_APLL);
-
-               val = (reg & SCG_PLL_CFG_POSTDIV1_MASK) >>
-                       SCG_PLL_CFG_POSTDIV1_SHIFT;
-               rate = rate / (val + 1);
-
-               val = (reg & SCG_PLL_CFG_POSTDIV2_MASK) >>
-                       SCG_PLL_CFG_POSTDIV2_SHIFT;
-               rate = rate / (val + 1);
-       } else {
-               /* APLL PFD clock */
-               val = (reg & SCG_PLL_CFG_PFDSEL_MASK) >>
-                       SCG_PLL_CFG_PFDSEL_SHIFT;
-               rate = scg_apll_pfd_get_rate(SCG_APLL_PFD0_CLK + val);
-       }
-
-       return rate;
-}
-
-static u32 scg_spll_get_rate(void)
-{
-       u32 reg, val, rate;
-
-       reg = readl(&scg1_regs->spllcfg);
-       val = (reg & SCG_PLL_CFG_PLLSEL_MASK) >> SCG_PLL_CFG_PLLSEL_SHIFT;
-
-       clk_debug("scg_spll_get_rate reg 0x%x\n", reg);
-
-       if (!val) {
-               /* APLL clock after two dividers */
-               rate = decode_pll(PLL_A7_SPLL);
-
-               val = (reg & SCG_PLL_CFG_POSTDIV1_MASK) >>
-                       SCG_PLL_CFG_POSTDIV1_SHIFT;
-               rate = rate / (val + 1);
-
-               val = (reg & SCG_PLL_CFG_POSTDIV2_MASK) >>
-                       SCG_PLL_CFG_POSTDIV2_SHIFT;
-               rate = rate / (val + 1);
-
-               clk_debug("scg_spll_get_rate SPLL %u\n", rate);
-
-       } else {
-               /* APLL PFD clock */
-               val = (reg & SCG_PLL_CFG_PFDSEL_MASK) >>
-                       SCG_PLL_CFG_PFDSEL_SHIFT;
-               rate = scg_spll_pfd_get_rate(SCG_SPLL_PFD0_CLK + val);
-
-               clk_debug("scg_spll_get_rate PFD %u\n", rate);
-       }
-
-       return rate;
-}
-
-static u32 scg_ddr_get_rate(void)
-{
-       u32 reg, val, rate, div;
-
-       reg = readl(&scg1_regs->ddrccr);
-       val = (reg & SCG_DDRCCR_DDRCS_MASK) >> SCG_DDRCCR_DDRCS_SHIFT;
-       div = (reg & SCG_DDRCCR_DDRDIV_MASK) >> SCG_DDRCCR_DDRDIV_SHIFT;
-
-       if (!div)
-               return 0;
-
-       if (!val) {
-               reg = readl(&scg1_regs->apllcfg);
-               val = (reg & SCG_PLL_CFG_PFDSEL_MASK) >>
-                       SCG_PLL_CFG_PFDSEL_SHIFT;
-               rate = scg_apll_pfd_get_rate(SCG_APLL_PFD0_CLK + val);
-       } else {
-               rate = decode_pll(PLL_USB);
-       }
-
-       rate = rate / (1 << (div - 1));
-       return rate;
-}
-
-static u32 scg_nic_get_rate(enum scg_clk clk)
-{
-       u32 reg, val, rate;
-       u32 shift, mask;
-
-       reg = readl(&scg1_regs->niccsr);
-       val = (reg & SCG_NICCSR_NICCS_MASK) >> SCG_NICCSR_NICCS_SHIFT;
-
-       clk_debug("scg_nic_get_rate niccsr 0x%x\n", reg);
-
-       if (!val)
-               rate = scg_src_get_rate(SCG_FIRC_CLK);
-       else
-               rate = scg_ddr_get_rate();
-
-       clk_debug("scg_nic_get_rate parent rate %u\n", rate);
-
-       val = (reg & SCG_NICCSR_NIC0DIV_MASK) >> SCG_NICCSR_NIC0DIV_SHIFT;
-
-       rate = rate / (val + 1);
-
-       clk_debug("scg_nic_get_rate NIC0 rate %u\n", rate);
-
-       switch (clk) {
-       case SCG_NIC0_CLK:
-               return rate;
-       case SCG_GPU_CLK:
-               mask = SCG_NICCSR_GPUDIV_MASK;
-               shift = SCG_NICCSR_GPUDIV_SHIFT;
-               break;
-       case SCG_NIC1_EXT_CLK:
-       case SCG_NIC1_BUS_CLK:
-       case SCG_NIC1_CLK:
-               mask = SCG_NICCSR_NIC1DIV_MASK;
-               shift = SCG_NICCSR_NIC1DIV_SHIFT;
-               break;
-       default:
-               return 0;
-       }
-
-       val = (reg & mask) >> shift;
-       rate = rate / (val + 1);
-
-       clk_debug("scg_nic_get_rate NIC1 rate %u\n", rate);
-
-       switch (clk) {
-       case SCG_GPU_CLK:
-       case SCG_NIC1_CLK:
-               return rate;
-       case SCG_NIC1_EXT_CLK:
-               mask = SCG_NICCSR_NIC1EXTDIV_MASK;
-               shift = SCG_NICCSR_NIC1EXTDIV_SHIFT;
-               break;
-       case SCG_NIC1_BUS_CLK:
-               mask = SCG_NICCSR_NIC1BUSDIV_MASK;
-               shift = SCG_NICCSR_NIC1BUSDIV_SHIFT;
-               break;
-       default:
-               return 0;
-       }
-
-       val = (reg & mask) >> shift;
-       rate = rate / (val + 1);
-
-       clk_debug("scg_nic_get_rate NIC1 bus rate %u\n", rate);
-       return rate;
-}
-
-
-static enum scg_clk scg_scs_array[4] = {
-       SCG_SOSC_CLK, SCG_SIRC_CLK, SCG_FIRC_CLK, SCG_ROSC_CLK,
-};
-
-static u32 scg_sys_get_rate(enum scg_clk clk)
-{
-       u32 reg, val, rate;
-
-       if (clk != SCG_CORE_CLK && clk != SCG_BUS_CLK)
-               return 0;
-
-       reg = readl(&scg1_regs->csr);
-       val = (reg & SCG_CCR_SCS_MASK) >> SCG_CCR_SCS_SHIFT;
-
-       clk_debug("scg_sys_get_rate reg 0x%x\n", reg);
-
-       switch (val) {
-       case SCG_SCS_SYS_OSC:
-       case SCG_SCS_SLOW_IRC:
-       case SCG_SCS_FAST_IRC:
-       case SCG_SCS_RTC_OSC:
-               rate = scg_src_get_rate(scg_scs_array[val]);
-               break;
-       case 5:
-               rate = scg_apll_get_rate();
-               break;
-       case 6:
-               rate = scg_spll_get_rate();
-               break;
-       default:
-               return 0;
-       }
-
-       clk_debug("scg_sys_get_rate parent rate %u\n", rate);
-
-       val = (reg & SCG_CCR_DIVCORE_MASK) >> SCG_CCR_DIVCORE_SHIFT;
-
-       rate = rate / (val + 1);
-
-       if (clk == SCG_BUS_CLK) {
-               val = (reg & SCG_CCR_DIVBUS_MASK) >> SCG_CCR_DIVBUS_SHIFT;
-               rate = rate / (val + 1);
-       }
-
-       return rate;
-}
-
-u32 decode_pll(enum pll_clocks pll)
-{
-       u32 reg,  pre_div, infreq, mult;
-       u32 num, denom;
-
-       /*
-        * Alought there are four choices for the bypass src,
-        * we choose OSC_24M which is the default set in ROM.
-        */
-       switch (pll) {
-       case PLL_A7_SPLL:
-               reg = readl(&scg1_regs->spllcsr);
-
-               if (!(reg & SCG_SPLL_CSR_SPLLVLD_MASK))
-                       return 0;
-
-               reg = readl(&scg1_regs->spllcfg);
-
-               pre_div = (reg & SCG_PLL_CFG_PREDIV_MASK) >>
-                          SCG_PLL_CFG_PREDIV_SHIFT;
-               pre_div += 1;
-
-               mult = (reg & SCG1_SPLL_CFG_MULT_MASK) >>
-                          SCG_PLL_CFG_MULT_SHIFT;
-
-               infreq = (reg & SCG_PLL_CFG_CLKSRC_MASK) >>
-                          SCG_PLL_CFG_CLKSRC_SHIFT;
-               if (!infreq)
-                       infreq = scg_src_get_rate(SCG_SOSC_CLK);
-               else
-                       infreq = scg_src_get_rate(SCG_FIRC_CLK);
-
-               num = readl(&scg1_regs->spllnum);
-               denom = readl(&scg1_regs->splldenom);
-
-               infreq = infreq / pre_div;
-
-               return infreq * mult + infreq * num / denom;
-
-       case PLL_A7_APLL:
-               reg = readl(&scg1_regs->apllcsr);
-
-               if (!(reg & SCG_APLL_CSR_APLLVLD_MASK))
-                       return 0;
-
-               reg = readl(&scg1_regs->apllcfg);
-
-               pre_div = (reg & SCG_PLL_CFG_PREDIV_MASK) >>
-                          SCG_PLL_CFG_PREDIV_SHIFT;
-               pre_div += 1;
-
-               mult = (reg & SCG_APLL_CFG_MULT_MASK) >>
-                          SCG_PLL_CFG_MULT_SHIFT;
-
-               infreq = (reg & SCG_PLL_CFG_CLKSRC_MASK) >>
-                          SCG_PLL_CFG_CLKSRC_SHIFT;
-               if (!infreq)
-                       infreq = scg_src_get_rate(SCG_SOSC_CLK);
-               else
-                       infreq = scg_src_get_rate(SCG_FIRC_CLK);
-
-               num = readl(&scg1_regs->apllnum);
-               denom = readl(&scg1_regs->aplldenom);
-
-               infreq = infreq / pre_div;
-
-               return infreq * mult + infreq * num / denom;
-
-       case PLL_USB:
-               reg = readl(&scg1_regs->upllcsr);
-
-               if (!(reg & SCG_UPLL_CSR_UPLLVLD_MASK))
-                       return 0;
-
-               return 480000000u;
-
-       case PLL_MIPI:
-               return 480000000u;
-       default:
-               printf("Unsupported pll clocks %d\n", pll);
-               break;
-       }
-
-       return 0;
-}
-
-u32 scg_clk_get_rate(enum scg_clk clk)
-{
-       switch (clk) {
-       case SCG_SIRC_DIV1_CLK:
-       case SCG_SIRC_DIV2_CLK:
-       case SCG_SIRC_DIV3_CLK:
-               return scg_sircdiv_get_rate(clk);
-
-       case SCG_FIRC_DIV1_CLK:
-       case SCG_FIRC_DIV2_CLK:
-       case SCG_FIRC_DIV3_CLK:
-               return scg_fircdiv_get_rate(clk);
-
-       case SCG_SOSC_DIV1_CLK:
-       case SCG_SOSC_DIV2_CLK:
-       case SCG_SOSC_DIV3_CLK:
-               return scg_soscdiv_get_rate(clk);
-
-       case SCG_CORE_CLK:
-       case SCG_BUS_CLK:
-               return scg_sys_get_rate(clk);
-
-       case SCG_SPLL_PFD0_CLK:
-       case SCG_SPLL_PFD1_CLK:
-       case SCG_SPLL_PFD2_CLK:
-       case SCG_SPLL_PFD3_CLK:
-               return scg_spll_pfd_get_rate(clk);
-
-       case SCG_APLL_PFD0_CLK:
-       case SCG_APLL_PFD1_CLK:
-       case SCG_APLL_PFD2_CLK:
-       case SCG_APLL_PFD3_CLK:
-               return scg_apll_pfd_get_rate(clk);
-
-       case SCG_DDR_CLK:
-               return scg_ddr_get_rate();
-
-       case SCG_NIC0_CLK:
-       case SCG_GPU_CLK:
-       case SCG_NIC1_CLK:
-       case SCG_NIC1_BUS_CLK:
-       case SCG_NIC1_EXT_CLK:
-               return scg_nic_get_rate(clk);
-
-       case USB_PLL_OUT:
-               return decode_pll(PLL_USB);
-
-       case MIPI_PLL_OUT:
-               return decode_pll(PLL_MIPI);
-
-       case SCG_SOSC_CLK:
-       case SCG_FIRC_CLK:
-       case SCG_SIRC_CLK:
-       case SCG_ROSC_CLK:
-               return scg_src_get_rate(clk);
-       default:
-               return 0;
-       }
-}
-
-int scg_enable_pll_pfd(enum scg_clk clk, u32 frac)
-{
-       u32 reg;
-       u32 shift, mask, gate, valid;
-       u32 addr;
-
-       if (frac < 12 || frac > 35)
-               return -EINVAL;
-
-       switch (clk) {
-       case SCG_SPLL_PFD0_CLK:
-       case SCG_APLL_PFD0_CLK:
-               gate = SCG_PLL_PFD0_GATE_MASK;
-               valid = SCG_PLL_PFD0_VALID_MASK;
-               mask = SCG_PLL_PFD0_FRAC_MASK;
-               shift = SCG_PLL_PFD0_FRAC_SHIFT;
-
-               if (clk == SCG_SPLL_PFD0_CLK)
-                       addr = (u32)(&scg1_regs->spllpfd);
-               else
-                       addr = (u32)(&scg1_regs->apllpfd);
-               break;
-       case SCG_SPLL_PFD1_CLK:
-       case SCG_APLL_PFD1_CLK:
-               gate = SCG_PLL_PFD1_GATE_MASK;
-               valid = SCG_PLL_PFD1_VALID_MASK;
-               mask = SCG_PLL_PFD1_FRAC_MASK;
-               shift = SCG_PLL_PFD1_FRAC_SHIFT;
-
-               if (clk == SCG_SPLL_PFD1_CLK)
-                       addr = (u32)(&scg1_regs->spllpfd);
-               else
-                       addr = (u32)(&scg1_regs->apllpfd);
-               break;
-       case SCG_SPLL_PFD2_CLK:
-       case SCG_APLL_PFD2_CLK:
-               gate = SCG_PLL_PFD2_GATE_MASK;
-               valid = SCG_PLL_PFD2_VALID_MASK;
-               mask = SCG_PLL_PFD2_FRAC_MASK;
-               shift = SCG_PLL_PFD2_FRAC_SHIFT;
-
-               if (clk == SCG_SPLL_PFD2_CLK)
-                       addr = (u32)(&scg1_regs->spllpfd);
-               else
-                       addr = (u32)(&scg1_regs->apllpfd);
-               break;
-       case SCG_SPLL_PFD3_CLK:
-       case SCG_APLL_PFD3_CLK:
-               gate = SCG_PLL_PFD3_GATE_MASK;
-               valid = SCG_PLL_PFD3_VALID_MASK;
-               mask = SCG_PLL_PFD3_FRAC_MASK;
-               shift = SCG_PLL_PFD3_FRAC_SHIFT;
-
-               if (clk == SCG_SPLL_PFD3_CLK)
-                       addr = (u32)(&scg1_regs->spllpfd);
-               else
-                       addr = (u32)(&scg1_regs->apllpfd);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       /* Gate the PFD */
-       reg = readl(addr);
-       reg |= gate;
-       writel(reg, addr);
-
-       /* Write Frac divider */
-       reg &= ~mask;
-       reg |= (frac << shift) & mask;
-       writel(reg, addr);
-
-       /*
-        * Un-gate the PFD
-        * (Need un-gate before checking valid, not align with RM)
-        */
-       reg &= ~gate;
-       writel(reg, addr);
-
-       /* Wait for PFD clock being valid */
-       do {
-               reg = readl(addr);
-       } while (!(reg & valid));
-
-       return 0;
-}
-
-#define SIM_MISC_CTRL0_USB_PLL_EN_MASK (0x1 << 2)
-int scg_enable_usb_pll(bool usb_control)
-{
-       u32 sosc_rate;
-       s32 timeout = 1000000;
-       u32 reg;
-
-       struct usbphy_regs *usbphy =
-               (struct usbphy_regs *)USBPHY_RBASE;
-
-       sosc_rate = scg_src_get_rate(SCG_SOSC_CLK);
-       if (!sosc_rate)
-               return -EPERM;
-
-       reg = readl(SIM0_RBASE + 0x3C);
-       if (usb_control)
-               reg &= ~SIM_MISC_CTRL0_USB_PLL_EN_MASK;
-       else
-               reg |= SIM_MISC_CTRL0_USB_PLL_EN_MASK;
-       writel(reg, SIM0_RBASE + 0x3C);
-
-       if (!(readl(&usbphy->usb1_pll_480_ctrl) & PLL_USB_LOCK_MASK)) {
-               writel(0x1c00000, &usbphy->usb1_pll_480_ctrl_clr);
-
-               switch (sosc_rate) {
-               case 24000000:
-                       writel(0xc00000, &usbphy->usb1_pll_480_ctrl_set);
-                       break;
-
-               case 30000000:
-                       writel(0x800000, &usbphy->usb1_pll_480_ctrl_set);
-                       break;
-
-               case 19200000:
-                       writel(0x1400000, &usbphy->usb1_pll_480_ctrl_set);
-                       break;
-
-               default:
-                       writel(0xc00000, &usbphy->usb1_pll_480_ctrl_set);
-                       break;
-               }
-
-               /* Enable the regulator first */
-               writel(PLL_USB_REG_ENABLE_MASK,
-                      &usbphy->usb1_pll_480_ctrl_set);
-
-               /* Wait at least 15us */
-               udelay(15);
-
-               /* Enable the power */
-               writel(PLL_USB_PWR_MASK, &usbphy->usb1_pll_480_ctrl_set);
-
-               /* Wait lock */
-               while (timeout--) {
-                       if (readl(&usbphy->usb1_pll_480_ctrl) &
-                           PLL_USB_LOCK_MASK)
-                               break;
-               }
-
-               if (timeout <= 0) {
-                       /* If timeout, we power down the pll */
-                       writel(PLL_USB_PWR_MASK,
-                              &usbphy->usb1_pll_480_ctrl_clr);
-                       return -ETIME;
-               }
-       }
-
-       /* Clear the bypass */
-       writel(PLL_USB_BYPASS_MASK, &usbphy->usb1_pll_480_ctrl_clr);
-
-       /* Enable the PLL clock out to USB */
-       writel((PLL_USB_EN_USB_CLKS_MASK | PLL_USB_ENABLE_MASK),
-              &usbphy->usb1_pll_480_ctrl_set);
-
-       if (!usb_control) {
-               while (timeout--) {
-                       if (readl(&scg1_regs->upllcsr) &
-                           SCG_UPLL_CSR_UPLLVLD_MASK)
-                               break;
-               }
-
-               if (timeout <= 0) {
-                       reg = readl(SIM0_RBASE + 0x3C);
-                       reg &= ~SIM_MISC_CTRL0_USB_PLL_EN_MASK;
-                       writel(reg, SIM0_RBASE + 0x3C);
-                       return -ETIME;
-               }
-       }
-
-       return 0;
-}
-
-
-/* A7 domain system clock source is SPLL */
-#define SCG1_RCCR_SCS_NUM      ((SCG_SCS_SYS_PLL) << SCG_CCR_SCS_SHIFT)
-
-/* A7 Core clck = SPLL PFD0 / 1 = 500MHz / 1 = 500MHz */
-#define SCG1_RCCR_DIVCORE_NUM  ((0x0)  << SCG_CCR_DIVCORE_SHIFT)
-#define SCG1_RCCR_CFG_MASK     (SCG_CCR_SCS_MASK | SCG_CCR_DIVBUS_MASK)
-
-/* A7 Plat clck = A7 Core Clock / 2 = 250MHz / 1 = 250MHz */
-#define SCG1_RCCR_DIVBUS_NUM   ((0x1)  << SCG_CCR_DIVBUS_SHIFT)
-#define SCG1_RCCR_CFG_NUM      (SCG1_RCCR_SCS_NUM | SCG1_RCCR_DIVBUS_NUM)
-
-void scg_a7_rccr_init(void)
-{
-       u32 rccr_reg_val = 0;
-
-       rccr_reg_val = readl(&scg1_regs->rccr);
-
-       rccr_reg_val &= (~SCG1_RCCR_CFG_MASK);
-       rccr_reg_val |= (SCG1_RCCR_CFG_NUM);
-
-       writel(rccr_reg_val, &scg1_regs->rccr);
-}
-
-/* POSTDIV2 = 1 */
-#define SCG1_SPLL_CFG_POSTDIV2_NUM     ((0x0)  << SCG_PLL_CFG_POSTDIV2_SHIFT)
-/* POSTDIV1 = 1 */
-#define SCG1_SPLL_CFG_POSTDIV1_NUM     ((0x0)  << SCG_PLL_CFG_POSTDIV1_SHIFT)
-
-/* MULT = 22 */
-#define SCG1_SPLL_CFG_MULT_NUM         ((22)   << SCG_PLL_CFG_MULT_SHIFT)
-
-/* PFD0 output clock selected */
-#define SCG1_SPLL_CFG_PFDSEL_NUM       ((0) << SCG_PLL_CFG_PFDSEL_SHIFT)
-/* PREDIV = 1 */
-#define SCG1_SPLL_CFG_PREDIV_NUM       ((0x0)  << SCG_PLL_CFG_PREDIV_SHIFT)
-/* SPLL output clocks (including PFD outputs) selected */
-#define SCG1_SPLL_CFG_BYPASS_NUM       ((0x0)  << SCG_PLL_CFG_BYPASS_SHIFT)
-/* SPLL PFD output clock selected */
-#define SCG1_SPLL_CFG_PLLSEL_NUM       ((0x1)  << SCG_PLL_CFG_PLLSEL_SHIFT)
-/* Clock source is System OSC */
-#define SCG1_SPLL_CFG_CLKSRC_NUM       ((0x0)  << SCG_PLL_CFG_CLKSRC_SHIFT)
-#define SCG1_SPLL_CFG_NUM_24M_OSC      (SCG1_SPLL_CFG_POSTDIV2_NUM     | \
-                                        SCG1_SPLL_CFG_POSTDIV1_NUM     | \
-                                        (22 << SCG_PLL_CFG_MULT_SHIFT) | \
-                                        SCG1_SPLL_CFG_PFDSEL_NUM       | \
-                                        SCG1_SPLL_CFG_PREDIV_NUM       | \
-                                        SCG1_SPLL_CFG_BYPASS_NUM       | \
-                                        SCG1_SPLL_CFG_PLLSEL_NUM       | \
-                                        SCG1_SPLL_CFG_CLKSRC_NUM)
-/*413Mhz = A7 SPLL(528MHz) * 18/23 */
-#define SCG1_SPLL_PFD0_FRAC_NUM                ((23) << SCG_PLL_PFD0_FRAC_SHIFT)
-
-void scg_a7_spll_init(void)
-{
-       u32 val = 0;
-
-       /* Disable A7 System PLL */
-       val = readl(&scg1_regs->spllcsr);
-       val &= ~SCG_SPLL_CSR_SPLLEN_MASK;
-       writel(val, &scg1_regs->spllcsr);
-
-       /*
-        * Per block guide,
-        * "When changing PFD values, it is recommneded PFDx clock
-        * gets gated first by writing a value of 1 to PFDx_CLKGATE register,
-        * then program the new PFD value, then poll the PFDx_VALID
-        * flag to set before writing a value of 0 to PFDx_CLKGATE
-        * to ungate the PFDx clock and allow PFDx clock to run"
-        */
-
-       /* Gate off A7 SPLL PFD0 ~ PDF4  */
-       val = readl(&scg1_regs->spllpfd);
-       val |= (SCG_PLL_PFD3_GATE_MASK |
-                       SCG_PLL_PFD2_GATE_MASK |
-                       SCG_PLL_PFD1_GATE_MASK |
-                       SCG_PLL_PFD0_GATE_MASK);
-       writel(val, &scg1_regs->spllpfd);
-
-       /* ================ A7 SPLL Configuration Start ============== */
-
-       /* Configure A7 System PLL */
-       writel(SCG1_SPLL_CFG_NUM_24M_OSC, &scg1_regs->spllcfg);
-
-       /* Enable A7 System PLL */
-       val = readl(&scg1_regs->spllcsr);
-       val |= SCG_SPLL_CSR_SPLLEN_MASK;
-       writel(val, &scg1_regs->spllcsr);
-
-       /* Wait for A7 SPLL clock ready */
-       while (!(readl(&scg1_regs->spllcsr) & SCG_SPLL_CSR_SPLLVLD_MASK))
-               ;
-
-       /* Configure A7 SPLL PFD0 */
-       val = readl(&scg1_regs->spllpfd);
-       val &= ~SCG_PLL_PFD0_FRAC_MASK;
-       val |= SCG1_SPLL_PFD0_FRAC_NUM;
-       writel(val, &scg1_regs->spllpfd);
-
-       /* Un-gate A7 SPLL PFD0 */
-       val = readl(&scg1_regs->spllpfd);
-       val &= ~SCG_PLL_PFD0_GATE_MASK;
-       writel(val, &scg1_regs->spllpfd);
-
-       /* Wait for A7 SPLL PFD0 clock being valid */
-       while (!(readl(&scg1_regs->spllpfd) & SCG_PLL_PFD0_VALID_MASK))
-               ;
-
-       /* ================ A7 SPLL Configuration End ============== */
-}
-
-/* DDR clock source is APLL PFD0 (396MHz) */
-#define SCG1_DDRCCR_DDRCS_NUM          ((0x0) << SCG_DDRCCR_DDRCS_SHIFT)
-/* DDR clock = APLL PFD0 / 1 = 396MHz / 1 = 396MHz */
-#define SCG1_DDRCCR_DDRDIV_NUM         ((0x1) << SCG_DDRCCR_DDRDIV_SHIFT)
-/* DDR clock = APLL PFD0 / 2 = 396MHz / 2 = 198MHz */
-#define SCG1_DDRCCR_DDRDIV_LF_NUM      ((0x2) << SCG_DDRCCR_DDRDIV_SHIFT)
-#define SCG1_DDRCCR_CFG_NUM            (SCG1_DDRCCR_DDRCS_NUM  | \
-                                        SCG1_DDRCCR_DDRDIV_NUM)
-#define SCG1_DDRCCR_CFG_LF_NUM         (SCG1_DDRCCR_DDRCS_NUM  | \
-                                        SCG1_DDRCCR_DDRDIV_LF_NUM)
-void scg_a7_ddrclk_init(void)
-{
-       writel(SCG1_DDRCCR_CFG_NUM, &scg1_regs->ddrccr);
-}
-
-/* SCG1(A7) APLLCFG configurations */
-/* divide by 1 <<28 */
-#define SCG1_APLL_CFG_POSTDIV2_NUM      ((0x0) << SCG_PLL_CFG_POSTDIV2_SHIFT)
-/* divide by 1 <<24 */
-#define SCG1_APLL_CFG_POSTDIV1_NUM      ((0x0) << SCG_PLL_CFG_POSTDIV1_SHIFT)
-/* MULT is 22  <<16 */
-#define SCG1_APLL_CFG_MULT_NUM          ((22)  << SCG_PLL_CFG_MULT_SHIFT)
-/* PFD0 output clock selected  <<14 */
-#define SCG1_APLL_CFG_PFDSEL_NUM        ((0) << SCG_PLL_CFG_PFDSEL_SHIFT)
-/* PREDIV = 1  <<8 */
-#define SCG1_APLL_CFG_PREDIV_NUM        ((0x0) << SCG_PLL_CFG_PREDIV_SHIFT)
-/* APLL output clocks (including PFD outputs) selected <<2 */
-#define SCG1_APLL_CFG_BYPASS_NUM        ((0x0) << SCG_PLL_CFG_BYPASS_SHIFT)
-/* APLL PFD output clock selected <<1 */
-#define SCG1_APLL_CFG_PLLSEL_NUM        ((0x0) << SCG_PLL_CFG_PLLSEL_SHIFT)
-/* Clock source is System OSC <<0 */
-#define SCG1_APLL_CFG_CLKSRC_NUM        ((0x0) << SCG_PLL_CFG_CLKSRC_SHIFT)
-
-/*
- * A7 APLL = 24MHz / 1 * 22 / 1 / 1 = 528MHz,
- * system PLL is sourced from APLL,
- * APLL clock source is system OSC (24MHz)
- */
-#define SCG1_APLL_CFG_NUM_24M_OSC (SCG1_APLL_CFG_POSTDIV2_NUM     |   \
-                                  SCG1_APLL_CFG_POSTDIV1_NUM     |   \
-                                  (22 << SCG_PLL_CFG_MULT_SHIFT) |   \
-                                  SCG1_APLL_CFG_PFDSEL_NUM       |   \
-                                  SCG1_APLL_CFG_PREDIV_NUM       |   \
-                                  SCG1_APLL_CFG_BYPASS_NUM       |   \
-                                  SCG1_APLL_CFG_PLLSEL_NUM       |   \
-                                  SCG1_APLL_CFG_CLKSRC_NUM)
-
-/* PFD0 Freq = A7 APLL(528MHz) * 18 / 27 = 352MHz */
-#define SCG1_APLL_PFD0_FRAC_NUM (27)
-
-
-void scg_a7_apll_init(void)
-{
-       u32 val = 0;
-
-       /* Disable A7 Auxiliary PLL */
-       val = readl(&scg1_regs->apllcsr);
-       val &= ~SCG_APLL_CSR_APLLEN_MASK;
-       writel(val, &scg1_regs->apllcsr);
-
-       /* Gate off A7 APLL PFD0 ~ PDF4  */
-       val = readl(&scg1_regs->apllpfd);
-       val |= 0x80808080;
-       writel(val, &scg1_regs->apllpfd);
-
-       /* ================ A7 APLL Configuration Start ============== */
-       /* Configure A7 Auxiliary PLL */
-       writel(SCG1_APLL_CFG_NUM_24M_OSC, &scg1_regs->apllcfg);
-
-       /* Enable A7 Auxiliary PLL */
-       val = readl(&scg1_regs->apllcsr);
-       val |= SCG_APLL_CSR_APLLEN_MASK;
-       writel(val, &scg1_regs->apllcsr);
-
-       /* Wait for A7 APLL clock ready */
-       while (!(readl(&scg1_regs->apllcsr) & SCG_APLL_CSR_APLLVLD_MASK))
-               ;
-
-       /* Configure A7 APLL PFD0 */
-       val = readl(&scg1_regs->apllpfd);
-       val &= ~SCG_PLL_PFD0_FRAC_MASK;
-       val |= SCG1_APLL_PFD0_FRAC_NUM;
-       writel(val, &scg1_regs->apllpfd);
-
-       /* Un-gate A7 APLL PFD0 */
-       val = readl(&scg1_regs->apllpfd);
-       val &= ~SCG_PLL_PFD0_GATE_MASK;
-       writel(val, &scg1_regs->apllpfd);
-
-       /* Wait for A7 APLL PFD0 clock being valid */
-       while (!(readl(&scg1_regs->apllpfd) & SCG_PLL_PFD0_VALID_MASK))
-               ;
-}
-
-/* SCG1(A7) FIRC DIV configurations */
-/* Disable FIRC DIV3 */
-#define SCG1_FIRCDIV_DIV3_NUM           ((0x0) << SCG_FIRCDIV_DIV3_SHIFT)
-/* FIRC DIV2 = 48MHz / 1 = 48MHz */
-#define SCG1_FIRCDIV_DIV2_NUM           ((0x1) << SCG_FIRCDIV_DIV2_SHIFT)
-/* Disable FIRC DIV1 */
-#define SCG1_FIRCDIV_DIV1_NUM           ((0x0) << SCG_FIRCDIV_DIV1_SHIFT)
-
-void scg_a7_firc_init(void)
-{
-       /* Wait for FIRC clock ready */
-       while (!(readl(&scg1_regs->firccsr) & SCG_FIRC_CSR_FIRCVLD_MASK))
-               ;
-
-       /* Configure A7 FIRC DIV1 ~ DIV3 */
-       writel((SCG1_FIRCDIV_DIV3_NUM |
-                       SCG1_FIRCDIV_DIV2_NUM |
-                       SCG1_FIRCDIV_DIV1_NUM), &scg1_regs->fircdiv);
-}
-
-/* SCG1(A7) NICCCR configurations */
-/* NIC clock source is DDR clock (396/198MHz) */
-#define SCG1_NICCCR_NICCS_NUM          ((0x1) << SCG_NICCCR_NICCS_SHIFT)
-
-/* NIC0 clock = DDR Clock / 2 = 396MHz / 2 = 198MHz */
-#define SCG1_NICCCR_NIC0_DIV_NUM       ((0x1) << SCG_NICCCR_NIC0_DIV_SHIFT)
-/* NIC0 clock = DDR Clock / 1 = 198MHz / 1 = 198MHz */
-#define SCG1_NICCCR_NIC0_DIV_LF_NUM    ((0x0) << SCG_NICCCR_NIC0_DIV_SHIFT)
-/* NIC1 clock = NIC0 Clock / 1 = 198MHz / 2 = 198MHz */
-#define SCG1_NICCCR_NIC1_DIV_NUM       ((0x0) << SCG_NICCCR_NIC1_DIV_SHIFT)
-/* NIC1 bus clock = NIC1 Clock / 3 = 198MHz / 3 = 66MHz */
-#define SCG1_NICCCR_NIC1_DIVBUS_NUM    ((0x2) << SCG_NICCCR_NIC1_DIVBUS_SHIFT)
-#define SCG1_NICCCR_CFG_NUM            (SCG1_NICCCR_NICCS_NUM      | \
-                                        SCG1_NICCCR_NIC0_DIV_NUM   | \
-                                        SCG1_NICCCR_NIC1_DIV_NUM   | \
-                                        SCG1_NICCCR_NIC1_DIVBUS_NUM)
-
-void scg_a7_nicclk_init(void)
-{
-       writel(SCG1_NICCCR_CFG_NUM, &scg1_regs->nicccr);
-}
-
-/* SCG1(A7) FIRC DIV configurations */
-/* Enable FIRC DIV3 */
-#define SCG1_SOSCDIV_DIV3_NUM          ((0x1) << SCG_SOSCDIV_DIV3_SHIFT)
-/* FIRC DIV2 = 48MHz / 1 = 48MHz */
-#define SCG1_SOSCDIV_DIV2_NUM          ((0x1) << SCG_SOSCDIV_DIV2_SHIFT)
-/* Enable FIRC DIV1 */
-#define SCG1_SOSCDIV_DIV1_NUM          ((0x1) << SCG_SOSCDIV_DIV1_SHIFT)
-
-void scg_a7_soscdiv_init(void)
-{
-       /* Wait for FIRC clock ready */
-       while (!(readl(&scg1_regs->sosccsr) & SCG_SOSC_CSR_SOSCVLD_MASK))
-               ;
-
-       /* Configure A7 FIRC DIV1 ~ DIV3 */
-       writel((SCG1_SOSCDIV_DIV3_NUM | SCG1_SOSCDIV_DIV2_NUM |
-              SCG1_SOSCDIV_DIV1_NUM), &scg1_regs->soscdiv);
-}
-
-void scg_a7_sys_clk_sel(enum scg_sys_src clk)
-{
-       u32 rccr_reg_val = 0;
-
-       clk_debug("%s: system clock selected as %s\n", "[SCG]",
-                 clk == SCG_SCS_SYS_OSC ? "SYS_OSC" :
-                 clk == SCG_SCS_SLOW_IRC  ? "SLOW_IRC" :
-                 clk == SCG_SCS_FAST_IRC  ? "FAST_IRC" :
-                 clk == SCG_SCS_RTC_OSC   ? "RTC_OSC" :
-                 clk == SCG_SCS_AUX_PLL   ? "AUX_PLL" :
-                 clk == SCG_SCS_SYS_PLL   ? "SYS_PLL" :
-                 clk == SCG_SCS_USBPHY_PLL ? "USBPHY_PLL" :
-                 "Invalid source"
-       );
-
-       rccr_reg_val = readl(&scg1_regs->rccr);
-       rccr_reg_val &= ~SCG_CCR_SCS_MASK;
-       rccr_reg_val |= (clk << SCG_CCR_SCS_SHIFT);
-       writel(rccr_reg_val, &scg1_regs->rccr);
-}
-
-void scg_a7_info(void)
-{
-       debug("SCG Version: 0x%x\n", readl(&scg1_regs->verid));
-       debug("SCG Parameter: 0x%x\n", readl(&scg1_regs->param));
-       debug("SCG RCCR Value: 0x%x\n", readl(&scg1_regs->rccr));
-       debug("SCG Clock Status: 0x%x\n", readl(&scg1_regs->csr));
-}
diff --git a/arch/arm/cpu/armv7/mx7ulp/soc.c b/arch/arm/cpu/armv7/mx7ulp/soc.c
deleted file mode 100644 (file)
index 4fd4c3a..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/imx-common/hab.h>
-
-static char *get_reset_cause(char *);
-
-#if defined(CONFIG_SECURE_BOOT)
-struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
-       .bank = 29,
-       .word = 6,
-};
-#endif
-
-u32 get_cpu_rev(void)
-{
-       /* Temporally hard code the CPU rev to 0x73, rev 1.0. Fix it later */
-       return (MXC_CPU_MX7ULP << 12) | (1 << 4);
-}
-
-#ifdef CONFIG_REVISION_TAG
-u32 __weak get_board_rev(void)
-{
-       return get_cpu_rev();
-}
-#endif
-
-enum bt_mode get_boot_mode(void)
-{
-       u32 bt0_cfg = 0;
-
-       bt0_cfg = readl(CMC0_RBASE + 0x40);
-       bt0_cfg &= (BT0CFG_LPBOOT_MASK | BT0CFG_DUALBOOT_MASK);
-
-       if (!(bt0_cfg & BT0CFG_LPBOOT_MASK)) {
-               /* No low power boot */
-               if (bt0_cfg & BT0CFG_DUALBOOT_MASK)
-                       return DUAL_BOOT;
-               else
-                       return SINGLE_BOOT;
-       }
-
-       return LOW_POWER_BOOT;
-}
-
-int arch_cpu_init(void)
-{
-       return 0;
-}
-
-#ifdef CONFIG_BOARD_POSTCLK_INIT
-int board_postclk_init(void)
-{
-       return 0;
-}
-#endif
-
-#define UNLOCK_WORD0 0xC520 /* 1st unlock word */
-#define UNLOCK_WORD1 0xD928 /* 2nd unlock word */
-#define REFRESH_WORD0 0xA602 /* 1st refresh word */
-#define REFRESH_WORD1 0xB480 /* 2nd refresh word */
-
-static void disable_wdog(u32 wdog_base)
-{
-       writel(UNLOCK_WORD0, (wdog_base + 0x04));
-       writel(UNLOCK_WORD1, (wdog_base + 0x04));
-       writel(0x0, (wdog_base + 0x0C)); /* Set WIN to 0 */
-       writel(0x400, (wdog_base + 0x08)); /* Set timeout to default 0x400 */
-       writel(0x120, (wdog_base + 0x00)); /* Disable it and set update */
-
-       writel(REFRESH_WORD0, (wdog_base + 0x04)); /* Refresh the CNT */
-       writel(REFRESH_WORD1, (wdog_base + 0x04));
-}
-
-void init_wdog(void)
-{
-       /*
-        * ROM will configure WDOG1, disable it or enable it
-        * depending on FUSE. The update bit is set for reconfigurable.
-        * We have to use unlock sequence to reconfigure it.
-        * WDOG2 is not touched by ROM, so it will have default value
-        * which is enabled. We can directly configure it.
-        * To simplify the codes, we still use same reconfigure
-        * process as WDOG1. Because the update bit is not set for
-        * WDOG2, the unlock sequence won't take effect really.
-        * It actually directly configure the wdog.
-        * In this function, we will disable both WDOG1 and WDOG2,
-        * and set update bit for both. So that kernel can reconfigure them.
-        */
-       disable_wdog(WDG1_RBASE);
-       disable_wdog(WDG2_RBASE);
-}
-
-
-void s_init(void)
-{
-       /* Disable wdog */
-       init_wdog();
-
-       /* clock configuration. */
-       clock_init();
-
-       return;
-}
-
-#ifndef CONFIG_ULP_WATCHDOG
-void reset_cpu(ulong addr)
-{
-       setbits_le32(SIM0_RBASE, SIM_SOPT1_A7_SW_RESET);
-       while (1)
-               ;
-}
-#endif
-
-#if defined(CONFIG_DISPLAY_CPUINFO)
-const char *get_imx_type(u32 imxtype)
-{
-       return "7ULP";
-}
-
-int print_cpuinfo(void)
-{
-       u32 cpurev;
-       char cause[18];
-
-       cpurev = get_cpu_rev();
-
-       printf("CPU:   Freescale i.MX%s rev%d.%d at %d MHz\n",
-              get_imx_type((cpurev & 0xFF000) >> 12),
-              (cpurev & 0x000F0) >> 4, (cpurev & 0x0000F) >> 0,
-              mxc_get_clock(MXC_ARM_CLK) / 1000000);
-
-       printf("Reset cause: %s\n", get_reset_cause(cause));
-
-       printf("Boot mode: ");
-       switch (get_boot_mode()) {
-       case LOW_POWER_BOOT:
-               printf("Low power boot\n");
-               break;
-       case DUAL_BOOT:
-               printf("Dual boot\n");
-               break;
-       case SINGLE_BOOT:
-       default:
-               printf("Single boot\n");
-               break;
-       }
-
-       return 0;
-}
-#endif
-
-#define CMC_SRS_TAMPER                    (1 << 31)
-#define CMC_SRS_SECURITY                  (1 << 30)
-#define CMC_SRS_TZWDG                     (1 << 29)
-#define CMC_SRS_JTAG_RST                  (1 << 28)
-#define CMC_SRS_CORE1                     (1 << 16)
-#define CMC_SRS_LOCKUP                    (1 << 15)
-#define CMC_SRS_SW                        (1 << 14)
-#define CMC_SRS_WDG                       (1 << 13)
-#define CMC_SRS_PIN_RESET                 (1 << 8)
-#define CMC_SRS_WARM                      (1 << 4)
-#define CMC_SRS_HVD                       (1 << 3)
-#define CMC_SRS_LVD                       (1 << 2)
-#define CMC_SRS_POR                       (1 << 1)
-#define CMC_SRS_WUP                       (1 << 0)
-
-static u32 reset_cause = -1;
-
-static char *get_reset_cause(char *ret)
-{
-       u32 cause1, cause = 0, srs = 0;
-       u32 *reg_ssrs = (u32 *)(SRC_BASE_ADDR + 0x28);
-       u32 *reg_srs = (u32 *)(SRC_BASE_ADDR + 0x20);
-
-       if (!ret)
-               return "null";
-
-       srs = readl(reg_srs);
-       cause1 = readl(reg_ssrs);
-       writel(cause1, reg_ssrs);
-
-       reset_cause = cause1;
-
-       cause = cause1 & (CMC_SRS_POR | CMC_SRS_WUP | CMC_SRS_WARM);
-
-       switch (cause) {
-       case CMC_SRS_POR:
-               sprintf(ret, "%s", "POR");
-               break;
-       case CMC_SRS_WUP:
-               sprintf(ret, "%s", "WUP");
-               break;
-       case CMC_SRS_WARM:
-               cause = cause1 & (CMC_SRS_WDG | CMC_SRS_SW |
-                       CMC_SRS_JTAG_RST);
-               switch (cause) {
-               case CMC_SRS_WDG:
-                       sprintf(ret, "%s", "WARM-WDG");
-                       break;
-               case CMC_SRS_SW:
-                       sprintf(ret, "%s", "WARM-SW");
-                       break;
-               case CMC_SRS_JTAG_RST:
-                       sprintf(ret, "%s", "WARM-JTAG");
-                       break;
-               default:
-                       sprintf(ret, "%s", "WARM-UNKN");
-                       break;
-               }
-               break;
-       default:
-               sprintf(ret, "%s-%X", "UNKN", cause1);
-               break;
-       }
-
-       debug("[%X] SRS[%X] %X - ", cause1, srs, srs^cause1);
-       return ret;
-}
-
-#ifdef CONFIG_ENV_IS_IN_MMC
-__weak int board_mmc_get_env_dev(int devno)
-{
-       return CONFIG_SYS_MMC_ENV_DEV;
-}
-
-int mmc_get_env_dev(void)
-{
-       int devno = 0;
-       u32 bt1_cfg = 0;
-
-       /* If not boot from sd/mmc, use default value */
-       if (get_boot_mode() == LOW_POWER_BOOT)
-               return CONFIG_SYS_MMC_ENV_DEV;
-
-       bt1_cfg = readl(CMC1_RBASE + 0x40);
-       devno = (bt1_cfg >> 9) & 0x7;
-
-       return board_mmc_get_env_dev(devno);
-}
-#endif
index 0328096afd05fe5c9a215a42b8b16cda06863d3c..ac2d8d1a3f83280011170fafda3032f3f7bc3dae 100644 (file)
@@ -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>
diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig
deleted file mode 100644 (file)
index cd8b8d2..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-config IMX_CONFIG
-       string
-
-config ROM_UNIFIED_SECTIONS
-       bool
-
-config IMX_RDC
-       bool "i.MX Resource domain controller driver"
-       depends on ARCH_MX6 || ARCH_MX7
-       help
-         i.MX Resource domain controller is used to assign masters
-         and peripherals to differet domains. This can be used to
-         isolate resources.
-
-config IMX_BOOTAUX
-       bool "Support boot auxiliary core"
-       depends on ARCH_MX7 || ARCH_MX6
-       help
-         bootaux [addr] to boot auxiliary core.
-
-config USE_IMXIMG_PLUGIN
-       bool "Use imximage plugin code"
-       depends on ARCH_MX7 || ARCH_MX6
-       help
-         i.MX6/7 supports DCD and Plugin. Enable this configuration
-         to use Plugin, otherwise DCD will be used.
-
-config SECURE_BOOT
-       bool "Support i.MX HAB features"
-       depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
-       select FSL_CAAM
-       imply CMD_DEKBLOB
-       help
-         This option enables the support for secure boot (HAB).
-         See doc/README.mxc_hab for more details.
-
-config CMD_BMODE
-       bool "Support the 'bmode' command"
-       default y
-       depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
-       help
-         This enables the 'bmode' (bootmode) command for forcing
-         a boot from specific media.
-
-         This is useful for forcing the ROM's usb downloader to
-         activate upon a watchdog reset which is nice when iterating
-         on U-Boot.  Using the reset button or running bmode normal
-         will set it back to normal.  This command currently
-         supports i.MX53 and i.MX6.
-
-config CMD_DEKBLOB
-       bool "Support the 'dek_blob' command"
-       help
-         This enables the 'dek_blob' command which is used with the
-         Freescale secure boot mechanism. This command encapsulates and
-         creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for
-         more information.
-
-config CMD_HDMIDETECT
-       bool "Support the 'hdmidet' command"
-       help
-         This enables the 'hdmidet' command which detects if an HDMI monitor
-         is connected.
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
deleted file mode 100644 (file)
index fc69172..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2011 Freescale Semiconductor, Inc.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 vf610))
-obj-y  = iomux-v3.o
-endif
-ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
-obj-y  += timer.o cpu.o speed.o
-obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
-endif
-ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs))
-obj-y  += misc.o
-obj-$(CONFIG_SPL_BUILD)        += spl.o
-endif
-ifeq ($(SOC),$(filter $(SOC),mx7))
-obj-y  += cpu.o
-obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
-obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o
-endif
-ifeq ($(SOC),$(filter $(SOC),mx6 mx7))
-obj-y  += cache.o init.o
-obj-$(CONFIG_SATA) += sata.o
-obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
-obj-$(CONFIG_IMX_RDC) += rdc-sema.o
-obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
-obj-$(CONFIG_SECURE_BOOT)    += hab.o
-endif
-ifeq ($(SOC),$(filter $(SOC),mx7ulp))
-obj-y  += cache.o
-obj-$(CONFIG_SECURE_BOOT) += hab.o
-endif
-ifeq ($(SOC),$(filter $(SOC),vf610))
-obj-y += ddrmc-vf610.o
-endif
-ifneq ($(CONFIG_SPL_BUILD),y)
-obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o
-obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
-obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o
-endif
-
-PLUGIN = board/$(BOARDDIR)/plugin
-
-ifeq ($(CONFIG_USE_IMXIMG_PLUGIN),y)
-
-$(PLUGIN).o: $(PLUGIN).S FORCE
-       $(Q)mkdir -p $(dir $@)
-       $(call if_changed_dep,as_o_S)
-
-$(PLUGIN).bin: $(PLUGIN).o FORCE
-       $(Q)mkdir -p $(dir $@)
-       $(OBJCOPY) -O binary --gap-fill 0xff $< $@
-else
-
-$(PLUGIN).bin:
-
-endif
-
-quiet_cmd_cpp_cfg = CFGS    $@
-      cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $<
-
-IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp
-
-$(IMX_CONFIG): %.cfgtmp: % FORCE
-       $(Q)mkdir -p $(dir $@)
-       $(call if_changed_dep,cpp_cfg)
-
-MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
-       -e $(CONFIG_SYS_TEXT_BASE)
-u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
-
-u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-       $(call if_changed,mkimage)
-
-ifeq ($(CONFIG_OF_SEPARATE),y)
-MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
-       -e $(CONFIG_SYS_TEXT_BASE)
-u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log
-
-u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-       $(call if_changed,mkimage)
-endif
-
-MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
-       -e $(CONFIG_SPL_TEXT_BASE)
-
-SPL: MKIMAGEOUTPUT = SPL.log
-
-SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-       $(call if_changed,mkimage)
-
-MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
-               -e $(CONFIG_SYS_TEXT_BASE) -C none -T firmware
-
-u-boot.uim: u-boot.bin FORCE
-       $(call if_changed,mkimage)
-
-OBJCOPYFLAGS += -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
-append = cat $(filter-out $< $(PHONY), $^) >> $@
-
-quiet_cmd_pad_cat = CAT     $@
-cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
-
-u-boot-with-spl.imx: SPL u-boot.uim FORCE
-       $(call if_changed,pad_cat)
-
-u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE
-       $(call if_changed,pad_cat)
-
-quiet_cmd_u-boot-nand-spl_imx = GEN     $@
-cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \
-       dd bs=1015 count=1 if=/dev/zero 2>/dev/null) | cat - $< > $@
-
-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)
diff --git a/arch/arm/imx-common/cache.c b/arch/arm/imx-common/cache.c
deleted file mode 100644 (file)
index 1c4a9a2..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/armv7.h>
-#include <asm/pl310.h>
-#include <asm/io.h>
-#include <asm/imx-common/sys_proto.h>
-
-#ifndef CONFIG_SYS_DCACHE_OFF
-void enable_caches(void)
-{
-#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH)
-       enum dcache_option option = DCACHE_WRITETHROUGH;
-#else
-       enum dcache_option option = DCACHE_WRITEBACK;
-#endif
-       /* Avoid random hang when download by usb */
-       invalidate_dcache_all();
-
-       /* Enable D-cache. I-cache is already enabled in start.S */
-       dcache_enable();
-
-       /* Enable caching on OCRAM and ROM */
-       mmu_set_region_dcache_behaviour(ROMCP_ARB_BASE_ADDR,
-                                       ROMCP_ARB_END_ADDR,
-                                       option);
-       mmu_set_region_dcache_behaviour(IRAM_BASE_ADDR,
-                                       IRAM_SIZE,
-                                       option);
-}
-#endif
-
-#ifndef CONFIG_SYS_L2CACHE_OFF
-#ifdef CONFIG_SYS_L2_PL310
-#define IOMUXC_GPR11_L2CACHE_AS_OCRAM 0x00000002
-void v7_outer_cache_enable(void)
-{
-       struct pl310_regs *const pl310 = (struct pl310_regs *)L2_PL310_BASE;
-       struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
-       unsigned int val;
-
-
-       /*
-        * Must disable the L2 before changing the latency parameters
-        * and auxiliary control register.
-        */
-       clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
-
-       /*
-        * Set bit 22 in the auxiliary control register. If this bit
-        * is cleared, PL310 treats Normal Shared Non-cacheable
-        * accesses as Cacheable no-allocate.
-        */
-       setbits_le32(&pl310->pl310_aux_ctrl, L310_SHARED_ATT_OVERRIDE_ENABLE);
-
-       if (is_mx6sl() || is_mx6sll()) {
-               val = readl(&iomux->gpr[11]);
-               if (val & IOMUXC_GPR11_L2CACHE_AS_OCRAM) {
-                       /* L2 cache configured as OCRAM, reset it */
-                       val &= ~IOMUXC_GPR11_L2CACHE_AS_OCRAM;
-                       writel(val, &iomux->gpr[11]);
-               }
-       }
-
-       writel(0x132, &pl310->pl310_tag_latency_ctrl);
-       writel(0x132, &pl310->pl310_data_latency_ctrl);
-
-       val = readl(&pl310->pl310_prefetch_ctrl);
-
-       /* Turn on the L2 I/D prefetch */
-       val |= 0x30000000;
-
-       /*
-        * The L2 cache controller(PL310) version on the i.MX6D/Q is r3p1-50rel0
-        * The L2 cache controller(PL310) version on the i.MX6DL/SOLO/SL is r3p2
-        * But according to ARM PL310 errata: 752271
-        * ID: 752271: Double linefill feature can cause data corruption
-        * Fault Status: Present in: r3p0, r3p1, r3p1-50rel0. Fixed in r3p2
-        * Workaround: The only workaround to this erratum is to disable the
-        * double linefill feature. This is the default behavior.
-        */
-
-#ifndef CONFIG_MX6Q
-       val |= 0x40800000;
-#endif
-       writel(val, &pl310->pl310_prefetch_ctrl);
-
-       val = readl(&pl310->pl310_power_ctrl);
-       val |= L2X0_DYNAMIC_CLK_GATING_EN;
-       val |= L2X0_STNDBY_MODE_EN;
-       writel(val, &pl310->pl310_power_ctrl);
-
-       setbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
-}
-
-void v7_outer_cache_disable(void)
-{
-       struct pl310_regs *const pl310 = (struct pl310_regs *)L2_PL310_BASE;
-
-       clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
-}
-#endif /* !CONFIG_SYS_L2_PL310 */
-#endif /* !CONFIG_SYS_L2CACHE_OFF */
diff --git a/arch/arm/imx-common/cmd_bmode.c b/arch/arm/imx-common/cmd_bmode.c
deleted file mode 100644 (file)
index b0868aa..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2012 Boundary Devices Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#include <common.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/imx-common/boot_mode.h>
-#include <malloc.h>
-#include <command.h>
-
-static const struct boot_mode *modes[2];
-
-static const struct boot_mode *search_modes(char *arg)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(modes); i++) {
-               const struct boot_mode *p = modes[i];
-               if (p) {
-                       while (p->name) {
-                               if (!strcmp(p->name, arg))
-                                       return p;
-                               p++;
-                       }
-               }
-       }
-       return NULL;
-}
-
-static int create_usage(char *dest)
-{
-       int i;
-       int size = 0;
-
-       for (i = 0; i < ARRAY_SIZE(modes); i++) {
-               const struct boot_mode *p = modes[i];
-               if (p) {
-                       while (p->name) {
-                               int len = strlen(p->name);
-                               if (dest) {
-                                       memcpy(dest, p->name, len);
-                                       dest += len;
-                                       *dest++ = '|';
-                               }
-                               size += len + 1;
-                               p++;
-                       }
-               }
-       }
-       if (dest)
-               memcpy(dest - 1, " [noreset]", 11);     /* include trailing 0 */
-       size += 10;
-       return size;
-}
-
-static int do_boot_mode(cmd_tbl_t *cmdtp, int flag, int argc,
-               char * const argv[])
-{
-       const struct boot_mode *p;
-       int reset_requested = 1;
-
-       if (argc < 2)
-               return CMD_RET_USAGE;
-       p = search_modes(argv[1]);
-       if (!p)
-               return CMD_RET_USAGE;
-       if (argc == 3) {
-               if (strcmp(argv[2], "noreset"))
-                       return CMD_RET_USAGE;
-               reset_requested = 0;
-       }
-
-       boot_mode_apply(p->cfg_val);
-       if (reset_requested && p->cfg_val)
-               do_reset(NULL, 0, 0, NULL);
-       return 0;
-}
-
-U_BOOT_CMD(
-       bmode, 3, 0, do_boot_mode,
-       NULL,
-       "");
-
-void add_board_boot_modes(const struct boot_mode *p)
-{
-       int size;
-       char *dest;
-
-       cmd_tbl_t *entry = ll_entry_get(cmd_tbl_t, bmode, cmd);
-
-       if (entry->usage) {
-               free(entry->usage);
-               entry->usage = NULL;
-       }
-
-       modes[0] = p;
-       modes[1] = soc_boot_modes;
-       size = create_usage(NULL);
-       dest = malloc(size);
-       if (dest) {
-               create_usage(dest);
-               entry->usage = dest;
-       }
-}
diff --git a/arch/arm/imx-common/cmd_dek.c b/arch/arm/imx-common/cmd_dek.c
deleted file mode 100644 (file)
index ada8adf..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2008-2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- *
- * Command for encapsulating DEK blob
- */
-
-#include <common.h>
-#include <command.h>
-#include <environment.h>
-#include <malloc.h>
-#include <asm/byteorder.h>
-#include <linux/compiler.h>
-#include <fsl_sec.h>
-#include <asm/arch/clock.h>
-#include <mapmem.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/**
-* blob_dek() - Encapsulate the DEK as a blob using CAM's Key
-* @src: - Address of data to be encapsulated
-* @dst: - Desination address of encapsulated data
-* @len: - Size of data to be encapsulated
-*
-* Returns zero on success,and negative on error.
-*/
-static int blob_encap_dek(const u8 *src, u8 *dst, u32 len)
-{
-       int ret = 0;
-       u32 jr_size = 4;
-
-       u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + 0x102c);
-       if (out_jr_size != jr_size) {
-               hab_caam_clock_enable(1);
-               sec_init();
-       }
-
-       if (!((len == 128) | (len == 192) | (len == 256))) {
-               debug("Invalid DEK size. Valid sizes are 128, 192 and 256b\n");
-               return -1;
-       }
-
-       len /= 8;
-       ret = blob_dek(src, dst, len);
-
-       return ret;
-}
-
-/**
- * do_dek_blob() - Handle the "dek_blob" command-line command
- * @cmdtp:  Command data struct pointer
- * @flag:   Command flag
- * @argc:   Command-line argument count
- * @argv:   Array of command-line arguments
- *
- * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
- * on error.
- */
-static int do_dek_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
-{
-       uint32_t src_addr, dst_addr, len;
-       uint8_t *src_ptr, *dst_ptr;
-       int ret = 0;
-
-       if (argc != 4)
-               return CMD_RET_USAGE;
-
-       src_addr = simple_strtoul(argv[1], NULL, 16);
-       dst_addr = simple_strtoul(argv[2], NULL, 16);
-       len = simple_strtoul(argv[3], NULL, 10);
-
-       src_ptr = map_sysmem(src_addr, len/8);
-       dst_ptr = map_sysmem(dst_addr, BLOB_SIZE(len/8));
-
-       ret = blob_encap_dek(src_ptr, dst_ptr, len);
-
-       return ret;
-}
-
-/***************************************************/
-static char dek_blob_help_text[] =
-       "src dst len            - Encapsulate and create blob of data\n"
-       "                         $len bits long at address $src and\n"
-       "                         store the result at address $dst.\n";
-
-U_BOOT_CMD(
-       dek_blob, 4, 1, do_dek_blob,
-       "Data Encryption Key blob encapsulation",
-       dek_blob_help_text
-);
diff --git a/arch/arm/imx-common/cmd_hdmidet.c b/arch/arm/imx-common/cmd_hdmidet.c
deleted file mode 100644 (file)
index e9fd955..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2012 Boundary Devices Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/mxc_hdmi.h>
-#include <asm/io.h>
-
-static int do_hdmidet(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
-       return (readb(&hdmi->phy_stat0) & HDMI_DVI_STAT) ? 0 : 1;
-}
-
-U_BOOT_CMD(hdmidet, 1, 1, do_hdmidet,
-       "detect HDMI monitor",
-       ""
-);
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
deleted file mode 100644 (file)
index 9e83b42..0000000
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * (C) Copyright 2007
- * Sascha Hauer, Pengutronix
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <bootm.h>
-#include <common.h>
-#include <netdev.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/crm_regs.h>
-#include <imx_thermal.h>
-#include <ipu_pixfmt.h>
-#include <thermal.h>
-#include <sata.h>
-
-#ifdef CONFIG_FSL_ESDHC
-#include <fsl_esdhc.h>
-#endif
-
-#if defined(CONFIG_DISPLAY_CPUINFO)
-static u32 reset_cause = -1;
-
-static char *get_reset_cause(void)
-{
-       u32 cause;
-       struct src *src_regs = (struct src *)SRC_BASE_ADDR;
-
-       cause = readl(&src_regs->srsr);
-       writel(cause, &src_regs->srsr);
-       reset_cause = cause;
-
-       switch (cause) {
-       case 0x00001:
-       case 0x00011:
-               return "POR";
-       case 0x00004:
-               return "CSU";
-       case 0x00008:
-               return "IPP USER";
-       case 0x00010:
-#ifdef CONFIG_MX7
-               return "WDOG1";
-#else
-               return "WDOG";
-#endif
-       case 0x00020:
-               return "JTAG HIGH-Z";
-       case 0x00040:
-               return "JTAG SW";
-       case 0x00080:
-               return "WDOG3";
-#ifdef CONFIG_MX7
-       case 0x00100:
-               return "WDOG4";
-       case 0x00200:
-               return "TEMPSENSE";
-#else
-       case 0x00100:
-               return "TEMPSENSE";
-       case 0x10000:
-               return "WARM BOOT";
-#endif
-       default:
-               return "unknown reset";
-       }
-}
-
-u32 get_imx_reset_cause(void)
-{
-       return reset_cause;
-}
-#endif
-
-#if defined(CONFIG_MX53) || defined(CONFIG_MX6)
-#if defined(CONFIG_MX53)
-#define MEMCTL_BASE    ESDCTL_BASE_ADDR
-#else
-#define MEMCTL_BASE    MMDC_P0_BASE_ADDR
-#endif
-static const unsigned char col_lookup[] = {9, 10, 11, 8, 12, 9, 9, 9};
-static const unsigned char bank_lookup[] = {3, 2};
-
-/* these MMDC registers are common to the IMX53 and IMX6 */
-struct esd_mmdc_regs {
-       uint32_t        ctl;
-       uint32_t        pdc;
-       uint32_t        otc;
-       uint32_t        cfg0;
-       uint32_t        cfg1;
-       uint32_t        cfg2;
-       uint32_t        misc;
-};
-
-#define ESD_MMDC_CTL_GET_ROW(mdctl)    ((ctl >> 24) & 7)
-#define ESD_MMDC_CTL_GET_COLUMN(mdctl) ((ctl >> 20) & 7)
-#define ESD_MMDC_CTL_GET_WIDTH(mdctl)  ((ctl >> 16) & 3)
-#define ESD_MMDC_CTL_GET_CS1(mdctl)    ((ctl >> 30) & 1)
-#define ESD_MMDC_MISC_GET_BANK(mdmisc) ((misc >> 5) & 1)
-
-/*
- * imx_ddr_size - return size in bytes of DRAM according MMDC config
- * The MMDC MDCTL register holds the number of bits for row, col, and data
- * width and the MMDC MDMISC register holds the number of banks. Combine
- * all these bits to determine the meme size the MMDC has been configured for
- */
-unsigned imx_ddr_size(void)
-{
-       struct esd_mmdc_regs *mem = (struct esd_mmdc_regs *)MEMCTL_BASE;
-       unsigned ctl = readl(&mem->ctl);
-       unsigned misc = readl(&mem->misc);
-       int bits = 11 + 0 + 0 + 1;      /* row + col + bank + width */
-
-       bits += ESD_MMDC_CTL_GET_ROW(ctl);
-       bits += col_lookup[ESD_MMDC_CTL_GET_COLUMN(ctl)];
-       bits += bank_lookup[ESD_MMDC_MISC_GET_BANK(misc)];
-       bits += ESD_MMDC_CTL_GET_WIDTH(ctl);
-       bits += ESD_MMDC_CTL_GET_CS1(ctl);
-
-       /* The MX6 can do only 3840 MiB of DRAM */
-       if (bits == 32)
-               return 0xf0000000;
-
-       return 1 << bits;
-}
-#endif
-
-#if defined(CONFIG_DISPLAY_CPUINFO)
-
-const char *get_imx_type(u32 imxtype)
-{
-       switch (imxtype) {
-       case MXC_CPU_MX7S:
-               return "7S";    /* Single-core version of the mx7 */
-       case MXC_CPU_MX7D:
-               return "7D";    /* Dual-core version of the mx7 */
-       case MXC_CPU_MX6QP:
-               return "6QP";   /* Quad-Plus version of the mx6 */
-       case MXC_CPU_MX6DP:
-               return "6DP";   /* Dual-Plus version of the mx6 */
-       case MXC_CPU_MX6Q:
-               return "6Q";    /* Quad-core version of the mx6 */
-       case MXC_CPU_MX6D:
-               return "6D";    /* Dual-core version of the mx6 */
-       case MXC_CPU_MX6DL:
-               return "6DL";   /* Dual Lite version of the mx6 */
-       case MXC_CPU_MX6SOLO:
-               return "6SOLO"; /* Solo version of the mx6 */
-       case MXC_CPU_MX6SL:
-               return "6SL";   /* Solo-Lite version of the mx6 */
-       case MXC_CPU_MX6SLL:
-               return "6SLL";  /* SLL version of the mx6 */
-       case MXC_CPU_MX6SX:
-               return "6SX";   /* SoloX version of the mx6 */
-       case MXC_CPU_MX6UL:
-               return "6UL";   /* Ultra-Lite version of the mx6 */
-       case MXC_CPU_MX6ULL:
-               return "6ULL";  /* ULL version of the mx6 */
-       case MXC_CPU_MX51:
-               return "51";
-       case MXC_CPU_MX53:
-               return "53";
-       default:
-               return "??";
-       }
-}
-
-int print_cpuinfo(void)
-{
-       u32 cpurev;
-       __maybe_unused u32 max_freq;
-
-       cpurev = get_cpu_rev();
-
-#if defined(CONFIG_IMX_THERMAL)
-       struct udevice *thermal_dev;
-       int cpu_tmp, minc, maxc, ret;
-
-       printf("CPU:   Freescale i.MX%s rev%d.%d",
-              get_imx_type((cpurev & 0xFF000) >> 12),
-              (cpurev & 0x000F0) >> 4,
-              (cpurev & 0x0000F) >> 0);
-       max_freq = get_cpu_speed_grade_hz();
-       if (!max_freq || max_freq == mxc_get_clock(MXC_ARM_CLK)) {
-               printf(" at %dMHz\n", mxc_get_clock(MXC_ARM_CLK) / 1000000);
-       } else {
-               printf(" %d MHz (running at %d MHz)\n", max_freq / 1000000,
-                      mxc_get_clock(MXC_ARM_CLK) / 1000000);
-       }
-#else
-       printf("CPU:   Freescale i.MX%s rev%d.%d at %d MHz\n",
-               get_imx_type((cpurev & 0xFF000) >> 12),
-               (cpurev & 0x000F0) >> 4,
-               (cpurev & 0x0000F) >> 0,
-               mxc_get_clock(MXC_ARM_CLK) / 1000000);
-#endif
-
-#if defined(CONFIG_IMX_THERMAL)
-       puts("CPU:   ");
-       switch (get_cpu_temp_grade(&minc, &maxc)) {
-       case TEMP_AUTOMOTIVE:
-               puts("Automotive temperature grade ");
-               break;
-       case TEMP_INDUSTRIAL:
-               puts("Industrial temperature grade ");
-               break;
-       case TEMP_EXTCOMMERCIAL:
-               puts("Extended Commercial temperature grade ");
-               break;
-       default:
-               puts("Commercial temperature grade ");
-               break;
-       }
-       printf("(%dC to %dC)", minc, maxc);
-       ret = uclass_get_device(UCLASS_THERMAL, 0, &thermal_dev);
-       if (!ret) {
-               ret = thermal_get_temp(thermal_dev, &cpu_tmp);
-
-               if (!ret)
-                       printf(" at %dC\n", cpu_tmp);
-               else
-                       debug(" - invalid sensor data\n");
-       } else {
-               debug(" - invalid sensor device\n");
-       }
-#endif
-
-       printf("Reset cause: %s\n", get_reset_cause());
-       return 0;
-}
-#endif
-
-int cpu_eth_init(bd_t *bis)
-{
-       int rc = -ENODEV;
-
-#if defined(CONFIG_FEC_MXC)
-       rc = fecmxc_initialize(bis);
-#endif
-
-       return rc;
-}
-
-#ifdef CONFIG_FSL_ESDHC
-/*
- * Initializes on-chip MMC controllers.
- * to override, implement board_mmc_init()
- */
-int cpu_mmc_init(bd_t *bis)
-{
-       return fsl_esdhc_mmc_init(bis);
-}
-#endif
-
-#ifndef CONFIG_MX7
-u32 get_ahb_clk(void)
-{
-       struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       u32 reg, ahb_podf;
-
-       reg = __raw_readl(&imx_ccm->cbcdr);
-       reg &= MXC_CCM_CBCDR_AHB_PODF_MASK;
-       ahb_podf = reg >> MXC_CCM_CBCDR_AHB_PODF_OFFSET;
-
-       return get_periph_clk() / (ahb_podf + 1);
-}
-#endif
-
-void arch_preboot_os(void)
-{
-#if defined(CONFIG_PCIE_IMX)
-       imx_pcie_remove();
-#endif
-#if defined(CONFIG_SATA)
-       sata_stop();
-#if defined(CONFIG_MX6)
-       disable_sata_clock();
-#endif
-#endif
-#if defined(CONFIG_VIDEO_IPUV3)
-       /* disable video before launching O/S */
-       ipuv3_fb_shutdown();
-#endif
-#if defined(CONFIG_VIDEO_MXS)
-       lcdif_power_down();
-#endif
-}
-
-void set_chipselect_size(int const cs_size)
-{
-       unsigned int reg;
-       struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
-       reg = readl(&iomuxc_regs->gpr[1]);
-
-       switch (cs_size) {
-       case CS0_128:
-               reg &= ~0x7;    /* CS0=128MB, CS1=0, CS2=0, CS3=0 */
-               reg |= 0x5;
-               break;
-       case CS0_64M_CS1_64M:
-               reg &= ~0x3F;   /* CS0=64MB, CS1=64MB, CS2=0, CS3=0 */
-               reg |= 0x1B;
-               break;
-       case CS0_64M_CS1_32M_CS2_32M:
-               reg &= ~0x1FF;  /* CS0=64MB, CS1=32MB, CS2=32MB, CS3=0 */
-               reg |= 0x4B;
-               break;
-       case CS0_32M_CS1_32M_CS2_32M_CS3_32M:
-               reg &= ~0xFFF;  /* CS0=32MB, CS1=32MB, CS2=32MB, CS3=32MB */
-               reg |= 0x249;
-               break;
-       default:
-               printf("Unknown chip select size: %d\n", cs_size);
-               break;
-       }
-
-       writel(reg, &iomuxc_regs->gpr[1]);
-}
diff --git a/arch/arm/imx-common/ddrmc-vf610.c b/arch/arm/imx-common/ddrmc-vf610.c
deleted file mode 100644 (file)
index 9bc56f6..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2015 Toradex, Inc.
- *
- * Based on vf610twr:
- * Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux-vf610.h>
-#include <asm/arch/ddrmc-vf610.h>
-
-void ddrmc_setup_iomux(const iomux_v3_cfg_t *pads, int pads_count)
-{
-       static const iomux_v3_cfg_t default_pads[] = {
-               VF610_PAD_DDR_A15__DDR_A_15,
-               VF610_PAD_DDR_A14__DDR_A_14,
-               VF610_PAD_DDR_A13__DDR_A_13,
-               VF610_PAD_DDR_A12__DDR_A_12,
-               VF610_PAD_DDR_A11__DDR_A_11,
-               VF610_PAD_DDR_A10__DDR_A_10,
-               VF610_PAD_DDR_A9__DDR_A_9,
-               VF610_PAD_DDR_A8__DDR_A_8,
-               VF610_PAD_DDR_A7__DDR_A_7,
-               VF610_PAD_DDR_A6__DDR_A_6,
-               VF610_PAD_DDR_A5__DDR_A_5,
-               VF610_PAD_DDR_A4__DDR_A_4,
-               VF610_PAD_DDR_A3__DDR_A_3,
-               VF610_PAD_DDR_A2__DDR_A_2,
-               VF610_PAD_DDR_A1__DDR_A_1,
-               VF610_PAD_DDR_A0__DDR_A_0,
-               VF610_PAD_DDR_BA2__DDR_BA_2,
-               VF610_PAD_DDR_BA1__DDR_BA_1,
-               VF610_PAD_DDR_BA0__DDR_BA_0,
-               VF610_PAD_DDR_CAS__DDR_CAS_B,
-               VF610_PAD_DDR_CKE__DDR_CKE_0,
-               VF610_PAD_DDR_CLK__DDR_CLK_0,
-               VF610_PAD_DDR_CS__DDR_CS_B_0,
-               VF610_PAD_DDR_D15__DDR_D_15,
-               VF610_PAD_DDR_D14__DDR_D_14,
-               VF610_PAD_DDR_D13__DDR_D_13,
-               VF610_PAD_DDR_D12__DDR_D_12,
-               VF610_PAD_DDR_D11__DDR_D_11,
-               VF610_PAD_DDR_D10__DDR_D_10,
-               VF610_PAD_DDR_D9__DDR_D_9,
-               VF610_PAD_DDR_D8__DDR_D_8,
-               VF610_PAD_DDR_D7__DDR_D_7,
-               VF610_PAD_DDR_D6__DDR_D_6,
-               VF610_PAD_DDR_D5__DDR_D_5,
-               VF610_PAD_DDR_D4__DDR_D_4,
-               VF610_PAD_DDR_D3__DDR_D_3,
-               VF610_PAD_DDR_D2__DDR_D_2,
-               VF610_PAD_DDR_D1__DDR_D_1,
-               VF610_PAD_DDR_D0__DDR_D_0,
-               VF610_PAD_DDR_DQM1__DDR_DQM_1,
-               VF610_PAD_DDR_DQM0__DDR_DQM_0,
-               VF610_PAD_DDR_DQS1__DDR_DQS_1,
-               VF610_PAD_DDR_DQS0__DDR_DQS_0,
-               VF610_PAD_DDR_RAS__DDR_RAS_B,
-               VF610_PAD_DDR_WE__DDR_WE_B,
-               VF610_PAD_DDR_ODT1__DDR_ODT_0,
-               VF610_PAD_DDR_ODT0__DDR_ODT_1,
-               VF610_PAD_DDR_RESETB,
-       };
-
-       if ((pads == NULL) || (pads_count == 0)) {
-               pads = default_pads;
-               pads_count = ARRAY_SIZE(default_pads);
-       }
-
-       imx_iomux_v3_setup_multiple_pads(pads, pads_count);
-}
-
-static struct ddrmc_phy_setting default_phy_settings[] = {
-       { DDRMC_PHY_DQ_TIMING,  0 },
-       { DDRMC_PHY_DQ_TIMING, 16 },
-       { DDRMC_PHY_DQ_TIMING, 32 },
-
-       { DDRMC_PHY_DQS_TIMING,  1 },
-       { DDRMC_PHY_DQS_TIMING, 17 },
-
-       { DDRMC_PHY_CTRL,  2 },
-       { DDRMC_PHY_CTRL, 18 },
-       { DDRMC_PHY_CTRL, 34 },
-
-       { DDRMC_PHY_MASTER_CTRL,  3 },
-       { DDRMC_PHY_MASTER_CTRL, 19 },
-       { DDRMC_PHY_MASTER_CTRL, 35 },
-
-       { DDRMC_PHY_SLAVE_CTRL,  4 },
-       { DDRMC_PHY_SLAVE_CTRL, 20 },
-       { DDRMC_PHY_SLAVE_CTRL, 36 },
-
-       /* LPDDR2 only parameter */
-       { DDRMC_PHY_OFF, 49 },
-
-       { DDRMC_PHY50_DDR3_MODE | DDRMC_PHY50_EN_SW_HALF_CYCLE, 50 },
-
-       /* Processor Pad ODT settings */
-       { DDRMC_PHY_PROC_PAD_ODT, 52 },
-
-       /* end marker */
-       { 0, -1 }
-};
-
-void ddrmc_ctrl_init_ddr3(struct ddr3_jedec_timings const *timings,
-                         struct ddrmc_cr_setting *board_cr_settings,
-                         struct ddrmc_phy_setting *board_phy_settings,
-                         int col_diff, int row_diff)
-{
-       struct ddrmr_regs *ddrmr = (struct ddrmr_regs *)DDR_BASE_ADDR;
-       struct ddrmc_cr_setting *cr_setting;
-       struct ddrmc_phy_setting *phy_setting;
-
-       writel(DDRMC_CR00_DRAM_CLASS_DDR3, &ddrmr->cr[0]);
-       writel(DDRMC_CR02_DRAM_TINIT(timings->tinit), &ddrmr->cr[2]);
-       writel(DDRMC_CR10_TRST_PWRON(timings->trst_pwron), &ddrmr->cr[10]);
-
-       writel(DDRMC_CR11_CKE_INACTIVE(timings->cke_inactive), &ddrmr->cr[11]);
-       writel(DDRMC_CR12_WRLAT(timings->wrlat) |
-                  DDRMC_CR12_CASLAT_LIN(timings->caslat_lin), &ddrmr->cr[12]);
-       writel(DDRMC_CR13_TRC(timings->trc) | DDRMC_CR13_TRRD(timings->trrd) |
-                  DDRMC_CR13_TCCD(timings->tccd) |
-                  DDRMC_CR13_TBST_INT_INTERVAL(timings->tbst_int_interval),
-                  &ddrmr->cr[13]);
-       writel(DDRMC_CR14_TFAW(timings->tfaw) | DDRMC_CR14_TRP(timings->trp) |
-                  DDRMC_CR14_TWTR(timings->twtr) |
-                  DDRMC_CR14_TRAS_MIN(timings->tras_min), &ddrmr->cr[14]);
-       writel(DDRMC_CR16_TMRD(timings->tmrd) |
-                  DDRMC_CR16_TRTP(timings->trtp), &ddrmr->cr[16]);
-       writel(DDRMC_CR17_TRAS_MAX(timings->tras_max) |
-                  DDRMC_CR17_TMOD(timings->tmod), &ddrmr->cr[17]);
-       writel(DDRMC_CR18_TCKESR(timings->tckesr) |
-                  DDRMC_CR18_TCKE(timings->tcke), &ddrmr->cr[18]);
-
-       writel(DDRMC_CR20_AP_EN, &ddrmr->cr[20]);
-       writel(DDRMC_CR21_TRCD_INT(timings->trcd_int) | DDRMC_CR21_CCMAP_EN |
-                  DDRMC_CR21_TRAS_LOCKOUT(timings->tras_lockout),
-                  &ddrmr->cr[21]);
-
-       writel(DDRMC_CR22_TDAL(timings->tdal), &ddrmr->cr[22]);
-       writel(DDRMC_CR23_BSTLEN(timings->bstlen) |
-                  DDRMC_CR23_TDLL(timings->tdll), &ddrmr->cr[23]);
-       writel(DDRMC_CR24_TRP_AB(timings->trp_ab), &ddrmr->cr[24]);
-
-       writel(DDRMC_CR25_TREF_EN, &ddrmr->cr[25]);
-       writel(DDRMC_CR26_TREF(timings->tref) |
-                  DDRMC_CR26_TRFC(timings->trfc), &ddrmr->cr[26]);
-       writel(DDRMC_CR28_TREF_INT(timings->tref_int), &ddrmr->cr[28]);
-       writel(DDRMC_CR29_TPDEX(timings->tpdex), &ddrmr->cr[29]);
-
-       writel(DDRMC_CR30_TXPDLL(timings->txpdll), &ddrmr->cr[30]);
-       writel(DDRMC_CR31_TXSNR(timings->txsnr) |
-                  DDRMC_CR31_TXSR(timings->txsr), &ddrmr->cr[31]);
-       writel(DDRMC_CR33_EN_QK_SREF, &ddrmr->cr[33]);
-       writel(DDRMC_CR34_CKSRX(timings->cksrx) |
-                  DDRMC_CR34_CKSRE(timings->cksre), &ddrmr->cr[34]);
-
-       writel(DDRMC_CR38_FREQ_CHG_EN(timings->freq_chg_en), &ddrmr->cr[38]);
-       writel(DDRMC_CR39_PHY_INI_COM(1024) | DDRMC_CR39_PHY_INI_STA(16) |
-                  DDRMC_CR39_FRQ_CH_DLLOFF(2), &ddrmr->cr[39]);
-
-       writel(DDRMC_CR41_PHY_INI_STRT_INI_DIS, &ddrmr->cr[41]);
-       writel(DDRMC_CR48_MR1_DA_0(70) |
-                  DDRMC_CR48_MR0_DA_0(1056), &ddrmr->cr[48]);
-
-       writel(DDRMC_CR66_ZQCL(timings->zqcl) |
-                  DDRMC_CR66_ZQINIT(timings->zqinit), &ddrmr->cr[66]);
-       writel(DDRMC_CR67_ZQCS(timings->zqcs), &ddrmr->cr[67]);
-       writel(DDRMC_CR69_ZQ_ON_SREF_EX(2), &ddrmr->cr[69]);
-
-       writel(DDRMC_CR70_REF_PER_ZQ(timings->ref_per_zq), &ddrmr->cr[70]);
-       writel(DDRMC_CR72_ZQCS_ROTATE(timings->zqcs_rotate), &ddrmr->cr[72]);
-
-       writel(DDRMC_CR73_APREBIT(timings->aprebit) |
-                  DDRMC_CR73_COL_DIFF(col_diff) |
-                  DDRMC_CR73_ROW_DIFF(row_diff), &ddrmr->cr[73]);
-       writel(DDRMC_CR74_BANKSPLT_EN | DDRMC_CR74_ADDR_CMP_EN |
-                  DDRMC_CR74_CMD_AGE_CNT(timings->cmd_age_cnt) |
-                  DDRMC_CR74_AGE_CNT(timings->age_cnt),
-                  &ddrmr->cr[74]);
-       writel(DDRMC_CR75_RW_PG_EN | DDRMC_CR75_RW_EN | DDRMC_CR75_PRI_EN |
-                  DDRMC_CR75_PLEN, &ddrmr->cr[75]);
-       writel(DDRMC_CR76_NQENT_ACTDIS(3) | DDRMC_CR76_D_RW_G_BKCN(3) |
-                  DDRMC_CR76_W2R_SPLT_EN, &ddrmr->cr[76]);
-       writel(DDRMC_CR77_CS_MAP | DDRMC_CR77_DI_RD_INTLEAVE |
-                  DDRMC_CR77_SWAP_EN, &ddrmr->cr[77]);
-       writel(DDRMC_CR78_Q_FULLNESS(timings->q_fullness) |
-                  DDRMC_CR78_BUR_ON_FLY_BIT(12), &ddrmr->cr[78]);
-       writel(DDRMC_CR79_CTLUPD_AREF(0), &ddrmr->cr[79]);
-
-       writel(DDRMC_CR82_INT_MASK, &ddrmr->cr[82]);
-
-       writel(DDRMC_CR87_ODT_RD_MAPCS0(timings->odt_rd_mapcs0) |
-                  DDRMC_CR87_ODT_WR_MAPCS0(timings->odt_wr_mapcs0),
-                  &ddrmr->cr[87]);
-       writel(DDRMC_CR88_TODTL_CMD(4), &ddrmr->cr[88]);
-       writel(DDRMC_CR89_AODT_RWSMCS(2), &ddrmr->cr[89]);
-
-       writel(DDRMC_CR91_R2W_SMCSDL(2), &ddrmr->cr[91]);
-       writel(DDRMC_CR96_WLMRD(timings->wlmrd) |
-                  DDRMC_CR96_WLDQSEN(timings->wldqsen), &ddrmr->cr[96]);
-
-       /* execute custom CR setting sequence (may be NULL) */
-       cr_setting = board_cr_settings;
-       if (cr_setting != NULL)
-               while (cr_setting->cr_rnum >= 0) {
-                       writel(cr_setting->setting,
-                              &ddrmr->cr[cr_setting->cr_rnum]);
-                       cr_setting++;
-               }
-
-       /* perform default PHY settings (may be overridden by custom settings */
-       phy_setting = default_phy_settings;
-       while (phy_setting->phy_rnum >= 0) {
-               writel(phy_setting->setting,
-                      &ddrmr->phy[phy_setting->phy_rnum]);
-               phy_setting++;
-       }
-
-       /* execute custom PHY setting sequence (may be NULL) */
-       phy_setting = board_phy_settings;
-       if (phy_setting != NULL)
-               while (phy_setting->phy_rnum >= 0) {
-                       writel(phy_setting->setting,
-                              &ddrmr->phy[phy_setting->phy_rnum]);
-                       phy_setting++;
-               }
-
-       /* all inits done, start the DDR controller */
-       writel(DDRMC_CR00_DRAM_CLASS_DDR3 | DDRMC_CR00_START, &ddrmr->cr[0]);
-
-       while (!(readl(&ddrmr->cr[80]) && 0x100))
-               udelay(10);
-}
diff --git a/arch/arm/imx-common/hab.c b/arch/arm/imx-common/hab.c
deleted file mode 100644 (file)
index 523d0e3..0000000
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <config.h>
-#include <fuse.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/imx-common/hab.h>
-
-/* -------- start of HAB API updates ------------*/
-
-#define hab_rvt_report_event_p                                 \
-(                                                              \
-       (is_mx6dqp()) ?                                         \
-       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
-       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
-       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
-       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
-       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
-       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT)        \
-)
-
-#define hab_rvt_report_status_p                                        \
-(                                                              \
-       (is_mx6dqp()) ?                                         \
-       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
-       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
-       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
-       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
-       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
-       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS)      \
-)
-
-#define hab_rvt_authenticate_image_p                           \
-(                                                              \
-       (is_mx6dqp()) ?                                         \
-       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
-       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
-       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
-       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
-       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
-       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE)    \
-)
-
-#define hab_rvt_entry_p                                                \
-(                                                              \
-       (is_mx6dqp()) ?                                         \
-       ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
-       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
-       ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
-       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
-       ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
-       ((hab_rvt_entry_t *)HAB_RVT_ENTRY)                      \
-)
-
-#define hab_rvt_exit_p                                         \
-(                                                              \
-       (is_mx6dqp()) ?                                         \
-       ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
-       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
-       ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
-       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
-       ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
-       ((hab_rvt_exit_t *)HAB_RVT_EXIT)                        \
-)
-
-#define IVT_SIZE               0x20
-#define ALIGN_SIZE             0x1000
-#define CSF_PAD_SIZE           0x2000
-#define MX6DQ_PU_IROM_MMU_EN_VAR       0x009024a8
-#define MX6DLS_PU_IROM_MMU_EN_VAR      0x00901dd0
-#define MX6SL_PU_IROM_MMU_EN_VAR       0x00900a18
-#define IS_HAB_ENABLED_BIT \
-       (is_soc_type(MXC_SOC_MX7ULP) ? 0x80000000 :     \
-        (is_soc_type(MXC_SOC_MX7) ? 0x2000000 : 0x2))
-
-/*
- * +------------+  0x0 (DDR_UIMAGE_START) -
- * |   Header   |                          |
- * +------------+  0x40                    |
- * |            |                          |
- * |            |                          |
- * |            |                          |
- * |            |                          |
- * | Image Data |                          |
- * .            |                          |
- * .            |                           > Stuff to be authenticated ----+
- * .            |                          |                                |
- * |            |                          |                                |
- * |            |                          |                                |
- * +------------+                          |                                |
- * |            |                          |                                |
- * | Fill Data  |                          |                                |
- * |            |                          |                                |
- * +------------+ Align to ALIGN_SIZE      |                                |
- * |    IVT     |                          |                                |
- * +------------+ + IVT_SIZE              -                                 |
- * |            |                                                           |
- * |  CSF DATA  | <---------------------------------------------------------+
- * |            |
- * +------------+
- * |            |
- * | Fill Data  |
- * |            |
- * +------------+ + CSF_PAD_SIZE
- */
-
-static bool is_hab_enabled(void);
-
-#if !defined(CONFIG_SPL_BUILD)
-
-#define MAX_RECORD_BYTES     (8*1024) /* 4 kbytes */
-
-struct record {
-       uint8_t  tag;                                           /* Tag */
-       uint8_t  len[2];                                        /* Length */
-       uint8_t  par;                                           /* Version */
-       uint8_t  contents[MAX_RECORD_BYTES];/* Record Data */
-       bool     any_rec_flag;
-};
-
-char *rsn_str[] = {"RSN = HAB_RSN_ANY (0x00)\n",
-                                  "RSN = HAB_ENG_FAIL (0x30)\n",
-                                  "RSN = HAB_INV_ADDRESS (0x22)\n",
-                                  "RSN = HAB_INV_ASSERTION (0x0C)\n",
-                                  "RSN = HAB_INV_CALL (0x28)\n",
-                                  "RSN = HAB_INV_CERTIFICATE (0x21)\n",
-                                  "RSN = HAB_INV_COMMAND (0x06)\n",
-                                  "RSN = HAB_INV_CSF (0x11)\n",
-                                  "RSN = HAB_INV_DCD (0x27)\n",
-                                  "RSN = HAB_INV_INDEX (0x0F)\n",
-                                  "RSN = HAB_INV_IVT (0x05)\n",
-                                  "RSN = HAB_INV_KEY (0x1D)\n",
-                                  "RSN = HAB_INV_RETURN (0x1E)\n",
-                                  "RSN = HAB_INV_SIGNATURE (0x18)\n",
-                                  "RSN = HAB_INV_SIZE (0x17)\n",
-                                  "RSN = HAB_MEM_FAIL (0x2E)\n",
-                                  "RSN = HAB_OVR_COUNT (0x2B)\n",
-                                  "RSN = HAB_OVR_STORAGE (0x2D)\n",
-                                  "RSN = HAB_UNS_ALGORITHM (0x12)\n",
-                                  "RSN = HAB_UNS_COMMAND (0x03)\n",
-                                  "RSN = HAB_UNS_ENGINE (0x0A)\n",
-                                  "RSN = HAB_UNS_ITEM (0x24)\n",
-                                  "RSN = HAB_UNS_KEY (0x1B)\n",
-                                  "RSN = HAB_UNS_PROTOCOL (0x14)\n",
-                                  "RSN = HAB_UNS_STATE (0x09)\n",
-                                  "RSN = INVALID\n",
-                                  NULL};
-
-char *sts_str[] = {"STS = HAB_SUCCESS (0xF0)\n",
-                                  "STS = HAB_FAILURE (0x33)\n",
-                                  "STS = HAB_WARNING (0x69)\n",
-                                  "STS = INVALID\n",
-                                  NULL};
-
-char *eng_str[] = {"ENG = HAB_ENG_ANY (0x00)\n",
-                                  "ENG = HAB_ENG_SCC (0x03)\n",
-                                  "ENG = HAB_ENG_RTIC (0x05)\n",
-                                  "ENG = HAB_ENG_SAHARA (0x06)\n",
-                                  "ENG = HAB_ENG_CSU (0x0A)\n",
-                                  "ENG = HAB_ENG_SRTC (0x0C)\n",
-                                  "ENG = HAB_ENG_DCP (0x1B)\n",
-                                  "ENG = HAB_ENG_CAAM (0x1D)\n",
-                                  "ENG = HAB_ENG_SNVS (0x1E)\n",
-                                  "ENG = HAB_ENG_OCOTP (0x21)\n",
-                                  "ENG = HAB_ENG_DTCP (0x22)\n",
-                                  "ENG = HAB_ENG_ROM (0x36)\n",
-                                  "ENG = HAB_ENG_HDCP (0x24)\n",
-                                  "ENG = HAB_ENG_RTL (0x77)\n",
-                                  "ENG = HAB_ENG_SW (0xFF)\n",
-                                  "ENG = INVALID\n",
-                                  NULL};
-
-char *ctx_str[] = {"CTX = HAB_CTX_ANY(0x00)\n",
-                                  "CTX = HAB_CTX_FAB (0xFF)\n",
-                                  "CTX = HAB_CTX_ENTRY (0xE1)\n",
-                                  "CTX = HAB_CTX_TARGET (0x33)\n",
-                                  "CTX = HAB_CTX_AUTHENTICATE (0x0A)\n",
-                                  "CTX = HAB_CTX_DCD (0xDD)\n",
-                                  "CTX = HAB_CTX_CSF (0xCF)\n",
-                                  "CTX = HAB_CTX_COMMAND (0xC0)\n",
-                                  "CTX = HAB_CTX_AUT_DAT (0xDB)\n",
-                                  "CTX = HAB_CTX_ASSERT (0xA0)\n",
-                                  "CTX = HAB_CTX_EXIT (0xEE)\n",
-                                  "CTX = INVALID\n",
-                                  NULL};
-
-uint8_t hab_statuses[5] = {
-       HAB_STS_ANY,
-       HAB_FAILURE,
-       HAB_WARNING,
-       HAB_SUCCESS,
-       -1
-};
-
-uint8_t hab_reasons[26] = {
-       HAB_RSN_ANY,
-       HAB_ENG_FAIL,
-       HAB_INV_ADDRESS,
-       HAB_INV_ASSERTION,
-       HAB_INV_CALL,
-       HAB_INV_CERTIFICATE,
-       HAB_INV_COMMAND,
-       HAB_INV_CSF,
-       HAB_INV_DCD,
-       HAB_INV_INDEX,
-       HAB_INV_IVT,
-       HAB_INV_KEY,
-       HAB_INV_RETURN,
-       HAB_INV_SIGNATURE,
-       HAB_INV_SIZE,
-       HAB_MEM_FAIL,
-       HAB_OVR_COUNT,
-       HAB_OVR_STORAGE,
-       HAB_UNS_ALGORITHM,
-       HAB_UNS_COMMAND,
-       HAB_UNS_ENGINE,
-       HAB_UNS_ITEM,
-       HAB_UNS_KEY,
-       HAB_UNS_PROTOCOL,
-       HAB_UNS_STATE,
-       -1
-};
-
-uint8_t hab_contexts[12] = {
-       HAB_CTX_ANY,
-       HAB_CTX_FAB,
-       HAB_CTX_ENTRY,
-       HAB_CTX_TARGET,
-       HAB_CTX_AUTHENTICATE,
-       HAB_CTX_DCD,
-       HAB_CTX_CSF,
-       HAB_CTX_COMMAND,
-       HAB_CTX_AUT_DAT,
-       HAB_CTX_ASSERT,
-       HAB_CTX_EXIT,
-       -1
-};
-
-uint8_t hab_engines[16] = {
-       HAB_ENG_ANY,
-       HAB_ENG_SCC,
-       HAB_ENG_RTIC,
-       HAB_ENG_SAHARA,
-       HAB_ENG_CSU,
-       HAB_ENG_SRTC,
-       HAB_ENG_DCP,
-       HAB_ENG_CAAM,
-       HAB_ENG_SNVS,
-       HAB_ENG_OCOTP,
-       HAB_ENG_DTCP,
-       HAB_ENG_ROM,
-       HAB_ENG_HDCP,
-       HAB_ENG_RTL,
-       HAB_ENG_SW,
-       -1
-};
-
-static inline uint8_t get_idx(uint8_t *list, uint8_t tgt)
-{
-       uint8_t idx = 0;
-       uint8_t element = list[idx];
-       while (element != -1) {
-               if (element == tgt)
-                       return idx;
-               element = list[++idx];
-       }
-       return -1;
-}
-
-void process_event_record(uint8_t *event_data, size_t bytes)
-{
-       struct record *rec = (struct record *)event_data;
-
-       printf("\n\n%s", sts_str[get_idx(hab_statuses, rec->contents[0])]);
-       printf("%s", rsn_str[get_idx(hab_reasons, rec->contents[1])]);
-       printf("%s", ctx_str[get_idx(hab_contexts, rec->contents[2])]);
-       printf("%s", eng_str[get_idx(hab_engines, rec->contents[3])]);
-}
-
-void display_event(uint8_t *event_data, size_t bytes)
-{
-       uint32_t i;
-
-       if (!(event_data && bytes > 0))
-               return;
-
-       for (i = 0; i < bytes; i++) {
-               if (i == 0)
-                       printf("\t0x%02x", event_data[i]);
-               else if ((i % 8) == 0)
-                       printf("\n\t0x%02x", event_data[i]);
-               else
-                       printf(" 0x%02x", event_data[i]);
-       }
-
-       process_event_record(event_data, bytes);
-}
-
-int get_hab_status(void)
-{
-       uint32_t index = 0; /* Loop index */
-       uint8_t event_data[128]; /* Event data buffer */
-       size_t bytes = sizeof(event_data); /* Event size in bytes */
-       enum hab_config config = 0;
-       enum hab_state state = 0;
-       hab_rvt_report_event_t *hab_rvt_report_event;
-       hab_rvt_report_status_t *hab_rvt_report_status;
-
-       hab_rvt_report_event = hab_rvt_report_event_p;
-       hab_rvt_report_status = hab_rvt_report_status_p;
-
-       if (is_hab_enabled())
-               puts("\nSecure boot enabled\n");
-       else
-               puts("\nSecure boot disabled\n");
-
-       /* Check HAB status */
-       if (hab_rvt_report_status(&config, &state) != HAB_SUCCESS) {
-               printf("\nHAB Configuration: 0x%02x, HAB State: 0x%02x\n",
-                      config, state);
-
-               /* Display HAB Error events */
-               while (hab_rvt_report_event(HAB_FAILURE, index, event_data,
-                                       &bytes) == HAB_SUCCESS) {
-                       puts("\n");
-                       printf("--------- HAB Event %d -----------------\n",
-                              index + 1);
-                       puts("event data:\n");
-                       display_event(event_data, bytes);
-                       puts("\n");
-                       bytes = sizeof(event_data);
-                       index++;
-               }
-       }
-       /* Display message if no HAB events are found */
-       else {
-               printf("\nHAB Configuration: 0x%02x, HAB State: 0x%02x\n",
-                      config, state);
-               puts("No HAB Events Found!\n\n");
-       }
-       return 0;
-}
-
-int do_hab_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       if ((argc != 1)) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
-
-       get_hab_status();
-
-       return 0;
-}
-
-static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
-{
-       ulong   addr, ivt_offset;
-       int     rcode = 0;
-
-       if (argc < 3)
-               return CMD_RET_USAGE;
-
-       addr = simple_strtoul(argv[1], NULL, 16);
-       ivt_offset = simple_strtoul(argv[2], NULL, 16);
-
-       rcode = authenticate_image(addr, ivt_offset);
-
-       return rcode;
-}
-
-U_BOOT_CMD(
-               hab_status, CONFIG_SYS_MAXARGS, 1, do_hab_status,
-               "display HAB status",
-               ""
-         );
-
-U_BOOT_CMD(
-               hab_auth_img, 3, 0, do_authenticate_image,
-               "authenticate image via HAB",
-               "addr ivt_offset\n"
-               "addr - image hex address\n"
-               "ivt_offset - hex offset of IVT in the image"
-         );
-
-
-#endif /* !defined(CONFIG_SPL_BUILD) */
-
-static bool is_hab_enabled(void)
-{
-       struct imx_sec_config_fuse_t *fuse =
-               (struct imx_sec_config_fuse_t *)&imx_sec_config_fuse;
-       uint32_t reg;
-       int ret;
-
-       ret = fuse_read(fuse->bank, fuse->word, &reg);
-       if (ret) {
-               puts("\nSecure boot fuse read error\n");
-               return ret;
-       }
-
-       return (reg & IS_HAB_ENABLED_BIT) == IS_HAB_ENABLED_BIT;
-}
-
-uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size)
-{
-       uint32_t load_addr = 0;
-       size_t bytes;
-       ptrdiff_t ivt_offset = 0;
-       int result = 0;
-       ulong start;
-       hab_rvt_authenticate_image_t *hab_rvt_authenticate_image;
-       hab_rvt_entry_t *hab_rvt_entry;
-       hab_rvt_exit_t *hab_rvt_exit;
-
-       hab_rvt_authenticate_image = hab_rvt_authenticate_image_p;
-       hab_rvt_entry = hab_rvt_entry_p;
-       hab_rvt_exit = hab_rvt_exit_p;
-
-       if (is_hab_enabled()) {
-               printf("\nAuthenticate image from DDR location 0x%x...\n",
-                      ddr_start);
-
-               hab_caam_clock_enable(1);
-
-               if (hab_rvt_entry() == HAB_SUCCESS) {
-                       /* If not already aligned, Align to ALIGN_SIZE */
-                       ivt_offset = (image_size + ALIGN_SIZE - 1) &
-                                       ~(ALIGN_SIZE - 1);
-
-                       start = ddr_start;
-                       bytes = ivt_offset + IVT_SIZE + CSF_PAD_SIZE;
-#ifdef DEBUG
-                       printf("\nivt_offset = 0x%x, ivt addr = 0x%x\n",
-                              ivt_offset, ddr_start + ivt_offset);
-                       puts("Dumping IVT\n");
-                       print_buffer(ddr_start + ivt_offset,
-                                    (void *)(ddr_start + ivt_offset),
-                                    4, 0x8, 0);
-
-                       puts("Dumping CSF Header\n");
-                       print_buffer(ddr_start + ivt_offset+IVT_SIZE,
-                                    (void *)(ddr_start + ivt_offset+IVT_SIZE),
-                                    4, 0x10, 0);
-
-#if  !defined(CONFIG_SPL_BUILD)
-                       get_hab_status();
-#endif
-
-                       puts("\nCalling authenticate_image in ROM\n");
-                       printf("\tivt_offset = 0x%x\n", ivt_offset);
-                       printf("\tstart = 0x%08lx\n", start);
-                       printf("\tbytes = 0x%x\n", bytes);
-#endif
-                       /*
-                        * If the MMU is enabled, we have to notify the ROM
-                        * code, or it won't flush the caches when needed.
-                        * This is done, by setting the "pu_irom_mmu_enabled"
-                        * word to 1. You can find its address by looking in
-                        * the ROM map. This is critical for
-                        * authenticate_image(). If MMU is enabled, without
-                        * setting this bit, authentication will fail and may
-                        * crash.
-                        */
-                       /* Check MMU enabled */
-                       if (is_soc_type(MXC_SOC_MX6) && get_cr() & CR_M) {
-                               if (is_mx6dq()) {
-                                       /*
-                                        * This won't work on Rev 1.0.0 of
-                                        * i.MX6Q/D, since their ROM doesn't
-                                        * do cache flushes. don't think any
-                                        * exist, so we ignore them.
-                                        */
-                                       if (!is_mx6dqp())
-                                               writel(1, MX6DQ_PU_IROM_MMU_EN_VAR);
-                               } else if (is_mx6sdl()) {
-                                       writel(1, MX6DLS_PU_IROM_MMU_EN_VAR);
-                               } else if (is_mx6sl()) {
-                                       writel(1, MX6SL_PU_IROM_MMU_EN_VAR);
-                               }
-                       }
-
-                       load_addr = (uint32_t)hab_rvt_authenticate_image(
-                                       HAB_CID_UBOOT,
-                                       ivt_offset, (void **)&start,
-                                       (size_t *)&bytes, NULL);
-                       if (hab_rvt_exit() != HAB_SUCCESS) {
-                               puts("hab exit function fail\n");
-                               load_addr = 0;
-                       }
-               } else {
-                       puts("hab entry function fail\n");
-               }
-
-               hab_caam_clock_enable(0);
-
-#if !defined(CONFIG_SPL_BUILD)
-               get_hab_status();
-#endif
-       } else {
-               puts("hab fuse not enabled\n");
-       }
-
-       if ((!is_hab_enabled()) || (load_addr != 0))
-               result = 1;
-
-       return result;
-}
diff --git a/arch/arm/imx-common/i2c-mxv7.c b/arch/arm/imx-common/i2c-mxv7.c
deleted file mode 100644 (file)
index ae8809c..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2012 Boundary Devices Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#include <common.h>
-#include <malloc.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/imx-regs.h>
-#include <linux/errno.h>
-#include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <watchdog.h>
-
-int force_idle_bus(void *priv)
-{
-       int i;
-       int sda, scl;
-       ulong elapsed, start_time;
-       struct i2c_pads_info *p = (struct i2c_pads_info *)priv;
-       int ret = 0;
-
-       gpio_direction_input(p->sda.gp);
-       gpio_direction_input(p->scl.gp);
-
-       imx_iomux_v3_setup_pad(p->sda.gpio_mode);
-       imx_iomux_v3_setup_pad(p->scl.gpio_mode);
-
-       sda = gpio_get_value(p->sda.gp);
-       scl = gpio_get_value(p->scl.gp);
-       if ((sda & scl) == 1)
-               goto exit;              /* Bus is idle already */
-
-       printf("%s: sda=%d scl=%d sda.gp=0x%x scl.gp=0x%x\n", __func__,
-               sda, scl, p->sda.gp, p->scl.gp);
-       /* Send high and low on the SCL line */
-       for (i = 0; i < 9; i++) {
-               gpio_direction_output(p->scl.gp, 0);
-               udelay(50);
-               gpio_direction_input(p->scl.gp);
-               udelay(50);
-       }
-       start_time = get_timer(0);
-       for (;;) {
-               sda = gpio_get_value(p->sda.gp);
-               scl = gpio_get_value(p->scl.gp);
-               if ((sda & scl) == 1)
-                       break;
-               WATCHDOG_RESET();
-               elapsed = get_timer(start_time);
-               if (elapsed > (CONFIG_SYS_HZ / 5)) {    /* .2 seconds */
-                       ret = -EBUSY;
-                       printf("%s: failed to clear bus, sda=%d scl=%d\n",
-                                       __func__, sda, scl);
-                       break;
-               }
-       }
-exit:
-       imx_iomux_v3_setup_pad(p->sda.i2c_mode);
-       imx_iomux_v3_setup_pad(p->scl.i2c_mode);
-       return ret;
-}
-
-static void * const i2c_bases[] = {
-       (void *)I2C1_BASE_ADDR,
-       (void *)I2C2_BASE_ADDR,
-#ifdef I2C3_BASE_ADDR
-       (void *)I2C3_BASE_ADDR,
-#endif
-#ifdef I2C4_BASE_ADDR
-       (void *)I2C4_BASE_ADDR,
-#endif
-};
-
-/* i2c_index can be from 0 - 3 */
-int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
-             struct i2c_pads_info *p)
-{
-       char name[9];
-       int ret;
-
-       if (i2c_index >= ARRAY_SIZE(i2c_bases))
-               return -EINVAL;
-
-       snprintf(name, sizeof(name), "i2c_sda%01d", i2c_index);
-       ret = gpio_request(p->sda.gp, name);
-       if (ret)
-               return ret;
-
-       snprintf(name, sizeof(name), "i2c_scl%01d", i2c_index);
-       ret = gpio_request(p->scl.gp, name);
-       if (ret)
-               goto err_req;
-
-       /* Enable i2c clock */
-       ret = enable_i2c_clk(1, i2c_index);
-       if (ret)
-               goto err_clk;
-
-       /* Make sure bus is idle */
-       ret = force_idle_bus(p);
-       if (ret)
-               goto err_idle;
-
-#ifndef CONFIG_DM_I2C
-       bus_i2c_init(i2c_index, speed, slave_addr, force_idle_bus, p);
-#endif
-
-       return 0;
-
-err_idle:
-err_clk:
-       gpio_free(p->scl.gp);
-err_req:
-       gpio_free(p->sda.gp);
-
-       return ret;
-}
diff --git a/arch/arm/imx-common/imx_bootaux.c b/arch/arm/imx-common/imx_bootaux.c
deleted file mode 100644 (file)
index 69026df..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-
-/* Allow for arch specific config before we boot */
-static int __arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
-{
-       /* please define platform specific arch_auxiliary_core_up() */
-       return CMD_RET_FAILURE;
-}
-
-int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
-       __attribute__((weak, alias("__arch_auxiliary_core_up")));
-
-/* Allow for arch specific config before we boot */
-static int __arch_auxiliary_core_check_up(u32 core_id)
-{
-       /* please define platform specific arch_auxiliary_core_check_up() */
-       return 0;
-}
-
-int arch_auxiliary_core_check_up(u32 core_id)
-       __attribute__((weak, alias("__arch_auxiliary_core_check_up")));
-
-/*
- * To i.MX6SX and i.MX7D, the image supported by bootaux needs
- * the reset vector at the head for the image, with SP and PC
- * as the first two words.
- *
- * Per the cortex-M reference manual, the reset vector of M4 needs
- * to exist at 0x0 (TCMUL). The PC and SP are the first two addresses
- * of that vector.  So to boot M4, the A core must build the M4's reset
- * vector with getting the PC and SP from image and filling them to
- * TCMUL. When M4 is kicked, it will load the PC and SP by itself.
- * The TCMUL is mapped to (M4_BOOTROM_BASE_ADDR) at A core side for
- * accessing the M4 TCMUL.
- */
-int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       ulong addr;
-       int ret, up;
-
-       if (argc < 2)
-               return CMD_RET_USAGE;
-
-       up = arch_auxiliary_core_check_up(0);
-       if (up) {
-               printf("## Auxiliary core is already up\n");
-               return CMD_RET_SUCCESS;
-       }
-
-       addr = simple_strtoul(argv[1], NULL, 16);
-
-       printf("## Starting auxiliary core at 0x%08lX ...\n", addr);
-
-       ret = arch_auxiliary_core_up(0, addr);
-       if (ret)
-               return CMD_RET_FAILURE;
-
-       return CMD_RET_SUCCESS;
-}
-
-U_BOOT_CMD(
-       bootaux, CONFIG_SYS_MAXARGS, 1, do_bootaux,
-       "Start auxiliary core",
-       ""
-);
diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c
deleted file mode 100644 (file)
index 5b4f828..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm/io.h>
-#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/arch/crm_regs.h>
-
-void init_aips(void)
-{
-       struct aipstz_regs *aips1, *aips2, *aips3;
-
-       aips1 = (struct aipstz_regs *)AIPS1_BASE_ADDR;
-       aips2 = (struct aipstz_regs *)AIPS2_BASE_ADDR;
-       aips3 = (struct aipstz_regs *)AIPS3_BASE_ADDR;
-
-       /*
-        * Set all MPROTx to be non-bufferable, trusted for R/W,
-        * not forced to user-mode.
-        */
-       writel(0x77777777, &aips1->mprot0);
-       writel(0x77777777, &aips1->mprot1);
-       writel(0x77777777, &aips2->mprot0);
-       writel(0x77777777, &aips2->mprot1);
-
-       /*
-        * Set all OPACRx to be non-bufferable, not require
-        * supervisor privilege level for access,allow for
-        * write access and untrusted master access.
-        */
-       writel(0x00000000, &aips1->opacr0);
-       writel(0x00000000, &aips1->opacr1);
-       writel(0x00000000, &aips1->opacr2);
-       writel(0x00000000, &aips1->opacr3);
-       writel(0x00000000, &aips1->opacr4);
-       writel(0x00000000, &aips2->opacr0);
-       writel(0x00000000, &aips2->opacr1);
-       writel(0x00000000, &aips2->opacr2);
-       writel(0x00000000, &aips2->opacr3);
-       writel(0x00000000, &aips2->opacr4);
-
-       if (is_mx6ull() || is_mx6sx() || is_mx7()) {
-               /*
-                * Set all MPROTx to be non-bufferable, trusted for R/W,
-                * not forced to user-mode.
-                */
-               writel(0x77777777, &aips3->mprot0);
-               writel(0x77777777, &aips3->mprot1);
-
-               /*
-                * Set all OPACRx to be non-bufferable, not require
-                * supervisor privilege level for access,allow for
-                * write access and untrusted master access.
-                */
-               writel(0x00000000, &aips3->opacr0);
-               writel(0x00000000, &aips3->opacr1);
-               writel(0x00000000, &aips3->opacr2);
-               writel(0x00000000, &aips3->opacr3);
-               writel(0x00000000, &aips3->opacr4);
-       }
-}
-
-void imx_set_wdog_powerdown(bool enable)
-{
-       struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR;
-       struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR;
-       struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR;
-#ifdef CONFIG_MX7D
-       struct wdog_regs *wdog4 = (struct wdog_regs *)WDOG4_BASE_ADDR;
-#endif
-
-       /* Write to the PDE (Power Down Enable) bit */
-       writew(enable, &wdog1->wmcr);
-       writew(enable, &wdog2->wmcr);
-
-       if (is_mx6sx() || is_mx6ul() || is_mx7())
-               writew(enable, &wdog3->wmcr);
-#ifdef CONFIG_MX7D
-       writew(enable, &wdog4->wmcr);
-#endif
-}
-
-#define SRC_SCR_WARM_RESET_ENABLE      0
-
-void init_src(void)
-{
-       struct src *src_regs = (struct src *)SRC_BASE_ADDR;
-       u32 val;
-
-       /*
-        * force warm reset sources to generate cold reset
-        * for a more reliable restart
-        */
-       val = readl(&src_regs->scr);
-       val &= ~(1 << SRC_SCR_WARM_RESET_ENABLE);
-       writel(val, &src_regs->scr);
-}
-
-#ifdef CONFIG_CMD_BMODE
-void boot_mode_apply(unsigned cfg_val)
-{
-       unsigned reg;
-       struct src *psrc = (struct src *)SRC_BASE_ADDR;
-       writel(cfg_val, &psrc->gpr9);
-       reg = readl(&psrc->gpr10);
-       if (cfg_val)
-               reg |= 1 << 28;
-       else
-               reg &= ~(1 << 28);
-       writel(reg, &psrc->gpr10);
-}
-#endif
-
-#if defined(CONFIG_MX6)
-u32 imx6_src_get_boot_mode(void)
-{
-       if (imx6_is_bmode_from_gpr9())
-               return readl(&src_base->gpr9);
-       else
-               return readl(&src_base->sbmr1);
-}
-#endif
diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
deleted file mode 100644 (file)
index c9a3bf2..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Based on the iomux-v3.c from Linux kernel:
- * Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
- * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH,
- *                       <armlinux@phytec.de>
- *
- * Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#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>
-
-static void *base = (void *)IOMUXC_BASE_ADDR;
-
-/*
- * configures a single pad in the iomuxer
- */
-void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
-{
-       u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
-       u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
-       u32 sel_input_ofs =
-               (pad & MUX_SEL_INPUT_OFS_MASK) >> MUX_SEL_INPUT_OFS_SHIFT;
-       u32 sel_input =
-               (pad & MUX_SEL_INPUT_MASK) >> MUX_SEL_INPUT_SHIFT;
-       u32 pad_ctrl_ofs =
-               (pad & MUX_PAD_CTRL_OFS_MASK) >> MUX_PAD_CTRL_OFS_SHIFT;
-       u32 pad_ctrl = (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT;
-
-#if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
-       /* Check whether LVE bit needs to be set */
-       if (pad_ctrl & PAD_CTL_LVE) {
-               pad_ctrl &= ~PAD_CTL_LVE;
-               pad_ctrl |= PAD_CTL_LVE_BIT;
-       }
-#endif
-
-#ifdef CONFIG_IOMUX_LPSR
-       u32 lpsr = (pad & MUX_MODE_LPSR) >> MUX_MODE_SHIFT;
-
-#ifdef CONFIG_MX7
-       if (lpsr == IOMUX_CONFIG_LPSR) {
-               base = (void *)IOMUXC_LPSR_BASE_ADDR;
-               mux_mode &= ~IOMUX_CONFIG_LPSR;
-               /* set daisy chain sel_input */
-               if (sel_input_ofs)
-                       sel_input_ofs += IOMUX_LPSR_SEL_INPUT_OFS;
-       }
-#else
-       if (is_mx6ull() || is_mx6sll()) {
-               if (lpsr == IOMUX_CONFIG_LPSR) {
-                       base = (void *)IOMUXC_SNVS_BASE_ADDR;
-                       mux_mode &= ~IOMUX_CONFIG_LPSR;
-               }
-       }
-#endif
-#endif
-
-       if (is_mx7() || is_mx6ull() || is_mx6sll() || mux_ctrl_ofs)
-               __raw_writel(mux_mode, base + mux_ctrl_ofs);
-
-       if (sel_input_ofs)
-               __raw_writel(sel_input, base + sel_input_ofs);
-
-#ifdef CONFIG_IOMUX_SHARE_CONF_REG
-       if (!(pad_ctrl & NO_PAD_CTRL))
-               __raw_writel((mux_mode << PAD_MUX_MODE_SHIFT) | pad_ctrl,
-                       base + pad_ctrl_ofs);
-#else
-       if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
-               __raw_writel(pad_ctrl, base + pad_ctrl_ofs);
-#if defined(CONFIG_MX6SLL)
-       else if ((pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
-               clrbits_le32(base + pad_ctrl_ofs, PAD_CTL_IPD_BIT);
-#endif
-#endif
-
-#ifdef CONFIG_IOMUX_LPSR
-       if (lpsr == IOMUX_CONFIG_LPSR)
-               base = (void *)IOMUXC_BASE_ADDR;
-#endif
-
-}
-
-/* configures a list of pads within declared with IOMUX_PADS macro */
-void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
-                                     unsigned count)
-{
-       iomux_v3_cfg_t const *p = pad_list;
-       int stride;
-       int i;
-
-#if defined(CONFIG_MX6QDL)
-       stride = 2;
-       if (!is_mx6dq() && !is_mx6dqp())
-               p += 1;
-#else
-       stride = 1;
-#endif
-       for (i = 0; i < count; i++) {
-               imx_iomux_v3_setup_pad(*p);
-               p += stride;
-       }
-}
-
-void imx_iomux_set_gpr_register(int group, int start_bit,
-                                       int num_bits, int value)
-{
-       int i = 0;
-       u32 reg;
-       reg = readl(base + group * 4);
-       while (num_bits) {
-               reg &= ~(1<<(start_bit + i));
-               i++;
-               num_bits--;
-       }
-       reg |= (value << start_bit);
-       writel(reg, base + group * 4);
-}
-
-#ifdef CONFIG_IOMUX_SHARE_CONF_REG
-void imx_iomux_gpio_set_direction(unsigned int gpio,
-                               unsigned int direction)
-{
-       u32 reg;
-       /*
-        * Only on Vybrid the input/output buffer enable flags
-        * are part of the shared mux/conf register.
-        */
-       reg = readl(base + (gpio << 2));
-
-       if (direction)
-               reg |= 0x2;
-       else
-               reg &= ~0x2;
-
-       writel(reg, base + (gpio << 2));
-}
-
-void imx_iomux_gpio_get_function(unsigned int gpio, u32 *gpio_state)
-{
-       *gpio_state = readl(base + (gpio << 2)) &
-               ((0X07 << PAD_MUX_MODE_SHIFT) | PAD_CTL_OBE_IBE_ENABLE);
-}
-#endif
diff --git a/arch/arm/imx-common/misc.c b/arch/arm/imx-common/misc.c
deleted file mode 100644 (file)
index 1b0f18d..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2013 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/sys_proto.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <asm/imx-common/regs-common.h>
-
-/* 1 second delay should be plenty of time for block reset. */
-#define        RESET_MAX_TIMEOUT       1000000
-
-#define        MXS_BLOCK_SFTRST        (1 << 31)
-#define        MXS_BLOCK_CLKGATE       (1 << 30)
-
-int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned
-                                                               int timeout)
-{
-       while (--timeout) {
-               if ((readl(&reg->reg) & mask) == mask)
-                       break;
-               udelay(1);
-       }
-
-       return !timeout;
-}
-
-int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned
-                                                               int timeout)
-{
-       while (--timeout) {
-               if ((readl(&reg->reg) & mask) == 0)
-                       break;
-               udelay(1);
-       }
-
-       return !timeout;
-}
-
-int mxs_reset_block(struct mxs_register_32 *reg)
-{
-       /* Clear SFTRST */
-       writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
-
-       if (mxs_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
-               return 1;
-
-       /* Clear CLKGATE */
-       writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
-
-       /* Set SFTRST */
-       writel(MXS_BLOCK_SFTRST, &reg->reg_set);
-
-       /* Wait for CLKGATE being set */
-       if (mxs_wait_mask_set(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
-               return 1;
-
-       /* Clear SFTRST */
-       writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
-
-       if (mxs_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
-               return 1;
-
-       /* Clear CLKGATE */
-       writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
-
-       if (mxs_wait_mask_clr(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
-               return 1;
-
-       return 0;
-}
diff --git a/arch/arm/imx-common/rdc-sema.c b/arch/arm/imx-common/rdc-sema.c
deleted file mode 100644 (file)
index 1d97ac8..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:  GPL-2.0+
- */
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/imx-common/rdc-sema.h>
-#include <asm/arch/imx-rdc.h>
-#include <linux/errno.h>
-
-/*
- * Check if the RDC Semaphore is required for this peripheral.
- */
-static inline int imx_rdc_check_sema_required(int per_id)
-{
-       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
-       u32 reg;
-
-       reg = readl(&imx_rdc->pdap[per_id]);
-       /*
-        * No semaphore:
-        * Intial value or this peripheral is assigned to only one domain
-        */
-       if (!(reg & RDC_PDAP_SREQ_MASK))
-               return -ENOENT;
-
-       return 0;
-}
-
-/*
- * Check the peripheral read / write access permission on Domain [dom_id].
- */
-int imx_rdc_check_permission(int per_id, int dom_id)
-{
-       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
-       u32 reg;
-
-       reg = readl(&imx_rdc->pdap[per_id]);
-       if (!(reg & RDC_PDAP_DRW_MASK(dom_id)))
-               return -EACCES;  /*No access*/
-
-       return 0;
-}
-
-/*
- * Lock up the RDC semaphore for this peripheral if semaphore is required.
- */
-int imx_rdc_sema_lock(int per_id)
-{
-       struct rdc_sema_regs *imx_rdc_sema;
-       int ret;
-       u8 reg;
-
-       ret = imx_rdc_check_sema_required(per_id);
-       if (ret)
-               return ret;
-
-       if (per_id < SEMA_GATES_NUM)
-               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE1_BASE_ADDR;
-       else
-               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE2_BASE_ADDR;
-
-       do {
-               writeb(RDC_SEMA_PROC_ID,
-                      &imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
-               reg = readb(&imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
-               if ((reg & RDC_SEMA_GATE_GTFSM_MASK) == RDC_SEMA_PROC_ID)
-                       break;  /* Get the Semaphore*/
-       } while (1);
-
-       return 0;
-}
-
-/*
- * Unlock the RDC semaphore for this peripheral if main CPU is the
- * semaphore owner.
- */
-int imx_rdc_sema_unlock(int per_id)
-{
-       struct rdc_sema_regs *imx_rdc_sema;
-       int ret;
-       u8 reg;
-
-       ret = imx_rdc_check_sema_required(per_id);
-       if (ret)
-               return ret;
-
-       if (per_id < SEMA_GATES_NUM)
-               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE1_BASE_ADDR;
-       else
-               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE2_BASE_ADDR;
-
-       reg = readb(&imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
-       if ((reg & RDC_SEMA_GATE_GTFSM_MASK) != RDC_SEMA_PROC_ID)
-               return -EACCES; /*Not the semaphore owner */
-
-       writeb(0x0, &imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
-
-       return 0;
-}
-
-/*
- * Setup RDC setting for one peripheral
- */
-int imx_rdc_setup_peri(rdc_peri_cfg_t p)
-{
-       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
-       u32 reg = 0;
-       u32 share_count = 0;
-       u32 peri_id = p & RDC_PERI_MASK;
-       u32 domain = (p & RDC_DOMAIN_MASK) >> RDC_DOMAIN_SHIFT_BASE;
-
-       /* No domain assigned */
-       if (domain == 0)
-               return -EINVAL;
-
-       reg |= domain;
-
-       share_count = (domain & 0x3)
-               + ((domain >> 2) & 0x3)
-               + ((domain >> 4) & 0x3)
-               + ((domain >> 6) & 0x3);
-
-       if (share_count > 0x3)
-               reg |= RDC_PDAP_SREQ_MASK;
-
-       writel(reg, &imx_rdc->pdap[peri_id]);
-
-       return 0;
-}
-
-/*
- * Setup RDC settings for multiple peripherals
- */
-int imx_rdc_setup_peripherals(rdc_peri_cfg_t const *peripherals_list,
-                                    unsigned count)
-{
-       rdc_peri_cfg_t const *p = peripherals_list;
-       int i, ret;
-
-       for (i = 0; i < count; i++) {
-               ret = imx_rdc_setup_peri(*p);
-               if (ret)
-                       return ret;
-               p++;
-       }
-
-       return 0;
-}
-
-/*
- * Setup RDC setting for one master
- */
-int imx_rdc_setup_ma(rdc_ma_cfg_t p)
-{
-       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
-       u32 master_id = (p & RDC_MASTER_MASK) >> RDC_MASTER_SHIFT;
-       u32 domain = (p & RDC_DOMAIN_MASK) >> RDC_DOMAIN_SHIFT_BASE;
-
-       writel((domain & RDC_MDA_DID_MASK), &imx_rdc->mda[master_id]);
-
-       return 0;
-}
-
-/*
- * Setup RDC settings for multiple masters
- */
-int imx_rdc_setup_masters(rdc_ma_cfg_t const *masters_list, unsigned count)
-{
-       rdc_ma_cfg_t const *p = masters_list;
-       int i, ret;
-
-       for (i = 0; i < count; i++) {
-               ret = imx_rdc_setup_ma(*p);
-               if (ret)
-                       return ret;
-               p++;
-       }
-
-       return 0;
-}
diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c
deleted file mode 100644 (file)
index acf9831..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/arch/iomux.h>
-#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-
-int setup_sata(void)
-{
-       struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
-       int ret;
-
-       if (!is_mx6dq() && !is_mx6dqp())
-               return 1;
-
-       ret = enable_sata_clock();
-       if (ret)
-               return ret;
-
-       clrsetbits_le32(&iomuxc_regs->gpr[13],
-                       IOMUXC_GPR13_SATA_MASK,
-                       IOMUXC_GPR13_SATA_PHY_8_RXEQ_3P0DB
-                       |IOMUXC_GPR13_SATA_PHY_7_SATA2M
-                       |IOMUXC_GPR13_SATA_SPEED_3G
-                       |(3<<IOMUXC_GPR13_SATA_PHY_6_SHIFT)
-                       |IOMUXC_GPR13_SATA_SATA_PHY_5_SS_DISABLED
-                       |IOMUXC_GPR13_SATA_SATA_PHY_4_ATTEN_9_16
-                       |IOMUXC_GPR13_SATA_PHY_3_TXBOOST_0P00_DB
-                       |IOMUXC_GPR13_SATA_PHY_2_TX_1P104V
-                       |IOMUXC_GPR13_SATA_PHY_1_SLOW);
-
-       return 0;
-}
diff --git a/arch/arm/imx-common/speed.c b/arch/arm/imx-common/speed.c
deleted file mode 100644 (file)
index 26132bf..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
-
-#ifdef CONFIG_FSL_ESDHC
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
-int get_clocks(void)
-{
-#ifdef CONFIG_FSL_ESDHC
-#ifdef CONFIG_FSL_USDHC
-#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC3_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC4_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
-#else
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-#endif
-#else
-#if CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC2_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-#elif CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC3_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-#elif CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC4_BASE_ADDR
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
-#else
-       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
-#endif
-#endif
-#endif
-       return 0;
-}
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
deleted file mode 100644 (file)
index f392941..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2014 Gateworks Corporation
- * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
- *
- * Author: Tim Harvey <tharvey@gateworks.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/spl.h>
-#include <spl.h>
-#include <asm/imx-common/hab.h>
-
-#if defined(CONFIG_MX6)
-/* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */
-u32 spl_boot_device(void)
-{
-       unsigned int bmode = readl(&src_base->sbmr2);
-       u32 reg = imx6_src_get_boot_mode();
-
-       /*
-        * Check for BMODE if serial downloader is enabled
-        * BOOT_MODE - see IMX6DQRM Table 8-1
-        */
-       if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */
-               return BOOT_DEVICE_UART;
-
-       /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
-       switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) {
-        /* EIM: See 8.5.1, Table 8-9 */
-       case IMX6_BMODE_EMI:
-               /* BOOT_CFG1[3]: NOR/OneNAND Selection */
-               switch ((reg & IMX6_BMODE_EMI_MASK) >> IMX6_BMODE_EMI_SHIFT) {
-               case IMX6_BMODE_ONENAND:
-                       return BOOT_DEVICE_ONENAND;
-               case IMX6_BMODE_NOR:
-                       return BOOT_DEVICE_NOR;
-               break;
-               }
-       /* Reserved: Used to force Serial Downloader */
-       case IMX6_BMODE_UART:
-               return BOOT_DEVICE_UART;
-       /* SATA: See 8.5.4, Table 8-20 */
-       case IMX6_BMODE_SATA:
-               return BOOT_DEVICE_SATA;
-       /* Serial ROM: See 8.5.5.1, Table 8-22 */
-       case IMX6_BMODE_SERIAL_ROM:
-               /* BOOT_CFG4[2:0] */
-               switch ((reg & IMX6_BMODE_SERIAL_ROM_MASK) >>
-                       IMX6_BMODE_SERIAL_ROM_SHIFT) {
-               case IMX6_BMODE_ECSPI1:
-               case IMX6_BMODE_ECSPI2:
-               case IMX6_BMODE_ECSPI3:
-               case IMX6_BMODE_ECSPI4:
-               case IMX6_BMODE_ECSPI5:
-                       return BOOT_DEVICE_SPI;
-               case IMX6_BMODE_I2C1:
-               case IMX6_BMODE_I2C2:
-               case IMX6_BMODE_I2C3:
-                       return BOOT_DEVICE_I2C;
-               }
-               break;
-       /* SD/eSD: 8.5.3, Table 8-15  */
-       case IMX6_BMODE_SD:
-       case IMX6_BMODE_ESD:
-               return BOOT_DEVICE_MMC1;
-       /* MMC/eMMC: 8.5.3 */
-       case IMX6_BMODE_MMC:
-       case IMX6_BMODE_EMMC:
-               return BOOT_DEVICE_MMC1;
-       /* NAND Flash: 8.5.2, Table 8-10 */
-       case IMX6_BMODE_NAND:
-               return BOOT_DEVICE_NAND;
-       }
-       return BOOT_DEVICE_NONE;
-}
-#endif
-
-#if defined(CONFIG_SPL_MMC_SUPPORT)
-/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */
-u32 spl_boot_mode(const u32 boot_device)
-{
-       switch (spl_boot_device()) {
-       /* for MMC return either RAW or FAT mode */
-       case BOOT_DEVICE_MMC1:
-       case BOOT_DEVICE_MMC2:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
-               return MMCSD_MODE_FS;
-#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
-               return MMCSD_MODE_EMMCBOOT;
-#else
-               return MMCSD_MODE_RAW;
-#endif
-               break;
-       default:
-               puts("spl: ERROR:  unsupported device\n");
-               hang();
-       }
-}
-#endif
-
-#if defined(CONFIG_SECURE_BOOT)
-
-__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
-{
-       typedef void __noreturn (*image_entry_noargs_t)(void);
-
-       image_entry_noargs_t image_entry =
-               (image_entry_noargs_t)(unsigned long)spl_image->entry_point;
-
-       debug("image entry point: 0x%lX\n", spl_image->entry_point);
-
-       /* HAB looks for the CSF at the end of the authenticated data therefore,
-        * we need to subtract the size of the CSF from the actual filesize */
-       if (authenticate_image(spl_image->load_addr,
-                              spl_image->size - CONFIG_CSF_SIZE)) {
-               image_entry();
-       } else {
-               puts("spl: ERROR:  image authentication unsuccessful\n");
-               hang();
-       }
-}
-
-#endif
diff --git a/arch/arm/imx-common/spl_sd.cfg b/arch/arm/imx-common/spl_sd.cfg
deleted file mode 100644 (file)
index 14c135c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#define __ASSEMBLY__
-#include <config.h>
-
-IMAGE_VERSION  2
-BOOT_FROM      sd
-
-/*
- * Secure boot support
- */
-#ifdef CONFIG_SECURE_BOOT
-CSF CONFIG_CSF_SIZE
-#endif
\ No newline at end of file
diff --git a/arch/arm/imx-common/syscounter.c b/arch/arm/imx-common/syscounter.c
deleted file mode 100644 (file)
index e00fef2..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- *
- * The file use ls102xa/timer.c as a reference.
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <div64.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/imx-common/syscounter.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * This function is intended for SHORT delays only.
- * It will overflow at around 10 seconds @ 400MHz,
- * or 20 seconds @ 200MHz.
- */
-unsigned long usec2ticks(unsigned long usec)
-{
-       ulong ticks;
-
-       if (usec < 1000)
-               ticks = ((usec * (get_tbclk()/1000)) + 500) / 1000;
-       else
-               ticks = ((usec / 10) * (get_tbclk() / 100000));
-
-       return ticks;
-}
-
-static inline unsigned long long tick_to_time(unsigned long long tick)
-{
-       unsigned long freq;
-
-       asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
-
-       tick *= CONFIG_SYS_HZ;
-       do_div(tick, freq);
-
-       return tick;
-}
-
-static inline unsigned long long us_to_tick(unsigned long long usec)
-{
-       unsigned long freq;
-
-       asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
-
-       usec = usec * freq  + 999999;
-       do_div(usec, 1000000);
-
-       return usec;
-}
-
-int timer_init(void)
-{
-       struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR;
-       unsigned long val, freq;
-
-       freq = CONFIG_SC_TIMER_CLK;
-       asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
-
-       writel(freq, &sctr->cntfid0);
-
-       /* Enable system counter */
-       val = readl(&sctr->cntcr);
-       val &= ~(SC_CNTCR_FREQ0 | SC_CNTCR_FREQ1);
-       val |= SC_CNTCR_FREQ0 | SC_CNTCR_ENABLE | SC_CNTCR_HDBG;
-       writel(val, &sctr->cntcr);
-
-       gd->arch.tbl = 0;
-       gd->arch.tbu = 0;
-
-       return 0;
-}
-
-unsigned long long get_ticks(void)
-{
-       unsigned long long now;
-
-       asm("mrrc p15, 0, %Q0, %R0, c14" : "=r" (now));
-
-       gd->arch.tbl = (unsigned long)(now & 0xffffffff);
-       gd->arch.tbu = (unsigned long)(now >> 32);
-
-       return now;
-}
-
-ulong get_timer_masked(void)
-{
-       return tick_to_time(get_ticks());
-}
-
-ulong get_timer(ulong base)
-{
-       return get_timer_masked() - base;
-}
-
-void __udelay(unsigned long usec)
-{
-       unsigned long long tmp;
-       ulong tmo;
-
-       tmo = us_to_tick(usec);
-       tmp = get_ticks() + tmo;        /* get current timestamp */
-
-       while (get_ticks() < tmp)       /* loop till event */
-                /*NOP*/;
-}
-
-/*
- * This function is derived from PowerPC code (timebase clock frequency).
- * On ARM it returns the number of timer ticks per second.
- */
-ulong get_tbclk(void)
-{
-       unsigned long freq;
-
-       asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
-
-       return freq;
-}
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c
deleted file mode 100644 (file)
index 9b01114..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * (C) Copyright 2007
- * Sascha Hauer, Pengutronix
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <div64.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-
-/* General purpose timers registers */
-struct mxc_gpt {
-       unsigned int control;
-       unsigned int prescaler;
-       unsigned int status;
-       unsigned int nouse[6];
-       unsigned int counter;
-};
-
-static struct mxc_gpt *cur_gpt = (struct mxc_gpt *)GPT1_BASE_ADDR;
-
-/* General purpose timers bitfields */
-#define GPTCR_SWR              (1 << 15)       /* Software reset */
-#define GPTCR_24MEN        (1 << 10)   /* Enable 24MHz clock input */
-#define GPTCR_FRR              (1 << 9)        /* Freerun / restart */
-#define GPTCR_CLKSOURCE_32     (4 << 6)        /* Clock source 32khz */
-#define GPTCR_CLKSOURCE_OSC    (5 << 6)        /* Clock source OSC */
-#define GPTCR_CLKSOURCE_PRE    (1 << 6)        /* Clock source PRECLK */
-#define GPTCR_CLKSOURCE_MASK (0x7 << 6)
-#define GPTCR_TEN              1               /* Timer enable */
-
-#define GPTPR_PRESCALER24M_SHIFT 12
-#define GPTPR_PRESCALER24M_MASK (0xF << GPTPR_PRESCALER24M_SHIFT)
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static inline int gpt_has_clk_source_osc(void)
-{
-#if defined(CONFIG_MX6)
-       if (((is_mx6dq()) && (soc_rev() > CHIP_REV_1_0)) ||
-           is_mx6dqp() || is_mx6sdl() || is_mx6sx() || is_mx6ul() ||
-           is_mx6ull() || is_mx6sll())
-               return 1;
-
-       return 0;
-#else
-       return 0;
-#endif
-}
-
-static inline ulong gpt_get_clk(void)
-{
-#ifdef CONFIG_MXC_GPT_HCLK
-       if (gpt_has_clk_source_osc())
-               return MXC_HCLK >> 3;
-       else
-               return mxc_get_clock(MXC_IPG_PERCLK);
-#else
-       return MXC_CLK32;
-#endif
-}
-
-int timer_init(void)
-{
-       int i;
-
-       /* setup GP Timer 1 */
-       __raw_writel(GPTCR_SWR, &cur_gpt->control);
-
-       /* We have no udelay by now */
-       for (i = 0; i < 100; i++)
-               __raw_writel(0, &cur_gpt->control);
-
-       i = __raw_readl(&cur_gpt->control);
-       i &= ~GPTCR_CLKSOURCE_MASK;
-
-#ifdef CONFIG_MXC_GPT_HCLK
-       if (gpt_has_clk_source_osc()) {
-               i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN;
-
-               /*
-                * For DL/S, SX, UL, ULL, SLL set 24Mhz OSC
-                * Enable bit and prescaler
-                */
-               if (is_mx6sdl() || is_mx6sx() || is_mx6ul() || is_mx6ull() ||
-                   is_mx6sll()) {
-                       i |= GPTCR_24MEN;
-
-                       /* Produce 3Mhz clock */
-                       __raw_writel((7 << GPTPR_PRESCALER24M_SHIFT),
-                                    &cur_gpt->prescaler);
-               }
-       } else {
-               i |= GPTCR_CLKSOURCE_PRE | GPTCR_TEN;
-       }
-#else
-       __raw_writel(0, &cur_gpt->prescaler); /* 32Khz */
-       i |= GPTCR_CLKSOURCE_32 | GPTCR_TEN;
-#endif
-       __raw_writel(i, &cur_gpt->control);
-
-       return 0;
-}
-
-unsigned long timer_read_counter(void)
-{
-       return __raw_readl(&cur_gpt->counter); /* current tick value */
-}
-
-/*
- * This function is derived from PowerPC code (timebase clock frequency).
- * On ARM it returns the number of timer ticks per second.
- */
-ulong get_tbclk(void)
-{
-       return gpt_get_clk();
-}
-
-/*
- * This function is intended for SHORT delays only.
- * It will overflow at around 10 seconds @ 400MHz,
- * or 20 seconds @ 200MHz.
- */
-unsigned long usec2ticks(unsigned long _usec)
-{
-       unsigned long long usec = _usec;
-
-       usec *= get_tbclk();
-       usec += 999999;
-       do_div(usec, 1000000);
-
-       return usec;
-}
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c
deleted file mode 100644 (file)
index 549bf9d..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <linux/errno.h>
-#include <asm/imx-common/video.h>
-
-int board_video_skip(void)
-{
-       int i;
-       int ret;
-       char const *panel = getenv("panel");
-
-       if (!panel) {
-               for (i = 0; i < display_count; i++) {
-                       struct display_info_t const *dev = displays+i;
-                       if (dev->detect && dev->detect(dev)) {
-                               panel = dev->mode.name;
-                               printf("auto-detected panel %s\n", panel);
-                               break;
-                       }
-               }
-               if (!panel) {
-                       panel = displays[0].mode.name;
-                       printf("No panel detected: default to %s\n", panel);
-                       i = 0;
-               }
-       } else {
-               for (i = 0; i < display_count; i++) {
-                       if (!strcmp(panel, displays[i].mode.name))
-                               break;
-               }
-       }
-
-       if (i < display_count) {
-               ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0,
-                                   displays[i].pixfmt);
-               if (!ret) {
-                       if (displays[i].enable)
-                               displays[i].enable(displays + i);
-
-                       printf("Display: %s (%ux%u)\n",
-                              displays[i].mode.name,
-                              displays[i].mode.xres,
-                              displays[i].mode.yres);
-               } else
-                       printf("LCD %s cannot be configured: %d\n",
-                              displays[i].mode.name, ret);
-       } else {
-               printf("unsupported panel %s\n", panel);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-#ifdef CONFIG_IMX_HDMI
-#include <asm/arch/mxc_hdmi.h>
-#include <asm/io.h>
-int detect_hdmi(struct display_info_t const *dev)
-{
-       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
-       return readb(&hdmi->phy_stat0) & HDMI_DVI_STAT;
-}
-#endif
index 81d95ea48580b05821cccaa4c569f5aae318f6ad..ef88d837cc666b64360bc9302b247109bce3ad58 100644 (file)
@@ -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
index 220cf4ef2e94aa69482557852ed0cc0690a79cec..5b2863e62e10d0bfcc8c9ec7cac18307533fcd4d 100644 (file)
@@ -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
index 14e9b85c8ba729d9b1ea017d0af32438f09dc69f..8e4b9a8a602f90c3f75260fd5a3f832a1413fc77 100644 (file)
@@ -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
index 674b25cff40ad55ce17d6966fa3f220050e2c503..5b9fa9cc0b85d8c2ca05fea27a2da121b9cf1a98 100644 (file)
@@ -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;
index f3572a402f9545b7b200a768eaf467037a55b140..5570ec739ea51a0c6062d37c58dd75b51cf9b4f8 100644 (file)
@@ -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
index 5898b46f4720088b18882e21d0d2424fff987ab5..4ec9da241c089b92d378169970163ff410f4d099 100644 (file)
@@ -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>
index 0979fda48764d6b5aa8cafd05f9bb086051f35a3..735e1353f7d8c50af5c575b2eaca9a7af5b5ef17 100644 (file)
@@ -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);
index e2a5bc97a3f945e022af511f509c7ab668d3e909..06658ff6be9f7a2b2866a18f6ec8dcf4116f9551 100644 (file)
@@ -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
index b7b169505f91c4a213be59efca47e8a5aed770e7..5c636acc03de69015390460e0280fa42fd9131f4 100644 (file)
@@ -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 | \
index 1b75fd1cfd13e697a622f36dbcd102743c6afd12..1572af7bf87f38b61b3aedf37dc85c74e90353c0 100644 (file)
@@ -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 | \
index 16c9b766d9a7df8fec7332c1c4084a2eea283ca9..14f5d948c9f65ddaf0cae4f30389caf3f1187173 100644 (file)
@@ -5,4 +5,4 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
index e6640f39a1eea6ffcf7c0bbd37618245e06129b8..baecbb4a8c20e25b3e960e23966a0a878b5c345b 100644 (file)
@@ -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 */
index 646013d7899bec40e83fc806d959697083744848..86e267087ad98ce15d847176ea956f6441dc7d34 100644 (file)
 #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>
 
index 2934b121c0678950a056724dfcd2c70173997499..c2ce9532069a316aa8af45074278b8f764eb3d97 100644 (file)
@@ -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)
index 919d83dd90cf6ac53d204d7e40a063d37a60dd51..158e47cd3bc0e71ed010d49e1a359ba4c8d1b0f5 100644 (file)
@@ -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),
index 1ecb7ceec1aac42b07fce1be0aae624899ca3bae..37ed45a77bb98cc257ab14d3953eabc86ed553ff 100644 (file)
@@ -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),
index 5dd9a50fdfafd6e91332e5026cd62366f77306e7..86e69fd0e8d1bda430350cc6c08861a610734604 100644 (file)
@@ -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),
index c92b4f09526df189c6a1257352b33cfb4aea57a1..900e062de41c6a888306e08fbf83c2550f5318b1 100644 (file)
@@ -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 {
 
index 682430e9077a920e384f0d107ebff6279d45600b..9c0390a2497421e010796b05962eb62237543991 100644 (file)
@@ -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),
index 16c9b766d9a7df8fec7332c1c4084a2eea283ca9..14f5d948c9f65ddaf0cae4f30389caf3f1187173 100644 (file)
@@ -5,4 +5,4 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
index b7890c2903acff70e2e1e80819ee124e3f951fdc..af57bb9c4e91fbadf6392d7ce4b5e17403a09820 100644 (file)
@@ -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 */
index d33be313c6ee22876b4216ceca2ab42af706a6d0..aab3a9a7a6c8a3b29913d95e907367363cd96bbe 100644 (file)
                                         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);
index 164c2be8acccfa038134957e2b34d2a2e3c40a5d..9df81f70b96473839106a74fbba44c232e9ae268 100644 (file)
@@ -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"
index 0ab1246de85219eda30db3a40bbbf2e6fb9e1eed..7e926d163a5f111abadb7e1cd4634dc94f557933 100644 (file)
@@ -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),
index ca7608bd56b7b9b71e47f0968fcf3523b3e01cf8..15e24d44b382377fbf2d7de61bb763c0f15e74db 100644 (file)
@@ -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);
index d01748fd2384ba04f7543a2b3572d25b3b8b0f8d..d53bfcc12a5395629b7fc047352d8ef4304eaa82 100644 (file)
@@ -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
index 88724381224776b1dfc2cef7a316979bbb7104de..6e35f2d43b845e56f5c8d3db0ac8898332b66f71 100644 (file)
 #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>
index d155e3a5d8d7c9affb3685ede539f871f6de7002..6a86055bab435e0a371a830e612e7dde1111f78d 100644 (file)
@@ -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 {
index 1490ffd520e52a9e023929fbd90f82ba60a8d36f..16447ae269e6b291a74d0648fcf8fa745e6542fc 100644 (file)
@@ -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 {
index 860be9e28f4561fab2dfba7be5e5dc328bd3ea80..e8ba1dd26f0720555714de0c20c3a6461d0c9d01 100644 (file)
@@ -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 {
index a58303efb8d9578cbac308feea0c2dc8561946df..6d10e4bc20b981d70dd7dc838162621b9c0dccbd 100644 (file)
@@ -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 {
index 74f9f7670788e9d879474dfe4f94c209d930d898..a00d6a424958c6d39e0af0c44b6d495a44982179 100644 (file)
@@ -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 {
index bd80ac77fc1e7307e88532dc0993cb4cff2a8471..7c51031b9a8cbb24bacfb2aca7270fc46122e665 100644 (file)
@@ -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 {
index 251fe6616d020e01cc69ee7a96089cfe5392bb65..b107dec31d368ae9ff90ebbe85148458bc614a7a 100644 (file)
@@ -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 {
index ce2f425c1c8b7de120ef1b972bc85af29a2379ac..d05fccf72938b10b4c1f7e3c8622056177febc20 100644 (file)
@@ -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 {
index 9528e3ce9ad805ec30a1c0595924dbddb296c50f..f6bb30107f5efc5229776e113772e61556110186 100644 (file)
@@ -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 {
index 03e2e5dd62881cc7cc3b20a1b6731abd8d644c7a..dfa4dd078f119b20ca823ad40b3985333736e3ff 100644 (file)
@@ -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 {
index e991216d0bd4bda0bbed9bbb8421027af67a122c..12a5dab73aec8b443a7bde3b38a708e8fbccd757 100644 (file)
@@ -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)
index 713c630dcc3e3199ff029f3e2eee675ab1a3e2d6..260d7d7f2babe47da5b556dba8c6f369f98de51e 100644 (file)
@@ -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 {
index 7ceb810dc627231acf2bbcbe66820e863e4f0809..608182af7b09df16e88fbbf74f3eb680ca65f2bb 100644 (file)
@@ -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 {
index f2b075e14ffbbcd8325574894585793b525ef373..609676375b55b93fb3e534f3d491ef31f45256b9 100644 (file)
@@ -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));
 
index 5af071a4db953a57f4673a4aec24d9aeabe88f60..506e584fa5937ff44d171924b91b362e02e5faff 100644 (file)
@@ -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 | \
diff --git a/arch/arm/include/asm/imx-common/boot_mode.h b/arch/arm/include/asm/imx-common/boot_mode.h
deleted file mode 100644 (file)
index a8239f2..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2012 Boundary Devices Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _ASM_BOOT_MODE_H
-#define _ASM_BOOT_MODE_H
-#define MAKE_CFGVAL(cfg1, cfg2, cfg3, cfg4) \
-       ((cfg4) << 24) | ((cfg3) << 16) | ((cfg2) << 8) | (cfg1)
-
-enum boot_device {
-       WEIM_NOR_BOOT,
-       ONE_NAND_BOOT,
-       PATA_BOOT,
-       SATA_BOOT,
-       I2C_BOOT,
-       SPI_NOR_BOOT,
-       SD1_BOOT,
-       SD2_BOOT,
-       SD3_BOOT,
-       SD4_BOOT,
-       MMC1_BOOT,
-       MMC2_BOOT,
-       MMC3_BOOT,
-       MMC4_BOOT,
-       NAND_BOOT,
-       QSPI_BOOT,
-       UNKNOWN_BOOT,
-       BOOT_DEV_NUM = UNKNOWN_BOOT,
-};
-
-struct boot_mode {
-       const char *name;
-       unsigned cfg_val;
-};
-
-void add_board_boot_modes(const struct boot_mode *p);
-void boot_mode_apply(unsigned cfg_val);
-extern const struct boot_mode soc_boot_modes[];
-#endif
diff --git a/arch/arm/include/asm/imx-common/dma.h b/arch/arm/include/asm/imx-common/dma.h
deleted file mode 100644 (file)
index 0244947..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Freescale i.MX28 APBH DMA
- *
- * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
- * on behalf of DENX Software Engineering GmbH
- *
- * Based on code from LTIB:
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __DMA_H__
-#define __DMA_H__
-
-#include <linux/list.h>
-#include <linux/compiler.h>
-
-#define DMA_PIO_WORDS          15
-#define MXS_DMA_ALIGNMENT      ARCH_DMA_MINALIGN
-
-/*
- * MXS DMA channels
- */
-#if defined(CONFIG_MX23)
-enum {
-       MXS_DMA_CHANNEL_AHB_APBH_LCDIF = 0,
-       MXS_DMA_CHANNEL_AHB_APBH_SSP0,
-       MXS_DMA_CHANNEL_AHB_APBH_SSP1,
-       MXS_DMA_CHANNEL_AHB_APBH_RESERVED0,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI0,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI1,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI2,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI3,
-       MXS_MAX_DMA_CHANNELS,
-};
-#elif defined(CONFIG_MX28)
-enum {
-       MXS_DMA_CHANNEL_AHB_APBH_SSP0 = 0,
-       MXS_DMA_CHANNEL_AHB_APBH_SSP1,
-       MXS_DMA_CHANNEL_AHB_APBH_SSP2,
-       MXS_DMA_CHANNEL_AHB_APBH_SSP3,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI0,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI1,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI2,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI3,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI4,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI5,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI6,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI7,
-       MXS_DMA_CHANNEL_AHB_APBH_HSADC,
-       MXS_DMA_CHANNEL_AHB_APBH_LCDIF,
-       MXS_DMA_CHANNEL_AHB_APBH_RESERVED0,
-       MXS_DMA_CHANNEL_AHB_APBH_RESERVED1,
-       MXS_MAX_DMA_CHANNELS,
-};
-#elif defined(CONFIG_MX6) || defined(CONFIG_MX7)
-enum {
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI0 = 0,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI1,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI2,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI3,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI4,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI5,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI6,
-       MXS_DMA_CHANNEL_AHB_APBH_GPMI7,
-       MXS_MAX_DMA_CHANNELS,
-};
-#endif
-
-/*
- * MXS DMA hardware command.
- *
- * This structure describes the in-memory layout of an entire DMA command,
- * including space for the maximum number of PIO accesses. See the appropriate
- * reference manual for a detailed description of what these fields mean to the
- * DMA hardware.
- */
-#define        MXS_DMA_DESC_COMMAND_MASK       0x3
-#define        MXS_DMA_DESC_COMMAND_OFFSET     0
-#define        MXS_DMA_DESC_COMMAND_NO_DMAXFER 0x0
-#define        MXS_DMA_DESC_COMMAND_DMA_WRITE  0x1
-#define        MXS_DMA_DESC_COMMAND_DMA_READ   0x2
-#define        MXS_DMA_DESC_COMMAND_DMA_SENSE  0x3
-#define        MXS_DMA_DESC_CHAIN              (1 << 2)
-#define        MXS_DMA_DESC_IRQ                (1 << 3)
-#define        MXS_DMA_DESC_NAND_LOCK          (1 << 4)
-#define        MXS_DMA_DESC_NAND_WAIT_4_READY  (1 << 5)
-#define        MXS_DMA_DESC_DEC_SEM            (1 << 6)
-#define        MXS_DMA_DESC_WAIT4END           (1 << 7)
-#define        MXS_DMA_DESC_HALT_ON_TERMINATE  (1 << 8)
-#define        MXS_DMA_DESC_TERMINATE_FLUSH    (1 << 9)
-#define        MXS_DMA_DESC_PIO_WORDS_MASK     (0xf << 12)
-#define        MXS_DMA_DESC_PIO_WORDS_OFFSET   12
-#define        MXS_DMA_DESC_BYTES_MASK         (0xffff << 16)
-#define        MXS_DMA_DESC_BYTES_OFFSET       16
-
-struct mxs_dma_cmd {
-       unsigned long           next;
-       unsigned long           data;
-       union {
-               dma_addr_t      address;
-               unsigned long   alternate;
-       };
-       unsigned long           pio_words[DMA_PIO_WORDS];
-};
-
-/*
- * MXS DMA command descriptor.
- *
- * This structure incorporates an MXS DMA hardware command structure, along
- * with metadata.
- */
-#define        MXS_DMA_DESC_FIRST      (1 << 0)
-#define        MXS_DMA_DESC_LAST       (1 << 1)
-#define        MXS_DMA_DESC_READY      (1 << 31)
-
-struct mxs_dma_desc {
-       struct mxs_dma_cmd      cmd;
-       unsigned int            flags;
-       dma_addr_t              address;
-       void                    *buffer;
-       struct list_head        node;
-} __aligned(MXS_DMA_ALIGNMENT);
-
-/**
- * MXS DMA channel
- *
- * This structure represents a single DMA channel. The MXS platform code
- * maintains an array of these structures to represent every DMA channel in the
- * system (see mxs_dma_channels).
- */
-#define        MXS_DMA_FLAGS_IDLE      0
-#define        MXS_DMA_FLAGS_BUSY      (1 << 0)
-#define        MXS_DMA_FLAGS_FREE      0
-#define        MXS_DMA_FLAGS_ALLOCATED (1 << 16)
-#define        MXS_DMA_FLAGS_VALID     (1 << 31)
-
-struct mxs_dma_chan {
-       const char *name;
-       unsigned long dev;
-       struct mxs_dma_device *dma;
-       unsigned int flags;
-       unsigned int active_num;
-       unsigned int pending_num;
-       struct list_head active;
-       struct list_head done;
-};
-
-struct mxs_dma_desc *mxs_dma_desc_alloc(void);
-void mxs_dma_desc_free(struct mxs_dma_desc *);
-int mxs_dma_desc_append(int channel, struct mxs_dma_desc *pdesc);
-
-int mxs_dma_go(int chan);
-void mxs_dma_init(void);
-int mxs_dma_init_channel(int chan);
-int mxs_dma_release(int chan);
-
-void mxs_dma_circ_start(int chan, struct mxs_dma_desc *pdesc);
-
-#endif /* __DMA_H__ */
diff --git a/arch/arm/include/asm/imx-common/gpio.h b/arch/arm/include/asm/imx-common/gpio.h
deleted file mode 100644 (file)
index 26b296b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2011
- * Stefano Babic, DENX Software Engineering, <sbabic@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-
-#ifndef __ASM_ARCH_IMX_GPIO_H
-#define __ASM_ARCH_IMX_GPIO_H
-
-#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
-/* GPIO registers */
-struct gpio_regs {
-       u32 gpio_dr;    /* data */
-       u32 gpio_dir;   /* direction */
-       u32 gpio_psr;   /* pad satus */
-};
-#endif
-
-#define IMX_GPIO_NR(port, index)               ((((port)-1)*32)+((index)&31))
-
-#endif
diff --git a/arch/arm/include/asm/imx-common/hab.h b/arch/arm/include/asm/imx-common/hab.h
deleted file mode 100644 (file)
index e0ff459..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2012-2015 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- *
-*/
-
-#ifndef __SECURE_MX6Q_H__
-#define __SECURE_MX6Q_H__
-
-#include <linux/types.h>
-
-/* -------- start of HAB API updates ------------*/
-/* The following are taken from HAB4 SIS */
-
-/* Status definitions */
-enum hab_status {
-       HAB_STS_ANY = 0x00,
-       HAB_FAILURE = 0x33,
-       HAB_WARNING = 0x69,
-       HAB_SUCCESS = 0xf0
-};
-
-/* Security Configuration definitions */
-enum hab_config {
-       HAB_CFG_RETURN = 0x33,  /* < Field Return IC */
-       HAB_CFG_OPEN = 0xf0,    /* < Non-secure IC */
-       HAB_CFG_CLOSED = 0xcc   /* < Secure IC */
-};
-
-/* State definitions */
-enum hab_state {
-       HAB_STATE_INITIAL = 0x33,       /* Initialising state (transitory) */
-       HAB_STATE_CHECK = 0x55,         /* Check state (non-secure) */
-       HAB_STATE_NONSECURE = 0x66,     /* Non-secure state */
-       HAB_STATE_TRUSTED = 0x99,       /* Trusted state */
-       HAB_STATE_SECURE = 0xaa,        /* Secure state */
-       HAB_STATE_FAIL_SOFT = 0xcc, /* Soft fail state */
-       HAB_STATE_FAIL_HARD = 0xff, /* Hard fail state (terminal) */
-       HAB_STATE_NONE = 0xf0,          /* No security state machine */
-       HAB_STATE_MAX
-};
-
-enum hab_reason {
-       HAB_RSN_ANY = 0x00,                     /* Match any reason */
-       HAB_ENG_FAIL = 0x30,            /* Engine failure */
-       HAB_INV_ADDRESS = 0x22,         /* Invalid address: access denied */
-       HAB_INV_ASSERTION = 0x0c,   /* Invalid assertion */
-       HAB_INV_CALL = 0x28,            /* Function called out of sequence */
-       HAB_INV_CERTIFICATE = 0x21, /* Invalid certificate */
-       HAB_INV_COMMAND = 0x06,     /* Invalid command: command malformed */
-       HAB_INV_CSF = 0x11,                     /* Invalid csf */
-       HAB_INV_DCD = 0x27,                     /* Invalid dcd */
-       HAB_INV_INDEX = 0x0f,           /* Invalid index: access denied */
-       HAB_INV_IVT = 0x05,                     /* Invalid ivt */
-       HAB_INV_KEY = 0x1d,                     /* Invalid key */
-       HAB_INV_RETURN = 0x1e,          /* Failed callback function */
-       HAB_INV_SIGNATURE = 0x18,   /* Invalid signature */
-       HAB_INV_SIZE = 0x17,            /* Invalid data size */
-       HAB_MEM_FAIL = 0x2e,            /* Memory failure */
-       HAB_OVR_COUNT = 0x2b,           /* Expired poll count */
-       HAB_OVR_STORAGE = 0x2d,         /* Exhausted storage region */
-       HAB_UNS_ALGORITHM = 0x12,   /* Unsupported algorithm */
-       HAB_UNS_COMMAND = 0x03,         /* Unsupported command */
-       HAB_UNS_ENGINE = 0x0a,          /* Unsupported engine */
-       HAB_UNS_ITEM = 0x24,            /* Unsupported configuration item */
-       HAB_UNS_KEY = 0x1b,             /* Unsupported key type/parameters */
-       HAB_UNS_PROTOCOL = 0x14,        /* Unsupported protocol */
-       HAB_UNS_STATE = 0x09,           /* Unsuitable state */
-       HAB_RSN_MAX
-};
-
-enum hab_context {
-       HAB_CTX_ANY = 0x00,                     /* Match any context */
-       HAB_CTX_FAB = 0xff,                 /* Event logged in hab_fab_test() */
-       HAB_CTX_ENTRY = 0xe1,           /* Event logged in hab_rvt.entry() */
-       HAB_CTX_TARGET = 0x33,      /* Event logged in hab_rvt.check_target() */
-       HAB_CTX_AUTHENTICATE = 0x0a,/* Logged in hab_rvt.authenticate_image() */
-       HAB_CTX_DCD = 0xdd,         /* Event logged in hab_rvt.run_dcd() */
-       HAB_CTX_CSF = 0xcf,         /* Event logged in hab_rvt.run_csf() */
-       HAB_CTX_COMMAND = 0xc0,     /* Event logged executing csf/dcd command */
-       HAB_CTX_AUT_DAT = 0xdb,         /* Authenticated data block */
-       HAB_CTX_ASSERT = 0xa0,          /* Event logged in hab_rvt.assert() */
-       HAB_CTX_EXIT = 0xee,            /* Event logged in hab_rvt.exit() */
-       HAB_CTX_MAX
-};
-
-struct imx_sec_config_fuse_t {
-       int bank;
-       int word;
-};
-
-#if defined(CONFIG_SECURE_BOOT)
-extern struct imx_sec_config_fuse_t const imx_sec_config_fuse;
-#endif
-
-/*Function prototype description*/
-typedef enum hab_status hab_rvt_report_event_t(enum hab_status, uint32_t,
-               uint8_t* , size_t*);
-typedef enum hab_status hab_rvt_report_status_t(enum hab_config *,
-               enum hab_state *);
-typedef enum hab_status hab_loader_callback_f_t(void**, size_t*, const void*);
-typedef enum hab_status hab_rvt_entry_t(void);
-typedef enum hab_status hab_rvt_exit_t(void);
-typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_t,
-               void **, size_t *, hab_loader_callback_f_t);
-typedef void hapi_clock_init_t(void);
-
-#define HAB_ENG_ANY            0x00   /* Select first compatible engine */
-#define HAB_ENG_SCC            0x03   /* Security controller */
-#define HAB_ENG_RTIC   0x05   /* Run-time integrity checker */
-#define HAB_ENG_SAHARA  0x06   /* Crypto accelerator */
-#define HAB_ENG_CSU            0x0a   /* Central Security Unit */
-#define HAB_ENG_SRTC   0x0c   /* Secure clock */
-#define HAB_ENG_DCP            0x1b   /* Data Co-Processor */
-#define HAB_ENG_CAAM   0x1d   /* CAAM */
-#define HAB_ENG_SNVS   0x1e   /* Secure Non-Volatile Storage */
-#define HAB_ENG_OCOTP  0x21   /* Fuse controller */
-#define HAB_ENG_DTCP   0x22   /* DTCP co-processor */
-#define HAB_ENG_ROM            0x36   /* Protected ROM area */
-#define HAB_ENG_HDCP   0x24   /* HDCP co-processor */
-#define HAB_ENG_RTL            0x77   /* RTL simulation engine */
-#define HAB_ENG_SW             0xff   /* Software engine */
-
-#ifdef CONFIG_ROM_UNIFIED_SECTIONS
-#define HAB_RVT_BASE                   0x00000100
-#else
-#define HAB_RVT_BASE                   0x00000094
-#endif
-
-#define HAB_RVT_ENTRY                  (*(uint32_t *)(HAB_RVT_BASE + 0x04))
-#define HAB_RVT_EXIT                   (*(uint32_t *)(HAB_RVT_BASE + 0x08))
-#define HAB_RVT_AUTHENTICATE_IMAGE     (*(uint32_t *)(HAB_RVT_BASE + 0x10))
-#define HAB_RVT_REPORT_EVENT           (*(uint32_t *)(HAB_RVT_BASE + 0x20))
-#define HAB_RVT_REPORT_STATUS          (*(uint32_t *)(HAB_RVT_BASE + 0x24))
-
-#define HAB_RVT_REPORT_EVENT_NEW               (*(uint32_t *)0x000000B8)
-#define HAB_RVT_REPORT_STATUS_NEW              (*(uint32_t *)0x000000BC)
-#define HAB_RVT_AUTHENTICATE_IMAGE_NEW         (*(uint32_t *)0x000000A8)
-#define HAB_RVT_ENTRY_NEW                      (*(uint32_t *)0x0000009C)
-#define HAB_RVT_EXIT_NEW                       (*(uint32_t *)0x000000A0)
-
-#define HAB_CID_ROM 0 /**< ROM Caller ID */
-#define HAB_CID_UBOOT 1 /**< UBOOT Caller ID*/
-
-/* ----------- end of HAB API updates ------------*/
-
-uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size);
-
-#endif
diff --git a/arch/arm/include/asm/imx-common/imximage.cfg b/arch/arm/include/asm/imx-common/imximage.cfg
deleted file mode 100644 (file)
index d62166f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * i.MX image header offset values
- * Copyright (C) 2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-/*
- * NOTE: This file must be kept in sync with tools/imximage.h because
- *       tools/imximage.c can not cross-include headers from arch/arm/
- *       and vice-versa.
- */
-
-#ifndef __ASM_IMX_COMMON_IMXIMAGE_CFG__
-#define __ASM_IMX_COMMON_IMXIMAGE_CFG__
-
-/* Standard image header offset for NAND, SATA, SD, SPI flash. */
-#define FLASH_OFFSET_STANDARD  0x400
-/* Specific image header offset for booting from OneNAND. */
-#define FLASH_OFFSET_ONENAND   0x100
-/* Specific image header offset for booting from memory-mapped NOR. */
-#define FLASH_OFFSET_NOR       0x1000
-
-#endif  /* __ASM_IMX_COMMON_IMXIMAGE_CFG__ */
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
deleted file mode 100644 (file)
index ad35e01..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Based on Linux i.MX iomux-v3.h file:
- * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH,
- *                     <armlinux@phytec.de>
- *
- * Copyright (C) 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __MACH_IOMUX_V3_H__
-#define __MACH_IOMUX_V3_H__
-
-#include <common.h>
-
-/*
- *     build IOMUX_PAD structure
- *
- * This iomux scheme is based around pads, which are the physical balls
- * on the processor.
- *
- * - Each pad has a pad control register (IOMUXC_SW_PAD_CTRL_x) which controls
- *   things like driving strength and pullup/pulldown.
- * - Each pad can have but not necessarily does have an output routing register
- *   (IOMUXC_SW_MUX_CTL_PAD_x).
- * - Each pad can have but not necessarily does have an input routing register
- *   (IOMUXC_x_SELECT_INPUT)
- *
- * The three register sets do not have a fixed offset to each other,
- * hence we order this table by pad control registers (which all pads
- * have) and put the optional i/o routing registers into additional
- * fields.
- *
- * The naming convention for the pad modes is SOC_PAD_<padname>__<padmode>
- * If <padname> or <padmode> refers to a GPIO, it is named GPIO_<unit>_<num>
- *
- * IOMUX/PAD Bit field definitions
- *
- * MUX_CTRL_OFS:           0..11 (12)
- * PAD_CTRL_OFS:          12..23 (12)
- * SEL_INPUT_OFS:         24..35 (12)
- * MUX_MODE + SION + LPSR: 36..41  (6)
- * PAD_CTRL + NO_PAD_CTRL: 42..59 (18)
- * SEL_INP:               60..63  (4)
-*/
-
-typedef u64 iomux_v3_cfg_t;
-
-#define MUX_CTRL_OFS_SHIFT     0
-#define MUX_CTRL_OFS_MASK      ((iomux_v3_cfg_t)0xfff << MUX_CTRL_OFS_SHIFT)
-#define MUX_PAD_CTRL_OFS_SHIFT 12
-#define MUX_PAD_CTRL_OFS_MASK  ((iomux_v3_cfg_t)0xfff << \
-       MUX_PAD_CTRL_OFS_SHIFT)
-#define MUX_SEL_INPUT_OFS_SHIFT        24
-#define MUX_SEL_INPUT_OFS_MASK ((iomux_v3_cfg_t)0xfff << \
-       MUX_SEL_INPUT_OFS_SHIFT)
-
-#define MUX_MODE_SHIFT         36
-#define MUX_MODE_MASK          ((iomux_v3_cfg_t)0x3f << MUX_MODE_SHIFT)
-#define MUX_PAD_CTRL_SHIFT     42
-#define MUX_PAD_CTRL_MASK      ((iomux_v3_cfg_t)0x3ffff << MUX_PAD_CTRL_SHIFT)
-#define MUX_SEL_INPUT_SHIFT    60
-#define MUX_SEL_INPUT_MASK     ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT)
-
-#define MUX_MODE_SION          ((iomux_v3_cfg_t)IOMUX_CONFIG_SION << \
-       MUX_MODE_SHIFT)
-#define MUX_PAD_CTRL(x)                ((iomux_v3_cfg_t)(x) << MUX_PAD_CTRL_SHIFT)
-
-#define IOMUX_PAD(pad_ctrl_ofs, mux_ctrl_ofs, mux_mode, sel_input_ofs, \
-               sel_input, pad_ctrl)                                    \
-       (((iomux_v3_cfg_t)(mux_ctrl_ofs) << MUX_CTRL_OFS_SHIFT)     |   \
-       ((iomux_v3_cfg_t)(mux_mode)      << MUX_MODE_SHIFT)         |   \
-       ((iomux_v3_cfg_t)(pad_ctrl_ofs)  << MUX_PAD_CTRL_OFS_SHIFT) |   \
-       ((iomux_v3_cfg_t)(pad_ctrl)      << MUX_PAD_CTRL_SHIFT)     |   \
-       ((iomux_v3_cfg_t)(sel_input_ofs) << MUX_SEL_INPUT_OFS_SHIFT)|   \
-       ((iomux_v3_cfg_t)(sel_input)     << MUX_SEL_INPUT_SHIFT))
-
-#define NEW_PAD_CTRL(cfg, pad) (((cfg) & ~MUX_PAD_CTRL_MASK) | \
-                                       MUX_PAD_CTRL(pad))
-
-#define __NA_                  0x000
-#define NO_MUX_I               0
-#define NO_PAD_I               0
-
-#define NO_PAD_CTRL            (1 << 17)
-
-#define IOMUX_CONFIG_LPSR       0x20
-#define MUX_MODE_LPSR           ((iomux_v3_cfg_t)IOMUX_CONFIG_LPSR << \
-                               MUX_MODE_SHIFT)
-#ifdef CONFIG_MX7
-
-#define IOMUX_LPSR_SEL_INPUT_OFS 0x70000
-
-#define PAD_CTL_DSE_1P8V_140OHM   (0x0<<0)
-#define PAD_CTL_DSE_1P8V_35OHM    (0x1<<0)
-#define PAD_CTL_DSE_1P8V_70OHM    (0x2<<0)
-#define PAD_CTL_DSE_1P8V_23OHM    (0x3<<0)
-
-#define PAD_CTL_DSE_3P3V_196OHM   (0x0<<0)
-#define PAD_CTL_DSE_3P3V_49OHM    (0x1<<0)
-#define PAD_CTL_DSE_3P3V_98OHM    (0x2<<0)
-#define PAD_CTL_DSE_3P3V_32OHM    (0x3<<0)
-
-#define PAD_CTL_SRE_FAST     (0 << 2)
-#define PAD_CTL_SRE_SLOW     (0x1 << 2)
-
-#define PAD_CTL_HYS       (0x1 << 3)
-#define PAD_CTL_PUE       (0x1 << 4)
-
-#define PAD_CTL_PUS_PD100KOHM  ((0x0 << 5) | PAD_CTL_PUE)
-#define PAD_CTL_PUS_PU5KOHM    ((0x1 << 5) | PAD_CTL_PUE)
-#define PAD_CTL_PUS_PU47KOHM   ((0x2 << 5) | PAD_CTL_PUE)
-#define PAD_CTL_PUS_PU100KOHM  ((0x3 << 5) | PAD_CTL_PUE)
-
-#else
-
-#ifdef CONFIG_MX6
-
-#define PAD_CTL_HYS            (1 << 16)
-
-#define PAD_CTL_PUS_100K_DOWN  (0 << 14 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_47K_UP     (1 << 14 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_100K_UP    (2 << 14 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_22K_UP     (3 << 14 | PAD_CTL_PUE)
-#define PAD_CTL_PUE            (1 << 13 | PAD_CTL_PKE)
-#define PAD_CTL_PKE            (1 << 12)
-
-#define PAD_CTL_ODE            (1 << 11)
-
-#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL)
-#define PAD_CTL_SPEED_LOW      (0 << 6)
-#else
-#define PAD_CTL_SPEED_LOW      (1 << 6)
-#endif
-#define PAD_CTL_SPEED_MED      (2 << 6)
-#define PAD_CTL_SPEED_HIGH     (3 << 6)
-
-#define PAD_CTL_DSE_DISABLE    (0 << 3)
-#define PAD_CTL_DSE_240ohm     (1 << 3)
-#define PAD_CTL_DSE_120ohm     (2 << 3)
-#define PAD_CTL_DSE_80ohm      (3 << 3)
-#define PAD_CTL_DSE_60ohm      (4 << 3)
-#define PAD_CTL_DSE_48ohm      (5 << 3)
-#define PAD_CTL_DSE_40ohm      (6 << 3)
-#define PAD_CTL_DSE_34ohm      (7 << 3)
-
-/* i.MX6SL/SLL */
-#define PAD_CTL_LVE            (1 << 1)
-#define PAD_CTL_LVE_BIT                (1 << 22)
-
-/* i.MX6SLL */
-#define PAD_CTL_IPD_BIT                (1 << 27)
-
-#elif defined(CONFIG_VF610)
-
-#define PAD_MUX_MODE_SHIFT     20
-
-#define PAD_CTL_INPUT_DIFFERENTIAL (1 << 16)
-
-#define PAD_CTL_SPEED_MED      (1 << 12)
-#define PAD_CTL_SPEED_HIGH     (3 << 12)
-
-#define PAD_CTL_SRE            (1 << 11)
-
-#define PAD_CTL_ODE            (1 << 10)
-
-#define PAD_CTL_DSE_150ohm     (1 << 6)
-#define PAD_CTL_DSE_75ohm      (2 << 6)
-#define PAD_CTL_DSE_50ohm      (3 << 6)
-#define PAD_CTL_DSE_37ohm      (4 << 6)
-#define PAD_CTL_DSE_30ohm      (5 << 6)
-#define PAD_CTL_DSE_25ohm      (6 << 6)
-#define PAD_CTL_DSE_20ohm      (7 << 6)
-
-#define PAD_CTL_PUS_47K_UP     (1 << 4 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_100K_UP    (2 << 4 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_22K_UP     (3 << 4 | PAD_CTL_PUE)
-#define PAD_CTL_PKE            (1 << 3)
-#define PAD_CTL_PUE            (1 << 2 | PAD_CTL_PKE)
-
-#define PAD_CTL_OBE_IBE_ENABLE (3 << 0)
-#define PAD_CTL_OBE_ENABLE     (1 << 1)
-#define PAD_CTL_IBE_ENABLE     (1 << 0)
-
-#else
-
-#define PAD_CTL_DVS            (1 << 13)
-#define PAD_CTL_INPUT_DDR      (1 << 9)
-#define PAD_CTL_HYS            (1 << 8)
-
-#define PAD_CTL_PKE            (1 << 7)
-#define PAD_CTL_PUE            (1 << 6 | PAD_CTL_PKE)
-#define PAD_CTL_PUS_100K_DOWN  (0 << 4 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_47K_UP     (1 << 4 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_100K_UP    (2 << 4 | PAD_CTL_PUE)
-#define PAD_CTL_PUS_22K_UP     (3 << 4 | PAD_CTL_PUE)
-
-#define PAD_CTL_ODE            (1 << 3)
-
-#define PAD_CTL_DSE_LOW                (0 << 1)
-#define PAD_CTL_DSE_MED                (1 << 1)
-#define PAD_CTL_DSE_HIGH       (2 << 1)
-#define PAD_CTL_DSE_MAX                (3 << 1)
-
-#endif
-
-#define PAD_CTL_SRE_SLOW       (0 << 0)
-#define PAD_CTL_SRE_FAST       (1 << 0)
-
-#endif
-
-#define IOMUX_CONFIG_SION      0x10
-
-#define GPIO_PIN_MASK          0x1f
-#define GPIO_PORT_SHIFT                5
-#define GPIO_PORT_MASK         (0x7 << GPIO_PORT_SHIFT)
-#define GPIO_PORTA             (0 << GPIO_PORT_SHIFT)
-#define GPIO_PORTB             (1 << GPIO_PORT_SHIFT)
-#define GPIO_PORTC             (2 << GPIO_PORT_SHIFT)
-#define GPIO_PORTD             (3 << GPIO_PORT_SHIFT)
-#define GPIO_PORTE             (4 << GPIO_PORT_SHIFT)
-#define GPIO_PORTF             (5 << GPIO_PORT_SHIFT)
-
-void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad);
-void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
-                                    unsigned count);
-/*
-* Set bits for general purpose registers
-*/
-void imx_iomux_set_gpr_register(int group, int start_bit,
-                                        int num_bits, int value);
-#ifdef CONFIG_IOMUX_SHARE_CONF_REG
-void imx_iomux_gpio_set_direction(unsigned int gpio,
-                               unsigned int direction);
-void imx_iomux_gpio_get_function(unsigned int gpio,
-                               u32 *gpio_state);
-#endif
-
-/* macros for declaring and using pinmux array */
-#if defined(CONFIG_MX6QDL)
-#define IOMUX_PADS(x) (MX6Q_##x), (MX6DL_##x)
-#define SETUP_IOMUX_PAD(def)                                   \
-if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) {                          \
-       imx_iomux_v3_setup_pad(MX6Q_##def);                     \
-} else {                                                       \
-       imx_iomux_v3_setup_pad(MX6DL_##def);                    \
-}
-#define SETUP_IOMUX_PADS(x)                                    \
-       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2)
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
-#define IOMUX_PADS(x) MX6Q_##x
-#define SETUP_IOMUX_PAD(def)                                   \
-       imx_iomux_v3_setup_pad(MX6Q_##def);
-#define SETUP_IOMUX_PADS(x)                                    \
-       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
-#elif defined(CONFIG_MX6UL)
-#define IOMUX_PADS(x) MX6_##x
-#define SETUP_IOMUX_PAD(def)                                   \
-       imx_iomux_v3_setup_pad(MX6_##def);
-#define SETUP_IOMUX_PADS(x)                                    \
-       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
-#else
-#define IOMUX_PADS(x) MX6DL_##x
-#define SETUP_IOMUX_PAD(def)                                   \
-       imx_iomux_v3_setup_pad(MX6DL_##def);
-#define SETUP_IOMUX_PADS(x)                                    \
-       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
-#endif
-
-#endif /* __MACH_IOMUX_V3_H__*/
diff --git a/arch/arm/include/asm/imx-common/mx5_video.h b/arch/arm/include/asm/imx-common/mx5_video.h
deleted file mode 100644 (file)
index ccaf010..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2012
- * Anatolij Gustschin, DENX Software Engineering, <agust@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#ifndef __MX5_VIDEO_H
-#define __MX5_VIDEO_H
-
-#ifdef CONFIG_VIDEO
-void lcd_enable(void);
-void setup_iomux_lcd(void);
-#else
-static inline void lcd_enable(void) { }
-static inline void setup_iomux_lcd(void) { }
-#endif
-
-#endif
diff --git a/arch/arm/include/asm/imx-common/mxc_i2c.h b/arch/arm/include/asm/imx-common/mxc_i2c.h
deleted file mode 100644 (file)
index b0b6d61..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-#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>
-
-struct i2c_pin_ctrl {
-       iomux_v3_cfg_t i2c_mode;
-       iomux_v3_cfg_t gpio_mode;
-       unsigned char gp;
-       unsigned char spare;
-};
-
-struct i2c_pads_info {
-       struct i2c_pin_ctrl scl;
-       struct i2c_pin_ctrl sda;
-};
-
-/*
- * Information about i2c controller
- * struct mxc_i2c_bus - information about the i2c[x] bus
- * @index: i2c bus index
- * @base: Address of I2C bus controller
- * @driver_data: Flags for different platforms, such as I2C_QUIRK_FLAG.
- * @speed: Speed of I2C bus
- * @pads_info: pinctrl info for this i2c bus, will be used when pinctrl is ok.
- * The following two is only to be compatible with non-DM part.
- * @idle_bus_fn: function to force bus idle
- * @idle_bus_data: parameter for idle_bus_fun
- * For DM:
- * bus: The device structure for i2c bus controller
- * scl-gpio: specify the gpio related to SCL pin
- * sda-gpio: specify the gpio related to SDA pin
- */
-struct mxc_i2c_bus {
-       /*
-        * board file can use this index to locate which i2c_pads_info is for
-        * i2c_idle_bus. When pinmux is implement, this entry can be
-        * discarded. Here we do not use dev->seq, because we do not want to
-        * export device to board file.
-        */
-       int index;
-       ulong base;
-       ulong driver_data;
-       int speed;
-       struct i2c_pads_info *pads_info;
-#ifndef CONFIG_DM_I2C
-       int (*idle_bus_fn)(void *p);
-       void *idle_bus_data;
-#else
-       struct udevice *bus;
-       /* Use gpio to force bus idle when bus state is abnormal */
-       struct gpio_desc scl_gpio;
-       struct gpio_desc sda_gpio;
-#endif
-};
-
-#if defined(CONFIG_MX6QDL)
-#define I2C_PADS(name, scl_i2c, scl_gpio, scl_gp, sda_i2c, sda_gpio, sda_gp) \
-       struct i2c_pads_info mx6q_##name = {            \
-               .scl = {                                \
-                       .i2c_mode = MX6Q_##scl_i2c,     \
-                       .gpio_mode = MX6Q_##scl_gpio,   \
-                       .gp = scl_gp,                   \
-               },                                      \
-               .sda = {                                \
-                       .i2c_mode = MX6Q_##sda_i2c,     \
-                       .gpio_mode = MX6Q_##sda_gpio,   \
-                       .gp = sda_gp,                   \
-               }                                       \
-       };                                              \
-       struct i2c_pads_info mx6s_##name = {            \
-               .scl = {                                \
-                       .i2c_mode = MX6DL_##scl_i2c,    \
-                       .gpio_mode = MX6DL_##scl_gpio,  \
-                       .gp = scl_gp,                   \
-               },                                      \
-               .sda = {                                \
-                       .i2c_mode = MX6DL_##sda_i2c,    \
-                       .gpio_mode = MX6DL_##sda_gpio,  \
-                       .gp = sda_gp,                   \
-               }                                       \
-       };
-
-
-#define I2C_PADS_INFO(name)    \
-       (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) ? \
-                                       &mx6q_##name : &mx6s_##name
-#endif
-
-int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
-             struct i2c_pads_info *p);
-void bus_i2c_init(int index, int speed, int slave_addr,
-               int (*idle_bus_fn)(void *p), void *p);
-int force_idle_bus(void *priv);
-int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus);
-#endif
diff --git a/arch/arm/include/asm/imx-common/rdc-sema.h b/arch/arm/include/asm/imx-common/rdc-sema.h
deleted file mode 100644 (file)
index 2c61e56..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:  GPL-2.0+
- */
-
-#ifndef __RDC_SEMA_H__
-#define __RDC_SEMA_H__
-
-/*
- * rdc_peri_cfg_t and rdc_ma_cft_t use the same layout.
- *
- *   [ 23 22 | 21 20 | 19 18 | 17 16 ] | [ 15 - 8 ] | [ 7 - 0 ]
- *      d3      d2      d1       d0    | master id  |  peri id
- *   d[x] means domain[x], x can be [3 - 0].
- */
-typedef u32 rdc_peri_cfg_t;
-typedef u32 rdc_ma_cfg_t;
-
-#define RDC_PERI_SHIFT         0
-#define RDC_PERI_MASK          0xFF
-
-#define RDC_DOMAIN_SHIFT_BASE  16
-#define RDC_DOMAIN_MASK                0xFF0000
-#define RDC_DOMAIN_SHIFT(x)    (RDC_DOMAIN_SHIFT_BASE + ((x << 1)))
-#define RDC_DOMAIN(x)          ((rdc_peri_cfg_t)(0x3 << RDC_DOMAIN_SHIFT(x)))
-
-#define RDC_MASTER_SHIFT       8
-#define RDC_MASTER_MASK                0xFF00
-#define RDC_MASTER_CFG(master_id, domain_id) (rdc_ma_cfg_t)((master_id << 8) | \
-                                       (domain_id << RDC_DOMAIN_SHIFT_BASE))
-
-/* The Following macro definitions are common to i.MX6SX and i.MX7D */
-#define SEMA_GATES_NUM         64
-
-#define RDC_MDA_DID_SHIFT      0
-#define RDC_MDA_DID_MASK       (0x3 << RDC_MDA_DID_SHIFT)
-#define RDC_MDA_LCK_SHIFT      31
-#define RDC_MDA_LCK_MASK       (0x1 << RDC_MDA_LCK_SHIFT)
-
-#define RDC_PDAP_DW_SHIFT(domain)      ((domain) << 1)
-#define RDC_PDAP_DR_SHIFT(domain)      (1 + RDC_PDAP_DW_SHIFT(domain))
-#define RDC_PDAP_DW_MASK(domain)       (1 << RDC_PDAP_DW_SHIFT(domain))
-#define RDC_PDAP_DR_MASK(domain)       (1 << RDC_PDAP_DR_SHIFT(domain))
-#define RDC_PDAP_DRW_MASK(domain)      (RDC_PDAP_DW_MASK(domain) | \
-                                        RDC_PDAP_DR_MASK(domain))
-
-#define RDC_PDAP_SREQ_SHIFT    30
-#define RDC_PDAP_SREQ_MASK     (0x1 << RDC_PDAP_SREQ_SHIFT)
-#define RDC_PDAP_LCK_SHIFT     31
-#define RDC_PDAP_LCK_MASK      (0x1 << RDC_PDAP_LCK_SHIFT)
-
-#define RDC_MRSA_SADR_SHIFT    7
-#define RDC_MRSA_SADR_MASK     (0x1ffffff << RDC_MRSA_SADR_SHIFT)
-
-#define RDC_MREA_EADR_SHIFT    7
-#define RDC_MREA_EADR_MASK     (0x1ffffff << RDC_MREA_EADR_SHIFT)
-
-#define RDC_MRC_DW_SHIFT(domain)       (domain)
-#define RDC_MRC_DR_SHIFT(domain)       (1 + RDC_MRC_DW_SHIFT(domain))
-#define RDC_MRC_DW_MASK(domain)                (1 << RDC_MRC_DW_SHIFT(domain))
-#define RDC_MRC_DR_MASK(domain)                (1 << RDC_MRC_DR_SHIFT(domain))
-#define RDC_MRC_DRW_MASK(domain)       (RDC_MRC_DW_MASK(domain) | \
-                                        RDC_MRC_DR_MASK(domain))
-#define RDC_MRC_ENA_SHIFT      30
-#define RDC_MRC_ENA_MASK       (0x1 << RDC_MRC_ENA_SHIFT)
-#define RDC_MRC_LCK_SHIFT      31
-#define RDC_MRC_LCK_MASK       (0x1 << RDC_MRC_LCK_SHIFT)
-
-#define RDC_MRVS_VDID_SHIFT    0
-#define RDC_MRVS_VDID_MASK     (0x3 << RDC_MRVS_VDID_SHIFT)
-#define RDC_MRVS_AD_SHIFT      4
-#define RDC_MRVS_AD_MASK       (0x1 << RDC_MRVS_AD_SHIFT)
-#define RDC_MRVS_VADDR_SHIFT   5
-#define RDC_MRVS_VADDR_MASK    (0x7ffffff << RDC_MRVS_VADDR_SHIFT)
-
-#define RDC_SEMA_GATE_GTFSM_SHIFT      0
-#define RDC_SEMA_GATE_GTFSM_MASK       (0xf << RDC_SEMA_GATE_GTFSM_SHIFT)
-#define RDC_SEMA_GATE_LDOM_SHIFT       5
-#define RDC_SEMA_GATE_LDOM_MASK                (0x3 << RDC_SEMA_GATE_LDOM_SHIFT)
-
-#define RDC_SEMA_RSTGT_RSTGDP_SHIFT    0
-#define RDC_SEMA_RSTGT_RSTGDP_MASK     (0xff << RDC_SEMA_RSTGT_RSTGDP_SHIFT)
-#define RDC_SEMA_RSTGT_RSTGSM_SHIFT    2
-#define RDC_SEMA_RSTGT_RSTGSM_MASK     (0x3 << RDC_SEMA_RSTGT_RSTGSM_SHIFT)
-#define RDC_SEMA_RSTGT_RSTGMS_SHIFT    4
-#define RDC_SEMA_RSTGT_RSTGMS_MASK     (0xf << RDC_SEMA_RSTGT_RSTGMS_SHIFT)
-#define RDC_SEMA_RSTGT_RSTGTN_SHIFT    8
-#define RDC_SEMA_RSTGT_RSTGTN_MASK     (0xff << RDC_SEMA_RSTGT_RSTGTN_SHIFT)
-
-int imx_rdc_check_permission(int per_id, int dom_id);
-int imx_rdc_sema_lock(int per_id);
-int imx_rdc_sema_unlock(int per_id);
-int imx_rdc_setup_peri(rdc_peri_cfg_t p);
-int imx_rdc_setup_peripherals(rdc_peri_cfg_t const *peripherals_list,
-                             unsigned count);
-int imx_rdc_setup_ma(rdc_ma_cfg_t p);
-int imx_rdc_setup_masters(rdc_ma_cfg_t const *masters_list, unsigned count);
-
-#endif /* __RDC_SEMA_H__*/
diff --git a/arch/arm/include/asm/imx-common/regs-apbh.h b/arch/arm/include/asm/imx-common/regs-apbh.h
deleted file mode 100644 (file)
index 391452c..0000000
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * Freescale i.MX28 APBH Register Definitions
- *
- * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
- * on behalf of DENX Software Engineering GmbH
- *
- * Based on code from LTIB:
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __REGS_APBH_H__
-#define __REGS_APBH_H__
-
-#include <asm/imx-common/regs-common.h>
-
-#ifndef        __ASSEMBLY__
-
-#if defined(CONFIG_MX23)
-struct mxs_apbh_regs {
-       mxs_reg_32(hw_apbh_ctrl0)
-       mxs_reg_32(hw_apbh_ctrl1)
-       mxs_reg_32(hw_apbh_ctrl2)
-       mxs_reg_32(hw_apbh_channel_ctrl)
-
-       union {
-       struct {
-               mxs_reg_32(hw_apbh_ch_curcmdar)
-               mxs_reg_32(hw_apbh_ch_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch_cmd)
-               mxs_reg_32(hw_apbh_ch_bar)
-               mxs_reg_32(hw_apbh_ch_sema)
-               mxs_reg_32(hw_apbh_ch_debug1)
-               mxs_reg_32(hw_apbh_ch_debug2)
-       } ch[8];
-       struct {
-               mxs_reg_32(hw_apbh_ch0_curcmdar)
-               mxs_reg_32(hw_apbh_ch0_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch0_cmd)
-               mxs_reg_32(hw_apbh_ch0_bar)
-               mxs_reg_32(hw_apbh_ch0_sema)
-               mxs_reg_32(hw_apbh_ch0_debug1)
-               mxs_reg_32(hw_apbh_ch0_debug2)
-               mxs_reg_32(hw_apbh_ch1_curcmdar)
-               mxs_reg_32(hw_apbh_ch1_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch1_cmd)
-               mxs_reg_32(hw_apbh_ch1_bar)
-               mxs_reg_32(hw_apbh_ch1_sema)
-               mxs_reg_32(hw_apbh_ch1_debug1)
-               mxs_reg_32(hw_apbh_ch1_debug2)
-               mxs_reg_32(hw_apbh_ch2_curcmdar)
-               mxs_reg_32(hw_apbh_ch2_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch2_cmd)
-               mxs_reg_32(hw_apbh_ch2_bar)
-               mxs_reg_32(hw_apbh_ch2_sema)
-               mxs_reg_32(hw_apbh_ch2_debug1)
-               mxs_reg_32(hw_apbh_ch2_debug2)
-               mxs_reg_32(hw_apbh_ch3_curcmdar)
-               mxs_reg_32(hw_apbh_ch3_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch3_cmd)
-               mxs_reg_32(hw_apbh_ch3_bar)
-               mxs_reg_32(hw_apbh_ch3_sema)
-               mxs_reg_32(hw_apbh_ch3_debug1)
-               mxs_reg_32(hw_apbh_ch3_debug2)
-               mxs_reg_32(hw_apbh_ch4_curcmdar)
-               mxs_reg_32(hw_apbh_ch4_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch4_cmd)
-               mxs_reg_32(hw_apbh_ch4_bar)
-               mxs_reg_32(hw_apbh_ch4_sema)
-               mxs_reg_32(hw_apbh_ch4_debug1)
-               mxs_reg_32(hw_apbh_ch4_debug2)
-               mxs_reg_32(hw_apbh_ch5_curcmdar)
-               mxs_reg_32(hw_apbh_ch5_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch5_cmd)
-               mxs_reg_32(hw_apbh_ch5_bar)
-               mxs_reg_32(hw_apbh_ch5_sema)
-               mxs_reg_32(hw_apbh_ch5_debug1)
-               mxs_reg_32(hw_apbh_ch5_debug2)
-               mxs_reg_32(hw_apbh_ch6_curcmdar)
-               mxs_reg_32(hw_apbh_ch6_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch6_cmd)
-               mxs_reg_32(hw_apbh_ch6_bar)
-               mxs_reg_32(hw_apbh_ch6_sema)
-               mxs_reg_32(hw_apbh_ch6_debug1)
-               mxs_reg_32(hw_apbh_ch6_debug2)
-               mxs_reg_32(hw_apbh_ch7_curcmdar)
-               mxs_reg_32(hw_apbh_ch7_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch7_cmd)
-               mxs_reg_32(hw_apbh_ch7_bar)
-               mxs_reg_32(hw_apbh_ch7_sema)
-               mxs_reg_32(hw_apbh_ch7_debug1)
-               mxs_reg_32(hw_apbh_ch7_debug2)
-       };
-       };
-       mxs_reg_32(hw_apbh_version)
-};
-
-#elif (defined(CONFIG_MX28) || defined(CONFIG_MX6) || defined(CONFIG_MX7))
-struct mxs_apbh_regs {
-       mxs_reg_32(hw_apbh_ctrl0)
-       mxs_reg_32(hw_apbh_ctrl1)
-       mxs_reg_32(hw_apbh_ctrl2)
-       mxs_reg_32(hw_apbh_channel_ctrl)
-       mxs_reg_32(hw_apbh_devsel)
-       mxs_reg_32(hw_apbh_dma_burst_size)
-       mxs_reg_32(hw_apbh_debug)
-
-       uint32_t        reserved[36];
-
-       union {
-       struct {
-               mxs_reg_32(hw_apbh_ch_curcmdar)
-               mxs_reg_32(hw_apbh_ch_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch_cmd)
-               mxs_reg_32(hw_apbh_ch_bar)
-               mxs_reg_32(hw_apbh_ch_sema)
-               mxs_reg_32(hw_apbh_ch_debug1)
-               mxs_reg_32(hw_apbh_ch_debug2)
-       } ch[16];
-       struct {
-               mxs_reg_32(hw_apbh_ch0_curcmdar)
-               mxs_reg_32(hw_apbh_ch0_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch0_cmd)
-               mxs_reg_32(hw_apbh_ch0_bar)
-               mxs_reg_32(hw_apbh_ch0_sema)
-               mxs_reg_32(hw_apbh_ch0_debug1)
-               mxs_reg_32(hw_apbh_ch0_debug2)
-               mxs_reg_32(hw_apbh_ch1_curcmdar)
-               mxs_reg_32(hw_apbh_ch1_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch1_cmd)
-               mxs_reg_32(hw_apbh_ch1_bar)
-               mxs_reg_32(hw_apbh_ch1_sema)
-               mxs_reg_32(hw_apbh_ch1_debug1)
-               mxs_reg_32(hw_apbh_ch1_debug2)
-               mxs_reg_32(hw_apbh_ch2_curcmdar)
-               mxs_reg_32(hw_apbh_ch2_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch2_cmd)
-               mxs_reg_32(hw_apbh_ch2_bar)
-               mxs_reg_32(hw_apbh_ch2_sema)
-               mxs_reg_32(hw_apbh_ch2_debug1)
-               mxs_reg_32(hw_apbh_ch2_debug2)
-               mxs_reg_32(hw_apbh_ch3_curcmdar)
-               mxs_reg_32(hw_apbh_ch3_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch3_cmd)
-               mxs_reg_32(hw_apbh_ch3_bar)
-               mxs_reg_32(hw_apbh_ch3_sema)
-               mxs_reg_32(hw_apbh_ch3_debug1)
-               mxs_reg_32(hw_apbh_ch3_debug2)
-               mxs_reg_32(hw_apbh_ch4_curcmdar)
-               mxs_reg_32(hw_apbh_ch4_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch4_cmd)
-               mxs_reg_32(hw_apbh_ch4_bar)
-               mxs_reg_32(hw_apbh_ch4_sema)
-               mxs_reg_32(hw_apbh_ch4_debug1)
-               mxs_reg_32(hw_apbh_ch4_debug2)
-               mxs_reg_32(hw_apbh_ch5_curcmdar)
-               mxs_reg_32(hw_apbh_ch5_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch5_cmd)
-               mxs_reg_32(hw_apbh_ch5_bar)
-               mxs_reg_32(hw_apbh_ch5_sema)
-               mxs_reg_32(hw_apbh_ch5_debug1)
-               mxs_reg_32(hw_apbh_ch5_debug2)
-               mxs_reg_32(hw_apbh_ch6_curcmdar)
-               mxs_reg_32(hw_apbh_ch6_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch6_cmd)
-               mxs_reg_32(hw_apbh_ch6_bar)
-               mxs_reg_32(hw_apbh_ch6_sema)
-               mxs_reg_32(hw_apbh_ch6_debug1)
-               mxs_reg_32(hw_apbh_ch6_debug2)
-               mxs_reg_32(hw_apbh_ch7_curcmdar)
-               mxs_reg_32(hw_apbh_ch7_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch7_cmd)
-               mxs_reg_32(hw_apbh_ch7_bar)
-               mxs_reg_32(hw_apbh_ch7_sema)
-               mxs_reg_32(hw_apbh_ch7_debug1)
-               mxs_reg_32(hw_apbh_ch7_debug2)
-               mxs_reg_32(hw_apbh_ch8_curcmdar)
-               mxs_reg_32(hw_apbh_ch8_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch8_cmd)
-               mxs_reg_32(hw_apbh_ch8_bar)
-               mxs_reg_32(hw_apbh_ch8_sema)
-               mxs_reg_32(hw_apbh_ch8_debug1)
-               mxs_reg_32(hw_apbh_ch8_debug2)
-               mxs_reg_32(hw_apbh_ch9_curcmdar)
-               mxs_reg_32(hw_apbh_ch9_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch9_cmd)
-               mxs_reg_32(hw_apbh_ch9_bar)
-               mxs_reg_32(hw_apbh_ch9_sema)
-               mxs_reg_32(hw_apbh_ch9_debug1)
-               mxs_reg_32(hw_apbh_ch9_debug2)
-               mxs_reg_32(hw_apbh_ch10_curcmdar)
-               mxs_reg_32(hw_apbh_ch10_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch10_cmd)
-               mxs_reg_32(hw_apbh_ch10_bar)
-               mxs_reg_32(hw_apbh_ch10_sema)
-               mxs_reg_32(hw_apbh_ch10_debug1)
-               mxs_reg_32(hw_apbh_ch10_debug2)
-               mxs_reg_32(hw_apbh_ch11_curcmdar)
-               mxs_reg_32(hw_apbh_ch11_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch11_cmd)
-               mxs_reg_32(hw_apbh_ch11_bar)
-               mxs_reg_32(hw_apbh_ch11_sema)
-               mxs_reg_32(hw_apbh_ch11_debug1)
-               mxs_reg_32(hw_apbh_ch11_debug2)
-               mxs_reg_32(hw_apbh_ch12_curcmdar)
-               mxs_reg_32(hw_apbh_ch12_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch12_cmd)
-               mxs_reg_32(hw_apbh_ch12_bar)
-               mxs_reg_32(hw_apbh_ch12_sema)
-               mxs_reg_32(hw_apbh_ch12_debug1)
-               mxs_reg_32(hw_apbh_ch12_debug2)
-               mxs_reg_32(hw_apbh_ch13_curcmdar)
-               mxs_reg_32(hw_apbh_ch13_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch13_cmd)
-               mxs_reg_32(hw_apbh_ch13_bar)
-               mxs_reg_32(hw_apbh_ch13_sema)
-               mxs_reg_32(hw_apbh_ch13_debug1)
-               mxs_reg_32(hw_apbh_ch13_debug2)
-               mxs_reg_32(hw_apbh_ch14_curcmdar)
-               mxs_reg_32(hw_apbh_ch14_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch14_cmd)
-               mxs_reg_32(hw_apbh_ch14_bar)
-               mxs_reg_32(hw_apbh_ch14_sema)
-               mxs_reg_32(hw_apbh_ch14_debug1)
-               mxs_reg_32(hw_apbh_ch14_debug2)
-               mxs_reg_32(hw_apbh_ch15_curcmdar)
-               mxs_reg_32(hw_apbh_ch15_nxtcmdar)
-               mxs_reg_32(hw_apbh_ch15_cmd)
-               mxs_reg_32(hw_apbh_ch15_bar)
-               mxs_reg_32(hw_apbh_ch15_sema)
-               mxs_reg_32(hw_apbh_ch15_debug1)
-               mxs_reg_32(hw_apbh_ch15_debug2)
-       };
-       };
-       mxs_reg_32(hw_apbh_version)
-};
-#endif
-
-#endif
-
-#define        APBH_CTRL0_SFTRST                               (1 << 31)
-#define        APBH_CTRL0_CLKGATE                              (1 << 30)
-#define        APBH_CTRL0_AHB_BURST8_EN                        (1 << 29)
-#define        APBH_CTRL0_APB_BURST_EN                         (1 << 28)
-#if defined(CONFIG_MX23)
-#define        APBH_CTRL0_RSVD0_MASK                           (0xf << 24)
-#define        APBH_CTRL0_RSVD0_OFFSET                         24
-#define        APBH_CTRL0_RESET_CHANNEL_MASK                   (0xff << 16)
-#define        APBH_CTRL0_RESET_CHANNEL_OFFSET                 16
-#define        APBH_CTRL0_CLKGATE_CHANNEL_MASK                 (0xff << 8)
-#define        APBH_CTRL0_CLKGATE_CHANNEL_OFFSET               8
-#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP0                 0x02
-#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP1                 0x04
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND0                0x10
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND1                0x20
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND2                0x40
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND3                0x80
-#elif defined(CONFIG_MX28)
-#define        APBH_CTRL0_RSVD0_MASK                           (0xfff << 16)
-#define        APBH_CTRL0_RSVD0_OFFSET                         16
-#define        APBH_CTRL0_CLKGATE_CHANNEL_MASK                 0xffff
-#define        APBH_CTRL0_CLKGATE_CHANNEL_OFFSET               0
-#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP0                 0x0001
-#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP1                 0x0002
-#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP2                 0x0004
-#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP3                 0x0008
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND0                0x0010
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND1                0x0020
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND2                0x0040
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND3                0x0080
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND4                0x0100
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND5                0x0200
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND6                0x0400
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND7                0x0800
-#define        APBH_CTRL0_CLKGATE_CHANNEL_HSADC                0x1000
-#define        APBH_CTRL0_CLKGATE_CHANNEL_LCDIF                0x2000
-#elif (defined(CONFIG_MX6) || defined(CONFIG_MX7))
-#define        APBH_CTRL0_CLKGATE_CHANNEL_OFFSET               0
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND0                0x0001
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND1                0x0002
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND2                0x0004
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND3                0x0008
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND4                0x0010
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND5                0x0020
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND6                0x0040
-#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND7                0x0080
-#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP                  0x0100
-#endif
-
-#define        APBH_CTRL1_CH15_CMDCMPLT_IRQ_EN                 (1 << 31)
-#define        APBH_CTRL1_CH14_CMDCMPLT_IRQ_EN                 (1 << 30)
-#define        APBH_CTRL1_CH13_CMDCMPLT_IRQ_EN                 (1 << 29)
-#define        APBH_CTRL1_CH12_CMDCMPLT_IRQ_EN                 (1 << 28)
-#define        APBH_CTRL1_CH11_CMDCMPLT_IRQ_EN                 (1 << 27)
-#define        APBH_CTRL1_CH10_CMDCMPLT_IRQ_EN                 (1 << 26)
-#define        APBH_CTRL1_CH9_CMDCMPLT_IRQ_EN                  (1 << 25)
-#define        APBH_CTRL1_CH8_CMDCMPLT_IRQ_EN                  (1 << 24)
-#define        APBH_CTRL1_CH7_CMDCMPLT_IRQ_EN                  (1 << 23)
-#define        APBH_CTRL1_CH6_CMDCMPLT_IRQ_EN                  (1 << 22)
-#define        APBH_CTRL1_CH5_CMDCMPLT_IRQ_EN                  (1 << 21)
-#define        APBH_CTRL1_CH4_CMDCMPLT_IRQ_EN                  (1 << 20)
-#define        APBH_CTRL1_CH3_CMDCMPLT_IRQ_EN                  (1 << 19)
-#define        APBH_CTRL1_CH2_CMDCMPLT_IRQ_EN                  (1 << 18)
-#define        APBH_CTRL1_CH1_CMDCMPLT_IRQ_EN                  (1 << 17)
-#define        APBH_CTRL1_CH0_CMDCMPLT_IRQ_EN                  (1 << 16)
-#define        APBH_CTRL1_CH_CMDCMPLT_IRQ_EN_OFFSET            16
-#define        APBH_CTRL1_CH_CMDCMPLT_IRQ_EN_MASK              (0xffff << 16)
-#define        APBH_CTRL1_CH15_CMDCMPLT_IRQ                    (1 << 15)
-#define        APBH_CTRL1_CH14_CMDCMPLT_IRQ                    (1 << 14)
-#define        APBH_CTRL1_CH13_CMDCMPLT_IRQ                    (1 << 13)
-#define        APBH_CTRL1_CH12_CMDCMPLT_IRQ                    (1 << 12)
-#define        APBH_CTRL1_CH11_CMDCMPLT_IRQ                    (1 << 11)
-#define        APBH_CTRL1_CH10_CMDCMPLT_IRQ                    (1 << 10)
-#define        APBH_CTRL1_CH9_CMDCMPLT_IRQ                     (1 << 9)
-#define        APBH_CTRL1_CH8_CMDCMPLT_IRQ                     (1 << 8)
-#define        APBH_CTRL1_CH7_CMDCMPLT_IRQ                     (1 << 7)
-#define        APBH_CTRL1_CH6_CMDCMPLT_IRQ                     (1 << 6)
-#define        APBH_CTRL1_CH5_CMDCMPLT_IRQ                     (1 << 5)
-#define        APBH_CTRL1_CH4_CMDCMPLT_IRQ                     (1 << 4)
-#define        APBH_CTRL1_CH3_CMDCMPLT_IRQ                     (1 << 3)
-#define        APBH_CTRL1_CH2_CMDCMPLT_IRQ                     (1 << 2)
-#define        APBH_CTRL1_CH1_CMDCMPLT_IRQ                     (1 << 1)
-#define        APBH_CTRL1_CH0_CMDCMPLT_IRQ                     (1 << 0)
-
-#define        APBH_CTRL2_CH15_ERROR_STATUS                    (1 << 31)
-#define        APBH_CTRL2_CH14_ERROR_STATUS                    (1 << 30)
-#define        APBH_CTRL2_CH13_ERROR_STATUS                    (1 << 29)
-#define        APBH_CTRL2_CH12_ERROR_STATUS                    (1 << 28)
-#define        APBH_CTRL2_CH11_ERROR_STATUS                    (1 << 27)
-#define        APBH_CTRL2_CH10_ERROR_STATUS                    (1 << 26)
-#define        APBH_CTRL2_CH9_ERROR_STATUS                     (1 << 25)
-#define        APBH_CTRL2_CH8_ERROR_STATUS                     (1 << 24)
-#define        APBH_CTRL2_CH7_ERROR_STATUS                     (1 << 23)
-#define        APBH_CTRL2_CH6_ERROR_STATUS                     (1 << 22)
-#define        APBH_CTRL2_CH5_ERROR_STATUS                     (1 << 21)
-#define        APBH_CTRL2_CH4_ERROR_STATUS                     (1 << 20)
-#define        APBH_CTRL2_CH3_ERROR_STATUS                     (1 << 19)
-#define        APBH_CTRL2_CH2_ERROR_STATUS                     (1 << 18)
-#define        APBH_CTRL2_CH1_ERROR_STATUS                     (1 << 17)
-#define        APBH_CTRL2_CH0_ERROR_STATUS                     (1 << 16)
-#define        APBH_CTRL2_CH15_ERROR_IRQ                       (1 << 15)
-#define        APBH_CTRL2_CH14_ERROR_IRQ                       (1 << 14)
-#define        APBH_CTRL2_CH13_ERROR_IRQ                       (1 << 13)
-#define        APBH_CTRL2_CH12_ERROR_IRQ                       (1 << 12)
-#define        APBH_CTRL2_CH11_ERROR_IRQ                       (1 << 11)
-#define        APBH_CTRL2_CH10_ERROR_IRQ                       (1 << 10)
-#define        APBH_CTRL2_CH9_ERROR_IRQ                        (1 << 9)
-#define        APBH_CTRL2_CH8_ERROR_IRQ                        (1 << 8)
-#define        APBH_CTRL2_CH7_ERROR_IRQ                        (1 << 7)
-#define        APBH_CTRL2_CH6_ERROR_IRQ                        (1 << 6)
-#define        APBH_CTRL2_CH5_ERROR_IRQ                        (1 << 5)
-#define        APBH_CTRL2_CH4_ERROR_IRQ                        (1 << 4)
-#define        APBH_CTRL2_CH3_ERROR_IRQ                        (1 << 3)
-#define        APBH_CTRL2_CH2_ERROR_IRQ                        (1 << 2)
-#define        APBH_CTRL2_CH1_ERROR_IRQ                        (1 << 1)
-#define        APBH_CTRL2_CH0_ERROR_IRQ                        (1 << 0)
-
-#if defined(CONFIG_MX28)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_MASK            (0xffff << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET          16
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP0            (0x0001 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP1            (0x0002 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP2            (0x0004 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP3            (0x0008 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND0           (0x0010 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND1           (0x0020 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND2           (0x0040 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND3           (0x0080 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND4           (0x0100 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND5           (0x0200 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND6           (0x0400 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND7           (0x0800 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_HSADC           (0x1000 << 16)
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_LCDIF           (0x2000 << 16)
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_MASK           0xffff
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_OFFSET         0
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP0           0x0001
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP1           0x0002
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP2           0x0004
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP3           0x0008
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND0          0x0010
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND1          0x0020
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND2          0x0040
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND3          0x0080
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND4          0x0100
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND5          0x0200
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND6          0x0400
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND7          0x0800
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_HSADC          0x1000
-#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_LCDIF          0x2000
-#endif
-
-#if (defined(CONFIG_MX6) || defined(CONFIG_MX7))
-#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET          16
-#endif
-
-#if defined(CONFIG_MX23)
-#define        APBH_DEVSEL_CH7_MASK                            (0xf << 28)
-#define        APBH_DEVSEL_CH7_OFFSET                          28
-#define        APBH_DEVSEL_CH6_MASK                            (0xf << 24)
-#define        APBH_DEVSEL_CH6_OFFSET                          24
-#define        APBH_DEVSEL_CH5_MASK                            (0xf << 20)
-#define        APBH_DEVSEL_CH5_OFFSET                          20
-#define        APBH_DEVSEL_CH4_MASK                            (0xf << 16)
-#define        APBH_DEVSEL_CH4_OFFSET                          16
-#define        APBH_DEVSEL_CH3_MASK                            (0xf << 12)
-#define        APBH_DEVSEL_CH3_OFFSET                          12
-#define        APBH_DEVSEL_CH2_MASK                            (0xf << 8)
-#define        APBH_DEVSEL_CH2_OFFSET                          8
-#define        APBH_DEVSEL_CH1_MASK                            (0xf << 4)
-#define        APBH_DEVSEL_CH1_OFFSET                          4
-#define        APBH_DEVSEL_CH0_MASK                            (0xf << 0)
-#define        APBH_DEVSEL_CH0_OFFSET                          0
-#elif defined(CONFIG_MX28)
-#define        APBH_DEVSEL_CH15_MASK                           (0x3 << 30)
-#define        APBH_DEVSEL_CH15_OFFSET                         30
-#define        APBH_DEVSEL_CH14_MASK                           (0x3 << 28)
-#define        APBH_DEVSEL_CH14_OFFSET                         28
-#define        APBH_DEVSEL_CH13_MASK                           (0x3 << 26)
-#define        APBH_DEVSEL_CH13_OFFSET                         26
-#define        APBH_DEVSEL_CH12_MASK                           (0x3 << 24)
-#define        APBH_DEVSEL_CH12_OFFSET                         24
-#define        APBH_DEVSEL_CH11_MASK                           (0x3 << 22)
-#define        APBH_DEVSEL_CH11_OFFSET                         22
-#define        APBH_DEVSEL_CH10_MASK                           (0x3 << 20)
-#define        APBH_DEVSEL_CH10_OFFSET                         20
-#define        APBH_DEVSEL_CH9_MASK                            (0x3 << 18)
-#define        APBH_DEVSEL_CH9_OFFSET                          18
-#define        APBH_DEVSEL_CH8_MASK                            (0x3 << 16)
-#define        APBH_DEVSEL_CH8_OFFSET                          16
-#define        APBH_DEVSEL_CH7_MASK                            (0x3 << 14)
-#define        APBH_DEVSEL_CH7_OFFSET                          14
-#define        APBH_DEVSEL_CH6_MASK                            (0x3 << 12)
-#define        APBH_DEVSEL_CH6_OFFSET                          12
-#define        APBH_DEVSEL_CH5_MASK                            (0x3 << 10)
-#define        APBH_DEVSEL_CH5_OFFSET                          10
-#define        APBH_DEVSEL_CH4_MASK                            (0x3 << 8)
-#define        APBH_DEVSEL_CH4_OFFSET                          8
-#define        APBH_DEVSEL_CH3_MASK                            (0x3 << 6)
-#define        APBH_DEVSEL_CH3_OFFSET                          6
-#define        APBH_DEVSEL_CH2_MASK                            (0x3 << 4)
-#define        APBH_DEVSEL_CH2_OFFSET                          4
-#define        APBH_DEVSEL_CH1_MASK                            (0x3 << 2)
-#define        APBH_DEVSEL_CH1_OFFSET                          2
-#define        APBH_DEVSEL_CH0_MASK                            (0x3 << 0)
-#define        APBH_DEVSEL_CH0_OFFSET                          0
-#endif
-
-#if defined(CONFIG_MX28)
-#define        APBH_DMA_BURST_SIZE_CH15_MASK                   (0x3 << 30)
-#define        APBH_DMA_BURST_SIZE_CH15_OFFSET                 30
-#define        APBH_DMA_BURST_SIZE_CH14_MASK                   (0x3 << 28)
-#define        APBH_DMA_BURST_SIZE_CH14_OFFSET                 28
-#define        APBH_DMA_BURST_SIZE_CH13_MASK                   (0x3 << 26)
-#define        APBH_DMA_BURST_SIZE_CH13_OFFSET                 26
-#define        APBH_DMA_BURST_SIZE_CH12_MASK                   (0x3 << 24)
-#define        APBH_DMA_BURST_SIZE_CH12_OFFSET                 24
-#define        APBH_DMA_BURST_SIZE_CH11_MASK                   (0x3 << 22)
-#define        APBH_DMA_BURST_SIZE_CH11_OFFSET                 22
-#define        APBH_DMA_BURST_SIZE_CH10_MASK                   (0x3 << 20)
-#define        APBH_DMA_BURST_SIZE_CH10_OFFSET                 20
-#define        APBH_DMA_BURST_SIZE_CH9_MASK                    (0x3 << 18)
-#define        APBH_DMA_BURST_SIZE_CH9_OFFSET                  18
-#define        APBH_DMA_BURST_SIZE_CH8_MASK                    (0x3 << 16)
-#define        APBH_DMA_BURST_SIZE_CH8_OFFSET                  16
-#define        APBH_DMA_BURST_SIZE_CH8_BURST0                  (0x0 << 16)
-#define        APBH_DMA_BURST_SIZE_CH8_BURST4                  (0x1 << 16)
-#define        APBH_DMA_BURST_SIZE_CH8_BURST8                  (0x2 << 16)
-#define        APBH_DMA_BURST_SIZE_CH7_MASK                    (0x3 << 14)
-#define        APBH_DMA_BURST_SIZE_CH7_OFFSET                  14
-#define        APBH_DMA_BURST_SIZE_CH6_MASK                    (0x3 << 12)
-#define        APBH_DMA_BURST_SIZE_CH6_OFFSET                  12
-#define        APBH_DMA_BURST_SIZE_CH5_MASK                    (0x3 << 10)
-#define        APBH_DMA_BURST_SIZE_CH5_OFFSET                  10
-#define        APBH_DMA_BURST_SIZE_CH4_MASK                    (0x3 << 8)
-#define        APBH_DMA_BURST_SIZE_CH4_OFFSET                  8
-#define        APBH_DMA_BURST_SIZE_CH3_MASK                    (0x3 << 6)
-#define        APBH_DMA_BURST_SIZE_CH3_OFFSET                  6
-#define        APBH_DMA_BURST_SIZE_CH3_BURST0                  (0x0 << 6)
-#define        APBH_DMA_BURST_SIZE_CH3_BURST4                  (0x1 << 6)
-#define        APBH_DMA_BURST_SIZE_CH3_BURST8                  (0x2 << 6)
-
-#define        APBH_DMA_BURST_SIZE_CH2_MASK                    (0x3 << 4)
-#define        APBH_DMA_BURST_SIZE_CH2_OFFSET                  4
-#define        APBH_DMA_BURST_SIZE_CH2_BURST0                  (0x0 << 4)
-#define        APBH_DMA_BURST_SIZE_CH2_BURST4                  (0x1 << 4)
-#define        APBH_DMA_BURST_SIZE_CH2_BURST8                  (0x2 << 4)
-#define        APBH_DMA_BURST_SIZE_CH1_MASK                    (0x3 << 2)
-#define        APBH_DMA_BURST_SIZE_CH1_OFFSET                  2
-#define        APBH_DMA_BURST_SIZE_CH1_BURST0                  (0x0 << 2)
-#define        APBH_DMA_BURST_SIZE_CH1_BURST4                  (0x1 << 2)
-#define        APBH_DMA_BURST_SIZE_CH1_BURST8                  (0x2 << 2)
-
-#define        APBH_DMA_BURST_SIZE_CH0_MASK                    0x3
-#define        APBH_DMA_BURST_SIZE_CH0_OFFSET                  0
-#define        APBH_DMA_BURST_SIZE_CH0_BURST0                  0x0
-#define        APBH_DMA_BURST_SIZE_CH0_BURST4                  0x1
-#define        APBH_DMA_BURST_SIZE_CH0_BURST8                  0x2
-
-#define        APBH_DEBUG_GPMI_ONE_FIFO                        (1 << 0)
-#endif
-
-#define        APBH_CHn_CURCMDAR_CMD_ADDR_MASK                 0xffffffff
-#define        APBH_CHn_CURCMDAR_CMD_ADDR_OFFSET               0
-
-#define        APBH_CHn_NXTCMDAR_CMD_ADDR_MASK                 0xffffffff
-#define        APBH_CHn_NXTCMDAR_CMD_ADDR_OFFSET               0
-
-#define        APBH_CHn_CMD_XFER_COUNT_MASK                    (0xffff << 16)
-#define        APBH_CHn_CMD_XFER_COUNT_OFFSET                  16
-#define        APBH_CHn_CMD_CMDWORDS_MASK                      (0xf << 12)
-#define        APBH_CHn_CMD_CMDWORDS_OFFSET                    12
-#define        APBH_CHn_CMD_HALTONTERMINATE                    (1 << 8)
-#define        APBH_CHn_CMD_WAIT4ENDCMD                        (1 << 7)
-#define        APBH_CHn_CMD_SEMAPHORE                          (1 << 6)
-#define        APBH_CHn_CMD_NANDWAIT4READY                     (1 << 5)
-#define        APBH_CHn_CMD_NANDLOCK                           (1 << 4)
-#define        APBH_CHn_CMD_IRQONCMPLT                         (1 << 3)
-#define        APBH_CHn_CMD_CHAIN                              (1 << 2)
-#define        APBH_CHn_CMD_COMMAND_MASK                       0x3
-#define        APBH_CHn_CMD_COMMAND_OFFSET                     0
-#define        APBH_CHn_CMD_COMMAND_NO_DMA_XFER                0x0
-#define        APBH_CHn_CMD_COMMAND_DMA_WRITE                  0x1
-#define        APBH_CHn_CMD_COMMAND_DMA_READ                   0x2
-#define        APBH_CHn_CMD_COMMAND_DMA_SENSE                  0x3
-
-#define        APBH_CHn_BAR_ADDRESS_MASK                       0xffffffff
-#define        APBH_CHn_BAR_ADDRESS_OFFSET                     0
-
-#define        APBH_CHn_SEMA_RSVD2_MASK                        (0xff << 24)
-#define        APBH_CHn_SEMA_RSVD2_OFFSET                      24
-#define        APBH_CHn_SEMA_PHORE_MASK                        (0xff << 16)
-#define        APBH_CHn_SEMA_PHORE_OFFSET                      16
-#define        APBH_CHn_SEMA_RSVD1_MASK                        (0xff << 8)
-#define        APBH_CHn_SEMA_RSVD1_OFFSET                      8
-#define        APBH_CHn_SEMA_INCREMENT_SEMA_MASK               (0xff << 0)
-#define        APBH_CHn_SEMA_INCREMENT_SEMA_OFFSET             0
-
-#define        APBH_CHn_DEBUG1_REQ                             (1 << 31)
-#define        APBH_CHn_DEBUG1_BURST                           (1 << 30)
-#define        APBH_CHn_DEBUG1_KICK                            (1 << 29)
-#define        APBH_CHn_DEBUG1_END                             (1 << 28)
-#define        APBH_CHn_DEBUG1_SENSE                           (1 << 27)
-#define        APBH_CHn_DEBUG1_READY                           (1 << 26)
-#define        APBH_CHn_DEBUG1_LOCK                            (1 << 25)
-#define        APBH_CHn_DEBUG1_NEXTCMDADDRVALID                (1 << 24)
-#define        APBH_CHn_DEBUG1_RD_FIFO_EMPTY                   (1 << 23)
-#define        APBH_CHn_DEBUG1_RD_FIFO_FULL                    (1 << 22)
-#define        APBH_CHn_DEBUG1_WR_FIFO_EMPTY                   (1 << 21)
-#define        APBH_CHn_DEBUG1_WR_FIFO_FULL                    (1 << 20)
-#define        APBH_CHn_DEBUG1_RSVD1_MASK                      (0x7fff << 5)
-#define        APBH_CHn_DEBUG1_RSVD1_OFFSET                    5
-#define        APBH_CHn_DEBUG1_STATEMACHINE_MASK               0x1f
-#define        APBH_CHn_DEBUG1_STATEMACHINE_OFFSET             0
-#define        APBH_CHn_DEBUG1_STATEMACHINE_IDLE               0x00
-#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD1           0x01
-#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD3           0x02
-#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD2           0x03
-#define        APBH_CHn_DEBUG1_STATEMACHINE_XFER_DECODE        0x04
-#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_WAIT           0x05
-#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD4           0x06
-#define        APBH_CHn_DEBUG1_STATEMACHINE_PIO_REQ            0x07
-#define        APBH_CHn_DEBUG1_STATEMACHINE_READ_FLUSH         0x08
-#define        APBH_CHn_DEBUG1_STATEMACHINE_READ_WAIT          0x09
-#define        APBH_CHn_DEBUG1_STATEMACHINE_WRITE              0x0c
-#define        APBH_CHn_DEBUG1_STATEMACHINE_READ_REQ           0x0d
-#define        APBH_CHn_DEBUG1_STATEMACHINE_CHECK_CHAIN        0x0e
-#define        APBH_CHn_DEBUG1_STATEMACHINE_XFER_COMPLETE      0x0f
-#define        APBH_CHn_DEBUG1_STATEMACHINE_TERMINATE          0x14
-#define        APBH_CHn_DEBUG1_STATEMACHINE_WAIT_END           0x15
-#define        APBH_CHn_DEBUG1_STATEMACHINE_WRITE_WAIT         0x1c
-#define        APBH_CHn_DEBUG1_STATEMACHINE_HALT_AFTER_TERM    0x1d
-#define        APBH_CHn_DEBUG1_STATEMACHINE_CHECK_WAIT         0x1e
-#define        APBH_CHn_DEBUG1_STATEMACHINE_WAIT_READY         0x1f
-
-#define        APBH_CHn_DEBUG2_APB_BYTES_MASK                  (0xffff << 16)
-#define        APBH_CHn_DEBUG2_APB_BYTES_OFFSET                16
-#define        APBH_CHn_DEBUG2_AHB_BYTES_MASK                  0xffff
-#define        APBH_CHn_DEBUG2_AHB_BYTES_OFFSET                0
-
-#define        APBH_VERSION_MAJOR_MASK                         (0xff << 24)
-#define        APBH_VERSION_MAJOR_OFFSET                       24
-#define        APBH_VERSION_MINOR_MASK                         (0xff << 16)
-#define        APBH_VERSION_MINOR_OFFSET                       16
-#define        APBH_VERSION_STEP_MASK                          0xffff
-#define        APBH_VERSION_STEP_OFFSET                        0
-
-#endif /* __REGS_APBH_H__ */
diff --git a/arch/arm/include/asm/imx-common/regs-bch.h b/arch/arm/include/asm/imx-common/regs-bch.h
deleted file mode 100644 (file)
index adfbace..0000000
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Freescale i.MX28 BCH Register Definitions
- *
- * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
- * on behalf of DENX Software Engineering GmbH
- *
- * Based on code from LTIB:
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __MX28_REGS_BCH_H__
-#define __MX28_REGS_BCH_H__
-
-#include <asm/imx-common/regs-common.h>
-
-#ifndef        __ASSEMBLY__
-struct mxs_bch_regs {
-       mxs_reg_32(hw_bch_ctrl)
-       mxs_reg_32(hw_bch_status0)
-       mxs_reg_32(hw_bch_mode)
-       mxs_reg_32(hw_bch_encodeptr)
-       mxs_reg_32(hw_bch_dataptr)
-       mxs_reg_32(hw_bch_metaptr)
-
-       uint32_t        reserved[4];
-
-       mxs_reg_32(hw_bch_layoutselect)
-       mxs_reg_32(hw_bch_flash0layout0)
-       mxs_reg_32(hw_bch_flash0layout1)
-       mxs_reg_32(hw_bch_flash1layout0)
-       mxs_reg_32(hw_bch_flash1layout1)
-       mxs_reg_32(hw_bch_flash2layout0)
-       mxs_reg_32(hw_bch_flash2layout1)
-       mxs_reg_32(hw_bch_flash3layout0)
-       mxs_reg_32(hw_bch_flash3layout1)
-       mxs_reg_32(hw_bch_dbgkesread)
-       mxs_reg_32(hw_bch_dbgcsferead)
-       mxs_reg_32(hw_bch_dbgsyndegread)
-       mxs_reg_32(hw_bch_dbgahbmread)
-       mxs_reg_32(hw_bch_blockname)
-       mxs_reg_32(hw_bch_version)
-};
-#endif
-
-#define        BCH_CTRL_SFTRST                                 (1 << 31)
-#define        BCH_CTRL_CLKGATE                                (1 << 30)
-#define        BCH_CTRL_DEBUGSYNDROME                          (1 << 22)
-#define        BCH_CTRL_M2M_LAYOUT_MASK                        (0x3 << 18)
-#define        BCH_CTRL_M2M_LAYOUT_OFFSET                      18
-#define        BCH_CTRL_M2M_ENCODE                             (1 << 17)
-#define        BCH_CTRL_M2M_ENABLE                             (1 << 16)
-#define        BCH_CTRL_DEBUG_STALL_IRQ_EN                     (1 << 10)
-#define        BCH_CTRL_COMPLETE_IRQ_EN                        (1 << 8)
-#define        BCH_CTRL_BM_ERROR_IRQ                           (1 << 3)
-#define        BCH_CTRL_DEBUG_STALL_IRQ                        (1 << 2)
-#define        BCH_CTRL_COMPLETE_IRQ                           (1 << 0)
-
-#define        BCH_STATUS0_HANDLE_MASK                         (0xfff << 20)
-#define        BCH_STATUS0_HANDLE_OFFSET                       20
-#define        BCH_STATUS0_COMPLETED_CE_MASK                   (0xf << 16)
-#define        BCH_STATUS0_COMPLETED_CE_OFFSET                 16
-#define        BCH_STATUS0_STATUS_BLK0_MASK                    (0xff << 8)
-#define        BCH_STATUS0_STATUS_BLK0_OFFSET                  8
-#define        BCH_STATUS0_STATUS_BLK0_ZERO                    (0x00 << 8)
-#define        BCH_STATUS0_STATUS_BLK0_ERROR1                  (0x01 << 8)
-#define        BCH_STATUS0_STATUS_BLK0_ERROR2                  (0x02 << 8)
-#define        BCH_STATUS0_STATUS_BLK0_ERROR3                  (0x03 << 8)
-#define        BCH_STATUS0_STATUS_BLK0_ERROR4                  (0x04 << 8)
-#define        BCH_STATUS0_STATUS_BLK0_UNCORRECTABLE           (0xfe << 8)
-#define        BCH_STATUS0_STATUS_BLK0_ERASED                  (0xff << 8)
-#define        BCH_STATUS0_ALLONES                             (1 << 4)
-#define        BCH_STATUS0_CORRECTED                           (1 << 3)
-#define        BCH_STATUS0_UNCORRECTABLE                       (1 << 2)
-
-#define        BCH_MODE_ERASE_THRESHOLD_MASK                   0xff
-#define        BCH_MODE_ERASE_THRESHOLD_OFFSET                 0
-
-#define        BCH_ENCODEPTR_ADDR_MASK                         0xffffffff
-#define        BCH_ENCODEPTR_ADDR_OFFSET                       0
-
-#define        BCH_DATAPTR_ADDR_MASK                           0xffffffff
-#define        BCH_DATAPTR_ADDR_OFFSET                         0
-
-#define        BCH_METAPTR_ADDR_MASK                           0xffffffff
-#define        BCH_METAPTR_ADDR_OFFSET                         0
-
-#define        BCH_LAYOUTSELECT_CS15_SELECT_MASK               (0x3 << 30)
-#define        BCH_LAYOUTSELECT_CS15_SELECT_OFFSET             30
-#define        BCH_LAYOUTSELECT_CS14_SELECT_MASK               (0x3 << 28)
-#define        BCH_LAYOUTSELECT_CS14_SELECT_OFFSET             28
-#define        BCH_LAYOUTSELECT_CS13_SELECT_MASK               (0x3 << 26)
-#define        BCH_LAYOUTSELECT_CS13_SELECT_OFFSET             26
-#define        BCH_LAYOUTSELECT_CS12_SELECT_MASK               (0x3 << 24)
-#define        BCH_LAYOUTSELECT_CS12_SELECT_OFFSET             24
-#define        BCH_LAYOUTSELECT_CS11_SELECT_MASK               (0x3 << 22)
-#define        BCH_LAYOUTSELECT_CS11_SELECT_OFFSET             22
-#define        BCH_LAYOUTSELECT_CS10_SELECT_MASK               (0x3 << 20)
-#define        BCH_LAYOUTSELECT_CS10_SELECT_OFFSET             20
-#define        BCH_LAYOUTSELECT_CS9_SELECT_MASK                (0x3 << 18)
-#define        BCH_LAYOUTSELECT_CS9_SELECT_OFFSET              18
-#define        BCH_LAYOUTSELECT_CS8_SELECT_MASK                (0x3 << 16)
-#define        BCH_LAYOUTSELECT_CS8_SELECT_OFFSET              16
-#define        BCH_LAYOUTSELECT_CS7_SELECT_MASK                (0x3 << 14)
-#define        BCH_LAYOUTSELECT_CS7_SELECT_OFFSET              14
-#define        BCH_LAYOUTSELECT_CS6_SELECT_MASK                (0x3 << 12)
-#define        BCH_LAYOUTSELECT_CS6_SELECT_OFFSET              12
-#define        BCH_LAYOUTSELECT_CS5_SELECT_MASK                (0x3 << 10)
-#define        BCH_LAYOUTSELECT_CS5_SELECT_OFFSET              10
-#define        BCH_LAYOUTSELECT_CS4_SELECT_MASK                (0x3 << 8)
-#define        BCH_LAYOUTSELECT_CS4_SELECT_OFFSET              8
-#define        BCH_LAYOUTSELECT_CS3_SELECT_MASK                (0x3 << 6)
-#define        BCH_LAYOUTSELECT_CS3_SELECT_OFFSET              6
-#define        BCH_LAYOUTSELECT_CS2_SELECT_MASK                (0x3 << 4)
-#define        BCH_LAYOUTSELECT_CS2_SELECT_OFFSET              4
-#define        BCH_LAYOUTSELECT_CS1_SELECT_MASK                (0x3 << 2)
-#define        BCH_LAYOUTSELECT_CS1_SELECT_OFFSET              2
-#define        BCH_LAYOUTSELECT_CS0_SELECT_MASK                (0x3 << 0)
-#define        BCH_LAYOUTSELECT_CS0_SELECT_OFFSET              0
-
-#define        BCH_FLASHLAYOUT0_NBLOCKS_MASK                   (0xff << 24)
-#define        BCH_FLASHLAYOUT0_NBLOCKS_OFFSET                 24
-#define        BCH_FLASHLAYOUT0_META_SIZE_MASK                 (0xff << 16)
-#define        BCH_FLASHLAYOUT0_META_SIZE_OFFSET               16
-#if (defined(CONFIG_MX6) || defined(CONFIG_MX7))
-#define        BCH_FLASHLAYOUT0_ECC0_MASK                      (0x1f << 11)
-#define        BCH_FLASHLAYOUT0_ECC0_OFFSET                    11
-#else
-#define        BCH_FLASHLAYOUT0_ECC0_MASK                      (0xf << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_OFFSET                    12
-#endif
-#define        BCH_FLASHLAYOUT0_ECC0_NONE                      (0x0 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC2                      (0x1 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC4                      (0x2 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC6                      (0x3 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC8                      (0x4 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC10                     (0x5 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC12                     (0x6 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC14                     (0x7 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC16                     (0x8 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC18                     (0x9 << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC20                     (0xa << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC22                     (0xb << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC24                     (0xc << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC26                     (0xd << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC28                     (0xe << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC30                     (0xf << 12)
-#define        BCH_FLASHLAYOUT0_ECC0_ECC32                     (0x10 << 12)
-#define        BCH_FLASHLAYOUT0_GF13_0_GF14_1                  (1 << 10)
-#define        BCH_FLASHLAYOUT0_GF13_0_GF14_1_OFFSET           10
-#define        BCH_FLASHLAYOUT0_DATA0_SIZE_MASK                0xfff
-#define        BCH_FLASHLAYOUT0_DATA0_SIZE_OFFSET              0
-
-#define        BCH_FLASHLAYOUT1_PAGE_SIZE_MASK                 (0xffff << 16)
-#define        BCH_FLASHLAYOUT1_PAGE_SIZE_OFFSET               16
-#if (defined(CONFIG_MX6) || defined(CONFIG_MX7))
-#define        BCH_FLASHLAYOUT1_ECCN_MASK                      (0x1f << 11)
-#define        BCH_FLASHLAYOUT1_ECCN_OFFSET                    11
-#else
-#define        BCH_FLASHLAYOUT1_ECCN_MASK                      (0xf << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_OFFSET                    12
-#endif
-#define        BCH_FLASHLAYOUT1_ECCN_NONE                      (0x0 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC2                      (0x1 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC4                      (0x2 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC6                      (0x3 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC8                      (0x4 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC10                     (0x5 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC12                     (0x6 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC14                     (0x7 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC16                     (0x8 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC18                     (0x9 << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC20                     (0xa << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC22                     (0xb << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC24                     (0xc << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC26                     (0xd << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC28                     (0xe << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC30                     (0xf << 12)
-#define        BCH_FLASHLAYOUT1_ECCN_ECC32                     (0x10 << 12)
-#define        BCH_FLASHLAYOUT1_GF13_0_GF14_1                  (1 << 10)
-#define        BCH_FLASHLAYOUT1_GF13_0_GF14_1_OFFSET           10
-#define        BCH_FLASHLAYOUT1_DATAN_SIZE_MASK                0xfff
-#define        BCH_FLASHLAYOUT1_DATAN_SIZE_OFFSET              0
-
-#define        BCH_DEBUG0_RSVD1_MASK                           (0x1f << 27)
-#define        BCH_DEBUG0_RSVD1_OFFSET                         27
-#define        BCH_DEBUG0_ROM_BIST_ENABLE                      (1 << 26)
-#define        BCH_DEBUG0_ROM_BIST_COMPLETE                    (1 << 25)
-#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_MASK       (0x1ff << 16)
-#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_OFFSET     16
-#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_NORMAL     (0x0 << 16)
-#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_TEST_MODE  (0x1 << 16)
-#define        BCH_DEBUG0_KES_DEBUG_SHIFT_SYND                 (1 << 15)
-#define        BCH_DEBUG0_KES_DEBUG_PAYLOAD_FLAG               (1 << 14)
-#define        BCH_DEBUG0_KES_DEBUG_MODE4K                     (1 << 13)
-#define        BCH_DEBUG0_KES_DEBUG_KICK                       (1 << 12)
-#define        BCH_DEBUG0_KES_STANDALONE                       (1 << 11)
-#define        BCH_DEBUG0_KES_DEBUG_STEP                       (1 << 10)
-#define        BCH_DEBUG0_KES_DEBUG_STALL                      (1 << 9)
-#define        BCH_DEBUG0_BM_KES_TEST_BYPASS                   (1 << 8)
-#define        BCH_DEBUG0_RSVD0_MASK                           (0x3 << 6)
-#define        BCH_DEBUG0_RSVD0_OFFSET                         6
-#define        BCH_DEBUG0_DEBUG_REG_SELECT_MASK                0x3f
-#define        BCH_DEBUG0_DEBUG_REG_SELECT_OFFSET              0
-
-#define        BCH_DBGKESREAD_VALUES_MASK                      0xffffffff
-#define        BCH_DBGKESREAD_VALUES_OFFSET                    0
-
-#define        BCH_DBGCSFEREAD_VALUES_MASK                     0xffffffff
-#define        BCH_DBGCSFEREAD_VALUES_OFFSET                   0
-
-#define        BCH_DBGSYNDGENREAD_VALUES_MASK                  0xffffffff
-#define        BCH_DBGSYNDGENREAD_VALUES_OFFSET                0
-
-#define        BCH_DBGAHBMREAD_VALUES_MASK                     0xffffffff
-#define        BCH_DBGAHBMREAD_VALUES_OFFSET                   0
-
-#define        BCH_BLOCKNAME_NAME_MASK                         0xffffffff
-#define        BCH_BLOCKNAME_NAME_OFFSET                       0
-
-#define        BCH_VERSION_MAJOR_MASK                          (0xff << 24)
-#define        BCH_VERSION_MAJOR_OFFSET                        24
-#define        BCH_VERSION_MINOR_MASK                          (0xff << 16)
-#define        BCH_VERSION_MINOR_OFFSET                        16
-#define        BCH_VERSION_STEP_MASK                           0xffff
-#define        BCH_VERSION_STEP_OFFSET                         0
-
-#endif /* __MX28_REGS_BCH_H__ */
diff --git a/arch/arm/include/asm/imx-common/regs-common.h b/arch/arm/include/asm/imx-common/regs-common.h
deleted file mode 100644 (file)
index 7382674..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Freescale i.MXS Register Accessors
- *
- * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
- * on behalf of DENX Software Engineering GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __MXS_REGS_COMMON_H__
-#define __MXS_REGS_COMMON_H__
-
-#include <linux/types.h>
-
-/*
- * The i.MXS has interesting feature when it comes to register access. There
- * are four kinds of access to one particular register. Those are:
- *
- * 1) Common read/write access. To use this mode, just write to the address of
- *    the register.
- * 2) Set bits only access. To set bits, write which bits you want to set to the
- *    address of the register + 0x4.
- * 3) Clear bits only access. To clear bits, write which bits you want to clear
- *    to the address of the register + 0x8.
- * 4) Toggle bits only access. To toggle bits, write which bits you want to
- *    toggle to the address of the register + 0xc.
- *
- * IMPORTANT NOTE: Not all registers support accesses 2-4! Also, not all bits
- * can be set/cleared by pure write as in access type 1, some need to be
- * explicitly set/cleared by using access type 2-3.
- *
- * The following macros and structures allow the user to either access the
- * register in all aforementioned modes (by accessing reg_name, reg_name_set,
- * reg_name_clr, reg_name_tog) or pass the register structure further into
- * various functions with correct type information (by accessing reg_name_reg).
- *
- */
-
-#define        __mxs_reg_8(name)               \
-       uint8_t name[4];                \
-       uint8_t name##_set[4];          \
-       uint8_t name##_clr[4];          \
-       uint8_t name##_tog[4];          \
-
-#define        __mxs_reg_32(name)              \
-       uint32_t name;                  \
-       uint32_t name##_set;            \
-       uint32_t name##_clr;            \
-       uint32_t name##_tog;
-
-struct mxs_register_8 {
-       __mxs_reg_8(reg)
-};
-
-struct mxs_register_32 {
-       __mxs_reg_32(reg)
-};
-
-#define        mxs_reg_8(name)                         \
-       union {                                         \
-               struct { __mxs_reg_8(name) };           \
-               struct mxs_register_8 name##_reg;       \
-       };
-
-#define        mxs_reg_32(name)                                \
-       union {                                         \
-               struct { __mxs_reg_32(name) };          \
-               struct mxs_register_32 name##_reg;      \
-       };
-
-#endif /* __MXS_REGS_COMMON_H__ */
diff --git a/arch/arm/include/asm/imx-common/regs-gpmi.h b/arch/arm/include/asm/imx-common/regs-gpmi.h
deleted file mode 100644 (file)
index b93bfe5..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Freescale i.MX28 GPMI Register Definitions
- *
- * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
- * on behalf of DENX Software Engineering GmbH
- *
- * Based on code from LTIB:
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __MX28_REGS_GPMI_H__
-#define __MX28_REGS_GPMI_H__
-
-#include <asm/imx-common/regs-common.h>
-
-#ifndef        __ASSEMBLY__
-struct mxs_gpmi_regs {
-       mxs_reg_32(hw_gpmi_ctrl0)
-       mxs_reg_32(hw_gpmi_compare)
-       mxs_reg_32(hw_gpmi_eccctrl)
-       mxs_reg_32(hw_gpmi_ecccount)
-       mxs_reg_32(hw_gpmi_payload)
-       mxs_reg_32(hw_gpmi_auxiliary)
-       mxs_reg_32(hw_gpmi_ctrl1)
-       mxs_reg_32(hw_gpmi_timing0)
-       mxs_reg_32(hw_gpmi_timing1)
-
-       uint32_t        reserved[4];
-
-       mxs_reg_32(hw_gpmi_data)
-       mxs_reg_32(hw_gpmi_stat)
-       mxs_reg_32(hw_gpmi_debug)
-       mxs_reg_32(hw_gpmi_version)
-};
-#endif
-
-#define        GPMI_CTRL0_SFTRST                               (1 << 31)
-#define        GPMI_CTRL0_CLKGATE                              (1 << 30)
-#define        GPMI_CTRL0_RUN                                  (1 << 29)
-#define        GPMI_CTRL0_DEV_IRQ_EN                           (1 << 28)
-#define        GPMI_CTRL0_LOCK_CS                              (1 << 27)
-#define        GPMI_CTRL0_UDMA                                 (1 << 26)
-#define        GPMI_CTRL0_COMMAND_MODE_MASK                    (0x3 << 24)
-#define        GPMI_CTRL0_COMMAND_MODE_OFFSET                  24
-#define        GPMI_CTRL0_COMMAND_MODE_WRITE                   (0x0 << 24)
-#define        GPMI_CTRL0_COMMAND_MODE_READ                    (0x1 << 24)
-#define        GPMI_CTRL0_COMMAND_MODE_READ_AND_COMPARE        (0x2 << 24)
-#define        GPMI_CTRL0_COMMAND_MODE_WAIT_FOR_READY          (0x3 << 24)
-#define        GPMI_CTRL0_WORD_LENGTH                          (1 << 23)
-#define        GPMI_CTRL0_CS_MASK                              (0x7 << 20)
-#define        GPMI_CTRL0_CS_OFFSET                            20
-#define        GPMI_CTRL0_ADDRESS_MASK                         (0x7 << 17)
-#define        GPMI_CTRL0_ADDRESS_OFFSET                       17
-#define        GPMI_CTRL0_ADDRESS_NAND_DATA                    (0x0 << 17)
-#define        GPMI_CTRL0_ADDRESS_NAND_CLE                     (0x1 << 17)
-#define        GPMI_CTRL0_ADDRESS_NAND_ALE                     (0x2 << 17)
-#define        GPMI_CTRL0_ADDRESS_INCREMENT                    (1 << 16)
-#define        GPMI_CTRL0_XFER_COUNT_MASK                      0xffff
-#define        GPMI_CTRL0_XFER_COUNT_OFFSET                    0
-
-#define        GPMI_COMPARE_MASK_MASK                          (0xffff << 16)
-#define        GPMI_COMPARE_MASK_OFFSET                        16
-#define        GPMI_COMPARE_REFERENCE_MASK                     0xffff
-#define        GPMI_COMPARE_REFERENCE_OFFSET                   0
-
-#define        GPMI_ECCCTRL_HANDLE_MASK                        (0xffff << 16)
-#define        GPMI_ECCCTRL_HANDLE_OFFSET                      16
-#define        GPMI_ECCCTRL_ECC_CMD_MASK                       (0x3 << 13)
-#define        GPMI_ECCCTRL_ECC_CMD_OFFSET                     13
-#define        GPMI_ECCCTRL_ECC_CMD_DECODE                     (0x0 << 13)
-#define        GPMI_ECCCTRL_ECC_CMD_ENCODE                     (0x1 << 13)
-#define        GPMI_ECCCTRL_ENABLE_ECC                         (1 << 12)
-#define        GPMI_ECCCTRL_BUFFER_MASK_MASK                   0x1ff
-#define        GPMI_ECCCTRL_BUFFER_MASK_OFFSET                 0
-#define        GPMI_ECCCTRL_BUFFER_MASK_BCH_AUXONLY            0x100
-#define        GPMI_ECCCTRL_BUFFER_MASK_BCH_PAGE               0x1ff
-
-#define        GPMI_ECCCOUNT_COUNT_MASK                        0xffff
-#define        GPMI_ECCCOUNT_COUNT_OFFSET                      0
-
-#define        GPMI_PAYLOAD_ADDRESS_MASK                       (0x3fffffff << 2)
-#define        GPMI_PAYLOAD_ADDRESS_OFFSET                     2
-
-#define        GPMI_AUXILIARY_ADDRESS_MASK                     (0x3fffffff << 2)
-#define        GPMI_AUXILIARY_ADDRESS_OFFSET                   2
-
-#define        GPMI_CTRL1_DECOUPLE_CS                          (1 << 24)
-#define        GPMI_CTRL1_WRN_DLY_SEL_MASK                     (0x3 << 22)
-#define        GPMI_CTRL1_WRN_DLY_SEL_OFFSET                   22
-#define        GPMI_CTRL1_TIMEOUT_IRQ_EN                       (1 << 20)
-#define        GPMI_CTRL1_GANGED_RDYBUSY                       (1 << 19)
-#define        GPMI_CTRL1_BCH_MODE                             (1 << 18)
-#define        GPMI_CTRL1_DLL_ENABLE                           (1 << 17)
-#define        GPMI_CTRL1_HALF_PERIOD                          (1 << 16)
-#define        GPMI_CTRL1_RDN_DELAY_MASK                       (0xf << 12)
-#define        GPMI_CTRL1_RDN_DELAY_OFFSET                     12
-#define        GPMI_CTRL1_DMA2ECC_MODE                         (1 << 11)
-#define        GPMI_CTRL1_DEV_IRQ                              (1 << 10)
-#define        GPMI_CTRL1_TIMEOUT_IRQ                          (1 << 9)
-#define        GPMI_CTRL1_BURST_EN                             (1 << 8)
-#define        GPMI_CTRL1_ABORT_WAIT_REQUEST                   (1 << 7)
-#define        GPMI_CTRL1_ABORT_WAIT_FOR_READY_CHANNEL_MASK    (0x7 << 4)
-#define        GPMI_CTRL1_ABORT_WAIT_FOR_READY_CHANNEL_OFFSET  4
-#define        GPMI_CTRL1_DEV_RESET                            (1 << 3)
-#define        GPMI_CTRL1_ATA_IRQRDY_POLARITY                  (1 << 2)
-#define        GPMI_CTRL1_CAMERA_MODE                          (1 << 1)
-#define        GPMI_CTRL1_GPMI_MODE                            (1 << 0)
-
-#define        GPMI_TIMING0_ADDRESS_SETUP_MASK                 (0xff << 16)
-#define        GPMI_TIMING0_ADDRESS_SETUP_OFFSET               16
-#define        GPMI_TIMING0_DATA_HOLD_MASK                     (0xff << 8)
-#define        GPMI_TIMING0_DATA_HOLD_OFFSET                   8
-#define        GPMI_TIMING0_DATA_SETUP_MASK                    0xff
-#define        GPMI_TIMING0_DATA_SETUP_OFFSET                  0
-
-#define        GPMI_TIMING1_DEVICE_BUSY_TIMEOUT_MASK           (0xffff << 16)
-#define        GPMI_TIMING1_DEVICE_BUSY_TIMEOUT_OFFSET         16
-
-#define        GPMI_TIMING2_UDMA_TRP_MASK                      (0xff << 24)
-#define        GPMI_TIMING2_UDMA_TRP_OFFSET                    24
-#define        GPMI_TIMING2_UDMA_ENV_MASK                      (0xff << 16)
-#define        GPMI_TIMING2_UDMA_ENV_OFFSET                    16
-#define        GPMI_TIMING2_UDMA_HOLD_MASK                     (0xff << 8)
-#define        GPMI_TIMING2_UDMA_HOLD_OFFSET                   8
-#define        GPMI_TIMING2_UDMA_SETUP_MASK                    0xff
-#define        GPMI_TIMING2_UDMA_SETUP_OFFSET                  0
-
-#define        GPMI_DATA_DATA_MASK                             0xffffffff
-#define        GPMI_DATA_DATA_OFFSET                           0
-
-#define        GPMI_STAT_READY_BUSY_MASK                       (0xff << 24)
-#define        GPMI_STAT_READY_BUSY_OFFSET                     24
-#define        GPMI_STAT_RDY_TIMEOUT_MASK                      (0xff << 16)
-#define        GPMI_STAT_RDY_TIMEOUT_OFFSET                    16
-#define        GPMI_STAT_DEV7_ERROR                            (1 << 15)
-#define        GPMI_STAT_DEV6_ERROR                            (1 << 14)
-#define        GPMI_STAT_DEV5_ERROR                            (1 << 13)
-#define        GPMI_STAT_DEV4_ERROR                            (1 << 12)
-#define        GPMI_STAT_DEV3_ERROR                            (1 << 11)
-#define        GPMI_STAT_DEV2_ERROR                            (1 << 10)
-#define        GPMI_STAT_DEV1_ERROR                            (1 << 9)
-#define        GPMI_STAT_DEV0_ERROR                            (1 << 8)
-#define        GPMI_STAT_ATA_IRQ                               (1 << 4)
-#define        GPMI_STAT_INVALID_BUFFER_MASK                   (1 << 3)
-#define        GPMI_STAT_FIFO_EMPTY                            (1 << 2)
-#define        GPMI_STAT_FIFO_FULL                             (1 << 1)
-#define        GPMI_STAT_PRESENT                               (1 << 0)
-
-#define        GPMI_DEBUG_WAIT_FOR_READY_END_MASK              (0xff << 24)
-#define        GPMI_DEBUG_WAIT_FOR_READY_END_OFFSET            24
-#define        GPMI_DEBUG_DMA_SENSE_MASK                       (0xff << 16)
-#define        GPMI_DEBUG_DMA_SENSE_OFFSET                     16
-#define        GPMI_DEBUG_DMAREQ_MASK                          (0xff << 8)
-#define        GPMI_DEBUG_DMAREQ_OFFSET                        8
-#define        GPMI_DEBUG_CMD_END_MASK                         0xff
-#define        GPMI_DEBUG_CMD_END_OFFSET                       0
-
-#define        GPMI_VERSION_MAJOR_MASK                         (0xff << 24)
-#define        GPMI_VERSION_MAJOR_OFFSET                       24
-#define        GPMI_VERSION_MINOR_MASK                         (0xff << 16)
-#define        GPMI_VERSION_MINOR_OFFSET                       16
-#define        GPMI_VERSION_STEP_MASK                          0xffff
-#define        GPMI_VERSION_STEP_OFFSET                        0
-
-#define        GPMI_DEBUG2_UDMA_STATE_MASK                     (0xf << 24)
-#define        GPMI_DEBUG2_UDMA_STATE_OFFSET                   24
-#define        GPMI_DEBUG2_BUSY                                (1 << 23)
-#define        GPMI_DEBUG2_PIN_STATE_MASK                      (0x7 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_OFFSET                    20
-#define        GPMI_DEBUG2_PIN_STATE_PSM_IDLE                  (0x0 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_PSM_BYTCNT                (0x1 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_PSM_ADDR                  (0x2 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_PSM_STALL                 (0x3 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_PSM_STROBE                (0x4 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_PSM_ATARDY                (0x5 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_PSM_DHOLD                 (0x6 << 20)
-#define        GPMI_DEBUG2_PIN_STATE_PSM_DONE                  (0x7 << 20)
-#define        GPMI_DEBUG2_MAIN_STATE_MASK                     (0xf << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_OFFSET                   16
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_IDLE                 (0x0 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_BYTCNT               (0x1 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_WAITFE               (0x2 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_WAITFR               (0x3 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_DMAREQ               (0x4 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_DMAACK               (0x5 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_WAITFF               (0x6 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_LDFIFO               (0x7 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_LDDMAR               (0x8 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_RDCMP                (0x9 << 16)
-#define        GPMI_DEBUG2_MAIN_STATE_MSM_DONE                 (0xa << 16)
-#define        GPMI_DEBUG2_SYND2GPMI_BE_MASK                   (0xf << 12)
-#define        GPMI_DEBUG2_SYND2GPMI_BE_OFFSET                 12
-#define        GPMI_DEBUG2_GPMI2SYND_VALID                     (1 << 11)
-#define        GPMI_DEBUG2_GPMI2SYND_READY                     (1 << 10)
-#define        GPMI_DEBUG2_SYND2GPMI_VALID                     (1 << 9)
-#define        GPMI_DEBUG2_SYND2GPMI_READY                     (1 << 8)
-#define        GPMI_DEBUG2_VIEW_DELAYED_RDN                    (1 << 7)
-#define        GPMI_DEBUG2_UPDATE_WINDOW                       (1 << 6)
-#define        GPMI_DEBUG2_RDN_TAP_MASK                        0x3f
-#define        GPMI_DEBUG2_RDN_TAP_OFFSET                      0
-
-#define        GPMI_DEBUG3_APB_WORD_CNTR_MASK                  (0xffff << 16)
-#define        GPMI_DEBUG3_APB_WORD_CNTR_OFFSET                16
-#define        GPMI_DEBUG3_DEV_WORD_CNTR_MASK                  0xffff
-#define        GPMI_DEBUG3_DEV_WORD_CNTR_OFFSET                0
-
-#endif /* __MX28_REGS_GPMI_H__ */
diff --git a/arch/arm/include/asm/imx-common/regs-lcdif.h b/arch/arm/include/asm/imx-common/regs-lcdif.h
deleted file mode 100644 (file)
index ab147b5..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Freescale i.MX28/6SX/6UL/7D LCDIF Register Definitions
- *
- * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
- * on behalf of DENX Software Engineering GmbH
- *
- * Based on code from LTIB:
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __IMX_REGS_LCDIF_H__
-#define __IMX_REGS_LCDIF_H__
-
-#ifndef        __ASSEMBLY__
-#include <asm/imx-common/regs-common.h>
-
-struct mxs_lcdif_regs {
-       mxs_reg_32(hw_lcdif_ctrl)               /* 0x00 */
-       mxs_reg_32(hw_lcdif_ctrl1)              /* 0x10 */
-#if defined(CONFIG_MX28) || defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || \
-       defined(CONFIG_MX7) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
-       mxs_reg_32(hw_lcdif_ctrl2)              /* 0x20 */
-#endif
-       mxs_reg_32(hw_lcdif_transfer_count)     /* 0x20/0x30 */
-       mxs_reg_32(hw_lcdif_cur_buf)            /* 0x30/0x40 */
-       mxs_reg_32(hw_lcdif_next_buf)           /* 0x40/0x50 */
-
-#if defined(CONFIG_MX23)
-       uint32_t        reserved1[4];
-#endif
-
-       mxs_reg_32(hw_lcdif_timing)             /* 0x60 */
-       mxs_reg_32(hw_lcdif_vdctrl0)            /* 0x70 */
-       mxs_reg_32(hw_lcdif_vdctrl1)            /* 0x80 */
-       mxs_reg_32(hw_lcdif_vdctrl2)            /* 0x90 */
-       mxs_reg_32(hw_lcdif_vdctrl3)            /* 0xa0 */
-       mxs_reg_32(hw_lcdif_vdctrl4)            /* 0xb0 */
-       mxs_reg_32(hw_lcdif_dvictrl0)           /* 0xc0 */
-       mxs_reg_32(hw_lcdif_dvictrl1)           /* 0xd0 */
-       mxs_reg_32(hw_lcdif_dvictrl2)           /* 0xe0 */
-       mxs_reg_32(hw_lcdif_dvictrl3)           /* 0xf0 */
-       mxs_reg_32(hw_lcdif_dvictrl4)           /* 0x100 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl0)     /* 0x110 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl1)     /* 0x120 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl2)     /* 0x130 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl3)     /* 0x140 */
-       mxs_reg_32(hw_lcdif_csc_coeffctrl4)     /* 0x150 */
-       mxs_reg_32(hw_lcdif_csc_offset) /* 0x160 */
-       mxs_reg_32(hw_lcdif_csc_limit)          /* 0x170 */
-
-#if defined(CONFIG_MX23)
-       uint32_t        reserved2[12];
-#endif
-       mxs_reg_32(hw_lcdif_data)               /* 0x1b0/0x180 */
-       mxs_reg_32(hw_lcdif_bm_error_stat)      /* 0x1c0/0x190 */
-#if defined(CONFIG_MX28) || defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || \
-       defined(CONFIG_MX7) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
-       mxs_reg_32(hw_lcdif_crc_stat)           /* 0x1a0 */
-#endif
-       mxs_reg_32(hw_lcdif_lcdif_stat)         /* 0x1d0/0x1b0 */
-       mxs_reg_32(hw_lcdif_version)            /* 0x1e0/0x1c0 */
-       mxs_reg_32(hw_lcdif_debug0)             /* 0x1f0/0x1d0 */
-       mxs_reg_32(hw_lcdif_debug1)             /* 0x200/0x1e0 */
-       mxs_reg_32(hw_lcdif_debug2)             /* 0x1f0 */
-#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || defined(CONFIG_MX7) || \
-       defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
-       mxs_reg_32(hw_lcdif_thres)
-       mxs_reg_32(hw_lcdif_as_ctrl)
-       mxs_reg_32(hw_lcdif_as_buf)
-       mxs_reg_32(hw_lcdif_as_next_buf)
-       mxs_reg_32(hw_lcdif_as_clrkeylow)
-       mxs_reg_32(hw_lcdif_as_clrkeyhigh)
-       mxs_reg_32(hw_lcdif_as_sync_delay)
-       mxs_reg_32(hw_lcdif_as_debug3)
-       mxs_reg_32(hw_lcdif_as_debug4)
-       mxs_reg_32(hw_lcdif_as_debug5)
-#endif
-};
-#endif
-
-#define        LCDIF_CTRL_SFTRST                                       (1 << 31)
-#define        LCDIF_CTRL_CLKGATE                                      (1 << 30)
-#define        LCDIF_CTRL_YCBCR422_INPUT                               (1 << 29)
-#define        LCDIF_CTRL_READ_WRITEB                                  (1 << 28)
-#define        LCDIF_CTRL_WAIT_FOR_VSYNC_EDGE                          (1 << 27)
-#define        LCDIF_CTRL_DATA_SHIFT_DIR                               (1 << 26)
-#define        LCDIF_CTRL_SHIFT_NUM_BITS_MASK                          (0x1f << 21)
-#define        LCDIF_CTRL_SHIFT_NUM_BITS_OFFSET                        21
-#define        LCDIF_CTRL_DVI_MODE                                     (1 << 20)
-#define        LCDIF_CTRL_BYPASS_COUNT                                 (1 << 19)
-#define        LCDIF_CTRL_VSYNC_MODE                                   (1 << 18)
-#define        LCDIF_CTRL_DOTCLK_MODE                                  (1 << 17)
-#define        LCDIF_CTRL_DATA_SELECT                                  (1 << 16)
-#define        LCDIF_CTRL_INPUT_DATA_SWIZZLE_MASK                      (0x3 << 14)
-#define        LCDIF_CTRL_INPUT_DATA_SWIZZLE_OFFSET                    14
-#define        LCDIF_CTRL_CSC_DATA_SWIZZLE_MASK                        (0x3 << 12)
-#define        LCDIF_CTRL_CSC_DATA_SWIZZLE_OFFSET                      12
-#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_MASK                       (0x3 << 10)
-#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_OFFSET                     10
-#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_16BIT                      (0 << 10)
-#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_8BIT                       (1 << 10)
-#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_18BIT                      (2 << 10)
-#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_24BIT                      (3 << 10)
-#define        LCDIF_CTRL_WORD_LENGTH_MASK                             (0x3 << 8)
-#define        LCDIF_CTRL_WORD_LENGTH_OFFSET                           8
-#define        LCDIF_CTRL_WORD_LENGTH_16BIT                            (0 << 8)
-#define        LCDIF_CTRL_WORD_LENGTH_8BIT                             (1 << 8)
-#define        LCDIF_CTRL_WORD_LENGTH_18BIT                            (2 << 8)
-#define        LCDIF_CTRL_WORD_LENGTH_24BIT                            (3 << 8)
-#define        LCDIF_CTRL_RGB_TO_YCBCR422_CSC                          (1 << 7)
-#define        LCDIF_CTRL_LCDIF_MASTER                                 (1 << 5)
-#define        LCDIF_CTRL_DATA_FORMAT_16_BIT                           (1 << 3)
-#define        LCDIF_CTRL_DATA_FORMAT_18_BIT                           (1 << 2)
-#define        LCDIF_CTRL_DATA_FORMAT_24_BIT                           (1 << 1)
-#define        LCDIF_CTRL_RUN                                          (1 << 0)
-
-#define        LCDIF_CTRL1_COMBINE_MPU_WR_STRB                         (1 << 27)
-#define        LCDIF_CTRL1_BM_ERROR_IRQ_EN                             (1 << 26)
-#define        LCDIF_CTRL1_BM_ERROR_IRQ                                (1 << 25)
-#define        LCDIF_CTRL1_RECOVER_ON_UNDERFLOW                        (1 << 24)
-#define        LCDIF_CTRL1_INTERLACE_FIELDS                            (1 << 23)
-#define        LCDIF_CTRL1_START_INTERLACE_FROM_SECOND_FIELD           (1 << 22)
-#define        LCDIF_CTRL1_FIFO_CLEAR                                  (1 << 21)
-#define        LCDIF_CTRL1_IRQ_ON_ALTERNATE_FIELDS                     (1 << 20)
-#define        LCDIF_CTRL1_BYTE_PACKING_FORMAT_MASK                    (0xf << 16)
-#define        LCDIF_CTRL1_BYTE_PACKING_FORMAT_OFFSET                  16
-#define        LCDIF_CTRL1_OVERFLOW_IRQ_EN                             (1 << 15)
-#define        LCDIF_CTRL1_UNDERFLOW_IRQ_EN                            (1 << 14)
-#define        LCDIF_CTRL1_CUR_FRAME_DONE_IRQ_EN                       (1 << 13)
-#define        LCDIF_CTRL1_VSYNC_EDGE_IRQ_EN                           (1 << 12)
-#define        LCDIF_CTRL1_OVERFLOW_IRQ                                (1 << 11)
-#define        LCDIF_CTRL1_UNDERFLOW_IRQ                               (1 << 10)
-#define        LCDIF_CTRL1_CUR_FRAME_DONE_IRQ                          (1 << 9)
-#define        LCDIF_CTRL1_VSYNC_EDGE_IRQ                              (1 << 8)
-#define        LCDIF_CTRL1_BUSY_ENABLE                                 (1 << 2)
-#define        LCDIF_CTRL1_MODE86                                      (1 << 1)
-#define        LCDIF_CTRL1_RESET                                       (1 << 0)
-
-#define        LCDIF_CTRL2_OUTSTANDING_REQS_MASK                       (0x7 << 21)
-#define        LCDIF_CTRL2_OUTSTANDING_REQS_OFFSET                     21
-#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_1                      (0x0 << 21)
-#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_2                      (0x1 << 21)
-#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_4                      (0x2 << 21)
-#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_8                      (0x3 << 21)
-#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_16                     (0x4 << 21)
-#define        LCDIF_CTRL2_BURST_LEN_8                                 (1 << 20)
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_MASK                       (0x7 << 16)
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_OFFSET                     16
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_RGB                        (0x0 << 16)
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_RBG                        (0x1 << 16)
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_GBR                        (0x2 << 16)
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_GRB                        (0x3 << 16)
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_BRG                        (0x4 << 16)
-#define        LCDIF_CTRL2_ODD_LINE_PATTERN_BGR                        (0x5 << 16)
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_MASK                      (0x7 << 12)
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_OFFSET                    12
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_RGB                       (0x0 << 12)
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_RBG                       (0x1 << 12)
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_GBR                       (0x2 << 12)
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_GRB                       (0x3 << 12)
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_BRG                       (0x4 << 12)
-#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_BGR                       (0x5 << 12)
-#define        LCDIF_CTRL2_READ_PACK_DIR                               (1 << 10)
-#define        LCDIF_CTRL2_READ_MODE_OUTPUT_IN_RGB_FORMAT              (1 << 9)
-#define        LCDIF_CTRL2_READ_MODE_6_BIT_INPUT                       (1 << 8)
-#define        LCDIF_CTRL2_READ_MODE_NUM_PACKED_SUBWORDS_MASK          (0x7 << 4)
-#define        LCDIF_CTRL2_READ_MODE_NUM_PACKED_SUBWORDS_OFFSET        4
-#define        LCDIF_CTRL2_INITIAL_DUMMY_READ_MASK                     (0x7 << 1)
-#define        LCDIF_CTRL2_INITIAL_DUMMY_READ_OFFSET                   1
-
-#define        LCDIF_TRANSFER_COUNT_V_COUNT_MASK                       (0xffff << 16)
-#define        LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET                     16
-#define        LCDIF_TRANSFER_COUNT_H_COUNT_MASK                       (0xffff << 0)
-#define        LCDIF_TRANSFER_COUNT_H_COUNT_OFFSET                     0
-
-#define        LCDIF_CUR_BUF_ADDR_MASK                                 0xffffffff
-#define        LCDIF_CUR_BUF_ADDR_OFFSET                               0
-
-#define        LCDIF_NEXT_BUF_ADDR_MASK                                0xffffffff
-#define        LCDIF_NEXT_BUF_ADDR_OFFSET                              0
-
-#define        LCDIF_TIMING_CMD_HOLD_MASK                              (0xff << 24)
-#define        LCDIF_TIMING_CMD_HOLD_OFFSET                            24
-#define        LCDIF_TIMING_CMD_SETUP_MASK                             (0xff << 16)
-#define        LCDIF_TIMING_CMD_SETUP_OFFSET                           16
-#define        LCDIF_TIMING_DATA_HOLD_MASK                             (0xff << 8)
-#define        LCDIF_TIMING_DATA_HOLD_OFFSET                           8
-#define        LCDIF_TIMING_DATA_SETUP_MASK                            (0xff << 0)
-#define        LCDIF_TIMING_DATA_SETUP_OFFSET                          0
-
-#define        LCDIF_VDCTRL0_VSYNC_OEB                                 (1 << 29)
-#define        LCDIF_VDCTRL0_ENABLE_PRESENT                            (1 << 28)
-#define        LCDIF_VDCTRL0_VSYNC_POL                                 (1 << 27)
-#define        LCDIF_VDCTRL0_HSYNC_POL                                 (1 << 26)
-#define        LCDIF_VDCTRL0_DOTCLK_POL                                (1 << 25)
-#define        LCDIF_VDCTRL0_ENABLE_POL                                (1 << 24)
-#define        LCDIF_VDCTRL0_VSYNC_PERIOD_UNIT                         (1 << 21)
-#define        LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_UNIT                    (1 << 20)
-#define        LCDIF_VDCTRL0_HALF_LINE                                 (1 << 19)
-#define        LCDIF_VDCTRL0_HALF_LINE_MODE                            (1 << 18)
-#define        LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_MASK                    0x3ffff
-#define        LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_OFFSET                  0
-
-#define        LCDIF_VDCTRL1_VSYNC_PERIOD_MASK                         0xffffffff
-#define        LCDIF_VDCTRL1_VSYNC_PERIOD_OFFSET                       0
-
-#if defined(CONFIG_MX23)
-#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_MASK                    (0xff << 24)
-#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET                  24
-#else
-#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_MASK                    (0x3fff << 18)
-#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET                  18
-#endif
-#define        LCDIF_VDCTRL2_HSYNC_PERIOD_MASK                         0x3ffff
-#define        LCDIF_VDCTRL2_HSYNC_PERIOD_OFFSET                       0
-
-#define        LCDIF_VDCTRL3_MUX_SYNC_SIGNALS                          (1 << 29)
-#define        LCDIF_VDCTRL3_VSYNC_ONLY                                (1 << 28)
-#define        LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT_MASK                  (0xfff << 16)
-#define        LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT_OFFSET                16
-#define        LCDIF_VDCTRL3_VERTICAL_WAIT_CNT_MASK                    (0xffff << 0)
-#define        LCDIF_VDCTRL3_VERTICAL_WAIT_CNT_OFFSET                  0
-
-#define        LCDIF_VDCTRL4_DOTCLK_DLY_SEL_MASK                       (0x7 << 29)
-#define        LCDIF_VDCTRL4_DOTCLK_DLY_SEL_OFFSET                     29
-#define        LCDIF_VDCTRL4_SYNC_SIGNALS_ON                           (1 << 18)
-#define        LCDIF_VDCTRL4_DOTCLK_H_VALID_DATA_CNT_MASK              0x3ffff
-#define        LCDIF_VDCTRL4_DOTCLK_H_VALID_DATA_CNT_OFFSET            0
-
-#endif /* __IMX_REGS_LCDIF_H__ */
diff --git a/arch/arm/include/asm/imx-common/regs-usbphy.h b/arch/arm/include/asm/imx-common/regs-usbphy.h
deleted file mode 100644 (file)
index 220e45f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Freescale USB PHY Register Definitions
- *
- * SPDX-License-Identifier: GPL-2.0+
- *
- */
-
-#ifndef __REGS_USBPHY_H__
-#define __REGS_USBPHY_H__
-
-#define USBPHY_CTRL                                            0x00000030
-#define USBPHY_CTRL_SET                                        0x00000034
-#define USBPHY_CTRL_CLR                                        0x00000038
-#define USBPHY_CTRL_TOG                                        0x0000003C
-#define USBPHY_PWD                                             0x00000000
-#define USBPHY_TX                                              0x00000010
-#define USBPHY_RX                                              0x00000020
-#define USBPHY_DEBUG                                   0x00000050
-
-#define USBPHY_CTRL_ENUTMILEVEL2               (1 << 14)
-#define USBPHY_CTRL_ENUTMILEVEL3               (1 << 15)
-#define USBPHY_CTRL_OTG_ID                             (1 << 27)
-#define USBPHY_CTRL_CLKGATE                            (1 << 30)
-#define USBPHY_CTRL_SFTRST                             (1 << 31)
-
-#endif /* __REGS_USBPHY_H__ */
diff --git a/arch/arm/include/asm/imx-common/sata.h b/arch/arm/include/asm/imx-common/sata.h
deleted file mode 100644 (file)
index 6b864cb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __IMX_SATA_H_
-#define __IMX_SATA_H_
-
-/*
- * SATA setup for i.mx6 quad based platform
- */
-
-int setup_sata(void);
-
-#endif
diff --git a/arch/arm/include/asm/imx-common/spi.h b/arch/arm/include/asm/imx-common/spi.h
deleted file mode 100644 (file)
index 1d4473a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __MXC_SPI_H_
-#define __MXC_SPI_H_
-
-/*
- * Board-level chip-select callback
- * Should return GPIO # to be used for chip-select
- */
-
-int board_spi_cs_gpio(unsigned bus, unsigned cs);
-
-#endif
diff --git a/arch/arm/include/asm/imx-common/sys_proto.h b/arch/arm/include/asm/imx-common/sys_proto.h
deleted file mode 100644 (file)
index a07061b..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * (C) Copyright 2009
- * Stefano Babic, DENX Software Engineering, sbabic@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _SYS_PROTO_H_
-#define _SYS_PROTO_H_
-
-#include <asm/io.h>
-#include <asm/imx-common/regs-common.h>
-#include <common.h>
-#include "../arch-imx/cpu.h"
-
-#define soc_rev() (get_cpu_rev() & 0xFF)
-#define is_soc_rev(rev) (soc_rev() == rev)
-
-/* returns MXC_CPU_ value */
-#define cpu_type(rev) (((rev) >> 12) & 0xff)
-#define soc_type(rev) (((rev) >> 12) & 0xf0)
-/* both macros return/take MXC_CPU_ constants */
-#define get_cpu_type() (cpu_type(get_cpu_rev()))
-#define get_soc_type() (soc_type(get_cpu_rev()))
-#define is_cpu_type(cpu) (get_cpu_type() == cpu)
-#define is_soc_type(soc) (get_soc_type() == soc)
-
-#define is_mx6() (is_soc_type(MXC_SOC_MX6))
-#define is_mx7() (is_soc_type(MXC_SOC_MX7))
-
-#define is_mx6dqp() (is_cpu_type(MXC_CPU_MX6QP) || is_cpu_type(MXC_CPU_MX6DP))
-#define is_mx6dq() (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
-#define is_mx6sdl() (is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6DL))
-#define is_mx6dl() (is_cpu_type(MXC_CPU_MX6DL))
-#define is_mx6sx() (is_cpu_type(MXC_CPU_MX6SX))
-#define is_mx6sl() (is_cpu_type(MXC_CPU_MX6SL))
-#define is_mx6solo() (is_cpu_type(MXC_CPU_MX6SOLO))
-#define is_mx6ul() (is_cpu_type(MXC_CPU_MX6UL))
-#define is_mx6ull() (is_cpu_type(MXC_CPU_MX6ULL))
-#define is_mx6sll() (is_cpu_type(MXC_CPU_MX6SLL))
-
-#define is_mx7ulp() (is_cpu_type(MXC_CPU_MX7ULP))
-
-#ifdef CONFIG_MX6
-#define IMX6_SRC_GPR10_BMODE           BIT(28)
-
-#define IMX6_BMODE_MASK                        GENMASK(7, 0)
-#define        IMX6_BMODE_SHIFT                4
-#define IMX6_BMODE_EMI_MASK            BIT(3)
-#define IMX6_BMODE_EMI_SHIFT           3
-#define IMX6_BMODE_SERIAL_ROM_MASK     GENMASK(26, 24)
-#define IMX6_BMODE_SERIAL_ROM_SHIFT    24
-
-enum imx6_bmode_serial_rom {
-       IMX6_BMODE_ECSPI1,
-       IMX6_BMODE_ECSPI2,
-       IMX6_BMODE_ECSPI3,
-       IMX6_BMODE_ECSPI4,
-       IMX6_BMODE_ECSPI5,
-       IMX6_BMODE_I2C1,
-       IMX6_BMODE_I2C2,
-       IMX6_BMODE_I2C3,
-};
-
-enum imx6_bmode_emi {
-       IMX6_BMODE_ONENAND,
-       IMX6_BMODE_NOR,
-};
-
-enum imx6_bmode {
-       IMX6_BMODE_EMI,
-       IMX6_BMODE_UART,
-       IMX6_BMODE_SATA,
-       IMX6_BMODE_SERIAL_ROM,
-       IMX6_BMODE_SD,
-       IMX6_BMODE_ESD,
-       IMX6_BMODE_MMC,
-       IMX6_BMODE_EMMC,
-       IMX6_BMODE_NAND,
-};
-
-static inline u8 imx6_is_bmode_from_gpr9(void)
-{
-       return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE;
-}
-
-u32 imx6_src_get_boot_mode(void);
-#endif /* CONFIG_MX6 */
-
-u32 get_nr_cpus(void);
-u32 get_cpu_rev(void);
-u32 get_cpu_speed_grade_hz(void);
-u32 get_cpu_temp_grade(int *minc, int *maxc);
-const char *get_imx_type(u32 imxtype);
-u32 imx_ddr_size(void);
-void sdelay(unsigned long);
-void set_chipselect_size(int const);
-
-void init_aips(void);
-void init_src(void);
-void imx_set_wdog_powerdown(bool enable);
-
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-int fecmxc_initialize(bd_t *bis);
-u32 get_ahb_clk(void);
-u32 get_periph_clk(void);
-
-void lcdif_power_down(void);
-
-int mxs_reset_block(struct mxs_register_32 *reg);
-int mxs_wait_mask_set(struct mxs_register_32 *reg, u32 mask, u32 timeout);
-int mxs_wait_mask_clr(struct mxs_register_32 *reg, u32 mask, u32 timeout);
-#endif
diff --git a/arch/arm/include/asm/imx-common/syscounter.h b/arch/arm/include/asm/imx-common/syscounter.h
deleted file mode 100644 (file)
index bdbe26c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _ASM_ARCH_SYSTEM_COUNTER_H
-#define _ASM_ARCH_SYSTEM_COUNTER_H
-
-/* System Counter */
-struct sctr_regs {
-       u32 cntcr;
-       u32 cntsr;
-       u32 cntcv1;
-       u32 cntcv2;
-       u32 resv1[4];
-       u32 cntfid0;
-       u32 cntfid1;
-       u32 cntfid2;
-       u32 resv2[1001];
-       u32 counterid[1];
-};
-
-#define SC_CNTCR_ENABLE                (1 << 0)
-#define SC_CNTCR_HDBG          (1 << 1)
-#define SC_CNTCR_FREQ0         (1 << 8)
-#define SC_CNTCR_FREQ1         (1 << 9)
-
-#endif
diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h
deleted file mode 100644 (file)
index 941a031..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __IMX_VIDEO_H_
-#define __IMX_VIDEO_H_
-
-#include <linux/fb.h>
-#include <ipu_pixfmt.h>
-
-struct display_info_t {
-       int     bus;
-       int     addr;
-       int     pixfmt;
-       int     di;
-       int     (*detect)(struct display_info_t const *dev);
-       void    (*enable)(struct display_info_t const *dev);
-       struct  fb_videomode mode;
-};
-
-#ifdef CONFIG_IMX_HDMI
-extern int detect_hdmi(struct display_info_t const *dev);
-#endif
-
-#ifdef CONFIG_IMX_VIDEO_SKIP
-extern struct display_info_t const displays[];
-extern size_t display_count;
-#endif
-
-int ipu_set_ldb_clock(int rate);
-#endif
diff --git a/arch/arm/include/asm/mach-imx/boot_mode.h b/arch/arm/include/asm/mach-imx/boot_mode.h
new file mode 100644 (file)
index 0000000..a8239f2
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 Boundary Devices Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _ASM_BOOT_MODE_H
+#define _ASM_BOOT_MODE_H
+#define MAKE_CFGVAL(cfg1, cfg2, cfg3, cfg4) \
+       ((cfg4) << 24) | ((cfg3) << 16) | ((cfg2) << 8) | (cfg1)
+
+enum boot_device {
+       WEIM_NOR_BOOT,
+       ONE_NAND_BOOT,
+       PATA_BOOT,
+       SATA_BOOT,
+       I2C_BOOT,
+       SPI_NOR_BOOT,
+       SD1_BOOT,
+       SD2_BOOT,
+       SD3_BOOT,
+       SD4_BOOT,
+       MMC1_BOOT,
+       MMC2_BOOT,
+       MMC3_BOOT,
+       MMC4_BOOT,
+       NAND_BOOT,
+       QSPI_BOOT,
+       UNKNOWN_BOOT,
+       BOOT_DEV_NUM = UNKNOWN_BOOT,
+};
+
+struct boot_mode {
+       const char *name;
+       unsigned cfg_val;
+};
+
+void add_board_boot_modes(const struct boot_mode *p);
+void boot_mode_apply(unsigned cfg_val);
+extern const struct boot_mode soc_boot_modes[];
+#endif
diff --git a/arch/arm/include/asm/mach-imx/dma.h b/arch/arm/include/asm/mach-imx/dma.h
new file mode 100644 (file)
index 0000000..0244947
--- /dev/null
@@ -0,0 +1,161 @@
+/*
+ * Freescale i.MX28 APBH DMA
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * Based on code from LTIB:
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __DMA_H__
+#define __DMA_H__
+
+#include <linux/list.h>
+#include <linux/compiler.h>
+
+#define DMA_PIO_WORDS          15
+#define MXS_DMA_ALIGNMENT      ARCH_DMA_MINALIGN
+
+/*
+ * MXS DMA channels
+ */
+#if defined(CONFIG_MX23)
+enum {
+       MXS_DMA_CHANNEL_AHB_APBH_LCDIF = 0,
+       MXS_DMA_CHANNEL_AHB_APBH_SSP0,
+       MXS_DMA_CHANNEL_AHB_APBH_SSP1,
+       MXS_DMA_CHANNEL_AHB_APBH_RESERVED0,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI0,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI1,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI2,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI3,
+       MXS_MAX_DMA_CHANNELS,
+};
+#elif defined(CONFIG_MX28)
+enum {
+       MXS_DMA_CHANNEL_AHB_APBH_SSP0 = 0,
+       MXS_DMA_CHANNEL_AHB_APBH_SSP1,
+       MXS_DMA_CHANNEL_AHB_APBH_SSP2,
+       MXS_DMA_CHANNEL_AHB_APBH_SSP3,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI0,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI1,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI2,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI3,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI4,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI5,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI6,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI7,
+       MXS_DMA_CHANNEL_AHB_APBH_HSADC,
+       MXS_DMA_CHANNEL_AHB_APBH_LCDIF,
+       MXS_DMA_CHANNEL_AHB_APBH_RESERVED0,
+       MXS_DMA_CHANNEL_AHB_APBH_RESERVED1,
+       MXS_MAX_DMA_CHANNELS,
+};
+#elif defined(CONFIG_MX6) || defined(CONFIG_MX7)
+enum {
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI0 = 0,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI1,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI2,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI3,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI4,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI5,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI6,
+       MXS_DMA_CHANNEL_AHB_APBH_GPMI7,
+       MXS_MAX_DMA_CHANNELS,
+};
+#endif
+
+/*
+ * MXS DMA hardware command.
+ *
+ * This structure describes the in-memory layout of an entire DMA command,
+ * including space for the maximum number of PIO accesses. See the appropriate
+ * reference manual for a detailed description of what these fields mean to the
+ * DMA hardware.
+ */
+#define        MXS_DMA_DESC_COMMAND_MASK       0x3
+#define        MXS_DMA_DESC_COMMAND_OFFSET     0
+#define        MXS_DMA_DESC_COMMAND_NO_DMAXFER 0x0
+#define        MXS_DMA_DESC_COMMAND_DMA_WRITE  0x1
+#define        MXS_DMA_DESC_COMMAND_DMA_READ   0x2
+#define        MXS_DMA_DESC_COMMAND_DMA_SENSE  0x3
+#define        MXS_DMA_DESC_CHAIN              (1 << 2)
+#define        MXS_DMA_DESC_IRQ                (1 << 3)
+#define        MXS_DMA_DESC_NAND_LOCK          (1 << 4)
+#define        MXS_DMA_DESC_NAND_WAIT_4_READY  (1 << 5)
+#define        MXS_DMA_DESC_DEC_SEM            (1 << 6)
+#define        MXS_DMA_DESC_WAIT4END           (1 << 7)
+#define        MXS_DMA_DESC_HALT_ON_TERMINATE  (1 << 8)
+#define        MXS_DMA_DESC_TERMINATE_FLUSH    (1 << 9)
+#define        MXS_DMA_DESC_PIO_WORDS_MASK     (0xf << 12)
+#define        MXS_DMA_DESC_PIO_WORDS_OFFSET   12
+#define        MXS_DMA_DESC_BYTES_MASK         (0xffff << 16)
+#define        MXS_DMA_DESC_BYTES_OFFSET       16
+
+struct mxs_dma_cmd {
+       unsigned long           next;
+       unsigned long           data;
+       union {
+               dma_addr_t      address;
+               unsigned long   alternate;
+       };
+       unsigned long           pio_words[DMA_PIO_WORDS];
+};
+
+/*
+ * MXS DMA command descriptor.
+ *
+ * This structure incorporates an MXS DMA hardware command structure, along
+ * with metadata.
+ */
+#define        MXS_DMA_DESC_FIRST      (1 << 0)
+#define        MXS_DMA_DESC_LAST       (1 << 1)
+#define        MXS_DMA_DESC_READY      (1 << 31)
+
+struct mxs_dma_desc {
+       struct mxs_dma_cmd      cmd;
+       unsigned int            flags;
+       dma_addr_t              address;
+       void                    *buffer;
+       struct list_head        node;
+} __aligned(MXS_DMA_ALIGNMENT);
+
+/**
+ * MXS DMA channel
+ *
+ * This structure represents a single DMA channel. The MXS platform code
+ * maintains an array of these structures to represent every DMA channel in the
+ * system (see mxs_dma_channels).
+ */
+#define        MXS_DMA_FLAGS_IDLE      0
+#define        MXS_DMA_FLAGS_BUSY      (1 << 0)
+#define        MXS_DMA_FLAGS_FREE      0
+#define        MXS_DMA_FLAGS_ALLOCATED (1 << 16)
+#define        MXS_DMA_FLAGS_VALID     (1 << 31)
+
+struct mxs_dma_chan {
+       const char *name;
+       unsigned long dev;
+       struct mxs_dma_device *dma;
+       unsigned int flags;
+       unsigned int active_num;
+       unsigned int pending_num;
+       struct list_head active;
+       struct list_head done;
+};
+
+struct mxs_dma_desc *mxs_dma_desc_alloc(void);
+void mxs_dma_desc_free(struct mxs_dma_desc *);
+int mxs_dma_desc_append(int channel, struct mxs_dma_desc *pdesc);
+
+int mxs_dma_go(int chan);
+void mxs_dma_init(void);
+int mxs_dma_init_channel(int chan);
+int mxs_dma_release(int chan);
+
+void mxs_dma_circ_start(int chan, struct mxs_dma_desc *pdesc);
+
+#endif /* __DMA_H__ */
diff --git a/arch/arm/include/asm/mach-imx/gpio.h b/arch/arm/include/asm/mach-imx/gpio.h
new file mode 100644 (file)
index 0000000..26b296b
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2011
+ * Stefano Babic, DENX Software Engineering, <sbabic@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+
+#ifndef __ASM_ARCH_IMX_GPIO_H
+#define __ASM_ARCH_IMX_GPIO_H
+
+#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
+/* GPIO registers */
+struct gpio_regs {
+       u32 gpio_dr;    /* data */
+       u32 gpio_dir;   /* direction */
+       u32 gpio_psr;   /* pad satus */
+};
+#endif
+
+#define IMX_GPIO_NR(port, index)               ((((port)-1)*32)+((index)&31))
+
+#endif
diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h
new file mode 100644 (file)
index 0000000..e0ff459
--- /dev/null
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2012-2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ *
+*/
+
+#ifndef __SECURE_MX6Q_H__
+#define __SECURE_MX6Q_H__
+
+#include <linux/types.h>
+
+/* -------- start of HAB API updates ------------*/
+/* The following are taken from HAB4 SIS */
+
+/* Status definitions */
+enum hab_status {
+       HAB_STS_ANY = 0x00,
+       HAB_FAILURE = 0x33,
+       HAB_WARNING = 0x69,
+       HAB_SUCCESS = 0xf0
+};
+
+/* Security Configuration definitions */
+enum hab_config {
+       HAB_CFG_RETURN = 0x33,  /* < Field Return IC */
+       HAB_CFG_OPEN = 0xf0,    /* < Non-secure IC */
+       HAB_CFG_CLOSED = 0xcc   /* < Secure IC */
+};
+
+/* State definitions */
+enum hab_state {
+       HAB_STATE_INITIAL = 0x33,       /* Initialising state (transitory) */
+       HAB_STATE_CHECK = 0x55,         /* Check state (non-secure) */
+       HAB_STATE_NONSECURE = 0x66,     /* Non-secure state */
+       HAB_STATE_TRUSTED = 0x99,       /* Trusted state */
+       HAB_STATE_SECURE = 0xaa,        /* Secure state */
+       HAB_STATE_FAIL_SOFT = 0xcc, /* Soft fail state */
+       HAB_STATE_FAIL_HARD = 0xff, /* Hard fail state (terminal) */
+       HAB_STATE_NONE = 0xf0,          /* No security state machine */
+       HAB_STATE_MAX
+};
+
+enum hab_reason {
+       HAB_RSN_ANY = 0x00,                     /* Match any reason */
+       HAB_ENG_FAIL = 0x30,            /* Engine failure */
+       HAB_INV_ADDRESS = 0x22,         /* Invalid address: access denied */
+       HAB_INV_ASSERTION = 0x0c,   /* Invalid assertion */
+       HAB_INV_CALL = 0x28,            /* Function called out of sequence */
+       HAB_INV_CERTIFICATE = 0x21, /* Invalid certificate */
+       HAB_INV_COMMAND = 0x06,     /* Invalid command: command malformed */
+       HAB_INV_CSF = 0x11,                     /* Invalid csf */
+       HAB_INV_DCD = 0x27,                     /* Invalid dcd */
+       HAB_INV_INDEX = 0x0f,           /* Invalid index: access denied */
+       HAB_INV_IVT = 0x05,                     /* Invalid ivt */
+       HAB_INV_KEY = 0x1d,                     /* Invalid key */
+       HAB_INV_RETURN = 0x1e,          /* Failed callback function */
+       HAB_INV_SIGNATURE = 0x18,   /* Invalid signature */
+       HAB_INV_SIZE = 0x17,            /* Invalid data size */
+       HAB_MEM_FAIL = 0x2e,            /* Memory failure */
+       HAB_OVR_COUNT = 0x2b,           /* Expired poll count */
+       HAB_OVR_STORAGE = 0x2d,         /* Exhausted storage region */
+       HAB_UNS_ALGORITHM = 0x12,   /* Unsupported algorithm */
+       HAB_UNS_COMMAND = 0x03,         /* Unsupported command */
+       HAB_UNS_ENGINE = 0x0a,          /* Unsupported engine */
+       HAB_UNS_ITEM = 0x24,            /* Unsupported configuration item */
+       HAB_UNS_KEY = 0x1b,             /* Unsupported key type/parameters */
+       HAB_UNS_PROTOCOL = 0x14,        /* Unsupported protocol */
+       HAB_UNS_STATE = 0x09,           /* Unsuitable state */
+       HAB_RSN_MAX
+};
+
+enum hab_context {
+       HAB_CTX_ANY = 0x00,                     /* Match any context */
+       HAB_CTX_FAB = 0xff,                 /* Event logged in hab_fab_test() */
+       HAB_CTX_ENTRY = 0xe1,           /* Event logged in hab_rvt.entry() */
+       HAB_CTX_TARGET = 0x33,      /* Event logged in hab_rvt.check_target() */
+       HAB_CTX_AUTHENTICATE = 0x0a,/* Logged in hab_rvt.authenticate_image() */
+       HAB_CTX_DCD = 0xdd,         /* Event logged in hab_rvt.run_dcd() */
+       HAB_CTX_CSF = 0xcf,         /* Event logged in hab_rvt.run_csf() */
+       HAB_CTX_COMMAND = 0xc0,     /* Event logged executing csf/dcd command */
+       HAB_CTX_AUT_DAT = 0xdb,         /* Authenticated data block */
+       HAB_CTX_ASSERT = 0xa0,          /* Event logged in hab_rvt.assert() */
+       HAB_CTX_EXIT = 0xee,            /* Event logged in hab_rvt.exit() */
+       HAB_CTX_MAX
+};
+
+struct imx_sec_config_fuse_t {
+       int bank;
+       int word;
+};
+
+#if defined(CONFIG_SECURE_BOOT)
+extern struct imx_sec_config_fuse_t const imx_sec_config_fuse;
+#endif
+
+/*Function prototype description*/
+typedef enum hab_status hab_rvt_report_event_t(enum hab_status, uint32_t,
+               uint8_t* , size_t*);
+typedef enum hab_status hab_rvt_report_status_t(enum hab_config *,
+               enum hab_state *);
+typedef enum hab_status hab_loader_callback_f_t(void**, size_t*, const void*);
+typedef enum hab_status hab_rvt_entry_t(void);
+typedef enum hab_status hab_rvt_exit_t(void);
+typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_t,
+               void **, size_t *, hab_loader_callback_f_t);
+typedef void hapi_clock_init_t(void);
+
+#define HAB_ENG_ANY            0x00   /* Select first compatible engine */
+#define HAB_ENG_SCC            0x03   /* Security controller */
+#define HAB_ENG_RTIC   0x05   /* Run-time integrity checker */
+#define HAB_ENG_SAHARA  0x06   /* Crypto accelerator */
+#define HAB_ENG_CSU            0x0a   /* Central Security Unit */
+#define HAB_ENG_SRTC   0x0c   /* Secure clock */
+#define HAB_ENG_DCP            0x1b   /* Data Co-Processor */
+#define HAB_ENG_CAAM   0x1d   /* CAAM */
+#define HAB_ENG_SNVS   0x1e   /* Secure Non-Volatile Storage */
+#define HAB_ENG_OCOTP  0x21   /* Fuse controller */
+#define HAB_ENG_DTCP   0x22   /* DTCP co-processor */
+#define HAB_ENG_ROM            0x36   /* Protected ROM area */
+#define HAB_ENG_HDCP   0x24   /* HDCP co-processor */
+#define HAB_ENG_RTL            0x77   /* RTL simulation engine */
+#define HAB_ENG_SW             0xff   /* Software engine */
+
+#ifdef CONFIG_ROM_UNIFIED_SECTIONS
+#define HAB_RVT_BASE                   0x00000100
+#else
+#define HAB_RVT_BASE                   0x00000094
+#endif
+
+#define HAB_RVT_ENTRY                  (*(uint32_t *)(HAB_RVT_BASE + 0x04))
+#define HAB_RVT_EXIT                   (*(uint32_t *)(HAB_RVT_BASE + 0x08))
+#define HAB_RVT_AUTHENTICATE_IMAGE     (*(uint32_t *)(HAB_RVT_BASE + 0x10))
+#define HAB_RVT_REPORT_EVENT           (*(uint32_t *)(HAB_RVT_BASE + 0x20))
+#define HAB_RVT_REPORT_STATUS          (*(uint32_t *)(HAB_RVT_BASE + 0x24))
+
+#define HAB_RVT_REPORT_EVENT_NEW               (*(uint32_t *)0x000000B8)
+#define HAB_RVT_REPORT_STATUS_NEW              (*(uint32_t *)0x000000BC)
+#define HAB_RVT_AUTHENTICATE_IMAGE_NEW         (*(uint32_t *)0x000000A8)
+#define HAB_RVT_ENTRY_NEW                      (*(uint32_t *)0x0000009C)
+#define HAB_RVT_EXIT_NEW                       (*(uint32_t *)0x000000A0)
+
+#define HAB_CID_ROM 0 /**< ROM Caller ID */
+#define HAB_CID_UBOOT 1 /**< UBOOT Caller ID*/
+
+/* ----------- end of HAB API updates ------------*/
+
+uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size);
+
+#endif
diff --git a/arch/arm/include/asm/mach-imx/imximage.cfg b/arch/arm/include/asm/mach-imx/imximage.cfg
new file mode 100644 (file)
index 0000000..d62166f
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * i.MX image header offset values
+ * Copyright (C) 2013 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+/*
+ * NOTE: This file must be kept in sync with tools/imximage.h because
+ *       tools/imximage.c can not cross-include headers from arch/arm/
+ *       and vice-versa.
+ */
+
+#ifndef __ASM_IMX_COMMON_IMXIMAGE_CFG__
+#define __ASM_IMX_COMMON_IMXIMAGE_CFG__
+
+/* Standard image header offset for NAND, SATA, SD, SPI flash. */
+#define FLASH_OFFSET_STANDARD  0x400
+/* Specific image header offset for booting from OneNAND. */
+#define FLASH_OFFSET_ONENAND   0x100
+/* Specific image header offset for booting from memory-mapped NOR. */
+#define FLASH_OFFSET_NOR       0x1000
+
+#endif  /* __ASM_IMX_COMMON_IMXIMAGE_CFG__ */
diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h
new file mode 100644 (file)
index 0000000..ad35e01
--- /dev/null
@@ -0,0 +1,270 @@
+/*
+ * Based on Linux i.MX iomux-v3.h file:
+ * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH,
+ *                     <armlinux@phytec.de>
+ *
+ * Copyright (C) 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __MACH_IOMUX_V3_H__
+#define __MACH_IOMUX_V3_H__
+
+#include <common.h>
+
+/*
+ *     build IOMUX_PAD structure
+ *
+ * This iomux scheme is based around pads, which are the physical balls
+ * on the processor.
+ *
+ * - Each pad has a pad control register (IOMUXC_SW_PAD_CTRL_x) which controls
+ *   things like driving strength and pullup/pulldown.
+ * - Each pad can have but not necessarily does have an output routing register
+ *   (IOMUXC_SW_MUX_CTL_PAD_x).
+ * - Each pad can have but not necessarily does have an input routing register
+ *   (IOMUXC_x_SELECT_INPUT)
+ *
+ * The three register sets do not have a fixed offset to each other,
+ * hence we order this table by pad control registers (which all pads
+ * have) and put the optional i/o routing registers into additional
+ * fields.
+ *
+ * The naming convention for the pad modes is SOC_PAD_<padname>__<padmode>
+ * If <padname> or <padmode> refers to a GPIO, it is named GPIO_<unit>_<num>
+ *
+ * IOMUX/PAD Bit field definitions
+ *
+ * MUX_CTRL_OFS:           0..11 (12)
+ * PAD_CTRL_OFS:          12..23 (12)
+ * SEL_INPUT_OFS:         24..35 (12)
+ * MUX_MODE + SION + LPSR: 36..41  (6)
+ * PAD_CTRL + NO_PAD_CTRL: 42..59 (18)
+ * SEL_INP:               60..63  (4)
+*/
+
+typedef u64 iomux_v3_cfg_t;
+
+#define MUX_CTRL_OFS_SHIFT     0
+#define MUX_CTRL_OFS_MASK      ((iomux_v3_cfg_t)0xfff << MUX_CTRL_OFS_SHIFT)
+#define MUX_PAD_CTRL_OFS_SHIFT 12
+#define MUX_PAD_CTRL_OFS_MASK  ((iomux_v3_cfg_t)0xfff << \
+       MUX_PAD_CTRL_OFS_SHIFT)
+#define MUX_SEL_INPUT_OFS_SHIFT        24
+#define MUX_SEL_INPUT_OFS_MASK ((iomux_v3_cfg_t)0xfff << \
+       MUX_SEL_INPUT_OFS_SHIFT)
+
+#define MUX_MODE_SHIFT         36
+#define MUX_MODE_MASK          ((iomux_v3_cfg_t)0x3f << MUX_MODE_SHIFT)
+#define MUX_PAD_CTRL_SHIFT     42
+#define MUX_PAD_CTRL_MASK      ((iomux_v3_cfg_t)0x3ffff << MUX_PAD_CTRL_SHIFT)
+#define MUX_SEL_INPUT_SHIFT    60
+#define MUX_SEL_INPUT_MASK     ((iomux_v3_cfg_t)0xf << MUX_SEL_INPUT_SHIFT)
+
+#define MUX_MODE_SION          ((iomux_v3_cfg_t)IOMUX_CONFIG_SION << \
+       MUX_MODE_SHIFT)
+#define MUX_PAD_CTRL(x)                ((iomux_v3_cfg_t)(x) << MUX_PAD_CTRL_SHIFT)
+
+#define IOMUX_PAD(pad_ctrl_ofs, mux_ctrl_ofs, mux_mode, sel_input_ofs, \
+               sel_input, pad_ctrl)                                    \
+       (((iomux_v3_cfg_t)(mux_ctrl_ofs) << MUX_CTRL_OFS_SHIFT)     |   \
+       ((iomux_v3_cfg_t)(mux_mode)      << MUX_MODE_SHIFT)         |   \
+       ((iomux_v3_cfg_t)(pad_ctrl_ofs)  << MUX_PAD_CTRL_OFS_SHIFT) |   \
+       ((iomux_v3_cfg_t)(pad_ctrl)      << MUX_PAD_CTRL_SHIFT)     |   \
+       ((iomux_v3_cfg_t)(sel_input_ofs) << MUX_SEL_INPUT_OFS_SHIFT)|   \
+       ((iomux_v3_cfg_t)(sel_input)     << MUX_SEL_INPUT_SHIFT))
+
+#define NEW_PAD_CTRL(cfg, pad) (((cfg) & ~MUX_PAD_CTRL_MASK) | \
+                                       MUX_PAD_CTRL(pad))
+
+#define __NA_                  0x000
+#define NO_MUX_I               0
+#define NO_PAD_I               0
+
+#define NO_PAD_CTRL            (1 << 17)
+
+#define IOMUX_CONFIG_LPSR       0x20
+#define MUX_MODE_LPSR           ((iomux_v3_cfg_t)IOMUX_CONFIG_LPSR << \
+                               MUX_MODE_SHIFT)
+#ifdef CONFIG_MX7
+
+#define IOMUX_LPSR_SEL_INPUT_OFS 0x70000
+
+#define PAD_CTL_DSE_1P8V_140OHM   (0x0<<0)
+#define PAD_CTL_DSE_1P8V_35OHM    (0x1<<0)
+#define PAD_CTL_DSE_1P8V_70OHM    (0x2<<0)
+#define PAD_CTL_DSE_1P8V_23OHM    (0x3<<0)
+
+#define PAD_CTL_DSE_3P3V_196OHM   (0x0<<0)
+#define PAD_CTL_DSE_3P3V_49OHM    (0x1<<0)
+#define PAD_CTL_DSE_3P3V_98OHM    (0x2<<0)
+#define PAD_CTL_DSE_3P3V_32OHM    (0x3<<0)
+
+#define PAD_CTL_SRE_FAST     (0 << 2)
+#define PAD_CTL_SRE_SLOW     (0x1 << 2)
+
+#define PAD_CTL_HYS       (0x1 << 3)
+#define PAD_CTL_PUE       (0x1 << 4)
+
+#define PAD_CTL_PUS_PD100KOHM  ((0x0 << 5) | PAD_CTL_PUE)
+#define PAD_CTL_PUS_PU5KOHM    ((0x1 << 5) | PAD_CTL_PUE)
+#define PAD_CTL_PUS_PU47KOHM   ((0x2 << 5) | PAD_CTL_PUE)
+#define PAD_CTL_PUS_PU100KOHM  ((0x3 << 5) | PAD_CTL_PUE)
+
+#else
+
+#ifdef CONFIG_MX6
+
+#define PAD_CTL_HYS            (1 << 16)
+
+#define PAD_CTL_PUS_100K_DOWN  (0 << 14 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_47K_UP     (1 << 14 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_100K_UP    (2 << 14 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_22K_UP     (3 << 14 | PAD_CTL_PUE)
+#define PAD_CTL_PUE            (1 << 13 | PAD_CTL_PKE)
+#define PAD_CTL_PKE            (1 << 12)
+
+#define PAD_CTL_ODE            (1 << 11)
+
+#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL)
+#define PAD_CTL_SPEED_LOW      (0 << 6)
+#else
+#define PAD_CTL_SPEED_LOW      (1 << 6)
+#endif
+#define PAD_CTL_SPEED_MED      (2 << 6)
+#define PAD_CTL_SPEED_HIGH     (3 << 6)
+
+#define PAD_CTL_DSE_DISABLE    (0 << 3)
+#define PAD_CTL_DSE_240ohm     (1 << 3)
+#define PAD_CTL_DSE_120ohm     (2 << 3)
+#define PAD_CTL_DSE_80ohm      (3 << 3)
+#define PAD_CTL_DSE_60ohm      (4 << 3)
+#define PAD_CTL_DSE_48ohm      (5 << 3)
+#define PAD_CTL_DSE_40ohm      (6 << 3)
+#define PAD_CTL_DSE_34ohm      (7 << 3)
+
+/* i.MX6SL/SLL */
+#define PAD_CTL_LVE            (1 << 1)
+#define PAD_CTL_LVE_BIT                (1 << 22)
+
+/* i.MX6SLL */
+#define PAD_CTL_IPD_BIT                (1 << 27)
+
+#elif defined(CONFIG_VF610)
+
+#define PAD_MUX_MODE_SHIFT     20
+
+#define PAD_CTL_INPUT_DIFFERENTIAL (1 << 16)
+
+#define PAD_CTL_SPEED_MED      (1 << 12)
+#define PAD_CTL_SPEED_HIGH     (3 << 12)
+
+#define PAD_CTL_SRE            (1 << 11)
+
+#define PAD_CTL_ODE            (1 << 10)
+
+#define PAD_CTL_DSE_150ohm     (1 << 6)
+#define PAD_CTL_DSE_75ohm      (2 << 6)
+#define PAD_CTL_DSE_50ohm      (3 << 6)
+#define PAD_CTL_DSE_37ohm      (4 << 6)
+#define PAD_CTL_DSE_30ohm      (5 << 6)
+#define PAD_CTL_DSE_25ohm      (6 << 6)
+#define PAD_CTL_DSE_20ohm      (7 << 6)
+
+#define PAD_CTL_PUS_47K_UP     (1 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_100K_UP    (2 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_22K_UP     (3 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PKE            (1 << 3)
+#define PAD_CTL_PUE            (1 << 2 | PAD_CTL_PKE)
+
+#define PAD_CTL_OBE_IBE_ENABLE (3 << 0)
+#define PAD_CTL_OBE_ENABLE     (1 << 1)
+#define PAD_CTL_IBE_ENABLE     (1 << 0)
+
+#else
+
+#define PAD_CTL_DVS            (1 << 13)
+#define PAD_CTL_INPUT_DDR      (1 << 9)
+#define PAD_CTL_HYS            (1 << 8)
+
+#define PAD_CTL_PKE            (1 << 7)
+#define PAD_CTL_PUE            (1 << 6 | PAD_CTL_PKE)
+#define PAD_CTL_PUS_100K_DOWN  (0 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_47K_UP     (1 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_100K_UP    (2 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_22K_UP     (3 << 4 | PAD_CTL_PUE)
+
+#define PAD_CTL_ODE            (1 << 3)
+
+#define PAD_CTL_DSE_LOW                (0 << 1)
+#define PAD_CTL_DSE_MED                (1 << 1)
+#define PAD_CTL_DSE_HIGH       (2 << 1)
+#define PAD_CTL_DSE_MAX                (3 << 1)
+
+#endif
+
+#define PAD_CTL_SRE_SLOW       (0 << 0)
+#define PAD_CTL_SRE_FAST       (1 << 0)
+
+#endif
+
+#define IOMUX_CONFIG_SION      0x10
+
+#define GPIO_PIN_MASK          0x1f
+#define GPIO_PORT_SHIFT                5
+#define GPIO_PORT_MASK         (0x7 << GPIO_PORT_SHIFT)
+#define GPIO_PORTA             (0 << GPIO_PORT_SHIFT)
+#define GPIO_PORTB             (1 << GPIO_PORT_SHIFT)
+#define GPIO_PORTC             (2 << GPIO_PORT_SHIFT)
+#define GPIO_PORTD             (3 << GPIO_PORT_SHIFT)
+#define GPIO_PORTE             (4 << GPIO_PORT_SHIFT)
+#define GPIO_PORTF             (5 << GPIO_PORT_SHIFT)
+
+void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad);
+void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
+                                    unsigned count);
+/*
+* Set bits for general purpose registers
+*/
+void imx_iomux_set_gpr_register(int group, int start_bit,
+                                        int num_bits, int value);
+#ifdef CONFIG_IOMUX_SHARE_CONF_REG
+void imx_iomux_gpio_set_direction(unsigned int gpio,
+                               unsigned int direction);
+void imx_iomux_gpio_get_function(unsigned int gpio,
+                               u32 *gpio_state);
+#endif
+
+/* macros for declaring and using pinmux array */
+#if defined(CONFIG_MX6QDL)
+#define IOMUX_PADS(x) (MX6Q_##x), (MX6DL_##x)
+#define SETUP_IOMUX_PAD(def)                                   \
+if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) {                          \
+       imx_iomux_v3_setup_pad(MX6Q_##def);                     \
+} else {                                                       \
+       imx_iomux_v3_setup_pad(MX6DL_##def);                    \
+}
+#define SETUP_IOMUX_PADS(x)                                    \
+       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2)
+#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
+#define IOMUX_PADS(x) MX6Q_##x
+#define SETUP_IOMUX_PAD(def)                                   \
+       imx_iomux_v3_setup_pad(MX6Q_##def);
+#define SETUP_IOMUX_PADS(x)                                    \
+       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
+#elif defined(CONFIG_MX6UL)
+#define IOMUX_PADS(x) MX6_##x
+#define SETUP_IOMUX_PAD(def)                                   \
+       imx_iomux_v3_setup_pad(MX6_##def);
+#define SETUP_IOMUX_PADS(x)                                    \
+       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
+#else
+#define IOMUX_PADS(x) MX6DL_##x
+#define SETUP_IOMUX_PAD(def)                                   \
+       imx_iomux_v3_setup_pad(MX6DL_##def);
+#define SETUP_IOMUX_PADS(x)                                    \
+       imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
+#endif
+
+#endif /* __MACH_IOMUX_V3_H__*/
diff --git a/arch/arm/include/asm/mach-imx/mx5_video.h b/arch/arm/include/asm/mach-imx/mx5_video.h
new file mode 100644 (file)
index 0000000..ccaf010
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2012
+ * Anatolij Gustschin, DENX Software Engineering, <agust@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#ifndef __MX5_VIDEO_H
+#define __MX5_VIDEO_H
+
+#ifdef CONFIG_VIDEO
+void lcd_enable(void);
+void setup_iomux_lcd(void);
+#else
+static inline void lcd_enable(void) { }
+static inline void setup_iomux_lcd(void) { }
+#endif
+
+#endif
diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h
new file mode 100644 (file)
index 0000000..292bf0c
--- /dev/null
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#ifndef __ASM_ARCH_MXC_MXC_I2C_H__
+#define __ASM_ARCH_MXC_MXC_I2C_H__
+#include <asm-generic/gpio.h>
+#include <asm/mach-imx/iomux-v3.h>
+
+struct i2c_pin_ctrl {
+       iomux_v3_cfg_t i2c_mode;
+       iomux_v3_cfg_t gpio_mode;
+       unsigned char gp;
+       unsigned char spare;
+};
+
+struct i2c_pads_info {
+       struct i2c_pin_ctrl scl;
+       struct i2c_pin_ctrl sda;
+};
+
+/*
+ * Information about i2c controller
+ * struct mxc_i2c_bus - information about the i2c[x] bus
+ * @index: i2c bus index
+ * @base: Address of I2C bus controller
+ * @driver_data: Flags for different platforms, such as I2C_QUIRK_FLAG.
+ * @speed: Speed of I2C bus
+ * @pads_info: pinctrl info for this i2c bus, will be used when pinctrl is ok.
+ * The following two is only to be compatible with non-DM part.
+ * @idle_bus_fn: function to force bus idle
+ * @idle_bus_data: parameter for idle_bus_fun
+ * For DM:
+ * bus: The device structure for i2c bus controller
+ * scl-gpio: specify the gpio related to SCL pin
+ * sda-gpio: specify the gpio related to SDA pin
+ */
+struct mxc_i2c_bus {
+       /*
+        * board file can use this index to locate which i2c_pads_info is for
+        * i2c_idle_bus. When pinmux is implement, this entry can be
+        * discarded. Here we do not use dev->seq, because we do not want to
+        * export device to board file.
+        */
+       int index;
+       ulong base;
+       ulong driver_data;
+       int speed;
+       struct i2c_pads_info *pads_info;
+#ifndef CONFIG_DM_I2C
+       int (*idle_bus_fn)(void *p);
+       void *idle_bus_data;
+#else
+       struct udevice *bus;
+       /* Use gpio to force bus idle when bus state is abnormal */
+       struct gpio_desc scl_gpio;
+       struct gpio_desc sda_gpio;
+#endif
+};
+
+#if defined(CONFIG_MX6QDL)
+#define I2C_PADS(name, scl_i2c, scl_gpio, scl_gp, sda_i2c, sda_gpio, sda_gp) \
+       struct i2c_pads_info mx6q_##name = {            \
+               .scl = {                                \
+                       .i2c_mode = MX6Q_##scl_i2c,     \
+                       .gpio_mode = MX6Q_##scl_gpio,   \
+                       .gp = scl_gp,                   \
+               },                                      \
+               .sda = {                                \
+                       .i2c_mode = MX6Q_##sda_i2c,     \
+                       .gpio_mode = MX6Q_##sda_gpio,   \
+                       .gp = sda_gp,                   \
+               }                                       \
+       };                                              \
+       struct i2c_pads_info mx6s_##name = {            \
+               .scl = {                                \
+                       .i2c_mode = MX6DL_##scl_i2c,    \
+                       .gpio_mode = MX6DL_##scl_gpio,  \
+                       .gp = scl_gp,                   \
+               },                                      \
+               .sda = {                                \
+                       .i2c_mode = MX6DL_##sda_i2c,    \
+                       .gpio_mode = MX6DL_##sda_gpio,  \
+                       .gp = sda_gp,                   \
+               }                                       \
+       };
+
+
+#define I2C_PADS_INFO(name)    \
+       (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) ? \
+                                       &mx6q_##name : &mx6s_##name
+#endif
+
+int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
+             struct i2c_pads_info *p);
+void bus_i2c_init(int index, int speed, int slave_addr,
+               int (*idle_bus_fn)(void *p), void *p);
+int force_idle_bus(void *priv);
+int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus);
+#endif
diff --git a/arch/arm/include/asm/mach-imx/rdc-sema.h b/arch/arm/include/asm/mach-imx/rdc-sema.h
new file mode 100644 (file)
index 0000000..2c61e56
--- /dev/null
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:  GPL-2.0+
+ */
+
+#ifndef __RDC_SEMA_H__
+#define __RDC_SEMA_H__
+
+/*
+ * rdc_peri_cfg_t and rdc_ma_cft_t use the same layout.
+ *
+ *   [ 23 22 | 21 20 | 19 18 | 17 16 ] | [ 15 - 8 ] | [ 7 - 0 ]
+ *      d3      d2      d1       d0    | master id  |  peri id
+ *   d[x] means domain[x], x can be [3 - 0].
+ */
+typedef u32 rdc_peri_cfg_t;
+typedef u32 rdc_ma_cfg_t;
+
+#define RDC_PERI_SHIFT         0
+#define RDC_PERI_MASK          0xFF
+
+#define RDC_DOMAIN_SHIFT_BASE  16
+#define RDC_DOMAIN_MASK                0xFF0000
+#define RDC_DOMAIN_SHIFT(x)    (RDC_DOMAIN_SHIFT_BASE + ((x << 1)))
+#define RDC_DOMAIN(x)          ((rdc_peri_cfg_t)(0x3 << RDC_DOMAIN_SHIFT(x)))
+
+#define RDC_MASTER_SHIFT       8
+#define RDC_MASTER_MASK                0xFF00
+#define RDC_MASTER_CFG(master_id, domain_id) (rdc_ma_cfg_t)((master_id << 8) | \
+                                       (domain_id << RDC_DOMAIN_SHIFT_BASE))
+
+/* The Following macro definitions are common to i.MX6SX and i.MX7D */
+#define SEMA_GATES_NUM         64
+
+#define RDC_MDA_DID_SHIFT      0
+#define RDC_MDA_DID_MASK       (0x3 << RDC_MDA_DID_SHIFT)
+#define RDC_MDA_LCK_SHIFT      31
+#define RDC_MDA_LCK_MASK       (0x1 << RDC_MDA_LCK_SHIFT)
+
+#define RDC_PDAP_DW_SHIFT(domain)      ((domain) << 1)
+#define RDC_PDAP_DR_SHIFT(domain)      (1 + RDC_PDAP_DW_SHIFT(domain))
+#define RDC_PDAP_DW_MASK(domain)       (1 << RDC_PDAP_DW_SHIFT(domain))
+#define RDC_PDAP_DR_MASK(domain)       (1 << RDC_PDAP_DR_SHIFT(domain))
+#define RDC_PDAP_DRW_MASK(domain)      (RDC_PDAP_DW_MASK(domain) | \
+                                        RDC_PDAP_DR_MASK(domain))
+
+#define RDC_PDAP_SREQ_SHIFT    30
+#define RDC_PDAP_SREQ_MASK     (0x1 << RDC_PDAP_SREQ_SHIFT)
+#define RDC_PDAP_LCK_SHIFT     31
+#define RDC_PDAP_LCK_MASK      (0x1 << RDC_PDAP_LCK_SHIFT)
+
+#define RDC_MRSA_SADR_SHIFT    7
+#define RDC_MRSA_SADR_MASK     (0x1ffffff << RDC_MRSA_SADR_SHIFT)
+
+#define RDC_MREA_EADR_SHIFT    7
+#define RDC_MREA_EADR_MASK     (0x1ffffff << RDC_MREA_EADR_SHIFT)
+
+#define RDC_MRC_DW_SHIFT(domain)       (domain)
+#define RDC_MRC_DR_SHIFT(domain)       (1 + RDC_MRC_DW_SHIFT(domain))
+#define RDC_MRC_DW_MASK(domain)                (1 << RDC_MRC_DW_SHIFT(domain))
+#define RDC_MRC_DR_MASK(domain)                (1 << RDC_MRC_DR_SHIFT(domain))
+#define RDC_MRC_DRW_MASK(domain)       (RDC_MRC_DW_MASK(domain) | \
+                                        RDC_MRC_DR_MASK(domain))
+#define RDC_MRC_ENA_SHIFT      30
+#define RDC_MRC_ENA_MASK       (0x1 << RDC_MRC_ENA_SHIFT)
+#define RDC_MRC_LCK_SHIFT      31
+#define RDC_MRC_LCK_MASK       (0x1 << RDC_MRC_LCK_SHIFT)
+
+#define RDC_MRVS_VDID_SHIFT    0
+#define RDC_MRVS_VDID_MASK     (0x3 << RDC_MRVS_VDID_SHIFT)
+#define RDC_MRVS_AD_SHIFT      4
+#define RDC_MRVS_AD_MASK       (0x1 << RDC_MRVS_AD_SHIFT)
+#define RDC_MRVS_VADDR_SHIFT   5
+#define RDC_MRVS_VADDR_MASK    (0x7ffffff << RDC_MRVS_VADDR_SHIFT)
+
+#define RDC_SEMA_GATE_GTFSM_SHIFT      0
+#define RDC_SEMA_GATE_GTFSM_MASK       (0xf << RDC_SEMA_GATE_GTFSM_SHIFT)
+#define RDC_SEMA_GATE_LDOM_SHIFT       5
+#define RDC_SEMA_GATE_LDOM_MASK                (0x3 << RDC_SEMA_GATE_LDOM_SHIFT)
+
+#define RDC_SEMA_RSTGT_RSTGDP_SHIFT    0
+#define RDC_SEMA_RSTGT_RSTGDP_MASK     (0xff << RDC_SEMA_RSTGT_RSTGDP_SHIFT)
+#define RDC_SEMA_RSTGT_RSTGSM_SHIFT    2
+#define RDC_SEMA_RSTGT_RSTGSM_MASK     (0x3 << RDC_SEMA_RSTGT_RSTGSM_SHIFT)
+#define RDC_SEMA_RSTGT_RSTGMS_SHIFT    4
+#define RDC_SEMA_RSTGT_RSTGMS_MASK     (0xf << RDC_SEMA_RSTGT_RSTGMS_SHIFT)
+#define RDC_SEMA_RSTGT_RSTGTN_SHIFT    8
+#define RDC_SEMA_RSTGT_RSTGTN_MASK     (0xff << RDC_SEMA_RSTGT_RSTGTN_SHIFT)
+
+int imx_rdc_check_permission(int per_id, int dom_id);
+int imx_rdc_sema_lock(int per_id);
+int imx_rdc_sema_unlock(int per_id);
+int imx_rdc_setup_peri(rdc_peri_cfg_t p);
+int imx_rdc_setup_peripherals(rdc_peri_cfg_t const *peripherals_list,
+                             unsigned count);
+int imx_rdc_setup_ma(rdc_ma_cfg_t p);
+int imx_rdc_setup_masters(rdc_ma_cfg_t const *masters_list, unsigned count);
+
+#endif /* __RDC_SEMA_H__*/
diff --git a/arch/arm/include/asm/mach-imx/regs-apbh.h b/arch/arm/include/asm/mach-imx/regs-apbh.h
new file mode 100644 (file)
index 0000000..4cc4aba
--- /dev/null
@@ -0,0 +1,589 @@
+/*
+ * Freescale i.MX28 APBH Register Definitions
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * Based on code from LTIB:
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __REGS_APBH_H__
+#define __REGS_APBH_H__
+
+#include <asm/mach-imx/regs-common.h>
+
+#ifndef        __ASSEMBLY__
+
+#if defined(CONFIG_MX23)
+struct mxs_apbh_regs {
+       mxs_reg_32(hw_apbh_ctrl0)
+       mxs_reg_32(hw_apbh_ctrl1)
+       mxs_reg_32(hw_apbh_ctrl2)
+       mxs_reg_32(hw_apbh_channel_ctrl)
+
+       union {
+       struct {
+               mxs_reg_32(hw_apbh_ch_curcmdar)
+               mxs_reg_32(hw_apbh_ch_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch_cmd)
+               mxs_reg_32(hw_apbh_ch_bar)
+               mxs_reg_32(hw_apbh_ch_sema)
+               mxs_reg_32(hw_apbh_ch_debug1)
+               mxs_reg_32(hw_apbh_ch_debug2)
+       } ch[8];
+       struct {
+               mxs_reg_32(hw_apbh_ch0_curcmdar)
+               mxs_reg_32(hw_apbh_ch0_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch0_cmd)
+               mxs_reg_32(hw_apbh_ch0_bar)
+               mxs_reg_32(hw_apbh_ch0_sema)
+               mxs_reg_32(hw_apbh_ch0_debug1)
+               mxs_reg_32(hw_apbh_ch0_debug2)
+               mxs_reg_32(hw_apbh_ch1_curcmdar)
+               mxs_reg_32(hw_apbh_ch1_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch1_cmd)
+               mxs_reg_32(hw_apbh_ch1_bar)
+               mxs_reg_32(hw_apbh_ch1_sema)
+               mxs_reg_32(hw_apbh_ch1_debug1)
+               mxs_reg_32(hw_apbh_ch1_debug2)
+               mxs_reg_32(hw_apbh_ch2_curcmdar)
+               mxs_reg_32(hw_apbh_ch2_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch2_cmd)
+               mxs_reg_32(hw_apbh_ch2_bar)
+               mxs_reg_32(hw_apbh_ch2_sema)
+               mxs_reg_32(hw_apbh_ch2_debug1)
+               mxs_reg_32(hw_apbh_ch2_debug2)
+               mxs_reg_32(hw_apbh_ch3_curcmdar)
+               mxs_reg_32(hw_apbh_ch3_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch3_cmd)
+               mxs_reg_32(hw_apbh_ch3_bar)
+               mxs_reg_32(hw_apbh_ch3_sema)
+               mxs_reg_32(hw_apbh_ch3_debug1)
+               mxs_reg_32(hw_apbh_ch3_debug2)
+               mxs_reg_32(hw_apbh_ch4_curcmdar)
+               mxs_reg_32(hw_apbh_ch4_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch4_cmd)
+               mxs_reg_32(hw_apbh_ch4_bar)
+               mxs_reg_32(hw_apbh_ch4_sema)
+               mxs_reg_32(hw_apbh_ch4_debug1)
+               mxs_reg_32(hw_apbh_ch4_debug2)
+               mxs_reg_32(hw_apbh_ch5_curcmdar)
+               mxs_reg_32(hw_apbh_ch5_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch5_cmd)
+               mxs_reg_32(hw_apbh_ch5_bar)
+               mxs_reg_32(hw_apbh_ch5_sema)
+               mxs_reg_32(hw_apbh_ch5_debug1)
+               mxs_reg_32(hw_apbh_ch5_debug2)
+               mxs_reg_32(hw_apbh_ch6_curcmdar)
+               mxs_reg_32(hw_apbh_ch6_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch6_cmd)
+               mxs_reg_32(hw_apbh_ch6_bar)
+               mxs_reg_32(hw_apbh_ch6_sema)
+               mxs_reg_32(hw_apbh_ch6_debug1)
+               mxs_reg_32(hw_apbh_ch6_debug2)
+               mxs_reg_32(hw_apbh_ch7_curcmdar)
+               mxs_reg_32(hw_apbh_ch7_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch7_cmd)
+               mxs_reg_32(hw_apbh_ch7_bar)
+               mxs_reg_32(hw_apbh_ch7_sema)
+               mxs_reg_32(hw_apbh_ch7_debug1)
+               mxs_reg_32(hw_apbh_ch7_debug2)
+       };
+       };
+       mxs_reg_32(hw_apbh_version)
+};
+
+#elif (defined(CONFIG_MX28) || defined(CONFIG_MX6) || defined(CONFIG_MX7))
+struct mxs_apbh_regs {
+       mxs_reg_32(hw_apbh_ctrl0)
+       mxs_reg_32(hw_apbh_ctrl1)
+       mxs_reg_32(hw_apbh_ctrl2)
+       mxs_reg_32(hw_apbh_channel_ctrl)
+       mxs_reg_32(hw_apbh_devsel)
+       mxs_reg_32(hw_apbh_dma_burst_size)
+       mxs_reg_32(hw_apbh_debug)
+
+       uint32_t        reserved[36];
+
+       union {
+       struct {
+               mxs_reg_32(hw_apbh_ch_curcmdar)
+               mxs_reg_32(hw_apbh_ch_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch_cmd)
+               mxs_reg_32(hw_apbh_ch_bar)
+               mxs_reg_32(hw_apbh_ch_sema)
+               mxs_reg_32(hw_apbh_ch_debug1)
+               mxs_reg_32(hw_apbh_ch_debug2)
+       } ch[16];
+       struct {
+               mxs_reg_32(hw_apbh_ch0_curcmdar)
+               mxs_reg_32(hw_apbh_ch0_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch0_cmd)
+               mxs_reg_32(hw_apbh_ch0_bar)
+               mxs_reg_32(hw_apbh_ch0_sema)
+               mxs_reg_32(hw_apbh_ch0_debug1)
+               mxs_reg_32(hw_apbh_ch0_debug2)
+               mxs_reg_32(hw_apbh_ch1_curcmdar)
+               mxs_reg_32(hw_apbh_ch1_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch1_cmd)
+               mxs_reg_32(hw_apbh_ch1_bar)
+               mxs_reg_32(hw_apbh_ch1_sema)
+               mxs_reg_32(hw_apbh_ch1_debug1)
+               mxs_reg_32(hw_apbh_ch1_debug2)
+               mxs_reg_32(hw_apbh_ch2_curcmdar)
+               mxs_reg_32(hw_apbh_ch2_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch2_cmd)
+               mxs_reg_32(hw_apbh_ch2_bar)
+               mxs_reg_32(hw_apbh_ch2_sema)
+               mxs_reg_32(hw_apbh_ch2_debug1)
+               mxs_reg_32(hw_apbh_ch2_debug2)
+               mxs_reg_32(hw_apbh_ch3_curcmdar)
+               mxs_reg_32(hw_apbh_ch3_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch3_cmd)
+               mxs_reg_32(hw_apbh_ch3_bar)
+               mxs_reg_32(hw_apbh_ch3_sema)
+               mxs_reg_32(hw_apbh_ch3_debug1)
+               mxs_reg_32(hw_apbh_ch3_debug2)
+               mxs_reg_32(hw_apbh_ch4_curcmdar)
+               mxs_reg_32(hw_apbh_ch4_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch4_cmd)
+               mxs_reg_32(hw_apbh_ch4_bar)
+               mxs_reg_32(hw_apbh_ch4_sema)
+               mxs_reg_32(hw_apbh_ch4_debug1)
+               mxs_reg_32(hw_apbh_ch4_debug2)
+               mxs_reg_32(hw_apbh_ch5_curcmdar)
+               mxs_reg_32(hw_apbh_ch5_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch5_cmd)
+               mxs_reg_32(hw_apbh_ch5_bar)
+               mxs_reg_32(hw_apbh_ch5_sema)
+               mxs_reg_32(hw_apbh_ch5_debug1)
+               mxs_reg_32(hw_apbh_ch5_debug2)
+               mxs_reg_32(hw_apbh_ch6_curcmdar)
+               mxs_reg_32(hw_apbh_ch6_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch6_cmd)
+               mxs_reg_32(hw_apbh_ch6_bar)
+               mxs_reg_32(hw_apbh_ch6_sema)
+               mxs_reg_32(hw_apbh_ch6_debug1)
+               mxs_reg_32(hw_apbh_ch6_debug2)
+               mxs_reg_32(hw_apbh_ch7_curcmdar)
+               mxs_reg_32(hw_apbh_ch7_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch7_cmd)
+               mxs_reg_32(hw_apbh_ch7_bar)
+               mxs_reg_32(hw_apbh_ch7_sema)
+               mxs_reg_32(hw_apbh_ch7_debug1)
+               mxs_reg_32(hw_apbh_ch7_debug2)
+               mxs_reg_32(hw_apbh_ch8_curcmdar)
+               mxs_reg_32(hw_apbh_ch8_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch8_cmd)
+               mxs_reg_32(hw_apbh_ch8_bar)
+               mxs_reg_32(hw_apbh_ch8_sema)
+               mxs_reg_32(hw_apbh_ch8_debug1)
+               mxs_reg_32(hw_apbh_ch8_debug2)
+               mxs_reg_32(hw_apbh_ch9_curcmdar)
+               mxs_reg_32(hw_apbh_ch9_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch9_cmd)
+               mxs_reg_32(hw_apbh_ch9_bar)
+               mxs_reg_32(hw_apbh_ch9_sema)
+               mxs_reg_32(hw_apbh_ch9_debug1)
+               mxs_reg_32(hw_apbh_ch9_debug2)
+               mxs_reg_32(hw_apbh_ch10_curcmdar)
+               mxs_reg_32(hw_apbh_ch10_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch10_cmd)
+               mxs_reg_32(hw_apbh_ch10_bar)
+               mxs_reg_32(hw_apbh_ch10_sema)
+               mxs_reg_32(hw_apbh_ch10_debug1)
+               mxs_reg_32(hw_apbh_ch10_debug2)
+               mxs_reg_32(hw_apbh_ch11_curcmdar)
+               mxs_reg_32(hw_apbh_ch11_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch11_cmd)
+               mxs_reg_32(hw_apbh_ch11_bar)
+               mxs_reg_32(hw_apbh_ch11_sema)
+               mxs_reg_32(hw_apbh_ch11_debug1)
+               mxs_reg_32(hw_apbh_ch11_debug2)
+               mxs_reg_32(hw_apbh_ch12_curcmdar)
+               mxs_reg_32(hw_apbh_ch12_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch12_cmd)
+               mxs_reg_32(hw_apbh_ch12_bar)
+               mxs_reg_32(hw_apbh_ch12_sema)
+               mxs_reg_32(hw_apbh_ch12_debug1)
+               mxs_reg_32(hw_apbh_ch12_debug2)
+               mxs_reg_32(hw_apbh_ch13_curcmdar)
+               mxs_reg_32(hw_apbh_ch13_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch13_cmd)
+               mxs_reg_32(hw_apbh_ch13_bar)
+               mxs_reg_32(hw_apbh_ch13_sema)
+               mxs_reg_32(hw_apbh_ch13_debug1)
+               mxs_reg_32(hw_apbh_ch13_debug2)
+               mxs_reg_32(hw_apbh_ch14_curcmdar)
+               mxs_reg_32(hw_apbh_ch14_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch14_cmd)
+               mxs_reg_32(hw_apbh_ch14_bar)
+               mxs_reg_32(hw_apbh_ch14_sema)
+               mxs_reg_32(hw_apbh_ch14_debug1)
+               mxs_reg_32(hw_apbh_ch14_debug2)
+               mxs_reg_32(hw_apbh_ch15_curcmdar)
+               mxs_reg_32(hw_apbh_ch15_nxtcmdar)
+               mxs_reg_32(hw_apbh_ch15_cmd)
+               mxs_reg_32(hw_apbh_ch15_bar)
+               mxs_reg_32(hw_apbh_ch15_sema)
+               mxs_reg_32(hw_apbh_ch15_debug1)
+               mxs_reg_32(hw_apbh_ch15_debug2)
+       };
+       };
+       mxs_reg_32(hw_apbh_version)
+};
+#endif
+
+#endif
+
+#define        APBH_CTRL0_SFTRST                               (1 << 31)
+#define        APBH_CTRL0_CLKGATE                              (1 << 30)
+#define        APBH_CTRL0_AHB_BURST8_EN                        (1 << 29)
+#define        APBH_CTRL0_APB_BURST_EN                         (1 << 28)
+#if defined(CONFIG_MX23)
+#define        APBH_CTRL0_RSVD0_MASK                           (0xf << 24)
+#define        APBH_CTRL0_RSVD0_OFFSET                         24
+#define        APBH_CTRL0_RESET_CHANNEL_MASK                   (0xff << 16)
+#define        APBH_CTRL0_RESET_CHANNEL_OFFSET                 16
+#define        APBH_CTRL0_CLKGATE_CHANNEL_MASK                 (0xff << 8)
+#define        APBH_CTRL0_CLKGATE_CHANNEL_OFFSET               8
+#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP0                 0x02
+#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP1                 0x04
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND0                0x10
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND1                0x20
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND2                0x40
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND3                0x80
+#elif defined(CONFIG_MX28)
+#define        APBH_CTRL0_RSVD0_MASK                           (0xfff << 16)
+#define        APBH_CTRL0_RSVD0_OFFSET                         16
+#define        APBH_CTRL0_CLKGATE_CHANNEL_MASK                 0xffff
+#define        APBH_CTRL0_CLKGATE_CHANNEL_OFFSET               0
+#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP0                 0x0001
+#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP1                 0x0002
+#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP2                 0x0004
+#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP3                 0x0008
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND0                0x0010
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND1                0x0020
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND2                0x0040
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND3                0x0080
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND4                0x0100
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND5                0x0200
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND6                0x0400
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND7                0x0800
+#define        APBH_CTRL0_CLKGATE_CHANNEL_HSADC                0x1000
+#define        APBH_CTRL0_CLKGATE_CHANNEL_LCDIF                0x2000
+#elif (defined(CONFIG_MX6) || defined(CONFIG_MX7))
+#define        APBH_CTRL0_CLKGATE_CHANNEL_OFFSET               0
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND0                0x0001
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND1                0x0002
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND2                0x0004
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND3                0x0008
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND4                0x0010
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND5                0x0020
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND6                0x0040
+#define        APBH_CTRL0_CLKGATE_CHANNEL_NAND7                0x0080
+#define        APBH_CTRL0_CLKGATE_CHANNEL_SSP                  0x0100
+#endif
+
+#define        APBH_CTRL1_CH15_CMDCMPLT_IRQ_EN                 (1 << 31)
+#define        APBH_CTRL1_CH14_CMDCMPLT_IRQ_EN                 (1 << 30)
+#define        APBH_CTRL1_CH13_CMDCMPLT_IRQ_EN                 (1 << 29)
+#define        APBH_CTRL1_CH12_CMDCMPLT_IRQ_EN                 (1 << 28)
+#define        APBH_CTRL1_CH11_CMDCMPLT_IRQ_EN                 (1 << 27)
+#define        APBH_CTRL1_CH10_CMDCMPLT_IRQ_EN                 (1 << 26)
+#define        APBH_CTRL1_CH9_CMDCMPLT_IRQ_EN                  (1 << 25)
+#define        APBH_CTRL1_CH8_CMDCMPLT_IRQ_EN                  (1 << 24)
+#define        APBH_CTRL1_CH7_CMDCMPLT_IRQ_EN                  (1 << 23)
+#define        APBH_CTRL1_CH6_CMDCMPLT_IRQ_EN                  (1 << 22)
+#define        APBH_CTRL1_CH5_CMDCMPLT_IRQ_EN                  (1 << 21)
+#define        APBH_CTRL1_CH4_CMDCMPLT_IRQ_EN                  (1 << 20)
+#define        APBH_CTRL1_CH3_CMDCMPLT_IRQ_EN                  (1 << 19)
+#define        APBH_CTRL1_CH2_CMDCMPLT_IRQ_EN                  (1 << 18)
+#define        APBH_CTRL1_CH1_CMDCMPLT_IRQ_EN                  (1 << 17)
+#define        APBH_CTRL1_CH0_CMDCMPLT_IRQ_EN                  (1 << 16)
+#define        APBH_CTRL1_CH_CMDCMPLT_IRQ_EN_OFFSET            16
+#define        APBH_CTRL1_CH_CMDCMPLT_IRQ_EN_MASK              (0xffff << 16)
+#define        APBH_CTRL1_CH15_CMDCMPLT_IRQ                    (1 << 15)
+#define        APBH_CTRL1_CH14_CMDCMPLT_IRQ                    (1 << 14)
+#define        APBH_CTRL1_CH13_CMDCMPLT_IRQ                    (1 << 13)
+#define        APBH_CTRL1_CH12_CMDCMPLT_IRQ                    (1 << 12)
+#define        APBH_CTRL1_CH11_CMDCMPLT_IRQ                    (1 << 11)
+#define        APBH_CTRL1_CH10_CMDCMPLT_IRQ                    (1 << 10)
+#define        APBH_CTRL1_CH9_CMDCMPLT_IRQ                     (1 << 9)
+#define        APBH_CTRL1_CH8_CMDCMPLT_IRQ                     (1 << 8)
+#define        APBH_CTRL1_CH7_CMDCMPLT_IRQ                     (1 << 7)
+#define        APBH_CTRL1_CH6_CMDCMPLT_IRQ                     (1 << 6)
+#define        APBH_CTRL1_CH5_CMDCMPLT_IRQ                     (1 << 5)
+#define        APBH_CTRL1_CH4_CMDCMPLT_IRQ                     (1 << 4)
+#define        APBH_CTRL1_CH3_CMDCMPLT_IRQ                     (1 << 3)
+#define        APBH_CTRL1_CH2_CMDCMPLT_IRQ                     (1 << 2)
+#define        APBH_CTRL1_CH1_CMDCMPLT_IRQ                     (1 << 1)
+#define        APBH_CTRL1_CH0_CMDCMPLT_IRQ                     (1 << 0)
+
+#define        APBH_CTRL2_CH15_ERROR_STATUS                    (1 << 31)
+#define        APBH_CTRL2_CH14_ERROR_STATUS                    (1 << 30)
+#define        APBH_CTRL2_CH13_ERROR_STATUS                    (1 << 29)
+#define        APBH_CTRL2_CH12_ERROR_STATUS                    (1 << 28)
+#define        APBH_CTRL2_CH11_ERROR_STATUS                    (1 << 27)
+#define        APBH_CTRL2_CH10_ERROR_STATUS                    (1 << 26)
+#define        APBH_CTRL2_CH9_ERROR_STATUS                     (1 << 25)
+#define        APBH_CTRL2_CH8_ERROR_STATUS                     (1 << 24)
+#define        APBH_CTRL2_CH7_ERROR_STATUS                     (1 << 23)
+#define        APBH_CTRL2_CH6_ERROR_STATUS                     (1 << 22)
+#define        APBH_CTRL2_CH5_ERROR_STATUS                     (1 << 21)
+#define        APBH_CTRL2_CH4_ERROR_STATUS                     (1 << 20)
+#define        APBH_CTRL2_CH3_ERROR_STATUS                     (1 << 19)
+#define        APBH_CTRL2_CH2_ERROR_STATUS                     (1 << 18)
+#define        APBH_CTRL2_CH1_ERROR_STATUS                     (1 << 17)
+#define        APBH_CTRL2_CH0_ERROR_STATUS                     (1 << 16)
+#define        APBH_CTRL2_CH15_ERROR_IRQ                       (1 << 15)
+#define        APBH_CTRL2_CH14_ERROR_IRQ                       (1 << 14)
+#define        APBH_CTRL2_CH13_ERROR_IRQ                       (1 << 13)
+#define        APBH_CTRL2_CH12_ERROR_IRQ                       (1 << 12)
+#define        APBH_CTRL2_CH11_ERROR_IRQ                       (1 << 11)
+#define        APBH_CTRL2_CH10_ERROR_IRQ                       (1 << 10)
+#define        APBH_CTRL2_CH9_ERROR_IRQ                        (1 << 9)
+#define        APBH_CTRL2_CH8_ERROR_IRQ                        (1 << 8)
+#define        APBH_CTRL2_CH7_ERROR_IRQ                        (1 << 7)
+#define        APBH_CTRL2_CH6_ERROR_IRQ                        (1 << 6)
+#define        APBH_CTRL2_CH5_ERROR_IRQ                        (1 << 5)
+#define        APBH_CTRL2_CH4_ERROR_IRQ                        (1 << 4)
+#define        APBH_CTRL2_CH3_ERROR_IRQ                        (1 << 3)
+#define        APBH_CTRL2_CH2_ERROR_IRQ                        (1 << 2)
+#define        APBH_CTRL2_CH1_ERROR_IRQ                        (1 << 1)
+#define        APBH_CTRL2_CH0_ERROR_IRQ                        (1 << 0)
+
+#if defined(CONFIG_MX28)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_MASK            (0xffff << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET          16
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP0            (0x0001 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP1            (0x0002 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP2            (0x0004 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_SSP3            (0x0008 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND0           (0x0010 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND1           (0x0020 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND2           (0x0040 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND3           (0x0080 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND4           (0x0100 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND5           (0x0200 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND6           (0x0400 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_NAND7           (0x0800 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_HSADC           (0x1000 << 16)
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_LCDIF           (0x2000 << 16)
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_MASK           0xffff
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_OFFSET         0
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP0           0x0001
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP1           0x0002
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP2           0x0004
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_SSP3           0x0008
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND0          0x0010
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND1          0x0020
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND2          0x0040
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND3          0x0080
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND4          0x0100
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND5          0x0200
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND6          0x0400
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_NAND7          0x0800
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_HSADC          0x1000
+#define        APBH_CHANNEL_CTRL_FREEZE_CHANNEL_LCDIF          0x2000
+#endif
+
+#if (defined(CONFIG_MX6) || defined(CONFIG_MX7))
+#define        APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET          16
+#endif
+
+#if defined(CONFIG_MX23)
+#define        APBH_DEVSEL_CH7_MASK                            (0xf << 28)
+#define        APBH_DEVSEL_CH7_OFFSET                          28
+#define        APBH_DEVSEL_CH6_MASK                            (0xf << 24)
+#define        APBH_DEVSEL_CH6_OFFSET                          24
+#define        APBH_DEVSEL_CH5_MASK                            (0xf << 20)
+#define        APBH_DEVSEL_CH5_OFFSET                          20
+#define        APBH_DEVSEL_CH4_MASK                            (0xf << 16)
+#define        APBH_DEVSEL_CH4_OFFSET                          16
+#define        APBH_DEVSEL_CH3_MASK                            (0xf << 12)
+#define        APBH_DEVSEL_CH3_OFFSET                          12
+#define        APBH_DEVSEL_CH2_MASK                            (0xf << 8)
+#define        APBH_DEVSEL_CH2_OFFSET                          8
+#define        APBH_DEVSEL_CH1_MASK                            (0xf << 4)
+#define        APBH_DEVSEL_CH1_OFFSET                          4
+#define        APBH_DEVSEL_CH0_MASK                            (0xf << 0)
+#define        APBH_DEVSEL_CH0_OFFSET                          0
+#elif defined(CONFIG_MX28)
+#define        APBH_DEVSEL_CH15_MASK                           (0x3 << 30)
+#define        APBH_DEVSEL_CH15_OFFSET                         30
+#define        APBH_DEVSEL_CH14_MASK                           (0x3 << 28)
+#define        APBH_DEVSEL_CH14_OFFSET                         28
+#define        APBH_DEVSEL_CH13_MASK                           (0x3 << 26)
+#define        APBH_DEVSEL_CH13_OFFSET                         26
+#define        APBH_DEVSEL_CH12_MASK                           (0x3 << 24)
+#define        APBH_DEVSEL_CH12_OFFSET                         24
+#define        APBH_DEVSEL_CH11_MASK                           (0x3 << 22)
+#define        APBH_DEVSEL_CH11_OFFSET                         22
+#define        APBH_DEVSEL_CH10_MASK                           (0x3 << 20)
+#define        APBH_DEVSEL_CH10_OFFSET                         20
+#define        APBH_DEVSEL_CH9_MASK                            (0x3 << 18)
+#define        APBH_DEVSEL_CH9_OFFSET                          18
+#define        APBH_DEVSEL_CH8_MASK                            (0x3 << 16)
+#define        APBH_DEVSEL_CH8_OFFSET                          16
+#define        APBH_DEVSEL_CH7_MASK                            (0x3 << 14)
+#define        APBH_DEVSEL_CH7_OFFSET                          14
+#define        APBH_DEVSEL_CH6_MASK                            (0x3 << 12)
+#define        APBH_DEVSEL_CH6_OFFSET                          12
+#define        APBH_DEVSEL_CH5_MASK                            (0x3 << 10)
+#define        APBH_DEVSEL_CH5_OFFSET                          10
+#define        APBH_DEVSEL_CH4_MASK                            (0x3 << 8)
+#define        APBH_DEVSEL_CH4_OFFSET                          8
+#define        APBH_DEVSEL_CH3_MASK                            (0x3 << 6)
+#define        APBH_DEVSEL_CH3_OFFSET                          6
+#define        APBH_DEVSEL_CH2_MASK                            (0x3 << 4)
+#define        APBH_DEVSEL_CH2_OFFSET                          4
+#define        APBH_DEVSEL_CH1_MASK                            (0x3 << 2)
+#define        APBH_DEVSEL_CH1_OFFSET                          2
+#define        APBH_DEVSEL_CH0_MASK                            (0x3 << 0)
+#define        APBH_DEVSEL_CH0_OFFSET                          0
+#endif
+
+#if defined(CONFIG_MX28)
+#define        APBH_DMA_BURST_SIZE_CH15_MASK                   (0x3 << 30)
+#define        APBH_DMA_BURST_SIZE_CH15_OFFSET                 30
+#define        APBH_DMA_BURST_SIZE_CH14_MASK                   (0x3 << 28)
+#define        APBH_DMA_BURST_SIZE_CH14_OFFSET                 28
+#define        APBH_DMA_BURST_SIZE_CH13_MASK                   (0x3 << 26)
+#define        APBH_DMA_BURST_SIZE_CH13_OFFSET                 26
+#define        APBH_DMA_BURST_SIZE_CH12_MASK                   (0x3 << 24)
+#define        APBH_DMA_BURST_SIZE_CH12_OFFSET                 24
+#define        APBH_DMA_BURST_SIZE_CH11_MASK                   (0x3 << 22)
+#define        APBH_DMA_BURST_SIZE_CH11_OFFSET                 22
+#define        APBH_DMA_BURST_SIZE_CH10_MASK                   (0x3 << 20)
+#define        APBH_DMA_BURST_SIZE_CH10_OFFSET                 20
+#define        APBH_DMA_BURST_SIZE_CH9_MASK                    (0x3 << 18)
+#define        APBH_DMA_BURST_SIZE_CH9_OFFSET                  18
+#define        APBH_DMA_BURST_SIZE_CH8_MASK                    (0x3 << 16)
+#define        APBH_DMA_BURST_SIZE_CH8_OFFSET                  16
+#define        APBH_DMA_BURST_SIZE_CH8_BURST0                  (0x0 << 16)
+#define        APBH_DMA_BURST_SIZE_CH8_BURST4                  (0x1 << 16)
+#define        APBH_DMA_BURST_SIZE_CH8_BURST8                  (0x2 << 16)
+#define        APBH_DMA_BURST_SIZE_CH7_MASK                    (0x3 << 14)
+#define        APBH_DMA_BURST_SIZE_CH7_OFFSET                  14
+#define        APBH_DMA_BURST_SIZE_CH6_MASK                    (0x3 << 12)
+#define        APBH_DMA_BURST_SIZE_CH6_OFFSET                  12
+#define        APBH_DMA_BURST_SIZE_CH5_MASK                    (0x3 << 10)
+#define        APBH_DMA_BURST_SIZE_CH5_OFFSET                  10
+#define        APBH_DMA_BURST_SIZE_CH4_MASK                    (0x3 << 8)
+#define        APBH_DMA_BURST_SIZE_CH4_OFFSET                  8
+#define        APBH_DMA_BURST_SIZE_CH3_MASK                    (0x3 << 6)
+#define        APBH_DMA_BURST_SIZE_CH3_OFFSET                  6
+#define        APBH_DMA_BURST_SIZE_CH3_BURST0                  (0x0 << 6)
+#define        APBH_DMA_BURST_SIZE_CH3_BURST4                  (0x1 << 6)
+#define        APBH_DMA_BURST_SIZE_CH3_BURST8                  (0x2 << 6)
+
+#define        APBH_DMA_BURST_SIZE_CH2_MASK                    (0x3 << 4)
+#define        APBH_DMA_BURST_SIZE_CH2_OFFSET                  4
+#define        APBH_DMA_BURST_SIZE_CH2_BURST0                  (0x0 << 4)
+#define        APBH_DMA_BURST_SIZE_CH2_BURST4                  (0x1 << 4)
+#define        APBH_DMA_BURST_SIZE_CH2_BURST8                  (0x2 << 4)
+#define        APBH_DMA_BURST_SIZE_CH1_MASK                    (0x3 << 2)
+#define        APBH_DMA_BURST_SIZE_CH1_OFFSET                  2
+#define        APBH_DMA_BURST_SIZE_CH1_BURST0                  (0x0 << 2)
+#define        APBH_DMA_BURST_SIZE_CH1_BURST4                  (0x1 << 2)
+#define        APBH_DMA_BURST_SIZE_CH1_BURST8                  (0x2 << 2)
+
+#define        APBH_DMA_BURST_SIZE_CH0_MASK                    0x3
+#define        APBH_DMA_BURST_SIZE_CH0_OFFSET                  0
+#define        APBH_DMA_BURST_SIZE_CH0_BURST0                  0x0
+#define        APBH_DMA_BURST_SIZE_CH0_BURST4                  0x1
+#define        APBH_DMA_BURST_SIZE_CH0_BURST8                  0x2
+
+#define        APBH_DEBUG_GPMI_ONE_FIFO                        (1 << 0)
+#endif
+
+#define        APBH_CHn_CURCMDAR_CMD_ADDR_MASK                 0xffffffff
+#define        APBH_CHn_CURCMDAR_CMD_ADDR_OFFSET               0
+
+#define        APBH_CHn_NXTCMDAR_CMD_ADDR_MASK                 0xffffffff
+#define        APBH_CHn_NXTCMDAR_CMD_ADDR_OFFSET               0
+
+#define        APBH_CHn_CMD_XFER_COUNT_MASK                    (0xffff << 16)
+#define        APBH_CHn_CMD_XFER_COUNT_OFFSET                  16
+#define        APBH_CHn_CMD_CMDWORDS_MASK                      (0xf << 12)
+#define        APBH_CHn_CMD_CMDWORDS_OFFSET                    12
+#define        APBH_CHn_CMD_HALTONTERMINATE                    (1 << 8)
+#define        APBH_CHn_CMD_WAIT4ENDCMD                        (1 << 7)
+#define        APBH_CHn_CMD_SEMAPHORE                          (1 << 6)
+#define        APBH_CHn_CMD_NANDWAIT4READY                     (1 << 5)
+#define        APBH_CHn_CMD_NANDLOCK                           (1 << 4)
+#define        APBH_CHn_CMD_IRQONCMPLT                         (1 << 3)
+#define        APBH_CHn_CMD_CHAIN                              (1 << 2)
+#define        APBH_CHn_CMD_COMMAND_MASK                       0x3
+#define        APBH_CHn_CMD_COMMAND_OFFSET                     0
+#define        APBH_CHn_CMD_COMMAND_NO_DMA_XFER                0x0
+#define        APBH_CHn_CMD_COMMAND_DMA_WRITE                  0x1
+#define        APBH_CHn_CMD_COMMAND_DMA_READ                   0x2
+#define        APBH_CHn_CMD_COMMAND_DMA_SENSE                  0x3
+
+#define        APBH_CHn_BAR_ADDRESS_MASK                       0xffffffff
+#define        APBH_CHn_BAR_ADDRESS_OFFSET                     0
+
+#define        APBH_CHn_SEMA_RSVD2_MASK                        (0xff << 24)
+#define        APBH_CHn_SEMA_RSVD2_OFFSET                      24
+#define        APBH_CHn_SEMA_PHORE_MASK                        (0xff << 16)
+#define        APBH_CHn_SEMA_PHORE_OFFSET                      16
+#define        APBH_CHn_SEMA_RSVD1_MASK                        (0xff << 8)
+#define        APBH_CHn_SEMA_RSVD1_OFFSET                      8
+#define        APBH_CHn_SEMA_INCREMENT_SEMA_MASK               (0xff << 0)
+#define        APBH_CHn_SEMA_INCREMENT_SEMA_OFFSET             0
+
+#define        APBH_CHn_DEBUG1_REQ                             (1 << 31)
+#define        APBH_CHn_DEBUG1_BURST                           (1 << 30)
+#define        APBH_CHn_DEBUG1_KICK                            (1 << 29)
+#define        APBH_CHn_DEBUG1_END                             (1 << 28)
+#define        APBH_CHn_DEBUG1_SENSE                           (1 << 27)
+#define        APBH_CHn_DEBUG1_READY                           (1 << 26)
+#define        APBH_CHn_DEBUG1_LOCK                            (1 << 25)
+#define        APBH_CHn_DEBUG1_NEXTCMDADDRVALID                (1 << 24)
+#define        APBH_CHn_DEBUG1_RD_FIFO_EMPTY                   (1 << 23)
+#define        APBH_CHn_DEBUG1_RD_FIFO_FULL                    (1 << 22)
+#define        APBH_CHn_DEBUG1_WR_FIFO_EMPTY                   (1 << 21)
+#define        APBH_CHn_DEBUG1_WR_FIFO_FULL                    (1 << 20)
+#define        APBH_CHn_DEBUG1_RSVD1_MASK                      (0x7fff << 5)
+#define        APBH_CHn_DEBUG1_RSVD1_OFFSET                    5
+#define        APBH_CHn_DEBUG1_STATEMACHINE_MASK               0x1f
+#define        APBH_CHn_DEBUG1_STATEMACHINE_OFFSET             0
+#define        APBH_CHn_DEBUG1_STATEMACHINE_IDLE               0x00
+#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD1           0x01
+#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD3           0x02
+#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD2           0x03
+#define        APBH_CHn_DEBUG1_STATEMACHINE_XFER_DECODE        0x04
+#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_WAIT           0x05
+#define        APBH_CHn_DEBUG1_STATEMACHINE_REQ_CMD4           0x06
+#define        APBH_CHn_DEBUG1_STATEMACHINE_PIO_REQ            0x07
+#define        APBH_CHn_DEBUG1_STATEMACHINE_READ_FLUSH         0x08
+#define        APBH_CHn_DEBUG1_STATEMACHINE_READ_WAIT          0x09
+#define        APBH_CHn_DEBUG1_STATEMACHINE_WRITE              0x0c
+#define        APBH_CHn_DEBUG1_STATEMACHINE_READ_REQ           0x0d
+#define        APBH_CHn_DEBUG1_STATEMACHINE_CHECK_CHAIN        0x0e
+#define        APBH_CHn_DEBUG1_STATEMACHINE_XFER_COMPLETE      0x0f
+#define        APBH_CHn_DEBUG1_STATEMACHINE_TERMINATE          0x14
+#define        APBH_CHn_DEBUG1_STATEMACHINE_WAIT_END           0x15
+#define        APBH_CHn_DEBUG1_STATEMACHINE_WRITE_WAIT         0x1c
+#define        APBH_CHn_DEBUG1_STATEMACHINE_HALT_AFTER_TERM    0x1d
+#define        APBH_CHn_DEBUG1_STATEMACHINE_CHECK_WAIT         0x1e
+#define        APBH_CHn_DEBUG1_STATEMACHINE_WAIT_READY         0x1f
+
+#define        APBH_CHn_DEBUG2_APB_BYTES_MASK                  (0xffff << 16)
+#define        APBH_CHn_DEBUG2_APB_BYTES_OFFSET                16
+#define        APBH_CHn_DEBUG2_AHB_BYTES_MASK                  0xffff
+#define        APBH_CHn_DEBUG2_AHB_BYTES_OFFSET                0
+
+#define        APBH_VERSION_MAJOR_MASK                         (0xff << 24)
+#define        APBH_VERSION_MAJOR_OFFSET                       24
+#define        APBH_VERSION_MINOR_MASK                         (0xff << 16)
+#define        APBH_VERSION_MINOR_OFFSET                       16
+#define        APBH_VERSION_STEP_MASK                          0xffff
+#define        APBH_VERSION_STEP_OFFSET                        0
+
+#endif /* __REGS_APBH_H__ */
diff --git a/arch/arm/include/asm/mach-imx/regs-bch.h b/arch/arm/include/asm/mach-imx/regs-bch.h
new file mode 100644 (file)
index 0000000..c0f673c
--- /dev/null
@@ -0,0 +1,229 @@
+/*
+ * Freescale i.MX28 BCH Register Definitions
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * Based on code from LTIB:
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __MX28_REGS_BCH_H__
+#define __MX28_REGS_BCH_H__
+
+#include <asm/mach-imx/regs-common.h>
+
+#ifndef        __ASSEMBLY__
+struct mxs_bch_regs {
+       mxs_reg_32(hw_bch_ctrl)
+       mxs_reg_32(hw_bch_status0)
+       mxs_reg_32(hw_bch_mode)
+       mxs_reg_32(hw_bch_encodeptr)
+       mxs_reg_32(hw_bch_dataptr)
+       mxs_reg_32(hw_bch_metaptr)
+
+       uint32_t        reserved[4];
+
+       mxs_reg_32(hw_bch_layoutselect)
+       mxs_reg_32(hw_bch_flash0layout0)
+       mxs_reg_32(hw_bch_flash0layout1)
+       mxs_reg_32(hw_bch_flash1layout0)
+       mxs_reg_32(hw_bch_flash1layout1)
+       mxs_reg_32(hw_bch_flash2layout0)
+       mxs_reg_32(hw_bch_flash2layout1)
+       mxs_reg_32(hw_bch_flash3layout0)
+       mxs_reg_32(hw_bch_flash3layout1)
+       mxs_reg_32(hw_bch_dbgkesread)
+       mxs_reg_32(hw_bch_dbgcsferead)
+       mxs_reg_32(hw_bch_dbgsyndegread)
+       mxs_reg_32(hw_bch_dbgahbmread)
+       mxs_reg_32(hw_bch_blockname)
+       mxs_reg_32(hw_bch_version)
+};
+#endif
+
+#define        BCH_CTRL_SFTRST                                 (1 << 31)
+#define        BCH_CTRL_CLKGATE                                (1 << 30)
+#define        BCH_CTRL_DEBUGSYNDROME                          (1 << 22)
+#define        BCH_CTRL_M2M_LAYOUT_MASK                        (0x3 << 18)
+#define        BCH_CTRL_M2M_LAYOUT_OFFSET                      18
+#define        BCH_CTRL_M2M_ENCODE                             (1 << 17)
+#define        BCH_CTRL_M2M_ENABLE                             (1 << 16)
+#define        BCH_CTRL_DEBUG_STALL_IRQ_EN                     (1 << 10)
+#define        BCH_CTRL_COMPLETE_IRQ_EN                        (1 << 8)
+#define        BCH_CTRL_BM_ERROR_IRQ                           (1 << 3)
+#define        BCH_CTRL_DEBUG_STALL_IRQ                        (1 << 2)
+#define        BCH_CTRL_COMPLETE_IRQ                           (1 << 0)
+
+#define        BCH_STATUS0_HANDLE_MASK                         (0xfff << 20)
+#define        BCH_STATUS0_HANDLE_OFFSET                       20
+#define        BCH_STATUS0_COMPLETED_CE_MASK                   (0xf << 16)
+#define        BCH_STATUS0_COMPLETED_CE_OFFSET                 16
+#define        BCH_STATUS0_STATUS_BLK0_MASK                    (0xff << 8)
+#define        BCH_STATUS0_STATUS_BLK0_OFFSET                  8
+#define        BCH_STATUS0_STATUS_BLK0_ZERO                    (0x00 << 8)
+#define        BCH_STATUS0_STATUS_BLK0_ERROR1                  (0x01 << 8)
+#define        BCH_STATUS0_STATUS_BLK0_ERROR2                  (0x02 << 8)
+#define        BCH_STATUS0_STATUS_BLK0_ERROR3                  (0x03 << 8)
+#define        BCH_STATUS0_STATUS_BLK0_ERROR4                  (0x04 << 8)
+#define        BCH_STATUS0_STATUS_BLK0_UNCORRECTABLE           (0xfe << 8)
+#define        BCH_STATUS0_STATUS_BLK0_ERASED                  (0xff << 8)
+#define        BCH_STATUS0_ALLONES                             (1 << 4)
+#define        BCH_STATUS0_CORRECTED                           (1 << 3)
+#define        BCH_STATUS0_UNCORRECTABLE                       (1 << 2)
+
+#define        BCH_MODE_ERASE_THRESHOLD_MASK                   0xff
+#define        BCH_MODE_ERASE_THRESHOLD_OFFSET                 0
+
+#define        BCH_ENCODEPTR_ADDR_MASK                         0xffffffff
+#define        BCH_ENCODEPTR_ADDR_OFFSET                       0
+
+#define        BCH_DATAPTR_ADDR_MASK                           0xffffffff
+#define        BCH_DATAPTR_ADDR_OFFSET                         0
+
+#define        BCH_METAPTR_ADDR_MASK                           0xffffffff
+#define        BCH_METAPTR_ADDR_OFFSET                         0
+
+#define        BCH_LAYOUTSELECT_CS15_SELECT_MASK               (0x3 << 30)
+#define        BCH_LAYOUTSELECT_CS15_SELECT_OFFSET             30
+#define        BCH_LAYOUTSELECT_CS14_SELECT_MASK               (0x3 << 28)
+#define        BCH_LAYOUTSELECT_CS14_SELECT_OFFSET             28
+#define        BCH_LAYOUTSELECT_CS13_SELECT_MASK               (0x3 << 26)
+#define        BCH_LAYOUTSELECT_CS13_SELECT_OFFSET             26
+#define        BCH_LAYOUTSELECT_CS12_SELECT_MASK               (0x3 << 24)
+#define        BCH_LAYOUTSELECT_CS12_SELECT_OFFSET             24
+#define        BCH_LAYOUTSELECT_CS11_SELECT_MASK               (0x3 << 22)
+#define        BCH_LAYOUTSELECT_CS11_SELECT_OFFSET             22
+#define        BCH_LAYOUTSELECT_CS10_SELECT_MASK               (0x3 << 20)
+#define        BCH_LAYOUTSELECT_CS10_SELECT_OFFSET             20
+#define        BCH_LAYOUTSELECT_CS9_SELECT_MASK                (0x3 << 18)
+#define        BCH_LAYOUTSELECT_CS9_SELECT_OFFSET              18
+#define        BCH_LAYOUTSELECT_CS8_SELECT_MASK                (0x3 << 16)
+#define        BCH_LAYOUTSELECT_CS8_SELECT_OFFSET              16
+#define        BCH_LAYOUTSELECT_CS7_SELECT_MASK                (0x3 << 14)
+#define        BCH_LAYOUTSELECT_CS7_SELECT_OFFSET              14
+#define        BCH_LAYOUTSELECT_CS6_SELECT_MASK                (0x3 << 12)
+#define        BCH_LAYOUTSELECT_CS6_SELECT_OFFSET              12
+#define        BCH_LAYOUTSELECT_CS5_SELECT_MASK                (0x3 << 10)
+#define        BCH_LAYOUTSELECT_CS5_SELECT_OFFSET              10
+#define        BCH_LAYOUTSELECT_CS4_SELECT_MASK                (0x3 << 8)
+#define        BCH_LAYOUTSELECT_CS4_SELECT_OFFSET              8
+#define        BCH_LAYOUTSELECT_CS3_SELECT_MASK                (0x3 << 6)
+#define        BCH_LAYOUTSELECT_CS3_SELECT_OFFSET              6
+#define        BCH_LAYOUTSELECT_CS2_SELECT_MASK                (0x3 << 4)
+#define        BCH_LAYOUTSELECT_CS2_SELECT_OFFSET              4
+#define        BCH_LAYOUTSELECT_CS1_SELECT_MASK                (0x3 << 2)
+#define        BCH_LAYOUTSELECT_CS1_SELECT_OFFSET              2
+#define        BCH_LAYOUTSELECT_CS0_SELECT_MASK                (0x3 << 0)
+#define        BCH_LAYOUTSELECT_CS0_SELECT_OFFSET              0
+
+#define        BCH_FLASHLAYOUT0_NBLOCKS_MASK                   (0xff << 24)
+#define        BCH_FLASHLAYOUT0_NBLOCKS_OFFSET                 24
+#define        BCH_FLASHLAYOUT0_META_SIZE_MASK                 (0xff << 16)
+#define        BCH_FLASHLAYOUT0_META_SIZE_OFFSET               16
+#if (defined(CONFIG_MX6) || defined(CONFIG_MX7))
+#define        BCH_FLASHLAYOUT0_ECC0_MASK                      (0x1f << 11)
+#define        BCH_FLASHLAYOUT0_ECC0_OFFSET                    11
+#else
+#define        BCH_FLASHLAYOUT0_ECC0_MASK                      (0xf << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_OFFSET                    12
+#endif
+#define        BCH_FLASHLAYOUT0_ECC0_NONE                      (0x0 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC2                      (0x1 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC4                      (0x2 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC6                      (0x3 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC8                      (0x4 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC10                     (0x5 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC12                     (0x6 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC14                     (0x7 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC16                     (0x8 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC18                     (0x9 << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC20                     (0xa << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC22                     (0xb << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC24                     (0xc << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC26                     (0xd << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC28                     (0xe << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC30                     (0xf << 12)
+#define        BCH_FLASHLAYOUT0_ECC0_ECC32                     (0x10 << 12)
+#define        BCH_FLASHLAYOUT0_GF13_0_GF14_1                  (1 << 10)
+#define        BCH_FLASHLAYOUT0_GF13_0_GF14_1_OFFSET           10
+#define        BCH_FLASHLAYOUT0_DATA0_SIZE_MASK                0xfff
+#define        BCH_FLASHLAYOUT0_DATA0_SIZE_OFFSET              0
+
+#define        BCH_FLASHLAYOUT1_PAGE_SIZE_MASK                 (0xffff << 16)
+#define        BCH_FLASHLAYOUT1_PAGE_SIZE_OFFSET               16
+#if (defined(CONFIG_MX6) || defined(CONFIG_MX7))
+#define        BCH_FLASHLAYOUT1_ECCN_MASK                      (0x1f << 11)
+#define        BCH_FLASHLAYOUT1_ECCN_OFFSET                    11
+#else
+#define        BCH_FLASHLAYOUT1_ECCN_MASK                      (0xf << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_OFFSET                    12
+#endif
+#define        BCH_FLASHLAYOUT1_ECCN_NONE                      (0x0 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC2                      (0x1 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC4                      (0x2 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC6                      (0x3 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC8                      (0x4 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC10                     (0x5 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC12                     (0x6 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC14                     (0x7 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC16                     (0x8 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC18                     (0x9 << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC20                     (0xa << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC22                     (0xb << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC24                     (0xc << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC26                     (0xd << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC28                     (0xe << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC30                     (0xf << 12)
+#define        BCH_FLASHLAYOUT1_ECCN_ECC32                     (0x10 << 12)
+#define        BCH_FLASHLAYOUT1_GF13_0_GF14_1                  (1 << 10)
+#define        BCH_FLASHLAYOUT1_GF13_0_GF14_1_OFFSET           10
+#define        BCH_FLASHLAYOUT1_DATAN_SIZE_MASK                0xfff
+#define        BCH_FLASHLAYOUT1_DATAN_SIZE_OFFSET              0
+
+#define        BCH_DEBUG0_RSVD1_MASK                           (0x1f << 27)
+#define        BCH_DEBUG0_RSVD1_OFFSET                         27
+#define        BCH_DEBUG0_ROM_BIST_ENABLE                      (1 << 26)
+#define        BCH_DEBUG0_ROM_BIST_COMPLETE                    (1 << 25)
+#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_MASK       (0x1ff << 16)
+#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_OFFSET     16
+#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_NORMAL     (0x0 << 16)
+#define        BCH_DEBUG0_KES_DEBUG_SYNDROME_SYMBOL_TEST_MODE  (0x1 << 16)
+#define        BCH_DEBUG0_KES_DEBUG_SHIFT_SYND                 (1 << 15)
+#define        BCH_DEBUG0_KES_DEBUG_PAYLOAD_FLAG               (1 << 14)
+#define        BCH_DEBUG0_KES_DEBUG_MODE4K                     (1 << 13)
+#define        BCH_DEBUG0_KES_DEBUG_KICK                       (1 << 12)
+#define        BCH_DEBUG0_KES_STANDALONE                       (1 << 11)
+#define        BCH_DEBUG0_KES_DEBUG_STEP                       (1 << 10)
+#define        BCH_DEBUG0_KES_DEBUG_STALL                      (1 << 9)
+#define        BCH_DEBUG0_BM_KES_TEST_BYPASS                   (1 << 8)
+#define        BCH_DEBUG0_RSVD0_MASK                           (0x3 << 6)
+#define        BCH_DEBUG0_RSVD0_OFFSET                         6
+#define        BCH_DEBUG0_DEBUG_REG_SELECT_MASK                0x3f
+#define        BCH_DEBUG0_DEBUG_REG_SELECT_OFFSET              0
+
+#define        BCH_DBGKESREAD_VALUES_MASK                      0xffffffff
+#define        BCH_DBGKESREAD_VALUES_OFFSET                    0
+
+#define        BCH_DBGCSFEREAD_VALUES_MASK                     0xffffffff
+#define        BCH_DBGCSFEREAD_VALUES_OFFSET                   0
+
+#define        BCH_DBGSYNDGENREAD_VALUES_MASK                  0xffffffff
+#define        BCH_DBGSYNDGENREAD_VALUES_OFFSET                0
+
+#define        BCH_DBGAHBMREAD_VALUES_MASK                     0xffffffff
+#define        BCH_DBGAHBMREAD_VALUES_OFFSET                   0
+
+#define        BCH_BLOCKNAME_NAME_MASK                         0xffffffff
+#define        BCH_BLOCKNAME_NAME_OFFSET                       0
+
+#define        BCH_VERSION_MAJOR_MASK                          (0xff << 24)
+#define        BCH_VERSION_MAJOR_OFFSET                        24
+#define        BCH_VERSION_MINOR_MASK                          (0xff << 16)
+#define        BCH_VERSION_MINOR_OFFSET                        16
+#define        BCH_VERSION_STEP_MASK                           0xffff
+#define        BCH_VERSION_STEP_OFFSET                         0
+
+#endif /* __MX28_REGS_BCH_H__ */
diff --git a/arch/arm/include/asm/mach-imx/regs-common.h b/arch/arm/include/asm/mach-imx/regs-common.h
new file mode 100644 (file)
index 0000000..7382674
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ * Freescale i.MXS Register Accessors
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __MXS_REGS_COMMON_H__
+#define __MXS_REGS_COMMON_H__
+
+#include <linux/types.h>
+
+/*
+ * The i.MXS has interesting feature when it comes to register access. There
+ * are four kinds of access to one particular register. Those are:
+ *
+ * 1) Common read/write access. To use this mode, just write to the address of
+ *    the register.
+ * 2) Set bits only access. To set bits, write which bits you want to set to the
+ *    address of the register + 0x4.
+ * 3) Clear bits only access. To clear bits, write which bits you want to clear
+ *    to the address of the register + 0x8.
+ * 4) Toggle bits only access. To toggle bits, write which bits you want to
+ *    toggle to the address of the register + 0xc.
+ *
+ * IMPORTANT NOTE: Not all registers support accesses 2-4! Also, not all bits
+ * can be set/cleared by pure write as in access type 1, some need to be
+ * explicitly set/cleared by using access type 2-3.
+ *
+ * The following macros and structures allow the user to either access the
+ * register in all aforementioned modes (by accessing reg_name, reg_name_set,
+ * reg_name_clr, reg_name_tog) or pass the register structure further into
+ * various functions with correct type information (by accessing reg_name_reg).
+ *
+ */
+
+#define        __mxs_reg_8(name)               \
+       uint8_t name[4];                \
+       uint8_t name##_set[4];          \
+       uint8_t name##_clr[4];          \
+       uint8_t name##_tog[4];          \
+
+#define        __mxs_reg_32(name)              \
+       uint32_t name;                  \
+       uint32_t name##_set;            \
+       uint32_t name##_clr;            \
+       uint32_t name##_tog;
+
+struct mxs_register_8 {
+       __mxs_reg_8(reg)
+};
+
+struct mxs_register_32 {
+       __mxs_reg_32(reg)
+};
+
+#define        mxs_reg_8(name)                         \
+       union {                                         \
+               struct { __mxs_reg_8(name) };           \
+               struct mxs_register_8 name##_reg;       \
+       };
+
+#define        mxs_reg_32(name)                                \
+       union {                                         \
+               struct { __mxs_reg_32(name) };          \
+               struct mxs_register_32 name##_reg;      \
+       };
+
+#endif /* __MXS_REGS_COMMON_H__ */
diff --git a/arch/arm/include/asm/mach-imx/regs-gpmi.h b/arch/arm/include/asm/mach-imx/regs-gpmi.h
new file mode 100644 (file)
index 0000000..9ff646b
--- /dev/null
@@ -0,0 +1,209 @@
+/*
+ * Freescale i.MX28 GPMI Register Definitions
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * Based on code from LTIB:
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __MX28_REGS_GPMI_H__
+#define __MX28_REGS_GPMI_H__
+
+#include <asm/mach-imx/regs-common.h>
+
+#ifndef        __ASSEMBLY__
+struct mxs_gpmi_regs {
+       mxs_reg_32(hw_gpmi_ctrl0)
+       mxs_reg_32(hw_gpmi_compare)
+       mxs_reg_32(hw_gpmi_eccctrl)
+       mxs_reg_32(hw_gpmi_ecccount)
+       mxs_reg_32(hw_gpmi_payload)
+       mxs_reg_32(hw_gpmi_auxiliary)
+       mxs_reg_32(hw_gpmi_ctrl1)
+       mxs_reg_32(hw_gpmi_timing0)
+       mxs_reg_32(hw_gpmi_timing1)
+
+       uint32_t        reserved[4];
+
+       mxs_reg_32(hw_gpmi_data)
+       mxs_reg_32(hw_gpmi_stat)
+       mxs_reg_32(hw_gpmi_debug)
+       mxs_reg_32(hw_gpmi_version)
+};
+#endif
+
+#define        GPMI_CTRL0_SFTRST                               (1 << 31)
+#define        GPMI_CTRL0_CLKGATE                              (1 << 30)
+#define        GPMI_CTRL0_RUN                                  (1 << 29)
+#define        GPMI_CTRL0_DEV_IRQ_EN                           (1 << 28)
+#define        GPMI_CTRL0_LOCK_CS                              (1 << 27)
+#define        GPMI_CTRL0_UDMA                                 (1 << 26)
+#define        GPMI_CTRL0_COMMAND_MODE_MASK                    (0x3 << 24)
+#define        GPMI_CTRL0_COMMAND_MODE_OFFSET                  24
+#define        GPMI_CTRL0_COMMAND_MODE_WRITE                   (0x0 << 24)
+#define        GPMI_CTRL0_COMMAND_MODE_READ                    (0x1 << 24)
+#define        GPMI_CTRL0_COMMAND_MODE_READ_AND_COMPARE        (0x2 << 24)
+#define        GPMI_CTRL0_COMMAND_MODE_WAIT_FOR_READY          (0x3 << 24)
+#define        GPMI_CTRL0_WORD_LENGTH                          (1 << 23)
+#define        GPMI_CTRL0_CS_MASK                              (0x7 << 20)
+#define        GPMI_CTRL0_CS_OFFSET                            20
+#define        GPMI_CTRL0_ADDRESS_MASK                         (0x7 << 17)
+#define        GPMI_CTRL0_ADDRESS_OFFSET                       17
+#define        GPMI_CTRL0_ADDRESS_NAND_DATA                    (0x0 << 17)
+#define        GPMI_CTRL0_ADDRESS_NAND_CLE                     (0x1 << 17)
+#define        GPMI_CTRL0_ADDRESS_NAND_ALE                     (0x2 << 17)
+#define        GPMI_CTRL0_ADDRESS_INCREMENT                    (1 << 16)
+#define        GPMI_CTRL0_XFER_COUNT_MASK                      0xffff
+#define        GPMI_CTRL0_XFER_COUNT_OFFSET                    0
+
+#define        GPMI_COMPARE_MASK_MASK                          (0xffff << 16)
+#define        GPMI_COMPARE_MASK_OFFSET                        16
+#define        GPMI_COMPARE_REFERENCE_MASK                     0xffff
+#define        GPMI_COMPARE_REFERENCE_OFFSET                   0
+
+#define        GPMI_ECCCTRL_HANDLE_MASK                        (0xffff << 16)
+#define        GPMI_ECCCTRL_HANDLE_OFFSET                      16
+#define        GPMI_ECCCTRL_ECC_CMD_MASK                       (0x3 << 13)
+#define        GPMI_ECCCTRL_ECC_CMD_OFFSET                     13
+#define        GPMI_ECCCTRL_ECC_CMD_DECODE                     (0x0 << 13)
+#define        GPMI_ECCCTRL_ECC_CMD_ENCODE                     (0x1 << 13)
+#define        GPMI_ECCCTRL_ENABLE_ECC                         (1 << 12)
+#define        GPMI_ECCCTRL_BUFFER_MASK_MASK                   0x1ff
+#define        GPMI_ECCCTRL_BUFFER_MASK_OFFSET                 0
+#define        GPMI_ECCCTRL_BUFFER_MASK_BCH_AUXONLY            0x100
+#define        GPMI_ECCCTRL_BUFFER_MASK_BCH_PAGE               0x1ff
+
+#define        GPMI_ECCCOUNT_COUNT_MASK                        0xffff
+#define        GPMI_ECCCOUNT_COUNT_OFFSET                      0
+
+#define        GPMI_PAYLOAD_ADDRESS_MASK                       (0x3fffffff << 2)
+#define        GPMI_PAYLOAD_ADDRESS_OFFSET                     2
+
+#define        GPMI_AUXILIARY_ADDRESS_MASK                     (0x3fffffff << 2)
+#define        GPMI_AUXILIARY_ADDRESS_OFFSET                   2
+
+#define        GPMI_CTRL1_DECOUPLE_CS                          (1 << 24)
+#define        GPMI_CTRL1_WRN_DLY_SEL_MASK                     (0x3 << 22)
+#define        GPMI_CTRL1_WRN_DLY_SEL_OFFSET                   22
+#define        GPMI_CTRL1_TIMEOUT_IRQ_EN                       (1 << 20)
+#define        GPMI_CTRL1_GANGED_RDYBUSY                       (1 << 19)
+#define        GPMI_CTRL1_BCH_MODE                             (1 << 18)
+#define        GPMI_CTRL1_DLL_ENABLE                           (1 << 17)
+#define        GPMI_CTRL1_HALF_PERIOD                          (1 << 16)
+#define        GPMI_CTRL1_RDN_DELAY_MASK                       (0xf << 12)
+#define        GPMI_CTRL1_RDN_DELAY_OFFSET                     12
+#define        GPMI_CTRL1_DMA2ECC_MODE                         (1 << 11)
+#define        GPMI_CTRL1_DEV_IRQ                              (1 << 10)
+#define        GPMI_CTRL1_TIMEOUT_IRQ                          (1 << 9)
+#define        GPMI_CTRL1_BURST_EN                             (1 << 8)
+#define        GPMI_CTRL1_ABORT_WAIT_REQUEST                   (1 << 7)
+#define        GPMI_CTRL1_ABORT_WAIT_FOR_READY_CHANNEL_MASK    (0x7 << 4)
+#define        GPMI_CTRL1_ABORT_WAIT_FOR_READY_CHANNEL_OFFSET  4
+#define        GPMI_CTRL1_DEV_RESET                            (1 << 3)
+#define        GPMI_CTRL1_ATA_IRQRDY_POLARITY                  (1 << 2)
+#define        GPMI_CTRL1_CAMERA_MODE                          (1 << 1)
+#define        GPMI_CTRL1_GPMI_MODE                            (1 << 0)
+
+#define        GPMI_TIMING0_ADDRESS_SETUP_MASK                 (0xff << 16)
+#define        GPMI_TIMING0_ADDRESS_SETUP_OFFSET               16
+#define        GPMI_TIMING0_DATA_HOLD_MASK                     (0xff << 8)
+#define        GPMI_TIMING0_DATA_HOLD_OFFSET                   8
+#define        GPMI_TIMING0_DATA_SETUP_MASK                    0xff
+#define        GPMI_TIMING0_DATA_SETUP_OFFSET                  0
+
+#define        GPMI_TIMING1_DEVICE_BUSY_TIMEOUT_MASK           (0xffff << 16)
+#define        GPMI_TIMING1_DEVICE_BUSY_TIMEOUT_OFFSET         16
+
+#define        GPMI_TIMING2_UDMA_TRP_MASK                      (0xff << 24)
+#define        GPMI_TIMING2_UDMA_TRP_OFFSET                    24
+#define        GPMI_TIMING2_UDMA_ENV_MASK                      (0xff << 16)
+#define        GPMI_TIMING2_UDMA_ENV_OFFSET                    16
+#define        GPMI_TIMING2_UDMA_HOLD_MASK                     (0xff << 8)
+#define        GPMI_TIMING2_UDMA_HOLD_OFFSET                   8
+#define        GPMI_TIMING2_UDMA_SETUP_MASK                    0xff
+#define        GPMI_TIMING2_UDMA_SETUP_OFFSET                  0
+
+#define        GPMI_DATA_DATA_MASK                             0xffffffff
+#define        GPMI_DATA_DATA_OFFSET                           0
+
+#define        GPMI_STAT_READY_BUSY_MASK                       (0xff << 24)
+#define        GPMI_STAT_READY_BUSY_OFFSET                     24
+#define        GPMI_STAT_RDY_TIMEOUT_MASK                      (0xff << 16)
+#define        GPMI_STAT_RDY_TIMEOUT_OFFSET                    16
+#define        GPMI_STAT_DEV7_ERROR                            (1 << 15)
+#define        GPMI_STAT_DEV6_ERROR                            (1 << 14)
+#define        GPMI_STAT_DEV5_ERROR                            (1 << 13)
+#define        GPMI_STAT_DEV4_ERROR                            (1 << 12)
+#define        GPMI_STAT_DEV3_ERROR                            (1 << 11)
+#define        GPMI_STAT_DEV2_ERROR                            (1 << 10)
+#define        GPMI_STAT_DEV1_ERROR                            (1 << 9)
+#define        GPMI_STAT_DEV0_ERROR                            (1 << 8)
+#define        GPMI_STAT_ATA_IRQ                               (1 << 4)
+#define        GPMI_STAT_INVALID_BUFFER_MASK                   (1 << 3)
+#define        GPMI_STAT_FIFO_EMPTY                            (1 << 2)
+#define        GPMI_STAT_FIFO_FULL                             (1 << 1)
+#define        GPMI_STAT_PRESENT                               (1 << 0)
+
+#define        GPMI_DEBUG_WAIT_FOR_READY_END_MASK              (0xff << 24)
+#define        GPMI_DEBUG_WAIT_FOR_READY_END_OFFSET            24
+#define        GPMI_DEBUG_DMA_SENSE_MASK                       (0xff << 16)
+#define        GPMI_DEBUG_DMA_SENSE_OFFSET                     16
+#define        GPMI_DEBUG_DMAREQ_MASK                          (0xff << 8)
+#define        GPMI_DEBUG_DMAREQ_OFFSET                        8
+#define        GPMI_DEBUG_CMD_END_MASK                         0xff
+#define        GPMI_DEBUG_CMD_END_OFFSET                       0
+
+#define        GPMI_VERSION_MAJOR_MASK                         (0xff << 24)
+#define        GPMI_VERSION_MAJOR_OFFSET                       24
+#define        GPMI_VERSION_MINOR_MASK                         (0xff << 16)
+#define        GPMI_VERSION_MINOR_OFFSET                       16
+#define        GPMI_VERSION_STEP_MASK                          0xffff
+#define        GPMI_VERSION_STEP_OFFSET                        0
+
+#define        GPMI_DEBUG2_UDMA_STATE_MASK                     (0xf << 24)
+#define        GPMI_DEBUG2_UDMA_STATE_OFFSET                   24
+#define        GPMI_DEBUG2_BUSY                                (1 << 23)
+#define        GPMI_DEBUG2_PIN_STATE_MASK                      (0x7 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_OFFSET                    20
+#define        GPMI_DEBUG2_PIN_STATE_PSM_IDLE                  (0x0 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_PSM_BYTCNT                (0x1 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_PSM_ADDR                  (0x2 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_PSM_STALL                 (0x3 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_PSM_STROBE                (0x4 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_PSM_ATARDY                (0x5 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_PSM_DHOLD                 (0x6 << 20)
+#define        GPMI_DEBUG2_PIN_STATE_PSM_DONE                  (0x7 << 20)
+#define        GPMI_DEBUG2_MAIN_STATE_MASK                     (0xf << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_OFFSET                   16
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_IDLE                 (0x0 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_BYTCNT               (0x1 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_WAITFE               (0x2 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_WAITFR               (0x3 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_DMAREQ               (0x4 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_DMAACK               (0x5 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_WAITFF               (0x6 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_LDFIFO               (0x7 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_LDDMAR               (0x8 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_RDCMP                (0x9 << 16)
+#define        GPMI_DEBUG2_MAIN_STATE_MSM_DONE                 (0xa << 16)
+#define        GPMI_DEBUG2_SYND2GPMI_BE_MASK                   (0xf << 12)
+#define        GPMI_DEBUG2_SYND2GPMI_BE_OFFSET                 12
+#define        GPMI_DEBUG2_GPMI2SYND_VALID                     (1 << 11)
+#define        GPMI_DEBUG2_GPMI2SYND_READY                     (1 << 10)
+#define        GPMI_DEBUG2_SYND2GPMI_VALID                     (1 << 9)
+#define        GPMI_DEBUG2_SYND2GPMI_READY                     (1 << 8)
+#define        GPMI_DEBUG2_VIEW_DELAYED_RDN                    (1 << 7)
+#define        GPMI_DEBUG2_UPDATE_WINDOW                       (1 << 6)
+#define        GPMI_DEBUG2_RDN_TAP_MASK                        0x3f
+#define        GPMI_DEBUG2_RDN_TAP_OFFSET                      0
+
+#define        GPMI_DEBUG3_APB_WORD_CNTR_MASK                  (0xffff << 16)
+#define        GPMI_DEBUG3_APB_WORD_CNTR_OFFSET                16
+#define        GPMI_DEBUG3_DEV_WORD_CNTR_MASK                  0xffff
+#define        GPMI_DEBUG3_DEV_WORD_CNTR_OFFSET                0
+
+#endif /* __MX28_REGS_GPMI_H__ */
diff --git a/arch/arm/include/asm/mach-imx/regs-lcdif.h b/arch/arm/include/asm/mach-imx/regs-lcdif.h
new file mode 100644 (file)
index 0000000..4de401b
--- /dev/null
@@ -0,0 +1,232 @@
+/*
+ * Freescale i.MX28/6SX/6UL/7D LCDIF Register Definitions
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * Based on code from LTIB:
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __IMX_REGS_LCDIF_H__
+#define __IMX_REGS_LCDIF_H__
+
+#ifndef        __ASSEMBLY__
+#include <asm/mach-imx/regs-common.h>
+
+struct mxs_lcdif_regs {
+       mxs_reg_32(hw_lcdif_ctrl)               /* 0x00 */
+       mxs_reg_32(hw_lcdif_ctrl1)              /* 0x10 */
+#if defined(CONFIG_MX28) || defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || \
+       defined(CONFIG_MX7) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
+       mxs_reg_32(hw_lcdif_ctrl2)              /* 0x20 */
+#endif
+       mxs_reg_32(hw_lcdif_transfer_count)     /* 0x20/0x30 */
+       mxs_reg_32(hw_lcdif_cur_buf)            /* 0x30/0x40 */
+       mxs_reg_32(hw_lcdif_next_buf)           /* 0x40/0x50 */
+
+#if defined(CONFIG_MX23)
+       uint32_t        reserved1[4];
+#endif
+
+       mxs_reg_32(hw_lcdif_timing)             /* 0x60 */
+       mxs_reg_32(hw_lcdif_vdctrl0)            /* 0x70 */
+       mxs_reg_32(hw_lcdif_vdctrl1)            /* 0x80 */
+       mxs_reg_32(hw_lcdif_vdctrl2)            /* 0x90 */
+       mxs_reg_32(hw_lcdif_vdctrl3)            /* 0xa0 */
+       mxs_reg_32(hw_lcdif_vdctrl4)            /* 0xb0 */
+       mxs_reg_32(hw_lcdif_dvictrl0)           /* 0xc0 */
+       mxs_reg_32(hw_lcdif_dvictrl1)           /* 0xd0 */
+       mxs_reg_32(hw_lcdif_dvictrl2)           /* 0xe0 */
+       mxs_reg_32(hw_lcdif_dvictrl3)           /* 0xf0 */
+       mxs_reg_32(hw_lcdif_dvictrl4)           /* 0x100 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl0)     /* 0x110 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl1)     /* 0x120 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl2)     /* 0x130 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl3)     /* 0x140 */
+       mxs_reg_32(hw_lcdif_csc_coeffctrl4)     /* 0x150 */
+       mxs_reg_32(hw_lcdif_csc_offset) /* 0x160 */
+       mxs_reg_32(hw_lcdif_csc_limit)          /* 0x170 */
+
+#if defined(CONFIG_MX23)
+       uint32_t        reserved2[12];
+#endif
+       mxs_reg_32(hw_lcdif_data)               /* 0x1b0/0x180 */
+       mxs_reg_32(hw_lcdif_bm_error_stat)      /* 0x1c0/0x190 */
+#if defined(CONFIG_MX28) || defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || \
+       defined(CONFIG_MX7) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
+       mxs_reg_32(hw_lcdif_crc_stat)           /* 0x1a0 */
+#endif
+       mxs_reg_32(hw_lcdif_lcdif_stat)         /* 0x1d0/0x1b0 */
+       mxs_reg_32(hw_lcdif_version)            /* 0x1e0/0x1c0 */
+       mxs_reg_32(hw_lcdif_debug0)             /* 0x1f0/0x1d0 */
+       mxs_reg_32(hw_lcdif_debug1)             /* 0x200/0x1e0 */
+       mxs_reg_32(hw_lcdif_debug2)             /* 0x1f0 */
+#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || defined(CONFIG_MX7) || \
+       defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
+       mxs_reg_32(hw_lcdif_thres)
+       mxs_reg_32(hw_lcdif_as_ctrl)
+       mxs_reg_32(hw_lcdif_as_buf)
+       mxs_reg_32(hw_lcdif_as_next_buf)
+       mxs_reg_32(hw_lcdif_as_clrkeylow)
+       mxs_reg_32(hw_lcdif_as_clrkeyhigh)
+       mxs_reg_32(hw_lcdif_as_sync_delay)
+       mxs_reg_32(hw_lcdif_as_debug3)
+       mxs_reg_32(hw_lcdif_as_debug4)
+       mxs_reg_32(hw_lcdif_as_debug5)
+#endif
+};
+#endif
+
+#define        LCDIF_CTRL_SFTRST                                       (1 << 31)
+#define        LCDIF_CTRL_CLKGATE                                      (1 << 30)
+#define        LCDIF_CTRL_YCBCR422_INPUT                               (1 << 29)
+#define        LCDIF_CTRL_READ_WRITEB                                  (1 << 28)
+#define        LCDIF_CTRL_WAIT_FOR_VSYNC_EDGE                          (1 << 27)
+#define        LCDIF_CTRL_DATA_SHIFT_DIR                               (1 << 26)
+#define        LCDIF_CTRL_SHIFT_NUM_BITS_MASK                          (0x1f << 21)
+#define        LCDIF_CTRL_SHIFT_NUM_BITS_OFFSET                        21
+#define        LCDIF_CTRL_DVI_MODE                                     (1 << 20)
+#define        LCDIF_CTRL_BYPASS_COUNT                                 (1 << 19)
+#define        LCDIF_CTRL_VSYNC_MODE                                   (1 << 18)
+#define        LCDIF_CTRL_DOTCLK_MODE                                  (1 << 17)
+#define        LCDIF_CTRL_DATA_SELECT                                  (1 << 16)
+#define        LCDIF_CTRL_INPUT_DATA_SWIZZLE_MASK                      (0x3 << 14)
+#define        LCDIF_CTRL_INPUT_DATA_SWIZZLE_OFFSET                    14
+#define        LCDIF_CTRL_CSC_DATA_SWIZZLE_MASK                        (0x3 << 12)
+#define        LCDIF_CTRL_CSC_DATA_SWIZZLE_OFFSET                      12
+#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_MASK                       (0x3 << 10)
+#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_OFFSET                     10
+#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_16BIT                      (0 << 10)
+#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_8BIT                       (1 << 10)
+#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_18BIT                      (2 << 10)
+#define        LCDIF_CTRL_LCD_DATABUS_WIDTH_24BIT                      (3 << 10)
+#define        LCDIF_CTRL_WORD_LENGTH_MASK                             (0x3 << 8)
+#define        LCDIF_CTRL_WORD_LENGTH_OFFSET                           8
+#define        LCDIF_CTRL_WORD_LENGTH_16BIT                            (0 << 8)
+#define        LCDIF_CTRL_WORD_LENGTH_8BIT                             (1 << 8)
+#define        LCDIF_CTRL_WORD_LENGTH_18BIT                            (2 << 8)
+#define        LCDIF_CTRL_WORD_LENGTH_24BIT                            (3 << 8)
+#define        LCDIF_CTRL_RGB_TO_YCBCR422_CSC                          (1 << 7)
+#define        LCDIF_CTRL_LCDIF_MASTER                                 (1 << 5)
+#define        LCDIF_CTRL_DATA_FORMAT_16_BIT                           (1 << 3)
+#define        LCDIF_CTRL_DATA_FORMAT_18_BIT                           (1 << 2)
+#define        LCDIF_CTRL_DATA_FORMAT_24_BIT                           (1 << 1)
+#define        LCDIF_CTRL_RUN                                          (1 << 0)
+
+#define        LCDIF_CTRL1_COMBINE_MPU_WR_STRB                         (1 << 27)
+#define        LCDIF_CTRL1_BM_ERROR_IRQ_EN                             (1 << 26)
+#define        LCDIF_CTRL1_BM_ERROR_IRQ                                (1 << 25)
+#define        LCDIF_CTRL1_RECOVER_ON_UNDERFLOW                        (1 << 24)
+#define        LCDIF_CTRL1_INTERLACE_FIELDS                            (1 << 23)
+#define        LCDIF_CTRL1_START_INTERLACE_FROM_SECOND_FIELD           (1 << 22)
+#define        LCDIF_CTRL1_FIFO_CLEAR                                  (1 << 21)
+#define        LCDIF_CTRL1_IRQ_ON_ALTERNATE_FIELDS                     (1 << 20)
+#define        LCDIF_CTRL1_BYTE_PACKING_FORMAT_MASK                    (0xf << 16)
+#define        LCDIF_CTRL1_BYTE_PACKING_FORMAT_OFFSET                  16
+#define        LCDIF_CTRL1_OVERFLOW_IRQ_EN                             (1 << 15)
+#define        LCDIF_CTRL1_UNDERFLOW_IRQ_EN                            (1 << 14)
+#define        LCDIF_CTRL1_CUR_FRAME_DONE_IRQ_EN                       (1 << 13)
+#define        LCDIF_CTRL1_VSYNC_EDGE_IRQ_EN                           (1 << 12)
+#define        LCDIF_CTRL1_OVERFLOW_IRQ                                (1 << 11)
+#define        LCDIF_CTRL1_UNDERFLOW_IRQ                               (1 << 10)
+#define        LCDIF_CTRL1_CUR_FRAME_DONE_IRQ                          (1 << 9)
+#define        LCDIF_CTRL1_VSYNC_EDGE_IRQ                              (1 << 8)
+#define        LCDIF_CTRL1_BUSY_ENABLE                                 (1 << 2)
+#define        LCDIF_CTRL1_MODE86                                      (1 << 1)
+#define        LCDIF_CTRL1_RESET                                       (1 << 0)
+
+#define        LCDIF_CTRL2_OUTSTANDING_REQS_MASK                       (0x7 << 21)
+#define        LCDIF_CTRL2_OUTSTANDING_REQS_OFFSET                     21
+#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_1                      (0x0 << 21)
+#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_2                      (0x1 << 21)
+#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_4                      (0x2 << 21)
+#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_8                      (0x3 << 21)
+#define        LCDIF_CTRL2_OUTSTANDING_REQS_REQ_16                     (0x4 << 21)
+#define        LCDIF_CTRL2_BURST_LEN_8                                 (1 << 20)
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_MASK                       (0x7 << 16)
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_OFFSET                     16
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_RGB                        (0x0 << 16)
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_RBG                        (0x1 << 16)
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_GBR                        (0x2 << 16)
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_GRB                        (0x3 << 16)
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_BRG                        (0x4 << 16)
+#define        LCDIF_CTRL2_ODD_LINE_PATTERN_BGR                        (0x5 << 16)
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_MASK                      (0x7 << 12)
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_OFFSET                    12
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_RGB                       (0x0 << 12)
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_RBG                       (0x1 << 12)
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_GBR                       (0x2 << 12)
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_GRB                       (0x3 << 12)
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_BRG                       (0x4 << 12)
+#define        LCDIF_CTRL2_EVEN_LINE_PATTERN_BGR                       (0x5 << 12)
+#define        LCDIF_CTRL2_READ_PACK_DIR                               (1 << 10)
+#define        LCDIF_CTRL2_READ_MODE_OUTPUT_IN_RGB_FORMAT              (1 << 9)
+#define        LCDIF_CTRL2_READ_MODE_6_BIT_INPUT                       (1 << 8)
+#define        LCDIF_CTRL2_READ_MODE_NUM_PACKED_SUBWORDS_MASK          (0x7 << 4)
+#define        LCDIF_CTRL2_READ_MODE_NUM_PACKED_SUBWORDS_OFFSET        4
+#define        LCDIF_CTRL2_INITIAL_DUMMY_READ_MASK                     (0x7 << 1)
+#define        LCDIF_CTRL2_INITIAL_DUMMY_READ_OFFSET                   1
+
+#define        LCDIF_TRANSFER_COUNT_V_COUNT_MASK                       (0xffff << 16)
+#define        LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET                     16
+#define        LCDIF_TRANSFER_COUNT_H_COUNT_MASK                       (0xffff << 0)
+#define        LCDIF_TRANSFER_COUNT_H_COUNT_OFFSET                     0
+
+#define        LCDIF_CUR_BUF_ADDR_MASK                                 0xffffffff
+#define        LCDIF_CUR_BUF_ADDR_OFFSET                               0
+
+#define        LCDIF_NEXT_BUF_ADDR_MASK                                0xffffffff
+#define        LCDIF_NEXT_BUF_ADDR_OFFSET                              0
+
+#define        LCDIF_TIMING_CMD_HOLD_MASK                              (0xff << 24)
+#define        LCDIF_TIMING_CMD_HOLD_OFFSET                            24
+#define        LCDIF_TIMING_CMD_SETUP_MASK                             (0xff << 16)
+#define        LCDIF_TIMING_CMD_SETUP_OFFSET                           16
+#define        LCDIF_TIMING_DATA_HOLD_MASK                             (0xff << 8)
+#define        LCDIF_TIMING_DATA_HOLD_OFFSET                           8
+#define        LCDIF_TIMING_DATA_SETUP_MASK                            (0xff << 0)
+#define        LCDIF_TIMING_DATA_SETUP_OFFSET                          0
+
+#define        LCDIF_VDCTRL0_VSYNC_OEB                                 (1 << 29)
+#define        LCDIF_VDCTRL0_ENABLE_PRESENT                            (1 << 28)
+#define        LCDIF_VDCTRL0_VSYNC_POL                                 (1 << 27)
+#define        LCDIF_VDCTRL0_HSYNC_POL                                 (1 << 26)
+#define        LCDIF_VDCTRL0_DOTCLK_POL                                (1 << 25)
+#define        LCDIF_VDCTRL0_ENABLE_POL                                (1 << 24)
+#define        LCDIF_VDCTRL0_VSYNC_PERIOD_UNIT                         (1 << 21)
+#define        LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_UNIT                    (1 << 20)
+#define        LCDIF_VDCTRL0_HALF_LINE                                 (1 << 19)
+#define        LCDIF_VDCTRL0_HALF_LINE_MODE                            (1 << 18)
+#define        LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_MASK                    0x3ffff
+#define        LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_OFFSET                  0
+
+#define        LCDIF_VDCTRL1_VSYNC_PERIOD_MASK                         0xffffffff
+#define        LCDIF_VDCTRL1_VSYNC_PERIOD_OFFSET                       0
+
+#if defined(CONFIG_MX23)
+#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_MASK                    (0xff << 24)
+#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET                  24
+#else
+#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_MASK                    (0x3fff << 18)
+#define        LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET                  18
+#endif
+#define        LCDIF_VDCTRL2_HSYNC_PERIOD_MASK                         0x3ffff
+#define        LCDIF_VDCTRL2_HSYNC_PERIOD_OFFSET                       0
+
+#define        LCDIF_VDCTRL3_MUX_SYNC_SIGNALS                          (1 << 29)
+#define        LCDIF_VDCTRL3_VSYNC_ONLY                                (1 << 28)
+#define        LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT_MASK                  (0xfff << 16)
+#define        LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT_OFFSET                16
+#define        LCDIF_VDCTRL3_VERTICAL_WAIT_CNT_MASK                    (0xffff << 0)
+#define        LCDIF_VDCTRL3_VERTICAL_WAIT_CNT_OFFSET                  0
+
+#define        LCDIF_VDCTRL4_DOTCLK_DLY_SEL_MASK                       (0x7 << 29)
+#define        LCDIF_VDCTRL4_DOTCLK_DLY_SEL_OFFSET                     29
+#define        LCDIF_VDCTRL4_SYNC_SIGNALS_ON                           (1 << 18)
+#define        LCDIF_VDCTRL4_DOTCLK_H_VALID_DATA_CNT_MASK              0x3ffff
+#define        LCDIF_VDCTRL4_DOTCLK_H_VALID_DATA_CNT_OFFSET            0
+
+#endif /* __IMX_REGS_LCDIF_H__ */
diff --git a/arch/arm/include/asm/mach-imx/regs-usbphy.h b/arch/arm/include/asm/mach-imx/regs-usbphy.h
new file mode 100644 (file)
index 0000000..220e45f
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * Freescale USB PHY Register Definitions
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ */
+
+#ifndef __REGS_USBPHY_H__
+#define __REGS_USBPHY_H__
+
+#define USBPHY_CTRL                                            0x00000030
+#define USBPHY_CTRL_SET                                        0x00000034
+#define USBPHY_CTRL_CLR                                        0x00000038
+#define USBPHY_CTRL_TOG                                        0x0000003C
+#define USBPHY_PWD                                             0x00000000
+#define USBPHY_TX                                              0x00000010
+#define USBPHY_RX                                              0x00000020
+#define USBPHY_DEBUG                                   0x00000050
+
+#define USBPHY_CTRL_ENUTMILEVEL2               (1 << 14)
+#define USBPHY_CTRL_ENUTMILEVEL3               (1 << 15)
+#define USBPHY_CTRL_OTG_ID                             (1 << 27)
+#define USBPHY_CTRL_CLKGATE                            (1 << 30)
+#define USBPHY_CTRL_SFTRST                             (1 << 31)
+
+#endif /* __REGS_USBPHY_H__ */
diff --git a/arch/arm/include/asm/mach-imx/sata.h b/arch/arm/include/asm/mach-imx/sata.h
new file mode 100644 (file)
index 0000000..6b864cb
--- /dev/null
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __IMX_SATA_H_
+#define __IMX_SATA_H_
+
+/*
+ * SATA setup for i.mx6 quad based platform
+ */
+
+int setup_sata(void);
+
+#endif
diff --git a/arch/arm/include/asm/mach-imx/spi.h b/arch/arm/include/asm/mach-imx/spi.h
new file mode 100644 (file)
index 0000000..1d4473a
--- /dev/null
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __MXC_SPI_H_
+#define __MXC_SPI_H_
+
+/*
+ * Board-level chip-select callback
+ * Should return GPIO # to be used for chip-select
+ */
+
+int board_spi_cs_gpio(unsigned bus, unsigned cs);
+
+#endif
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
new file mode 100644 (file)
index 0000000..046df62
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+ * (C) Copyright 2009
+ * Stefano Babic, DENX Software Engineering, sbabic@denx.de.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _SYS_PROTO_H_
+#define _SYS_PROTO_H_
+
+#include <asm/io.h>
+#include <asm/mach-imx/regs-common.h>
+#include <common.h>
+#include "../arch-imx/cpu.h"
+
+#define soc_rev() (get_cpu_rev() & 0xFF)
+#define is_soc_rev(rev) (soc_rev() == rev)
+
+/* returns MXC_CPU_ value */
+#define cpu_type(rev) (((rev) >> 12) & 0xff)
+#define soc_type(rev) (((rev) >> 12) & 0xf0)
+/* both macros return/take MXC_CPU_ constants */
+#define get_cpu_type() (cpu_type(get_cpu_rev()))
+#define get_soc_type() (soc_type(get_cpu_rev()))
+#define is_cpu_type(cpu) (get_cpu_type() == cpu)
+#define is_soc_type(soc) (get_soc_type() == soc)
+
+#define is_mx6() (is_soc_type(MXC_SOC_MX6))
+#define is_mx7() (is_soc_type(MXC_SOC_MX7))
+
+#define is_mx6dqp() (is_cpu_type(MXC_CPU_MX6QP) || is_cpu_type(MXC_CPU_MX6DP))
+#define is_mx6dq() (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
+#define is_mx6sdl() (is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6DL))
+#define is_mx6dl() (is_cpu_type(MXC_CPU_MX6DL))
+#define is_mx6sx() (is_cpu_type(MXC_CPU_MX6SX))
+#define is_mx6sl() (is_cpu_type(MXC_CPU_MX6SL))
+#define is_mx6solo() (is_cpu_type(MXC_CPU_MX6SOLO))
+#define is_mx6ul() (is_cpu_type(MXC_CPU_MX6UL))
+#define is_mx6ull() (is_cpu_type(MXC_CPU_MX6ULL))
+#define is_mx6sll() (is_cpu_type(MXC_CPU_MX6SLL))
+
+#define is_mx7ulp() (is_cpu_type(MXC_CPU_MX7ULP))
+
+#ifdef CONFIG_MX6
+#define IMX6_SRC_GPR10_BMODE           BIT(28)
+
+#define IMX6_BMODE_MASK                        GENMASK(7, 0)
+#define        IMX6_BMODE_SHIFT                4
+#define IMX6_BMODE_EMI_MASK            BIT(3)
+#define IMX6_BMODE_EMI_SHIFT           3
+#define IMX6_BMODE_SERIAL_ROM_MASK     GENMASK(26, 24)
+#define IMX6_BMODE_SERIAL_ROM_SHIFT    24
+
+enum imx6_bmode_serial_rom {
+       IMX6_BMODE_ECSPI1,
+       IMX6_BMODE_ECSPI2,
+       IMX6_BMODE_ECSPI3,
+       IMX6_BMODE_ECSPI4,
+       IMX6_BMODE_ECSPI5,
+       IMX6_BMODE_I2C1,
+       IMX6_BMODE_I2C2,
+       IMX6_BMODE_I2C3,
+};
+
+enum imx6_bmode_emi {
+       IMX6_BMODE_ONENAND,
+       IMX6_BMODE_NOR,
+};
+
+enum imx6_bmode {
+       IMX6_BMODE_EMI,
+       IMX6_BMODE_UART,
+       IMX6_BMODE_SATA,
+       IMX6_BMODE_SERIAL_ROM,
+       IMX6_BMODE_SD,
+       IMX6_BMODE_ESD,
+       IMX6_BMODE_MMC,
+       IMX6_BMODE_EMMC,
+       IMX6_BMODE_NAND,
+};
+
+static inline u8 imx6_is_bmode_from_gpr9(void)
+{
+       return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE;
+}
+
+u32 imx6_src_get_boot_mode(void);
+#endif /* CONFIG_MX6 */
+
+u32 get_nr_cpus(void);
+u32 get_cpu_rev(void);
+u32 get_cpu_speed_grade_hz(void);
+u32 get_cpu_temp_grade(int *minc, int *maxc);
+const char *get_imx_type(u32 imxtype);
+u32 imx_ddr_size(void);
+void sdelay(unsigned long);
+void set_chipselect_size(int const);
+
+void init_aips(void);
+void init_src(void);
+void imx_set_wdog_powerdown(bool enable);
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+int fecmxc_initialize(bd_t *bis);
+u32 get_ahb_clk(void);
+u32 get_periph_clk(void);
+
+void lcdif_power_down(void);
+
+int mxs_reset_block(struct mxs_register_32 *reg);
+int mxs_wait_mask_set(struct mxs_register_32 *reg, u32 mask, u32 timeout);
+int mxs_wait_mask_clr(struct mxs_register_32 *reg, u32 mask, u32 timeout);
+#endif
diff --git a/arch/arm/include/asm/mach-imx/syscounter.h b/arch/arm/include/asm/mach-imx/syscounter.h
new file mode 100644 (file)
index 0000000..bdbe26c
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _ASM_ARCH_SYSTEM_COUNTER_H
+#define _ASM_ARCH_SYSTEM_COUNTER_H
+
+/* System Counter */
+struct sctr_regs {
+       u32 cntcr;
+       u32 cntsr;
+       u32 cntcv1;
+       u32 cntcv2;
+       u32 resv1[4];
+       u32 cntfid0;
+       u32 cntfid1;
+       u32 cntfid2;
+       u32 resv2[1001];
+       u32 counterid[1];
+};
+
+#define SC_CNTCR_ENABLE                (1 << 0)
+#define SC_CNTCR_HDBG          (1 << 1)
+#define SC_CNTCR_FREQ0         (1 << 8)
+#define SC_CNTCR_FREQ1         (1 << 9)
+
+#endif
diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h
new file mode 100644 (file)
index 0000000..941a031
--- /dev/null
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __IMX_VIDEO_H_
+#define __IMX_VIDEO_H_
+
+#include <linux/fb.h>
+#include <ipu_pixfmt.h>
+
+struct display_info_t {
+       int     bus;
+       int     addr;
+       int     pixfmt;
+       int     di;
+       int     (*detect)(struct display_info_t const *dev);
+       void    (*enable)(struct display_info_t const *dev);
+       struct  fb_videomode mode;
+};
+
+#ifdef CONFIG_IMX_HDMI
+extern int detect_hdmi(struct display_info_t const *dev);
+#endif
+
+#ifdef CONFIG_IMX_VIDEO_SKIP
+extern struct display_info_t const displays[];
+extern size_t display_count;
+#endif
+
+int ipu_set_ldb_clock(int rate);
+#endif
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
new file mode 100644 (file)
index 0000000..cd8b8d2
--- /dev/null
@@ -0,0 +1,63 @@
+config IMX_CONFIG
+       string
+
+config ROM_UNIFIED_SECTIONS
+       bool
+
+config IMX_RDC
+       bool "i.MX Resource domain controller driver"
+       depends on ARCH_MX6 || ARCH_MX7
+       help
+         i.MX Resource domain controller is used to assign masters
+         and peripherals to differet domains. This can be used to
+         isolate resources.
+
+config IMX_BOOTAUX
+       bool "Support boot auxiliary core"
+       depends on ARCH_MX7 || ARCH_MX6
+       help
+         bootaux [addr] to boot auxiliary core.
+
+config USE_IMXIMG_PLUGIN
+       bool "Use imximage plugin code"
+       depends on ARCH_MX7 || ARCH_MX6
+       help
+         i.MX6/7 supports DCD and Plugin. Enable this configuration
+         to use Plugin, otherwise DCD will be used.
+
+config SECURE_BOOT
+       bool "Support i.MX HAB features"
+       depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
+       select FSL_CAAM
+       imply CMD_DEKBLOB
+       help
+         This option enables the support for secure boot (HAB).
+         See doc/README.mxc_hab for more details.
+
+config CMD_BMODE
+       bool "Support the 'bmode' command"
+       default y
+       depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
+       help
+         This enables the 'bmode' (bootmode) command for forcing
+         a boot from specific media.
+
+         This is useful for forcing the ROM's usb downloader to
+         activate upon a watchdog reset which is nice when iterating
+         on U-Boot.  Using the reset button or running bmode normal
+         will set it back to normal.  This command currently
+         supports i.MX53 and i.MX6.
+
+config CMD_DEKBLOB
+       bool "Support the 'dek_blob' command"
+       help
+         This enables the 'dek_blob' command which is used with the
+         Freescale secure boot mechanism. This command encapsulates and
+         creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for
+         more information.
+
+config CMD_HDMIDETECT
+       bool "Support the 'hdmidet' command"
+       help
+         This enables the 'hdmidet' command which detects if an HDMI monitor
+         is connected.
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
new file mode 100644 (file)
index 0000000..d77c10e
--- /dev/null
@@ -0,0 +1,128 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# (C) Copyright 2011 Freescale Semiconductor, Inc.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 vf610))
+obj-y  = iomux-v3.o
+endif
+ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
+obj-y  += timer.o cpu.o speed.o
+obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
+endif
+ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs))
+obj-y  += misc.o
+obj-$(CONFIG_SPL_BUILD)        += spl.o
+endif
+ifeq ($(SOC),$(filter $(SOC),mx7))
+obj-y  += cpu.o
+obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
+obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o
+endif
+ifeq ($(SOC),$(filter $(SOC),mx6 mx7))
+obj-y  += cache.o init.o
+obj-$(CONFIG_SATA) += sata.o
+obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
+obj-$(CONFIG_IMX_RDC) += rdc-sema.o
+obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
+obj-$(CONFIG_SECURE_BOOT)    += hab.o
+endif
+ifeq ($(SOC),$(filter $(SOC),mx7ulp))
+obj-y  += cache.o
+obj-$(CONFIG_SECURE_BOOT) += hab.o
+endif
+ifeq ($(SOC),$(filter $(SOC),vf610))
+obj-y += ddrmc-vf610.o
+endif
+ifneq ($(CONFIG_SPL_BUILD),y)
+obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o
+obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
+obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o
+endif
+
+PLUGIN = board/$(BOARDDIR)/plugin
+
+ifeq ($(CONFIG_USE_IMXIMG_PLUGIN),y)
+
+$(PLUGIN).o: $(PLUGIN).S FORCE
+       $(Q)mkdir -p $(dir $@)
+       $(call if_changed_dep,as_o_S)
+
+$(PLUGIN).bin: $(PLUGIN).o FORCE
+       $(Q)mkdir -p $(dir $@)
+       $(OBJCOPY) -O binary --gap-fill 0xff $< $@
+else
+
+$(PLUGIN).bin:
+
+endif
+
+quiet_cmd_cpp_cfg = CFGS    $@
+      cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $<
+
+IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp
+
+$(IMX_CONFIG): %.cfgtmp: % FORCE
+       $(Q)mkdir -p $(dir $@)
+       $(call if_changed_dep,cpp_cfg)
+
+MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
+       -e $(CONFIG_SYS_TEXT_BASE)
+u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
+
+u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
+       $(call if_changed,mkimage)
+
+ifeq ($(CONFIG_OF_SEPARATE),y)
+MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
+       -e $(CONFIG_SYS_TEXT_BASE)
+u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log
+
+u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
+       $(call if_changed,mkimage)
+endif
+
+MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
+       -e $(CONFIG_SPL_TEXT_BASE)
+
+SPL: MKIMAGEOUTPUT = SPL.log
+
+SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
+       $(call if_changed,mkimage)
+
+MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
+               -e $(CONFIG_SYS_TEXT_BASE) -C none -T firmware
+
+u-boot.uim: u-boot.bin FORCE
+       $(call if_changed,mkimage)
+
+OBJCOPYFLAGS += -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
+append = cat $(filter-out $< $(PHONY), $^) >> $@
+
+quiet_cmd_pad_cat = CAT     $@
+cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
+
+u-boot-with-spl.imx: SPL u-boot.uim FORCE
+       $(call if_changed,pad_cat)
+
+u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE
+       $(call if_changed,pad_cat)
+
+quiet_cmd_u-boot-nand-spl_imx = GEN     $@
+cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \
+       dd bs=1015 count=1 if=/dev/zero 2>/dev/null) | cat - $< > $@
+
+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/
+
diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c
new file mode 100644 (file)
index 0000000..c5279a7
--- /dev/null
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/armv7.h>
+#include <asm/pl310.h>
+#include <asm/io.h>
+#include <asm/mach-imx/sys_proto.h>
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH)
+       enum dcache_option option = DCACHE_WRITETHROUGH;
+#else
+       enum dcache_option option = DCACHE_WRITEBACK;
+#endif
+       /* Avoid random hang when download by usb */
+       invalidate_dcache_all();
+
+       /* Enable D-cache. I-cache is already enabled in start.S */
+       dcache_enable();
+
+       /* Enable caching on OCRAM and ROM */
+       mmu_set_region_dcache_behaviour(ROMCP_ARB_BASE_ADDR,
+                                       ROMCP_ARB_END_ADDR,
+                                       option);
+       mmu_set_region_dcache_behaviour(IRAM_BASE_ADDR,
+                                       IRAM_SIZE,
+                                       option);
+}
+#endif
+
+#ifndef CONFIG_SYS_L2CACHE_OFF
+#ifdef CONFIG_SYS_L2_PL310
+#define IOMUXC_GPR11_L2CACHE_AS_OCRAM 0x00000002
+void v7_outer_cache_enable(void)
+{
+       struct pl310_regs *const pl310 = (struct pl310_regs *)L2_PL310_BASE;
+       struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
+       unsigned int val;
+
+
+       /*
+        * Must disable the L2 before changing the latency parameters
+        * and auxiliary control register.
+        */
+       clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
+
+       /*
+        * Set bit 22 in the auxiliary control register. If this bit
+        * is cleared, PL310 treats Normal Shared Non-cacheable
+        * accesses as Cacheable no-allocate.
+        */
+       setbits_le32(&pl310->pl310_aux_ctrl, L310_SHARED_ATT_OVERRIDE_ENABLE);
+
+       if (is_mx6sl() || is_mx6sll()) {
+               val = readl(&iomux->gpr[11]);
+               if (val & IOMUXC_GPR11_L2CACHE_AS_OCRAM) {
+                       /* L2 cache configured as OCRAM, reset it */
+                       val &= ~IOMUXC_GPR11_L2CACHE_AS_OCRAM;
+                       writel(val, &iomux->gpr[11]);
+               }
+       }
+
+       writel(0x132, &pl310->pl310_tag_latency_ctrl);
+       writel(0x132, &pl310->pl310_data_latency_ctrl);
+
+       val = readl(&pl310->pl310_prefetch_ctrl);
+
+       /* Turn on the L2 I/D prefetch */
+       val |= 0x30000000;
+
+       /*
+        * The L2 cache controller(PL310) version on the i.MX6D/Q is r3p1-50rel0
+        * The L2 cache controller(PL310) version on the i.MX6DL/SOLO/SL is r3p2
+        * But according to ARM PL310 errata: 752271
+        * ID: 752271: Double linefill feature can cause data corruption
+        * Fault Status: Present in: r3p0, r3p1, r3p1-50rel0. Fixed in r3p2
+        * Workaround: The only workaround to this erratum is to disable the
+        * double linefill feature. This is the default behavior.
+        */
+
+#ifndef CONFIG_MX6Q
+       val |= 0x40800000;
+#endif
+       writel(val, &pl310->pl310_prefetch_ctrl);
+
+       val = readl(&pl310->pl310_power_ctrl);
+       val |= L2X0_DYNAMIC_CLK_GATING_EN;
+       val |= L2X0_STNDBY_MODE_EN;
+       writel(val, &pl310->pl310_power_ctrl);
+
+       setbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
+}
+
+void v7_outer_cache_disable(void)
+{
+       struct pl310_regs *const pl310 = (struct pl310_regs *)L2_PL310_BASE;
+
+       clrbits_le32(&pl310->pl310_ctrl, L2X0_CTRL_EN);
+}
+#endif /* !CONFIG_SYS_L2_PL310 */
+#endif /* !CONFIG_SYS_L2CACHE_OFF */
diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c
new file mode 100644 (file)
index 0000000..4ee514f
--- /dev/null
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2012 Boundary Devices Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <common.h>
+#include <linux/errno.h>
+#include <asm/io.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <malloc.h>
+#include <command.h>
+
+static const struct boot_mode *modes[2];
+
+static const struct boot_mode *search_modes(char *arg)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(modes); i++) {
+               const struct boot_mode *p = modes[i];
+               if (p) {
+                       while (p->name) {
+                               if (!strcmp(p->name, arg))
+                                       return p;
+                               p++;
+                       }
+               }
+       }
+       return NULL;
+}
+
+static int create_usage(char *dest)
+{
+       int i;
+       int size = 0;
+
+       for (i = 0; i < ARRAY_SIZE(modes); i++) {
+               const struct boot_mode *p = modes[i];
+               if (p) {
+                       while (p->name) {
+                               int len = strlen(p->name);
+                               if (dest) {
+                                       memcpy(dest, p->name, len);
+                                       dest += len;
+                                       *dest++ = '|';
+                               }
+                               size += len + 1;
+                               p++;
+                       }
+               }
+       }
+       if (dest)
+               memcpy(dest - 1, " [noreset]", 11);     /* include trailing 0 */
+       size += 10;
+       return size;
+}
+
+static int do_boot_mode(cmd_tbl_t *cmdtp, int flag, int argc,
+               char * const argv[])
+{
+       const struct boot_mode *p;
+       int reset_requested = 1;
+
+       if (argc < 2)
+               return CMD_RET_USAGE;
+       p = search_modes(argv[1]);
+       if (!p)
+               return CMD_RET_USAGE;
+       if (argc == 3) {
+               if (strcmp(argv[2], "noreset"))
+                       return CMD_RET_USAGE;
+               reset_requested = 0;
+       }
+
+       boot_mode_apply(p->cfg_val);
+       if (reset_requested && p->cfg_val)
+               do_reset(NULL, 0, 0, NULL);
+       return 0;
+}
+
+U_BOOT_CMD(
+       bmode, 3, 0, do_boot_mode,
+       NULL,
+       "");
+
+void add_board_boot_modes(const struct boot_mode *p)
+{
+       int size;
+       char *dest;
+
+       cmd_tbl_t *entry = ll_entry_get(cmd_tbl_t, bmode, cmd);
+
+       if (entry->usage) {
+               free(entry->usage);
+               entry->usage = NULL;
+       }
+
+       modes[0] = p;
+       modes[1] = soc_boot_modes;
+       size = create_usage(NULL);
+       dest = malloc(size);
+       if (dest) {
+               create_usage(dest);
+               entry->usage = dest;
+       }
+}
diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
new file mode 100644 (file)
index 0000000..ada8adf
--- /dev/null
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2008-2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * Command for encapsulating DEK blob
+ */
+
+#include <common.h>
+#include <command.h>
+#include <environment.h>
+#include <malloc.h>
+#include <asm/byteorder.h>
+#include <linux/compiler.h>
+#include <fsl_sec.h>
+#include <asm/arch/clock.h>
+#include <mapmem.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/**
+* blob_dek() - Encapsulate the DEK as a blob using CAM's Key
+* @src: - Address of data to be encapsulated
+* @dst: - Desination address of encapsulated data
+* @len: - Size of data to be encapsulated
+*
+* Returns zero on success,and negative on error.
+*/
+static int blob_encap_dek(const u8 *src, u8 *dst, u32 len)
+{
+       int ret = 0;
+       u32 jr_size = 4;
+
+       u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + 0x102c);
+       if (out_jr_size != jr_size) {
+               hab_caam_clock_enable(1);
+               sec_init();
+       }
+
+       if (!((len == 128) | (len == 192) | (len == 256))) {
+               debug("Invalid DEK size. Valid sizes are 128, 192 and 256b\n");
+               return -1;
+       }
+
+       len /= 8;
+       ret = blob_dek(src, dst, len);
+
+       return ret;
+}
+
+/**
+ * do_dek_blob() - Handle the "dek_blob" command-line command
+ * @cmdtp:  Command data struct pointer
+ * @flag:   Command flag
+ * @argc:   Command-line argument count
+ * @argv:   Array of command-line arguments
+ *
+ * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
+ * on error.
+ */
+static int do_dek_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+       uint32_t src_addr, dst_addr, len;
+       uint8_t *src_ptr, *dst_ptr;
+       int ret = 0;
+
+       if (argc != 4)
+               return CMD_RET_USAGE;
+
+       src_addr = simple_strtoul(argv[1], NULL, 16);
+       dst_addr = simple_strtoul(argv[2], NULL, 16);
+       len = simple_strtoul(argv[3], NULL, 10);
+
+       src_ptr = map_sysmem(src_addr, len/8);
+       dst_ptr = map_sysmem(dst_addr, BLOB_SIZE(len/8));
+
+       ret = blob_encap_dek(src_ptr, dst_ptr, len);
+
+       return ret;
+}
+
+/***************************************************/
+static char dek_blob_help_text[] =
+       "src dst len            - Encapsulate and create blob of data\n"
+       "                         $len bits long at address $src and\n"
+       "                         store the result at address $dst.\n";
+
+U_BOOT_CMD(
+       dek_blob, 4, 1, do_dek_blob,
+       "Data Encryption Key blob encapsulation",
+       dek_blob_help_text
+);
diff --git a/arch/arm/mach-imx/cmd_hdmidet.c b/arch/arm/mach-imx/cmd_hdmidet.c
new file mode 100644 (file)
index 0000000..e9fd955
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2012 Boundary Devices Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <common.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/mxc_hdmi.h>
+#include <asm/io.h>
+
+static int do_hdmidet(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
+       return (readb(&hdmi->phy_stat0) & HDMI_DVI_STAT) ? 0 : 1;
+}
+
+U_BOOT_CMD(hdmidet, 1, 1, do_hdmidet,
+       "detect HDMI monitor",
+       ""
+);
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
new file mode 100644 (file)
index 0000000..9e83b42
--- /dev/null
@@ -0,0 +1,325 @@
+/*
+ * (C) Copyright 2007
+ * Sascha Hauer, Pengutronix
+ *
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <bootm.h>
+#include <common.h>
+#include <netdev.h>
+#include <linux/errno.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/arch/crm_regs.h>
+#include <imx_thermal.h>
+#include <ipu_pixfmt.h>
+#include <thermal.h>
+#include <sata.h>
+
+#ifdef CONFIG_FSL_ESDHC
+#include <fsl_esdhc.h>
+#endif
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+static u32 reset_cause = -1;
+
+static char *get_reset_cause(void)
+{
+       u32 cause;
+       struct src *src_regs = (struct src *)SRC_BASE_ADDR;
+
+       cause = readl(&src_regs->srsr);
+       writel(cause, &src_regs->srsr);
+       reset_cause = cause;
+
+       switch (cause) {
+       case 0x00001:
+       case 0x00011:
+               return "POR";
+       case 0x00004:
+               return "CSU";
+       case 0x00008:
+               return "IPP USER";
+       case 0x00010:
+#ifdef CONFIG_MX7
+               return "WDOG1";
+#else
+               return "WDOG";
+#endif
+       case 0x00020:
+               return "JTAG HIGH-Z";
+       case 0x00040:
+               return "JTAG SW";
+       case 0x00080:
+               return "WDOG3";
+#ifdef CONFIG_MX7
+       case 0x00100:
+               return "WDOG4";
+       case 0x00200:
+               return "TEMPSENSE";
+#else
+       case 0x00100:
+               return "TEMPSENSE";
+       case 0x10000:
+               return "WARM BOOT";
+#endif
+       default:
+               return "unknown reset";
+       }
+}
+
+u32 get_imx_reset_cause(void)
+{
+       return reset_cause;
+}
+#endif
+
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6)
+#if defined(CONFIG_MX53)
+#define MEMCTL_BASE    ESDCTL_BASE_ADDR
+#else
+#define MEMCTL_BASE    MMDC_P0_BASE_ADDR
+#endif
+static const unsigned char col_lookup[] = {9, 10, 11, 8, 12, 9, 9, 9};
+static const unsigned char bank_lookup[] = {3, 2};
+
+/* these MMDC registers are common to the IMX53 and IMX6 */
+struct esd_mmdc_regs {
+       uint32_t        ctl;
+       uint32_t        pdc;
+       uint32_t        otc;
+       uint32_t        cfg0;
+       uint32_t        cfg1;
+       uint32_t        cfg2;
+       uint32_t        misc;
+};
+
+#define ESD_MMDC_CTL_GET_ROW(mdctl)    ((ctl >> 24) & 7)
+#define ESD_MMDC_CTL_GET_COLUMN(mdctl) ((ctl >> 20) & 7)
+#define ESD_MMDC_CTL_GET_WIDTH(mdctl)  ((ctl >> 16) & 3)
+#define ESD_MMDC_CTL_GET_CS1(mdctl)    ((ctl >> 30) & 1)
+#define ESD_MMDC_MISC_GET_BANK(mdmisc) ((misc >> 5) & 1)
+
+/*
+ * imx_ddr_size - return size in bytes of DRAM according MMDC config
+ * The MMDC MDCTL register holds the number of bits for row, col, and data
+ * width and the MMDC MDMISC register holds the number of banks. Combine
+ * all these bits to determine the meme size the MMDC has been configured for
+ */
+unsigned imx_ddr_size(void)
+{
+       struct esd_mmdc_regs *mem = (struct esd_mmdc_regs *)MEMCTL_BASE;
+       unsigned ctl = readl(&mem->ctl);
+       unsigned misc = readl(&mem->misc);
+       int bits = 11 + 0 + 0 + 1;      /* row + col + bank + width */
+
+       bits += ESD_MMDC_CTL_GET_ROW(ctl);
+       bits += col_lookup[ESD_MMDC_CTL_GET_COLUMN(ctl)];
+       bits += bank_lookup[ESD_MMDC_MISC_GET_BANK(misc)];
+       bits += ESD_MMDC_CTL_GET_WIDTH(ctl);
+       bits += ESD_MMDC_CTL_GET_CS1(ctl);
+
+       /* The MX6 can do only 3840 MiB of DRAM */
+       if (bits == 32)
+               return 0xf0000000;
+
+       return 1 << bits;
+}
+#endif
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+
+const char *get_imx_type(u32 imxtype)
+{
+       switch (imxtype) {
+       case MXC_CPU_MX7S:
+               return "7S";    /* Single-core version of the mx7 */
+       case MXC_CPU_MX7D:
+               return "7D";    /* Dual-core version of the mx7 */
+       case MXC_CPU_MX6QP:
+               return "6QP";   /* Quad-Plus version of the mx6 */
+       case MXC_CPU_MX6DP:
+               return "6DP";   /* Dual-Plus version of the mx6 */
+       case MXC_CPU_MX6Q:
+               return "6Q";    /* Quad-core version of the mx6 */
+       case MXC_CPU_MX6D:
+               return "6D";    /* Dual-core version of the mx6 */
+       case MXC_CPU_MX6DL:
+               return "6DL";   /* Dual Lite version of the mx6 */
+       case MXC_CPU_MX6SOLO:
+               return "6SOLO"; /* Solo version of the mx6 */
+       case MXC_CPU_MX6SL:
+               return "6SL";   /* Solo-Lite version of the mx6 */
+       case MXC_CPU_MX6SLL:
+               return "6SLL";  /* SLL version of the mx6 */
+       case MXC_CPU_MX6SX:
+               return "6SX";   /* SoloX version of the mx6 */
+       case MXC_CPU_MX6UL:
+               return "6UL";   /* Ultra-Lite version of the mx6 */
+       case MXC_CPU_MX6ULL:
+               return "6ULL";  /* ULL version of the mx6 */
+       case MXC_CPU_MX51:
+               return "51";
+       case MXC_CPU_MX53:
+               return "53";
+       default:
+               return "??";
+       }
+}
+
+int print_cpuinfo(void)
+{
+       u32 cpurev;
+       __maybe_unused u32 max_freq;
+
+       cpurev = get_cpu_rev();
+
+#if defined(CONFIG_IMX_THERMAL)
+       struct udevice *thermal_dev;
+       int cpu_tmp, minc, maxc, ret;
+
+       printf("CPU:   Freescale i.MX%s rev%d.%d",
+              get_imx_type((cpurev & 0xFF000) >> 12),
+              (cpurev & 0x000F0) >> 4,
+              (cpurev & 0x0000F) >> 0);
+       max_freq = get_cpu_speed_grade_hz();
+       if (!max_freq || max_freq == mxc_get_clock(MXC_ARM_CLK)) {
+               printf(" at %dMHz\n", mxc_get_clock(MXC_ARM_CLK) / 1000000);
+       } else {
+               printf(" %d MHz (running at %d MHz)\n", max_freq / 1000000,
+                      mxc_get_clock(MXC_ARM_CLK) / 1000000);
+       }
+#else
+       printf("CPU:   Freescale i.MX%s rev%d.%d at %d MHz\n",
+               get_imx_type((cpurev & 0xFF000) >> 12),
+               (cpurev & 0x000F0) >> 4,
+               (cpurev & 0x0000F) >> 0,
+               mxc_get_clock(MXC_ARM_CLK) / 1000000);
+#endif
+
+#if defined(CONFIG_IMX_THERMAL)
+       puts("CPU:   ");
+       switch (get_cpu_temp_grade(&minc, &maxc)) {
+       case TEMP_AUTOMOTIVE:
+               puts("Automotive temperature grade ");
+               break;
+       case TEMP_INDUSTRIAL:
+               puts("Industrial temperature grade ");
+               break;
+       case TEMP_EXTCOMMERCIAL:
+               puts("Extended Commercial temperature grade ");
+               break;
+       default:
+               puts("Commercial temperature grade ");
+               break;
+       }
+       printf("(%dC to %dC)", minc, maxc);
+       ret = uclass_get_device(UCLASS_THERMAL, 0, &thermal_dev);
+       if (!ret) {
+               ret = thermal_get_temp(thermal_dev, &cpu_tmp);
+
+               if (!ret)
+                       printf(" at %dC\n", cpu_tmp);
+               else
+                       debug(" - invalid sensor data\n");
+       } else {
+               debug(" - invalid sensor device\n");
+       }
+#endif
+
+       printf("Reset cause: %s\n", get_reset_cause());
+       return 0;
+}
+#endif
+
+int cpu_eth_init(bd_t *bis)
+{
+       int rc = -ENODEV;
+
+#if defined(CONFIG_FEC_MXC)
+       rc = fecmxc_initialize(bis);
+#endif
+
+       return rc;
+}
+
+#ifdef CONFIG_FSL_ESDHC
+/*
+ * Initializes on-chip MMC controllers.
+ * to override, implement board_mmc_init()
+ */
+int cpu_mmc_init(bd_t *bis)
+{
+       return fsl_esdhc_mmc_init(bis);
+}
+#endif
+
+#ifndef CONFIG_MX7
+u32 get_ahb_clk(void)
+{
+       struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       u32 reg, ahb_podf;
+
+       reg = __raw_readl(&imx_ccm->cbcdr);
+       reg &= MXC_CCM_CBCDR_AHB_PODF_MASK;
+       ahb_podf = reg >> MXC_CCM_CBCDR_AHB_PODF_OFFSET;
+
+       return get_periph_clk() / (ahb_podf + 1);
+}
+#endif
+
+void arch_preboot_os(void)
+{
+#if defined(CONFIG_PCIE_IMX)
+       imx_pcie_remove();
+#endif
+#if defined(CONFIG_SATA)
+       sata_stop();
+#if defined(CONFIG_MX6)
+       disable_sata_clock();
+#endif
+#endif
+#if defined(CONFIG_VIDEO_IPUV3)
+       /* disable video before launching O/S */
+       ipuv3_fb_shutdown();
+#endif
+#if defined(CONFIG_VIDEO_MXS)
+       lcdif_power_down();
+#endif
+}
+
+void set_chipselect_size(int const cs_size)
+{
+       unsigned int reg;
+       struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
+       reg = readl(&iomuxc_regs->gpr[1]);
+
+       switch (cs_size) {
+       case CS0_128:
+               reg &= ~0x7;    /* CS0=128MB, CS1=0, CS2=0, CS3=0 */
+               reg |= 0x5;
+               break;
+       case CS0_64M_CS1_64M:
+               reg &= ~0x3F;   /* CS0=64MB, CS1=64MB, CS2=0, CS3=0 */
+               reg |= 0x1B;
+               break;
+       case CS0_64M_CS1_32M_CS2_32M:
+               reg &= ~0x1FF;  /* CS0=64MB, CS1=32MB, CS2=32MB, CS3=0 */
+               reg |= 0x4B;
+               break;
+       case CS0_32M_CS1_32M_CS2_32M_CS3_32M:
+               reg &= ~0xFFF;  /* CS0=32MB, CS1=32MB, CS2=32MB, CS3=32MB */
+               reg |= 0x249;
+               break;
+       default:
+               printf("Unknown chip select size: %d\n", cs_size);
+               break;
+       }
+
+       writel(reg, &iomuxc_regs->gpr[1]);
+}
diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c
new file mode 100644 (file)
index 0000000..9bc56f6
--- /dev/null
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2015 Toradex, Inc.
+ *
+ * Based on vf610twr:
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/iomux-vf610.h>
+#include <asm/arch/ddrmc-vf610.h>
+
+void ddrmc_setup_iomux(const iomux_v3_cfg_t *pads, int pads_count)
+{
+       static const iomux_v3_cfg_t default_pads[] = {
+               VF610_PAD_DDR_A15__DDR_A_15,
+               VF610_PAD_DDR_A14__DDR_A_14,
+               VF610_PAD_DDR_A13__DDR_A_13,
+               VF610_PAD_DDR_A12__DDR_A_12,
+               VF610_PAD_DDR_A11__DDR_A_11,
+               VF610_PAD_DDR_A10__DDR_A_10,
+               VF610_PAD_DDR_A9__DDR_A_9,
+               VF610_PAD_DDR_A8__DDR_A_8,
+               VF610_PAD_DDR_A7__DDR_A_7,
+               VF610_PAD_DDR_A6__DDR_A_6,
+               VF610_PAD_DDR_A5__DDR_A_5,
+               VF610_PAD_DDR_A4__DDR_A_4,
+               VF610_PAD_DDR_A3__DDR_A_3,
+               VF610_PAD_DDR_A2__DDR_A_2,
+               VF610_PAD_DDR_A1__DDR_A_1,
+               VF610_PAD_DDR_A0__DDR_A_0,
+               VF610_PAD_DDR_BA2__DDR_BA_2,
+               VF610_PAD_DDR_BA1__DDR_BA_1,
+               VF610_PAD_DDR_BA0__DDR_BA_0,
+               VF610_PAD_DDR_CAS__DDR_CAS_B,
+               VF610_PAD_DDR_CKE__DDR_CKE_0,
+               VF610_PAD_DDR_CLK__DDR_CLK_0,
+               VF610_PAD_DDR_CS__DDR_CS_B_0,
+               VF610_PAD_DDR_D15__DDR_D_15,
+               VF610_PAD_DDR_D14__DDR_D_14,
+               VF610_PAD_DDR_D13__DDR_D_13,
+               VF610_PAD_DDR_D12__DDR_D_12,
+               VF610_PAD_DDR_D11__DDR_D_11,
+               VF610_PAD_DDR_D10__DDR_D_10,
+               VF610_PAD_DDR_D9__DDR_D_9,
+               VF610_PAD_DDR_D8__DDR_D_8,
+               VF610_PAD_DDR_D7__DDR_D_7,
+               VF610_PAD_DDR_D6__DDR_D_6,
+               VF610_PAD_DDR_D5__DDR_D_5,
+               VF610_PAD_DDR_D4__DDR_D_4,
+               VF610_PAD_DDR_D3__DDR_D_3,
+               VF610_PAD_DDR_D2__DDR_D_2,
+               VF610_PAD_DDR_D1__DDR_D_1,
+               VF610_PAD_DDR_D0__DDR_D_0,
+               VF610_PAD_DDR_DQM1__DDR_DQM_1,
+               VF610_PAD_DDR_DQM0__DDR_DQM_0,
+               VF610_PAD_DDR_DQS1__DDR_DQS_1,
+               VF610_PAD_DDR_DQS0__DDR_DQS_0,
+               VF610_PAD_DDR_RAS__DDR_RAS_B,
+               VF610_PAD_DDR_WE__DDR_WE_B,
+               VF610_PAD_DDR_ODT1__DDR_ODT_0,
+               VF610_PAD_DDR_ODT0__DDR_ODT_1,
+               VF610_PAD_DDR_RESETB,
+       };
+
+       if ((pads == NULL) || (pads_count == 0)) {
+               pads = default_pads;
+               pads_count = ARRAY_SIZE(default_pads);
+       }
+
+       imx_iomux_v3_setup_multiple_pads(pads, pads_count);
+}
+
+static struct ddrmc_phy_setting default_phy_settings[] = {
+       { DDRMC_PHY_DQ_TIMING,  0 },
+       { DDRMC_PHY_DQ_TIMING, 16 },
+       { DDRMC_PHY_DQ_TIMING, 32 },
+
+       { DDRMC_PHY_DQS_TIMING,  1 },
+       { DDRMC_PHY_DQS_TIMING, 17 },
+
+       { DDRMC_PHY_CTRL,  2 },
+       { DDRMC_PHY_CTRL, 18 },
+       { DDRMC_PHY_CTRL, 34 },
+
+       { DDRMC_PHY_MASTER_CTRL,  3 },
+       { DDRMC_PHY_MASTER_CTRL, 19 },
+       { DDRMC_PHY_MASTER_CTRL, 35 },
+
+       { DDRMC_PHY_SLAVE_CTRL,  4 },
+       { DDRMC_PHY_SLAVE_CTRL, 20 },
+       { DDRMC_PHY_SLAVE_CTRL, 36 },
+
+       /* LPDDR2 only parameter */
+       { DDRMC_PHY_OFF, 49 },
+
+       { DDRMC_PHY50_DDR3_MODE | DDRMC_PHY50_EN_SW_HALF_CYCLE, 50 },
+
+       /* Processor Pad ODT settings */
+       { DDRMC_PHY_PROC_PAD_ODT, 52 },
+
+       /* end marker */
+       { 0, -1 }
+};
+
+void ddrmc_ctrl_init_ddr3(struct ddr3_jedec_timings const *timings,
+                         struct ddrmc_cr_setting *board_cr_settings,
+                         struct ddrmc_phy_setting *board_phy_settings,
+                         int col_diff, int row_diff)
+{
+       struct ddrmr_regs *ddrmr = (struct ddrmr_regs *)DDR_BASE_ADDR;
+       struct ddrmc_cr_setting *cr_setting;
+       struct ddrmc_phy_setting *phy_setting;
+
+       writel(DDRMC_CR00_DRAM_CLASS_DDR3, &ddrmr->cr[0]);
+       writel(DDRMC_CR02_DRAM_TINIT(timings->tinit), &ddrmr->cr[2]);
+       writel(DDRMC_CR10_TRST_PWRON(timings->trst_pwron), &ddrmr->cr[10]);
+
+       writel(DDRMC_CR11_CKE_INACTIVE(timings->cke_inactive), &ddrmr->cr[11]);
+       writel(DDRMC_CR12_WRLAT(timings->wrlat) |
+                  DDRMC_CR12_CASLAT_LIN(timings->caslat_lin), &ddrmr->cr[12]);
+       writel(DDRMC_CR13_TRC(timings->trc) | DDRMC_CR13_TRRD(timings->trrd) |
+                  DDRMC_CR13_TCCD(timings->tccd) |
+                  DDRMC_CR13_TBST_INT_INTERVAL(timings->tbst_int_interval),
+                  &ddrmr->cr[13]);
+       writel(DDRMC_CR14_TFAW(timings->tfaw) | DDRMC_CR14_TRP(timings->trp) |
+                  DDRMC_CR14_TWTR(timings->twtr) |
+                  DDRMC_CR14_TRAS_MIN(timings->tras_min), &ddrmr->cr[14]);
+       writel(DDRMC_CR16_TMRD(timings->tmrd) |
+                  DDRMC_CR16_TRTP(timings->trtp), &ddrmr->cr[16]);
+       writel(DDRMC_CR17_TRAS_MAX(timings->tras_max) |
+                  DDRMC_CR17_TMOD(timings->tmod), &ddrmr->cr[17]);
+       writel(DDRMC_CR18_TCKESR(timings->tckesr) |
+                  DDRMC_CR18_TCKE(timings->tcke), &ddrmr->cr[18]);
+
+       writel(DDRMC_CR20_AP_EN, &ddrmr->cr[20]);
+       writel(DDRMC_CR21_TRCD_INT(timings->trcd_int) | DDRMC_CR21_CCMAP_EN |
+                  DDRMC_CR21_TRAS_LOCKOUT(timings->tras_lockout),
+                  &ddrmr->cr[21]);
+
+       writel(DDRMC_CR22_TDAL(timings->tdal), &ddrmr->cr[22]);
+       writel(DDRMC_CR23_BSTLEN(timings->bstlen) |
+                  DDRMC_CR23_TDLL(timings->tdll), &ddrmr->cr[23]);
+       writel(DDRMC_CR24_TRP_AB(timings->trp_ab), &ddrmr->cr[24]);
+
+       writel(DDRMC_CR25_TREF_EN, &ddrmr->cr[25]);
+       writel(DDRMC_CR26_TREF(timings->tref) |
+                  DDRMC_CR26_TRFC(timings->trfc), &ddrmr->cr[26]);
+       writel(DDRMC_CR28_TREF_INT(timings->tref_int), &ddrmr->cr[28]);
+       writel(DDRMC_CR29_TPDEX(timings->tpdex), &ddrmr->cr[29]);
+
+       writel(DDRMC_CR30_TXPDLL(timings->txpdll), &ddrmr->cr[30]);
+       writel(DDRMC_CR31_TXSNR(timings->txsnr) |
+                  DDRMC_CR31_TXSR(timings->txsr), &ddrmr->cr[31]);
+       writel(DDRMC_CR33_EN_QK_SREF, &ddrmr->cr[33]);
+       writel(DDRMC_CR34_CKSRX(timings->cksrx) |
+                  DDRMC_CR34_CKSRE(timings->cksre), &ddrmr->cr[34]);
+
+       writel(DDRMC_CR38_FREQ_CHG_EN(timings->freq_chg_en), &ddrmr->cr[38]);
+       writel(DDRMC_CR39_PHY_INI_COM(1024) | DDRMC_CR39_PHY_INI_STA(16) |
+                  DDRMC_CR39_FRQ_CH_DLLOFF(2), &ddrmr->cr[39]);
+
+       writel(DDRMC_CR41_PHY_INI_STRT_INI_DIS, &ddrmr->cr[41]);
+       writel(DDRMC_CR48_MR1_DA_0(70) |
+                  DDRMC_CR48_MR0_DA_0(1056), &ddrmr->cr[48]);
+
+       writel(DDRMC_CR66_ZQCL(timings->zqcl) |
+                  DDRMC_CR66_ZQINIT(timings->zqinit), &ddrmr->cr[66]);
+       writel(DDRMC_CR67_ZQCS(timings->zqcs), &ddrmr->cr[67]);
+       writel(DDRMC_CR69_ZQ_ON_SREF_EX(2), &ddrmr->cr[69]);
+
+       writel(DDRMC_CR70_REF_PER_ZQ(timings->ref_per_zq), &ddrmr->cr[70]);
+       writel(DDRMC_CR72_ZQCS_ROTATE(timings->zqcs_rotate), &ddrmr->cr[72]);
+
+       writel(DDRMC_CR73_APREBIT(timings->aprebit) |
+                  DDRMC_CR73_COL_DIFF(col_diff) |
+                  DDRMC_CR73_ROW_DIFF(row_diff), &ddrmr->cr[73]);
+       writel(DDRMC_CR74_BANKSPLT_EN | DDRMC_CR74_ADDR_CMP_EN |
+                  DDRMC_CR74_CMD_AGE_CNT(timings->cmd_age_cnt) |
+                  DDRMC_CR74_AGE_CNT(timings->age_cnt),
+                  &ddrmr->cr[74]);
+       writel(DDRMC_CR75_RW_PG_EN | DDRMC_CR75_RW_EN | DDRMC_CR75_PRI_EN |
+                  DDRMC_CR75_PLEN, &ddrmr->cr[75]);
+       writel(DDRMC_CR76_NQENT_ACTDIS(3) | DDRMC_CR76_D_RW_G_BKCN(3) |
+                  DDRMC_CR76_W2R_SPLT_EN, &ddrmr->cr[76]);
+       writel(DDRMC_CR77_CS_MAP | DDRMC_CR77_DI_RD_INTLEAVE |
+                  DDRMC_CR77_SWAP_EN, &ddrmr->cr[77]);
+       writel(DDRMC_CR78_Q_FULLNESS(timings->q_fullness) |
+                  DDRMC_CR78_BUR_ON_FLY_BIT(12), &ddrmr->cr[78]);
+       writel(DDRMC_CR79_CTLUPD_AREF(0), &ddrmr->cr[79]);
+
+       writel(DDRMC_CR82_INT_MASK, &ddrmr->cr[82]);
+
+       writel(DDRMC_CR87_ODT_RD_MAPCS0(timings->odt_rd_mapcs0) |
+                  DDRMC_CR87_ODT_WR_MAPCS0(timings->odt_wr_mapcs0),
+                  &ddrmr->cr[87]);
+       writel(DDRMC_CR88_TODTL_CMD(4), &ddrmr->cr[88]);
+       writel(DDRMC_CR89_AODT_RWSMCS(2), &ddrmr->cr[89]);
+
+       writel(DDRMC_CR91_R2W_SMCSDL(2), &ddrmr->cr[91]);
+       writel(DDRMC_CR96_WLMRD(timings->wlmrd) |
+                  DDRMC_CR96_WLDQSEN(timings->wldqsen), &ddrmr->cr[96]);
+
+       /* execute custom CR setting sequence (may be NULL) */
+       cr_setting = board_cr_settings;
+       if (cr_setting != NULL)
+               while (cr_setting->cr_rnum >= 0) {
+                       writel(cr_setting->setting,
+                              &ddrmr->cr[cr_setting->cr_rnum]);
+                       cr_setting++;
+               }
+
+       /* perform default PHY settings (may be overridden by custom settings */
+       phy_setting = default_phy_settings;
+       while (phy_setting->phy_rnum >= 0) {
+               writel(phy_setting->setting,
+                      &ddrmr->phy[phy_setting->phy_rnum]);
+               phy_setting++;
+       }
+
+       /* execute custom PHY setting sequence (may be NULL) */
+       phy_setting = board_phy_settings;
+       if (phy_setting != NULL)
+               while (phy_setting->phy_rnum >= 0) {
+                       writel(phy_setting->setting,
+                              &ddrmr->phy[phy_setting->phy_rnum]);
+                       phy_setting++;
+               }
+
+       /* all inits done, start the DDR controller */
+       writel(DDRMC_CR00_DRAM_CLASS_DDR3 | DDRMC_CR00_START, &ddrmr->cr[0]);
+
+       while (!(readl(&ddrmr->cr[80]) && 0x100))
+               udelay(10);
+}
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
new file mode 100644 (file)
index 0000000..02c7ae4
--- /dev/null
@@ -0,0 +1,516 @@
+/*
+ * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <config.h>
+#include <fuse.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/mach-imx/hab.h>
+
+/* -------- start of HAB API updates ------------*/
+
+#define hab_rvt_report_event_p                                 \
+(                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
+       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
+       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
+       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
+       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
+       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT)        \
+)
+
+#define hab_rvt_report_status_p                                        \
+(                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
+       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
+       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
+       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
+       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
+       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS)      \
+)
+
+#define hab_rvt_authenticate_image_p                           \
+(                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
+       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
+       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
+       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
+       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
+       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE)    \
+)
+
+#define hab_rvt_entry_p                                                \
+(                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
+       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
+       ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
+       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
+       ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
+       ((hab_rvt_entry_t *)HAB_RVT_ENTRY)                      \
+)
+
+#define hab_rvt_exit_p                                         \
+(                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
+       (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
+       ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
+       (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
+       ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
+       ((hab_rvt_exit_t *)HAB_RVT_EXIT)                        \
+)
+
+#define IVT_SIZE               0x20
+#define ALIGN_SIZE             0x1000
+#define CSF_PAD_SIZE           0x2000
+#define MX6DQ_PU_IROM_MMU_EN_VAR       0x009024a8
+#define MX6DLS_PU_IROM_MMU_EN_VAR      0x00901dd0
+#define MX6SL_PU_IROM_MMU_EN_VAR       0x00900a18
+#define IS_HAB_ENABLED_BIT \
+       (is_soc_type(MXC_SOC_MX7ULP) ? 0x80000000 :     \
+        (is_soc_type(MXC_SOC_MX7) ? 0x2000000 : 0x2))
+
+/*
+ * +------------+  0x0 (DDR_UIMAGE_START) -
+ * |   Header   |                          |
+ * +------------+  0x40                    |
+ * |            |                          |
+ * |            |                          |
+ * |            |                          |
+ * |            |                          |
+ * | Image Data |                          |
+ * .            |                          |
+ * .            |                           > Stuff to be authenticated ----+
+ * .            |                          |                                |
+ * |            |                          |                                |
+ * |            |                          |                                |
+ * +------------+                          |                                |
+ * |            |                          |                                |
+ * | Fill Data  |                          |                                |
+ * |            |                          |                                |
+ * +------------+ Align to ALIGN_SIZE      |                                |
+ * |    IVT     |                          |                                |
+ * +------------+ + IVT_SIZE              -                                 |
+ * |            |                                                           |
+ * |  CSF DATA  | <---------------------------------------------------------+
+ * |            |
+ * +------------+
+ * |            |
+ * | Fill Data  |
+ * |            |
+ * +------------+ + CSF_PAD_SIZE
+ */
+
+static bool is_hab_enabled(void);
+
+#if !defined(CONFIG_SPL_BUILD)
+
+#define MAX_RECORD_BYTES     (8*1024) /* 4 kbytes */
+
+struct record {
+       uint8_t  tag;                                           /* Tag */
+       uint8_t  len[2];                                        /* Length */
+       uint8_t  par;                                           /* Version */
+       uint8_t  contents[MAX_RECORD_BYTES];/* Record Data */
+       bool     any_rec_flag;
+};
+
+char *rsn_str[] = {"RSN = HAB_RSN_ANY (0x00)\n",
+                                  "RSN = HAB_ENG_FAIL (0x30)\n",
+                                  "RSN = HAB_INV_ADDRESS (0x22)\n",
+                                  "RSN = HAB_INV_ASSERTION (0x0C)\n",
+                                  "RSN = HAB_INV_CALL (0x28)\n",
+                                  "RSN = HAB_INV_CERTIFICATE (0x21)\n",
+                                  "RSN = HAB_INV_COMMAND (0x06)\n",
+                                  "RSN = HAB_INV_CSF (0x11)\n",
+                                  "RSN = HAB_INV_DCD (0x27)\n",
+                                  "RSN = HAB_INV_INDEX (0x0F)\n",
+                                  "RSN = HAB_INV_IVT (0x05)\n",
+                                  "RSN = HAB_INV_KEY (0x1D)\n",
+                                  "RSN = HAB_INV_RETURN (0x1E)\n",
+                                  "RSN = HAB_INV_SIGNATURE (0x18)\n",
+                                  "RSN = HAB_INV_SIZE (0x17)\n",
+                                  "RSN = HAB_MEM_FAIL (0x2E)\n",
+                                  "RSN = HAB_OVR_COUNT (0x2B)\n",
+                                  "RSN = HAB_OVR_STORAGE (0x2D)\n",
+                                  "RSN = HAB_UNS_ALGORITHM (0x12)\n",
+                                  "RSN = HAB_UNS_COMMAND (0x03)\n",
+                                  "RSN = HAB_UNS_ENGINE (0x0A)\n",
+                                  "RSN = HAB_UNS_ITEM (0x24)\n",
+                                  "RSN = HAB_UNS_KEY (0x1B)\n",
+                                  "RSN = HAB_UNS_PROTOCOL (0x14)\n",
+                                  "RSN = HAB_UNS_STATE (0x09)\n",
+                                  "RSN = INVALID\n",
+                                  NULL};
+
+char *sts_str[] = {"STS = HAB_SUCCESS (0xF0)\n",
+                                  "STS = HAB_FAILURE (0x33)\n",
+                                  "STS = HAB_WARNING (0x69)\n",
+                                  "STS = INVALID\n",
+                                  NULL};
+
+char *eng_str[] = {"ENG = HAB_ENG_ANY (0x00)\n",
+                                  "ENG = HAB_ENG_SCC (0x03)\n",
+                                  "ENG = HAB_ENG_RTIC (0x05)\n",
+                                  "ENG = HAB_ENG_SAHARA (0x06)\n",
+                                  "ENG = HAB_ENG_CSU (0x0A)\n",
+                                  "ENG = HAB_ENG_SRTC (0x0C)\n",
+                                  "ENG = HAB_ENG_DCP (0x1B)\n",
+                                  "ENG = HAB_ENG_CAAM (0x1D)\n",
+                                  "ENG = HAB_ENG_SNVS (0x1E)\n",
+                                  "ENG = HAB_ENG_OCOTP (0x21)\n",
+                                  "ENG = HAB_ENG_DTCP (0x22)\n",
+                                  "ENG = HAB_ENG_ROM (0x36)\n",
+                                  "ENG = HAB_ENG_HDCP (0x24)\n",
+                                  "ENG = HAB_ENG_RTL (0x77)\n",
+                                  "ENG = HAB_ENG_SW (0xFF)\n",
+                                  "ENG = INVALID\n",
+                                  NULL};
+
+char *ctx_str[] = {"CTX = HAB_CTX_ANY(0x00)\n",
+                                  "CTX = HAB_CTX_FAB (0xFF)\n",
+                                  "CTX = HAB_CTX_ENTRY (0xE1)\n",
+                                  "CTX = HAB_CTX_TARGET (0x33)\n",
+                                  "CTX = HAB_CTX_AUTHENTICATE (0x0A)\n",
+                                  "CTX = HAB_CTX_DCD (0xDD)\n",
+                                  "CTX = HAB_CTX_CSF (0xCF)\n",
+                                  "CTX = HAB_CTX_COMMAND (0xC0)\n",
+                                  "CTX = HAB_CTX_AUT_DAT (0xDB)\n",
+                                  "CTX = HAB_CTX_ASSERT (0xA0)\n",
+                                  "CTX = HAB_CTX_EXIT (0xEE)\n",
+                                  "CTX = INVALID\n",
+                                  NULL};
+
+uint8_t hab_statuses[5] = {
+       HAB_STS_ANY,
+       HAB_FAILURE,
+       HAB_WARNING,
+       HAB_SUCCESS,
+       -1
+};
+
+uint8_t hab_reasons[26] = {
+       HAB_RSN_ANY,
+       HAB_ENG_FAIL,
+       HAB_INV_ADDRESS,
+       HAB_INV_ASSERTION,
+       HAB_INV_CALL,
+       HAB_INV_CERTIFICATE,
+       HAB_INV_COMMAND,
+       HAB_INV_CSF,
+       HAB_INV_DCD,
+       HAB_INV_INDEX,
+       HAB_INV_IVT,
+       HAB_INV_KEY,
+       HAB_INV_RETURN,
+       HAB_INV_SIGNATURE,
+       HAB_INV_SIZE,
+       HAB_MEM_FAIL,
+       HAB_OVR_COUNT,
+       HAB_OVR_STORAGE,
+       HAB_UNS_ALGORITHM,
+       HAB_UNS_COMMAND,
+       HAB_UNS_ENGINE,
+       HAB_UNS_ITEM,
+       HAB_UNS_KEY,
+       HAB_UNS_PROTOCOL,
+       HAB_UNS_STATE,
+       -1
+};
+
+uint8_t hab_contexts[12] = {
+       HAB_CTX_ANY,
+       HAB_CTX_FAB,
+       HAB_CTX_ENTRY,
+       HAB_CTX_TARGET,
+       HAB_CTX_AUTHENTICATE,
+       HAB_CTX_DCD,
+       HAB_CTX_CSF,
+       HAB_CTX_COMMAND,
+       HAB_CTX_AUT_DAT,
+       HAB_CTX_ASSERT,
+       HAB_CTX_EXIT,
+       -1
+};
+
+uint8_t hab_engines[16] = {
+       HAB_ENG_ANY,
+       HAB_ENG_SCC,
+       HAB_ENG_RTIC,
+       HAB_ENG_SAHARA,
+       HAB_ENG_CSU,
+       HAB_ENG_SRTC,
+       HAB_ENG_DCP,
+       HAB_ENG_CAAM,
+       HAB_ENG_SNVS,
+       HAB_ENG_OCOTP,
+       HAB_ENG_DTCP,
+       HAB_ENG_ROM,
+       HAB_ENG_HDCP,
+       HAB_ENG_RTL,
+       HAB_ENG_SW,
+       -1
+};
+
+static inline uint8_t get_idx(uint8_t *list, uint8_t tgt)
+{
+       uint8_t idx = 0;
+       uint8_t element = list[idx];
+       while (element != -1) {
+               if (element == tgt)
+                       return idx;
+               element = list[++idx];
+       }
+       return -1;
+}
+
+void process_event_record(uint8_t *event_data, size_t bytes)
+{
+       struct record *rec = (struct record *)event_data;
+
+       printf("\n\n%s", sts_str[get_idx(hab_statuses, rec->contents[0])]);
+       printf("%s", rsn_str[get_idx(hab_reasons, rec->contents[1])]);
+       printf("%s", ctx_str[get_idx(hab_contexts, rec->contents[2])]);
+       printf("%s", eng_str[get_idx(hab_engines, rec->contents[3])]);
+}
+
+void display_event(uint8_t *event_data, size_t bytes)
+{
+       uint32_t i;
+
+       if (!(event_data && bytes > 0))
+               return;
+
+       for (i = 0; i < bytes; i++) {
+               if (i == 0)
+                       printf("\t0x%02x", event_data[i]);
+               else if ((i % 8) == 0)
+                       printf("\n\t0x%02x", event_data[i]);
+               else
+                       printf(" 0x%02x", event_data[i]);
+       }
+
+       process_event_record(event_data, bytes);
+}
+
+int get_hab_status(void)
+{
+       uint32_t index = 0; /* Loop index */
+       uint8_t event_data[128]; /* Event data buffer */
+       size_t bytes = sizeof(event_data); /* Event size in bytes */
+       enum hab_config config = 0;
+       enum hab_state state = 0;
+       hab_rvt_report_event_t *hab_rvt_report_event;
+       hab_rvt_report_status_t *hab_rvt_report_status;
+
+       hab_rvt_report_event = hab_rvt_report_event_p;
+       hab_rvt_report_status = hab_rvt_report_status_p;
+
+       if (is_hab_enabled())
+               puts("\nSecure boot enabled\n");
+       else
+               puts("\nSecure boot disabled\n");
+
+       /* Check HAB status */
+       if (hab_rvt_report_status(&config, &state) != HAB_SUCCESS) {
+               printf("\nHAB Configuration: 0x%02x, HAB State: 0x%02x\n",
+                      config, state);
+
+               /* Display HAB Error events */
+               while (hab_rvt_report_event(HAB_FAILURE, index, event_data,
+                                       &bytes) == HAB_SUCCESS) {
+                       puts("\n");
+                       printf("--------- HAB Event %d -----------------\n",
+                              index + 1);
+                       puts("event data:\n");
+                       display_event(event_data, bytes);
+                       puts("\n");
+                       bytes = sizeof(event_data);
+                       index++;
+               }
+       }
+       /* Display message if no HAB events are found */
+       else {
+               printf("\nHAB Configuration: 0x%02x, HAB State: 0x%02x\n",
+                      config, state);
+               puts("No HAB Events Found!\n\n");
+       }
+       return 0;
+}
+
+int do_hab_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       if ((argc != 1)) {
+               cmd_usage(cmdtp);
+               return 1;
+       }
+
+       get_hab_status();
+
+       return 0;
+}
+
+static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc,
+                               char * const argv[])
+{
+       ulong   addr, ivt_offset;
+       int     rcode = 0;
+
+       if (argc < 3)
+               return CMD_RET_USAGE;
+
+       addr = simple_strtoul(argv[1], NULL, 16);
+       ivt_offset = simple_strtoul(argv[2], NULL, 16);
+
+       rcode = authenticate_image(addr, ivt_offset);
+
+       return rcode;
+}
+
+U_BOOT_CMD(
+               hab_status, CONFIG_SYS_MAXARGS, 1, do_hab_status,
+               "display HAB status",
+               ""
+         );
+
+U_BOOT_CMD(
+               hab_auth_img, 3, 0, do_authenticate_image,
+               "authenticate image via HAB",
+               "addr ivt_offset\n"
+               "addr - image hex address\n"
+               "ivt_offset - hex offset of IVT in the image"
+         );
+
+
+#endif /* !defined(CONFIG_SPL_BUILD) */
+
+static bool is_hab_enabled(void)
+{
+       struct imx_sec_config_fuse_t *fuse =
+               (struct imx_sec_config_fuse_t *)&imx_sec_config_fuse;
+       uint32_t reg;
+       int ret;
+
+       ret = fuse_read(fuse->bank, fuse->word, &reg);
+       if (ret) {
+               puts("\nSecure boot fuse read error\n");
+               return ret;
+       }
+
+       return (reg & IS_HAB_ENABLED_BIT) == IS_HAB_ENABLED_BIT;
+}
+
+uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size)
+{
+       uint32_t load_addr = 0;
+       size_t bytes;
+       ptrdiff_t ivt_offset = 0;
+       int result = 0;
+       ulong start;
+       hab_rvt_authenticate_image_t *hab_rvt_authenticate_image;
+       hab_rvt_entry_t *hab_rvt_entry;
+       hab_rvt_exit_t *hab_rvt_exit;
+
+       hab_rvt_authenticate_image = hab_rvt_authenticate_image_p;
+       hab_rvt_entry = hab_rvt_entry_p;
+       hab_rvt_exit = hab_rvt_exit_p;
+
+       if (is_hab_enabled()) {
+               printf("\nAuthenticate image from DDR location 0x%x...\n",
+                      ddr_start);
+
+               hab_caam_clock_enable(1);
+
+               if (hab_rvt_entry() == HAB_SUCCESS) {
+                       /* If not already aligned, Align to ALIGN_SIZE */
+                       ivt_offset = (image_size + ALIGN_SIZE - 1) &
+                                       ~(ALIGN_SIZE - 1);
+
+                       start = ddr_start;
+                       bytes = ivt_offset + IVT_SIZE + CSF_PAD_SIZE;
+#ifdef DEBUG
+                       printf("\nivt_offset = 0x%x, ivt addr = 0x%x\n",
+                              ivt_offset, ddr_start + ivt_offset);
+                       puts("Dumping IVT\n");
+                       print_buffer(ddr_start + ivt_offset,
+                                    (void *)(ddr_start + ivt_offset),
+                                    4, 0x8, 0);
+
+                       puts("Dumping CSF Header\n");
+                       print_buffer(ddr_start + ivt_offset+IVT_SIZE,
+                                    (void *)(ddr_start + ivt_offset+IVT_SIZE),
+                                    4, 0x10, 0);
+
+#if  !defined(CONFIG_SPL_BUILD)
+                       get_hab_status();
+#endif
+
+                       puts("\nCalling authenticate_image in ROM\n");
+                       printf("\tivt_offset = 0x%x\n", ivt_offset);
+                       printf("\tstart = 0x%08lx\n", start);
+                       printf("\tbytes = 0x%x\n", bytes);
+#endif
+                       /*
+                        * If the MMU is enabled, we have to notify the ROM
+                        * code, or it won't flush the caches when needed.
+                        * This is done, by setting the "pu_irom_mmu_enabled"
+                        * word to 1. You can find its address by looking in
+                        * the ROM map. This is critical for
+                        * authenticate_image(). If MMU is enabled, without
+                        * setting this bit, authentication will fail and may
+                        * crash.
+                        */
+                       /* Check MMU enabled */
+                       if (is_soc_type(MXC_SOC_MX6) && get_cr() & CR_M) {
+                               if (is_mx6dq()) {
+                                       /*
+                                        * This won't work on Rev 1.0.0 of
+                                        * i.MX6Q/D, since their ROM doesn't
+                                        * do cache flushes. don't think any
+                                        * exist, so we ignore them.
+                                        */
+                                       if (!is_mx6dqp())
+                                               writel(1, MX6DQ_PU_IROM_MMU_EN_VAR);
+                               } else if (is_mx6sdl()) {
+                                       writel(1, MX6DLS_PU_IROM_MMU_EN_VAR);
+                               } else if (is_mx6sl()) {
+                                       writel(1, MX6SL_PU_IROM_MMU_EN_VAR);
+                               }
+                       }
+
+                       load_addr = (uint32_t)hab_rvt_authenticate_image(
+                                       HAB_CID_UBOOT,
+                                       ivt_offset, (void **)&start,
+                                       (size_t *)&bytes, NULL);
+                       if (hab_rvt_exit() != HAB_SUCCESS) {
+                               puts("hab exit function fail\n");
+                               load_addr = 0;
+                       }
+               } else {
+                       puts("hab entry function fail\n");
+               }
+
+               hab_caam_clock_enable(0);
+
+#if !defined(CONFIG_SPL_BUILD)
+               get_hab_status();
+#endif
+       } else {
+               puts("hab fuse not enabled\n");
+       }
+
+       if ((!is_hab_enabled()) || (load_addr != 0))
+               result = 1;
+
+       return result;
+}
diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c
new file mode 100644 (file)
index 0000000..dfb5c1e
--- /dev/null
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2012 Boundary Devices Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <common.h>
+#include <malloc.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
+#include <linux/errno.h>
+#include <asm/gpio.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <watchdog.h>
+
+int force_idle_bus(void *priv)
+{
+       int i;
+       int sda, scl;
+       ulong elapsed, start_time;
+       struct i2c_pads_info *p = (struct i2c_pads_info *)priv;
+       int ret = 0;
+
+       gpio_direction_input(p->sda.gp);
+       gpio_direction_input(p->scl.gp);
+
+       imx_iomux_v3_setup_pad(p->sda.gpio_mode);
+       imx_iomux_v3_setup_pad(p->scl.gpio_mode);
+
+       sda = gpio_get_value(p->sda.gp);
+       scl = gpio_get_value(p->scl.gp);
+       if ((sda & scl) == 1)
+               goto exit;              /* Bus is idle already */
+
+       printf("%s: sda=%d scl=%d sda.gp=0x%x scl.gp=0x%x\n", __func__,
+               sda, scl, p->sda.gp, p->scl.gp);
+       /* Send high and low on the SCL line */
+       for (i = 0; i < 9; i++) {
+               gpio_direction_output(p->scl.gp, 0);
+               udelay(50);
+               gpio_direction_input(p->scl.gp);
+               udelay(50);
+       }
+       start_time = get_timer(0);
+       for (;;) {
+               sda = gpio_get_value(p->sda.gp);
+               scl = gpio_get_value(p->scl.gp);
+               if ((sda & scl) == 1)
+                       break;
+               WATCHDOG_RESET();
+               elapsed = get_timer(start_time);
+               if (elapsed > (CONFIG_SYS_HZ / 5)) {    /* .2 seconds */
+                       ret = -EBUSY;
+                       printf("%s: failed to clear bus, sda=%d scl=%d\n",
+                                       __func__, sda, scl);
+                       break;
+               }
+       }
+exit:
+       imx_iomux_v3_setup_pad(p->sda.i2c_mode);
+       imx_iomux_v3_setup_pad(p->scl.i2c_mode);
+       return ret;
+}
+
+static void * const i2c_bases[] = {
+       (void *)I2C1_BASE_ADDR,
+       (void *)I2C2_BASE_ADDR,
+#ifdef I2C3_BASE_ADDR
+       (void *)I2C3_BASE_ADDR,
+#endif
+#ifdef I2C4_BASE_ADDR
+       (void *)I2C4_BASE_ADDR,
+#endif
+};
+
+/* i2c_index can be from 0 - 3 */
+int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
+             struct i2c_pads_info *p)
+{
+       char name[9];
+       int ret;
+
+       if (i2c_index >= ARRAY_SIZE(i2c_bases))
+               return -EINVAL;
+
+       snprintf(name, sizeof(name), "i2c_sda%01d", i2c_index);
+       ret = gpio_request(p->sda.gp, name);
+       if (ret)
+               return ret;
+
+       snprintf(name, sizeof(name), "i2c_scl%01d", i2c_index);
+       ret = gpio_request(p->scl.gp, name);
+       if (ret)
+               goto err_req;
+
+       /* Enable i2c clock */
+       ret = enable_i2c_clk(1, i2c_index);
+       if (ret)
+               goto err_clk;
+
+       /* Make sure bus is idle */
+       ret = force_idle_bus(p);
+       if (ret)
+               goto err_idle;
+
+#ifndef CONFIG_DM_I2C
+       bus_i2c_init(i2c_index, speed, slave_addr, force_idle_bus, p);
+#endif
+
+       return 0;
+
+err_idle:
+err_clk:
+       gpio_free(p->scl.gp);
+err_req:
+       gpio_free(p->sda.gp);
+
+       return ret;
+}
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
new file mode 100644 (file)
index 0000000..69026df
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <command.h>
+
+/* Allow for arch specific config before we boot */
+static int __arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
+{
+       /* please define platform specific arch_auxiliary_core_up() */
+       return CMD_RET_FAILURE;
+}
+
+int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
+       __attribute__((weak, alias("__arch_auxiliary_core_up")));
+
+/* Allow for arch specific config before we boot */
+static int __arch_auxiliary_core_check_up(u32 core_id)
+{
+       /* please define platform specific arch_auxiliary_core_check_up() */
+       return 0;
+}
+
+int arch_auxiliary_core_check_up(u32 core_id)
+       __attribute__((weak, alias("__arch_auxiliary_core_check_up")));
+
+/*
+ * To i.MX6SX and i.MX7D, the image supported by bootaux needs
+ * the reset vector at the head for the image, with SP and PC
+ * as the first two words.
+ *
+ * Per the cortex-M reference manual, the reset vector of M4 needs
+ * to exist at 0x0 (TCMUL). The PC and SP are the first two addresses
+ * of that vector.  So to boot M4, the A core must build the M4's reset
+ * vector with getting the PC and SP from image and filling them to
+ * TCMUL. When M4 is kicked, it will load the PC and SP by itself.
+ * The TCMUL is mapped to (M4_BOOTROM_BASE_ADDR) at A core side for
+ * accessing the M4 TCMUL.
+ */
+int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       ulong addr;
+       int ret, up;
+
+       if (argc < 2)
+               return CMD_RET_USAGE;
+
+       up = arch_auxiliary_core_check_up(0);
+       if (up) {
+               printf("## Auxiliary core is already up\n");
+               return CMD_RET_SUCCESS;
+       }
+
+       addr = simple_strtoul(argv[1], NULL, 16);
+
+       printf("## Starting auxiliary core at 0x%08lX ...\n", addr);
+
+       ret = arch_auxiliary_core_up(0, addr);
+       if (ret)
+               return CMD_RET_FAILURE;
+
+       return CMD_RET_SUCCESS;
+}
+
+U_BOOT_CMD(
+       bootaux, CONFIG_SYS_MAXARGS, 1, do_bootaux,
+       "Start auxiliary core",
+       ""
+);
diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c
new file mode 100644 (file)
index 0000000..720ad67
--- /dev/null
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/arch/crm_regs.h>
+
+void init_aips(void)
+{
+       struct aipstz_regs *aips1, *aips2, *aips3;
+
+       aips1 = (struct aipstz_regs *)AIPS1_BASE_ADDR;
+       aips2 = (struct aipstz_regs *)AIPS2_BASE_ADDR;
+       aips3 = (struct aipstz_regs *)AIPS3_BASE_ADDR;
+
+       /*
+        * Set all MPROTx to be non-bufferable, trusted for R/W,
+        * not forced to user-mode.
+        */
+       writel(0x77777777, &aips1->mprot0);
+       writel(0x77777777, &aips1->mprot1);
+       writel(0x77777777, &aips2->mprot0);
+       writel(0x77777777, &aips2->mprot1);
+
+       /*
+        * Set all OPACRx to be non-bufferable, not require
+        * supervisor privilege level for access,allow for
+        * write access and untrusted master access.
+        */
+       writel(0x00000000, &aips1->opacr0);
+       writel(0x00000000, &aips1->opacr1);
+       writel(0x00000000, &aips1->opacr2);
+       writel(0x00000000, &aips1->opacr3);
+       writel(0x00000000, &aips1->opacr4);
+       writel(0x00000000, &aips2->opacr0);
+       writel(0x00000000, &aips2->opacr1);
+       writel(0x00000000, &aips2->opacr2);
+       writel(0x00000000, &aips2->opacr3);
+       writel(0x00000000, &aips2->opacr4);
+
+       if (is_mx6ull() || is_mx6sx() || is_mx7()) {
+               /*
+                * Set all MPROTx to be non-bufferable, trusted for R/W,
+                * not forced to user-mode.
+                */
+               writel(0x77777777, &aips3->mprot0);
+               writel(0x77777777, &aips3->mprot1);
+
+               /*
+                * Set all OPACRx to be non-bufferable, not require
+                * supervisor privilege level for access,allow for
+                * write access and untrusted master access.
+                */
+               writel(0x00000000, &aips3->opacr0);
+               writel(0x00000000, &aips3->opacr1);
+               writel(0x00000000, &aips3->opacr2);
+               writel(0x00000000, &aips3->opacr3);
+               writel(0x00000000, &aips3->opacr4);
+       }
+}
+
+void imx_set_wdog_powerdown(bool enable)
+{
+       struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR;
+       struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR;
+       struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR;
+#ifdef CONFIG_MX7D
+       struct wdog_regs *wdog4 = (struct wdog_regs *)WDOG4_BASE_ADDR;
+#endif
+
+       /* Write to the PDE (Power Down Enable) bit */
+       writew(enable, &wdog1->wmcr);
+       writew(enable, &wdog2->wmcr);
+
+       if (is_mx6sx() || is_mx6ul() || is_mx7())
+               writew(enable, &wdog3->wmcr);
+#ifdef CONFIG_MX7D
+       writew(enable, &wdog4->wmcr);
+#endif
+}
+
+#define SRC_SCR_WARM_RESET_ENABLE      0
+
+void init_src(void)
+{
+       struct src *src_regs = (struct src *)SRC_BASE_ADDR;
+       u32 val;
+
+       /*
+        * force warm reset sources to generate cold reset
+        * for a more reliable restart
+        */
+       val = readl(&src_regs->scr);
+       val &= ~(1 << SRC_SCR_WARM_RESET_ENABLE);
+       writel(val, &src_regs->scr);
+}
+
+#ifdef CONFIG_CMD_BMODE
+void boot_mode_apply(unsigned cfg_val)
+{
+       unsigned reg;
+       struct src *psrc = (struct src *)SRC_BASE_ADDR;
+       writel(cfg_val, &psrc->gpr9);
+       reg = readl(&psrc->gpr10);
+       if (cfg_val)
+               reg |= 1 << 28;
+       else
+               reg &= ~(1 << 28);
+       writel(reg, &psrc->gpr10);
+}
+#endif
+
+#if defined(CONFIG_MX6)
+u32 imx6_src_get_boot_mode(void)
+{
+       if (imx6_is_bmode_from_gpr9())
+               return readl(&src_base->gpr9);
+       else
+               return readl(&src_base->sbmr1);
+}
+#endif
diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c
new file mode 100644 (file)
index 0000000..94d6600
--- /dev/null
@@ -0,0 +1,149 @@
+/*
+ * Based on the iomux-v3.c from Linux kernel:
+ * Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
+ * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH,
+ *                       <armlinux@phytec.de>
+ *
+ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sys_proto.h>
+
+static void *base = (void *)IOMUXC_BASE_ADDR;
+
+/*
+ * configures a single pad in the iomuxer
+ */
+void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
+{
+       u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
+       u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
+       u32 sel_input_ofs =
+               (pad & MUX_SEL_INPUT_OFS_MASK) >> MUX_SEL_INPUT_OFS_SHIFT;
+       u32 sel_input =
+               (pad & MUX_SEL_INPUT_MASK) >> MUX_SEL_INPUT_SHIFT;
+       u32 pad_ctrl_ofs =
+               (pad & MUX_PAD_CTRL_OFS_MASK) >> MUX_PAD_CTRL_OFS_SHIFT;
+       u32 pad_ctrl = (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT;
+
+#if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL)
+       /* Check whether LVE bit needs to be set */
+       if (pad_ctrl & PAD_CTL_LVE) {
+               pad_ctrl &= ~PAD_CTL_LVE;
+               pad_ctrl |= PAD_CTL_LVE_BIT;
+       }
+#endif
+
+#ifdef CONFIG_IOMUX_LPSR
+       u32 lpsr = (pad & MUX_MODE_LPSR) >> MUX_MODE_SHIFT;
+
+#ifdef CONFIG_MX7
+       if (lpsr == IOMUX_CONFIG_LPSR) {
+               base = (void *)IOMUXC_LPSR_BASE_ADDR;
+               mux_mode &= ~IOMUX_CONFIG_LPSR;
+               /* set daisy chain sel_input */
+               if (sel_input_ofs)
+                       sel_input_ofs += IOMUX_LPSR_SEL_INPUT_OFS;
+       }
+#else
+       if (is_mx6ull() || is_mx6sll()) {
+               if (lpsr == IOMUX_CONFIG_LPSR) {
+                       base = (void *)IOMUXC_SNVS_BASE_ADDR;
+                       mux_mode &= ~IOMUX_CONFIG_LPSR;
+               }
+       }
+#endif
+#endif
+
+       if (is_mx7() || is_mx6ull() || is_mx6sll() || mux_ctrl_ofs)
+               __raw_writel(mux_mode, base + mux_ctrl_ofs);
+
+       if (sel_input_ofs)
+               __raw_writel(sel_input, base + sel_input_ofs);
+
+#ifdef CONFIG_IOMUX_SHARE_CONF_REG
+       if (!(pad_ctrl & NO_PAD_CTRL))
+               __raw_writel((mux_mode << PAD_MUX_MODE_SHIFT) | pad_ctrl,
+                       base + pad_ctrl_ofs);
+#else
+       if (!(pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
+               __raw_writel(pad_ctrl, base + pad_ctrl_ofs);
+#if defined(CONFIG_MX6SLL)
+       else if ((pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs)
+               clrbits_le32(base + pad_ctrl_ofs, PAD_CTL_IPD_BIT);
+#endif
+#endif
+
+#ifdef CONFIG_IOMUX_LPSR
+       if (lpsr == IOMUX_CONFIG_LPSR)
+               base = (void *)IOMUXC_BASE_ADDR;
+#endif
+
+}
+
+/* configures a list of pads within declared with IOMUX_PADS macro */
+void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
+                                     unsigned count)
+{
+       iomux_v3_cfg_t const *p = pad_list;
+       int stride;
+       int i;
+
+#if defined(CONFIG_MX6QDL)
+       stride = 2;
+       if (!is_mx6dq() && !is_mx6dqp())
+               p += 1;
+#else
+       stride = 1;
+#endif
+       for (i = 0; i < count; i++) {
+               imx_iomux_v3_setup_pad(*p);
+               p += stride;
+       }
+}
+
+void imx_iomux_set_gpr_register(int group, int start_bit,
+                                       int num_bits, int value)
+{
+       int i = 0;
+       u32 reg;
+       reg = readl(base + group * 4);
+       while (num_bits) {
+               reg &= ~(1<<(start_bit + i));
+               i++;
+               num_bits--;
+       }
+       reg |= (value << start_bit);
+       writel(reg, base + group * 4);
+}
+
+#ifdef CONFIG_IOMUX_SHARE_CONF_REG
+void imx_iomux_gpio_set_direction(unsigned int gpio,
+                               unsigned int direction)
+{
+       u32 reg;
+       /*
+        * Only on Vybrid the input/output buffer enable flags
+        * are part of the shared mux/conf register.
+        */
+       reg = readl(base + (gpio << 2));
+
+       if (direction)
+               reg |= 0x2;
+       else
+               reg &= ~0x2;
+
+       writel(reg, base + (gpio << 2));
+}
+
+void imx_iomux_gpio_get_function(unsigned int gpio, u32 *gpio_state)
+{
+       *gpio_state = readl(base + (gpio << 2)) &
+               ((0X07 << PAD_MUX_MODE_SHIFT) | PAD_CTL_OBE_IBE_ENABLE);
+}
+#endif
diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c
new file mode 100644 (file)
index 0000000..c644183
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2013 Stefan Roese <sr@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/arch/sys_proto.h>
+#include <linux/errno.h>
+#include <asm/io.h>
+#include <asm/mach-imx/regs-common.h>
+
+/* 1 second delay should be plenty of time for block reset. */
+#define        RESET_MAX_TIMEOUT       1000000
+
+#define        MXS_BLOCK_SFTRST        (1 << 31)
+#define        MXS_BLOCK_CLKGATE       (1 << 30)
+
+int mxs_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned
+                                                               int timeout)
+{
+       while (--timeout) {
+               if ((readl(&reg->reg) & mask) == mask)
+                       break;
+               udelay(1);
+       }
+
+       return !timeout;
+}
+
+int mxs_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned
+                                                               int timeout)
+{
+       while (--timeout) {
+               if ((readl(&reg->reg) & mask) == 0)
+                       break;
+               udelay(1);
+       }
+
+       return !timeout;
+}
+
+int mxs_reset_block(struct mxs_register_32 *reg)
+{
+       /* Clear SFTRST */
+       writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
+
+       if (mxs_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
+               return 1;
+
+       /* Clear CLKGATE */
+       writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
+
+       /* Set SFTRST */
+       writel(MXS_BLOCK_SFTRST, &reg->reg_set);
+
+       /* Wait for CLKGATE being set */
+       if (mxs_wait_mask_set(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
+               return 1;
+
+       /* Clear SFTRST */
+       writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
+
+       if (mxs_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
+               return 1;
+
+       /* Clear CLKGATE */
+       writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
+
+       if (mxs_wait_mask_clr(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
+               return 1;
+
+       return 0;
+}
diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig
new file mode 100644 (file)
index 0000000..ef37c35
--- /dev/null
@@ -0,0 +1,76 @@
+if ARCH_MX5
+
+config MX5
+       bool
+       default y
+
+config MX51
+       bool
+
+config MX53
+       bool
+
+choice
+       prompt "MX5 board select"
+       optional
+
+config TARGET_M53EVK
+       bool "Support m53evk"
+       select MX53
+       select SUPPORT_SPL
+
+config TARGET_MX51EVK
+       bool "Support mx51evk"
+       select BOARD_LATE_INIT
+       select MX51
+
+config TARGET_MX53ARD
+       bool "Support mx53ard"
+       select MX53
+
+config TARGET_MX53CX9020
+       bool "Support CX9020"
+       select BOARD_LATE_INIT
+       select MX53
+       select DM
+       select DM_SERIAL
+
+config TARGET_MX53EVK
+       bool "Support mx53evk"
+       select BOARD_LATE_INIT
+       select MX53
+
+config TARGET_MX53LOCO
+       bool "Support mx53loco"
+       select BOARD_LATE_INIT
+       select MX53
+
+config TARGET_MX53SMD
+       bool "Support mx53smd"
+       select MX53
+
+config TARGET_TS4800
+       bool "Support TS4800"
+       select MX51
+       select SYS_FSL_ERRATUM_ESDHC_A001
+
+config TARGET_USBARMORY
+       bool "Support USB armory"
+       select MX53
+
+endchoice
+
+config SYS_SOC
+       default "mx5"
+
+source "board/aries/m53evk/Kconfig"
+source "board/beckhoff/mx53cx9020/Kconfig"
+source "board/freescale/mx51evk/Kconfig"
+source "board/freescale/mx53ard/Kconfig"
+source "board/freescale/mx53evk/Kconfig"
+source "board/freescale/mx53loco/Kconfig"
+source "board/freescale/mx53smd/Kconfig"
+source "board/inversepath/usbarmory/Kconfig"
+source "board/technologic/ts4800/Kconfig"
+
+endif
diff --git a/arch/arm/mach-imx/mx5/Makefile b/arch/arm/mach-imx/mx5/Makefile
new file mode 100644 (file)
index 0000000..d021842
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# (C) Copyright 2009 Freescale Semiconductor, Inc.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y := soc.o clock.o
+obj-y += lowlevel_init.o
diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c
new file mode 100644 (file)
index 0000000..610098c
--- /dev/null
@@ -0,0 +1,949 @@
+/*
+ * (C) Copyright 2007
+ * Sascha Hauer, Pengutronix
+ *
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <linux/errno.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/clock.h>
+#include <div64.h>
+#include <asm/arch/sys_proto.h>
+
+enum pll_clocks {
+       PLL1_CLOCK = 0,
+       PLL2_CLOCK,
+       PLL3_CLOCK,
+#ifdef CONFIG_MX53
+       PLL4_CLOCK,
+#endif
+       PLL_CLOCKS,
+};
+
+struct mxc_pll_reg *mxc_plls[PLL_CLOCKS] = {
+       [PLL1_CLOCK] = (struct mxc_pll_reg *)PLL1_BASE_ADDR,
+       [PLL2_CLOCK] = (struct mxc_pll_reg *)PLL2_BASE_ADDR,
+       [PLL3_CLOCK] = (struct mxc_pll_reg *)PLL3_BASE_ADDR,
+#ifdef CONFIG_MX53
+       [PLL4_CLOCK] = (struct mxc_pll_reg *)PLL4_BASE_ADDR,
+#endif
+};
+
+#define AHB_CLK_ROOT    133333333
+#define SZ_DEC_1M       1000000
+#define PLL_PD_MAX      16      /* Actual pd+1 */
+#define PLL_MFI_MAX     15
+#define PLL_MFI_MIN     5
+#define ARM_DIV_MAX     8
+#define IPG_DIV_MAX     4
+#define AHB_DIV_MAX     8
+#define EMI_DIV_MAX     8
+#define NFC_DIV_MAX     8
+
+#define MX5_CBCMR      0x00015154
+#define MX5_CBCDR      0x02888945
+
+struct fixed_pll_mfd {
+       u32 ref_clk_hz;
+       u32 mfd;
+};
+
+const struct fixed_pll_mfd fixed_mfd[] = {
+       {MXC_HCLK, 24 * 16},
+};
+
+struct pll_param {
+       u32 pd;
+       u32 mfi;
+       u32 mfn;
+       u32 mfd;
+};
+
+#define PLL_FREQ_MAX(ref_clk)  (4 * (ref_clk) * PLL_MFI_MAX)
+#define PLL_FREQ_MIN(ref_clk) \
+               ((2 * (ref_clk) * (PLL_MFI_MIN - 1)) / PLL_PD_MAX)
+#define MAX_DDR_CLK     420000000
+#define NFC_CLK_MAX     34000000
+
+struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
+
+void set_usboh3_clk(void)
+{
+       clrsetbits_le32(&mxc_ccm->cscmr1,
+                       MXC_CCM_CSCMR1_USBOH3_CLK_SEL_MASK,
+                       MXC_CCM_CSCMR1_USBOH3_CLK_SEL(1));
+       clrsetbits_le32(&mxc_ccm->cscdr1,
+                       MXC_CCM_CSCDR1_USBOH3_CLK_PODF_MASK |
+                       MXC_CCM_CSCDR1_USBOH3_CLK_PRED_MASK,
+                       MXC_CCM_CSCDR1_USBOH3_CLK_PRED(4) |
+                       MXC_CCM_CSCDR1_USBOH3_CLK_PODF(1));
+}
+
+void enable_usboh3_clk(bool enable)
+{
+       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
+
+       clrsetbits_le32(&mxc_ccm->CCGR2,
+                       MXC_CCM_CCGR2_USBOH3_60M(MXC_CCM_CCGR_CG_MASK),
+                       MXC_CCM_CCGR2_USBOH3_60M(cg));
+}
+
+#ifdef CONFIG_SYS_I2C_MXC
+/* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */
+int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
+{
+       u32 mask;
+
+#if defined(CONFIG_MX51)
+       if (i2c_num > 1)
+#elif defined(CONFIG_MX53)
+       if (i2c_num > 2)
+#endif
+               return -EINVAL;
+       mask = MXC_CCM_CCGR_CG_MASK <<
+                       (MXC_CCM_CCGR1_I2C1_OFFSET + (i2c_num << 1));
+       if (enable)
+               setbits_le32(&mxc_ccm->CCGR1, mask);
+       else
+               clrbits_le32(&mxc_ccm->CCGR1, mask);
+       return 0;
+}
+#endif
+
+void set_usb_phy_clk(void)
+{
+       clrbits_le32(&mxc_ccm->cscmr1, MXC_CCM_CSCMR1_USB_PHY_CLK_SEL);
+}
+
+#if defined(CONFIG_MX51)
+void enable_usb_phy1_clk(bool enable)
+{
+       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
+
+       clrsetbits_le32(&mxc_ccm->CCGR2,
+                       MXC_CCM_CCGR2_USB_PHY(MXC_CCM_CCGR_CG_MASK),
+                       MXC_CCM_CCGR2_USB_PHY(cg));
+}
+
+void enable_usb_phy2_clk(bool enable)
+{
+       /* i.MX51 has a single USB PHY clock, so do nothing here. */
+}
+#elif defined(CONFIG_MX53)
+void enable_usb_phy1_clk(bool enable)
+{
+       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
+
+       clrsetbits_le32(&mxc_ccm->CCGR4,
+                       MXC_CCM_CCGR4_USB_PHY1(MXC_CCM_CCGR_CG_MASK),
+                       MXC_CCM_CCGR4_USB_PHY1(cg));
+}
+
+void enable_usb_phy2_clk(bool enable)
+{
+       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
+
+       clrsetbits_le32(&mxc_ccm->CCGR4,
+                       MXC_CCM_CCGR4_USB_PHY2(MXC_CCM_CCGR_CG_MASK),
+                       MXC_CCM_CCGR4_USB_PHY2(cg));
+}
+#endif
+
+/*
+ * Calculate the frequency of PLLn.
+ */
+static uint32_t decode_pll(struct mxc_pll_reg *pll, uint32_t infreq)
+{
+       uint32_t ctrl, op, mfd, mfn, mfi, pdf, ret;
+       uint64_t refclk, temp;
+       int32_t mfn_abs;
+
+       ctrl = readl(&pll->ctrl);
+
+       if (ctrl & MXC_DPLLC_CTL_HFSM) {
+               mfn = readl(&pll->hfs_mfn);
+               mfd = readl(&pll->hfs_mfd);
+               op = readl(&pll->hfs_op);
+       } else {
+               mfn = readl(&pll->mfn);
+               mfd = readl(&pll->mfd);
+               op = readl(&pll->op);
+       }
+
+       mfd &= MXC_DPLLC_MFD_MFD_MASK;
+       mfn &= MXC_DPLLC_MFN_MFN_MASK;
+       pdf = op & MXC_DPLLC_OP_PDF_MASK;
+       mfi = MXC_DPLLC_OP_MFI_RD(op);
+
+       /* 21.2.3 */
+       if (mfi < 5)
+               mfi = 5;
+
+       /* Sign extend */
+       if (mfn >= 0x04000000) {
+               mfn |= 0xfc000000;
+               mfn_abs = -mfn;
+       } else
+               mfn_abs = mfn;
+
+       refclk = infreq * 2;
+       if (ctrl & MXC_DPLLC_CTL_DPDCK0_2_EN)
+               refclk *= 2;
+
+       do_div(refclk, pdf + 1);
+       temp = refclk * mfn_abs;
+       do_div(temp, mfd + 1);
+       ret = refclk * mfi;
+
+       if ((int)mfn < 0)
+               ret -= temp;
+       else
+               ret += temp;
+
+       return ret;
+}
+
+#ifdef CONFIG_MX51
+/*
+ * This function returns the Frequency Pre-Multiplier clock.
+ */
+static u32 get_fpm(void)
+{
+       u32 mult;
+       u32 ccr = readl(&mxc_ccm->ccr);
+
+       if (ccr & MXC_CCM_CCR_FPM_MULT)
+               mult = 1024;
+       else
+               mult = 512;
+
+       return MXC_CLK32 * mult;
+}
+#endif
+
+/*
+ * This function returns the low power audio clock.
+ */
+static u32 get_lp_apm(void)
+{
+       u32 ret_val = 0;
+       u32 ccsr = readl(&mxc_ccm->ccsr);
+
+       if (ccsr & MXC_CCM_CCSR_LP_APM)
+#if defined(CONFIG_MX51)
+               ret_val = get_fpm();
+#elif defined(CONFIG_MX53)
+               ret_val = decode_pll(mxc_plls[PLL4_CLOCK], MXC_HCLK);
+#endif
+       else
+               ret_val = MXC_HCLK;
+
+       return ret_val;
+}
+
+/*
+ * Get mcu main rate
+ */
+u32 get_mcu_main_clk(void)
+{
+       u32 reg, freq;
+
+       reg = MXC_CCM_CACRR_ARM_PODF_RD(readl(&mxc_ccm->cacrr));
+       freq = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
+       return freq / (reg + 1);
+}
+
+/*
+ * Get the rate of peripheral's root clock.
+ */
+u32 get_periph_clk(void)
+{
+       u32 reg;
+
+       reg = readl(&mxc_ccm->cbcdr);
+       if (!(reg & MXC_CCM_CBCDR_PERIPH_CLK_SEL))
+               return decode_pll(mxc_plls[PLL2_CLOCK], MXC_HCLK);
+       reg = readl(&mxc_ccm->cbcmr);
+       switch (MXC_CCM_CBCMR_PERIPH_CLK_SEL_RD(reg)) {
+       case 0:
+               return decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
+       case 1:
+               return decode_pll(mxc_plls[PLL3_CLOCK], MXC_HCLK);
+       case 2:
+               return get_lp_apm();
+       default:
+               return 0;
+       }
+       /* NOTREACHED */
+}
+
+/*
+ * Get the rate of ipg clock.
+ */
+static u32 get_ipg_clk(void)
+{
+       uint32_t freq, reg, div;
+
+       freq = get_ahb_clk();
+
+       reg = readl(&mxc_ccm->cbcdr);
+       div = MXC_CCM_CBCDR_IPG_PODF_RD(reg) + 1;
+
+       return freq / div;
+}
+
+/*
+ * Get the rate of ipg_per clock.
+ */
+static u32 get_ipg_per_clk(void)
+{
+       u32 freq, pred1, pred2, podf;
+
+       if (readl(&mxc_ccm->cbcmr) & MXC_CCM_CBCMR_PERCLK_IPG_CLK_SEL)
+               return get_ipg_clk();
+
+       if (readl(&mxc_ccm->cbcmr) & MXC_CCM_CBCMR_PERCLK_LP_APM_CLK_SEL)
+               freq = get_lp_apm();
+       else
+               freq = get_periph_clk();
+       podf = readl(&mxc_ccm->cbcdr);
+       pred1 = MXC_CCM_CBCDR_PERCLK_PRED1_RD(podf);
+       pred2 = MXC_CCM_CBCDR_PERCLK_PRED2_RD(podf);
+       podf = MXC_CCM_CBCDR_PERCLK_PODF_RD(podf);
+       return freq / ((pred1 + 1) * (pred2 + 1) * (podf + 1));
+}
+
+/* Get the output clock rate of a standard PLL MUX for peripherals. */
+static u32 get_standard_pll_sel_clk(u32 clk_sel)
+{
+       u32 freq = 0;
+
+       switch (clk_sel & 0x3) {
+       case 0:
+               freq = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
+               break;
+       case 1:
+               freq = decode_pll(mxc_plls[PLL2_CLOCK], MXC_HCLK);
+               break;
+       case 2:
+               freq = decode_pll(mxc_plls[PLL3_CLOCK], MXC_HCLK);
+               break;
+       case 3:
+               freq = get_lp_apm();
+               break;
+       }
+
+       return freq;
+}
+
+/*
+ * Get the rate of uart clk.
+ */
+static u32 get_uart_clk(void)
+{
+       unsigned int clk_sel, freq, reg, pred, podf;
+
+       reg = readl(&mxc_ccm->cscmr1);
+       clk_sel = MXC_CCM_CSCMR1_UART_CLK_SEL_RD(reg);
+       freq = get_standard_pll_sel_clk(clk_sel);
+
+       reg = readl(&mxc_ccm->cscdr1);
+       pred = MXC_CCM_CSCDR1_UART_CLK_PRED_RD(reg);
+       podf = MXC_CCM_CSCDR1_UART_CLK_PODF_RD(reg);
+       freq /= (pred + 1) * (podf + 1);
+
+       return freq;
+}
+
+/*
+ * get cspi clock rate.
+ */
+static u32 imx_get_cspiclk(void)
+{
+       u32 ret_val = 0, pdf, pre_pdf, clk_sel, freq;
+       u32 cscmr1 = readl(&mxc_ccm->cscmr1);
+       u32 cscdr2 = readl(&mxc_ccm->cscdr2);
+
+       pre_pdf = MXC_CCM_CSCDR2_CSPI_CLK_PRED_RD(cscdr2);
+       pdf = MXC_CCM_CSCDR2_CSPI_CLK_PODF_RD(cscdr2);
+       clk_sel = MXC_CCM_CSCMR1_CSPI_CLK_SEL_RD(cscmr1);
+       freq = get_standard_pll_sel_clk(clk_sel);
+       ret_val = freq / ((pre_pdf + 1) * (pdf + 1));
+       return ret_val;
+}
+
+/*
+ * get esdhc clock rate.
+ */
+static u32 get_esdhc_clk(u32 port)
+{
+       u32 clk_sel = 0, pred = 0, podf = 0, freq = 0;
+       u32 cscmr1 = readl(&mxc_ccm->cscmr1);
+       u32 cscdr1 = readl(&mxc_ccm->cscdr1);
+
+       switch (port) {
+       case 0:
+               clk_sel = MXC_CCM_CSCMR1_ESDHC1_MSHC1_CLK_SEL_RD(cscmr1);
+               pred = MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PRED_RD(cscdr1);
+               podf = MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PODF_RD(cscdr1);
+               break;
+       case 1:
+               clk_sel = MXC_CCM_CSCMR1_ESDHC2_MSHC2_CLK_SEL_RD(cscmr1);
+               pred = MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PRED_RD(cscdr1);
+               podf = MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PODF_RD(cscdr1);
+               break;
+       case 2:
+               if (cscmr1 & MXC_CCM_CSCMR1_ESDHC3_CLK_SEL)
+                       return get_esdhc_clk(1);
+               else
+                       return get_esdhc_clk(0);
+       case 3:
+               if (cscmr1 & MXC_CCM_CSCMR1_ESDHC4_CLK_SEL)
+                       return get_esdhc_clk(1);
+               else
+                       return get_esdhc_clk(0);
+       default:
+               break;
+       }
+
+       freq = get_standard_pll_sel_clk(clk_sel) / ((pred + 1) * (podf + 1));
+       return freq;
+}
+
+static u32 get_axi_a_clk(void)
+{
+       u32 cbcdr = readl(&mxc_ccm->cbcdr);
+       u32 pdf = MXC_CCM_CBCDR_AXI_A_PODF_RD(cbcdr);
+
+       return  get_periph_clk() / (pdf + 1);
+}
+
+static u32 get_axi_b_clk(void)
+{
+       u32 cbcdr = readl(&mxc_ccm->cbcdr);
+       u32 pdf = MXC_CCM_CBCDR_AXI_B_PODF_RD(cbcdr);
+
+       return  get_periph_clk() / (pdf + 1);
+}
+
+static u32 get_emi_slow_clk(void)
+{
+       u32 cbcdr = readl(&mxc_ccm->cbcdr);
+       u32 emi_clk_sel = cbcdr & MXC_CCM_CBCDR_EMI_CLK_SEL;
+       u32 pdf = MXC_CCM_CBCDR_EMI_PODF_RD(cbcdr);
+
+       if (emi_clk_sel)
+               return  get_ahb_clk() / (pdf + 1);
+
+       return  get_periph_clk() / (pdf + 1);
+}
+
+static u32 get_ddr_clk(void)
+{
+       u32 ret_val = 0;
+       u32 cbcmr = readl(&mxc_ccm->cbcmr);
+       u32 ddr_clk_sel = MXC_CCM_CBCMR_DDR_CLK_SEL_RD(cbcmr);
+#ifdef CONFIG_MX51
+       u32 cbcdr = readl(&mxc_ccm->cbcdr);
+       if (cbcdr & MXC_CCM_CBCDR_DDR_HIFREQ_SEL) {
+               u32 ddr_clk_podf = MXC_CCM_CBCDR_DDR_PODF_RD(cbcdr);
+
+               ret_val = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
+               ret_val /= ddr_clk_podf + 1;
+
+               return ret_val;
+       }
+#endif
+       switch (ddr_clk_sel) {
+       case 0:
+               ret_val = get_axi_a_clk();
+               break;
+       case 1:
+               ret_val = get_axi_b_clk();
+               break;
+       case 2:
+               ret_val = get_emi_slow_clk();
+               break;
+       case 3:
+               ret_val = get_ahb_clk();
+               break;
+       default:
+               break;
+       }
+
+       return ret_val;
+}
+
+/*
+ * The API of get mxc clocks.
+ */
+unsigned int mxc_get_clock(enum mxc_clock clk)
+{
+       switch (clk) {
+       case MXC_ARM_CLK:
+               return get_mcu_main_clk();
+       case MXC_AHB_CLK:
+               return get_ahb_clk();
+       case MXC_IPG_CLK:
+               return get_ipg_clk();
+       case MXC_IPG_PERCLK:
+       case MXC_I2C_CLK:
+               return get_ipg_per_clk();
+       case MXC_UART_CLK:
+               return get_uart_clk();
+       case MXC_CSPI_CLK:
+               return imx_get_cspiclk();
+       case MXC_ESDHC_CLK:
+               return get_esdhc_clk(0);
+       case MXC_ESDHC2_CLK:
+               return get_esdhc_clk(1);
+       case MXC_ESDHC3_CLK:
+               return get_esdhc_clk(2);
+       case MXC_ESDHC4_CLK:
+               return get_esdhc_clk(3);
+       case MXC_FEC_CLK:
+               return get_ipg_clk();
+       case MXC_SATA_CLK:
+               return get_ahb_clk();
+       case MXC_DDR_CLK:
+               return get_ddr_clk();
+       default:
+               break;
+       }
+       return -EINVAL;
+}
+
+u32 imx_get_uartclk(void)
+{
+       return get_uart_clk();
+}
+
+u32 imx_get_fecclk(void)
+{
+       return get_ipg_clk();
+}
+
+static int gcd(int m, int n)
+{
+       int t;
+       while (m > 0) {
+               if (n > m) {
+                       t = m;
+                       m = n;
+                       n = t;
+               } /* swap */
+               m -= n;
+       }
+       return n;
+}
+
+/*
+ * This is to calculate various parameters based on reference clock and
+ * targeted clock based on the equation:
+ *      t_clk = 2*ref_freq*(mfi + mfn/(mfd+1))/(pd+1)
+ * This calculation is based on a fixed MFD value for simplicity.
+ */
+static int calc_pll_params(u32 ref, u32 target, struct pll_param *pll)
+{
+       u64 pd, mfi = 1, mfn, mfd, t1;
+       u32 n_target = target;
+       u32 n_ref = ref, i;
+
+       /*
+        * Make sure targeted freq is in the valid range.
+        * Otherwise the following calculation might be wrong!!!
+        */
+       if (n_target < PLL_FREQ_MIN(ref) ||
+               n_target > PLL_FREQ_MAX(ref)) {
+               printf("Targeted peripheral clock should be"
+                       "within [%d - %d]\n",
+                       PLL_FREQ_MIN(ref) / SZ_DEC_1M,
+                       PLL_FREQ_MAX(ref) / SZ_DEC_1M);
+               return -EINVAL;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(fixed_mfd); i++) {
+               if (fixed_mfd[i].ref_clk_hz == ref) {
+                       mfd = fixed_mfd[i].mfd;
+                       break;
+               }
+       }
+
+       if (i == ARRAY_SIZE(fixed_mfd))
+               return -EINVAL;
+
+       /* Use n_target and n_ref to avoid overflow */
+       for (pd = 1; pd <= PLL_PD_MAX; pd++) {
+               t1 = n_target * pd;
+               do_div(t1, (4 * n_ref));
+               mfi = t1;
+               if (mfi > PLL_MFI_MAX)
+                       return -EINVAL;
+               else if (mfi < 5)
+                       continue;
+               break;
+       }
+       /*
+        * Now got pd and mfi already
+        *
+        * mfn = (((n_target * pd) / 4 - n_ref * mfi) * mfd) / n_ref;
+        */
+       t1 = n_target * pd;
+       do_div(t1, 4);
+       t1 -= n_ref * mfi;
+       t1 *= mfd;
+       do_div(t1, n_ref);
+       mfn = t1;
+       debug("ref=%d, target=%d, pd=%d," "mfi=%d,mfn=%d, mfd=%d\n",
+               ref, n_target, (u32)pd, (u32)mfi, (u32)mfn, (u32)mfd);
+       i = 1;
+       if (mfn != 0)
+               i = gcd(mfd, mfn);
+       pll->pd = (u32)pd;
+       pll->mfi = (u32)mfi;
+       do_div(mfn, i);
+       pll->mfn = (u32)mfn;
+       do_div(mfd, i);
+       pll->mfd = (u32)mfd;
+
+       return 0;
+}
+
+#define calc_div(tgt_clk, src_clk, limit) ({           \
+               u32 v = 0;                              \
+               if (((src_clk) % (tgt_clk)) <= 100)     \
+                       v = (src_clk) / (tgt_clk);      \
+               else                                    \
+                       v = ((src_clk) / (tgt_clk)) + 1;\
+               if (v > limit)                          \
+                       v = limit;                      \
+               (v - 1);                                \
+       })
+
+#define CHANGE_PLL_SETTINGS(pll, pd, fi, fn, fd) \
+       {       \
+               writel(0x1232, &pll->ctrl);             \
+               writel(0x2, &pll->config);              \
+               writel((((pd) - 1) << 0) | ((fi) << 4), \
+                       &pll->op);                      \
+               writel(fn, &(pll->mfn));                \
+               writel((fd) - 1, &pll->mfd);            \
+               writel((((pd) - 1) << 0) | ((fi) << 4), \
+                       &pll->hfs_op);                  \
+               writel(fn, &pll->hfs_mfn);              \
+               writel((fd) - 1, &pll->hfs_mfd);        \
+               writel(0x1232, &pll->ctrl);             \
+               while (!readl(&pll->ctrl) & 0x1)        \
+                       ;\
+       }
+
+static int config_pll_clk(enum pll_clocks index, struct pll_param *pll_param)
+{
+       u32 ccsr = readl(&mxc_ccm->ccsr);
+       struct mxc_pll_reg *pll = mxc_plls[index];
+
+       switch (index) {
+       case PLL1_CLOCK:
+               /* Switch ARM to PLL2 clock */
+               writel(ccsr | MXC_CCM_CCSR_PLL1_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
+                                       pll_param->mfi, pll_param->mfn,
+                                       pll_param->mfd);
+               /* Switch back */
+               writel(ccsr & ~MXC_CCM_CCSR_PLL1_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               break;
+       case PLL2_CLOCK:
+               /* Switch to pll2 bypass clock */
+               writel(ccsr | MXC_CCM_CCSR_PLL2_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
+                                       pll_param->mfi, pll_param->mfn,
+                                       pll_param->mfd);
+               /* Switch back */
+               writel(ccsr & ~MXC_CCM_CCSR_PLL2_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               break;
+       case PLL3_CLOCK:
+               /* Switch to pll3 bypass clock */
+               writel(ccsr | MXC_CCM_CCSR_PLL3_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
+                                       pll_param->mfi, pll_param->mfn,
+                                       pll_param->mfd);
+               /* Switch back */
+               writel(ccsr & ~MXC_CCM_CCSR_PLL3_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               break;
+#ifdef CONFIG_MX53
+       case PLL4_CLOCK:
+               /* Switch to pll4 bypass clock */
+               writel(ccsr | MXC_CCM_CCSR_PLL4_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               CHANGE_PLL_SETTINGS(pll, pll_param->pd,
+                                       pll_param->mfi, pll_param->mfn,
+                                       pll_param->mfd);
+               /* Switch back */
+               writel(ccsr & ~MXC_CCM_CCSR_PLL4_SW_CLK_SEL,
+                               &mxc_ccm->ccsr);
+               break;
+#endif
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+/* Config CPU clock */
+static int config_core_clk(u32 ref, u32 freq)
+{
+       int ret = 0;
+       struct pll_param pll_param;
+
+       memset(&pll_param, 0, sizeof(struct pll_param));
+
+       /* The case that periph uses PLL1 is not considered here */
+       ret = calc_pll_params(ref, freq, &pll_param);
+       if (ret != 0) {
+               printf("Error:Can't find pll parameters: %d\n", ret);
+               return ret;
+       }
+
+       return config_pll_clk(PLL1_CLOCK, &pll_param);
+}
+
+static int config_nfc_clk(u32 nfc_clk)
+{
+       u32 parent_rate = get_emi_slow_clk();
+       u32 div;
+
+       if (nfc_clk == 0)
+               return -EINVAL;
+       div = parent_rate / nfc_clk;
+       if (div == 0)
+               div++;
+       if (parent_rate / div > NFC_CLK_MAX)
+               div++;
+       clrsetbits_le32(&mxc_ccm->cbcdr,
+                       MXC_CCM_CBCDR_NFC_PODF_MASK,
+                       MXC_CCM_CBCDR_NFC_PODF(div - 1));
+       while (readl(&mxc_ccm->cdhipr) != 0)
+               ;
+       return 0;
+}
+
+void enable_nfc_clk(unsigned char enable)
+{
+       unsigned int cg = enable ? MXC_CCM_CCGR_CG_ON : MXC_CCM_CCGR_CG_OFF;
+
+       clrsetbits_le32(&mxc_ccm->CCGR5,
+               MXC_CCM_CCGR5_EMI_ENFC(MXC_CCM_CCGR_CG_MASK),
+               MXC_CCM_CCGR5_EMI_ENFC(cg));
+}
+
+#ifdef CONFIG_FSL_IIM
+void enable_efuse_prog_supply(bool enable)
+{
+       if (enable)
+               setbits_le32(&mxc_ccm->cgpr,
+                            MXC_CCM_CGPR_EFUSE_PROG_SUPPLY_GATE);
+       else
+               clrbits_le32(&mxc_ccm->cgpr,
+                            MXC_CCM_CGPR_EFUSE_PROG_SUPPLY_GATE);
+}
+#endif
+
+/* Config main_bus_clock for periphs */
+static int config_periph_clk(u32 ref, u32 freq)
+{
+       int ret = 0;
+       struct pll_param pll_param;
+
+       memset(&pll_param, 0, sizeof(struct pll_param));
+
+       if (readl(&mxc_ccm->cbcdr) & MXC_CCM_CBCDR_PERIPH_CLK_SEL) {
+               ret = calc_pll_params(ref, freq, &pll_param);
+               if (ret != 0) {
+                       printf("Error:Can't find pll parameters: %d\n",
+                               ret);
+                       return ret;
+               }
+               switch (MXC_CCM_CBCMR_PERIPH_CLK_SEL_RD(
+                               readl(&mxc_ccm->cbcmr))) {
+               case 0:
+                       return config_pll_clk(PLL1_CLOCK, &pll_param);
+                       break;
+               case 1:
+                       return config_pll_clk(PLL3_CLOCK, &pll_param);
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
+static int config_ddr_clk(u32 emi_clk)
+{
+       u32 clk_src;
+       s32 shift = 0, clk_sel, div = 1;
+       u32 cbcmr = readl(&mxc_ccm->cbcmr);
+
+       if (emi_clk > MAX_DDR_CLK) {
+               printf("Warning:DDR clock should not exceed %d MHz\n",
+                       MAX_DDR_CLK / SZ_DEC_1M);
+               emi_clk = MAX_DDR_CLK;
+       }
+
+       clk_src = get_periph_clk();
+       /* Find DDR clock input */
+       clk_sel = MXC_CCM_CBCMR_DDR_CLK_SEL_RD(cbcmr);
+       switch (clk_sel) {
+       case 0:
+               shift = 16;
+               break;
+       case 1:
+               shift = 19;
+               break;
+       case 2:
+               shift = 22;
+               break;
+       case 3:
+               shift = 10;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       if ((clk_src % emi_clk) < 10000000)
+               div = clk_src / emi_clk;
+       else
+               div = (clk_src / emi_clk) + 1;
+       if (div > 8)
+               div = 8;
+
+       clrsetbits_le32(&mxc_ccm->cbcdr, 0x7 << shift, (div - 1) << shift);
+       while (readl(&mxc_ccm->cdhipr) != 0)
+               ;
+       writel(0x0, &mxc_ccm->ccdr);
+
+       return 0;
+}
+
+/*
+ * This function assumes the expected core clock has to be changed by
+ * modifying the PLL. This is NOT true always but for most of the times,
+ * it is. So it assumes the PLL output freq is the same as the expected
+ * core clock (presc=1) unless the core clock is less than PLL_FREQ_MIN.
+ * In the latter case, it will try to increase the presc value until
+ * (presc*core_clk) is greater than PLL_FREQ_MIN. It then makes call to
+ * calc_pll_params() and obtains the values of PD, MFI,MFN, MFD based
+ * on the targeted PLL and reference input clock to the PLL. Lastly,
+ * it sets the register based on these values along with the dividers.
+ * Note 1) There is no value checking for the passed-in divider values
+ *         so the caller has to make sure those values are sensible.
+ *      2) Also adjust the NFC divider such that the NFC clock doesn't
+ *         exceed NFC_CLK_MAX.
+ *      3) IPU HSP clock is independent of AHB clock. Even it can go up to
+ *         177MHz for higher voltage, this function fixes the max to 133MHz.
+ *      4) This function should not have allowed diag_printf() calls since
+ *         the serial driver has been stoped. But leave then here to allow
+ *         easy debugging by NOT calling the cyg_hal_plf_serial_stop().
+ */
+int mxc_set_clock(u32 ref, u32 freq, enum mxc_clock clk)
+{
+       freq *= SZ_DEC_1M;
+
+       switch (clk) {
+       case MXC_ARM_CLK:
+               if (config_core_clk(ref, freq))
+                       return -EINVAL;
+               break;
+       case MXC_PERIPH_CLK:
+               if (config_periph_clk(ref, freq))
+                       return -EINVAL;
+               break;
+       case MXC_DDR_CLK:
+               if (config_ddr_clk(freq))
+                       return -EINVAL;
+               break;
+       case MXC_NFC_CLK:
+               if (config_nfc_clk(freq))
+                       return -EINVAL;
+               break;
+       default:
+               printf("Warning:Unsupported or invalid clock type\n");
+       }
+
+       return 0;
+}
+
+#ifdef CONFIG_MX53
+/*
+ * The clock for the external interface can be set to use internal clock
+ * if fuse bank 4, row 3, bit 2 is set.
+ * This is an undocumented feature and it was confirmed by Freescale's support:
+ * Fuses (but not pins) may be used to configure SATA clocks.
+ * Particularly the i.MX53 Fuse_Map contains the next information
+ * about configuring SATA clocks :  SATA_ALT_REF_CLK[1:0] (offset 0x180C)
+ * '00' - 100MHz (External)
+ * '01' - 50MHz (External)
+ * '10' - 120MHz, internal (USB PHY)
+ * '11' - Reserved
+*/
+void mxc_set_sata_internal_clock(void)
+{
+       u32 *tmp_base =
+               (u32 *)(IIM_BASE_ADDR + 0x180c);
+
+       set_usb_phy_clk();
+
+       clrsetbits_le32(tmp_base, 0x6, 0x4);
+}
+#endif
+
+/*
+ * Dump some core clockes.
+ */
+int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       u32 freq;
+
+       freq = decode_pll(mxc_plls[PLL1_CLOCK], MXC_HCLK);
+       printf("PLL1       %8d MHz\n", freq / 1000000);
+       freq = decode_pll(mxc_plls[PLL2_CLOCK], MXC_HCLK);
+       printf("PLL2       %8d MHz\n", freq / 1000000);
+       freq = decode_pll(mxc_plls[PLL3_CLOCK], MXC_HCLK);
+       printf("PLL3       %8d MHz\n", freq / 1000000);
+#ifdef CONFIG_MX53
+       freq = decode_pll(mxc_plls[PLL4_CLOCK], MXC_HCLK);
+       printf("PLL4       %8d MHz\n", freq / 1000000);
+#endif
+
+       printf("\n");
+       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
+       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
+       printf("IPG PERCLK %8d kHz\n", mxc_get_clock(MXC_IPG_PERCLK) / 1000);
+       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
+#ifdef CONFIG_MXC_SPI
+       printf("CSPI       %8d kHz\n", mxc_get_clock(MXC_CSPI_CLK) / 1000);
+#endif
+       return 0;
+}
+
+/***************************************************/
+
+U_BOOT_CMD(
+       clocks, CONFIG_SYS_MAXARGS, 1, do_mx5_showclocks,
+       "display clocks",
+       ""
+);
diff --git a/arch/arm/mach-imx/mx5/lowlevel_init.S b/arch/arm/mach-imx/mx5/lowlevel_init.S
new file mode 100644 (file)
index 0000000..f5bc672
--- /dev/null
@@ -0,0 +1,429 @@
+/*
+ * Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
+ *
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <config.h>
+#include <asm/arch/imx-regs.h>
+#include <generated/asm-offsets.h>
+#include <linux/linkage.h>
+
+.section ".text.init", "x"
+
+.macro init_arm_erratum
+       /* ARM erratum ID #468414 */
+       mrc 15, 0, r1, c1, c0, 1
+       orr r1, r1, #(1 << 5)    /* enable L1NEON bit */
+       mcr 15, 0, r1, c1, c0, 1
+.endm
+
+/*
+ * L2CC Cache setup/invalidation/disable
+ */
+.macro init_l2cc
+       /* explicitly disable L2 cache */
+       mrc 15, 0, r0, c1, c0, 1
+       bic r0, r0, #0x2
+       mcr 15, 0, r0, c1, c0, 1
+
+       /* reconfigure L2 cache aux control reg */
+       ldr r0, =0xC0 |                 /* tag RAM */ \
+                0x4 |                  /* data RAM */ \
+                1 << 24 |              /* disable write allocate delay */ \
+                1 << 23 |              /* disable write allocate combine */ \
+                1 << 22                /* disable write allocate */
+
+#if defined(CONFIG_MX51)
+       ldr r3, [r4, #ROM_SI_REV]
+       cmp r3, #0x10
+
+       /* disable write combine for TO 2 and lower revs */
+       orrls r0, r0, #1 << 25
+#endif
+
+       mcr 15, 1, r0, c9, c0, 2
+
+       /* enable L2 cache */
+       mrc 15, 0, r0, c1, c0, 1
+       orr r0, r0, #2
+       mcr 15, 0, r0, c1, c0, 1
+
+.endm /* init_l2cc */
+
+/* AIPS setup - Only setup MPROTx registers.
+ * The PACR default values are good.*/
+.macro init_aips
+       /*
+        * Set all MPROTx to be non-bufferable, trusted for R/W,
+        * not forced to user-mode.
+        */
+       ldr r0, =AIPS1_BASE_ADDR
+       ldr r1, =0x77777777
+       str r1, [r0, #0x0]
+       str r1, [r0, #0x4]
+       ldr r0, =AIPS2_BASE_ADDR
+       str r1, [r0, #0x0]
+       str r1, [r0, #0x4]
+       /*
+        * Clear the on and off peripheral modules Supervisor Protect bit
+        * for SDMA to access them. Did not change the AIPS control registers
+        * (offset 0x20) access type
+        */
+.endm /* init_aips */
+
+/* M4IF setup */
+.macro init_m4if
+#ifdef CONFIG_MX51
+       /* VPU and IPU given higher priority (0x4)
+        * IPU accesses with ID=0x1 given highest priority (=0xA)
+        */
+       ldr r0, =M4IF_BASE_ADDR
+
+       ldr r1, =0x00000203
+       str r1, [r0, #0x40]
+
+       str r4, [r0, #0x44]
+
+       ldr r1, =0x00120125
+       str r1, [r0, #0x9C]
+
+       ldr r1, =0x001901A3
+       str r1, [r0, #0x48]
+
+#endif
+.endm /* init_m4if */
+
+.macro setup_pll pll, freq
+       ldr r0, =\pll
+       adr r2, W_DP_\freq
+       bl setup_pll_func
+.endm
+
+#define W_DP_OP                0
+#define W_DP_MFD       4
+#define W_DP_MFN       8
+
+setup_pll_func:
+       ldr r1, =0x00001232
+       str r1, [r0, #PLL_DP_CTL] /* Set DPLL ON (set UPEN bit): BRMO=1 */
+       mov r1, #0x2
+       str r1, [r0, #PLL_DP_CONFIG] /* Enable auto-restart AREN bit */
+
+       ldr r1, [r2, #W_DP_OP]
+       str r1, [r0, #PLL_DP_OP]
+       str r1, [r0, #PLL_DP_HFS_OP]
+
+       ldr r1, [r2, #W_DP_MFD]
+       str r1, [r0, #PLL_DP_MFD]
+       str r1, [r0, #PLL_DP_HFS_MFD]
+
+       ldr r1, [r2, #W_DP_MFN]
+       str r1, [r0, #PLL_DP_MFN]
+       str r1, [r0, #PLL_DP_HFS_MFN]
+
+       ldr r1, =0x00001232
+       str r1, [r0, #PLL_DP_CTL]
+1:     ldr r1, [r0, #PLL_DP_CTL]
+       ands r1, r1, #0x1
+       beq 1b
+
+       /* r10 saved upper lr */
+       mov pc, lr
+
+.macro setup_pll_errata pll, freq
+       ldr r2, =\pll
+       str r4, [r2, #PLL_DP_CONFIG] /* Disable auto-restart AREN bit */
+       ldr r1, =0x00001236
+       str r1, [r2, #PLL_DP_CTL]    /* Restart PLL with PLM=1 */
+1:     ldr r1, [r2, #PLL_DP_CTL]    /* Wait for lock */
+       ands r1, r1, #0x1
+       beq 1b
+
+       ldr r5, \freq
+       str r5, [r2, #PLL_DP_MFN]    /* Modify MFN value */
+       str r5, [r2, #PLL_DP_HFS_MFN]
+
+       mov r1, #0x1
+       str r1, [r2, #PLL_DP_CONFIG] /* Reload MFN value */
+
+2:     ldr r1, [r2, #PLL_DP_CONFIG]
+       tst r1, #1
+       bne 2b
+
+       ldr r1, =100                 /* Wait at least 4 us */
+3:     subs r1, r1, #1
+       bge 3b
+
+       mov r1, #0x2
+       str r1, [r2, #PLL_DP_CONFIG] /* Enable auto-restart AREN bit */
+.endm
+
+.macro init_clock
+#if defined (CONFIG_MX51)
+       ldr r0, =CCM_BASE_ADDR
+
+       /* Gate of clocks to the peripherals first */
+       ldr r1, =0x3FFFFFFF
+       str r1, [r0, #CLKCTL_CCGR0]
+       str r4, [r0, #CLKCTL_CCGR1]
+       str r4, [r0, #CLKCTL_CCGR2]
+       str r4, [r0, #CLKCTL_CCGR3]
+
+       ldr r1, =0x00030000
+       str r1, [r0, #CLKCTL_CCGR4]
+       ldr r1, =0x00FFF030
+       str r1, [r0, #CLKCTL_CCGR5]
+       ldr r1, =0x00000300
+       str r1, [r0, #CLKCTL_CCGR6]
+
+       /* Disable IPU and HSC dividers */
+       mov r1, #0x60000
+       str r1, [r0, #CLKCTL_CCDR]
+
+       /* Make sure to switch the DDR away from PLL 1 */
+       ldr r1, =0x19239145
+       str r1, [r0, #CLKCTL_CBCDR]
+       /* make sure divider effective */
+1:     ldr r1, [r0, #CLKCTL_CDHIPR]
+       cmp r1, #0x0
+       bne 1b
+
+       /* Switch ARM to step clock */
+       mov r1, #0x4
+       str r1, [r0, #CLKCTL_CCSR]
+
+#if defined(CONFIG_MX51_PLL_ERRATA)
+       setup_pll PLL1_BASE_ADDR, 864
+       setup_pll_errata PLL1_BASE_ADDR, W_DP_MFN_800_DIT
+#else
+       setup_pll PLL1_BASE_ADDR, 800
+#endif
+
+       setup_pll PLL3_BASE_ADDR, 665
+
+       /* Switch peripheral to PLL 3 */
+       ldr r0, =CCM_BASE_ADDR
+       ldr r1, =0x000010C0 | CONFIG_SYS_DDR_CLKSEL
+       str r1, [r0, #CLKCTL_CBCMR]
+       ldr r1, =0x13239145
+       str r1, [r0, #CLKCTL_CBCDR]
+       setup_pll PLL2_BASE_ADDR, 665
+
+       /* Switch peripheral to PLL2 */
+       ldr r0, =CCM_BASE_ADDR
+       ldr r1, =0x19239145
+       str r1, [r0, #CLKCTL_CBCDR]
+       ldr r1, =0x000020C0 | CONFIG_SYS_DDR_CLKSEL
+       str r1, [r0, #CLKCTL_CBCMR]
+
+       setup_pll PLL3_BASE_ADDR, 216
+
+       /* Set the platform clock dividers */
+       ldr r0, =ARM_BASE_ADDR
+       ldr r1, =0x00000725
+       str r1, [r0, #0x14]
+
+       ldr r0, =CCM_BASE_ADDR
+
+       /* Run 3.0 at Full speed, for other TO's wait till we increase VDDGP */
+       ldr r3, [r4, #ROM_SI_REV]
+       cmp r3, #0x10
+       movls r1, #0x1
+       movhi r1, #0
+
+       str r1, [r0, #CLKCTL_CACRR]
+
+       /* Switch ARM back to PLL 1 */
+       str r4, [r0, #CLKCTL_CCSR]
+
+       /* setup the rest */
+       /* Use lp_apm (24MHz) source for perclk */
+       ldr r1, =0x000020C2 | CONFIG_SYS_DDR_CLKSEL
+       str r1, [r0, #CLKCTL_CBCMR]
+       /* ddr clock from PLL 1, all perclk dividers are 1 since using 24MHz */
+       ldr r1, =CONFIG_SYS_CLKTL_CBCDR
+       str r1, [r0, #CLKCTL_CBCDR]
+
+       /* Restore the default values in the Gate registers */
+       ldr r1, =0xFFFFFFFF
+       str r1, [r0, #CLKCTL_CCGR0]
+       str r1, [r0, #CLKCTL_CCGR1]
+       str r1, [r0, #CLKCTL_CCGR2]
+       str r1, [r0, #CLKCTL_CCGR3]
+       str r1, [r0, #CLKCTL_CCGR4]
+       str r1, [r0, #CLKCTL_CCGR5]
+       str r1, [r0, #CLKCTL_CCGR6]
+
+       /* Use PLL 2 for UART's, get 66.5MHz from it */
+       ldr r1, =0xA5A2A020
+       str r1, [r0, #CLKCTL_CSCMR1]
+       ldr r1, =0x00C30321
+       str r1, [r0, #CLKCTL_CSCDR1]
+       /* make sure divider effective */
+1:     ldr r1, [r0, #CLKCTL_CDHIPR]
+       cmp r1, #0x0
+       bne 1b
+
+       str r4, [r0, #CLKCTL_CCDR]
+
+       /* for cko - for ARM div by 8 */
+       mov r1, #0x000A0000
+       add r1, r1, #0x00000F0
+       str r1, [r0, #CLKCTL_CCOSR]
+#else  /* CONFIG_MX53 */
+       ldr r0, =CCM_BASE_ADDR
+
+       /* Gate of clocks to the peripherals first */
+       ldr r1, =0x3FFFFFFF
+       str r1, [r0, #CLKCTL_CCGR0]
+       str r4, [r0, #CLKCTL_CCGR1]
+       str r4, [r0, #CLKCTL_CCGR2]
+       str r4, [r0, #CLKCTL_CCGR3]
+       str r4, [r0, #CLKCTL_CCGR7]
+       ldr r1, =0x00030000
+       str r1, [r0, #CLKCTL_CCGR4]
+       ldr r1, =0x00FFF030
+       str r1, [r0, #CLKCTL_CCGR5]
+       ldr r1, =0x0F00030F
+       str r1, [r0, #CLKCTL_CCGR6]
+
+       /* Switch ARM to step clock */
+       mov r1, #0x4
+       str r1, [r0, #CLKCTL_CCSR]
+
+       setup_pll PLL1_BASE_ADDR, 800
+
+       setup_pll PLL3_BASE_ADDR, 400
+
+       /* Switch peripheral to PLL3 */
+       ldr r0, =CCM_BASE_ADDR
+       ldr r1, =0x00015154
+       str r1, [r0, #CLKCTL_CBCMR]
+       ldr r1, =0x02898945
+       str r1, [r0, #CLKCTL_CBCDR]
+       /* make sure change is effective */
+1:      ldr r1, [r0, #CLKCTL_CDHIPR]
+       cmp r1, #0x0
+       bne 1b
+
+       setup_pll PLL2_BASE_ADDR, 400
+
+       /* Switch peripheral to PLL2 */
+       ldr r0, =CCM_BASE_ADDR
+       ldr r1, =0x00888945
+       str r1, [r0, #CLKCTL_CBCDR]
+
+       ldr r1, =0x00016154
+       str r1, [r0, #CLKCTL_CBCMR]
+
+       /*change uart clk parent to pll2*/
+       ldr r1, [r0, #CLKCTL_CSCMR1]
+       and r1, r1, #0xfcffffff
+       orr r1, r1, #0x01000000
+       str r1, [r0, #CLKCTL_CSCMR1]
+
+       /* make sure change is effective */
+1:      ldr r1, [r0, #CLKCTL_CDHIPR]
+       cmp r1, #0x0
+       bne 1b
+
+       setup_pll PLL3_BASE_ADDR, 216
+
+       setup_pll PLL4_BASE_ADDR, 455
+
+       /* Set the platform clock dividers */
+       ldr r0, =ARM_BASE_ADDR
+       ldr r1, =0x00000124
+       str r1, [r0, #0x14]
+
+       ldr r0, =CCM_BASE_ADDR
+       mov r1, #0
+       str r1, [r0, #CLKCTL_CACRR]
+
+       /* Switch ARM back to PLL 1. */
+       mov r1, #0x0
+       str r1, [r0, #CLKCTL_CCSR]
+
+       /* make uart div=6 */
+       ldr r1, [r0, #CLKCTL_CSCDR1]
+       and r1, r1, #0xffffffc0
+       orr r1, r1, #0x0a
+       str r1, [r0, #CLKCTL_CSCDR1]
+
+       /* Restore the default values in the Gate registers */
+       ldr r1, =0xFFFFFFFF
+       str r1, [r0, #CLKCTL_CCGR0]
+       str r1, [r0, #CLKCTL_CCGR1]
+       str r1, [r0, #CLKCTL_CCGR2]
+       str r1, [r0, #CLKCTL_CCGR3]
+       str r1, [r0, #CLKCTL_CCGR4]
+       str r1, [r0, #CLKCTL_CCGR5]
+       str r1, [r0, #CLKCTL_CCGR6]
+       str r1, [r0, #CLKCTL_CCGR7]
+
+       mov r1, #0x00000
+       str r1, [r0, #CLKCTL_CCDR]
+
+       /* for cko - for ARM div by 8 */
+       mov r1, #0x000A0000
+       add r1, r1, #0x00000F0
+       str r1, [r0, #CLKCTL_CCOSR]
+
+#endif /* CONFIG_MX53 */
+.endm
+
+ENTRY(lowlevel_init)
+       mov r10, lr
+       mov r4, #0      /* Fix R4 to 0 */
+
+#if defined(CONFIG_SYS_MAIN_PWR_ON)
+       ldr r0, =GPIO1_BASE_ADDR
+       ldr r1, [r0, #0x0]
+       orr r1, r1, #1 << 23
+       str r1, [r0, #0x0]
+       ldr r1, [r0, #0x4]
+       orr r1, r1, #1 << 23
+       str r1, [r0, #0x4]
+#endif
+
+       init_arm_erratum
+
+       init_l2cc
+
+       init_aips
+
+       init_m4if
+
+       init_clock
+
+       mov pc, r10
+ENDPROC(lowlevel_init)
+
+/* Board level setting value */
+#if defined(CONFIG_MX51_PLL_ERRATA)
+W_DP_864:              .word DP_OP_864
+                       .word DP_MFD_864
+                       .word DP_MFN_864
+W_DP_MFN_800_DIT:      .word DP_MFN_800_DIT
+#else
+W_DP_800:              .word DP_OP_800
+                       .word DP_MFD_800
+                       .word DP_MFN_800
+#endif
+#if defined(CONFIG_MX51)
+W_DP_665:              .word DP_OP_665
+                       .word DP_MFD_665
+                       .word DP_MFN_665
+#endif
+W_DP_216:              .word DP_OP_216
+                       .word DP_MFD_216
+                       .word DP_MFN_216
+W_DP_400:               .word DP_OP_400
+                       .word DP_MFD_400
+                       .word DP_MFN_400
+W_DP_455:               .word DP_OP_455
+                       .word DP_MFD_455
+                       .word DP_MFN_455
diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c
new file mode 100644 (file)
index 0000000..2b63871
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+ * (C) Copyright 2007
+ * Sascha Hauer, Pengutronix
+ *
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+#include <linux/errno.h>
+#include <asm/io.h>
+#include <asm/mach-imx/boot_mode.h>
+
+#if !(defined(CONFIG_MX51) || defined(CONFIG_MX53))
+#error "CPU_TYPE not defined"
+#endif
+
+u32 get_cpu_rev(void)
+{
+#ifdef CONFIG_MX51
+       int system_rev = 0x51000;
+#else
+       int system_rev = 0x53000;
+#endif
+       int reg = __raw_readl(ROM_SI_REV);
+
+#if defined(CONFIG_MX51)
+       switch (reg) {
+       case 0x02:
+               system_rev |= CHIP_REV_1_1;
+               break;
+       case 0x10:
+               if ((__raw_readl(GPIO1_BASE_ADDR + 0x0) & (0x1 << 22)) == 0)
+                       system_rev |= CHIP_REV_2_5;
+               else
+                       system_rev |= CHIP_REV_2_0;
+               break;
+       case 0x20:
+               system_rev |= CHIP_REV_3_0;
+               break;
+       default:
+               system_rev |= CHIP_REV_1_0;
+               break;
+       }
+#else
+       if (reg < 0x20)
+               system_rev |= CHIP_REV_1_0;
+       else
+               system_rev |= reg;
+#endif
+       return system_rev;
+}
+
+#ifdef CONFIG_REVISION_TAG
+u32 __weak get_board_rev(void)
+{
+       return get_cpu_rev();
+}
+#endif
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+       /* Enable D-cache. I-cache is already enabled in start.S */
+       dcache_enable();
+}
+#endif
+
+#if defined(CONFIG_FEC_MXC)
+void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
+{
+       int i;
+       struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
+       struct fuse_bank *bank = &iim->bank[1];
+       struct fuse_bank1_regs *fuse =
+                       (struct fuse_bank1_regs *)bank->fuse_regs;
+
+       for (i = 0; i < 6; i++)
+               mac[i] = readl(&fuse->mac_addr[i]) & 0xff;
+}
+#endif
+
+#ifdef CONFIG_MX53
+void boot_mode_apply(unsigned cfg_val)
+{
+       writel(cfg_val, &((struct srtc_regs *)SRTC_BASE_ADDR)->lpgr);
+}
+/*
+ * cfg_val will be used for
+ * Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0]
+ *
+ * If bit 28 of LPGR is set upon watchdog reset,
+ * bits[25:0] of LPGR will move to SBMR.
+ */
+const struct boot_mode soc_boot_modes[] = {
+       {"normal",      MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)},
+       /* usb or serial download */
+       {"usb",         MAKE_CFGVAL(0x00, 0x00, 0x00, 0x13)},
+       {"sata",        MAKE_CFGVAL(0x28, 0x00, 0x00, 0x12)},
+       {"escpi1:0",    MAKE_CFGVAL(0x38, 0x20, 0x00, 0x12)},
+       {"escpi1:1",    MAKE_CFGVAL(0x38, 0x20, 0x04, 0x12)},
+       {"escpi1:2",    MAKE_CFGVAL(0x38, 0x20, 0x08, 0x12)},
+       {"escpi1:3",    MAKE_CFGVAL(0x38, 0x20, 0x0c, 0x12)},
+       /* 4 bit bus width */
+       {"esdhc1",      MAKE_CFGVAL(0x40, 0x20, 0x00, 0x12)},
+       {"esdhc2",      MAKE_CFGVAL(0x40, 0x20, 0x08, 0x12)},
+       {"esdhc3",      MAKE_CFGVAL(0x40, 0x20, 0x10, 0x12)},
+       {"esdhc4",      MAKE_CFGVAL(0x40, 0x20, 0x18, 0x12)},
+       {NULL,          0},
+};
+#endif
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
new file mode 100644 (file)
index 0000000..1595a76
--- /dev/null
@@ -0,0 +1,447 @@
+if ARCH_MX6
+
+config MX6
+       bool
+       default y
+       select ARM_ERRATA_743622 if !MX6UL
+       select ARM_ERRATA_751472 if !MX6UL
+       select ARM_ERRATA_761320 if !MX6UL
+       select ARM_ERRATA_794072 if !MX6UL
+       imply CMD_FUSE
+
+config MX6D
+       bool
+
+config MX6DL
+       bool
+
+config MX6Q
+       bool
+
+config MX6QDL
+       bool
+
+config MX6S
+       bool
+
+config MX6SL
+       bool
+
+config MX6SX
+       select ROM_UNIFIED_SECTIONS
+       bool
+
+config MX6SLL
+       select ROM_UNIFIED_SECTIONS
+       bool
+
+config MX6UL
+       select SYS_L2CACHE_OFF
+       select ROM_UNIFIED_SECTIONS
+       bool
+
+config MX6UL_LITESOM
+       bool
+       select MX6UL
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL
+
+config MX6UL_OPOS6UL
+       bool
+       select MX6UL
+       select BOARD_LATE_INIT
+       select DM
+       select DM_GPIO
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
+
+config MX6ULL
+       bool
+       select MX6UL
+
+config MX6_DDRCAL
+       bool "Include dynamic DDR calibration routines"
+       depends on SPL
+       default n
+       help
+         Say "Y" if your board uses dynamic (per-boot) DDR calibration.
+         If unsure, say N.
+
+choice
+       prompt "MX6 board select"
+       optional
+
+config TARGET_ADVANTECH_DMS_BA16
+       bool "Advantech dms-ba16"
+       select BOARD_LATE_INIT
+       select MX6Q
+       imply CMD_SATA
+
+config TARGET_APALIS_IMX6
+       bool "Toradex Apalis iMX6 board"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_THERMAL
+       imply CMD_SATA
+
+config TARGET_ARISTAINETOS
+       bool "aristainetos"
+
+config TARGET_ARISTAINETOS2
+       bool "aristainetos2"
+       select BOARD_LATE_INIT
+
+config TARGET_ARISTAINETOS2B
+       bool "Support aristainetos2-revB"
+       select BOARD_LATE_INIT
+
+config TARGET_CGTQMX6EVAL
+       bool "cgtqmx6eval"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+
+config TARGET_CM_FX6
+       bool "CM-FX6"
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
+config TARGET_COLIBRI_IMX6
+       bool "Toradex Colibri iMX6 board"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_THERMAL
+
+config TARGET_EMBESTMX6BOARDS
+       bool "embestmx6boards"
+       select BOARD_LATE_INIT
+
+config TARGET_GE_B450V3
+       bool "General Electric B450v3"
+       select BOARD_LATE_INIT
+       select MX6Q
+
+config TARGET_GE_B650V3
+       bool "General Electric B650v3"
+       select BOARD_LATE_INIT
+       select MX6Q
+
+config TARGET_GE_B850V3
+       bool "General Electric B850v3"
+       select BOARD_LATE_INIT
+       select MX6Q
+
+config TARGET_GW_VENTANA
+       bool "gw_ventana"
+       select SUPPORT_SPL
+       imply CMD_SATA
+
+config TARGET_KOSAGI_NOVENA
+       bool "Kosagi Novena"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+
+config TARGET_MCCMON6
+       bool "mccmon6"
+       select SUPPORT_SPL
+
+config TARGET_MX6CUBOXI
+       bool "Solid-run mx6 boards"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+
+config TARGET_MX6LOGICPD
+       bool "Logic PD i.MX6 SOM"
+       select BOARD_EARLY_INIT_F
+       select BOARD_LATE_INIT
+       select DM
+       select DM_ETH
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_PMIC
+       select DM_REGULATOR
+       select OF_CONTROL
+
+config TARGET_MX6QARM2
+       bool "mx6qarm2"
+
+config TARGET_MX6Q_ICORE
+       bool "Support Engicam i.Core"
+       select BOARD_LATE_INIT
+       select MX6QDL
+       select OF_CONTROL
+       select SPL_OF_LIBFDT
+       select DM
+       select DM_ETH
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
+       select SPL_LOAD_FIT
+
+config TARGET_MX6Q_ICORE_RQS
+       bool "Support Engicam i.Core RQS"
+       select BOARD_LATE_INIT
+       select MX6QDL
+       select OF_CONTROL
+       select SPL_OF_LIBFDT
+       select DM
+       select DM_ETH
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
+       select SPL_LOAD_FIT
+
+config TARGET_MX6SABREAUTO
+       bool "mx6sabreauto"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+       select BOARD_EARLY_INIT_F
+
+config TARGET_MX6SABRESD
+       bool "mx6sabresd"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+       select BOARD_EARLY_INIT_F
+
+config TARGET_MX6SLEVK
+       bool "mx6slevk"
+       select SUPPORT_SPL
+
+config TARGET_MX6SLLEVK
+        bool "mx6sll evk"
+       select BOARD_LATE_INIT
+        select MX6SLL
+        select DM
+        select DM_THERMAL
+
+config TARGET_MX6SXSABRESD
+       bool "mx6sxsabresd"
+       select MX6SX
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+       select BOARD_EARLY_INIT_F
+
+config TARGET_MX6SXSABREAUTO
+        bool "mx6sxsabreauto"
+       select BOARD_LATE_INIT
+       select MX6SX
+        select DM
+        select DM_THERMAL
+       select BOARD_EARLY_INIT_F
+
+config TARGET_MX6UL_9X9_EVK
+       bool "mx6ul_9x9_evk"
+       select BOARD_LATE_INIT
+       select MX6UL
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL
+
+config TARGET_MX6UL_14X14_EVK
+       select BOARD_LATE_INIT
+       bool "mx6ul_14x14_evk"
+       select MX6UL
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL
+
+config TARGET_MX6UL_GEAM
+       bool "Support Engicam GEAM6UL"
+       select BOARD_LATE_INIT
+       select MX6UL
+       select OF_CONTROL
+       select DM
+       select DM_ETH
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
+config TARGET_MX6UL_ISIOT
+       bool "Support Engicam Is.IoT MX6UL"
+       select BOARD_LATE_INIT
+       select MX6UL
+       select OF_CONTROL
+       select DM
+       select DM_ETH
+       select DM_GPIO
+       select DM_I2C
+       select DM_MMC
+       select DM_THERMAL
+       select SUPPORT_SPL
+
+config TARGET_MX6ULL_14X14_EVK
+       bool "Support mx6ull_14x14_evk"
+       select BOARD_LATE_INIT
+       select MX6ULL
+       select DM
+       select DM_THERMAL
+
+config TARGET_NITROGEN6X
+       bool "nitrogen6x"
+
+config TARGET_OPOS6ULDEV
+       bool "Armadeus OPOS6ULDev board"
+       select MX6UL_OPOS6UL
+
+config TARGET_OT1200
+       bool "Bachmann OT1200"
+       select SUPPORT_SPL
+       imply CMD_SATA
+
+config TARGET_PICO_IMX6UL
+       bool "PICO-IMX6UL-EMMC"
+       select MX6UL
+
+config TARGET_LITEBOARD
+       bool "Grinn liteBoard (i.MX6UL)"
+       select BOARD_LATE_INIT
+       select MX6UL_LITESOM
+
+config TARGET_PLATINUM_PICON
+       bool "platinum-picon"
+       select SUPPORT_SPL
+
+config TARGET_PLATINUM_TITANIUM
+       bool "platinum-titanium"
+       select SUPPORT_SPL
+
+config TARGET_PCM058
+       bool "Phytec PCM058 i.MX6 Quad"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+
+config TARGET_SECOMX6
+       bool "secomx6 boards"
+
+config TARGET_TBS2910
+       bool "TBS2910 Matrix ARM mini PC"
+
+config TARGET_TITANIUM
+       bool "titanium"
+
+config TARGET_TQMA6
+       bool "TQ Systems TQMa6 board"
+       select BOARD_LATE_INIT
+
+config TARGET_UDOO
+       bool "udoo"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+
+config TARGET_UDOO_NEO
+       bool "UDOO Neo"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select MX6SX
+       select DM
+       select DM_THERMAL
+
+config TARGET_SAMTEC_VINING_2000
+       bool "samtec VIN|ING 2000"
+       select BOARD_LATE_INIT
+       select MX6SX
+       select DM
+       select DM_THERMAL
+
+config TARGET_WANDBOARD
+       bool "wandboard"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+
+config TARGET_WARP
+       bool "WaRP"
+       select BOARD_LATE_INIT
+
+config TARGET_XPRESS
+       bool "CCV xPress"
+       select BOARD_LATE_INIT
+       select MX6UL
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL
+
+config TARGET_ZC5202
+       bool "zc5202"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+
+config TARGET_ZC5601
+       bool "zc5601"
+       select BOARD_LATE_INIT
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+
+endchoice
+
+config SYS_SOC
+       default "mx6"
+
+source "board/ge/bx50v3/Kconfig"
+source "board/advantech/dms-ba16/Kconfig"
+source "board/aristainetos/Kconfig"
+source "board/armadeus/opos6uldev/Kconfig"
+source "board/bachmann/ot1200/Kconfig"
+source "board/barco/platinum/Kconfig"
+source "board/barco/titanium/Kconfig"
+source "board/boundary/nitrogen6x/Kconfig"
+source "board/ccv/xpress/Kconfig"
+source "board/compulab/cm_fx6/Kconfig"
+source "board/congatec/cgtqmx6eval/Kconfig"
+source "board/el/el6x/Kconfig"
+source "board/embest/mx6boards/Kconfig"
+source "board/engicam/geam6ul/Kconfig"
+source "board/engicam/icorem6/Kconfig"
+source "board/engicam/icorem6_rqs/Kconfig"
+source "board/engicam/isiotmx6ul/Kconfig"
+source "board/freescale/mx6qarm2/Kconfig"
+source "board/freescale/mx6sabreauto/Kconfig"
+source "board/freescale/mx6sabresd/Kconfig"
+source "board/freescale/mx6slevk/Kconfig"
+source "board/freescale/mx6sllevk/Kconfig"
+source "board/freescale/mx6sxsabresd/Kconfig"
+source "board/freescale/mx6sxsabreauto/Kconfig"
+source "board/freescale/mx6ul_14x14_evk/Kconfig"
+source "board/freescale/mx6ullevk/Kconfig"
+source "board/grinn/liteboard/Kconfig"
+source "board/phytec/pcm058/Kconfig"
+source "board/gateworks/gw_ventana/Kconfig"
+source "board/kosagi/novena/Kconfig"
+source "board/samtec/vining_2000/Kconfig"
+source "board/liebherr/mccmon6/Kconfig"
+source "board/logicpd/imx6/Kconfig"
+source "board/seco/Kconfig"
+source "board/solidrun/mx6cuboxi/Kconfig"
+source "board/technexion/pico-imx6ul/Kconfig"
+source "board/tbs/tbs2910/Kconfig"
+source "board/tqc/tqma6/Kconfig"
+source "board/toradex/apalis_imx6/Kconfig"
+source "board/toradex/colibri_imx6/Kconfig"
+source "board/udoo/Kconfig"
+source "board/udoo/neo/Kconfig"
+source "board/wandboard/Kconfig"
+source "board/warp/Kconfig"
+
+endif
diff --git a/arch/arm/mach-imx/mx6/Makefile b/arch/arm/mach-imx/mx6/Makefile
new file mode 100644 (file)
index 0000000..c183eb4
--- /dev/null
@@ -0,0 +1,14 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# (C) Copyright 2011 Freescale Semiconductor, Inc.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y  := soc.o clock.o
+obj-$(CONFIG_SPL_BUILD)             += ddr.o
+obj-$(CONFIG_MP)             += mp.o
+obj-$(CONFIG_MX6UL_LITESOM)  += litesom.o
+obj-$(CONFIG_MX6UL_OPOS6UL)  += opos6ul.o
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c
new file mode 100644 (file)
index 0000000..1f2739e
--- /dev/null
@@ -0,0 +1,1486 @@
+/*
+ * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <div64.h>
+#include <asm/io.h>
+#include <linux/errno.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+enum pll_clocks {
+       PLL_SYS,        /* System PLL */
+       PLL_BUS,        /* System Bus PLL*/
+       PLL_USBOTG,     /* OTG USB PLL */
+       PLL_ENET,       /* ENET PLL */
+       PLL_AUDIO,      /* AUDIO PLL */
+       PLL_VIDEO,      /* AUDIO PLL */
+};
+
+struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+#ifdef CONFIG_MXC_OCOTP
+void enable_ocotp_clk(unsigned char enable)
+{
+       u32 reg;
+
+       reg = __raw_readl(&imx_ccm->CCGR2);
+       if (enable)
+               reg |= MXC_CCM_CCGR2_OCOTP_CTRL_MASK;
+       else
+               reg &= ~MXC_CCM_CCGR2_OCOTP_CTRL_MASK;
+       __raw_writel(reg, &imx_ccm->CCGR2);
+}
+#endif
+
+#ifdef CONFIG_NAND_MXS
+void setup_gpmi_io_clk(u32 cfg)
+{
+       /* Disable clocks per ERR007177 from MX6 errata */
+       clrbits_le32(&imx_ccm->CCGR4,
+                    MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
+                    MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
+
+#if defined(CONFIG_MX6SX)
+       clrbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK);
+
+       clrsetbits_le32(&imx_ccm->cs2cdr,
+                       MXC_CCM_CS2CDR_QSPI2_CLK_PODF_MASK |
+                       MXC_CCM_CS2CDR_QSPI2_CLK_PRED_MASK |
+                       MXC_CCM_CS2CDR_QSPI2_CLK_SEL_MASK,
+                       cfg);
+
+       setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK);
+#else
+       clrbits_le32(&imx_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK);
+
+       clrsetbits_le32(&imx_ccm->cs2cdr,
+                       MXC_CCM_CS2CDR_ENFC_CLK_PODF_MASK |
+                       MXC_CCM_CS2CDR_ENFC_CLK_PRED_MASK |
+                       MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK,
+                       cfg);
+
+       setbits_le32(&imx_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK);
+#endif
+       setbits_le32(&imx_ccm->CCGR4,
+                    MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
+                    MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
+                    MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
+}
+#endif
+
+void enable_usboh3_clk(unsigned char enable)
+{
+       u32 reg;
+
+       reg = __raw_readl(&imx_ccm->CCGR6);
+       if (enable)
+               reg |= MXC_CCM_CCGR6_USBOH3_MASK;
+       else
+               reg &= ~(MXC_CCM_CCGR6_USBOH3_MASK);
+       __raw_writel(reg, &imx_ccm->CCGR6);
+
+}
+
+#if defined(CONFIG_FEC_MXC) && !defined(CONFIG_MX6SX)
+void enable_enet_clk(unsigned char enable)
+{
+       u32 mask, *addr;
+
+       if (is_mx6ull()) {
+               mask = MXC_CCM_CCGR0_ENET_CLK_ENABLE_MASK;
+               addr = &imx_ccm->CCGR0;
+       } else if (is_mx6ul()) {
+               mask = MXC_CCM_CCGR3_ENET_MASK;
+               addr = &imx_ccm->CCGR3;
+       } else {
+               mask = MXC_CCM_CCGR1_ENET_MASK;
+               addr = &imx_ccm->CCGR1;
+       }
+
+       if (enable)
+               setbits_le32(addr, mask);
+       else
+               clrbits_le32(addr, mask);
+}
+#endif
+
+#ifdef CONFIG_MXC_UART
+void enable_uart_clk(unsigned char enable)
+{
+       u32 mask;
+
+       if (is_mx6ul() || is_mx6ull())
+               mask = MXC_CCM_CCGR5_UART_MASK;
+       else
+               mask = MXC_CCM_CCGR5_UART_MASK | MXC_CCM_CCGR5_UART_SERIAL_MASK;
+
+       if (enable)
+               setbits_le32(&imx_ccm->CCGR5, mask);
+       else
+               clrbits_le32(&imx_ccm->CCGR5, mask);
+}
+#endif
+
+#ifdef CONFIG_MMC
+int enable_usdhc_clk(unsigned char enable, unsigned bus_num)
+{
+       u32 mask;
+
+       if (bus_num > 3)
+               return -EINVAL;
+
+       mask = MXC_CCM_CCGR_CG_MASK << (bus_num * 2 + 2);
+       if (enable)
+               setbits_le32(&imx_ccm->CCGR6, mask);
+       else
+               clrbits_le32(&imx_ccm->CCGR6, mask);
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_SYS_I2C_MXC
+/* i2c_num can be from 0 - 3 */
+int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
+{
+       u32 reg;
+       u32 mask;
+       u32 *addr;
+
+       if (i2c_num > 3)
+               return -EINVAL;
+       if (i2c_num < 3) {
+               mask = MXC_CCM_CCGR_CG_MASK
+                       << (MXC_CCM_CCGR2_I2C1_SERIAL_OFFSET
+                       + (i2c_num << 1));
+               reg = __raw_readl(&imx_ccm->CCGR2);
+               if (enable)
+                       reg |= mask;
+               else
+                       reg &= ~mask;
+               __raw_writel(reg, &imx_ccm->CCGR2);
+       } else {
+               if (is_mx6sll())
+                       return -EINVAL;
+               if (is_mx6sx() || is_mx6ul() || is_mx6ull()) {
+                       mask = MXC_CCM_CCGR6_I2C4_MASK;
+                       addr = &imx_ccm->CCGR6;
+               } else {
+                       mask = MXC_CCM_CCGR1_I2C4_SERIAL_MASK;
+                       addr = &imx_ccm->CCGR1;
+               }
+               reg = __raw_readl(addr);
+               if (enable)
+                       reg |= mask;
+               else
+                       reg &= ~mask;
+               __raw_writel(reg, addr);
+       }
+       return 0;
+}
+#endif
+
+/* spi_num can be from 0 - SPI_MAX_NUM */
+int enable_spi_clk(unsigned char enable, unsigned spi_num)
+{
+       u32 reg;
+       u32 mask;
+
+       if (spi_num > SPI_MAX_NUM)
+               return -EINVAL;
+
+       mask = MXC_CCM_CCGR_CG_MASK << (spi_num << 1);
+       reg = __raw_readl(&imx_ccm->CCGR1);
+       if (enable)
+               reg |= mask;
+       else
+               reg &= ~mask;
+       __raw_writel(reg, &imx_ccm->CCGR1);
+       return 0;
+}
+static u32 decode_pll(enum pll_clocks pll, u32 infreq)
+{
+       u32 div, test_div, pll_num, pll_denom;
+
+       switch (pll) {
+       case PLL_SYS:
+               div = __raw_readl(&imx_ccm->analog_pll_sys);
+               div &= BM_ANADIG_PLL_SYS_DIV_SELECT;
+
+               return (infreq * div) >> 1;
+       case PLL_BUS:
+               div = __raw_readl(&imx_ccm->analog_pll_528);
+               div &= BM_ANADIG_PLL_528_DIV_SELECT;
+
+               return infreq * (20 + (div << 1));
+       case PLL_USBOTG:
+               div = __raw_readl(&imx_ccm->analog_usb1_pll_480_ctrl);
+               div &= BM_ANADIG_USB1_PLL_480_CTRL_DIV_SELECT;
+
+               return infreq * (20 + (div << 1));
+       case PLL_ENET:
+               div = __raw_readl(&imx_ccm->analog_pll_enet);
+               div &= BM_ANADIG_PLL_ENET_DIV_SELECT;
+
+               return 25000000 * (div + (div >> 1) + 1);
+       case PLL_AUDIO:
+               div = __raw_readl(&imx_ccm->analog_pll_audio);
+               if (!(div & BM_ANADIG_PLL_AUDIO_ENABLE))
+                       return 0;
+               /* BM_ANADIG_PLL_AUDIO_BYPASS_CLK_SRC is ignored */
+               if (div & BM_ANADIG_PLL_AUDIO_BYPASS)
+                       return MXC_HCLK;
+               pll_num = __raw_readl(&imx_ccm->analog_pll_audio_num);
+               pll_denom = __raw_readl(&imx_ccm->analog_pll_audio_denom);
+               test_div = (div & BM_ANADIG_PLL_AUDIO_TEST_DIV_SELECT) >>
+                       BP_ANADIG_PLL_AUDIO_TEST_DIV_SELECT;
+               div &= BM_ANADIG_PLL_AUDIO_DIV_SELECT;
+               if (test_div == 3) {
+                       debug("Error test_div\n");
+                       return 0;
+               }
+               test_div = 1 << (2 - test_div);
+
+               return infreq * (div + pll_num / pll_denom) / test_div;
+       case PLL_VIDEO:
+               div = __raw_readl(&imx_ccm->analog_pll_video);
+               if (!(div & BM_ANADIG_PLL_VIDEO_ENABLE))
+                       return 0;
+               /* BM_ANADIG_PLL_AUDIO_BYPASS_CLK_SRC is ignored */
+               if (div & BM_ANADIG_PLL_VIDEO_BYPASS)
+                       return MXC_HCLK;
+               pll_num = __raw_readl(&imx_ccm->analog_pll_video_num);
+               pll_denom = __raw_readl(&imx_ccm->analog_pll_video_denom);
+               test_div = (div & BM_ANADIG_PLL_VIDEO_POST_DIV_SELECT) >>
+                       BP_ANADIG_PLL_VIDEO_POST_DIV_SELECT;
+               div &= BM_ANADIG_PLL_VIDEO_DIV_SELECT;
+               if (test_div == 3) {
+                       debug("Error test_div\n");
+                       return 0;
+               }
+               test_div = 1 << (2 - test_div);
+
+               return infreq * (div + pll_num / pll_denom) / test_div;
+       default:
+               return 0;
+       }
+       /* NOTREACHED */
+}
+static u32 mxc_get_pll_pfd(enum pll_clocks pll, int pfd_num)
+{
+       u32 div;
+       u64 freq;
+
+       switch (pll) {
+       case PLL_BUS:
+               if (!is_mx6ul() && !is_mx6ull()) {
+                       if (pfd_num == 3) {
+                               /* No PFD3 on PLL2 */
+                               return 0;
+                       }
+               }
+               div = __raw_readl(&imx_ccm->analog_pfd_528);
+               freq = (u64)decode_pll(PLL_BUS, MXC_HCLK);
+               break;
+       case PLL_USBOTG:
+               div = __raw_readl(&imx_ccm->analog_pfd_480);
+               freq = (u64)decode_pll(PLL_USBOTG, MXC_HCLK);
+               break;
+       default:
+               /* No PFD on other PLL                                       */
+               return 0;
+       }
+
+       return lldiv(freq * 18, (div & ANATOP_PFD_FRAC_MASK(pfd_num)) >>
+                             ANATOP_PFD_FRAC_SHIFT(pfd_num));
+}
+
+static u32 get_mcu_main_clk(void)
+{
+       u32 reg, freq;
+
+       reg = __raw_readl(&imx_ccm->cacrr);
+       reg &= MXC_CCM_CACRR_ARM_PODF_MASK;
+       reg >>= MXC_CCM_CACRR_ARM_PODF_OFFSET;
+       freq = decode_pll(PLL_SYS, MXC_HCLK);
+
+       return freq / (reg + 1);
+}
+
+u32 get_periph_clk(void)
+{
+       u32 reg, div = 0, freq = 0;
+
+       reg = __raw_readl(&imx_ccm->cbcdr);
+       if (reg & MXC_CCM_CBCDR_PERIPH_CLK_SEL) {
+               div = (reg & MXC_CCM_CBCDR_PERIPH_CLK2_PODF_MASK) >>
+                      MXC_CCM_CBCDR_PERIPH_CLK2_PODF_OFFSET;
+               reg = __raw_readl(&imx_ccm->cbcmr);
+               reg &= MXC_CCM_CBCMR_PERIPH_CLK2_SEL_MASK;
+               reg >>= MXC_CCM_CBCMR_PERIPH_CLK2_SEL_OFFSET;
+
+               switch (reg) {
+               case 0:
+                       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
+                       break;
+               case 1:
+               case 2:
+                       freq = MXC_HCLK;
+                       break;
+               default:
+                       break;
+               }
+       } else {
+               reg = __raw_readl(&imx_ccm->cbcmr);
+               reg &= MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_MASK;
+               reg >>= MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_OFFSET;
+
+               switch (reg) {
+               case 0:
+                       freq = decode_pll(PLL_BUS, MXC_HCLK);
+                       break;
+               case 1:
+                       freq = mxc_get_pll_pfd(PLL_BUS, 2);
+                       break;
+               case 2:
+                       freq = mxc_get_pll_pfd(PLL_BUS, 0);
+                       break;
+               case 3:
+                       /* static / 2 divider */
+                       freq = mxc_get_pll_pfd(PLL_BUS, 2) / 2;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       return freq / (div + 1);
+}
+
+static u32 get_ipg_clk(void)
+{
+       u32 reg, ipg_podf;
+
+       reg = __raw_readl(&imx_ccm->cbcdr);
+       reg &= MXC_CCM_CBCDR_IPG_PODF_MASK;
+       ipg_podf = reg >> MXC_CCM_CBCDR_IPG_PODF_OFFSET;
+
+       return get_ahb_clk() / (ipg_podf + 1);
+}
+
+static u32 get_ipg_per_clk(void)
+{
+       u32 reg, perclk_podf;
+
+       reg = __raw_readl(&imx_ccm->cscmr1);
+       if (is_mx6sll() || is_mx6sl() || is_mx6sx() ||
+           is_mx6dqp() || is_mx6ul() || is_mx6ull()) {
+               if (reg & MXC_CCM_CSCMR1_PER_CLK_SEL_MASK)
+                       return MXC_HCLK; /* OSC 24Mhz */
+       }
+
+       perclk_podf = reg & MXC_CCM_CSCMR1_PERCLK_PODF_MASK;
+
+       return get_ipg_clk() / (perclk_podf + 1);
+}
+
+static u32 get_uart_clk(void)
+{
+       u32 reg, uart_podf;
+       u32 freq = decode_pll(PLL_USBOTG, MXC_HCLK) / 6; /* static divider */
+       reg = __raw_readl(&imx_ccm->cscdr1);
+
+       if (is_mx6sl() || is_mx6sx() || is_mx6dqp() || is_mx6ul() ||
+           is_mx6sll() || is_mx6ull()) {
+               if (reg & MXC_CCM_CSCDR1_UART_CLK_SEL)
+                       freq = MXC_HCLK;
+       }
+
+       reg &= MXC_CCM_CSCDR1_UART_CLK_PODF_MASK;
+       uart_podf = reg >> MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET;
+
+       return freq / (uart_podf + 1);
+}
+
+static u32 get_cspi_clk(void)
+{
+       u32 reg, cspi_podf;
+
+       reg = __raw_readl(&imx_ccm->cscdr2);
+       cspi_podf = (reg & MXC_CCM_CSCDR2_ECSPI_CLK_PODF_MASK) >>
+                    MXC_CCM_CSCDR2_ECSPI_CLK_PODF_OFFSET;
+
+       if (is_mx6dqp() || is_mx6sl() || is_mx6sx() || is_mx6ul() ||
+           is_mx6sll() || is_mx6ull()) {
+               if (reg & MXC_CCM_CSCDR2_ECSPI_CLK_SEL_MASK)
+                       return MXC_HCLK / (cspi_podf + 1);
+       }
+
+       return  decode_pll(PLL_USBOTG, MXC_HCLK) / (8 * (cspi_podf + 1));
+}
+
+static u32 get_axi_clk(void)
+{
+       u32 root_freq, axi_podf;
+       u32 cbcdr =  __raw_readl(&imx_ccm->cbcdr);
+
+       axi_podf = cbcdr & MXC_CCM_CBCDR_AXI_PODF_MASK;
+       axi_podf >>= MXC_CCM_CBCDR_AXI_PODF_OFFSET;
+
+       if (cbcdr & MXC_CCM_CBCDR_AXI_SEL) {
+               if (cbcdr & MXC_CCM_CBCDR_AXI_ALT_SEL)
+                       root_freq = mxc_get_pll_pfd(PLL_USBOTG, 1);
+               else
+                       root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
+       } else
+               root_freq = get_periph_clk();
+
+       return  root_freq / (axi_podf + 1);
+}
+
+static u32 get_emi_slow_clk(void)
+{
+       u32 emi_clk_sel, emi_slow_podf, cscmr1, root_freq = 0;
+
+       cscmr1 =  __raw_readl(&imx_ccm->cscmr1);
+       emi_clk_sel = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_MASK;
+       emi_clk_sel >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_OFFSET;
+       emi_slow_podf = cscmr1 & MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_MASK;
+       emi_slow_podf >>= MXC_CCM_CSCMR1_ACLK_EMI_SLOW_PODF_OFFSET;
+
+       switch (emi_clk_sel) {
+       case 0:
+               root_freq = get_axi_clk();
+               break;
+       case 1:
+               root_freq = decode_pll(PLL_USBOTG, MXC_HCLK);
+               break;
+       case 2:
+               root_freq =  mxc_get_pll_pfd(PLL_BUS, 2);
+               break;
+       case 3:
+               root_freq =  mxc_get_pll_pfd(PLL_BUS, 0);
+               break;
+       }
+
+       return root_freq / (emi_slow_podf + 1);
+}
+
+static u32 get_mmdc_ch0_clk(void)
+{
+       u32 cbcmr = __raw_readl(&imx_ccm->cbcmr);
+       u32 cbcdr = __raw_readl(&imx_ccm->cbcdr);
+
+       u32 freq, podf, per2_clk2_podf, pmu_misc2_audio_div;
+
+       if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sl() ||
+           is_mx6sll()) {
+               podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH1_PODF_MASK) >>
+                       MXC_CCM_CBCDR_MMDC_CH1_PODF_OFFSET;
+               if (cbcdr & MXC_CCM_CBCDR_PERIPH2_CLK_SEL) {
+                       per2_clk2_podf = (cbcdr & MXC_CCM_CBCDR_PERIPH2_CLK2_PODF_MASK) >>
+                               MXC_CCM_CBCDR_PERIPH2_CLK2_PODF_OFFSET;
+                       if (is_mx6sl()) {
+                               if (cbcmr & MXC_CCM_CBCMR_PERIPH2_CLK2_SEL)
+                                       freq = MXC_HCLK;
+                               else
+                                       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
+                       } else {
+                               if (cbcmr & MXC_CCM_CBCMR_PERIPH2_CLK2_SEL)
+                                       freq = decode_pll(PLL_BUS, MXC_HCLK);
+                               else
+                                       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
+                       }
+               } else {
+                       per2_clk2_podf = 0;
+                       switch ((cbcmr &
+                               MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_MASK) >>
+                               MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_OFFSET) {
+                       case 0:
+                               freq = decode_pll(PLL_BUS, MXC_HCLK);
+                               break;
+                       case 1:
+                               freq = mxc_get_pll_pfd(PLL_BUS, 2);
+                               break;
+                       case 2:
+                               freq = mxc_get_pll_pfd(PLL_BUS, 0);
+                               break;
+                       case 3:
+                               if (is_mx6sl()) {
+                                       freq = mxc_get_pll_pfd(PLL_BUS, 2) >> 1;
+                                       break;
+                               }
+
+                               pmu_misc2_audio_div = PMU_MISC2_AUDIO_DIV(__raw_readl(&imx_ccm->pmu_misc2));
+                               switch (pmu_misc2_audio_div) {
+                               case 0:
+                               case 2:
+                                       pmu_misc2_audio_div = 1;
+                                       break;
+                               case 1:
+                                       pmu_misc2_audio_div = 2;
+                                       break;
+                               case 3:
+                                       pmu_misc2_audio_div = 4;
+                                       break;
+                               }
+                               freq = decode_pll(PLL_AUDIO, MXC_HCLK) /
+                                       pmu_misc2_audio_div;
+                               break;
+                       }
+               }
+               return freq / (podf + 1) / (per2_clk2_podf + 1);
+       } else {
+               podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH0_PODF_MASK) >>
+                       MXC_CCM_CBCDR_MMDC_CH0_PODF_OFFSET;
+               return get_periph_clk() / (podf + 1);
+       }
+}
+
+#if defined(CONFIG_VIDEO_MXS)
+static int enable_pll_video(u32 pll_div, u32 pll_num, u32 pll_denom,
+                           u32 post_div)
+{
+       u32 reg = 0;
+       ulong start;
+
+       debug("pll5 div = %d, num = %d, denom = %d\n",
+             pll_div, pll_num, pll_denom);
+
+       /* Power up PLL5 video */
+       writel(BM_ANADIG_PLL_VIDEO_POWERDOWN |
+              BM_ANADIG_PLL_VIDEO_BYPASS |
+              BM_ANADIG_PLL_VIDEO_DIV_SELECT |
+              BM_ANADIG_PLL_VIDEO_POST_DIV_SELECT,
+              &imx_ccm->analog_pll_video_clr);
+
+       /* Set div, num and denom */
+       switch (post_div) {
+       case 1:
+               writel(BF_ANADIG_PLL_VIDEO_DIV_SELECT(pll_div) |
+                      BF_ANADIG_PLL_VIDEO_POST_DIV_SELECT(0x2),
+                      &imx_ccm->analog_pll_video_set);
+               break;
+       case 2:
+               writel(BF_ANADIG_PLL_VIDEO_DIV_SELECT(pll_div) |
+                      BF_ANADIG_PLL_VIDEO_POST_DIV_SELECT(0x1),
+                      &imx_ccm->analog_pll_video_set);
+               break;
+       case 4:
+               writel(BF_ANADIG_PLL_VIDEO_DIV_SELECT(pll_div) |
+                      BF_ANADIG_PLL_VIDEO_POST_DIV_SELECT(0x0),
+                      &imx_ccm->analog_pll_video_set);
+               break;
+       default:
+               puts("Wrong test_div!\n");
+               return -EINVAL;
+       }
+
+       writel(BF_ANADIG_PLL_VIDEO_NUM_A(pll_num),
+              &imx_ccm->analog_pll_video_num);
+       writel(BF_ANADIG_PLL_VIDEO_DENOM_B(pll_denom),
+              &imx_ccm->analog_pll_video_denom);
+
+       /* Wait PLL5 lock */
+       start = get_timer(0);   /* Get current timestamp */
+
+       do {
+               reg = readl(&imx_ccm->analog_pll_video);
+               if (reg & BM_ANADIG_PLL_VIDEO_LOCK) {
+                       /* Enable PLL out */
+                       writel(BM_ANADIG_PLL_VIDEO_ENABLE,
+                              &imx_ccm->analog_pll_video_set);
+                       return 0;
+               }
+       } while (get_timer(0) < (start + 10)); /* Wait 10ms */
+
+       puts("Lock PLL5 timeout\n");
+
+       return -ETIME;
+}
+
+/*
+ * 24M--> PLL_VIDEO -> LCDIFx_PRED -> LCDIFx_PODF -> LCD
+ *
+ * 'freq' using KHz as unit, see driver/video/mxsfb.c.
+ */
+void mxs_set_lcdclk(u32 base_addr, u32 freq)
+{
+       u32 reg = 0;
+       u32 hck = MXC_HCLK / 1000;
+       /* DIV_SELECT ranges from 27 to 54 */
+       u32 min = hck * 27;
+       u32 max = hck * 54;
+       u32 temp, best = 0;
+       u32 i, j, max_pred = 8, max_postd = 8, pred = 1, postd = 1;
+       u32 pll_div, pll_num, pll_denom, post_div = 1;
+
+       debug("mxs_set_lcdclk, freq = %dKHz\n", freq);
+
+       if (!is_mx6sx() && !is_mx6ul() && !is_mx6ull() && !is_mx6sl() &&
+           !is_mx6sll()) {
+               debug("This chip not support lcd!\n");
+               return;
+       }
+
+       if (!is_mx6sl()) {
+               if (base_addr == LCDIF1_BASE_ADDR) {
+                       reg = readl(&imx_ccm->cscdr2);
+                       /* Can't change clocks when clock not from pre-mux */
+                       if ((reg & MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_MASK) != 0)
+                               return;
+               }
+       }
+
+       if (is_mx6sx()) {
+               reg = readl(&imx_ccm->cscdr2);
+               /* Can't change clocks when clock not from pre-mux */
+               if ((reg & MXC_CCM_CSCDR2_LCDIF2_CLK_SEL_MASK) != 0)
+                       return;
+       }
+
+       temp = freq * max_pred * max_postd;
+       if (temp < min) {
+               /*
+                * Register: PLL_VIDEO
+                * Bit Field: POST_DIV_SELECT
+                * 00 — Divide by 4.
+                * 01 — Divide by 2.
+                * 10 — Divide by 1.
+                * 11 — Reserved
+                * No need to check post_div(1)
+                */
+               for (post_div = 2; post_div <= 4; post_div <<= 1) {
+                       if ((temp * post_div) > min) {
+                               freq *= post_div;
+                               break;
+                       }
+               }
+
+               if (post_div > 4) {
+                       printf("Fail to set rate to %dkhz", freq);
+                       return;
+               }
+       }
+
+       /* Choose the best pred and postd to match freq for lcd */
+       for (i = 1; i <= max_pred; i++) {
+               for (j = 1; j <= max_postd; j++) {
+                       temp = freq * i * j;
+                       if (temp > max || temp < min)
+                               continue;
+                       if (best == 0 || temp < best) {
+                               best = temp;
+                               pred = i;
+                               postd = j;
+                       }
+               }
+       }
+
+       if (best == 0) {
+               printf("Fail to set rate to %dKHz", freq);
+               return;
+       }
+
+       debug("best %d, pred = %d, postd = %d\n", best, pred, postd);
+
+       pll_div = best / hck;
+       pll_denom = 1000000;
+       pll_num = (best - hck * pll_div) * pll_denom / hck;
+
+       /*
+        *                                  pll_num
+        *             (24MHz * (pll_div + --------- ))
+        *                                 pll_denom
+        *freq KHz =  --------------------------------
+        *             post_div * pred * postd * 1000
+        */
+
+       if (base_addr == LCDIF1_BASE_ADDR) {
+               if (enable_pll_video(pll_div, pll_num, pll_denom, post_div))
+                       return;
+
+               enable_lcdif_clock(base_addr, 0);
+               if (!is_mx6sl()) {
+                       /* Select pre-lcd clock to PLL5 and set pre divider */
+                       clrsetbits_le32(&imx_ccm->cscdr2,
+                                       MXC_CCM_CSCDR2_LCDIF1_PRED_SEL_MASK |
+                                       MXC_CCM_CSCDR2_LCDIF1_PRE_DIV_MASK,
+                                       (0x2 << MXC_CCM_CSCDR2_LCDIF1_PRED_SEL_OFFSET) |
+                                       ((pred - 1) <<
+                                        MXC_CCM_CSCDR2_LCDIF1_PRE_DIV_OFFSET));
+
+                       /* Set the post divider */
+                       clrsetbits_le32(&imx_ccm->cbcmr,
+                                       MXC_CCM_CBCMR_LCDIF1_PODF_MASK,
+                                       ((postd - 1) <<
+                                       MXC_CCM_CBCMR_LCDIF1_PODF_OFFSET));
+               } else {
+                       /* Select pre-lcd clock to PLL5 and set pre divider */
+                       clrsetbits_le32(&imx_ccm->cscdr2,
+                                       MXC_CCM_CSCDR2_LCDIF_PIX_CLK_SEL_MASK |
+                                       MXC_CCM_CSCDR2_LCDIF_PIX_PRE_DIV_MASK,
+                                       (0x2 << MXC_CCM_CSCDR2_LCDIF_PIX_CLK_SEL_OFFSET) |
+                                       ((pred - 1) <<
+                                        MXC_CCM_CSCDR2_LCDIF_PIX_PRE_DIV_OFFSET));
+
+                       /* Set the post divider */
+                       clrsetbits_le32(&imx_ccm->cscmr1,
+                                       MXC_CCM_CSCMR1_LCDIF_PIX_PODF_MASK,
+                                       (((postd - 1)^0x6) <<
+                                        MXC_CCM_CSCMR1_LCDIF_PIX_PODF_OFFSET));
+               }
+
+               enable_lcdif_clock(base_addr, 1);
+       } else if (is_mx6sx()) {
+               /* Setting LCDIF2 for i.MX6SX */
+               if (enable_pll_video(pll_div, pll_num, pll_denom, post_div))
+                       return;
+
+               enable_lcdif_clock(base_addr, 0);
+               /* Select pre-lcd clock to PLL5 and set pre divider */
+               clrsetbits_le32(&imx_ccm->cscdr2,
+                               MXC_CCM_CSCDR2_LCDIF2_PRED_SEL_MASK |
+                               MXC_CCM_CSCDR2_LCDIF2_PRE_DIV_MASK,
+                               (0x2 << MXC_CCM_CSCDR2_LCDIF2_PRED_SEL_OFFSET) |
+                               ((pred - 1) <<
+                                MXC_CCM_CSCDR2_LCDIF2_PRE_DIV_OFFSET));
+
+               /* Set the post divider */
+               clrsetbits_le32(&imx_ccm->cscmr1,
+                               MXC_CCM_CSCMR1_LCDIF2_PODF_MASK,
+                               ((postd - 1) <<
+                                MXC_CCM_CSCMR1_LCDIF2_PODF_OFFSET));
+
+               enable_lcdif_clock(base_addr, 1);
+       }
+}
+
+int enable_lcdif_clock(u32 base_addr, bool enable)
+{
+       u32 reg = 0;
+       u32 lcdif_clk_sel_mask, lcdif_ccgr3_mask;
+
+       if (is_mx6sx()) {
+               if ((base_addr != LCDIF1_BASE_ADDR) &&
+                   (base_addr != LCDIF2_BASE_ADDR)) {
+                       puts("Wrong LCD interface!\n");
+                       return -EINVAL;
+               }
+               /* Set to pre-mux clock at default */
+               lcdif_clk_sel_mask = (base_addr == LCDIF2_BASE_ADDR) ?
+                       MXC_CCM_CSCDR2_LCDIF2_CLK_SEL_MASK :
+                       MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_MASK;
+               lcdif_ccgr3_mask = (base_addr == LCDIF2_BASE_ADDR) ?
+                       (MXC_CCM_CCGR3_LCDIF2_PIX_MASK |
+                        MXC_CCM_CCGR3_DISP_AXI_MASK) :
+                       (MXC_CCM_CCGR3_LCDIF1_PIX_MASK |
+                        MXC_CCM_CCGR3_DISP_AXI_MASK);
+       } else if (is_mx6ul() || is_mx6ull() || is_mx6sll()) {
+               if (base_addr != LCDIF1_BASE_ADDR) {
+                       puts("Wrong LCD interface!\n");
+                       return -EINVAL;
+               }
+               /* Set to pre-mux clock at default */
+               lcdif_clk_sel_mask = MXC_CCM_CSCDR2_LCDIF1_CLK_SEL_MASK;
+               lcdif_ccgr3_mask =  MXC_CCM_CCGR3_LCDIF1_PIX_MASK;
+       } else if (is_mx6sl()) {
+               if (base_addr != LCDIF1_BASE_ADDR) {
+                       puts("Wrong LCD interface!\n");
+                       return -EINVAL;
+               }
+
+               reg = readl(&imx_ccm->CCGR3);
+               reg &= ~(MXC_CCM_CCGR3_LCDIF_AXI_MASK |
+                        MXC_CCM_CCGR3_LCDIF_PIX_MASK);
+               writel(reg, &imx_ccm->CCGR3);
+
+               if (enable) {
+                       reg = readl(&imx_ccm->cscdr3);
+                       reg &= ~MXC_CCM_CSCDR3_LCDIF_AXI_CLK_SEL_MASK;
+                       reg |= 1 << MXC_CCM_CSCDR3_LCDIF_AXI_CLK_SEL_OFFSET;
+                       writel(reg, &imx_ccm->cscdr3);
+
+                       reg = readl(&imx_ccm->CCGR3);
+                       reg |= MXC_CCM_CCGR3_LCDIF_AXI_MASK |
+                               MXC_CCM_CCGR3_LCDIF_PIX_MASK;
+                       writel(reg, &imx_ccm->CCGR3);
+               }
+
+               return 0;
+       } else {
+               return 0;
+       }
+
+       /* Gate LCDIF clock first */
+       reg = readl(&imx_ccm->CCGR3);
+       reg &= ~lcdif_ccgr3_mask;
+       writel(reg, &imx_ccm->CCGR3);
+
+       reg = readl(&imx_ccm->CCGR2);
+       reg &= ~MXC_CCM_CCGR2_LCD_MASK;
+       writel(reg, &imx_ccm->CCGR2);
+
+       if (enable) {
+               /* Select pre-mux */
+               reg = readl(&imx_ccm->cscdr2);
+               reg &= ~lcdif_clk_sel_mask;
+               writel(reg, &imx_ccm->cscdr2);
+
+               /* Enable the LCDIF pix clock */
+               reg = readl(&imx_ccm->CCGR3);
+               reg |= lcdif_ccgr3_mask;
+               writel(reg, &imx_ccm->CCGR3);
+
+               reg = readl(&imx_ccm->CCGR2);
+               reg |= MXC_CCM_CCGR2_LCD_MASK;
+               writel(reg, &imx_ccm->CCGR2);
+       }
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_FSL_QSPI
+/* qspi_num can be from 0 - 1 */
+void enable_qspi_clk(int qspi_num)
+{
+       u32 reg = 0;
+       /* Enable QuadSPI clock */
+       switch (qspi_num) {
+       case 0:
+               /* disable the clock gate */
+               clrbits_le32(&imx_ccm->CCGR3, MXC_CCM_CCGR3_QSPI1_MASK);
+
+               /* set 50M  : (50 = 396 / 2 / 4) */
+               reg = readl(&imx_ccm->cscmr1);
+               reg &= ~(MXC_CCM_CSCMR1_QSPI1_PODF_MASK |
+                        MXC_CCM_CSCMR1_QSPI1_CLK_SEL_MASK);
+               reg |= ((1 << MXC_CCM_CSCMR1_QSPI1_PODF_OFFSET) |
+                       (2 << MXC_CCM_CSCMR1_QSPI1_CLK_SEL_OFFSET));
+               writel(reg, &imx_ccm->cscmr1);
+
+               /* enable the clock gate */
+               setbits_le32(&imx_ccm->CCGR3, MXC_CCM_CCGR3_QSPI1_MASK);
+               break;
+       case 1:
+               /*
+                * disable the clock gate
+                * QSPI2 and GPMI_BCH_INPUT_GPMI_IO share the same clock gate,
+                * disable both of them.
+                */
+               clrbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK |
+                            MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK);
+
+               /* set 50M  : (50 = 396 / 2 / 4) */
+               reg = readl(&imx_ccm->cs2cdr);
+               reg &= ~(MXC_CCM_CS2CDR_QSPI2_CLK_PODF_MASK |
+                        MXC_CCM_CS2CDR_QSPI2_CLK_PRED_MASK |
+                        MXC_CCM_CS2CDR_QSPI2_CLK_SEL_MASK);
+               reg |= (MXC_CCM_CS2CDR_QSPI2_CLK_PRED(0x1) |
+                       MXC_CCM_CS2CDR_QSPI2_CLK_SEL(0x3));
+               writel(reg, &imx_ccm->cs2cdr);
+
+               /*enable the clock gate*/
+               setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK |
+                            MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK);
+               break;
+       default:
+               break;
+       }
+}
+#endif
+
+#ifdef CONFIG_FEC_MXC
+int enable_fec_anatop_clock(int fec_id, enum enet_freq freq)
+{
+       u32 reg = 0;
+       s32 timeout = 100000;
+
+       struct anatop_regs __iomem *anatop =
+               (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
+
+       if (freq < ENET_25MHZ || freq > ENET_125MHZ)
+               return -EINVAL;
+
+       reg = readl(&anatop->pll_enet);
+
+       if (fec_id == 0) {
+               reg &= ~BM_ANADIG_PLL_ENET_DIV_SELECT;
+               reg |= BF_ANADIG_PLL_ENET_DIV_SELECT(freq);
+       } else if (fec_id == 1) {
+               /* Only i.MX6SX/UL support ENET2 */
+               if (!(is_mx6sx() || is_mx6ul() || is_mx6ull()))
+                       return -EINVAL;
+               reg &= ~BM_ANADIG_PLL_ENET2_DIV_SELECT;
+               reg |= BF_ANADIG_PLL_ENET2_DIV_SELECT(freq);
+       } else {
+               return -EINVAL;
+       }
+
+       if ((reg & BM_ANADIG_PLL_ENET_POWERDOWN) ||
+           (!(reg & BM_ANADIG_PLL_ENET_LOCK))) {
+               reg &= ~BM_ANADIG_PLL_ENET_POWERDOWN;
+               writel(reg, &anatop->pll_enet);
+               while (timeout--) {
+                       if (readl(&anatop->pll_enet) & BM_ANADIG_PLL_ENET_LOCK)
+                               break;
+               }
+               if (timeout < 0)
+                       return -ETIMEDOUT;
+       }
+
+       /* Enable FEC clock */
+       if (fec_id == 0)
+               reg |= BM_ANADIG_PLL_ENET_ENABLE;
+       else
+               reg |= BM_ANADIG_PLL_ENET2_ENABLE;
+       reg &= ~BM_ANADIG_PLL_ENET_BYPASS;
+       writel(reg, &anatop->pll_enet);
+
+#ifdef CONFIG_MX6SX
+       /* Disable enet system clcok before switching clock parent */
+       reg = readl(&imx_ccm->CCGR3);
+       reg &= ~MXC_CCM_CCGR3_ENET_MASK;
+       writel(reg, &imx_ccm->CCGR3);
+
+       /*
+        * Set enet ahb clock to 200MHz
+        * pll2_pfd2_396m-> ENET_PODF-> ENET_AHB
+        */
+       reg = readl(&imx_ccm->chsccdr);
+       reg &= ~(MXC_CCM_CHSCCDR_ENET_PRE_CLK_SEL_MASK
+                | MXC_CCM_CHSCCDR_ENET_PODF_MASK
+                | MXC_CCM_CHSCCDR_ENET_CLK_SEL_MASK);
+       /* PLL2 PFD2 */
+       reg |= (4 << MXC_CCM_CHSCCDR_ENET_PRE_CLK_SEL_OFFSET);
+       /* Div = 2*/
+       reg |= (1 << MXC_CCM_CHSCCDR_ENET_PODF_OFFSET);
+       reg |= (0 << MXC_CCM_CHSCCDR_ENET_CLK_SEL_OFFSET);
+       writel(reg, &imx_ccm->chsccdr);
+
+       /* Enable enet system clock */
+       reg = readl(&imx_ccm->CCGR3);
+       reg |= MXC_CCM_CCGR3_ENET_MASK;
+       writel(reg, &imx_ccm->CCGR3);
+#endif
+       return 0;
+}
+#endif
+
+static u32 get_usdhc_clk(u32 port)
+{
+       u32 root_freq = 0, usdhc_podf = 0, clk_sel = 0;
+       u32 cscmr1 = __raw_readl(&imx_ccm->cscmr1);
+       u32 cscdr1 = __raw_readl(&imx_ccm->cscdr1);
+
+       if (is_mx6ul() || is_mx6ull()) {
+               if (port > 1)
+                       return 0;
+       }
+
+       if (is_mx6sll()) {
+               if (port > 2)
+                       return 0;
+       }
+
+       switch (port) {
+       case 0:
+               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC1_PODF_MASK) >>
+                                       MXC_CCM_CSCDR1_USDHC1_PODF_OFFSET;
+               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC1_CLK_SEL;
+
+               break;
+       case 1:
+               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC2_PODF_MASK) >>
+                                       MXC_CCM_CSCDR1_USDHC2_PODF_OFFSET;
+               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC2_CLK_SEL;
+
+               break;
+       case 2:
+               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC3_PODF_MASK) >>
+                                       MXC_CCM_CSCDR1_USDHC3_PODF_OFFSET;
+               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC3_CLK_SEL;
+
+               break;
+       case 3:
+               usdhc_podf = (cscdr1 & MXC_CCM_CSCDR1_USDHC4_PODF_MASK) >>
+                                       MXC_CCM_CSCDR1_USDHC4_PODF_OFFSET;
+               clk_sel = cscmr1 & MXC_CCM_CSCMR1_USDHC4_CLK_SEL;
+
+               break;
+       default:
+               break;
+       }
+
+       if (clk_sel)
+               root_freq = mxc_get_pll_pfd(PLL_BUS, 0);
+       else
+               root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
+
+       return root_freq / (usdhc_podf + 1);
+}
+
+u32 imx_get_uartclk(void)
+{
+       return get_uart_clk();
+}
+
+u32 imx_get_fecclk(void)
+{
+       return mxc_get_clock(MXC_IPG_CLK);
+}
+
+#if defined(CONFIG_SATA) || defined(CONFIG_PCIE_IMX)
+static int enable_enet_pll(uint32_t en)
+{
+       struct mxc_ccm_reg *const imx_ccm
+               = (struct mxc_ccm_reg *) CCM_BASE_ADDR;
+       s32 timeout = 100000;
+       u32 reg = 0;
+
+       /* Enable PLLs */
+       reg = readl(&imx_ccm->analog_pll_enet);
+       reg &= ~BM_ANADIG_PLL_SYS_POWERDOWN;
+       writel(reg, &imx_ccm->analog_pll_enet);
+       reg |= BM_ANADIG_PLL_SYS_ENABLE;
+       while (timeout--) {
+               if (readl(&imx_ccm->analog_pll_enet) & BM_ANADIG_PLL_SYS_LOCK)
+                       break;
+       }
+       if (timeout <= 0)
+               return -EIO;
+       reg &= ~BM_ANADIG_PLL_SYS_BYPASS;
+       writel(reg, &imx_ccm->analog_pll_enet);
+       reg |= en;
+       writel(reg, &imx_ccm->analog_pll_enet);
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_SATA
+static void ungate_sata_clock(void)
+{
+       struct mxc_ccm_reg *const imx_ccm =
+               (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+       /* Enable SATA clock. */
+       setbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK);
+}
+
+int enable_sata_clock(void)
+{
+       ungate_sata_clock();
+       return enable_enet_pll(BM_ANADIG_PLL_ENET_ENABLE_SATA);
+}
+
+void disable_sata_clock(void)
+{
+       struct mxc_ccm_reg *const imx_ccm =
+               (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+       clrbits_le32(&imx_ccm->CCGR5, MXC_CCM_CCGR5_SATA_MASK);
+}
+#endif
+
+#ifdef CONFIG_PCIE_IMX
+static void ungate_pcie_clock(void)
+{
+       struct mxc_ccm_reg *const imx_ccm =
+               (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+       /* Enable PCIe clock. */
+       setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_PCIE_MASK);
+}
+
+int enable_pcie_clock(void)
+{
+       struct anatop_regs *anatop_regs =
+               (struct anatop_regs *)ANATOP_BASE_ADDR;
+       struct mxc_ccm_reg *ccm_regs = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       u32 lvds1_clk_sel;
+
+       /*
+        * Here be dragons!
+        *
+        * The register ANATOP_MISC1 is not documented in the Freescale
+        * MX6RM. The register that is mapped in the ANATOP space and
+        * marked as ANATOP_MISC1 is actually documented in the PMU section
+        * of the datasheet as PMU_MISC1.
+        *
+        * Switch LVDS clock source to SATA (0xb) on mx6q/dl or PCI (0xa) on
+        * mx6sx, disable clock INPUT and enable clock OUTPUT. This is important
+        * for PCI express link that is clocked from the i.MX6.
+        */
+#define ANADIG_ANA_MISC1_LVDSCLK1_IBEN         (1 << 12)
+#define ANADIG_ANA_MISC1_LVDSCLK1_OBEN         (1 << 10)
+#define ANADIG_ANA_MISC1_LVDS1_CLK_SEL_MASK    0x0000001F
+#define ANADIG_ANA_MISC1_LVDS1_CLK_SEL_PCIE_REF        0xa
+#define ANADIG_ANA_MISC1_LVDS1_CLK_SEL_SATA_REF        0xb
+
+       if (is_mx6sx())
+               lvds1_clk_sel = ANADIG_ANA_MISC1_LVDS1_CLK_SEL_PCIE_REF;
+       else
+               lvds1_clk_sel = ANADIG_ANA_MISC1_LVDS1_CLK_SEL_SATA_REF;
+
+       clrsetbits_le32(&anatop_regs->ana_misc1,
+                       ANADIG_ANA_MISC1_LVDSCLK1_IBEN |
+                       ANADIG_ANA_MISC1_LVDS1_CLK_SEL_MASK,
+                       ANADIG_ANA_MISC1_LVDSCLK1_OBEN | lvds1_clk_sel);
+
+       /* PCIe reference clock sourced from AXI. */
+       clrbits_le32(&ccm_regs->cbcmr, MXC_CCM_CBCMR_PCIE_AXI_CLK_SEL);
+
+       /* Party time! Ungate the clock to the PCIe. */
+#ifdef CONFIG_SATA
+       ungate_sata_clock();
+#endif
+       ungate_pcie_clock();
+
+       return enable_enet_pll(BM_ANADIG_PLL_ENET_ENABLE_SATA |
+                              BM_ANADIG_PLL_ENET_ENABLE_PCIE);
+}
+#endif
+
+#ifdef CONFIG_SECURE_BOOT
+void hab_caam_clock_enable(unsigned char enable)
+{
+       u32 reg;
+
+       if (is_mx6ull() || is_mx6sll()) {
+               /* CG5, DCP clock */
+               reg = __raw_readl(&imx_ccm->CCGR0);
+               if (enable)
+                       reg |= MXC_CCM_CCGR0_DCP_CLK_MASK;
+               else
+                       reg &= ~MXC_CCM_CCGR0_DCP_CLK_MASK;
+               __raw_writel(reg, &imx_ccm->CCGR0);
+       } else {
+               /* CG4 ~ CG6, CAAM clocks */
+               reg = __raw_readl(&imx_ccm->CCGR0);
+               if (enable)
+                       reg |= (MXC_CCM_CCGR0_CAAM_WRAPPER_IPG_MASK |
+                               MXC_CCM_CCGR0_CAAM_WRAPPER_ACLK_MASK |
+                               MXC_CCM_CCGR0_CAAM_SECURE_MEM_MASK);
+               else
+                       reg &= ~(MXC_CCM_CCGR0_CAAM_WRAPPER_IPG_MASK |
+                               MXC_CCM_CCGR0_CAAM_WRAPPER_ACLK_MASK |
+                               MXC_CCM_CCGR0_CAAM_SECURE_MEM_MASK);
+               __raw_writel(reg, &imx_ccm->CCGR0);
+       }
+
+       /* EMI slow clk */
+       reg = __raw_readl(&imx_ccm->CCGR6);
+       if (enable)
+               reg |= MXC_CCM_CCGR6_EMI_SLOW_MASK;
+       else
+               reg &= ~MXC_CCM_CCGR6_EMI_SLOW_MASK;
+       __raw_writel(reg, &imx_ccm->CCGR6);
+}
+#endif
+
+static void enable_pll3(void)
+{
+       struct anatop_regs __iomem *anatop =
+               (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
+
+       /* make sure pll3 is enabled */
+       if ((readl(&anatop->usb1_pll_480_ctrl) &
+                       BM_ANADIG_USB1_PLL_480_CTRL_LOCK) == 0) {
+               /* enable pll's power */
+               writel(BM_ANADIG_USB1_PLL_480_CTRL_POWER,
+                      &anatop->usb1_pll_480_ctrl_set);
+               writel(0x80, &anatop->ana_misc2_clr);
+               /* wait for pll lock */
+               while ((readl(&anatop->usb1_pll_480_ctrl) &
+                       BM_ANADIG_USB1_PLL_480_CTRL_LOCK) == 0)
+                       ;
+               /* disable bypass */
+               writel(BM_ANADIG_USB1_PLL_480_CTRL_BYPASS,
+                      &anatop->usb1_pll_480_ctrl_clr);
+               /* enable pll output */
+               writel(BM_ANADIG_USB1_PLL_480_CTRL_ENABLE,
+                      &anatop->usb1_pll_480_ctrl_set);
+       }
+}
+
+void enable_thermal_clk(void)
+{
+       enable_pll3();
+}
+
+unsigned int mxc_get_clock(enum mxc_clock clk)
+{
+       switch (clk) {
+       case MXC_ARM_CLK:
+               return get_mcu_main_clk();
+       case MXC_PER_CLK:
+               return get_periph_clk();
+       case MXC_AHB_CLK:
+               return get_ahb_clk();
+       case MXC_IPG_CLK:
+               return get_ipg_clk();
+       case MXC_IPG_PERCLK:
+       case MXC_I2C_CLK:
+               return get_ipg_per_clk();
+       case MXC_UART_CLK:
+               return get_uart_clk();
+       case MXC_CSPI_CLK:
+               return get_cspi_clk();
+       case MXC_AXI_CLK:
+               return get_axi_clk();
+       case MXC_EMI_SLOW_CLK:
+               return get_emi_slow_clk();
+       case MXC_DDR_CLK:
+               return get_mmdc_ch0_clk();
+       case MXC_ESDHC_CLK:
+               return get_usdhc_clk(0);
+       case MXC_ESDHC2_CLK:
+               return get_usdhc_clk(1);
+       case MXC_ESDHC3_CLK:
+               return get_usdhc_clk(2);
+       case MXC_ESDHC4_CLK:
+               return get_usdhc_clk(3);
+       case MXC_SATA_CLK:
+               return get_ahb_clk();
+       default:
+               printf("Unsupported MXC CLK: %d\n", clk);
+               break;
+       }
+
+       return 0;
+}
+
+/*
+ * Dump some core clockes.
+ */
+int do_mx6_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       u32 freq;
+       freq = decode_pll(PLL_SYS, MXC_HCLK);
+       printf("PLL_SYS    %8d MHz\n", freq / 1000000);
+       freq = decode_pll(PLL_BUS, MXC_HCLK);
+       printf("PLL_BUS    %8d MHz\n", freq / 1000000);
+       freq = decode_pll(PLL_USBOTG, MXC_HCLK);
+       printf("PLL_OTG    %8d MHz\n", freq / 1000000);
+       freq = decode_pll(PLL_ENET, MXC_HCLK);
+       printf("PLL_NET    %8d MHz\n", freq / 1000000);
+
+       printf("\n");
+       printf("ARM        %8d kHz\n", mxc_get_clock(MXC_ARM_CLK) / 1000);
+       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
+       printf("UART       %8d kHz\n", mxc_get_clock(MXC_UART_CLK) / 1000);
+#ifdef CONFIG_MXC_SPI
+       printf("CSPI       %8d kHz\n", mxc_get_clock(MXC_CSPI_CLK) / 1000);
+#endif
+       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
+       printf("AXI        %8d kHz\n", mxc_get_clock(MXC_AXI_CLK) / 1000);
+       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
+       printf("USDHC1     %8d kHz\n", mxc_get_clock(MXC_ESDHC_CLK) / 1000);
+       printf("USDHC2     %8d kHz\n", mxc_get_clock(MXC_ESDHC2_CLK) / 1000);
+       printf("USDHC3     %8d kHz\n", mxc_get_clock(MXC_ESDHC3_CLK) / 1000);
+       printf("USDHC4     %8d kHz\n", mxc_get_clock(MXC_ESDHC4_CLK) / 1000);
+       printf("EMI SLOW   %8d kHz\n", mxc_get_clock(MXC_EMI_SLOW_CLK) / 1000);
+       printf("IPG PERCLK %8d kHz\n", mxc_get_clock(MXC_IPG_PERCLK) / 1000);
+
+       return 0;
+}
+
+#ifndef CONFIG_MX6SX
+void enable_ipu_clock(void)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       int reg;
+       reg = readl(&mxc_ccm->CCGR3);
+       reg |= MXC_CCM_CCGR3_IPU1_IPU_MASK;
+       writel(reg, &mxc_ccm->CCGR3);
+
+       if (is_mx6dqp()) {
+               setbits_le32(&mxc_ccm->CCGR6, MXC_CCM_CCGR6_PRG_CLK0_MASK);
+               setbits_le32(&mxc_ccm->CCGR3, MXC_CCM_CCGR3_IPU2_IPU_MASK);
+       }
+}
+#endif
+
+#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) || defined(CONFIG_MX6DL) || \
+       defined(CONFIG_MX6S)
+static void disable_ldb_di_clock_sources(void)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       int reg;
+
+       /* Make sure PFDs are disabled at boot. */
+       reg = readl(&mxc_ccm->analog_pfd_528);
+       /* Cannot disable pll2_pfd2_396M, as it is the MMDC clock in iMX6DL */
+       if (is_mx6sdl())
+               reg |= 0x80008080;
+       else
+               reg |= 0x80808080;
+       writel(reg, &mxc_ccm->analog_pfd_528);
+
+       /* Disable PLL3 PFDs */
+       reg = readl(&mxc_ccm->analog_pfd_480);
+       reg |= 0x80808080;
+       writel(reg, &mxc_ccm->analog_pfd_480);
+
+       /* Disable PLL5 */
+       reg = readl(&mxc_ccm->analog_pll_video);
+       reg &= ~(1 << 13);
+       writel(reg, &mxc_ccm->analog_pll_video);
+}
+
+static void enable_ldb_di_clock_sources(void)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       int reg;
+
+       reg = readl(&mxc_ccm->analog_pfd_528);
+       if (is_mx6sdl())
+               reg &= ~(0x80008080);
+       else
+               reg &= ~(0x80808080);
+       writel(reg, &mxc_ccm->analog_pfd_528);
+
+       reg = readl(&mxc_ccm->analog_pfd_480);
+       reg &= ~(0x80808080);
+       writel(reg, &mxc_ccm->analog_pfd_480);
+}
+
+/*
+ * Try call this function as early in the boot process as possible since the
+ * function temporarily disables PLL2 PFD's, PLL3 PFD's and PLL5.
+ */
+void select_ldb_di_clock_source(enum ldb_di_clock clk)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       int reg;
+
+       /*
+        * Need to follow a strict procedure when changing the LDB
+        * clock, else we can introduce a glitch. Things to keep in
+        * mind:
+        * 1. The current and new parent clocks must be disabled.
+        * 2. The default clock for ldb_dio_clk is mmdc_ch1 which has
+        * no CG bit.
+        * 3. In the RTL implementation of the LDB_DI_CLK_SEL mux
+        * the top four options are in one mux and the PLL3 option along
+        * with another option is in the second mux. There is third mux
+        * used to decide between the first and second mux.
+        * The code below switches the parent to the bottom mux first
+        * and then manipulates the top mux. This ensures that no glitch
+        * will enter the divider.
+        *
+        * Need to disable MMDC_CH1 clock manually as there is no CG bit
+        * for this clock. The only way to disable this clock is to move
+        * it to pll3_sw_clk and then to disable pll3_sw_clk
+        * Make sure periph2_clk2_sel is set to pll3_sw_clk
+        */
+
+       /* Disable all ldb_di clock parents */
+       disable_ldb_di_clock_sources();
+
+       /* Set MMDC_CH1 mask bit */
+       reg = readl(&mxc_ccm->ccdr);
+       reg |= MXC_CCM_CCDR_MMDC_CH1_HS_MASK;
+       writel(reg, &mxc_ccm->ccdr);
+
+       /* Set periph2_clk2_sel to be sourced from PLL3_sw_clk */
+       reg = readl(&mxc_ccm->cbcmr);
+       reg &= ~MXC_CCM_CBCMR_PERIPH2_CLK2_SEL;
+       writel(reg, &mxc_ccm->cbcmr);
+
+       /*
+        * Set the periph2_clk_sel to the top mux so that
+        * mmdc_ch1 is from pll3_sw_clk.
+        */
+       reg = readl(&mxc_ccm->cbcdr);
+       reg |= MXC_CCM_CBCDR_PERIPH2_CLK_SEL;
+       writel(reg, &mxc_ccm->cbcdr);
+
+       /* Wait for the clock switch */
+       while (readl(&mxc_ccm->cdhipr))
+               ;
+       /* Disable pll3_sw_clk by selecting bypass clock source */
+       reg = readl(&mxc_ccm->ccsr);
+       reg |= MXC_CCM_CCSR_PLL3_SW_CLK_SEL;
+       writel(reg, &mxc_ccm->ccsr);
+
+       /* Set the ldb_di0_clk and ldb_di1_clk to 111b */
+       reg = readl(&mxc_ccm->cs2cdr);
+       reg |= ((7 << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET)
+             | (7 << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET));
+       writel(reg, &mxc_ccm->cs2cdr);
+
+       /* Set the ldb_di0_clk and ldb_di1_clk to 100b */
+       reg = readl(&mxc_ccm->cs2cdr);
+       reg &= ~(MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK
+             | MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK);
+       reg |= ((4 << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET)
+             | (4 << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET));
+       writel(reg, &mxc_ccm->cs2cdr);
+
+       /* Set the ldb_di0_clk and ldb_di1_clk to desired source */
+       reg = readl(&mxc_ccm->cs2cdr);
+       reg &= ~(MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_MASK
+             | MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_MASK);
+       reg |= ((clk << MXC_CCM_CS2CDR_LDB_DI1_CLK_SEL_OFFSET)
+             | (clk << MXC_CCM_CS2CDR_LDB_DI0_CLK_SEL_OFFSET));
+       writel(reg, &mxc_ccm->cs2cdr);
+
+       /* Unbypass pll3_sw_clk */
+       reg = readl(&mxc_ccm->ccsr);
+       reg &= ~MXC_CCM_CCSR_PLL3_SW_CLK_SEL;
+       writel(reg, &mxc_ccm->ccsr);
+
+       /*
+        * Set the periph2_clk_sel back to the bottom mux so that
+        * mmdc_ch1 is from its original parent.
+        */
+       reg = readl(&mxc_ccm->cbcdr);
+       reg &= ~MXC_CCM_CBCDR_PERIPH2_CLK_SEL;
+       writel(reg, &mxc_ccm->cbcdr);
+
+       /* Wait for the clock switch */
+       while (readl(&mxc_ccm->cdhipr))
+               ;
+       /* Clear MMDC_CH1 mask bit */
+       reg = readl(&mxc_ccm->ccdr);
+       reg &= ~MXC_CCM_CCDR_MMDC_CH1_HS_MASK;
+       writel(reg, &mxc_ccm->ccdr);
+
+       enable_ldb_di_clock_sources();
+}
+#endif
+
+#ifdef CONFIG_MTD_NOR_FLASH
+void enable_eim_clk(unsigned char enable)
+{
+       u32 reg;
+
+       reg = __raw_readl(&imx_ccm->CCGR6);
+       if (enable)
+               reg |= MXC_CCM_CCGR6_EMI_SLOW_MASK;
+       else
+               reg &= ~MXC_CCM_CCGR6_EMI_SLOW_MASK;
+       __raw_writel(reg, &imx_ccm->CCGR6);
+}
+#endif
+
+/***************************************************/
+
+U_BOOT_CMD(
+       clocks, CONFIG_SYS_MAXARGS, 1, do_mx6_showclocks,
+       "display clocks",
+       ""
+);
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c
new file mode 100644 (file)
index 0000000..0cf391e
--- /dev/null
@@ -0,0 +1,1538 @@
+/*
+ * Copyright (C) 2014 Gateworks Corporation
+ * Author: Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <linux/types.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/mx6-ddr.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/io.h>
+#include <asm/types.h>
+#include <wait_bit.h>
+
+#if defined(CONFIG_MX6_DDRCAL)
+static void reset_read_data_fifos(void)
+{
+       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+
+       /* Reset data FIFOs twice. */
+       setbits_le32(&mmdc0->mpdgctrl0, 1 << 31);
+       wait_for_bit("MMDC", &mmdc0->mpdgctrl0, 1 << 31, 0, 100, 0);
+
+       setbits_le32(&mmdc0->mpdgctrl0, 1 << 31);
+       wait_for_bit("MMDC", &mmdc0->mpdgctrl0, 1 << 31, 0, 100, 0);
+}
+
+static void precharge_all(const bool cs0_enable, const bool cs1_enable)
+{
+       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+
+       /*
+        * Issue the Precharge-All command to the DDR device for both
+        * chip selects. Note, CON_REQ bit should also remain set. If
+        * only using one chip select, then precharge only the desired
+        * chip select.
+        */
+       if (cs0_enable) { /* CS0 */
+               writel(0x04008050, &mmdc0->mdscr);
+               wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 1, 100, 0);
+       }
+
+       if (cs1_enable) { /* CS1 */
+               writel(0x04008058, &mmdc0->mdscr);
+               wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 1, 100, 0);
+       }
+}
+
+static void force_delay_measurement(int bus_size)
+{
+       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
+
+       writel(0x800, &mmdc0->mpmur0);
+       if (bus_size == 0x2)
+               writel(0x800, &mmdc1->mpmur0);
+}
+
+static void modify_dg_result(u32 *reg_st0, u32 *reg_st1, u32 *reg_ctrl)
+{
+       u32 dg_tmp_val, dg_dl_abs_offset, dg_hc_del, val_ctrl;
+
+       /*
+        * DQS gating absolute offset should be modified from reflecting
+        * (HW_DG_LOWx + HW_DG_UPx)/2 to reflecting (HW_DG_UPx - 0x80)
+        */
+
+       val_ctrl = readl(reg_ctrl);
+       val_ctrl &= 0xf0000000;
+
+       dg_tmp_val = ((readl(reg_st0) & 0x07ff0000) >> 16) - 0xc0;
+       dg_dl_abs_offset = dg_tmp_val & 0x7f;
+       dg_hc_del = (dg_tmp_val & 0x780) << 1;
+
+       val_ctrl |= dg_dl_abs_offset + dg_hc_del;
+
+       dg_tmp_val = ((readl(reg_st1) & 0x07ff0000) >> 16) - 0xc0;
+       dg_dl_abs_offset = dg_tmp_val & 0x7f;
+       dg_hc_del = (dg_tmp_val & 0x780) << 1;
+
+       val_ctrl |= (dg_dl_abs_offset + dg_hc_del) << 16;
+
+       writel(val_ctrl, reg_ctrl);
+}
+
+int mmdc_do_write_level_calibration(struct mx6_ddr_sysinfo const *sysinfo)
+{
+       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
+       u32 esdmisc_val, zq_val;
+       u32 errors = 0;
+       u32 ldectrl[4] = {0};
+       u32 ddr_mr1 = 0x4;
+       u32 rwalat_max;
+
+       /*
+        * Stash old values in case calibration fails,
+        * we need to restore them
+        */
+       ldectrl[0] = readl(&mmdc0->mpwldectrl0);
+       ldectrl[1] = readl(&mmdc0->mpwldectrl1);
+       if (sysinfo->dsize == 2) {
+               ldectrl[2] = readl(&mmdc1->mpwldectrl0);
+               ldectrl[3] = readl(&mmdc1->mpwldectrl1);
+       }
+
+       /* disable DDR logic power down timer */
+       clrbits_le32(&mmdc0->mdpdc, 0xff00);
+
+       /* disable Adopt power down timer */
+       setbits_le32(&mmdc0->mapsr, 0x1);
+
+       debug("Starting write leveling calibration.\n");
+
+       /*
+        * 2. disable auto refresh and ZQ calibration
+        * before proceeding with Write Leveling calibration
+        */
+       esdmisc_val = readl(&mmdc0->mdref);
+       writel(0x0000C000, &mmdc0->mdref);
+       zq_val = readl(&mmdc0->mpzqhwctrl);
+       writel(zq_val & ~0x3, &mmdc0->mpzqhwctrl);
+
+       /* 3. increase walat and ralat to maximum */
+       rwalat_max = (1 << 6) | (1 << 7) | (1 << 8) | (1 << 16) | (1 << 17);
+       setbits_le32(&mmdc0->mdmisc, rwalat_max);
+       if (sysinfo->dsize == 2)
+               setbits_le32(&mmdc1->mdmisc, rwalat_max);
+       /*
+        * 4 & 5. Configure the external DDR device to enter write-leveling
+        * mode through Load Mode Register command.
+        * Register setting:
+        * Bits[31:16] MR1 value (0x0080 write leveling enable)
+        * Bit[9] set WL_EN to enable MMDC DQS output
+        * Bits[6:4] set CMD bits for Load Mode Register programming
+        * Bits[2:0] set CMD_BA to 0x1 for DDR MR1 programming
+        */
+       writel(0x00808231, &mmdc0->mdscr);
+
+       /* 6. Activate automatic calibration by setting MPWLGCR[HW_WL_EN] */
+       writel(0x00000001, &mmdc0->mpwlgcr);
+
+       /*
+        * 7. Upon completion of this process the MMDC de-asserts
+        * the MPWLGCR[HW_WL_EN]
+        */
+       wait_for_bit("MMDC", &mmdc0->mpwlgcr, 1 << 0, 0, 100, 0);
+
+       /*
+        * 8. check for any errors: check both PHYs for x64 configuration,
+        * if x32, check only PHY0
+        */
+       if (readl(&mmdc0->mpwlgcr) & 0x00000F00)
+               errors |= 1;
+       if (sysinfo->dsize == 2)
+               if (readl(&mmdc1->mpwlgcr) & 0x00000F00)
+                       errors |= 2;
+
+       debug("Ending write leveling calibration. Error mask: 0x%x\n", errors);
+
+       /* check to see if cal failed */
+       if ((readl(&mmdc0->mpwldectrl0) == 0x001F001F) &&
+           (readl(&mmdc0->mpwldectrl1) == 0x001F001F) &&
+           ((sysinfo->dsize < 2) ||
+            ((readl(&mmdc1->mpwldectrl0) == 0x001F001F) &&
+             (readl(&mmdc1->mpwldectrl1) == 0x001F001F)))) {
+               debug("Cal seems to have soft-failed due to memory not supporting write leveling on all channels. Restoring original write leveling values.\n");
+               writel(ldectrl[0], &mmdc0->mpwldectrl0);
+               writel(ldectrl[1], &mmdc0->mpwldectrl1);
+               if (sysinfo->dsize == 2) {
+                       writel(ldectrl[2], &mmdc1->mpwldectrl0);
+                       writel(ldectrl[3], &mmdc1->mpwldectrl1);
+               }
+               errors |= 4;
+       }
+
+       /*
+        * User should issue MRS command to exit write leveling mode
+        * through Load Mode Register command
+        * Register setting:
+        * Bits[31:16] MR1 value "ddr_mr1" value from initialization
+        * Bit[9] clear WL_EN to disable MMDC DQS output
+        * Bits[6:4] set CMD bits for Load Mode Register programming
+        * Bits[2:0] set CMD_BA to 0x1 for DDR MR1 programming
+        */
+       writel((ddr_mr1 << 16) + 0x8031, &mmdc0->mdscr);
+
+       /* re-enable auto refresh and zq cal */
+       writel(esdmisc_val, &mmdc0->mdref);
+       writel(zq_val, &mmdc0->mpzqhwctrl);
+
+       debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08X\n",
+             readl(&mmdc0->mpwldectrl0));
+       debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08X\n",
+             readl(&mmdc0->mpwldectrl1));
+       if (sysinfo->dsize == 2) {
+               debug("\tMMDC_MPWLDECTRL0 after write level cal: 0x%08X\n",
+                     readl(&mmdc1->mpwldectrl0));
+               debug("\tMMDC_MPWLDECTRL1 after write level cal: 0x%08X\n",
+                     readl(&mmdc1->mpwldectrl1));
+       }
+
+       /* We must force a readback of these values, to get them to stick */
+       readl(&mmdc0->mpwldectrl0);
+       readl(&mmdc0->mpwldectrl1);
+       if (sysinfo->dsize == 2) {
+               readl(&mmdc1->mpwldectrl0);
+               readl(&mmdc1->mpwldectrl1);
+       }
+
+       /* enable DDR logic power down timer: */
+       setbits_le32(&mmdc0->mdpdc, 0x00005500);
+
+       /* Enable Adopt power down timer: */
+       clrbits_le32(&mmdc0->mapsr, 0x1);
+
+       /* Clear CON_REQ */
+       writel(0, &mmdc0->mdscr);
+
+       return errors;
+}
+
+int mmdc_do_dqs_calibration(struct mx6_ddr_sysinfo const *sysinfo)
+{
+       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
+       struct mx6dq_iomux_ddr_regs *mx6_ddr_iomux =
+               (struct mx6dq_iomux_ddr_regs *)MX6DQ_IOM_DDR_BASE;
+       bool cs0_enable;
+       bool cs1_enable;
+       bool cs0_enable_initial;
+       bool cs1_enable_initial;
+       u32 esdmisc_val;
+       u32 temp_ref;
+       u32 pddword = 0x00ffff00; /* best so far, place into MPPDCMPR1 */
+       u32 errors = 0;
+       u32 initdelay = 0x40404040;
+
+       /* check to see which chip selects are enabled */
+       cs0_enable_initial = readl(&mmdc0->mdctl) & 0x80000000;
+       cs1_enable_initial = readl(&mmdc0->mdctl) & 0x40000000;
+
+       /* disable DDR logic power down timer: */
+       clrbits_le32(&mmdc0->mdpdc, 0xff00);
+
+       /* disable Adopt power down timer: */
+       setbits_le32(&mmdc0->mapsr, 0x1);
+
+       /* set DQS pull ups */
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs0, 0x7000);
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs1, 0x7000);
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs2, 0x7000);
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs3, 0x7000);
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs4, 0x7000);
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs5, 0x7000);
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs6, 0x7000);
+       setbits_le32(&mx6_ddr_iomux->dram_sdqs7, 0x7000);
+
+       /* Save old RALAT and WALAT values */
+       esdmisc_val = readl(&mmdc0->mdmisc);
+
+       setbits_le32(&mmdc0->mdmisc,
+                    (1 << 6) | (1 << 7) | (1 << 8) | (1 << 16) | (1 << 17));
+
+       /* Disable auto refresh before proceeding with calibration */
+       temp_ref = readl(&mmdc0->mdref);
+       writel(0x0000c000, &mmdc0->mdref);
+
+       /*
+        * Per the ref manual, issue one refresh cycle MDSCR[CMD]= 0x2,
+        * this also sets the CON_REQ bit.
+        */
+       if (cs0_enable_initial)
+               writel(0x00008020, &mmdc0->mdscr);
+       if (cs1_enable_initial)
+               writel(0x00008028, &mmdc0->mdscr);
+
+       /* poll to make sure the con_ack bit was asserted */
+       wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 1, 100, 0);
+
+       /*
+        * Check MDMISC register CALIB_PER_CS to see which CS calibration
+        * is targeted to (under normal cases, it should be cleared
+        * as this is the default value, indicating calibration is directed
+        * to CS0).
+        * Disable the other chip select not being target for calibration
+        * to avoid any potential issues.  This will get re-enabled at end
+        * of calibration.
+        */
+       if ((readl(&mmdc0->mdmisc) & 0x00100000) == 0)
+               clrbits_le32(&mmdc0->mdctl, 1 << 30);   /* clear SDE_1 */
+       else
+               clrbits_le32(&mmdc0->mdctl, 1 << 31);   /* clear SDE_0 */
+
+       /*
+        * Check to see which chip selects are now enabled for
+        * the remainder of the calibration.
+        */
+       cs0_enable = readl(&mmdc0->mdctl) & 0x80000000;
+       cs1_enable = readl(&mmdc0->mdctl) & 0x40000000;
+
+       precharge_all(cs0_enable, cs1_enable);
+
+       /* Write the pre-defined value into MPPDCMPR1 */
+       writel(pddword, &mmdc0->mppdcmpr1);
+
+       /*
+        * Issue a write access to the external DDR device by setting
+        * the bit SW_DUMMY_WR (bit 0) in the MPSWDAR0 and then poll
+        * this bit until it clears to indicate completion of the write access.
+        */
+       setbits_le32(&mmdc0->mpswdar0, 1);
+       wait_for_bit("MMDC", &mmdc0->mpswdar0, 1 << 0, 0, 100, 0);
+
+       /* Set the RD_DL_ABS# bits to their default values
+        * (will be calibrated later in the read delay-line calibration).
+        * Both PHYs for x64 configuration, if x32, do only PHY0.
+        */
+       writel(initdelay, &mmdc0->mprddlctl);
+       if (sysinfo->dsize == 0x2)
+               writel(initdelay, &mmdc1->mprddlctl);
+
+       /* Force a measurment, for previous delay setup to take effect. */
+       force_delay_measurement(sysinfo->dsize);
+
+       /*
+        * ***************************
+        * Read DQS Gating calibration
+        * ***************************
+        */
+       debug("Starting Read DQS Gating calibration.\n");
+
+       /*
+        * Reset the read data FIFOs (two resets); only need to issue reset
+        * to PHY0 since in x64 mode, the reset will also go to PHY1.
+        */
+       reset_read_data_fifos();
+
+       /*
+        * Start the automatic read DQS gating calibration process by
+        * asserting MPDGCTRL0[HW_DG_EN] and MPDGCTRL0[DG_CMP_CYC]
+        * and then poll MPDGCTRL0[HW_DG_EN]] until this bit clears
+        * to indicate completion.
+        * Also, ensure that MPDGCTRL0[HW_DG_ERR] is clear to indicate
+        * no errors were seen during calibration.
+        */
+
+       /*
+        * Set bit 30: chooses option to wait 32 cycles instead of
+        * 16 before comparing read data.
+        */
+       setbits_le32(&mmdc0->mpdgctrl0, 1 << 30);
+       if (sysinfo->dsize == 2)
+               setbits_le32(&mmdc1->mpdgctrl0, 1 << 30);
+
+       /* Set bit 28 to start automatic read DQS gating calibration */
+       setbits_le32(&mmdc0->mpdgctrl0, 5 << 28);
+
+       /* Poll for completion.  MPDGCTRL0[HW_DG_EN] should be 0 */
+       wait_for_bit("MMDC", &mmdc0->mpdgctrl0, 1 << 28, 0, 100, 0);
+
+       /*
+        * Check to see if any errors were encountered during calibration
+        * (check MPDGCTRL0[HW_DG_ERR]).
+        * Check both PHYs for x64 configuration, if x32, check only PHY0.
+        */
+       if (readl(&mmdc0->mpdgctrl0) & 0x00001000)
+               errors |= 1;
+
+       if ((sysinfo->dsize == 0x2) && (readl(&mmdc1->mpdgctrl0) & 0x00001000))
+               errors |= 2;
+
+       /* now disable mpdgctrl0[DG_CMP_CYC] */
+       clrbits_le32(&mmdc0->mpdgctrl0, 1 << 30);
+       if (sysinfo->dsize == 2)
+               clrbits_le32(&mmdc1->mpdgctrl0, 1 << 30);
+
+       /*
+        * DQS gating absolute offset should be modified from
+        * reflecting (HW_DG_LOWx + HW_DG_UPx)/2 to
+        * reflecting (HW_DG_UPx - 0x80)
+        */
+       modify_dg_result(&mmdc0->mpdghwst0, &mmdc0->mpdghwst1,
+                        &mmdc0->mpdgctrl0);
+       modify_dg_result(&mmdc0->mpdghwst2, &mmdc0->mpdghwst3,
+                        &mmdc0->mpdgctrl1);
+       if (sysinfo->dsize == 0x2) {
+               modify_dg_result(&mmdc1->mpdghwst0, &mmdc1->mpdghwst1,
+                                &mmdc1->mpdgctrl0);
+               modify_dg_result(&mmdc1->mpdghwst2, &mmdc1->mpdghwst3,
+                                &mmdc1->mpdgctrl1);
+       }
+       debug("Ending Read DQS Gating calibration. Error mask: 0x%x\n", errors);
+
+       /*
+        * **********************
+        * Read Delay calibration
+        * **********************
+        */
+       debug("Starting Read Delay calibration.\n");
+
+       reset_read_data_fifos();
+
+       /*
+        * 4. Issue the Precharge-All command to the DDR device for both
+        * chip selects.  If only using one chip select, then precharge
+        * only the desired chip select.
+        */
+       precharge_all(cs0_enable, cs1_enable);
+
+       /*
+        * 9. Read delay-line calibration
+        * Start the automatic read calibration process by asserting
+        * MPRDDLHWCTL[HW_RD_DL_EN].
+        */
+       writel(0x00000030, &mmdc0->mprddlhwctl);
+
+       /*
+        * 10. poll for completion
+        * MMDC indicates that the write data calibration had finished by
+        * setting MPRDDLHWCTL[HW_RD_DL_EN] = 0.   Also, ensure that
+        * no error bits were set.
+        */
+       wait_for_bit("MMDC", &mmdc0->mprddlhwctl, 1 << 4, 0, 100, 0);
+
+       /* check both PHYs for x64 configuration, if x32, check only PHY0 */
+       if (readl(&mmdc0->mprddlhwctl) & 0x0000000f)
+               errors |= 4;
+
+       if ((sysinfo->dsize == 0x2) &&
+           (readl(&mmdc1->mprddlhwctl) & 0x0000000f))
+               errors |= 8;
+
+       debug("Ending Read Delay calibration. Error mask: 0x%x\n", errors);
+
+       /*
+        * ***********************
+        * Write Delay Calibration
+        * ***********************
+        */
+       debug("Starting Write Delay calibration.\n");
+
+       reset_read_data_fifos();
+
+       /*
+        * 4. Issue the Precharge-All command to the DDR device for both
+        * chip selects. If only using one chip select, then precharge
+        * only the desired chip select.
+        */
+       precharge_all(cs0_enable, cs1_enable);
+
+       /*
+        * 8. Set the WR_DL_ABS# bits to their default values.
+        * Both PHYs for x64 configuration, if x32, do only PHY0.
+        */
+       writel(initdelay, &mmdc0->mpwrdlctl);
+       if (sysinfo->dsize == 0x2)
+               writel(initdelay, &mmdc1->mpwrdlctl);
+
+       /*
+        * XXX This isn't in the manual. Force a measurement,
+        * for previous delay setup to effect.
+        */
+       force_delay_measurement(sysinfo->dsize);
+
+       /*
+        * 9. 10. Start the automatic write calibration process
+        * by asserting MPWRDLHWCTL0[HW_WR_DL_EN].
+        */
+       writel(0x00000030, &mmdc0->mpwrdlhwctl);
+
+       /*
+        * Poll for completion.
+        * MMDC indicates that the write data calibration had finished
+        * by setting MPWRDLHWCTL[HW_WR_DL_EN] = 0.
+        * Also, ensure that no error bits were set.
+        */
+       wait_for_bit("MMDC", &mmdc0->mpwrdlhwctl, 1 << 4, 0, 100, 0);
+
+       /* Check both PHYs for x64 configuration, if x32, check only PHY0 */
+       if (readl(&mmdc0->mpwrdlhwctl) & 0x0000000f)
+               errors |= 16;
+
+       if ((sysinfo->dsize == 0x2) &&
+           (readl(&mmdc1->mpwrdlhwctl) & 0x0000000f))
+               errors |= 32;
+
+       debug("Ending Write Delay calibration. Error mask: 0x%x\n", errors);
+
+       reset_read_data_fifos();
+
+       /* Enable DDR logic power down timer */
+       setbits_le32(&mmdc0->mdpdc, 0x00005500);
+
+       /* Enable Adopt power down timer */
+       clrbits_le32(&mmdc0->mapsr, 0x1);
+
+       /* Restore MDMISC value (RALAT, WALAT) to MMDCP1 */
+       writel(esdmisc_val, &mmdc0->mdmisc);
+
+       /* Clear DQS pull ups */
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs0, 0x7000);
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs1, 0x7000);
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs2, 0x7000);
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs3, 0x7000);
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs4, 0x7000);
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs5, 0x7000);
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs6, 0x7000);
+       clrbits_le32(&mx6_ddr_iomux->dram_sdqs7, 0x7000);
+
+       /* Re-enable SDE (chip selects) if they were set initially */
+       if (cs1_enable_initial)
+               /* Set SDE_1 */
+               setbits_le32(&mmdc0->mdctl, 1 << 30);
+
+       if (cs0_enable_initial)
+               /* Set SDE_0 */
+               setbits_le32(&mmdc0->mdctl, 1 << 31);
+
+       /* Re-enable to auto refresh */
+       writel(temp_ref, &mmdc0->mdref);
+
+       /* Clear the MDSCR (including the con_req bit) */
+       writel(0x0, &mmdc0->mdscr);     /* CS0 */
+
+       /* Poll to make sure the con_ack bit is clear */
+       wait_for_bit("MMDC", &mmdc0->mdscr, 1 << 14, 0, 100, 0);
+
+       /*
+        * Print out the registers that were updated as a result
+        * of the calibration process.
+        */
+       debug("MMDC registers updated from calibration\n");
+       debug("Read DQS gating calibration:\n");
+       debug("\tMPDGCTRL0 PHY0 = 0x%08X\n", readl(&mmdc0->mpdgctrl0));
+       debug("\tMPDGCTRL1 PHY0 = 0x%08X\n", readl(&mmdc0->mpdgctrl1));
+       if (sysinfo->dsize == 2) {
+               debug("\tMPDGCTRL0 PHY1 = 0x%08X\n", readl(&mmdc1->mpdgctrl0));
+               debug("\tMPDGCTRL1 PHY1 = 0x%08X\n", readl(&mmdc1->mpdgctrl1));
+       }
+       debug("Read calibration:\n");
+       debug("\tMPRDDLCTL PHY0 = 0x%08X\n", readl(&mmdc0->mprddlctl));
+       if (sysinfo->dsize == 2)
+               debug("\tMPRDDLCTL PHY1 = 0x%08X\n", readl(&mmdc1->mprddlctl));
+       debug("Write calibration:\n");
+       debug("\tMPWRDLCTL PHY0 = 0x%08X\n", readl(&mmdc0->mpwrdlctl));
+       if (sysinfo->dsize == 2)
+               debug("\tMPWRDLCTL PHY1 = 0x%08X\n", readl(&mmdc1->mpwrdlctl));
+
+       /*
+        * Registers below are for debugging purposes.  These print out
+        * the upper and lower boundaries captured during
+        * read DQS gating calibration.
+        */
+       debug("Status registers bounds for read DQS gating:\n");
+       debug("\tMPDGHWST0 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst0));
+       debug("\tMPDGHWST1 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst1));
+       debug("\tMPDGHWST2 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst2));
+       debug("\tMPDGHWST3 PHY0 = 0x%08x\n", readl(&mmdc0->mpdghwst3));
+       if (sysinfo->dsize == 2) {
+               debug("\tMPDGHWST0 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst0));
+               debug("\tMPDGHWST1 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst1));
+               debug("\tMPDGHWST2 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst2));
+               debug("\tMPDGHWST3 PHY1 = 0x%08x\n", readl(&mmdc1->mpdghwst3));
+       }
+
+       debug("Final do_dqs_calibration error mask: 0x%x\n", errors);
+
+       return errors;
+}
+#endif
+
+#if defined(CONFIG_MX6SX)
+/* Configure MX6SX mmdc iomux */
+void mx6sx_dram_iocfg(unsigned width,
+                     const struct mx6sx_iomux_ddr_regs *ddr,
+                     const struct mx6sx_iomux_grp_regs *grp)
+{
+       struct mx6sx_iomux_ddr_regs *mx6_ddr_iomux;
+       struct mx6sx_iomux_grp_regs *mx6_grp_iomux;
+
+       mx6_ddr_iomux = (struct mx6sx_iomux_ddr_regs *)MX6SX_IOM_DDR_BASE;
+       mx6_grp_iomux = (struct mx6sx_iomux_grp_regs *)MX6SX_IOM_GRP_BASE;
+
+       /* DDR IO TYPE */
+       writel(grp->grp_ddr_type, &mx6_grp_iomux->grp_ddr_type);
+       writel(grp->grp_ddrpke, &mx6_grp_iomux->grp_ddrpke);
+
+       /* CLOCK */
+       writel(ddr->dram_sdclk_0, &mx6_ddr_iomux->dram_sdclk_0);
+
+       /* ADDRESS */
+       writel(ddr->dram_cas, &mx6_ddr_iomux->dram_cas);
+       writel(ddr->dram_ras, &mx6_ddr_iomux->dram_ras);
+       writel(grp->grp_addds, &mx6_grp_iomux->grp_addds);
+
+       /* Control */
+       writel(ddr->dram_reset, &mx6_ddr_iomux->dram_reset);
+       writel(ddr->dram_sdba2, &mx6_ddr_iomux->dram_sdba2);
+       writel(ddr->dram_sdcke0, &mx6_ddr_iomux->dram_sdcke0);
+       writel(ddr->dram_sdcke1, &mx6_ddr_iomux->dram_sdcke1);
+       writel(ddr->dram_odt0, &mx6_ddr_iomux->dram_odt0);
+       writel(ddr->dram_odt1, &mx6_ddr_iomux->dram_odt1);
+       writel(grp->grp_ctlds, &mx6_grp_iomux->grp_ctlds);
+
+       /* Data Strobes */
+       writel(grp->grp_ddrmode_ctl, &mx6_grp_iomux->grp_ddrmode_ctl);
+       writel(ddr->dram_sdqs0, &mx6_ddr_iomux->dram_sdqs0);
+       writel(ddr->dram_sdqs1, &mx6_ddr_iomux->dram_sdqs1);
+       if (width >= 32) {
+               writel(ddr->dram_sdqs2, &mx6_ddr_iomux->dram_sdqs2);
+               writel(ddr->dram_sdqs3, &mx6_ddr_iomux->dram_sdqs3);
+       }
+
+       /* Data */
+       writel(grp->grp_ddrmode, &mx6_grp_iomux->grp_ddrmode);
+       writel(grp->grp_b0ds, &mx6_grp_iomux->grp_b0ds);
+       writel(grp->grp_b1ds, &mx6_grp_iomux->grp_b1ds);
+       if (width >= 32) {
+               writel(grp->grp_b2ds, &mx6_grp_iomux->grp_b2ds);
+               writel(grp->grp_b3ds, &mx6_grp_iomux->grp_b3ds);
+       }
+       writel(ddr->dram_dqm0, &mx6_ddr_iomux->dram_dqm0);
+       writel(ddr->dram_dqm1, &mx6_ddr_iomux->dram_dqm1);
+       if (width >= 32) {
+               writel(ddr->dram_dqm2, &mx6_ddr_iomux->dram_dqm2);
+               writel(ddr->dram_dqm3, &mx6_ddr_iomux->dram_dqm3);
+       }
+}
+#endif
+
+#ifdef CONFIG_MX6UL
+void mx6ul_dram_iocfg(unsigned width,
+                     const struct mx6ul_iomux_ddr_regs *ddr,
+                     const struct mx6ul_iomux_grp_regs *grp)
+{
+       struct mx6ul_iomux_ddr_regs *mx6_ddr_iomux;
+       struct mx6ul_iomux_grp_regs *mx6_grp_iomux;
+
+       mx6_ddr_iomux = (struct mx6ul_iomux_ddr_regs *)MX6UL_IOM_DDR_BASE;
+       mx6_grp_iomux = (struct mx6ul_iomux_grp_regs *)MX6UL_IOM_GRP_BASE;
+
+       /* DDR IO TYPE */
+       writel(grp->grp_ddr_type, &mx6_grp_iomux->grp_ddr_type);
+       writel(grp->grp_ddrpke, &mx6_grp_iomux->grp_ddrpke);
+
+       /* CLOCK */
+       writel(ddr->dram_sdclk_0, &mx6_ddr_iomux->dram_sdclk_0);
+
+       /* ADDRESS */
+       writel(ddr->dram_cas, &mx6_ddr_iomux->dram_cas);
+       writel(ddr->dram_ras, &mx6_ddr_iomux->dram_ras);
+       writel(grp->grp_addds, &mx6_grp_iomux->grp_addds);
+
+       /* Control */
+       writel(ddr->dram_reset, &mx6_ddr_iomux->dram_reset);
+       writel(ddr->dram_sdba2, &mx6_ddr_iomux->dram_sdba2);
+       writel(ddr->dram_odt0, &mx6_ddr_iomux->dram_odt0);
+       writel(ddr->dram_odt1, &mx6_ddr_iomux->dram_odt1);
+       writel(grp->grp_ctlds, &mx6_grp_iomux->grp_ctlds);
+
+       /* Data Strobes */
+       writel(grp->grp_ddrmode_ctl, &mx6_grp_iomux->grp_ddrmode_ctl);
+       writel(ddr->dram_sdqs0, &mx6_ddr_iomux->dram_sdqs0);
+       writel(ddr->dram_sdqs1, &mx6_ddr_iomux->dram_sdqs1);
+
+       /* Data */
+       writel(grp->grp_ddrmode, &mx6_grp_iomux->grp_ddrmode);
+       writel(grp->grp_b0ds, &mx6_grp_iomux->grp_b0ds);
+       writel(grp->grp_b1ds, &mx6_grp_iomux->grp_b1ds);
+       writel(ddr->dram_dqm0, &mx6_ddr_iomux->dram_dqm0);
+       writel(ddr->dram_dqm1, &mx6_ddr_iomux->dram_dqm1);
+}
+#endif
+
+#if defined(CONFIG_MX6SL)
+void mx6sl_dram_iocfg(unsigned width,
+                     const struct mx6sl_iomux_ddr_regs *ddr,
+                     const struct mx6sl_iomux_grp_regs *grp)
+{
+       struct mx6sl_iomux_ddr_regs *mx6_ddr_iomux;
+       struct mx6sl_iomux_grp_regs *mx6_grp_iomux;
+
+       mx6_ddr_iomux = (struct mx6sl_iomux_ddr_regs *)MX6SL_IOM_DDR_BASE;
+       mx6_grp_iomux = (struct mx6sl_iomux_grp_regs *)MX6SL_IOM_GRP_BASE;
+
+       /* DDR IO TYPE */
+       mx6_grp_iomux->grp_ddr_type = grp->grp_ddr_type;
+       mx6_grp_iomux->grp_ddrpke = grp->grp_ddrpke;
+
+       /* CLOCK */
+       mx6_ddr_iomux->dram_sdclk_0 = ddr->dram_sdclk_0;
+
+       /* ADDRESS */
+       mx6_ddr_iomux->dram_cas = ddr->dram_cas;
+       mx6_ddr_iomux->dram_ras = ddr->dram_ras;
+       mx6_grp_iomux->grp_addds = grp->grp_addds;
+
+       /* Control */
+       mx6_ddr_iomux->dram_reset = ddr->dram_reset;
+       mx6_ddr_iomux->dram_sdba2 = ddr->dram_sdba2;
+       mx6_grp_iomux->grp_ctlds = grp->grp_ctlds;
+
+       /* Data Strobes */
+       mx6_grp_iomux->grp_ddrmode_ctl = grp->grp_ddrmode_ctl;
+       mx6_ddr_iomux->dram_sdqs0 = ddr->dram_sdqs0;
+       mx6_ddr_iomux->dram_sdqs1 = ddr->dram_sdqs1;
+       if (width >= 32) {
+               mx6_ddr_iomux->dram_sdqs2 = ddr->dram_sdqs2;
+               mx6_ddr_iomux->dram_sdqs3 = ddr->dram_sdqs3;
+       }
+
+       /* Data */
+       mx6_grp_iomux->grp_ddrmode = grp->grp_ddrmode;
+       mx6_grp_iomux->grp_b0ds = grp->grp_b0ds;
+       mx6_grp_iomux->grp_b1ds = grp->grp_b1ds;
+       if (width >= 32) {
+               mx6_grp_iomux->grp_b2ds = grp->grp_b2ds;
+               mx6_grp_iomux->grp_b3ds = grp->grp_b3ds;
+       }
+
+       mx6_ddr_iomux->dram_dqm0 = ddr->dram_dqm0;
+       mx6_ddr_iomux->dram_dqm1 = ddr->dram_dqm1;
+       if (width >= 32) {
+               mx6_ddr_iomux->dram_dqm2 = ddr->dram_dqm2;
+               mx6_ddr_iomux->dram_dqm3 = ddr->dram_dqm3;
+       }
+}
+#endif
+
+#if defined(CONFIG_MX6QDL) || defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
+/* Configure MX6DQ mmdc iomux */
+void mx6dq_dram_iocfg(unsigned width,
+                     const struct mx6dq_iomux_ddr_regs *ddr,
+                     const struct mx6dq_iomux_grp_regs *grp)
+{
+       volatile struct mx6dq_iomux_ddr_regs *mx6_ddr_iomux;
+       volatile struct mx6dq_iomux_grp_regs *mx6_grp_iomux;
+
+       mx6_ddr_iomux = (struct mx6dq_iomux_ddr_regs *)MX6DQ_IOM_DDR_BASE;
+       mx6_grp_iomux = (struct mx6dq_iomux_grp_regs *)MX6DQ_IOM_GRP_BASE;
+
+       /* DDR IO Type */
+       mx6_grp_iomux->grp_ddr_type = grp->grp_ddr_type;
+       mx6_grp_iomux->grp_ddrpke = grp->grp_ddrpke;
+
+       /* Clock */
+       mx6_ddr_iomux->dram_sdclk_0 = ddr->dram_sdclk_0;
+       mx6_ddr_iomux->dram_sdclk_1 = ddr->dram_sdclk_1;
+
+       /* Address */
+       mx6_ddr_iomux->dram_cas = ddr->dram_cas;
+       mx6_ddr_iomux->dram_ras = ddr->dram_ras;
+       mx6_grp_iomux->grp_addds = grp->grp_addds;
+
+       /* Control */
+       mx6_ddr_iomux->dram_reset = ddr->dram_reset;
+       mx6_ddr_iomux->dram_sdcke0 = ddr->dram_sdcke0;
+       mx6_ddr_iomux->dram_sdcke1 = ddr->dram_sdcke1;
+       mx6_ddr_iomux->dram_sdba2 = ddr->dram_sdba2;
+       mx6_ddr_iomux->dram_sdodt0 = ddr->dram_sdodt0;
+       mx6_ddr_iomux->dram_sdodt1 = ddr->dram_sdodt1;
+       mx6_grp_iomux->grp_ctlds = grp->grp_ctlds;
+
+       /* Data Strobes */
+       mx6_grp_iomux->grp_ddrmode_ctl = grp->grp_ddrmode_ctl;
+       mx6_ddr_iomux->dram_sdqs0 = ddr->dram_sdqs0;
+       mx6_ddr_iomux->dram_sdqs1 = ddr->dram_sdqs1;
+       if (width >= 32) {
+               mx6_ddr_iomux->dram_sdqs2 = ddr->dram_sdqs2;
+               mx6_ddr_iomux->dram_sdqs3 = ddr->dram_sdqs3;
+       }
+       if (width >= 64) {
+               mx6_ddr_iomux->dram_sdqs4 = ddr->dram_sdqs4;
+               mx6_ddr_iomux->dram_sdqs5 = ddr->dram_sdqs5;
+               mx6_ddr_iomux->dram_sdqs6 = ddr->dram_sdqs6;
+               mx6_ddr_iomux->dram_sdqs7 = ddr->dram_sdqs7;
+       }
+
+       /* Data */
+       mx6_grp_iomux->grp_ddrmode = grp->grp_ddrmode;
+       mx6_grp_iomux->grp_b0ds = grp->grp_b0ds;
+       mx6_grp_iomux->grp_b1ds = grp->grp_b1ds;
+       if (width >= 32) {
+               mx6_grp_iomux->grp_b2ds = grp->grp_b2ds;
+               mx6_grp_iomux->grp_b3ds = grp->grp_b3ds;
+       }
+       if (width >= 64) {
+               mx6_grp_iomux->grp_b4ds = grp->grp_b4ds;
+               mx6_grp_iomux->grp_b5ds = grp->grp_b5ds;
+               mx6_grp_iomux->grp_b6ds = grp->grp_b6ds;
+               mx6_grp_iomux->grp_b7ds = grp->grp_b7ds;
+       }
+       mx6_ddr_iomux->dram_dqm0 = ddr->dram_dqm0;
+       mx6_ddr_iomux->dram_dqm1 = ddr->dram_dqm1;
+       if (width >= 32) {
+               mx6_ddr_iomux->dram_dqm2 = ddr->dram_dqm2;
+               mx6_ddr_iomux->dram_dqm3 = ddr->dram_dqm3;
+       }
+       if (width >= 64) {
+               mx6_ddr_iomux->dram_dqm4 = ddr->dram_dqm4;
+               mx6_ddr_iomux->dram_dqm5 = ddr->dram_dqm5;
+               mx6_ddr_iomux->dram_dqm6 = ddr->dram_dqm6;
+               mx6_ddr_iomux->dram_dqm7 = ddr->dram_dqm7;
+       }
+}
+#endif
+
+#if defined(CONFIG_MX6QDL) || defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
+/* Configure MX6SDL mmdc iomux */
+void mx6sdl_dram_iocfg(unsigned width,
+                      const struct mx6sdl_iomux_ddr_regs *ddr,
+                      const struct mx6sdl_iomux_grp_regs *grp)
+{
+       volatile struct mx6sdl_iomux_ddr_regs *mx6_ddr_iomux;
+       volatile struct mx6sdl_iomux_grp_regs *mx6_grp_iomux;
+
+       mx6_ddr_iomux = (struct mx6sdl_iomux_ddr_regs *)MX6SDL_IOM_DDR_BASE;
+       mx6_grp_iomux = (struct mx6sdl_iomux_grp_regs *)MX6SDL_IOM_GRP_BASE;
+
+       /* DDR IO Type */
+       mx6_grp_iomux->grp_ddr_type = grp->grp_ddr_type;
+       mx6_grp_iomux->grp_ddrpke = grp->grp_ddrpke;
+
+       /* Clock */
+       mx6_ddr_iomux->dram_sdclk_0 = ddr->dram_sdclk_0;
+       mx6_ddr_iomux->dram_sdclk_1 = ddr->dram_sdclk_1;
+
+       /* Address */
+       mx6_ddr_iomux->dram_cas = ddr->dram_cas;
+       mx6_ddr_iomux->dram_ras = ddr->dram_ras;
+       mx6_grp_iomux->grp_addds = grp->grp_addds;
+
+       /* Control */
+       mx6_ddr_iomux->dram_reset = ddr->dram_reset;
+       mx6_ddr_iomux->dram_sdcke0 = ddr->dram_sdcke0;
+       mx6_ddr_iomux->dram_sdcke1 = ddr->dram_sdcke1;
+       mx6_ddr_iomux->dram_sdba2 = ddr->dram_sdba2;
+       mx6_ddr_iomux->dram_sdodt0 = ddr->dram_sdodt0;
+       mx6_ddr_iomux->dram_sdodt1 = ddr->dram_sdodt1;
+       mx6_grp_iomux->grp_ctlds = grp->grp_ctlds;
+
+       /* Data Strobes */
+       mx6_grp_iomux->grp_ddrmode_ctl = grp->grp_ddrmode_ctl;
+       mx6_ddr_iomux->dram_sdqs0 = ddr->dram_sdqs0;
+       mx6_ddr_iomux->dram_sdqs1 = ddr->dram_sdqs1;
+       if (width >= 32) {
+               mx6_ddr_iomux->dram_sdqs2 = ddr->dram_sdqs2;
+               mx6_ddr_iomux->dram_sdqs3 = ddr->dram_sdqs3;
+       }
+       if (width >= 64) {
+               mx6_ddr_iomux->dram_sdqs4 = ddr->dram_sdqs4;
+               mx6_ddr_iomux->dram_sdqs5 = ddr->dram_sdqs5;
+               mx6_ddr_iomux->dram_sdqs6 = ddr->dram_sdqs6;
+               mx6_ddr_iomux->dram_sdqs7 = ddr->dram_sdqs7;
+       }
+
+       /* Data */
+       mx6_grp_iomux->grp_ddrmode = grp->grp_ddrmode;
+       mx6_grp_iomux->grp_b0ds = grp->grp_b0ds;
+       mx6_grp_iomux->grp_b1ds = grp->grp_b1ds;
+       if (width >= 32) {
+               mx6_grp_iomux->grp_b2ds = grp->grp_b2ds;
+               mx6_grp_iomux->grp_b3ds = grp->grp_b3ds;
+       }
+       if (width >= 64) {
+               mx6_grp_iomux->grp_b4ds = grp->grp_b4ds;
+               mx6_grp_iomux->grp_b5ds = grp->grp_b5ds;
+               mx6_grp_iomux->grp_b6ds = grp->grp_b6ds;
+               mx6_grp_iomux->grp_b7ds = grp->grp_b7ds;
+       }
+       mx6_ddr_iomux->dram_dqm0 = ddr->dram_dqm0;
+       mx6_ddr_iomux->dram_dqm1 = ddr->dram_dqm1;
+       if (width >= 32) {
+               mx6_ddr_iomux->dram_dqm2 = ddr->dram_dqm2;
+               mx6_ddr_iomux->dram_dqm3 = ddr->dram_dqm3;
+       }
+       if (width >= 64) {
+               mx6_ddr_iomux->dram_dqm4 = ddr->dram_dqm4;
+               mx6_ddr_iomux->dram_dqm5 = ddr->dram_dqm5;
+               mx6_ddr_iomux->dram_dqm6 = ddr->dram_dqm6;
+               mx6_ddr_iomux->dram_dqm7 = ddr->dram_dqm7;
+       }
+}
+#endif
+
+/*
+ * Configure mx6 mmdc registers based on:
+ *  - board-specific memory configuration
+ *  - board-specific calibration data
+ *  - ddr3/lpddr2 chip details
+ *
+ * The various calculations here are derived from the Freescale
+ * 1. i.Mx6DQSDL DDR3 Script Aid spreadsheet (DOC-94917) designed to generate
+ *    MMDC configuration registers based on memory system and memory chip
+ *    parameters.
+ *
+ * 2. i.Mx6SL LPDDR2 Script Aid spreadsheet V0.04 designed to generate MMDC
+ *    configuration registers based on memory system and memory chip
+ *    parameters.
+ *
+ * The defaults here are those which were specified in the spreadsheet.
+ * For details on each register, refer to the IMX6DQRM and/or IMX6SDLRM
+ * and/or IMX6SLRM section titled MMDC initialization.
+ */
+#define MR(val, ba, cmd, cs1) \
+       ((val << 16) | (1 << 15) | (cmd << 4) | (cs1 << 3) | ba)
+#define MMDC1(entry, value) do {                                         \
+       if (!is_mx6sx() && !is_mx6ul() && !is_mx6sl())                    \
+               mmdc1->entry = value;                                     \
+       } while (0)
+
+/*
+ * According JESD209-2B-LPDDR2: Table 103
+ * WL: write latency
+ */
+static int lpddr2_wl(uint32_t mem_speed)
+{
+       switch (mem_speed) {
+       case 1066:
+       case 933:
+               return 4;
+       case 800:
+               return 3;
+       case 677:
+       case 533:
+               return 2;
+       case 400:
+       case 333:
+               return 1;
+       default:
+               puts("invalid memory speed\n");
+               hang();
+       }
+
+       return 0;
+}
+
+/*
+ * According JESD209-2B-LPDDR2: Table 103
+ * RL: read latency
+ */
+static int lpddr2_rl(uint32_t mem_speed)
+{
+       switch (mem_speed) {
+       case 1066:
+               return 8;
+       case 933:
+               return 7;
+       case 800:
+               return 6;
+       case 677:
+               return 5;
+       case 533:
+               return 4;
+       case 400:
+       case 333:
+               return 3;
+       default:
+               puts("invalid memory speed\n");
+               hang();
+       }
+
+       return 0;
+}
+
+void mx6_lpddr2_cfg(const struct mx6_ddr_sysinfo *sysinfo,
+                   const struct mx6_mmdc_calibration *calib,
+                   const struct mx6_lpddr2_cfg *lpddr2_cfg)
+{
+       volatile struct mmdc_p_regs *mmdc0;
+       u32 val;
+       u8 tcke, tcksrx, tcksre, trrd;
+       u8 twl, txp, tfaw, tcl;
+       u16 tras, twr, tmrd, trtp, twtr, trfc, txsr;
+       u16 trcd_lp, trppb_lp, trpab_lp, trc_lp;
+       u16 cs0_end;
+       u8 coladdr;
+       int clkper; /* clock period in picoseconds */
+       int clock;  /* clock freq in mHz */
+       int cs;
+
+       /* only support 16/32 bits */
+       if (sysinfo->dsize > 1)
+               hang();
+
+       mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+
+       clock = mxc_get_clock(MXC_DDR_CLK) / 1000000U;
+       clkper = (1000 * 1000) / clock; /* pico seconds */
+
+       twl = lpddr2_wl(lpddr2_cfg->mem_speed) - 1;
+
+       /* LPDDR2-S2 and LPDDR2-S4 have the same tRFC value. */
+       switch (lpddr2_cfg->density) {
+       case 1:
+       case 2:
+       case 4:
+               trfc = DIV_ROUND_UP(130000, clkper) - 1;
+               txsr = DIV_ROUND_UP(140000, clkper) - 1;
+               break;
+       case 8:
+               trfc = DIV_ROUND_UP(210000, clkper) - 1;
+               txsr = DIV_ROUND_UP(220000, clkper) - 1;
+               break;
+       default:
+               /*
+                * 64Mb, 128Mb, 256Mb, 512Mb are not supported currently.
+                */
+               hang();
+               break;
+       }
+       /*
+        * txpdll, txpr, taonpd and taofpd are not relevant in LPDDR2 mode,
+        * set them to 0. */
+       txp = DIV_ROUND_UP(7500, clkper) - 1;
+       tcke = 3;
+       if (lpddr2_cfg->mem_speed == 333)
+               tfaw = DIV_ROUND_UP(60000, clkper) - 1;
+       else
+               tfaw = DIV_ROUND_UP(50000, clkper) - 1;
+       trrd = DIV_ROUND_UP(10000, clkper) - 1;
+
+       /* tckesr for LPDDR2 */
+       tcksre = DIV_ROUND_UP(15000, clkper);
+       tcksrx = tcksre;
+       twr  = DIV_ROUND_UP(15000, clkper) - 1;
+       /*
+        * tMRR: 2, tMRW: 5
+        * tMRD should be set to max(tMRR, tMRW)
+        */
+       tmrd = 5;
+       tras = DIV_ROUND_UP(lpddr2_cfg->trasmin, clkper / 10) - 1;
+       /* LPDDR2 mode use tRCD_LP filed in MDCFG3. */
+       trcd_lp = DIV_ROUND_UP(lpddr2_cfg->trcd_lp, clkper / 10) - 1;
+       trc_lp = DIV_ROUND_UP(lpddr2_cfg->trasmin + lpddr2_cfg->trppb_lp,
+                             clkper / 10) - 1;
+       trppb_lp = DIV_ROUND_UP(lpddr2_cfg->trppb_lp, clkper / 10) - 1;
+       trpab_lp = DIV_ROUND_UP(lpddr2_cfg->trpab_lp, clkper / 10) - 1;
+       /* To LPDDR2, CL in MDCFG0 refers to RL */
+       tcl = lpddr2_rl(lpddr2_cfg->mem_speed) - 3;
+       twtr = DIV_ROUND_UP(7500, clkper) - 1;
+       trtp = DIV_ROUND_UP(7500, clkper) - 1;
+
+       cs0_end = 4 * sysinfo->cs_density - 1;
+
+       debug("density:%d Gb (%d Gb per chip)\n",
+             sysinfo->cs_density, lpddr2_cfg->density);
+       debug("clock: %dMHz (%d ps)\n", clock, clkper);
+       debug("memspd:%d\n", lpddr2_cfg->mem_speed);
+       debug("trcd_lp=%d\n", trcd_lp);
+       debug("trppb_lp=%d\n", trppb_lp);
+       debug("trpab_lp=%d\n", trpab_lp);
+       debug("trc_lp=%d\n", trc_lp);
+       debug("tcke=%d\n", tcke);
+       debug("tcksrx=%d\n", tcksrx);
+       debug("tcksre=%d\n", tcksre);
+       debug("trfc=%d\n", trfc);
+       debug("txsr=%d\n", txsr);
+       debug("txp=%d\n", txp);
+       debug("tfaw=%d\n", tfaw);
+       debug("tcl=%d\n", tcl);
+       debug("tras=%d\n", tras);
+       debug("twr=%d\n", twr);
+       debug("tmrd=%d\n", tmrd);
+       debug("twl=%d\n", twl);
+       debug("trtp=%d\n", trtp);
+       debug("twtr=%d\n", twtr);
+       debug("trrd=%d\n", trrd);
+       debug("cs0_end=%d\n", cs0_end);
+       debug("ncs=%d\n", sysinfo->ncs);
+
+       /*
+        * board-specific configuration:
+        *  These values are determined empirically and vary per board layout
+        */
+       mmdc0->mpwldectrl0 = calib->p0_mpwldectrl0;
+       mmdc0->mpwldectrl1 = calib->p0_mpwldectrl1;
+       mmdc0->mpdgctrl0 = calib->p0_mpdgctrl0;
+       mmdc0->mpdgctrl1 = calib->p0_mpdgctrl1;
+       mmdc0->mprddlctl = calib->p0_mprddlctl;
+       mmdc0->mpwrdlctl = calib->p0_mpwrdlctl;
+       mmdc0->mpzqlp2ctl = calib->mpzqlp2ctl;
+
+       /* Read data DQ Byte0-3 delay */
+       mmdc0->mprddqby0dl = 0x33333333;
+       mmdc0->mprddqby1dl = 0x33333333;
+       if (sysinfo->dsize > 0) {
+               mmdc0->mprddqby2dl = 0x33333333;
+               mmdc0->mprddqby3dl = 0x33333333;
+       }
+
+       /* Write data DQ Byte0-3 delay */
+       mmdc0->mpwrdqby0dl = 0xf3333333;
+       mmdc0->mpwrdqby1dl = 0xf3333333;
+       if (sysinfo->dsize > 0) {
+               mmdc0->mpwrdqby2dl = 0xf3333333;
+               mmdc0->mpwrdqby3dl = 0xf3333333;
+       }
+
+       /*
+        * In LPDDR2 mode this register should be cleared,
+        * so no termination will be activated.
+        */
+       mmdc0->mpodtctrl = 0;
+
+       /* complete calibration */
+       val = (1 << 11); /* Force measurement on delay-lines */
+       mmdc0->mpmur0 = val;
+
+       /* Step 1: configuration request */
+       mmdc0->mdscr = (u32)(1 << 15); /* config request */
+
+       /* Step 2: Timing configuration */
+       mmdc0->mdcfg0 = (trfc << 24) | (txsr << 16) | (txp << 13) |
+                       (tfaw << 4) | tcl;
+       mmdc0->mdcfg1 = (tras << 16) | (twr << 9) | (tmrd << 5) | twl;
+       mmdc0->mdcfg2 = (trtp << 6) | (twtr << 3) | trrd;
+       mmdc0->mdcfg3lp = (trc_lp << 16) | (trcd_lp << 8) |
+                         (trppb_lp << 4) | trpab_lp;
+       mmdc0->mdotc = 0;
+
+       mmdc0->mdasp = cs0_end; /* CS addressing */
+
+       /* Step 3: Configure DDR type */
+       mmdc0->mdmisc = (sysinfo->cs1_mirror << 19) | (sysinfo->walat << 16) |
+                       (sysinfo->bi_on << 12) | (sysinfo->mif3_mode << 9) |
+                       (sysinfo->ralat << 6) | (1 << 3);
+
+       /* Step 4: Configure delay while leaving reset */
+       mmdc0->mdor = (sysinfo->sde_to_rst << 8) |
+                     (sysinfo->rst_to_cke << 0);
+
+       /* Step 5: Configure DDR physical parameters (density and burst len) */
+       coladdr = lpddr2_cfg->coladdr;
+       if (lpddr2_cfg->coladdr == 8)           /* 8-bit COL is 0x3 */
+               coladdr += 4;
+       else if (lpddr2_cfg->coladdr == 12)     /* 12-bit COL is 0x4 */
+               coladdr += 1;
+       mmdc0->mdctl =  (lpddr2_cfg->rowaddr - 11) << 24 |      /* ROW */
+                       (coladdr - 9) << 20 |                   /* COL */
+                       (0 << 19) |     /* Burst Length = 4 for LPDDR2 */
+                       (sysinfo->dsize << 16); /* DDR data bus size */
+
+       /* Step 6: Perform ZQ calibration */
+       val = 0xa1390003; /* one-time HW ZQ calib */
+       mmdc0->mpzqhwctrl = val;
+
+       /* Step 7: Enable MMDC with desired chip select */
+       mmdc0->mdctl |= (1 << 31) |                          /* SDE_0 for CS0 */
+                       ((sysinfo->ncs == 2) ? 1 : 0) << 30; /* SDE_1 for CS1 */
+
+       /* Step 8: Write Mode Registers to Init LPDDR2 devices */
+       for (cs = 0; cs < sysinfo->ncs; cs++) {
+               /* MR63: reset */
+               mmdc0->mdscr = MR(63, 0, 3, cs);
+               /* MR10: calibration,
+                * 0xff is calibration command after intilization.
+                */
+               val = 0xA | (0xff << 8);
+               mmdc0->mdscr = MR(val, 0, 3, cs);
+               /* MR1 */
+               val = 0x1 | (0x82 << 8);
+               mmdc0->mdscr = MR(val, 0, 3, cs);
+               /* MR2 */
+               val = 0x2 | (0x04 << 8);
+               mmdc0->mdscr = MR(val, 0, 3, cs);
+               /* MR3 */
+               val = 0x3 | (0x02 << 8);
+               mmdc0->mdscr = MR(val, 0, 3, cs);
+       }
+
+       /* Step 10: Power down control and self-refresh */
+       mmdc0->mdpdc = (tcke & 0x7) << 16 |
+                       5            << 12 |  /* PWDT_1: 256 cycles */
+                       5            <<  8 |  /* PWDT_0: 256 cycles */
+                       1            <<  6 |  /* BOTH_CS_PD */
+                       (tcksrx & 0x7) << 3 |
+                       (tcksre & 0x7);
+       mmdc0->mapsr = 0x00001006; /* ADOPT power down enabled */
+
+       /* Step 11: Configure ZQ calibration: one-time and periodic 1ms */
+       val = 0xa1310003;
+       mmdc0->mpzqhwctrl = val;
+
+       /* Step 12: Configure and activate periodic refresh */
+       mmdc0->mdref = (sysinfo->refsel << 14) | (sysinfo->refr << 11);
+
+       /* Step 13: Deassert config request - init complete */
+       mmdc0->mdscr = 0x00000000;
+
+       /* wait for auto-ZQ calibration to complete */
+       mdelay(1);
+}
+
+void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo,
+                 const struct mx6_mmdc_calibration *calib,
+                 const struct mx6_ddr3_cfg *ddr3_cfg)
+{
+       volatile struct mmdc_p_regs *mmdc0;
+       volatile struct mmdc_p_regs *mmdc1;
+       u32 val;
+       u8 tcke, tcksrx, tcksre, txpdll, taofpd, taonpd, trrd;
+       u8 todtlon, taxpd, tanpd, tcwl, txp, tfaw, tcl;
+       u8 todt_idle_off = 0x4; /* from DDR3 Script Aid spreadsheet */
+       u16 trcd, trc, tras, twr, tmrd, trtp, trp, twtr, trfc, txs, txpr;
+       u16 cs0_end;
+       u16 tdllk = 0x1ff; /* DLL locking time: 512 cycles (JEDEC DDR3) */
+       u8 coladdr;
+       int clkper; /* clock period in picoseconds */
+       int clock; /* clock freq in MHz */
+       int cs;
+       u16 mem_speed = ddr3_cfg->mem_speed;
+
+       mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+       if (!is_mx6sx() && !is_mx6ul() && !is_mx6sl())
+               mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
+
+       /* Limit mem_speed for MX6D/MX6Q */
+       if (is_mx6dq() || is_mx6dqp()) {
+               if (mem_speed > 1066)
+                       mem_speed = 1066; /* 1066 MT/s */
+
+               tcwl = 4;
+       }
+       /* Limit mem_speed for MX6S/MX6DL */
+       else {
+               if (mem_speed > 800)
+                       mem_speed = 800;  /* 800 MT/s */
+
+               tcwl = 3;
+       }
+
+       clock = mem_speed / 2;
+       /*
+        * Data rate of 1066 MT/s requires 533 MHz DDR3 clock, but MX6D/Q supports
+        * up to 528 MHz, so reduce the clock to fit chip specs
+        */
+       if (is_mx6dq() || is_mx6dqp()) {
+               if (clock > 528)
+                       clock = 528; /* 528 MHz */
+       }
+
+       clkper = (1000 * 1000) / clock; /* pico seconds */
+       todtlon = tcwl;
+       taxpd = tcwl;
+       tanpd = tcwl;
+
+       switch (ddr3_cfg->density) {
+       case 1: /* 1Gb per chip */
+               trfc = DIV_ROUND_UP(110000, clkper) - 1;
+               txs = DIV_ROUND_UP(120000, clkper) - 1;
+               break;
+       case 2: /* 2Gb per chip */
+               trfc = DIV_ROUND_UP(160000, clkper) - 1;
+               txs = DIV_ROUND_UP(170000, clkper) - 1;
+               break;
+       case 4: /* 4Gb per chip */
+               trfc = DIV_ROUND_UP(260000, clkper) - 1;
+               txs = DIV_ROUND_UP(270000, clkper) - 1;
+               break;
+       case 8: /* 8Gb per chip */
+               trfc = DIV_ROUND_UP(350000, clkper) - 1;
+               txs = DIV_ROUND_UP(360000, clkper) - 1;
+               break;
+       default:
+               /* invalid density */
+               puts("invalid chip density\n");
+               hang();
+               break;
+       }
+       txpr = txs;
+
+       switch (mem_speed) {
+       case 800:
+               txp = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
+               tcke = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
+               if (ddr3_cfg->pagesz == 1) {
+                       tfaw = DIV_ROUND_UP(40000, clkper) - 1;
+                       trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
+               } else {
+                       tfaw = DIV_ROUND_UP(50000, clkper) - 1;
+                       trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
+               }
+               break;
+       case 1066:
+               txp = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
+               tcke = DIV_ROUND_UP(max(3 * clkper, 5625), clkper) - 1;
+               if (ddr3_cfg->pagesz == 1) {
+                       tfaw = DIV_ROUND_UP(37500, clkper) - 1;
+                       trrd = DIV_ROUND_UP(max(4 * clkper, 7500), clkper) - 1;
+               } else {
+                       tfaw = DIV_ROUND_UP(50000, clkper) - 1;
+                       trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
+               }
+               break;
+       default:
+               puts("invalid memory speed\n");
+               hang();
+               break;
+       }
+       txpdll = DIV_ROUND_UP(max(10 * clkper, 24000), clkper) - 1;
+       tcksre = DIV_ROUND_UP(max(5 * clkper, 10000), clkper);
+       taonpd = DIV_ROUND_UP(2000, clkper) - 1;
+       tcksrx = tcksre;
+       taofpd = taonpd;
+       twr  = DIV_ROUND_UP(15000, clkper) - 1;
+       tmrd = DIV_ROUND_UP(max(12 * clkper, 15000), clkper) - 1;
+       trc  = DIV_ROUND_UP(ddr3_cfg->trcmin, clkper / 10) - 1;
+       tras = DIV_ROUND_UP(ddr3_cfg->trasmin, clkper / 10) - 1;
+       tcl  = DIV_ROUND_UP(ddr3_cfg->trcd, clkper / 10) - 3;
+       trp  = DIV_ROUND_UP(ddr3_cfg->trcd, clkper / 10) - 1;
+       twtr = ROUND(max(4 * clkper, 7500) / clkper, 1) - 1;
+       trcd = trp;
+       trtp = twtr;
+       cs0_end = 4 * sysinfo->cs_density - 1;
+
+       debug("density:%d Gb (%d Gb per chip)\n",
+             sysinfo->cs_density, ddr3_cfg->density);
+       debug("clock: %dMHz (%d ps)\n", clock, clkper);
+       debug("memspd:%d\n", mem_speed);
+       debug("tcke=%d\n", tcke);
+       debug("tcksrx=%d\n", tcksrx);
+       debug("tcksre=%d\n", tcksre);
+       debug("taofpd=%d\n", taofpd);
+       debug("taonpd=%d\n", taonpd);
+       debug("todtlon=%d\n", todtlon);
+       debug("tanpd=%d\n", tanpd);
+       debug("taxpd=%d\n", taxpd);
+       debug("trfc=%d\n", trfc);
+       debug("txs=%d\n", txs);
+       debug("txp=%d\n", txp);
+       debug("txpdll=%d\n", txpdll);
+       debug("tfaw=%d\n", tfaw);
+       debug("tcl=%d\n", tcl);
+       debug("trcd=%d\n", trcd);
+       debug("trp=%d\n", trp);
+       debug("trc=%d\n", trc);
+       debug("tras=%d\n", tras);
+       debug("twr=%d\n", twr);
+       debug("tmrd=%d\n", tmrd);
+       debug("tcwl=%d\n", tcwl);
+       debug("tdllk=%d\n", tdllk);
+       debug("trtp=%d\n", trtp);
+       debug("twtr=%d\n", twtr);
+       debug("trrd=%d\n", trrd);
+       debug("txpr=%d\n", txpr);
+       debug("cs0_end=%d\n", cs0_end);
+       debug("ncs=%d\n", sysinfo->ncs);
+       debug("Rtt_wr=%d\n", sysinfo->rtt_wr);
+       debug("Rtt_nom=%d\n", sysinfo->rtt_nom);
+       debug("SRT=%d\n", ddr3_cfg->SRT);
+       debug("twr=%d\n", twr);
+
+       /*
+        * board-specific configuration:
+        *  These values are determined empirically and vary per board layout
+        *  see:
+        *   appnote, ddr3 spreadsheet
+        */
+       mmdc0->mpwldectrl0 = calib->p0_mpwldectrl0;
+       mmdc0->mpwldectrl1 = calib->p0_mpwldectrl1;
+       mmdc0->mpdgctrl0 = calib->p0_mpdgctrl0;
+       mmdc0->mpdgctrl1 = calib->p0_mpdgctrl1;
+       mmdc0->mprddlctl = calib->p0_mprddlctl;
+       mmdc0->mpwrdlctl = calib->p0_mpwrdlctl;
+       if (sysinfo->dsize > 1) {
+               MMDC1(mpwldectrl0, calib->p1_mpwldectrl0);
+               MMDC1(mpwldectrl1, calib->p1_mpwldectrl1);
+               MMDC1(mpdgctrl0, calib->p1_mpdgctrl0);
+               MMDC1(mpdgctrl1, calib->p1_mpdgctrl1);
+               MMDC1(mprddlctl, calib->p1_mprddlctl);
+               MMDC1(mpwrdlctl, calib->p1_mpwrdlctl);
+       }
+
+       /* Read data DQ Byte0-3 delay */
+       mmdc0->mprddqby0dl = 0x33333333;
+       mmdc0->mprddqby1dl = 0x33333333;
+       if (sysinfo->dsize > 0) {
+               mmdc0->mprddqby2dl = 0x33333333;
+               mmdc0->mprddqby3dl = 0x33333333;
+       }
+
+       if (sysinfo->dsize > 1) {
+               MMDC1(mprddqby0dl, 0x33333333);
+               MMDC1(mprddqby1dl, 0x33333333);
+               MMDC1(mprddqby2dl, 0x33333333);
+               MMDC1(mprddqby3dl, 0x33333333);
+       }
+
+       /* MMDC Termination: rtt_nom:2 RZQ/2(120ohm), rtt_nom:1 RZQ/4(60ohm) */
+       val = (sysinfo->rtt_nom == 2) ? 0x00011117 : 0x00022227;
+       mmdc0->mpodtctrl = val;
+       if (sysinfo->dsize > 1)
+               MMDC1(mpodtctrl, val);
+
+       /* complete calibration */
+       val = (1 << 11); /* Force measurement on delay-lines */
+       mmdc0->mpmur0 = val;
+       if (sysinfo->dsize > 1)
+               MMDC1(mpmur0, val);
+
+       /* Step 1: configuration request */
+       mmdc0->mdscr = (u32)(1 << 15); /* config request */
+
+       /* Step 2: Timing configuration */
+       mmdc0->mdcfg0 = (trfc << 24) | (txs << 16) | (txp << 13) |
+                       (txpdll << 9) | (tfaw << 4) | tcl;
+       mmdc0->mdcfg1 = (trcd << 29) | (trp << 26) | (trc << 21) |
+                       (tras << 16) | (1 << 15) /* trpa */ |
+                       (twr << 9) | (tmrd << 5) | tcwl;
+       mmdc0->mdcfg2 = (tdllk << 16) | (trtp << 6) | (twtr << 3) | trrd;
+       mmdc0->mdotc = (taofpd << 27) | (taonpd << 24) | (tanpd << 20) |
+                      (taxpd << 16) | (todtlon << 12) | (todt_idle_off << 4);
+       mmdc0->mdasp = cs0_end; /* CS addressing */
+
+       /* Step 3: Configure DDR type */
+       mmdc0->mdmisc = (sysinfo->cs1_mirror << 19) | (sysinfo->walat << 16) |
+                       (sysinfo->bi_on << 12) | (sysinfo->mif3_mode << 9) |
+                       (sysinfo->ralat << 6);
+
+       /* Step 4: Configure delay while leaving reset */
+       mmdc0->mdor = (txpr << 16) | (sysinfo->sde_to_rst << 8) |
+                     (sysinfo->rst_to_cke << 0);
+
+       /* Step 5: Configure DDR physical parameters (density and burst len) */
+       coladdr = ddr3_cfg->coladdr;
+       if (ddr3_cfg->coladdr == 8)             /* 8-bit COL is 0x3 */
+               coladdr += 4;
+       else if (ddr3_cfg->coladdr == 12)       /* 12-bit COL is 0x4 */
+               coladdr += 1;
+       mmdc0->mdctl =  (ddr3_cfg->rowaddr - 11) << 24 |        /* ROW */
+                       (coladdr - 9) << 20 |                   /* COL */
+                       (1 << 19) |             /* Burst Length = 8 for DDR3 */
+                       (sysinfo->dsize << 16);         /* DDR data bus size */
+
+       /* Step 6: Perform ZQ calibration */
+       val = 0xa1390001; /* one-time HW ZQ calib */
+       mmdc0->mpzqhwctrl = val;
+       if (sysinfo->dsize > 1)
+               MMDC1(mpzqhwctrl, val);
+
+       /* Step 7: Enable MMDC with desired chip select */
+       mmdc0->mdctl |= (1 << 31) |                          /* SDE_0 for CS0 */
+                       ((sysinfo->ncs == 2) ? 1 : 0) << 30; /* SDE_1 for CS1 */
+
+       /* Step 8: Write Mode Registers to Init DDR3 devices */
+       for (cs = 0; cs < sysinfo->ncs; cs++) {
+               /* MR2 */
+               val = (sysinfo->rtt_wr & 3) << 9 | (ddr3_cfg->SRT & 1) << 7 |
+                     ((tcwl - 3) & 3) << 3;
+               debug("MR2 CS%d: 0x%08x\n", cs, (u32)MR(val, 2, 3, cs));
+               mmdc0->mdscr = MR(val, 2, 3, cs);
+               /* MR3 */
+               debug("MR3 CS%d: 0x%08x\n", cs, (u32)MR(0, 3, 3, cs));
+               mmdc0->mdscr = MR(0, 3, 3, cs);
+               /* MR1 */
+               val = ((sysinfo->rtt_nom & 1) ? 1 : 0) << 2 |
+                     ((sysinfo->rtt_nom & 2) ? 1 : 0) << 6;
+               debug("MR1 CS%d: 0x%08x\n", cs, (u32)MR(val, 1, 3, cs));
+               mmdc0->mdscr = MR(val, 1, 3, cs);
+               /* MR0 */
+               val = ((tcl - 1) << 4) |        /* CAS */
+                     (1 << 8)   |              /* DLL Reset */
+                     ((twr - 3) << 9) |        /* Write Recovery */
+                     (sysinfo->pd_fast_exit << 12); /* Precharge PD PLL on */
+               debug("MR0 CS%d: 0x%08x\n", cs, (u32)MR(val, 0, 3, cs));
+               mmdc0->mdscr = MR(val, 0, 3, cs);
+               /* ZQ calibration */
+               val = (1 << 10);
+               mmdc0->mdscr = MR(val, 0, 4, cs);
+       }
+
+       /* Step 10: Power down control and self-refresh */
+       mmdc0->mdpdc = (tcke & 0x7) << 16 |
+                       5            << 12 |  /* PWDT_1: 256 cycles */
+                       5            <<  8 |  /* PWDT_0: 256 cycles */
+                       1            <<  6 |  /* BOTH_CS_PD */
+                       (tcksrx & 0x7) << 3 |
+                       (tcksre & 0x7);
+       if (!sysinfo->pd_fast_exit)
+               mmdc0->mdpdc |= (1 << 7); /* SLOW_PD */
+       mmdc0->mapsr = 0x00001006; /* ADOPT power down enabled */
+
+       /* Step 11: Configure ZQ calibration: one-time and periodic 1ms */
+       val = 0xa1390003;
+       mmdc0->mpzqhwctrl = val;
+       if (sysinfo->dsize > 1)
+               MMDC1(mpzqhwctrl, val);
+
+       /* Step 12: Configure and activate periodic refresh */
+       mmdc0->mdref = (sysinfo->refsel << 14) | (sysinfo->refr << 11);
+
+       /* Step 13: Deassert config request - init complete */
+       mmdc0->mdscr = 0x00000000;
+
+       /* wait for auto-ZQ calibration to complete */
+       mdelay(1);
+}
+
+void mmdc_read_calibration(struct mx6_ddr_sysinfo const *sysinfo,
+                           struct mx6_mmdc_calibration *calib)
+{
+       struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR;
+       struct mmdc_p_regs *mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR;
+
+       calib->p0_mpwldectrl0 = readl(&mmdc0->mpwldectrl0);
+       calib->p0_mpwldectrl1 = readl(&mmdc0->mpwldectrl1);
+       calib->p0_mpdgctrl0 = readl(&mmdc0->mpdgctrl0);
+       calib->p0_mpdgctrl1 = readl(&mmdc0->mpdgctrl1);
+       calib->p0_mprddlctl = readl(&mmdc0->mprddlctl);
+       calib->p0_mpwrdlctl = readl(&mmdc0->mpwrdlctl);
+
+       if (sysinfo->dsize == 2) {
+               calib->p1_mpwldectrl0 = readl(&mmdc1->mpwldectrl0);
+               calib->p1_mpwldectrl1 = readl(&mmdc1->mpwldectrl1);
+               calib->p1_mpdgctrl0 = readl(&mmdc1->mpdgctrl0);
+               calib->p1_mpdgctrl1 = readl(&mmdc1->mpdgctrl1);
+               calib->p1_mprddlctl = readl(&mmdc1->mprddlctl);
+               calib->p1_mpwrdlctl = readl(&mmdc1->mpwrdlctl);
+       }
+}
+
+void mx6_dram_cfg(const struct mx6_ddr_sysinfo *sysinfo,
+                 const struct mx6_mmdc_calibration *calib,
+                 const void *ddr_cfg)
+{
+       if (sysinfo->ddr_type == DDR_TYPE_DDR3) {
+               mx6_ddr3_cfg(sysinfo, calib, ddr_cfg);
+       } else if (sysinfo->ddr_type == DDR_TYPE_LPDDR2) {
+               mx6_lpddr2_cfg(sysinfo, calib, ddr_cfg);
+       } else {
+               puts("Unsupported ddr type\n");
+               hang();
+       }
+}
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c
new file mode 100644 (file)
index 0000000..590e92f
--- /dev/null
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright (C) 2016 Grinn
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <asm/arch/clock.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/mx6ul_pins.h>
+#include <asm/arch/mx6-pins.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.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>
+#include <linux/sizes.h>
+#include <mmc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |            \
+       PAD_CTL_PUS_22K_UP  | PAD_CTL_SPEED_LOW |               \
+       PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
+
+int dram_init(void)
+{
+       gd->ram_size = imx_ddr_size();
+
+       return 0;
+}
+
+static iomux_v3_cfg_t const emmc_pads[] = {
+       MX6_PAD_NAND_RE_B__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_WE_B__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA00__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA01__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA02__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA03__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA04__USDHC2_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA05__USDHC2_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA06__USDHC2_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_DATA07__USDHC2_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+
+       /* RST_B */
+       MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+#ifdef CONFIG_FSL_ESDHC
+static struct fsl_esdhc_cfg emmc_cfg = {USDHC2_BASE_ADDR, 0, 8};
+
+#define EMMC_PWR_GPIO  IMX_GPIO_NR(4, 10)
+
+int litesom_mmc_init(bd_t *bis)
+{
+       int ret;
+
+       /* eMMC */
+       imx_iomux_v3_setup_multiple_pads(emmc_pads, ARRAY_SIZE(emmc_pads));
+       gpio_direction_output(EMMC_PWR_GPIO, 0);
+       udelay(500);
+       gpio_direction_output(EMMC_PWR_GPIO, 1);
+       emmc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+
+       ret = fsl_esdhc_initialize(bis, &emmc_cfg);
+       if (ret) {
+               printf("Warning: failed to initialize mmc dev 1 (eMMC)\n");
+               return ret;
+       }
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_SPL_BUILD
+#include <libfdt.h>
+#include <spl.h>
+#include <asm/arch/mx6-ddr.h>
+
+
+static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = {
+       .grp_addds = 0x00000030,
+       .grp_ddrmode_ctl = 0x00020000,
+       .grp_b0ds = 0x00000030,
+       .grp_ctlds = 0x00000030,
+       .grp_b1ds = 0x00000030,
+       .grp_ddrpke = 0x00000000,
+       .grp_ddrmode = 0x00020000,
+       .grp_ddr_type = 0x000c0000,
+};
+
+static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = {
+       .dram_dqm0 = 0x00000030,
+       .dram_dqm1 = 0x00000030,
+       .dram_ras = 0x00000030,
+       .dram_cas = 0x00000030,
+       .dram_odt0 = 0x00000030,
+       .dram_odt1 = 0x00000030,
+       .dram_sdba2 = 0x00000000,
+       .dram_sdclk_0 = 0x00000030,
+       .dram_sdqs0 = 0x00000030,
+       .dram_sdqs1 = 0x00000030,
+       .dram_reset = 0x00000030,
+};
+
+static struct mx6_mmdc_calibration mx6_mmcd_calib = {
+       .p0_mpwldectrl0 = 0x00000000,
+       .p0_mpdgctrl0 = 0x41570155,
+       .p0_mprddlctl = 0x4040474A,
+       .p0_mpwrdlctl = 0x40405550,
+};
+
+struct mx6_ddr_sysinfo ddr_sysinfo = {
+       .dsize = 0,
+       .cs_density = 20,
+       .ncs = 1,
+       .cs1_mirror = 0,
+       .rtt_wr = 2,
+       .rtt_nom = 1,           /* RTT_Nom = RZQ/2 */
+       .walat = 0,             /* Write additional latency */
+       .ralat = 5,             /* Read additional latency */
+       .mif3_mode = 3,         /* Command prediction working mode */
+       .bi_on = 1,             /* Bank interleaving enabled */
+       .sde_to_rst = 0x10,     /* 14 cycles, 200us (JEDEC default) */
+       .rst_to_cke = 0x23,     /* 33 cycles, 500us (JEDEC default) */
+       .ddr_type = DDR_TYPE_DDR3,
+       .refsel = 0,            /* Refresh cycles at 64KHz */
+       .refr = 1,              /* 2 refresh commands per refresh cycle */
+};
+
+static struct mx6_ddr3_cfg mem_ddr = {
+       .mem_speed = 800,
+       .density = 4,
+       .width = 16,
+       .banks = 8,
+       .rowaddr = 15,
+       .coladdr = 10,
+       .pagesz = 2,
+       .trcd = 1375,
+       .trcmin = 4875,
+       .trasmin = 3500,
+};
+
+static void ccgr_init(void)
+{
+       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+       writel(0xFFFFFFFF, &ccm->CCGR0);
+       writel(0xFFFFFFFF, &ccm->CCGR1);
+       writel(0xFFFFFFFF, &ccm->CCGR2);
+       writel(0xFFFFFFFF, &ccm->CCGR3);
+       writel(0xFFFFFFFF, &ccm->CCGR4);
+       writel(0xFFFFFFFF, &ccm->CCGR5);
+       writel(0xFFFFFFFF, &ccm->CCGR6);
+       writel(0xFFFFFFFF, &ccm->CCGR7);
+}
+
+static void spl_dram_init(void)
+{
+       unsigned long ram_size;
+
+       mx6ul_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs);
+       mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
+
+       /*
+        * Get actual RAM size, so we can adjust DDR row size for <512M
+        * memories
+        */
+       ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_512M);
+       if (ram_size < SZ_512M) {
+               mem_ddr.rowaddr = 14;
+               mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
+       }
+}
+
+void litesom_init_f(void)
+{
+       ccgr_init();
+
+       /* setup AIPS and disable watchdog */
+       arch_cpu_init();
+
+#ifdef CONFIG_BOARD_EARLY_INIT_F
+       board_early_init_f();
+#endif
+
+       /* setup GP timer */
+       timer_init();
+
+       /* UART clocks enabled and gd valid - init serial console */
+       preloader_console_init();
+
+       /* DDR initialization */
+       spl_dram_init();
+}
+#endif
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c
new file mode 100644 (file)
index 0000000..e28018b
--- /dev/null
@@ -0,0 +1,87 @@
+/*
+ * (C) Copyright 2014
+ * Gabriel Huau <contact@huau-gabriel.fr>
+ *
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <linux/errno.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/arch/imx-regs.h>
+
+#define MAX_CPUS 4
+static struct src *src = (struct src *)SRC_BASE_ADDR;
+
+static uint32_t cpu_reset_mask[MAX_CPUS] = {
+       0, /* We don't really want to modify the cpu0 */
+       SRC_SCR_CORE_1_RESET_MASK,
+       SRC_SCR_CORE_2_RESET_MASK,
+       SRC_SCR_CORE_3_RESET_MASK
+};
+
+static uint32_t cpu_ctrl_mask[MAX_CPUS] = {
+       0, /* We don't really want to modify the cpu0 */
+       SRC_SCR_CORE_1_ENABLE_MASK,
+       SRC_SCR_CORE_2_ENABLE_MASK,
+       SRC_SCR_CORE_3_ENABLE_MASK
+};
+
+int cpu_reset(int nr)
+{
+       /* Software reset of the CPU N */
+       src->scr |= cpu_reset_mask[nr];
+       return 0;
+}
+
+int cpu_status(int nr)
+{
+       printf("core %d => %d\n", nr, !!(src->scr & cpu_ctrl_mask[nr]));
+       return 0;
+}
+
+int cpu_release(int nr, int argc, char *const argv[])
+{
+       uint32_t boot_addr;
+
+       boot_addr = simple_strtoul(argv[0], NULL, 16);
+
+       switch (nr) {
+       case 1:
+               src->gpr3 = boot_addr;
+               break;
+       case 2:
+               src->gpr5 = boot_addr;
+               break;
+       case 3:
+               src->gpr7 = boot_addr;
+               break;
+       default:
+               return 1;
+       }
+
+       /* CPU N is ready to start */
+       src->scr |= cpu_ctrl_mask[nr];
+
+       return 0;
+}
+
+int is_core_valid(unsigned int core)
+{
+       uint32_t nr_cores = get_nr_cpus();
+
+       if (core > nr_cores)
+               return 0;
+
+       return 1;
+}
+
+int cpu_disable(int nr)
+{
+       /* Disable the CPU N */
+       src->scr &= ~cpu_ctrl_mask[nr];
+       return 0;
+}
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
new file mode 100644 (file)
index 0000000..22b2440
--- /dev/null
@@ -0,0 +1,302 @@
+/*
+ * Copyright (C) 2017 Armadeus Systems
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <asm/arch/clock.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/mx6-pins.h>
+#include <asm/arch/mx6ul_pins.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/io.h>
+#include <common.h>
+#include <environment.h>
+#include <fsl_esdhc.h>
+#include <mmc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#ifdef CONFIG_FEC_MXC
+#include <miiphy.h>
+
+#define MDIO_PAD_CTRL ( \
+       PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
+       PAD_CTL_DSE_40ohm \
+)
+
+#define ENET_PAD_CTRL_PU ( \
+       PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
+       PAD_CTL_DSE_40ohm \
+)
+
+#define ENET_PAD_CTRL_PD ( \
+       PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | \
+       PAD_CTL_DSE_40ohm \
+)
+
+#define ENET_CLK_PAD_CTRL ( \
+       PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \
+       PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST \
+)
+
+static iomux_v3_cfg_t const fec1_pads[] = {
+       MX6_PAD_GPIO1_IO06__ENET1_MDIO        | MUX_PAD_CTRL(MDIO_PAD_CTRL),
+       MX6_PAD_GPIO1_IO07__ENET1_MDC         | MUX_PAD_CTRL(MDIO_PAD_CTRL),
+       MX6_PAD_ENET1_RX_ER__ENET1_RX_ER      | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
+       MX6_PAD_ENET1_RX_EN__ENET1_RX_EN      | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
+       MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
+       MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
+       MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
+       MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
+       MX6_PAD_ENET1_TX_EN__ENET1_TX_EN      | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
+       /* PHY Int */
+       MX6_PAD_NAND_DQS__GPIO4_IO16          | MUX_PAD_CTRL(ENET_PAD_CTRL_PU),
+       /* PHY Reset */
+       MX6_PAD_NAND_DATA00__GPIO4_IO02       | MUX_PAD_CTRL(ENET_PAD_CTRL_PD),
+       MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
+};
+
+int board_phy_config(struct phy_device *phydev)
+{
+       phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190);
+
+       if (phydev->drv->config)
+               phydev->drv->config(phydev);
+
+       return 0;
+}
+
+int board_eth_init(bd_t *bis)
+{
+       struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
+       struct gpio_desc rst;
+       int ret;
+
+       /* Use 50M anatop loopback REF_CLK1 for ENET1,
+        * clear gpr1[13], set gpr1[17] */
+       clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK,
+                       IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK);
+
+       ret = enable_fec_anatop_clock(0, ENET_50MHZ);
+       if (ret)
+               return ret;
+
+       enable_enet_clk(1);
+
+       imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
+
+       ret = dm_gpio_lookup_name("GPIO4_2", &rst);
+       if (ret) {
+               printf("Cannot get GPIO4_2\n");
+               return ret;
+       }
+
+       ret = dm_gpio_request(&rst, "phy-rst");
+       if (ret) {
+               printf("Cannot request GPIO4_2\n");
+               return ret;
+       }
+
+       dm_gpio_set_dir_flags(&rst, GPIOD_IS_OUT);
+       dm_gpio_set_value(&rst, 0);
+       udelay(1000);
+       dm_gpio_set_value(&rst, 1);
+
+       return fecmxc_initialize(bis);
+}
+#endif /* CONFIG_FEC_MXC */
+
+int board_init(void)
+{
+       /* Address of boot parameters */
+       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+       return 0;
+}
+
+int __weak opos6ul_board_late_init(void)
+{
+       return 0;
+}
+
+int board_late_init(void)
+{
+       struct src *psrc = (struct src *)SRC_BASE_ADDR;
+       unsigned reg = readl(&psrc->sbmr2);
+
+       /* In bootstrap don't use the env vars */
+       if (((reg & 0x3000000) >> 24) == 0x1) {
+               set_default_env(NULL);
+               setenv("preboot", "");
+       }
+
+       return opos6ul_board_late_init();
+}
+
+int board_mmc_getcd(struct mmc *mmc)
+{
+       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
+       return cfg->esdhc_base == USDHC1_BASE_ADDR;
+}
+
+int dram_init(void)
+{
+       gd->ram_size = imx_ddr_size();
+
+       return 0;
+}
+
+#ifdef CONFIG_SPL_BUILD
+#include <asm/arch/mx6-ddr.h>
+#include <asm/arch/opos6ul.h>
+#include <libfdt.h>
+#include <spl.h>
+
+#define USDHC_PAD_CTRL (                                       \
+       PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_MED | \
+       PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST                   \
+)
+
+struct fsl_esdhc_cfg usdhc_cfg[1] = {
+       {USDHC1_BASE_ADDR, 0, 8},
+};
+
+static iomux_v3_cfg_t const usdhc1_pads[] = {
+       MX6_PAD_SD1_CLK__USDHC1_CLK        | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD1_CMD__USDHC1_CMD        | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD1_DATA0__USDHC1_DATA0    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD1_DATA1__USDHC1_DATA1    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD1_DATA2__USDHC1_DATA2    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_SD1_DATA3__USDHC1_DATA3    | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_READY_B__USDHC1_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_CE0_B__USDHC1_DATA5   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_CE1_B__USDHC1_DATA6   | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+       MX6_PAD_NAND_CLE__USDHC1_DATA7     | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+};
+
+static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = {
+       .grp_addds = 0x00000030,
+       .grp_ddrmode_ctl = 0x00020000,
+       .grp_b0ds = 0x00000030,
+       .grp_ctlds = 0x00000030,
+       .grp_b1ds = 0x00000030,
+       .grp_ddrpke = 0x00000000,
+       .grp_ddrmode = 0x00020000,
+       .grp_ddr_type = 0x000c0000,
+};
+
+static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = {
+       .dram_dqm0 = 0x00000030,
+       .dram_dqm1 = 0x00000030,
+       .dram_ras = 0x00000030,
+       .dram_cas = 0x00000030,
+       .dram_odt0 = 0x00000030,
+       .dram_odt1 = 0x00000030,
+       .dram_sdba2 = 0x00000000,
+       .dram_sdclk_0 = 0x00000008,
+       .dram_sdqs0 = 0x00000038,
+       .dram_sdqs1 = 0x00000030,
+       .dram_reset = 0x00000030,
+};
+
+static struct mx6_mmdc_calibration mx6_mmcd_calib = {
+       .p0_mpwldectrl0 = 0x00070007,
+       .p0_mpdgctrl0 = 0x41490145,
+       .p0_mprddlctl = 0x40404546,
+       .p0_mpwrdlctl = 0x4040524D,
+};
+
+struct mx6_ddr_sysinfo ddr_sysinfo = {
+       .dsize = 0,
+       .cs_density = 20,
+       .ncs = 1,
+       .cs1_mirror = 0,
+       .rtt_wr = 2,
+       .rtt_nom = 1,           /* RTT_Nom = RZQ/2 */
+       .walat = 1,             /* Write additional latency */
+       .ralat = 5,             /* Read additional latency */
+       .mif3_mode = 3,         /* Command prediction working mode */
+       .bi_on = 1,             /* Bank interleaving enabled */
+       .sde_to_rst = 0x10,     /* 14 cycles, 200us (JEDEC default) */
+       .rst_to_cke = 0x23,     /* 33 cycles, 500us (JEDEC default) */
+       .ddr_type = DDR_TYPE_DDR3,
+};
+
+static struct mx6_ddr3_cfg mem_ddr = {
+       .mem_speed = 800,
+       .density = 2,
+       .width = 16,
+       .banks = 8,
+       .rowaddr = 14,
+       .coladdr = 10,
+       .pagesz = 2,
+       .trcd = 1500,
+       .trcmin = 5250,
+       .trasmin = 3750,
+};
+
+int board_mmc_init(bd_t *bis)
+{
+       imx_iomux_v3_setup_multiple_pads(usdhc1_pads, ARRAY_SIZE(usdhc1_pads));
+       usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+       return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
+}
+
+static void ccgr_init(void)
+{
+       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+       writel(0xFFFFFFFF, &ccm->CCGR0);
+       writel(0xFFFFFFFF, &ccm->CCGR1);
+       writel(0xFFFFFFFF, &ccm->CCGR2);
+       writel(0xFFFFFFFF, &ccm->CCGR3);
+       writel(0xFFFFFFFF, &ccm->CCGR4);
+       writel(0xFFFFFFFF, &ccm->CCGR5);
+       writel(0xFFFFFFFF, &ccm->CCGR6);
+       writel(0xFFFFFFFF, &ccm->CCGR7);
+}
+
+static void spl_dram_init(void)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[4];
+       struct fuse_bank4_regs *fuse =
+               (struct fuse_bank4_regs *)bank->fuse_regs;
+       int reg = readl(&fuse->gp1);
+
+       /* 512MB of RAM */
+       if (reg & 0x1) {
+               mem_ddr.density = 4;
+               mem_ddr.rowaddr = 15;
+               mem_ddr.trcd = 1375;
+               mem_ddr.trcmin = 4875;
+               mem_ddr.trasmin = 3500;
+       }
+
+       mx6ul_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs);
+       mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);
+}
+
+void board_init_f(ulong dummy)
+{
+       ccgr_init();
+
+       /* setup AIPS and disable watchdog */
+       arch_cpu_init();
+
+       /* setup GP timer */
+       timer_init();
+
+       /* UART clocks enabled and gd valid - init serial console */
+       opos6ul_setup_uart_debug();
+       preloader_console_init();
+
+       /* DDR initialization */
+       spl_dram_init();
+}
+#endif /* CONFIG_SPL_BUILD */
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
new file mode 100644 (file)
index 0000000..af31673
--- /dev/null
@@ -0,0 +1,703 @@
+/*
+ * (C) Copyright 2007
+ * Sascha Hauer, Pengutronix
+ *
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <linux/errno.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.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>
+#include <dm.h>
+#include <imx_thermal.h>
+#include <mmc.h>
+
+enum ldo_reg {
+       LDO_ARM,
+       LDO_SOC,
+       LDO_PU,
+};
+
+struct scu_regs {
+       u32     ctrl;
+       u32     config;
+       u32     status;
+       u32     invalidate;
+       u32     fpga_rev;
+};
+
+#if defined(CONFIG_IMX_THERMAL)
+static const struct imx_thermal_plat imx6_thermal_plat = {
+       .regs = (void *)ANATOP_BASE_ADDR,
+       .fuse_bank = 1,
+       .fuse_word = 6,
+};
+
+U_BOOT_DEVICE(imx6_thermal) = {
+       .name = "imx_thermal",
+       .platdata = &imx6_thermal_plat,
+};
+#endif
+
+#if defined(CONFIG_SECURE_BOOT)
+struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
+       .bank = 0,
+       .word = 6,
+};
+#endif
+
+u32 get_nr_cpus(void)
+{
+       struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
+       return readl(&scu->config) & 3;
+}
+
+u32 get_cpu_rev(void)
+{
+       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
+       u32 reg = readl(&anatop->digprog_sololite);
+       u32 type = ((reg >> 16) & 0xff);
+       u32 major, cfg = 0;
+
+       if (type != MXC_CPU_MX6SL) {
+               reg = readl(&anatop->digprog);
+               struct scu_regs *scu = (struct scu_regs *)SCU_BASE_ADDR;
+               cfg = readl(&scu->config) & 3;
+               type = ((reg >> 16) & 0xff);
+               if (type == MXC_CPU_MX6DL) {
+                       if (!cfg)
+                               type = MXC_CPU_MX6SOLO;
+               }
+
+               if (type == MXC_CPU_MX6Q) {
+                       if (cfg == 1)
+                               type = MXC_CPU_MX6D;
+               }
+
+       }
+       major = ((reg >> 8) & 0xff);
+       if ((major >= 1) &&
+           ((type == MXC_CPU_MX6Q) || (type == MXC_CPU_MX6D))) {
+               major--;
+               type = MXC_CPU_MX6QP;
+               if (cfg == 1)
+                       type = MXC_CPU_MX6DP;
+       }
+       reg &= 0xff;            /* mx6 silicon revision */
+       return (type << 12) | (reg + (0x10 * (major + 1)));
+}
+
+/*
+ * OCOTP_CFG3[17:16] (see Fusemap Description Table offset 0x440)
+ * defines a 2-bit SPEED_GRADING
+ */
+#define OCOTP_CFG3_SPEED_SHIFT 16
+#define OCOTP_CFG3_SPEED_800MHZ        0
+#define OCOTP_CFG3_SPEED_850MHZ        1
+#define OCOTP_CFG3_SPEED_1GHZ  2
+#define OCOTP_CFG3_SPEED_1P2GHZ        3
+
+/*
+ * For i.MX6UL
+ */
+#define OCOTP_CFG3_SPEED_528MHZ 1
+#define OCOTP_CFG3_SPEED_696MHZ 2
+
+u32 get_cpu_speed_grade_hz(void)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[0];
+       struct fuse_bank0_regs *fuse =
+               (struct fuse_bank0_regs *)bank->fuse_regs;
+       uint32_t val;
+
+       val = readl(&fuse->cfg3);
+       val >>= OCOTP_CFG3_SPEED_SHIFT;
+       val &= 0x3;
+
+       if (is_mx6ul() || is_mx6ull()) {
+               if (val == OCOTP_CFG3_SPEED_528MHZ)
+                       return 528000000;
+               else if (val == OCOTP_CFG3_SPEED_696MHZ)
+                       return 69600000;
+               else
+                       return 0;
+       }
+
+       switch (val) {
+       /* Valid for IMX6DQ */
+       case OCOTP_CFG3_SPEED_1P2GHZ:
+               if (is_mx6dq() || is_mx6dqp())
+                       return 1200000000;
+       /* Valid for IMX6SX/IMX6SDL/IMX6DQ */
+       case OCOTP_CFG3_SPEED_1GHZ:
+               return 996000000;
+       /* Valid for IMX6DQ */
+       case OCOTP_CFG3_SPEED_850MHZ:
+               if (is_mx6dq() || is_mx6dqp())
+                       return 852000000;
+       /* Valid for IMX6SX/IMX6SDL/IMX6DQ */
+       case OCOTP_CFG3_SPEED_800MHZ:
+               return 792000000;
+       }
+       return 0;
+}
+
+/*
+ * OCOTP_MEM0[7:6] (see Fusemap Description Table offset 0x480)
+ * defines a 2-bit Temperature Grade
+ *
+ * return temperature grade and min/max temperature in Celsius
+ */
+#define OCOTP_MEM0_TEMP_SHIFT          6
+
+u32 get_cpu_temp_grade(int *minc, int *maxc)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[1];
+       struct fuse_bank1_regs *fuse =
+               (struct fuse_bank1_regs *)bank->fuse_regs;
+       uint32_t val;
+
+       val = readl(&fuse->mem0);
+       val >>= OCOTP_MEM0_TEMP_SHIFT;
+       val &= 0x3;
+
+       if (minc && maxc) {
+               if (val == TEMP_AUTOMOTIVE) {
+                       *minc = -40;
+                       *maxc = 125;
+               } else if (val == TEMP_INDUSTRIAL) {
+                       *minc = -40;
+                       *maxc = 105;
+               } else if (val == TEMP_EXTCOMMERCIAL) {
+                       *minc = -20;
+                       *maxc = 105;
+               } else {
+                       *minc = 0;
+                       *maxc = 95;
+               }
+       }
+       return val;
+}
+
+#ifdef CONFIG_REVISION_TAG
+u32 __weak get_board_rev(void)
+{
+       u32 cpurev = get_cpu_rev();
+       u32 type = ((cpurev >> 12) & 0xff);
+       if (type == MXC_CPU_MX6SOLO)
+               cpurev = (MXC_CPU_MX6DL) << 12 | (cpurev & 0xFFF);
+
+       if (type == MXC_CPU_MX6D)
+               cpurev = (MXC_CPU_MX6Q) << 12 | (cpurev & 0xFFF);
+
+       return cpurev;
+}
+#endif
+
+static void clear_ldo_ramp(void)
+{
+       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
+       int reg;
+
+       /* ROM may modify LDO ramp up time according to fuse setting, so in
+        * order to be in the safe side we neeed to reset these settings to
+        * match the reset value: 0'b00
+        */
+       reg = readl(&anatop->ana_misc2);
+       reg &= ~(0x3f << 24);
+       writel(reg, &anatop->ana_misc2);
+}
+
+/*
+ * Set the PMU_REG_CORE register
+ *
+ * Set LDO_SOC/PU/ARM regulators to the specified millivolt level.
+ * Possible values are from 0.725V to 1.450V in steps of
+ * 0.025V (25mV).
+ */
+static int set_ldo_voltage(enum ldo_reg ldo, u32 mv)
+{
+       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
+       u32 val, step, old, reg = readl(&anatop->reg_core);
+       u8 shift;
+
+       if (mv < 725)
+               val = 0x00;     /* Power gated off */
+       else if (mv > 1450)
+               val = 0x1F;     /* Power FET switched full on. No regulation */
+       else
+               val = (mv - 700) / 25;
+
+       clear_ldo_ramp();
+
+       switch (ldo) {
+       case LDO_SOC:
+               shift = 18;
+               break;
+       case LDO_PU:
+               shift = 9;
+               break;
+       case LDO_ARM:
+               shift = 0;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       old = (reg & (0x1F << shift)) >> shift;
+       step = abs(val - old);
+       if (step == 0)
+               return 0;
+
+       reg = (reg & ~(0x1F << shift)) | (val << shift);
+       writel(reg, &anatop->reg_core);
+
+       /*
+        * The LDO ramp-up is based on 64 clock cycles of 24 MHz = 2.6 us per
+        * step
+        */
+       udelay(3 * step);
+
+       return 0;
+}
+
+static void set_ahb_rate(u32 val)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       u32 reg, div;
+
+       div = get_periph_clk() / val - 1;
+       reg = readl(&mxc_ccm->cbcdr);
+
+       writel((reg & (~MXC_CCM_CBCDR_AHB_PODF_MASK)) |
+               (div << MXC_CCM_CBCDR_AHB_PODF_OFFSET), &mxc_ccm->cbcdr);
+}
+
+static void clear_mmdc_ch_mask(void)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       u32 reg;
+       reg = readl(&mxc_ccm->ccdr);
+
+       /* Clear MMDC channel mask */
+       if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx6sl())
+               reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK);
+       else
+               reg &= ~(MXC_CCM_CCDR_MMDC_CH1_HS_MASK | MXC_CCM_CCDR_MMDC_CH0_HS_MASK);
+       writel(reg, &mxc_ccm->ccdr);
+}
+
+#define OCOTP_MEM0_REFTOP_TRIM_SHIFT          8
+
+static void init_bandgap(void)
+{
+       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[1];
+       struct fuse_bank1_regs *fuse =
+               (struct fuse_bank1_regs *)bank->fuse_regs;
+       uint32_t val;
+
+       /*
+        * Ensure the bandgap has stabilized.
+        */
+       while (!(readl(&anatop->ana_misc0) & 0x80))
+               ;
+       /*
+        * For best noise performance of the analog blocks using the
+        * outputs of the bandgap, the reftop_selfbiasoff bit should
+        * be set.
+        */
+       writel(BM_ANADIG_ANA_MISC0_REFTOP_SELBIASOFF, &anatop->ana_misc0_set);
+       /*
+        * On i.MX6ULL,we need to set VBGADJ bits according to the
+        * REFTOP_TRIM[3:0] in fuse table
+        *      000 - set REFTOP_VBGADJ[2:0] to 3b'110,
+        *      110 - set REFTOP_VBGADJ[2:0] to 3b'000,
+        *      001 - set REFTOP_VBGADJ[2:0] to 3b'001,
+        *      010 - set REFTOP_VBGADJ[2:0] to 3b'010,
+        *      011 - set REFTOP_VBGADJ[2:0] to 3b'011,
+        *      100 - set REFTOP_VBGADJ[2:0] to 3b'100,
+        *      101 - set REFTOP_VBGADJ[2:0] to 3b'101,
+        *      111 - set REFTOP_VBGADJ[2:0] to 3b'111,
+        */
+       if (is_mx6ull()) {
+               val = readl(&fuse->mem0);
+               val >>= OCOTP_MEM0_REFTOP_TRIM_SHIFT;
+               val &= 0x7;
+
+               writel(val << BM_ANADIG_ANA_MISC0_REFTOP_VBGADJ_SHIFT,
+                      &anatop->ana_misc0_set);
+       }
+}
+
+#ifdef CONFIG_MX6SL
+static void set_preclk_from_osc(void)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       u32 reg;
+
+       reg = readl(&mxc_ccm->cscmr1);
+       reg |= MXC_CCM_CSCMR1_PER_CLK_SEL_MASK;
+       writel(reg, &mxc_ccm->cscmr1);
+}
+#endif
+
+int arch_cpu_init(void)
+{
+       init_aips();
+
+       /* Need to clear MMDC_CHx_MASK to make warm reset work. */
+       clear_mmdc_ch_mask();
+
+       /*
+        * Disable self-bias circuit in the analog bandap.
+        * The self-bias circuit is used by the bandgap during startup.
+        * This bit should be set after the bandgap has initialized.
+        */
+       init_bandgap();
+
+       if (!is_mx6ul() && !is_mx6ull()) {
+               /*
+                * When low freq boot is enabled, ROM will not set AHB
+                * freq, so we need to ensure AHB freq is 132MHz in such
+                * scenario.
+                *
+                * To i.MX6UL, when power up, default ARM core and
+                * AHB rate is 396M and 132M.
+                */
+               if (mxc_get_clock(MXC_ARM_CLK) == 396000000)
+                       set_ahb_rate(132000000);
+       }
+
+       if (is_mx6ul()) {
+               if (is_soc_rev(CHIP_REV_1_0) == 0) {
+                       /*
+                        * According to the design team's requirement on
+                        * i.MX6UL,the PMIC_STBY_REQ PAD should be configured
+                        * as open drain 100K (0x0000b8a0).
+                        * Only exists on TO1.0
+                        */
+                       writel(0x0000b8a0, IOMUXC_BASE_ADDR + 0x29c);
+               } else {
+                       /*
+                        * From TO1.1, SNVS adds internal pull up control
+                        * for POR_B, the register filed is GPBIT[1:0],
+                        * after system boot up, it can be set to 2b'01
+                        * to disable internal pull up.It can save about
+                        * 30uA power in SNVS mode.
+                        */
+                       writel((readl(MX6UL_SNVS_LP_BASE_ADDR + 0x10) &
+                              (~0x1400)) | 0x400,
+                              MX6UL_SNVS_LP_BASE_ADDR + 0x10);
+               }
+       }
+
+       if (is_mx6ull()) {
+               /*
+                * GPBIT[1:0] is suggested to set to 2'b11:
+                * 2'b00 : always PUP100K
+                * 2'b01 : PUP100K when PMIC_ON_REQ or SOC_NOT_FAIL
+                * 2'b10 : always disable PUP100K
+                * 2'b11 : PDN100K when SOC_FAIL, PUP100K when SOC_NOT_FAIL
+                * register offset is different from i.MX6UL, since
+                * i.MX6UL is fixed by ECO.
+                */
+               writel(readl(MX6UL_SNVS_LP_BASE_ADDR) |
+                       0x3, MX6UL_SNVS_LP_BASE_ADDR);
+       }
+
+       /* Set perclk to source from OSC 24MHz */
+#if defined(CONFIG_MX6SL)
+       set_preclk_from_osc();
+#endif
+
+       imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */
+
+       init_src();
+
+       return 0;
+}
+
+#ifdef CONFIG_ENV_IS_IN_MMC
+__weak int board_mmc_get_env_dev(int devno)
+{
+       return CONFIG_SYS_MMC_ENV_DEV;
+}
+
+static int mmc_get_boot_dev(void)
+{
+       struct src *src_regs = (struct src *)SRC_BASE_ADDR;
+       u32 soc_sbmr = readl(&src_regs->sbmr1);
+       u32 bootsel;
+       int devno;
+
+       /*
+        * Refer to
+        * "i.MX 6Dual/6Quad Applications Processor Reference Manual"
+        * Chapter "8.5.3.1 Expansion Device eFUSE Configuration"
+        * i.MX6SL/SX/UL has same layout.
+        */
+       bootsel = (soc_sbmr & 0x000000FF) >> 6;
+
+       /* No boot from sd/mmc */
+       if (bootsel != 1)
+               return -1;
+
+       /* BOOT_CFG2[3] and BOOT_CFG2[4] */
+       devno = (soc_sbmr & 0x00001800) >> 11;
+
+       return devno;
+}
+
+int mmc_get_env_dev(void)
+{
+       int devno = mmc_get_boot_dev();
+
+       /* If not boot from sd/mmc, use default value */
+       if (devno < 0)
+               return CONFIG_SYS_MMC_ENV_DEV;
+
+       return board_mmc_get_env_dev(devno);
+}
+
+#ifdef CONFIG_SYS_MMC_ENV_PART
+__weak int board_mmc_get_env_part(int devno)
+{
+       return CONFIG_SYS_MMC_ENV_PART;
+}
+
+uint mmc_get_env_part(struct mmc *mmc)
+{
+       int devno = mmc_get_boot_dev();
+
+       /* If not boot from sd/mmc, use default value */
+       if (devno < 0)
+               return CONFIG_SYS_MMC_ENV_PART;
+
+       return board_mmc_get_env_part(devno);
+}
+#endif
+#endif
+
+int board_postclk_init(void)
+{
+       set_ldo_voltage(LDO_SOC, 1175); /* Set VDDSOC to 1.175V */
+
+       return 0;
+}
+
+#if defined(CONFIG_FEC_MXC)
+void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[4];
+       struct fuse_bank4_regs *fuse =
+                       (struct fuse_bank4_regs *)bank->fuse_regs;
+
+       if ((is_mx6sx() || is_mx6ul() || is_mx6ull()) && dev_id == 1) {
+               u32 value = readl(&fuse->mac_addr2);
+               mac[0] = value >> 24 ;
+               mac[1] = value >> 16 ;
+               mac[2] = value >> 8 ;
+               mac[3] = value ;
+
+               value = readl(&fuse->mac_addr1);
+               mac[4] = value >> 24 ;
+               mac[5] = value >> 16 ;
+               
+       } else {
+               u32 value = readl(&fuse->mac_addr1);
+               mac[0] = (value >> 8);
+               mac[1] = value ;
+
+               value = readl(&fuse->mac_addr0);
+               mac[2] = value >> 24 ;
+               mac[3] = value >> 16 ;
+               mac[4] = value >> 8 ;
+               mac[5] = value ;
+       }
+
+}
+#endif
+
+/*
+ * cfg_val will be used for
+ * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0]
+ * After reset, if GPR10[28] is 1, ROM will use GPR9[25:0]
+ * instead of SBMR1 to determine the boot device.
+ */
+const struct boot_mode soc_boot_modes[] = {
+       {"normal",      MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)},
+       /* reserved value should start rom usb */
+#if defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
+       {"usb",         MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)},
+#else
+       {"usb",         MAKE_CFGVAL(0x10, 0x00, 0x00, 0x00)},
+#endif
+       {"sata",        MAKE_CFGVAL(0x20, 0x00, 0x00, 0x00)},
+       {"ecspi1:0",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x08)},
+       {"ecspi1:1",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x18)},
+       {"ecspi1:2",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x28)},
+       {"ecspi1:3",    MAKE_CFGVAL(0x30, 0x00, 0x00, 0x38)},
+       /* 4 bit bus width */
+       {"esdhc1",      MAKE_CFGVAL(0x40, 0x20, 0x00, 0x00)},
+       {"esdhc2",      MAKE_CFGVAL(0x40, 0x28, 0x00, 0x00)},
+       {"esdhc3",      MAKE_CFGVAL(0x40, 0x30, 0x00, 0x00)},
+       {"esdhc4",      MAKE_CFGVAL(0x40, 0x38, 0x00, 0x00)},
+       {NULL,          0},
+};
+
+void reset_misc(void)
+{
+#ifdef CONFIG_VIDEO_MXS
+       lcdif_power_down();
+#endif
+}
+
+void s_init(void)
+{
+       struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
+       struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       u32 mask480;
+       u32 mask528;
+       u32 reg, periph1, periph2;
+
+       if (is_mx6sx() || is_mx6ul() || is_mx6ull())
+               return;
+
+       /* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs
+        * to make sure PFD is working right, otherwise, PFDs may
+        * not output clock after reset, MX6DL and MX6SL have added 396M pfd
+        * workaround in ROM code, as bus clock need it
+        */
+
+       mask480 = ANATOP_PFD_CLKGATE_MASK(0) |
+               ANATOP_PFD_CLKGATE_MASK(1) |
+               ANATOP_PFD_CLKGATE_MASK(2) |
+               ANATOP_PFD_CLKGATE_MASK(3);
+       mask528 = ANATOP_PFD_CLKGATE_MASK(1) |
+               ANATOP_PFD_CLKGATE_MASK(3);
+
+       reg = readl(&ccm->cbcmr);
+       periph2 = ((reg & MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_MASK)
+               >> MXC_CCM_CBCMR_PRE_PERIPH2_CLK_SEL_OFFSET);
+       periph1 = ((reg & MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_MASK)
+               >> MXC_CCM_CBCMR_PRE_PERIPH_CLK_SEL_OFFSET);
+
+       /* Checking if PLL2 PFD0 or PLL2 PFD2 is using for periph clock */
+       if ((periph2 != 0x2) && (periph1 != 0x2))
+               mask528 |= ANATOP_PFD_CLKGATE_MASK(0);
+
+       if ((periph2 != 0x1) && (periph1 != 0x1) &&
+               (periph2 != 0x3) && (periph1 != 0x3))
+               mask528 |= ANATOP_PFD_CLKGATE_MASK(2);
+
+       writel(mask480, &anatop->pfd_480_set);
+       writel(mask528, &anatop->pfd_528_set);
+       writel(mask480, &anatop->pfd_480_clr);
+       writel(mask528, &anatop->pfd_528_clr);
+}
+
+#ifdef CONFIG_IMX_HDMI
+void imx_enable_hdmi_phy(void)
+{
+       struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
+       u8 reg;
+       reg = readb(&hdmi->phy_conf0);
+       reg |= HDMI_PHY_CONF0_PDZ_MASK;
+       writeb(reg, &hdmi->phy_conf0);
+       udelay(3000);
+       reg |= HDMI_PHY_CONF0_ENTMDS_MASK;
+       writeb(reg, &hdmi->phy_conf0);
+       udelay(3000);
+       reg |= HDMI_PHY_CONF0_GEN2_TXPWRON_MASK;
+       writeb(reg, &hdmi->phy_conf0);
+       writeb(HDMI_MC_PHYRSTZ_ASSERT, &hdmi->mc_phyrstz);
+}
+
+void imx_setup_hdmi(void)
+{
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
+       int reg, count;
+       u8 val;
+
+       /* Turn on HDMI PHY clock */
+       reg = readl(&mxc_ccm->CCGR2);
+       reg |=  MXC_CCM_CCGR2_HDMI_TX_IAHBCLK_MASK|
+                MXC_CCM_CCGR2_HDMI_TX_ISFRCLK_MASK;
+       writel(reg, &mxc_ccm->CCGR2);
+       writeb(HDMI_MC_PHYRSTZ_DEASSERT, &hdmi->mc_phyrstz);
+       reg = readl(&mxc_ccm->chsccdr);
+       reg &= ~(MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_MASK|
+                MXC_CCM_CHSCCDR_IPU1_DI0_PODF_MASK|
+                MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_MASK);
+       reg |= (CHSCCDR_PODF_DIVIDE_BY_3
+                << MXC_CCM_CHSCCDR_IPU1_DI0_PODF_OFFSET)
+                |(CHSCCDR_IPU_PRE_CLK_540M_PFD
+                << MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_OFFSET);
+       writel(reg, &mxc_ccm->chsccdr);
+
+       /* Clear the overflow condition */
+       if (readb(&hdmi->ih_fc_stat2) & HDMI_IH_FC_STAT2_OVERFLOW_MASK) {
+               /* TMDS software reset */
+               writeb((u8)~HDMI_MC_SWRSTZ_TMDSSWRST_REQ, &hdmi->mc_swrstz);
+               val = readb(&hdmi->fc_invidconf);
+               /* Need minimum 3 times to write to clear the register */
+               for (count = 0 ; count < 5 ; count++)
+                       writeb(val, &hdmi->fc_invidconf);
+       }
+}
+#endif
+
+#ifdef CONFIG_IMX_BOOTAUX
+int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
+{
+       struct src *src_reg;
+       u32 stack, pc;
+
+       if (!boot_private_data)
+               return -EINVAL;
+
+       stack = *(u32 *)boot_private_data;
+       pc = *(u32 *)(boot_private_data + 4);
+
+       /* Set the stack and pc to M4 bootROM */
+       writel(stack, M4_BOOTROM_BASE_ADDR);
+       writel(pc, M4_BOOTROM_BASE_ADDR + 4);
+
+       /* Enable M4 */
+       src_reg = (struct src *)SRC_BASE_ADDR;
+       clrsetbits_le32(&src_reg->scr, SRC_SCR_M4C_NON_SCLR_RST_MASK,
+                       SRC_SCR_M4_ENABLE_MASK);
+
+       return 0;
+}
+
+int arch_auxiliary_core_check_up(u32 core_id)
+{
+       struct src *src_reg = (struct src *)SRC_BASE_ADDR;
+       unsigned val;
+
+       val = readl(&src_reg->scr);
+
+       if (val & SRC_SCR_M4C_NON_SCLR_RST_MASK)
+               return 0;  /* assert in reset */
+
+       return 1;
+}
+#endif
diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
new file mode 100644 (file)
index 0000000..aea8526
--- /dev/null
@@ -0,0 +1,59 @@
+if ARCH_MX7
+
+config MX7
+       bool
+       select ROM_UNIFIED_SECTIONS
+       select CPU_V7_HAS_VIRT
+       select CPU_V7_HAS_NONSEC
+       select ARCH_SUPPORT_PSCI
+       imply CMD_FUSE
+       default y
+
+config MX7D
+       select ROM_UNIFIED_SECTIONS
+       imply CMD_FUSE
+       bool
+
+choice
+       prompt "MX7 board select"
+       optional
+
+config TARGET_MX7DSABRESD
+       bool "mx7dsabresd"
+       select BOARD_LATE_INIT
+       select MX7D
+       select DM
+       select DM_THERMAL
+
+config TARGET_PICO_IMX7D
+       bool "pico-imx7d"
+       select BOARD_LATE_INIT
+       select MX7D
+       select DM
+       select DM_THERMAL
+
+config TARGET_WARP7
+       bool "warp7"
+       select BOARD_LATE_INIT
+       select MX7D
+       select DM
+       select DM_THERMAL
+
+config TARGET_COLIBRI_IMX7
+       bool "Support Colibri iMX7S/iMX7D modules"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_THERMAL
+
+endchoice
+
+config SYS_SOC
+       default "mx7"
+
+source "board/freescale/mx7dsabresd/Kconfig"
+source "board/technexion/pico-imx7d/Kconfig"
+source "board/toradex/colibri_imx7/Kconfig"
+source "board/warp7/Kconfig"
+
+endif
diff --git a/arch/arm/mach-imx/mx7/Makefile b/arch/arm/mach-imx/mx7/Makefile
new file mode 100644 (file)
index 0000000..d21f87f
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# (C) Copyright 2015 Freescale Semiconductor, Inc.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+#
+
+obj-y  := soc.o clock.o clock_slice.o
+
+ifdef CONFIG_ARMV7_PSCI
+obj-y  += psci-mx7.o psci.o
+endif
diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c
new file mode 100644 (file)
index 0000000..2cfde46
--- /dev/null
@@ -0,0 +1,1133 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * Author:
+ *     Peng Fan <Peng.Fan@freescale.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <div64.h>
+#include <asm/io.h>
+#include <linux/errno.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
+                                        ANATOP_BASE_ADDR;
+struct mxc_ccm_reg *ccm_reg = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+#ifdef CONFIG_FSL_ESDHC
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
+int get_clocks(void)
+{
+#ifdef CONFIG_FSL_ESDHC
+#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC3_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
+#else
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+#endif
+#endif
+       return 0;
+}
+
+u32 get_ahb_clk(void)
+{
+       return get_root_clk(AHB_CLK_ROOT);
+}
+
+static u32 get_ipg_clk(void)
+{
+       /*
+        * The AHB and IPG are fixed at 2:1 ratio, and synchronized to
+        * each other.
+        */
+       return get_ahb_clk() / 2;
+}
+
+u32 imx_get_uartclk(void)
+{
+       return get_root_clk(UART1_CLK_ROOT);
+}
+
+u32 imx_get_fecclk(void)
+{
+       return get_root_clk(ENET_AXI_CLK_ROOT);
+}
+
+#ifdef CONFIG_MXC_OCOTP
+void enable_ocotp_clk(unsigned char enable)
+{
+       clock_enable(CCGR_OCOTP, enable);
+}
+
+void enable_thermal_clk(void)
+{
+       enable_ocotp_clk(1);
+}
+#endif
+
+void enable_usboh3_clk(unsigned char enable)
+{
+       u32 target;
+
+       if (enable) {
+               /* disable the clock gate first */
+               clock_enable(CCGR_USB_HSIC, 0);
+
+               /* 120Mhz */
+               target = CLK_ROOT_ON |
+                        USB_HSIC_CLK_ROOT_FROM_PLL_SYS_MAIN_480M_CLK |
+                        CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                        CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+               clock_set_target_val(USB_HSIC_CLK_ROOT, target);
+
+               /* enable the clock gate */
+               clock_enable(CCGR_USB_CTRL, 1);
+               clock_enable(CCGR_USB_HSIC, 1);
+               clock_enable(CCGR_USB_PHY1, 1);
+               clock_enable(CCGR_USB_PHY2, 1);
+       } else {
+               clock_enable(CCGR_USB_CTRL, 0);
+               clock_enable(CCGR_USB_HSIC, 0);
+               clock_enable(CCGR_USB_PHY1, 0);
+               clock_enable(CCGR_USB_PHY2, 0);
+       }
+}
+
+static u32 decode_pll(enum pll_clocks pll, u32 infreq)
+{
+       u32 reg, div_sel;
+       u32 num, denom;
+
+       /*
+        * Alought there are four choices for the bypass src,
+        * we choose OSC_24M which is the default set in ROM.
+        */
+       switch (pll) {
+       case PLL_CORE:
+               reg = readl(&ccm_anatop->pll_arm);
+
+               if (reg & CCM_ANALOG_PLL_ARM_POWERDOWN_MASK)
+                       return 0;
+
+               if (reg & CCM_ANALOG_PLL_ARM_BYPASS_MASK)
+                       return MXC_HCLK;
+
+               div_sel = (reg & CCM_ANALOG_PLL_ARM_DIV_SELECT_MASK) >>
+                          CCM_ANALOG_PLL_ARM_DIV_SELECT_SHIFT;
+
+               return (infreq * div_sel) / 2;
+
+       case PLL_SYS:
+               reg = readl(&ccm_anatop->pll_480);
+
+               if (reg & CCM_ANALOG_PLL_480_POWERDOWN_MASK)
+                       return 0;
+
+               if (reg & CCM_ANALOG_PLL_480_BYPASS_MASK)
+                       return MXC_HCLK;
+
+               if (((reg & CCM_ANALOG_PLL_480_DIV_SELECT_MASK) >>
+                       CCM_ANALOG_PLL_480_DIV_SELECT_SHIFT) == 0)
+                       return 480000000u;
+               else
+                       return 528000000u;
+
+       case PLL_ENET:
+               reg = readl(&ccm_anatop->pll_enet);
+
+               if (reg & CCM_ANALOG_PLL_ENET_POWERDOWN_MASK)
+                       return 0;
+
+               if (reg & CCM_ANALOG_PLL_ENET_BYPASS_MASK)
+                       return MXC_HCLK;
+
+               return 1000000000u;
+
+       case PLL_DDR:
+               reg = readl(&ccm_anatop->pll_ddr);
+
+               if (reg & CCM_ANALOG_PLL_DDR_POWERDOWN_MASK)
+                       return 0;
+
+               num = ccm_anatop->pll_ddr_num;
+               denom = ccm_anatop->pll_ddr_denom;
+
+               if (reg & CCM_ANALOG_PLL_DDR_BYPASS_MASK)
+                       return MXC_HCLK;
+
+               div_sel = (reg & CCM_ANALOG_PLL_DDR_DIV_SELECT_MASK) >>
+                          CCM_ANALOG_PLL_DDR_DIV_SELECT_SHIFT;
+
+               return infreq * (div_sel + num / denom);
+
+       case PLL_USB:
+               return 480000000u;
+
+       default:
+               printf("Unsupported pll clocks %d\n", pll);
+               break;
+       }
+
+       return 0;
+}
+
+static u32 mxc_get_pll_sys_derive(int derive)
+{
+       u32 freq, div, frac;
+       u32 reg;
+
+       div = 1;
+       reg = readl(&ccm_anatop->pll_480);
+       freq = decode_pll(PLL_SYS, MXC_HCLK);
+
+       switch (derive) {
+       case PLL_SYS_MAIN_480M_CLK:
+               if (reg & CCM_ANALOG_PLL_480_MAIN_DIV1_CLKGATE_MASK)
+                       return 0;
+               else
+                       return freq;
+       case PLL_SYS_MAIN_240M_CLK:
+               if (reg & CCM_ANALOG_PLL_480_MAIN_DIV2_CLKGATE_MASK)
+                       return 0;
+               else
+                       return freq / 2;
+       case PLL_SYS_MAIN_120M_CLK:
+               if (reg & CCM_ANALOG_PLL_480_MAIN_DIV4_CLKGATE_MASK)
+                       return 0;
+               else
+                       return freq / 4;
+       case PLL_SYS_PFD0_392M_CLK:
+               reg = readl(&ccm_anatop->pfd_480a);
+               if (reg & CCM_ANALOG_PFD_480A_PFD0_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480A_PFD0_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480A_PFD0_FRAC_SHIFT;
+               break;
+       case PLL_SYS_PFD0_196M_CLK:
+               if (reg & CCM_ANALOG_PLL_480_PFD0_DIV2_CLKGATE_MASK)
+                       return 0;
+               reg = readl(&ccm_anatop->pfd_480a);
+               frac = (reg & CCM_ANALOG_PFD_480A_PFD0_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480A_PFD0_FRAC_SHIFT;
+               div = 2;
+               break;
+       case PLL_SYS_PFD1_332M_CLK:
+               reg = readl(&ccm_anatop->pfd_480a);
+               if (reg & CCM_ANALOG_PFD_480A_PFD1_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480A_PFD1_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480A_PFD1_FRAC_SHIFT;
+               break;
+       case PLL_SYS_PFD1_166M_CLK:
+               if (reg & CCM_ANALOG_PLL_480_PFD1_DIV2_CLKGATE_MASK)
+                       return 0;
+               reg = readl(&ccm_anatop->pfd_480a);
+               frac = (reg & CCM_ANALOG_PFD_480A_PFD1_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480A_PFD1_FRAC_SHIFT;
+               div = 2;
+               break;
+       case PLL_SYS_PFD2_270M_CLK:
+               reg = readl(&ccm_anatop->pfd_480a);
+               if (reg & CCM_ANALOG_PFD_480A_PFD2_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480A_PFD2_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480A_PFD2_FRAC_SHIFT;
+               break;
+       case PLL_SYS_PFD2_135M_CLK:
+               if (reg & CCM_ANALOG_PLL_480_PFD2_DIV2_CLKGATE_MASK)
+                       return 0;
+               reg = readl(&ccm_anatop->pfd_480a);
+               frac = (reg & CCM_ANALOG_PFD_480A_PFD2_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480A_PFD2_FRAC_SHIFT;
+               div = 2;
+               break;
+       case PLL_SYS_PFD3_CLK:
+               reg = readl(&ccm_anatop->pfd_480a);
+               if (reg & CCM_ANALOG_PFD_480A_PFD3_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480A_PFD3_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480A_PFD3_FRAC_SHIFT;
+               break;
+       case PLL_SYS_PFD4_CLK:
+               reg = readl(&ccm_anatop->pfd_480b);
+               if (reg & CCM_ANALOG_PFD_480B_PFD4_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480B_PFD4_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480B_PFD4_FRAC_SHIFT;
+               break;
+       case PLL_SYS_PFD5_CLK:
+               reg = readl(&ccm_anatop->pfd_480b);
+               if (reg & CCM_ANALOG_PFD_480B_PFD5_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480B_PFD5_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480B_PFD5_FRAC_SHIFT;
+               break;
+       case PLL_SYS_PFD6_CLK:
+               reg = readl(&ccm_anatop->pfd_480b);
+               if (reg & CCM_ANALOG_PFD_480B_PFD6_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480B_PFD6_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480B_PFD6_FRAC_SHIFT;
+               break;
+       case PLL_SYS_PFD7_CLK:
+               reg = readl(&ccm_anatop->pfd_480b);
+               if (reg & CCM_ANALOG_PFD_480B_PFD7_DIV1_CLKGATE_MASK)
+                       return 0;
+               frac = (reg & CCM_ANALOG_PFD_480B_PFD7_FRAC_MASK) >>
+                       CCM_ANALOG_PFD_480B_PFD7_FRAC_SHIFT;
+               break;
+       default:
+               printf("Error derived pll_sys clock %d\n", derive);
+               return 0;
+       }
+
+       return ((freq / frac) * 18) / div;
+}
+
+static u32 mxc_get_pll_enet_derive(int derive)
+{
+       u32 freq, reg;
+
+       freq = decode_pll(PLL_ENET, MXC_HCLK);
+       reg = readl(&ccm_anatop->pll_enet);
+
+       switch (derive) {
+       case PLL_ENET_MAIN_500M_CLK:
+               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_500MHZ_MASK)
+                       return freq / 2;
+               break;
+       case PLL_ENET_MAIN_250M_CLK:
+               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_250MHZ_MASK)
+                       return freq / 4;
+               break;
+       case PLL_ENET_MAIN_125M_CLK:
+               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_125MHZ_MASK)
+                       return freq / 8;
+               break;
+       case PLL_ENET_MAIN_100M_CLK:
+               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_100MHZ_MASK)
+                       return freq / 10;
+               break;
+       case PLL_ENET_MAIN_50M_CLK:
+               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_50MHZ_MASK)
+                       return freq / 20;
+               break;
+       case PLL_ENET_MAIN_40M_CLK:
+               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_40MHZ_MASK)
+                       return freq / 25;
+               break;
+       case PLL_ENET_MAIN_25M_CLK:
+               if (reg & CCM_ANALOG_PLL_ENET_ENABLE_CLK_25MHZ_MASK)
+                       return freq / 40;
+               break;
+       default:
+               printf("Error derived pll_enet clock %d\n", derive);
+               break;
+       }
+
+       return 0;
+}
+
+static u32 mxc_get_pll_ddr_derive(int derive)
+{
+       u32 freq, reg;
+
+       freq = decode_pll(PLL_DDR, MXC_HCLK);
+       reg = readl(&ccm_anatop->pll_ddr);
+
+       switch (derive) {
+       case PLL_DRAM_MAIN_1066M_CLK:
+               return freq;
+       case PLL_DRAM_MAIN_533M_CLK:
+               if (reg & CCM_ANALOG_PLL_DDR_DIV2_ENABLE_CLK_MASK)
+                       return freq / 2;
+               break;
+       default:
+               printf("Error derived pll_ddr clock %d\n", derive);
+               break;
+       }
+
+       return 0;
+}
+
+static u32 mxc_get_pll_derive(enum pll_clocks pll, int derive)
+{
+       switch (pll) {
+       case PLL_SYS:
+               return mxc_get_pll_sys_derive(derive);
+       case PLL_ENET:
+               return mxc_get_pll_enet_derive(derive);
+       case PLL_DDR:
+               return mxc_get_pll_ddr_derive(derive);
+       default:
+               printf("Error pll.\n");
+               return 0;
+       }
+}
+
+static u32 get_root_src_clk(enum clk_root_src root_src)
+{
+       switch (root_src) {
+       case OSC_24M_CLK:
+               return 24000000u;
+       case PLL_ARM_MAIN_800M_CLK:
+               return decode_pll(PLL_CORE, MXC_HCLK);
+
+       case PLL_SYS_MAIN_480M_CLK:
+       case PLL_SYS_MAIN_240M_CLK:
+       case PLL_SYS_MAIN_120M_CLK:
+       case PLL_SYS_PFD0_392M_CLK:
+       case PLL_SYS_PFD0_196M_CLK:
+       case PLL_SYS_PFD1_332M_CLK:
+       case PLL_SYS_PFD1_166M_CLK:
+       case PLL_SYS_PFD2_270M_CLK:
+       case PLL_SYS_PFD2_135M_CLK:
+       case PLL_SYS_PFD3_CLK:
+       case PLL_SYS_PFD4_CLK:
+       case PLL_SYS_PFD5_CLK:
+       case PLL_SYS_PFD6_CLK:
+       case PLL_SYS_PFD7_CLK:
+               return mxc_get_pll_derive(PLL_SYS, root_src);
+
+       case PLL_ENET_MAIN_500M_CLK:
+       case PLL_ENET_MAIN_250M_CLK:
+       case PLL_ENET_MAIN_125M_CLK:
+       case PLL_ENET_MAIN_100M_CLK:
+       case PLL_ENET_MAIN_50M_CLK:
+       case PLL_ENET_MAIN_40M_CLK:
+       case PLL_ENET_MAIN_25M_CLK:
+               return mxc_get_pll_derive(PLL_ENET, root_src);
+
+       case PLL_DRAM_MAIN_1066M_CLK:
+       case PLL_DRAM_MAIN_533M_CLK:
+               return mxc_get_pll_derive(PLL_DDR, root_src);
+
+       case PLL_AUDIO_MAIN_CLK:
+               return decode_pll(PLL_AUDIO, MXC_HCLK);
+       case PLL_VIDEO_MAIN_CLK:
+               return decode_pll(PLL_VIDEO, MXC_HCLK);
+
+       case PLL_USB_MAIN_480M_CLK:
+               return decode_pll(PLL_USB, MXC_HCLK);
+
+       case REF_1M_CLK:
+               return 1000000;
+       case OSC_32K_CLK:
+               return MXC_CLK32;
+
+       case EXT_CLK_1:
+       case EXT_CLK_2:
+       case EXT_CLK_3:
+       case EXT_CLK_4:
+               printf("No EXT CLK supported??\n");
+               break;
+       };
+
+       return 0;
+}
+
+u32 get_root_clk(enum clk_root_index clock_id)
+{
+       enum clk_root_src root_src;
+       u32 post_podf, pre_podf, auto_podf, root_src_clk;
+       int auto_en;
+
+       if (clock_root_enabled(clock_id) <= 0)
+               return 0;
+
+       if (clock_get_prediv(clock_id, &pre_podf) < 0)
+               return 0;
+
+       if (clock_get_postdiv(clock_id, &post_podf) < 0)
+               return 0;
+
+       if (clock_get_autopostdiv(clock_id, &auto_podf, &auto_en) < 0)
+               return 0;
+
+       if (auto_en == 0)
+               auto_podf = 0;
+
+       if (clock_get_src(clock_id, &root_src) < 0)
+               return 0;
+
+       root_src_clk = get_root_src_clk(root_src);
+
+       /*
+        * bypass clk is ignored.
+        */
+
+       return root_src_clk / (post_podf + 1) / (pre_podf + 1) /
+               (auto_podf + 1);
+}
+
+static u32 get_ddrc_clk(void)
+{
+       u32 reg, freq;
+       enum root_post_div post_div;
+
+       reg = readl(&ccm_reg->root[DRAM_CLK_ROOT].target_root);
+       if (reg & CLK_ROOT_MUX_MASK)
+               /* DRAM_ALT_CLK_ROOT */
+               freq = get_root_clk(DRAM_ALT_CLK_ROOT);
+       else
+               /* PLL_DRAM_MAIN_1066M_CLK */
+               freq = mxc_get_pll_derive(PLL_DDR, PLL_DRAM_MAIN_1066M_CLK);
+
+       post_div = reg & DRAM_CLK_ROOT_POST_DIV_MASK;
+
+       return freq / (post_div + 1) / 2;
+}
+
+unsigned int mxc_get_clock(enum mxc_clock clk)
+{
+       switch (clk) {
+       case MXC_ARM_CLK:
+               return get_root_clk(ARM_A7_CLK_ROOT);
+       case MXC_AXI_CLK:
+               return get_root_clk(MAIN_AXI_CLK_ROOT);
+       case MXC_AHB_CLK:
+               return get_root_clk(AHB_CLK_ROOT);
+       case MXC_IPG_CLK:
+               return get_ipg_clk();
+       case MXC_I2C_CLK:
+               return get_root_clk(I2C1_CLK_ROOT);
+       case MXC_UART_CLK:
+               return get_root_clk(UART1_CLK_ROOT);
+       case MXC_CSPI_CLK:
+               return get_root_clk(ECSPI1_CLK_ROOT);
+       case MXC_DDR_CLK:
+               return get_ddrc_clk();
+       case MXC_ESDHC_CLK:
+               return get_root_clk(USDHC1_CLK_ROOT);
+       case MXC_ESDHC2_CLK:
+               return get_root_clk(USDHC2_CLK_ROOT);
+       case MXC_ESDHC3_CLK:
+               return get_root_clk(USDHC3_CLK_ROOT);
+       default:
+               printf("Unsupported mxc_clock %d\n", clk);
+               break;
+       }
+
+       return 0;
+}
+
+#ifdef CONFIG_SYS_I2C_MXC
+/* i2c_num can be 0 - 3 */
+int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
+{
+       u32 target;
+
+       if (i2c_num >= 4)
+               return -EINVAL;
+
+       if (enable) {
+               clock_enable(CCGR_I2C1 + i2c_num, 0);
+
+               /* Set i2c root clock to PLL_SYS_MAIN_120M_CLK */
+
+               target = CLK_ROOT_ON |
+                        I2C1_CLK_ROOT_FROM_PLL_SYS_MAIN_120M_CLK |
+                        CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                        CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
+               clock_set_target_val(I2C1_CLK_ROOT + i2c_num, target);
+
+               clock_enable(CCGR_I2C1 + i2c_num, 1);
+       } else {
+               clock_enable(CCGR_I2C1 + i2c_num, 0);
+       }
+
+       return 0;
+}
+#endif
+
+static void init_clk_esdhc(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_USDHC1, 0);
+       clock_enable(CCGR_USDHC2, 0);
+       clock_enable(CCGR_USDHC3, 0);
+
+       /* 196: 392/2 */
+       target = CLK_ROOT_ON | USDHC1_CLK_ROOT_FROM_PLL_SYS_PFD0_392M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
+       clock_set_target_val(USDHC1_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | USDHC1_CLK_ROOT_FROM_PLL_SYS_PFD0_392M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
+       clock_set_target_val(USDHC2_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | USDHC1_CLK_ROOT_FROM_PLL_SYS_PFD0_392M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
+       clock_set_target_val(USDHC3_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_USDHC1, 1);
+       clock_enable(CCGR_USDHC2, 1);
+       clock_enable(CCGR_USDHC3, 1);
+}
+
+static void init_clk_uart(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_UART1, 0);
+       clock_enable(CCGR_UART2, 0);
+       clock_enable(CCGR_UART3, 0);
+       clock_enable(CCGR_UART4, 0);
+       clock_enable(CCGR_UART5, 0);
+       clock_enable(CCGR_UART6, 0);
+       clock_enable(CCGR_UART7, 0);
+
+       /* 24Mhz */
+       target = CLK_ROOT_ON | UART1_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(UART1_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | UART2_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(UART2_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | UART3_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(UART3_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | UART4_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(UART4_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | UART5_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(UART5_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | UART6_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(UART6_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | UART7_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(UART7_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_UART1, 1);
+       clock_enable(CCGR_UART2, 1);
+       clock_enable(CCGR_UART3, 1);
+       clock_enable(CCGR_UART4, 1);
+       clock_enable(CCGR_UART5, 1);
+       clock_enable(CCGR_UART6, 1);
+       clock_enable(CCGR_UART7, 1);
+}
+
+static void init_clk_weim(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_WEIM, 0);
+
+       /* 120Mhz */
+       target = CLK_ROOT_ON | EIM_CLK_ROOT_FROM_PLL_SYS_MAIN_120M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(EIM_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_WEIM, 1);
+}
+
+static void init_clk_ecspi(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_ECSPI1, 0);
+       clock_enable(CCGR_ECSPI2, 0);
+       clock_enable(CCGR_ECSPI3, 0);
+       clock_enable(CCGR_ECSPI4, 0);
+
+       /* 60Mhz: 240/4 */
+       target = CLK_ROOT_ON | ECSPI1_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
+       clock_set_target_val(ECSPI1_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | ECSPI2_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
+       clock_set_target_val(ECSPI2_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | ECSPI3_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
+       clock_set_target_val(ECSPI3_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | ECSPI4_CLK_ROOT_FROM_PLL_SYS_MAIN_240M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
+       clock_set_target_val(ECSPI4_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_ECSPI1, 1);
+       clock_enable(CCGR_ECSPI2, 1);
+       clock_enable(CCGR_ECSPI3, 1);
+       clock_enable(CCGR_ECSPI4, 1);
+}
+
+static void init_clk_wdog(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_WDOG1, 0);
+       clock_enable(CCGR_WDOG2, 0);
+       clock_enable(CCGR_WDOG3, 0);
+       clock_enable(CCGR_WDOG4, 0);
+
+       /* 24Mhz */
+       target = CLK_ROOT_ON | WDOG_CLK_ROOT_FROM_OSC_24M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(WDOG_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_WDOG1, 1);
+       clock_enable(CCGR_WDOG2, 1);
+       clock_enable(CCGR_WDOG3, 1);
+       clock_enable(CCGR_WDOG4, 1);
+}
+
+#ifdef CONFIG_MXC_EPDC
+static void init_clk_epdc(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_EPDC, 0);
+
+       /* 24Mhz */
+       target = CLK_ROOT_ON | EPDC_PIXEL_CLK_ROOT_FROM_PLL_SYS_MAIN_480M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV12);
+       clock_set_target_val(EPDC_PIXEL_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_EPDC, 1);
+}
+#endif
+
+static int enable_pll_enet(void)
+{
+       u32 reg;
+       s32 timeout = 100000;
+
+       reg = readl(&ccm_anatop->pll_enet);
+       /* If pll_enet powered up, no need to set it again */
+       if (reg & ANADIG_PLL_ENET_PWDN_MASK) {
+               reg &= ~ANADIG_PLL_ENET_PWDN_MASK;
+               writel(reg, &ccm_anatop->pll_enet);
+
+               while (timeout--) {
+                       if (readl(&ccm_anatop->pll_enet) & ANADIG_PLL_LOCK)
+                               break;
+               }
+
+               if (timeout <= 0) {
+                       /* If timeout, we set pwdn for pll_enet. */
+                       reg |= ANADIG_PLL_ENET_PWDN_MASK;
+                       return -ETIME;
+               }
+       }
+
+       /* Clear bypass */
+       writel(CCM_ANALOG_PLL_ENET_BYPASS_MASK, &ccm_anatop->pll_enet_clr);
+
+       writel((CCM_ANALOG_PLL_ENET_ENABLE_CLK_500MHZ_MASK
+               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_250MHZ_MASK
+               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_125MHZ_MASK
+               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_100MHZ_MASK
+               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_50MHZ_MASK
+               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_40MHZ_MASK
+               | CCM_ANALOG_PLL_ENET_ENABLE_CLK_25MHZ_MASK),
+              &ccm_anatop->pll_enet_set);
+
+       return 0;
+}
+static int enable_pll_video(u32 pll_div, u32 pll_num, u32 pll_denom,
+       u32 post_div)
+{
+       u32 reg = 0;
+       ulong start;
+
+       debug("pll5 div = %d, num = %d, denom = %d\n",
+               pll_div, pll_num, pll_denom);
+
+       /* Power up PLL5 video and disable its output */
+       writel(CCM_ANALOG_PLL_VIDEO_CLR_ENABLE_CLK_MASK |
+               CCM_ANALOG_PLL_VIDEO_CLR_POWERDOWN_MASK |
+               CCM_ANALOG_PLL_VIDEO_CLR_BYPASS_MASK |
+               CCM_ANALOG_PLL_VIDEO_CLR_DIV_SELECT_MASK |
+               CCM_ANALOG_PLL_VIDEO_CLR_POST_DIV_SEL_MASK |
+               CCM_ANALOG_PLL_VIDEO_CLR_TEST_DIV_SELECT_MASK,
+               &ccm_anatop->pll_video_clr);
+
+       /* Set div, num and denom */
+       switch (post_div) {
+       case 1:
+               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
+                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x1) |
+                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x0),
+                       &ccm_anatop->pll_video_set);
+               break;
+       case 2:
+               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
+                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x0) |
+                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x0),
+                       &ccm_anatop->pll_video_set);
+               break;
+       case 3:
+               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
+                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x0) |
+                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x1),
+                       &ccm_anatop->pll_video_set);
+               break;
+       case 4:
+               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
+                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x0) |
+                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x3),
+                       &ccm_anatop->pll_video_set);
+               break;
+       case 0:
+       default:
+               writel(CCM_ANALOG_PLL_VIDEO_SET_DIV_SELECT(pll_div) |
+                       CCM_ANALOG_PLL_VIDEO_SET_TEST_DIV_SELECT(0x2) |
+                       CCM_ANALOG_PLL_VIDEO_SET_POST_DIV_SEL(0x0),
+                       &ccm_anatop->pll_video_set);
+               break;
+       }
+
+       writel(CCM_ANALOG_PLL_VIDEO_NUM_A(pll_num),
+               &ccm_anatop->pll_video_num);
+
+       writel(CCM_ANALOG_PLL_VIDEO_DENOM_B(pll_denom),
+               &ccm_anatop->pll_video_denom);
+
+       /* Wait PLL5 lock */
+       start = get_timer(0);   /* Get current timestamp */
+
+       do {
+               reg = readl(&ccm_anatop->pll_video);
+               if (reg & CCM_ANALOG_PLL_VIDEO_LOCK_MASK) {
+                       /* Enable PLL out */
+                       writel(CCM_ANALOG_PLL_VIDEO_CLR_ENABLE_CLK_MASK,
+                                       &ccm_anatop->pll_video_set);
+                       return 0;
+               }
+       } while (get_timer(0) < (start + 10)); /* Wait 10ms */
+
+       printf("Lock PLL5 timeout\n");
+
+       return 1;
+}
+
+int set_clk_qspi(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_QSPI, 0);
+
+       /* 49M: 392/2/4 */
+       target = CLK_ROOT_ON | QSPI_CLK_ROOT_FROM_PLL_SYS_PFD4_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
+       clock_set_target_val(QSPI_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_QSPI, 1);
+
+       return 0;
+}
+
+int set_clk_nand(void)
+{
+       u32 target;
+
+       /* disable the clock gate first */
+       clock_enable(CCGR_RAWNAND, 0);
+
+       enable_pll_enet();
+       /* 100: 500/5 */
+       target = CLK_ROOT_ON | NAND_CLK_ROOT_FROM_PLL_ENET_MAIN_500M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV5);
+       clock_set_target_val(NAND_CLK_ROOT, target);
+
+       /* enable the clock gate */
+       clock_enable(CCGR_RAWNAND, 1);
+
+       return 0;
+}
+
+void mxs_set_lcdclk(uint32_t base_addr, uint32_t freq)
+{
+       u32 hck = MXC_HCLK/1000;
+       u32 min = hck * 27;
+       u32 max = hck * 54;
+       u32 temp, best = 0;
+       u32 i, j, pred = 1, postd = 1;
+       u32 pll_div, pll_num, pll_denom, post_div = 0;
+       u32 target;
+
+       debug("mxs_set_lcdclk, freq = %d\n", freq);
+
+       clock_enable(CCGR_LCDIF, 0);
+
+       temp = (freq * 8 * 8);
+       if (temp < min) {
+               for (i = 1; i <= 4; i++) {
+                       if ((temp * (1 << i)) > min) {
+                               post_div = i;
+                               freq = (freq * (1 << i));
+                               break;
+                       }
+               }
+
+               if (5 == i) {
+                       printf("Fail to set rate to %dkhz", freq);
+                       return;
+               }
+       }
+
+       for (i = 1; i <= 8; i++) {
+               for (j = 1; j <= 8; j++) {
+                       temp = freq * i * j;
+                       if (temp > max || temp < min)
+                               continue;
+
+                       if (best == 0 || temp < best) {
+                               best = temp;
+                               pred = i;
+                               postd = j;
+                       }
+               }
+       }
+
+       if (best == 0) {
+               printf("Fail to set rate to %dkhz", freq);
+               return;
+       }
+
+       debug("best %d, pred = %d, postd = %d\n", best, pred, postd);
+
+       pll_div = best / hck;
+       pll_denom = 1000000;
+       pll_num = (best - hck * pll_div) * pll_denom / hck;
+
+       if (enable_pll_video(pll_div, pll_num, pll_denom, post_div))
+               return;
+
+       target = CLK_ROOT_ON | LCDIF_PIXEL_CLK_ROOT_FROM_PLL_VIDEO_MAIN_CLK |
+                CLK_ROOT_PRE_DIV((pred - 1)) | CLK_ROOT_POST_DIV((postd - 1));
+       clock_set_target_val(LCDIF_PIXEL_CLK_ROOT, target);
+
+       clock_enable(CCGR_LCDIF, 1);
+}
+
+#ifdef CONFIG_FEC_MXC
+int set_clk_enet(enum enet_freq type)
+{
+       u32 target;
+       int ret;
+       u32 enet1_ref, enet2_ref;
+
+       /* disable the clock first */
+       clock_enable(CCGR_ENET1, 0);
+       clock_enable(CCGR_ENET2, 0);
+
+       switch (type) {
+       case ENET_125MHz:
+               enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
+               enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_125M_CLK;
+               break;
+       case ENET_50MHz:
+               enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
+               enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_50M_CLK;
+               break;
+       case ENET_25MHz:
+               enet1_ref = ENET1_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
+               enet2_ref = ENET2_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       ret = enable_pll_enet();
+       if (ret != 0)
+               return ret;
+
+       /* set enet axi clock 196M: 392/2 */
+       target = CLK_ROOT_ON | ENET_AXI_CLK_ROOT_FROM_PLL_SYS_PFD4_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV2);
+       clock_set_target_val(ENET_AXI_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | enet1_ref |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(ENET1_REF_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | ENET1_TIME_CLK_ROOT_FROM_PLL_ENET_MAIN_100M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
+       clock_set_target_val(ENET1_TIME_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | enet2_ref |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(ENET2_REF_CLK_ROOT, target);
+
+       target = CLK_ROOT_ON | ENET2_TIME_CLK_ROOT_FROM_PLL_ENET_MAIN_100M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV4);
+       clock_set_target_val(ENET2_TIME_CLK_ROOT, target);
+
+#ifdef CONFIG_FEC_MXC_25M_REF_CLK
+       target = CLK_ROOT_ON |
+                ENET_PHY_REF_CLK_ROOT_FROM_PLL_ENET_MAIN_25M_CLK |
+                CLK_ROOT_PRE_DIV(CLK_ROOT_PRE_DIV1) |
+                CLK_ROOT_POST_DIV(CLK_ROOT_POST_DIV1);
+       clock_set_target_val(ENET_PHY_REF_CLK_ROOT, target);
+#endif
+       /* enable clock */
+       clock_enable(CCGR_ENET1, 1);
+       clock_enable(CCGR_ENET2, 1);
+
+       return 0;
+}
+#endif
+
+/* Configure PLL/PFD freq */
+void clock_init(void)
+{
+/* Rom has enabled PLL_ARM, PLL_DDR, PLL_SYS, PLL_ENET
+ *   In u-boot, we have to:
+ *   1. Configure PFD3- PFD7 for freq we needed in u-boot
+ *   2. Set clock root for peripherals (ip channel) used in u-boot but without set rate
+ *       interface.  The clocks for these peripherals are enabled after this intialization.
+ *   3. Other peripherals with set clock rate interface does not be set in this function.
+ */
+       u32 reg;
+
+       /*
+        * Configure PFD4 to 392M
+        * 480M * 18 / 0x16 = 392M
+        */
+       reg = readl(&ccm_anatop->pfd_480b);
+
+       reg &= ~(ANATOP_PFD480B_PFD4_FRAC_MASK |
+                CCM_ANALOG_PFD_480B_PFD4_DIV1_CLKGATE_MASK);
+       reg |= ANATOP_PFD480B_PFD4_FRAC_392M_VAL;
+
+       writel(reg, &ccm_anatop->pfd_480b);
+
+       init_clk_esdhc();
+       init_clk_uart();
+       init_clk_weim();
+       init_clk_ecspi();
+       init_clk_wdog();
+#ifdef CONFIG_MXC_EPDC
+       init_clk_epdc();
+#endif
+
+       enable_usboh3_clk(1);
+
+       clock_enable(CCGR_SNVS, 1);
+
+#ifdef CONFIG_NAND_MXS
+       clock_enable(CCGR_RAWNAND, 1);
+#endif
+
+       if (IS_ENABLED(CONFIG_IMX_RDC)) {
+               clock_enable(CCGR_RDC, 1);
+               clock_enable(CCGR_SEMA1, 1);
+               clock_enable(CCGR_SEMA2, 1);
+       }
+}
+
+#ifdef CONFIG_SECURE_BOOT
+void hab_caam_clock_enable(unsigned char enable)
+{
+       if (enable)
+               clock_enable(CCGR_CAAM, 1);
+       else
+               clock_enable(CCGR_CAAM, 0);
+}
+#endif
+
+#ifdef CONFIG_MXC_EPDC
+void epdc_clock_enable(void)
+{
+       clock_enable(CCGR_EPDC, 1);
+}
+void epdc_clock_disable(void)
+{
+       clock_enable(CCGR_EPDC, 0);
+}
+#endif
+
+/*
+ * Dump some core clockes.
+ */
+int do_mx7_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       u32 freq;
+       freq = decode_pll(PLL_CORE, MXC_HCLK);
+       printf("PLL_CORE    %8d MHz\n", freq / 1000000);
+       freq = decode_pll(PLL_SYS, MXC_HCLK);
+       printf("PLL_SYS    %8d MHz\n", freq / 1000000);
+       freq = decode_pll(PLL_ENET, MXC_HCLK);
+       printf("PLL_NET    %8d MHz\n", freq / 1000000);
+
+       printf("\n");
+
+       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
+       printf("UART       %8d kHz\n", mxc_get_clock(MXC_UART_CLK) / 1000);
+#ifdef CONFIG_MXC_SPI
+       printf("CSPI       %8d kHz\n", mxc_get_clock(MXC_CSPI_CLK) / 1000);
+#endif
+       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
+       printf("AXI        %8d kHz\n", mxc_get_clock(MXC_AXI_CLK) / 1000);
+       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
+       printf("USDHC1     %8d kHz\n", mxc_get_clock(MXC_ESDHC_CLK) / 1000);
+       printf("USDHC2     %8d kHz\n", mxc_get_clock(MXC_ESDHC2_CLK) / 1000);
+       printf("USDHC3     %8d kHz\n", mxc_get_clock(MXC_ESDHC3_CLK) / 1000);
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       clocks, CONFIG_SYS_MAXARGS, 1, do_mx7_showclocks,
+       "display clocks",
+       ""
+);
diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c
new file mode 100644 (file)
index 0000000..68a7005
--- /dev/null
@@ -0,0 +1,757 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * Author:
+ *     Peng Fan <Peng.Fan@freescale.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <div64.h>
+#include <asm/io.h>
+#include <linux/errno.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+struct mxc_ccm_reg *imx_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+
+static struct clk_root_map root_array[] = {
+       {ARM_A7_CLK_ROOT, CCM_CORE_CHANNEL,
+        {OSC_24M_CLK, PLL_ARM_MAIN_800M_CLK, PLL_ENET_MAIN_500M_CLK,
+         PLL_DRAM_MAIN_1066M_CLK, PLL_SYS_MAIN_480M_CLK,
+         PLL_SYS_PFD0_392M_CLK, PLL_AUDIO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {ARM_M4_CLK_ROOT, CCM_BUS_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_250M_CLK,
+         PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {ARM_M0_CLK_ROOT, CCM_BUS_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_125M_CLK,
+         PLL_SYS_PFD2_135M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {MAIN_AXI_CLK_ROOT, CCM_BUS_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_SYS_PFD5_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {DISP_AXI_CLK_ROOT, CCM_BUS_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK,
+         PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {ENET_AXI_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK}
+       },
+       {NAND_USDHC_BUS_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_SYS_MAIN_240M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_PFD6_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_AUDIO_MAIN_CLK}
+       },
+       {AHB_CLK_ROOT, CCM_AHB_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_SYS_PFD0_392M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK,
+         PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {DRAM_PHYM_CLK_ROOT, CCM_DRAM_PHYM_CHANNEL,
+        {PLL_DRAM_MAIN_1066M_CLK, DRAM_PHYM_ALT_CLK_ROOT}
+       },
+       {DRAM_CLK_ROOT, CCM_DRAM_CHANNEL,
+        {PLL_DRAM_MAIN_1066M_CLK, DRAM_ALT_CLK_ROOT}
+       },
+       {DRAM_PHYM_ALT_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_SYS_MAIN_480M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD7_CLK,
+         PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {DRAM_ALT_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_SYS_MAIN_480M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_ENET_MAIN_250M_CLK,
+         PLL_SYS_PFD0_392M_CLK, PLL_AUDIO_MAIN_CLK, PLL_SYS_PFD2_270M_CLK}
+       },
+       {USB_HSIC_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_USB_MAIN_480M_CLK,
+         PLL_SYS_PFD3_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD5_CLK,
+         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {PCIE_CTRL_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_250M_CLK, PLL_SYS_MAIN_240M_CLK,
+         PLL_SYS_PFD2_270M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_SYS_PFD6_CLK}
+       },
+       {PCIE_PHY_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_ENET_MAIN_500M_CLK,
+         EXT_CLK_1, EXT_CLK_2, EXT_CLK_3,
+         EXT_CLK_4, PLL_SYS_PFD0_392M_CLK}
+       },
+       {EPDC_PIXEL_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD1_332M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD5_CLK, PLL_SYS_PFD6_CLK,
+         PLL_SYS_PFD7_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {LCDIF_PIXEL_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD5_CLK, PLL_DRAM_MAIN_533M_CLK,
+         EXT_CLK_3, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {MIPI_DSI_EXTSER_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD5_CLK, PLL_SYS_PFD3_CLK,
+         PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD0_196M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_AUDIO_MAIN_CLK}
+       },
+       {MIPI_CSI_WARP_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD3_CLK,
+         PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD0_196M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_AUDIO_MAIN_CLK}
+       },
+       {MIPI_DPHY_REF_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_SYS_PFD5_CLK, REF_1M_CLK, EXT_CLK_2,
+         PLL_VIDEO_MAIN_CLK, EXT_CLK_3}
+       },
+       {SAI1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_125M_CLK, EXT_CLK_2}
+       },
+       {SAI2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_125M_CLK, EXT_CLK_2}
+       },
+       {SAI3_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_125M_CLK, EXT_CLK_3}
+       },
+       {SPDIF_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_125M_CLK, EXT_CLK_3}
+       },
+       {ENET1_REF_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_ENET_MAIN_50M_CLK,
+         PLL_ENET_MAIN_25M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, EXT_CLK_4}
+       },
+       {ENET1_TIME_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_AUDIO_MAIN_CLK,
+         EXT_CLK_1, EXT_CLK_2, EXT_CLK_3,
+         EXT_CLK_4, PLL_VIDEO_MAIN_CLK}
+       },
+       {ENET2_REF_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_ENET_MAIN_50M_CLK,
+         PLL_ENET_MAIN_25M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, EXT_CLK_4}
+       },
+       {ENET2_TIME_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_AUDIO_MAIN_CLK,
+         EXT_CLK_1, EXT_CLK_2, EXT_CLK_3,
+         EXT_CLK_4, PLL_VIDEO_MAIN_CLK}
+       },
+       {ENET_PHY_REF_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_25M_CLK, PLL_ENET_MAIN_50M_CLK,
+         PLL_ENET_MAIN_125M_CLK, PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_SYS_PFD3_CLK}
+       },
+       {EIM_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_SYS_PFD2_270M_CLK, PLL_SYS_PFD3_CLK,
+         PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {NAND_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_SYS_PFD0_392M_CLK, PLL_SYS_PFD3_CLK, PLL_ENET_MAIN_500M_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {QSPI_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD4_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD3_CLK, PLL_SYS_PFD2_270M_CLK,
+         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {USDHC1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD0_392M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
+         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {USDHC2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD0_392M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
+         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {USDHC3_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD0_392M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD4_CLK, PLL_SYS_PFD2_270M_CLK,
+         PLL_SYS_PFD6_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {CAN1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_SYS_MAIN_480M_CLK, PLL_ENET_MAIN_40M_CLK, PLL_USB_MAIN_480M_CLK,
+         EXT_CLK_1, EXT_CLK_4}
+       },
+       {CAN2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_SYS_MAIN_480M_CLK, PLL_ENET_MAIN_40M_CLK, PLL_USB_MAIN_480M_CLK,
+         EXT_CLK_1, EXT_CLK_3}
+       },
+       {I2C1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
+         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
+       },
+       {I2C2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
+         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
+       },
+       {I2C3_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
+         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
+       },
+       {I2C4_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_120M_CLK, PLL_ENET_MAIN_50M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_AUDIO_MAIN_CLK, PLL_VIDEO_MAIN_CLK,
+         PLL_USB_MAIN_480M_CLK, PLL_SYS_PFD2_135M_CLK}
+       },
+       {UART1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
+         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
+       },
+       {UART2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
+         EXT_CLK_3, PLL_USB_MAIN_480M_CLK}
+       },
+       {UART3_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
+         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
+       },
+       {UART4_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
+         EXT_CLK_3, PLL_USB_MAIN_480M_CLK}
+       },
+       {UART5_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
+         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
+       },
+       {UART6_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
+         EXT_CLK_3, PLL_USB_MAIN_480M_CLK}
+       },
+       {UART7_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_480M_CLK, EXT_CLK_2,
+         EXT_CLK_4, PLL_USB_MAIN_480M_CLK}
+       },
+       {ECSPI1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {ECSPI2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {ECSPI3_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {ECSPI4_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_ENET_MAIN_40M_CLK,
+         PLL_SYS_MAIN_120M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_PFD4_CLK,
+         PLL_ENET_MAIN_250M_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {PWM1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_1,
+         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {PWM2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_1,
+         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {PWM3_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_2,
+         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {PWM4_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_2,
+         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {FLEXTIMER1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_3,
+         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {FLEXTIMER2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_AUDIO_MAIN_CLK, EXT_CLK_3,
+         REF_1M_CLK, PLL_VIDEO_MAIN_CLK}
+       },
+       {SIM1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_USB_MAIN_480M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_ENET_MAIN_125M_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {SIM2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_USB_MAIN_480M_CLK, PLL_VIDEO_MAIN_CLK,
+         PLL_ENET_MAIN_125M_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {GPT1_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
+         PLL_AUDIO_MAIN_CLK, EXT_CLK_1}
+       },
+       {GPT2_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
+         PLL_AUDIO_MAIN_CLK, EXT_CLK_2}
+       },
+       {GPT3_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
+         PLL_AUDIO_MAIN_CLK, EXT_CLK_3}
+       },
+       {GPT4_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_100M_CLK, PLL_SYS_PFD0_392M_CLK,
+         PLL_ENET_MAIN_40M_CLK, PLL_VIDEO_MAIN_CLK, REF_1M_CLK,
+         PLL_AUDIO_MAIN_CLK, EXT_CLK_4}
+       },
+       {TRACE_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK,
+         EXT_CLK_1, EXT_CLK_3}
+       },
+       {WDOG_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_USB_MAIN_480M_CLK,
+         REF_1M_CLK, PLL_SYS_PFD1_166M_CLK}
+       },
+       {CSI_MCLK_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {AUDIO_MCLK_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_PFD2_135M_CLK, PLL_SYS_MAIN_120M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, PLL_ENET_MAIN_125M_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, PLL_USB_MAIN_480M_CLK}
+       },
+       {WRCLK_CLK_ROOT, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_ENET_MAIN_40M_CLK, PLL_DRAM_MAIN_533M_CLK,
+         PLL_USB_MAIN_480M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_SYS_PFD2_270M_CLK,
+         PLL_ENET_MAIN_500M_CLK, PLL_SYS_PFD7_CLK}
+       },
+       {IPP_DO_CLKO1, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_480M_CLK, PLL_SYS_MAIN_240M_CLK,
+         PLL_SYS_PFD0_196M_CLK, PLL_SYS_PFD3_CLK, PLL_ENET_MAIN_500M_CLK,
+         PLL_DRAM_MAIN_533M_CLK, REF_1M_CLK}
+       },
+       {IPP_DO_CLKO2, CCM_IP_CHANNEL,
+        {OSC_24M_CLK, PLL_SYS_MAIN_240M_CLK, PLL_SYS_PFD0_392M_CLK,
+         PLL_SYS_PFD1_166M_CLK, PLL_SYS_PFD4_CLK, PLL_AUDIO_MAIN_CLK,
+         PLL_VIDEO_MAIN_CLK, OSC_32K_CLK}
+       },
+};
+
+/* select which entry of root_array */
+static int select(enum clk_root_index clock_id)
+{
+       int i, size;
+       struct clk_root_map *p = root_array;
+
+       size = ARRAY_SIZE(root_array);
+
+       for (i = 0; i < size; i++, p++) {
+               if (clock_id == p->entry)
+                       return i;
+       }
+
+       return -EINVAL;
+}
+
+static int src_supported(int entry, enum clk_root_src clock_src)
+{
+       int i, size;
+       struct clk_root_map *p = &root_array[entry];
+
+       if ((p->type == CCM_DRAM_PHYM_CHANNEL) || (p->type == CCM_DRAM_CHANNEL))
+               size = 2;
+       else
+               size = 8;
+
+       for (i = 0; i < size; i++) {
+               if (p->src_mux[i] == clock_src)
+                       return i;
+       }
+
+       return -EINVAL;
+}
+
+/* Set src for clock root slice. */
+int clock_set_src(enum clk_root_index clock_id, enum clk_root_src clock_src)
+{
+       int root_entry, src_entry;
+       u32 reg;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       root_entry = select(clock_id);
+       if (root_entry < 0)
+               return -EINVAL;
+
+       src_entry = src_supported(root_entry, clock_src);
+       if (src_entry < 0)
+               return -EINVAL;
+
+       reg = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       reg &= ~CLK_ROOT_MUX_MASK;
+       reg |= src_entry << CLK_ROOT_MUX_SHIFT;
+       __raw_writel(reg, &imx_ccm->root[clock_id].target_root);
+
+       return 0;
+}
+
+/* Get src of a clock root slice. */
+int clock_get_src(enum clk_root_index clock_id, enum clk_root_src *p_clock_src)
+{
+       u32 val;
+       int root_entry;
+       struct clk_root_map *p;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       val &= CLK_ROOT_MUX_MASK;
+       val >>= CLK_ROOT_MUX_SHIFT;
+
+       root_entry = select(clock_id);
+       if (root_entry < 0)
+               return -EINVAL;
+
+       p = &root_array[root_entry];
+       *p_clock_src = p->src_mux[val];
+
+       return 0;
+}
+
+int clock_set_prediv(enum clk_root_index clock_id, enum root_pre_div pre_div)
+{
+       int root_entry;
+       struct clk_root_map *p;
+       u32 reg;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       root_entry = select(clock_id);
+       if (root_entry < 0)
+               return -EINVAL;
+
+       p = &root_array[root_entry];
+
+       if ((p->type == CCM_CORE_CHANNEL) ||
+           (p->type == CCM_DRAM_PHYM_CHANNEL) ||
+           (p->type == CCM_DRAM_CHANNEL)) {
+               if (pre_div != CLK_ROOT_PRE_DIV1) {
+                       printf("Error pre div!\n");
+                       return -EINVAL;
+               }
+       }
+
+       reg = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       reg &= ~CLK_ROOT_PRE_DIV_MASK;
+       reg |= pre_div << CLK_ROOT_PRE_DIV_SHIFT;
+       __raw_writel(reg, &imx_ccm->root[clock_id].target_root);
+
+       return 0;
+}
+
+int clock_get_prediv(enum clk_root_index clock_id, enum root_pre_div *pre_div)
+{
+       u32 val;
+       int root_entry;
+       struct clk_root_map *p;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       root_entry = select(clock_id);
+       if (root_entry < 0)
+               return -EINVAL;
+
+       p = &root_array[root_entry];
+
+       if ((p->type == CCM_CORE_CHANNEL) ||
+           (p->type == CCM_DRAM_PHYM_CHANNEL) ||
+           (p->type == CCM_DRAM_CHANNEL)) {
+               *pre_div = 0;
+               return 0;
+       }
+
+       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       val &= CLK_ROOT_PRE_DIV_MASK;
+       val >>= CLK_ROOT_PRE_DIV_SHIFT;
+
+       *pre_div = val;
+
+       return 0;
+}
+
+int clock_set_postdiv(enum clk_root_index clock_id, enum root_post_div div)
+{
+       u32 reg;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       if (clock_id == DRAM_PHYM_CLK_ROOT) {
+               if (div != CLK_ROOT_POST_DIV1) {
+                       printf("Error post div!\n");
+                       return -EINVAL;
+               }
+       }
+
+       /* Only 3 bit post div. */
+       if ((clock_id == DRAM_CLK_ROOT) && (div > CLK_ROOT_POST_DIV7)) {
+               printf("Error post div!\n");
+               return -EINVAL;
+       }
+
+       reg = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       reg &= ~CLK_ROOT_POST_DIV_MASK;
+       reg |= div << CLK_ROOT_POST_DIV_SHIFT;
+       __raw_writel(reg, &imx_ccm->root[clock_id].target_root);
+
+       return 0;
+}
+
+int clock_get_postdiv(enum clk_root_index clock_id, enum root_post_div *div)
+{
+       u32 val;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       if (clock_id == DRAM_PHYM_CLK_ROOT) {
+               *div = 0;
+               return 0;
+       }
+
+       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       if (clock_id == DRAM_CLK_ROOT)
+               val &= DRAM_CLK_ROOT_POST_DIV_MASK;
+       else
+               val &= CLK_ROOT_POST_DIV_MASK;
+       val >>= CLK_ROOT_POST_DIV_SHIFT;
+
+       *div = val;
+
+       return 0;
+}
+
+int clock_set_autopostdiv(enum clk_root_index clock_id, enum root_auto_div div,
+                         int auto_en)
+{
+       u32 val;
+       int root_entry;
+       struct clk_root_map *p;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       root_entry = select(clock_id);
+       if (root_entry < 0)
+               return -EINVAL;
+
+       p = &root_array[root_entry];
+
+       if ((p->type != CCM_BUS_CHANNEL) && (p->type != CCM_AHB_CHANNEL)) {
+               printf("Auto postdiv not supported.!\n");
+               return -EINVAL;
+       }
+
+       /*
+        * Each time only one filed can be changed, no use target_root_set.
+        */
+       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       val &= ~CLK_ROOT_AUTO_DIV_MASK;
+       val |= (div << CLK_ROOT_AUTO_DIV_SHIFT);
+
+       if (auto_en)
+               val |= CLK_ROOT_AUTO_EN;
+       else
+               val &= ~CLK_ROOT_AUTO_EN;
+
+       __raw_writel(val, &imx_ccm->root[clock_id].target_root);
+
+       return 0;
+}
+
+int clock_get_autopostdiv(enum clk_root_index clock_id, enum root_auto_div *div,
+                         int *auto_en)
+{
+       u32 val;
+       int root_entry;
+       struct clk_root_map *p;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       root_entry = select(clock_id);
+       if (root_entry < 0)
+               return -EINVAL;
+
+       p = &root_array[root_entry];
+
+       /*
+        * Only bus/ahb channel supports auto div.
+        * If unsupported, just set auto_en and div with 0.
+        */
+       if ((p->type != CCM_BUS_CHANNEL) && (p->type != CCM_AHB_CHANNEL)) {
+               *auto_en = 0;
+               *div = 0;
+               return 0;
+       }
+
+       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
+       if ((val & CLK_ROOT_AUTO_EN_MASK) == 0)
+               *auto_en = 0;
+       else
+               *auto_en = 1;
+
+       val &= CLK_ROOT_AUTO_DIV_MASK;
+       val >>= CLK_ROOT_AUTO_DIV_SHIFT;
+
+       *div = val;
+
+       return 0;
+}
+
+int clock_get_target_val(enum clk_root_index clock_id, u32 *val)
+{
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       *val = __raw_readl(&imx_ccm->root[clock_id].target_root);
+
+       return 0;
+}
+
+int clock_set_target_val(enum clk_root_index clock_id, u32 val)
+{
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       __raw_writel(val, &imx_ccm->root[clock_id].target_root);
+
+       return 0;
+}
+
+/* Auto_div and auto_en is ignored, they are rarely used. */
+int clock_root_cfg(enum clk_root_index clock_id, enum root_pre_div pre_div,
+                  enum root_post_div post_div, enum clk_root_src clock_src)
+{
+       u32 val;
+       int root_entry, src_entry;
+       struct clk_root_map *p;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       root_entry = select(clock_id);
+       if (root_entry < 0)
+               return -EINVAL;
+
+       p = &root_array[root_entry];
+
+       if ((p->type == CCM_CORE_CHANNEL) ||
+           (p->type == CCM_DRAM_PHYM_CHANNEL) ||
+           (p->type == CCM_DRAM_CHANNEL)) {
+               if (pre_div != CLK_ROOT_PRE_DIV1) {
+                       printf("Error pre div!\n");
+                       return -EINVAL;
+               }
+       }
+
+       /* Only 3 bit post div. */
+       if (p->type == CCM_DRAM_CHANNEL) {
+               if (post_div > CLK_ROOT_POST_DIV7) {
+                       printf("Error post div!\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (p->type == CCM_DRAM_PHYM_CHANNEL) {
+               if (post_div != CLK_ROOT_POST_DIV1) {
+                       printf("Error post div!\n");
+                       return -EINVAL;
+               }
+       }
+
+       src_entry = src_supported(root_entry, clock_src);
+       if (src_entry < 0)
+               return -EINVAL;
+
+       val = CLK_ROOT_ON | pre_div << CLK_ROOT_PRE_DIV_SHIFT |
+             post_div << CLK_ROOT_POST_DIV_SHIFT |
+             src_entry << CLK_ROOT_MUX_SHIFT;
+
+       __raw_writel(val, &imx_ccm->root[clock_id].target_root);
+
+       return 0;
+}
+
+int clock_root_enabled(enum clk_root_index clock_id)
+{
+       u32 val;
+
+       if (clock_id >= CLK_ROOT_MAX)
+               return -EINVAL;
+
+       /*
+        * No enable bit for DRAM controller and PHY. Just return enabled.
+        */
+       if ((clock_id == DRAM_PHYM_CLK_ROOT) || (clock_id == DRAM_CLK_ROOT))
+               return 1;
+
+       val = __raw_readl(&imx_ccm->root[clock_id].target_root);
+
+       return (val & CLK_ROOT_ENABLE_MASK) ? 1 : 0;
+}
+
+/* CCGR gate operation */
+int clock_enable(enum clk_ccgr_index index, bool enable)
+{
+       if (index >= CCGR_MAX)
+               return -EINVAL;
+
+       if (enable)
+               __raw_writel(CCM_CLK_ON_MSK,
+                            &imx_ccm->ccgr_array[index].ccgr_set);
+       else
+               __raw_writel(CCM_CLK_ON_MSK,
+                            &imx_ccm->ccgr_array[index].ccgr_clr);
+
+       return 0;
+}
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
new file mode 100644 (file)
index 0000000..502552d
--- /dev/null
@@ -0,0 +1,69 @@
+#include <asm/io.h>
+#include <asm/psci.h>
+#include <asm/secure.h>
+#include <asm/arch/imx-regs.h>
+#include <common.h>
+
+
+#define GPC_CPU_PGC_SW_PDN_REQ 0xfc
+#define GPC_CPU_PGC_SW_PUP_REQ 0xf0
+#define GPC_PGC_C1             0x840
+
+#define BM_CPU_PGC_SW_PDN_PUP_REQ_CORE1_A7     0x2
+
+/* below is for i.MX7D */
+#define SRC_GPR1_MX7D          0x074
+#define SRC_A7RCR0             0x004
+#define SRC_A7RCR1             0x008
+
+#define BP_SRC_A7RCR0_A7_CORE_RESET0   0
+#define BP_SRC_A7RCR1_A7_CORE1_ENABLE  1
+
+static inline void imx_gpcv2_set_m_core_pgc(bool enable, u32 offset)
+{
+       writel(enable, GPC_IPS_BASE_ADDR + offset);
+}
+
+__secure void imx_gpcv2_set_core1_power(bool pdn)
+{
+       u32 reg = pdn ? GPC_CPU_PGC_SW_PUP_REQ : GPC_CPU_PGC_SW_PDN_REQ;
+       u32 val;
+
+       imx_gpcv2_set_m_core_pgc(true, GPC_PGC_C1);
+
+       val = readl(GPC_IPS_BASE_ADDR + reg);
+       val |= BM_CPU_PGC_SW_PDN_PUP_REQ_CORE1_A7;
+       writel(val, GPC_IPS_BASE_ADDR + reg);
+
+       while ((readl(GPC_IPS_BASE_ADDR + reg) &
+              BM_CPU_PGC_SW_PDN_PUP_REQ_CORE1_A7) != 0)
+               ;
+
+       imx_gpcv2_set_m_core_pgc(false, GPC_PGC_C1);
+}
+
+__secure void imx_enable_cpu_ca7(int cpu, bool enable)
+{
+       u32 mask, val;
+
+       mask = 1 << (BP_SRC_A7RCR1_A7_CORE1_ENABLE + cpu - 1);
+       val = readl(SRC_BASE_ADDR + SRC_A7RCR1);
+       val = enable ? val | mask : val & ~mask;
+       writel(val, SRC_BASE_ADDR + SRC_A7RCR1);
+}
+
+__secure int imx_cpu_on(int fn, int cpu, int pc)
+{
+       writel(pc, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D);
+       imx_gpcv2_set_core1_power(true);
+       imx_enable_cpu_ca7(cpu, true);
+       return 0;
+}
+
+__secure int imx_cpu_off(int cpu)
+{
+       imx_enable_cpu_ca7(cpu, false);
+       imx_gpcv2_set_core1_power(false);
+       writel(0, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D + 4);
+       return 0;
+}
diff --git a/arch/arm/mach-imx/mx7/psci.S b/arch/arm/mach-imx/mx7/psci.S
new file mode 100644 (file)
index 0000000..96e88d6
--- /dev/null
@@ -0,0 +1,39 @@
+#include <config.h>
+#include <linux/linkage.h>
+
+#include <asm/armv7.h>
+#include <asm/arch-armv7/generictimer.h>
+#include <asm/psci.h>
+
+       .pushsection ._secure.text, "ax"
+
+       .arch_extension sec
+
+.globl psci_cpu_on
+psci_cpu_on:
+       push    {r4, r5, lr}
+
+       mov     r4, r0
+       mov     r5, r1
+       mov     r0, r1
+       mov     r1, r2
+       bl      psci_save_target_pc
+
+       mov     r0, r4
+       mov     r1, r5
+       ldr     r2, =psci_cpu_entry
+       bl      imx_cpu_on
+
+       pop     {r4, r5, pc}
+
+.globl psci_cpu_off
+psci_cpu_off:
+
+       bl      psci_cpu_off_common
+       bl      psci_get_cpu_id
+       bl      imx_cpu_off
+
+1:     wfi
+       b 1b
+
+       .popsection
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
new file mode 100644 (file)
index 0000000..4cf977e
--- /dev/null
@@ -0,0 +1,468 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/dma.h>
+#include <asm/mach-imx/hab.h>
+#include <asm/mach-imx/rdc-sema.h>
+#include <asm/arch/imx-rdc.h>
+#include <asm/arch/crm_regs.h>
+#include <dm.h>
+#include <imx_thermal.h>
+
+#if defined(CONFIG_IMX_THERMAL)
+static const struct imx_thermal_plat imx7_thermal_plat = {
+       .regs = (void *)ANATOP_BASE_ADDR,
+       .fuse_bank = 3,
+       .fuse_word = 3,
+};
+
+U_BOOT_DEVICE(imx7_thermal) = {
+       .name = "imx_thermal",
+       .platdata = &imx7_thermal_plat,
+};
+#endif
+
+#ifdef CONFIG_IMX_RDC
+/*
+ * In current design, if any peripheral was assigned to both A7 and M4,
+ * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter
+ * low power mode. So M4 sleep will cause some peripherals fail to work
+ * at A7 core side. At default, all resources are in domain 0 - 3.
+ *
+ * There are 26 peripherals impacted by this IC issue:
+ * SIM2(sim2/emvsim2)
+ * SIM1(sim1/emvsim1)
+ * UART1/UART2/UART3/UART4/UART5/UART6/UART7
+ * SAI1/SAI2/SAI3
+ * WDOG1/WDOG2/WDOG3/WDOG4
+ * GPT1/GPT2/GPT3/GPT4
+ * PWM1/PWM2/PWM3/PWM4
+ * ENET1/ENET2
+ * Software Workaround:
+ * Here we setup some resources to domain 0 where M4 codes will move
+ * the M4 out of this domain. Then M4 is not able to access them any longer.
+ * This is a workaround for ic issue. So the peripherals are not shared
+ * by them. This way requires the uboot implemented the RDC driver and
+ * set the 26 IPs above to domain 0 only. M4 code will assign resource
+ * to its own domain, if it want to use the resource.
+ */
+static rdc_peri_cfg_t const resources[] = {
+       (RDC_PER_SIM1 | RDC_DOMAIN(0)),
+       (RDC_PER_SIM2 | RDC_DOMAIN(0)),
+       (RDC_PER_UART1 | RDC_DOMAIN(0)),
+       (RDC_PER_UART2 | RDC_DOMAIN(0)),
+       (RDC_PER_UART3 | RDC_DOMAIN(0)),
+       (RDC_PER_UART4 | RDC_DOMAIN(0)),
+       (RDC_PER_UART5 | RDC_DOMAIN(0)),
+       (RDC_PER_UART6 | RDC_DOMAIN(0)),
+       (RDC_PER_UART7 | RDC_DOMAIN(0)),
+       (RDC_PER_SAI1 | RDC_DOMAIN(0)),
+       (RDC_PER_SAI2 | RDC_DOMAIN(0)),
+       (RDC_PER_SAI3 | RDC_DOMAIN(0)),
+       (RDC_PER_WDOG1 | RDC_DOMAIN(0)),
+       (RDC_PER_WDOG2 | RDC_DOMAIN(0)),
+       (RDC_PER_WDOG3 | RDC_DOMAIN(0)),
+       (RDC_PER_WDOG4 | RDC_DOMAIN(0)),
+       (RDC_PER_GPT1 | RDC_DOMAIN(0)),
+       (RDC_PER_GPT2 | RDC_DOMAIN(0)),
+       (RDC_PER_GPT3 | RDC_DOMAIN(0)),
+       (RDC_PER_GPT4 | RDC_DOMAIN(0)),
+       (RDC_PER_PWM1 | RDC_DOMAIN(0)),
+       (RDC_PER_PWM2 | RDC_DOMAIN(0)),
+       (RDC_PER_PWM3 | RDC_DOMAIN(0)),
+       (RDC_PER_PWM4 | RDC_DOMAIN(0)),
+       (RDC_PER_ENET1 | RDC_DOMAIN(0)),
+       (RDC_PER_ENET2 | RDC_DOMAIN(0)),
+};
+
+static void isolate_resource(void)
+{
+       imx_rdc_setup_peripherals(resources, ARRAY_SIZE(resources));
+}
+#endif
+
+#if defined(CONFIG_SECURE_BOOT)
+struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
+       .bank = 1,
+       .word = 3,
+};
+#endif
+
+/*
+ * OCOTP_TESTER3[9:8] (see Fusemap Description Table offset 0x440)
+ * defines a 2-bit SPEED_GRADING
+ */
+#define OCOTP_TESTER3_SPEED_SHIFT      8
+#define OCOTP_TESTER3_SPEED_800MHZ     0
+#define OCOTP_TESTER3_SPEED_500MHZ     1
+#define OCOTP_TESTER3_SPEED_1GHZ       2
+#define OCOTP_TESTER3_SPEED_1P2GHZ     3
+
+u32 get_cpu_speed_grade_hz(void)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[1];
+       struct fuse_bank1_regs *fuse =
+               (struct fuse_bank1_regs *)bank->fuse_regs;
+       uint32_t val;
+
+       val = readl(&fuse->tester3);
+       val >>= OCOTP_TESTER3_SPEED_SHIFT;
+       val &= 0x3;
+
+       switch(val) {
+       case OCOTP_TESTER3_SPEED_800MHZ:
+               return 800000000;
+       case OCOTP_TESTER3_SPEED_500MHZ:
+               return 500000000;
+       case OCOTP_TESTER3_SPEED_1GHZ:
+               return 1000000000;
+       case OCOTP_TESTER3_SPEED_1P2GHZ:
+               return 1200000000;
+       }
+       return 0;
+}
+
+/*
+ * OCOTP_TESTER3[7:6] (see Fusemap Description Table offset 0x440)
+ * defines a 2-bit SPEED_GRADING
+ */
+#define OCOTP_TESTER3_TEMP_SHIFT       6
+
+u32 get_cpu_temp_grade(int *minc, int *maxc)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[1];
+       struct fuse_bank1_regs *fuse =
+               (struct fuse_bank1_regs *)bank->fuse_regs;
+       uint32_t val;
+
+       val = readl(&fuse->tester3);
+       val >>= OCOTP_TESTER3_TEMP_SHIFT;
+       val &= 0x3;
+
+       if (minc && maxc) {
+               if (val == TEMP_AUTOMOTIVE) {
+                       *minc = -40;
+                       *maxc = 125;
+               } else if (val == TEMP_INDUSTRIAL) {
+                       *minc = -40;
+                       *maxc = 105;
+               } else if (val == TEMP_EXTCOMMERCIAL) {
+                       *minc = -20;
+                       *maxc = 105;
+               } else {
+                       *minc = 0;
+                       *maxc = 95;
+               }
+       }
+       return val;
+}
+
+static bool is_mx7d(void)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[1];
+       struct fuse_bank1_regs *fuse =
+               (struct fuse_bank1_regs *)bank->fuse_regs;
+       int val;
+
+       val = readl(&fuse->tester4);
+       if (val & 1)
+               return false;
+       else
+               return true;
+}
+
+u32 get_cpu_rev(void)
+{
+       struct mxc_ccm_anatop_reg *ccm_anatop = (struct mxc_ccm_anatop_reg *)
+                                                ANATOP_BASE_ADDR;
+       u32 reg = readl(&ccm_anatop->digprog);
+       u32 type = (reg >> 16) & 0xff;
+
+       if (!is_mx7d())
+               type = MXC_CPU_MX7S;
+
+       reg &= 0xff;
+       return (type << 12) | reg;
+}
+
+#ifdef CONFIG_REVISION_TAG
+u32 __weak get_board_rev(void)
+{
+       return get_cpu_rev();
+}
+#endif
+
+/* enable all periherial can be accessed in nosec mode */
+static void init_csu(void)
+{
+       int i = 0;
+       for (i = 0; i < CSU_NUM_REGS; i++)
+               writel(CSU_INIT_SEC_LEVEL0, CSU_IPS_BASE_ADDR + i * 4);
+}
+
+static void imx_enet_mdio_fixup(void)
+{
+       struct iomuxc_gpr_base_regs *gpr_regs =
+               (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR;
+
+       /*
+        * The management data input/output (MDIO) requires open-drain,
+        * i.MX7D TO1.0 ENET MDIO pin has no open drain, but TO1.1 supports
+        * this feature. So to TO1.1, need to enable open drain by setting
+        * bits GPR0[8:7].
+        */
+
+       if (soc_rev() >= CHIP_REV_1_1) {
+               setbits_le32(&gpr_regs->gpr[0],
+                            IOMUXC_GPR_GPR0_ENET_MDIO_OPEN_DRAIN_MASK);
+       }
+}
+
+int arch_cpu_init(void)
+{
+       init_aips();
+
+       init_csu();
+       /* Disable PDE bit of WMCR register */
+       imx_set_wdog_powerdown(false);
+
+       imx_enet_mdio_fixup();
+
+#ifdef CONFIG_APBH_DMA
+       /* Start APBH DMA */
+       mxs_dma_init();
+#endif
+
+       if (IS_ENABLED(CONFIG_IMX_RDC))
+               isolate_resource();
+
+       return 0;
+}
+
+#ifdef CONFIG_ARCH_MISC_INIT
+int arch_misc_init(void)
+{
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+       if (is_mx7d())
+               setenv("soc", "imx7d");
+       else
+               setenv("soc", "imx7s");
+#endif
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_SERIAL_TAG
+void get_board_serial(struct tag_serialnr *serialnr)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[0];
+       struct fuse_bank0_regs *fuse =
+               (struct fuse_bank0_regs *)bank->fuse_regs;
+
+       serialnr->low = fuse->tester0;
+       serialnr->high = fuse->tester1;
+}
+#endif
+
+#if defined(CONFIG_FEC_MXC)
+void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
+{
+       struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
+       struct fuse_bank *bank = &ocotp->bank[9];
+       struct fuse_bank9_regs *fuse =
+               (struct fuse_bank9_regs *)bank->fuse_regs;
+
+       if (0 == dev_id) {
+               u32 value = readl(&fuse->mac_addr1);
+               mac[0] = (value >> 8);
+               mac[1] = value;
+
+               value = readl(&fuse->mac_addr0);
+               mac[2] = value >> 24;
+               mac[3] = value >> 16;
+               mac[4] = value >> 8;
+               mac[5] = value;
+       } else {
+               u32 value = readl(&fuse->mac_addr2);
+               mac[0] = value >> 24;
+               mac[1] = value >> 16;
+               mac[2] = value >> 8;
+               mac[3] = value;
+
+               value = readl(&fuse->mac_addr1);
+               mac[4] = value >> 24;
+               mac[5] = value >> 16;
+       }
+}
+#endif
+
+#ifdef CONFIG_IMX_BOOTAUX
+int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
+{
+       u32 stack, pc;
+       struct src *src_reg = (struct src *)SRC_BASE_ADDR;
+
+       if (!boot_private_data)
+               return 1;
+
+       stack = *(u32 *)boot_private_data;
+       pc = *(u32 *)(boot_private_data + 4);
+
+       /* Set the stack and pc to M4 bootROM */
+       writel(stack, M4_BOOTROM_BASE_ADDR);
+       writel(pc, M4_BOOTROM_BASE_ADDR + 4);
+
+       /* Enable M4 */
+       clrsetbits_le32(&src_reg->m4rcr, SRC_M4RCR_M4C_NON_SCLR_RST_MASK,
+                       SRC_M4RCR_ENABLE_M4_MASK);
+
+       return 0;
+}
+
+int arch_auxiliary_core_check_up(u32 core_id)
+{
+       uint32_t val;
+       struct src *src_reg = (struct src *)SRC_BASE_ADDR;
+
+       val = readl(&src_reg->m4rcr);
+       if (val & 0x00000001)
+               return 0; /* assert in reset */
+
+       return 1;
+}
+#endif
+
+void set_wdog_reset(struct wdog_regs *wdog)
+{
+       u32 reg = readw(&wdog->wcr);
+       /*
+        * Output WDOG_B signal to reset external pmic or POR_B decided by
+        * the board desgin. Without external reset, the peripherals/DDR/
+        * PMIC are not reset, that may cause system working abnormal.
+        */
+       reg = readw(&wdog->wcr);
+       reg |= 1 << 3;
+       /*
+        * WDZST bit is write-once only bit. Align this bit in kernel,
+        * otherwise kernel code will have no chance to set this bit.
+        */
+       reg |= 1 << 0;
+       writew(reg, &wdog->wcr);
+}
+
+/*
+ * cfg_val will be used for
+ * Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0]
+ * After reset, if GPR10[28] is 1, ROM will copy GPR9[25:0]
+ * to SBMR1, which will determine the boot device.
+ */
+const struct boot_mode soc_boot_modes[] = {
+       {"ecspi1:0",    MAKE_CFGVAL(0x00, 0x60, 0x00, 0x00)},
+       {"ecspi1:1",    MAKE_CFGVAL(0x40, 0x62, 0x00, 0x00)},
+       {"ecspi1:2",    MAKE_CFGVAL(0x80, 0x64, 0x00, 0x00)},
+       {"ecspi1:3",    MAKE_CFGVAL(0xc0, 0x66, 0x00, 0x00)},
+
+       {"weim",        MAKE_CFGVAL(0x00, 0x50, 0x00, 0x00)},
+       {"qspi1",       MAKE_CFGVAL(0x10, 0x40, 0x00, 0x00)},
+       /* 4 bit bus width */
+       {"usdhc1",      MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)},
+       {"usdhc2",      MAKE_CFGVAL(0x10, 0x14, 0x00, 0x00)},
+       {"usdhc3",      MAKE_CFGVAL(0x10, 0x18, 0x00, 0x00)},
+       {"mmc1",        MAKE_CFGVAL(0x10, 0x20, 0x00, 0x00)},
+       {"mmc2",        MAKE_CFGVAL(0x10, 0x24, 0x00, 0x00)},
+       {"mmc3",        MAKE_CFGVAL(0x10, 0x28, 0x00, 0x00)},
+       {NULL,          0},
+};
+
+enum boot_device get_boot_device(void)
+{
+       struct bootrom_sw_info **p =
+               (struct bootrom_sw_info **)ROM_SW_INFO_ADDR;
+
+       enum boot_device boot_dev = SD1_BOOT;
+       u8 boot_type = (*p)->boot_dev_type;
+       u8 boot_instance = (*p)->boot_dev_instance;
+
+       switch (boot_type) {
+       case BOOT_TYPE_SD:
+               boot_dev = boot_instance + SD1_BOOT;
+               break;
+       case BOOT_TYPE_MMC:
+               boot_dev = boot_instance + MMC1_BOOT;
+               break;
+       case BOOT_TYPE_NAND:
+               boot_dev = NAND_BOOT;
+               break;
+       case BOOT_TYPE_QSPI:
+               boot_dev = QSPI_BOOT;
+               break;
+       case BOOT_TYPE_WEIM:
+               boot_dev = WEIM_NOR_BOOT;
+               break;
+       case BOOT_TYPE_SPINOR:
+               boot_dev = SPI_NOR_BOOT;
+               break;
+       default:
+               break;
+       }
+
+       return boot_dev;
+}
+
+#ifdef CONFIG_ENV_IS_IN_MMC
+__weak int board_mmc_get_env_dev(int devno)
+{
+       return CONFIG_SYS_MMC_ENV_DEV;
+}
+
+int mmc_get_env_dev(void)
+{
+       struct bootrom_sw_info **p =
+               (struct bootrom_sw_info **)ROM_SW_INFO_ADDR;
+       int devno = (*p)->boot_dev_instance;
+       u8 boot_type = (*p)->boot_dev_type;
+
+       /* If not boot from sd/mmc, use default value */
+       if ((boot_type != BOOT_TYPE_SD) && (boot_type != BOOT_TYPE_MMC))
+               return CONFIG_SYS_MMC_ENV_DEV;
+
+       return board_mmc_get_env_dev(devno);
+}
+#endif
+
+void s_init(void)
+{
+#if !defined CONFIG_SPL_BUILD
+       /* Enable SMP mode for CPU0, by setting bit 6 of Auxiliary Ctl reg */
+       asm volatile(
+                       "mrc p15, 0, r0, c1, c0, 1\n"
+                       "orr r0, r0, #1 << 6\n"
+                       "mcr p15, 0, r0, c1, c0, 1\n");
+#endif
+       /* clock configuration. */
+       clock_init();
+
+       return;
+}
+
+void reset_misc(void)
+{
+#ifdef CONFIG_VIDEO_MXS
+       lcdif_power_down();
+#endif
+}
+
diff --git a/arch/arm/mach-imx/mx7ulp/Kconfig b/arch/arm/mach-imx/mx7ulp/Kconfig
new file mode 100644 (file)
index 0000000..1bdc85a
--- /dev/null
@@ -0,0 +1,17 @@
+if ARCH_MX7ULP
+
+config SYS_SOC
+       default "mx7ulp"
+
+choice
+       prompt "MX7ULP board select"
+       optional
+
+config TARGET_MX7ULP_EVK
+        bool "Support mx7ulp EVK board"
+
+endchoice
+
+source "board/freescale/mx7ulp_evk/Kconfig"
+
+endif
diff --git a/arch/arm/mach-imx/mx7ulp/Makefile b/arch/arm/mach-imx/mx7ulp/Makefile
new file mode 100644 (file)
index 0000000..0248ea8
--- /dev/null
@@ -0,0 +1,8 @@
+#
+# (C) Copyright 2016 Freescale Semiconductor, Inc.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+#
+
+obj-y  := soc.o clock.o iomux.o pcc.o scg.o
diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c
new file mode 100644 (file)
index 0000000..77b282a
--- /dev/null
@@ -0,0 +1,365 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <div64.h>
+#include <asm/io.h>
+#include <errno.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int get_clocks(void)
+{
+#ifdef CONFIG_FSL_ESDHC
+#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC0_RBASE
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC1_RBASE
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+#endif
+#endif
+       return 0;
+}
+
+static u32 get_fast_plat_clk(void)
+{
+       return scg_clk_get_rate(SCG_NIC0_CLK);
+}
+
+static u32 get_slow_plat_clk(void)
+{
+       return scg_clk_get_rate(SCG_NIC1_CLK);
+}
+
+static u32 get_ipg_clk(void)
+{
+       return scg_clk_get_rate(SCG_NIC1_BUS_CLK);
+}
+
+u32 get_lpuart_clk(void)
+{
+       int index = 0;
+
+       const u32 lpuart_array[] = {
+               LPUART0_RBASE,
+               LPUART1_RBASE,
+               LPUART2_RBASE,
+               LPUART3_RBASE,
+               LPUART4_RBASE,
+               LPUART5_RBASE,
+               LPUART6_RBASE,
+               LPUART7_RBASE,
+       };
+
+       const enum pcc_clk lpuart_pcc_clks[] = {
+               PER_CLK_LPUART4,
+               PER_CLK_LPUART5,
+               PER_CLK_LPUART6,
+               PER_CLK_LPUART7,
+       };
+
+       for (index = 0; index < 8; index++) {
+               if (lpuart_array[index] == LPUART_BASE)
+                       break;
+       }
+
+       if (index < 4 || index > 7)
+               return 0;
+
+       return pcc_clock_get_rate(lpuart_pcc_clks[index - 4]);
+}
+
+#ifdef CONFIG_SYS_LPI2C_IMX
+int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
+{
+       /* Set parent to FIRC DIV2 clock */
+       const enum pcc_clk lpi2c_pcc_clks[] = {
+               PER_CLK_LPI2C4,
+               PER_CLK_LPI2C5,
+               PER_CLK_LPI2C6,
+               PER_CLK_LPI2C7,
+       };
+
+       if (i2c_num < 4 || i2c_num > 7)
+               return -EINVAL;
+
+       if (enable) {
+               pcc_clock_enable(lpi2c_pcc_clks[i2c_num - 4], false);
+               pcc_clock_sel(lpi2c_pcc_clks[i2c_num - 4], SCG_FIRC_DIV2_CLK);
+               pcc_clock_enable(lpi2c_pcc_clks[i2c_num - 4], true);
+       } else {
+               pcc_clock_enable(lpi2c_pcc_clks[i2c_num - 4], false);
+       }
+       return 0;
+}
+
+u32 imx_get_i2cclk(unsigned i2c_num)
+{
+       const enum pcc_clk lpi2c_pcc_clks[] = {
+               PER_CLK_LPI2C4,
+               PER_CLK_LPI2C5,
+               PER_CLK_LPI2C6,
+               PER_CLK_LPI2C7,
+       };
+
+       if (i2c_num < 4 || i2c_num > 7)
+               return 0;
+
+       return pcc_clock_get_rate(lpi2c_pcc_clks[i2c_num - 4]);
+}
+#endif
+
+unsigned int mxc_get_clock(enum mxc_clock clk)
+{
+       switch (clk) {
+       case MXC_ARM_CLK:
+               return scg_clk_get_rate(SCG_CORE_CLK);
+       case MXC_AXI_CLK:
+               return get_fast_plat_clk();
+       case MXC_AHB_CLK:
+               return get_slow_plat_clk();
+       case MXC_IPG_CLK:
+               return get_ipg_clk();
+       case MXC_I2C_CLK:
+               return pcc_clock_get_rate(PER_CLK_LPI2C4);
+       case MXC_UART_CLK:
+               return get_lpuart_clk();
+       case MXC_ESDHC_CLK:
+               return pcc_clock_get_rate(PER_CLK_USDHC0);
+       case MXC_ESDHC2_CLK:
+               return pcc_clock_get_rate(PER_CLK_USDHC1);
+       case MXC_DDR_CLK:
+               return scg_clk_get_rate(SCG_DDR_CLK);
+       default:
+               printf("Unsupported mxc_clock %d\n", clk);
+               break;
+       }
+
+       return 0;
+}
+
+void init_clk_usdhc(u32 index)
+{
+       switch (index) {
+       case 0:
+               /*Disable the clock before configure it */
+               pcc_clock_enable(PER_CLK_USDHC0, false);
+
+               /* 158MHz / 1 = 158MHz */
+               pcc_clock_sel(PER_CLK_USDHC0, SCG_NIC1_CLK);
+               pcc_clock_div_config(PER_CLK_USDHC0, false, 1);
+               pcc_clock_enable(PER_CLK_USDHC0, true);
+               break;
+       case 1:
+               /*Disable the clock before configure it */
+               pcc_clock_enable(PER_CLK_USDHC1, false);
+
+               /* 158MHz / 1 = 158MHz */
+               pcc_clock_sel(PER_CLK_USDHC1, SCG_NIC1_CLK);
+               pcc_clock_div_config(PER_CLK_USDHC1, false, 1);
+               pcc_clock_enable(PER_CLK_USDHC1, true);
+               break;
+       default:
+               printf("Invalid index for USDHC %d\n", index);
+               break;
+       }
+}
+
+#ifdef CONFIG_MXC_OCOTP
+
+#define OCOTP_CTRL_PCC1_SLOT           (38)
+#define OCOTP_CTRL_HIGH4K_PCC1_SLOT    (39)
+
+void enable_ocotp_clk(unsigned char enable)
+{
+       u32 val;
+
+       /*
+        * Seems the OCOTP CLOCKs have been enabled at default,
+        * check its inuse flag
+        */
+
+       val = readl(PCC1_RBASE + 4 * OCOTP_CTRL_PCC1_SLOT);
+       if (!(val & PCC_INUSE_MASK))
+               writel(PCC_CGC_MASK, (PCC1_RBASE + 4 * OCOTP_CTRL_PCC1_SLOT));
+
+       val = readl(PCC1_RBASE + 4 * OCOTP_CTRL_HIGH4K_PCC1_SLOT);
+       if (!(val & PCC_INUSE_MASK))
+               writel(PCC_CGC_MASK,
+                      (PCC1_RBASE + 4 * OCOTP_CTRL_HIGH4K_PCC1_SLOT));
+}
+#endif
+
+void enable_usboh3_clk(unsigned char enable)
+{
+       if (enable) {
+               pcc_clock_enable(PER_CLK_USB0, false);
+               pcc_clock_sel(PER_CLK_USB0, SCG_NIC1_BUS_CLK);
+               pcc_clock_enable(PER_CLK_USB0, true);
+
+#ifdef CONFIG_USB_MAX_CONTROLLER_COUNT
+               if (CONFIG_USB_MAX_CONTROLLER_COUNT > 1) {
+                       pcc_clock_enable(PER_CLK_USB1, false);
+                       pcc_clock_sel(PER_CLK_USB1, SCG_NIC1_BUS_CLK);
+                       pcc_clock_enable(PER_CLK_USB1, true);
+               }
+#endif
+
+               pcc_clock_enable(PER_CLK_USB_PHY, true);
+               pcc_clock_enable(PER_CLK_USB_PL301, true);
+       } else {
+               pcc_clock_enable(PER_CLK_USB0, false);
+               pcc_clock_enable(PER_CLK_USB1, false);
+               pcc_clock_enable(PER_CLK_USB_PHY, false);
+               pcc_clock_enable(PER_CLK_USB_PL301, false);
+       }
+}
+
+static void lpuart_set_clk(uint32_t index, enum scg_clk clk)
+{
+       const enum pcc_clk lpuart_pcc_clks[] = {
+               PER_CLK_LPUART4,
+               PER_CLK_LPUART5,
+               PER_CLK_LPUART6,
+               PER_CLK_LPUART7,
+       };
+
+       if (index < 4 || index > 7)
+               return;
+
+#ifndef CONFIG_CLK_DEBUG
+       pcc_clock_enable(lpuart_pcc_clks[index - 4], false);
+#endif
+       pcc_clock_sel(lpuart_pcc_clks[index - 4], clk);
+       pcc_clock_enable(lpuart_pcc_clks[index - 4], true);
+}
+
+static void init_clk_lpuart(void)
+{
+       u32 index = 0, i;
+
+       const u32 lpuart_array[] = {
+               LPUART0_RBASE,
+               LPUART1_RBASE,
+               LPUART2_RBASE,
+               LPUART3_RBASE,
+               LPUART4_RBASE,
+               LPUART5_RBASE,
+               LPUART6_RBASE,
+               LPUART7_RBASE,
+       };
+
+       for (i = 0; i < 8; i++) {
+               if (lpuart_array[i] == LPUART_BASE) {
+                       index = i;
+                       break;
+               }
+       }
+
+       lpuart_set_clk(index, SCG_SOSC_DIV2_CLK);
+}
+
+static void init_clk_rgpio2p(void)
+{
+       /*Enable RGPIO2P1 clock */
+       pcc_clock_enable(PER_CLK_RGPIO2P1, true);
+
+       /*
+        * Hard code to enable RGPIO2P0 clock since it is not
+        * in clock frame for A7 domain
+        */
+       writel(PCC_CGC_MASK, (PCC0_RBASE + 0x3C));
+}
+
+/* Configure PLL/PFD freq */
+void clock_init(void)
+{
+       /*
+        * ROM has enabled clocks:
+        * A4 side: SIRC 16Mhz (DIV1-3 off),  FIRC 48Mhz (DIV1-2 on),
+        *          Non-LP-boot:  SOSC, SPLL PFD0 (scs selected)
+        * A7 side:  SPLL PFD0 (scs selected, 413Mhz),
+        *           APLL PFD0 (352Mhz), DDRCLK, all NIC clocks
+        *           A7 Plat0 (NIC0) = 176Mhz, Plat1 (NIC1) = 176Mhz,
+        *           IP BUS (NIC1_BUS) = 58.6Mhz
+        *
+        * In u-boot:
+        * 1. Enable PFD1-3 of APLL for A7 side. Enable FIRC and DIVs.
+        * 2. Enable USB PLL
+        * 3. Init the clocks of peripherals used in u-boot bu
+        *    without set rate interface.The clocks for these
+        *    peripherals are enabled in this intialization.
+        * 4.Other peripherals with set clock rate interface
+        *   does not be set in this function.
+        */
+
+       scg_a7_firc_init();
+
+       scg_a7_soscdiv_init();
+
+       /* APLL PFD1 = 270Mhz, PFD2=480Mhz, PFD3=800Mhz */
+       scg_enable_pll_pfd(SCG_APLL_PFD1_CLK, 35);
+       scg_enable_pll_pfd(SCG_APLL_PFD2_CLK, 20);
+       scg_enable_pll_pfd(SCG_APLL_PFD3_CLK, 12);
+
+       init_clk_lpuart();
+
+       init_clk_rgpio2p();
+
+       enable_usboh3_clk(1);
+}
+
+#ifdef CONFIG_SECURE_BOOT
+void hab_caam_clock_enable(unsigned char enable)
+{
+       if (enable)
+              pcc_clock_enable(PER_CLK_CAAM, true);
+       else
+              pcc_clock_enable(PER_CLK_CAAM, false);
+}
+#endif
+
+/*
+ * Dump some core clockes.
+ */
+int do_mx7_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       u32 addr = 0;
+       u32 freq;
+       freq = decode_pll(PLL_A7_SPLL);
+       printf("PLL_A7_SPLL    %8d MHz\n", freq / 1000000);
+
+       freq = decode_pll(PLL_A7_APLL);
+       printf("PLL_A7_APLL    %8d MHz\n", freq / 1000000);
+
+       freq = decode_pll(PLL_USB);
+       printf("PLL_USB    %8d MHz\n", freq / 1000000);
+
+       printf("\n");
+
+       printf("CORE       %8d kHz\n", scg_clk_get_rate(SCG_CORE_CLK) / 1000);
+       printf("IPG        %8d kHz\n", mxc_get_clock(MXC_IPG_CLK) / 1000);
+       printf("UART       %8d kHz\n", mxc_get_clock(MXC_UART_CLK) / 1000);
+       printf("AHB        %8d kHz\n", mxc_get_clock(MXC_AHB_CLK) / 1000);
+       printf("AXI        %8d kHz\n", mxc_get_clock(MXC_AXI_CLK) / 1000);
+       printf("DDR        %8d kHz\n", mxc_get_clock(MXC_DDR_CLK) / 1000);
+       printf("USDHC1     %8d kHz\n", mxc_get_clock(MXC_ESDHC_CLK) / 1000);
+       printf("USDHC2     %8d kHz\n", mxc_get_clock(MXC_ESDHC2_CLK) / 1000);
+       printf("I2C4       %8d kHz\n", mxc_get_clock(MXC_I2C_CLK) / 1000);
+
+       addr = (u32) clock_init;
+       printf("[%s] addr = 0x%08X\r\n", __func__, addr);
+       scg_a7_info();
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       clocks, CONFIG_SYS_MAXARGS, 1, do_mx7_showclocks,
+       "display clocks",
+       ""
+);
diff --git a/arch/arm/mach-imx/mx7ulp/iomux.c b/arch/arm/mach-imx/mx7ulp/iomux.c
new file mode 100644 (file)
index 0000000..1eba24e
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/iomux.h>
+
+static void *base = (void *)IOMUXC_BASE_ADDR;
+
+/*
+ * iomuxc0 base address. In imx7ulp-pins.h,
+ * the offsets of pins in iomuxc0 are from 0xD000,
+ * so we set the base address to (0x4103D000 - 0xD000 = 0x41030000)
+ */
+static void *base_mports = (void *)(AIPS0_BASE + 0x30000);
+
+/*
+ * configures a single pad in the iomuxer
+ */
+void mx7ulp_iomux_setup_pad(iomux_cfg_t pad)
+{
+       u32 mux_ctrl_ofs = (pad & MUX_CTRL_OFS_MASK) >> MUX_CTRL_OFS_SHIFT;
+       u32 mux_mode = (pad & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
+       u32 sel_input_ofs =
+               (pad & MUX_SEL_INPUT_OFS_MASK) >> MUX_SEL_INPUT_OFS_SHIFT;
+       u32 sel_input =
+               (pad & MUX_SEL_INPUT_MASK) >> MUX_SEL_INPUT_SHIFT;
+       u32 pad_ctrl_ofs = mux_ctrl_ofs;
+       u32 pad_ctrl = (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT;
+
+       debug("[PAD CFG] = 0x%16llX \r\n\tmux_ctl = 0x%X(0x%X) sel_input = 0x%X(0x%X) pad_ctrl = 0x%X(0x%X)\r\n",
+             pad, mux_ctrl_ofs, mux_mode, sel_input_ofs, sel_input,
+             pad_ctrl_ofs, pad_ctrl);
+
+       if (mux_mode & IOMUX_CONFIG_MPORTS) {
+               mux_mode &= ~IOMUX_CONFIG_MPORTS;
+               base = base_mports;
+       } else {
+               base = (void *)IOMUXC_BASE_ADDR;
+       }
+
+       __raw_writel(((mux_mode << IOMUXC_PCR_MUX_ALT_SHIFT) &
+                    IOMUXC_PCR_MUX_ALT_MASK), base + mux_ctrl_ofs);
+
+       if (sel_input_ofs)
+               __raw_writel((sel_input << IOMUXC_PSMI_IMUX_ALT_SHIFT),
+                       base + sel_input_ofs);
+
+       if (!(pad_ctrl & NO_PAD_CTRL))
+               __raw_writel(((mux_mode << IOMUXC_PCR_MUX_ALT_SHIFT) &
+                            IOMUXC_PCR_MUX_ALT_MASK) |
+                            (pad_ctrl & (~IOMUXC_PCR_MUX_ALT_MASK)),
+                            base + pad_ctrl_ofs);
+}
+
+/* configures a list of pads within declared with IOMUX_PADS macro */
+void mx7ulp_iomux_setup_multiple_pads(iomux_cfg_t const *pad_list,
+                                     unsigned count)
+{
+       iomux_cfg_t const *p = pad_list;
+       int i;
+
+       for (i = 0; i < count; i++) {
+               mx7ulp_iomux_setup_pad(*p);
+               p++;
+       }
+}
diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c
new file mode 100644 (file)
index 0000000..edd84e5
--- /dev/null
@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <div64.h>
+#include <asm/io.h>
+#include <errno.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/pcc.h>
+#include <asm/arch/sys_proto.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define PCC_CLKSRC_TYPES 2
+#define PCC_CLKSRC_NUM 7
+
+static enum scg_clk pcc_clksrc[PCC_CLKSRC_TYPES][PCC_CLKSRC_NUM] = {
+       {       SCG_NIC1_BUS_CLK,
+               SCG_NIC1_CLK,
+               SCG_DDR_CLK,
+               SCG_APLL_PFD2_CLK,
+               SCG_APLL_PFD1_CLK,
+               SCG_APLL_PFD0_CLK,
+               USB_PLL_OUT,
+       },
+       {       SCG_SOSC_DIV2_CLK,  /* SOSC BUS clock */
+               MIPI_PLL_OUT,
+               SCG_FIRC_DIV2_CLK,  /* FIRC BUS clock */
+               SCG_ROSC_CLK,
+               SCG_NIC1_BUS_CLK,
+               SCG_NIC1_CLK,
+               SCG_APLL_PFD3_CLK,
+       },
+};
+
+static struct pcc_entry pcc_arrays[] = {
+       {PCC2_RBASE, DMA1_PCC2_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, RGPIO1_PCC2_SLOT,          CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, FLEXBUS0_PCC2_SLOT,        CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, SEMA42_1_PCC2_SLOT,        CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, DMA1_CH_MUX0_PCC2_SLOT,    CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, SNVS_PCC2_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, CAAM_PCC2_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, LPTPM4_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPTPM5_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPIT1_PCC2_SLOT,           CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPSPI2_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPSPI3_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPI2C4_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPI2C5_PCC2_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPUART4_PCC2_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, LPUART5_PCC2_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, FLEXIO1_PCC2_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC2_RBASE, USBOTG0_PCC2_SLOT,         CLKSRC_PER_PLAT, PCC_HAS_DIV},
+       {PCC2_RBASE, USBOTG1_PCC2_SLOT,         CLKSRC_PER_PLAT, PCC_HAS_DIV},
+       {PCC2_RBASE, USBPHY_PCC2_SLOT,          CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, USB_PL301_PCC2_SLOT,       CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC2_RBASE, USDHC0_PCC2_SLOT,          CLKSRC_PER_PLAT, PCC_HAS_DIV},
+       {PCC2_RBASE, USDHC1_PCC2_SLOT,          CLKSRC_PER_PLAT, PCC_HAS_DIV},
+       {PCC2_RBASE, WDG1_PCC2_SLOT,            CLKSRC_PER_BUS, PCC_HAS_DIV},
+       {PCC2_RBASE, WDG2_PCC2_SLOT,            CLKSRC_PER_BUS, PCC_HAS_DIV},
+
+       {PCC3_RBASE, LPTPM6_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC3_RBASE, LPTPM7_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC3_RBASE, LPI2C6_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC3_RBASE, LPI2C7_PCC3_SLOT,          CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC3_RBASE, LPUART6_PCC3_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC3_RBASE, LPUART7_PCC3_SLOT,         CLKSRC_PER_BUS, PCC_NO_DIV},
+       {PCC3_RBASE, VIU0_PCC3_SLOT,            CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC3_RBASE, DSI0_PCC3_SLOT,            CLKSRC_PER_BUS, PCC_HAS_DIV},
+       {PCC3_RBASE, LCDIF0_PCC3_SLOT,          CLKSRC_PER_PLAT, PCC_HAS_DIV},
+       {PCC3_RBASE, MMDC0_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC3_RBASE, PORTC_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC3_RBASE, PORTD_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC3_RBASE, PORTE_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC3_RBASE, PORTF_PCC3_SLOT,           CLKSRC_NO_PCS, PCC_NO_DIV},
+       {PCC3_RBASE, GPU3D_PCC3_SLOT,           CLKSRC_PER_PLAT, PCC_NO_DIV},
+       {PCC3_RBASE, GPU2D_PCC3_SLOT,           CLKSRC_PER_PLAT, PCC_NO_DIV},
+};
+
+int pcc_clock_enable(enum pcc_clk clk, bool enable)
+{
+       u32 reg, val;
+
+       if (clk >= ARRAY_SIZE(pcc_arrays))
+               return -EINVAL;
+
+       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
+
+       val = readl(reg);
+
+       clk_debug("pcc_clock_enable: clk %d, reg 0x%x, val 0x%x, enable %d\n",
+                 clk, reg, val, enable);
+
+       if (!(val & PCC_PR_MASK) || (val & PCC_INUSE_MASK))
+               return -EPERM;
+
+       if (enable)
+               val |= PCC_CGC_MASK;
+       else
+               val &= ~PCC_CGC_MASK;
+
+       writel(val, reg);
+
+       clk_debug("pcc_clock_enable: val 0x%x\n", val);
+
+       return 0;
+}
+
+/* The clock source select needs clock is disabled */
+int pcc_clock_sel(enum pcc_clk clk, enum scg_clk src)
+{
+       u32 reg, val, i, clksrc_type;
+
+       if (clk >= ARRAY_SIZE(pcc_arrays))
+               return -EINVAL;
+
+       clksrc_type = pcc_arrays[clk].clksrc;
+       if (clksrc_type >= CLKSRC_NO_PCS) {
+               printf("No PCS field for the PCC %d, clksrc type %d\n",
+                      clk, clksrc_type);
+               return -EPERM;
+       }
+
+       for (i = 0; i < PCC_CLKSRC_NUM; i++) {
+               if (pcc_clksrc[clksrc_type][i] == src) {
+                       /* Find the clock src, then set it to PCS */
+                       break;
+               }
+       }
+
+       if (i == PCC_CLKSRC_NUM) {
+               printf("Not find the parent scg_clk in PCS of PCC %d, invalid scg_clk %d\n", clk, src);
+               return -EINVAL;
+       }
+
+       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
+
+       val = readl(reg);
+
+       clk_debug("pcc_clock_sel: clk %d, reg 0x%x, val 0x%x, clksrc_type %d\n",
+                 clk, reg, val, clksrc_type);
+
+       if (!(val & PCC_PR_MASK) || (val & PCC_INUSE_MASK) ||
+           (val & PCC_CGC_MASK)) {
+               printf("Not permit to select clock source val = 0x%x\n", val);
+               return -EPERM;
+       }
+
+       val &= ~PCC_PCS_MASK;
+       val |= ((i + 1) << PCC_PCS_OFFSET);
+
+       writel(val, reg);
+
+       clk_debug("pcc_clock_sel: val 0x%x\n", val);
+
+       return 0;
+}
+
+int pcc_clock_div_config(enum pcc_clk clk, bool frac, u8 div)
+{
+       u32 reg, val;
+
+       if (clk >= ARRAY_SIZE(pcc_arrays) || div > 8 ||
+           (div == 1 && frac != 0))
+               return -EINVAL;
+
+       if (pcc_arrays[clk].div >= PCC_NO_DIV) {
+               printf("No DIV/FRAC field for the PCC %d\n", clk);
+               return -EPERM;
+       }
+
+       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
+
+       val = readl(reg);
+
+       if (!(val & PCC_PR_MASK) || (val & PCC_INUSE_MASK) ||
+           (val & PCC_CGC_MASK)) {
+               printf("Not permit to set div/frac val = 0x%x\n", val);
+               return -EPERM;
+       }
+
+       if (frac)
+               val |= PCC_FRAC_MASK;
+       else
+               val &= ~PCC_FRAC_MASK;
+
+       val &= ~PCC_PCD_MASK;
+       val |= (div - 1) & PCC_PCD_MASK;
+
+       writel(val, reg);
+
+       return 0;
+}
+
+bool pcc_clock_is_enable(enum pcc_clk clk)
+{
+       u32 reg, val;
+
+       if (clk >= ARRAY_SIZE(pcc_arrays))
+               return -EINVAL;
+
+       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
+       val = readl(reg);
+
+       if ((val & PCC_INUSE_MASK) || (val & PCC_CGC_MASK))
+               return true;
+
+       return false;
+}
+
+int pcc_clock_get_clksrc(enum pcc_clk clk, enum scg_clk *src)
+{
+       u32 reg, val, clksrc_type;
+
+       if (clk >= ARRAY_SIZE(pcc_arrays))
+               return -EINVAL;
+
+       clksrc_type = pcc_arrays[clk].clksrc;
+       if (clksrc_type >= CLKSRC_NO_PCS) {
+               printf("No PCS field for the PCC %d, clksrc type %d\n",
+                      clk, clksrc_type);
+               return -EPERM;
+       }
+
+       reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
+
+       val = readl(reg);
+
+       clk_debug("pcc_clock_get_clksrc: clk %d, reg 0x%x, val 0x%x, type %d\n",
+                 clk, reg, val, clksrc_type);
+
+       if (!(val & PCC_PR_MASK)) {
+               printf("This pcc slot is not present = 0x%x\n", val);
+               return -EPERM;
+       }
+
+       val &= PCC_PCS_MASK;
+       val = (val >> PCC_PCS_OFFSET);
+
+       if (!val) {
+               printf("Clock source is off\n");
+               return -EIO;
+       }
+
+       *src = pcc_clksrc[clksrc_type][val - 1];
+
+       clk_debug("pcc_clock_get_clksrc: parent scg clk %d\n", *src);
+
+       return 0;
+}
+
+u32 pcc_clock_get_rate(enum pcc_clk clk)
+{
+       u32 reg, val, rate, frac, div;
+       enum scg_clk parent;
+       int ret;
+
+       ret = pcc_clock_get_clksrc(clk, &parent);
+       if (ret)
+               return 0;
+
+       rate = scg_clk_get_rate(parent);
+
+       clk_debug("pcc_clock_get_rate: parent rate %u\n", rate);
+
+       if (pcc_arrays[clk].div == PCC_HAS_DIV) {
+               reg = pcc_arrays[clk].pcc_base + pcc_arrays[clk].pcc_slot * 4;
+               val = readl(reg);
+
+               frac = (val & PCC_FRAC_MASK) >> PCC_FRAC_OFFSET;
+               div = (val & PCC_PCD_MASK) >> PCC_PCD_OFFSET;
+
+               /*
+                * Theoretically don't have overflow in the calc,
+                * the rate won't exceed 2G
+                */
+               rate = rate * (frac + 1) / (div + 1);
+       }
+
+       clk_debug("pcc_clock_get_rate: rate %u\n", rate);
+       return rate;
+}
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c
new file mode 100644 (file)
index 0000000..c117af0
--- /dev/null
@@ -0,0 +1,1090 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <div64.h>
+#include <asm/io.h>
+#include <errno.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/pcc.h>
+#include <asm/arch/sys_proto.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+scg_p scg1_regs = (scg_p)SCG1_RBASE;
+
+static u32 scg_src_get_rate(enum scg_clk clksrc)
+{
+       u32 reg;
+
+       switch (clksrc) {
+       case SCG_SOSC_CLK:
+               reg = readl(&scg1_regs->sosccsr);
+               if (!(reg & SCG_SOSC_CSR_SOSCVLD_MASK))
+                       return 0;
+
+               return 24000000;
+       case SCG_FIRC_CLK:
+               reg = readl(&scg1_regs->firccsr);
+               if (!(reg & SCG_FIRC_CSR_FIRCVLD_MASK))
+                       return 0;
+
+               return 48000000;
+       case SCG_SIRC_CLK:
+               reg = readl(&scg1_regs->sirccsr);
+               if (!(reg & SCG_SIRC_CSR_SIRCVLD_MASK))
+                       return 0;
+
+               return 16000000;
+       case SCG_ROSC_CLK:
+               reg = readl(&scg1_regs->rtccsr);
+               if (!(reg & SCG_ROSC_CSR_ROSCVLD_MASK))
+                       return 0;
+
+               return 32768;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+static u32 scg_sircdiv_get_rate(enum scg_clk clk)
+{
+       u32 reg, val, rate;
+       u32 shift, mask;
+
+       switch (clk) {
+       case SCG_SIRC_DIV1_CLK:
+               mask = SCG_SIRCDIV_DIV1_MASK;
+               shift = SCG_SIRCDIV_DIV1_SHIFT;
+               break;
+       case SCG_SIRC_DIV2_CLK:
+               mask = SCG_SIRCDIV_DIV2_MASK;
+               shift = SCG_SIRCDIV_DIV2_SHIFT;
+               break;
+       case SCG_SIRC_DIV3_CLK:
+               mask = SCG_SIRCDIV_DIV3_MASK;
+               shift = SCG_SIRCDIV_DIV3_SHIFT;
+               break;
+       default:
+               return 0;
+       }
+
+       reg = readl(&scg1_regs->sirccsr);
+       if (!(reg & SCG_SIRC_CSR_SIRCVLD_MASK))
+               return 0;
+
+       reg = readl(&scg1_regs->sircdiv);
+       val = (reg & mask) >> shift;
+
+       if (!val) /*clock disabled*/
+               return 0;
+
+       rate = scg_src_get_rate(SCG_SIRC_CLK);
+       rate = rate / (1 << (val - 1));
+
+       return rate;
+}
+
+static u32 scg_fircdiv_get_rate(enum scg_clk clk)
+{
+       u32 reg, val, rate;
+       u32 shift, mask;
+
+       switch (clk) {
+       case SCG_FIRC_DIV1_CLK:
+               mask = SCG_FIRCDIV_DIV1_MASK;
+               shift = SCG_FIRCDIV_DIV1_SHIFT;
+               break;
+       case SCG_FIRC_DIV2_CLK:
+               mask = SCG_FIRCDIV_DIV2_MASK;
+               shift = SCG_FIRCDIV_DIV2_SHIFT;
+               break;
+       case SCG_FIRC_DIV3_CLK:
+               mask = SCG_FIRCDIV_DIV3_MASK;
+               shift = SCG_FIRCDIV_DIV3_SHIFT;
+               break;
+       default:
+               return 0;
+       }
+
+       reg = readl(&scg1_regs->firccsr);
+       if (!(reg & SCG_FIRC_CSR_FIRCVLD_MASK))
+               return 0;
+
+       reg = readl(&scg1_regs->fircdiv);
+       val = (reg & mask) >> shift;
+
+       if (!val) /*clock disabled*/
+               return 0;
+
+       rate = scg_src_get_rate(SCG_FIRC_CLK);
+       rate = rate / (1 << (val - 1));
+
+       return rate;
+}
+
+static u32 scg_soscdiv_get_rate(enum scg_clk clk)
+{
+       u32 reg, val, rate;
+       u32 shift, mask;
+
+       switch (clk) {
+       case SCG_SOSC_DIV1_CLK:
+               mask = SCG_SOSCDIV_DIV1_MASK;
+               shift = SCG_SOSCDIV_DIV1_SHIFT;
+               break;
+       case SCG_SOSC_DIV2_CLK:
+               mask = SCG_SOSCDIV_DIV2_MASK;
+               shift = SCG_SOSCDIV_DIV2_SHIFT;
+               break;
+       case SCG_SOSC_DIV3_CLK:
+               mask = SCG_SOSCDIV_DIV3_MASK;
+               shift = SCG_SOSCDIV_DIV3_SHIFT;
+               break;
+       default:
+               return 0;
+       }
+
+       reg = readl(&scg1_regs->sosccsr);
+       if (!(reg & SCG_SOSC_CSR_SOSCVLD_MASK))
+               return 0;
+
+       reg = readl(&scg1_regs->soscdiv);
+       val = (reg & mask) >> shift;
+
+       if (!val) /*clock disabled*/
+               return 0;
+
+       rate = scg_src_get_rate(SCG_SOSC_CLK);
+       rate = rate / (1 << (val - 1));
+
+       return rate;
+}
+
+static u32 scg_apll_pfd_get_rate(enum scg_clk clk)
+{
+       u32 reg, val, rate;
+       u32 shift, mask, gate, valid;
+
+       switch (clk) {
+       case SCG_APLL_PFD0_CLK:
+               gate = SCG_PLL_PFD0_GATE_MASK;
+               valid = SCG_PLL_PFD0_VALID_MASK;
+               mask = SCG_PLL_PFD0_FRAC_MASK;
+               shift = SCG_PLL_PFD0_FRAC_SHIFT;
+               break;
+       case SCG_APLL_PFD1_CLK:
+               gate = SCG_PLL_PFD1_GATE_MASK;
+               valid = SCG_PLL_PFD1_VALID_MASK;
+               mask = SCG_PLL_PFD1_FRAC_MASK;
+               shift = SCG_PLL_PFD1_FRAC_SHIFT;
+               break;
+       case SCG_APLL_PFD2_CLK:
+               gate = SCG_PLL_PFD2_GATE_MASK;
+               valid = SCG_PLL_PFD2_VALID_MASK;
+               mask = SCG_PLL_PFD2_FRAC_MASK;
+               shift = SCG_PLL_PFD2_FRAC_SHIFT;
+               break;
+       case SCG_APLL_PFD3_CLK:
+               gate = SCG_PLL_PFD3_GATE_MASK;
+               valid = SCG_PLL_PFD3_VALID_MASK;
+               mask = SCG_PLL_PFD3_FRAC_MASK;
+               shift = SCG_PLL_PFD3_FRAC_SHIFT;
+               break;
+       default:
+               return 0;
+       }
+
+       reg = readl(&scg1_regs->apllpfd);
+       if (reg & gate || !(reg & valid))
+               return 0;
+
+       clk_debug("scg_apll_pfd_get_rate reg 0x%x\n", reg);
+
+       val = (reg & mask) >> shift;
+       rate = decode_pll(PLL_A7_APLL);
+
+       rate = rate / val * 18;
+
+       clk_debug("scg_apll_pfd_get_rate rate %u\n", rate);
+
+       return rate;
+}
+
+static u32 scg_spll_pfd_get_rate(enum scg_clk clk)
+{
+       u32 reg, val, rate;
+       u32 shift, mask, gate, valid;
+
+       switch (clk) {
+       case SCG_SPLL_PFD0_CLK:
+               gate = SCG_PLL_PFD0_GATE_MASK;
+               valid = SCG_PLL_PFD0_VALID_MASK;
+               mask = SCG_PLL_PFD0_FRAC_MASK;
+               shift = SCG_PLL_PFD0_FRAC_SHIFT;
+               break;
+       case SCG_SPLL_PFD1_CLK:
+               gate = SCG_PLL_PFD1_GATE_MASK;
+               valid = SCG_PLL_PFD1_VALID_MASK;
+               mask = SCG_PLL_PFD1_FRAC_MASK;
+               shift = SCG_PLL_PFD1_FRAC_SHIFT;
+               break;
+       case SCG_SPLL_PFD2_CLK:
+               gate = SCG_PLL_PFD2_GATE_MASK;
+               valid = SCG_PLL_PFD2_VALID_MASK;
+               mask = SCG_PLL_PFD2_FRAC_MASK;
+               shift = SCG_PLL_PFD2_FRAC_SHIFT;
+               break;
+       case SCG_SPLL_PFD3_CLK:
+               gate = SCG_PLL_PFD3_GATE_MASK;
+               valid = SCG_PLL_PFD3_VALID_MASK;
+               mask = SCG_PLL_PFD3_FRAC_MASK;
+               shift = SCG_PLL_PFD3_FRAC_SHIFT;
+               break;
+       default:
+               return 0;
+       }
+
+       reg = readl(&scg1_regs->spllpfd);
+       if (reg & gate || !(reg & valid))
+               return 0;
+
+       clk_debug("scg_spll_pfd_get_rate reg 0x%x\n", reg);
+
+       val = (reg & mask) >> shift;
+       rate = decode_pll(PLL_A7_SPLL);
+
+       rate = rate / val * 18;
+
+       clk_debug("scg_spll_pfd_get_rate rate %u\n", rate);
+
+       return rate;
+}
+
+static u32 scg_apll_get_rate(void)
+{
+       u32 reg, val, rate;
+
+       reg = readl(&scg1_regs->apllcfg);
+       val = (reg & SCG_PLL_CFG_PLLSEL_MASK) >> SCG_PLL_CFG_PLLSEL_SHIFT;
+
+       if (!val) {
+               /* APLL clock after two dividers */
+               rate = decode_pll(PLL_A7_APLL);
+
+               val = (reg & SCG_PLL_CFG_POSTDIV1_MASK) >>
+                       SCG_PLL_CFG_POSTDIV1_SHIFT;
+               rate = rate / (val + 1);
+
+               val = (reg & SCG_PLL_CFG_POSTDIV2_MASK) >>
+                       SCG_PLL_CFG_POSTDIV2_SHIFT;
+               rate = rate / (val + 1);
+       } else {
+               /* APLL PFD clock */
+               val = (reg & SCG_PLL_CFG_PFDSEL_MASK) >>
+                       SCG_PLL_CFG_PFDSEL_SHIFT;
+               rate = scg_apll_pfd_get_rate(SCG_APLL_PFD0_CLK + val);
+       }
+
+       return rate;
+}
+
+static u32 scg_spll_get_rate(void)
+{
+       u32 reg, val, rate;
+
+       reg = readl(&scg1_regs->spllcfg);
+       val = (reg & SCG_PLL_CFG_PLLSEL_MASK) >> SCG_PLL_CFG_PLLSEL_SHIFT;
+
+       clk_debug("scg_spll_get_rate reg 0x%x\n", reg);
+
+       if (!val) {
+               /* APLL clock after two dividers */
+               rate = decode_pll(PLL_A7_SPLL);
+
+               val = (reg & SCG_PLL_CFG_POSTDIV1_MASK) >>
+                       SCG_PLL_CFG_POSTDIV1_SHIFT;
+               rate = rate / (val + 1);
+
+               val = (reg & SCG_PLL_CFG_POSTDIV2_MASK) >>
+                       SCG_PLL_CFG_POSTDIV2_SHIFT;
+               rate = rate / (val + 1);
+
+               clk_debug("scg_spll_get_rate SPLL %u\n", rate);
+
+       } else {
+               /* APLL PFD clock */
+               val = (reg & SCG_PLL_CFG_PFDSEL_MASK) >>
+                       SCG_PLL_CFG_PFDSEL_SHIFT;
+               rate = scg_spll_pfd_get_rate(SCG_SPLL_PFD0_CLK + val);
+
+               clk_debug("scg_spll_get_rate PFD %u\n", rate);
+       }
+
+       return rate;
+}
+
+static u32 scg_ddr_get_rate(void)
+{
+       u32 reg, val, rate, div;
+
+       reg = readl(&scg1_regs->ddrccr);
+       val = (reg & SCG_DDRCCR_DDRCS_MASK) >> SCG_DDRCCR_DDRCS_SHIFT;
+       div = (reg & SCG_DDRCCR_DDRDIV_MASK) >> SCG_DDRCCR_DDRDIV_SHIFT;
+
+       if (!div)
+               return 0;
+
+       if (!val) {
+               reg = readl(&scg1_regs->apllcfg);
+               val = (reg & SCG_PLL_CFG_PFDSEL_MASK) >>
+                       SCG_PLL_CFG_PFDSEL_SHIFT;
+               rate = scg_apll_pfd_get_rate(SCG_APLL_PFD0_CLK + val);
+       } else {
+               rate = decode_pll(PLL_USB);
+       }
+
+       rate = rate / (1 << (div - 1));
+       return rate;
+}
+
+static u32 scg_nic_get_rate(enum scg_clk clk)
+{
+       u32 reg, val, rate;
+       u32 shift, mask;
+
+       reg = readl(&scg1_regs->niccsr);
+       val = (reg & SCG_NICCSR_NICCS_MASK) >> SCG_NICCSR_NICCS_SHIFT;
+
+       clk_debug("scg_nic_get_rate niccsr 0x%x\n", reg);
+
+       if (!val)
+               rate = scg_src_get_rate(SCG_FIRC_CLK);
+       else
+               rate = scg_ddr_get_rate();
+
+       clk_debug("scg_nic_get_rate parent rate %u\n", rate);
+
+       val = (reg & SCG_NICCSR_NIC0DIV_MASK) >> SCG_NICCSR_NIC0DIV_SHIFT;
+
+       rate = rate / (val + 1);
+
+       clk_debug("scg_nic_get_rate NIC0 rate %u\n", rate);
+
+       switch (clk) {
+       case SCG_NIC0_CLK:
+               return rate;
+       case SCG_GPU_CLK:
+               mask = SCG_NICCSR_GPUDIV_MASK;
+               shift = SCG_NICCSR_GPUDIV_SHIFT;
+               break;
+       case SCG_NIC1_EXT_CLK:
+       case SCG_NIC1_BUS_CLK:
+       case SCG_NIC1_CLK:
+               mask = SCG_NICCSR_NIC1DIV_MASK;
+               shift = SCG_NICCSR_NIC1DIV_SHIFT;
+               break;
+       default:
+               return 0;
+       }
+
+       val = (reg & mask) >> shift;
+       rate = rate / (val + 1);
+
+       clk_debug("scg_nic_get_rate NIC1 rate %u\n", rate);
+
+       switch (clk) {
+       case SCG_GPU_CLK:
+       case SCG_NIC1_CLK:
+               return rate;
+       case SCG_NIC1_EXT_CLK:
+               mask = SCG_NICCSR_NIC1EXTDIV_MASK;
+               shift = SCG_NICCSR_NIC1EXTDIV_SHIFT;
+               break;
+       case SCG_NIC1_BUS_CLK:
+               mask = SCG_NICCSR_NIC1BUSDIV_MASK;
+               shift = SCG_NICCSR_NIC1BUSDIV_SHIFT;
+               break;
+       default:
+               return 0;
+       }
+
+       val = (reg & mask) >> shift;
+       rate = rate / (val + 1);
+
+       clk_debug("scg_nic_get_rate NIC1 bus rate %u\n", rate);
+       return rate;
+}
+
+
+static enum scg_clk scg_scs_array[4] = {
+       SCG_SOSC_CLK, SCG_SIRC_CLK, SCG_FIRC_CLK, SCG_ROSC_CLK,
+};
+
+static u32 scg_sys_get_rate(enum scg_clk clk)
+{
+       u32 reg, val, rate;
+
+       if (clk != SCG_CORE_CLK && clk != SCG_BUS_CLK)
+               return 0;
+
+       reg = readl(&scg1_regs->csr);
+       val = (reg & SCG_CCR_SCS_MASK) >> SCG_CCR_SCS_SHIFT;
+
+       clk_debug("scg_sys_get_rate reg 0x%x\n", reg);
+
+       switch (val) {
+       case SCG_SCS_SYS_OSC:
+       case SCG_SCS_SLOW_IRC:
+       case SCG_SCS_FAST_IRC:
+       case SCG_SCS_RTC_OSC:
+               rate = scg_src_get_rate(scg_scs_array[val]);
+               break;
+       case 5:
+               rate = scg_apll_get_rate();
+               break;
+       case 6:
+               rate = scg_spll_get_rate();
+               break;
+       default:
+               return 0;
+       }
+
+       clk_debug("scg_sys_get_rate parent rate %u\n", rate);
+
+       val = (reg & SCG_CCR_DIVCORE_MASK) >> SCG_CCR_DIVCORE_SHIFT;
+
+       rate = rate / (val + 1);
+
+       if (clk == SCG_BUS_CLK) {
+               val = (reg & SCG_CCR_DIVBUS_MASK) >> SCG_CCR_DIVBUS_SHIFT;
+               rate = rate / (val + 1);
+       }
+
+       return rate;
+}
+
+u32 decode_pll(enum pll_clocks pll)
+{
+       u32 reg,  pre_div, infreq, mult;
+       u32 num, denom;
+
+       /*
+        * Alought there are four choices for the bypass src,
+        * we choose OSC_24M which is the default set in ROM.
+        */
+       switch (pll) {
+       case PLL_A7_SPLL:
+               reg = readl(&scg1_regs->spllcsr);
+
+               if (!(reg & SCG_SPLL_CSR_SPLLVLD_MASK))
+                       return 0;
+
+               reg = readl(&scg1_regs->spllcfg);
+
+               pre_div = (reg & SCG_PLL_CFG_PREDIV_MASK) >>
+                          SCG_PLL_CFG_PREDIV_SHIFT;
+               pre_div += 1;
+
+               mult = (reg & SCG1_SPLL_CFG_MULT_MASK) >>
+                          SCG_PLL_CFG_MULT_SHIFT;
+
+               infreq = (reg & SCG_PLL_CFG_CLKSRC_MASK) >>
+                          SCG_PLL_CFG_CLKSRC_SHIFT;
+               if (!infreq)
+                       infreq = scg_src_get_rate(SCG_SOSC_CLK);
+               else
+                       infreq = scg_src_get_rate(SCG_FIRC_CLK);
+
+               num = readl(&scg1_regs->spllnum);
+               denom = readl(&scg1_regs->splldenom);
+
+               infreq = infreq / pre_div;
+
+               return infreq * mult + infreq * num / denom;
+
+       case PLL_A7_APLL:
+               reg = readl(&scg1_regs->apllcsr);
+
+               if (!(reg & SCG_APLL_CSR_APLLVLD_MASK))
+                       return 0;
+
+               reg = readl(&scg1_regs->apllcfg);
+
+               pre_div = (reg & SCG_PLL_CFG_PREDIV_MASK) >>
+                          SCG_PLL_CFG_PREDIV_SHIFT;
+               pre_div += 1;
+
+               mult = (reg & SCG_APLL_CFG_MULT_MASK) >>
+                          SCG_PLL_CFG_MULT_SHIFT;
+
+               infreq = (reg & SCG_PLL_CFG_CLKSRC_MASK) >>
+                          SCG_PLL_CFG_CLKSRC_SHIFT;
+               if (!infreq)
+                       infreq = scg_src_get_rate(SCG_SOSC_CLK);
+               else
+                       infreq = scg_src_get_rate(SCG_FIRC_CLK);
+
+               num = readl(&scg1_regs->apllnum);
+               denom = readl(&scg1_regs->aplldenom);
+
+               infreq = infreq / pre_div;
+
+               return infreq * mult + infreq * num / denom;
+
+       case PLL_USB:
+               reg = readl(&scg1_regs->upllcsr);
+
+               if (!(reg & SCG_UPLL_CSR_UPLLVLD_MASK))
+                       return 0;
+
+               return 480000000u;
+
+       case PLL_MIPI:
+               return 480000000u;
+       default:
+               printf("Unsupported pll clocks %d\n", pll);
+               break;
+       }
+
+       return 0;
+}
+
+u32 scg_clk_get_rate(enum scg_clk clk)
+{
+       switch (clk) {
+       case SCG_SIRC_DIV1_CLK:
+       case SCG_SIRC_DIV2_CLK:
+       case SCG_SIRC_DIV3_CLK:
+               return scg_sircdiv_get_rate(clk);
+
+       case SCG_FIRC_DIV1_CLK:
+       case SCG_FIRC_DIV2_CLK:
+       case SCG_FIRC_DIV3_CLK:
+               return scg_fircdiv_get_rate(clk);
+
+       case SCG_SOSC_DIV1_CLK:
+       case SCG_SOSC_DIV2_CLK:
+       case SCG_SOSC_DIV3_CLK:
+               return scg_soscdiv_get_rate(clk);
+
+       case SCG_CORE_CLK:
+       case SCG_BUS_CLK:
+               return scg_sys_get_rate(clk);
+
+       case SCG_SPLL_PFD0_CLK:
+       case SCG_SPLL_PFD1_CLK:
+       case SCG_SPLL_PFD2_CLK:
+       case SCG_SPLL_PFD3_CLK:
+               return scg_spll_pfd_get_rate(clk);
+
+       case SCG_APLL_PFD0_CLK:
+       case SCG_APLL_PFD1_CLK:
+       case SCG_APLL_PFD2_CLK:
+       case SCG_APLL_PFD3_CLK:
+               return scg_apll_pfd_get_rate(clk);
+
+       case SCG_DDR_CLK:
+               return scg_ddr_get_rate();
+
+       case SCG_NIC0_CLK:
+       case SCG_GPU_CLK:
+       case SCG_NIC1_CLK:
+       case SCG_NIC1_BUS_CLK:
+       case SCG_NIC1_EXT_CLK:
+               return scg_nic_get_rate(clk);
+
+       case USB_PLL_OUT:
+               return decode_pll(PLL_USB);
+
+       case MIPI_PLL_OUT:
+               return decode_pll(PLL_MIPI);
+
+       case SCG_SOSC_CLK:
+       case SCG_FIRC_CLK:
+       case SCG_SIRC_CLK:
+       case SCG_ROSC_CLK:
+               return scg_src_get_rate(clk);
+       default:
+               return 0;
+       }
+}
+
+int scg_enable_pll_pfd(enum scg_clk clk, u32 frac)
+{
+       u32 reg;
+       u32 shift, mask, gate, valid;
+       u32 addr;
+
+       if (frac < 12 || frac > 35)
+               return -EINVAL;
+
+       switch (clk) {
+       case SCG_SPLL_PFD0_CLK:
+       case SCG_APLL_PFD0_CLK:
+               gate = SCG_PLL_PFD0_GATE_MASK;
+               valid = SCG_PLL_PFD0_VALID_MASK;
+               mask = SCG_PLL_PFD0_FRAC_MASK;
+               shift = SCG_PLL_PFD0_FRAC_SHIFT;
+
+               if (clk == SCG_SPLL_PFD0_CLK)
+                       addr = (u32)(&scg1_regs->spllpfd);
+               else
+                       addr = (u32)(&scg1_regs->apllpfd);
+               break;
+       case SCG_SPLL_PFD1_CLK:
+       case SCG_APLL_PFD1_CLK:
+               gate = SCG_PLL_PFD1_GATE_MASK;
+               valid = SCG_PLL_PFD1_VALID_MASK;
+               mask = SCG_PLL_PFD1_FRAC_MASK;
+               shift = SCG_PLL_PFD1_FRAC_SHIFT;
+
+               if (clk == SCG_SPLL_PFD1_CLK)
+                       addr = (u32)(&scg1_regs->spllpfd);
+               else
+                       addr = (u32)(&scg1_regs->apllpfd);
+               break;
+       case SCG_SPLL_PFD2_CLK:
+       case SCG_APLL_PFD2_CLK:
+               gate = SCG_PLL_PFD2_GATE_MASK;
+               valid = SCG_PLL_PFD2_VALID_MASK;
+               mask = SCG_PLL_PFD2_FRAC_MASK;
+               shift = SCG_PLL_PFD2_FRAC_SHIFT;
+
+               if (clk == SCG_SPLL_PFD2_CLK)
+                       addr = (u32)(&scg1_regs->spllpfd);
+               else
+                       addr = (u32)(&scg1_regs->apllpfd);
+               break;
+       case SCG_SPLL_PFD3_CLK:
+       case SCG_APLL_PFD3_CLK:
+               gate = SCG_PLL_PFD3_GATE_MASK;
+               valid = SCG_PLL_PFD3_VALID_MASK;
+               mask = SCG_PLL_PFD3_FRAC_MASK;
+               shift = SCG_PLL_PFD3_FRAC_SHIFT;
+
+               if (clk == SCG_SPLL_PFD3_CLK)
+                       addr = (u32)(&scg1_regs->spllpfd);
+               else
+                       addr = (u32)(&scg1_regs->apllpfd);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       /* Gate the PFD */
+       reg = readl(addr);
+       reg |= gate;
+       writel(reg, addr);
+
+       /* Write Frac divider */
+       reg &= ~mask;
+       reg |= (frac << shift) & mask;
+       writel(reg, addr);
+
+       /*
+        * Un-gate the PFD
+        * (Need un-gate before checking valid, not align with RM)
+        */
+       reg &= ~gate;
+       writel(reg, addr);
+
+       /* Wait for PFD clock being valid */
+       do {
+               reg = readl(addr);
+       } while (!(reg & valid));
+
+       return 0;
+}
+
+#define SIM_MISC_CTRL0_USB_PLL_EN_MASK (0x1 << 2)
+int scg_enable_usb_pll(bool usb_control)
+{
+       u32 sosc_rate;
+       s32 timeout = 1000000;
+       u32 reg;
+
+       struct usbphy_regs *usbphy =
+               (struct usbphy_regs *)USBPHY_RBASE;
+
+       sosc_rate = scg_src_get_rate(SCG_SOSC_CLK);
+       if (!sosc_rate)
+               return -EPERM;
+
+       reg = readl(SIM0_RBASE + 0x3C);
+       if (usb_control)
+               reg &= ~SIM_MISC_CTRL0_USB_PLL_EN_MASK;
+       else
+               reg |= SIM_MISC_CTRL0_USB_PLL_EN_MASK;
+       writel(reg, SIM0_RBASE + 0x3C);
+
+       if (!(readl(&usbphy->usb1_pll_480_ctrl) & PLL_USB_LOCK_MASK)) {
+               writel(0x1c00000, &usbphy->usb1_pll_480_ctrl_clr);
+
+               switch (sosc_rate) {
+               case 24000000:
+                       writel(0xc00000, &usbphy->usb1_pll_480_ctrl_set);
+                       break;
+
+               case 30000000:
+                       writel(0x800000, &usbphy->usb1_pll_480_ctrl_set);
+                       break;
+
+               case 19200000:
+                       writel(0x1400000, &usbphy->usb1_pll_480_ctrl_set);
+                       break;
+
+               default:
+                       writel(0xc00000, &usbphy->usb1_pll_480_ctrl_set);
+                       break;
+               }
+
+               /* Enable the regulator first */
+               writel(PLL_USB_REG_ENABLE_MASK,
+                      &usbphy->usb1_pll_480_ctrl_set);
+
+               /* Wait at least 15us */
+               udelay(15);
+
+               /* Enable the power */
+               writel(PLL_USB_PWR_MASK, &usbphy->usb1_pll_480_ctrl_set);
+
+               /* Wait lock */
+               while (timeout--) {
+                       if (readl(&usbphy->usb1_pll_480_ctrl) &
+                           PLL_USB_LOCK_MASK)
+                               break;
+               }
+
+               if (timeout <= 0) {
+                       /* If timeout, we power down the pll */
+                       writel(PLL_USB_PWR_MASK,
+                              &usbphy->usb1_pll_480_ctrl_clr);
+                       return -ETIME;
+               }
+       }
+
+       /* Clear the bypass */
+       writel(PLL_USB_BYPASS_MASK, &usbphy->usb1_pll_480_ctrl_clr);
+
+       /* Enable the PLL clock out to USB */
+       writel((PLL_USB_EN_USB_CLKS_MASK | PLL_USB_ENABLE_MASK),
+              &usbphy->usb1_pll_480_ctrl_set);
+
+       if (!usb_control) {
+               while (timeout--) {
+                       if (readl(&scg1_regs->upllcsr) &
+                           SCG_UPLL_CSR_UPLLVLD_MASK)
+                               break;
+               }
+
+               if (timeout <= 0) {
+                       reg = readl(SIM0_RBASE + 0x3C);
+                       reg &= ~SIM_MISC_CTRL0_USB_PLL_EN_MASK;
+                       writel(reg, SIM0_RBASE + 0x3C);
+                       return -ETIME;
+               }
+       }
+
+       return 0;
+}
+
+
+/* A7 domain system clock source is SPLL */
+#define SCG1_RCCR_SCS_NUM      ((SCG_SCS_SYS_PLL) << SCG_CCR_SCS_SHIFT)
+
+/* A7 Core clck = SPLL PFD0 / 1 = 500MHz / 1 = 500MHz */
+#define SCG1_RCCR_DIVCORE_NUM  ((0x0)  << SCG_CCR_DIVCORE_SHIFT)
+#define SCG1_RCCR_CFG_MASK     (SCG_CCR_SCS_MASK | SCG_CCR_DIVBUS_MASK)
+
+/* A7 Plat clck = A7 Core Clock / 2 = 250MHz / 1 = 250MHz */
+#define SCG1_RCCR_DIVBUS_NUM   ((0x1)  << SCG_CCR_DIVBUS_SHIFT)
+#define SCG1_RCCR_CFG_NUM      (SCG1_RCCR_SCS_NUM | SCG1_RCCR_DIVBUS_NUM)
+
+void scg_a7_rccr_init(void)
+{
+       u32 rccr_reg_val = 0;
+
+       rccr_reg_val = readl(&scg1_regs->rccr);
+
+       rccr_reg_val &= (~SCG1_RCCR_CFG_MASK);
+       rccr_reg_val |= (SCG1_RCCR_CFG_NUM);
+
+       writel(rccr_reg_val, &scg1_regs->rccr);
+}
+
+/* POSTDIV2 = 1 */
+#define SCG1_SPLL_CFG_POSTDIV2_NUM     ((0x0)  << SCG_PLL_CFG_POSTDIV2_SHIFT)
+/* POSTDIV1 = 1 */
+#define SCG1_SPLL_CFG_POSTDIV1_NUM     ((0x0)  << SCG_PLL_CFG_POSTDIV1_SHIFT)
+
+/* MULT = 22 */
+#define SCG1_SPLL_CFG_MULT_NUM         ((22)   << SCG_PLL_CFG_MULT_SHIFT)
+
+/* PFD0 output clock selected */
+#define SCG1_SPLL_CFG_PFDSEL_NUM       ((0) << SCG_PLL_CFG_PFDSEL_SHIFT)
+/* PREDIV = 1 */
+#define SCG1_SPLL_CFG_PREDIV_NUM       ((0x0)  << SCG_PLL_CFG_PREDIV_SHIFT)
+/* SPLL output clocks (including PFD outputs) selected */
+#define SCG1_SPLL_CFG_BYPASS_NUM       ((0x0)  << SCG_PLL_CFG_BYPASS_SHIFT)
+/* SPLL PFD output clock selected */
+#define SCG1_SPLL_CFG_PLLSEL_NUM       ((0x1)  << SCG_PLL_CFG_PLLSEL_SHIFT)
+/* Clock source is System OSC */
+#define SCG1_SPLL_CFG_CLKSRC_NUM       ((0x0)  << SCG_PLL_CFG_CLKSRC_SHIFT)
+#define SCG1_SPLL_CFG_NUM_24M_OSC      (SCG1_SPLL_CFG_POSTDIV2_NUM     | \
+                                        SCG1_SPLL_CFG_POSTDIV1_NUM     | \
+                                        (22 << SCG_PLL_CFG_MULT_SHIFT) | \
+                                        SCG1_SPLL_CFG_PFDSEL_NUM       | \
+                                        SCG1_SPLL_CFG_PREDIV_NUM       | \
+                                        SCG1_SPLL_CFG_BYPASS_NUM       | \
+                                        SCG1_SPLL_CFG_PLLSEL_NUM       | \
+                                        SCG1_SPLL_CFG_CLKSRC_NUM)
+/*413Mhz = A7 SPLL(528MHz) * 18/23 */
+#define SCG1_SPLL_PFD0_FRAC_NUM                ((23) << SCG_PLL_PFD0_FRAC_SHIFT)
+
+void scg_a7_spll_init(void)
+{
+       u32 val = 0;
+
+       /* Disable A7 System PLL */
+       val = readl(&scg1_regs->spllcsr);
+       val &= ~SCG_SPLL_CSR_SPLLEN_MASK;
+       writel(val, &scg1_regs->spllcsr);
+
+       /*
+        * Per block guide,
+        * "When changing PFD values, it is recommneded PFDx clock
+        * gets gated first by writing a value of 1 to PFDx_CLKGATE register,
+        * then program the new PFD value, then poll the PFDx_VALID
+        * flag to set before writing a value of 0 to PFDx_CLKGATE
+        * to ungate the PFDx clock and allow PFDx clock to run"
+        */
+
+       /* Gate off A7 SPLL PFD0 ~ PDF4  */
+       val = readl(&scg1_regs->spllpfd);
+       val |= (SCG_PLL_PFD3_GATE_MASK |
+                       SCG_PLL_PFD2_GATE_MASK |
+                       SCG_PLL_PFD1_GATE_MASK |
+                       SCG_PLL_PFD0_GATE_MASK);
+       writel(val, &scg1_regs->spllpfd);
+
+       /* ================ A7 SPLL Configuration Start ============== */
+
+       /* Configure A7 System PLL */
+       writel(SCG1_SPLL_CFG_NUM_24M_OSC, &scg1_regs->spllcfg);
+
+       /* Enable A7 System PLL */
+       val = readl(&scg1_regs->spllcsr);
+       val |= SCG_SPLL_CSR_SPLLEN_MASK;
+       writel(val, &scg1_regs->spllcsr);
+
+       /* Wait for A7 SPLL clock ready */
+       while (!(readl(&scg1_regs->spllcsr) & SCG_SPLL_CSR_SPLLVLD_MASK))
+               ;
+
+       /* Configure A7 SPLL PFD0 */
+       val = readl(&scg1_regs->spllpfd);
+       val &= ~SCG_PLL_PFD0_FRAC_MASK;
+       val |= SCG1_SPLL_PFD0_FRAC_NUM;
+       writel(val, &scg1_regs->spllpfd);
+
+       /* Un-gate A7 SPLL PFD0 */
+       val = readl(&scg1_regs->spllpfd);
+       val &= ~SCG_PLL_PFD0_GATE_MASK;
+       writel(val, &scg1_regs->spllpfd);
+
+       /* Wait for A7 SPLL PFD0 clock being valid */
+       while (!(readl(&scg1_regs->spllpfd) & SCG_PLL_PFD0_VALID_MASK))
+               ;
+
+       /* ================ A7 SPLL Configuration End ============== */
+}
+
+/* DDR clock source is APLL PFD0 (396MHz) */
+#define SCG1_DDRCCR_DDRCS_NUM          ((0x0) << SCG_DDRCCR_DDRCS_SHIFT)
+/* DDR clock = APLL PFD0 / 1 = 396MHz / 1 = 396MHz */
+#define SCG1_DDRCCR_DDRDIV_NUM         ((0x1) << SCG_DDRCCR_DDRDIV_SHIFT)
+/* DDR clock = APLL PFD0 / 2 = 396MHz / 2 = 198MHz */
+#define SCG1_DDRCCR_DDRDIV_LF_NUM      ((0x2) << SCG_DDRCCR_DDRDIV_SHIFT)
+#define SCG1_DDRCCR_CFG_NUM            (SCG1_DDRCCR_DDRCS_NUM  | \
+                                        SCG1_DDRCCR_DDRDIV_NUM)
+#define SCG1_DDRCCR_CFG_LF_NUM         (SCG1_DDRCCR_DDRCS_NUM  | \
+                                        SCG1_DDRCCR_DDRDIV_LF_NUM)
+void scg_a7_ddrclk_init(void)
+{
+       writel(SCG1_DDRCCR_CFG_NUM, &scg1_regs->ddrccr);
+}
+
+/* SCG1(A7) APLLCFG configurations */
+/* divide by 1 <<28 */
+#define SCG1_APLL_CFG_POSTDIV2_NUM      ((0x0) << SCG_PLL_CFG_POSTDIV2_SHIFT)
+/* divide by 1 <<24 */
+#define SCG1_APLL_CFG_POSTDIV1_NUM      ((0x0) << SCG_PLL_CFG_POSTDIV1_SHIFT)
+/* MULT is 22  <<16 */
+#define SCG1_APLL_CFG_MULT_NUM          ((22)  << SCG_PLL_CFG_MULT_SHIFT)
+/* PFD0 output clock selected  <<14 */
+#define SCG1_APLL_CFG_PFDSEL_NUM        ((0) << SCG_PLL_CFG_PFDSEL_SHIFT)
+/* PREDIV = 1  <<8 */
+#define SCG1_APLL_CFG_PREDIV_NUM        ((0x0) << SCG_PLL_CFG_PREDIV_SHIFT)
+/* APLL output clocks (including PFD outputs) selected <<2 */
+#define SCG1_APLL_CFG_BYPASS_NUM        ((0x0) << SCG_PLL_CFG_BYPASS_SHIFT)
+/* APLL PFD output clock selected <<1 */
+#define SCG1_APLL_CFG_PLLSEL_NUM        ((0x0) << SCG_PLL_CFG_PLLSEL_SHIFT)
+/* Clock source is System OSC <<0 */
+#define SCG1_APLL_CFG_CLKSRC_NUM        ((0x0) << SCG_PLL_CFG_CLKSRC_SHIFT)
+
+/*
+ * A7 APLL = 24MHz / 1 * 22 / 1 / 1 = 528MHz,
+ * system PLL is sourced from APLL,
+ * APLL clock source is system OSC (24MHz)
+ */
+#define SCG1_APLL_CFG_NUM_24M_OSC (SCG1_APLL_CFG_POSTDIV2_NUM     |   \
+                                  SCG1_APLL_CFG_POSTDIV1_NUM     |   \
+                                  (22 << SCG_PLL_CFG_MULT_SHIFT) |   \
+                                  SCG1_APLL_CFG_PFDSEL_NUM       |   \
+                                  SCG1_APLL_CFG_PREDIV_NUM       |   \
+                                  SCG1_APLL_CFG_BYPASS_NUM       |   \
+                                  SCG1_APLL_CFG_PLLSEL_NUM       |   \
+                                  SCG1_APLL_CFG_CLKSRC_NUM)
+
+/* PFD0 Freq = A7 APLL(528MHz) * 18 / 27 = 352MHz */
+#define SCG1_APLL_PFD0_FRAC_NUM (27)
+
+
+void scg_a7_apll_init(void)
+{
+       u32 val = 0;
+
+       /* Disable A7 Auxiliary PLL */
+       val = readl(&scg1_regs->apllcsr);
+       val &= ~SCG_APLL_CSR_APLLEN_MASK;
+       writel(val, &scg1_regs->apllcsr);
+
+       /* Gate off A7 APLL PFD0 ~ PDF4  */
+       val = readl(&scg1_regs->apllpfd);
+       val |= 0x80808080;
+       writel(val, &scg1_regs->apllpfd);
+
+       /* ================ A7 APLL Configuration Start ============== */
+       /* Configure A7 Auxiliary PLL */
+       writel(SCG1_APLL_CFG_NUM_24M_OSC, &scg1_regs->apllcfg);
+
+       /* Enable A7 Auxiliary PLL */
+       val = readl(&scg1_regs->apllcsr);
+       val |= SCG_APLL_CSR_APLLEN_MASK;
+       writel(val, &scg1_regs->apllcsr);
+
+       /* Wait for A7 APLL clock ready */
+       while (!(readl(&scg1_regs->apllcsr) & SCG_APLL_CSR_APLLVLD_MASK))
+               ;
+
+       /* Configure A7 APLL PFD0 */
+       val = readl(&scg1_regs->apllpfd);
+       val &= ~SCG_PLL_PFD0_FRAC_MASK;
+       val |= SCG1_APLL_PFD0_FRAC_NUM;
+       writel(val, &scg1_regs->apllpfd);
+
+       /* Un-gate A7 APLL PFD0 */
+       val = readl(&scg1_regs->apllpfd);
+       val &= ~SCG_PLL_PFD0_GATE_MASK;
+       writel(val, &scg1_regs->apllpfd);
+
+       /* Wait for A7 APLL PFD0 clock being valid */
+       while (!(readl(&scg1_regs->apllpfd) & SCG_PLL_PFD0_VALID_MASK))
+               ;
+}
+
+/* SCG1(A7) FIRC DIV configurations */
+/* Disable FIRC DIV3 */
+#define SCG1_FIRCDIV_DIV3_NUM           ((0x0) << SCG_FIRCDIV_DIV3_SHIFT)
+/* FIRC DIV2 = 48MHz / 1 = 48MHz */
+#define SCG1_FIRCDIV_DIV2_NUM           ((0x1) << SCG_FIRCDIV_DIV2_SHIFT)
+/* Disable FIRC DIV1 */
+#define SCG1_FIRCDIV_DIV1_NUM           ((0x0) << SCG_FIRCDIV_DIV1_SHIFT)
+
+void scg_a7_firc_init(void)
+{
+       /* Wait for FIRC clock ready */
+       while (!(readl(&scg1_regs->firccsr) & SCG_FIRC_CSR_FIRCVLD_MASK))
+               ;
+
+       /* Configure A7 FIRC DIV1 ~ DIV3 */
+       writel((SCG1_FIRCDIV_DIV3_NUM |
+                       SCG1_FIRCDIV_DIV2_NUM |
+                       SCG1_FIRCDIV_DIV1_NUM), &scg1_regs->fircdiv);
+}
+
+/* SCG1(A7) NICCCR configurations */
+/* NIC clock source is DDR clock (396/198MHz) */
+#define SCG1_NICCCR_NICCS_NUM          ((0x1) << SCG_NICCCR_NICCS_SHIFT)
+
+/* NIC0 clock = DDR Clock / 2 = 396MHz / 2 = 198MHz */
+#define SCG1_NICCCR_NIC0_DIV_NUM       ((0x1) << SCG_NICCCR_NIC0_DIV_SHIFT)
+/* NIC0 clock = DDR Clock / 1 = 198MHz / 1 = 198MHz */
+#define SCG1_NICCCR_NIC0_DIV_LF_NUM    ((0x0) << SCG_NICCCR_NIC0_DIV_SHIFT)
+/* NIC1 clock = NIC0 Clock / 1 = 198MHz / 2 = 198MHz */
+#define SCG1_NICCCR_NIC1_DIV_NUM       ((0x0) << SCG_NICCCR_NIC1_DIV_SHIFT)
+/* NIC1 bus clock = NIC1 Clock / 3 = 198MHz / 3 = 66MHz */
+#define SCG1_NICCCR_NIC1_DIVBUS_NUM    ((0x2) << SCG_NICCCR_NIC1_DIVBUS_SHIFT)
+#define SCG1_NICCCR_CFG_NUM            (SCG1_NICCCR_NICCS_NUM      | \
+                                        SCG1_NICCCR_NIC0_DIV_NUM   | \
+                                        SCG1_NICCCR_NIC1_DIV_NUM   | \
+                                        SCG1_NICCCR_NIC1_DIVBUS_NUM)
+
+void scg_a7_nicclk_init(void)
+{
+       writel(SCG1_NICCCR_CFG_NUM, &scg1_regs->nicccr);
+}
+
+/* SCG1(A7) FIRC DIV configurations */
+/* Enable FIRC DIV3 */
+#define SCG1_SOSCDIV_DIV3_NUM          ((0x1) << SCG_SOSCDIV_DIV3_SHIFT)
+/* FIRC DIV2 = 48MHz / 1 = 48MHz */
+#define SCG1_SOSCDIV_DIV2_NUM          ((0x1) << SCG_SOSCDIV_DIV2_SHIFT)
+/* Enable FIRC DIV1 */
+#define SCG1_SOSCDIV_DIV1_NUM          ((0x1) << SCG_SOSCDIV_DIV1_SHIFT)
+
+void scg_a7_soscdiv_init(void)
+{
+       /* Wait for FIRC clock ready */
+       while (!(readl(&scg1_regs->sosccsr) & SCG_SOSC_CSR_SOSCVLD_MASK))
+               ;
+
+       /* Configure A7 FIRC DIV1 ~ DIV3 */
+       writel((SCG1_SOSCDIV_DIV3_NUM | SCG1_SOSCDIV_DIV2_NUM |
+              SCG1_SOSCDIV_DIV1_NUM), &scg1_regs->soscdiv);
+}
+
+void scg_a7_sys_clk_sel(enum scg_sys_src clk)
+{
+       u32 rccr_reg_val = 0;
+
+       clk_debug("%s: system clock selected as %s\n", "[SCG]",
+                 clk == SCG_SCS_SYS_OSC ? "SYS_OSC" :
+                 clk == SCG_SCS_SLOW_IRC  ? "SLOW_IRC" :
+                 clk == SCG_SCS_FAST_IRC  ? "FAST_IRC" :
+                 clk == SCG_SCS_RTC_OSC   ? "RTC_OSC" :
+                 clk == SCG_SCS_AUX_PLL   ? "AUX_PLL" :
+                 clk == SCG_SCS_SYS_PLL   ? "SYS_PLL" :
+                 clk == SCG_SCS_USBPHY_PLL ? "USBPHY_PLL" :
+                 "Invalid source"
+       );
+
+       rccr_reg_val = readl(&scg1_regs->rccr);
+       rccr_reg_val &= ~SCG_CCR_SCS_MASK;
+       rccr_reg_val |= (clk << SCG_CCR_SCS_SHIFT);
+       writel(rccr_reg_val, &scg1_regs->rccr);
+}
+
+void scg_a7_info(void)
+{
+       debug("SCG Version: 0x%x\n", readl(&scg1_regs->verid));
+       debug("SCG Parameter: 0x%x\n", readl(&scg1_regs->param));
+       debug("SCG RCCR Value: 0x%x\n", readl(&scg1_regs->rccr));
+       debug("SCG Clock Status: 0x%x\n", readl(&scg1_regs->csr));
+}
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
new file mode 100644 (file)
index 0000000..454665a
--- /dev/null
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/mach-imx/hab.h>
+
+static char *get_reset_cause(char *);
+
+#if defined(CONFIG_SECURE_BOOT)
+struct imx_sec_config_fuse_t const imx_sec_config_fuse = {
+       .bank = 29,
+       .word = 6,
+};
+#endif
+
+u32 get_cpu_rev(void)
+{
+       /* Temporally hard code the CPU rev to 0x73, rev 1.0. Fix it later */
+       return (MXC_CPU_MX7ULP << 12) | (1 << 4);
+}
+
+#ifdef CONFIG_REVISION_TAG
+u32 __weak get_board_rev(void)
+{
+       return get_cpu_rev();
+}
+#endif
+
+enum bt_mode get_boot_mode(void)
+{
+       u32 bt0_cfg = 0;
+
+       bt0_cfg = readl(CMC0_RBASE + 0x40);
+       bt0_cfg &= (BT0CFG_LPBOOT_MASK | BT0CFG_DUALBOOT_MASK);
+
+       if (!(bt0_cfg & BT0CFG_LPBOOT_MASK)) {
+               /* No low power boot */
+               if (bt0_cfg & BT0CFG_DUALBOOT_MASK)
+                       return DUAL_BOOT;
+               else
+                       return SINGLE_BOOT;
+       }
+
+       return LOW_POWER_BOOT;
+}
+
+int arch_cpu_init(void)
+{
+       return 0;
+}
+
+#ifdef CONFIG_BOARD_POSTCLK_INIT
+int board_postclk_init(void)
+{
+       return 0;
+}
+#endif
+
+#define UNLOCK_WORD0 0xC520 /* 1st unlock word */
+#define UNLOCK_WORD1 0xD928 /* 2nd unlock word */
+#define REFRESH_WORD0 0xA602 /* 1st refresh word */
+#define REFRESH_WORD1 0xB480 /* 2nd refresh word */
+
+static void disable_wdog(u32 wdog_base)
+{
+       writel(UNLOCK_WORD0, (wdog_base + 0x04));
+       writel(UNLOCK_WORD1, (wdog_base + 0x04));
+       writel(0x0, (wdog_base + 0x0C)); /* Set WIN to 0 */
+       writel(0x400, (wdog_base + 0x08)); /* Set timeout to default 0x400 */
+       writel(0x120, (wdog_base + 0x00)); /* Disable it and set update */
+
+       writel(REFRESH_WORD0, (wdog_base + 0x04)); /* Refresh the CNT */
+       writel(REFRESH_WORD1, (wdog_base + 0x04));
+}
+
+void init_wdog(void)
+{
+       /*
+        * ROM will configure WDOG1, disable it or enable it
+        * depending on FUSE. The update bit is set for reconfigurable.
+        * We have to use unlock sequence to reconfigure it.
+        * WDOG2 is not touched by ROM, so it will have default value
+        * which is enabled. We can directly configure it.
+        * To simplify the codes, we still use same reconfigure
+        * process as WDOG1. Because the update bit is not set for
+        * WDOG2, the unlock sequence won't take effect really.
+        * It actually directly configure the wdog.
+        * In this function, we will disable both WDOG1 and WDOG2,
+        * and set update bit for both. So that kernel can reconfigure them.
+        */
+       disable_wdog(WDG1_RBASE);
+       disable_wdog(WDG2_RBASE);
+}
+
+
+void s_init(void)
+{
+       /* Disable wdog */
+       init_wdog();
+
+       /* clock configuration. */
+       clock_init();
+
+       return;
+}
+
+#ifndef CONFIG_ULP_WATCHDOG
+void reset_cpu(ulong addr)
+{
+       setbits_le32(SIM0_RBASE, SIM_SOPT1_A7_SW_RESET);
+       while (1)
+               ;
+}
+#endif
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+const char *get_imx_type(u32 imxtype)
+{
+       return "7ULP";
+}
+
+int print_cpuinfo(void)
+{
+       u32 cpurev;
+       char cause[18];
+
+       cpurev = get_cpu_rev();
+
+       printf("CPU:   Freescale i.MX%s rev%d.%d at %d MHz\n",
+              get_imx_type((cpurev & 0xFF000) >> 12),
+              (cpurev & 0x000F0) >> 4, (cpurev & 0x0000F) >> 0,
+              mxc_get_clock(MXC_ARM_CLK) / 1000000);
+
+       printf("Reset cause: %s\n", get_reset_cause(cause));
+
+       printf("Boot mode: ");
+       switch (get_boot_mode()) {
+       case LOW_POWER_BOOT:
+               printf("Low power boot\n");
+               break;
+       case DUAL_BOOT:
+               printf("Dual boot\n");
+               break;
+       case SINGLE_BOOT:
+       default:
+               printf("Single boot\n");
+               break;
+       }
+
+       return 0;
+}
+#endif
+
+#define CMC_SRS_TAMPER                    (1 << 31)
+#define CMC_SRS_SECURITY                  (1 << 30)
+#define CMC_SRS_TZWDG                     (1 << 29)
+#define CMC_SRS_JTAG_RST                  (1 << 28)
+#define CMC_SRS_CORE1                     (1 << 16)
+#define CMC_SRS_LOCKUP                    (1 << 15)
+#define CMC_SRS_SW                        (1 << 14)
+#define CMC_SRS_WDG                       (1 << 13)
+#define CMC_SRS_PIN_RESET                 (1 << 8)
+#define CMC_SRS_WARM                      (1 << 4)
+#define CMC_SRS_HVD                       (1 << 3)
+#define CMC_SRS_LVD                       (1 << 2)
+#define CMC_SRS_POR                       (1 << 1)
+#define CMC_SRS_WUP                       (1 << 0)
+
+static u32 reset_cause = -1;
+
+static char *get_reset_cause(char *ret)
+{
+       u32 cause1, cause = 0, srs = 0;
+       u32 *reg_ssrs = (u32 *)(SRC_BASE_ADDR + 0x28);
+       u32 *reg_srs = (u32 *)(SRC_BASE_ADDR + 0x20);
+
+       if (!ret)
+               return "null";
+
+       srs = readl(reg_srs);
+       cause1 = readl(reg_ssrs);
+       writel(cause1, reg_ssrs);
+
+       reset_cause = cause1;
+
+       cause = cause1 & (CMC_SRS_POR | CMC_SRS_WUP | CMC_SRS_WARM);
+
+       switch (cause) {
+       case CMC_SRS_POR:
+               sprintf(ret, "%s", "POR");
+               break;
+       case CMC_SRS_WUP:
+               sprintf(ret, "%s", "WUP");
+               break;
+       case CMC_SRS_WARM:
+               cause = cause1 & (CMC_SRS_WDG | CMC_SRS_SW |
+                       CMC_SRS_JTAG_RST);
+               switch (cause) {
+               case CMC_SRS_WDG:
+                       sprintf(ret, "%s", "WARM-WDG");
+                       break;
+               case CMC_SRS_SW:
+                       sprintf(ret, "%s", "WARM-SW");
+                       break;
+               case CMC_SRS_JTAG_RST:
+                       sprintf(ret, "%s", "WARM-JTAG");
+                       break;
+               default:
+                       sprintf(ret, "%s", "WARM-UNKN");
+                       break;
+               }
+               break;
+       default:
+               sprintf(ret, "%s-%X", "UNKN", cause1);
+               break;
+       }
+
+       debug("[%X] SRS[%X] %X - ", cause1, srs, srs^cause1);
+       return ret;
+}
+
+#ifdef CONFIG_ENV_IS_IN_MMC
+__weak int board_mmc_get_env_dev(int devno)
+{
+       return CONFIG_SYS_MMC_ENV_DEV;
+}
+
+int mmc_get_env_dev(void)
+{
+       int devno = 0;
+       u32 bt1_cfg = 0;
+
+       /* If not boot from sd/mmc, use default value */
+       if (get_boot_mode() == LOW_POWER_BOOT)
+               return CONFIG_SYS_MMC_ENV_DEV;
+
+       bt1_cfg = readl(CMC1_RBASE + 0x40);
+       devno = (bt1_cfg >> 9) & 0x7;
+
+       return board_mmc_get_env_dev(devno);
+}
+#endif
diff --git a/arch/arm/mach-imx/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c
new file mode 100644 (file)
index 0000000..cffd4e8
--- /dev/null
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:  GPL-2.0+
+ */
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/mach-imx/rdc-sema.h>
+#include <asm/arch/imx-rdc.h>
+#include <linux/errno.h>
+
+/*
+ * Check if the RDC Semaphore is required for this peripheral.
+ */
+static inline int imx_rdc_check_sema_required(int per_id)
+{
+       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
+       u32 reg;
+
+       reg = readl(&imx_rdc->pdap[per_id]);
+       /*
+        * No semaphore:
+        * Intial value or this peripheral is assigned to only one domain
+        */
+       if (!(reg & RDC_PDAP_SREQ_MASK))
+               return -ENOENT;
+
+       return 0;
+}
+
+/*
+ * Check the peripheral read / write access permission on Domain [dom_id].
+ */
+int imx_rdc_check_permission(int per_id, int dom_id)
+{
+       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
+       u32 reg;
+
+       reg = readl(&imx_rdc->pdap[per_id]);
+       if (!(reg & RDC_PDAP_DRW_MASK(dom_id)))
+               return -EACCES;  /*No access*/
+
+       return 0;
+}
+
+/*
+ * Lock up the RDC semaphore for this peripheral if semaphore is required.
+ */
+int imx_rdc_sema_lock(int per_id)
+{
+       struct rdc_sema_regs *imx_rdc_sema;
+       int ret;
+       u8 reg;
+
+       ret = imx_rdc_check_sema_required(per_id);
+       if (ret)
+               return ret;
+
+       if (per_id < SEMA_GATES_NUM)
+               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE1_BASE_ADDR;
+       else
+               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE2_BASE_ADDR;
+
+       do {
+               writeb(RDC_SEMA_PROC_ID,
+                      &imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
+               reg = readb(&imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
+               if ((reg & RDC_SEMA_GATE_GTFSM_MASK) == RDC_SEMA_PROC_ID)
+                       break;  /* Get the Semaphore*/
+       } while (1);
+
+       return 0;
+}
+
+/*
+ * Unlock the RDC semaphore for this peripheral if main CPU is the
+ * semaphore owner.
+ */
+int imx_rdc_sema_unlock(int per_id)
+{
+       struct rdc_sema_regs *imx_rdc_sema;
+       int ret;
+       u8 reg;
+
+       ret = imx_rdc_check_sema_required(per_id);
+       if (ret)
+               return ret;
+
+       if (per_id < SEMA_GATES_NUM)
+               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE1_BASE_ADDR;
+       else
+               imx_rdc_sema  = (struct rdc_sema_regs *)SEMAPHORE2_BASE_ADDR;
+
+       reg = readb(&imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
+       if ((reg & RDC_SEMA_GATE_GTFSM_MASK) != RDC_SEMA_PROC_ID)
+               return -EACCES; /*Not the semaphore owner */
+
+       writeb(0x0, &imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]);
+
+       return 0;
+}
+
+/*
+ * Setup RDC setting for one peripheral
+ */
+int imx_rdc_setup_peri(rdc_peri_cfg_t p)
+{
+       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
+       u32 reg = 0;
+       u32 share_count = 0;
+       u32 peri_id = p & RDC_PERI_MASK;
+       u32 domain = (p & RDC_DOMAIN_MASK) >> RDC_DOMAIN_SHIFT_BASE;
+
+       /* No domain assigned */
+       if (domain == 0)
+               return -EINVAL;
+
+       reg |= domain;
+
+       share_count = (domain & 0x3)
+               + ((domain >> 2) & 0x3)
+               + ((domain >> 4) & 0x3)
+               + ((domain >> 6) & 0x3);
+
+       if (share_count > 0x3)
+               reg |= RDC_PDAP_SREQ_MASK;
+
+       writel(reg, &imx_rdc->pdap[peri_id]);
+
+       return 0;
+}
+
+/*
+ * Setup RDC settings for multiple peripherals
+ */
+int imx_rdc_setup_peripherals(rdc_peri_cfg_t const *peripherals_list,
+                                    unsigned count)
+{
+       rdc_peri_cfg_t const *p = peripherals_list;
+       int i, ret;
+
+       for (i = 0; i < count; i++) {
+               ret = imx_rdc_setup_peri(*p);
+               if (ret)
+                       return ret;
+               p++;
+       }
+
+       return 0;
+}
+
+/*
+ * Setup RDC setting for one master
+ */
+int imx_rdc_setup_ma(rdc_ma_cfg_t p)
+{
+       struct rdc_regs *imx_rdc = (struct rdc_regs *)RDC_BASE_ADDR;
+       u32 master_id = (p & RDC_MASTER_MASK) >> RDC_MASTER_SHIFT;
+       u32 domain = (p & RDC_DOMAIN_MASK) >> RDC_DOMAIN_SHIFT_BASE;
+
+       writel((domain & RDC_MDA_DID_MASK), &imx_rdc->mda[master_id]);
+
+       return 0;
+}
+
+/*
+ * Setup RDC settings for multiple masters
+ */
+int imx_rdc_setup_masters(rdc_ma_cfg_t const *masters_list, unsigned count)
+{
+       rdc_ma_cfg_t const *p = masters_list;
+       int i, ret;
+
+       for (i = 0; i < count; i++) {
+               ret = imx_rdc_setup_ma(*p);
+               if (ret)
+                       return ret;
+               p++;
+       }
+
+       return 0;
+}
diff --git a/arch/arm/mach-imx/sata.c b/arch/arm/mach-imx/sata.c
new file mode 100644 (file)
index 0000000..142a7f4
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/arch/iomux.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+int setup_sata(void)
+{
+       struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
+       int ret;
+
+       if (!is_mx6dq() && !is_mx6dqp())
+               return 1;
+
+       ret = enable_sata_clock();
+       if (ret)
+               return ret;
+
+       clrsetbits_le32(&iomuxc_regs->gpr[13],
+                       IOMUXC_GPR13_SATA_MASK,
+                       IOMUXC_GPR13_SATA_PHY_8_RXEQ_3P0DB
+                       |IOMUXC_GPR13_SATA_PHY_7_SATA2M
+                       |IOMUXC_GPR13_SATA_SPEED_3G
+                       |(3<<IOMUXC_GPR13_SATA_PHY_6_SHIFT)
+                       |IOMUXC_GPR13_SATA_SATA_PHY_5_SS_DISABLED
+                       |IOMUXC_GPR13_SATA_SATA_PHY_4_ATTEN_9_16
+                       |IOMUXC_GPR13_SATA_PHY_3_TXBOOST_0P00_DB
+                       |IOMUXC_GPR13_SATA_PHY_2_TX_1P104V
+                       |IOMUXC_GPR13_SATA_PHY_1_SLOW);
+
+       return 0;
+}
diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c
new file mode 100644 (file)
index 0000000..26132bf
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * (C) Copyright 2000-2003
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
+ * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+
+#ifdef CONFIG_FSL_ESDHC
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
+int get_clocks(void)
+{
+#ifdef CONFIG_FSL_ESDHC
+#ifdef CONFIG_FSL_USDHC
+#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC3_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
+#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC4_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
+#else
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+#endif
+#else
+#if CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC2_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+#elif CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC3_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
+#elif CONFIG_SYS_FSL_ESDHC_ADDR == MMC_SDHC4_BASE_ADDR
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
+#else
+       gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+#endif
+#endif
+#endif
+       return 0;
+}
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
new file mode 100644 (file)
index 0000000..75698c4
--- /dev/null
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2014 Gateworks Corporation
+ * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
+ *
+ * Author: Tim Harvey <tharvey@gateworks.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/spl.h>
+#include <spl.h>
+#include <asm/mach-imx/hab.h>
+
+#if defined(CONFIG_MX6)
+/* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */
+u32 spl_boot_device(void)
+{
+       unsigned int bmode = readl(&src_base->sbmr2);
+       u32 reg = imx6_src_get_boot_mode();
+
+       /*
+        * Check for BMODE if serial downloader is enabled
+        * BOOT_MODE - see IMX6DQRM Table 8-1
+        */
+       if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */
+               return BOOT_DEVICE_UART;
+
+       /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
+       switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) {
+        /* EIM: See 8.5.1, Table 8-9 */
+       case IMX6_BMODE_EMI:
+               /* BOOT_CFG1[3]: NOR/OneNAND Selection */
+               switch ((reg & IMX6_BMODE_EMI_MASK) >> IMX6_BMODE_EMI_SHIFT) {
+               case IMX6_BMODE_ONENAND:
+                       return BOOT_DEVICE_ONENAND;
+               case IMX6_BMODE_NOR:
+                       return BOOT_DEVICE_NOR;
+               break;
+               }
+       /* Reserved: Used to force Serial Downloader */
+       case IMX6_BMODE_UART:
+               return BOOT_DEVICE_UART;
+       /* SATA: See 8.5.4, Table 8-20 */
+       case IMX6_BMODE_SATA:
+               return BOOT_DEVICE_SATA;
+       /* Serial ROM: See 8.5.5.1, Table 8-22 */
+       case IMX6_BMODE_SERIAL_ROM:
+               /* BOOT_CFG4[2:0] */
+               switch ((reg & IMX6_BMODE_SERIAL_ROM_MASK) >>
+                       IMX6_BMODE_SERIAL_ROM_SHIFT) {
+               case IMX6_BMODE_ECSPI1:
+               case IMX6_BMODE_ECSPI2:
+               case IMX6_BMODE_ECSPI3:
+               case IMX6_BMODE_ECSPI4:
+               case IMX6_BMODE_ECSPI5:
+                       return BOOT_DEVICE_SPI;
+               case IMX6_BMODE_I2C1:
+               case IMX6_BMODE_I2C2:
+               case IMX6_BMODE_I2C3:
+                       return BOOT_DEVICE_I2C;
+               }
+               break;
+       /* SD/eSD: 8.5.3, Table 8-15  */
+       case IMX6_BMODE_SD:
+       case IMX6_BMODE_ESD:
+               return BOOT_DEVICE_MMC1;
+       /* MMC/eMMC: 8.5.3 */
+       case IMX6_BMODE_MMC:
+       case IMX6_BMODE_EMMC:
+               return BOOT_DEVICE_MMC1;
+       /* NAND Flash: 8.5.2, Table 8-10 */
+       case IMX6_BMODE_NAND:
+               return BOOT_DEVICE_NAND;
+       }
+       return BOOT_DEVICE_NONE;
+}
+#endif
+
+#if defined(CONFIG_SPL_MMC_SUPPORT)
+/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */
+u32 spl_boot_mode(const u32 boot_device)
+{
+       switch (spl_boot_device()) {
+       /* for MMC return either RAW or FAT mode */
+       case BOOT_DEVICE_MMC1:
+       case BOOT_DEVICE_MMC2:
+#if defined(CONFIG_SPL_FAT_SUPPORT)
+               return MMCSD_MODE_FS;
+#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
+               return MMCSD_MODE_EMMCBOOT;
+#else
+               return MMCSD_MODE_RAW;
+#endif
+               break;
+       default:
+               puts("spl: ERROR:  unsupported device\n");
+               hang();
+       }
+}
+#endif
+
+#if defined(CONFIG_SECURE_BOOT)
+
+__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
+{
+       typedef void __noreturn (*image_entry_noargs_t)(void);
+
+       image_entry_noargs_t image_entry =
+               (image_entry_noargs_t)(unsigned long)spl_image->entry_point;
+
+       debug("image entry point: 0x%lX\n", spl_image->entry_point);
+
+       /* HAB looks for the CSF at the end of the authenticated data therefore,
+        * we need to subtract the size of the CSF from the actual filesize */
+       if (authenticate_image(spl_image->load_addr,
+                              spl_image->size - CONFIG_CSF_SIZE)) {
+               image_entry();
+       } else {
+               puts("spl: ERROR:  image authentication unsuccessful\n");
+               hang();
+       }
+}
+
+#endif
diff --git a/arch/arm/mach-imx/spl_sd.cfg b/arch/arm/mach-imx/spl_sd.cfg
new file mode 100644 (file)
index 0000000..14c135c
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#define __ASSEMBLY__
+#include <config.h>
+
+IMAGE_VERSION  2
+BOOT_FROM      sd
+
+/*
+ * Secure boot support
+ */
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
\ No newline at end of file
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
new file mode 100644 (file)
index 0000000..9290918
--- /dev/null
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ *
+ * The file use ls102xa/timer.c as a reference.
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <div64.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/mach-imx/syscounter.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * This function is intended for SHORT delays only.
+ * It will overflow at around 10 seconds @ 400MHz,
+ * or 20 seconds @ 200MHz.
+ */
+unsigned long usec2ticks(unsigned long usec)
+{
+       ulong ticks;
+
+       if (usec < 1000)
+               ticks = ((usec * (get_tbclk()/1000)) + 500) / 1000;
+       else
+               ticks = ((usec / 10) * (get_tbclk() / 100000));
+
+       return ticks;
+}
+
+static inline unsigned long long tick_to_time(unsigned long long tick)
+{
+       unsigned long freq;
+
+       asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
+
+       tick *= CONFIG_SYS_HZ;
+       do_div(tick, freq);
+
+       return tick;
+}
+
+static inline unsigned long long us_to_tick(unsigned long long usec)
+{
+       unsigned long freq;
+
+       asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
+
+       usec = usec * freq  + 999999;
+       do_div(usec, 1000000);
+
+       return usec;
+}
+
+int timer_init(void)
+{
+       struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR;
+       unsigned long val, freq;
+
+       freq = CONFIG_SC_TIMER_CLK;
+       asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
+
+       writel(freq, &sctr->cntfid0);
+
+       /* Enable system counter */
+       val = readl(&sctr->cntcr);
+       val &= ~(SC_CNTCR_FREQ0 | SC_CNTCR_FREQ1);
+       val |= SC_CNTCR_FREQ0 | SC_CNTCR_ENABLE | SC_CNTCR_HDBG;
+       writel(val, &sctr->cntcr);
+
+       gd->arch.tbl = 0;
+       gd->arch.tbu = 0;
+
+       return 0;
+}
+
+unsigned long long get_ticks(void)
+{
+       unsigned long long now;
+
+       asm("mrrc p15, 0, %Q0, %R0, c14" : "=r" (now));
+
+       gd->arch.tbl = (unsigned long)(now & 0xffffffff);
+       gd->arch.tbu = (unsigned long)(now >> 32);
+
+       return now;
+}
+
+ulong get_timer_masked(void)
+{
+       return tick_to_time(get_ticks());
+}
+
+ulong get_timer(ulong base)
+{
+       return get_timer_masked() - base;
+}
+
+void __udelay(unsigned long usec)
+{
+       unsigned long long tmp;
+       ulong tmo;
+
+       tmo = us_to_tick(usec);
+       tmp = get_ticks() + tmo;        /* get current timestamp */
+
+       while (get_ticks() < tmp)       /* loop till event */
+                /*NOP*/;
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk(void)
+{
+       unsigned long freq;
+
+       asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (freq));
+
+       return freq;
+}
diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
new file mode 100644 (file)
index 0000000..9b01114
--- /dev/null
@@ -0,0 +1,139 @@
+/*
+ * (C) Copyright 2007
+ * Sascha Hauer, Pengutronix
+ *
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <div64.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
+/* General purpose timers registers */
+struct mxc_gpt {
+       unsigned int control;
+       unsigned int prescaler;
+       unsigned int status;
+       unsigned int nouse[6];
+       unsigned int counter;
+};
+
+static struct mxc_gpt *cur_gpt = (struct mxc_gpt *)GPT1_BASE_ADDR;
+
+/* General purpose timers bitfields */
+#define GPTCR_SWR              (1 << 15)       /* Software reset */
+#define GPTCR_24MEN        (1 << 10)   /* Enable 24MHz clock input */
+#define GPTCR_FRR              (1 << 9)        /* Freerun / restart */
+#define GPTCR_CLKSOURCE_32     (4 << 6)        /* Clock source 32khz */
+#define GPTCR_CLKSOURCE_OSC    (5 << 6)        /* Clock source OSC */
+#define GPTCR_CLKSOURCE_PRE    (1 << 6)        /* Clock source PRECLK */
+#define GPTCR_CLKSOURCE_MASK (0x7 << 6)
+#define GPTCR_TEN              1               /* Timer enable */
+
+#define GPTPR_PRESCALER24M_SHIFT 12
+#define GPTPR_PRESCALER24M_MASK (0xF << GPTPR_PRESCALER24M_SHIFT)
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static inline int gpt_has_clk_source_osc(void)
+{
+#if defined(CONFIG_MX6)
+       if (((is_mx6dq()) && (soc_rev() > CHIP_REV_1_0)) ||
+           is_mx6dqp() || is_mx6sdl() || is_mx6sx() || is_mx6ul() ||
+           is_mx6ull() || is_mx6sll())
+               return 1;
+
+       return 0;
+#else
+       return 0;
+#endif
+}
+
+static inline ulong gpt_get_clk(void)
+{
+#ifdef CONFIG_MXC_GPT_HCLK
+       if (gpt_has_clk_source_osc())
+               return MXC_HCLK >> 3;
+       else
+               return mxc_get_clock(MXC_IPG_PERCLK);
+#else
+       return MXC_CLK32;
+#endif
+}
+
+int timer_init(void)
+{
+       int i;
+
+       /* setup GP Timer 1 */
+       __raw_writel(GPTCR_SWR, &cur_gpt->control);
+
+       /* We have no udelay by now */
+       for (i = 0; i < 100; i++)
+               __raw_writel(0, &cur_gpt->control);
+
+       i = __raw_readl(&cur_gpt->control);
+       i &= ~GPTCR_CLKSOURCE_MASK;
+
+#ifdef CONFIG_MXC_GPT_HCLK
+       if (gpt_has_clk_source_osc()) {
+               i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN;
+
+               /*
+                * For DL/S, SX, UL, ULL, SLL set 24Mhz OSC
+                * Enable bit and prescaler
+                */
+               if (is_mx6sdl() || is_mx6sx() || is_mx6ul() || is_mx6ull() ||
+                   is_mx6sll()) {
+                       i |= GPTCR_24MEN;
+
+                       /* Produce 3Mhz clock */
+                       __raw_writel((7 << GPTPR_PRESCALER24M_SHIFT),
+                                    &cur_gpt->prescaler);
+               }
+       } else {
+               i |= GPTCR_CLKSOURCE_PRE | GPTCR_TEN;
+       }
+#else
+       __raw_writel(0, &cur_gpt->prescaler); /* 32Khz */
+       i |= GPTCR_CLKSOURCE_32 | GPTCR_TEN;
+#endif
+       __raw_writel(i, &cur_gpt->control);
+
+       return 0;
+}
+
+unsigned long timer_read_counter(void)
+{
+       return __raw_readl(&cur_gpt->counter); /* current tick value */
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk(void)
+{
+       return gpt_get_clk();
+}
+
+/*
+ * This function is intended for SHORT delays only.
+ * It will overflow at around 10 seconds @ 400MHz,
+ * or 20 seconds @ 200MHz.
+ */
+unsigned long usec2ticks(unsigned long _usec)
+{
+       unsigned long long usec = _usec;
+
+       usec *= get_tbclk();
+       usec += 999999;
+       do_div(usec, 1000000);
+
+       return usec;
+}
diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c
new file mode 100644 (file)
index 0000000..55242f0
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <linux/errno.h>
+#include <asm/mach-imx/video.h>
+
+int board_video_skip(void)
+{
+       int i;
+       int ret;
+       char const *panel = getenv("panel");
+
+       if (!panel) {
+               for (i = 0; i < display_count; i++) {
+                       struct display_info_t const *dev = displays+i;
+                       if (dev->detect && dev->detect(dev)) {
+                               panel = dev->mode.name;
+                               printf("auto-detected panel %s\n", panel);
+                               break;
+                       }
+               }
+               if (!panel) {
+                       panel = displays[0].mode.name;
+                       printf("No panel detected: default to %s\n", panel);
+                       i = 0;
+               }
+       } else {
+               for (i = 0; i < display_count; i++) {
+                       if (!strcmp(panel, displays[i].mode.name))
+                               break;
+               }
+       }
+
+       if (i < display_count) {
+               ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0,
+                                   displays[i].pixfmt);
+               if (!ret) {
+                       if (displays[i].enable)
+                               displays[i].enable(displays + i);
+
+                       printf("Display: %s (%ux%u)\n",
+                              displays[i].mode.name,
+                              displays[i].mode.xres,
+                              displays[i].mode.yres);
+               } else
+                       printf("LCD %s cannot be configured: %d\n",
+                              displays[i].mode.name, ret);
+       } else {
+               printf("unsupported panel %s\n", panel);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+#ifdef CONFIG_IMX_HDMI
+#include <asm/arch/mxc_hdmi.h>
+#include <asm/io.h>
+int detect_hdmi(struct display_info_t const *dev)
+{
+       struct hdmi_regs *hdmi  = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR;
+       return readb(&hdmi->phy_stat0) & HDMI_DVI_STAT;
+}
+#endif
index 2dab906f445d4c67534ed8ff8a57144d6c162000..c72894357c0ba178ba8b4ad1d1a919022d39f2e7 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index ec855c835d2e8ce88ac5da94893c62979a8fc95e..e4f3ce53d2284706b53d679fba22a1064314ebfc 100644 (file)
@@ -9,7 +9,7 @@
  *
  * The syntax is taken as close as possible with the kwbimage
  */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
 
 /* image version */
 IMAGE_VERSION  2
index 14c60fc5397588c7798373a5f6f90dc5796a8dab..ece8957aaff98a29b7f47234e1200697e566d959 100644 (file)
@@ -13,7 +13,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
 #include <asm/spl.h>
 #include <linux/errno.h>
 #include <netdev.h>
index 94e2b8a36058f1bf1a7d2376cba2db0ebb4ceea2..b3f5c99e03713b5740146b2176ddafbef1694b15 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index 4cd184ed74e0ab94d2d389fcfc0f86631b26eb52..6abc2159bbc59bc34bc52482a225a41cba1e5f6e 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index b7c65ca7f8b813ec0a2118b905d604e97e7bc87d..872fedd2908ba62e62818324fc58afca38dfc139 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index beca37dfb3841819b7357923d5a7f0ae30895a23..e66f060d140e7f81e3ca2c5c86a4c3e6eaa2f68b 100644 (file)
@@ -10,6 +10,6 @@ config SYS_CONFIG_NAME
        default "opos6uldev"
 
 config IMX_CONFIG
-       default "arch/arm/imx-common/spl_sd.cfg"
+       default "arch/arm/mach-imx/spl_sd.cfg"
 
 endif
index 500d0bd2dfd3c9ed219a868b49bc8ad2ead25cf0..646094aef4ca1e4174ddf3b16e24bc40a4571e74 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/opos6ul.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>
 
index 74f652e025aacd955d8e7d1948329d24b67f4a29..1ad4ef93cfc7e5f2d11a7f1116b62a52b576d8b7 100644 (file)
 #include <asm/arch/iomux.h>
 #include <malloc.h>
 #include <asm/arch/mx6-pins.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <mmc.h>
index 1485a4856f17431296b5af6eef35f1590c8f1d97..f74fa1358fd4385a26bc322e1ec63f9dd792cd92 100644 (file)
@@ -18,8 +18,8 @@
 #include <asm/arch/crm_regs.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 "platinum.h"
 
index 0384a26e925b5b83565c552ecbb6c342d32cba95..716aec28395f2d4077309179cc9ebde64aa4e004 100644 (file)
@@ -11,8 +11,8 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
 #include <miiphy.h>
 
index 73a955f01943e1cb9289cb72e67f8df7dd5bf7a1..bbcd1c56061007fa7034ef6ead45ae8b9c99f442 100644 (file)
@@ -9,8 +9,8 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <miiphy.h>
 #include <micrel.h>
 
index ec57cf120592e59e6b5da575ade3d2f71f3ecb1f..f49adf03296724f4a89fcaf8805cc42aad7d1964 100644 (file)
@@ -14,9 +14,9 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
 
 #include "platinum.h"
index d1ba85ab82c8dd50e1f1c27f5fe699c2ec551f1c..c27fb4836a15e2e8cd0523637cdc127a7080f785 100644 (file)
@@ -14,9 +14,9 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <spl.h>
 
 #include "platinum.h"
index 84a7b849ad7435e055d23a871726a9ba4114f74f..caa598d8f5cb7980b470326788974b2bfd9efcab 100644 (file)
@@ -13,9 +13,9 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <micrel.h>
index e903bc18072427a492028653ad63e93638182d4e..a18a4e8ac5ca6aceed1220651286c222972417c0 100644 (file)
@@ -17,7 +17,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
 #include <ACEX1K.h>
 #include <netdev.h>
 #include <i2c.h>
index 1145af53d7365242147c19c73e6e4445ec239640..17fd6f56eafb3fdebd3410a679b1f1a09eef97d1 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <micrel.h>
index 3193abf0b02409c6ad9c9c6b82a6d9239c2c8b2d..542e534270e02389805a0f9433bf5183881b2834 100644 (file)
@@ -12,9 +12,9 @@
 #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/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_esdhc.h>
index 80b5dc9026ab0b7ccd66c6d014d849f777dfb57c..c59884a8c319489b1ab3bb33d2de64ed0fd28fc7 100644 (file)
@@ -23,9 +23,9 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mxc_hdmi.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/video.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <dm/platform_data/serial_mxc.h>
index 59c9d1ac0644c902582e61488aceba6fb1246dcd..19fa5d3cf70bd9469b8ca6a39c9a3abe1cdd2e04 100644 (file)
@@ -11,7 +11,7 @@
 #include <common.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/spi.h>
 #include <fsl_esdhc.h>
 #include "common.h"
 
index 9442d098201f77f328670c718e50bafa1532061e..bba977ff8e2979eabcc811bde2a44f0a0354ba54 100644 (file)
@@ -16,7 +16,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/crm_regs.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 #include <fsl_esdhc.h>
 #include "common.h"
 
index fe7db91dd8d0186457778aff000510830f915f78..5cb97b4778721c258720ab4c397cb18e139c7bb7 100644 (file)
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/crm_regs.h>
index 5b60654991bf6c85859e3d155c03a2cd6c369ee9..cbe355a600a3eb21add00e3f3490305701fed01d 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index 95cdaeb07187bc6184f240c01a6dbaaea722dc2d..867459909df8fa0fda4ee943e8afb2cdeabeab2b 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/video.h>
 #include <i2c.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
index ab0ab986bfc8238bd0eed76ba2ccfcabdff6d420..a8a7cf317e8790446aa23d3a11a7729fa642fe3c 100644 (file)
@@ -20,8 +20,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index 841ade98c56efaca37d7e3639e45877774325d43..bc36fc77ee5b5ab3ba9c0637b7edbb22dd18e6c3 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 #include "../common/board.h"
 
index 74cbbc5c5624e172c0343231362b10ea889b3f2e..5b2ed066b49ae85bc3be5d6b8a0479b19b1f87fb 100644 (file)
@@ -18,8 +18,8 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
 
 #include "../common/board.h"
 
index c3c3173f513a781e6b675879f3f11b79af1ea46b..10a947173032e510ccb9da8a3dcfee1938e2777c 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 #include "../common/board.h"
 
index 105db73f6df546b36f216287e13caa11a18fb76d..4dcc9ea11baa3b34c68287f8a5d6f94d4f9a834f 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 #include "../common/board.h"
 
index df25be8e6c749f7d0c5f75116e58b1b654c9ca89..a88ff8fe132f7dd7f08635a4f44ea95dc40f88ec 100644 (file)
@@ -13,7 +13,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
 #include <i2c.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
index db28942603a030983bd721d9aebc8b3ec454ac03..c608de456b3b0f7e6486a04e4fff52d87f32c634 100644 (file)
@@ -12,7 +12,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
 #include <linux/errno.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <netdev.h>
 #include <i2c.h>
 #include <mmc.h>
index 3741fa178c3a7c69ea9b3815c41f6386ba8b59dd..27d606f3105bcfe5085a7560864a41b25298c65f 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/arch/iomux-mx53.h>
 #include <asm/arch/clock.h>
 #include <linux/errno.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
 #include <netdev.h>
 #include <i2c.h>
 #include <mmc.h>
index 7f8eca33464c529606c8dffdcf363c8b05c03406..8cb5ac5940ed8a3758ed206e9844647854850ec2 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/arch/clock.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index 927ebe4a6a28297254ed8f6baf8470d47bc45034..13af9ca6cd5809cc755ccc435b327c50cfd0d231 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/spi.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
@@ -25,7 +25,7 @@
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
 #include <asm/arch/mxc_hdmi.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/video.h>
 #include <asm/arch/crm_regs.h>
 #include <pca953x.h>
 #include <power/pmic.h>
index f4a5d9cff95e1473068b93dc94e942db57947fed..e4160420fa8b393d792c05b1433f39cb331dee1e 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index 228514b106a8dacba1d6f88b0c9aed7c03df7399..8afd5da49f605f9c0c40a18f688de8831d70b3db 100644 (file)
@@ -14,9 +14,9 @@
 #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/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <common.h>
index 74a27a3af0463f849035a2b5ece297e0bc1117c4..33aada179f80d7f0ad4e57091fdfc3a4d7397531 100644 (file)
@@ -11,8 +11,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 <linux/sizes.h>
index e7ab81091d8857604f9a4ba80a7ecb84464f5b57..83473d80b01d7df94f708431981e89aaad3eae61 100644 (file)
@@ -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 <linux/sizes.h>
 #include <common.h>
index 0460cd9257b15196288a17cac35a130f9205f390..2aeef61ffdef8785185188b7b2e877706eadffdb 100644 (file)
@@ -13,9 +13,9 @@
 #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/mach-imx/iomux-v3.h>
 #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc.h>
index a5746fe08688d5752bf1d69cff465a355404d6da..a30c379e4ddd5a9e895844bf8d28bf867f050be1 100644 (file)
@@ -12,9 +12,9 @@
 #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/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_esdhc.h>
index 489bf2114b8a727ff03c072d520cc8df389e024e..66b08f823e3fabcae29f4814317495fa24e8ef1c 100644 (file)
@@ -11,8 +11,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>
index 7d22501d269b459e2827100a430d12dad7da399c..a681ecef3aa96d9bce12c92aa0ec2fe25dfa697e 100644 (file)
@@ -9,7 +9,7 @@
 #include <asm/arch/mx7-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 <linux/sizes.h>
 #include <common.h>
@@ -21,7 +21,7 @@
 #include <power/pfuze3000_pmic.h>
 #include "../common/pfuze.h"
 #include <i2c.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/crm_regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
index 6449ef2873288460892055c9c7d6e551403c24b9..6626a12dc65f0c8d202b36fab0366165bd237c34 100644 (file)
@@ -10,7 +10,7 @@
  *
  * The syntax is taken as close as possible with the kwbimage
  */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
 
 /* image version */
 IMAGE_VERSION  2
index 09125cff126b1e64802e28a94607ddb01299f92a..70157ede541989b83c8a18f8c943a9b9ba87ec7f 100644 (file)
@@ -8,7 +8,7 @@
  *
  * The syntax is taken as close as possible with the kwbimage
  */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
 
 /* image version */
 IMAGE_VERSION  2
index 186eb18048139694db23270db0d2e85d9667a46e..46404b4d59f6f3bc8a13fa998e6211bda2a03390 100644 (file)
@@ -10,7 +10,7 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <fsl_esdhc.h>
 #include <hwconfig.h>
 #include <power/pmic.h>
index 40ee1b61e95f021c47a8a15e14de0f5e97ef0d1e..89848c8f075d46b29a40b9484c4aba9ebea791c3 100644 (file)
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/video.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <dm.h>
index 6060b4421680d90789009105924b1e780044253c..69a638d71d8ca7904314a36cb50208b7fee1a2fc 100644 (file)
@@ -11,9 +11,9 @@
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <environment.h>
 #include <i2c.h>
 #include <spl.h>
index 0acf655c0e5b86686ea1d32471ba1ab1c4122f2a..b25c634bb5a072a1010496adbb62e38e7d1dcc0b 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index 2d184c8125bbaac19ed82c9b73723687dd71ee1b..817e22fd455518d4ed2af1e550457aa4e20b2378 100644 (file)
@@ -14,8 +14,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>
index 17c2b13ef2ed31bd32573cf944b171ae998a1d8d..980cd6288ca8286a520e299d96a653d18a015a19 100644 (file)
 #include <asm/arch/iomux.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/video.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
 #include <input.h>
index b934d3678814661a2eb06873232bccf0b0b4d75f..3645b75cb29bfa07222eec8f673862b5e3e1e1bb 100644 (file)
@@ -14,9 +14,9 @@
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/crm_regs.h>
 #include <i2c.h>
 #include <mmc.h>
index a4c1222a11b6b228dc80d9ef3c29f11e16e02dc7..bd845696047943e472e66e2ffd2b3efd0f9c941d 100644 (file)
@@ -20,9 +20,9 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
 #include <i2c.h>
 #include <input.h>
 #include <ipu_pixfmt.h>
index eb5eae43551648b4b49c49ccc4d41d077258a687..e265e2a73291f5b0643d6c403569a852aad52495 100644 (file)
 #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/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
 #include <fsl_esdhc.h>
 #include <mmc.h>
index 73beeaaf6d51ca759e7b00f57145bfb36c7f0b8a..15844ef437b7b76c7e790c12c44c400619ac7daf 100644 (file)
@@ -11,8 +11,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/arch/crm_regs.h>
index 55767996a085b85b98c9a8835e1e86583aca4fe6..0a7d4124a62830f4aa07ae58221a16c7c977a34e 100644 (file)
@@ -22,8 +22,8 @@
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index b20654870a8af8d28033a17cdad86e80a378af58..a75746161e01b14fcef24e02e70cff82d857e87b 100644 (file)
@@ -10,7 +10,7 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
 
 /* image version */
 IMAGE_VERSION 2
index 2fbb5c1b25eed96fb783f3a3da43c76380767651..2a302d79341e6b43ef3dab331cfe0b43c6e8e772 100644 (file)
@@ -8,7 +8,7 @@
  *
  * The syntax is taken as close as possible with the kwbimage
  */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
 
 /* image version */
 IMAGE_VERSION  2
index 3dc8cbd6a50b6f5fd5dbc1ceb7104c1b0b57ddf7..4257fbcb68b471fd64277ee2f7746ac4d497c100 100644 (file)
 #include <asm/arch/mx6-ddr.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <mmc.h>
index c92f37c9bb5db73b0ee8c4f21c802762d390533d..5c8b4367767bb127c525290b510c2408a8592426 100644 (file)
@@ -13,9 +13,9 @@
 #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/mach-imx/iomux-v3.h>
 #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <linux/sizes.h>
 #include <common.h>
 #include <fsl_esdhc.h>
index c4abc1dc1d694cc64382c2720e85239018cfb251..ad4bb5bed74dc61539b8cbca74fac9c991b81c17 100644 (file)
@@ -14,8 +14,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.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 <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
@@ -27,7 +27,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <micrel.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
 
 #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                  \
index 341e7274f1377d00700c4e78a540761ce3da66bd..be8fef4287e195af461fc7ce4b2cb5ee3b14ca96 100644 (file)
@@ -14,8 +14,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.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 <malloc.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <micrel.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
 
 #include "../common/mx6.h"
index 5c622164772d113462543831b2358af8332d978e..1ccdfa8e056064cc7446cd85a8920d3468f043ed 100644 (file)
@@ -21,9 +21,9 @@
 #include <asm/arch/mxc_hdmi.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <malloc.h>
index db0c58f6f5695cc130c25fe26bc8a1add3ecaffb..7a6657fc1d46e36f07075ef9b5e06b47391f6790 100644 (file)
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
index 49aeb80327b5d1bfc5df942ed8cdb1dd663b2883..39f7e016fd0c507cb728ef0ed8543fc1aa18fde0 100644 (file)
@@ -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/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <common.h>
 #include <miiphy.h>
index 799751d699b001a2cf49cfd4f4ec1ba9b1023c21..b4c9be73780607bb3feb55f2def2985d3bb10e61 100644 (file)
@@ -10,8 +10,8 @@
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_esdhc.h>
index eef6922b20822d064eae6ad57e106fe2cd298268..94251c6d918bf1d89e2a71fb469eb0b5ebf20d61 100644 (file)
@@ -16,7 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <mc13892.h>
index 166b93f0c5288bb1d6a7e6e0cc082da516717e6d..8e5613cb126124c7041791131e8a4e14b3337ba9 100644 (file)
 #include <asm/bootm.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <dm/platdata.h>
 #include <fsl_esdhc.h>
index 0b424384b9bfe9f204018cb94c39f53386a3b240..5eaf9c0b1785c00a6b93a794348d36e249e46049 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
index 87e24471ceaef999ee3f67d70d1acaf0c71c30bc..cbf7aa952a90cef3ecdbbac237c769c57dd31ff6 100644 (file)
 #include <asm/arch/sys_proto.h>
 #include <asm/bootm.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <asm/io.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <dm/platdata.h>
index 618c57180545f27b3f28e7724e5e5e851d5a6fe9..68892877606855966fc4f323d9527c478b2c836e 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
 #include "pf0100_otp.inc"
 #include "pf0100.h"
index e54afa1952606706be2390da4eba560feecc6f66..5cb14b43de76ed38153c37ad8f8748ec1badfd26 100644 (file)
@@ -10,8 +10,8 @@
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
index baab8129cf4e7369438e929aff42503ababfc69d..6d032ed9e3450e174564c9243fb7ad3a3f2b7396 100644 (file)
@@ -8,7 +8,7 @@
  *
  * The syntax is taken as close as possible with the kwbimage
  */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
 
 /* image version */
 IMAGE_VERSION  2
index fdb0fa11b00c1346b3aedd2e52a55153b7516e79..fcdea34f050a06f6f61d1765e4be2aee2036973e 100644 (file)
@@ -16,8 +16,8 @@
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
 #include <common.h>
 #include <fsl_esdhc.h>
 #include <libfdt.h>
index 43349ade1d42a63edbeb5c4c0db48f039d5833a2..1188215738c3fd396c64e0495f587f9e0947a2b8 100644 (file)
@@ -16,7 +16,7 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 
 #include <common.h>
 #include <fsl_esdhc.h>
index 2bbb614e4fe9a34638c91b08438b080d6573ed8c..2360cffdd903c2235758adbbcfe85557e9ff3076 100644 (file)
@@ -18,8 +18,8 @@
 #include <asm/arch/sys_proto.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
 
 #include <common.h>
 #include <fsl_esdhc.h>
index 530c45f600f2e111975985484bd431ce2d0f946e..276c625cfd813683725bc14ba8509469f02c3370 100644 (file)
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 #include <linux/sizes.h>
index d2cbbaa23e6e819a742220819e09ac36fe49c654..7534935dde0f64ce7f590161cb98a68f3fdbae03 100644 (file)
@@ -13,8 +13,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/arch/crm_regs.h>
index f24d21e2bfd178b71ea85a610073ad4ab4506672..e83e7c3a1b2208e0652e79bf9c95c7a0d5e0e56e 100644 (file)
@@ -12,8 +12,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/arch/crm_regs.h>
index 24c1767901db5ac9f0c23215f28f9cc2d43fd060..47082a88d5ec45812ad079b1660a386a56e8a293 100644 (file)
@@ -11,8 +11,8 @@
 #include <asm/arch/mx6-pins.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <asm/arch/crm_regs.h>
index 438bc0e7431b368ddb81628859e9f66589d7cd25..1dbc966b6eedab437ce37a0d4b2e47a4814ec09c 100644 (file)
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
-#include <asm/imx-common/sata.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
+#include <asm/mach-imx/sata.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <common.h>
index b1b528a47056d6ad00ffde4c20e0a94249681030..52319b302408766a329478c5bddee591931ed55c 100644 (file)
@@ -14,8 +14,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/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <common.h>
index df8e9da6f9190a6f3195397e9c4b90a71a45b7f6..d422d63df55306c45fad6ce7315b0d687310449f 100644 (file)
@@ -10,8 +10,8 @@
 #include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <common.h>
 #include <fsl_esdhc.h>
index d171cf075468653e60db2fa6387b7df4d90072cc..d6adf041f380ff0f70f4e7bfb0c8f3dade435b20 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_CMD_HDMIDETECT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
index 4acede4b8eb00fcbe3be2a138dfdf66fd97cb948..85ac7ace1286c4b35cfefb6779d045fce9f34b59 100644 (file)
@@ -11,7 +11,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
index fa5d9e35be40f225359c4987bfae2166b196f94e..26b4f8abc11cdb767f289a5e934cc1023d663979 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80
index d8307b0836efbf9324287440643960aaa9073116..7ed05cf8c92c27390a4c0497b962bc2e3c8fb662 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_CMD_HDMIDETECT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
index a476dc2af2d474732ab6270ab017175daab90dd9..57f46af193a94a87a23a0051524c8389055d5e9b 100644 (file)
@@ -15,7 +15,7 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_SYS_STDIO_DEREGISTER is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
index bd38e6d5e13aabc23b5f705b5d9afaad591147fd..4bf7122963bdc21261b3355c3759d169bc61002d 100644 (file)
@@ -15,7 +15,7 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_SYS_STDIO_DEREGISTER is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
index 296f015a50165b2cc67ae5790f53236ba5352267..ea6c13d9dc148ed3e8ba600397a8fc35f7c65054 100644 (file)
@@ -16,7 +16,7 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_SYS_STDIO_DEREGISTER is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
index 2b1bb3d5911677e8a6f06689460cdb2555bdb86c..b0ba7ffb28185e62b4606e9717340f7753c26ce2 100644 (file)
@@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
index caf4246a3301dafe3d69616f567728198d8bbb6a..f94281cdc059d63b37c3abc7f4a41af8c870ced5 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_NAND"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_DMA_SUPPORT=y
index acc66b089474dc8c74635dd75d52669219edaddb..ca9eb94491989e46f0118505ad64a3868122c483 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
index c0489cbd19e5cfa64f2af33187cbaf9ee28fb55d..743f859b998d4e15473d0c2281bb02f1d7881fe8 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
index 411b95e4ee21d3290701004fa79857abd0357a3e..b0da6f1553b67a5f1b91aa6d4f4644568834a3da 100644 (file)
@@ -11,7 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_NAND"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_DMA_SUPPORT=y
index 8e0bbb2ede8a51ffabc6b3baeaef86ff216dcaed..9771b793e54aadd4f7ea427196d2c6ff68b0cdc5 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-emmc"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
index 69d4fc5e5116f37108e395255fabe5638290b4ae..f4b5c8f26244c95eed5fed185c0a02d95e1daa24 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-mmc"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
index 5285120aab84dcdaafab82dc3a6b3a1b6b65a69c..76bfe8da5b168946303322ff2577d689247095ac 100644 (file)
@@ -11,7 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_NAND"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_SPL_DMA_SUPPORT=y
index e550cf250a3fd3f808807bb9d9792ec820a97272..f8494503d85bf59bba9dc3e085c3683916ec7487 100644 (file)
@@ -7,7 +7,7 @@ CONFIG_TARGET_LITEBOARD=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_DEFAULT_FDT_FILE="imx6ul-liteboard.dtb"
 CONFIG_BOARD_EARLY_INIT_F=y
index 7530de1519c204ac6a5225b0bdc2c46d887ab15f..c35ea92bd2e39d2d2d70241233408ddcbfb3efb6 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_VIDEO=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 # CONFIG_SYS_STDIO_DEREGISTER is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index c1b3bbfa76a2bfc0a5f832c45e6dbe7d7b85c848..c63cc8e81e6e9430c925a3eab13175b77a9602d9 100644 (file)
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
index a1d0c84bed460591fd4200d048d0a82547e35ad3..972e971a6a84789f6301ebb74f1e1b96bea7e6c1 100644 (file)
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
index ad15e7a18af12d4ef270d941d0d9764a50324405..39bb63f861f7df46db017ee79d202fb8fe64392b 100644 (file)
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SL,SYS_I2C"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6SL,SYS_I2C"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index 6d4fe6370fb97cab4b3535ce46ad319370ef4d06..90daa96a366340c7e97258e981ea0cc2f09fd54a 100644 (file)
@@ -10,7 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
 # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
index 56e66eef3dfe1e242a658b8b71caa380c90b82fa..54f323192d4ad52d12c2ec9e14f3f9212fb71e03 100644 (file)
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
index aa6cc08a4f9214bbdb83af02bb70a8f2df7c30fe..57ed81f1abf61eeb2b0cf1af51eca5eec836d67b 100644 (file)
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
index 3f8b98ebb9a612807ae931822fe26a5cb8cbd8a5..15cbbace85bf4e9660a4955ceab49ea38d2d9f08 100644 (file)
@@ -14,7 +14,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index 1e3b0f7043f203febfa7898278e5708372977987..6c33853987f130b3fb054df7a3de7fa3cf742ad6 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index c55537c03274a3ddba67d394f7ca9e48d7d4e150..d18faf7a04fa45b37054806e77b171bfb16f1d96 100644 (file)
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index 38423dce98240ee4cd8116487348bc9ea9962ac1..d361a74033102d4342801b0e1f91dfbb3e3ce945 100644 (file)
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index 3813b98ada41f5aaa129c8ea62d5535c95558372..cf6367a9203e4536c361729f7cb9ed93841d13df 100644 (file)
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index 7e52bdc91744f7edca1851874d642ce85e43b499..ced195c9f8c3834046f43122872a79af2d9f9a97 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
index cad2a024a61db53029f2cffbd1f2536bcef1e050..ecc03fcaa90d98922e93d7c8e0df69a815b92095 100644 (file)
@@ -10,7 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
 CONFIG_SPL_ENV_SUPPORT=y
index 95a14cabc7f4bfd90d52f9be2a92de9c9a3982e6..2e5ca15d4b291ef1715a21fc5c0990670b726cab 100644 (file)
@@ -11,7 +11,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
index 6f4f4bffb9993b938b25316e1e67cd629cf0fa95..0286c996663e5590d2a9cb8780f22d02d290a12c 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_BOARD_EARLY_INIT_F=y
index a2e01e613229c8ddb4ea0e727309825607a00119..b1f86d98aef88c345858bf5ac37f0017a3bea464 100644 (file)
@@ -11,7 +11,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_DEFAULT_FDT_FILE="imx6q-zc5202.dtb"
 CONFIG_BOARD_EARLY_INIT_F=y
index e28652b21cfdf2e68c3dc761de5e83c68203a8a2..ef86cc4f341d7e6386a4f01c98d81cc90568535d 100644 (file)
@@ -11,7 +11,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_DEFAULT_FDT_FILE="imx6q-zc5601.dtb"
 CONFIG_BOARD_EARLY_INIT_F=y
index 27d335456997a702ff072f870e7e97fc5d91c74a..803682f5580dd90c18bbffe846f578b53a9b7443 100644 (file)
@@ -71,7 +71,7 @@ Configuration command line syntax:
                                        value shall be set to one of the
                                        values found in the file:
                                                arch/arm/include/asm/\
-                                               imx-common/imximage.cfg
+                                               mach-imx/imximage.cfg
                                Example:
                                BOOT_OFFSET FLASH_OFFSET_STANDARD
 
index a97fa859e0f1b6a4db116fc84af741dd5751d2c3..fea8767d7bae5b65013dc33c3b7506748247f646 100644 (file)
@@ -19,8 +19,8 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
-#include <asm/imx-common/regs-apbh.h>
+#include <asm/mach-imx/dma.h>
+#include <asm/mach-imx/regs-apbh.h>
 
 static struct mxs_dma_chan mxs_dma_channels[MXS_MAX_DMA_CHANNELS];
 
index b7a1b6a45b484ad5ed333029157e52438f6ec9ce..89918e48ddc9e1b18898fe261072bea0ae358c32 100644 (file)
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <malloc.h>
 
index 110b9d6119255e9cbdfd0cc7ef4d1b510ad9688f..b7bb76c0ed0c794ce1f7e183465e06ed397353e0 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/errno.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <i2c.h>
 #include <watchdog.h>
index 88610d6af2cd60be0f40ba00ed8174cf09680a48..8986bb4ad0798f57ce28c4d5e4b8f2f56ecb1c80 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 #define BO_CTRL_WR_UNLOCK              16
 #define BM_CTRL_WR_UNLOCK              0xffff0000
index fe1fe707a58b53faf797060d3de70b9c35cadd5c..eb014cc5279d5e8f6d96f6d612b399b763eba9ff 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
 #include <bouncebuf.h>
 
 struct mxsmmc_priv {
index 5aa36082dd708484851dfd9eb8da891950c0a051..d774ab8d82dab20ef0f889d6670c76dced3ca900 100644 (file)
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/regs-bch.h>
-#include <asm/imx-common/regs-gpmi.h>
+#include <asm/mach-imx/regs-bch.h>
+#include <asm/mach-imx/regs-gpmi.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
 
 #define        MXS_NAND_DMA_DESCRIPTOR_COUNT           4
 
index 4ad4ddc86602adf87f8c1efdbc1d6edb18536817..40be52070eae9c0dfa6e7537d163c6eed34cfa86 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index fc2786e270a6cf5f40ce9e965fe0063414532b9a..e1562c36b7a6b5ecec5892d8ba85719cdda0e7f7 100644 (file)
@@ -12,7 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/spi.h>
 
 #ifdef CONFIG_MX27
 /* i.MX27 has a completely wrong register layout and register definitions in the
index 61daeba7b10bf607383ad57485b25790355dfa79..790db78a02ef470e960cbe1494e4e60bca9cd095 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
 
 #define        MXS_SPI_MAX_TIMEOUT     1000000
 #define        MXS_SPI_PORT_OFFSET     0x2000
index f348ec9bca9d8ff1c6b4bf0bb8018986e0d384ce..fe2627ea937c6e3bfc1b2313c4103167e16ef6c9 100644 (file)
@@ -14,8 +14,8 @@
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.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>
 #include <dm.h>
 #include <asm/mach-types.h>
 #include <power/regulator.h>
index a7f6f21fa2c9e0b3477f7d8b1c07dace16f0e3f2..5bb3763814197217a945d64f456cf61a94a5e69d 100644 (file)
@@ -17,8 +17,8 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/regs-usbphy.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/regs-usbphy.h>
 #include <usb/ehci-ci.h>
 #include <libfdt.h>
 #include <fdtdec.h>
index 20455ffb54219e9965bbd989c0e601d1392d50ae..0ddce3db58bd1a4b7d1bac8d538c18a4527363a1 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
 
 #include "videomodes.h"
 
index 66ee167f96b717c39d234df6b5a20cb3e242e6c5..58cf7ad888893d26781cc8aeec02dea871ae0418 100644 (file)
@@ -10,7 +10,7 @@
 #define __ADVANTECH_DMSBA16_CONFIG_H
 
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #define CONFIG_BOARD_NAME      "Advantech DMS-BA16"
 
index b4006a37e0f6a57c1c47001b35c854f7381a30af..a18ab12804146a382aae70cd15c018c4f79e8f18 100644 (file)
@@ -19,7 +19,7 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
index 82812e577a9598708d4a3a313b3868fcf92c6259..f3335f5c12a3203e53a821e5e7fa4637705a2eca 100644 (file)
@@ -17,7 +17,7 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
index f60a0298d6b6989bfe9778c9b8ddf829a9785c9b..ad97a16bc7ab80786980f1537289c3818a16333a 100644 (file)
@@ -13,7 +13,7 @@
 #define __GE_BX50V3_CONFIG_H
 
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #define BX50V3_BOOTARGS_EXTRA
 #if defined(CONFIG_TARGET_GE_B450V3)
index 1a8ab4ee33e1d7e29584f830f6848799f0efe942..f07e83b498c658f174ffba7228bbc1d52710ee81 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifndef CONFIG_MX6
 #define CONFIG_MX6
index 2c40decf499b9dea9dd800aa3b099f82ebac8106..d38c27a6417bb17b94aba570411b5b2415049b8b 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #define is_mx6ul_9x9_evk()     CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
 
index 19b0630d9d0570e255057b641b050c2a3d43eb91..30e75184950cdddc47efffd10fa0b576f19f2fc3 100644 (file)
@@ -12,7 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifdef CONFIG_SECURE_BOOT
 #ifndef CONFIG_CSF_SIZE
index fe460109d12a6d5e12a4cf16d5f837fa58551f7f..6df6498fd5e786806a9856855f1ddca11281dbb2 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifndef CONFIG_MX7
 #define CONFIG_MX7
index 8d78f49c96843bd75e1478f5ef2887e446ae37db..38ae83786d4e4c3f9a8d923cd859beba523ec207 100644 (file)
@@ -12,7 +12,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 /* Network support */
 
index e13b792f38679eb911e8c17fc48b1c0bb1675c26..9edb35322d4d398332f19ed0858c625d55763562 100644 (file)
@@ -9,7 +9,7 @@
 #define __XPRESS_CONFIG_H
 
 #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 /* SPL options */
 #include "imx6_spl.h"
index 78d48bb2e10249ccd474991888c886b0d07e1765..de1ea8ff147bff7f2b095270d4b4f3554f038da3 100644 (file)
@@ -16,7 +16,7 @@
 
 /*
  * NOTE: This file must be kept in sync with arch/arm/include/asm/\
- *       imx-common/imximage.cfg because tools/imximage.c can not
+ *       mach-imx/imximage.cfg because tools/imximage.c can not
  *       cross-include headers from arch/arm/ and vice-versa.
  */
 #define CMD_DATA_STR   "DATA"