u-boot.git
4 years agoMLK-20228 mx7ulp: Read chip ID from SIM register
Ye Li [Wed, 7 Nov 2018 05:12:39 +0000 (21:12 -0800)]
MLK-20228 mx7ulp: Read chip ID from SIM register

Since from B0 TO, there is a Mirror of JTAG ID register added in
SIM. We can read the part revision from this register.
Update codes to use this register.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit de14e88698b9ae9b0a9ac674f16d65b3ceb4ccc2)
(cherry picked from commit 0d0d9acc04972792890776e3c066f05a349bb623)
(cherry picked from commit 00dfa82643b4e06c4c5e3830d35a82801e74ad81)
(cherry picked from commit 6617b9a8770b3df01df75dc6aaf6f5e75d1f5d72)
(cherry picked from commit 496020f0f0947e2762d8fb921baf3120b8520bec)

4 years agoMLK-20116-3 mx7ulp_evk: Remove GPIO codes for USB ID
Ye Li [Tue, 30 Oct 2018 04:48:38 +0000 (21:48 -0700)]
MLK-20116-3 mx7ulp_evk: Remove GPIO codes for USB ID

The iMX7ULP B0 chip has added more pins for muxing USB ID. The A3 board
follows it to exploit PTC13 for USB ID, so we don't need to use GPIO
any longer. The USB driver can recognize the USB mode from USB PHY.

After this change, old boards with design using GPIO for USB mode won't
be supported.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 706b1a41b73d9604d4a590173f86fb398a908406)
(cherry picked from commit 8302b13924a1e5c1ed356de6a9ce62198160c307)
(cherry picked from commit 362aaec61fc9baa0f701fcdafa95f40cb13b746d)
(cherry picked from commit aa167befc7f00d11adce75635c66d093e5f29307)
(cherry picked from commit bb8f35dd2c4e0a6b9ff9e340578be9bbda964455)

4 years agoMLK-20116-1 imx7ulp: Update iomux pins header file for Rev B0 chip
Ye Li [Tue, 30 Oct 2018 04:37:24 +0000 (21:37 -0700)]
MLK-20116-1 imx7ulp: Update iomux pins header file for Rev B0 chip

i.MX7ULP B0 silicon has below updates in iomux

  - GPIO function input buffer enable (IBE)/output buffer enable (OBE) is
    now controlled by RGPIO module. IOMUXC IBE/OBE is used as an override.
  - LPUART2_TX (I/O) to PTB12 (ALT4)
  - LPUART2_RX (I) to PTB13 (ALT4)
  - USB0_ID (I) to PTC13 (ALT11), PTC18 (ALT11) and PTC19 (ALT10)
  - VIU_DE (I) to PTC18 (ALT12), PTC19 (ALT12) and PTE5 (ALT12)
  - RTC_CLKOUT (O) to PTB5 (ALT11) and PTB14 (ALT11)
  - SEC_VIO_B (I) to PTB4 (ALT11)
  - Added new Input Selection Registers
      PSMI1_USB0_ID Address: 0x40ac_0338 To select USB_ID input pad/source
      PSMI1_VIU_DE Address: 0x40ac_033c To select VIU_DE input pad/source

Copy the imx7ulp-pinfunc.h from latest kernel dts
(commit 18cdeadfe1967ea33d3bdfc7ccead6d6d06a98a6), and update
the mx7ulp-pins.h accordingly.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5e3da4cf8e217e7efe683bc63114e45927ebb28b)
(cherry picked from commit 459c2fe202175e7201b4b863eb6d98d15406d923)
(cherry picked from commit 20c7ae29346df608836df3efa4511af4a58b4f21)
(cherry picked from commit 69d1dab14fb791da23a084d844b097d9d842ca91)
(cherry picked from commit 591acc7880af3e151e2adff1f1e94c70a2dc8a42)

4 years agoMLK-19767-1: imx7ulp: configs: Enable DEFAULT_FDT_FILE
Shenwei Wang [Mon, 1 Oct 2018 13:50:49 +0000 (08:50 -0500)]
MLK-19767-1: imx7ulp: configs: Enable DEFAULT_FDT_FILE

Specify the default dtb file for kernel boot per i.MX7ULP
board config.

Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
Reviewed-by: Frank Li <Frank.li@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 3fba1c1a76cadfe0177e61a85eac3da10ee086e0)
(cherry picked from commit 013eb1fdfdb33df19a0917fd554160a84ec45dd1)
(cherry picked from commit 6052c4d6059f7f545f2f6d73bf77dd4fc5687130)
(cherry picked from commit 25bc40364344a414282c16052d044f7000c94aa8)
(cherry picked from commit 734368dc183a9d8e3b9fb46d30dac5efe4639556)

4 years agoMA-12724 imx7ulp: Correct earlycon parameter
Luo Ji [Fri, 14 Sep 2018 08:02:55 +0000 (16:02 +0800)]
MA-12724 imx7ulp: Correct earlycon parameter

Default address of earlycon parameter is not correct,
use correct value for imx7ulp_evk.

Test: imx7ulp_evk boots ok.

Change-Id: I2cecb6bfacca573013313ba4ae3783784ccfd506
Signed-off-by: Luo Ji <ji.luo@nxp.com>
(cherry picked from commit 9dce3365b8ea0cbdaed06f0c9b98c98b2f150c5a)
(cherry picked from commit c727966e6688fd3de199de1b631a8fd57a8c7149)
(cherry picked from commit 9f27514d69a46d3d5e60e57feee47267d6977260)
(cherry picked from commit 1c3028b34e35a6ca3b9641d7122e8be4531d4d2f)

4 years agoMLK-18939 mx7ulp_evk: Fix mtest end address issue
Ye Li [Fri, 27 Jul 2018 14:03:47 +0000 (07:03 -0700)]
MLK-18939 mx7ulp_evk: Fix mtest end address issue

When TEE is enabled, the high 32MB memory is reserved to TEE. So the
mtest end address 0x9e000000 will overlay with u-boot runtime text and data.

Fix the issue by changing the mtest end to half of DDR size.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 9b56f22639703bd70bfdd1de0cbdcef2b80f0bff)
(cherry picked from commit e9c1c97f64df33eaded9f78268782a246010928f)
(cherry picked from commit 87e7df87b7818052a8c915a5eaeb468d22004383)
(cherry picked from commit 149c3d17879749fd43935893130ccdb3530bc025)
(cherry picked from commit 60aac7b7aed2d708c01c0fe2f41dc52daa587737)
(cherry picked from commit 4ae5fb7f3c5c862107d814e107142eb2c39a8e19)

4 years agoMLK-18318: mx7ulp: Enable QSPI interrupt as a wakeup source on MX7ULP
Fabio Estevam [Mon, 14 May 2018 16:46:58 +0000 (13:46 -0300)]
MLK-18318: mx7ulp: Enable QSPI interrupt as a wakeup source on MX7ULP

MX7ULP needs to have the QSPI interrupt configured as a wakeup source
in the SIM_WKPU_WAKEUP_ENABLE register, otherwise the QSPI interrupts
do not wakeup the CPU from idle mode leading to poor performance in
Linux.

The SIM_WKPU_WAKEUP_ENABLE register only exists in B0 silicon, so
make sure to only write to this register in the B0 version (or greater).

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
(cherry picked from commit 1ab33446d6843f560fb6d14c781f6417225f8f3d)
(cherry picked from commit 8116f34387f8164dd72656fb8278e6df9fdf4c05)
(cherry picked from commit 3d64768b1b1064aed71974842a781b69ee34f8c9)
(cherry picked from commit 25b73de874e3b66e79a9f6bcb01714aeab7568a6)
(cherry picked from commit a704c61c8ffa0f8a2ad26c1cc3cdc549dcdb7487)

4 years agoMLK-14606 mx7ulp: Modify ENV offset to 896K
Ye Li [Mon, 9 Apr 2018 09:06:16 +0000 (02:06 -0700)]
MLK-14606 mx7ulp: Modify ENV offset to 896K

Since the u-boot size increases after using OF_CONTROL to including DTB,
we have to adjust ENV_OFFSET to 896K for SD/eMMC/FLASH.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 9d2df7407c58cd8b29fcbf57144e8ad9d8795207)
(cherry picked from commit b2c8c63fe7eff0cd5aea875ddc94a2f70d42d6cd)
(cherry picked from commit 43c66ac2138ec3414d2300ec82f7e65f5081b668)
(cherry picked from commit fd53b1346dc1186ea6f4d28f14397e3303e4f8ff)

4 years agoMLK-17586-3 i.MX7ULP: change USDHC clock rate
Haibo Chen [Wed, 14 Mar 2018 09:15:23 +0000 (17:15 +0800)]
MLK-17586-3 i.MX7ULP: change USDHC clock rate

Change USDHC0 and USDHC1 per clock source from APLL_PFD1,
and set the APll_PFD1 clock rate to 352.8MHz.

Also gate off APll_PFD1/2/3 before boot OS, otherwise set
the clock rate of APll_PFD1/2/3 during OS boot up will triger
some warning message.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
(cherry picked from commit 07ef0fab23204684d82f27baf721a72b247f30c5)
(cherry picked from commit 1c30a73542990afbe48bf7a398baba9c5efaf4fe)
(cherry picked from commit 0e4ce4b6b3f8d06f5b63850e04a1e4deb9b07624)
(cherry picked from commit 113a509e4d4ea84b55b296efa5f760b7192f9487)
(cherry picked from commit e01af8fc7daf0700c13f46e985e2e956f753feff)

4 years agoMLK-17897: mx7ulp: Add ARCH_MX7ULP to IMX_HAB dependency
Breno Lima [Tue, 20 Mar 2018 13:09:47 +0000 (10:09 -0300)]
MLK-17897: mx7ulp: Add ARCH_MX7ULP to IMX_HAB dependency

Add ARCH_MX7ULP as a CONFIG_IMX_HAB dependency, so we can enable
IMX_HAB on mx7ulp

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit d4c01cd3f6f5ba59ca17ebf52f610f629895ac7a)
(cherry picked from commit 4ba6e5aa05ec8872426aa68da3879e8fcd835710)
(cherry picked from commit 78e717c7e0897e759abdbe5bf28b46ae56d403ee)
(cherry picked from commit 80facaa8dfd9b199965c3c46a08f32f6dd1e646c)
(cherry picked from commit b34d12ec68f9345bade97cb0c0f96741933ea2f8)

