summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* MLK-10215 Add elan init in i.MX6SL-EVK boardHaibo Chen2015-04-29-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | EPDC board contain a elan touch screen, this screen is a i2c slave. If this EPDC board connect to i.MX6SL-EVK board, after uboot boot up, if we do i2c operation, like i2c probe, then the i2c bus block. This is due to the elan touch screen i2c slave. This device needs to do some initialization opearation before its i2c operation, otherwise this i2c device pull down the i2c clk line, and make the i2c bus hang. This means elan needs a special flow on i2c before its address is acked, otherwise the i2c bus will be hang. This patch is a workaround, it add a void function which is defined as a weak symbol in i2c driver, and it is called before every i2c operation. In mx6slevk, this function was overwrite to execute elan initialization. So that, for mx6slevk board, it will initialize elan before every i2c operation, but for other boards, it just work as before. Signed-off-by: Haibo Chen <haibo.chen@freescale.com> (cherry picked from commit 4c587b29c423ce61b2471ed20f31ff533d9d8a39) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: arch/arm/include/asm/arch-mx6/mx6sl_pins.h board/freescale/mx6slevk/mx6slevk.c
* MLK-10370: imx7d-12x12-arm2 imximage: update dcd table for lpddr3Adrian Alonso2015-04-29-14/+22
| | | | | | | | | | | * Update DCD table for lpddr3 @400Mhz * Boot kernel linux and run memtester for memory stress memtester 1G 100000 Signedoff-by: Ye.Li <B37916@freescale.com> Signed-off-by: Adrian Alonso <aalonso@freescale.com> (cherry picked from commit 7cbab5830d486733a691be104cbc2be494b00776) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10363-2 imx: mx7: Enable SNVS clockYe.Li2015-04-29-0/+2
| | | | | | | | Enable SNVS clock in clock_init function as default enabled clock. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit df1e45b3098f737d68517c51032472d12fd87666) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10362 imx: mx7dsabresd: Add support for MX7D SABRESD boardPeng Fan2015-04-29-0/+1620
| | | | | | | | | | | | | | | Add i.MX7D SABRESD board BSP codes, with enabled modules: UART, PMIC, USB/OTG, SD, eMMC, ENET, I2C, 74LV IOX. Build target: mx7dsabresd_config Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Fugang Duan <B38611@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 3bf52a153e2964d4fdc17f0e8cb816686cbb6c2b) Conflicts: boards.cfg
* MLK-10361 imx: mx7d arm2: Change to use WDOG_B resetYe.Li2015-04-29-5/+34
| | | | | | | | | | | | | | | | | | | | | The default u-boot reset is a internal WDOG reset (warm reset on i.MX6) which does not have power and DDR reset. So the peripherals and DDR may meet problem. When using the internal WDOG reset on i.MX7D ARM2 boards, we meets two DDR issues: 1. On 12x12 ARM2, sometimes the system may hang in DCD because the DDRC Operating Mode does not become to normal. 2. On 19x19 ARM2, the reset always brings system to USB download because the DDR3 turns to unstable. On the i.MX7D ARM2 board, the WDOG_B signal connects to POR_B or PMIC_PWRON. This gives a chance to use a stronger reset. So in this patch, we set the IOMUX for WDOG_B pin and enable WDOG_B signal output in WDOG WCR register. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 1192501c1fcf3b266eb22639a6bc93ac7c03b367) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10351 imx: mx7d: Add 19x19 DDR3L ARM2 board supportYe.Li2015-04-29-0/+1098
| | | | | | | | | | | | | | | Add BSP codes, configuration head file and build target for 19x19 DDR3L ARM2 board with basic functions: ENET2, I2C, SD/eMMC/MMC, USB, QSPI, ECSPI, pfuze3000 PMIC. Build target: mx7d_19x19_ddr3_arm2_config Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 58fd869e3097b7461fbfae3d94e3ebbd30ae2474) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: boards.cfg
* MLK-10200 imx: mx7: Add M4 booting supportYe.Li2015-04-29-2/+18
| | | | | | | | Implement the auxiliary core booting for Cortex M4 on i.MX7 Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit c1c8ba37d87493c16ec1a12bc36d47f909e0e733) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10195 imx: mx7: Fix build warning related to mxs_lcd_initYe.Li2015-04-29-1/+1
| | | | | | | | | | | | | Fix the warning below by adding function declare: drivers/video/mxsfb.c: In function 'mxs_lcd_init': drivers/video/mxsfb.c:92:2: warning: implicit declaration of function 'mxs_set_lcdclk' [-Wimplicit-function-declaration] mxs_set_lcdclk(panel->isaBase, PS2KHZ(mode->pixclock)); Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 615af07d960d9ec17708fb1712b2362dbaeab121) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10191-3 imx: mx7: Add support for i.MX7D 12x12 LPDDR3 ARM2 boardYe.Li2015-04-29-0/+1080
| | | | | | | | | | | | | | | | Add BSP codes, configuration head file and build target for 12x12 LPDDR3 ARM2 board with basic functions: ENET, I2C, SD/eMMC/MMC, USB, LCD Splash screen, QSPI, ECSPI, pfuze3000 PMIC. Note: pmic and video is still not upstream way Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit ac0d51ef07fdec880e6da318c08d521506640efa) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Conflicts: boards.cfg
* MLK-10191-2 imx: mx7: Add common head file for i.MX7D ARM2 boardsPeng Fan2015-04-29-0/+332
| | | | | | | | Add mx7d_arm2.h for common part of all i.MX7D arm2 boards Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 6cc15cf8c4e1f9a08130c5e232f23af75407fa50) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10191-1 imx: mx7: Add i.MX7 platform common head fileYe.Li2015-04-29-0/+20
| | | | | | | | Add common head file mx7_common.h for all i.MX7 platform Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit e38c9a7a543890e0879f89627a3f404d8068d602) Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10186-2 imximage: support new commandPeng Fan2015-04-29-18/+88
| | | | | | | | | | | | | | | | | Since rom code supports clear bit and check data command, and new ddrc needs such commands, add clear bit and check data command in imximage.c. CHECK_DATA 4 xxxx bit This command is dead loop until bit set at address xxxx. CLR_BIT 4 xxxx bit This command is to clear bit at address xxxx. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 257600d197bf9a58a2b8d08419296aaf901d850d) Conflicts: tools/imximage.c
* MLK-10186-1 imximage: add fixed IVT offset supportYe.Li2015-04-29-0/+10
| | | | | | | | | | | | Since from mx7, we use fixed IVT offset for all boot devices. Introduce a new configuration CONFIG_IMX_FIXED_IVT_OFFSET for this. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 88e0a3552b08627b18d98380a32dbafacb18854b) Conflicts: tools/imximage.h
* MLK-10178-10 mtd:nand:mxs fix potential dcache issuePeng Fan2015-04-29-1/+7
| | | | | | | | | | | DCIMVAC is upgraded to DCCIMVAC for the individual processor (Cortex-A7) that the DCIMVAC is executed on. We should follow the linux dma follow. Before DMA read, first invalidate dcache then after DMA read, invalidate dcache again. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit dddb52ebdc6c4919da0103a364563dbe2c100874)
* MLK-10178-8 mmc:fsl_esdhc fix dcache issuePeng Fan2015-04-29-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | DCIMVAC is upgraded to DCCIMVAC for the individual processor (Cortex-A7) that the DCIMVAC is executed on. We should follow the linux dma follow. Before DMA read, first invalidate dcache then after DMA read, invalidate dcache again. With the DMA direction DMA_FROM_DEVICE, the dcache need be invalidated again after the DMA completion. The reason is that we need explicity make sure the dcache been invalidated thus to get the DMA'ed memory correctly from the physical memory. Any cache-line fill during the DMA operations such as the pre-fetching can cause the DMA coherency issue, thus CPU get the stale data. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Nitin Garg <nitin.garg@freescale.com> Signed-off-by: Jason Liu <r64343@freescale.com> (cherry picked from commit 13cdb96bc52b3079ba91a08c1704307e5598ee59) Conflicts: drivers/mmc/fsl_esdhc.c
* MLK-10178-7 imx:wdog add imx7 supportPeng Fan2015-04-29-1/+1
| | | | | | | | | | Add mx7 in driver/watchdog/Makefile to support watchdog driver for imx7 Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 19d698109fd136586b292430989e0f6edb723db6) Conflicts: drivers/watchdog/Makefile
* MLK-10178-6 net:fec_mxc support shared MDIO busYe.Li2015-04-29-0/+4
| | | | | | | | | There are two FEC controller on MX7, and each MDIO bus can be shared with other. So add a configuration for this case. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit d31b4fcc6175b1bc9a2cf672678da212b133af17)
* MLK-10178-5 ocotp:mxc add i.MX7D supportPeng Fan2015-04-29-2/+74
| | | | | | | | | | | | Ocotp of i.MX7D has different operation rule. This patch is to add support for i.MX7D ocotp. Note: DIV_ROUND is changed to DIV_ROUND_CLOSEST Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit d0c3564b6a0f430254edcd8db1f33588bbeccb08)
* MLK-10178-3 i2c:mxc Add i2c support for i.MX7DPeng Fan2015-04-29-1/+24
| | | | | | | | | | Add i2c support for i.MX7D. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit b52cb9d40e71305b7a11b0bbc68fddd8e84e3b17) Conflicts: drivers/i2c/mxc_i2c.c
* 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>