summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* MLK-10178-2 usb:ehci-mx7 add usb driver for i.MX7DYe.Li2015-04-29-0/+106
| | | | | | | | Add usb driver for i.MX7D. Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit c78f52798d6b7dda775d272c3ccb9899e548d3d6)
* MLK-10178-1 gpio:mxc_gpio add i.MX7D supportPeng Fan2015-04-29-3/+5
| | | | | | | Add CONFIG_MX7 for mxc gpio driver Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 6e3f8dc68f1606cbbcdb4997fc0bdf1ac8a3f3b6)
* MLK-10176-9 imx: mx7: add plugin boot supportYe.Li2015-04-29-0/+103
| | | | | | | | Add mx7_plugin.S to support building plugin boot image. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 8d15f44ca0c2d694b87eb6ab6db5f27496924b4a) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10176-8 imx: mx7: add HAB security supportYe.Li2015-04-29-0/+353
| | | | | | | | Add HAB files for secure boot and image athentication. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 2447bbcdd4ffcbdbd4ebed1b25e67ea753332d9d) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10176-7 imx: mx7: add system counter supportYe.Li2015-04-29-1/+156
| | | | | | | | | | Generic timer is added to mx7d, so add support for this. In uboot, only system counter is needed, the timer events are not needed. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 514a79581c6a46df445d69f1fcb2b3bff9584162) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10176-6 imx: mx7: Modify GPT timer driver for mx7Peng Fan2015-04-29-2/+9
| | | | | | | | | | | | Modify the GPT common platform driver for mx7 which only use 24Mhz OSC as clock source. Note: at default, the mx7d will use system counter as timer. The GPT is disabled. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 6e250796d6a07d84093eeae96e5a6e4c593cdb0b) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10176-5 imx: mx7: Update IOMUX v3 driver for LPSRPeng Fan2015-04-29-3/+17
| | | | | | | | | | | | Since mx7d introduces some LPSR IOMUX pins, add new base to IOMUX v3 driver for these LPSR pins. This patch also include commit b83bb7b6cf26a4bb8983ae89c284fb4018c89870 Signed-off-by: Fugang Duan <B38611@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 8aa92b831955c968f802286de561825227e761ce)
* MLK-10176-4 imx: mx7: Add arch level supportYe.Li2015-04-29-9/+592
| | | | | | | | | | | | | | | | | | | Introduce a new cpu type MXC_CPU_MX7D and relevant functions for mx7d. Implement the soc.c for various system level functions like: temperature check, arch init, get mac fuse, boot mode get/apply, etc. Additional, enable building imx common platform files for mx7d. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 47d65aa6bdd109fd9141b5a5d64ab9deeb9dd2b3) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: Makefile arch/arm/cpu/armv7/Makefile arch/arm/imx-common/cpu.c arch/arm/include/asm/arch-imx/cpu.h arch/arm/include/asm/imx-common/boot_mode.h
* MLK-10176-3 imx: mx7: Add clock supportYe.Li2015-04-29-0/+2270
| | | | | | | | | | | | | | | | | | Since a new CCM with clock root slice is introduced in mx7. Provide several APIs for configuring root slice in clock_slice.c Implement clock/PLL relevant functions for modules in mx7d to enable/disable/set/get clocks or PLLs. From mx7d, the clocks are initialized in function "void clock_init(void)", such as UART, USDHC, ECSPI, USB, WDOG, WEIM. These module don't have clock setting functions in driver and BSP, and assume the clock is setup before entering into u-boot. Because default root clock is 24Mhz OSC, we have to setup these default clocks. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 73b511503aef9675e58baadc0639d59c8395bcb4)
* MLK-10176-2 imx: mx7: Update IOMUX settings and definitionsYe.Li2015-04-29-0/+1320
| | | | | | | | Add mx7d pins for various IOMUX settins. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 25f508ff6891d8861e1fe49c4e2f840cff0040e0) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10176-1 imx: mx7: Add registers base address and definitionsYe.Li2015-04-29-0/+4100
| | | | | | | | | Add mx7 registers base address and relevant structure and definitions. Signed-off-by: Ye.Li <B37916@freescale.com> Acked-by: Jason Liu <r64343@freescale.com> (cherry picked from commit 05ad2b076ca7ba8c38cf34cab217de58f9a6a375) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-25 imx:imximage add plugin supportPeng Fan2015-04-29-52/+221
| | | | | | | This patch is from commit 441fd86d055c57b79257943449a8101b83e98c61 Signed-off-by: Nitin Garg <nitin.garg@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-24 imx:mx6 add get_boot_devicePeng Fan2015-04-29-0/+43
| | | | | | Add get_boot_device function. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-23 Add SECURE BOOT in cmd_bootm.cPeng Fan2015-04-29-0/+18
| | | | | | Add SECURE BOOT in bootm Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-22 imx:mx6sx_arm2 add mx6sx arm2 bspPeng Fan2015-04-29-0/+3529
| | | | | | | Add bsp and configuration file Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-21 imx:imx6sxsabreauto add bspPeng Fan2015-04-29-0/+1591
| | | | | | | Add bsp and configuration file Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-20 imx:mx6 add plugin supportPeng Fan2015-04-29-10/+2693
| | | | | | Add plugin support Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-19 imx:mx6qsabreauto update bspPeng Fan2015-04-29-112/+571
| | | | | | Update bsp and add configuration file Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-18 imx:mx6qarm2 update bspPeng Fan2015-04-29-11/+318
| | | | | | Update bsp and add configuration file Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-17 imx:mx6sabresd update bspPeng Fan2015-04-29-483/+934
| | | | | | Update bsp and add configuration file Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-16 imx:mx6sxsabresd update board and configPeng Fan2015-04-29-126/+697
| | | | | | | | | Update mx6sxsabresd board and config file Note: Fastboot Android support is not added. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-15 imx:mx6slevk update board codePeng Fan2015-04-29-14/+184
| | | | | | | | | | | Update board header and bsp code in board/freescale/mx6slevk Update board config file Note: Fastboot will be added in future Android config is not included. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-14 imx:mx6sx fix pad settingsPeng Fan2015-04-29-1/+5
| | | | | | Fix PAD_CTL_SPEED_LOW pad settings. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-13 imx:mx6 update header files in arch-mx6Peng Fan2015-04-29-25/+749
| | | | | | Update header files in arch/arm/include/asm/arch-mx6/ Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-59 iMX6SX: Add RDC mappings of masters and peripheralsYe.Li2015-04-29-0/+159
| | | | | | | | | Add the definitions for the RDC mappings on iMX6SX and include this file to "imx-rdc.h" Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit f4d42906c0db4d156e197781784d0ae010a364a5) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-12 imx:mx6 update habPeng Fan2015-04-29-9/+16
| | | | | | Update hab with imx_v2014.04 Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-11 mx6: clock: Modify GPMI clock to support mx6sxPeng Fan2015-04-29-0/+13
| | | | | | | | On mx6sx, the CCM register bits for GPMI are different as other mx6 platforms. Modify the GPMI clock function to support mx6sx. Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-10 imx:mx6sx add mx6sx support for pcie power downPeng Fan2015-04-29-0/+6
| | | | | | Add mx6sx support for pcie power down Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00325255 pcie:enable pcie support on imx6sx sdRichard Zhu2015-04-29-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Enable pcie support in uboot on imx6sx sd boards - enable_pcie_clock should be call before ssp_en is set, since that ssp_en control the phy_ref clk gate, turn on it after the source of the pcie clks are stable. - add debug info - add rx_eq of gpr12 on imx6sx - there are random link down issue on imx6sx. It's pcie ep reset issue. solution:reset ep, then retry link can fix it. Signed-off-by: Richard Zhu <r65037@freescale.com> (cherry picked from commit ec78595a24b5ff1020baa97b6d6e79a3a3326307) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: arch/arm/cpu/armv7/mx6/clock.c arch/arm/include/asm/arch-mx6/iomux.h drivers/pci/pcie_imx.c include/configs/mx6sxsabresd.h Note: There is an upstream patch 1b8ad74a6f8cea55a727dc4b399baac46d0daef1 to add support for mx6solox. This patch is to add more stuff from our vendor imx_v2014.04 branch.
* ENGR00319151-2 HAB: Add the HAB image authentication to bootzYe.Li2015-04-29-0/+9
| | | | | | | | | Since the zImage is used at default, add the HAB image authentication support in bootz to authenticate zImage. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 591100eec569dd1d54f61e9f49fe995f56a021eb) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-9 common: add sata commandPeng Fan2015-04-29-4/+177
| | | | | | Add sata command Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-8 env_mmc: add the dynamtic mmc dev supportPeng Fan2015-04-29-8/+14
| | | | | | | | | This patch add the support to load/save env to the slot which was used as the boot media by dynamic detection. Signed-off-by: Jason Liu <r64343@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-7 Auto check if boot from usbPeng Fan2015-04-29-0/+52
| | | | | | | | | | | If boot from usb, reset environment to default value. Auto apply mfgtools setting and boot mfgtools kernel. Signed-off-by: Frank Li <Frank.li@freescale.com> Signed-off-by: Nitin Garg <nitin.garg@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10035-2: supports NAND chips with oob size up to 744 byteAllen Xu2015-04-29-9/+17
| | | | | | | | | | | | | | | | | | Update the u-boot code to support NAND chips with oob size up to 744 byte. For the NAND flash MT29F32G08CBADA, which consists of 2 planes x 1064 blocks per plane. Obviously the block number is not power-of-2. But all MTD driver assumes the page per block and block per plane must be a power of 2 number. So the last 40 blocks in each plane must be truncated. Signed-off-by: Allen Xu <b45815@freescale.com> (cherry picked from commit 9045626dbc7798cc340f64699bc9bd35c537498a) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: include/linux/mtd/nand.h
* ENGR00325088 video: mxsfb: Disable LCDIF correctlyLiu Ying2015-04-29-5/+9
| | | | | | | | | | | | | | | | | | | | | Let's use the i.MX common miscellaneous reset API to reset the LCDIF block so that we may eliminate a random hang issue at the arch_preboot_os() stage when we disable the LCDIF. This patch also waits for a VSYNC interrupt to guarantee the reset is done at the VSYNC edge, which somehow makes the LCDIF consume the display FIFO(?) and helps the LCDIF work normally at the kernel stage. Tested-by: Jason Liu <r64343@freescale.com> Tested-by: Sandor Yu <R01008@freescale.com> Tested-by: Ye.Li <B37916@freescale.com> Tested-by: Guo Sally <b38912@freescale.com> Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit 45fa2ad38b846596e61ce8fc477713dede8a43e7) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 9d782aa487c4ffe096c94bbda5867b44afd6a440) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-60 GPIO: Modify driver mxc_gpio to support RDC SemaphoresYe.Li2015-04-29-0/+51
| | | | | | | | | | | | | | | | | | | | For GPIO group which shared by multiple masters, it may set in RDC to shared and semaphore required. Before access the GPIO register, the GPIO driver must get the RDC semaphore, and release the semaphore after the GPIO register access. When CONFIG_MXC_RDC is set, the features related to RDC semaphores is enabled in mxc_gpio driver. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 84d63e2e2ce12f714e88baad8b2325684614a7c1) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: drivers/gpio/mxc_gpio.c (cherry picked from commit c9943b9c8a78bb2c9886bfe582e82978387d8dee) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-33 gpmi: use the same ECC strength as used in the kernelYe.Li2015-04-29-19/+13
| | | | | | | | | | | | | | | | | Current code use the hardcoded ECC strength which is not aligned with the kernel. This patch use the same ECC strength as used in the kernel. We do not support the NAND whose OOB size is larger then 512bytes. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 8b3db31d607be02409b1f4937d91241f48229e96) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: drivers/mtd/nand/mxs_nand.c
* ENGR00315499-22 video: ipu: wait for DP SF end irq when disabling sync BG flowLiu Ying2015-04-29-3/+3
| | | | | | | | | | | | | | | Instead of waiting for DC triple buffer to be cleared, this patch changes to wait for a relevant DP sync flow end irq when disabling sync BG flows. In this way, we align the implement to the FSL internal IPUv3 driver. After applying this patch, the uboot hang up issue at the arch_preboot_os stage on the MX6DL platforms is not observed any more. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> Signed-off-by: Nitin Garg <nitin.garg@freescale.com> (cherry picked from commit 56d72035946c40f45d2f49ccb1520734e34ecc89) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit d8ac526681589c62287d014fedee4c9e64fbca66) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10774-6 imx: add mxc_keybPeng Fan2015-04-29-0/+834
| | | | | | | | | | | | This patch is from commit b79371410aa44972dea53d5c19d256170928dcbd "ENGR00315499-9: ARM:iMX6SL EVK: Add keyboard support" Since board file already added related bsp and pin settings, this patch only add driver. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Nitin Garg <nitin.garg@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315499-18 driver:MAX7310: Add GPIO expander driver for MAX7310Ye.Li2015-04-29-0/+241
| | | | | | | | | | | | | | | | | Implement simple functionalities for MAX7310 GPIO input and output. Because MAX7310 is a off-chip device and need to co-exist with on-chip GPIO, new APIs are added specifically for expander device. CONFIG_MAX7310_IOEXP is used to enable the MAX7310 driver. The I2C related configurations also need to set together. Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Nitin Garg <nitin.garg@freescale.com> (cherry picked from commit e3b699dab2c92268799b56c28c6a8fcda4f6110b) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: drivers/gpio/Makefile
* MLK-10774-5 Add EPDC splash screen for MX 6DL SabreSD and 6SL EVKPeng Fan2015-04-29-1/+1721
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EPDC splash screen feature for MX6SL EVK, and MX6DL SABRESD board. - Currently, splash screen consists of a simple black border around a white screen. Done this way to save in memory footprint. - EPDC splash screen is disabled by default in the config file for MX6DL_SABRESD and MX6SL_EVK. If left enabled, the U-Boot image will not boot correctly (hang), since some additional content on the boot device (waveform file) is required for EPDC splash to work correctly. Please refer to Linux Reference Manual for how to flash WAVEFORM file. Signed-off-by: Robby Cai <R63905@freescale.com> Signed-off-by: Nitin Garg <nitin.garg@freescale.com> (cherry picked from commit b8ab9b3eabb94bbbc1eea63e7c0e2a87d2d645f4) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: arch/arm/include/asm/arch-mx6/mx6sl_pins.h board/freescale/mx6sabresd/mx6sabresd.c board/freescale/mx6slevk/mx6slevk.c drivers/video/Makefile include/configs/mx6sabresd.h include/configs/mx6slevk.h include/lcd.h drivers/video/Makefile
* MLK-10774-4 fsl:qspi update qspi driverPeng Fan2015-04-29-596/+684
| | | | | | Use freescale vendor qspi driver but not upstream qspi driver Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00328312 i2c: imx: Optimize the i2c device recovery solutionFugang Duan2015-04-29-2/+25
| | | | | | | | | | | | | | | | | From i2c spec, if device pull down the SDA line that causes i2c bus dead, host can send out 9 clock to let device release SDA. But for some special device like pfuze100, it pull down SDA line and the solution cannot take effort. The patch just add NACK and STOP signal after 8 dummy clock, and pmic can release SDA line after the recovery. Test case catch 375 times of i2c hang, and all are recovered. Signed-off-by: Fugang Duan <B38611@freescale.com> (cherry picked from commit 53118db42d201d36ca9067b4bb0e2702399e100b) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00321435-1 imx-common: cpu: Disable mxsfb when necessaryLiu Ying2015-04-29-0/+4
| | | | | | | | | | The kernel may break the display pipeline at boot stage and introduce various display artifacts, so let's disable mxsfb in uboot when necessary. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit 539b8416299ec1ae3f57f866dd3f016bdfaa6875) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-81 gis: Add gis moduleYe.Li2015-04-29-0/+640
| | | | | | | | | | | | Add gis module, current gis is support vadc input. Add power down function to lcdif driver. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit a007b00dd8ef9f773dfdebef0b1deb0990281793) Conflicts: drivers/video/Makefile
* ENGR00315894-80 pxp: Add pxp moduleYe.Li2015-04-29-0/+324
| | | | | | | | | | Add pxp module. Support csc between YUV444 and RGB888 and scaling. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 4c6e1f9ed1b2f5c98a34502b44b6414593fdd290) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-79 csi: Add csi moduleYe.Li2015-04-29-0/+425
| | | | | | | | | Add csi module. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 854ae26758ec8132ef749b98645dd2f43b84e5e2) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-78 vadc: Add vadc moduleYe.Li2015-04-29-0/+602
| | | | | | | | | | Add vadc module. Both PAL and NTSC mode can work. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 03c31ae30c1e81c99f6824221e4801433445e04a) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-70 iMX6SX:Video Update MXS LCDIF driverYe.Li2015-04-29-13/+67
| | | | | | | | | | | | | | Add a new interface "mxs_lcd_panel_setup" to setup fb parameters and specifies the LCDIF controller for multiple controllers of iMX6SX. Pass fb parameters via "videomode" env remains work if the new interface is not called before video initialization. Modify LCDIF clock interface "mxs_set_lcdclk" to support multiple LCDIF controllers on iMX6SX. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 054fed6bab5b05a054c7e3cb5362635a40e6ee18) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* ENGR00315894-58 RDC: Add an iMX platform driver for RDC-SEMAYe.Li2015-04-29-0/+319
| | | | | | | | | | | | | | | | | | | | The RDC driver provides interfaces for setting peripherals and masters at BSP initialization, before using the peripherals driver. Another interfaces for lock/unlock RDC semaphore and permission check. The driver assumes boot CPU which runs u-boot is in Domain 0 (default setting on boot). Users should not set it to other domains. The peripherals ID and masters ID may change on different chip, each should provide definitions of the IDs and be included in "imx-rdc.h". Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 964b2672bfbec14629f5767e59e73fd3bb185e3a) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: arch/arm/imx-common/Makefile arch/arm/include/asm/arch-mx6/imx-regs.h