4 years agoMLK-15087 mx7ulp_evk: Add m4 boot defconfig
Ye Li [Wed, 14 Jun 2017 13:19:06 +0000 (08:19 -0500)]
MLK-15087 mx7ulp_evk: Add m4 boot defconfig

Add back the defconfig to boot M4 in single mode, because some customers
are using the defconfig during development.

Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit ad2298d04fe2443e2b60114001523555d0cd5a50)
(cherry picked from commit 26697788474a1a38d84679a9a6b86a6b455cbd0b)
(cherry picked from commit 2d9ef1d76fa148cd6b0c40b33550e923e7ea8b2d)
(cherry picked from commit c9952714224712e06112b26adb2d5b9d14c48446)
(cherry picked from commit 60ad9ecdc48f273123ceabaf49b51cc674bd1a6d)

4 years agoMLK-14445-9 mx7ulp_evk: Add eMMC reworked board support
Ye Li [Fri, 17 Mar 2017 09:17:59 +0000 (17:17 +0800)]
MLK-14445-9 mx7ulp_evk: Add eMMC reworked board support

Add build configuration and DTS file to enable eMMC for eMMC reworked
EVK board.
Because the eMMC DTS file has QSPI node disabled, so we change to use
non-DM QSPI driver.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 9ae0e03eb829f694d26caec22f91d1f0fdba980d)
(cherry picked from commit 29a10734150e91d3b5596f11a7533cb52dc5a4d2)
(cherry picked from commit 6d8c9e8567eff4f5be860bc5f0e48a03e368c653)
(cherry picked from commit 495ca96505f1e4070cba4aac1891389e96f86ae8)
(cherry picked from commit c1ad2dcdf74ed7c811e10c6a0f413a7eed12723d)

4 years agoMLK-14445-8 mx7ulp_evk: Add dynamical MMC device detection
Ye Li [Fri, 17 Mar 2017 08:23:46 +0000 (16:23 +0800)]
MLK-14445-8 mx7ulp_evk: Add dynamical MMC device detection

Add board_late_mmc_env_init to support MMC device detection for environment
variables.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 6c2fe5b60692e7d0e86383c44792e5f2938bfa14)
(cherry picked from commit 74f5fffe9aee3e1434b63b95e33e7ecc7e5a2b08)
(cherry picked from commit 74b505dd70fc5ba5bb00ec0359ec6f79be757388)
(cherry picked from commit b3f5ed546092f557e0a68c78e181990e0a637af8)
(cherry picked from commit 1ae79a71818aec55613456b408e3e1fa4d0e7be3)

4 years agoMLK-13547 configs: mx7ulp_evk: enable ethernet boot support
Peter Chen [Wed, 16 Nov 2016 06:07:53 +0000 (14:07 +0800)]
MLK-13547 configs: mx7ulp_evk: enable ethernet boot support

Since we can use USB ethernet instead of local ethernet, add ethernet support
for it. To use USB ethernet function at u-boot, just plug in Micro-AB cable
at USBOTG1 port with USB2Ethernet adapter connected.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
(cherry picked from commit 60ffddf87cf6b8502c5d5fc6540364adfd66ebb3)
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 63c2e1de37e1e24f35279f50efa5a330e2cb3d07)
(cherry picked from commit c82f3bef0aa0cba4937eb6c39501e446dca01746)
(cherry picked from commit b9d238f6e240e189299e49654ca3abf53e92cb28)
(cherry picked from commit a99fd1b215cf176377a8e0a35d9bbe7b080cae13)
(cherry picked from commit d261a139c946f3117aef9cdbbbe78b8f46d61952)

4 years agoMLK-14445-6 mx7ulp_evk: Add USB OTG0 support
Ye Li [Thu, 16 Mar 2017 09:02:56 +0000 (17:02 +0800)]
MLK-14445-6 mx7ulp_evk: Add USB OTG0 support

Porting codes to support USB OTG0 on the EVK board. Convert
to use DM USB driver.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit b4e01a67a0740c524e7522da7ace0488f86261db)
(cherry picked from commit 23144983d3347f8f91695cea73aab8558cc66629)
(cherry picked from commit a5d3e7a334689b5c7b4e99f10c1a6044e4775699)
(cherry picked from commit 4906e4b9ff0e75ad517fa3ed3d49430d3533d3f6)
(cherry picked from commit c315588cf84d2a4b61ad11827444891edf17a35a)

4 years agoMLK-14445-3 mx7ulp_evk: Enable wdog driver for reset cpu
Ye Li [Thu, 16 Mar 2017 05:40:01 +0000 (13:40 +0800)]
MLK-14445-3 mx7ulp_evk: Enable wdog driver for reset cpu

Enable the CONFIG_ULP_WATCHDOG in defconfig, so that reset command
can work.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit da1c290f0b890fafeb8ce29b53b764eaee53520b)
(cherry picked from commit 7a4ba3eb22732ba0d4cc47552413bad8c1d94dbe)
(cherry picked from commit 1a471f37b2ea74c1be5bde861576aa2bc4a679b6)
(cherry picked from commit 022a7297569555139c9170f52bbeb1378333e669)
(cherry picked from commit 8b32ba6819e181f3afe533ab41612700b19ce69d)

4 years agoMLK-14445-2 mx7ulp_evk: Add QSPI flash support
Ye Li [Thu, 16 Mar 2017 03:25:35 +0000 (11:25 +0800)]
MLK-14445-2 mx7ulp_evk: Add QSPI flash support

Porting the QSPI flash board support from v2016.03, and convert to use
DM QSPI driver.
Since we need to support QSPI at default in u-boot, change the default
DTS file to qspi enabled DTS.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 41895cd598be6c4a64fc4fec521120e4962abc28)
(cherry picked from commit b4698ce0e5b6952a88702075ce905a059da277d9)
(cherry picked from commit 2fa81543fa49924a92a470cce62fbca7544ecd56)
(cherry picked from commit e8795e4dc6eb5f3c9583e1d787368ff1e1ffb48f)
(cherry picked from commit 014ffa93579624d52571e0914af7f9166a73d5bb)

4 years agoMLK-13450-7 mx7ulp: Add M4 core boot support when using single boot mode
Ye Li [Mon, 14 Nov 2016 09:58:04 +0000 (17:58 +0800)]
MLK-13450-7 mx7ulp: Add M4 core boot support when using single boot mode

The single boot mode in MX7ULP will only boot up A7, the M4 is running in ROM
by checking entry from SIM0 GP register.

In this patch, We bind M4 image with u-boot.bin by allocating a section for m4 image.
So the whole image (included M4 image) will be loaded by A7 ROM into DDR. Then
when u-boot is up, it will try to load M4 image into TCML and boot it there.

Since M4 image will not be relocated in u-boot codes, we must load it during
board_f. Current implementation put it in arch_cpu_init to get M4 booted
as quick as possible.

We requires the M4 image with IVT head and padding embedded, not a RAW binary. The
image should be same as what is used for M4 QSPI boot in dual boot mode.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 04163dbd4f6190f310fff17b53b4bc7b8370ba89)
(cherry picked from commit 81b5ea14493ef25a6cca22bc5651ec3e93e941f3)
(cherry picked from commit 1e4414da2e9a671896af1af887ab710489a2007e)
(cherry picked from commit b3a50e57aafe2830388d1295a8583c4e2515594b)
(cherry picked from commit 2b9416b3dcd0eb85504aece94a603dc9aca6021e)
(cherry picked from commit aadc312ee92c6f6ab2c427ca5eec2a7a02281e50)

4 years agoMLK-13602-3 mx6ullevk: Enable module fuse checking for mx6ull boards
Ye Li [Tue, 13 Dec 2016 07:33:41 +0000 (15:33 +0800)]
MLK-13602-3 mx6ullevk: Enable module fuse checking for mx6ull boards

Enable the module disable fuse checking configurations, and ENET fuse checking during
ENET setup.

Signed-off-by: Ye Li <ye.li@nxp.com>
Tested-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit d2192a3909be8ab9433082e7c04c917489b28e25)
(cherry picked from commit 5fa7d431db1c5eda903f211a99c426d8d57293bd)
(cherry picked from commit 5fc6fe6b0f85f61bc60712af5b8cd55e7b8b0789)
(cherry picked from commit 522748cbcfc2ddd5a3490fe74683926048ff099d)
(cherry picked from commit 176e91bcdc49025cf127b4226ec0e2476ebafdf0)
(cherry picked from commit 9c42a6b549b1f5bc84fff10f0590e94111771422)

4 years agoMLK-12483-5 mx6ul: Enable module fuse check EVK board
Ye Li [Tue, 15 Mar 2016 14:16:54 +0000 (22:16 +0800)]
MLK-12483-5 mx6ul: Enable module fuse check EVK board

Enable the configurations CONFIG_MODULE_FUSE and CONFIG_OF_SYSTEM_SETUP for
module fuse check. And modify board level codes for SD, FEC and EIM.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 9232e9f7637afa3b71b43ab2d1361582ec5a080a)
(cherry picked from commit 687b586bf7d3b0d2f796c8ea768e4fb450079adb)
(cherry picked from commit f1cdd3b004b15d950b35f3ef625af23c2f106f5a)
(cherry picked from commit e5ac66df336a1ce45f315ada5d8f1a73e8f22632)
(cherry picked from commit f43662fa184193d165973f0c50708f818b120708)
(cherry picked from commit 5a635cad834def6d5a624311e6db2666c6617276)

4 years agoLF-3483-4 imx: Fix module fuse build break
Ye Li [Tue, 6 Apr 2021 08:20:14 +0000 (01:20 -0700)]
LF-3483-4 imx: Fix module fuse build break

Wrong variable name was used, fix it to pass build

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 14546f009decf0b65a0d877326ad852116d99b6e)

4 years agoMLK-12483-4 mx6: Modify drivers to disable fused modules
Ye Li [Wed, 16 Mar 2016 05:50:54 +0000 (13:50 +0800)]
MLK-12483-4 mx6: Modify drivers to disable fused modules

Add the fuse checking in drivers, when the module is disabled in fuse,
the driver will not work.

Changed drivers: BEE, GPMI, APBH-DMA, ESDHC, FEC, QSPI, ECSPI, I2C,
USB-EHCI, GIS, LCDIF and EPDC.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 1704e116f9b39aeb99201919a18bc2b1e19a980e)
(cherry picked from commit 2d3b5df8530cd5ef883750378838dea7c40259af)
(cherry picked from commit 6e8c9ae136bee8ec0121c1db4b935510caad09db)
(cherry picked from commit 99b54a6965904a879afdb6883a519de726cb4e96)
(cherry picked from commit 0633c42f9465e4484d7c9db4de1c0d3910e6a46e)

