imx: kontron-sl-mx8mm: Improvements and OSM board support
Subsystems (2)
cover imx: kontron-sl-mx8mm: Improvements and OSM board support
From: Frieder Schrempf <[email protected]>
This set contains several improvements for the kontron-sl-mx8mm board configuration (patches 1 to 13) and support for a new SoM (patch 14, including baseboard) that complies to the Open Standard Module (OSM) 1.0 hardware specification, size S (https://sget.org/standards/osm).
Frieder Schrempf (14):
imx: kontron-sl-mx8mm: Remove LVDS board type and devicetrees
imx: kontron-sl-mx8mm: Add redundant environment
imx: kontron-sl-mx8mm: Enable environment in MMC
imx: kontron-sl-mx8mm: Migrate to use CONFIG_EXTRA_ENV_TEXT
imx: kontron-sl-mx8mm: Enable bootaux command
imx: kontron-sl-mx8mm: lpddr4_timing.c: Add spaces for proper
alignment
imx: kontron-sl-mx8mm: Remove 100mt DDR setpoint
imx: kontron-sl-mx8mm: Use new LPDDR4 config parameters
imx: kontron-sl-mx8mm: Prepare for other i.MX8MM SoM types
imx: kontron-sl-mx8mm: Adjust board and SoM model strings
imx: kontron-sl-mx8mm: Use the VSELECT signal to switch SD card IO
voltage
imx: kontron-sl-mx8mm: Use voltage rail names from schematic for PMIC
regulator-names
imx: kontron-sl-mx8mm: Simplify code in spl.c
imx: kontron-sl-mx8mm: Add support for Kontron Electronics SoM SL
i.MX8MM OSM-S
arch/arm/dts/Makefile | 1 -
.../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 -
arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 116 -
.../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 7 +-
arch/arm/dts/imx8mm-kontron-n801x-s.dts | 5 +-
arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 30 +-
.../dts/imx8mm-kontron-n802x-s-u-boot.dtsi | 6 +
arch/arm/dts/imx8mm-kontron-n802x-s.dts | 376 ++++
arch/arm/dts/imx8mm-kontron-n802x-som.dtsi | 309 +++
...tsi => imx8mm-kontron-n80xx-s-u-boot.dtsi} | 8 +-
board/kontron/sl-mx8mm/MAINTAINERS | 1 +
board/kontron/sl-mx8mm/lpddr4_timing.c | 1969 ++++++++---------
board/kontron/sl-mx8mm/sl-mx8mm.c | 41 +
board/kontron/sl-mx8mm/sl-mx8mm.env | 7 +
board/kontron/sl-mx8mm/spl.c | 85 +-
configs/kontron-sl-mx8mm_defconfig | 10 +-
doc/board/kontron/sl-mx8mm.rst | 7 +-
include/configs/kontron-sl-mx8mm.h | 16 +-
18 files changed, 1717 insertions(+), 1283 deletions(-)
delete mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts
create mode 100644 arch/arm/dts/imx8mm-kontron-n802x-s-u-boot.dtsi
create mode 100644 arch/arm/dts/imx8mm-kontron-n802x-s.dts
create mode 100644 arch/arm/dts/imx8mm-kontron-n802x-som.dtsi
rename arch/arm/dts/{imx8mm-kontron-n801x-u-boot.dtsi => imx8mm-kontron-n80xx-s-u-boot.dtsi} (88%)
create mode 100644 board/kontron/sl-mx8mm/sl-mx8mm.envSignature · 1 line
2.37.0
PATCH 1/14 imx: kontron-sl-mx8mm: Remove LVDS board type and devicetrees
From: Frieder Schrempf <[email protected]>
The display isn't and won't be used in U-Boot. Also the display setup is not yet supported in mainline Linux, so even for cases where the U-Boot devicetree is passed to the kernel there is currently no use for this configuration.
Selecting the proper configuration in the kernel FIT image automatically depending on the detected hardware can be handled by a script in the environment.
--- arch/arm/dts/Makefile | 1 - .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 - arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 116 -------------- .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 140 ++++++++++++++++- arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 145 ------------------ board/kontron/sl-mx8mm/spl.c | 46 +----- configs/kontron-sl-mx8mm_defconfig | 1 - 7 files changed, 141 insertions(+), 314 deletions(-) delete mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi delete mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts delete mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi
arch/arm/dts/Makefile +0 -1
@@ -938,7 +938,6 @@ dtb-$(CONFIG_ARCH_IMX8M) += \ imx8mm-icore-mx8mm-ctouch2.dtb \ imx8mm-icore-mx8mm-edimm2.2.dtb \ imx8mm-kontron-n801x-s.dtb \ - imx8mm-kontron-n801x-s-lvds.dtb \ imx8mm-mx8menlo.dtb \ imx8mm-venice.dtb \ imx8mm-venice-gw71xx-0x.dtb \
arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi deleted +0 -6
@@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2019 Kontron Electronics GmbH - */ - -#include "imx8mm-kontron-n801x-u-boot.dtsi"
arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts deleted +0 -116
116 lines not on this page · raw message
arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +139 -1
143 lines not on this page · raw message
arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi deleted +0 -145
145 lines not on this page · raw message
board/kontron/sl-mx8mm/spl.c +2 -44
90 lines not on this page · raw message
configs/kontron-sl-mx8mm_defconfig +0 -1
@@ -67,7 +67,6 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="imx8mm-kontron-n801x-s imx8mm-kontron-n801x-s-lvds" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y
Signature · 1 line
2.37.0
PATCH 2/14 imx: kontron-sl-mx8mm: Add redundant environment
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Enable the redundant environment feature to allow falling back in case of storage corruption.
--- configs/kontron-sl-mx8mm_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
configs/kontron-sl-mx8mm_defconfig +4 -1
@@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0x1f0000 +CONFIG_ENV_OFFSET=0x150000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_IMX_CONFIG="board/kontron/sl-mx8mm/imximage.cfg" CONFIG_DM_GPIO=y
@@ -19,6 +19,7 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SPL=y +CONFIG_ENV_OFFSET_REDUND=0x160000 CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y
@@ -65,9 +66,11 @@ CONFIG_CMD_TIME=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:320k(spl),1024k(u-boot),64k(env),64k(env_redundant)" CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y
Signature · 1 line
2.37.0
PATCH 3/14 imx: kontron-sl-mx8mm: Enable environment in MMC
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
In case we boot from SD card or eMMC, we also want to load the environment from the according boot device.
--- board/kontron/sl-mx8mm/sl-mx8mm.c | 31 ++++++++++++++++++++++++++++++ configs/kontron-sl-mx8mm_defconfig | 1 + 2 files changed, 32 insertions(+)
board/kontron/sl-mx8mm/sl-mx8mm.c +31 -0
@@ -4,10 +4,13 @@*/ #include <asm/arch/imx-regs.h> +#include <asm/arch/sys_proto.h> #include <asm/global_data.h> #include <asm/io.h> +#include <asm/mach-imx/boot_mode.h> #include <efi.h> #include <efi_loader.h> +#include <env_internal.h> #include <fdt_support.h> #include <linux/errno.h> #include <linux/kernel.h>
@@ -117,3 +120,31 @@ int board_init(void) {return 0 ; } + +enum env_location env_get_location (enum env_operation op,int prio) +{ +enum boot_device boot_dev =get_boot_device (); + +if (prio) +return ENVL_UNKNOWN ; + +/* +* Make sure that the environment is loaded from +* the MMC if we are running from SD card or eMMC. +*/ +if (CONFIG_IS_ENABLED (ENV_IS_IN_MMC ) && + (boot_dev ==SD1_BOOT || boot_dev ==SD2_BOOT )) +return ENVL_MMC ; + +if (CONFIG_IS_ENABLED (ENV_IS_IN_SPI_FLASH )) +return ENVL_SPI_FLASH ; + +return ENVL_NOWHERE ; +} + +#if defined(CONFIG_ENV_IS_IN_MMC ) +int board_mmc_get_env_dev (int devno) +{ +return devno; +} +#endif
configs/kontron-sl-mx8mm_defconfig +1 -0
@@ -69,6 +69,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:320k(spl),1024k(u-boot),64k(env),64k(env_redundant)" CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
Signature · 1 line
2.37.0
PATCH 4/14 imx: kontron-sl-mx8mm: Migrate to use CONFIG_EXTRA_ENV_TEXT
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Move the environment from the board header to a separate text file and also drop those variables that are already set in env_default.h from the Kconfig options.
--- board/kontron/sl-mx8mm/sl-mx8mm.env | 7 +++++++ include/configs/kontron-sl-mx8mm.h | 16 +--------------- 2 files changed, 8 insertions(+), 15 deletions(-) create mode 100644 board/kontron/sl-mx8mm/sl-mx8mm.env
board/kontron/sl-mx8mm/sl-mx8mm.env new file +7 -0
@@ -0,0 +1,7 @@ +kernel_addr_r=0x42000000 +fdt_addr_r=0x48000000 +fdtoverlay_addr_r=0x49000000 +ramdisk_addr_r=0x48080000 +scriptaddr=0x40000000 +pxefile_addr_r=0x40100000 +dfu_alt_info=sf 0:0=flash-bin raw 0x400 0x1f0000
include/configs/kontron-sl-mx8mm.h +1 -15
@@ -50,20 +50,6 @@#define CONFIG_MALLOC_F_ADDR 0x930000#endif -#define ENV_MEM_LAYOUT_SETTINGS \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "kernel_addr_r=0x42000000\0" \ - "fdt_addr_r=0x48000000\0" \ - "fdtoverlay_addr_r=0x49000000\0" \ - "ramdisk_addr_r=0x48080000\0" \ - "scriptaddr=0x40000000\0"\ - "pxefile_addr_r=0x40100000\0" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "dfu_alt_info=sf 0:0=flash-bin raw 0x400 0x1f0000\0" \ - "bootdelay=3\0" \ - "hostname=" CONFIG_HOSTNAME "\0" \ - ENV_MEM_LAYOUT_SETTINGS \ - BOOTENV +#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV#endif /* __KONTRON_MX8MM_CONFIG_H */
Signature · 1 line
2.37.0
PATCH 5/14 imx: kontron-sl-mx8mm: Enable bootaux command
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Enable the bootaux command in order to be able to load a binary into the M4 core when needed.
--- configs/kontron-sl-mx8mm_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/kontron-sl-mx8mm_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x160000 +CONFIG_IMX_BOOTAUX=y CONFIG_SYS_LOAD_ADDR=0x42000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y
Signature · 1 line
2.37.0
PATCH 6/14 imx: kontron-sl-mx8mm: lpddr4_timing.c: Add spaces for proper alignment
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Fix the spaces and alignment for easier tracking of changes and comparing with configs generated by the tools.
--- board/kontron/sl-mx8mm/lpddr4_timing.c | 2076 ++++++++++++------------ 1 file changed, 1038 insertions(+), 1038 deletions(-)
board/kontron/sl-mx8mm/lpddr4_timing.c +1038 -1038
@@ -10,313 +10,313 @@struct dram_cfg_param ddr_ddrc_cfg[] = {/** Initialize DDRC registers **/ - {0x3d400304 ,0x1 }, - {0x3d400030 ,0x1 }, - {0x3d400000 ,0xa3080020 }, - {0x3d400020 ,0x223 }, - {0x3d400024 ,0x3a980 }, - {0x3d400064 ,0x5b0087 }, - {0x3d4000d0 ,0xc00305ba }, - {0x3d4000d4 ,0x940000 }, - {0x3d4000dc ,0xd4002d }, - {0x3d4000e0 ,0x310000 }, - {0x3d4000e8 ,0x66004d }, - {0x3d4000ec ,0x16004d }, - {0x3d400100 ,0x191e1920 }, - {0x3d400104 ,0x60630 }, - {0x3d40010c ,0xb0b000 }, - {0x3d400110 ,0xe04080e }, - {0x3d400114 ,0x2040c0c }, - {0x3d400118 ,0x1010007 }, - {0x3d40011c ,0x401 }, - {0x3d400130 ,0x20600 }, - {0x3d400134 ,0xc100002 }, - {0x3d400138 ,0xd8 }, - {0x3d400144 ,0x96004b }, - {0x3d400180 ,0x2ee0017 }, - {0x3d400184 ,0x2605b8e }, - {0x3d400188 ,0x0 }, - {0x3d400190 ,0x497820a }, - {0x3d400194 ,0x80303 }, - {0x3d4001b4 ,0x170a }, - {0x3d4001a0 ,0xe0400018 }, - {0x3d4001a4 ,0xdf00e4 }, - {0x3d4001a8 ,0x80000000 }, - {0x3d4001b0 ,0x11 }, - {0x3d4001c0 ,0x1 }, - {0x3d4001c4 ,0x1 }, - {0x3d4000f4 ,0xc99 }, - {0x3d400108 ,0x70e1617 }, - {0x3d400200 ,0x17 }, - {0x3d40020c ,0x0 }, - {0x3d400210 ,0x1f1f }, - {0x3d400204 ,0x80808 }, - {0x3d400214 ,0x7070707 }, - {0x3d400218 ,0x7070707 }, - {0x3d400250 ,0x29001701 }, - {0x3d400254 ,0x2c }, - {0x3d40025c ,0x4000030 }, - {0x3d400264 ,0x900093e7 }, - {0x3d40026c ,0x2005574 }, - {0x3d400400 ,0x111 }, - {0x3d400408 ,0x72ff }, - {0x3d400494 ,0x2100e07 }, - {0x3d400498 ,0x620096 }, - {0x3d40049c ,0x1100e07 }, - {0x3d4004a0 ,0xc8012c }, - {0x3d402020 ,0x21 }, - {0x3d402024 ,0x7d00 }, - {0x3d402050 ,0x20d040 }, - {0x3d402064 ,0xc001c }, - {0x3d4020dc ,0x840000 }, - {0x3d4020e0 ,0x310000 }, - {0x3d4020e8 ,0x66004d }, - {0x3d4020ec ,0x16004d }, - {0x3d402100 ,0xa040305 }, - {0x3d402104 ,0x30407 }, - {0x3d402108 ,0x203060b }, - {0x3d40210c ,0x505000 }, - {0x3d402110 ,0x2040202 }, - {0x3d402114 ,0x2030202 }, - {0x3d402118 ,0x1010004 }, - {0x3d40211c ,0x301 }, - {0x3d402130 ,0x20300 }, - {0x3d402134 ,0xa100002 }, - {0x3d402138 ,0x1d }, - {0x3d402144 ,0x14000a }, - {0x3d402180 ,0x640004 }, - {0x3d402190 ,0x3818200 }, - {0x3d402194 ,0x80303 }, - {0x3d4021b4 ,0x100 }, - {0x3d403020 ,0x21 }, - {0x3d403024 ,0x1f40 }, - {0x3d403050 ,0x20d040 }, - {0x3d403064 ,0x30007 }, - {0x3d4030dc ,0x840000 }, - {0x3d4030e0 ,0x310000 }, - {0x3d4030e8 ,0x66004d }, - {0x3d4030ec ,0x16004d }, - {0x3d403100 ,0xa010102 }, - {0x3d403104 ,0x30404 }, - {0x3d403108 ,0x203060b }, - {0x3d40310c ,0x505000 }, - {0x3d403110 ,0x2040202 }, - {0x3d403114 ,0x2030202 }, - {0x3d403118 ,0x1010004 }, - {0x3d40311c ,0x301 }, - {0x3d403130 ,0x20300 }, - {0x3d403134 ,0xa100002 }, - {0x3d403138 ,0x8 }, - {0x3d403144 ,0x50003 }, - {0x3d403180 ,0x190004 }, - {0x3d403190 ,0x3818200 }, - {0x3d403194 ,0x80303 }, - {0x3d4031b4 ,0x100 }, - {0x3d400028 ,0x0 }, + {0x3d400304 ,0x1 }, + {0x3d400030 ,0x1 }, + {0x3d400000 ,0xa3080020 }, + {0x3d400020 ,0x223 }, + {0x3d400024 ,0x3a980 }, + {0x3d400064 ,0x5b0087 }, + {0x3d4000d0 ,0xc00305ba }, + {0x3d4000d4 ,0x940000 }, + {0x3d4000dc ,0xd4002d }, + {0x3d4000e0 ,0x310000 }, + {0x3d4000e8 ,0x66004d }, + {0x3d4000ec ,0x16004d }, + {0x3d400100 ,0x191e1920 }, + {0x3d400104 ,0x60630 }, + {0x3d40010c ,0xb0b000 }, + {0x3d400110 ,0xe04080e }, + {0x3d400114 ,0x2040c0c }, + {0x3d400118 ,0x1010007 }, + {0x3d40011c ,0x401 }, + {0x3d400130 ,0x20600 }, + {0x3d400134 ,0xc100002 }, + {0x3d400138 ,0xd8 }, + {0x3d400144 ,0x96004b }, + {0x3d400180 ,0x2ee0017 }, + {0x3d400184 ,0x2605b8e }, + {0x3d400188 ,0x0 }, + {0x3d400190 ,0x497820a }, + {0x3d400194 ,0x80303 }, + {0x3d4001b4 ,0x170a }, + {0x3d4001a0 ,0xe0400018 }, + {0x3d4001a4 ,0xdf00e4 }, + {0x3d4001a8 ,0x80000000 }, + {0x3d4001b0 ,0x11 }, + {0x3d4001c0 ,0x1 }, + {0x3d4001c4 ,0x1 }, + {0x3d4000f4 ,0xc99 }, + {0x3d400108 ,0x70e1617 }, + {0x3d400200 ,0x17 }, + {0x3d40020c ,0x0 }, + {0x3d400210 ,0x1f1f }, + {0x3d400204 ,0x80808 }, + {0x3d400214 ,0x7070707 }, + {0x3d400218 ,0x7070707 }, + {0x3d400250 ,0x29001701 }, + {0x3d400254 ,0x2c }, + {0x3d40025c ,0x4000030 }, + {0x3d400264 ,0x900093e7 }, + {0x3d40026c ,0x2005574 }, + {0x3d400400 ,0x111 }, + {0x3d400408 ,0x72ff }, + {0x3d400494 ,0x2100e07 }, + {0x3d400498 ,0x620096 }, + {0x3d40049c ,0x1100e07 }, + {0x3d4004a0 ,0xc8012c }, + {0x3d402020 ,0x21 }, + {0x3d402024 ,0x7d00 }, + {0x3d402050 ,0x20d040 }, + {0x3d402064 ,0xc001c }, + {0x3d4020dc ,0x840000 }, + {0x3d4020e0 ,0x310000 }, + {0x3d4020e8 ,0x66004d }, + {0x3d4020ec ,0x16004d }, + {0x3d402100 ,0xa040305 }, + {0x3d402104 ,0x30407 }, + {0x3d402108 ,0x203060b }, + {0x3d40210c ,0x505000 }, + {0x3d402110 ,0x2040202 }, + {0x3d402114 ,0x2030202 }, + {0x3d402118 ,0x1010004 }, + {0x3d40211c ,0x301 }, + {0x3d402130 ,0x20300 }, + {0x3d402134 ,0xa100002 }, + {0x3d402138 ,0x1d }, + {0x3d402144 ,0x14000a }, + {0x3d402180 ,0x640004 }, + {0x3d402190 ,0x3818200 }, + {0x3d402194 ,0x80303 }, + {0x3d4021b4 ,0x100 }, + {0x3d403020 ,0x21 }, + {0x3d403024 ,0x1f40 }, + {0x3d403050 ,0x20d040 }, + {0x3d403064 ,0x30007 }, + {0x3d4030dc ,0x840000 }, + {0x3d4030e0 ,0x310000 }, + {0x3d4030e8 ,0x66004d }, + {0x3d4030ec ,0x16004d }, + {0x3d403100 ,0xa010102 }, + {0x3d403104 ,0x30404 }, + {0x3d403108 ,0x203060b }, + {0x3d40310c ,0x505000 }, + {0x3d403110 ,0x2040202 }, + {0x3d403114 ,0x2030202 }, + {0x3d403118 ,0x1010004 }, + {0x3d40311c ,0x301 }, + {0x3d403130 ,0x20300 }, + {0x3d403134 ,0xa100002 }, + {0x3d403138 ,0x8 }, + {0x3d403144 ,0x50003 }, + {0x3d403180 ,0x190004 }, + {0x3d403190 ,0x3818200 }, + {0x3d403194 ,0x80303 }, + {0x3d4031b4 ,0x100 }, + {0x3d400028 ,0x0 }, };/* PHY Initialize Configuration */ struct dram_cfg_param ddr_ddrphy_cfg[] = { - {0x100a0 ,0x0 }, - {0x100a1 ,0x1 }, - {0x100a2 ,0x2 }, - {0x100a3 ,0x3 }, - {0x100a4 ,0x4 }, - {0x100a5 ,0x5 }, - {0x100a6 ,0x6 }, - {0x100a7 ,0x7 }, - {0x110a0 ,0x0 }, - {0x110a1 ,0x1 }, - {0x110a2 ,0x3 }, - {0x110a3 ,0x4 }, - {0x110a4 ,0x5 }, - {0x110a5 ,0x2 }, - {0x110a6 ,0x7 }, - {0x110a7 ,0x6 }, - {0x120a0 ,0x0 }, - {0x120a1 ,0x1 }, - {0x120a2 ,0x3 }, - {0x120a3 ,0x2 }, - {0x120a4 ,0x5 }, - {0x120a5 ,0x4 }, - {0x120a6 ,0x7 }, - {0x120a7 ,0x6 }, - {0x130a0 ,0x0 }, - {0x130a1 ,0x1 }, - {0x130a2 ,0x2 }, - {0x130a3 ,0x3 }, - {0x130a4 ,0x4 }, - {0x130a5 ,0x5 }, - {0x130a6 ,0x6 }, - {0x130a7 ,0x7 }, - {0x1005f ,0x1ff }, - {0x1015f ,0x1ff }, - {0x1105f ,0x1ff }, - {0x1115f ,0x1ff }, - {0x1205f ,0x1ff }, - {0x1215f ,0x1ff }, - {0x1305f ,0x1ff }, - {0x1315f ,0x1ff }, - {0x11005f ,0x1ff }, - {0x11015f ,0x1ff }, - {0x11105f ,0x1ff }, - {0x11115f ,0x1ff }, - {0x11205f ,0x1ff }, - {0x11215f ,0x1ff }, - {0x11305f ,0x1ff }, - {0x11315f ,0x1ff }, - {0x21005f ,0x1ff }, - {0x21015f ,0x1ff }, - {0x21105f ,0x1ff }, - {0x21115f ,0x1ff }, - {0x21205f ,0x1ff }, - {0x21215f ,0x1ff }, - {0x21305f ,0x1ff }, - {0x21315f ,0x1ff }, - {0x55 ,0x1ff }, - {0x1055 ,0x1ff }, - {0x2055 ,0x1ff }, - {0x3055 ,0x1ff }, - {0x4055 ,0x1ff }, - {0x5055 ,0x1ff }, - {0x6055 ,0x1ff }, - {0x7055 ,0x1ff }, - {0x8055 ,0x1ff }, - {0x9055 ,0x1ff }, - {0x200c5 ,0x19 }, - {0x1200c5 ,0x7 }, - {0x2200c5 ,0x7 }, - {0x2002e ,0x2 }, - {0x12002e ,0x2 }, - {0x22002e ,0x2 }, - {0x90204 ,0x0 }, - {0x190204 ,0x0 }, - {0x290204 ,0x0 }, - {0x20024 ,0x1ab }, - {0x2003a ,0x0 }, - {0x120024 ,0x1ab }, - {0x2003a ,0x0 }, - {0x220024 ,0x1ab }, - {0x2003a ,0x0 }, - {0x20056 ,0x3 }, - {0x120056 ,0x3 }, - {0x220056 ,0x3 }, - {0x1004d ,0xe00 }, - {0x1014d ,0xe00 }, - {0x1104d ,0xe00 }, - {0x1114d ,0xe00 }, - {0x1204d ,0xe00 }, - {0x1214d ,0xe00 }, - {0x1304d ,0xe00 }, - {0x1314d ,0xe00 }, - {0x11004d ,0xe00 }, - {0x11014d ,0xe00 }, - {0x11104d ,0xe00 }, - {0x11114d ,0xe00 }, - {0x11204d ,0xe00 }, - {0x11214d ,0xe00 }, - {0x11304d ,0xe00 }, - {0x11314d ,0xe00 }, - {0x21004d ,0xe00 }, - {0x21014d ,0xe00 }, - {0x21104d ,0xe00 }, - {0x21114d ,0xe00 }, - {0x21204d ,0xe00 }, - {0x21214d ,0xe00 }, - {0x21304d ,0xe00 }, - {0x21314d ,0xe00 }, - {0x10049 ,0xeba }, - {0x10149 ,0xeba }, - {0x11049 ,0xeba }, - {0x11149 ,0xeba }, - {0x12049 ,0xeba }, - {0x12149 ,0xeba }, - {0x13049 ,0xeba }, - {0x13149 ,0xeba }, - {0x110049 ,0xeba }, - {0x110149 ,0xeba }, - {0x111049 ,0xeba }, - {0x111149 ,0xeba }, - {0x112049 ,0xeba }, - {0x112149 ,0xeba }, - {0x113049 ,0xeba }, - {0x113149 ,0xeba }, - {0x210049 ,0xeba }, - {0x210149 ,0xeba }, - {0x211049 ,0xeba }, - {0x211149 ,0xeba }, - {0x212049 ,0xeba }, - {0x212149 ,0xeba }, - {0x213049 ,0xeba }, - {0x213149 ,0xeba }, - {0x43 ,0x63 }, - {0x1043 ,0x63 }, - {0x2043 ,0x63 }, - {0x3043 ,0x63 }, - {0x4043 ,0x63 }, - {0x5043 ,0x63 }, - {0x6043 ,0x63 }, - {0x7043 ,0x63 }, - {0x8043 ,0x63 }, - {0x9043 ,0x63 }, - {0x20018 ,0x3 }, - {0x20075 ,0x4 }, - {0x20050 ,0x0 }, - {0x20008 ,0x2ee }, - {0x120008 ,0x64 }, - {0x220008 ,0x19 }, - {0x20088 ,0x9 }, - {0x200b2 ,0xdc }, - {0x10043 ,0x5a1 }, - {0x10143 ,0x5a1 }, - {0x11043 ,0x5a1 }, - {0x11143 ,0x5a1 }, - {0x12043 ,0x5a1 }, - {0x12143 ,0x5a1 }, - {0x13043 ,0x5a1 }, - {0x13143 ,0x5a1 }, - {0x1200b2 ,0xdc }, - {0x110043 ,0x5a1 }, - {0x110143 ,0x5a1 }, - {0x111043 ,0x5a1 }, - {0x111143 ,0x5a1 }, - {0x112043 ,0x5a1 }, - {0x112143 ,0x5a1 }, - {0x113043 ,0x5a1 }, - {0x113143 ,0x5a1 }, - {0x2200b2 ,0xdc }, - {0x210043 ,0x5a1 }, - {0x210143 ,0x5a1 }, - {0x211043 ,0x5a1 }, - {0x211143 ,0x5a1 }, - {0x212043 ,0x5a1 }, - {0x212143 ,0x5a1 }, - {0x213043 ,0x5a1 }, - {0x213143 ,0x5a1 }, - {0x200fa ,0x1 }, - {0x1200fa ,0x1 }, - {0x2200fa ,0x1 }, - {0x20019 ,0x1 }, - {0x120019 ,0x1 }, - {0x220019 ,0x1 }, - {0x200f0 ,0x660 }, - {0x200f1 ,0x0 }, - {0x200f2 ,0x4444 }, - {0x200f3 ,0x8888 }, - {0x200f4 ,0x5665 }, - {0x200f5 ,0x0 }, - {0x200f6 ,0x0 }, - {0x200f7 ,0xf000 }, - {0x20025 ,0x0 }, - {0x2002d ,0x0 }, - {0x12002d ,0x0 }, - {0x22002d ,0x0 }, - {0x200c7 ,0x21 }, - {0x1200c7 ,0x21 }, - {0x2200c7 ,0x21 }, - {0x200ca ,0x24 }, - {0x1200ca ,0x24 }, - {0x2200ca ,0x24 }, + {0x100a0 ,0x0 }, + {0x100a1 ,0x1 }, + {0x100a2 ,0x2 }, + {0x100a3 ,0x3 }, + {0x100a4 ,0x4 }, + {0x100a5 ,0x5 }, + {0x100a6 ,0x6 }, + {0x100a7 ,0x7 }, + {0x110a0 ,0x0 }, + {0x110a1 ,0x1 }, + {0x110a2 ,0x3 }, + {0x110a3 ,0x4 }, + {0x110a4 ,0x5 }, + {0x110a5 ,0x2 }, + {0x110a6 ,0x7 }, + {0x110a7 ,0x6 }, + {0x120a0 ,0x0 }, + {0x120a1 ,0x1 }, + {0x120a2 ,0x3 }, + {0x120a3 ,0x2 }, + {0x120a4 ,0x5 }, + {0x120a5 ,0x4 }, + {0x120a6 ,0x7 }, + {0x120a7 ,0x6 }, + {0x130a0 ,0x0 }, + {0x130a1 ,0x1 }, + {0x130a2 ,0x2 }, + {0x130a3 ,0x3 }, + {0x130a4 ,0x4 }, + {0x130a5 ,0x5 }, + {0x130a6 ,0x6 }, + {0x130a7 ,0x7 }, + {0x1005f ,0x1ff }, + {0x1015f ,0x1ff }, + {0x1105f ,0x1ff }, + {0x1115f ,0x1ff }, + {0x1205f ,0x1ff }, + {0x1215f ,0x1ff }, + {0x1305f ,0x1ff }, + {0x1315f ,0x1ff }, + {0x11005f ,0x1ff }, + {0x11015f ,0x1ff }, + {0x11105f ,0x1ff }, + {0x11115f ,0x1ff }, + {0x11205f ,0x1ff }, + {0x11215f ,0x1ff }, + {0x11305f ,0x1ff }, + {0x11315f ,0x1ff }, + {0x21005f ,0x1ff }, + {0x21015f ,0x1ff }, + {0x21105f ,0x1ff }, + {0x21115f ,0x1ff }, + {0x21205f ,0x1ff }, + {0x21215f ,0x1ff }, + {0x21305f ,0x1ff }, + {0x21315f ,0x1ff }, + {0x55 ,0x1ff }, + {0x1055 ,0x1ff }, + {0x2055 ,0x1ff }, + {0x3055 ,0x1ff }, + {0x4055 ,0x1ff }, + {0x5055 ,0x1ff }, + {0x6055 ,0x1ff }, + {0x7055 ,0x1ff }, + {0x8055 ,0x1ff }, + {0x9055 ,0x1ff }, + {0x200c5 ,0x19 }, + {0x1200c5 ,0x7 }, + {0x2200c5 ,0x7 }, + {0x2002e ,0x2 }, + {0x12002e ,0x2 }, + {0x22002e ,0x2 }, + {0x90204 ,0x0 }, + {0x190204 ,0x0 }, + {0x290204 ,0x0 }, + {0x20024 ,0x1ab }, + {0x2003a ,0x0 }, + {0x120024 ,0x1ab }, + {0x2003a ,0x0 }, + {0x220024 ,0x1ab }, + {0x2003a ,0x0 }, + {0x20056 ,0x3 }, + {0x120056 ,0x3 }, + {0x220056 ,0x3 }, + {0x1004d ,0xe00 }, + {0x1014d ,0xe00 }, + {0x1104d ,0xe00 }, + {0x1114d ,0xe00 }, + {0x1204d ,0xe00 }, + {0x1214d ,0xe00 }, + {0x1304d ,0xe00 }, + {0x1314d ,0xe00 }, + {0x11004d ,0xe00 }, + {0x11014d ,0xe00 }, + {0x11104d ,0xe00 }, + {0x11114d ,0xe00 }, + {0x11204d ,0xe00 }, + {0x11214d ,0xe00 }, + {0x11304d ,0xe00 }, + {0x11314d ,0xe00 }, + {0x21004d ,0xe00 }, + {0x21014d ,0xe00 }, + {0x21104d ,0xe00 }, + {0x21114d ,0xe00 }, + {0x21204d ,0xe00 }, + {0x21214d ,0xe00 }, + {0x21304d ,0xe00 }, + {0x21314d ,0xe00 }, + {0x10049 ,0xeba }, + {0x10149 ,0xeba }, + {0x11049 ,0xeba }, + {0x11149 ,0xeba }, + {0x12049 ,0xeba }, + {0x12149 ,0xeba }, + {0x13049 ,0xeba }, + {0x13149 ,0xeba }, + {0x110049 ,0xeba }, + {0x110149 ,0xeba }, + {0x111049 ,0xeba }, + {0x111149 ,0xeba }, + {0x112049 ,0xeba }, + {0x112149 ,0xeba }, + {0x113049 ,0xeba }, + {0x113149 ,0xeba }, + {0x210049 ,0xeba }, + {0x210149 ,0xeba }, + {0x211049 ,0xeba }, + {0x211149 ,0xeba }, + {0x212049 ,0xeba }, + {0x212149 ,0xeba }, + {0x213049 ,0xeba }, + {0x213149 ,0xeba }, + {0x43 ,0x63 }, + {0x1043 ,0x63 }, + {0x2043 ,0x63 }, + {0x3043 ,0x63 }, + {0x4043 ,0x63 }, + {0x5043 ,0x63 }, + {0x6043 ,0x63 }, + {0x7043 ,0x63 }, + {0x8043 ,0x63 }, + {0x9043 ,0x63 }, + {0x20018 ,0x3 }, + {0x20075 ,0x4 }, + {0x20050 ,0x0 }, + {0x20008 ,0x2ee }, + {0x120008 ,0x64 }, + {0x220008 ,0x19 }, + {0x20088 ,0x9 }, + {0x200b2 ,0xdc }, + {0x10043 ,0x5a1 }, + {0x10143 ,0x5a1 }, + {0x11043 ,0x5a1 }, + {0x11143 ,0x5a1 }, + {0x12043 ,0x5a1 }, + {0x12143 ,0x5a1 }, + {0x13043 ,0x5a1 }, + {0x13143 ,0x5a1 }, + {0x1200b2 ,0xdc }, + {0x110043 ,0x5a1 }, + {0x110143 ,0x5a1 }, + {0x111043 ,0x5a1 }, + {0x111143 ,0x5a1 }, + {0x112043 ,0x5a1 }, + {0x112143 ,0x5a1 }, + {0x113043 ,0x5a1 }, + {0x113143 ,0x5a1 }, + {0x2200b2 ,0xdc }, + {0x210043 ,0x5a1 }, + {0x210143 ,0x5a1 }, + {0x211043 ,0x5a1 }, + {0x211143 ,0x5a1 }, + {0x212043 ,0x5a1 }, + {0x212143 ,0x5a1 }, + {0x213043 ,0x5a1 }, + {0x213143 ,0x5a1 }, + {0x200fa ,0x1 }, + {0x1200fa ,0x1 }, + {0x2200fa ,0x1 }, + {0x20019 ,0x1 }, + {0x120019 ,0x1 }, + {0x220019 ,0x1 }, + {0x200f0 ,0x660 }, + {0x200f1 ,0x0 }, + {0x200f2 ,0x4444 }, + {0x200f3 ,0x8888 }, + {0x200f4 ,0x5665 }, + {0x200f5 ,0x0 }, + {0x200f6 ,0x0 }, + {0x200f7 ,0xf000 }, + {0x20025 ,0x0 }, + {0x2002d ,0x0 }, + {0x12002d ,0x0 }, + {0x22002d ,0x0 }, + {0x200c7 ,0x21 }, + {0x1200c7 ,0x21 }, + {0x2200c7 ,0x21 }, + {0x200ca ,0x24 }, + {0x1200ca ,0x24 }, + {0x2200ca ,0x24 }, };/* ddr phy trained csr */
@@ -1044,757 +1044,757 @@ struct dram_cfg_param ddr_ddrphy_trained_csr[] = {/* P0 message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp0_cfg[] = { - {0xd0000 ,0x0 }, - {0x54003 ,0xbb8 }, - {0x54004 ,0x2 }, - {0x54005 ,0x2228 }, - {0x54006 ,0x11 }, - {0x54008 ,0x131f }, - {0x54009 ,0xc8 }, - {0x5400b ,0x2 }, - {0x5400d ,0x100 }, - {0x54012 ,0x310 }, - {0x54019 ,0x2dd4 }, - {0x5401a ,0x31 }, - {0x5401b ,0x4d66 }, - {0x5401c ,0x4d00 }, - {0x5401e ,0x16 }, - {0x5401f ,0x2dd4 }, - {0x54020 ,0x31 }, - {0x54021 ,0x4d66 }, - {0x54022 ,0x4d00 }, - {0x54024 ,0x16 }, - {0x5402b ,0x1000 }, - {0x5402c ,0x3 }, - {0x54032 ,0xd400 }, - {0x54033 ,0x312d }, - {0x54034 ,0x6600 }, - {0x54035 ,0x4d }, - {0x54036 ,0x4d }, - {0x54037 ,0x1600 }, - {0x54038 ,0xd400 }, - {0x54039 ,0x312d }, - {0x5403a ,0x6600 }, - {0x5403b ,0x4d }, - {0x5403c ,0x4d }, - {0x5403d ,0x1600 }, - {0xd0000 ,0x1 }, + {0xd0000 ,0x0 }, + {0x54003 ,0xbb8 }, + {0x54004 ,0x2 }, + {0x54005 ,0x2228 }, + {0x54006 ,0x11 }, + {0x54008 ,0x131f }, + {0x54009 ,0xc8 }, + {0x5400b ,0x2 }, + {0x5400d ,0x100 }, + {0x54012 ,0x310 }, + {0x54019 ,0x2dd4 }, + {0x5401a ,0x31 }, + {0x5401b ,0x4d66 }, + {0x5401c ,0x4d00 }, + {0x5401e ,0x16 }, + {0x5401f ,0x2dd4 }, + {0x54020 ,0x31 }, + {0x54021 ,0x4d66 }, + {0x54022 ,0x4d00 }, + {0x54024 ,0x16 }, + {0x5402b ,0x1000 }, + {0x5402c ,0x3 }, + {0x54032 ,0xd400 }, + {0x54033 ,0x312d }, + {0x54034 ,0x6600 }, + {0x54035 ,0x4d }, + {0x54036 ,0x4d }, + {0x54037 ,0x1600 }, + {0x54038 ,0xd400 }, + {0x54039 ,0x312d }, + {0x5403a ,0x6600 }, + {0x5403b ,0x4d }, + {0x5403c ,0x4d }, + {0x5403d ,0x1600 }, + {0xd0000 ,0x1 }, };/* P1 message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp1_cfg[] = { - {0xd0000 ,0x0 }, - {0x54002 ,0x101 }, - {0x54003 ,0x190 }, - {0x54004 ,0x2 }, - {0x54005 ,0x2228 }, - {0x54006 ,0x11 }, - {0x54008 ,0x121f }, - {0x54009 ,0xc8 }, - {0x5400b ,0x2 }, - {0x5400d ,0x100 }, - {0x54012 ,0x310 }, - {0x54019 ,0x84 }, - {0x5401a ,0x31 }, - {0x5401b ,0x4d66 }, - {0x5401c ,0x4d00 }, - {0x5401e ,0x16 }, - {0x5401f ,0x84 }, - {0x54020 ,0x31 }, - {0x54021 ,0x4d66 }, - {0x54022 ,0x4d00 }, - {0x54024 ,0x16 }, - {0x5402b ,0x1000 }, - {0x5402c ,0x3 }, - {0x54032 ,0x8400 }, - {0x54033 ,0x3100 }, - {0x54034 ,0x6600 }, - {0x54035 ,0x4d }, - {0x54036 ,0x4d }, - {0x54037 ,0x1600 }, - {0x54038 ,0x8400 }, - {0x54039 ,0x3100 }, - {0x5403a ,0x6600 }, - {0x5403b ,0x4d }, - {0x5403c ,0x4d }, - {0x5403d ,0x1600 }, - {0xd0000 ,0x1 }, + {0xd0000 ,0x0 }, + {0x54002 ,0x101 }, + {0x54003 ,0x190 }, + {0x54004 ,0x2 }, + {0x54005 ,0x2228 }, + {0x54006 ,0x11 }, + {0x54008 ,0x121f }, + {0x54009 ,0xc8 }, + {0x5400b ,0x2 }, + {0x5400d ,0x100 }, + {0x54012 ,0x310 }, + {0x54019 ,0x84 }, + {0x5401a ,0x31 }, + {0x5401b ,0x4d66 }, + {0x5401c ,0x4d00 }, + {0x5401e ,0x16 }, + {0x5401f ,0x84 }, + {0x54020 ,0x31 }, + {0x54021 ,0x4d66 }, + {0x54022 ,0x4d00 }, + {0x54024 ,0x16 }, + {0x5402b ,0x1000 }, + {0x5402c ,0x3 }, + {0x54032 ,0x8400 }, + {0x54033 ,0x3100 }, + {0x54034 ,0x6600 }, + {0x54035 ,0x4d }, + {0x54036 ,0x4d }, + {0x54037 ,0x1600 }, + {0x54038 ,0x8400 }, + {0x54039 ,0x3100 }, + {0x5403a ,0x6600 }, + {0x5403b ,0x4d }, + {0x5403c ,0x4d }, + {0x5403d ,0x1600 }, + {0xd0000 ,0x1 }, };/* P2 message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp2_cfg[] = { - {0xd0000 ,0x0 }, - {0x54002 ,0x102 }, - {0x54003 ,0x64 }, - {0x54004 ,0x2 }, - {0x54005 ,0x2228 }, - {0x54006 ,0x11 }, - {0x54008 ,0x121f }, - {0x54009 ,0xc8 }, - {0x5400b ,0x2 }, - {0x5400d ,0x100 }, - {0x54012 ,0x310 }, - {0x54019 ,0x84 }, - {0x5401a ,0x31 }, - {0x5401b ,0x4d66 }, - {0x5401c ,0x4d00 }, - {0x5401e ,0x16 }, - {0x5401f ,0x84 }, - {0x54020 ,0x31 }, - {0x54021 ,0x4d66 }, - {0x54022 ,0x4d00 }, - {0x54024 ,0x16 }, - {0x5402b ,0x1000 }, - {0x5402c ,0x3 }, - {0x54032 ,0x8400 }, - {0x54033 ,0x3100 }, - {0x54034 ,0x6600 }, - {0x54035 ,0x4d }, - {0x54036 ,0x4d }, - {0x54037 ,0x1600 }, - {0x54038 ,0x8400 }, - {0x54039 ,0x3100 }, - {0x5403a ,0x6600 }, - {0x5403b ,0x4d }, - {0x5403c ,0x4d }, - {0x5403d ,0x1600 }, - {0xd0000 ,0x1 }, + {0xd0000 ,0x0 }, + {0x54002 ,0x102 }, + {0x54003 ,0x64 }, + {0x54004 ,0x2 }, + {0x54005 ,0x2228 }, + {0x54006 ,0x11 }, + {0x54008 ,0x121f }, + {0x54009 ,0xc8 }, + {0x5400b ,0x2 }, + {0x5400d ,0x100 }, + {0x54012 ,0x310 }, + {0x54019 ,0x84 }, + {0x5401a ,0x31 }, + {0x5401b ,0x4d66 }, + {0x5401c ,0x4d00 }, + {0x5401e ,0x16 }, + {0x5401f ,0x84 }, + {0x54020 ,0x31 }, + {0x54021 ,0x4d66 }, + {0x54022 ,0x4d00 }, + {0x54024 ,0x16 }, + {0x5402b ,0x1000 }, + {0x5402c ,0x3 }, + {0x54032 ,0x8400 }, + {0x54033 ,0x3100 }, + {0x54034 ,0x6600 }, + {0x54035 ,0x4d }, + {0x54036 ,0x4d }, + {0x54037 ,0x1600 }, + {0x54038 ,0x8400 }, + {0x54039 ,0x3100 }, + {0x5403a ,0x6600 }, + {0x5403b ,0x4d }, + {0x5403c ,0x4d }, + {0x5403d ,0x1600 }, + {0xd0000 ,0x1 }, };/* P0 2D message block paremeter for training firmware */ struct dram_cfg_param ddr_fsp0_2d_cfg[] = { - {0xd0000 ,0x0 }, - {0x54003 ,0xbb8 }, - {0x54004 ,0x2 }, - {0x54005 ,0x2228 }, - {0x54006 ,0x11 }, - {0x54008 ,0x61 }, - {0x54009 ,0xc8 }, - {0x5400b ,0x2 }, - {0x5400f ,0x100 }, - {0x54010 ,0x1f7f }, - {0x54012 ,0x310 }, - {0x54019 ,0x2dd4 }, - {0x5401a ,0x31 }, - {0x5401b ,0x4d66 }, - {0x5401c ,0x4d00 }, - {0x5401e ,0x16 }, - {0x5401f ,0x2dd4 }, - {0x54020 ,0x31 }, - {0x54021 ,0x4d66 }, - {0x54022 ,0x4d00 }, - {0x54024 ,0x16 }, - {0x5402b ,0x1000 }, - {0x5402c ,0x3 }, - {0x54032 ,0xd400 }, - {0x54033 ,0x312d }, - {0x54034 ,0x6600 }, - {0x54035 ,0x4d }, - {0x54036 ,0x4d }, - {0x54037 ,0x1600 }, - {0x54038 ,0xd400 }, - {0x54039 ,0x312d }, - {0x5403a ,0x6600 }, - {0x5403b ,0x4d }, - {0x5403c ,0x4d }, - {0x5403d ,0x1600 }, + {0xd0000 ,0x0 }, + {0x54003 ,0xbb8 }, + {0x54004 ,0x2 }, + {0x54005 ,0x2228 }, + {0x54006 ,0x11 }, + {0x54008 ,0x61 }, + {0x54009 ,0xc8 }, + {0x5400b ,0x2 }, + {0x5400f ,0x100 }, + {0x54010 ,0x1f7f }, + {0x54012 ,0x310 }, + {0x54019 ,0x2dd4 }, + {0x5401a ,0x31 }, + {0x5401b ,0x4d66 }, + {0x5401c ,0x4d00 }, + {0x5401e ,0x16 }, + {0x5401f ,0x2dd4 }, + {0x54020 ,0x31 }, + {0x54021 ,0x4d66 }, + {0x54022 ,0x4d00 }, + {0x54024 ,0x16 }, + {0x5402b ,0x1000 }, + {0x5402c ,0x3 }, + {0x54032 ,0xd400 }, + {0x54033 ,0x312d }, + {0x54034 ,0x6600 }, + {0x54035 ,0x4d }, + {0x54036 ,0x4d }, + {0x54037 ,0x1600 }, + {0x54038 ,0xd400 }, + {0x54039 ,0x312d }, + {0x5403a ,0x6600 }, + {0x5403b ,0x4d }, + {0x5403c ,0x4d }, + {0x5403d ,0x1600 }, {0xd0000 ,0x1 }, };/* DRAM PHY init engine image */ struct dram_cfg_param ddr_phy_pie[] = { - {0xd0000 ,0x0 }, - {0x90000 ,0x10 }, - {0x90001 ,0x400 }, - {0x90002 ,0x10e }, - {0x90003 ,0x0 }, - {0x90004 ,0x0 }, - {0x90005 ,0x8 }, - {0x90029 ,0xb }, - {0x9002a ,0x480 }, - {0x9002b ,0x109 }, - {0x9002c ,0x8 }, - {0x9002d ,0x448 }, - {0x9002e ,0x139 }, - {0x9002f ,0x8 }, - {0x90030 ,0x478 }, - {0x90031 ,0x109 }, - {0x90032 ,0x0 }, - {0x90033 ,0xe8 }, - {0x90034 ,0x109 }, - {0x90035 ,0x2 }, - {0x90036 ,0x10 }, - {0x90037 ,0x139 }, - {0x90038 ,0xf }, - {0x90039 ,0x7c0 }, - {0x9003a ,0x139 }, - {0x9003b ,0x44 }, - {0x9003c ,0x630 }, - {0x9003d ,0x159 }, - {0x9003e ,0x14f }, - {0x9003f ,0x630 }, - {0x90040 ,0x159 }, - {0x90041 ,0x47 }, - {0x90042 ,0x630 }, - {0x90043 ,0x149 }, - {0x90044 ,0x4f }, - {0x90045 ,0x630 }, - {0x90046 ,0x179 }, - {0x90047 ,0x8 }, - {0x90048 ,0xe0 }, - {0x90049 ,0x109 }, - {0x9004a ,0x0 }, - {0x9004b ,0x7c8 }, - {0x9004c ,0x109 }, - {0x9004d ,0x0 }, - {0x9004e ,0x1 }, - {0x9004f ,0x8 }, - {0x90050 ,0x0 }, - {0x90051 ,0x45a }, - {0x90052 ,0x9 }, - {0x90053 ,0x0 }, - {0x90054 ,0x448 }, - {0x90055 ,0x109 }, - {0x90056 ,0x40 }, - {0x90057 ,0x630 }, - {0x90058 ,0x179 }, - {0x90059 ,0x1 }, - {0x9005a ,0x618 }, - {0x9005b ,0x109 }, - {0x9005c ,0x40c0 }, - {0x9005d ,0x630 }, - {0x9005e ,0x149 }, - {0x9005f ,0x8 }, - {0x90060 ,0x4 }, - {0x90061 ,0x48 }, - {0x90062 ,0x4040 }, - {0x90063 ,0x630 }, - {0x90064 ,0x149 }, - {0x90065 ,0x0 }, - {0x90066 ,0x4 }, - {0x90067 ,0x48 }, - {0x90068 ,0x40 }, - {0x90069 ,0x630 }, - {0x9006a ,0x149 }, - {0x9006b ,0x10 }, - {0x9006c ,0x4 }, - {0x9006d ,0x18 }, - {0x9006e ,0x0 }, - {0x9006f ,0x4 }, - {0x90070 ,0x78 }, - {0x90071 ,0x549 }, - {0x90072 ,0x630 }, - {0x90073 ,0x159 }, - {0x90074 ,0xd49 }, - {0x90075 ,0x630 }, - {0x90076 ,0x159 }, - {0x90077 ,0x94a }, - {0x90078 ,0x630 }, - {0x90079 ,0x159 }, - {0x9007a ,0x441 }, - {0x9007b ,0x630 }, - {0x9007c ,0x149 }, - {0x9007d ,0x42 }, - {0x9007e ,0x630 }, - {0x9007f ,0x149 }, - {0x90080 ,0x1 }, - {0x90081 ,0x630 }, - {0x90082 ,0x149 }, - {0x90083 ,0x0 }, - {0x90084 ,0xe0 }, - {0x90085 ,0x109 }, - {0x90086 ,0xa }, - {0x90087 ,0x10 }, - {0x90088 ,0x109 }, - {0x90089 ,0x9 }, - {0x9008a ,0x3c0 }, - {0x9008b ,0x149 }, - {0x9008c ,0x9 }, - {0x9008d ,0x3c0 }, - {0x9008e ,0x159 }, - {0x9008f ,0x18 }, - {0x90090 ,0x10 }, - {0x90091 ,0x109 }, - {0x90092 ,0x0 }, - {0x90093 ,0x3c0 }, - {0x90094 ,0x109 }, - {0x90095 ,0x18 }, - {0x90096 ,0x4 }, - {0x90097 ,0x48 }, - {0x90098 ,0x18 }, - {0x90099 ,0x4 }, - {0x9009a ,0x58 }, - {0x9009b ,0xa }, - {0x9009c ,0x10 }, - {0x9009d ,0x109 }, - {0x9009e ,0x2 }, - {0x9009f ,0x10 }, - {0x900a0 ,0x109 }, - {0x900a1 ,0x5 }, - {0x900a2 ,0x7c0 }, - {0x900a3 ,0x109 }, - {0x900a4 ,0x10 }, - {0x900a5 ,0x10 }, - {0x900a6 ,0x109 }, - {0x40000 ,0x811 }, - {0x40020 ,0x880 }, - {0x40040 ,0x0 }, - {0x40060 ,0x0 }, - {0x40001 ,0x4008 }, - {0x40021 ,0x83 }, - {0x40041 ,0x4f }, - {0x40061 ,0x0 }, - {0x40002 ,0x4040 }, - {0x40022 ,0x83 }, - {0x40042 ,0x51 }, - {0x40062 ,0x0 }, - {0x40003 ,0x811 }, - {0x40023 ,0x880 }, - {0x40043 ,0x0 }, - {0x40063 ,0x0 }, - {0x40004 ,0x720 }, - {0x40024 ,0xf }, - {0x40044 ,0x1740 }, - {0x40064 ,0x0 }, - {0x40005 ,0x16 }, - {0x40025 ,0x83 }, - {0x40045 ,0x4b }, - {0x40065 ,0x0 }, - {0x40006 ,0x716 }, - {0x40026 ,0xf }, - {0x40046 ,0x2001 }, - {0x40066 ,0x0 }, - {0x40007 ,0x716 }, - {0x40027 ,0xf }, - {0x40047 ,0x2800 }, - {0x40067 ,0x0 }, - {0x40008 ,0x716 }, - {0x40028 ,0xf }, - {0x40048 ,0xf00 }, - {0x40068 ,0x0 }, - {0x40009 ,0x720 }, - {0x40029 ,0xf }, - {0x40049 ,0x1400 }, - {0x40069 ,0x0 }, - {0x4000a ,0xe08 }, - {0x4002a ,0xc15 }, - {0x4004a ,0x0 }, - {0x4006a ,0x0 }, - {0x4000b ,0x623 }, - {0x4002b ,0x15 }, - {0x4004b ,0x0 }, - {0x4006b ,0x0 }, - {0x4000c ,0x4028 }, - {0x4002c ,0x80 }, - {0x4004c ,0x0 }, - {0x4006c ,0x0 }, - {0x4000d ,0xe08 }, - {0x4002d ,0xc1a }, - {0x4004d ,0x0 }, - {0x4006d ,0x0 }, - {0x4000e ,0x623 }, - {0x4002e ,0x1a }, - {0x4004e ,0x0 }, - {0x4006e ,0x0 }, - {0x4000f ,0x4040 }, - {0x4002f ,0x80 }, - {0x4004f ,0x0 }, - {0x4006f ,0x0 }, - {0x40010 ,0x2604 }, - {0x40030 ,0x15 }, - {0x40050 ,0x0 }, - {0x40070 ,0x0 }, - {0x40011 ,0x708 }, - {0x40031 ,0x5 }, - {0x40051 ,0x0 }, - {0x40071 ,0x2002 }, - {0x40012 ,0x8 }, - {0x40032 ,0x80 }, - {0x40052 ,0x0 }, - {0x40072 ,0x0 }, - {0x40013 ,0x2604 }, - {0x40033 ,0x1a }, - {0x40053 ,0x0 }, - {0x40073 ,0x0 }, - {0x40014 ,0x708 }, - {0x40034 ,0xa }, - {0x40054 ,0x0 }, - {0x40074 ,0x2002 }, - {0x40015 ,0x4040 }, - {0x40035 ,0x80 }, - {0x40055 ,0x0 }, - {0x40075 ,0x0 }, - {0x40016 ,0x60a }, - {0x40036 ,0x15 }, - {0x40056 ,0x1200 }, - {0x40076 ,0x0 }, - {0x40017 ,0x61a }, - {0x40037 ,0x15 }, - {0x40057 ,0x1300 }, - {0x40077 ,0x0 }, - {0x40018 ,0x60a }, - {0x40038 ,0x1a }, - {0x40058 ,0x1200 }, - {0x40078 ,0x0 }, - {0x40019 ,0x642 }, - {0x40039 ,0x1a }, - {0x40059 ,0x1300 }, - {0x40079 ,0x0 }, - {0x4001a ,0x4808 }, - {0x4003a ,0x880 }, - {0x4005a ,0x0 }, - {0x4007a ,0x0 }, - {0x900a7 ,0x0 }, - {0x900a8 ,0x790 }, - {0x900a9 ,0x11a }, - {0x900aa ,0x8 }, - {0x900ab ,0x7aa }, - {0x900ac ,0x2a }, - {0x900ad ,0x10 }, - {0x900ae ,0x7b2 }, - {0x900af ,0x2a }, - {0x900b0 ,0x0 }, - {0x900b1 ,0x7c8 }, - {0x900b2 ,0x109 }, - {0x900b3 ,0x10 }, - {0x900b4 ,0x2a8 }, - {0x900b5 ,0x129 }, - {0x900b6 ,0x8 }, - {0x900b7 ,0x370 }, - {0x900b8 ,0x129 }, - {0x900b9 ,0xa }, - {0x900ba ,0x3c8 }, - {0x900bb ,0x1a9 }, - {0x900bc ,0xc }, - {0x900bd ,0x408 }, - {0x900be ,0x199 }, - {0x900bf ,0x14 }, - {0x900c0 ,0x790 }, - {0x900c1 ,0x11a }, - {0x900c2 ,0x8 }, - {0x900c3 ,0x4 }, - {0x900c4 ,0x18 }, - {0x900c5 ,0xe }, - {0x900c6 ,0x408 }, - {0x900c7 ,0x199 }, - {0x900c8 ,0x8 }, - {0x900c9 ,0x8568 }, - {0x900ca ,0x108 }, - {0x900cb ,0x18 }, - {0x900cc ,0x790 }, - {0x900cd ,0x16a }, - {0x900ce ,0x8 }, - {0x900cf ,0x1d8 }, - {0x900d0 ,0x169 }, - {0x900d1 ,0x10 }, - {0x900d2 ,0x8558 }, - {0x900d3 ,0x168 }, - {0x900d4 ,0x70 }, - {0x900d5 ,0x788 }, - {0x900d6 ,0x16a }, - {0x900d7 ,0x1ff8 }, - {0x900d8 ,0x85a8 }, - {0x900d9 ,0x1e8 }, - {0x900da ,0x50 }, - {0x900db ,0x798 }, - {0x900dc ,0x16a }, - {0x900dd ,0x60 }, - {0x900de ,0x7a0 }, - {0x900df ,0x16a }, - {0x900e0 ,0x8 }, - {0x900e1 ,0x8310 }, - {0x900e2 ,0x168 }, - {0x900e3 ,0x8 }, - {0x900e4 ,0xa310 }, - {0x900e5 ,0x168 }, - {0x900e6 ,0xa }, - {0x900e7 ,0x408 }, - {0x900e8 ,0x169 }, - {0x900e9 ,0x6e }, - {0x900ea ,0x0 }, - {0x900eb ,0x68 }, - {0x900ec ,0x0 }, - {0x900ed ,0x408 }, - {0x900ee ,0x169 }, - {0x900ef ,0x0 }, - {0x900f0 ,0x8310 }, - {0x900f1 ,0x168 }, - {0x900f2 ,0x0 }, - {0x900f3 ,0xa310 }, - {0x900f4 ,0x168 }, - {0x900f5 ,0x1ff8 }, - {0x900f6 ,0x85a8 }, - {0x900f7 ,0x1e8 }, - {0x900f8 ,0x68 }, - {0x900f9 ,0x798 }, - {0x900fa ,0x16a }, - {0x900fb ,0x78 }, - {0x900fc ,0x7a0 }, - {0x900fd ,0x16a }, - {0x900fe ,0x68 }, - {0x900ff ,0x790 }, - {0x90100 ,0x16a }, - {0x90101 ,0x8 }, - {0x90102 ,0x8b10 }, - {0x90103 ,0x168 }, - {0x90104 ,0x8 }, - {0x90105 ,0xab10 }, - {0x90106 ,0x168 }, - {0x90107 ,0xa }, - {0x90108 ,0x408 }, - {0x90109 ,0x169 }, - {0x9010a ,0x58 }, - {0x9010b ,0x0 }, - {0x9010c ,0x68 }, - {0x9010d ,0x0 }, - {0x9010e ,0x408 }, - {0x9010f ,0x169 }, - {0x90110 ,0x0 }, - {0x90111 ,0x8b10 }, - {0x90112 ,0x168 }, - {0x90113 ,0x0 }, - {0x90114 ,0xab10 }, - {0x90115 ,0x168 }, - {0x90116 ,0x0 }, - {0x90117 ,0x1d8 }, - {0x90118 ,0x169 }, - {0x90119 ,0x80 }, - {0x9011a ,0x790 }, - {0x9011b ,0x16a }, - {0x9011c ,0x18 }, - {0x9011d ,0x7aa }, - {0x9011e ,0x6a }, - {0x9011f ,0xa }, - {0x90120 ,0x0 }, - {0x90121 ,0x1e9 }, - {0x90122 ,0x8 }, - {0x90123 ,0x8080 }, - {0x90124 ,0x108 }, - {0x90125 ,0xf }, - {0x90126 ,0x408 }, - {0x90127 ,0x169 }, - {0x90128 ,0xc }, - {0x90129 ,0x0 }, - {0x9012a ,0x68 }, - {0x9012b ,0x9 }, - {0x9012c ,0x0 }, - {0x9012d ,0x1a9 }, - {0x9012e ,0x0 }, - {0x9012f ,0x408 }, - {0x90130 ,0x169 }, - {0x90131 ,0x0 }, - {0x90132 ,0x8080 }, - {0x90133 ,0x108 }, - {0x90134 ,0x8 }, - {0x90135 ,0x7aa }, - {0x90136 ,0x6a }, - {0x90137 ,0x0 }, - {0x90138 ,0x8568 }, - {0x90139 ,0x108 }, - {0x9013a ,0xb7 }, - {0x9013b ,0x790 }, - {0x9013c ,0x16a }, - {0x9013d ,0x1f }, - {0x9013e ,0x0 }, - {0x9013f ,0x68 }, - {0x90140 ,0x8 }, - {0x90141 ,0x8558 }, - {0x90142 ,0x168 }, - {0x90143 ,0xf }, - {0x90144 ,0x408 }, - {0x90145 ,0x169 }, - {0x90146 ,0xc }, - {0x90147 ,0x0 }, - {0x90148 ,0x68 }, - {0x90149 ,0x0 }, - {0x9014a ,0x408 }, - {0x9014b ,0x169 }, - {0x9014c ,0x0 }, - {0x9014d ,0x8558 }, - {0x9014e ,0x168 }, - {0x9014f ,0x8 }, - {0x90150 ,0x3c8 }, - {0x90151 ,0x1a9 }, - {0x90152 ,0x3 }, - {0x90153 ,0x370 }, - {0x90154 ,0x129 }, - {0x90155 ,0x20 }, - {0x90156 ,0x2aa }, - {0x90157 ,0x9 }, - {0x90158 ,0x0 }, - {0x90159 ,0x400 }, - {0x9015a ,0x10e }, - {0x9015b ,0x8 }, - {0x9015c ,0xe8 }, - {0x9015d ,0x109 }, - {0x9015e ,0x0 }, - {0x9015f ,0x8140 }, - {0x90160 ,0x10c }, - {0x90161 ,0x10 }, - {0x90162 ,0x8138 }, - {0x90163 ,0x10c }, - {0x90164 ,0x8 }, - {0x90165 ,0x7c8 }, - {0x90166 ,0x101 }, - {0x90167 ,0x8 }, - {0x90168 ,0x0 }, - {0x90169 ,0x8 }, - {0x9016a ,0x8 }, - {0x9016b ,0x448 }, - {0x9016c ,0x109 }, - {0x9016d ,0xf }, - {0x9016e ,0x7c0 }, - {0x9016f ,0x109 }, - {0x90170 ,0x0 }, - {0x90171 ,0xe8 }, - {0x90172 ,0x109 }, - {0x90173 ,0x47 }, - {0x90174 ,0x630 }, - {0x90175 ,0x109 }, - {0x90176 ,0x8 }, - {0x90177 ,0x618 }, - {0x90178 ,0x109 }, - {0x90179 ,0x8 }, - {0x9017a ,0xe0 }, - {0x9017b ,0x109 }, - {0x9017c ,0x0 }, - {0x9017d ,0x7c8 }, - {0x9017e ,0x109 }, - {0x9017f ,0x8 }, - {0x90180 ,0x8140 }, - {0x90181 ,0x10c }, - {0x90182 ,0x0 }, - {0x90183 ,0x1 }, - {0x90184 ,0x8 }, - {0x90185 ,0x8 }, - {0x90186 ,0x4 }, - {0x90187 ,0x8 }, - {0x90188 ,0x8 }, - {0x90189 ,0x7c8 }, - {0x9018a ,0x101 }, - {0x90006 ,0x0 }, - {0x90007 ,0x0 }, - {0x90008 ,0x8 }, - {0x90009 ,0x0 }, - {0x9000a ,0x0 }, - {0x9000b ,0x0 }, - {0xd00e7 ,0x400 }, - {0x90017 ,0x0 }, - {0x9001f ,0x2a }, - {0x90026 ,0x6a }, - {0x400d0 ,0x0 }, - {0x400d1 ,0x101 }, - {0x400d2 ,0x105 }, - {0x400d3 ,0x107 }, - {0x400d4 ,0x10f }, - {0x400d5 ,0x202 }, - {0x400d6 ,0x20a }, - {0x400d7 ,0x20b }, - {0x2003a ,0x2 }, - {0x2000b ,0x5d }, - {0x2000c ,0xbb }, - {0x2000d ,0x753 }, - {0x2000e ,0x2c }, - {0x12000b ,0xc }, - {0x12000c ,0x19 }, - {0x12000d ,0xfa }, - {0x12000e ,0x10 }, - {0x22000b ,0x3 }, - {0x22000c ,0x6 }, - {0x22000d ,0x3e }, - {0x22000e ,0x10 }, - {0x9000c ,0x0 }, - {0x9000d ,0x173 }, - {0x9000e ,0x60 }, - {0x9000f ,0x6110 }, - {0x90010 ,0x2152 }, - {0x90011 ,0xdfbd }, - {0x90012 ,0x60 }, - {0x90013 ,0x6152 }, - {0x20010 ,0x5a }, - {0x20011 ,0x3 }, - {0x120010 ,0x5a }, - {0x120011 ,0x3 }, - {0x220010 ,0x5a }, - {0x220011 ,0x3 }, - {0x40080 ,0xe0 }, - {0x40081 ,0x12 }, - {0x40082 ,0xe0 }, - {0x40083 ,0x12 }, - {0x40084 ,0xe0 }, - {0x40085 ,0x12 }, - {0x140080 ,0xe0 }, - {0x140081 ,0x12 }, - {0x140082 ,0xe0 }, - {0x140083 ,0x12 }, - {0x140084 ,0xe0 }, - {0x140085 ,0x12 }, - {0x240080 ,0xe0 }, - {0x240081 ,0x12 }, - {0x240082 ,0xe0 }, - {0x240083 ,0x12 }, - {0x240084 ,0xe0 }, - {0x240085 ,0x12 }, - {0x400fd ,0xf }, - {0x10011 ,0x1 }, - {0x10012 ,0x1 }, - {0x10013 ,0x180 }, - {0x10018 ,0x1 }, - {0x10002 ,0x6209 }, - {0x100b2 ,0x1 }, - {0x101b4 ,0x1 }, - {0x102b4 ,0x1 }, - {0x103b4 ,0x1 }, - {0x104b4 ,0x1 }, - {0x105b4 ,0x1 }, - {0x106b4 ,0x1 }, - {0x107b4 ,0x1 }, - {0x108b4 ,0x1 }, - {0x11011 ,0x1 }, - {0x11012 ,0x1 }, - {0x11013 ,0x180 }, - {0x11018 ,0x1 }, - {0x11002 ,0x6209 }, - {0x110b2 ,0x1 }, - {0x111b4 ,0x1 }, - {0x112b4 ,0x1 }, - {0x113b4 ,0x1 }, - {0x114b4 ,0x1 }, - {0x115b4 ,0x1 }, - {0x116b4 ,0x1 }, - {0x117b4 ,0x1 }, - {0x118b4 ,0x1 }, - {0x12011 ,0x1 }, - {0x12012 ,0x1 }, - {0x12013 ,0x180 }, - {0x12018 ,0x1 }, - {0x12002 ,0x6209 }, - {0x120b2 ,0x1 }, - {0x121b4 ,0x1 }, - {0x122b4 ,0x1 }, - {0x123b4 ,0x1 }, - {0x124b4 ,0x1 }, - {0x125b4 ,0x1 }, - {0x126b4 ,0x1 }, - {0x127b4 ,0x1 }, - {0x128b4 ,0x1 }, - {0x13011 ,0x1 }, - {0x13012 ,0x1 }, - {0x13013 ,0x180 }, - {0x13018 ,0x1 }, - {0x13002 ,0x6209 }, - {0x130b2 ,0x1 }, - {0x131b4 ,0x1 }, - {0x132b4 ,0x1 }, - {0x133b4 ,0x1 }, - {0x134b4 ,0x1 }, - {0x135b4 ,0x1 }, - {0x136b4 ,0x1 }, - {0x137b4 ,0x1 }, - {0x138b4 ,0x1 }, - {0x2003a ,0x2 }, - {0xc0080 ,0x2 }, - {0xd0000 ,0x1 } + {0xd0000 ,0x0 }, + {0x90000 ,0x10 }, + {0x90001 ,0x400 }, + {0x90002 ,0x10e }, + {0x90003 ,0x0 }, + {0x90004 ,0x0 }, + {0x90005 ,0x8 }, + {0x90029 ,0xb }, + {0x9002a ,0x480 }, + {0x9002b ,0x109 }, + {0x9002c ,0x8 }, + {0x9002d ,0x448 }, + {0x9002e ,0x139 }, + {0x9002f ,0x8 }, + {0x90030 ,0x478 }, + {0x90031 ,0x109 }, + {0x90032 ,0x0 }, + {0x90033 ,0xe8 }, + {0x90034 ,0x109 }, + {0x90035 ,0x2 }, + {0x90036 ,0x10 }, + {0x90037 ,0x139 }, + {0x90038 ,0xf }, + {0x90039 ,0x7c0 }, + {0x9003a ,0x139 }, + {0x9003b ,0x44 }, + {0x9003c ,0x630 }, + {0x9003d ,0x159 }, + {0x9003e ,0x14f }, + {0x9003f ,0x630 }, + {0x90040 ,0x159 }, + {0x90041 ,0x47 }, + {0x90042 ,0x630 }, + {0x90043 ,0x149 }, + {0x90044 ,0x4f }, + {0x90045 ,0x630 }, + {0x90046 ,0x179 }, + {0x90047 ,0x8 }, + {0x90048 ,0xe0 }, + {0x90049 ,0x109 }, + {0x9004a ,0x0 }, + {0x9004b ,0x7c8 }, + {0x9004c ,0x109 }, + {0x9004d ,0x0 }, + {0x9004e ,0x1 }, + {0x9004f ,0x8 }, + {0x90050 ,0x0 }, + {0x90051 ,0x45a }, + {0x90052 ,0x9 }, + {0x90053 ,0x0 }, + {0x90054 ,0x448 }, + {0x90055 ,0x109 }, + {0x90056 ,0x40 }, + {0x90057 ,0x630 }, + {0x90058 ,0x179 }, + {0x90059 ,0x1 }, + {0x9005a ,0x618 }, + {0x9005b ,0x109 }, + {0x9005c ,0x40c0 }, + {0x9005d ,0x630 }, + {0x9005e ,0x149 }, + {0x9005f ,0x8 }, + {0x90060 ,0x4 }, + {0x90061 ,0x48 }, + {0x90062 ,0x4040 }, + {0x90063 ,0x630 }, + {0x90064 ,0x149 }, + {0x90065 ,0x0 }, + {0x90066 ,0x4 }, + {0x90067 ,0x48 }, + {0x90068 ,0x40 }, + {0x90069 ,0x630 }, + {0x9006a ,0x149 }, + {0x9006b ,0x10 }, + {0x9006c ,0x4 }, + {0x9006d ,0x18 }, + {0x9006e ,0x0 }, + {0x9006f ,0x4 }, + {0x90070 ,0x78 }, + {0x90071 ,0x549 }, + {0x90072 ,0x630 }, + {0x90073 ,0x159 }, + {0x90074 ,0xd49 }, + {0x90075 ,0x630 }, + {0x90076 ,0x159 }, + {0x90077 ,0x94a }, + {0x90078 ,0x630 }, + {0x90079 ,0x159 }, + {0x9007a ,0x441 }, + {0x9007b ,0x630 }, + {0x9007c ,0x149 }, + {0x9007d ,0x42 }, + {0x9007e ,0x630 }, + {0x9007f ,0x149 }, + {0x90080 ,0x1 }, + {0x90081 ,0x630 }, + {0x90082 ,0x149 }, + {0x90083 ,0x0 }, + {0x90084 ,0xe0 }, + {0x90085 ,0x109 }, + {0x90086 ,0xa }, + {0x90087 ,0x10 }, + {0x90088 ,0x109 }, + {0x90089 ,0x9 }, + {0x9008a ,0x3c0 }, + {0x9008b ,0x149 }, + {0x9008c ,0x9 }, + {0x9008d ,0x3c0 }, + {0x9008e ,0x159 }, + {0x9008f ,0x18 }, + {0x90090 ,0x10 }, + {0x90091 ,0x109 }, + {0x90092 ,0x0 }, + {0x90093 ,0x3c0 }, + {0x90094 ,0x109 }, + {0x90095 ,0x18 }, + {0x90096 ,0x4 }, + {0x90097 ,0x48 }, + {0x90098 ,0x18 }, + {0x90099 ,0x4 }, + {0x9009a ,0x58 }, + {0x9009b ,0xa }, + {0x9009c ,0x10 }, + {0x9009d ,0x109 }, + {0x9009e ,0x2 }, + {0x9009f ,0x10 }, + {0x900a0 ,0x109 }, + {0x900a1 ,0x5 }, + {0x900a2 ,0x7c0 }, + {0x900a3 ,0x109 }, + {0x900a4 ,0x10 }, + {0x900a5 ,0x10 }, + {0x900a6 ,0x109 }, + {0x40000 ,0x811 }, + {0x40020 ,0x880 }, + {0x40040 ,0x0 }, + {0x40060 ,0x0 }, + {0x40001 ,0x4008 }, + {0x40021 ,0x83 }, + {0x40041 ,0x4f }, + {0x40061 ,0x0 }, + {0x40002 ,0x4040 }, + {0x40022 ,0x83 }, + {0x40042 ,0x51 }, + {0x40062 ,0x0 }, + {0x40003 ,0x811 }, + {0x40023 ,0x880 }, + {0x40043 ,0x0 }, + {0x40063 ,0x0 }, + {0x40004 ,0x720 }, + {0x40024 ,0xf }, + {0x40044 ,0x1740 }, + {0x40064 ,0x0 }, + {0x40005 ,0x16 }, + {0x40025 ,0x83 }, + {0x40045 ,0x4b }, + {0x40065 ,0x0 }, + {0x40006 ,0x716 }, + {0x40026 ,0xf }, + {0x40046 ,0x2001 }, + {0x40066 ,0x0 }, + {0x40007 ,0x716 }, + {0x40027 ,0xf }, + {0x40047 ,0x2800 }, + {0x40067 ,0x0 }, + {0x40008 ,0x716 }, + {0x40028 ,0xf }, + {0x40048 ,0xf00 }, + {0x40068 ,0x0 }, + {0x40009 ,0x720 }, + {0x40029 ,0xf }, + {0x40049 ,0x1400 }, + {0x40069 ,0x0 }, + {0x4000a ,0xe08 }, + {0x4002a ,0xc15 }, + {0x4004a ,0x0 }, + {0x4006a ,0x0 }, + {0x4000b ,0x623 }, + {0x4002b ,0x15 }, + {0x4004b ,0x0 }, + {0x4006b ,0x0 }, + {0x4000c ,0x4028 }, + {0x4002c ,0x80 }, + {0x4004c ,0x0 }, + {0x4006c ,0x0 }, + {0x4000d ,0xe08 }, + {0x4002d ,0xc1a }, + {0x4004d ,0x0 }, + {0x4006d ,0x0 }, + {0x4000e ,0x623 }, + {0x4002e ,0x1a }, + {0x4004e ,0x0 }, + {0x4006e ,0x0 }, + {0x4000f ,0x4040 }, + {0x4002f ,0x80 }, + {0x4004f ,0x0 }, + {0x4006f ,0x0 }, + {0x40010 ,0x2604 }, + {0x40030 ,0x15 }, + {0x40050 ,0x0 }, + {0x40070 ,0x0 }, + {0x40011 ,0x708 }, + {0x40031 ,0x5 }, + {0x40051 ,0x0 }, + {0x40071 ,0x2002 }, + {0x40012 ,0x8 }, + {0x40032 ,0x80 }, + {0x40052 ,0x0 }, + {0x40072 ,0x0 }, + {0x40013 ,0x2604 }, + {0x40033 ,0x1a }, + {0x40053 ,0x0 }, + {0x40073 ,0x0 }, + {0x40014 ,0x708 }, + {0x40034 ,0xa }, + {0x40054 ,0x0 }, + {0x40074 ,0x2002 }, + {0x40015 ,0x4040 }, + {0x40035 ,0x80 }, + {0x40055 ,0x0 }, + {0x40075 ,0x0 }, + {0x40016 ,0x60a }, + {0x40036 ,0x15 }, + {0x40056 ,0x1200 }, + {0x40076 ,0x0 }, + {0x40017 ,0x61a }, + {0x40037 ,0x15 }, + {0x40057 ,0x1300 }, + {0x40077 ,0x0 }, + {0x40018 ,0x60a }, + {0x40038 ,0x1a }, + {0x40058 ,0x1200 }, + {0x40078 ,0x0 }, + {0x40019 ,0x642 }, + {0x40039 ,0x1a }, + {0x40059 ,0x1300 }, + {0x40079 ,0x0 }, + {0x4001a ,0x4808 }, + {0x4003a ,0x880 }, + {0x4005a ,0x0 }, + {0x4007a ,0x0 }, + {0x900a7 ,0x0 }, + {0x900a8 ,0x790 }, + {0x900a9 ,0x11a }, + {0x900aa ,0x8 }, + {0x900ab ,0x7aa }, + {0x900ac ,0x2a }, + {0x900ad ,0x10 }, + {0x900ae ,0x7b2 }, + {0x900af ,0x2a }, + {0x900b0 ,0x0 }, + {0x900b1 ,0x7c8 }, + {0x900b2 ,0x109 }, + {0x900b3 ,0x10 }, + {0x900b4 ,0x2a8 }, + {0x900b5 ,0x129 }, + {0x900b6 ,0x8 }, + {0x900b7 ,0x370 }, + {0x900b8 ,0x129 }, + {0x900b9 ,0xa }, + {0x900ba ,0x3c8 }, + {0x900bb ,0x1a9 }, + {0x900bc ,0xc }, + {0x900bd ,0x408 }, + {0x900be ,0x199 }, + {0x900bf ,0x14 }, + {0x900c0 ,0x790 }, + {0x900c1 ,0x11a }, + {0x900c2 ,0x8 }, + {0x900c3 ,0x4 }, + {0x900c4 ,0x18 }, + {0x900c5 ,0xe }, + {0x900c6 ,0x408 }, + {0x900c7 ,0x199 }, + {0x900c8 ,0x8 }, + {0x900c9 ,0x8568 }, + {0x900ca ,0x108 }, + {0x900cb ,0x18 }, + {0x900cc ,0x790 }, + {0x900cd ,0x16a }, + {0x900ce ,0x8 }, + {0x900cf ,0x1d8 }, + {0x900d0 ,0x169 }, + {0x900d1 ,0x10 }, + {0x900d2 ,0x8558 }, + {0x900d3 ,0x168 }, + {0x900d4 ,0x70 }, + {0x900d5 ,0x788 }, + {0x900d6 ,0x16a }, + {0x900d7 ,0x1ff8 }, + {0x900d8 ,0x85a8 }, + {0x900d9 ,0x1e8 }, + {0x900da ,0x50 }, + {0x900db ,0x798 }, + {0x900dc ,0x16a }, + {0x900dd ,0x60 }, + {0x900de ,0x7a0 }, + {0x900df ,0x16a }, + {0x900e0 ,0x8 }, + {0x900e1 ,0x8310 }, + {0x900e2 ,0x168 }, + {0x900e3 ,0x8 }, + {0x900e4 ,0xa310 }, + {0x900e5 ,0x168 }, + {0x900e6 ,0xa }, + {0x900e7 ,0x408 }, + {0x900e8 ,0x169 }, + {0x900e9 ,0x6e }, + {0x900ea ,0x0 }, + {0x900eb ,0x68 }, + {0x900ec ,0x0 }, + {0x900ed ,0x408 }, + {0x900ee ,0x169 }, + {0x900ef ,0x0 }, + {0x900f0 ,0x8310 }, + {0x900f1 ,0x168 }, + {0x900f2 ,0x0 }, + {0x900f3 ,0xa310 }, + {0x900f4 ,0x168 }, + {0x900f5 ,0x1ff8 }, + {0x900f6 ,0x85a8 }, + {0x900f7 ,0x1e8 }, + {0x900f8 ,0x68 }, + {0x900f9 ,0x798 }, + {0x900fa ,0x16a }, + {0x900fb ,0x78 }, + {0x900fc ,0x7a0 }, + {0x900fd ,0x16a }, + {0x900fe ,0x68 }, + {0x900ff ,0x790 }, + {0x90100 ,0x16a }, + {0x90101 ,0x8 }, + {0x90102 ,0x8b10 }, + {0x90103 ,0x168 }, + {0x90104 ,0x8 }, + {0x90105 ,0xab10 }, + {0x90106 ,0x168 }, + {0x90107 ,0xa }, + {0x90108 ,0x408 }, + {0x90109 ,0x169 }, + {0x9010a ,0x58 }, + {0x9010b ,0x0 }, + {0x9010c ,0x68 }, + {0x9010d ,0x0 }, + {0x9010e ,0x408 }, + {0x9010f ,0x169 }, + {0x90110 ,0x0 }, + {0x90111 ,0x8b10 }, + {0x90112 ,0x168 }, + {0x90113 ,0x0 }, + {0x90114 ,0xab10 }, + {0x90115 ,0x168 }, + {0x90116 ,0x0 }, + {0x90117 ,0x1d8 }, + {0x90118 ,0x169 }, + {0x90119 ,0x80 }, + {0x9011a ,0x790 }, + {0x9011b ,0x16a }, + {0x9011c ,0x18 }, + {0x9011d ,0x7aa }, + {0x9011e ,0x6a }, + {0x9011f ,0xa }, + {0x90120 ,0x0 }, + {0x90121 ,0x1e9 }, + {0x90122 ,0x8 }, + {0x90123 ,0x8080 }, + {0x90124 ,0x108 }, + {0x90125 ,0xf }, + {0x90126 ,0x408 }, + {0x90127 ,0x169 }, + {0x90128 ,0xc }, + {0x90129 ,0x0 }, + {0x9012a ,0x68 }, + {0x9012b ,0x9 }, + {0x9012c ,0x0 }, + {0x9012d ,0x1a9 }, + {0x9012e ,0x0 }, + {0x9012f ,0x408 }, + {0x90130 ,0x169 }, + {0x90131 ,0x0 }, + {0x90132 ,0x8080 }, + {0x90133 ,0x108 }, + {0x90134 ,0x8 }, + {0x90135 ,0x7aa }, + {0x90136 ,0x6a }, + {0x90137 ,0x0 }, + {0x90138 ,0x8568 }, + {0x90139 ,0x108 }, + {0x9013a ,0xb7 }, + {0x9013b ,0x790 }, + {0x9013c ,0x16a }, + {0x9013d ,0x1f }, + {0x9013e ,0x0 }, + {0x9013f ,0x68 }, + {0x90140 ,0x8 }, + {0x90141 ,0x8558 }, + {0x90142 ,0x168 }, + {0x90143 ,0xf }, + {0x90144 ,0x408 }, + {0x90145 ,0x169 }, + {0x90146 ,0xc }, + {0x90147 ,0x0 }, + {0x90148 ,0x68 }, + {0x90149 ,0x0 }, + {0x9014a ,0x408 }, + {0x9014b ,0x169 }, + {0x9014c ,0x0 }, + {0x9014d ,0x8558 }, + {0x9014e ,0x168 }, + {0x9014f ,0x8 }, + {0x90150 ,0x3c8 }, + {0x90151 ,0x1a9 }, + {0x90152 ,0x3 }, + {0x90153 ,0x370 }, + {0x90154 ,0x129 }, + {0x90155 ,0x20 }, + {0x90156 ,0x2aa }, + {0x90157 ,0x9 }, + {0x90158 ,0x0 }, + {0x90159 ,0x400 }, + {0x9015a ,0x10e }, + {0x9015b ,0x8 }, + {0x9015c ,0xe8 }, + {0x9015d ,0x109 }, + {0x9015e ,0x0 }, + {0x9015f ,0x8140 }, + {0x90160 ,0x10c }, + {0x90161 ,0x10 }, + {0x90162 ,0x8138 }, + {0x90163 ,0x10c }, + {0x90164 ,0x8 }, + {0x90165 ,0x7c8 }, + {0x90166 ,0x101 }, + {0x90167 ,0x8 }, + {0x90168 ,0x0 }, + {0x90169 ,0x8 }, + {0x9016a ,0x8 }, + {0x9016b ,0x448 }, + {0x9016c ,0x109 }, + {0x9016d ,0xf }, + {0x9016e ,0x7c0 }, + {0x9016f ,0x109 }, + {0x90170 ,0x0 }, + {0x90171 ,0xe8 }, + {0x90172 ,0x109 }, + {0x90173 ,0x47 }, + {0x90174 ,0x630 }, + {0x90175 ,0x109 }, + {0x90176 ,0x8 }, + {0x90177 ,0x618 }, + {0x90178 ,0x109 }, + {0x90179 ,0x8 }, + {0x9017a ,0xe0 }, + {0x9017b ,0x109 }, + {0x9017c ,0x0 }, + {0x9017d ,0x7c8 }, + {0x9017e ,0x109 }, + {0x9017f ,0x8 }, + {0x90180 ,0x8140 }, + {0x90181 ,0x10c }, + {0x90182 ,0x0 }, + {0x90183 ,0x1 }, + {0x90184 ,0x8 }, + {0x90185 ,0x8 }, + {0x90186 ,0x4 }, + {0x90187 ,0x8 }, + {0x90188 ,0x8 }, + {0x90189 ,0x7c8 }, + {0x9018a ,0x101 }, + {0x90006 ,0x0 }, + {0x90007 ,0x0 }, + {0x90008 ,0x8 }, + {0x90009 ,0x0 }, + {0x9000a ,0x0 }, + {0x9000b ,0x0 }, + {0xd00e7 ,0x400 }, + {0x90017 ,0x0 }, + {0x9001f ,0x2a }, + {0x90026 ,0x6a }, + {0x400d0 ,0x0 }, + {0x400d1 ,0x101 }, + {0x400d2 ,0x105 }, + {0x400d3 ,0x107 }, + {0x400d4 ,0x10f }, + {0x400d5 ,0x202 }, + {0x400d6 ,0x20a }, + {0x400d7 ,0x20b }, + {0x2003a ,0x2 }, + {0x2000b ,0x5d }, + {0x2000c ,0xbb }, + {0x2000d ,0x753 }, + {0x2000e ,0x2c }, + {0x12000b ,0xc }, + {0x12000c ,0x19 }, + {0x12000d ,0xfa }, + {0x12000e ,0x10 }, + {0x22000b ,0x3 }, + {0x22000c ,0x6 }, + {0x22000d ,0x3e }, + {0x22000e ,0x10 }, + {0x9000c ,0x0 }, + {0x9000d ,0x173 }, + {0x9000e ,0x60 }, + {0x9000f ,0x6110 }, + {0x90010 ,0x2152 }, + {0x90011 ,0xdfbd }, + {0x90012 ,0x60 }, + {0x90013 ,0x6152 }, + {0x20010 ,0x5a }, + {0x20011 ,0x3 }, + {0x120010 ,0x5a }, + {0x120011 ,0x3 }, + {0x220010 ,0x5a }, + {0x220011 ,0x3 }, + {0x40080 ,0xe0 }, + {0x40081 ,0x12 }, + {0x40082 ,0xe0 }, + {0x40083 ,0x12 }, + {0x40084 ,0xe0 }, + {0x40085 ,0x12 }, + {0x140080 ,0xe0 }, + {0x140081 ,0x12 }, + {0x140082 ,0xe0 }, + {0x140083 ,0x12 }, + {0x140084 ,0xe0 }, + {0x140085 ,0x12 }, + {0x240080 ,0xe0 }, + {0x240081 ,0x12 }, + {0x240082 ,0xe0 }, + {0x240083 ,0x12 }, + {0x240084 ,0xe0 }, + {0x240085 ,0x12 }, + {0x400fd ,0xf }, + {0x10011 ,0x1 }, + {0x10012 ,0x1 }, + {0x10013 ,0x180 }, + {0x10018 ,0x1 }, + {0x10002 ,0x6209 }, + {0x100b2 ,0x1 }, + {0x101b4 ,0x1 }, + {0x102b4 ,0x1 }, + {0x103b4 ,0x1 }, + {0x104b4 ,0x1 }, + {0x105b4 ,0x1 }, + {0x106b4 ,0x1 }, + {0x107b4 ,0x1 }, + {0x108b4 ,0x1 }, + {0x11011 ,0x1 }, + {0x11012 ,0x1 }, + {0x11013 ,0x180 }, + {0x11018 ,0x1 }, + {0x11002 ,0x6209 }, + {0x110b2 ,0x1 }, + {0x111b4 ,0x1 }, + {0x112b4 ,0x1 }, + {0x113b4 ,0x1 }, + {0x114b4 ,0x1 }, + {0x115b4 ,0x1 }, + {0x116b4 ,0x1 }, + {0x117b4 ,0x1 }, + {0x118b4 ,0x1 }, + {0x12011 ,0x1 }, + {0x12012 ,0x1 }, + {0x12013 ,0x180 }, + {0x12018 ,0x1 }, + {0x12002 ,0x6209 }, + {0x120b2 ,0x1 }, + {0x121b4 ,0x1 }, + {0x122b4 ,0x1 }, + {0x123b4 ,0x1 }, + {0x124b4 ,0x1 }, + {0x125b4 ,0x1 }, + {0x126b4 ,0x1 }, + {0x127b4 ,0x1 }, + {0x128b4 ,0x1 }, + {0x13011 ,0x1 }, + {0x13012 ,0x1 }, + {0x13013 ,0x180 }, + {0x13018 ,0x1 }, + {0x13002 ,0x6209 }, + {0x130b2 ,0x1 }, + {0x131b4 ,0x1 }, + {0x132b4 ,0x1 }, + {0x133b4 ,0x1 }, + {0x134b4 ,0x1 }, + {0x135b4 ,0x1 }, + {0x136b4 ,0x1 }, + {0x137b4 ,0x1 }, + {0x138b4 ,0x1 }, + {0x2003a ,0x2 }, + {0xc0080 ,0x2 }, + {0xd0000 ,0x1 } };struct dram_fsp_msg ddr_dram_fsp_msg[] = {
@@ -1818,7 +1818,7 @@ struct dram_fsp_msg ddr_dram_fsp_msg[] = { .fw_type = FW_1D_IMAGE, .fsp_cfg = ddr_fsp2_cfg, .fsp_cfg_num = ARRAY_SIZE(ddr_fsp2_cfg), - }, + }, {/* P0 3000mts 2D */ .drate = 3000,
Signature · 1 line
2.37.0
PATCH 7/14 imx: kontron-sl-mx8mm: Remove 100mt DDR setpoint
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
The new stable configuration is missing the 100mt setpoint, remove it before updating the config to make sure the changes are separated cleanly.
--- arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 4 -- board/kontron/sl-mx8mm/lpddr4_timing.c | 49 +--------------------- board/kontron/sl-mx8mm/spl.c | 2 - 3 files changed, 1 insertion(+), 54 deletions(-)
arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +0 -4
@@ -46,10 +46,6 @@ ddrc_opp_table: opp-table { compatible = "operating-points-v2"; - opp-25M { - opp-hz = /bits/ 64 <25000000>; - }; - opp-100M { opp-hz = /bits/ 64 <100000000>; };
board/kontron/sl-mx8mm/lpddr4_timing.c +1 -48
65 lines not on this page · raw message
board/kontron/sl-mx8mm/spl.c +0 -2
@@ -95,8 +95,6 @@ static void spl_dram_init(void) dram_timing.fsp_msg[1 ].fsp_cfg[22 ].val =0x1 ; dram_timing.fsp_msg[2 ].fsp_cfg[10 ].val =0x110 ; dram_timing.fsp_msg[2 ].fsp_cfg[22 ].val =0x1 ; - dram_timing.fsp_msg[3 ].fsp_cfg[10 ].val =0x110 ; - dram_timing.fsp_msg[3 ].fsp_cfg[22 ].val =0x1 ;if (!ddr_init (&dram_timing)) {if (check_ram_available (SZ_2G ))
Signature · 1 line
2.37.0
PATCH 8/14 imx: kontron-sl-mx8mm: Use new LPDDR4 config parameters
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
These parameters are needed for stable performance on new hardware with Nanya LPDDR4 chips.
--- board/kontron/sl-mx8mm/lpddr4_timing.c | 184 +++++++------------------ board/kontron/sl-mx8mm/spl.c | 8 +- 2 files changed, 55 insertions(+), 137 deletions(-)
board/kontron/sl-mx8mm/lpddr4_timing.c +51 -133
@@ -15,13 +15,13 @@ struct dram_cfg_param ddr_ddrc_cfg[] = { { 0x3d400000, 0xa3080020 }, { 0x3d400020, 0x223 }, { 0x3d400024, 0x3a980 }, - { 0x3d400064, 0x5b0087 }, + { 0x3d400064, 0x5b00d2 }, { 0x3d4000d0, 0xc00305ba }, { 0x3d4000d4, 0x940000 }, { 0x3d4000dc, 0xd4002d }, { 0x3d4000e0, 0x310000 }, - { 0x3d4000e8, 0x66004d }, - { 0x3d4000ec, 0x16004d }, + { 0x3d4000e8, 0x63004d }, + { 0x3d4000ec, 0x15004d }, { 0x3d400100, 0x191e1920 }, { 0x3d400104, 0x60630 }, { 0x3d40010c, 0xb0b000 },
@@ -88,30 +88,7 @@ struct dram_cfg_param ddr_ddrc_cfg[] = { { 0x3d402190, 0x3818200 }, { 0x3d402194, 0x80303 }, { 0x3d4021b4, 0x100 }, - { 0x3d403020, 0x21 }, - { 0x3d403024, 0x1f40 }, - { 0x3d403050, 0x20d040 }, - { 0x3d403064, 0x30007 }, - { 0x3d4030dc, 0x840000 }, - { 0x3d4030e0, 0x310000 }, - { 0x3d4030e8, 0x66004d }, - { 0x3d4030ec, 0x16004d }, - { 0x3d403100, 0xa010102 }, - { 0x3d403104, 0x30404 }, - { 0x3d403108, 0x203060b }, - { 0x3d40310c, 0x505000 }, - { 0x3d403110, 0x2040202 }, - { 0x3d403114, 0x2030202 }, - { 0x3d403118, 0x1010004 }, - { 0x3d40311c, 0x301 }, - { 0x3d403130, 0x20300 }, - { 0x3d403134, 0xa100002 }, - { 0x3d403138, 0x8 }, - { 0x3d403144, 0x50003 }, - { 0x3d403180, 0x190004 }, - { 0x3d403190, 0x3818200 }, - { 0x3d403194, 0x80303 }, - { 0x3d4031b4, 0x100 }, + { 0x3d4020f4, 0xc99 }, { 0x3d400028, 0x0 }, };
@@ -165,14 +142,6 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = { { 0x11215f, 0x1ff }, { 0x11305f, 0x1ff }, { 0x11315f, 0x1ff }, - { 0x21005f, 0x1ff }, - { 0x21015f, 0x1ff }, - { 0x21105f, 0x1ff }, - { 0x21115f, 0x1ff }, - { 0x21205f, 0x1ff }, - { 0x21215f, 0x1ff }, - { 0x21305f, 0x1ff }, - { 0x21315f, 0x1ff }, { 0x55, 0x1ff }, { 0x1055, 0x1ff }, { 0x2055, 0x1ff },
@@ -185,22 +154,16 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = { { 0x9055, 0x1ff }, { 0x200c5, 0x19 }, { 0x1200c5, 0x7 }, - { 0x2200c5, 0x7 }, { 0x2002e, 0x2 }, { 0x12002e, 0x2 }, - { 0x22002e, 0x2 }, { 0x90204, 0x0 }, { 0x190204, 0x0 }, - { 0x290204, 0x0 }, { 0x20024, 0x1ab }, { 0x2003a, 0x0 }, { 0x120024, 0x1ab }, { 0x2003a, 0x0 }, - { 0x220024, 0x1ab }, - { 0x2003a, 0x0 }, { 0x20056, 0x3 }, { 0x120056, 0x3 }, - { 0x220056, 0x3 }, { 0x1004d, 0xe00 }, { 0x1014d, 0xe00 }, { 0x1104d, 0xe00 },
@@ -217,54 +180,37 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = { { 0x11214d, 0xe00 }, { 0x11304d, 0xe00 }, { 0x11314d, 0xe00 }, - { 0x21004d, 0xe00 }, - { 0x21014d, 0xe00 }, - { 0x21104d, 0xe00 }, - { 0x21114d, 0xe00 }, - { 0x21204d, 0xe00 }, - { 0x21214d, 0xe00 }, - { 0x21304d, 0xe00 }, - { 0x21314d, 0xe00 }, - { 0x10049, 0xeba }, - { 0x10149, 0xeba }, - { 0x11049, 0xeba }, - { 0x11149, 0xeba }, - { 0x12049, 0xeba }, - { 0x12149, 0xeba }, - { 0x13049, 0xeba }, - { 0x13149, 0xeba }, - { 0x110049, 0xeba }, - { 0x110149, 0xeba }, - { 0x111049, 0xeba }, - { 0x111149, 0xeba }, - { 0x112049, 0xeba }, - { 0x112149, 0xeba }, - { 0x113049, 0xeba }, - { 0x113149, 0xeba }, - { 0x210049, 0xeba }, - { 0x210149, 0xeba }, - { 0x211049, 0xeba }, - { 0x211149, 0xeba }, - { 0x212049, 0xeba }, - { 0x212149, 0xeba }, - { 0x213049, 0xeba }, - { 0x213149, 0xeba }, - { 0x43, 0x63 }, - { 0x1043, 0x63 }, - { 0x2043, 0x63 }, - { 0x3043, 0x63 }, - { 0x4043, 0x63 }, - { 0x5043, 0x63 }, - { 0x6043, 0x63 }, - { 0x7043, 0x63 }, - { 0x8043, 0x63 }, - { 0x9043, 0x63 }, + { 0x10049, 0x69a }, + { 0x10149, 0x69a }, + { 0x11049, 0x69a }, + { 0x11149, 0x69a }, + { 0x12049, 0x69a }, + { 0x12149, 0x69a }, + { 0x13049, 0x69a }, + { 0x13149, 0x69a }, + { 0x110049, 0x69a }, + { 0x110149, 0x69a }, + { 0x111049, 0x69a }, + { 0x111149, 0x69a }, + { 0x112049, 0x69a }, + { 0x112149, 0x69a }, + { 0x113049, 0x69a }, + { 0x113149, 0x69a }, + { 0x43, 0xe7 }, + { 0x1043, 0xe7 }, + { 0x2043, 0xe7 }, + { 0x3043, 0xe7 }, + { 0x4043, 0xe7 }, + { 0x5043, 0xe7 }, + { 0x6043, 0xe7 }, + { 0x7043, 0xe7 }, + { 0x8043, 0xe7 }, + { 0x9043, 0xe7 }, { 0x20018, 0x3 }, { 0x20075, 0x4 }, { 0x20050, 0x0 }, { 0x20008, 0x2ee }, { 0x120008, 0x64 }, - { 0x220008, 0x19 }, { 0x20088, 0x9 }, { 0x200b2, 0xdc }, { 0x10043, 0x5a1 },
@@ -284,39 +230,25 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = { { 0x112143, 0x5a1 }, { 0x113043, 0x5a1 }, { 0x113143, 0x5a1 }, - { 0x2200b2, 0xdc }, - { 0x210043, 0x5a1 }, - { 0x210143, 0x5a1 }, - { 0x211043, 0x5a1 }, - { 0x211143, 0x5a1 }, - { 0x212043, 0x5a1 }, - { 0x212143, 0x5a1 }, - { 0x213043, 0x5a1 }, - { 0x213143, 0x5a1 }, { 0x200fa, 0x1 }, { 0x1200fa, 0x1 }, - { 0x2200fa, 0x1 }, { 0x20019, 0x1 }, { 0x120019, 0x1 }, - { 0x220019, 0x1 }, - { 0x200f0, 0x660 }, + { 0x200f0, 0x60 }, { 0x200f1, 0x0 }, { 0x200f2, 0x4444 }, { 0x200f3, 0x8888 }, - { 0x200f4, 0x5665 }, + { 0x200f4, 0x5565 }, { 0x200f5, 0x0 }, { 0x200f6, 0x0 }, { 0x200f7, 0xf000 }, { 0x20025, 0x0 }, { 0x2002d, 0x0 }, { 0x12002d, 0x0 }, - { 0x22002d, 0x0 }, { 0x200c7, 0x21 }, { 0x1200c7, 0x21 }, - { 0x2200c7, 0x21 }, { 0x200ca, 0x24 }, { 0x1200ca, 0x24 }, - { 0x2200ca, 0x24 }, };/* ddr phy trained csr */
@@ -1047,37 +979,36 @@ struct dram_cfg_param ddr_fsp0_cfg[] = { { 0xd0000, 0x0 }, { 0x54003, 0xbb8 }, { 0x54004, 0x2 }, - { 0x54005, 0x2228 }, + { 0x54005, 0x3028 }, { 0x54006, 0x11 }, { 0x54008, 0x131f }, { 0x54009, 0xc8 }, { 0x5400b, 0x2 }, - { 0x5400d, 0x100 }, { 0x54012, 0x310 }, { 0x54019, 0x2dd4 }, { 0x5401a, 0x31 }, - { 0x5401b, 0x4d66 }, + { 0x5401b, 0x4d63 }, { 0x5401c, 0x4d00 }, - { 0x5401e, 0x16 }, + { 0x5401e, 0x15 }, { 0x5401f, 0x2dd4 }, { 0x54020, 0x31 }, - { 0x54021, 0x4d66 }, + { 0x54021, 0x4d63 }, { 0x54022, 0x4d00 }, - { 0x54024, 0x16 }, + { 0x54024, 0x15 }, { 0x5402b, 0x1000 }, { 0x5402c, 0x3 }, { 0x54032, 0xd400 }, { 0x54033, 0x312d }, - { 0x54034, 0x6600 }, + { 0x54034, 0x6300 }, { 0x54035, 0x4d }, { 0x54036, 0x4d }, - { 0x54037, 0x1600 }, + { 0x54037, 0x1500 }, { 0x54038, 0xd400 }, { 0x54039, 0x312d }, - { 0x5403a, 0x6600 }, + { 0x5403a, 0x6300 }, { 0x5403b, 0x4d }, { 0x5403c, 0x4d }, - { 0x5403d, 0x1600 }, + { 0x5403d, 0x1500 }, { 0xd0000, 0x1 }, };
@@ -1087,12 +1018,11 @@ struct dram_cfg_param ddr_fsp1_cfg[] = { { 0x54002, 0x101 }, { 0x54003, 0x190 }, { 0x54004, 0x2 }, - { 0x54005, 0x2228 }, + { 0x54005, 0x3028 }, { 0x54006, 0x11 }, { 0x54008, 0x121f }, { 0x54009, 0xc8 }, { 0x5400b, 0x2 }, - { 0x5400d, 0x100 }, { 0x54012, 0x310 }, { 0x54019, 0x84 }, { 0x5401a, 0x31 },
@@ -1126,7 +1056,7 @@ struct dram_cfg_param ddr_fsp0_2d_cfg[] = { { 0xd0000, 0x0 }, { 0x54003, 0xbb8 }, { 0x54004, 0x2 }, - { 0x54005, 0x2228 }, + { 0x54005, 0x3028 }, { 0x54006, 0x11 }, { 0x54008, 0x61 }, { 0x54009, 0xc8 },
@@ -1136,28 +1066,28 @@ struct dram_cfg_param ddr_fsp0_2d_cfg[] = { { 0x54012, 0x310 }, { 0x54019, 0x2dd4 }, { 0x5401a, 0x31 }, - { 0x5401b, 0x4d66 }, + { 0x5401b, 0x4d63 }, { 0x5401c, 0x4d00 }, - { 0x5401e, 0x16 }, + { 0x5401e, 0x15 }, { 0x5401f, 0x2dd4 }, { 0x54020, 0x31 }, - { 0x54021, 0x4d66 }, + { 0x54021, 0x4d63 }, { 0x54022, 0x4d00 }, - { 0x54024, 0x16 }, + { 0x54024, 0x15 }, { 0x5402b, 0x1000 }, { 0x5402c, 0x3 }, { 0x54032, 0xd400 }, { 0x54033, 0x312d }, - { 0x54034, 0x6600 }, + { 0x54034, 0x6300 }, { 0x54035, 0x4d }, { 0x54036, 0x4d }, - { 0x54037, 0x1600 }, + { 0x54037, 0x1500 }, { 0x54038, 0xd400 }, { 0x54039, 0x312d }, - { 0x5403a, 0x6600 }, + { 0x5403a, 0x6300 }, { 0x5403b, 0x4d }, { 0x5403c, 0x4d }, - { 0x5403d, 0x1600 }, + { 0x5403d, 0x1500 }, { 0xd0000, 0x1 }, };
@@ -1659,10 +1589,6 @@ struct dram_cfg_param ddr_phy_pie[] = { { 0x12000c, 0x19 }, { 0x12000d, 0xfa }, { 0x12000e, 0x10 }, - { 0x22000b, 0x3 }, - { 0x22000c, 0x6 }, - { 0x22000d, 0x3e }, - { 0x22000e, 0x10 }, { 0x9000c, 0x0 }, { 0x9000d, 0x173 }, { 0x9000e, 0x60 },
@@ -1675,8 +1601,6 @@ struct dram_cfg_param ddr_phy_pie[] = { { 0x20011, 0x3 }, { 0x120010, 0x5a }, { 0x120011, 0x3 }, - { 0x220010, 0x5a }, - { 0x220011, 0x3 }, { 0x40080, 0xe0 }, { 0x40081, 0x12 }, { 0x40082, 0xe0 },
@@ -1689,12 +1613,6 @@ struct dram_cfg_param ddr_phy_pie[] = { { 0x140083, 0x12 }, { 0x140084, 0xe0 }, { 0x140085, 0x12 }, - { 0x240080, 0xe0 }, - { 0x240081, 0x12 }, - { 0x240082, 0xe0 }, - { 0x240083, 0x12 }, - { 0x240084, 0xe0 }, - { 0x240085, 0x12 }, { 0x400fd, 0xf }, { 0x10011, 0x1 }, { 0x10012, 0x1 },
board/kontron/sl-mx8mm/spl.c +4 -4
@@ -89,10 +89,10 @@ static void spl_dram_init(void) dram_timing.ddrc_cfg[2 ].val =0xa1080020 ; dram_timing.ddrc_cfg[37 ].val =0x1f ; - dram_timing.fsp_msg[0 ].fsp_cfg[9 ].val =0x110 ; - dram_timing.fsp_msg[0 ].fsp_cfg[21 ].val =0x1 ; - dram_timing.fsp_msg[1 ].fsp_cfg[10 ].val =0x110 ; - dram_timing.fsp_msg[1 ].fsp_cfg[22 ].val =0x1 ; + dram_timing.fsp_msg[0 ].fsp_cfg[8 ].val =0x110 ; + dram_timing.fsp_msg[0 ].fsp_cfg[20 ].val =0x1 ; + dram_timing.fsp_msg[1 ].fsp_cfg[9 ].val =0x110 ; + dram_timing.fsp_msg[1 ].fsp_cfg[21 ].val =0x1 ; dram_timing.fsp_msg[2 ].fsp_cfg[10 ].val =0x110 ; dram_timing.fsp_msg[2 ].fsp_cfg[22 ].val =0x1 ;
Signature · 1 line
2.37.0
PATCH 9/14 imx: kontron-sl-mx8mm: Prepare for other i.MX8MM SoM types
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
This sets an env variable 'som_type' from the board code. It can later be used by environment scripts, e. g. to select the proper devicetree for the board.
--- board/kontron/sl-mx8mm/sl-mx8mm.c | 6 ++++++ 1 file changed, 6 insertions(+)
board/kontron/sl-mx8mm/sl-mx8mm.c +6 -0
@@ -121,6 +121,12 @@ int board_init(void)return 0 ; } +int board_late_init (void ) +{ +env_set ("som_type" ,"n801x" ); +return 0 ; +} +enum env_location env_get_location (enum env_operation op,int prio) {enum boot_device boot_dev =get_boot_device ();
Signature · 1 line
2.37.0
PATCH 10/14 imx: kontron-sl-mx8mm: Adjust board and SoM model strings
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
The official naming includes "SL" (SoM-Line) or "BL" (Board-Line). The legacy identifiers are kept in brackets and are still used in file names and compatible strings.
--- arch/arm/dts/imx8mm-kontron-n801x-s.dts | 2 +- arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/imx8mm-kontron-n801x-s.dts +1 -1
@@ -8,7 +8,7 @@ #include "imx8mm-kontron-n801x-som.dtsi" / { - model = "Kontron i.MX8MM N801X S"; + model = "Kontron BL i.MX8MM (N801X)"; compatible = "kontron,imx8mm-n801x-s", "kontron,imx8mm-n801x-som", "fsl,imx8mm"; aliases {
arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +1 -1
@@ -6,7 +6,7 @@ #include "imx8mm.dtsi" / { - model = "Kontron i.MX8MM N801X SoM"; + model = "Kontron SL i.MX8MM (N801X)"; compatible = "kontron,imx8mm-n801x-som", "fsl,imx8mm"; memory@40000000 {
Signature · 1 line
2.37.0
PATCH 11/14 imx: kontron-sl-mx8mm: Use the VSELECT signal to switch SD card IO voltage
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
It turns out that it is not necessary to declare the VSELECT signal as GPIO and let the PMIC driver set it to a fixed high level. This switches the voltage between 3.3V and 1.8V by setting the PMIC register for LDO5 accordingly.
Instead we can do it like other boards already do and simply mux the VSELECT signal of the USDHC interface to the pin. This makes sure that the correct voltage is selected by setting the PMIC's SD_VSEL input to high or low accordingly.
--- arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 5 ----- arch/arm/dts/imx8mm-kontron-n801x-s.dts | 3 +++ arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-)
arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +0 -5
@@ -62,11 +62,6 @@ &pinctrl_pmic { u-boot,dm-spl; - fsl,pins = < - MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 - /* Disable Pullup for SD_VSEL */ - MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 - >; }; &pinctrl_uart3 {
arch/arm/dts/imx8mm-kontron-n801x-s.dts +3 -0
@@ -321,6 +321,7 @@ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0 >; };
@@ -333,6 +334,7 @@ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0 >; };
@@ -345,6 +347,7 @@ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0 >; }; };
arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +0 -2
@@ -82,7 +82,6 @@ pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio1>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; regulators { reg_vdd_soc: BUCK1 {
@@ -225,7 +224,6 @@ pinctrl_pmic: pmicgrp { fsl,pins = < MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 - MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x141 >; };
Signature · 1 line
2.37.0
Re: [PATCH 11/14] imx: kontron-sl-mx8mm: Use the VSELECT signal to switch SD card IO voltage
Hi
Am Mi., 13. Juli 2022 um 11:53 Uhr schrieb Frieder Schrempf <[email protected]>:
Quoted 8 lines
From: Frieder Schrempf <[email protected]>
It turns out that it is not necessary to declare the VSELECT signal as GPIO and let the PMIC driver set it to a fixed high level. This switches the voltage between 3.3V and 1.8V by setting the PMIC register for LDO5 accordingly.
Quoted 7 lines
Instead we can do it like other boards already do and simply mux the VSELECT signal of the USDHC interface to the pin. This makes sure that the correct voltage is selected by setting the PMIC's
SD_VSELinput to high or low accordingly.Reported-by Heiko Thiery <[email protected]>Signed-off-by Frieder Schrempf <[email protected]>
Quoted 73 lines
--- arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 5 ----- arch/arm/dts/imx8mm-kontron-n801x-s.dts | 3 +++ arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-)arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +0
-5@@ -62,11 +62,6 @@ &pinctrl_pmic { u-boot,dm-spl; - fsl,pins = < - MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 - /* Disable Pullup for SD_VSEL */ - MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 - >; }; &pinctrl_uart3 {arch/arm/dts/imx8mm-kontron-n801x-s.dts +3
-0@@ -321,6 +321,7 @@ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0 >; };@@ -333,6 +334,7 @@ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0 >; };@@ -345,6 +347,7 @@ MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6 MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6 MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019 + MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0 >; }; };arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +0
-3@@ -82,7 +82,6 @@ pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio1>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; regulators { reg_vdd_soc: BUCK1 {@@ -225,7 +224,6 @@ pinctrl_pmic: pmicgrp { fsl,pins = < MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 - MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x141 >; }; --2.37.0
PATCH 12/14 imx: kontron-sl-mx8mm: Use voltage rail names from schematic for PMIC regulator-names
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Improve the naming of the regulators to contain the voltage rail names from the schematic.
--- arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +11 -11
@@ -85,7 +85,7 @@ regulators { reg_vdd_soc: BUCK1 { - regulator-name = "buck1"; + regulator-name = "+0V8_VDD_SOC (BUCK1)"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <850000>; regulator-boot-on;
@@ -96,7 +96,7 @@ }; reg_vdd_arm: BUCK2 { - regulator-name = "buck2"; + regulator-name = "+0V9_VDD_ARM (BUCK2)"; regulator-min-microvolt = <850000>; regulator-max-microvolt = <950000>; regulator-boot-on;
@@ -107,7 +107,7 @@ }; reg_vdd_dram: BUCK3 { - regulator-name = "buck3"; + regulator-name = "+0V9_VDD_DRAM&PU (BUCK3)"; regulator-min-microvolt = <850000>; regulator-max-microvolt = <950000>; regulator-boot-on;
@@ -115,7 +115,7 @@ }; reg_vdd_3v3: BUCK4 { - regulator-name = "buck4"; + regulator-name = "+3V3 (BUCK4)"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-boot-on;
@@ -123,7 +123,7 @@ }; reg_vdd_1v8: BUCK5 { - regulator-name = "buck5"; + regulator-name = "+1V8 (BUCK5)"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-boot-on;
@@ -131,7 +131,7 @@ }; reg_nvcc_dram: BUCK6 { - regulator-name = "buck6"; + regulator-name = "+1V1_NVCC_DRAM (BUCK6)"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-boot-on;
@@ -139,7 +139,7 @@ }; reg_nvcc_snvs: LDO1 { - regulator-name = "ldo1"; + regulator-name = "+1V8_NVCC_SNVS (LDO1)"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-boot-on;
@@ -147,7 +147,7 @@ }; reg_vdd_snvs: LDO2 { - regulator-name = "ldo2"; + regulator-name = "+0V8_VDD_SNVS (LDO2)"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <900000>; regulator-boot-on;
@@ -155,7 +155,7 @@ }; reg_vdda: LDO3 { - regulator-name = "ldo3"; + regulator-name = "+1V8_VDDA (LDO3)"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-boot-on;
@@ -163,7 +163,7 @@ }; reg_vdd_phy: LDO4 { - regulator-name = "ldo4"; + regulator-name = "+0V9_VDD_PHY (LDO4)"; regulator-min-microvolt = <900000>; regulator-max-microvolt = <900000>; regulator-boot-on;
@@ -171,7 +171,7 @@ }; reg_nvcc_sd: LDO5 { - regulator-name = "ldo5"; + regulator-name = "NVCC_SD (LDO5)"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; };
Signature · 1 line
2.37.0
PATCH 13/14 imx: kontron-sl-mx8mm: Simplify code in spl.c
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Refactor the code a bit without any functional changes.
--- board/kontron/sl-mx8mm/spl.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-)
board/kontron/sl-mx8mm/spl.c +5 -20
@@ -109,41 +109,26 @@ static void spl_dram_init(void) size =1 ; } -printf ("Kontron SL i.MX8MM (N801X) module, %u GB RAM detected\n" , size); + gd->ram_size = size;writel (size,M4_BOOTROM_BASE_ADDR ); } -static int i2c_detect (u8 bus,u16 addr) -{ -struct udevice *udev; -int ret; - -/* -* Try to probe the touch controller to check if an LVDS panel is -* connected. -*/ - ret =i2c_get_chip_for_busnum (bus, addr,0 , &udev); -if (ret ==0 ) -return 0 ; - -return 1 ; -} -int do_board_detect (void ) { + gd->board_type =BOARD_TYPE_KTN_N801X ; +printf ("Kontron SL i.MX8MM (N801X) module, %u GB RAM detected\n" , gd->ram_size); +/* * Check the I2C PMIC to detect the deprecated SoM with DA9063. */ imx_iomux_v3_setup_multiple_pads (i2c1_pads,ARRAY_SIZE (i2c1_pads)); -if (i2c_detect (0 ,0x58 ) ==0 ) { +if (i2c_get_chip_for_busnum (0 ,0x58 ,0 , &udev) ==0 ) {printf ("### ATTENTION: DEPRECATED SOM REVISION (N8010 Rev0) DETECTED! ###\n" );printf ("### THIS HW IS NOT SUPPORTED AND BOOTING WILL PROBABLY FAIL ###\n" );printf ("### PLEASE UPGRADE TO LATEST MODULE ###\n" ); } - gd->board_type =BOARD_TYPE_KTN_N801X ; -return 0 ; }
Signature · 1 line
2.37.0
PATCH 14/14 imx: kontron-sl-mx8mm: Add support for Kontron Electronics SoM SL i.MX8MM OSM-S
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
This adds support for the Kontron Electronics SoM SL i.MX8MM OSM-S and the matching baseboard BL i.MX8MM OSM-S.
The SoM hardware complies to the Open Standard Module (OSM) 1.0 specification, size S (https://sget.org/standards/osm).
The existing board configuration for the non-OSM SoM is reused and allows to detect the SoM variant at runtime.
--- .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 138 +------ .../dts/imx8mm-kontron-n802x-s-u-boot.dtsi | 6 + arch/arm/dts/imx8mm-kontron-n802x-s.dts | 376 ++++++++++++++++++ arch/arm/dts/imx8mm-kontron-n802x-som.dtsi | 309 ++++++++++++++ .../dts/imx8mm-kontron-n80xx-s-u-boot.dtsi | 139 +++++++ board/kontron/sl-mx8mm/MAINTAINERS | 1 + board/kontron/sl-mx8mm/sl-mx8mm.c | 6 +- board/kontron/sl-mx8mm/spl.c | 22 +- configs/kontron-sl-mx8mm_defconfig | 2 + doc/board/kontron/sl-mx8mm.rst | 7 +- 10 files changed, 866 insertions(+), 140 deletions(-) create mode 100644 arch/arm/dts/imx8mm-kontron-n802x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-kontron-n802x-s.dts create mode 100644 arch/arm/dts/imx8mm-kontron-n802x-som.dtsi create mode 100644 arch/arm/dts/imx8mm-kontron-n80xx-s-u-boot.dtsi
arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +3 -135
@@ -1,139 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * Copyright (C) 2019 Kontron Electronics GmbH + * Copyright (C) 2022 Kontron Electronics GmbH */ -#include "imx8mm-u-boot.dtsi" +#include "imx8mm-kontron-n80xx-s-u-boot.dtsi" -/ { - aliases { - usb0 = &usbotg1; - usb1 = &usbotg2; - }; - - wdt-reboot { - compatible = "wdt-reboot"; - wdt = <&wdog1>; - u-boot,dm-spl; - }; - - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; -}; - -&crypto { - u-boot,dm-spl; -}; - -&sec_jr0 { - u-boot,dm-spl; -}; - -&sec_jr1 { - u-boot,dm-spl; -}; - -&sec_jr2 { - u-boot,dm-spl; -}; - -&i2c1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&i2c2 { - status = "okay"; - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&pinctrl_ecspi1 { - u-boot,dm-spl; -}; - -&pinctrl_i2c1 { - u-boot,dm-spl; -}; - -&pinctrl_pmic { - u-boot,dm-spl; -}; - -&pinctrl_uart3 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&pinctrl_usdhc1 { - u-boot,dm-spl; -}; - -&pinctrl_usdhc1_100mhz { - u-boot,dm-spl; -}; - -&pinctrl_usdhc1_200mhz { - u-boot,dm-spl; -}; - -&pinctrl_usdhc2 { - u-boot,dm-spl; -}; - -&pca9450 { - u-boot,dm-spl; -}; - -&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { - u-boot,dm-spl; -}; - -&ecspi1 { - u-boot,dm-spl; -}; - -&gpio1 { - u-boot,dm-spl; -}; - -&gpio2 { - u-boot,dm-spl; -}; - -&gpio3 { - u-boot,dm-spl; -}; - -&gpio4 { - u-boot,dm-spl; -}; - -&gpio5 { - u-boot,dm-spl; -}; - -&uart3 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&usdhc1 { - u-boot,dm-spl; -}; - -&usdhc2 { - u-boot,dm-spl; -}; - -&wdog1 { - u-boot,dm-spl; -}; - -&pinctrl_wdog { - u-boot,dm-spl; -};
arch/arm/dts/imx8mm-kontron-n802x-s-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Copyright (C) 2022 Kontron Electronics GmbH + */ + +#include "imx8mm-kontron-n80xx-s-u-boot.dtsi"
arch/arm/dts/imx8mm-kontron-n802x-s.dts new file +376 -0
376 lines not on this page · raw message
arch/arm/dts/imx8mm-kontron-n802x-som.dtsi new file +309 -0
309 lines not on this page · raw message
arch/arm/dts/imx8mm-kontron-n80xx-s-u-boot.dtsi new file +139 -0
139 lines not on this page · raw message
board/kontron/sl-mx8mm/MAINTAINERS +1 -0
@@ -2,6 +2,7 @@ Kontron SL/BL i.MX8M Mini Boards (N801x) M: Frieder Schrempf <[email protected]> S: Maintained F: arch/arm/dts/imx8mm-kontron-n801x-* +F: arch/arm/dts/imx8mm-kontron-n802x-* F: board/kontron/sl-mx8mm F: configs/kontron-sl-mx8mm_defconfig F: doc/board/kontron/sl-mx8mm.rst
board/kontron/sl-mx8mm/sl-mx8mm.c +5 -1
@@ -123,7 +123,11 @@ int board_init(void)int board_late_init (void ) { -env_set ("som_type" ,"n801x" ); +if (!fdt_node_check_compatible (gd->fdt_blob,0 ,"kontron,imx8mm-n802x-som" )) +env_set ("som_type" ,"n802x" ); +else +env_set ("som_type" ,"n801x" ); +return 0 ; }
board/kontron/sl-mx8mm/spl.c +20 -2
@@ -29,6 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;enum {BOARD_TYPE_KTN_N801X , +BOARD_TYPE_KTN_N802X ,BOARD_TYPE_MAX };
@@ -115,8 +116,21 @@ static void spl_dram_init(void)int do_board_detect (void ) { - gd->board_type =BOARD_TYPE_KTN_N801X ; -printf ("Kontron SL i.MX8MM (N801X) module, %u GB RAM detected\n" , gd->ram_size); +struct udevice *udev; + +/* +* Check for the RTC on the OSM module. +*/ +imx_iomux_v3_setup_multiple_pads (i2c1_pads,ARRAY_SIZE (i2c1_pads)); + +if (i2c_get_chip_for_busnum (0 ,0x52 ,0 , &udev) ==0 ) { + gd->board_type =BOARD_TYPE_KTN_N802X ; +printf ("Kontron SL i.MX8MM OSM-S (N802X) module, %u GB RAM detected\n" , + gd->ram_size); + }else { + gd->board_type =BOARD_TYPE_KTN_N801X ; +printf ("Kontron SL i.MX8MM (N801X) module, %u GB RAM detected\n" , gd->ram_size); + }/* * Check the I2C PMIC to detect the deprecated SoM with DA9063.
@@ -138,6 +152,10 @@ int board_fit_config_name_match(const char *name) !strncmp(name, "imx8mm-kontron-n801x-s", 22))return 0 ; +if (gd->board_type ==BOARD_TYPE_KTN_N802X &&is_imx8mm () && + !strncmp (name,"imx8mm-kontron-n802x-s" ,22 )) +return 0 ; +return -1 ; }
configs/kontron-sl-mx8mm_defconfig +2 -0
@@ -70,6 +70,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:320k(spl),1024k(u-boot),64k(env),64k(env_redundant)" CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIST="imx8mm-kontron-n801x-s imx8mm-kontron-n802x-s" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
@@ -118,6 +119,7 @@ CONFIG_SPL_DM_PMIC_PCA9450=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PCA9450=y CONFIG_DM_RTC=y +CONFIG_RTC_RV3028=y CONFIG_RTC_RV8803=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y
doc/board/kontron/sl-mx8mm.rst +5 -2
@@ -3,12 +3,15 @@ Kontron Electronics SL i.MX8MM SoM ================================== -The Kontron SoM-Line i.MX8MM (N801x) by Kontron Electronics GmbH is a SoM module -with an i.MX8M-Mini SoC, 1/2/4 GB LPDDR4 RAM, SPI NOR, eMMC and PMIC. +The Kontron SoM-Line i.MX8MM (N801x, N802x) by Kontron Electronics GmbH is a SoM +module with an i.MX8M-Mini SoC, 1/2/4 GB LPDDR4 RAM, SPI NOR, eMMC and PMIC. The matching evaluation boards (Board-Line) have two Ethernet ports, USB 2.0, HDMI/LVDS, SD card, CAN, RS485, RS232 and much more. +The SL i.MX8MM OSM-S (N802x) is compliant to the Open Standard Module (OSM) 1.0 +specification, size S (https://sget.org/standards/osm). + Quick Start -----------
Signature · 1 line
2.37.0
Hi Frieder,
Quoted 2 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
Series raises a warning and I cannot merge it. Can you fix it and repost ? Thanks !
https://source.denx.de/u-boot/custodians/u-boot-imx/-/jobs/471281
Best regards,
Stefano
Quoted 52 lines
This set contains several improvements for the kontron-sl-mx8mm board configuration (patches 1 to 13) and support for a new SoM (patch 14, including baseboard) that complies to the Open Standard Module (OSM) 1.0 hardware specification, size S (https://sget.org/standards/osm).
Frieder Schrempf (14):
imx: kontron-sl-mx8mm: Remove LVDS board type and devicetrees
imx: kontron-sl-mx8mm: Add redundant environment
imx: kontron-sl-mx8mm: Enable environment in MMC
imx: kontron-sl-mx8mm: Migrate to useCONFIG_EXTRA_ENV_TEXT
imx: kontron-sl-mx8mm: Enable bootaux command
imx: kontron-sl-mx8mm:lpddr4_timing.c: Add spaces for proper
alignment
imx: kontron-sl-mx8mm: Remove 100mt DDR setpoint
imx: kontron-sl-mx8mm: Use new LPDDR4 config parameters
imx: kontron-sl-mx8mm: Prepare for other i.MX8MM SoM types
imx: kontron-sl-mx8mm: Adjust board and SoM model strings
imx: kontron-sl-mx8mm: Use the VSELECT signal to switch SD card IO
voltage
imx: kontron-sl-mx8mm: Use voltage rail names from schematic for PMIC
regulator-names
imx: kontron-sl-mx8mm: Simplify code inspl.c
imx: kontron-sl-mx8mm: Add support for Kontron Electronics SoM SL
i.MX8MM OSM-Sarch/arm/dts/Makefile | 1 - .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 - arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 116 - .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 7 +- arch/arm/dts/imx8mm-kontron-n801x-s.dts | 5 +- arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 30 +- .../dts/imx8mm-kontron-n802x-s-u-boot.dtsi | 6 + arch/arm/dts/imx8mm-kontron-n802x-s.dts | 376 ++++ arch/arm/dts/imx8mm-kontron-n802x-som.dtsi | 309 +++ ...tsi => imx8mm-kontron-n80xx-s-u-boot.dtsi} | 8 +- board/kontron/sl-mx8mm/MAINTAINERS | 1 + board/kontron/sl-mx8mm/lpddr4_timing.c | 1969 ++++++++--------- board/kontron/sl-mx8mm/sl-mx8mm.c | 41 + board/kontron/sl-mx8mm/sl-mx8mm.env | 7 + board/kontron/sl-mx8mm/spl.c | 85 +- configs/kontron-sl-mx8mm_defconfig | 10 +- doc/board/kontron/sl-mx8mm.rst | 7 +- include/configs/kontron-sl-mx8mm.h | 16 +- 18 files changed, 1717 insertions(+), 1283 deletions(-)delete mode 100644
arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi
delete mode 100644arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts
create mode 100644arch/arm/dts/imx8mm-kontron-n802x-s-u-boot.dtsi
create mode 100644arch/arm/dts/imx8mm-kontron-n802x-s.dts
create mode 100644arch/arm/dts/imx8mm-kontron-n802x-som.dtsi
renamearch/arm/dts/{imx8mm-kontron-n801x-u-boot.dtsi=>imx8mm-kontron-n80xx-s-u-boot.dtsi} (88%) create mode 100644 board/kontron/sl-mx8mm/sl-mx8mm.env
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
Hi Stefano,
Am 25.07.22 um 15:03 schrieb Stefano Babic:
Quoted 8 lines
Hi Frieder,
Quoted 2 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
Series raises a warning and I cannot merge it. Can you fix it and repost ? Thanks !
Thanks for the feedback! I just sent a v2 that contains a fix for this issue (among other improvements).
Best regards
Frieder
Hi Frieder,
Quoted 6 lines · Frieder Schrempf
Hi Stefano,
Am 25.07.22 um 15:03 schrieb Stefano Babic:
Quoted 3 lines
Hi Frieder,
On 13.07.22 11:52, Frieder Schrempf wrote:
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
From: Frieder Schrempf <[email protected]>
Series raises a warning and I cannot merge it. Can you fix it and repost ? Thanks !
Thanks for the feedback! I just sent a v2 that contains a fix for this issue (among other improvements).
Ok, thanks, I'll pick them up the V2.
Regards,
Stefano
Quoted 2 lines
Best regards
Frieder
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================