4 years agoMLK-18156-3 configs: mx6ullevk: Update build configs
Ye Li [Wed, 4 Apr 2018 08:46:32 +0000 (01:46 -0700)]
MLK-18156-3 configs: mx6ullevk: Update build configs

Add new build configs for 9x9 evk and NAND/QSPI boot.
Update 14x14 EVK build config to align with v2019.04

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit e93235cbcf624a476c95f4e9e8fd51e667ab4aa2)
(cherry picked from commit 073b4a789cd56910c8f337a88f264bb19a078003)
(cherry picked from commit 1660b2f880666fde01839a221f896a75dfd71306)

4 years agoMLK-18156-2 mx6ullevk: Update board level codes
Ye Li [Wed, 4 Apr 2018 08:45:41 +0000 (01:45 -0700)]
MLK-18156-2 mx6ullevk: Update board level codes

To align with v2020.04, add functions:
1. Support GPMI NAND
2. Support LCD splash screen
3. Add 9x9 EVK board support with LPDDR2 used
4. Update PMIC and LDO bypass for 9x9 EVK
5. Support two ethernet controllers

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 154d6c905a848eed3bcc1ae2e142da3508a61b92)
(cherry picked from commit e7617471ab33579da972db82e042937233c857fa)
(cherry picked from commit 1df176a9b18d5e16e445307e6702822d9a8fa9f8)

4 years agoMLK-18156-1 dts: mx6ullevk: Update DTS for i.MX6ULL EVK boards
Ye Li [Wed, 15 Apr 2020 17:25:28 +0000 (10:25 -0700)]
MLK-18156-1 dts: mx6ullevk: Update DTS for i.MX6ULL EVK boards

Update the DTS files for 14x14 EVK and 9x9 EVK to align with
v2019.04.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit ef5ca9d0ff1f95683b68a580b7d314c9f7901f68)

4 years agoMLK-18155-3 configs: mx6ulevk: Update build configs
Ye Li [Wed, 15 Apr 2020 15:27:26 +0000 (08:27 -0700)]
MLK-18155-3 configs: mx6ulevk: Update build configs

Align the build config files with v2020.04.
Add config files for reworked eMMC, NAND boot, QSPI boot
and plugin support. Move original defconfig to _spl_defconfig to keep
SPL support.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit bf3882af8ddc804bc35a16dd73034b88eab5e4e2)
(cherry picked from commit 9202b22533a5b44ed0d1985c3abc181dd9c0673e)

4 years agoMLK-18155-2 mx6ulevk: Update board level codes
Ye Li [Wed, 15 Apr 2020 09:26:47 +0000 (02:26 -0700)]
MLK-18155-2 mx6ulevk: Update board level codes

Add functions below to align with v2020.04
1. Switch from SPL to Non-SPL
2. Add plugin and DCD for DDR initialization
3. Update two ethernet controllers support at runtime
4. Add GPMI NAND support
5. Add LDO bypass settings

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5daeae6f49fefdf6eb54f5a9ae37f21483883f83)

4 years agoMLK-18155-1 dts: mx6ulevk: Update DTS for i.MX6UL EVK boards
Ye Li [Wed, 15 Apr 2020 08:39:03 +0000 (01:39 -0700)]
MLK-18155-1 dts: mx6ulevk: Update DTS for i.MX6UL EVK boards

Update iMX6UL EVK DTS file to align with v5.4 kernel. And add DTS
for eMMC and NAND.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 21fcfc54e7cad149cbefbec8095112983e766d29)

4 years agoMLK-18154-3 configs: mx6sllevk: Update build configs
Ye Li [Wed, 4 Apr 2018 02:50:27 +0000 (19:50 -0700)]
MLK-18154-3 configs: mx6sllevk: Update build configs

Align the build configs with v2018.03, add new config for EPDC enabled.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit bbc43351ab3da32bcdb33ad1d9aa0bd6c7d7f193)
(cherry picked from commit 059e1ee2e35f6d68660c5f30ddd98ebce7dee083)
(cherry picked from commit ef40bd448eff2348f3b9e835aaaf335370700ca7)

4 years agoMLK-18154-2 mx6sllevk: Update board level codes
Ye Li [Wed, 4 Apr 2018 02:48:37 +0000 (19:48 -0700)]
MLK-18154-2 mx6sllevk: Update board level codes

Add EPDC and LCD splash screen display support
Update environment settings to align with v2018.03

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5c2afb47a6ce15e6a0830771b09452d346c87688)
(cherry picked from commit 4067abb96aa629c6ef7766cf0e2007d64e23e1c5)
(cherry picked from commit a02c8a5f5b0959c76e0d37d39b3bdf74424f8cd9)

4 years agoMLK-18154-1 dts: mx6sllevk: Update DTS to align with v2020.04
Ye Li [Wed, 4 Apr 2018 02:41:18 +0000 (19:41 -0700)]
MLK-18154-1 dts: mx6sllevk: Update DTS to align with v2020.04

Update DTS, DTSi and clock binding file for mx6sllevk:
1. Fix USDHC pad settings
2. Add pin settings for i2c bus force idle
3. Fix non-removable bug for usdhc2
4. Update clock
5. Update model name
6. Update pmic node name

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 26bd5feefec059a0176768e89016cdc289839103)
(cherry picked from commit f57952362eda7f56005e306ce6ef42e5a8e1b9e3)
(cherry picked from commit dc75f7cf336985dc0b51635ee3c8612fd7a64ccd)

4 years agoMLK-18153-3 configs: mx6slevk: Update build configs for mx6slevk
Ye Li [Tue, 3 Apr 2018 08:59:43 +0000 (01:59 -0700)]
MLK-18153-3 configs: mx6slevk: Update build configs for mx6slevk

Add two build configs for EPDC and plugin.
Update default mx6slevk defconfig and spinor defconfig to align
with v2017.03

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit c635b7f4f0eeb29510896f0df2715b8c1fb59553)
(cherry picked from commit cb676995bb2cad3b4a696e7a7ed96faef0f7bfb3)
(cherry picked from commit 8c0200a02c0b9854223a1af149e996202290015d)

4 years agoMLK-18153-2 mx6slevk: Update board codes to align with v2020.04
Ye Li [Tue, 3 Apr 2018 08:53:04 +0000 (01:53 -0700)]
MLK-18153-2 mx6slevk: Update board codes to align with v2020.04

Porting functions from v2020.04 in board level codes:
1. Add EPDC support
2. Update environment settings
3. Add LDO bypass and update PMIC settings
4. Add keypad support
5. Add plugin support
6. Add DM ethernet driver support

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 88232c1cbf9389e82f8e00c1cc3fcd6456292ed4)
(cherry picked from commit 7dc7c5ebc16c5bf2f97d0d172f241615a98b55e0)

4 years agoMLK-18153-1 dts: mx6slevk: Update DTS and DTSi to align with v2020.04
Ye Li [Tue, 3 Apr 2018 08:49:54 +0000 (01:49 -0700)]
MLK-18153-1 dts: mx6slevk: Update DTS and DTSi to align with v2020.04

Copy the DTS and DTSi from 4.14 kernel.

Changes in DTS specified for u-boot:
1. Add alias for mmc and usb
2. Add pin settings for i2c bus force idle
3. Change PMIC node name
4. Update model name to remove freescale

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit e669373fc5f861750b2b7b59cde6c31c43cf61fb)
(cherry picked from commit 877d09b0d104db8e377aa6e213b7cee46217fbbd)
(cherry picked from commit 1c0c39e41ac9e4caea0452a242d6f9245231e09f)

4 years agoMLK-18152-6 configs: mx6sxsabreauto: Update and add build configs
Ye Li [Tue, 3 Apr 2018 07:31:00 +0000 (00:31 -0700)]
MLK-18152-6 configs: mx6sxsabreauto: Update and add build configs

Update mx6sxsabreauto defconfig to align with v2018.03.

Add other configs to support QSPI1 boot, NAND boot and plugin.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 779b3bd0ede4050689b12982bfa2abe1d07b566e)
(cherry picked from commit 7a83cf87562f1214b87ff99bb13bf01ed04e9581)
(cherry picked from commit d019d257c9605852007b94c53233dbdba2c50e55)

4 years agoMLK-18152-5 mx6sxsabreauto: Update board codes to align with v2019.04
Ye Li [Tue, 3 Apr 2018 07:27:48 +0000 (00:27 -0700)]
MLK-18152-5 mx6sxsabreauto: Update board codes to align with v2019.04

Update DM PMIC settings and LDO bypass support.
Add BMODE support.
Add LVDS and LCD splash screen support
Add two ethernet controller support
Update environment settings
Add plugin support

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit beaea14e18f138249521f0de8a8ef902d555cb89)
(cherry picked from commit c766595b0be6676b57886114f383b2d1c529ce29)
(cherry picked from commit e035f2c4746ed35fa39bc9d11d70ff329c1e37fd)

4 years agoMLK-18152-4 dts: mx6sxsabreauto: Update DTS to align with v2020.04
Ye Li [Tue, 3 Apr 2018 07:21:44 +0000 (00:21 -0700)]
MLK-18152-4 dts: mx6sxsabreauto: Update DTS to align with v2020.04

Copy the DTS from 4.14 kernel

Compared with kernel DTS, the changes in DTS for u-boot:
1. Add pin settings for supporting i2c bus force idle.
2. Change pfuze name
3. Change board model name, remove freescale

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 67d0c3427562a81713ac8d00f5a976ac2942cb1a)
(cherry picked from commit 5f99b0252b570d490c06269bd565da58d45f2dca)

4 years agoMLK-18152-3 configs: mx6sxsabresd: Update and add build configs
Ye Li [Tue, 3 Apr 2018 04:00:43 +0000 (21:00 -0700)]
MLK-18152-3 configs: mx6sxsabresd: Update and add build configs

Update mx6sxsabresd defconfig to align with v2018.03 with DM
ethernet enabled.

Add other configs to support QSPI2 boot, reworked eMMC, M4 fastboot and
plugin.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 8b5dd6ebeedf3325aacc3f61c1ae77b584d8756a)
(cherry picked from commit d8e4ba7520881b3aaca1e98718e969a31429005e)

4 years agoMLK-18152-2 mx6sxsabresd: Update board codes to align with v2020.04
Ye Li [Tue, 3 Apr 2018 03:52:12 +0000 (20:52 -0700)]
MLK-18152-2 mx6sxsabresd: Update board codes to align with v2020.04

Add emmc support which needs board rework.
Add I2C2.
Update DM PMIC settings and LDO bypass support.
Add BMODE support.
Add LVDS and LCD splash screen support
Add PCI power and reset GPIO and disable PCI at default.
Update QSPI settings for QSPI boot and M4 fastup.
Update environment settings

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit e74716b6e78f016226dc9f800b04574f545d9367)
(cherry picked from commit f3dd07286dc39d3028deaedf5dc1668929cbfd29)
(cherry picked from commit 462883d1a88e59fd2b854c3f751e75a329fad500)

4 years agoMLK-18152-1 dts: mx6sxsabresd: Update and add mx6sxsabresd DTS files
Ye Li [Tue, 3 Apr 2018 03:45:16 +0000 (20:45 -0700)]
MLK-18152-1 dts: mx6sxsabresd: Update and add mx6sxsabresd DTS files

Update i.MX6SX dtsi file and relevant DTS header files.
Add the imx6sx-sdb-emmc DTS file for reworked eMMC board.

Changes in DTS and DTSi:
1. Add spi0 and spi1 alias for qspi1 and qspi2.
2. Add USB alias for usb0 and usb1

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 9d8838cb1409c265db3dd0b64219e1286202c10d)
(cherry picked from commit deed82bb1d09d6163b3e69e04d723dc91563225b)
(cherry picked from commit 6891e8b4a31a18e561a29362bbb8b3a17594fe17)

4 years agoMLK-14418-8 imx: mx7dsabresd: add epdc support
Peng Fan [Tue, 7 Feb 2017 02:22:02 +0000 (10:22 +0800)]
MLK-14418-8 imx: mx7dsabresd: add epdc support

Add epdc support from v2019.04.
Add a epdc specified DTS file for using epdc

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit ab2f9e136f5da034a8335dc8ca276a54367132e8)
(cherry picked from commit ccfa28aec4093ac30a9b76d973f0288ab9c8f92c)
(cherry picked from commit 86f7a2c50aeb4d5c12f7159356ea782f48905b19)
(cherry picked from commit 77e171129baef32ec836f51afc18be89421d5512)

4 years agoMLK-18151-3 config: mx7dsabresd: Update defconfig to align with v2019.04
Ye Li [Wed, 31 Mar 2021 13:35:39 +0000 (06:35 -0700)]
MLK-18151-3 config: mx7dsabresd: Update defconfig to align with v2019.04

Update mx7dsabresd and qspi defconfigs, remove distro, and correct ENV device.
Add config files to support NAND boot.
Add config file for plugin.
Add config files for RevA board and RevB boards.
Remove the SYS_TEXT_BASE
Rename mx7dsabresd_qspi_defconfig to mx7dsabresd_qspi1_defconfig

Signed-off-by: Ye Li <ye.li@nxp.com>
4 years agoMLK-18151-2 mx7dsabresd: Update codes to align with v2020.04
Ye Li [Mon, 2 Apr 2018 08:33:43 +0000 (01:33 -0700)]
MLK-18151-2 mx7dsabresd: Update codes to align with v2020.04

1. Add plugin support
2. Update to latest ddr3 script v2.0 version
   refer commit (b4db09bc0fc96e7c7461afade6346e0700ad582f)
3. Add ddr3 script for TO1.1
5. Update header file for NAND boot settings.
6. Remove the wdog WCR bit 4 clear. Since we have implemented reset_cpu for mx7d.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 16e51b5b59700a49c48cdfd8b308aa8793eeb44a)
(cherry picked from commit 5a13c049e92536ba56924c934b1815e09a5fef59)
(cherry picked from commit 29fb4a6315dbc676c3dfca0e684301f85a679f34)

4 years agoMLK-18151-1 dts: mx7d: Update imx7d dts and binding files
Ye Li [Tue, 7 May 2019 05:35:22 +0000 (22:35 -0700)]
MLK-18151-1 dts: mx7d: Update imx7d dts and binding files

Porting the the imx7d dtsi, dts files and binding files from 5.4.y kernel
(359d8f37b464afea3718796fdd6eb27b0d2df8b1)

New dts files are added to support GPMI-WEIM, RevA boards.

Changes in DTS and DTSi:
1. Add USB alias
2. Modify the SPI alias for qspi
3. Disable USDHC2 since it is for SDIO
4. Add i2c force idle support pins
5. Add back mmc alias by comparing with 2019.04.
6. Update clock, pin and reset binding files
7. Update QSPI only support 1 bit mode, remove RX/TX 4 bit mode

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5feb51de9b4ddde2bf6c44f18320ba262f424b7c)
(cherry picked from commit ee0ebdd3ef40ca1ebd80287a8c4bc5f2c772f5dd)

4 years agoMLK-14418-12 imx: mx7dsabresd: Update LCD splash screen codes
Ye Li [Tue, 14 Apr 2020 03:29:46 +0000 (20:29 -0700)]
MLK-14418-12 imx: mx7dsabresd: Update LCD splash screen codes

Update LCD setup codes to use the parameters structure used for all
i.mx platforms, discard to use videmode environment variable.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 3b0609ca267baaf6a78bebaccc6896e6508d1844)
(cherry picked from commit e97965bbd8f9346d909cda433cafd04a750d9867)
(cherry picked from commit d8bcdcb95df9ed6661be589726bba66da26a1cdf)
(cherry picked from commit 07795520e74cfb85ab9112a5a6347290e0082d07)

4 years agoMLK-23574-30 mx7dsabresd: Support two ethernet ports
Ye Li [Fri, 10 Apr 2020 13:37:08 +0000 (06:37 -0700)]
MLK-23574-30 mx7dsabresd: Support two ethernet ports

Enable the fec2 port by enabling its DTS node and clocks.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit db179a361159ddc9555fa3616040b750ae73440b)

4 years agoMLK-10647 armv7: Fix Dcache disable issue on i.MX7
Ye.Li [Mon, 13 Apr 2015 09:18:14 +0000 (17:18 +0800)]
MLK-10647 armv7: Fix Dcache disable issue on i.MX7

The issue on the i.MX7D is that, there is one cache-able memory access
between the L1 and L2 cache flush by calling the flush_dache_all->
v7_maint_dcache_all() [Flush L1 and L2 cache) which written in the C code.

L1-cache-flush            -> This will flush L1 cache to L2 cache in the end.
Cache-able memory access  -> This will have the chance cause the L1 line-fill
                             with dirty data from L2 cache(L1 cache-line dirty,
                             L2 clean)
L2-cache-flush            -> This will only flush L2 cache to L3, but still
                             some dirty data on the L1 cacheline.

After C & M bit clean,    -> The dirty data on the L1 cache line lost, which will
                             cause memory coherent issue if that dirty cache line
                             has some useful data

This patch should works fine on the i.MX6 and i.MX7.

The second cache flush have zero impact on the i.MX6, but this is really need for
the i.MX7D platform due to the L1 line-fill during the first dcache_flush.

And the second flush will not bring in the L1 dirty cache line due to the C bit is
clear now, which means the dcache is disabled.

Acked-by: Jason Liu<r64343@freescale.com>
Reviewed-by: Jason Liu<r64343@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit f5d5f07fba936c4bb05c887de9d72fb75b3dc0f2)
(cherry picked from commit 86c784cf4c4b633d37a76de7d47155c08f75dc82)
(cherry picked from commit d85cd484e6825631aa1ab572e5e0539f2191d795)
(cherry picked from commit 2b29c1873c2293abe1c4b361392521223b9c9ecf)
(cherry picked from commit 3eaf56494f3000f841531e8c219cf3dd9ca024f7)
(cherry picked from commit fd1ecbfba9ba0fb52a757a70a2fcbeb325508be2)
(cherry picked from commit 742cd01a7bbe3e355569be2d1d454f4f268390a9)
(cherry picked from commit 1d7765da8a8ae03fa36022c567cc03bf1eaa23f8)

4 years agoMLK-12425-6: mx7: add epdc qos settings
Peng Fan [Tue, 23 Feb 2016 02:12:20 +0000 (10:12 +0800)]
MLK-12425-6: mx7: add epdc qos settings

This EPDC/EPXP QoS setting is needed for EPDC stress test to pass.

Signed-off-by: Robby Cai <r63905@freescale.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 1b32518d1c27f05eb84a4cb93594710354b2e343)
(cherry picked from commit 8fd2dbe9097b09715f84e1c0c17dcd6a6351fb35)
(cherry picked from commit a92a02f984aa7871aa5bb1a83e0e3f444796fedd)
(cherry picked from commit 682b705b402827f6041839d92a717887a2a9649d)
(cherry picked from commit 4c50797b34115c2f40552329fb4901d588e6bef9)

4 years agoMLK-10774-2 HDMI: splash screen function enhancement
Peng Fan [Thu, 19 Mar 2015 02:10:07 +0000 (10:10 +0800)]
MLK-10774-2 HDMI: splash screen function enhancement

-Change HDMI video mode to VGA.
-Add pixel clock fraction part setting in IPU driver,
 fix video mode timing issue.
-Add overflow state clear workaround,
 fix kernel hang in HDMI driver issue.
-Correct IPU clock to 264MHz.

Signed-off-by: Sandor Yu <R01008@freescale.com>
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5028519b434d5dfbe53c48ac4b115ff8b69bbac7)
(cherry picked from commit 8dcbd43b971616fb67dc3b2af32e2d33f68ed0ce)
(cherry picked from commit 46b20bec72b53f10c1edf0bd8add5b356fbd7c42)
(cherry picked from commit 116691b2fbc7a1f579c1a384739c15aa59e3fa69)
(cherry picked from commit dee071872ea2681a1e824ad78fd7cbe04965febe)

4 years agoMLK-12527-1 mxc_keyb: Add MXC keyboard driver
Ye Li [Wed, 9 Mar 2016 12:59:43 +0000 (20:59 +0800)]
MLK-12527-1 mxc_keyb: Add MXC keyboard driver

The i.MX6SL EVK needs this driver in android fastboot support. Add
this driver to u-boot.

To use the driver, user must define:

CONFIG_MXC_KPD          Enable the driver
CONFIG_MXC_KEYMAPPING   Key mapping matrix
CONFIG_MXC_KPD_COLMAX   The column size of key mapping matrix
CONFIG_MXC_KPD_ROWMAX   The row size of the key mapping matrix

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5096e572667ff41217deb4ba9b1bd15e93fa6b59)
(cherry picked from commit e84160eaf5c057da45a227039c6f8a7911f43a82)
(cherry picked from commit 7f8757016e97adeacba256bd0cb6ad8882f6a51e)
(cherry picked from commit 79f5e8a3cc9bb1460dd06fa4909ff200d147377c)
(cherry picked from commit d62830ee536b70d2ac75a6ac692c67ee151d65e2)

4 years agoMLK-14930-1 cmd: sata: Fix sata init and stop issue
Ye Li [Tue, 27 Mar 2018 07:56:19 +0000 (00:56 -0700)]
MLK-14930-1 cmd: sata: Fix sata init and stop issue

When sata stop is executed, the sata_curr_device is not reset to -1, so
any following sata commands will not initialize the sata again and cause
problem.

Additional, in sata init implementation, the sata_curr_device should be updated,
otherwise sata will be initialized again when doing other sata commands like
read/write/info/part/device.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 9bccfd01c618a5d059f332c000c42e5bf39880d9)
(cherry picked from commit f162bbb14b5c9b0c4073eee5ceeea6a9d1780394)
(cherry picked from commit 1707f011d5c79ae0f32b50ecf87f8aaed94944d0)

4 years agoENGR00315894-60 GPIO: Modify driver mxc_gpio to support RDC Semaphores
Ye.Li [Wed, 11 Jun 2014 08:21:29 +0000 (16:21 +0800)]
ENGR00315894-60 GPIO: Modify driver mxc_gpio to support RDC Semaphores

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>
(cherry picked from commit faf94726cac8316c4342e19936f1e03ef283ace3)
(cherry picked from commit 6c0474fe0e4fc543c62b22c05c2702a881f56418)
(cherry picked from commit 7cd5fec7ce6a9ecfdaa1a9c1aaaa0d0ac18a4f86)
(cherry picked from commit 74d68c1b9f098c44992d591616372f0ec5ff13dd)
(cherry picked from commit 208c009aa15453349ee9272d62e2c1cebe14ecab)
(cherry picked from commit 59777a11b1e923f3222a34d243884efaf9cd59d6)

4 years agoMLK-12434-1: imx: dynamic setting mmcdev and mmcroot
Peng Fan [Tue, 23 Feb 2016 04:43:10 +0000 (12:43 +0800)]
MLK-12434-1: imx: dynamic setting mmcdev and mmcroot

Align to imx_v2015.04, dynamic setting mmcdev and mmcroot.
Then when boot linux, we can have correct "root=/dev/mmcblk[x]p2"

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit b46b99a901eb194e81fc4836ee2259ad8857f4d3)
(cherry picked from commit 6f6a828fbe7478efd5932c302e6368877107bbca)
(cherry picked from commit bb628be4e993e98fb2fe8fc6af7b16e706d0f32d)
(cherry picked from commit 8e56914b4f536094bdf2301e347be02e0ccfee42)
(cherry picked from commit 3352f12289b3979a329486620711ecc2c2fb9fbd)

4 years agoENGR00315894-55 iMX6SX: add debug monitor support
Ye.Li [Wed, 11 Jun 2014 07:34:49 +0000 (15:34 +0800)]
ENGR00315894-55 iMX6SX: add debug monitor support

Debug monitor will print out last failed AXI access info when
system reboot is caused by AXI access failure, only works when
debug monitor is enabled.

Enable this module on i.MX6SX.

Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit df6ac8531d498021ed379c74fc1847bd2cec7179)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit 4f4ecdbf6fe2673b8ad117df1a4974bdb7e6aa4a)
(cherry picked from commit e1c98a672e50fd0405686b74dad50680a75a8a9f)
(cherry picked from commit 5265a3052505fae2a212af292412a62b20a16f97)
(cherry picked from commit 9939631045b77617572a74283dd637d5c476cd53)
(cherry picked from commit f778852e518e2819470e7903ec10af9462b99f40)

4 years agoENGR00315894-81 gis: Add gis module
Ye.Li [Thu, 12 Jun 2014 11:47:27 +0000 (19:47 +0800)]
ENGR00315894-81 gis: Add gis module

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)
(cherry picked from commit a31dcdafb0963381e7213c59f79a340ef27ec2e2)
(cherry picked from commit 02dfe2e4af5f51d39a51542fb0e81f93faf505bc)
(cherry picked from commit a8e94954d8ccc44c41d77a5e356d6a99b3d45649)
(cherry picked from commit 0864a17afbc93fed72273c7d7d3be0fc8681e794)
(cherry picked from commit 20918f8e062111ca11bc9e3b82732145792c87c2)
(cherry picked from commit eb335355b9563c74ef0f54259439e6f2b57a3167)

4 years agoENGR00315894-80 pxp: Add pxp module
Ye.Li [Thu, 12 Jun 2014 11:40:53 +0000 (19:40 +0800)]
ENGR00315894-80 pxp: Add pxp module

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>
(cherry picked from commit 92295fafcdbaa3a3fe0a63ede15f896dfc9ce0b0)
(cherry picked from commit 096a63e81a8c78b3f8bbc65a9d418aa032d62231)
(cherry picked from commit b24cce0ad3ec9f386ca7aa231d8a2db33462f092)
(cherry picked from commit 40c2e2c2160ac23f89a682c965ebea6488b8bffc)
(cherry picked from commit 89bf4fac9052bf5d140a53670535285a8ca0a422)
(cherry picked from commit 6e12809eefe0e0ae0ff0b62d827b8c0dbae025f1)

4 years agoENGR00315894-79 csi: Add csi module
Ye.Li [Thu, 12 Jun 2014 11:39:16 +0000 (19:39 +0800)]
ENGR00315894-79 csi: Add csi module

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>
(cherry picked from commit 5f133bd9420109951fd03bd5168801327e929c3b)
(cherry picked from commit 16960e59fa3334162d2e2212ee4bc1e7f0c420a3)
(cherry picked from commit bc0639ed8f5069f198067916caf088908492329d)
(cherry picked from commit c7232ae1c27ef561d2235bb4db837ef9805f86d2)
(cherry picked from commit 039bb76082a16b0e43e818a4d9df68ab4320ede5)
(cherry picked from commit 4048b2cc1932a51f7f8c32ddf21bcf5ebd885a4f)
(cherry picked from commit 15b0a54151915acfd780b8ec3d3aba9f25b7408e)

4 years agoENGR00315894-78 vadc: Add vadc module
Ye.Li [Thu, 12 Jun 2014 11:37:19 +0000 (19:37 +0800)]
ENGR00315894-78 vadc: Add vadc module

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>
(cherry picked from commit b5d776ffc1519c16091736445b3217ffb7fcd7db)
(cherry picked from commit 2377eb9fd299b76888f11faf76383b68e77bcc8a)
(cherry picked from commit 808d447235bd0f9134c7d00fa480cd55b4e0426e)
(cherry picked from commit 99977a1152981247a84252dba1d1cf55c0406b08)
(cherry picked from commit ed0e7a8081c1a0447c0df72d36937a0a0c5c8a49)
(cherry picked from commit 1133ea58a5460b4464c3bbf7f6fdc3086867e3e6)

4 years agoENGR00315894-77 mx6: soc: Add vadc power up/down function
Ye Li [Mon, 26 Mar 2018 08:56:39 +0000 (01:56 -0700)]
ENGR00315894-77 mx6: soc: Add vadc power up/down function

Add vadc power up/down function.
When gis enable in uboot, the CSI0 input mux select setting
to vadc module, clean the bit when gis disabled

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Sandor Yu <R01008@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit e0cfa889531d0a2587fb1fc607fffcc9599a2f4e)
(cherry picked from commit 4b8609acf781dab90c6916dea4e74d5ffcd017b3)
(cherry picked from commit 9df6744d8104651801778a023455d0fae939c786)

4 years agoENGR00315894-76 mx6 clock: Add vadc clock enable function
Ye.Li [Thu, 12 Jun 2014 11:33:05 +0000 (19:33 +0800)]
ENGR00315894-76 mx6 clock: Add vadc clock enable function

Add vadc clock enable function.

Signed-off-by: Sandor Yu <R01008@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit 721c7a1448c5b7265b597b83d18f8338a27ea213)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit 903a59ef941f39b6d7f693dd7c60528e166de079)
(cherry picked from commit dc767fb7d5c155f2a6ef01c4dee808b9c1944fc2)
(cherry picked from commit 0a48932f375a969e6f7e72d171522146981b2135)
(cherry picked from commit b6f962db57c988c31d35e204f638ba3b0c53eb4a)
(cherry picked from commit b28c20cc8d9032a0521274f6bc21d4da414a8a37)
(cherry picked from commit 909929b5b8a6ae7d7f8d8b12e60e0882634550c8)

4 years agoMLK-18147-3 mx6sabreauto/sabresd: Port defconfigs from v2020.04
Ye Li [Mon, 26 Mar 2018 05:23:41 +0000 (22:23 -0700)]
MLK-18147-3 mx6sabreauto/sabresd: Port defconfigs from v2020.04

Add defconfigs to support various boot devices and platforms
for MX6DQ/DQP/DL/S sabreauto and sabresd boards.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit d88863b467d2aebc802d634dcc96060f5af45414)
(cherry picked from commit 1a3fe19c2cf1b2147813c14b177f3d99d39f4b70)
(cherry picked from commit 68dfe74093ffc25e5e042796f3e54af9d4dacc0f)

4 years agoMLK-12425-2 video: epdc: introduce epdc support
Peng Fan [Tue, 23 Feb 2016 02:14:34 +0000 (10:14 +0800)]
MLK-12425-2 video: epdc: introduce epdc support

Support EPDC.
E-Ink feature is supported by i.MX6DL/SL/SLL/ULL and i.MX7D.

This driver supports user defined logo file, if there is no logo file, it will
draw a black border around a white screen.

If need to enable EPDC, a waveform file is required to let all
work.

Since we need LCD_MONOCHROME mode for EPDC, we introduce LCD_MONOCHROME
support.

Please refer to Linux Reference Manual for how to flash WAVEFORM file.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Robby Cai <R63905@freescale.com>
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit a7244f279cc3c3994bcd103f5e9a183b1075ae71)
(cherry picked from commit 21bf1c38b7d75c31875fb02a972c458f25d9c33a)
(cherry picked from commit 237742f73998b35dd896592e19f1e119e72baa71)
(cherry picked from commit 3e788604343274e806510261aea407a9d916755b)

4 years agoMLK-18147-2 mx6sabreauto/sabresd: Update mx6dq/dqp/dl/s sabre boards codes
Ye Li [Mon, 26 Mar 2018 03:42:07 +0000 (20:42 -0700)]
MLK-18147-2 mx6sabreauto/sabresd: Update mx6dq/dqp/dl/s sabre boards codes

Porting the mx6dq/dqp/dl/s sabresd and sabreauto codes from v2018.03
The major change is moving back to non-SPL mode for sabre boards.
which means all old things like DCD, plugin are added back for each
platform. This inherits the way used in v2018.03

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 3a3a0f07c85b0ae86b18709445206db0310c3b63)
(cherry picked from commit 90b86014f70f44db3b18e96b2643a57a0a6f92a3)
(cherry picked from commit 2660660f213e117c3445ba6f18e78d44df1683bc)

4 years agoMLK-18147-1 arm: dts: mx6dq/dqp/dl/s: Porting DTS and binding files from v2019.04
Ye Li [Fri, 23 Mar 2018 09:43:06 +0000 (02:43 -0700)]
MLK-18147-1 arm: dts: mx6dq/dqp/dl/s: Porting DTS and binding files from v2019.04

Port the DTS and relevent binding files from v2019.04 for i.MX6DQ/DQP/DL/S
Sabreauto and SabreSD boards.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit bedc2a2223746a8059b80518ec094077c0d4c44d)
(cherry picked from commit 800a1c47f135321f4063e1efccdf244f6edb0500)
(cherry picked from commit e89adf4a3810c0c513cc9040d18380b9f6b6a915)

4 years agoMLK-18143 mx6: Add CONFIG_MX6QP kconfig
Ye Li [Fri, 23 Mar 2018 08:59:21 +0000 (01:59 -0700)]
MLK-18143 mx6: Add CONFIG_MX6QP kconfig

Since i.MX6QP is a variant of i.MX6Q, have to add CONFIG_MX6QP
with CONFIG_MX6Q in the soc codes for ddr/pin/clock/plugin

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit a56c1d98d8d56a34ca1226e15fe05b75cd9b3686)
(cherry picked from commit 1fa581642ec8def3fd378b29f8d9b6527358dfe9)
(cherry picked from commit cad8787ee3a37a644e6c981e6b8c9d9748a212de)

4 years agoMLK-18146-4 mx6: Update mx6 common head file
Ye Li [Fri, 23 Mar 2018 09:46:41 +0000 (02:46 -0700)]
MLK-18146-4 mx6: Update mx6 common head file

Align the common head file with v2020.04, since some configurations
have been moved to Kconfig, so don't need them in mx6_common.h now.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 183c12aeec8faae933f3222c40d333f1fc6ef89a)
(cherry picked from commit 6fdf38a42f3dd3e623d46cb8a5f750ad83fd2720)
(cherry picked from commit e37ed29ece6593f032d0333b229ca5f70bb2269f)

4 years agoMLK-18146-3 mx6: Update pads definition files
Ye Li [Mon, 26 Mar 2018 07:53:34 +0000 (00:53 -0700)]
MLK-18146-3 mx6: Update pads definition files

Update the pins.h for i.MX6SL/UL/ULL to align with v2017.03

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 86c6ba24e56e32ad9942b14fe8565651f9a4c3c6)
(cherry picked from commit c3f9a3036f5e2ddebf2fdd3a1b423bf09dfa1a26)
(cherry picked from commit 3bea36bb5b570847ba065fb2da1d53a62d35a31c)

4 years agoMLK-18146-2 mx6: Update registers mapping file
Ye Li [Mon, 26 Mar 2018 07:52:17 +0000 (00:52 -0700)]
MLK-18146-2 mx6: Update registers mapping file

Update the CCM and AIPS registers mapping files to align with v2017.03

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 4479d29d344c89fe3f0ba73934e72bc6099b6eaf)
(cherry picked from commit 079cfb35c0a898d0cb3f6441c5dc41e06edb6525)
(cherry picked from commit 170a48574588ddcf475811182dc697938da63454)

4 years agoMLK-18146-1 mx6: Align SOC level codes with v2020.04
Ye Li [Fri, 23 Mar 2018 09:37:28 +0000 (02:37 -0700)]
MLK-18146-1 mx6: Align SOC level codes with v2020.04

Update codes for i.MX6 soc and clock settings to align with v2020.04

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 82ecba47271848a339a53eef7e770526bc3b3967)
(cherry picked from commit fa452a1fa374f5a26ed8c178c8c1fb3e383962e5)
(cherry picked from commit d745866a43c0a69e4132c23a29106bfba6a32c9a)

4 years agoENGR00325255 pcie:enable pcie support on imx6sx sd
Ye Li [Fri, 11 Mar 2016 09:28:00 +0000 (17:28 +0800)]
ENGR00325255 pcie:enable pcie support on imx6sx sd

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.

(cherry picked from commit ec78595a24b5ff1020baa97b6d6e79a3a3326307)
Signed-off-by: Richard Zhu <r65037@freescale.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 81fd30250110d72992758f08b66c07306126892b)
(cherry picked from commit 4226ce46f24e176dcfc20aea1af0713b4b425655)
(cherry picked from commit 3e1a0a7f37d749d5e36e27ad46e8c8db12a865be)
(cherry picked from commit fa4b46f0f55a19c3cab762e2fdbb01e359c9040b)

4 years agoENGR00319415 pcie: random link down issue after warm-rst
Richard Zhu [Tue, 24 Jun 2014 01:59:47 +0000 (09:59 +0800)]
ENGR00319415 pcie: random link down issue after warm-rst

There are about 0.02% percentage on some imx6q/dl/solo
hw boards, random pcie link down when warm-reset is used.
Make sure to clear the ref_ssp_en bit16 of gpr1 before
warm-rst, and set ref_ssp_en after the pcie clks are
stable to workaround it.

imx6sl doesn't have the pcie module, mask the pcie
related codes from imx6sl.

rootcause:
* gpr regisers wouldn't be reset by warm-rst, while the
ref_ssp_en is required to be reset by pcie.
(work-around in u-boot)
* ref_ssp_en should be set after pcie clks are stable.
(work-around in kernel)

Signed-off-by: Richard Zhu <r65037@freescale.com>
(cherry picked from commit 5cc825b12c6b86a22f1a6a0535b52cf3ee142e77)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit 6193cf4e3384a59e29546d13a67657f7faeafc9e)
(cherry picked from commit 7b4aabeddffabca46d7d6e7ef2611de468a6b4f7)
(cherry picked from commit a117fc7b2b8d930fd7a47b168c4638365cb3a475)
(cherry picked from commit d94a5b283afd2786428f514b0db4a6eaa5bcccff)
(cherry picked from commit 9ee86b956916432e0a27afc31d29933705d4a675)

4 years agoMLK-12534 mx6: shutdown vddpu and PCIE phy to save power
Ye Li [Fri, 11 Mar 2016 07:44:01 +0000 (15:44 +0800)]
MLK-12534 mx6: shutdown vddpu and PCIE phy to save power

Shutdown VDDPU and PCIE phy to save power.

For PCIE, the i.MX6SL and i.MX6UL does not have this module,
so don't need it.

For VDDPU, the i.MX6UL does not have GPU, does not need it. And on
i.MX6QP there is narrow window that PRE driver is ready but GPU driver probe later,
and the later GPU driver turn on PU may cause 'PRE hang' issue. To simplify
thing, do not turn off PU in u-boot.

Reference:
commit: 6b0787b726e2ff32210d742d93ecd3f4bb2ae402
commit: 4bd0032c0eba50fa0caf43f50f735a3cfbe36a8d

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5c96ea91fe89c67991c929c9b39ffaa940d28391)
(cherry picked from commit 6a5442b41ef400edd0b332962a3450e909b85df5)
(cherry picked from commit 2d7e33530f9bea23c7d09e5b6ae27b0e17f0aa94)
(cherry picked from commit 9043e88a78d303091788952c2e1d35fe9544625e)
(cherry picked from commit 20b75bb074792d55f4fa556425d30871ef5095aa)

4 years agoMLK-18145 imx: Fix wrong pad name prefix
Ye Li [Fri, 23 Mar 2018 09:24:09 +0000 (02:24 -0700)]
MLK-18145 imx: Fix wrong pad name prefix

The pads name bind with CONFIG_MX6Q and CONFIG_6DL should start with MX6_PAD
not MX6Q_PAD and MX6DL_PAD. Otherwise we will get build break.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit be7aa84842d9cb4e94f50ff798b6e54712ece89a)
(cherry picked from commit fb8149b20d51381c34877c951cc38a1cc185b5da)
(cherry picked from commit 1e86d97adcab78622c95bdbdef06dcc30dd09d7c)

4 years agoMLK-10958 imx: mx6ul support Bus Encryption Engine
Ye Li [Fri, 23 Mar 2018 08:14:13 +0000 (01:14 -0700)]
MLK-10958 imx: mx6ul support Bus Encryption Engine

This patch is to support Bus Encryption Engine(BEE) for i.MX 6UL.
Supported feature:
1. SNVS key and soft key
2. CTR and ECB mode
3. Specify address region to bee.

Two commands are included:
bee init [key] [mode] [start] [end] - BEE block initial
    "Example: bee init 1 1 0x80000000 0x80010000\n"
bee test [region]
    "Example: bee test 1\n"

Mapping:
[0x10000000 - (0x10000000 + size - 1)] : [start - (start + size - 1)]
[0x30000000 - (0x30000000 + IRAM_SIZE - 1)] : [IRAM_BASE_ADDR -
(IRAM_BASE_ADDR + IRAM_SIZE - 1)]

Whatever start is, start - (start + size -1) will be fixed mapping to
0x10000000 - (0x10000000 + size - 1)

Since default AES region's protected size is SZ_512M, so
on mx6ul evk board, you can not simply run 'bee init', it will
overlap with uboot execution environment, you can use
'bee init 0 0 0x80000000 0x81000000'.

If want to use bee, Need to define CONFIG_CMD_BEE in board configuration
header file, since CONFIG_CMD_BEE default is not enabled.

This patch also checks fuse bit 25 of bank 0 word 4 before initialize bee.
The bit: 0 means bee enabled, 1 means bee disabled.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 9d592121bebbdb9ded0009a2703c7cab01edfa70)
(cherry picked from commit cd03ba8327d46178900a63310d5ef3edd8034350)
(cherry picked from commit 6c8ed4a65e73747f38d2e16e8a2b8cb0c7cce4af)

4 years agoMLK-12495 mx6: Add LDO bypass support to i.MX6 SOC
Ye Li [Fri, 23 Mar 2018 07:53:44 +0000 (00:53 -0700)]
MLK-12495 mx6: Add LDO bypass support to i.MX6 SOC

Port LDO bypass SOC codes from v2017 to support the features:

1. Add check for 1.2GHz core speed. If Speed grading fuse is for 1.2GHz,
   enable LDO bypass and setup PMIC voltages. LDO bypass is dependent
   on the flatten device tree file.

2. We set WDOG_B in set_anatop_bypass() before, because it is the only case, but now
   on i.mx6sabreauto board, we didn't use ldo-bypass mode, but have to use WDOG_B to
   reboot whole board, so split these code to independent function so that board file
   can call it freely.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 6bceaf009718cec856e11106d26e13601631fa4f)
(cherry picked from commit 0e2de4c2d5d2c79e485d164394f03065743ba2c4)
(cherry picked from commit 4160d7362893873d04b8a2d618ad6ff84c411da4)

4 years agoMLK-18142 imx: timer: Modify GPT timer driver for mx7
Ye Li [Fri, 23 Mar 2018 06:45:26 +0000 (23:45 -0700)]
MLK-18142 imx: timer: Modify GPT timer driver for mx7

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 <ye.li@nxp.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit ff8902ab14705935a30f318db8d1c71ce3cc40dc)
(cherry picked from commit c3fa80efdb8680b4b35bc5b3607c148c3c48732b)
(cherry picked from commit 62625f0c8a2e90259488166ee8d8ddcf0ca4e9ae)

4 years agoMLK-18141-2 env: Kconfig: Add ENV_IS_IN_SATA config
Ye Li [Fri, 23 Mar 2018 06:23:44 +0000 (23:23 -0700)]
MLK-18141-2 env: Kconfig: Add ENV_IS_IN_SATA config

The ENV_IS_IN_SATA config is missed, add it into env/Kconfig, that
we can enable it for SATA boot.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 75b6d78fbb2ed29039852f9e652f9acd80bf7eaa)
(cherry picked from commit 338f20a1804a21ae11b70b83bd820e0e7e399a1d)
(cherry picked from commit 051d3f53a92f89cc09884ead8cbb1454512bf464)

4 years agoMLK-18141-1 env: sata: Fix build warning and break
Ye Li [Fri, 23 Mar 2018 06:21:48 +0000 (23:21 -0700)]
MLK-18141-1 env: sata: Fix build warning and break

Fix below build warning and errors:
env/sata.c: In function ‘env_sata_save’:
env/sata.c:59:9: warning: implicit declaration of function ‘sata_get_dev’ [-Wimplicit-function-declaration]
  sata = sata_get_dev(env_sata);
         ^~~~~~~~~~~~
env/sata.c:59:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  sata = sata_get_dev(env_sata);
       ^
env/sata.c: In function ‘env_sata_load’:
env/sata.c:101:10: warning: ‘return’ with a value, in function returning void
   return -EIO;
          ^
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c:105:7: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  sata = sata_get_dev(env_sata);
       ^
env/sata.c:108:10: warning: ‘return’ with a value, in function returning void
   return -EIO;
          ^
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c:113:10: warning: ‘return’ with a value, in function returning void
   return -EIO;
          ^
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c:116:9: warning: ‘return’ with a value, in function returning void
  return env_import(buf, 1);
         ^~~~~~~~~~~~~~~~~~
env/sata.c:94:13: note: declared here
 static void env_sata_load(void)
             ^~~~~~~~~~~~~
env/sata.c: At top level:
env/sata.c:120:14: error: ‘ENVL_ESATA’ undeclared here (not in a function)
  .location = ENVL_ESATA,
              ^~~~~~~~~~
env/sata.c:122:11: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
  .load  = env_sata_load,

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit ffdc4c02e0a3eb18c7fddf307887265aa97699a6)
(cherry picked from commit 25cb0daa9128f15e0da7efeea2bfc436e610648c)

4 years agoENGR00328312 i2c: imx: Optimize the i2c device recovery solution
Ye Li [Fri, 23 Mar 2018 03:59:35 +0000 (20:59 -0700)]
ENGR00328312 i2c: imx: Optimize the i2c device recovery solution

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>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 6220bb6fb43aa485a10f96fb6ade864b3371e4ca)
(cherry picked from commit 8353e27b8e9022623618afc77919c74b606f0ccb)
(cherry picked from commit 8c14a4352d2b75b5ea2fdd3e504789eeea0acd51)

4 years agoMLK-19790 imx: caam: new u-boot command to set PRIBLOB bitfield from CAAM SCFGR regis...
Clement Le Marquis [Thu, 20 Sep 2018 01:07:10 +0000 (03:07 +0200)]
MLK-19790 imx: caam: new u-boot command to set PRIBLOB bitfield from CAAM SCFGR register to 0x3

It is highly recommended to set the PRIBLOB bitfield to 0x3 once your
encrypted boot image has booted up, this prevents the generation of new
blobs that can be used to decrypt an encrypted boot image. The PRIBLOB is
a sticky type bit and cannot be changed until the next power on reset.

Add the set_priblob_bitfield U-Boot command to prevent the generation of
new blobs.

Signed-off-by: Clement Le Marquis <clement.lemarquis@nxp.com>
Acked-by: Ye Li <Ye.Li@nxp.com>
(cherry picked from commit 69cca568b85f36a77ef6ef31538f69366d238845)
(cherry picked from commit e8f813a6b66961759916e65b8c18ec43fd36a7c3)
(cherry picked from commit 55552a26af9a3d94cd19d30c12efcdc1f373d88b)

4 years agoMLK-21420 crypto: fsl: blob: Flush dcache range for destination address
Breno Lima [Tue, 9 Apr 2019 02:48:11 +0000 (23:48 -0300)]
MLK-21420 crypto: fsl: blob: Flush dcache range for destination address

The blob command is not working on i.MX7D, i.MX8MQ and i.MX8MM
devices.

Due to different cache management it's necessary to flush dcache
range for destination address so data can be available in memory.

Add necessary operations in blob_encap() and blob_decap() functions.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 639e5c15816c3eea0d4904a72ad175627be043d8)
(cherry picked from commit ec828953801ee64c4def8133fd5b3d199a65bc92)
(cherry picked from commit 92c0340211b3723dbe3bf7450be7ccb996005358)

4 years agoMLK-21291 imx8mm: evk: not restrict uart4 when enabling jailhouse
Peng Fan [Fri, 29 Mar 2019 08:55:39 +0000 (16:55 +0800)]
MLK-21291 imx8mm: evk: not restrict uart4 when enabling jailhouse

When booting dual linux with jailhouse, inmate linux will use
the 2nd uart, so not restrict access the uart for jailhouse case.

The best solution would be using SIP call to ATF, for simplicity,
directly modify the RDC register.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit b22b70ff0b5bbacea7383bde9e8893bb504199c3)
(cherry picked from commit e5768d04b57599ef8d5fcb4664d87b7c3ba50feb)
(cherry picked from commit 0a7bb85d05f567274d54b4aaf6d061b0b1c03b33)
(cherry picked from commit fb97a542a5c74cb57ca9dcc10c960fde4f4bc209)

4 years agoMLK-20893: imx: in_le32 out_le32 preprocessor casting issue with addresses involving...
Utkarsh Gupta [Mon, 25 Feb 2019 18:00:23 +0000 (12:00 -0600)]
MLK-20893: imx: in_le32 out_le32 preprocessor casting issue with addresses involving math

The sec_in32 preprocessor is defined as follows in include/fsl_sec.h file:
When address "a" is calculated using math for ex: addition of base address and an offset, then casting is applied only to the first address which in this example is base address.

caam_ccbvid_reg = sec_in32(CONFIG_SYS_FSL_SEC_ADDR + CAAM_CCBVID_OFFSET)
resolves to:
caam_ccbvid_reg = in_le32((ulong *)(ulong)CONFIG_SYS_FSL_SEC_ADDR + CAAM_CCBVID_OFFSET)
instead it should resolve to:
caam_ccbvid_reg = in_le32((ulong *)(ulong)(CONFIG_SYS_FSL_SEC_ADDR + CAAM_CCBVID_OFFSET))

Thus add parenthesis around the address "a" so that however the address is calculated, the casting is applied to the final calculated address.

Bug introduced by commit 79e90af14af3 ("MLK-18044-2: crypto: caam: Fix build warnings pointer casting").

Signed-off-by: Utkarsh Gupta <utkarsh.gupta@nxp.com>
Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5d10d1cab052f8af4fd00640e09642aa0a596922)
(cherry picked from commit 0dfa4efe7ce53042c48fb21ba1060045238b5ccb)

4 years agoMLK-15286 arm: arm64: only use general regs
Peng Fan [Mon, 26 Jun 2017 12:18:10 +0000 (20:18 +0800)]
MLK-15286 arm: arm64: only use general regs

When compiling with android toolchain, there is an instruction
"str     q0, [x8],#16", but x8 is not 16bytes aligned,
this instruction will trigger sync abort.

So, following Linux kernel, only use general regs option to IMX8 and
IMX8M aarch64 only.
If not, compiler may use simd registers Q[x]. We need to avoid
using simd registers in U-Boot, because load/store Q[x] has
restriction that 128bits aligned when str/ldr.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 186ccd8de53f986c5913432638dfaca9bdc97e89)
(cherry picked from commit 8f3f0d339783e066f7815408949677b62e465b62)
(cherry picked from commit 3002af0ff57e9db40baeefbc14a336ad206e8fea)
(cherry picked from commit ad1f02f687e208a32d89d6f7b16802da115cf27e)

4 years agoMLK-21848-5 fsl_esdhc: fix problem when using clk driver
Ye Li [Fri, 26 Apr 2019 01:39:12 +0000 (18:39 -0700)]
MLK-21848-5 fsl_esdhc: fix problem when using clk driver

Should use CONFIG_IS_ENABLED not IS_ENABLED for CLK driver, so it will
check the CONFIG_SPL_CLK when building SPL

Move init_clk_usdhc to non-clk driver case, since assigned-clocks properties
will initialize the clocks by clk driver.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit be51cba531a985f6bde70213856ee957b80562dd)
(cherry picked from commit 23b99dc837c94c5337fb92fbc9d46fa8c23b644b)

4 years agoRevert "sdp: call board_usb_init at spl_sdp_load_image"
Ye Li [Thu, 11 Mar 2021 06:12:15 +0000 (22:12 -0800)]
Revert "sdp: call board_usb_init at spl_sdp_load_image"

This reverts commit 0ced2faba08a9faf0ac1cbeb2a320faa635651d9.
It is already applied from history, and re-apply causes problem
after switching to DM

Signed-off-by: Ye Li <ye.li@nxp.com>
4 years agoMLK-20414 imx8m: jailhouse: loadimage before mmcboot
Peng Fan [Tue, 20 Nov 2018 02:04:16 +0000 (10:04 +0800)]
MLK-20414 imx8m: jailhouse: loadimage before mmcboot

Need loadimage before execute mmcboot.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 016bb84267ff3882228ffbde64c2c670be7a8f16)
(cherry picked from commit b3b1b44f6eea2d811f6bbb2d398997513c43775a)
(cherry picked from commit 8272cbb15eec2401b7292afc07f2952574ff8467)

4 years agoMLK-19053: crypto: caam: RNG4 TRNG errata
Aymen Sghaier [Thu, 13 Sep 2018 16:19:13 +0000 (18:19 +0200)]
MLK-19053: crypto: caam: RNG4 TRNG errata

  The TRNG as used in RNG4, used in CAAM has a documentation issue. The
 effect is that it is possible that the entropy used to instantiate the
 DRBG may be old entropy, rather than newly generated entropy. There is
 proper programming guidance, but it is not in the documentation.

Signed-off-by: Aymen Sghaier <aymen.sghaier@nxp.com>
(cherry picked from commit 2aff5ffb2c4bb19106f3faa76415b51591cbc2b2)
(cherry picked from commit 051a93febddac7e6fac557b0409203cfefb45b65)
(cherry picked from commit 68cea9fd1df97f2dd48dae0c891325a444458f94)

4 years agoMLK-19131 configs: imx8mm_evk: add jailhouse boot command
Peng Fan [Mon, 6 Aug 2018 09:47:22 +0000 (17:47 +0800)]
MLK-19131 configs: imx8mm_evk: add jailhouse boot command

Add jailhouse env. Currently need to pass clk_ignore_unused to bootargs
to avoid linux root cell shutdown clocks used by inmates.

If only want a minimal clk being on in inmates, the clks could
be added in clk_inits_on in linux kernel drivers/clk/imx/clk-imx8mm.c
or use init-on-array under clk node.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 7732b3b87423069c1c31d25ec07201098062b717)
(cherry picked from commit 718b0792dfedcf68b6c2e93d3eefe499ec463433)
(cherry picked from commit d18597669c701aebbf0a29c22f68a2347ea4eaf2)
(cherry picked from commit db588bf76ba47ebf872c36efa46dc64443eb657a)

4 years agoMLK-18793 imx8mq: config: add jailhouse env
Peng Fan [Fri, 6 Jul 2018 06:07:02 +0000 (14:07 +0800)]
MLK-18793 imx8mq: config: add jailhouse env

Add jailhouse env. Currently need to pass clk_ignore_unused to bootargs
to avoid linux root cell shutdown clocks used by inmates.

If only want a minimal clk being on in inmates, the clks could
be added in clk_inits_on in linux kernel drivers/clk/imx/clk-imx8mq.c

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 0d33db00e96e7addb6910a7097a62222ff75480f)
(cherry picked from commit 56ea0d9280b22ce3e260851e88782cb877fad6ec)
(cherry picked from commit a0371a771d102b3f90e043056ecdf477cd31ec20)
(cherry picked from commit b0790eaf28814d484c12c1b971a1518179fbb83a)

4 years agoMLK-18703: crypto: caam: Fix typo for caam blob commands
Aymen Sghaier [Wed, 11 Jul 2018 16:23:18 +0000 (18:23 +0200)]
MLK-18703: crypto: caam: Fix typo for caam blob commands

 This fix a wrong trace error while executing caam genlob command.

Signed-off-by: Aymen Sghaier <aymen.sghaier@nxp.com>
(cherry picked from commit 7b80598100baf38562bee10bb4a19c3c834b945b)
(cherry picked from commit 878d0d145482683bd7d3b89f3cbd74878b5d1064)
(cherry picked from commit 8877fda60d47cd1444f480a3486234ad76a547bb)

4 years agoMLK-18703: crypto: caam: Add TRNG init function call
Aymen Sghaier [Tue, 3 Jul 2018 08:14:37 +0000 (10:14 +0200)]
MLK-18703: crypto: caam: Add TRNG init function call

 Call the TRNG init function at the end of arch_cpu_init()
 Concerned SoCs are: i.MX6, i.MX7 and i.MX8M

Signed-off-by: Aymen Sghaier <aymen.sghaier@nxp.com>
(cherry picked from commit 996329904c0304a7bfbc6cda8287ab93de77870d)
(cherry picked from commit 5dd4441081f2af6f198a4d43eb1a3e543d986306)
(cherry picked from commit 6427f23dce038ddd995b41ef2300c6d6131ea9a2)

4 years agoMLK-18703: crypto: caam: Add init TRNG into SPL or U-Boot
Aymen Sghaier [Tue, 24 Apr 2018 16:36:02 +0000 (18:36 +0200)]
MLK-18703: crypto: caam: Add init TRNG into SPL or U-Boot

 The following reasons lead to instantiate the TRNG into U-Boot/SPL:

 - On some i.MX platforms Linux Kernel could not instantiate RNG
 - RNG could be used/needed by M4/M0 cores before Kernel stage
 - Having the RNG instantiation implemented only once for
   almost i.MX platforms

Signed-off-by: Aymen Sghaier <aymen.sghaier@nxp.com>
(cherry picked from commit 1f4134c85f6416cbdadaf5f4ff6321f6c685c74c)
(cherry picked from commit 20bd91de9f4b305adb15dda3a09fd9958557a82b)
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 1d7bbf924f59bb6e7401890b936c501b13222fdc)

4 years agoMLK-18591-2 crypto: caam: Add fsl caam driver
Ye Li [Wed, 6 Jun 2018 10:29:16 +0000 (03:29 -0700)]
MLK-18591-2 crypto: caam: Add fsl caam driver

Add the fsl CAAM driver and new commands to implement DEK blob operations,
like "caam genblob" to generate encrypted blob and "caam decap" to output
orignal plain data.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 4ec81a0b075d8d853ac696172660a7771064405d)
(cherry picked from commit fcd29e9dd2e13e4650741603ca1bfb40fe1a9ede)
(cherry picked from commit b5d2da34ea3bf377ae169378e56eb45480e80bdc)

4 years agoMLK-21846-2 imx8mq_evk: Enable USB SDP in SPL
Ye Li [Mon, 22 Apr 2019 04:06:13 +0000 (21:06 -0700)]
MLK-21846-2 imx8mq_evk: Enable USB SDP in SPL

Enable the SPL SDP driver and SPL gadget drivers on iMX8MQ EVK board.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 957fd8c849142802c4f0b9479be607c8c5ed1f7a)
(cherry picked from commit 69015a4b7fe719260929d4aca32da45addba0efe)

4 years agoMLK-18822 imx: Fix bootaux issue when running on ARM64
Ye Li [Wed, 11 Jul 2018 08:41:24 +0000 (01:41 -0700)]
MLK-18822 imx: Fix bootaux issue when running on ARM64

The bootaux from community uses ulong to read private data and write to M4 TCM,
this cause problem on ARM64 platform where the ulong is 8bytes.
Fix it by using u32 to replace ulong.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit f3d936c84759fcd47a2489cf31fe46cd84ba1f47)
(cherry picked from commit 2795cbf333997f2b723dff7d7585ece0257a0b3f)
(cherry picked from commit f22ccd7e79d7372f6c961bc876f16938e983291d)

4 years agoMLK-13486: imx: logos: use NXP logo
Peng Fan [Tue, 22 Nov 2016 02:57:13 +0000 (10:57 +0800)]
MLK-13486: imx: logos: use NXP logo

Use NXP logo.
The vendor and board dir not changed, only replace the contents
of freescale.bmp.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 0b381fdf1a45cb06a057724e708ce0bbeee67f4d)
(cherry picked from commit 836461a95ca8df0f41dacf1d390a966624190524)
(cherry picked from commit ffbeb365642907957a385fe970fc69adcf87d600)
(cherry picked from commit 18ec1e8b2be5c0952636960b39edd40f38ffcbc3)
(cherry picked from commit 03d27b84c6a44a1dafca775dfb748f75a5c1d834)

4 years agoMLK-18654-4 imx8mm_evk: Enable SPL SDP for iMX8MM EVK board
Ye Li [Fri, 19 Apr 2019 06:34:13 +0000 (23:34 -0700)]
MLK-18654-4 imx8mm_evk: Enable SPL SDP for iMX8MM EVK board

Enable the SPL SDP for iMX8MM EVK. So that when booting from USB serial
download mode, the SPL will enter SDP to download FIT image from USB host
(uuu tool) and boot into FIT image.

The SDP driver needs larger malloc pool size, so extend the SPL malloc pool
to 12KB and reduce the SPL BSS MAX to 4KB because BSS actual size is about 1KB.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit bd9cbf66f801ac930f7e62da9ed42653fd3dc7f9)
(cherry picked from commit f52234814d3d624aae36dd1db843f06d8ea6e348)

4 years agoMLK-23574-27 imx8mm_evk: Update board codes and add DDR4 support
Ye Li [Thu, 2 Apr 2020 06:58:29 +0000 (23:58 -0700)]
MLK-23574-27 imx8mm_evk: Update board codes and add DDR4 support

Update the board codes to use latest DDR script and support flexspi boot,
USB host/gadget, etc.
Also add DDR4 EVK board support for RAW NAND boot.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 07c35f48b5e9e41f7e8c1dfe81e9e50c65d4e87c)

4 years agoMA-15062 change MACRO name of mcu TCM base address
faqiang.zhu [Tue, 2 Jul 2019 04:36:34 +0000 (12:36 +0800)]
MA-15062 change MACRO name of mcu TCM base address

Change the MACRO name of mcu TCM base address from M4_BOOTROM_BASE_ADDR
to MCU_BOOTROM_BASE_ADDR.
since this MACRO will be used in common code for i.MX chips, the same
MACRO name in other files are also modified.

Change-Id: I433dd78d11c485d0f4cb82bab299f61cb29dce45
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
(cherry picked from commit e2eb616fdbc4ce6475b084ab11b77cd5dcaa6fd2)
(cherry picked from commit 809d03482c951989769a82e317abbeab9b8e4d8b)