* [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board.
@ 2019-07-31 16:01 Matwey V. Kornilov
2019-07-31 16:01 ` [U-Boot] [PATCH 1/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov
` (7 more replies)
0 siblings, 8 replies; 34+ messages in thread
From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw)
To: u-boot
This series adds initial TPL support for Pine64 Rock64 board.
The ROCK64 is a credit card size SBC based on Rockchip RK3328 Quad-Core ARM Cortex A53.
The series has been tested with ATF v2.1.
Some patches in the series are taken from https://github.com/rockchip-linux/u-boot
Credits are given in each patch separately.
Kever Yang (5):
rockchip: ram: add full feature rk3328 DRAM driver
rockchip: dts: rk3328: update dmc node for driver
rockchip: dts: rk3328: enable the drivers need by TPL/SPL
rockchip: Kconfig: enable TPL support for rk3328
rockchip: evb-rk3328: enable defconfig options for TPL/SPL
Matwey V. Kornilov (2):
configs: rk3328: enable TPL for rock64-rk3328_defconfig
doc: rockchip: Adapt Pine64 Rock64 board instructions
arch/arm/dts/rk3328-evb.dts | 3 +
arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 +
arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++
arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++
arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++
arch/arm/dts/rk3328.dtsi | 12 +-
arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++
arch/arm/mach-rockchip/Kconfig | 21 +
configs/evb-rk3328_defconfig | 37 +-
configs/rock64-rk3328_defconfig | 14 +
doc/README.rockchip | 10 +-
drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++-
12 files changed, 2187 insertions(+), 16 deletions(-)
create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi
create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi
create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h
--
2.16.4
^ permalink raw reply [flat|nested] 34+ messages in thread* [U-Boot] [PATCH 1/7] rockchip: ram: add full feature rk3328 DRAM driver 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov @ 2019-07-31 16:01 ` Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 2/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov ` (6 subsequent siblings) 7 siblings, 0 replies; 34+ messages in thread From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> This driver supports DDR3/LPDDR3/DDR4 SDRAM initialization. Signed-off-by: YouMin Chen <cym@rock-chips.com> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/9fb0777ec3cc6a89af9d2e0969c3bfe58306a88d with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- 2 files changed, 1456 insertions(+), 3 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h new file mode 100644 index 0000000000..11411ead10 --- /dev/null +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h @@ -0,0 +1,441 @@ +/* + * Copyright (C) 2016-2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _ASM_ARCH_SDRAM_RK3328_H +#define _ASM_ARCH_SDRAM_RK3328_H + +#define SR_IDLE 93 +#define PD_IDLE 13 +#define SDRAM_ADDR 0x00000000 +#define PATTERN (0x5aa5f00f) + +/* ddr pctl registers define */ +#define DDR_PCTL2_MSTR 0x0 +#define DDR_PCTL2_STAT 0x4 +#define DDR_PCTL2_MSTR1 0x8 +#define DDR_PCTL2_MRCTRL0 0x10 +#define DDR_PCTL2_MRCTRL1 0x14 +#define DDR_PCTL2_MRSTAT 0x18 +#define DDR_PCTL2_MRCTRL2 0x1c +#define DDR_PCTL2_DERATEEN 0x20 +#define DDR_PCTL2_DERATEINT 0x24 +#define DDR_PCTL2_PWRCTL 0x30 +#define DDR_PCTL2_PWRTMG 0x34 +#define DDR_PCTL2_HWLPCTL 0x38 +#define DDR_PCTL2_RFSHCTL0 0x50 +#define DDR_PCTL2_RFSHCTL1 0x54 +#define DDR_PCTL2_RFSHCTL2 0x58 +#define DDR_PCTL2_RFSHCTL4 0x5c +#define DDR_PCTL2_RFSHCTL3 0x60 +#define DDR_PCTL2_RFSHTMG 0x64 +#define DDR_PCTL2_RFSHTMG1 0x68 +#define DDR_PCTL2_RFSHCTL5 0x6c +#define DDR_PCTL2_INIT0 0xd0 +#define DDR_PCTL2_INIT1 0xd4 +#define DDR_PCTL2_INIT2 0xd8 +#define DDR_PCTL2_INIT3 0xdc +#define DDR_PCTL2_INIT4 0xe0 +#define DDR_PCTL2_INIT5 0xe4 +#define DDR_PCTL2_INIT6 0xe8 +#define DDR_PCTL2_INIT7 0xec +#define DDR_PCTL2_DIMMCTL 0xf0 +#define DDR_PCTL2_RANKCTL 0xf4 +#define DDR_PCTL2_CHCTL 0xfc +#define DDR_PCTL2_DRAMTMG0 0x100 +#define DDR_PCTL2_DRAMTMG1 0x104 +#define DDR_PCTL2_DRAMTMG2 0x108 +#define DDR_PCTL2_DRAMTMG3 0x10c +#define DDR_PCTL2_DRAMTMG4 0x110 +#define DDR_PCTL2_DRAMTMG5 0x114 +#define DDR_PCTL2_DRAMTMG6 0x118 +#define DDR_PCTL2_DRAMTMG7 0x11c +#define DDR_PCTL2_DRAMTMG8 0x120 +#define DDR_PCTL2_DRAMTMG9 0x124 +#define DDR_PCTL2_DRAMTMG10 0x128 +#define DDR_PCTL2_DRAMTMG11 0x12c +#define DDR_PCTL2_DRAMTMG12 0x130 +#define DDR_PCTL2_DRAMTMG13 0x134 +#define DDR_PCTL2_DRAMTMG14 0x138 +#define DDR_PCTL2_DRAMTMG15 0x13c +#define DDR_PCTL2_DRAMTMG16 0x140 +#define DDR_PCTL2_ZQCTL0 0x180 +#define DDR_PCTL2_ZQCTL1 0x184 +#define DDR_PCTL2_ZQCTL2 0x188 +#define DDR_PCTL2_ZQSTAT 0x18c +#define DDR_PCTL2_DFITMG0 0x190 +#define DDR_PCTL2_DFITMG1 0x194 +#define DDR_PCTL2_DFILPCFG0 0x198 +#define DDR_PCTL2_DFILPCFG1 0x19c +#define DDR_PCTL2_DFIUPD0 0x1a0 +#define DDR_PCTL2_DFIUPD1 0x1a4 +#define DDR_PCTL2_DFIUPD2 0x1a8 +#define DDR_PCTL2_DFIMISC 0x1b0 +#define DDR_PCTL2_DFITMG2 0x1b4 +#define DDR_PCTL2_DFITMG3 0x1b8 +#define DDR_PCTL2_DFISTAT 0x1bc +#define DDR_PCTL2_DBICTL 0x1c0 +#define DDR_PCTL2_ADDRMAP0 0x200 +#define DDR_PCTL2_ADDRMAP1 0x204 +#define DDR_PCTL2_ADDRMAP2 0x208 +#define DDR_PCTL2_ADDRMAP3 0x20c +#define DDR_PCTL2_ADDRMAP4 0x210 +#define DDR_PCTL2_ADDRMAP5 0x214 +#define DDR_PCTL2_ADDRMAP6 0x218 +#define DDR_PCTL2_ADDRMAP7 0x21c +#define DDR_PCTL2_ADDRMAP8 0x220 +#define DDR_PCTL2_ADDRMAP9 0x224 +#define DDR_PCTL2_ADDRMAP10 0x228 +#define DDR_PCTL2_ADDRMAP11 0x22c +#define DDR_PCTL2_ODTCFG 0x240 +#define DDR_PCTL2_ODTMAP 0x244 +#define DDR_PCTL2_SCHED 0x250 +#define DDR_PCTL2_SCHED1 0x254 +#define DDR_PCTL2_PERFHPR1 0x25c +#define DDR_PCTL2_PERFLPR1 0x264 +#define DDR_PCTL2_PERFWR1 0x26c +#define DDR_PCTL2_DQMAP0 0x280 +#define DDR_PCTL2_DQMAP1 0x284 +#define DDR_PCTL2_DQMAP2 0x288 +#define DDR_PCTL2_DQMAP3 0x28c +#define DDR_PCTL2_DQMAP4 0x290 +#define DDR_PCTL2_DQMAP5 0x294 +#define DDR_PCTL2_DBG0 0x300 +#define DDR_PCTL2_DBG1 0x304 +#define DDR_PCTL2_DBGCAM 0x308 +#define DDR_PCTL2_DBGCMD 0x30c +#define DDR_PCTL2_DBGSTAT 0x310 +#define DDR_PCTL2_SWCTL 0x320 +#define DDR_PCTL2_SWSTAT 0x324 +#define DDR_PCTL2_POISONCFG 0x36c +#define DDR_PCTL2_POISONSTAT 0x370 +#define DDR_PCTL2_ADVECCINDEX 0x374 +#define DDR_PCTL2_ADVECCSTAT 0x378 +#define DDR_PCTL2_PSTAT 0x3fc +#define DDR_PCTL2_PCCFG 0x400 +#define DDR_PCTL2_PCFGR_n 0x404 +#define DDR_PCTL2_PCFGW_n 0x408 +#define DDR_PCTL2_PCTRL_n 0x490 + +/* PCTL2_MRSTAT */ +#define MR_WR_BUSY BIT(0) + +/* PHY_REG0 */ +#define DIGITAL_DERESET BIT(3) +#define ANALOG_DERESET BIT(2) +#define DIGITAL_RESET (0 << 3) +#define ANALOG_RESET (0 << 2) + +/* PHY_REG1 */ +#define PHY_DDR2 (0) +#define PHY_LPDDR2 (1) +#define PHY_DDR3 (2) +#define PHY_LPDDR3 (3) +#define PHY_DDR4 (4) +#define PHY_BL_4 (0 << 2) +#define PHY_BL_8 BIT(2) + +/* PHY_REG2 */ +#define PHY_DTT_EN BIT(0) +#define PHY_DTT_DISB (0 << 0) +#define PHY_WRITE_LEVELING_EN BIT(2) +#define PHY_WRITE_LEVELING_DISB (0 << 2) +#define PHY_SELECT_CS0 (2) +#define PHY_SELECT_CS1 (1) +#define PHY_SELECT_CS0_1 (0) +#define PHY_WRITE_LEVELING_SELECTCS(n) (n << 6) +#define PHY_DATA_TRAINING_SELECTCS(n) (n << 4) + +#define PHY_DDR3_RON_RTT_DISABLE (0) +#define PHY_DDR3_RON_RTT_451ohm (1) +#define PHY_DDR3_RON_RTT_225ohm (2) +#define PHY_DDR3_RON_RTT_150ohm (3) +#define PHY_DDR3_RON_RTT_112ohm (4) +#define PHY_DDR3_RON_RTT_90ohm (5) +#define PHY_DDR3_RON_RTT_75ohm (6) +#define PHY_DDR3_RON_RTT_64ohm (7) +#define PHY_DDR3_RON_RTT_56ohm (16) +#define PHY_DDR3_RON_RTT_50ohm (17) +#define PHY_DDR3_RON_RTT_45ohm (18) +#define PHY_DDR3_RON_RTT_41ohm (19) +#define PHY_DDR3_RON_RTT_37ohm (20) +#define PHY_DDR3_RON_RTT_34ohm (21) +#define PHY_DDR3_RON_RTT_33ohm (22) +#define PHY_DDR3_RON_RTT_30ohm (23) +#define PHY_DDR3_RON_RTT_28ohm (24) +#define PHY_DDR3_RON_RTT_26ohm (25) +#define PHY_DDR3_RON_RTT_25ohm (26) +#define PHY_DDR3_RON_RTT_23ohm (27) +#define PHY_DDR3_RON_RTT_22ohm (28) +#define PHY_DDR3_RON_RTT_21ohm (29) +#define PHY_DDR3_RON_RTT_20ohm (30) +#define PHY_DDR3_RON_RTT_19ohm (31) + +#define PHY_DDR4_LPDDR3_RON_RTT_DISABLE (0) +#define PHY_DDR4_LPDDR3_RON_RTT_480ohm (1) +#define PHY_DDR4_LPDDR3_RON_RTT_240ohm (2) +#define PHY_DDR4_LPDDR3_RON_RTT_160ohm (3) +#define PHY_DDR4_LPDDR3_RON_RTT_120ohm (4) +#define PHY_DDR4_LPDDR3_RON_RTT_96ohm (5) +#define PHY_DDR4_LPDDR3_RON_RTT_80ohm (6) +#define PHY_DDR4_LPDDR3_RON_RTT_68ohm (7) +#define PHY_DDR4_LPDDR3_RON_RTT_60ohm (16) +#define PHY_DDR4_LPDDR3_RON_RTT_53ohm (17) +#define PHY_DDR4_LPDDR3_RON_RTT_48ohm (18) +#define PHY_DDR4_LPDDR3_RON_RTT_43ohm (19) +#define PHY_DDR4_LPDDR3_RON_RTT_40ohm (20) +#define PHY_DDR4_LPDDR3_RON_RTT_37ohm (21) +#define PHY_DDR4_LPDDR3_RON_RTT_34ohm (22) +#define PHY_DDR4_LPDDR3_RON_RTT_32ohm (23) +#define PHY_DDR4_LPDDR3_RON_RTT_30ohm (24) +#define PHY_DDR4_LPDDR3_RON_RTT_28ohm (25) +#define PHY_DDR4_LPDDR3_RON_RTT_26ohm (26) +#define PHY_DDR4_LPDDR3_RON_RTT_25ohm (27) +#define PHY_DDR4_LPDDR3_RON_RTT_24ohm (28) +#define PHY_DDR4_LPDDR3_RON_RTT_22ohm (29) +#define PHY_DDR4_LPDDR3_RON_RTT_21ohm (30) +#define PHY_DDR4_LPDDR3_RON_RTT_20ohm (31) + +/* noc registers define */ +#define DDRCONF 0x8 +#define DDRTIMING 0xc +#define DDRMODE 0x10 +#define READLATENCY 0x14 +#define AGING0 0x18 +#define AGING1 0x1c +#define AGING2 0x20 +#define AGING3 0x24 +#define AGING4 0x28 +#define AGING5 0x2c +#define ACTIVATE 0x38 +#define DEVTODEV 0x3c +#define DDR4TIMING 0x40 + +/* DDR GRF */ +#define DDR_GRF_CON(n) (0 + (n) * 4) +#define DDR_GRF_STATUS_BASE (0X100) +#define DDR_GRF_STATUS(n) (DDR_GRF_STATUS_BASE + (n) * 4) + +/* CRU_SOFTRESET_CON5 */ +#define ddrphy_psrstn_req(n) (((0x1 << 15) << 16) | (n << 15)) +#define ddrphy_srstn_req(n) (((0x1 << 14) << 16) | (n << 14)) +#define ddrctrl_psrstn_req(n) (((0x1 << 13) << 16) | (n << 13)) +#define ddrctrl_srstn_req(n) (((0x1 << 12) << 16) | (n << 12)) +#define ddrmsch_srstn_req(n) (((0x1 << 11) << 16) | (n << 11)) +#define msch_srstn_req(n) (((0x1 << 9) << 16) | (n << 9)) +#define dfimon_srstn_req(n) (((0x1 << 8) << 16) | (n << 8)) +#define grf_ddr_srstn_req(n) (((0x1 << 7) << 16) | (n << 7)) +/* CRU_SOFTRESET_CON9 */ +#define ddrctrl_asrstn_req(n) (((0x1 << 9) << 16) | (n << 9)) + +/* CRU register */ +#define CRU_PLL_CON(pll_id, n) ((pll_id) * 0x20 + (n) * 4) +#define CRU_MODE (0x80) +#define CRU_GLB_CNT_TH (0x90) +#define CRU_CLKSEL_CON_BASE 0x100 +#define CRU_CLKSELS_CON(i) (CRU_CLKSEL_CON_BASE + ((i) * 4)) +#define CRU_CLKGATE_CON_BASE 0x200 +#define CRU_CLKGATE_CON(i) (CRU_CLKGATE_CON_BASE + ((i) * 4)) +#define CRU_CLKSFTRST_CON_BASE 0x300 +#define CRU_CLKSFTRST_CON(i) (CRU_CLKSFTRST_CON_BASE + ((i) * 4)) + +/* CRU_PLL_CON0 */ +#define PB(n) ((0x1 << (15 + 16)) | ((n) << 15)) +#define POSTDIV1(n) ((0x7 << (12 + 16)) | ((n) << 12)) +#define FBDIV(n) ((0xFFF << 16) | (n)) + +/* CRU_PLL_CON1 */ +#define RSTMODE(n) ((0x1 << (15 + 16)) | ((n) << 15)) +#define RST(n) ((0x1 << (14 + 16)) | ((n) << 14)) +#define PD(n) ((0x1 << (13 + 16)) | ((n) << 13)) +#define DSMPD(n) ((0x1 << (12 + 16)) | ((n) << 12)) +#define LOCK(n) (((n) >> 10) & 0x1) +#define POSTDIV2(n) ((0x7 << (6 + 16)) | ((n) << 6)) +#define REFDIV(n) ((0x3F << 16) | (n)) + +union noc_ddrtiming { + u32 d32; + struct { + unsigned acttoact:6; + unsigned rdtomiss:6; + unsigned wrtomiss:6; + unsigned burstlen:3; + unsigned rdtowr:5; + unsigned wrtord:5; + unsigned bwratio:1; + } b; +} NOC_TIMING_T; + +union noc_activate { + u32 d32; + struct { + unsigned rrd:4; + unsigned faw:6; + unsigned fawbank:1; + unsigned reserved1:21; + } b; +}; + +union noc_devtodev { + u32 d32; + struct { + unsigned busrdtord:2; + unsigned busrdtowr:2; + unsigned buswrtord:2; + unsigned reserved2:26; + } b; +}; + +union noc_ddr4timing { + u32 d32; + struct { + unsigned ccdl:3; + unsigned wrtordl:5; + unsigned rrdl:4; + unsigned reserved2:20; + } b; +}; + +union noc_ddrmode { + u32 d32; + struct { + unsigned autoprecharge:1; + unsigned bwratioextended:1; + unsigned reserved3:30; + } b; +}; + +u32 addrmap[21][9] = { + /* map0 map1 map2 map3 map4 map5 map6 map7 map8 */ + {22, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x06060606, + 0x06060606, 0x00000f0f, 0x3f3f}, + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x3f3f}, + {23, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, + 0x0f080808, 0x00000f0f, 0x3f3f}, + {24, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, + 0x08080808, 0x00000f0f, 0x3f3f}, + {24, 0x000a0a0a, 0x00000000, 0x00000000, 0x00000000, 0x09090909, + 0x0f090909, 0x00000f0f, 0x3f3f}, + {6, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x3f3f}, + {7, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x3f3f}, + {8, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x09090909, + 0x0f090909, 0x00000f0f, 0x3f3f}, + {22, 0x001f0808, 0x00000000, 0x00000000, 0x00001f1f, 0x06060606, + 0x06060606, 0x00000f0f, 0x3f3f}, + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, + 0x0f070707, 0x00000f0f, 0x3f3f}, + + {24, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x0801}, + {23, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, + 0x0f080808, 0x00000f0f, 0x0801}, + {24, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f07, 0x0700}, + {23, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x0700}, + {24, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f07, 0x3f01}, + {23, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x3f01}, + {24, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x06060606, + 0x06060606, 0x00000f06, 0x3f00}, + {8, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x09090909, + 0x0f090909, 0x00000f0f, 0x0801}, + {7, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x0700}, + {7, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x3f01}, + + {6, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f07, 0x3f00} +}; + +struct rk3328_msch_timings { + union noc_ddrtiming ddrtiming; + union noc_ddrmode ddrmode; + u32 readlatency; + union noc_activate activate; + union noc_devtodev devtodev; + union noc_ddr4timing ddr4timing; + u32 agingx0; +}; + +struct rk3328_msch_regs { + u32 coreid; + u32 revisionid; + u32 ddrconf; + u32 ddrtiming; + u32 ddrmode; + u32 readlatency; + u32 aging0; + u32 aging1; + u32 aging2; + u32 aging3; + u32 aging4; + u32 aging5; + u32 reserved[2]; + u32 activate; + u32 devtodev; + u32 ddr4_timing; +}; + +struct rk3328_ddr_grf_regs { + u32 ddr_grf_con[4]; + u32 reserved[(0x100 - 0x10) / 4]; + u32 ddr_grf_status[11]; +}; + +struct rk3328_ddr_pctl_regs { + u32 pctl[30][2]; +}; + +struct rk3328_ddr_phy_regs { + u32 phy[5][2]; +}; + +struct rk3328_ddr_skew { + u32 a0_a1_skew[15]; + u32 cs0_dm0_skew[11]; + u32 cs0_dm1_skew[11]; + u32 cs0_dm2_skew[11]; + u32 cs0_dm3_skew[11]; + u32 cs1_dm0_skew[11]; + u32 cs1_dm1_skew[11]; + u32 cs1_dm2_skew[11]; + u32 cs1_dm3_skew[11]; +}; + +struct rk3328_sdram_channel { + unsigned int rank; + unsigned int col; + /* 3:8bank, 2:4bank */ + unsigned int bk; + /* channel buswidth, 2:32bit, 1:16bit, 0:8bit */ + unsigned int bw; + /* die buswidth, 2:32bit, 1:16bit, 0:8bit */ + unsigned int dbw; + unsigned int row_3_4; + unsigned int cs0_row; + unsigned int cs1_row; + unsigned int ddrconfig; + struct rk3328_msch_timings noc_timings; +}; + +struct rk3328_sdram_params { + struct rk3328_sdram_channel ch; + unsigned int ddr_freq; + unsigned int dramtype; + unsigned int odt; + struct rk3328_ddr_pctl_regs pctl_regs; + struct rk3328_ddr_phy_regs phy_regs; + struct rk3328_ddr_skew skew; +}; + +#define PHY_REG(base, n) (base + 4 * (n)) + +#endif diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index f4e0b18447..656696ac3c 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -2,22 +2,1029 @@ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ - #include <common.h> +#include <clk.h> +#include <debug_uart.h> #include <dm.h> +#include <dt-structs.h> #include <ram.h> +#include <regmap.h> #include <syscon.h> +#include <asm/io.h> #include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3328.h> #include <asm/arch-rockchip/grf_rk3328.h> #include <asm/arch-rockchip/sdram_common.h> +#include <asm/arch-rockchip/sdram_rk3328.h> +#include <asm/arch-rockchip/uart.h> struct dram_info { +#ifdef CONFIG_TPL_BUILD + struct rk3328_ddr_pctl_regs *pctl; + struct rk3328_ddr_phy_regs *phy; + struct clk ddr_clk; + struct rk3328_cru *cru; + struct rk3328_msch_regs *msch; + struct rk3328_ddr_grf_regs *ddr_grf; +#endif struct ram_info info; struct rk3328_grf_regs *grf; }; +#ifdef CONFIG_TPL_BUILD + +struct rk3328_sdram_channel sdram_ch; + +struct rockchip_dmc_plat { +#if CONFIG_IS_ENABLED(OF_PLATDATA) + struct dtd_rockchip_rk3328_dmc dtplat; +#else + struct rk3328_sdram_params sdram_params; +#endif + struct regmap *map; +}; + +#if CONFIG_IS_ENABLED(OF_PLATDATA) +static int conv_of_platdata(struct udevice *dev) +{ + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; + int ret; + + ret = regmap_init_mem_platdata(dev, dtplat->reg, + ARRAY_SIZE(dtplat->reg) / 2, + &plat->map); + if (ret) + return ret; + + return 0; +} +#endif + +static void rkclk_ddr_reset(struct dram_info *dram, + u32 ctl_srstn, u32 ctl_psrstn, + u32 phy_srstn, u32 phy_psrstn) +{ + writel(ddrctrl_srstn_req(ctl_srstn) | ddrctrl_psrstn_req(ctl_psrstn) | + ddrphy_srstn_req(phy_srstn) | ddrphy_psrstn_req(phy_psrstn), + &dram->cru->softrst_con[5]); + writel(ddrctrl_asrstn_req(ctl_srstn), &dram->cru->softrst_con[9]); +} + +static void rkclk_set_dpll(struct dram_info *dram, unsigned int mhz) +{ + unsigned int refdiv, postdiv1, postdiv2, fbdiv; + int delay = 1000; + + refdiv = 1; + if (mhz <= 300) { + postdiv1 = 4; + postdiv2 = 2; + } else if (mhz <= 400) { + postdiv1 = 6; + postdiv2 = 1; + } else if (mhz <= 600) { + postdiv1 = 4; + postdiv2 = 1; + } else if (mhz <= 800) { + postdiv1 = 3; + postdiv2 = 1; + } else if (mhz <= 1600) { + postdiv1 = 2; + postdiv2 = 1; + } else { + postdiv1 = 1; + postdiv2 = 1; + } + fbdiv = (mhz * refdiv * postdiv1 * postdiv2) / 24; + + writel(((0x1 << 4) << 16) | (0 << 4), &dram->cru->mode_con); + writel(POSTDIV1(postdiv1) | FBDIV(fbdiv), &dram->cru->dpll_con[0]); + writel(DSMPD(1) | POSTDIV2(postdiv2) | REFDIV(refdiv), + &dram->cru->dpll_con[1]); + + while (delay > 0) { + udelay(1); + if (LOCK(readl(&dram->cru->dpll_con[1]))) + break; + delay--; + } + + writel(((0x1 << 4) << 16) | (1 << 4), &dram->cru->mode_con); +} + +static void rkclk_configure_ddr(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + void __iomem *phy_base = dram->phy; + + /* choose DPLL for ddr clk source */ + clrbits_le32(PHY_REG(phy_base, 0xef), 1 << 7); + + /* for inno ddr phy need 2*freq */ + rkclk_set_dpll(dram, sdram_params->ddr_freq * 2); +} + +static void phy_soft_reset(struct dram_info *dram) +{ + void __iomem *phy_base = dram->phy; + + clrbits_le32(PHY_REG(phy_base, 0), 0x3 << 2); + udelay(1); + setbits_le32(PHY_REG(phy_base, 0), ANALOG_DERESET); + udelay(5); + setbits_le32(PHY_REG(phy_base, 0), DIGITAL_DERESET); + udelay(1); +} + +static int pctl_cfg(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 i; + void __iomem *pctl_base = dram->pctl; + + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { + writel(sdram_params->pctl_regs.pctl[i][1], + pctl_base + sdram_params->pctl_regs.pctl[i][0]); + } + clrsetbits_le32(pctl_base + DDR_PCTL2_PWRTMG, + (0xff << 16) | 0x1f, + ((SR_IDLE & 0xff) << 16) | (PD_IDLE & 0x1f)); + /* + * dfi_lp_en_pd=1,dfi_lp_wakeup_pd=2 + * hw_lp_idle_x32=1 + */ + if (sdram_params->dramtype == LPDDR3) { + setbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, 1); + clrsetbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, + 0xf << 4, + 2 << 4); + } + clrsetbits_le32(pctl_base + DDR_PCTL2_HWLPCTL, + 0xfff << 16, + 1 << 16); + /* disable zqcs */ + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1u << 31); + setbits_le32(pctl_base + 0x2000 + DDR_PCTL2_ZQCTL0, 1u << 31); + + return 0; +} + +/* return ddrconfig value + * (-1), find ddrconfig fail + * other, the ddrconfig value + * only support cs0_row >= cs1_row + */ +static unsigned int calculate_ddrconfig(struct rk3328_sdram_params *sdram_params) +{ + static const u16 ddr_cfg_2_rbc[] = { + /*************************** + * [5:4] row(13+n) + * [3] cs(0:0 cs, 1:2 cs) + * [2] bank(0:0bank,1:8bank) + * [1:0] col(11+n) + ****************************/ + /* row, cs, bank, col */ + ((3 << 4) | (0 << 3) | (1 << 2) | 0), + ((3 << 4) | (0 << 3) | (1 << 2) | 1), + ((2 << 4) | (0 << 3) | (1 << 2) | 2), + ((3 << 4) | (0 << 3) | (1 << 2) | 2), + ((2 << 4) | (0 << 3) | (1 << 2) | 3), + ((3 << 4) | (1 << 3) | (1 << 2) | 0), + ((3 << 4) | (1 << 3) | (1 << 2) | 1), + ((2 << 4) | (1 << 3) | (1 << 2) | 2), + ((3 << 4) | (0 << 3) | (0 << 2) | 1), + ((2 << 4) | (0 << 3) | (1 << 2) | 1), + }; + + static const u16 ddr4_cfg_2_rbc[] = { + /*************************** + * [6] cs 0:0cs 1:2 cs + * [5:3] row(13+n) + * [2] cs(0:0 cs, 1:2 cs) + * [1] bw 0: 16bit 1:32bit + * [0] diebw 0:8bit 1:16bit + ***************************/ + /* cs, row, cs, bw, diebw */ + ((0 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 0), + ((1 << 6) | (2 << 3) | (0 << 2) | (1 << 1) | 0), + ((0 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 0), + ((1 << 6) | (3 << 3) | (0 << 2) | (0 << 1) | 0), + ((0 << 6) | (4 << 3) | (0 << 2) | (1 << 1) | 1), + ((1 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 1), + ((1 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 1), + ((0 << 6) | (2 << 3) | (1 << 2) | (1 << 1) | 0), + ((0 << 6) | (3 << 3) | (1 << 2) | (0 << 1) | 0), + ((0 << 6) | (3 << 3) | (1 << 2) | (1 << 1) | 1), + ((0 << 6) | (4 << 3) | (1 << 2) | (0 << 1) | 1), + }; + + u32 cs, bw, die_bw, col, row, bank; + u32 i, tmp; + u32 ddrconf = -1; + + cs = sdram_ch.rank; + bw = sdram_ch.bw; + die_bw = sdram_ch.dbw; + col = sdram_ch.col; + row = sdram_ch.cs0_row; + bank = sdram_ch.bk; + + if (sdram_params->dramtype == DDR4) { + tmp = ((cs - 1) << 6) | ((row - 13) << 3) | (bw & 0x2) | die_bw; + for (i = 10; i < 17; i++) { + if (((tmp & 0x7) == (ddr4_cfg_2_rbc[i - 10] & 0x7)) && + ((tmp & 0x3c) <= (ddr4_cfg_2_rbc[i - 10] & 0x3c)) && + ((tmp & 0x40) <= (ddr4_cfg_2_rbc[i - 10] & 0x40))) { + ddrconf = i; + goto out; + } + } + } else { + if (bank == 2) { + ddrconf = 8; + goto out; + } + + tmp = ((row - 13) << 4) | (1 << 2) | ((bw + col - 11) << 0); + for (i = 0; i < 5; i++) + if (((tmp & 0xf) == (ddr_cfg_2_rbc[i] & 0xf)) && + ((tmp & 0x30) <= (ddr_cfg_2_rbc[i] & 0x30))) { + ddrconf = i; + goto out; + } + } + +out: + if (ddrconf > 20) + printf("calculate_ddrconfig error\n"); + + return ddrconf; +} + +/* n: Unit bytes */ +static void copy_to_reg(u32 *dest, u32 *src, u32 n) +{ + int i; + + for (i = 0; i < n / sizeof(u32); i++) { + writel(*src, dest); + src++; + dest++; + } +} + +/******* + * calculate controller dram address map, and setting to register. + * argument sdram_ch.ddrconf must be right value before + * call this function. + *******/ +static void set_ctl_address_map(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + void __iomem *pctl_base = dram->pctl; + + copy_to_reg((u32 *)(pctl_base + DDR_PCTL2_ADDRMAP0), + &addrmap[sdram_ch.ddrconfig][0], 9 * 4); + if (sdram_params->dramtype == LPDDR3 && sdram_ch.row_3_4) + setbits_le32(pctl_base + DDR_PCTL2_ADDRMAP6, 1 << 31); + if (sdram_params->dramtype == DDR4 && sdram_ch.bw == 0x1) + setbits_le32(pctl_base + DDR_PCTL2_PCCFG, 1 << 8); + + if (sdram_ch.rank == 1) + clrsetbits_le32(pctl_base + DDR_PCTL2_ADDRMAP0, 0x1f, 0x1f); +} + +static void phy_dll_bypass_set(struct dram_info *dram, u32 freq) +{ + u32 tmp; + void __iomem *phy_base = dram->phy; + + setbits_le32(PHY_REG(phy_base, 0x13), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x14), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x26), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x27), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x36), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x37), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x46), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x47), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x56), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x57), 1 << 3); + + if (freq <= (400 * MHz)) + /* DLL bypass */ + setbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); + else + clrbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); + if (freq <= (680 * MHz)) + tmp = 2; + else + tmp = 1; + writel(tmp, PHY_REG(phy_base, 0x28)); + writel(tmp, PHY_REG(phy_base, 0x38)); + writel(tmp, PHY_REG(phy_base, 0x48)); + writel(tmp, PHY_REG(phy_base, 0x58)); +} + +static void set_ds_odt(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 cmd_drv, clk_drv, dqs_drv, dqs_odt; + void __iomem *phy_base = dram->phy; + + if (sdram_params->dramtype == DDR3) { + cmd_drv = PHY_DDR3_RON_RTT_34ohm; + clk_drv = PHY_DDR3_RON_RTT_45ohm; + dqs_drv = PHY_DDR3_RON_RTT_34ohm; + dqs_odt = PHY_DDR3_RON_RTT_225ohm; + } else { + cmd_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; + clk_drv = PHY_DDR4_LPDDR3_RON_RTT_43ohm; + dqs_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; + dqs_odt = PHY_DDR4_LPDDR3_RON_RTT_240ohm; + } + /* DS */ + writel(cmd_drv, PHY_REG(phy_base, 0x11)); + clrsetbits_le32(PHY_REG(phy_base, 0x12), 0x1f << 3, cmd_drv << 3); + writel(clk_drv, PHY_REG(phy_base, 0x16)); + writel(clk_drv, PHY_REG(phy_base, 0x18)); + writel(dqs_drv, PHY_REG(phy_base, 0x20)); + writel(dqs_drv, PHY_REG(phy_base, 0x2f)); + writel(dqs_drv, PHY_REG(phy_base, 0x30)); + writel(dqs_drv, PHY_REG(phy_base, 0x3f)); + writel(dqs_drv, PHY_REG(phy_base, 0x40)); + writel(dqs_drv, PHY_REG(phy_base, 0x4f)); + writel(dqs_drv, PHY_REG(phy_base, 0x50)); + writel(dqs_drv, PHY_REG(phy_base, 0x5f)); + /* ODT */ + writel(dqs_odt, PHY_REG(phy_base, 0x21)); + writel(dqs_odt, PHY_REG(phy_base, 0x2e)); + writel(dqs_odt, PHY_REG(phy_base, 0x31)); + writel(dqs_odt, PHY_REG(phy_base, 0x3e)); + writel(dqs_odt, PHY_REG(phy_base, 0x41)); + writel(dqs_odt, PHY_REG(phy_base, 0x4e)); + writel(dqs_odt, PHY_REG(phy_base, 0x51)); + writel(dqs_odt, PHY_REG(phy_base, 0x5e)); +} + +static void phy_cfg(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 i; + void __iomem *phy_base = dram->phy; + + phy_dll_bypass_set(dram, sdram_params->ddr_freq); + for (i = 0; sdram_params->phy_regs.phy[i][0] != 0xFFFFFFFF; i++) { + writel(sdram_params->phy_regs.phy[i][1], + phy_base + sdram_params->phy_regs.phy[i][0]); + } + if (sdram_ch.bw == 2) { + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 0xf << 4); + } else { + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 3 << 4); + /* disable DQS2,DQS3 tx dll for saving power */ + clrbits_le32(PHY_REG(phy_base, 0x46), 1 << 3); + clrbits_le32(PHY_REG(phy_base, 0x56), 1 << 3); + } + set_ds_odt(dram, sdram_params); + /* deskew */ + setbits_le32(PHY_REG(phy_base, 2), 8); + copy_to_reg(PHY_REG(phy_base, 0xb0), + &sdram_params->skew.a0_a1_skew[0], 15 * 4); + copy_to_reg(PHY_REG(phy_base, 0x70), + &sdram_params->skew.cs0_dm0_skew[0], 44 * 4); + copy_to_reg(PHY_REG(phy_base, 0xc0), + &sdram_params->skew.cs0_dm1_skew[0], 44 * 4); +} + +static int update_refresh_reg(struct dram_info *dram) +{ + void __iomem *pctl_base = dram->pctl; + u32 ret; + + ret = readl(pctl_base + DDR_PCTL2_RFSHCTL3) ^ (1 << 1); + writel(ret, pctl_base + DDR_PCTL2_RFSHCTL3); + + return 0; +} + +static int data_training(struct dram_info *dram, u32 cs, u32 dramtype) +{ + u32 ret; + u32 dis_auto_zq = 0; + void __iomem *pctl_base = dram->pctl; + void __iomem *phy_base = dram->phy; + + /* disable zqcs */ + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & + (1ul << 31))) { + dis_auto_zq = 1; + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + } + /* disable auto refresh */ + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + if (dramtype == DDR4) { + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0); + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0); + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0); + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0); + } + /* choose training cs */ + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs)); + /* enable gate training */ + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 1); + udelay(50); + ret = readl(PHY_REG(phy_base, 0xff)); + /* disable gate training */ + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 0); + /* restore zqcs */ + if (dis_auto_zq) + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + /* restore auto refresh */ + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + if (dramtype == DDR4) { + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0x2); + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0x2); + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0x2); + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0x2); + } + + if (ret & 0x10) { + ret = -1; + } else { + ret = (ret & 0xf) ^ (readl(PHY_REG(phy_base, 0)) >> 4); + ret = (ret == 0) ? 0 : -1; + } + return ret; +} + +/* rank = 1: cs0 + * rank = 2: cs1 + * rank = 3: cs0 & cs1 + * note: be careful of keep mr original val + */ +static int write_mr(struct dram_info *dram, u32 rank, u32 mr_num, u32 arg, + u32 dramtype) +{ + void __iomem *pctl_base = dram->pctl; + + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) + continue; + if (dramtype == DDR3 || dramtype == DDR4) { + writel((mr_num << 12) | (rank << 4) | (0 << 0), + pctl_base + DDR_PCTL2_MRCTRL0); + writel(arg, pctl_base + DDR_PCTL2_MRCTRL1); + } else { + writel((rank << 4) | (0 << 0), + pctl_base + DDR_PCTL2_MRCTRL0); + writel((mr_num << 8) | (arg & 0xff), + pctl_base + DDR_PCTL2_MRCTRL1); + } + + setbits_le32(pctl_base + DDR_PCTL2_MRCTRL0, 1u << 31); + while (readl(pctl_base + DDR_PCTL2_MRCTRL0) & (1u << 31)) + continue; + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) + continue; + + return 0; +} + +/* + * rank : 1:cs0, 2:cs1, 3:cs0&cs1 + * vrefrate: 4500: 45%, + */ +static int write_vrefdq(struct dram_info *dram, u32 rank, u32 vrefrate, + u32 dramtype) +{ + u32 tccd_l, value; + u32 dis_auto_zq = 0; + void __iomem *pctl_base = dram->pctl; + + if (dramtype != DDR4 || vrefrate < 4500 || vrefrate > 9200) + return -1; + + tccd_l = (readl(pctl_base + DDR_PCTL2_DRAMTMG4) >> 16) & 0xf; + tccd_l = (tccd_l - 4) << 10; + + if (vrefrate > 7500) { + /* range 1 */ + value = ((vrefrate - 6000) / 65) | tccd_l; + } else { + /* range 2 */ + value = ((vrefrate - 4500) / 65) | tccd_l | (1 << 6); + } + + /* disable zqcs */ + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & + (1ul << 31))) { + dis_auto_zq = 1; + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + } + /* disable auto refresh */ + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + /* enable vrefdq calibratin */ + write_mr(dram, rank, 6, value | (1 << 7), dramtype); + udelay(1);/* tvrefdqe */ + /* write vrefdq value */ + write_mr(dram, rank, 6, value | (1 << 7), dramtype); + udelay(1);/* tvref_time */ + write_mr(dram, rank, 6, value | (0 << 7), dramtype); + udelay(1);/* tvrefdqx */ + + /* restore zqcs */ + if (dis_auto_zq) + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + /* restore auto refresh */ + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + return 0; +} + +#define _MAX_(x, y) ((x) > (y) ? (x) : (y)) + +static void rx_deskew_switch_adjust(struct dram_info *dram) +{ + u32 i, deskew_val; + u32 gate_val = 0; + void __iomem *phy_base = dram->phy; + + for (i = 0; i < 4; i++) + gate_val = _MAX_(readl(PHY_REG(phy_base, 0xfb + i)), gate_val); + + deskew_val = (gate_val >> 3) + 1; + deskew_val = (deskew_val > 0x1f) ? 0x1f : deskew_val; + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0xc, (deskew_val & 0x3) << 2); + clrsetbits_le32(PHY_REG(phy_base, 0x6f), 0x7 << 4, + (deskew_val & 0x1c) << 2); +} + +#undef _MAX_ + +static void tx_deskew_switch_adjust(struct dram_info *dram) +{ + void __iomem *phy_base = dram->phy; + + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0x3, 1); +} + +static void set_ddrconfig(struct dram_info *dram, u32 ddrconfig) +{ + writel(ddrconfig, &dram->msch->ddrconf); +} + +static void dram_all_config(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 sys_reg = 0, tmp = 0; + + set_ddrconfig(dram, sdram_ch.ddrconfig); + + sys_reg |= SYS_REG_ENC_DDRTYPE(sdram_params->dramtype); + sys_reg |= SYS_REG_ENC_ROW_3_4(sdram_ch.row_3_4, 0); + sys_reg |= SYS_REG_ENC_RANK(sdram_ch.rank, 0); + sys_reg |= SYS_REG_ENC_COL(sdram_ch.col, 0); + sys_reg |= SYS_REG_ENC_BK(sdram_ch.bk, 0); + SYS_REG_ENC_CS0_ROW(sdram_ch.cs0_row, sys_reg, tmp, 0); + if (sdram_ch.cs1_row) + SYS_REG_ENC_CS1_ROW(sdram_ch.cs1_row, sys_reg, tmp, 0); + sys_reg |= SYS_REG_ENC_BW(sdram_ch.bw, 0); + sys_reg |= SYS_REG_ENC_DBW(sdram_ch.dbw, 0); + + writel(sys_reg, &dram->grf->os_reg[2]); + + writel(sdram_ch.noc_timings.ddrtiming.d32, &dram->msch->ddrtiming); + + writel(sdram_ch.noc_timings.ddrmode.d32, &dram->msch->ddrmode); + writel(sdram_ch.noc_timings.readlatency, &dram->msch->readlatency); + + writel(sdram_ch.noc_timings.activate.d32, &dram->msch->activate); + writel(sdram_ch.noc_timings.devtodev.d32, &dram->msch->devtodev); + writel(sdram_ch.noc_timings.ddr4timing.d32, &dram->msch->ddr4_timing); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging0); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging1); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging2); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging3); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging4); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging5); +} + +static void enable_low_power(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + void __iomem *pctl_base = dram->pctl; + + /* enable upctl2 axi clock auto gating */ + writel(0x00800000, &dram->ddr_grf->ddr_grf_con[0]); + writel(0x20012001, &dram->ddr_grf->ddr_grf_con[2]); + /* enable upctl2 core clock auto gating */ + writel(0x001e001a, &dram->ddr_grf->ddr_grf_con[2]); + /* enable sr, pd */ + if (PD_IDLE == 0) + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); + else + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); + if (SR_IDLE == 0) + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); + else + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 3)); +} + +static int sdram_init(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params, u32 pre_init) +{ + void __iomem *pctl_base = dram->pctl; + + rkclk_ddr_reset(dram, 1, 1, 1, 1); + udelay(10); + /* + * dereset ddr phy psrstn to config pll, + * if using phy pll psrstn must be dereset + * before config pll + */ + rkclk_ddr_reset(dram, 1, 1, 1, 0); + rkclk_configure_ddr(dram, sdram_params); + if (pre_init == 0) { + switch (sdram_params->dramtype) { + case DDR3: + printf("DDR3\n"); + break; + case DDR4: + printf("DDR4\n"); + break; + case LPDDR3: + default: + printf("LPDDR3\n"); + break; + } + } + /* release phy srst to provide clk to ctrl */ + rkclk_ddr_reset(dram, 1, 1, 0, 0); + udelay(10); + phy_soft_reset(dram); + /* release ctrl presetn, and config ctl registers */ + rkclk_ddr_reset(dram, 1, 0, 0, 0); + pctl_cfg(dram, sdram_params); + sdram_ch.ddrconfig = calculate_ddrconfig(sdram_params); + set_ctl_address_map(dram, sdram_params); + phy_cfg(dram, sdram_params); + + /* enable dfi_init_start to init phy after ctl srstn deassert */ + setbits_le32(pctl_base + DDR_PCTL2_DFIMISC, (1 << 5) | (1 << 4)); + rkclk_ddr_reset(dram, 0, 0, 0, 0); + /* wait for dfi_init_done and dram init complete */ + while ((readl(pctl_base + DDR_PCTL2_STAT) & 0x7) == 0) + continue; + + /* do ddr gate training */ + if (data_training(dram, 0, sdram_params->dramtype) != 0) { + printf("data training error\n"); + return -1; + } + + if (sdram_params->dramtype == DDR4) + write_vrefdq(dram, 0x3, 5670, sdram_params->dramtype); + + if (pre_init == 0) { + rx_deskew_switch_adjust(dram); + tx_deskew_switch_adjust(dram); + } + + dram_all_config(dram, sdram_params); + enable_low_power(dram, sdram_params); + + return 0; +} + +static u64 dram_detect_cap(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params, + unsigned char channel) +{ + void __iomem *pctl_base = dram->pctl; + + /* + * for ddr3: ddrconf = 3 + * for ddr4: ddrconf = 12 + * for lpddr3: ddrconf = 3 + * default bw = 1 + */ + u32 bk, bktmp; + u32 col, coltmp; + u32 row, rowtmp, row_3_4; + void __iomem *test_addr, *test_addr1; + u32 dbw; + u32 cs; + u32 bw = 1; + u64 cap = 0; + u32 dram_type = sdram_params->dramtype; + u32 pwrctl; + + if (dram_type != DDR4) { + /* detect col and bk for ddr3/lpddr3 */ + coltmp = 12; + bktmp = 3; + rowtmp = 16; + + for (col = coltmp; col >= 9; col -= 1) { + writel(0, SDRAM_ADDR); + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (col + bw - 1ul))); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + break; + } + if (col == 8) { + printf("col error\n"); + goto cap_err; + } + + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (coltmp + bktmp + bw - 1ul))); + writel(0, SDRAM_ADDR); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + bk = 3; + else + bk = 2; + if (dram_type == LPDDR3) + dbw = 2; + else + dbw = 1; + } else { + /* detect bg for ddr4 */ + coltmp = 10; + bktmp = 4; + rowtmp = 17; + + col = 10; + bk = 2; + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (coltmp + bw + 1ul))); + writel(0, SDRAM_ADDR); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + dbw = 0; + else + dbw = 1; + } + /* detect row */ + for (row = rowtmp; row > 12; row--) { + writel(0, SDRAM_ADDR); + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (row + bktmp + coltmp + bw - 1ul))); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + break; + } + if (row == 12) { + printf("row error"); + goto cap_err; + } + /* detect row_3_4 */ + test_addr = SDRAM_ADDR; + test_addr1 = (void __iomem *)(SDRAM_ADDR + + (0x3ul << (row + bktmp + coltmp + bw - 1ul - 1ul))); + + writel(0, test_addr); + writel(PATTERN, test_addr1); + if ((readl(test_addr) == 0) && + (readl(test_addr1) == PATTERN)) + row_3_4 = 0; + else + row_3_4 = 1; + + /* disable auto low-power */ + pwrctl = readl(pctl_base + DDR_PCTL2_PWRCTL); + writel(0, pctl_base + DDR_PCTL2_PWRCTL); + + /* bw and cs detect using phy read gate training */ + if (data_training(dram, 1, dram_type) == 0) + cs = 1; + else + cs = 0; + + bw = 2; + + /* restore auto low-power */ + writel(pwrctl, pctl_base + DDR_PCTL2_PWRCTL); + + sdram_ch.rank = cs + 1; + sdram_ch.col = col; + sdram_ch.bk = bk; + sdram_ch.dbw = dbw; + sdram_ch.bw = bw; + sdram_ch.cs0_row = row; + if (cs) + sdram_ch.cs1_row = row; + else + sdram_ch.cs1_row = 0; + sdram_ch.row_3_4 = row_3_4; + + if (dram_type == DDR4) + cap = 1llu << (cs + row + bk + col + ((dbw == 0) ? 2 : 1) + bw); + else + cap = 1llu << (cs + row + bk + col + bw); + + return cap; + +cap_err: + return 0; +} + +static u32 remodify_sdram_params(struct rk3328_sdram_params *sdram_params) +{ + u32 tmp = 0, tmp_adr = 0, i; + + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { + if (sdram_params->pctl_regs.pctl[i][0] == 0) { + tmp = sdram_params->pctl_regs.pctl[i][1];/* MSTR */ + tmp_adr = i; + } + } + + tmp &= ~((3ul << 30) | (3ul << 24) | (3ul << 12)); + + switch (sdram_ch.dbw) { + case 2: + tmp |= (3ul << 30); + break; + case 1: + tmp |= (2ul << 30); + break; + case 0: + default: + tmp |= (1ul << 30); + break; + } + + if (sdram_ch.rank == 2) + tmp |= 3 << 24; + else + tmp |= 1 << 24; + + tmp |= (2 - sdram_ch.bw) << 12; + + sdram_params->pctl_regs.pctl[tmp_adr][1] = tmp; + + if (sdram_ch.bw == 2) + sdram_ch.noc_timings.ddrtiming.b.bwratio = 0; + else + sdram_ch.noc_timings.ddrtiming.b.bwratio = 1; + + return 0; +} + +static int dram_detect_cs1_row(struct rk3328_sdram_params *sdram_params, + unsigned char channel) +{ + u32 ret = 0; + u32 cs1_bit; + void __iomem *test_addr, *cs1_addr; + u32 row, bktmp, coltmp, bw; + u32 ddrconf = sdram_ch.ddrconfig; + + if (sdram_ch.rank == 2) { + cs1_bit = addrmap[ddrconf][0] + 8; + + if (cs1_bit > 31) + goto out; + + cs1_addr = (void __iomem *)(1ul << cs1_bit); + if (cs1_bit < 20) + cs1_bit = 1; + else + cs1_bit = 0; + + if (sdram_params->dramtype == DDR4) { + if (sdram_ch.dbw == 0) + bktmp = sdram_ch.bk + 2; + else + bktmp = sdram_ch.bk + 1; + } else { + bktmp = sdram_ch.bk; + } + bw = sdram_ch.bw; + coltmp = sdram_ch.col; + + /* detect cs1 row */ + for (row = sdram_ch.cs0_row; row > 12; row--) { + test_addr = (void __iomem *)(SDRAM_ADDR + cs1_addr + + (1ul << (row + cs1_bit + bktmp + + coltmp + bw - 1ul))); + writel(0, SDRAM_ADDR + cs1_addr); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR + cs1_addr) == 0)) { + ret = row; + break; + } + } + } + +out: + return ret; +} + +static int sdram_init_detect(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + debug("Starting SDRAM initialization...\n"); + + memcpy(&sdram_ch, &sdram_params->ch, + sizeof(struct rk3328_sdram_channel)); + + sdram_init(dram, sdram_params, 1); + dram_detect_cap(dram, sdram_params, 0); + + /* modify bw, cs related timing */ + remodify_sdram_params(sdram_params); + /* reinit sdram by real dram cap */ + sdram_init(dram, sdram_params, 0); + + /* redetect cs1 row */ + sdram_ch.cs1_row = + dram_detect_cs1_row(sdram_params, 0); + + return 0; +} + +static int rk3328_dmc_init(struct udevice *dev) +{ + struct dram_info *priv = dev_get_priv(dev); + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + int ret; + +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + struct rk3328_sdram_params *params = &plat->sdram_params; +#else + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; + struct rk3328_sdram_params *params = + (void *)dtplat->rockchip_sdram_params; + + ret = conv_of_platdata(dev); + if (ret) + return ret; +#endif + priv->phy = regmap_get_range(plat->map, 0); + priv->pctl = regmap_get_range(plat->map, 1); + priv->grf = regmap_get_range(plat->map, 2); + priv->cru = regmap_get_range(plat->map, 3); + priv->msch = regmap_get_range(plat->map, 4); + priv->ddr_grf = regmap_get_range(plat->map, 5); + + debug("%s phy %p pctrl %p grf %p cru %p msch %p ddr_grf %p\n", + __func__, priv->phy, priv->pctl, priv->grf, priv->cru, + priv->msch, priv->ddr_grf); + ret = sdram_init_detect(priv, params); + if (ret < 0) { + printf("%s DRAM init failed%d\n", __func__, ret); + return ret; + } + + return 0; +} + +static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev) +{ +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + int ret; + + ret = dev_read_u32_array(dev, "rockchip,sdram-params", + (u32 *)&plat->sdram_params, + sizeof(plat->sdram_params) / sizeof(u32)); + if (ret) { + printf("%s: Cannot read rockchip,sdram-params %d\n", + __func__, ret); + return ret; + } + ret = regmap_init_mem(dev, &plat->map); + if (ret) + printf("%s: regmap failed %d\n", __func__, ret); +#endif + return 0; +} + +#endif + static int rk3328_dmc_probe(struct udevice *dev) { +#ifdef CONFIG_TPL_BUILD + if (rk3328_dmc_init(dev)) + return 0; +#else struct dram_info *priv = dev_get_priv(dev); priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); @@ -25,7 +1032,7 @@ static int rk3328_dmc_probe(struct udevice *dev) priv->info.base = CONFIG_SYS_SDRAM_BASE; priv->info.size = rockchip_sdram_size( (phys_addr_t)&priv->grf->os_reg[2]); - +#endif return 0; } @@ -42,7 +1049,6 @@ static struct ram_ops rk3328_dmc_ops = { .get_info = rk3328_dmc_get_info, }; - static const struct udevice_id rk3328_dmc_ids[] = { { .compatible = "rockchip,rk3328-dmc" }, { } @@ -53,6 +1059,12 @@ U_BOOT_DRIVER(dmc_rk3328) = { .id = UCLASS_RAM, .of_match = rk3328_dmc_ids, .ops = &rk3328_dmc_ops, +#ifdef CONFIG_TPL_BUILD + .ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata, +#endif .probe = rk3328_dmc_probe, .priv_auto_alloc_size = sizeof(struct dram_info), +#ifdef CONFIG_TPL_BUILD + .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), +#endif }; -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 2/7] rockchip: dts: rk3328: update dmc node for driver 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 1/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov @ 2019-07-31 16:01 ` Matwey V. Kornilov 2019-08-01 2:38 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 3/7] rockchip: dts: rk3328: enable the drivers need by TPL/SPL Matwey V. Kornilov ` (5 subsequent siblings) 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> Update dmc node for full feature driver. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/1e1495636574c78ea9d3af3e0aae95d5204612d6 with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/dts/rk3328-evb.dts | 1 + arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++++++++++++++++++++++++++ arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ arch/arm/dts/rk3328.dtsi | 11 +- 6 files changed, 656 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts index ec594a8452..3b01dd0a87 100644 --- a/arch/arm/dts/rk3328-evb.dts +++ b/arch/arm/dts/rk3328-evb.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "rk3328.dtsi" +#include "rk3328-sdram-ddr3-666.dtsi" / { model = "Rockchip RK3328 EVB"; diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi index b077436cbc..a01f758e9f 100644 --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi @@ -4,6 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include "rk3328-sdram-lpddr3-1600.dtsi" + / { aliases { mmc0 = &emmc; diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi new file mode 100644 index 0000000000..d99e7e0352 --- /dev/null +++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi @@ -0,0 +1,215 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&dmc { + rockchip,sdram-params = < + 0x1 + 0xC + 0x3 + 0x1 + 0x0 + 0x0 + 0x10 + 0x10 + 0 + + 0x9028b189 + 0x00000000 + 0x00000021 + 0x00000482 + 0x00000015 + 0x00000222 + 0x000000ff + + 333 + 3 + 0 + + 0x00000000 + 0x43041001 + 0x00000064 + 0x0028003b + 0x000000d0 + 0x00020053 + 0x000000d4 + 0x00020000 + 0x000000d8 + 0x00000100 + 0x000000dc + 0x03200000 + 0x000000e0 + 0x00000000 + 0x000000e4 + 0x00090000 + 0x000000f4 + 0x000f011f + 0x00000100 + 0x07090b06 + 0x00000104 + 0x00050209 + 0x00000108 + 0x03030407 + 0x0000010c + 0x00202006 + 0x00000110 + 0x03020204 + 0x00000114 + 0x03030202 + 0x00000120 + 0x00000903 + 0x00000180 + 0x00800020 + 0x00000184 + 0x00000000 + 0x00000190 + 0x07010001 + 0x00000198 + 0x05001100 + 0x000001a0 + 0xc0400003 + 0x00000240 + 0x06000604 + 0x00000244 + 0x00000201 + 0x00000250 + 0x00000f00 + 0x00000490 + 0x00000001 + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + + 0x00000004 + 0x0000000a + 0x00000028 + 0x00000006 + 0x0000002c + 0x00000000 + 0x00000030 + 0x00000005 + 0xffffffff + 0xffffffff + + 0x77 + 0x88 + 0x79 + 0x79 + 0x87 + 0x97 + 0x87 + 0x78 + 0x77 + 0x78 + 0x87 + 0x88 + 0x87 + 0x87 + 0x77 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + >; +}; diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi new file mode 100644 index 0000000000..cc0011cf7b --- /dev/null +++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi @@ -0,0 +1,215 @@ +/* + * (C) 2017 Theobroma Systems Design und Consulting GmbH + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&dmc { + rockchip,sdram-params = < + 0x1 + 0xC + 0x3 + 0x1 + 0x0 + 0x0 + 0x10 + 0x10 + 0 + + 0x98899459 + 0x00000000 + 0x0000002e + 0x00000544 + 0x00000015 + 0x00000432 + 0x000000ff + + 800 + 6 + 1 + + 0x00000000 + 0x43041008 + 0x00000064 + 0x00300054 + 0x000000d0 + 0x00500002 + 0x000000d4 + 0x00010000 + 0x000000d8 + 0x00000e03 + 0x000000dc + 0x0043001a + 0x000000e0 + 0x00010000 + 0x000000e4 + 0x000e0005 + 0x000000f4 + 0x000f011f + 0x00000100 + 0x0b141b11 + 0x00000104 + 0x0003031a + 0x00000108 + 0x03060809 + 0x0000010c + 0x00606000 + 0x00000110 + 0x08020409 + 0x00000114 + 0x01010606 + 0x00000118 + 0x02020004 + 0x00000120 + 0x00000404 + 0x00000138 + 0x00000058 + 0x00000180 + 0x00900024 + 0x00000184 + 0x01400000 + 0x00000190 + 0x07050002 + 0x00000198 + 0x05001100 + 0x000001a0 + 0xc0400003 + 0x00000240 + 0x0a020b28 + 0x00000244 + 0x00000101 + 0x00000250 + 0x00000f00 + 0x00000490 + 0x00000001 + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + + 0x00000004 + 0x0000000b + 0x00000028 + 0x0000000c + 0x0000002c + 0x00000000 + 0x00000030 + 0x00000006 + 0xffffffff + 0xffffffff + + 0x77 + 0x88 + 0x79 + 0x79 + 0x87 + 0x97 + 0x87 + 0x78 + 0x77 + 0x78 + 0x87 + 0x88 + 0x87 + 0x87 + 0x77 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + >; +}; diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi new file mode 100644 index 0000000000..62d809e833 --- /dev/null +++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi @@ -0,0 +1,215 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&dmc { + rockchip,sdram-params = < + 0x1 + 0xC + 0x3 + 0x1 + 0x0 + 0x0 + 0x10 + 0x10 + 0 + + 0x0c48a18a + 0x00000000 + 0x00000021 + 0x00000482 + 0x00000015 + 0x0000021a + 0x000000ff + + 333 + 6 + 0 + + 0x00000000 + 0xc3040008 + 0x00000064 + 0x00140023 + 0x000000d0 + 0x00220002 + 0x000000d4 + 0x00010000 + 0x000000d8 + 0x00000703 + 0x000000dc + 0x00830004 + 0x000000e0 + 0x00010000 + 0x000000e4 + 0x00070003 + 0x00000100 + 0x06090b07 + 0x00000104 + 0x0002020b + 0x00000108 + 0x02030506 + 0x0000010c + 0x00505000 + 0x00000110 + 0x03020204 + 0x00000114 + 0x01010303 + 0x00000118 + 0x02020003 + 0x00000120 + 0x00000303 + 0x00000138 + 0x00000025 + 0x00000180 + 0x003c000f + 0x00000184 + 0x00900000 + 0x00000190 + 0x07020000 + 0x00000198 + 0x05001100 + 0x000001a0 + 0xc0400003 + 0x00000240 + 0x0900090c + 0x00000244 + 0x00000101 + 0x00000250 + 0x00000f00 + 0x00000490 + 0x00000001 + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + + 0x00000004 + 0x0000000b + 0x00000028 + 0x00000006 + 0x0000002c + 0x00000000 + 0x00000030 + 0x00000003 + 0xffffffff + 0xffffffff + + 0x77 + 0x88 + 0x79 + 0x79 + 0x87 + 0x97 + 0x87 + 0x78 + 0x77 + 0x78 + 0x87 + 0x88 + 0x87 + 0x87 + 0x77 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + >; +}; diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index 2d80addbb0..a080ae8d69 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -351,10 +351,15 @@ status = "disabled"; }; - dmc: dmc at ff400000 { + dmc: dmc { u-boot,dm-pre-reloc; - compatible = "rockchip,rk3328-dmc", "syscon"; - reg = <0x0 0xff400000 0x0 0x1000>; + compatible = "rockchip,rk3328-dmc"; + reg = <0x0 0xff400000 0x0 0x1000 + 0x0 0xff780000 0x0 0x3000 + 0x0 0xff100000 0x0 0x1000 + 0x0 0xff440000 0x0 0x1000 + 0x0 0xff720000 0x0 0x1000 + 0x0 0xff798000 0x0 0x1000>; }; cru: clock-controller at ff440000 { -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 2/7] rockchip: dts: rk3328: update dmc node for driver 2019-07-31 16:01 ` [U-Boot] [PATCH 2/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov @ 2019-08-01 2:38 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-01 2:38 UTC (permalink / raw) To: u-boot Hi Matwey, On 2019/8/1 上午12:01, Matwey V. Kornilov wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > Update dmc node for full feature driver. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/1e1495636574c78ea9d3af3e0aae95d5204612d6 with minor modifications] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > --- > arch/arm/dts/rk3328-evb.dts | 1 + > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + > arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ > arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++++++++++++++++++++++++++ > arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ > arch/arm/dts/rk3328.dtsi | 11 +- > 6 files changed, 656 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > > diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts > index ec594a8452..3b01dd0a87 100644 > --- a/arch/arm/dts/rk3328-evb.dts > +++ b/arch/arm/dts/rk3328-evb.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "rk3328.dtsi" > +#include "rk3328-sdram-ddr3-666.dtsi" Please Add a "rk3328-evb-u-boot.dtsi" for evb and move all these dts update including in next patch into the -u-boot.dtsi file. Thanks, - Kever > > / { > model = "Rockchip RK3328 EVB"; > diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > index b077436cbc..a01f758e9f 100644 > --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > @@ -4,6 +4,8 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > +#include "rk3328-sdram-lpddr3-1600.dtsi" > + > / { > aliases { > mmc0 = &emmc; > diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > new file mode 100644 > index 0000000000..d99e7e0352 > --- /dev/null > +++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > @@ -0,0 +1,215 @@ > +/* > + * (C) Copyright 2017 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +&dmc { > + rockchip,sdram-params = < > + 0x1 > + 0xC > + 0x3 > + 0x1 > + 0x0 > + 0x0 > + 0x10 > + 0x10 > + 0 > + > + 0x9028b189 > + 0x00000000 > + 0x00000021 > + 0x00000482 > + 0x00000015 > + 0x00000222 > + 0x000000ff > + > + 333 > + 3 > + 0 > + > + 0x00000000 > + 0x43041001 > + 0x00000064 > + 0x0028003b > + 0x000000d0 > + 0x00020053 > + 0x000000d4 > + 0x00020000 > + 0x000000d8 > + 0x00000100 > + 0x000000dc > + 0x03200000 > + 0x000000e0 > + 0x00000000 > + 0x000000e4 > + 0x00090000 > + 0x000000f4 > + 0x000f011f > + 0x00000100 > + 0x07090b06 > + 0x00000104 > + 0x00050209 > + 0x00000108 > + 0x03030407 > + 0x0000010c > + 0x00202006 > + 0x00000110 > + 0x03020204 > + 0x00000114 > + 0x03030202 > + 0x00000120 > + 0x00000903 > + 0x00000180 > + 0x00800020 > + 0x00000184 > + 0x00000000 > + 0x00000190 > + 0x07010001 > + 0x00000198 > + 0x05001100 > + 0x000001a0 > + 0xc0400003 > + 0x00000240 > + 0x06000604 > + 0x00000244 > + 0x00000201 > + 0x00000250 > + 0x00000f00 > + 0x00000490 > + 0x00000001 > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + > + 0x00000004 > + 0x0000000a > + 0x00000028 > + 0x00000006 > + 0x0000002c > + 0x00000000 > + 0x00000030 > + 0x00000005 > + 0xffffffff > + 0xffffffff > + > + 0x77 > + 0x88 > + 0x79 > + 0x79 > + 0x87 > + 0x97 > + 0x87 > + 0x78 > + 0x77 > + 0x78 > + 0x87 > + 0x88 > + 0x87 > + 0x87 > + 0x77 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + >; > +}; > diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > new file mode 100644 > index 0000000000..cc0011cf7b > --- /dev/null > +++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > @@ -0,0 +1,215 @@ > +/* > + * (C) 2017 Theobroma Systems Design und Consulting GmbH > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +&dmc { > + rockchip,sdram-params = < > + 0x1 > + 0xC > + 0x3 > + 0x1 > + 0x0 > + 0x0 > + 0x10 > + 0x10 > + 0 > + > + 0x98899459 > + 0x00000000 > + 0x0000002e > + 0x00000544 > + 0x00000015 > + 0x00000432 > + 0x000000ff > + > + 800 > + 6 > + 1 > + > + 0x00000000 > + 0x43041008 > + 0x00000064 > + 0x00300054 > + 0x000000d0 > + 0x00500002 > + 0x000000d4 > + 0x00010000 > + 0x000000d8 > + 0x00000e03 > + 0x000000dc > + 0x0043001a > + 0x000000e0 > + 0x00010000 > + 0x000000e4 > + 0x000e0005 > + 0x000000f4 > + 0x000f011f > + 0x00000100 > + 0x0b141b11 > + 0x00000104 > + 0x0003031a > + 0x00000108 > + 0x03060809 > + 0x0000010c > + 0x00606000 > + 0x00000110 > + 0x08020409 > + 0x00000114 > + 0x01010606 > + 0x00000118 > + 0x02020004 > + 0x00000120 > + 0x00000404 > + 0x00000138 > + 0x00000058 > + 0x00000180 > + 0x00900024 > + 0x00000184 > + 0x01400000 > + 0x00000190 > + 0x07050002 > + 0x00000198 > + 0x05001100 > + 0x000001a0 > + 0xc0400003 > + 0x00000240 > + 0x0a020b28 > + 0x00000244 > + 0x00000101 > + 0x00000250 > + 0x00000f00 > + 0x00000490 > + 0x00000001 > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + > + 0x00000004 > + 0x0000000b > + 0x00000028 > + 0x0000000c > + 0x0000002c > + 0x00000000 > + 0x00000030 > + 0x00000006 > + 0xffffffff > + 0xffffffff > + > + 0x77 > + 0x88 > + 0x79 > + 0x79 > + 0x87 > + 0x97 > + 0x87 > + 0x78 > + 0x77 > + 0x78 > + 0x87 > + 0x88 > + 0x87 > + 0x87 > + 0x77 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + >; > +}; > diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > new file mode 100644 > index 0000000000..62d809e833 > --- /dev/null > +++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > @@ -0,0 +1,215 @@ > +/* > + * (C) Copyright 2017 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +&dmc { > + rockchip,sdram-params = < > + 0x1 > + 0xC > + 0x3 > + 0x1 > + 0x0 > + 0x0 > + 0x10 > + 0x10 > + 0 > + > + 0x0c48a18a > + 0x00000000 > + 0x00000021 > + 0x00000482 > + 0x00000015 > + 0x0000021a > + 0x000000ff > + > + 333 > + 6 > + 0 > + > + 0x00000000 > + 0xc3040008 > + 0x00000064 > + 0x00140023 > + 0x000000d0 > + 0x00220002 > + 0x000000d4 > + 0x00010000 > + 0x000000d8 > + 0x00000703 > + 0x000000dc > + 0x00830004 > + 0x000000e0 > + 0x00010000 > + 0x000000e4 > + 0x00070003 > + 0x00000100 > + 0x06090b07 > + 0x00000104 > + 0x0002020b > + 0x00000108 > + 0x02030506 > + 0x0000010c > + 0x00505000 > + 0x00000110 > + 0x03020204 > + 0x00000114 > + 0x01010303 > + 0x00000118 > + 0x02020003 > + 0x00000120 > + 0x00000303 > + 0x00000138 > + 0x00000025 > + 0x00000180 > + 0x003c000f > + 0x00000184 > + 0x00900000 > + 0x00000190 > + 0x07020000 > + 0x00000198 > + 0x05001100 > + 0x000001a0 > + 0xc0400003 > + 0x00000240 > + 0x0900090c > + 0x00000244 > + 0x00000101 > + 0x00000250 > + 0x00000f00 > + 0x00000490 > + 0x00000001 > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + > + 0x00000004 > + 0x0000000b > + 0x00000028 > + 0x00000006 > + 0x0000002c > + 0x00000000 > + 0x00000030 > + 0x00000003 > + 0xffffffff > + 0xffffffff > + > + 0x77 > + 0x88 > + 0x79 > + 0x79 > + 0x87 > + 0x97 > + 0x87 > + 0x78 > + 0x77 > + 0x78 > + 0x87 > + 0x88 > + 0x87 > + 0x87 > + 0x77 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + >; > +}; > diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi > index 2d80addbb0..a080ae8d69 100644 > --- a/arch/arm/dts/rk3328.dtsi > +++ b/arch/arm/dts/rk3328.dtsi > @@ -351,10 +351,15 @@ > status = "disabled"; > }; > > - dmc: dmc at ff400000 { > + dmc: dmc { > u-boot,dm-pre-reloc; > - compatible = "rockchip,rk3328-dmc", "syscon"; > - reg = <0x0 0xff400000 0x0 0x1000>; > + compatible = "rockchip,rk3328-dmc"; > + reg = <0x0 0xff400000 0x0 0x1000 > + 0x0 0xff780000 0x0 0x3000 > + 0x0 0xff100000 0x0 0x1000 > + 0x0 0xff440000 0x0 0x1000 > + 0x0 0xff720000 0x0 0x1000 > + 0x0 0xff798000 0x0 0x1000>; > }; > > cru: clock-controller at ff440000 { ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 3/7] rockchip: dts: rk3328: enable the drivers need by TPL/SPL 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 1/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 2/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov @ 2019-07-31 16:01 ` Matwey V. Kornilov 2019-08-01 2:39 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov ` (4 subsequent siblings) 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> Enable the drivers need by TPL/SPL with 'u-boot,dm-pre-reloc'. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/664225d1610d77ef64ed9a4f42d36474362592cc] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/dts/rk3328-evb.dts | 2 ++ arch/arm/dts/rk3328.dtsi | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts index 3b01dd0a87..fa8b1b18da 100644 --- a/arch/arm/dts/rk3328-evb.dts +++ b/arch/arm/dts/rk3328-evb.dts @@ -61,6 +61,7 @@ }; &uart2 { + u-boot,dm-pre-reloc; status = "okay"; }; @@ -77,6 +78,7 @@ }; &emmc { + u-boot,dm-pre-reloc; bus-width = <8>; cap-mmc-highspeed; supports-emmc; diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index a080ae8d69..4ec5d3e1f3 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -363,6 +363,7 @@ }; cru: clock-controller at ff440000 { + u-boot,dm-pre-reloc; compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon"; reg = <0x0 0xff440000 0x0 0x1000>; rockchip,grf = <&grf>; -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 3/7] rockchip: dts: rk3328: enable the drivers need by TPL/SPL 2019-07-31 16:01 ` [U-Boot] [PATCH 3/7] rockchip: dts: rk3328: enable the drivers need by TPL/SPL Matwey V. Kornilov @ 2019-08-01 2:39 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-01 2:39 UTC (permalink / raw) To: u-boot Matwey, On 2019/8/1 上午12:01, Matwey V. Kornilov wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > Enable the drivers need by TPL/SPL with 'u-boot,dm-pre-reloc'. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/664225d1610d77ef64ed9a4f42d36474362592cc] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > --- > arch/arm/dts/rk3328-evb.dts | 2 ++ > arch/arm/dts/rk3328.dtsi | 1 + All these updates should go to -u-boot.dtsi. Thanks, - Kever > 2 files changed, 3 insertions(+) > > diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts > index 3b01dd0a87..fa8b1b18da 100644 > --- a/arch/arm/dts/rk3328-evb.dts > +++ b/arch/arm/dts/rk3328-evb.dts > @@ -61,6 +61,7 @@ > }; > > &uart2 { > + u-boot,dm-pre-reloc; > status = "okay"; > }; > > @@ -77,6 +78,7 @@ > }; > > &emmc { > + u-boot,dm-pre-reloc; > bus-width = <8>; > cap-mmc-highspeed; > supports-emmc; > diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi > index a080ae8d69..4ec5d3e1f3 100644 > --- a/arch/arm/dts/rk3328.dtsi > +++ b/arch/arm/dts/rk3328.dtsi > @@ -363,6 +363,7 @@ > }; > > cru: clock-controller at ff440000 { > + u-boot,dm-pre-reloc; > compatible = "rockchip,rk3328-cru", "rockchip,cru", "syscon"; > reg = <0x0 0xff440000 0x0 0x1000>; > rockchip,grf = <&grf>; ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 4/7] rockchip: Kconfig: enable TPL support for rk3328 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov ` (2 preceding siblings ...) 2019-07-31 16:01 ` [U-Boot] [PATCH 3/7] rockchip: dts: rk3328: enable the drivers need by TPL/SPL Matwey V. Kornilov @ 2019-07-31 16:01 ` Matwey V. Kornilov 2019-08-01 2:40 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov ` (3 subsequent siblings) 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> Enable TPL support and some related option in Kconfig. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/430b01462bf3f24aaf7920ae2587a6943c39ab5d with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/mach-rockchip/Kconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index e337d06b99..22cbb3a9a4 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -110,9 +110,14 @@ config ROCKCHIP_RK3328 select ARM64 select SUPPORT_SPL select SPL + select SUPPORT_TPL + select TPL + select TPL_NEEDS_SEPARATE_TEXT_BASE if TPL + select TPL_NEEDS_SEPARATE_STACK if TPL imply ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD imply SPL_SERIAL_SUPPORT + imply TPL_SERIAL_SUPPORT imply SPL_SEPARATE_BSS select ENABLE_ARM_SOC_BOOT0_HOOK select DEBUG_UART_BOARD_INIT @@ -124,6 +129,22 @@ config ROCKCHIP_RK3328 and video codec support. Peripherals include Gigabit Ethernet, USB2 host and OTG, SDIO, I2S, UARTs, SPI, I2C and PWMs. +if ROCKCHIP_RK3328 + +config TPL_LDSCRIPT + default "arch/arm/mach-rockchip/u-boot-tpl-v8.lds" + +config TPL_TEXT_BASE + default 0xff091000 + +config TPL_MAX_SIZE + default 28672 + +config TPL_STACK + default 0xff098000 + +endif + config ROCKCHIP_RK3368 bool "Support Rockchip RK3368" select ARM64 -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 4/7] rockchip: Kconfig: enable TPL support for rk3328 2019-07-31 16:01 ` [U-Boot] [PATCH 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov @ 2019-08-01 2:40 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-01 2:40 UTC (permalink / raw) To: u-boot On 2019/8/1 上午12:01, Matwey V. Kornilov wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > Enable TPL support and some related option in Kconfig. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/430b01462bf3f24aaf7920ae2587a6943c39ab5d with minor modifications] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > --- > arch/arm/mach-rockchip/Kconfig | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > index e337d06b99..22cbb3a9a4 100644 > --- a/arch/arm/mach-rockchip/Kconfig > +++ b/arch/arm/mach-rockchip/Kconfig > @@ -110,9 +110,14 @@ config ROCKCHIP_RK3328 > select ARM64 > select SUPPORT_SPL > select SPL > + select SUPPORT_TPL > + select TPL > + select TPL_NEEDS_SEPARATE_TEXT_BASE if TPL > + select TPL_NEEDS_SEPARATE_STACK if TPL > imply ROCKCHIP_COMMON_BOARD > imply SPL_ROCKCHIP_COMMON_BOARD > imply SPL_SERIAL_SUPPORT > + imply TPL_SERIAL_SUPPORT > imply SPL_SEPARATE_BSS > select ENABLE_ARM_SOC_BOOT0_HOOK > select DEBUG_UART_BOARD_INIT > @@ -124,6 +129,22 @@ config ROCKCHIP_RK3328 > and video codec support. Peripherals include Gigabit Ethernet, > USB2 host and OTG, SDIO, I2S, UARTs, SPI, I2C and PWMs. > > +if ROCKCHIP_RK3328 > + > +config TPL_LDSCRIPT > + default "arch/arm/mach-rockchip/u-boot-tpl-v8.lds" > + > +config TPL_TEXT_BASE > + default 0xff091000 > + > +config TPL_MAX_SIZE > + default 28672 > + > +config TPL_STACK > + default 0xff098000 > + > +endif > + These option for RK3328 should go to arch/arm/mach-rockchip/rk3328/Kconfig Thanks, - Kever > config ROCKCHIP_RK3368 > bool "Support Rockchip RK3368" > select ARM64 ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov ` (3 preceding siblings ...) 2019-07-31 16:01 ` [U-Boot] [PATCH 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov @ 2019-07-31 16:01 ` Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov ` (2 subsequent siblings) 7 siblings, 0 replies; 34+ messages in thread From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> Enable driver options for TPL/SPL in evb-rk3328_defconfig. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/df4f40acb449815384e397dcaf5b618bbc6cd855 with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- configs/evb-rk3328_defconfig | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index fcc04f27ec..12be1dedc6 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -1,5 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_TPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ROCKCHIP_RK3328=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y @@ -9,31 +15,50 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_TPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_ATF_SUPPORT=y +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_TPL_BOOTROM_SUPPORT=y +CONFIG_TPL_DRIVERS_MISC_SUPPORT=y +CONFIG_TPL_SERIAL_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_TPL_SERIAL_PRESENT=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x40000 +CONFIG_SPL_STACK_R_ADDR=0x600000 +CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y -CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_TPL_DM=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y +CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y +CONFIG_TPL_OF_PLATDATA=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y @@ -44,6 +69,7 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y @@ -51,9 +77,14 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y @@ -69,4 +100,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USE_TINY_PRINTF=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov ` (4 preceding siblings ...) 2019-07-31 16:01 ` [U-Boot] [PATCH 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov @ 2019-07-31 16:01 ` Matwey V. Kornilov 2019-08-01 2:42 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions Matwey V. Kornilov 2019-08-01 2:36 ` [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Kever Yang 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw) To: u-boot Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- configs/rock64-rk3328_defconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index ef453e72c1..6484845fb6 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -34,15 +34,20 @@ CONFIG_CMD_USB=y CONFIG_CMD_TIME=y CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64" CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_TPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y +CONFIG_TPL_CLK=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y @@ -65,6 +70,7 @@ CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y CONFIG_DM_RESET=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 @@ -85,4 +91,12 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_TPL_DM=y +CONFIG_TPL_LIBCOMMON_SUPPORT=y +CONFIG_TPL_LIBGENERIC_SUPPORT=y +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_TPL_BOOTROM_SUPPORT=y +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 +CONFIG_TPL_SYS_MALLOC_SIMPLE=y -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig 2019-07-31 16:01 ` [U-Boot] [PATCH 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov @ 2019-08-01 2:42 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-01 2:42 UTC (permalink / raw) To: u-boot On 2019/8/1 上午12:01, Matwey V. Kornilov wrote: > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> The commit message is not allowed to be empty, please say something here. Thanks, - Kever > --- > configs/rock64-rk3328_defconfig | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > index ef453e72c1..6484845fb6 100644 > --- a/configs/rock64-rk3328_defconfig > +++ b/configs/rock64-rk3328_defconfig > @@ -34,15 +34,20 @@ CONFIG_CMD_USB=y > CONFIG_CMD_TIME=y > CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64" > CONFIG_SPL_OF_CONTROL=y > +CONFIG_TPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_TPL_OF_PLATDATA=y > CONFIG_ENV_IS_IN_MMC=y > CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_REGMAP=y > CONFIG_SPL_REGMAP=y > +CONFIG_TPL_REGMAP=y > CONFIG_SYSCON=y > CONFIG_SPL_SYSCON=y > +CONFIG_TPL_SYSCON=y > CONFIG_CLK=y > CONFIG_SPL_CLK=y > +CONFIG_TPL_CLK=y > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > @@ -65,6 +70,7 @@ CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM=y > CONFIG_SPL_RAM=y > +CONFIG_TPL_RAM=y > CONFIG_DM_RESET=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > @@ -85,4 +91,12 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x330a > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USE_TINY_PRINTF=y > CONFIG_SPL_TINY_MEMSET=y > +CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > +CONFIG_TPL_DM=y > +CONFIG_TPL_LIBCOMMON_SUPPORT=y > +CONFIG_TPL_LIBGENERIC_SUPPORT=y > +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y > +CONFIG_TPL_BOOTROM_SUPPORT=y > +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 > +CONFIG_TPL_SYS_MALLOC_SIMPLE=y ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov ` (5 preceding siblings ...) 2019-07-31 16:01 ` [U-Boot] [PATCH 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov @ 2019-07-31 16:01 ` Matwey V. Kornilov 2019-08-01 2:42 ` Kever Yang 2019-08-01 2:36 ` [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Kever Yang 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-07-31 16:01 UTC (permalink / raw) To: u-boot Now we have our own TPL implementation. Remove obsolete notes. Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- doc/README.rockchip | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/README.rockchip b/doc/README.rockchip index 8ccbb87264..7d4dc1b33b 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -309,17 +309,11 @@ Booting from an SD card on Pine64 Rock64 (RK3328) ================================================= For Rock64 rk3328 board the following three parts are required: -TPL, SPL, and the u-boot image tree blob. While u-boot-spl.bin and -u-boot.itb are to be compiled as usual, TPL is currently not -implemented in u-boot, so you need to pick one from rkbin: - - - Get the rkbin - - => git clone https://github.com/rockchip-linux/rkbin.git +TPL, SPL, and the u-boot image tree blob. - Create TPL/SPL image - => tools/mkimage -n rk3328 -T rksd -d rkbin/bin/rk33/rk3328_ddr_333MHz_v1.16.bin idbloader.img + => tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin idbloader.img => cat spl/u-boot-spl.bin >> idbloader.img - Write TPL/SPL image at 64 sector -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions 2019-07-31 16:01 ` [U-Boot] [PATCH 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions Matwey V. Kornilov @ 2019-08-01 2:42 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-01 2:42 UTC (permalink / raw) To: u-boot On 2019/8/1 上午12:01, Matwey V. Kornilov wrote: > Now we have our own TPL implementation. Remove obsolete notes. > > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > doc/README.rockchip | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/doc/README.rockchip b/doc/README.rockchip > index 8ccbb87264..7d4dc1b33b 100644 > --- a/doc/README.rockchip > +++ b/doc/README.rockchip > @@ -309,17 +309,11 @@ Booting from an SD card on Pine64 Rock64 (RK3328) > ================================================= > > For Rock64 rk3328 board the following three parts are required: > -TPL, SPL, and the u-boot image tree blob. While u-boot-spl.bin and > -u-boot.itb are to be compiled as usual, TPL is currently not > -implemented in u-boot, so you need to pick one from rkbin: > - > - - Get the rkbin > - > - => git clone https://github.com/rockchip-linux/rkbin.git > +TPL, SPL, and the u-boot image tree blob. > > - Create TPL/SPL image > > - => tools/mkimage -n rk3328 -T rksd -d rkbin/bin/rk33/rk3328_ddr_333MHz_v1.16.bin idbloader.img > + => tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin idbloader.img > => cat spl/u-boot-spl.bin >> idbloader.img > > - Write TPL/SPL image at 64 sector ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board. 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov ` (6 preceding siblings ...) 2019-07-31 16:01 ` [U-Boot] [PATCH 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions Matwey V. Kornilov @ 2019-08-01 2:36 ` Kever Yang 2019-08-02 7:09 ` Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov 7 siblings, 2 replies; 34+ messages in thread From: Kever Yang @ 2019-08-01 2:36 UTC (permalink / raw) To: u-boot Hi Matwey, I was plan to send TPL support for RK3328 some time later, I'm so glad you help to make it done. Thanks, - Kever On 2019/8/1 上午12:01, Matwey V. Kornilov wrote: > This series adds initial TPL support for Pine64 Rock64 board. > > The ROCK64 is a credit card size SBC based on Rockchip RK3328 Quad-Core ARM Cortex A53. > > The series has been tested with ATF v2.1. > > Some patches in the series are taken from https://github.com/rockchip-linux/u-boot > Credits are given in each patch separately. > > Kever Yang (5): > rockchip: ram: add full feature rk3328 DRAM driver > rockchip: dts: rk3328: update dmc node for driver > rockchip: dts: rk3328: enable the drivers need by TPL/SPL > rockchip: Kconfig: enable TPL support for rk3328 > rockchip: evb-rk3328: enable defconfig options for TPL/SPL > > Matwey V. Kornilov (2): > configs: rk3328: enable TPL for rock64-rk3328_defconfig > doc: rockchip: Adapt Pine64 Rock64 board instructions > > arch/arm/dts/rk3328-evb.dts | 3 + > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + > arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++ > arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++ > arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++ > arch/arm/dts/rk3328.dtsi | 12 +- > arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ > arch/arm/mach-rockchip/Kconfig | 21 + > configs/evb-rk3328_defconfig | 37 +- > configs/rock64-rk3328_defconfig | 14 + > doc/README.rockchip | 10 +- > drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- > 12 files changed, 2187 insertions(+), 16 deletions(-) > create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board. 2019-08-01 2:36 ` [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Kever Yang @ 2019-08-02 7:09 ` Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov 1 sibling, 0 replies; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:09 UTC (permalink / raw) To: u-boot чт, 1 авг. 2019 г. в 05:37, Kever Yang <kever.yang@rock-chips.com>: > > Hi Matwey, > > I was plan to send TPL support for RK3328 some time later, I'm so > glad you help to make it done. You are welcome! > > > Thanks, > > - Kever > > On 2019/8/1 上午12:01, Matwey V. Kornilov wrote: > > This series adds initial TPL support for Pine64 Rock64 board. > > > > The ROCK64 is a credit card size SBC based on Rockchip RK3328 Quad-Core ARM Cortex A53. > > > > The series has been tested with ATF v2.1. > > > > Some patches in the series are taken from https://github.com/rockchip-linux/u-boot > > Credits are given in each patch separately. > > > > Kever Yang (5): > > rockchip: ram: add full feature rk3328 DRAM driver > > rockchip: dts: rk3328: update dmc node for driver > > rockchip: dts: rk3328: enable the drivers need by TPL/SPL > > rockchip: Kconfig: enable TPL support for rk3328 > > rockchip: evb-rk3328: enable defconfig options for TPL/SPL > > > > Matwey V. Kornilov (2): > > configs: rk3328: enable TPL for rock64-rk3328_defconfig > > doc: rockchip: Adapt Pine64 Rock64 board instructions > > > > arch/arm/dts/rk3328-evb.dts | 3 + > > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + > > arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++ > > arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++ > > arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++ > > arch/arm/dts/rk3328.dtsi | 12 +- > > arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ > > arch/arm/mach-rockchip/Kconfig | 21 + > > configs/evb-rk3328_defconfig | 37 +- > > configs/rock64-rk3328_defconfig | 14 + > > doc/README.rockchip | 10 +- > > drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- > > 12 files changed, 2187 insertions(+), 16 deletions(-) > > create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > > create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > > > > -- With best regards, Matwey V. Kornilov ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board. 2019-08-01 2:36 ` [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Kever Yang 2019-08-02 7:09 ` Matwey V. Kornilov @ 2019-08-02 7:39 ` Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 1/7] rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi Matwey V. Kornilov ` (7 more replies) 1 sibling, 8 replies; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:39 UTC (permalink / raw) To: u-boot This series adds initial TPL support for Pine64 Rock64 board. The ROCK64 is a credit card size SBC based on Rockchip RK3328 Quad-Core ARM Cortex A53. The series has been tested with ATF v2.1. Some patches in the series are taken from https://github.com/rockchip-linux/u-boot Credits are given in each patch separately. Changes since v1: - Added commit message in patch 6 - Split config to rk3328/Kconfig in patch 4 - Introduced rk3328-evb-u-boot.dtsi to collect u-boot specific dts configs Kever Yang (4): rockchip: ram: add full feature rk3328 DRAM driver rockchip: dts: rk3328: update dmc node for driver rockchip: Kconfig: enable TPL support for rk3328 rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov (3): rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi configs: rk3328: enable TPL for rock64-rk3328_defconfig doc: rockchip: Adapt Pine64 Rock64 board instructions arch/arm/dts/rk3328-evb-u-boot.dtsi | 33 + arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++ arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++ arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++ arch/arm/dts/rk3328.dtsi | 11 +- arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ arch/arm/mach-rockchip/Kconfig | 5 + arch/arm/mach-rockchip/rk3328/Kconfig | 12 + configs/evb-rk3328_defconfig | 37 +- configs/rock64-rk3328_defconfig | 14 + doc/README.rockchip | 10 +- drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- 13 files changed, 2212 insertions(+), 16 deletions(-) create mode 100644 arch/arm/dts/rk3328-evb-u-boot.dtsi create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h -- 2.16.4 ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 1/7] rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov @ 2019-08-02 7:39 ` Matwey V. Kornilov 2019-08-05 13:01 ` Kever Yang 2019-08-02 7:39 ` [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov ` (6 subsequent siblings) 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:39 UTC (permalink / raw) To: u-boot Split u-boot specific dts configuration to separate rk3328-evb-u-boot.dtsi Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/dts/rk3328-evb-u-boot.dtsi | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 arch/arm/dts/rk3328-evb-u-boot.dtsi diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi new file mode 100644 index 0000000000..22bfaef72a --- /dev/null +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + */ + +/ { + aliases { + mmc0 = &emmc; + mmc1 = &sdmmc; + }; + + chosen { + u-boot,spl-boot-order = &emmc, &sdmmc; + }; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&uart2 { + u-boot,dm-pre-reloc; +}; + +&emmc { + u-boot,dm-pre-reloc; +}; + +&sdmmc { + u-boot,dm-pre-reloc; +}; -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 1/7] rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi 2019-08-02 7:39 ` [U-Boot] [PATCH v2 1/7] rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi Matwey V. Kornilov @ 2019-08-05 13:01 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-05 13:01 UTC (permalink / raw) To: u-boot On 2019/8/2 下午3:39, Matwey V. Kornilov wrote: > Split u-boot specific dts configuration to separate > rk3328-evb-u-boot.dtsi > > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3328-evb-u-boot.dtsi | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > create mode 100644 arch/arm/dts/rk3328-evb-u-boot.dtsi > > diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi > new file mode 100644 > index 0000000000..22bfaef72a > --- /dev/null > +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi > @@ -0,0 +1,31 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * (C) Copyright 2016 Rockchip Electronics Co., Ltd > + */ > + > +/ { > + aliases { > + mmc0 = &emmc; > + mmc1 = &sdmmc; > + }; > + > + chosen { > + u-boot,spl-boot-order = &emmc, &sdmmc; > + }; > +}; > + > +&cru { > + u-boot,dm-pre-reloc; > +}; > + > +&uart2 { > + u-boot,dm-pre-reloc; > +}; > + > +&emmc { > + u-boot,dm-pre-reloc; > +}; > + > +&sdmmc { > + u-boot,dm-pre-reloc; > +}; ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 1/7] rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi Matwey V. Kornilov @ 2019-08-02 7:39 ` Matwey V. Kornilov 2019-08-05 13:02 ` Kever Yang 2019-08-05 13:04 ` Philipp Tomsich 2019-08-02 7:40 ` [U-Boot] [PATCH v2 3/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov ` (5 subsequent siblings) 7 siblings, 2 replies; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:39 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> This driver supports DDR3/LPDDR3/DDR4 SDRAM initialization. Signed-off-by: YouMin Chen <cym@rock-chips.com> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/9fb0777ec3cc6a89af9d2e0969c3bfe58306a88d with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- 2 files changed, 1456 insertions(+), 3 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h new file mode 100644 index 0000000000..11411ead10 --- /dev/null +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h @@ -0,0 +1,441 @@ +/* + * Copyright (C) 2016-2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _ASM_ARCH_SDRAM_RK3328_H +#define _ASM_ARCH_SDRAM_RK3328_H + +#define SR_IDLE 93 +#define PD_IDLE 13 +#define SDRAM_ADDR 0x00000000 +#define PATTERN (0x5aa5f00f) + +/* ddr pctl registers define */ +#define DDR_PCTL2_MSTR 0x0 +#define DDR_PCTL2_STAT 0x4 +#define DDR_PCTL2_MSTR1 0x8 +#define DDR_PCTL2_MRCTRL0 0x10 +#define DDR_PCTL2_MRCTRL1 0x14 +#define DDR_PCTL2_MRSTAT 0x18 +#define DDR_PCTL2_MRCTRL2 0x1c +#define DDR_PCTL2_DERATEEN 0x20 +#define DDR_PCTL2_DERATEINT 0x24 +#define DDR_PCTL2_PWRCTL 0x30 +#define DDR_PCTL2_PWRTMG 0x34 +#define DDR_PCTL2_HWLPCTL 0x38 +#define DDR_PCTL2_RFSHCTL0 0x50 +#define DDR_PCTL2_RFSHCTL1 0x54 +#define DDR_PCTL2_RFSHCTL2 0x58 +#define DDR_PCTL2_RFSHCTL4 0x5c +#define DDR_PCTL2_RFSHCTL3 0x60 +#define DDR_PCTL2_RFSHTMG 0x64 +#define DDR_PCTL2_RFSHTMG1 0x68 +#define DDR_PCTL2_RFSHCTL5 0x6c +#define DDR_PCTL2_INIT0 0xd0 +#define DDR_PCTL2_INIT1 0xd4 +#define DDR_PCTL2_INIT2 0xd8 +#define DDR_PCTL2_INIT3 0xdc +#define DDR_PCTL2_INIT4 0xe0 +#define DDR_PCTL2_INIT5 0xe4 +#define DDR_PCTL2_INIT6 0xe8 +#define DDR_PCTL2_INIT7 0xec +#define DDR_PCTL2_DIMMCTL 0xf0 +#define DDR_PCTL2_RANKCTL 0xf4 +#define DDR_PCTL2_CHCTL 0xfc +#define DDR_PCTL2_DRAMTMG0 0x100 +#define DDR_PCTL2_DRAMTMG1 0x104 +#define DDR_PCTL2_DRAMTMG2 0x108 +#define DDR_PCTL2_DRAMTMG3 0x10c +#define DDR_PCTL2_DRAMTMG4 0x110 +#define DDR_PCTL2_DRAMTMG5 0x114 +#define DDR_PCTL2_DRAMTMG6 0x118 +#define DDR_PCTL2_DRAMTMG7 0x11c +#define DDR_PCTL2_DRAMTMG8 0x120 +#define DDR_PCTL2_DRAMTMG9 0x124 +#define DDR_PCTL2_DRAMTMG10 0x128 +#define DDR_PCTL2_DRAMTMG11 0x12c +#define DDR_PCTL2_DRAMTMG12 0x130 +#define DDR_PCTL2_DRAMTMG13 0x134 +#define DDR_PCTL2_DRAMTMG14 0x138 +#define DDR_PCTL2_DRAMTMG15 0x13c +#define DDR_PCTL2_DRAMTMG16 0x140 +#define DDR_PCTL2_ZQCTL0 0x180 +#define DDR_PCTL2_ZQCTL1 0x184 +#define DDR_PCTL2_ZQCTL2 0x188 +#define DDR_PCTL2_ZQSTAT 0x18c +#define DDR_PCTL2_DFITMG0 0x190 +#define DDR_PCTL2_DFITMG1 0x194 +#define DDR_PCTL2_DFILPCFG0 0x198 +#define DDR_PCTL2_DFILPCFG1 0x19c +#define DDR_PCTL2_DFIUPD0 0x1a0 +#define DDR_PCTL2_DFIUPD1 0x1a4 +#define DDR_PCTL2_DFIUPD2 0x1a8 +#define DDR_PCTL2_DFIMISC 0x1b0 +#define DDR_PCTL2_DFITMG2 0x1b4 +#define DDR_PCTL2_DFITMG3 0x1b8 +#define DDR_PCTL2_DFISTAT 0x1bc +#define DDR_PCTL2_DBICTL 0x1c0 +#define DDR_PCTL2_ADDRMAP0 0x200 +#define DDR_PCTL2_ADDRMAP1 0x204 +#define DDR_PCTL2_ADDRMAP2 0x208 +#define DDR_PCTL2_ADDRMAP3 0x20c +#define DDR_PCTL2_ADDRMAP4 0x210 +#define DDR_PCTL2_ADDRMAP5 0x214 +#define DDR_PCTL2_ADDRMAP6 0x218 +#define DDR_PCTL2_ADDRMAP7 0x21c +#define DDR_PCTL2_ADDRMAP8 0x220 +#define DDR_PCTL2_ADDRMAP9 0x224 +#define DDR_PCTL2_ADDRMAP10 0x228 +#define DDR_PCTL2_ADDRMAP11 0x22c +#define DDR_PCTL2_ODTCFG 0x240 +#define DDR_PCTL2_ODTMAP 0x244 +#define DDR_PCTL2_SCHED 0x250 +#define DDR_PCTL2_SCHED1 0x254 +#define DDR_PCTL2_PERFHPR1 0x25c +#define DDR_PCTL2_PERFLPR1 0x264 +#define DDR_PCTL2_PERFWR1 0x26c +#define DDR_PCTL2_DQMAP0 0x280 +#define DDR_PCTL2_DQMAP1 0x284 +#define DDR_PCTL2_DQMAP2 0x288 +#define DDR_PCTL2_DQMAP3 0x28c +#define DDR_PCTL2_DQMAP4 0x290 +#define DDR_PCTL2_DQMAP5 0x294 +#define DDR_PCTL2_DBG0 0x300 +#define DDR_PCTL2_DBG1 0x304 +#define DDR_PCTL2_DBGCAM 0x308 +#define DDR_PCTL2_DBGCMD 0x30c +#define DDR_PCTL2_DBGSTAT 0x310 +#define DDR_PCTL2_SWCTL 0x320 +#define DDR_PCTL2_SWSTAT 0x324 +#define DDR_PCTL2_POISONCFG 0x36c +#define DDR_PCTL2_POISONSTAT 0x370 +#define DDR_PCTL2_ADVECCINDEX 0x374 +#define DDR_PCTL2_ADVECCSTAT 0x378 +#define DDR_PCTL2_PSTAT 0x3fc +#define DDR_PCTL2_PCCFG 0x400 +#define DDR_PCTL2_PCFGR_n 0x404 +#define DDR_PCTL2_PCFGW_n 0x408 +#define DDR_PCTL2_PCTRL_n 0x490 + +/* PCTL2_MRSTAT */ +#define MR_WR_BUSY BIT(0) + +/* PHY_REG0 */ +#define DIGITAL_DERESET BIT(3) +#define ANALOG_DERESET BIT(2) +#define DIGITAL_RESET (0 << 3) +#define ANALOG_RESET (0 << 2) + +/* PHY_REG1 */ +#define PHY_DDR2 (0) +#define PHY_LPDDR2 (1) +#define PHY_DDR3 (2) +#define PHY_LPDDR3 (3) +#define PHY_DDR4 (4) +#define PHY_BL_4 (0 << 2) +#define PHY_BL_8 BIT(2) + +/* PHY_REG2 */ +#define PHY_DTT_EN BIT(0) +#define PHY_DTT_DISB (0 << 0) +#define PHY_WRITE_LEVELING_EN BIT(2) +#define PHY_WRITE_LEVELING_DISB (0 << 2) +#define PHY_SELECT_CS0 (2) +#define PHY_SELECT_CS1 (1) +#define PHY_SELECT_CS0_1 (0) +#define PHY_WRITE_LEVELING_SELECTCS(n) (n << 6) +#define PHY_DATA_TRAINING_SELECTCS(n) (n << 4) + +#define PHY_DDR3_RON_RTT_DISABLE (0) +#define PHY_DDR3_RON_RTT_451ohm (1) +#define PHY_DDR3_RON_RTT_225ohm (2) +#define PHY_DDR3_RON_RTT_150ohm (3) +#define PHY_DDR3_RON_RTT_112ohm (4) +#define PHY_DDR3_RON_RTT_90ohm (5) +#define PHY_DDR3_RON_RTT_75ohm (6) +#define PHY_DDR3_RON_RTT_64ohm (7) +#define PHY_DDR3_RON_RTT_56ohm (16) +#define PHY_DDR3_RON_RTT_50ohm (17) +#define PHY_DDR3_RON_RTT_45ohm (18) +#define PHY_DDR3_RON_RTT_41ohm (19) +#define PHY_DDR3_RON_RTT_37ohm (20) +#define PHY_DDR3_RON_RTT_34ohm (21) +#define PHY_DDR3_RON_RTT_33ohm (22) +#define PHY_DDR3_RON_RTT_30ohm (23) +#define PHY_DDR3_RON_RTT_28ohm (24) +#define PHY_DDR3_RON_RTT_26ohm (25) +#define PHY_DDR3_RON_RTT_25ohm (26) +#define PHY_DDR3_RON_RTT_23ohm (27) +#define PHY_DDR3_RON_RTT_22ohm (28) +#define PHY_DDR3_RON_RTT_21ohm (29) +#define PHY_DDR3_RON_RTT_20ohm (30) +#define PHY_DDR3_RON_RTT_19ohm (31) + +#define PHY_DDR4_LPDDR3_RON_RTT_DISABLE (0) +#define PHY_DDR4_LPDDR3_RON_RTT_480ohm (1) +#define PHY_DDR4_LPDDR3_RON_RTT_240ohm (2) +#define PHY_DDR4_LPDDR3_RON_RTT_160ohm (3) +#define PHY_DDR4_LPDDR3_RON_RTT_120ohm (4) +#define PHY_DDR4_LPDDR3_RON_RTT_96ohm (5) +#define PHY_DDR4_LPDDR3_RON_RTT_80ohm (6) +#define PHY_DDR4_LPDDR3_RON_RTT_68ohm (7) +#define PHY_DDR4_LPDDR3_RON_RTT_60ohm (16) +#define PHY_DDR4_LPDDR3_RON_RTT_53ohm (17) +#define PHY_DDR4_LPDDR3_RON_RTT_48ohm (18) +#define PHY_DDR4_LPDDR3_RON_RTT_43ohm (19) +#define PHY_DDR4_LPDDR3_RON_RTT_40ohm (20) +#define PHY_DDR4_LPDDR3_RON_RTT_37ohm (21) +#define PHY_DDR4_LPDDR3_RON_RTT_34ohm (22) +#define PHY_DDR4_LPDDR3_RON_RTT_32ohm (23) +#define PHY_DDR4_LPDDR3_RON_RTT_30ohm (24) +#define PHY_DDR4_LPDDR3_RON_RTT_28ohm (25) +#define PHY_DDR4_LPDDR3_RON_RTT_26ohm (26) +#define PHY_DDR4_LPDDR3_RON_RTT_25ohm (27) +#define PHY_DDR4_LPDDR3_RON_RTT_24ohm (28) +#define PHY_DDR4_LPDDR3_RON_RTT_22ohm (29) +#define PHY_DDR4_LPDDR3_RON_RTT_21ohm (30) +#define PHY_DDR4_LPDDR3_RON_RTT_20ohm (31) + +/* noc registers define */ +#define DDRCONF 0x8 +#define DDRTIMING 0xc +#define DDRMODE 0x10 +#define READLATENCY 0x14 +#define AGING0 0x18 +#define AGING1 0x1c +#define AGING2 0x20 +#define AGING3 0x24 +#define AGING4 0x28 +#define AGING5 0x2c +#define ACTIVATE 0x38 +#define DEVTODEV 0x3c +#define DDR4TIMING 0x40 + +/* DDR GRF */ +#define DDR_GRF_CON(n) (0 + (n) * 4) +#define DDR_GRF_STATUS_BASE (0X100) +#define DDR_GRF_STATUS(n) (DDR_GRF_STATUS_BASE + (n) * 4) + +/* CRU_SOFTRESET_CON5 */ +#define ddrphy_psrstn_req(n) (((0x1 << 15) << 16) | (n << 15)) +#define ddrphy_srstn_req(n) (((0x1 << 14) << 16) | (n << 14)) +#define ddrctrl_psrstn_req(n) (((0x1 << 13) << 16) | (n << 13)) +#define ddrctrl_srstn_req(n) (((0x1 << 12) << 16) | (n << 12)) +#define ddrmsch_srstn_req(n) (((0x1 << 11) << 16) | (n << 11)) +#define msch_srstn_req(n) (((0x1 << 9) << 16) | (n << 9)) +#define dfimon_srstn_req(n) (((0x1 << 8) << 16) | (n << 8)) +#define grf_ddr_srstn_req(n) (((0x1 << 7) << 16) | (n << 7)) +/* CRU_SOFTRESET_CON9 */ +#define ddrctrl_asrstn_req(n) (((0x1 << 9) << 16) | (n << 9)) + +/* CRU register */ +#define CRU_PLL_CON(pll_id, n) ((pll_id) * 0x20 + (n) * 4) +#define CRU_MODE (0x80) +#define CRU_GLB_CNT_TH (0x90) +#define CRU_CLKSEL_CON_BASE 0x100 +#define CRU_CLKSELS_CON(i) (CRU_CLKSEL_CON_BASE + ((i) * 4)) +#define CRU_CLKGATE_CON_BASE 0x200 +#define CRU_CLKGATE_CON(i) (CRU_CLKGATE_CON_BASE + ((i) * 4)) +#define CRU_CLKSFTRST_CON_BASE 0x300 +#define CRU_CLKSFTRST_CON(i) (CRU_CLKSFTRST_CON_BASE + ((i) * 4)) + +/* CRU_PLL_CON0 */ +#define PB(n) ((0x1 << (15 + 16)) | ((n) << 15)) +#define POSTDIV1(n) ((0x7 << (12 + 16)) | ((n) << 12)) +#define FBDIV(n) ((0xFFF << 16) | (n)) + +/* CRU_PLL_CON1 */ +#define RSTMODE(n) ((0x1 << (15 + 16)) | ((n) << 15)) +#define RST(n) ((0x1 << (14 + 16)) | ((n) << 14)) +#define PD(n) ((0x1 << (13 + 16)) | ((n) << 13)) +#define DSMPD(n) ((0x1 << (12 + 16)) | ((n) << 12)) +#define LOCK(n) (((n) >> 10) & 0x1) +#define POSTDIV2(n) ((0x7 << (6 + 16)) | ((n) << 6)) +#define REFDIV(n) ((0x3F << 16) | (n)) + +union noc_ddrtiming { + u32 d32; + struct { + unsigned acttoact:6; + unsigned rdtomiss:6; + unsigned wrtomiss:6; + unsigned burstlen:3; + unsigned rdtowr:5; + unsigned wrtord:5; + unsigned bwratio:1; + } b; +} NOC_TIMING_T; + +union noc_activate { + u32 d32; + struct { + unsigned rrd:4; + unsigned faw:6; + unsigned fawbank:1; + unsigned reserved1:21; + } b; +}; + +union noc_devtodev { + u32 d32; + struct { + unsigned busrdtord:2; + unsigned busrdtowr:2; + unsigned buswrtord:2; + unsigned reserved2:26; + } b; +}; + +union noc_ddr4timing { + u32 d32; + struct { + unsigned ccdl:3; + unsigned wrtordl:5; + unsigned rrdl:4; + unsigned reserved2:20; + } b; +}; + +union noc_ddrmode { + u32 d32; + struct { + unsigned autoprecharge:1; + unsigned bwratioextended:1; + unsigned reserved3:30; + } b; +}; + +u32 addrmap[21][9] = { + /* map0 map1 map2 map3 map4 map5 map6 map7 map8 */ + {22, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x06060606, + 0x06060606, 0x00000f0f, 0x3f3f}, + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x3f3f}, + {23, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, + 0x0f080808, 0x00000f0f, 0x3f3f}, + {24, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, + 0x08080808, 0x00000f0f, 0x3f3f}, + {24, 0x000a0a0a, 0x00000000, 0x00000000, 0x00000000, 0x09090909, + 0x0f090909, 0x00000f0f, 0x3f3f}, + {6, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x3f3f}, + {7, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x3f3f}, + {8, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x09090909, + 0x0f090909, 0x00000f0f, 0x3f3f}, + {22, 0x001f0808, 0x00000000, 0x00000000, 0x00001f1f, 0x06060606, + 0x06060606, 0x00000f0f, 0x3f3f}, + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, + 0x0f070707, 0x00000f0f, 0x3f3f}, + + {24, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x0801}, + {23, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, + 0x0f080808, 0x00000f0f, 0x0801}, + {24, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f07, 0x0700}, + {23, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x0700}, + {24, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f07, 0x3f01}, + {23, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f0f, 0x3f01}, + {24, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x06060606, + 0x06060606, 0x00000f06, 0x3f00}, + {8, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x09090909, + 0x0f090909, 0x00000f0f, 0x0801}, + {7, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x0700}, + {7, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, + 0x08080808, 0x00000f0f, 0x3f01}, + + {6, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, + 0x07070707, 0x00000f07, 0x3f00} +}; + +struct rk3328_msch_timings { + union noc_ddrtiming ddrtiming; + union noc_ddrmode ddrmode; + u32 readlatency; + union noc_activate activate; + union noc_devtodev devtodev; + union noc_ddr4timing ddr4timing; + u32 agingx0; +}; + +struct rk3328_msch_regs { + u32 coreid; + u32 revisionid; + u32 ddrconf; + u32 ddrtiming; + u32 ddrmode; + u32 readlatency; + u32 aging0; + u32 aging1; + u32 aging2; + u32 aging3; + u32 aging4; + u32 aging5; + u32 reserved[2]; + u32 activate; + u32 devtodev; + u32 ddr4_timing; +}; + +struct rk3328_ddr_grf_regs { + u32 ddr_grf_con[4]; + u32 reserved[(0x100 - 0x10) / 4]; + u32 ddr_grf_status[11]; +}; + +struct rk3328_ddr_pctl_regs { + u32 pctl[30][2]; +}; + +struct rk3328_ddr_phy_regs { + u32 phy[5][2]; +}; + +struct rk3328_ddr_skew { + u32 a0_a1_skew[15]; + u32 cs0_dm0_skew[11]; + u32 cs0_dm1_skew[11]; + u32 cs0_dm2_skew[11]; + u32 cs0_dm3_skew[11]; + u32 cs1_dm0_skew[11]; + u32 cs1_dm1_skew[11]; + u32 cs1_dm2_skew[11]; + u32 cs1_dm3_skew[11]; +}; + +struct rk3328_sdram_channel { + unsigned int rank; + unsigned int col; + /* 3:8bank, 2:4bank */ + unsigned int bk; + /* channel buswidth, 2:32bit, 1:16bit, 0:8bit */ + unsigned int bw; + /* die buswidth, 2:32bit, 1:16bit, 0:8bit */ + unsigned int dbw; + unsigned int row_3_4; + unsigned int cs0_row; + unsigned int cs1_row; + unsigned int ddrconfig; + struct rk3328_msch_timings noc_timings; +}; + +struct rk3328_sdram_params { + struct rk3328_sdram_channel ch; + unsigned int ddr_freq; + unsigned int dramtype; + unsigned int odt; + struct rk3328_ddr_pctl_regs pctl_regs; + struct rk3328_ddr_phy_regs phy_regs; + struct rk3328_ddr_skew skew; +}; + +#define PHY_REG(base, n) (base + 4 * (n)) + +#endif diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index f4e0b18447..656696ac3c 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -2,22 +2,1029 @@ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ - #include <common.h> +#include <clk.h> +#include <debug_uart.h> #include <dm.h> +#include <dt-structs.h> #include <ram.h> +#include <regmap.h> #include <syscon.h> +#include <asm/io.h> #include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3328.h> #include <asm/arch-rockchip/grf_rk3328.h> #include <asm/arch-rockchip/sdram_common.h> +#include <asm/arch-rockchip/sdram_rk3328.h> +#include <asm/arch-rockchip/uart.h> struct dram_info { +#ifdef CONFIG_TPL_BUILD + struct rk3328_ddr_pctl_regs *pctl; + struct rk3328_ddr_phy_regs *phy; + struct clk ddr_clk; + struct rk3328_cru *cru; + struct rk3328_msch_regs *msch; + struct rk3328_ddr_grf_regs *ddr_grf; +#endif struct ram_info info; struct rk3328_grf_regs *grf; }; +#ifdef CONFIG_TPL_BUILD + +struct rk3328_sdram_channel sdram_ch; + +struct rockchip_dmc_plat { +#if CONFIG_IS_ENABLED(OF_PLATDATA) + struct dtd_rockchip_rk3328_dmc dtplat; +#else + struct rk3328_sdram_params sdram_params; +#endif + struct regmap *map; +}; + +#if CONFIG_IS_ENABLED(OF_PLATDATA) +static int conv_of_platdata(struct udevice *dev) +{ + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; + int ret; + + ret = regmap_init_mem_platdata(dev, dtplat->reg, + ARRAY_SIZE(dtplat->reg) / 2, + &plat->map); + if (ret) + return ret; + + return 0; +} +#endif + +static void rkclk_ddr_reset(struct dram_info *dram, + u32 ctl_srstn, u32 ctl_psrstn, + u32 phy_srstn, u32 phy_psrstn) +{ + writel(ddrctrl_srstn_req(ctl_srstn) | ddrctrl_psrstn_req(ctl_psrstn) | + ddrphy_srstn_req(phy_srstn) | ddrphy_psrstn_req(phy_psrstn), + &dram->cru->softrst_con[5]); + writel(ddrctrl_asrstn_req(ctl_srstn), &dram->cru->softrst_con[9]); +} + +static void rkclk_set_dpll(struct dram_info *dram, unsigned int mhz) +{ + unsigned int refdiv, postdiv1, postdiv2, fbdiv; + int delay = 1000; + + refdiv = 1; + if (mhz <= 300) { + postdiv1 = 4; + postdiv2 = 2; + } else if (mhz <= 400) { + postdiv1 = 6; + postdiv2 = 1; + } else if (mhz <= 600) { + postdiv1 = 4; + postdiv2 = 1; + } else if (mhz <= 800) { + postdiv1 = 3; + postdiv2 = 1; + } else if (mhz <= 1600) { + postdiv1 = 2; + postdiv2 = 1; + } else { + postdiv1 = 1; + postdiv2 = 1; + } + fbdiv = (mhz * refdiv * postdiv1 * postdiv2) / 24; + + writel(((0x1 << 4) << 16) | (0 << 4), &dram->cru->mode_con); + writel(POSTDIV1(postdiv1) | FBDIV(fbdiv), &dram->cru->dpll_con[0]); + writel(DSMPD(1) | POSTDIV2(postdiv2) | REFDIV(refdiv), + &dram->cru->dpll_con[1]); + + while (delay > 0) { + udelay(1); + if (LOCK(readl(&dram->cru->dpll_con[1]))) + break; + delay--; + } + + writel(((0x1 << 4) << 16) | (1 << 4), &dram->cru->mode_con); +} + +static void rkclk_configure_ddr(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + void __iomem *phy_base = dram->phy; + + /* choose DPLL for ddr clk source */ + clrbits_le32(PHY_REG(phy_base, 0xef), 1 << 7); + + /* for inno ddr phy need 2*freq */ + rkclk_set_dpll(dram, sdram_params->ddr_freq * 2); +} + +static void phy_soft_reset(struct dram_info *dram) +{ + void __iomem *phy_base = dram->phy; + + clrbits_le32(PHY_REG(phy_base, 0), 0x3 << 2); + udelay(1); + setbits_le32(PHY_REG(phy_base, 0), ANALOG_DERESET); + udelay(5); + setbits_le32(PHY_REG(phy_base, 0), DIGITAL_DERESET); + udelay(1); +} + +static int pctl_cfg(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 i; + void __iomem *pctl_base = dram->pctl; + + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { + writel(sdram_params->pctl_regs.pctl[i][1], + pctl_base + sdram_params->pctl_regs.pctl[i][0]); + } + clrsetbits_le32(pctl_base + DDR_PCTL2_PWRTMG, + (0xff << 16) | 0x1f, + ((SR_IDLE & 0xff) << 16) | (PD_IDLE & 0x1f)); + /* + * dfi_lp_en_pd=1,dfi_lp_wakeup_pd=2 + * hw_lp_idle_x32=1 + */ + if (sdram_params->dramtype == LPDDR3) { + setbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, 1); + clrsetbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, + 0xf << 4, + 2 << 4); + } + clrsetbits_le32(pctl_base + DDR_PCTL2_HWLPCTL, + 0xfff << 16, + 1 << 16); + /* disable zqcs */ + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1u << 31); + setbits_le32(pctl_base + 0x2000 + DDR_PCTL2_ZQCTL0, 1u << 31); + + return 0; +} + +/* return ddrconfig value + * (-1), find ddrconfig fail + * other, the ddrconfig value + * only support cs0_row >= cs1_row + */ +static unsigned int calculate_ddrconfig(struct rk3328_sdram_params *sdram_params) +{ + static const u16 ddr_cfg_2_rbc[] = { + /*************************** + * [5:4] row(13+n) + * [3] cs(0:0 cs, 1:2 cs) + * [2] bank(0:0bank,1:8bank) + * [1:0] col(11+n) + ****************************/ + /* row, cs, bank, col */ + ((3 << 4) | (0 << 3) | (1 << 2) | 0), + ((3 << 4) | (0 << 3) | (1 << 2) | 1), + ((2 << 4) | (0 << 3) | (1 << 2) | 2), + ((3 << 4) | (0 << 3) | (1 << 2) | 2), + ((2 << 4) | (0 << 3) | (1 << 2) | 3), + ((3 << 4) | (1 << 3) | (1 << 2) | 0), + ((3 << 4) | (1 << 3) | (1 << 2) | 1), + ((2 << 4) | (1 << 3) | (1 << 2) | 2), + ((3 << 4) | (0 << 3) | (0 << 2) | 1), + ((2 << 4) | (0 << 3) | (1 << 2) | 1), + }; + + static const u16 ddr4_cfg_2_rbc[] = { + /*************************** + * [6] cs 0:0cs 1:2 cs + * [5:3] row(13+n) + * [2] cs(0:0 cs, 1:2 cs) + * [1] bw 0: 16bit 1:32bit + * [0] diebw 0:8bit 1:16bit + ***************************/ + /* cs, row, cs, bw, diebw */ + ((0 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 0), + ((1 << 6) | (2 << 3) | (0 << 2) | (1 << 1) | 0), + ((0 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 0), + ((1 << 6) | (3 << 3) | (0 << 2) | (0 << 1) | 0), + ((0 << 6) | (4 << 3) | (0 << 2) | (1 << 1) | 1), + ((1 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 1), + ((1 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 1), + ((0 << 6) | (2 << 3) | (1 << 2) | (1 << 1) | 0), + ((0 << 6) | (3 << 3) | (1 << 2) | (0 << 1) | 0), + ((0 << 6) | (3 << 3) | (1 << 2) | (1 << 1) | 1), + ((0 << 6) | (4 << 3) | (1 << 2) | (0 << 1) | 1), + }; + + u32 cs, bw, die_bw, col, row, bank; + u32 i, tmp; + u32 ddrconf = -1; + + cs = sdram_ch.rank; + bw = sdram_ch.bw; + die_bw = sdram_ch.dbw; + col = sdram_ch.col; + row = sdram_ch.cs0_row; + bank = sdram_ch.bk; + + if (sdram_params->dramtype == DDR4) { + tmp = ((cs - 1) << 6) | ((row - 13) << 3) | (bw & 0x2) | die_bw; + for (i = 10; i < 17; i++) { + if (((tmp & 0x7) == (ddr4_cfg_2_rbc[i - 10] & 0x7)) && + ((tmp & 0x3c) <= (ddr4_cfg_2_rbc[i - 10] & 0x3c)) && + ((tmp & 0x40) <= (ddr4_cfg_2_rbc[i - 10] & 0x40))) { + ddrconf = i; + goto out; + } + } + } else { + if (bank == 2) { + ddrconf = 8; + goto out; + } + + tmp = ((row - 13) << 4) | (1 << 2) | ((bw + col - 11) << 0); + for (i = 0; i < 5; i++) + if (((tmp & 0xf) == (ddr_cfg_2_rbc[i] & 0xf)) && + ((tmp & 0x30) <= (ddr_cfg_2_rbc[i] & 0x30))) { + ddrconf = i; + goto out; + } + } + +out: + if (ddrconf > 20) + printf("calculate_ddrconfig error\n"); + + return ddrconf; +} + +/* n: Unit bytes */ +static void copy_to_reg(u32 *dest, u32 *src, u32 n) +{ + int i; + + for (i = 0; i < n / sizeof(u32); i++) { + writel(*src, dest); + src++; + dest++; + } +} + +/******* + * calculate controller dram address map, and setting to register. + * argument sdram_ch.ddrconf must be right value before + * call this function. + *******/ +static void set_ctl_address_map(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + void __iomem *pctl_base = dram->pctl; + + copy_to_reg((u32 *)(pctl_base + DDR_PCTL2_ADDRMAP0), + &addrmap[sdram_ch.ddrconfig][0], 9 * 4); + if (sdram_params->dramtype == LPDDR3 && sdram_ch.row_3_4) + setbits_le32(pctl_base + DDR_PCTL2_ADDRMAP6, 1 << 31); + if (sdram_params->dramtype == DDR4 && sdram_ch.bw == 0x1) + setbits_le32(pctl_base + DDR_PCTL2_PCCFG, 1 << 8); + + if (sdram_ch.rank == 1) + clrsetbits_le32(pctl_base + DDR_PCTL2_ADDRMAP0, 0x1f, 0x1f); +} + +static void phy_dll_bypass_set(struct dram_info *dram, u32 freq) +{ + u32 tmp; + void __iomem *phy_base = dram->phy; + + setbits_le32(PHY_REG(phy_base, 0x13), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x14), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x26), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x27), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x36), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x37), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x46), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x47), 1 << 3); + setbits_le32(PHY_REG(phy_base, 0x56), 1 << 4); + clrbits_le32(PHY_REG(phy_base, 0x57), 1 << 3); + + if (freq <= (400 * MHz)) + /* DLL bypass */ + setbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); + else + clrbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); + if (freq <= (680 * MHz)) + tmp = 2; + else + tmp = 1; + writel(tmp, PHY_REG(phy_base, 0x28)); + writel(tmp, PHY_REG(phy_base, 0x38)); + writel(tmp, PHY_REG(phy_base, 0x48)); + writel(tmp, PHY_REG(phy_base, 0x58)); +} + +static void set_ds_odt(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 cmd_drv, clk_drv, dqs_drv, dqs_odt; + void __iomem *phy_base = dram->phy; + + if (sdram_params->dramtype == DDR3) { + cmd_drv = PHY_DDR3_RON_RTT_34ohm; + clk_drv = PHY_DDR3_RON_RTT_45ohm; + dqs_drv = PHY_DDR3_RON_RTT_34ohm; + dqs_odt = PHY_DDR3_RON_RTT_225ohm; + } else { + cmd_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; + clk_drv = PHY_DDR4_LPDDR3_RON_RTT_43ohm; + dqs_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; + dqs_odt = PHY_DDR4_LPDDR3_RON_RTT_240ohm; + } + /* DS */ + writel(cmd_drv, PHY_REG(phy_base, 0x11)); + clrsetbits_le32(PHY_REG(phy_base, 0x12), 0x1f << 3, cmd_drv << 3); + writel(clk_drv, PHY_REG(phy_base, 0x16)); + writel(clk_drv, PHY_REG(phy_base, 0x18)); + writel(dqs_drv, PHY_REG(phy_base, 0x20)); + writel(dqs_drv, PHY_REG(phy_base, 0x2f)); + writel(dqs_drv, PHY_REG(phy_base, 0x30)); + writel(dqs_drv, PHY_REG(phy_base, 0x3f)); + writel(dqs_drv, PHY_REG(phy_base, 0x40)); + writel(dqs_drv, PHY_REG(phy_base, 0x4f)); + writel(dqs_drv, PHY_REG(phy_base, 0x50)); + writel(dqs_drv, PHY_REG(phy_base, 0x5f)); + /* ODT */ + writel(dqs_odt, PHY_REG(phy_base, 0x21)); + writel(dqs_odt, PHY_REG(phy_base, 0x2e)); + writel(dqs_odt, PHY_REG(phy_base, 0x31)); + writel(dqs_odt, PHY_REG(phy_base, 0x3e)); + writel(dqs_odt, PHY_REG(phy_base, 0x41)); + writel(dqs_odt, PHY_REG(phy_base, 0x4e)); + writel(dqs_odt, PHY_REG(phy_base, 0x51)); + writel(dqs_odt, PHY_REG(phy_base, 0x5e)); +} + +static void phy_cfg(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 i; + void __iomem *phy_base = dram->phy; + + phy_dll_bypass_set(dram, sdram_params->ddr_freq); + for (i = 0; sdram_params->phy_regs.phy[i][0] != 0xFFFFFFFF; i++) { + writel(sdram_params->phy_regs.phy[i][1], + phy_base + sdram_params->phy_regs.phy[i][0]); + } + if (sdram_ch.bw == 2) { + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 0xf << 4); + } else { + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 3 << 4); + /* disable DQS2,DQS3 tx dll for saving power */ + clrbits_le32(PHY_REG(phy_base, 0x46), 1 << 3); + clrbits_le32(PHY_REG(phy_base, 0x56), 1 << 3); + } + set_ds_odt(dram, sdram_params); + /* deskew */ + setbits_le32(PHY_REG(phy_base, 2), 8); + copy_to_reg(PHY_REG(phy_base, 0xb0), + &sdram_params->skew.a0_a1_skew[0], 15 * 4); + copy_to_reg(PHY_REG(phy_base, 0x70), + &sdram_params->skew.cs0_dm0_skew[0], 44 * 4); + copy_to_reg(PHY_REG(phy_base, 0xc0), + &sdram_params->skew.cs0_dm1_skew[0], 44 * 4); +} + +static int update_refresh_reg(struct dram_info *dram) +{ + void __iomem *pctl_base = dram->pctl; + u32 ret; + + ret = readl(pctl_base + DDR_PCTL2_RFSHCTL3) ^ (1 << 1); + writel(ret, pctl_base + DDR_PCTL2_RFSHCTL3); + + return 0; +} + +static int data_training(struct dram_info *dram, u32 cs, u32 dramtype) +{ + u32 ret; + u32 dis_auto_zq = 0; + void __iomem *pctl_base = dram->pctl; + void __iomem *phy_base = dram->phy; + + /* disable zqcs */ + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & + (1ul << 31))) { + dis_auto_zq = 1; + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + } + /* disable auto refresh */ + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + if (dramtype == DDR4) { + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0); + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0); + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0); + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0); + } + /* choose training cs */ + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs)); + /* enable gate training */ + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 1); + udelay(50); + ret = readl(PHY_REG(phy_base, 0xff)); + /* disable gate training */ + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 0); + /* restore zqcs */ + if (dis_auto_zq) + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + /* restore auto refresh */ + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + if (dramtype == DDR4) { + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0x2); + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0x2); + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0x2); + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0x2); + } + + if (ret & 0x10) { + ret = -1; + } else { + ret = (ret & 0xf) ^ (readl(PHY_REG(phy_base, 0)) >> 4); + ret = (ret == 0) ? 0 : -1; + } + return ret; +} + +/* rank = 1: cs0 + * rank = 2: cs1 + * rank = 3: cs0 & cs1 + * note: be careful of keep mr original val + */ +static int write_mr(struct dram_info *dram, u32 rank, u32 mr_num, u32 arg, + u32 dramtype) +{ + void __iomem *pctl_base = dram->pctl; + + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) + continue; + if (dramtype == DDR3 || dramtype == DDR4) { + writel((mr_num << 12) | (rank << 4) | (0 << 0), + pctl_base + DDR_PCTL2_MRCTRL0); + writel(arg, pctl_base + DDR_PCTL2_MRCTRL1); + } else { + writel((rank << 4) | (0 << 0), + pctl_base + DDR_PCTL2_MRCTRL0); + writel((mr_num << 8) | (arg & 0xff), + pctl_base + DDR_PCTL2_MRCTRL1); + } + + setbits_le32(pctl_base + DDR_PCTL2_MRCTRL0, 1u << 31); + while (readl(pctl_base + DDR_PCTL2_MRCTRL0) & (1u << 31)) + continue; + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) + continue; + + return 0; +} + +/* + * rank : 1:cs0, 2:cs1, 3:cs0&cs1 + * vrefrate: 4500: 45%, + */ +static int write_vrefdq(struct dram_info *dram, u32 rank, u32 vrefrate, + u32 dramtype) +{ + u32 tccd_l, value; + u32 dis_auto_zq = 0; + void __iomem *pctl_base = dram->pctl; + + if (dramtype != DDR4 || vrefrate < 4500 || vrefrate > 9200) + return -1; + + tccd_l = (readl(pctl_base + DDR_PCTL2_DRAMTMG4) >> 16) & 0xf; + tccd_l = (tccd_l - 4) << 10; + + if (vrefrate > 7500) { + /* range 1 */ + value = ((vrefrate - 6000) / 65) | tccd_l; + } else { + /* range 2 */ + value = ((vrefrate - 4500) / 65) | tccd_l | (1 << 6); + } + + /* disable zqcs */ + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & + (1ul << 31))) { + dis_auto_zq = 1; + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + } + /* disable auto refresh */ + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + /* enable vrefdq calibratin */ + write_mr(dram, rank, 6, value | (1 << 7), dramtype); + udelay(1);/* tvrefdqe */ + /* write vrefdq value */ + write_mr(dram, rank, 6, value | (1 << 7), dramtype); + udelay(1);/* tvref_time */ + write_mr(dram, rank, 6, value | (0 << 7), dramtype); + udelay(1);/* tvrefdqx */ + + /* restore zqcs */ + if (dis_auto_zq) + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); + /* restore auto refresh */ + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); + update_refresh_reg(dram); + + return 0; +} + +#define _MAX_(x, y) ((x) > (y) ? (x) : (y)) + +static void rx_deskew_switch_adjust(struct dram_info *dram) +{ + u32 i, deskew_val; + u32 gate_val = 0; + void __iomem *phy_base = dram->phy; + + for (i = 0; i < 4; i++) + gate_val = _MAX_(readl(PHY_REG(phy_base, 0xfb + i)), gate_val); + + deskew_val = (gate_val >> 3) + 1; + deskew_val = (deskew_val > 0x1f) ? 0x1f : deskew_val; + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0xc, (deskew_val & 0x3) << 2); + clrsetbits_le32(PHY_REG(phy_base, 0x6f), 0x7 << 4, + (deskew_val & 0x1c) << 2); +} + +#undef _MAX_ + +static void tx_deskew_switch_adjust(struct dram_info *dram) +{ + void __iomem *phy_base = dram->phy; + + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0x3, 1); +} + +static void set_ddrconfig(struct dram_info *dram, u32 ddrconfig) +{ + writel(ddrconfig, &dram->msch->ddrconf); +} + +static void dram_all_config(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + u32 sys_reg = 0, tmp = 0; + + set_ddrconfig(dram, sdram_ch.ddrconfig); + + sys_reg |= SYS_REG_ENC_DDRTYPE(sdram_params->dramtype); + sys_reg |= SYS_REG_ENC_ROW_3_4(sdram_ch.row_3_4, 0); + sys_reg |= SYS_REG_ENC_RANK(sdram_ch.rank, 0); + sys_reg |= SYS_REG_ENC_COL(sdram_ch.col, 0); + sys_reg |= SYS_REG_ENC_BK(sdram_ch.bk, 0); + SYS_REG_ENC_CS0_ROW(sdram_ch.cs0_row, sys_reg, tmp, 0); + if (sdram_ch.cs1_row) + SYS_REG_ENC_CS1_ROW(sdram_ch.cs1_row, sys_reg, tmp, 0); + sys_reg |= SYS_REG_ENC_BW(sdram_ch.bw, 0); + sys_reg |= SYS_REG_ENC_DBW(sdram_ch.dbw, 0); + + writel(sys_reg, &dram->grf->os_reg[2]); + + writel(sdram_ch.noc_timings.ddrtiming.d32, &dram->msch->ddrtiming); + + writel(sdram_ch.noc_timings.ddrmode.d32, &dram->msch->ddrmode); + writel(sdram_ch.noc_timings.readlatency, &dram->msch->readlatency); + + writel(sdram_ch.noc_timings.activate.d32, &dram->msch->activate); + writel(sdram_ch.noc_timings.devtodev.d32, &dram->msch->devtodev); + writel(sdram_ch.noc_timings.ddr4timing.d32, &dram->msch->ddr4_timing); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging0); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging1); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging2); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging3); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging4); + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging5); +} + +static void enable_low_power(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + void __iomem *pctl_base = dram->pctl; + + /* enable upctl2 axi clock auto gating */ + writel(0x00800000, &dram->ddr_grf->ddr_grf_con[0]); + writel(0x20012001, &dram->ddr_grf->ddr_grf_con[2]); + /* enable upctl2 core clock auto gating */ + writel(0x001e001a, &dram->ddr_grf->ddr_grf_con[2]); + /* enable sr, pd */ + if (PD_IDLE == 0) + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); + else + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); + if (SR_IDLE == 0) + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); + else + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 3)); +} + +static int sdram_init(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params, u32 pre_init) +{ + void __iomem *pctl_base = dram->pctl; + + rkclk_ddr_reset(dram, 1, 1, 1, 1); + udelay(10); + /* + * dereset ddr phy psrstn to config pll, + * if using phy pll psrstn must be dereset + * before config pll + */ + rkclk_ddr_reset(dram, 1, 1, 1, 0); + rkclk_configure_ddr(dram, sdram_params); + if (pre_init == 0) { + switch (sdram_params->dramtype) { + case DDR3: + printf("DDR3\n"); + break; + case DDR4: + printf("DDR4\n"); + break; + case LPDDR3: + default: + printf("LPDDR3\n"); + break; + } + } + /* release phy srst to provide clk to ctrl */ + rkclk_ddr_reset(dram, 1, 1, 0, 0); + udelay(10); + phy_soft_reset(dram); + /* release ctrl presetn, and config ctl registers */ + rkclk_ddr_reset(dram, 1, 0, 0, 0); + pctl_cfg(dram, sdram_params); + sdram_ch.ddrconfig = calculate_ddrconfig(sdram_params); + set_ctl_address_map(dram, sdram_params); + phy_cfg(dram, sdram_params); + + /* enable dfi_init_start to init phy after ctl srstn deassert */ + setbits_le32(pctl_base + DDR_PCTL2_DFIMISC, (1 << 5) | (1 << 4)); + rkclk_ddr_reset(dram, 0, 0, 0, 0); + /* wait for dfi_init_done and dram init complete */ + while ((readl(pctl_base + DDR_PCTL2_STAT) & 0x7) == 0) + continue; + + /* do ddr gate training */ + if (data_training(dram, 0, sdram_params->dramtype) != 0) { + printf("data training error\n"); + return -1; + } + + if (sdram_params->dramtype == DDR4) + write_vrefdq(dram, 0x3, 5670, sdram_params->dramtype); + + if (pre_init == 0) { + rx_deskew_switch_adjust(dram); + tx_deskew_switch_adjust(dram); + } + + dram_all_config(dram, sdram_params); + enable_low_power(dram, sdram_params); + + return 0; +} + +static u64 dram_detect_cap(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params, + unsigned char channel) +{ + void __iomem *pctl_base = dram->pctl; + + /* + * for ddr3: ddrconf = 3 + * for ddr4: ddrconf = 12 + * for lpddr3: ddrconf = 3 + * default bw = 1 + */ + u32 bk, bktmp; + u32 col, coltmp; + u32 row, rowtmp, row_3_4; + void __iomem *test_addr, *test_addr1; + u32 dbw; + u32 cs; + u32 bw = 1; + u64 cap = 0; + u32 dram_type = sdram_params->dramtype; + u32 pwrctl; + + if (dram_type != DDR4) { + /* detect col and bk for ddr3/lpddr3 */ + coltmp = 12; + bktmp = 3; + rowtmp = 16; + + for (col = coltmp; col >= 9; col -= 1) { + writel(0, SDRAM_ADDR); + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (col + bw - 1ul))); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + break; + } + if (col == 8) { + printf("col error\n"); + goto cap_err; + } + + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (coltmp + bktmp + bw - 1ul))); + writel(0, SDRAM_ADDR); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + bk = 3; + else + bk = 2; + if (dram_type == LPDDR3) + dbw = 2; + else + dbw = 1; + } else { + /* detect bg for ddr4 */ + coltmp = 10; + bktmp = 4; + rowtmp = 17; + + col = 10; + bk = 2; + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (coltmp + bw + 1ul))); + writel(0, SDRAM_ADDR); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + dbw = 0; + else + dbw = 1; + } + /* detect row */ + for (row = rowtmp; row > 12; row--) { + writel(0, SDRAM_ADDR); + test_addr = (void __iomem *)(SDRAM_ADDR + + (1ul << (row + bktmp + coltmp + bw - 1ul))); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR) == 0)) + break; + } + if (row == 12) { + printf("row error"); + goto cap_err; + } + /* detect row_3_4 */ + test_addr = SDRAM_ADDR; + test_addr1 = (void __iomem *)(SDRAM_ADDR + + (0x3ul << (row + bktmp + coltmp + bw - 1ul - 1ul))); + + writel(0, test_addr); + writel(PATTERN, test_addr1); + if ((readl(test_addr) == 0) && + (readl(test_addr1) == PATTERN)) + row_3_4 = 0; + else + row_3_4 = 1; + + /* disable auto low-power */ + pwrctl = readl(pctl_base + DDR_PCTL2_PWRCTL); + writel(0, pctl_base + DDR_PCTL2_PWRCTL); + + /* bw and cs detect using phy read gate training */ + if (data_training(dram, 1, dram_type) == 0) + cs = 1; + else + cs = 0; + + bw = 2; + + /* restore auto low-power */ + writel(pwrctl, pctl_base + DDR_PCTL2_PWRCTL); + + sdram_ch.rank = cs + 1; + sdram_ch.col = col; + sdram_ch.bk = bk; + sdram_ch.dbw = dbw; + sdram_ch.bw = bw; + sdram_ch.cs0_row = row; + if (cs) + sdram_ch.cs1_row = row; + else + sdram_ch.cs1_row = 0; + sdram_ch.row_3_4 = row_3_4; + + if (dram_type == DDR4) + cap = 1llu << (cs + row + bk + col + ((dbw == 0) ? 2 : 1) + bw); + else + cap = 1llu << (cs + row + bk + col + bw); + + return cap; + +cap_err: + return 0; +} + +static u32 remodify_sdram_params(struct rk3328_sdram_params *sdram_params) +{ + u32 tmp = 0, tmp_adr = 0, i; + + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { + if (sdram_params->pctl_regs.pctl[i][0] == 0) { + tmp = sdram_params->pctl_regs.pctl[i][1];/* MSTR */ + tmp_adr = i; + } + } + + tmp &= ~((3ul << 30) | (3ul << 24) | (3ul << 12)); + + switch (sdram_ch.dbw) { + case 2: + tmp |= (3ul << 30); + break; + case 1: + tmp |= (2ul << 30); + break; + case 0: + default: + tmp |= (1ul << 30); + break; + } + + if (sdram_ch.rank == 2) + tmp |= 3 << 24; + else + tmp |= 1 << 24; + + tmp |= (2 - sdram_ch.bw) << 12; + + sdram_params->pctl_regs.pctl[tmp_adr][1] = tmp; + + if (sdram_ch.bw == 2) + sdram_ch.noc_timings.ddrtiming.b.bwratio = 0; + else + sdram_ch.noc_timings.ddrtiming.b.bwratio = 1; + + return 0; +} + +static int dram_detect_cs1_row(struct rk3328_sdram_params *sdram_params, + unsigned char channel) +{ + u32 ret = 0; + u32 cs1_bit; + void __iomem *test_addr, *cs1_addr; + u32 row, bktmp, coltmp, bw; + u32 ddrconf = sdram_ch.ddrconfig; + + if (sdram_ch.rank == 2) { + cs1_bit = addrmap[ddrconf][0] + 8; + + if (cs1_bit > 31) + goto out; + + cs1_addr = (void __iomem *)(1ul << cs1_bit); + if (cs1_bit < 20) + cs1_bit = 1; + else + cs1_bit = 0; + + if (sdram_params->dramtype == DDR4) { + if (sdram_ch.dbw == 0) + bktmp = sdram_ch.bk + 2; + else + bktmp = sdram_ch.bk + 1; + } else { + bktmp = sdram_ch.bk; + } + bw = sdram_ch.bw; + coltmp = sdram_ch.col; + + /* detect cs1 row */ + for (row = sdram_ch.cs0_row; row > 12; row--) { + test_addr = (void __iomem *)(SDRAM_ADDR + cs1_addr + + (1ul << (row + cs1_bit + bktmp + + coltmp + bw - 1ul))); + writel(0, SDRAM_ADDR + cs1_addr); + writel(PATTERN, test_addr); + if ((readl(test_addr) == PATTERN) && + (readl(SDRAM_ADDR + cs1_addr) == 0)) { + ret = row; + break; + } + } + } + +out: + return ret; +} + +static int sdram_init_detect(struct dram_info *dram, + struct rk3328_sdram_params *sdram_params) +{ + debug("Starting SDRAM initialization...\n"); + + memcpy(&sdram_ch, &sdram_params->ch, + sizeof(struct rk3328_sdram_channel)); + + sdram_init(dram, sdram_params, 1); + dram_detect_cap(dram, sdram_params, 0); + + /* modify bw, cs related timing */ + remodify_sdram_params(sdram_params); + /* reinit sdram by real dram cap */ + sdram_init(dram, sdram_params, 0); + + /* redetect cs1 row */ + sdram_ch.cs1_row = + dram_detect_cs1_row(sdram_params, 0); + + return 0; +} + +static int rk3328_dmc_init(struct udevice *dev) +{ + struct dram_info *priv = dev_get_priv(dev); + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + int ret; + +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + struct rk3328_sdram_params *params = &plat->sdram_params; +#else + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; + struct rk3328_sdram_params *params = + (void *)dtplat->rockchip_sdram_params; + + ret = conv_of_platdata(dev); + if (ret) + return ret; +#endif + priv->phy = regmap_get_range(plat->map, 0); + priv->pctl = regmap_get_range(plat->map, 1); + priv->grf = regmap_get_range(plat->map, 2); + priv->cru = regmap_get_range(plat->map, 3); + priv->msch = regmap_get_range(plat->map, 4); + priv->ddr_grf = regmap_get_range(plat->map, 5); + + debug("%s phy %p pctrl %p grf %p cru %p msch %p ddr_grf %p\n", + __func__, priv->phy, priv->pctl, priv->grf, priv->cru, + priv->msch, priv->ddr_grf); + ret = sdram_init_detect(priv, params); + if (ret < 0) { + printf("%s DRAM init failed%d\n", __func__, ret); + return ret; + } + + return 0; +} + +static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev) +{ +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); + int ret; + + ret = dev_read_u32_array(dev, "rockchip,sdram-params", + (u32 *)&plat->sdram_params, + sizeof(plat->sdram_params) / sizeof(u32)); + if (ret) { + printf("%s: Cannot read rockchip,sdram-params %d\n", + __func__, ret); + return ret; + } + ret = regmap_init_mem(dev, &plat->map); + if (ret) + printf("%s: regmap failed %d\n", __func__, ret); +#endif + return 0; +} + +#endif + static int rk3328_dmc_probe(struct udevice *dev) { +#ifdef CONFIG_TPL_BUILD + if (rk3328_dmc_init(dev)) + return 0; +#else struct dram_info *priv = dev_get_priv(dev); priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); @@ -25,7 +1032,7 @@ static int rk3328_dmc_probe(struct udevice *dev) priv->info.base = CONFIG_SYS_SDRAM_BASE; priv->info.size = rockchip_sdram_size( (phys_addr_t)&priv->grf->os_reg[2]); - +#endif return 0; } @@ -42,7 +1049,6 @@ static struct ram_ops rk3328_dmc_ops = { .get_info = rk3328_dmc_get_info, }; - static const struct udevice_id rk3328_dmc_ids[] = { { .compatible = "rockchip,rk3328-dmc" }, { } @@ -53,6 +1059,12 @@ U_BOOT_DRIVER(dmc_rk3328) = { .id = UCLASS_RAM, .of_match = rk3328_dmc_ids, .ops = &rk3328_dmc_ops, +#ifdef CONFIG_TPL_BUILD + .ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata, +#endif .probe = rk3328_dmc_probe, .priv_auto_alloc_size = sizeof(struct dram_info), +#ifdef CONFIG_TPL_BUILD + .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), +#endif }; -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver 2019-08-02 7:39 ` [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov @ 2019-08-05 13:02 ` Kever Yang 2019-08-05 13:04 ` Philipp Tomsich 1 sibling, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-05 13:02 UTC (permalink / raw) To: u-boot On 2019/8/2 下午3:39, Matwey V. Kornilov wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > This driver supports DDR3/LPDDR3/DDR4 SDRAM initialization. > > Signed-off-by: YouMin Chen <cym@rock-chips.com> > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/9fb0777ec3cc6a89af9d2e0969c3bfe58306a88d with minor modifications] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ > drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- > 2 files changed, 1456 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > > diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > new file mode 100644 > index 0000000000..11411ead10 > --- /dev/null > +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > @@ -0,0 +1,441 @@ > +/* > + * Copyright (C) 2016-2017 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#ifndef _ASM_ARCH_SDRAM_RK3328_H > +#define _ASM_ARCH_SDRAM_RK3328_H > + > +#define SR_IDLE 93 > +#define PD_IDLE 13 > +#define SDRAM_ADDR 0x00000000 > +#define PATTERN (0x5aa5f00f) > + > +/* ddr pctl registers define */ > +#define DDR_PCTL2_MSTR 0x0 > +#define DDR_PCTL2_STAT 0x4 > +#define DDR_PCTL2_MSTR1 0x8 > +#define DDR_PCTL2_MRCTRL0 0x10 > +#define DDR_PCTL2_MRCTRL1 0x14 > +#define DDR_PCTL2_MRSTAT 0x18 > +#define DDR_PCTL2_MRCTRL2 0x1c > +#define DDR_PCTL2_DERATEEN 0x20 > +#define DDR_PCTL2_DERATEINT 0x24 > +#define DDR_PCTL2_PWRCTL 0x30 > +#define DDR_PCTL2_PWRTMG 0x34 > +#define DDR_PCTL2_HWLPCTL 0x38 > +#define DDR_PCTL2_RFSHCTL0 0x50 > +#define DDR_PCTL2_RFSHCTL1 0x54 > +#define DDR_PCTL2_RFSHCTL2 0x58 > +#define DDR_PCTL2_RFSHCTL4 0x5c > +#define DDR_PCTL2_RFSHCTL3 0x60 > +#define DDR_PCTL2_RFSHTMG 0x64 > +#define DDR_PCTL2_RFSHTMG1 0x68 > +#define DDR_PCTL2_RFSHCTL5 0x6c > +#define DDR_PCTL2_INIT0 0xd0 > +#define DDR_PCTL2_INIT1 0xd4 > +#define DDR_PCTL2_INIT2 0xd8 > +#define DDR_PCTL2_INIT3 0xdc > +#define DDR_PCTL2_INIT4 0xe0 > +#define DDR_PCTL2_INIT5 0xe4 > +#define DDR_PCTL2_INIT6 0xe8 > +#define DDR_PCTL2_INIT7 0xec > +#define DDR_PCTL2_DIMMCTL 0xf0 > +#define DDR_PCTL2_RANKCTL 0xf4 > +#define DDR_PCTL2_CHCTL 0xfc > +#define DDR_PCTL2_DRAMTMG0 0x100 > +#define DDR_PCTL2_DRAMTMG1 0x104 > +#define DDR_PCTL2_DRAMTMG2 0x108 > +#define DDR_PCTL2_DRAMTMG3 0x10c > +#define DDR_PCTL2_DRAMTMG4 0x110 > +#define DDR_PCTL2_DRAMTMG5 0x114 > +#define DDR_PCTL2_DRAMTMG6 0x118 > +#define DDR_PCTL2_DRAMTMG7 0x11c > +#define DDR_PCTL2_DRAMTMG8 0x120 > +#define DDR_PCTL2_DRAMTMG9 0x124 > +#define DDR_PCTL2_DRAMTMG10 0x128 > +#define DDR_PCTL2_DRAMTMG11 0x12c > +#define DDR_PCTL2_DRAMTMG12 0x130 > +#define DDR_PCTL2_DRAMTMG13 0x134 > +#define DDR_PCTL2_DRAMTMG14 0x138 > +#define DDR_PCTL2_DRAMTMG15 0x13c > +#define DDR_PCTL2_DRAMTMG16 0x140 > +#define DDR_PCTL2_ZQCTL0 0x180 > +#define DDR_PCTL2_ZQCTL1 0x184 > +#define DDR_PCTL2_ZQCTL2 0x188 > +#define DDR_PCTL2_ZQSTAT 0x18c > +#define DDR_PCTL2_DFITMG0 0x190 > +#define DDR_PCTL2_DFITMG1 0x194 > +#define DDR_PCTL2_DFILPCFG0 0x198 > +#define DDR_PCTL2_DFILPCFG1 0x19c > +#define DDR_PCTL2_DFIUPD0 0x1a0 > +#define DDR_PCTL2_DFIUPD1 0x1a4 > +#define DDR_PCTL2_DFIUPD2 0x1a8 > +#define DDR_PCTL2_DFIMISC 0x1b0 > +#define DDR_PCTL2_DFITMG2 0x1b4 > +#define DDR_PCTL2_DFITMG3 0x1b8 > +#define DDR_PCTL2_DFISTAT 0x1bc > +#define DDR_PCTL2_DBICTL 0x1c0 > +#define DDR_PCTL2_ADDRMAP0 0x200 > +#define DDR_PCTL2_ADDRMAP1 0x204 > +#define DDR_PCTL2_ADDRMAP2 0x208 > +#define DDR_PCTL2_ADDRMAP3 0x20c > +#define DDR_PCTL2_ADDRMAP4 0x210 > +#define DDR_PCTL2_ADDRMAP5 0x214 > +#define DDR_PCTL2_ADDRMAP6 0x218 > +#define DDR_PCTL2_ADDRMAP7 0x21c > +#define DDR_PCTL2_ADDRMAP8 0x220 > +#define DDR_PCTL2_ADDRMAP9 0x224 > +#define DDR_PCTL2_ADDRMAP10 0x228 > +#define DDR_PCTL2_ADDRMAP11 0x22c > +#define DDR_PCTL2_ODTCFG 0x240 > +#define DDR_PCTL2_ODTMAP 0x244 > +#define DDR_PCTL2_SCHED 0x250 > +#define DDR_PCTL2_SCHED1 0x254 > +#define DDR_PCTL2_PERFHPR1 0x25c > +#define DDR_PCTL2_PERFLPR1 0x264 > +#define DDR_PCTL2_PERFWR1 0x26c > +#define DDR_PCTL2_DQMAP0 0x280 > +#define DDR_PCTL2_DQMAP1 0x284 > +#define DDR_PCTL2_DQMAP2 0x288 > +#define DDR_PCTL2_DQMAP3 0x28c > +#define DDR_PCTL2_DQMAP4 0x290 > +#define DDR_PCTL2_DQMAP5 0x294 > +#define DDR_PCTL2_DBG0 0x300 > +#define DDR_PCTL2_DBG1 0x304 > +#define DDR_PCTL2_DBGCAM 0x308 > +#define DDR_PCTL2_DBGCMD 0x30c > +#define DDR_PCTL2_DBGSTAT 0x310 > +#define DDR_PCTL2_SWCTL 0x320 > +#define DDR_PCTL2_SWSTAT 0x324 > +#define DDR_PCTL2_POISONCFG 0x36c > +#define DDR_PCTL2_POISONSTAT 0x370 > +#define DDR_PCTL2_ADVECCINDEX 0x374 > +#define DDR_PCTL2_ADVECCSTAT 0x378 > +#define DDR_PCTL2_PSTAT 0x3fc > +#define DDR_PCTL2_PCCFG 0x400 > +#define DDR_PCTL2_PCFGR_n 0x404 > +#define DDR_PCTL2_PCFGW_n 0x408 > +#define DDR_PCTL2_PCTRL_n 0x490 > + > +/* PCTL2_MRSTAT */ > +#define MR_WR_BUSY BIT(0) > + > +/* PHY_REG0 */ > +#define DIGITAL_DERESET BIT(3) > +#define ANALOG_DERESET BIT(2) > +#define DIGITAL_RESET (0 << 3) > +#define ANALOG_RESET (0 << 2) > + > +/* PHY_REG1 */ > +#define PHY_DDR2 (0) > +#define PHY_LPDDR2 (1) > +#define PHY_DDR3 (2) > +#define PHY_LPDDR3 (3) > +#define PHY_DDR4 (4) > +#define PHY_BL_4 (0 << 2) > +#define PHY_BL_8 BIT(2) > + > +/* PHY_REG2 */ > +#define PHY_DTT_EN BIT(0) > +#define PHY_DTT_DISB (0 << 0) > +#define PHY_WRITE_LEVELING_EN BIT(2) > +#define PHY_WRITE_LEVELING_DISB (0 << 2) > +#define PHY_SELECT_CS0 (2) > +#define PHY_SELECT_CS1 (1) > +#define PHY_SELECT_CS0_1 (0) > +#define PHY_WRITE_LEVELING_SELECTCS(n) (n << 6) > +#define PHY_DATA_TRAINING_SELECTCS(n) (n << 4) > + > +#define PHY_DDR3_RON_RTT_DISABLE (0) > +#define PHY_DDR3_RON_RTT_451ohm (1) > +#define PHY_DDR3_RON_RTT_225ohm (2) > +#define PHY_DDR3_RON_RTT_150ohm (3) > +#define PHY_DDR3_RON_RTT_112ohm (4) > +#define PHY_DDR3_RON_RTT_90ohm (5) > +#define PHY_DDR3_RON_RTT_75ohm (6) > +#define PHY_DDR3_RON_RTT_64ohm (7) > +#define PHY_DDR3_RON_RTT_56ohm (16) > +#define PHY_DDR3_RON_RTT_50ohm (17) > +#define PHY_DDR3_RON_RTT_45ohm (18) > +#define PHY_DDR3_RON_RTT_41ohm (19) > +#define PHY_DDR3_RON_RTT_37ohm (20) > +#define PHY_DDR3_RON_RTT_34ohm (21) > +#define PHY_DDR3_RON_RTT_33ohm (22) > +#define PHY_DDR3_RON_RTT_30ohm (23) > +#define PHY_DDR3_RON_RTT_28ohm (24) > +#define PHY_DDR3_RON_RTT_26ohm (25) > +#define PHY_DDR3_RON_RTT_25ohm (26) > +#define PHY_DDR3_RON_RTT_23ohm (27) > +#define PHY_DDR3_RON_RTT_22ohm (28) > +#define PHY_DDR3_RON_RTT_21ohm (29) > +#define PHY_DDR3_RON_RTT_20ohm (30) > +#define PHY_DDR3_RON_RTT_19ohm (31) > + > +#define PHY_DDR4_LPDDR3_RON_RTT_DISABLE (0) > +#define PHY_DDR4_LPDDR3_RON_RTT_480ohm (1) > +#define PHY_DDR4_LPDDR3_RON_RTT_240ohm (2) > +#define PHY_DDR4_LPDDR3_RON_RTT_160ohm (3) > +#define PHY_DDR4_LPDDR3_RON_RTT_120ohm (4) > +#define PHY_DDR4_LPDDR3_RON_RTT_96ohm (5) > +#define PHY_DDR4_LPDDR3_RON_RTT_80ohm (6) > +#define PHY_DDR4_LPDDR3_RON_RTT_68ohm (7) > +#define PHY_DDR4_LPDDR3_RON_RTT_60ohm (16) > +#define PHY_DDR4_LPDDR3_RON_RTT_53ohm (17) > +#define PHY_DDR4_LPDDR3_RON_RTT_48ohm (18) > +#define PHY_DDR4_LPDDR3_RON_RTT_43ohm (19) > +#define PHY_DDR4_LPDDR3_RON_RTT_40ohm (20) > +#define PHY_DDR4_LPDDR3_RON_RTT_37ohm (21) > +#define PHY_DDR4_LPDDR3_RON_RTT_34ohm (22) > +#define PHY_DDR4_LPDDR3_RON_RTT_32ohm (23) > +#define PHY_DDR4_LPDDR3_RON_RTT_30ohm (24) > +#define PHY_DDR4_LPDDR3_RON_RTT_28ohm (25) > +#define PHY_DDR4_LPDDR3_RON_RTT_26ohm (26) > +#define PHY_DDR4_LPDDR3_RON_RTT_25ohm (27) > +#define PHY_DDR4_LPDDR3_RON_RTT_24ohm (28) > +#define PHY_DDR4_LPDDR3_RON_RTT_22ohm (29) > +#define PHY_DDR4_LPDDR3_RON_RTT_21ohm (30) > +#define PHY_DDR4_LPDDR3_RON_RTT_20ohm (31) > + > +/* noc registers define */ > +#define DDRCONF 0x8 > +#define DDRTIMING 0xc > +#define DDRMODE 0x10 > +#define READLATENCY 0x14 > +#define AGING0 0x18 > +#define AGING1 0x1c > +#define AGING2 0x20 > +#define AGING3 0x24 > +#define AGING4 0x28 > +#define AGING5 0x2c > +#define ACTIVATE 0x38 > +#define DEVTODEV 0x3c > +#define DDR4TIMING 0x40 > + > +/* DDR GRF */ > +#define DDR_GRF_CON(n) (0 + (n) * 4) > +#define DDR_GRF_STATUS_BASE (0X100) > +#define DDR_GRF_STATUS(n) (DDR_GRF_STATUS_BASE + (n) * 4) > + > +/* CRU_SOFTRESET_CON5 */ > +#define ddrphy_psrstn_req(n) (((0x1 << 15) << 16) | (n << 15)) > +#define ddrphy_srstn_req(n) (((0x1 << 14) << 16) | (n << 14)) > +#define ddrctrl_psrstn_req(n) (((0x1 << 13) << 16) | (n << 13)) > +#define ddrctrl_srstn_req(n) (((0x1 << 12) << 16) | (n << 12)) > +#define ddrmsch_srstn_req(n) (((0x1 << 11) << 16) | (n << 11)) > +#define msch_srstn_req(n) (((0x1 << 9) << 16) | (n << 9)) > +#define dfimon_srstn_req(n) (((0x1 << 8) << 16) | (n << 8)) > +#define grf_ddr_srstn_req(n) (((0x1 << 7) << 16) | (n << 7)) > +/* CRU_SOFTRESET_CON9 */ > +#define ddrctrl_asrstn_req(n) (((0x1 << 9) << 16) | (n << 9)) > + > +/* CRU register */ > +#define CRU_PLL_CON(pll_id, n) ((pll_id) * 0x20 + (n) * 4) > +#define CRU_MODE (0x80) > +#define CRU_GLB_CNT_TH (0x90) > +#define CRU_CLKSEL_CON_BASE 0x100 > +#define CRU_CLKSELS_CON(i) (CRU_CLKSEL_CON_BASE + ((i) * 4)) > +#define CRU_CLKGATE_CON_BASE 0x200 > +#define CRU_CLKGATE_CON(i) (CRU_CLKGATE_CON_BASE + ((i) * 4)) > +#define CRU_CLKSFTRST_CON_BASE 0x300 > +#define CRU_CLKSFTRST_CON(i) (CRU_CLKSFTRST_CON_BASE + ((i) * 4)) > + > +/* CRU_PLL_CON0 */ > +#define PB(n) ((0x1 << (15 + 16)) | ((n) << 15)) > +#define POSTDIV1(n) ((0x7 << (12 + 16)) | ((n) << 12)) > +#define FBDIV(n) ((0xFFF << 16) | (n)) > + > +/* CRU_PLL_CON1 */ > +#define RSTMODE(n) ((0x1 << (15 + 16)) | ((n) << 15)) > +#define RST(n) ((0x1 << (14 + 16)) | ((n) << 14)) > +#define PD(n) ((0x1 << (13 + 16)) | ((n) << 13)) > +#define DSMPD(n) ((0x1 << (12 + 16)) | ((n) << 12)) > +#define LOCK(n) (((n) >> 10) & 0x1) > +#define POSTDIV2(n) ((0x7 << (6 + 16)) | ((n) << 6)) > +#define REFDIV(n) ((0x3F << 16) | (n)) > + > +union noc_ddrtiming { > + u32 d32; > + struct { > + unsigned acttoact:6; > + unsigned rdtomiss:6; > + unsigned wrtomiss:6; > + unsigned burstlen:3; > + unsigned rdtowr:5; > + unsigned wrtord:5; > + unsigned bwratio:1; > + } b; > +} NOC_TIMING_T; > + > +union noc_activate { > + u32 d32; > + struct { > + unsigned rrd:4; > + unsigned faw:6; > + unsigned fawbank:1; > + unsigned reserved1:21; > + } b; > +}; > + > +union noc_devtodev { > + u32 d32; > + struct { > + unsigned busrdtord:2; > + unsigned busrdtowr:2; > + unsigned buswrtord:2; > + unsigned reserved2:26; > + } b; > +}; > + > +union noc_ddr4timing { > + u32 d32; > + struct { > + unsigned ccdl:3; > + unsigned wrtordl:5; > + unsigned rrdl:4; > + unsigned reserved2:20; > + } b; > +}; > + > +union noc_ddrmode { > + u32 d32; > + struct { > + unsigned autoprecharge:1; > + unsigned bwratioextended:1; > + unsigned reserved3:30; > + } b; > +}; > + > +u32 addrmap[21][9] = { > + /* map0 map1 map2 map3 map4 map5 map6 map7 map8 */ > + {22, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x06060606, > + 0x06060606, 0x00000f0f, 0x3f3f}, > + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x3f3f}, > + {23, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, > + 0x0f080808, 0x00000f0f, 0x3f3f}, > + {24, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, > + 0x08080808, 0x00000f0f, 0x3f3f}, > + {24, 0x000a0a0a, 0x00000000, 0x00000000, 0x00000000, 0x09090909, > + 0x0f090909, 0x00000f0f, 0x3f3f}, > + {6, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x3f3f}, > + {7, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x3f3f}, > + {8, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x09090909, > + 0x0f090909, 0x00000f0f, 0x3f3f}, > + {22, 0x001f0808, 0x00000000, 0x00000000, 0x00001f1f, 0x06060606, > + 0x06060606, 0x00000f0f, 0x3f3f}, > + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, > + 0x0f070707, 0x00000f0f, 0x3f3f}, > + > + {24, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x0801}, > + {23, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, > + 0x0f080808, 0x00000f0f, 0x0801}, > + {24, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f07, 0x0700}, > + {23, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x0700}, > + {24, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f07, 0x3f01}, > + {23, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x3f01}, > + {24, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x06060606, > + 0x06060606, 0x00000f06, 0x3f00}, > + {8, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x09090909, > + 0x0f090909, 0x00000f0f, 0x0801}, > + {7, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x0700}, > + {7, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x3f01}, > + > + {6, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f07, 0x3f00} > +}; > + > +struct rk3328_msch_timings { > + union noc_ddrtiming ddrtiming; > + union noc_ddrmode ddrmode; > + u32 readlatency; > + union noc_activate activate; > + union noc_devtodev devtodev; > + union noc_ddr4timing ddr4timing; > + u32 agingx0; > +}; > + > +struct rk3328_msch_regs { > + u32 coreid; > + u32 revisionid; > + u32 ddrconf; > + u32 ddrtiming; > + u32 ddrmode; > + u32 readlatency; > + u32 aging0; > + u32 aging1; > + u32 aging2; > + u32 aging3; > + u32 aging4; > + u32 aging5; > + u32 reserved[2]; > + u32 activate; > + u32 devtodev; > + u32 ddr4_timing; > +}; > + > +struct rk3328_ddr_grf_regs { > + u32 ddr_grf_con[4]; > + u32 reserved[(0x100 - 0x10) / 4]; > + u32 ddr_grf_status[11]; > +}; > + > +struct rk3328_ddr_pctl_regs { > + u32 pctl[30][2]; > +}; > + > +struct rk3328_ddr_phy_regs { > + u32 phy[5][2]; > +}; > + > +struct rk3328_ddr_skew { > + u32 a0_a1_skew[15]; > + u32 cs0_dm0_skew[11]; > + u32 cs0_dm1_skew[11]; > + u32 cs0_dm2_skew[11]; > + u32 cs0_dm3_skew[11]; > + u32 cs1_dm0_skew[11]; > + u32 cs1_dm1_skew[11]; > + u32 cs1_dm2_skew[11]; > + u32 cs1_dm3_skew[11]; > +}; > + > +struct rk3328_sdram_channel { > + unsigned int rank; > + unsigned int col; > + /* 3:8bank, 2:4bank */ > + unsigned int bk; > + /* channel buswidth, 2:32bit, 1:16bit, 0:8bit */ > + unsigned int bw; > + /* die buswidth, 2:32bit, 1:16bit, 0:8bit */ > + unsigned int dbw; > + unsigned int row_3_4; > + unsigned int cs0_row; > + unsigned int cs1_row; > + unsigned int ddrconfig; > + struct rk3328_msch_timings noc_timings; > +}; > + > +struct rk3328_sdram_params { > + struct rk3328_sdram_channel ch; > + unsigned int ddr_freq; > + unsigned int dramtype; > + unsigned int odt; > + struct rk3328_ddr_pctl_regs pctl_regs; > + struct rk3328_ddr_phy_regs phy_regs; > + struct rk3328_ddr_skew skew; > +}; > + > +#define PHY_REG(base, n) (base + 4 * (n)) > + > +#endif > diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c > index f4e0b18447..656696ac3c 100644 > --- a/drivers/ram/rockchip/sdram_rk3328.c > +++ b/drivers/ram/rockchip/sdram_rk3328.c > @@ -2,22 +2,1029 @@ > /* > * (C) Copyright 2017 Rockchip Electronics Co., Ltd. > */ > - > #include <common.h> > +#include <clk.h> > +#include <debug_uart.h> > #include <dm.h> > +#include <dt-structs.h> > #include <ram.h> > +#include <regmap.h> > #include <syscon.h> > +#include <asm/io.h> > #include <asm/arch-rockchip/clock.h> > +#include <asm/arch-rockchip/cru_rk3328.h> > #include <asm/arch-rockchip/grf_rk3328.h> > #include <asm/arch-rockchip/sdram_common.h> > +#include <asm/arch-rockchip/sdram_rk3328.h> > +#include <asm/arch-rockchip/uart.h> > > struct dram_info { > +#ifdef CONFIG_TPL_BUILD > + struct rk3328_ddr_pctl_regs *pctl; > + struct rk3328_ddr_phy_regs *phy; > + struct clk ddr_clk; > + struct rk3328_cru *cru; > + struct rk3328_msch_regs *msch; > + struct rk3328_ddr_grf_regs *ddr_grf; > +#endif > struct ram_info info; > struct rk3328_grf_regs *grf; > }; > > +#ifdef CONFIG_TPL_BUILD > + > +struct rk3328_sdram_channel sdram_ch; > + > +struct rockchip_dmc_plat { > +#if CONFIG_IS_ENABLED(OF_PLATDATA) > + struct dtd_rockchip_rk3328_dmc dtplat; > +#else > + struct rk3328_sdram_params sdram_params; > +#endif > + struct regmap *map; > +}; > + > +#if CONFIG_IS_ENABLED(OF_PLATDATA) > +static int conv_of_platdata(struct udevice *dev) > +{ > + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); > + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; > + int ret; > + > + ret = regmap_init_mem_platdata(dev, dtplat->reg, > + ARRAY_SIZE(dtplat->reg) / 2, > + &plat->map); > + if (ret) > + return ret; > + > + return 0; > +} > +#endif > + > +static void rkclk_ddr_reset(struct dram_info *dram, > + u32 ctl_srstn, u32 ctl_psrstn, > + u32 phy_srstn, u32 phy_psrstn) > +{ > + writel(ddrctrl_srstn_req(ctl_srstn) | ddrctrl_psrstn_req(ctl_psrstn) | > + ddrphy_srstn_req(phy_srstn) | ddrphy_psrstn_req(phy_psrstn), > + &dram->cru->softrst_con[5]); > + writel(ddrctrl_asrstn_req(ctl_srstn), &dram->cru->softrst_con[9]); > +} > + > +static void rkclk_set_dpll(struct dram_info *dram, unsigned int mhz) > +{ > + unsigned int refdiv, postdiv1, postdiv2, fbdiv; > + int delay = 1000; > + > + refdiv = 1; > + if (mhz <= 300) { > + postdiv1 = 4; > + postdiv2 = 2; > + } else if (mhz <= 400) { > + postdiv1 = 6; > + postdiv2 = 1; > + } else if (mhz <= 600) { > + postdiv1 = 4; > + postdiv2 = 1; > + } else if (mhz <= 800) { > + postdiv1 = 3; > + postdiv2 = 1; > + } else if (mhz <= 1600) { > + postdiv1 = 2; > + postdiv2 = 1; > + } else { > + postdiv1 = 1; > + postdiv2 = 1; > + } > + fbdiv = (mhz * refdiv * postdiv1 * postdiv2) / 24; > + > + writel(((0x1 << 4) << 16) | (0 << 4), &dram->cru->mode_con); > + writel(POSTDIV1(postdiv1) | FBDIV(fbdiv), &dram->cru->dpll_con[0]); > + writel(DSMPD(1) | POSTDIV2(postdiv2) | REFDIV(refdiv), > + &dram->cru->dpll_con[1]); > + > + while (delay > 0) { > + udelay(1); > + if (LOCK(readl(&dram->cru->dpll_con[1]))) > + break; > + delay--; > + } > + > + writel(((0x1 << 4) << 16) | (1 << 4), &dram->cru->mode_con); > +} > + > +static void rkclk_configure_ddr(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + void __iomem *phy_base = dram->phy; > + > + /* choose DPLL for ddr clk source */ > + clrbits_le32(PHY_REG(phy_base, 0xef), 1 << 7); > + > + /* for inno ddr phy need 2*freq */ > + rkclk_set_dpll(dram, sdram_params->ddr_freq * 2); > +} > + > +static void phy_soft_reset(struct dram_info *dram) > +{ > + void __iomem *phy_base = dram->phy; > + > + clrbits_le32(PHY_REG(phy_base, 0), 0x3 << 2); > + udelay(1); > + setbits_le32(PHY_REG(phy_base, 0), ANALOG_DERESET); > + udelay(5); > + setbits_le32(PHY_REG(phy_base, 0), DIGITAL_DERESET); > + udelay(1); > +} > + > +static int pctl_cfg(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 i; > + void __iomem *pctl_base = dram->pctl; > + > + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { > + writel(sdram_params->pctl_regs.pctl[i][1], > + pctl_base + sdram_params->pctl_regs.pctl[i][0]); > + } > + clrsetbits_le32(pctl_base + DDR_PCTL2_PWRTMG, > + (0xff << 16) | 0x1f, > + ((SR_IDLE & 0xff) << 16) | (PD_IDLE & 0x1f)); > + /* > + * dfi_lp_en_pd=1,dfi_lp_wakeup_pd=2 > + * hw_lp_idle_x32=1 > + */ > + if (sdram_params->dramtype == LPDDR3) { > + setbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, 1); > + clrsetbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, > + 0xf << 4, > + 2 << 4); > + } > + clrsetbits_le32(pctl_base + DDR_PCTL2_HWLPCTL, > + 0xfff << 16, > + 1 << 16); > + /* disable zqcs */ > + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1u << 31); > + setbits_le32(pctl_base + 0x2000 + DDR_PCTL2_ZQCTL0, 1u << 31); > + > + return 0; > +} > + > +/* return ddrconfig value > + * (-1), find ddrconfig fail > + * other, the ddrconfig value > + * only support cs0_row >= cs1_row > + */ > +static unsigned int calculate_ddrconfig(struct rk3328_sdram_params *sdram_params) > +{ > + static const u16 ddr_cfg_2_rbc[] = { > + /*************************** > + * [5:4] row(13+n) > + * [3] cs(0:0 cs, 1:2 cs) > + * [2] bank(0:0bank,1:8bank) > + * [1:0] col(11+n) > + ****************************/ > + /* row, cs, bank, col */ > + ((3 << 4) | (0 << 3) | (1 << 2) | 0), > + ((3 << 4) | (0 << 3) | (1 << 2) | 1), > + ((2 << 4) | (0 << 3) | (1 << 2) | 2), > + ((3 << 4) | (0 << 3) | (1 << 2) | 2), > + ((2 << 4) | (0 << 3) | (1 << 2) | 3), > + ((3 << 4) | (1 << 3) | (1 << 2) | 0), > + ((3 << 4) | (1 << 3) | (1 << 2) | 1), > + ((2 << 4) | (1 << 3) | (1 << 2) | 2), > + ((3 << 4) | (0 << 3) | (0 << 2) | 1), > + ((2 << 4) | (0 << 3) | (1 << 2) | 1), > + }; > + > + static const u16 ddr4_cfg_2_rbc[] = { > + /*************************** > + * [6] cs 0:0cs 1:2 cs > + * [5:3] row(13+n) > + * [2] cs(0:0 cs, 1:2 cs) > + * [1] bw 0: 16bit 1:32bit > + * [0] diebw 0:8bit 1:16bit > + ***************************/ > + /* cs, row, cs, bw, diebw */ > + ((0 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 0), > + ((1 << 6) | (2 << 3) | (0 << 2) | (1 << 1) | 0), > + ((0 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 0), > + ((1 << 6) | (3 << 3) | (0 << 2) | (0 << 1) | 0), > + ((0 << 6) | (4 << 3) | (0 << 2) | (1 << 1) | 1), > + ((1 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 1), > + ((1 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 1), > + ((0 << 6) | (2 << 3) | (1 << 2) | (1 << 1) | 0), > + ((0 << 6) | (3 << 3) | (1 << 2) | (0 << 1) | 0), > + ((0 << 6) | (3 << 3) | (1 << 2) | (1 << 1) | 1), > + ((0 << 6) | (4 << 3) | (1 << 2) | (0 << 1) | 1), > + }; > + > + u32 cs, bw, die_bw, col, row, bank; > + u32 i, tmp; > + u32 ddrconf = -1; > + > + cs = sdram_ch.rank; > + bw = sdram_ch.bw; > + die_bw = sdram_ch.dbw; > + col = sdram_ch.col; > + row = sdram_ch.cs0_row; > + bank = sdram_ch.bk; > + > + if (sdram_params->dramtype == DDR4) { > + tmp = ((cs - 1) << 6) | ((row - 13) << 3) | (bw & 0x2) | die_bw; > + for (i = 10; i < 17; i++) { > + if (((tmp & 0x7) == (ddr4_cfg_2_rbc[i - 10] & 0x7)) && > + ((tmp & 0x3c) <= (ddr4_cfg_2_rbc[i - 10] & 0x3c)) && > + ((tmp & 0x40) <= (ddr4_cfg_2_rbc[i - 10] & 0x40))) { > + ddrconf = i; > + goto out; > + } > + } > + } else { > + if (bank == 2) { > + ddrconf = 8; > + goto out; > + } > + > + tmp = ((row - 13) << 4) | (1 << 2) | ((bw + col - 11) << 0); > + for (i = 0; i < 5; i++) > + if (((tmp & 0xf) == (ddr_cfg_2_rbc[i] & 0xf)) && > + ((tmp & 0x30) <= (ddr_cfg_2_rbc[i] & 0x30))) { > + ddrconf = i; > + goto out; > + } > + } > + > +out: > + if (ddrconf > 20) > + printf("calculate_ddrconfig error\n"); > + > + return ddrconf; > +} > + > +/* n: Unit bytes */ > +static void copy_to_reg(u32 *dest, u32 *src, u32 n) > +{ > + int i; > + > + for (i = 0; i < n / sizeof(u32); i++) { > + writel(*src, dest); > + src++; > + dest++; > + } > +} > + > +/******* > + * calculate controller dram address map, and setting to register. > + * argument sdram_ch.ddrconf must be right value before > + * call this function. > + *******/ > +static void set_ctl_address_map(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + copy_to_reg((u32 *)(pctl_base + DDR_PCTL2_ADDRMAP0), > + &addrmap[sdram_ch.ddrconfig][0], 9 * 4); > + if (sdram_params->dramtype == LPDDR3 && sdram_ch.row_3_4) > + setbits_le32(pctl_base + DDR_PCTL2_ADDRMAP6, 1 << 31); > + if (sdram_params->dramtype == DDR4 && sdram_ch.bw == 0x1) > + setbits_le32(pctl_base + DDR_PCTL2_PCCFG, 1 << 8); > + > + if (sdram_ch.rank == 1) > + clrsetbits_le32(pctl_base + DDR_PCTL2_ADDRMAP0, 0x1f, 0x1f); > +} > + > +static void phy_dll_bypass_set(struct dram_info *dram, u32 freq) > +{ > + u32 tmp; > + void __iomem *phy_base = dram->phy; > + > + setbits_le32(PHY_REG(phy_base, 0x13), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x14), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x26), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x27), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x36), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x37), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x46), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x47), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x56), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x57), 1 << 3); > + > + if (freq <= (400 * MHz)) > + /* DLL bypass */ > + setbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); > + else > + clrbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); > + if (freq <= (680 * MHz)) > + tmp = 2; > + else > + tmp = 1; > + writel(tmp, PHY_REG(phy_base, 0x28)); > + writel(tmp, PHY_REG(phy_base, 0x38)); > + writel(tmp, PHY_REG(phy_base, 0x48)); > + writel(tmp, PHY_REG(phy_base, 0x58)); > +} > + > +static void set_ds_odt(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 cmd_drv, clk_drv, dqs_drv, dqs_odt; > + void __iomem *phy_base = dram->phy; > + > + if (sdram_params->dramtype == DDR3) { > + cmd_drv = PHY_DDR3_RON_RTT_34ohm; > + clk_drv = PHY_DDR3_RON_RTT_45ohm; > + dqs_drv = PHY_DDR3_RON_RTT_34ohm; > + dqs_odt = PHY_DDR3_RON_RTT_225ohm; > + } else { > + cmd_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; > + clk_drv = PHY_DDR4_LPDDR3_RON_RTT_43ohm; > + dqs_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; > + dqs_odt = PHY_DDR4_LPDDR3_RON_RTT_240ohm; > + } > + /* DS */ > + writel(cmd_drv, PHY_REG(phy_base, 0x11)); > + clrsetbits_le32(PHY_REG(phy_base, 0x12), 0x1f << 3, cmd_drv << 3); > + writel(clk_drv, PHY_REG(phy_base, 0x16)); > + writel(clk_drv, PHY_REG(phy_base, 0x18)); > + writel(dqs_drv, PHY_REG(phy_base, 0x20)); > + writel(dqs_drv, PHY_REG(phy_base, 0x2f)); > + writel(dqs_drv, PHY_REG(phy_base, 0x30)); > + writel(dqs_drv, PHY_REG(phy_base, 0x3f)); > + writel(dqs_drv, PHY_REG(phy_base, 0x40)); > + writel(dqs_drv, PHY_REG(phy_base, 0x4f)); > + writel(dqs_drv, PHY_REG(phy_base, 0x50)); > + writel(dqs_drv, PHY_REG(phy_base, 0x5f)); > + /* ODT */ > + writel(dqs_odt, PHY_REG(phy_base, 0x21)); > + writel(dqs_odt, PHY_REG(phy_base, 0x2e)); > + writel(dqs_odt, PHY_REG(phy_base, 0x31)); > + writel(dqs_odt, PHY_REG(phy_base, 0x3e)); > + writel(dqs_odt, PHY_REG(phy_base, 0x41)); > + writel(dqs_odt, PHY_REG(phy_base, 0x4e)); > + writel(dqs_odt, PHY_REG(phy_base, 0x51)); > + writel(dqs_odt, PHY_REG(phy_base, 0x5e)); > +} > + > +static void phy_cfg(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 i; > + void __iomem *phy_base = dram->phy; > + > + phy_dll_bypass_set(dram, sdram_params->ddr_freq); > + for (i = 0; sdram_params->phy_regs.phy[i][0] != 0xFFFFFFFF; i++) { > + writel(sdram_params->phy_regs.phy[i][1], > + phy_base + sdram_params->phy_regs.phy[i][0]); > + } > + if (sdram_ch.bw == 2) { > + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 0xf << 4); > + } else { > + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 3 << 4); > + /* disable DQS2,DQS3 tx dll for saving power */ > + clrbits_le32(PHY_REG(phy_base, 0x46), 1 << 3); > + clrbits_le32(PHY_REG(phy_base, 0x56), 1 << 3); > + } > + set_ds_odt(dram, sdram_params); > + /* deskew */ > + setbits_le32(PHY_REG(phy_base, 2), 8); > + copy_to_reg(PHY_REG(phy_base, 0xb0), > + &sdram_params->skew.a0_a1_skew[0], 15 * 4); > + copy_to_reg(PHY_REG(phy_base, 0x70), > + &sdram_params->skew.cs0_dm0_skew[0], 44 * 4); > + copy_to_reg(PHY_REG(phy_base, 0xc0), > + &sdram_params->skew.cs0_dm1_skew[0], 44 * 4); > +} > + > +static int update_refresh_reg(struct dram_info *dram) > +{ > + void __iomem *pctl_base = dram->pctl; > + u32 ret; > + > + ret = readl(pctl_base + DDR_PCTL2_RFSHCTL3) ^ (1 << 1); > + writel(ret, pctl_base + DDR_PCTL2_RFSHCTL3); > + > + return 0; > +} > + > +static int data_training(struct dram_info *dram, u32 cs, u32 dramtype) > +{ > + u32 ret; > + u32 dis_auto_zq = 0; > + void __iomem *pctl_base = dram->pctl; > + void __iomem *phy_base = dram->phy; > + > + /* disable zqcs */ > + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & > + (1ul << 31))) { > + dis_auto_zq = 1; > + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + } > + /* disable auto refresh */ > + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + if (dramtype == DDR4) { > + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0); > + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0); > + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0); > + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0); > + } > + /* choose training cs */ > + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs)); > + /* enable gate training */ > + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 1); > + udelay(50); > + ret = readl(PHY_REG(phy_base, 0xff)); > + /* disable gate training */ > + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 0); > + /* restore zqcs */ > + if (dis_auto_zq) > + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + /* restore auto refresh */ > + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + if (dramtype == DDR4) { > + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0x2); > + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0x2); > + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0x2); > + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0x2); > + } > + > + if (ret & 0x10) { > + ret = -1; > + } else { > + ret = (ret & 0xf) ^ (readl(PHY_REG(phy_base, 0)) >> 4); > + ret = (ret == 0) ? 0 : -1; > + } > + return ret; > +} > + > +/* rank = 1: cs0 > + * rank = 2: cs1 > + * rank = 3: cs0 & cs1 > + * note: be careful of keep mr original val > + */ > +static int write_mr(struct dram_info *dram, u32 rank, u32 mr_num, u32 arg, > + u32 dramtype) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) > + continue; > + if (dramtype == DDR3 || dramtype == DDR4) { > + writel((mr_num << 12) | (rank << 4) | (0 << 0), > + pctl_base + DDR_PCTL2_MRCTRL0); > + writel(arg, pctl_base + DDR_PCTL2_MRCTRL1); > + } else { > + writel((rank << 4) | (0 << 0), > + pctl_base + DDR_PCTL2_MRCTRL0); > + writel((mr_num << 8) | (arg & 0xff), > + pctl_base + DDR_PCTL2_MRCTRL1); > + } > + > + setbits_le32(pctl_base + DDR_PCTL2_MRCTRL0, 1u << 31); > + while (readl(pctl_base + DDR_PCTL2_MRCTRL0) & (1u << 31)) > + continue; > + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) > + continue; > + > + return 0; > +} > + > +/* > + * rank : 1:cs0, 2:cs1, 3:cs0&cs1 > + * vrefrate: 4500: 45%, > + */ > +static int write_vrefdq(struct dram_info *dram, u32 rank, u32 vrefrate, > + u32 dramtype) > +{ > + u32 tccd_l, value; > + u32 dis_auto_zq = 0; > + void __iomem *pctl_base = dram->pctl; > + > + if (dramtype != DDR4 || vrefrate < 4500 || vrefrate > 9200) > + return -1; > + > + tccd_l = (readl(pctl_base + DDR_PCTL2_DRAMTMG4) >> 16) & 0xf; > + tccd_l = (tccd_l - 4) << 10; > + > + if (vrefrate > 7500) { > + /* range 1 */ > + value = ((vrefrate - 6000) / 65) | tccd_l; > + } else { > + /* range 2 */ > + value = ((vrefrate - 4500) / 65) | tccd_l | (1 << 6); > + } > + > + /* disable zqcs */ > + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & > + (1ul << 31))) { > + dis_auto_zq = 1; > + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + } > + /* disable auto refresh */ > + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + /* enable vrefdq calibratin */ > + write_mr(dram, rank, 6, value | (1 << 7), dramtype); > + udelay(1);/* tvrefdqe */ > + /* write vrefdq value */ > + write_mr(dram, rank, 6, value | (1 << 7), dramtype); > + udelay(1);/* tvref_time */ > + write_mr(dram, rank, 6, value | (0 << 7), dramtype); > + udelay(1);/* tvrefdqx */ > + > + /* restore zqcs */ > + if (dis_auto_zq) > + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + /* restore auto refresh */ > + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + return 0; > +} > + > +#define _MAX_(x, y) ((x) > (y) ? (x) : (y)) > + > +static void rx_deskew_switch_adjust(struct dram_info *dram) > +{ > + u32 i, deskew_val; > + u32 gate_val = 0; > + void __iomem *phy_base = dram->phy; > + > + for (i = 0; i < 4; i++) > + gate_val = _MAX_(readl(PHY_REG(phy_base, 0xfb + i)), gate_val); > + > + deskew_val = (gate_val >> 3) + 1; > + deskew_val = (deskew_val > 0x1f) ? 0x1f : deskew_val; > + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0xc, (deskew_val & 0x3) << 2); > + clrsetbits_le32(PHY_REG(phy_base, 0x6f), 0x7 << 4, > + (deskew_val & 0x1c) << 2); > +} > + > +#undef _MAX_ > + > +static void tx_deskew_switch_adjust(struct dram_info *dram) > +{ > + void __iomem *phy_base = dram->phy; > + > + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0x3, 1); > +} > + > +static void set_ddrconfig(struct dram_info *dram, u32 ddrconfig) > +{ > + writel(ddrconfig, &dram->msch->ddrconf); > +} > + > +static void dram_all_config(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 sys_reg = 0, tmp = 0; > + > + set_ddrconfig(dram, sdram_ch.ddrconfig); > + > + sys_reg |= SYS_REG_ENC_DDRTYPE(sdram_params->dramtype); > + sys_reg |= SYS_REG_ENC_ROW_3_4(sdram_ch.row_3_4, 0); > + sys_reg |= SYS_REG_ENC_RANK(sdram_ch.rank, 0); > + sys_reg |= SYS_REG_ENC_COL(sdram_ch.col, 0); > + sys_reg |= SYS_REG_ENC_BK(sdram_ch.bk, 0); > + SYS_REG_ENC_CS0_ROW(sdram_ch.cs0_row, sys_reg, tmp, 0); > + if (sdram_ch.cs1_row) > + SYS_REG_ENC_CS1_ROW(sdram_ch.cs1_row, sys_reg, tmp, 0); > + sys_reg |= SYS_REG_ENC_BW(sdram_ch.bw, 0); > + sys_reg |= SYS_REG_ENC_DBW(sdram_ch.dbw, 0); > + > + writel(sys_reg, &dram->grf->os_reg[2]); > + > + writel(sdram_ch.noc_timings.ddrtiming.d32, &dram->msch->ddrtiming); > + > + writel(sdram_ch.noc_timings.ddrmode.d32, &dram->msch->ddrmode); > + writel(sdram_ch.noc_timings.readlatency, &dram->msch->readlatency); > + > + writel(sdram_ch.noc_timings.activate.d32, &dram->msch->activate); > + writel(sdram_ch.noc_timings.devtodev.d32, &dram->msch->devtodev); > + writel(sdram_ch.noc_timings.ddr4timing.d32, &dram->msch->ddr4_timing); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging0); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging1); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging2); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging3); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging4); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging5); > +} > + > +static void enable_low_power(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + /* enable upctl2 axi clock auto gating */ > + writel(0x00800000, &dram->ddr_grf->ddr_grf_con[0]); > + writel(0x20012001, &dram->ddr_grf->ddr_grf_con[2]); > + /* enable upctl2 core clock auto gating */ > + writel(0x001e001a, &dram->ddr_grf->ddr_grf_con[2]); > + /* enable sr, pd */ > + if (PD_IDLE == 0) > + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); > + else > + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); > + if (SR_IDLE == 0) > + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); > + else > + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); > + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 3)); > +} > + > +static int sdram_init(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params, u32 pre_init) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + rkclk_ddr_reset(dram, 1, 1, 1, 1); > + udelay(10); > + /* > + * dereset ddr phy psrstn to config pll, > + * if using phy pll psrstn must be dereset > + * before config pll > + */ > + rkclk_ddr_reset(dram, 1, 1, 1, 0); > + rkclk_configure_ddr(dram, sdram_params); > + if (pre_init == 0) { > + switch (sdram_params->dramtype) { > + case DDR3: > + printf("DDR3\n"); > + break; > + case DDR4: > + printf("DDR4\n"); > + break; > + case LPDDR3: > + default: > + printf("LPDDR3\n"); > + break; > + } > + } > + /* release phy srst to provide clk to ctrl */ > + rkclk_ddr_reset(dram, 1, 1, 0, 0); > + udelay(10); > + phy_soft_reset(dram); > + /* release ctrl presetn, and config ctl registers */ > + rkclk_ddr_reset(dram, 1, 0, 0, 0); > + pctl_cfg(dram, sdram_params); > + sdram_ch.ddrconfig = calculate_ddrconfig(sdram_params); > + set_ctl_address_map(dram, sdram_params); > + phy_cfg(dram, sdram_params); > + > + /* enable dfi_init_start to init phy after ctl srstn deassert */ > + setbits_le32(pctl_base + DDR_PCTL2_DFIMISC, (1 << 5) | (1 << 4)); > + rkclk_ddr_reset(dram, 0, 0, 0, 0); > + /* wait for dfi_init_done and dram init complete */ > + while ((readl(pctl_base + DDR_PCTL2_STAT) & 0x7) == 0) > + continue; > + > + /* do ddr gate training */ > + if (data_training(dram, 0, sdram_params->dramtype) != 0) { > + printf("data training error\n"); > + return -1; > + } > + > + if (sdram_params->dramtype == DDR4) > + write_vrefdq(dram, 0x3, 5670, sdram_params->dramtype); > + > + if (pre_init == 0) { > + rx_deskew_switch_adjust(dram); > + tx_deskew_switch_adjust(dram); > + } > + > + dram_all_config(dram, sdram_params); > + enable_low_power(dram, sdram_params); > + > + return 0; > +} > + > +static u64 dram_detect_cap(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params, > + unsigned char channel) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + /* > + * for ddr3: ddrconf = 3 > + * for ddr4: ddrconf = 12 > + * for lpddr3: ddrconf = 3 > + * default bw = 1 > + */ > + u32 bk, bktmp; > + u32 col, coltmp; > + u32 row, rowtmp, row_3_4; > + void __iomem *test_addr, *test_addr1; > + u32 dbw; > + u32 cs; > + u32 bw = 1; > + u64 cap = 0; > + u32 dram_type = sdram_params->dramtype; > + u32 pwrctl; > + > + if (dram_type != DDR4) { > + /* detect col and bk for ddr3/lpddr3 */ > + coltmp = 12; > + bktmp = 3; > + rowtmp = 16; > + > + for (col = coltmp; col >= 9; col -= 1) { > + writel(0, SDRAM_ADDR); > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (col + bw - 1ul))); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + break; > + } > + if (col == 8) { > + printf("col error\n"); > + goto cap_err; > + } > + > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (coltmp + bktmp + bw - 1ul))); > + writel(0, SDRAM_ADDR); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + bk = 3; > + else > + bk = 2; > + if (dram_type == LPDDR3) > + dbw = 2; > + else > + dbw = 1; > + } else { > + /* detect bg for ddr4 */ > + coltmp = 10; > + bktmp = 4; > + rowtmp = 17; > + > + col = 10; > + bk = 2; > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (coltmp + bw + 1ul))); > + writel(0, SDRAM_ADDR); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + dbw = 0; > + else > + dbw = 1; > + } > + /* detect row */ > + for (row = rowtmp; row > 12; row--) { > + writel(0, SDRAM_ADDR); > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (row + bktmp + coltmp + bw - 1ul))); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + break; > + } > + if (row == 12) { > + printf("row error"); > + goto cap_err; > + } > + /* detect row_3_4 */ > + test_addr = SDRAM_ADDR; > + test_addr1 = (void __iomem *)(SDRAM_ADDR + > + (0x3ul << (row + bktmp + coltmp + bw - 1ul - 1ul))); > + > + writel(0, test_addr); > + writel(PATTERN, test_addr1); > + if ((readl(test_addr) == 0) && > + (readl(test_addr1) == PATTERN)) > + row_3_4 = 0; > + else > + row_3_4 = 1; > + > + /* disable auto low-power */ > + pwrctl = readl(pctl_base + DDR_PCTL2_PWRCTL); > + writel(0, pctl_base + DDR_PCTL2_PWRCTL); > + > + /* bw and cs detect using phy read gate training */ > + if (data_training(dram, 1, dram_type) == 0) > + cs = 1; > + else > + cs = 0; > + > + bw = 2; > + > + /* restore auto low-power */ > + writel(pwrctl, pctl_base + DDR_PCTL2_PWRCTL); > + > + sdram_ch.rank = cs + 1; > + sdram_ch.col = col; > + sdram_ch.bk = bk; > + sdram_ch.dbw = dbw; > + sdram_ch.bw = bw; > + sdram_ch.cs0_row = row; > + if (cs) > + sdram_ch.cs1_row = row; > + else > + sdram_ch.cs1_row = 0; > + sdram_ch.row_3_4 = row_3_4; > + > + if (dram_type == DDR4) > + cap = 1llu << (cs + row + bk + col + ((dbw == 0) ? 2 : 1) + bw); > + else > + cap = 1llu << (cs + row + bk + col + bw); > + > + return cap; > + > +cap_err: > + return 0; > +} > + > +static u32 remodify_sdram_params(struct rk3328_sdram_params *sdram_params) > +{ > + u32 tmp = 0, tmp_adr = 0, i; > + > + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { > + if (sdram_params->pctl_regs.pctl[i][0] == 0) { > + tmp = sdram_params->pctl_regs.pctl[i][1];/* MSTR */ > + tmp_adr = i; > + } > + } > + > + tmp &= ~((3ul << 30) | (3ul << 24) | (3ul << 12)); > + > + switch (sdram_ch.dbw) { > + case 2: > + tmp |= (3ul << 30); > + break; > + case 1: > + tmp |= (2ul << 30); > + break; > + case 0: > + default: > + tmp |= (1ul << 30); > + break; > + } > + > + if (sdram_ch.rank == 2) > + tmp |= 3 << 24; > + else > + tmp |= 1 << 24; > + > + tmp |= (2 - sdram_ch.bw) << 12; > + > + sdram_params->pctl_regs.pctl[tmp_adr][1] = tmp; > + > + if (sdram_ch.bw == 2) > + sdram_ch.noc_timings.ddrtiming.b.bwratio = 0; > + else > + sdram_ch.noc_timings.ddrtiming.b.bwratio = 1; > + > + return 0; > +} > + > +static int dram_detect_cs1_row(struct rk3328_sdram_params *sdram_params, > + unsigned char channel) > +{ > + u32 ret = 0; > + u32 cs1_bit; > + void __iomem *test_addr, *cs1_addr; > + u32 row, bktmp, coltmp, bw; > + u32 ddrconf = sdram_ch.ddrconfig; > + > + if (sdram_ch.rank == 2) { > + cs1_bit = addrmap[ddrconf][0] + 8; > + > + if (cs1_bit > 31) > + goto out; > + > + cs1_addr = (void __iomem *)(1ul << cs1_bit); > + if (cs1_bit < 20) > + cs1_bit = 1; > + else > + cs1_bit = 0; > + > + if (sdram_params->dramtype == DDR4) { > + if (sdram_ch.dbw == 0) > + bktmp = sdram_ch.bk + 2; > + else > + bktmp = sdram_ch.bk + 1; > + } else { > + bktmp = sdram_ch.bk; > + } > + bw = sdram_ch.bw; > + coltmp = sdram_ch.col; > + > + /* detect cs1 row */ > + for (row = sdram_ch.cs0_row; row > 12; row--) { > + test_addr = (void __iomem *)(SDRAM_ADDR + cs1_addr + > + (1ul << (row + cs1_bit + bktmp + > + coltmp + bw - 1ul))); > + writel(0, SDRAM_ADDR + cs1_addr); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR + cs1_addr) == 0)) { > + ret = row; > + break; > + } > + } > + } > + > +out: > + return ret; > +} > + > +static int sdram_init_detect(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + debug("Starting SDRAM initialization...\n"); > + > + memcpy(&sdram_ch, &sdram_params->ch, > + sizeof(struct rk3328_sdram_channel)); > + > + sdram_init(dram, sdram_params, 1); > + dram_detect_cap(dram, sdram_params, 0); > + > + /* modify bw, cs related timing */ > + remodify_sdram_params(sdram_params); > + /* reinit sdram by real dram cap */ > + sdram_init(dram, sdram_params, 0); > + > + /* redetect cs1 row */ > + sdram_ch.cs1_row = > + dram_detect_cs1_row(sdram_params, 0); > + > + return 0; > +} > + > +static int rk3328_dmc_init(struct udevice *dev) > +{ > + struct dram_info *priv = dev_get_priv(dev); > + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); > + int ret; > + > +#if !CONFIG_IS_ENABLED(OF_PLATDATA) > + struct rk3328_sdram_params *params = &plat->sdram_params; > +#else > + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; > + struct rk3328_sdram_params *params = > + (void *)dtplat->rockchip_sdram_params; > + > + ret = conv_of_platdata(dev); > + if (ret) > + return ret; > +#endif > + priv->phy = regmap_get_range(plat->map, 0); > + priv->pctl = regmap_get_range(plat->map, 1); > + priv->grf = regmap_get_range(plat->map, 2); > + priv->cru = regmap_get_range(plat->map, 3); > + priv->msch = regmap_get_range(plat->map, 4); > + priv->ddr_grf = regmap_get_range(plat->map, 5); > + > + debug("%s phy %p pctrl %p grf %p cru %p msch %p ddr_grf %p\n", > + __func__, priv->phy, priv->pctl, priv->grf, priv->cru, > + priv->msch, priv->ddr_grf); > + ret = sdram_init_detect(priv, params); > + if (ret < 0) { > + printf("%s DRAM init failed%d\n", __func__, ret); > + return ret; > + } > + > + return 0; > +} > + > +static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev) > +{ > +#if !CONFIG_IS_ENABLED(OF_PLATDATA) > + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); > + int ret; > + > + ret = dev_read_u32_array(dev, "rockchip,sdram-params", > + (u32 *)&plat->sdram_params, > + sizeof(plat->sdram_params) / sizeof(u32)); > + if (ret) { > + printf("%s: Cannot read rockchip,sdram-params %d\n", > + __func__, ret); > + return ret; > + } > + ret = regmap_init_mem(dev, &plat->map); > + if (ret) > + printf("%s: regmap failed %d\n", __func__, ret); > +#endif > + return 0; > +} > + > +#endif > + > static int rk3328_dmc_probe(struct udevice *dev) > { > +#ifdef CONFIG_TPL_BUILD > + if (rk3328_dmc_init(dev)) > + return 0; > +#else > struct dram_info *priv = dev_get_priv(dev); > > priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); > @@ -25,7 +1032,7 @@ static int rk3328_dmc_probe(struct udevice *dev) > priv->info.base = CONFIG_SYS_SDRAM_BASE; > priv->info.size = rockchip_sdram_size( > (phys_addr_t)&priv->grf->os_reg[2]); > - > +#endif > return 0; > } > > @@ -42,7 +1049,6 @@ static struct ram_ops rk3328_dmc_ops = { > .get_info = rk3328_dmc_get_info, > }; > > - > static const struct udevice_id rk3328_dmc_ids[] = { > { .compatible = "rockchip,rk3328-dmc" }, > { } > @@ -53,6 +1059,12 @@ U_BOOT_DRIVER(dmc_rk3328) = { > .id = UCLASS_RAM, > .of_match = rk3328_dmc_ids, > .ops = &rk3328_dmc_ops, > +#ifdef CONFIG_TPL_BUILD > + .ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata, > +#endif > .probe = rk3328_dmc_probe, > .priv_auto_alloc_size = sizeof(struct dram_info), > +#ifdef CONFIG_TPL_BUILD > + .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), > +#endif > }; ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver 2019-08-02 7:39 ` [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov 2019-08-05 13:02 ` Kever Yang @ 2019-08-05 13:04 ` Philipp Tomsich 2019-08-06 1:46 ` Kever Yang 1 sibling, 1 reply; 34+ messages in thread From: Philipp Tomsich @ 2019-08-05 13:04 UTC (permalink / raw) To: u-boot Kever, > On 02.08.2019, at 09:39, Matwey V. Kornilov <matwey.kornilov@gmail.com> wrote: > > From: Kever Yang <kever.yang@rock-chips.com> > > This driver supports DDR3/LPDDR3/DDR4 SDRAM initialization. How is the unified driver for the Designware DRAM controller coming along? We’ve had that discussion over a year ago and it seems as if we’re still adding individual drivers for the closely related DRAM controllers… Thanks, Philipp. > Signed-off-by: YouMin Chen <cym@rock-chips.com> > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/9fb0777ec3cc6a89af9d2e0969c3bfe58306a88d with minor modifications] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > --- > arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ > drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- > 2 files changed, 1456 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > > diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > new file mode 100644 > index 0000000000..11411ead10 > --- /dev/null > +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > @@ -0,0 +1,441 @@ > +/* > + * Copyright (C) 2016-2017 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#ifndef _ASM_ARCH_SDRAM_RK3328_H > +#define _ASM_ARCH_SDRAM_RK3328_H > + > +#define SR_IDLE 93 > +#define PD_IDLE 13 > +#define SDRAM_ADDR 0x00000000 > +#define PATTERN (0x5aa5f00f) > + > +/* ddr pctl registers define */ > +#define DDR_PCTL2_MSTR 0x0 > +#define DDR_PCTL2_STAT 0x4 > +#define DDR_PCTL2_MSTR1 0x8 > +#define DDR_PCTL2_MRCTRL0 0x10 > +#define DDR_PCTL2_MRCTRL1 0x14 > +#define DDR_PCTL2_MRSTAT 0x18 > +#define DDR_PCTL2_MRCTRL2 0x1c > +#define DDR_PCTL2_DERATEEN 0x20 > +#define DDR_PCTL2_DERATEINT 0x24 > +#define DDR_PCTL2_PWRCTL 0x30 > +#define DDR_PCTL2_PWRTMG 0x34 > +#define DDR_PCTL2_HWLPCTL 0x38 > +#define DDR_PCTL2_RFSHCTL0 0x50 > +#define DDR_PCTL2_RFSHCTL1 0x54 > +#define DDR_PCTL2_RFSHCTL2 0x58 > +#define DDR_PCTL2_RFSHCTL4 0x5c > +#define DDR_PCTL2_RFSHCTL3 0x60 > +#define DDR_PCTL2_RFSHTMG 0x64 > +#define DDR_PCTL2_RFSHTMG1 0x68 > +#define DDR_PCTL2_RFSHCTL5 0x6c > +#define DDR_PCTL2_INIT0 0xd0 > +#define DDR_PCTL2_INIT1 0xd4 > +#define DDR_PCTL2_INIT2 0xd8 > +#define DDR_PCTL2_INIT3 0xdc > +#define DDR_PCTL2_INIT4 0xe0 > +#define DDR_PCTL2_INIT5 0xe4 > +#define DDR_PCTL2_INIT6 0xe8 > +#define DDR_PCTL2_INIT7 0xec > +#define DDR_PCTL2_DIMMCTL 0xf0 > +#define DDR_PCTL2_RANKCTL 0xf4 > +#define DDR_PCTL2_CHCTL 0xfc > +#define DDR_PCTL2_DRAMTMG0 0x100 > +#define DDR_PCTL2_DRAMTMG1 0x104 > +#define DDR_PCTL2_DRAMTMG2 0x108 > +#define DDR_PCTL2_DRAMTMG3 0x10c > +#define DDR_PCTL2_DRAMTMG4 0x110 > +#define DDR_PCTL2_DRAMTMG5 0x114 > +#define DDR_PCTL2_DRAMTMG6 0x118 > +#define DDR_PCTL2_DRAMTMG7 0x11c > +#define DDR_PCTL2_DRAMTMG8 0x120 > +#define DDR_PCTL2_DRAMTMG9 0x124 > +#define DDR_PCTL2_DRAMTMG10 0x128 > +#define DDR_PCTL2_DRAMTMG11 0x12c > +#define DDR_PCTL2_DRAMTMG12 0x130 > +#define DDR_PCTL2_DRAMTMG13 0x134 > +#define DDR_PCTL2_DRAMTMG14 0x138 > +#define DDR_PCTL2_DRAMTMG15 0x13c > +#define DDR_PCTL2_DRAMTMG16 0x140 > +#define DDR_PCTL2_ZQCTL0 0x180 > +#define DDR_PCTL2_ZQCTL1 0x184 > +#define DDR_PCTL2_ZQCTL2 0x188 > +#define DDR_PCTL2_ZQSTAT 0x18c > +#define DDR_PCTL2_DFITMG0 0x190 > +#define DDR_PCTL2_DFITMG1 0x194 > +#define DDR_PCTL2_DFILPCFG0 0x198 > +#define DDR_PCTL2_DFILPCFG1 0x19c > +#define DDR_PCTL2_DFIUPD0 0x1a0 > +#define DDR_PCTL2_DFIUPD1 0x1a4 > +#define DDR_PCTL2_DFIUPD2 0x1a8 > +#define DDR_PCTL2_DFIMISC 0x1b0 > +#define DDR_PCTL2_DFITMG2 0x1b4 > +#define DDR_PCTL2_DFITMG3 0x1b8 > +#define DDR_PCTL2_DFISTAT 0x1bc > +#define DDR_PCTL2_DBICTL 0x1c0 > +#define DDR_PCTL2_ADDRMAP0 0x200 > +#define DDR_PCTL2_ADDRMAP1 0x204 > +#define DDR_PCTL2_ADDRMAP2 0x208 > +#define DDR_PCTL2_ADDRMAP3 0x20c > +#define DDR_PCTL2_ADDRMAP4 0x210 > +#define DDR_PCTL2_ADDRMAP5 0x214 > +#define DDR_PCTL2_ADDRMAP6 0x218 > +#define DDR_PCTL2_ADDRMAP7 0x21c > +#define DDR_PCTL2_ADDRMAP8 0x220 > +#define DDR_PCTL2_ADDRMAP9 0x224 > +#define DDR_PCTL2_ADDRMAP10 0x228 > +#define DDR_PCTL2_ADDRMAP11 0x22c > +#define DDR_PCTL2_ODTCFG 0x240 > +#define DDR_PCTL2_ODTMAP 0x244 > +#define DDR_PCTL2_SCHED 0x250 > +#define DDR_PCTL2_SCHED1 0x254 > +#define DDR_PCTL2_PERFHPR1 0x25c > +#define DDR_PCTL2_PERFLPR1 0x264 > +#define DDR_PCTL2_PERFWR1 0x26c > +#define DDR_PCTL2_DQMAP0 0x280 > +#define DDR_PCTL2_DQMAP1 0x284 > +#define DDR_PCTL2_DQMAP2 0x288 > +#define DDR_PCTL2_DQMAP3 0x28c > +#define DDR_PCTL2_DQMAP4 0x290 > +#define DDR_PCTL2_DQMAP5 0x294 > +#define DDR_PCTL2_DBG0 0x300 > +#define DDR_PCTL2_DBG1 0x304 > +#define DDR_PCTL2_DBGCAM 0x308 > +#define DDR_PCTL2_DBGCMD 0x30c > +#define DDR_PCTL2_DBGSTAT 0x310 > +#define DDR_PCTL2_SWCTL 0x320 > +#define DDR_PCTL2_SWSTAT 0x324 > +#define DDR_PCTL2_POISONCFG 0x36c > +#define DDR_PCTL2_POISONSTAT 0x370 > +#define DDR_PCTL2_ADVECCINDEX 0x374 > +#define DDR_PCTL2_ADVECCSTAT 0x378 > +#define DDR_PCTL2_PSTAT 0x3fc > +#define DDR_PCTL2_PCCFG 0x400 > +#define DDR_PCTL2_PCFGR_n 0x404 > +#define DDR_PCTL2_PCFGW_n 0x408 > +#define DDR_PCTL2_PCTRL_n 0x490 > + > +/* PCTL2_MRSTAT */ > +#define MR_WR_BUSY BIT(0) > + > +/* PHY_REG0 */ > +#define DIGITAL_DERESET BIT(3) > +#define ANALOG_DERESET BIT(2) > +#define DIGITAL_RESET (0 << 3) > +#define ANALOG_RESET (0 << 2) > + > +/* PHY_REG1 */ > +#define PHY_DDR2 (0) > +#define PHY_LPDDR2 (1) > +#define PHY_DDR3 (2) > +#define PHY_LPDDR3 (3) > +#define PHY_DDR4 (4) > +#define PHY_BL_4 (0 << 2) > +#define PHY_BL_8 BIT(2) > + > +/* PHY_REG2 */ > +#define PHY_DTT_EN BIT(0) > +#define PHY_DTT_DISB (0 << 0) > +#define PHY_WRITE_LEVELING_EN BIT(2) > +#define PHY_WRITE_LEVELING_DISB (0 << 2) > +#define PHY_SELECT_CS0 (2) > +#define PHY_SELECT_CS1 (1) > +#define PHY_SELECT_CS0_1 (0) > +#define PHY_WRITE_LEVELING_SELECTCS(n) (n << 6) > +#define PHY_DATA_TRAINING_SELECTCS(n) (n << 4) > + > +#define PHY_DDR3_RON_RTT_DISABLE (0) > +#define PHY_DDR3_RON_RTT_451ohm (1) > +#define PHY_DDR3_RON_RTT_225ohm (2) > +#define PHY_DDR3_RON_RTT_150ohm (3) > +#define PHY_DDR3_RON_RTT_112ohm (4) > +#define PHY_DDR3_RON_RTT_90ohm (5) > +#define PHY_DDR3_RON_RTT_75ohm (6) > +#define PHY_DDR3_RON_RTT_64ohm (7) > +#define PHY_DDR3_RON_RTT_56ohm (16) > +#define PHY_DDR3_RON_RTT_50ohm (17) > +#define PHY_DDR3_RON_RTT_45ohm (18) > +#define PHY_DDR3_RON_RTT_41ohm (19) > +#define PHY_DDR3_RON_RTT_37ohm (20) > +#define PHY_DDR3_RON_RTT_34ohm (21) > +#define PHY_DDR3_RON_RTT_33ohm (22) > +#define PHY_DDR3_RON_RTT_30ohm (23) > +#define PHY_DDR3_RON_RTT_28ohm (24) > +#define PHY_DDR3_RON_RTT_26ohm (25) > +#define PHY_DDR3_RON_RTT_25ohm (26) > +#define PHY_DDR3_RON_RTT_23ohm (27) > +#define PHY_DDR3_RON_RTT_22ohm (28) > +#define PHY_DDR3_RON_RTT_21ohm (29) > +#define PHY_DDR3_RON_RTT_20ohm (30) > +#define PHY_DDR3_RON_RTT_19ohm (31) > + > +#define PHY_DDR4_LPDDR3_RON_RTT_DISABLE (0) > +#define PHY_DDR4_LPDDR3_RON_RTT_480ohm (1) > +#define PHY_DDR4_LPDDR3_RON_RTT_240ohm (2) > +#define PHY_DDR4_LPDDR3_RON_RTT_160ohm (3) > +#define PHY_DDR4_LPDDR3_RON_RTT_120ohm (4) > +#define PHY_DDR4_LPDDR3_RON_RTT_96ohm (5) > +#define PHY_DDR4_LPDDR3_RON_RTT_80ohm (6) > +#define PHY_DDR4_LPDDR3_RON_RTT_68ohm (7) > +#define PHY_DDR4_LPDDR3_RON_RTT_60ohm (16) > +#define PHY_DDR4_LPDDR3_RON_RTT_53ohm (17) > +#define PHY_DDR4_LPDDR3_RON_RTT_48ohm (18) > +#define PHY_DDR4_LPDDR3_RON_RTT_43ohm (19) > +#define PHY_DDR4_LPDDR3_RON_RTT_40ohm (20) > +#define PHY_DDR4_LPDDR3_RON_RTT_37ohm (21) > +#define PHY_DDR4_LPDDR3_RON_RTT_34ohm (22) > +#define PHY_DDR4_LPDDR3_RON_RTT_32ohm (23) > +#define PHY_DDR4_LPDDR3_RON_RTT_30ohm (24) > +#define PHY_DDR4_LPDDR3_RON_RTT_28ohm (25) > +#define PHY_DDR4_LPDDR3_RON_RTT_26ohm (26) > +#define PHY_DDR4_LPDDR3_RON_RTT_25ohm (27) > +#define PHY_DDR4_LPDDR3_RON_RTT_24ohm (28) > +#define PHY_DDR4_LPDDR3_RON_RTT_22ohm (29) > +#define PHY_DDR4_LPDDR3_RON_RTT_21ohm (30) > +#define PHY_DDR4_LPDDR3_RON_RTT_20ohm (31) > + > +/* noc registers define */ > +#define DDRCONF 0x8 > +#define DDRTIMING 0xc > +#define DDRMODE 0x10 > +#define READLATENCY 0x14 > +#define AGING0 0x18 > +#define AGING1 0x1c > +#define AGING2 0x20 > +#define AGING3 0x24 > +#define AGING4 0x28 > +#define AGING5 0x2c > +#define ACTIVATE 0x38 > +#define DEVTODEV 0x3c > +#define DDR4TIMING 0x40 > + > +/* DDR GRF */ > +#define DDR_GRF_CON(n) (0 + (n) * 4) > +#define DDR_GRF_STATUS_BASE (0X100) > +#define DDR_GRF_STATUS(n) (DDR_GRF_STATUS_BASE + (n) * 4) > + > +/* CRU_SOFTRESET_CON5 */ > +#define ddrphy_psrstn_req(n) (((0x1 << 15) << 16) | (n << 15)) > +#define ddrphy_srstn_req(n) (((0x1 << 14) << 16) | (n << 14)) > +#define ddrctrl_psrstn_req(n) (((0x1 << 13) << 16) | (n << 13)) > +#define ddrctrl_srstn_req(n) (((0x1 << 12) << 16) | (n << 12)) > +#define ddrmsch_srstn_req(n) (((0x1 << 11) << 16) | (n << 11)) > +#define msch_srstn_req(n) (((0x1 << 9) << 16) | (n << 9)) > +#define dfimon_srstn_req(n) (((0x1 << 8) << 16) | (n << 8)) > +#define grf_ddr_srstn_req(n) (((0x1 << 7) << 16) | (n << 7)) > +/* CRU_SOFTRESET_CON9 */ > +#define ddrctrl_asrstn_req(n) (((0x1 << 9) << 16) | (n << 9)) > + > +/* CRU register */ > +#define CRU_PLL_CON(pll_id, n) ((pll_id) * 0x20 + (n) * 4) > +#define CRU_MODE (0x80) > +#define CRU_GLB_CNT_TH (0x90) > +#define CRU_CLKSEL_CON_BASE 0x100 > +#define CRU_CLKSELS_CON(i) (CRU_CLKSEL_CON_BASE + ((i) * 4)) > +#define CRU_CLKGATE_CON_BASE 0x200 > +#define CRU_CLKGATE_CON(i) (CRU_CLKGATE_CON_BASE + ((i) * 4)) > +#define CRU_CLKSFTRST_CON_BASE 0x300 > +#define CRU_CLKSFTRST_CON(i) (CRU_CLKSFTRST_CON_BASE + ((i) * 4)) > + > +/* CRU_PLL_CON0 */ > +#define PB(n) ((0x1 << (15 + 16)) | ((n) << 15)) > +#define POSTDIV1(n) ((0x7 << (12 + 16)) | ((n) << 12)) > +#define FBDIV(n) ((0xFFF << 16) | (n)) > + > +/* CRU_PLL_CON1 */ > +#define RSTMODE(n) ((0x1 << (15 + 16)) | ((n) << 15)) > +#define RST(n) ((0x1 << (14 + 16)) | ((n) << 14)) > +#define PD(n) ((0x1 << (13 + 16)) | ((n) << 13)) > +#define DSMPD(n) ((0x1 << (12 + 16)) | ((n) << 12)) > +#define LOCK(n) (((n) >> 10) & 0x1) > +#define POSTDIV2(n) ((0x7 << (6 + 16)) | ((n) << 6)) > +#define REFDIV(n) ((0x3F << 16) | (n)) > + > +union noc_ddrtiming { > + u32 d32; > + struct { > + unsigned acttoact:6; > + unsigned rdtomiss:6; > + unsigned wrtomiss:6; > + unsigned burstlen:3; > + unsigned rdtowr:5; > + unsigned wrtord:5; > + unsigned bwratio:1; > + } b; > +} NOC_TIMING_T; > + > +union noc_activate { > + u32 d32; > + struct { > + unsigned rrd:4; > + unsigned faw:6; > + unsigned fawbank:1; > + unsigned reserved1:21; > + } b; > +}; > + > +union noc_devtodev { > + u32 d32; > + struct { > + unsigned busrdtord:2; > + unsigned busrdtowr:2; > + unsigned buswrtord:2; > + unsigned reserved2:26; > + } b; > +}; > + > +union noc_ddr4timing { > + u32 d32; > + struct { > + unsigned ccdl:3; > + unsigned wrtordl:5; > + unsigned rrdl:4; > + unsigned reserved2:20; > + } b; > +}; > + > +union noc_ddrmode { > + u32 d32; > + struct { > + unsigned autoprecharge:1; > + unsigned bwratioextended:1; > + unsigned reserved3:30; > + } b; > +}; > + > +u32 addrmap[21][9] = { > + /* map0 map1 map2 map3 map4 map5 map6 map7 map8 */ > + {22, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x06060606, > + 0x06060606, 0x00000f0f, 0x3f3f}, > + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x3f3f}, > + {23, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, > + 0x0f080808, 0x00000f0f, 0x3f3f}, > + {24, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, > + 0x08080808, 0x00000f0f, 0x3f3f}, > + {24, 0x000a0a0a, 0x00000000, 0x00000000, 0x00000000, 0x09090909, > + 0x0f090909, 0x00000f0f, 0x3f3f}, > + {6, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x3f3f}, > + {7, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x3f3f}, > + {8, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x09090909, > + 0x0f090909, 0x00000f0f, 0x3f3f}, > + {22, 0x001f0808, 0x00000000, 0x00000000, 0x00001f1f, 0x06060606, > + 0x06060606, 0x00000f0f, 0x3f3f}, > + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, > + 0x0f070707, 0x00000f0f, 0x3f3f}, > + > + {24, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x0801}, > + {23, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, > + 0x0f080808, 0x00000f0f, 0x0801}, > + {24, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f07, 0x0700}, > + {23, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x0700}, > + {24, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f07, 0x3f01}, > + {23, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f0f, 0x3f01}, > + {24, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x06060606, > + 0x06060606, 0x00000f06, 0x3f00}, > + {8, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x09090909, > + 0x0f090909, 0x00000f0f, 0x0801}, > + {7, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x0700}, > + {7, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, > + 0x08080808, 0x00000f0f, 0x3f01}, > + > + {6, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, > + 0x07070707, 0x00000f07, 0x3f00} > +}; > + > +struct rk3328_msch_timings { > + union noc_ddrtiming ddrtiming; > + union noc_ddrmode ddrmode; > + u32 readlatency; > + union noc_activate activate; > + union noc_devtodev devtodev; > + union noc_ddr4timing ddr4timing; > + u32 agingx0; > +}; > + > +struct rk3328_msch_regs { > + u32 coreid; > + u32 revisionid; > + u32 ddrconf; > + u32 ddrtiming; > + u32 ddrmode; > + u32 readlatency; > + u32 aging0; > + u32 aging1; > + u32 aging2; > + u32 aging3; > + u32 aging4; > + u32 aging5; > + u32 reserved[2]; > + u32 activate; > + u32 devtodev; > + u32 ddr4_timing; > +}; > + > +struct rk3328_ddr_grf_regs { > + u32 ddr_grf_con[4]; > + u32 reserved[(0x100 - 0x10) / 4]; > + u32 ddr_grf_status[11]; > +}; > + > +struct rk3328_ddr_pctl_regs { > + u32 pctl[30][2]; > +}; > + > +struct rk3328_ddr_phy_regs { > + u32 phy[5][2]; > +}; > + > +struct rk3328_ddr_skew { > + u32 a0_a1_skew[15]; > + u32 cs0_dm0_skew[11]; > + u32 cs0_dm1_skew[11]; > + u32 cs0_dm2_skew[11]; > + u32 cs0_dm3_skew[11]; > + u32 cs1_dm0_skew[11]; > + u32 cs1_dm1_skew[11]; > + u32 cs1_dm2_skew[11]; > + u32 cs1_dm3_skew[11]; > +}; > + > +struct rk3328_sdram_channel { > + unsigned int rank; > + unsigned int col; > + /* 3:8bank, 2:4bank */ > + unsigned int bk; > + /* channel buswidth, 2:32bit, 1:16bit, 0:8bit */ > + unsigned int bw; > + /* die buswidth, 2:32bit, 1:16bit, 0:8bit */ > + unsigned int dbw; > + unsigned int row_3_4; > + unsigned int cs0_row; > + unsigned int cs1_row; > + unsigned int ddrconfig; > + struct rk3328_msch_timings noc_timings; > +}; > + > +struct rk3328_sdram_params { > + struct rk3328_sdram_channel ch; > + unsigned int ddr_freq; > + unsigned int dramtype; > + unsigned int odt; > + struct rk3328_ddr_pctl_regs pctl_regs; > + struct rk3328_ddr_phy_regs phy_regs; > + struct rk3328_ddr_skew skew; > +}; > + > +#define PHY_REG(base, n) (base + 4 * (n)) > + > +#endif > diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c > index f4e0b18447..656696ac3c 100644 > --- a/drivers/ram/rockchip/sdram_rk3328.c > +++ b/drivers/ram/rockchip/sdram_rk3328.c > @@ -2,22 +2,1029 @@ > /* > * (C) Copyright 2017 Rockchip Electronics Co., Ltd. > */ > - > #include <common.h> > +#include <clk.h> > +#include <debug_uart.h> > #include <dm.h> > +#include <dt-structs.h> > #include <ram.h> > +#include <regmap.h> > #include <syscon.h> > +#include <asm/io.h> > #include <asm/arch-rockchip/clock.h> > +#include <asm/arch-rockchip/cru_rk3328.h> > #include <asm/arch-rockchip/grf_rk3328.h> > #include <asm/arch-rockchip/sdram_common.h> > +#include <asm/arch-rockchip/sdram_rk3328.h> > +#include <asm/arch-rockchip/uart.h> > > struct dram_info { > +#ifdef CONFIG_TPL_BUILD > + struct rk3328_ddr_pctl_regs *pctl; > + struct rk3328_ddr_phy_regs *phy; > + struct clk ddr_clk; > + struct rk3328_cru *cru; > + struct rk3328_msch_regs *msch; > + struct rk3328_ddr_grf_regs *ddr_grf; > +#endif > struct ram_info info; > struct rk3328_grf_regs *grf; > }; > > +#ifdef CONFIG_TPL_BUILD > + > +struct rk3328_sdram_channel sdram_ch; > + > +struct rockchip_dmc_plat { > +#if CONFIG_IS_ENABLED(OF_PLATDATA) > + struct dtd_rockchip_rk3328_dmc dtplat; > +#else > + struct rk3328_sdram_params sdram_params; > +#endif > + struct regmap *map; > +}; > + > +#if CONFIG_IS_ENABLED(OF_PLATDATA) > +static int conv_of_platdata(struct udevice *dev) > +{ > + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); > + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; > + int ret; > + > + ret = regmap_init_mem_platdata(dev, dtplat->reg, > + ARRAY_SIZE(dtplat->reg) / 2, > + &plat->map); > + if (ret) > + return ret; > + > + return 0; > +} > +#endif > + > +static void rkclk_ddr_reset(struct dram_info *dram, > + u32 ctl_srstn, u32 ctl_psrstn, > + u32 phy_srstn, u32 phy_psrstn) > +{ > + writel(ddrctrl_srstn_req(ctl_srstn) | ddrctrl_psrstn_req(ctl_psrstn) | > + ddrphy_srstn_req(phy_srstn) | ddrphy_psrstn_req(phy_psrstn), > + &dram->cru->softrst_con[5]); > + writel(ddrctrl_asrstn_req(ctl_srstn), &dram->cru->softrst_con[9]); > +} > + > +static void rkclk_set_dpll(struct dram_info *dram, unsigned int mhz) > +{ > + unsigned int refdiv, postdiv1, postdiv2, fbdiv; > + int delay = 1000; > + > + refdiv = 1; > + if (mhz <= 300) { > + postdiv1 = 4; > + postdiv2 = 2; > + } else if (mhz <= 400) { > + postdiv1 = 6; > + postdiv2 = 1; > + } else if (mhz <= 600) { > + postdiv1 = 4; > + postdiv2 = 1; > + } else if (mhz <= 800) { > + postdiv1 = 3; > + postdiv2 = 1; > + } else if (mhz <= 1600) { > + postdiv1 = 2; > + postdiv2 = 1; > + } else { > + postdiv1 = 1; > + postdiv2 = 1; > + } > + fbdiv = (mhz * refdiv * postdiv1 * postdiv2) / 24; > + > + writel(((0x1 << 4) << 16) | (0 << 4), &dram->cru->mode_con); > + writel(POSTDIV1(postdiv1) | FBDIV(fbdiv), &dram->cru->dpll_con[0]); > + writel(DSMPD(1) | POSTDIV2(postdiv2) | REFDIV(refdiv), > + &dram->cru->dpll_con[1]); > + > + while (delay > 0) { > + udelay(1); > + if (LOCK(readl(&dram->cru->dpll_con[1]))) > + break; > + delay--; > + } > + > + writel(((0x1 << 4) << 16) | (1 << 4), &dram->cru->mode_con); > +} > + > +static void rkclk_configure_ddr(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + void __iomem *phy_base = dram->phy; > + > + /* choose DPLL for ddr clk source */ > + clrbits_le32(PHY_REG(phy_base, 0xef), 1 << 7); > + > + /* for inno ddr phy need 2*freq */ > + rkclk_set_dpll(dram, sdram_params->ddr_freq * 2); > +} > + > +static void phy_soft_reset(struct dram_info *dram) > +{ > + void __iomem *phy_base = dram->phy; > + > + clrbits_le32(PHY_REG(phy_base, 0), 0x3 << 2); > + udelay(1); > + setbits_le32(PHY_REG(phy_base, 0), ANALOG_DERESET); > + udelay(5); > + setbits_le32(PHY_REG(phy_base, 0), DIGITAL_DERESET); > + udelay(1); > +} > + > +static int pctl_cfg(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 i; > + void __iomem *pctl_base = dram->pctl; > + > + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { > + writel(sdram_params->pctl_regs.pctl[i][1], > + pctl_base + sdram_params->pctl_regs.pctl[i][0]); > + } > + clrsetbits_le32(pctl_base + DDR_PCTL2_PWRTMG, > + (0xff << 16) | 0x1f, > + ((SR_IDLE & 0xff) << 16) | (PD_IDLE & 0x1f)); > + /* > + * dfi_lp_en_pd=1,dfi_lp_wakeup_pd=2 > + * hw_lp_idle_x32=1 > + */ > + if (sdram_params->dramtype == LPDDR3) { > + setbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, 1); > + clrsetbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, > + 0xf << 4, > + 2 << 4); > + } > + clrsetbits_le32(pctl_base + DDR_PCTL2_HWLPCTL, > + 0xfff << 16, > + 1 << 16); > + /* disable zqcs */ > + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1u << 31); > + setbits_le32(pctl_base + 0x2000 + DDR_PCTL2_ZQCTL0, 1u << 31); > + > + return 0; > +} > + > +/* return ddrconfig value > + * (-1), find ddrconfig fail > + * other, the ddrconfig value > + * only support cs0_row >= cs1_row > + */ > +static unsigned int calculate_ddrconfig(struct rk3328_sdram_params *sdram_params) > +{ > + static const u16 ddr_cfg_2_rbc[] = { > + /*************************** > + * [5:4] row(13+n) > + * [3] cs(0:0 cs, 1:2 cs) > + * [2] bank(0:0bank,1:8bank) > + * [1:0] col(11+n) > + ****************************/ > + /* row, cs, bank, col */ > + ((3 << 4) | (0 << 3) | (1 << 2) | 0), > + ((3 << 4) | (0 << 3) | (1 << 2) | 1), > + ((2 << 4) | (0 << 3) | (1 << 2) | 2), > + ((3 << 4) | (0 << 3) | (1 << 2) | 2), > + ((2 << 4) | (0 << 3) | (1 << 2) | 3), > + ((3 << 4) | (1 << 3) | (1 << 2) | 0), > + ((3 << 4) | (1 << 3) | (1 << 2) | 1), > + ((2 << 4) | (1 << 3) | (1 << 2) | 2), > + ((3 << 4) | (0 << 3) | (0 << 2) | 1), > + ((2 << 4) | (0 << 3) | (1 << 2) | 1), > + }; > + > + static const u16 ddr4_cfg_2_rbc[] = { > + /*************************** > + * [6] cs 0:0cs 1:2 cs > + * [5:3] row(13+n) > + * [2] cs(0:0 cs, 1:2 cs) > + * [1] bw 0: 16bit 1:32bit > + * [0] diebw 0:8bit 1:16bit > + ***************************/ > + /* cs, row, cs, bw, diebw */ > + ((0 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 0), > + ((1 << 6) | (2 << 3) | (0 << 2) | (1 << 1) | 0), > + ((0 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 0), > + ((1 << 6) | (3 << 3) | (0 << 2) | (0 << 1) | 0), > + ((0 << 6) | (4 << 3) | (0 << 2) | (1 << 1) | 1), > + ((1 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 1), > + ((1 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 1), > + ((0 << 6) | (2 << 3) | (1 << 2) | (1 << 1) | 0), > + ((0 << 6) | (3 << 3) | (1 << 2) | (0 << 1) | 0), > + ((0 << 6) | (3 << 3) | (1 << 2) | (1 << 1) | 1), > + ((0 << 6) | (4 << 3) | (1 << 2) | (0 << 1) | 1), > + }; > + > + u32 cs, bw, die_bw, col, row, bank; > + u32 i, tmp; > + u32 ddrconf = -1; > + > + cs = sdram_ch.rank; > + bw = sdram_ch.bw; > + die_bw = sdram_ch.dbw; > + col = sdram_ch.col; > + row = sdram_ch.cs0_row; > + bank = sdram_ch.bk; > + > + if (sdram_params->dramtype == DDR4) { > + tmp = ((cs - 1) << 6) | ((row - 13) << 3) | (bw & 0x2) | die_bw; > + for (i = 10; i < 17; i++) { > + if (((tmp & 0x7) == (ddr4_cfg_2_rbc[i - 10] & 0x7)) && > + ((tmp & 0x3c) <= (ddr4_cfg_2_rbc[i - 10] & 0x3c)) && > + ((tmp & 0x40) <= (ddr4_cfg_2_rbc[i - 10] & 0x40))) { > + ddrconf = i; > + goto out; > + } > + } > + } else { > + if (bank == 2) { > + ddrconf = 8; > + goto out; > + } > + > + tmp = ((row - 13) << 4) | (1 << 2) | ((bw + col - 11) << 0); > + for (i = 0; i < 5; i++) > + if (((tmp & 0xf) == (ddr_cfg_2_rbc[i] & 0xf)) && > + ((tmp & 0x30) <= (ddr_cfg_2_rbc[i] & 0x30))) { > + ddrconf = i; > + goto out; > + } > + } > + > +out: > + if (ddrconf > 20) > + printf("calculate_ddrconfig error\n"); > + > + return ddrconf; > +} > + > +/* n: Unit bytes */ > +static void copy_to_reg(u32 *dest, u32 *src, u32 n) > +{ > + int i; > + > + for (i = 0; i < n / sizeof(u32); i++) { > + writel(*src, dest); > + src++; > + dest++; > + } > +} > + > +/******* > + * calculate controller dram address map, and setting to register. > + * argument sdram_ch.ddrconf must be right value before > + * call this function. > + *******/ > +static void set_ctl_address_map(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + copy_to_reg((u32 *)(pctl_base + DDR_PCTL2_ADDRMAP0), > + &addrmap[sdram_ch.ddrconfig][0], 9 * 4); > + if (sdram_params->dramtype == LPDDR3 && sdram_ch.row_3_4) > + setbits_le32(pctl_base + DDR_PCTL2_ADDRMAP6, 1 << 31); > + if (sdram_params->dramtype == DDR4 && sdram_ch.bw == 0x1) > + setbits_le32(pctl_base + DDR_PCTL2_PCCFG, 1 << 8); > + > + if (sdram_ch.rank == 1) > + clrsetbits_le32(pctl_base + DDR_PCTL2_ADDRMAP0, 0x1f, 0x1f); > +} > + > +static void phy_dll_bypass_set(struct dram_info *dram, u32 freq) > +{ > + u32 tmp; > + void __iomem *phy_base = dram->phy; > + > + setbits_le32(PHY_REG(phy_base, 0x13), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x14), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x26), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x27), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x36), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x37), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x46), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x47), 1 << 3); > + setbits_le32(PHY_REG(phy_base, 0x56), 1 << 4); > + clrbits_le32(PHY_REG(phy_base, 0x57), 1 << 3); > + > + if (freq <= (400 * MHz)) > + /* DLL bypass */ > + setbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); > + else > + clrbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); > + if (freq <= (680 * MHz)) > + tmp = 2; > + else > + tmp = 1; > + writel(tmp, PHY_REG(phy_base, 0x28)); > + writel(tmp, PHY_REG(phy_base, 0x38)); > + writel(tmp, PHY_REG(phy_base, 0x48)); > + writel(tmp, PHY_REG(phy_base, 0x58)); > +} > + > +static void set_ds_odt(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 cmd_drv, clk_drv, dqs_drv, dqs_odt; > + void __iomem *phy_base = dram->phy; > + > + if (sdram_params->dramtype == DDR3) { > + cmd_drv = PHY_DDR3_RON_RTT_34ohm; > + clk_drv = PHY_DDR3_RON_RTT_45ohm; > + dqs_drv = PHY_DDR3_RON_RTT_34ohm; > + dqs_odt = PHY_DDR3_RON_RTT_225ohm; > + } else { > + cmd_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; > + clk_drv = PHY_DDR4_LPDDR3_RON_RTT_43ohm; > + dqs_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; > + dqs_odt = PHY_DDR4_LPDDR3_RON_RTT_240ohm; > + } > + /* DS */ > + writel(cmd_drv, PHY_REG(phy_base, 0x11)); > + clrsetbits_le32(PHY_REG(phy_base, 0x12), 0x1f << 3, cmd_drv << 3); > + writel(clk_drv, PHY_REG(phy_base, 0x16)); > + writel(clk_drv, PHY_REG(phy_base, 0x18)); > + writel(dqs_drv, PHY_REG(phy_base, 0x20)); > + writel(dqs_drv, PHY_REG(phy_base, 0x2f)); > + writel(dqs_drv, PHY_REG(phy_base, 0x30)); > + writel(dqs_drv, PHY_REG(phy_base, 0x3f)); > + writel(dqs_drv, PHY_REG(phy_base, 0x40)); > + writel(dqs_drv, PHY_REG(phy_base, 0x4f)); > + writel(dqs_drv, PHY_REG(phy_base, 0x50)); > + writel(dqs_drv, PHY_REG(phy_base, 0x5f)); > + /* ODT */ > + writel(dqs_odt, PHY_REG(phy_base, 0x21)); > + writel(dqs_odt, PHY_REG(phy_base, 0x2e)); > + writel(dqs_odt, PHY_REG(phy_base, 0x31)); > + writel(dqs_odt, PHY_REG(phy_base, 0x3e)); > + writel(dqs_odt, PHY_REG(phy_base, 0x41)); > + writel(dqs_odt, PHY_REG(phy_base, 0x4e)); > + writel(dqs_odt, PHY_REG(phy_base, 0x51)); > + writel(dqs_odt, PHY_REG(phy_base, 0x5e)); > +} > + > +static void phy_cfg(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 i; > + void __iomem *phy_base = dram->phy; > + > + phy_dll_bypass_set(dram, sdram_params->ddr_freq); > + for (i = 0; sdram_params->phy_regs.phy[i][0] != 0xFFFFFFFF; i++) { > + writel(sdram_params->phy_regs.phy[i][1], > + phy_base + sdram_params->phy_regs.phy[i][0]); > + } > + if (sdram_ch.bw == 2) { > + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 0xf << 4); > + } else { > + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 3 << 4); > + /* disable DQS2,DQS3 tx dll for saving power */ > + clrbits_le32(PHY_REG(phy_base, 0x46), 1 << 3); > + clrbits_le32(PHY_REG(phy_base, 0x56), 1 << 3); > + } > + set_ds_odt(dram, sdram_params); > + /* deskew */ > + setbits_le32(PHY_REG(phy_base, 2), 8); > + copy_to_reg(PHY_REG(phy_base, 0xb0), > + &sdram_params->skew.a0_a1_skew[0], 15 * 4); > + copy_to_reg(PHY_REG(phy_base, 0x70), > + &sdram_params->skew.cs0_dm0_skew[0], 44 * 4); > + copy_to_reg(PHY_REG(phy_base, 0xc0), > + &sdram_params->skew.cs0_dm1_skew[0], 44 * 4); > +} > + > +static int update_refresh_reg(struct dram_info *dram) > +{ > + void __iomem *pctl_base = dram->pctl; > + u32 ret; > + > + ret = readl(pctl_base + DDR_PCTL2_RFSHCTL3) ^ (1 << 1); > + writel(ret, pctl_base + DDR_PCTL2_RFSHCTL3); > + > + return 0; > +} > + > +static int data_training(struct dram_info *dram, u32 cs, u32 dramtype) > +{ > + u32 ret; > + u32 dis_auto_zq = 0; > + void __iomem *pctl_base = dram->pctl; > + void __iomem *phy_base = dram->phy; > + > + /* disable zqcs */ > + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & > + (1ul << 31))) { > + dis_auto_zq = 1; > + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + } > + /* disable auto refresh */ > + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + if (dramtype == DDR4) { > + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0); > + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0); > + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0); > + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0); > + } > + /* choose training cs */ > + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs)); > + /* enable gate training */ > + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 1); > + udelay(50); > + ret = readl(PHY_REG(phy_base, 0xff)); > + /* disable gate training */ > + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 0); > + /* restore zqcs */ > + if (dis_auto_zq) > + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + /* restore auto refresh */ > + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + if (dramtype == DDR4) { > + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0x2); > + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0x2); > + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0x2); > + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0x2); > + } > + > + if (ret & 0x10) { > + ret = -1; > + } else { > + ret = (ret & 0xf) ^ (readl(PHY_REG(phy_base, 0)) >> 4); > + ret = (ret == 0) ? 0 : -1; > + } > + return ret; > +} > + > +/* rank = 1: cs0 > + * rank = 2: cs1 > + * rank = 3: cs0 & cs1 > + * note: be careful of keep mr original val > + */ > +static int write_mr(struct dram_info *dram, u32 rank, u32 mr_num, u32 arg, > + u32 dramtype) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) > + continue; > + if (dramtype == DDR3 || dramtype == DDR4) { > + writel((mr_num << 12) | (rank << 4) | (0 << 0), > + pctl_base + DDR_PCTL2_MRCTRL0); > + writel(arg, pctl_base + DDR_PCTL2_MRCTRL1); > + } else { > + writel((rank << 4) | (0 << 0), > + pctl_base + DDR_PCTL2_MRCTRL0); > + writel((mr_num << 8) | (arg & 0xff), > + pctl_base + DDR_PCTL2_MRCTRL1); > + } > + > + setbits_le32(pctl_base + DDR_PCTL2_MRCTRL0, 1u << 31); > + while (readl(pctl_base + DDR_PCTL2_MRCTRL0) & (1u << 31)) > + continue; > + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) > + continue; > + > + return 0; > +} > + > +/* > + * rank : 1:cs0, 2:cs1, 3:cs0&cs1 > + * vrefrate: 4500: 45%, > + */ > +static int write_vrefdq(struct dram_info *dram, u32 rank, u32 vrefrate, > + u32 dramtype) > +{ > + u32 tccd_l, value; > + u32 dis_auto_zq = 0; > + void __iomem *pctl_base = dram->pctl; > + > + if (dramtype != DDR4 || vrefrate < 4500 || vrefrate > 9200) > + return -1; > + > + tccd_l = (readl(pctl_base + DDR_PCTL2_DRAMTMG4) >> 16) & 0xf; > + tccd_l = (tccd_l - 4) << 10; > + > + if (vrefrate > 7500) { > + /* range 1 */ > + value = ((vrefrate - 6000) / 65) | tccd_l; > + } else { > + /* range 2 */ > + value = ((vrefrate - 4500) / 65) | tccd_l | (1 << 6); > + } > + > + /* disable zqcs */ > + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & > + (1ul << 31))) { > + dis_auto_zq = 1; > + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + } > + /* disable auto refresh */ > + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + /* enable vrefdq calibratin */ > + write_mr(dram, rank, 6, value | (1 << 7), dramtype); > + udelay(1);/* tvrefdqe */ > + /* write vrefdq value */ > + write_mr(dram, rank, 6, value | (1 << 7), dramtype); > + udelay(1);/* tvref_time */ > + write_mr(dram, rank, 6, value | (0 << 7), dramtype); > + udelay(1);/* tvrefdqx */ > + > + /* restore zqcs */ > + if (dis_auto_zq) > + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); > + /* restore auto refresh */ > + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); > + update_refresh_reg(dram); > + > + return 0; > +} > + > +#define _MAX_(x, y) ((x) > (y) ? (x) : (y)) > + > +static void rx_deskew_switch_adjust(struct dram_info *dram) > +{ > + u32 i, deskew_val; > + u32 gate_val = 0; > + void __iomem *phy_base = dram->phy; > + > + for (i = 0; i < 4; i++) > + gate_val = _MAX_(readl(PHY_REG(phy_base, 0xfb + i)), gate_val); > + > + deskew_val = (gate_val >> 3) + 1; > + deskew_val = (deskew_val > 0x1f) ? 0x1f : deskew_val; > + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0xc, (deskew_val & 0x3) << 2); > + clrsetbits_le32(PHY_REG(phy_base, 0x6f), 0x7 << 4, > + (deskew_val & 0x1c) << 2); > +} > + > +#undef _MAX_ > + > +static void tx_deskew_switch_adjust(struct dram_info *dram) > +{ > + void __iomem *phy_base = dram->phy; > + > + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0x3, 1); > +} > + > +static void set_ddrconfig(struct dram_info *dram, u32 ddrconfig) > +{ > + writel(ddrconfig, &dram->msch->ddrconf); > +} > + > +static void dram_all_config(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + u32 sys_reg = 0, tmp = 0; > + > + set_ddrconfig(dram, sdram_ch.ddrconfig); > + > + sys_reg |= SYS_REG_ENC_DDRTYPE(sdram_params->dramtype); > + sys_reg |= SYS_REG_ENC_ROW_3_4(sdram_ch.row_3_4, 0); > + sys_reg |= SYS_REG_ENC_RANK(sdram_ch.rank, 0); > + sys_reg |= SYS_REG_ENC_COL(sdram_ch.col, 0); > + sys_reg |= SYS_REG_ENC_BK(sdram_ch.bk, 0); > + SYS_REG_ENC_CS0_ROW(sdram_ch.cs0_row, sys_reg, tmp, 0); > + if (sdram_ch.cs1_row) > + SYS_REG_ENC_CS1_ROW(sdram_ch.cs1_row, sys_reg, tmp, 0); > + sys_reg |= SYS_REG_ENC_BW(sdram_ch.bw, 0); > + sys_reg |= SYS_REG_ENC_DBW(sdram_ch.dbw, 0); > + > + writel(sys_reg, &dram->grf->os_reg[2]); > + > + writel(sdram_ch.noc_timings.ddrtiming.d32, &dram->msch->ddrtiming); > + > + writel(sdram_ch.noc_timings.ddrmode.d32, &dram->msch->ddrmode); > + writel(sdram_ch.noc_timings.readlatency, &dram->msch->readlatency); > + > + writel(sdram_ch.noc_timings.activate.d32, &dram->msch->activate); > + writel(sdram_ch.noc_timings.devtodev.d32, &dram->msch->devtodev); > + writel(sdram_ch.noc_timings.ddr4timing.d32, &dram->msch->ddr4_timing); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging0); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging1); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging2); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging3); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging4); > + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging5); > +} > + > +static void enable_low_power(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + /* enable upctl2 axi clock auto gating */ > + writel(0x00800000, &dram->ddr_grf->ddr_grf_con[0]); > + writel(0x20012001, &dram->ddr_grf->ddr_grf_con[2]); > + /* enable upctl2 core clock auto gating */ > + writel(0x001e001a, &dram->ddr_grf->ddr_grf_con[2]); > + /* enable sr, pd */ > + if (PD_IDLE == 0) > + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); > + else > + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); > + if (SR_IDLE == 0) > + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); > + else > + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); > + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 3)); > +} > + > +static int sdram_init(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params, u32 pre_init) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + rkclk_ddr_reset(dram, 1, 1, 1, 1); > + udelay(10); > + /* > + * dereset ddr phy psrstn to config pll, > + * if using phy pll psrstn must be dereset > + * before config pll > + */ > + rkclk_ddr_reset(dram, 1, 1, 1, 0); > + rkclk_configure_ddr(dram, sdram_params); > + if (pre_init == 0) { > + switch (sdram_params->dramtype) { > + case DDR3: > + printf("DDR3\n"); > + break; > + case DDR4: > + printf("DDR4\n"); > + break; > + case LPDDR3: > + default: > + printf("LPDDR3\n"); > + break; > + } > + } > + /* release phy srst to provide clk to ctrl */ > + rkclk_ddr_reset(dram, 1, 1, 0, 0); > + udelay(10); > + phy_soft_reset(dram); > + /* release ctrl presetn, and config ctl registers */ > + rkclk_ddr_reset(dram, 1, 0, 0, 0); > + pctl_cfg(dram, sdram_params); > + sdram_ch.ddrconfig = calculate_ddrconfig(sdram_params); > + set_ctl_address_map(dram, sdram_params); > + phy_cfg(dram, sdram_params); > + > + /* enable dfi_init_start to init phy after ctl srstn deassert */ > + setbits_le32(pctl_base + DDR_PCTL2_DFIMISC, (1 << 5) | (1 << 4)); > + rkclk_ddr_reset(dram, 0, 0, 0, 0); > + /* wait for dfi_init_done and dram init complete */ > + while ((readl(pctl_base + DDR_PCTL2_STAT) & 0x7) == 0) > + continue; > + > + /* do ddr gate training */ > + if (data_training(dram, 0, sdram_params->dramtype) != 0) { > + printf("data training error\n"); > + return -1; > + } > + > + if (sdram_params->dramtype == DDR4) > + write_vrefdq(dram, 0x3, 5670, sdram_params->dramtype); > + > + if (pre_init == 0) { > + rx_deskew_switch_adjust(dram); > + tx_deskew_switch_adjust(dram); > + } > + > + dram_all_config(dram, sdram_params); > + enable_low_power(dram, sdram_params); > + > + return 0; > +} > + > +static u64 dram_detect_cap(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params, > + unsigned char channel) > +{ > + void __iomem *pctl_base = dram->pctl; > + > + /* > + * for ddr3: ddrconf = 3 > + * for ddr4: ddrconf = 12 > + * for lpddr3: ddrconf = 3 > + * default bw = 1 > + */ > + u32 bk, bktmp; > + u32 col, coltmp; > + u32 row, rowtmp, row_3_4; > + void __iomem *test_addr, *test_addr1; > + u32 dbw; > + u32 cs; > + u32 bw = 1; > + u64 cap = 0; > + u32 dram_type = sdram_params->dramtype; > + u32 pwrctl; > + > + if (dram_type != DDR4) { > + /* detect col and bk for ddr3/lpddr3 */ > + coltmp = 12; > + bktmp = 3; > + rowtmp = 16; > + > + for (col = coltmp; col >= 9; col -= 1) { > + writel(0, SDRAM_ADDR); > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (col + bw - 1ul))); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + break; > + } > + if (col == 8) { > + printf("col error\n"); > + goto cap_err; > + } > + > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (coltmp + bktmp + bw - 1ul))); > + writel(0, SDRAM_ADDR); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + bk = 3; > + else > + bk = 2; > + if (dram_type == LPDDR3) > + dbw = 2; > + else > + dbw = 1; > + } else { > + /* detect bg for ddr4 */ > + coltmp = 10; > + bktmp = 4; > + rowtmp = 17; > + > + col = 10; > + bk = 2; > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (coltmp + bw + 1ul))); > + writel(0, SDRAM_ADDR); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + dbw = 0; > + else > + dbw = 1; > + } > + /* detect row */ > + for (row = rowtmp; row > 12; row--) { > + writel(0, SDRAM_ADDR); > + test_addr = (void __iomem *)(SDRAM_ADDR + > + (1ul << (row + bktmp + coltmp + bw - 1ul))); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR) == 0)) > + break; > + } > + if (row == 12) { > + printf("row error"); > + goto cap_err; > + } > + /* detect row_3_4 */ > + test_addr = SDRAM_ADDR; > + test_addr1 = (void __iomem *)(SDRAM_ADDR + > + (0x3ul << (row + bktmp + coltmp + bw - 1ul - 1ul))); > + > + writel(0, test_addr); > + writel(PATTERN, test_addr1); > + if ((readl(test_addr) == 0) && > + (readl(test_addr1) == PATTERN)) > + row_3_4 = 0; > + else > + row_3_4 = 1; > + > + /* disable auto low-power */ > + pwrctl = readl(pctl_base + DDR_PCTL2_PWRCTL); > + writel(0, pctl_base + DDR_PCTL2_PWRCTL); > + > + /* bw and cs detect using phy read gate training */ > + if (data_training(dram, 1, dram_type) == 0) > + cs = 1; > + else > + cs = 0; > + > + bw = 2; > + > + /* restore auto low-power */ > + writel(pwrctl, pctl_base + DDR_PCTL2_PWRCTL); > + > + sdram_ch.rank = cs + 1; > + sdram_ch.col = col; > + sdram_ch.bk = bk; > + sdram_ch.dbw = dbw; > + sdram_ch.bw = bw; > + sdram_ch.cs0_row = row; > + if (cs) > + sdram_ch.cs1_row = row; > + else > + sdram_ch.cs1_row = 0; > + sdram_ch.row_3_4 = row_3_4; > + > + if (dram_type == DDR4) > + cap = 1llu << (cs + row + bk + col + ((dbw == 0) ? 2 : 1) + bw); > + else > + cap = 1llu << (cs + row + bk + col + bw); > + > + return cap; > + > +cap_err: > + return 0; > +} > + > +static u32 remodify_sdram_params(struct rk3328_sdram_params *sdram_params) > +{ > + u32 tmp = 0, tmp_adr = 0, i; > + > + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { > + if (sdram_params->pctl_regs.pctl[i][0] == 0) { > + tmp = sdram_params->pctl_regs.pctl[i][1];/* MSTR */ > + tmp_adr = i; > + } > + } > + > + tmp &= ~((3ul << 30) | (3ul << 24) | (3ul << 12)); > + > + switch (sdram_ch.dbw) { > + case 2: > + tmp |= (3ul << 30); > + break; > + case 1: > + tmp |= (2ul << 30); > + break; > + case 0: > + default: > + tmp |= (1ul << 30); > + break; > + } > + > + if (sdram_ch.rank == 2) > + tmp |= 3 << 24; > + else > + tmp |= 1 << 24; > + > + tmp |= (2 - sdram_ch.bw) << 12; > + > + sdram_params->pctl_regs.pctl[tmp_adr][1] = tmp; > + > + if (sdram_ch.bw == 2) > + sdram_ch.noc_timings.ddrtiming.b.bwratio = 0; > + else > + sdram_ch.noc_timings.ddrtiming.b.bwratio = 1; > + > + return 0; > +} > + > +static int dram_detect_cs1_row(struct rk3328_sdram_params *sdram_params, > + unsigned char channel) > +{ > + u32 ret = 0; > + u32 cs1_bit; > + void __iomem *test_addr, *cs1_addr; > + u32 row, bktmp, coltmp, bw; > + u32 ddrconf = sdram_ch.ddrconfig; > + > + if (sdram_ch.rank == 2) { > + cs1_bit = addrmap[ddrconf][0] + 8; > + > + if (cs1_bit > 31) > + goto out; > + > + cs1_addr = (void __iomem *)(1ul << cs1_bit); > + if (cs1_bit < 20) > + cs1_bit = 1; > + else > + cs1_bit = 0; > + > + if (sdram_params->dramtype == DDR4) { > + if (sdram_ch.dbw == 0) > + bktmp = sdram_ch.bk + 2; > + else > + bktmp = sdram_ch.bk + 1; > + } else { > + bktmp = sdram_ch.bk; > + } > + bw = sdram_ch.bw; > + coltmp = sdram_ch.col; > + > + /* detect cs1 row */ > + for (row = sdram_ch.cs0_row; row > 12; row--) { > + test_addr = (void __iomem *)(SDRAM_ADDR + cs1_addr + > + (1ul << (row + cs1_bit + bktmp + > + coltmp + bw - 1ul))); > + writel(0, SDRAM_ADDR + cs1_addr); > + writel(PATTERN, test_addr); > + if ((readl(test_addr) == PATTERN) && > + (readl(SDRAM_ADDR + cs1_addr) == 0)) { > + ret = row; > + break; > + } > + } > + } > + > +out: > + return ret; > +} > + > +static int sdram_init_detect(struct dram_info *dram, > + struct rk3328_sdram_params *sdram_params) > +{ > + debug("Starting SDRAM initialization...\n"); > + > + memcpy(&sdram_ch, &sdram_params->ch, > + sizeof(struct rk3328_sdram_channel)); > + > + sdram_init(dram, sdram_params, 1); > + dram_detect_cap(dram, sdram_params, 0); > + > + /* modify bw, cs related timing */ > + remodify_sdram_params(sdram_params); > + /* reinit sdram by real dram cap */ > + sdram_init(dram, sdram_params, 0); > + > + /* redetect cs1 row */ > + sdram_ch.cs1_row = > + dram_detect_cs1_row(sdram_params, 0); > + > + return 0; > +} > + > +static int rk3328_dmc_init(struct udevice *dev) > +{ > + struct dram_info *priv = dev_get_priv(dev); > + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); > + int ret; > + > +#if !CONFIG_IS_ENABLED(OF_PLATDATA) > + struct rk3328_sdram_params *params = &plat->sdram_params; > +#else > + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; > + struct rk3328_sdram_params *params = > + (void *)dtplat->rockchip_sdram_params; > + > + ret = conv_of_platdata(dev); > + if (ret) > + return ret; > +#endif > + priv->phy = regmap_get_range(plat->map, 0); > + priv->pctl = regmap_get_range(plat->map, 1); > + priv->grf = regmap_get_range(plat->map, 2); > + priv->cru = regmap_get_range(plat->map, 3); > + priv->msch = regmap_get_range(plat->map, 4); > + priv->ddr_grf = regmap_get_range(plat->map, 5); > + > + debug("%s phy %p pctrl %p grf %p cru %p msch %p ddr_grf %p\n", > + __func__, priv->phy, priv->pctl, priv->grf, priv->cru, > + priv->msch, priv->ddr_grf); > + ret = sdram_init_detect(priv, params); > + if (ret < 0) { > + printf("%s DRAM init failed%d\n", __func__, ret); > + return ret; > + } > + > + return 0; > +} > + > +static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev) > +{ > +#if !CONFIG_IS_ENABLED(OF_PLATDATA) > + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); > + int ret; > + > + ret = dev_read_u32_array(dev, "rockchip,sdram-params", > + (u32 *)&plat->sdram_params, > + sizeof(plat->sdram_params) / sizeof(u32)); > + if (ret) { > + printf("%s: Cannot read rockchip,sdram-params %d\n", > + __func__, ret); > + return ret; > + } > + ret = regmap_init_mem(dev, &plat->map); > + if (ret) > + printf("%s: regmap failed %d\n", __func__, ret); > +#endif > + return 0; > +} > + > +#endif > + > static int rk3328_dmc_probe(struct udevice *dev) > { > +#ifdef CONFIG_TPL_BUILD > + if (rk3328_dmc_init(dev)) > + return 0; > +#else > struct dram_info *priv = dev_get_priv(dev); > > priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); > @@ -25,7 +1032,7 @@ static int rk3328_dmc_probe(struct udevice *dev) > priv->info.base = CONFIG_SYS_SDRAM_BASE; > priv->info.size = rockchip_sdram_size( > (phys_addr_t)&priv->grf->os_reg[2]); > - > +#endif > return 0; > } > > @@ -42,7 +1049,6 @@ static struct ram_ops rk3328_dmc_ops = { > .get_info = rk3328_dmc_get_info, > }; > > - > static const struct udevice_id rk3328_dmc_ids[] = { > { .compatible = "rockchip,rk3328-dmc" }, > { } > @@ -53,6 +1059,12 @@ U_BOOT_DRIVER(dmc_rk3328) = { > .id = UCLASS_RAM, > .of_match = rk3328_dmc_ids, > .ops = &rk3328_dmc_ops, > +#ifdef CONFIG_TPL_BUILD > + .ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata, > +#endif > .probe = rk3328_dmc_probe, > .priv_auto_alloc_size = sizeof(struct dram_info), > +#ifdef CONFIG_TPL_BUILD > + .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), > +#endif > }; > -- > 2.16.4 > ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver 2019-08-05 13:04 ` Philipp Tomsich @ 2019-08-06 1:46 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-06 1:46 UTC (permalink / raw) To: u-boot Philipp, On 2019/8/5 下午9:04, Philipp Tomsich wrote: > Kever, > >> On 02.08.2019, at 09:39, Matwey V. Kornilov <matwey.kornilov@gmail.com> wrote: >> >> From: Kever Yang <kever.yang@rock-chips.com> >> >> This driver supports DDR3/LPDDR3/DDR4 SDRAM initialization. > How is the unified driver for the Designware DRAM controller coming along? We do have do some clean up for the DRAM driver, you can take a look if you have time: https://github.com/rockchip-linux/u-boot/tree/next-dev/drivers/ram/rockchip Some of APIs can be share as common code, but most of the dram init operations can not be shared between different SoCs, so the result is not merge most of individual drivers into one common driver, but only able to abstract some of APIs into common file. We start to use separate API for controller and phy from PX30, and its sdram_pctl_px30.c and sdram_phy_px30.c can be shared by other SoCs who is using the same phy/controller. We will add driver base on PX30 driver for new SoCs, but we don't have time to migrate old SoC dram driver on top of it now. > We’ve had that discussion over a year ago > and it seems as if we’re still adding individual drivers for the closely related DRAM controllers… But before we have a unified driver, it will be better to support DRAM driver for SoCs than NOT support, I think some time ago, some guys even asking for register reverse dump after run binary driver, and use it as DRAM driver, this "individual driver" is much better than that, and many people need this fully source code support on mainline U-Boot. I want to send the PX30 dram driver later(maybe next merge window), and all other drivers with the same controller/phy can migrate to use it, anyone who have experience on DRAM driver and good coding skill are welcome to do this. What's your opinion here? Thanks, - Kever > > Thanks, > Philipp. > >> Signed-off-by: YouMin Chen <cym@rock-chips.com> >> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> >> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/9fb0777ec3cc6a89af9d2e0969c3bfe58306a88d with minor modifications] >> Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> >> --- >> arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ >> drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- >> 2 files changed, 1456 insertions(+), 3 deletions(-) >> create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h >> >> diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h >> new file mode 100644 >> index 0000000000..11411ead10 >> --- /dev/null >> +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h >> @@ -0,0 +1,441 @@ >> +/* >> + * Copyright (C) 2016-2017 Rockchip Electronics Co., Ltd >> + * >> + * SPDX-License-Identifier: GPL-2.0+ >> + */ >> + >> +#ifndef _ASM_ARCH_SDRAM_RK3328_H >> +#define _ASM_ARCH_SDRAM_RK3328_H >> + >> +#define SR_IDLE 93 >> +#define PD_IDLE 13 >> +#define SDRAM_ADDR 0x00000000 >> +#define PATTERN (0x5aa5f00f) >> + >> +/* ddr pctl registers define */ >> +#define DDR_PCTL2_MSTR 0x0 >> +#define DDR_PCTL2_STAT 0x4 >> +#define DDR_PCTL2_MSTR1 0x8 >> +#define DDR_PCTL2_MRCTRL0 0x10 >> +#define DDR_PCTL2_MRCTRL1 0x14 >> +#define DDR_PCTL2_MRSTAT 0x18 >> +#define DDR_PCTL2_MRCTRL2 0x1c >> +#define DDR_PCTL2_DERATEEN 0x20 >> +#define DDR_PCTL2_DERATEINT 0x24 >> +#define DDR_PCTL2_PWRCTL 0x30 >> +#define DDR_PCTL2_PWRTMG 0x34 >> +#define DDR_PCTL2_HWLPCTL 0x38 >> +#define DDR_PCTL2_RFSHCTL0 0x50 >> +#define DDR_PCTL2_RFSHCTL1 0x54 >> +#define DDR_PCTL2_RFSHCTL2 0x58 >> +#define DDR_PCTL2_RFSHCTL4 0x5c >> +#define DDR_PCTL2_RFSHCTL3 0x60 >> +#define DDR_PCTL2_RFSHTMG 0x64 >> +#define DDR_PCTL2_RFSHTMG1 0x68 >> +#define DDR_PCTL2_RFSHCTL5 0x6c >> +#define DDR_PCTL2_INIT0 0xd0 >> +#define DDR_PCTL2_INIT1 0xd4 >> +#define DDR_PCTL2_INIT2 0xd8 >> +#define DDR_PCTL2_INIT3 0xdc >> +#define DDR_PCTL2_INIT4 0xe0 >> +#define DDR_PCTL2_INIT5 0xe4 >> +#define DDR_PCTL2_INIT6 0xe8 >> +#define DDR_PCTL2_INIT7 0xec >> +#define DDR_PCTL2_DIMMCTL 0xf0 >> +#define DDR_PCTL2_RANKCTL 0xf4 >> +#define DDR_PCTL2_CHCTL 0xfc >> +#define DDR_PCTL2_DRAMTMG0 0x100 >> +#define DDR_PCTL2_DRAMTMG1 0x104 >> +#define DDR_PCTL2_DRAMTMG2 0x108 >> +#define DDR_PCTL2_DRAMTMG3 0x10c >> +#define DDR_PCTL2_DRAMTMG4 0x110 >> +#define DDR_PCTL2_DRAMTMG5 0x114 >> +#define DDR_PCTL2_DRAMTMG6 0x118 >> +#define DDR_PCTL2_DRAMTMG7 0x11c >> +#define DDR_PCTL2_DRAMTMG8 0x120 >> +#define DDR_PCTL2_DRAMTMG9 0x124 >> +#define DDR_PCTL2_DRAMTMG10 0x128 >> +#define DDR_PCTL2_DRAMTMG11 0x12c >> +#define DDR_PCTL2_DRAMTMG12 0x130 >> +#define DDR_PCTL2_DRAMTMG13 0x134 >> +#define DDR_PCTL2_DRAMTMG14 0x138 >> +#define DDR_PCTL2_DRAMTMG15 0x13c >> +#define DDR_PCTL2_DRAMTMG16 0x140 >> +#define DDR_PCTL2_ZQCTL0 0x180 >> +#define DDR_PCTL2_ZQCTL1 0x184 >> +#define DDR_PCTL2_ZQCTL2 0x188 >> +#define DDR_PCTL2_ZQSTAT 0x18c >> +#define DDR_PCTL2_DFITMG0 0x190 >> +#define DDR_PCTL2_DFITMG1 0x194 >> +#define DDR_PCTL2_DFILPCFG0 0x198 >> +#define DDR_PCTL2_DFILPCFG1 0x19c >> +#define DDR_PCTL2_DFIUPD0 0x1a0 >> +#define DDR_PCTL2_DFIUPD1 0x1a4 >> +#define DDR_PCTL2_DFIUPD2 0x1a8 >> +#define DDR_PCTL2_DFIMISC 0x1b0 >> +#define DDR_PCTL2_DFITMG2 0x1b4 >> +#define DDR_PCTL2_DFITMG3 0x1b8 >> +#define DDR_PCTL2_DFISTAT 0x1bc >> +#define DDR_PCTL2_DBICTL 0x1c0 >> +#define DDR_PCTL2_ADDRMAP0 0x200 >> +#define DDR_PCTL2_ADDRMAP1 0x204 >> +#define DDR_PCTL2_ADDRMAP2 0x208 >> +#define DDR_PCTL2_ADDRMAP3 0x20c >> +#define DDR_PCTL2_ADDRMAP4 0x210 >> +#define DDR_PCTL2_ADDRMAP5 0x214 >> +#define DDR_PCTL2_ADDRMAP6 0x218 >> +#define DDR_PCTL2_ADDRMAP7 0x21c >> +#define DDR_PCTL2_ADDRMAP8 0x220 >> +#define DDR_PCTL2_ADDRMAP9 0x224 >> +#define DDR_PCTL2_ADDRMAP10 0x228 >> +#define DDR_PCTL2_ADDRMAP11 0x22c >> +#define DDR_PCTL2_ODTCFG 0x240 >> +#define DDR_PCTL2_ODTMAP 0x244 >> +#define DDR_PCTL2_SCHED 0x250 >> +#define DDR_PCTL2_SCHED1 0x254 >> +#define DDR_PCTL2_PERFHPR1 0x25c >> +#define DDR_PCTL2_PERFLPR1 0x264 >> +#define DDR_PCTL2_PERFWR1 0x26c >> +#define DDR_PCTL2_DQMAP0 0x280 >> +#define DDR_PCTL2_DQMAP1 0x284 >> +#define DDR_PCTL2_DQMAP2 0x288 >> +#define DDR_PCTL2_DQMAP3 0x28c >> +#define DDR_PCTL2_DQMAP4 0x290 >> +#define DDR_PCTL2_DQMAP5 0x294 >> +#define DDR_PCTL2_DBG0 0x300 >> +#define DDR_PCTL2_DBG1 0x304 >> +#define DDR_PCTL2_DBGCAM 0x308 >> +#define DDR_PCTL2_DBGCMD 0x30c >> +#define DDR_PCTL2_DBGSTAT 0x310 >> +#define DDR_PCTL2_SWCTL 0x320 >> +#define DDR_PCTL2_SWSTAT 0x324 >> +#define DDR_PCTL2_POISONCFG 0x36c >> +#define DDR_PCTL2_POISONSTAT 0x370 >> +#define DDR_PCTL2_ADVECCINDEX 0x374 >> +#define DDR_PCTL2_ADVECCSTAT 0x378 >> +#define DDR_PCTL2_PSTAT 0x3fc >> +#define DDR_PCTL2_PCCFG 0x400 >> +#define DDR_PCTL2_PCFGR_n 0x404 >> +#define DDR_PCTL2_PCFGW_n 0x408 >> +#define DDR_PCTL2_PCTRL_n 0x490 >> + >> +/* PCTL2_MRSTAT */ >> +#define MR_WR_BUSY BIT(0) >> + >> +/* PHY_REG0 */ >> +#define DIGITAL_DERESET BIT(3) >> +#define ANALOG_DERESET BIT(2) >> +#define DIGITAL_RESET (0 << 3) >> +#define ANALOG_RESET (0 << 2) >> + >> +/* PHY_REG1 */ >> +#define PHY_DDR2 (0) >> +#define PHY_LPDDR2 (1) >> +#define PHY_DDR3 (2) >> +#define PHY_LPDDR3 (3) >> +#define PHY_DDR4 (4) >> +#define PHY_BL_4 (0 << 2) >> +#define PHY_BL_8 BIT(2) >> + >> +/* PHY_REG2 */ >> +#define PHY_DTT_EN BIT(0) >> +#define PHY_DTT_DISB (0 << 0) >> +#define PHY_WRITE_LEVELING_EN BIT(2) >> +#define PHY_WRITE_LEVELING_DISB (0 << 2) >> +#define PHY_SELECT_CS0 (2) >> +#define PHY_SELECT_CS1 (1) >> +#define PHY_SELECT_CS0_1 (0) >> +#define PHY_WRITE_LEVELING_SELECTCS(n) (n << 6) >> +#define PHY_DATA_TRAINING_SELECTCS(n) (n << 4) >> + >> +#define PHY_DDR3_RON_RTT_DISABLE (0) >> +#define PHY_DDR3_RON_RTT_451ohm (1) >> +#define PHY_DDR3_RON_RTT_225ohm (2) >> +#define PHY_DDR3_RON_RTT_150ohm (3) >> +#define PHY_DDR3_RON_RTT_112ohm (4) >> +#define PHY_DDR3_RON_RTT_90ohm (5) >> +#define PHY_DDR3_RON_RTT_75ohm (6) >> +#define PHY_DDR3_RON_RTT_64ohm (7) >> +#define PHY_DDR3_RON_RTT_56ohm (16) >> +#define PHY_DDR3_RON_RTT_50ohm (17) >> +#define PHY_DDR3_RON_RTT_45ohm (18) >> +#define PHY_DDR3_RON_RTT_41ohm (19) >> +#define PHY_DDR3_RON_RTT_37ohm (20) >> +#define PHY_DDR3_RON_RTT_34ohm (21) >> +#define PHY_DDR3_RON_RTT_33ohm (22) >> +#define PHY_DDR3_RON_RTT_30ohm (23) >> +#define PHY_DDR3_RON_RTT_28ohm (24) >> +#define PHY_DDR3_RON_RTT_26ohm (25) >> +#define PHY_DDR3_RON_RTT_25ohm (26) >> +#define PHY_DDR3_RON_RTT_23ohm (27) >> +#define PHY_DDR3_RON_RTT_22ohm (28) >> +#define PHY_DDR3_RON_RTT_21ohm (29) >> +#define PHY_DDR3_RON_RTT_20ohm (30) >> +#define PHY_DDR3_RON_RTT_19ohm (31) >> + >> +#define PHY_DDR4_LPDDR3_RON_RTT_DISABLE (0) >> +#define PHY_DDR4_LPDDR3_RON_RTT_480ohm (1) >> +#define PHY_DDR4_LPDDR3_RON_RTT_240ohm (2) >> +#define PHY_DDR4_LPDDR3_RON_RTT_160ohm (3) >> +#define PHY_DDR4_LPDDR3_RON_RTT_120ohm (4) >> +#define PHY_DDR4_LPDDR3_RON_RTT_96ohm (5) >> +#define PHY_DDR4_LPDDR3_RON_RTT_80ohm (6) >> +#define PHY_DDR4_LPDDR3_RON_RTT_68ohm (7) >> +#define PHY_DDR4_LPDDR3_RON_RTT_60ohm (16) >> +#define PHY_DDR4_LPDDR3_RON_RTT_53ohm (17) >> +#define PHY_DDR4_LPDDR3_RON_RTT_48ohm (18) >> +#define PHY_DDR4_LPDDR3_RON_RTT_43ohm (19) >> +#define PHY_DDR4_LPDDR3_RON_RTT_40ohm (20) >> +#define PHY_DDR4_LPDDR3_RON_RTT_37ohm (21) >> +#define PHY_DDR4_LPDDR3_RON_RTT_34ohm (22) >> +#define PHY_DDR4_LPDDR3_RON_RTT_32ohm (23) >> +#define PHY_DDR4_LPDDR3_RON_RTT_30ohm (24) >> +#define PHY_DDR4_LPDDR3_RON_RTT_28ohm (25) >> +#define PHY_DDR4_LPDDR3_RON_RTT_26ohm (26) >> +#define PHY_DDR4_LPDDR3_RON_RTT_25ohm (27) >> +#define PHY_DDR4_LPDDR3_RON_RTT_24ohm (28) >> +#define PHY_DDR4_LPDDR3_RON_RTT_22ohm (29) >> +#define PHY_DDR4_LPDDR3_RON_RTT_21ohm (30) >> +#define PHY_DDR4_LPDDR3_RON_RTT_20ohm (31) >> + >> +/* noc registers define */ >> +#define DDRCONF 0x8 >> +#define DDRTIMING 0xc >> +#define DDRMODE 0x10 >> +#define READLATENCY 0x14 >> +#define AGING0 0x18 >> +#define AGING1 0x1c >> +#define AGING2 0x20 >> +#define AGING3 0x24 >> +#define AGING4 0x28 >> +#define AGING5 0x2c >> +#define ACTIVATE 0x38 >> +#define DEVTODEV 0x3c >> +#define DDR4TIMING 0x40 >> + >> +/* DDR GRF */ >> +#define DDR_GRF_CON(n) (0 + (n) * 4) >> +#define DDR_GRF_STATUS_BASE (0X100) >> +#define DDR_GRF_STATUS(n) (DDR_GRF_STATUS_BASE + (n) * 4) >> + >> +/* CRU_SOFTRESET_CON5 */ >> +#define ddrphy_psrstn_req(n) (((0x1 << 15) << 16) | (n << 15)) >> +#define ddrphy_srstn_req(n) (((0x1 << 14) << 16) | (n << 14)) >> +#define ddrctrl_psrstn_req(n) (((0x1 << 13) << 16) | (n << 13)) >> +#define ddrctrl_srstn_req(n) (((0x1 << 12) << 16) | (n << 12)) >> +#define ddrmsch_srstn_req(n) (((0x1 << 11) << 16) | (n << 11)) >> +#define msch_srstn_req(n) (((0x1 << 9) << 16) | (n << 9)) >> +#define dfimon_srstn_req(n) (((0x1 << 8) << 16) | (n << 8)) >> +#define grf_ddr_srstn_req(n) (((0x1 << 7) << 16) | (n << 7)) >> +/* CRU_SOFTRESET_CON9 */ >> +#define ddrctrl_asrstn_req(n) (((0x1 << 9) << 16) | (n << 9)) >> + >> +/* CRU register */ >> +#define CRU_PLL_CON(pll_id, n) ((pll_id) * 0x20 + (n) * 4) >> +#define CRU_MODE (0x80) >> +#define CRU_GLB_CNT_TH (0x90) >> +#define CRU_CLKSEL_CON_BASE 0x100 >> +#define CRU_CLKSELS_CON(i) (CRU_CLKSEL_CON_BASE + ((i) * 4)) >> +#define CRU_CLKGATE_CON_BASE 0x200 >> +#define CRU_CLKGATE_CON(i) (CRU_CLKGATE_CON_BASE + ((i) * 4)) >> +#define CRU_CLKSFTRST_CON_BASE 0x300 >> +#define CRU_CLKSFTRST_CON(i) (CRU_CLKSFTRST_CON_BASE + ((i) * 4)) >> + >> +/* CRU_PLL_CON0 */ >> +#define PB(n) ((0x1 << (15 + 16)) | ((n) << 15)) >> +#define POSTDIV1(n) ((0x7 << (12 + 16)) | ((n) << 12)) >> +#define FBDIV(n) ((0xFFF << 16) | (n)) >> + >> +/* CRU_PLL_CON1 */ >> +#define RSTMODE(n) ((0x1 << (15 + 16)) | ((n) << 15)) >> +#define RST(n) ((0x1 << (14 + 16)) | ((n) << 14)) >> +#define PD(n) ((0x1 << (13 + 16)) | ((n) << 13)) >> +#define DSMPD(n) ((0x1 << (12 + 16)) | ((n) << 12)) >> +#define LOCK(n) (((n) >> 10) & 0x1) >> +#define POSTDIV2(n) ((0x7 << (6 + 16)) | ((n) << 6)) >> +#define REFDIV(n) ((0x3F << 16) | (n)) >> + >> +union noc_ddrtiming { >> + u32 d32; >> + struct { >> + unsigned acttoact:6; >> + unsigned rdtomiss:6; >> + unsigned wrtomiss:6; >> + unsigned burstlen:3; >> + unsigned rdtowr:5; >> + unsigned wrtord:5; >> + unsigned bwratio:1; >> + } b; >> +} NOC_TIMING_T; >> + >> +union noc_activate { >> + u32 d32; >> + struct { >> + unsigned rrd:4; >> + unsigned faw:6; >> + unsigned fawbank:1; >> + unsigned reserved1:21; >> + } b; >> +}; >> + >> +union noc_devtodev { >> + u32 d32; >> + struct { >> + unsigned busrdtord:2; >> + unsigned busrdtowr:2; >> + unsigned buswrtord:2; >> + unsigned reserved2:26; >> + } b; >> +}; >> + >> +union noc_ddr4timing { >> + u32 d32; >> + struct { >> + unsigned ccdl:3; >> + unsigned wrtordl:5; >> + unsigned rrdl:4; >> + unsigned reserved2:20; >> + } b; >> +}; >> + >> +union noc_ddrmode { >> + u32 d32; >> + struct { >> + unsigned autoprecharge:1; >> + unsigned bwratioextended:1; >> + unsigned reserved3:30; >> + } b; >> +}; >> + >> +u32 addrmap[21][9] = { >> + /* map0 map1 map2 map3 map4 map5 map6 map7 map8 */ >> + {22, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x06060606, >> + 0x06060606, 0x00000f0f, 0x3f3f}, >> + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, >> + 0x07070707, 0x00000f0f, 0x3f3f}, >> + {23, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, >> + 0x0f080808, 0x00000f0f, 0x3f3f}, >> + {24, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x08080808, >> + 0x08080808, 0x00000f0f, 0x3f3f}, >> + {24, 0x000a0a0a, 0x00000000, 0x00000000, 0x00000000, 0x09090909, >> + 0x0f090909, 0x00000f0f, 0x3f3f}, >> + {6, 0x00070707, 0x00000000, 0x1f000000, 0x00001f1f, 0x07070707, >> + 0x07070707, 0x00000f0f, 0x3f3f}, >> + {7, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x08080808, >> + 0x08080808, 0x00000f0f, 0x3f3f}, >> + {8, 0x00090909, 0x00000000, 0x00000000, 0x00001f00, 0x09090909, >> + 0x0f090909, 0x00000f0f, 0x3f3f}, >> + {22, 0x001f0808, 0x00000000, 0x00000000, 0x00001f1f, 0x06060606, >> + 0x06060606, 0x00000f0f, 0x3f3f}, >> + {23, 0x00080808, 0x00000000, 0x00000000, 0x00001f1f, 0x07070707, >> + 0x0f070707, 0x00000f0f, 0x3f3f}, >> + >> + {24, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, >> + 0x08080808, 0x00000f0f, 0x0801}, >> + {23, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, >> + 0x0f080808, 0x00000f0f, 0x0801}, >> + {24, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, >> + 0x07070707, 0x00000f07, 0x0700}, >> + {23, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, >> + 0x07070707, 0x00000f0f, 0x0700}, >> + {24, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, >> + 0x07070707, 0x00000f07, 0x3f01}, >> + {23, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x07070707, >> + 0x07070707, 0x00000f0f, 0x3f01}, >> + {24, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x06060606, >> + 0x06060606, 0x00000f06, 0x3f00}, >> + {8, 0x003f0a0a, 0x01010100, 0x01010101, 0x00001f1f, 0x09090909, >> + 0x0f090909, 0x00000f0f, 0x0801}, >> + {7, 0x003f0909, 0x00000007, 0x1f000000, 0x00001f1f, 0x08080808, >> + 0x08080808, 0x00000f0f, 0x0700}, >> + {7, 0x003f0909, 0x01010100, 0x01010101, 0x00001f1f, 0x08080808, >> + 0x08080808, 0x00000f0f, 0x3f01}, >> + >> + {6, 0x003f0808, 0x00000007, 0x1f000000, 0x00001f1f, 0x07070707, >> + 0x07070707, 0x00000f07, 0x3f00} >> +}; >> + >> +struct rk3328_msch_timings { >> + union noc_ddrtiming ddrtiming; >> + union noc_ddrmode ddrmode; >> + u32 readlatency; >> + union noc_activate activate; >> + union noc_devtodev devtodev; >> + union noc_ddr4timing ddr4timing; >> + u32 agingx0; >> +}; >> + >> +struct rk3328_msch_regs { >> + u32 coreid; >> + u32 revisionid; >> + u32 ddrconf; >> + u32 ddrtiming; >> + u32 ddrmode; >> + u32 readlatency; >> + u32 aging0; >> + u32 aging1; >> + u32 aging2; >> + u32 aging3; >> + u32 aging4; >> + u32 aging5; >> + u32 reserved[2]; >> + u32 activate; >> + u32 devtodev; >> + u32 ddr4_timing; >> +}; >> + >> +struct rk3328_ddr_grf_regs { >> + u32 ddr_grf_con[4]; >> + u32 reserved[(0x100 - 0x10) / 4]; >> + u32 ddr_grf_status[11]; >> +}; >> + >> +struct rk3328_ddr_pctl_regs { >> + u32 pctl[30][2]; >> +}; >> + >> +struct rk3328_ddr_phy_regs { >> + u32 phy[5][2]; >> +}; >> + >> +struct rk3328_ddr_skew { >> + u32 a0_a1_skew[15]; >> + u32 cs0_dm0_skew[11]; >> + u32 cs0_dm1_skew[11]; >> + u32 cs0_dm2_skew[11]; >> + u32 cs0_dm3_skew[11]; >> + u32 cs1_dm0_skew[11]; >> + u32 cs1_dm1_skew[11]; >> + u32 cs1_dm2_skew[11]; >> + u32 cs1_dm3_skew[11]; >> +}; >> + >> +struct rk3328_sdram_channel { >> + unsigned int rank; >> + unsigned int col; >> + /* 3:8bank, 2:4bank */ >> + unsigned int bk; >> + /* channel buswidth, 2:32bit, 1:16bit, 0:8bit */ >> + unsigned int bw; >> + /* die buswidth, 2:32bit, 1:16bit, 0:8bit */ >> + unsigned int dbw; >> + unsigned int row_3_4; >> + unsigned int cs0_row; >> + unsigned int cs1_row; >> + unsigned int ddrconfig; >> + struct rk3328_msch_timings noc_timings; >> +}; >> + >> +struct rk3328_sdram_params { >> + struct rk3328_sdram_channel ch; >> + unsigned int ddr_freq; >> + unsigned int dramtype; >> + unsigned int odt; >> + struct rk3328_ddr_pctl_regs pctl_regs; >> + struct rk3328_ddr_phy_regs phy_regs; >> + struct rk3328_ddr_skew skew; >> +}; >> + >> +#define PHY_REG(base, n) (base + 4 * (n)) >> + >> +#endif >> diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c >> index f4e0b18447..656696ac3c 100644 >> --- a/drivers/ram/rockchip/sdram_rk3328.c >> +++ b/drivers/ram/rockchip/sdram_rk3328.c >> @@ -2,22 +2,1029 @@ >> /* >> * (C) Copyright 2017 Rockchip Electronics Co., Ltd. >> */ >> - >> #include <common.h> >> +#include <clk.h> >> +#include <debug_uart.h> >> #include <dm.h> >> +#include <dt-structs.h> >> #include <ram.h> >> +#include <regmap.h> >> #include <syscon.h> >> +#include <asm/io.h> >> #include <asm/arch-rockchip/clock.h> >> +#include <asm/arch-rockchip/cru_rk3328.h> >> #include <asm/arch-rockchip/grf_rk3328.h> >> #include <asm/arch-rockchip/sdram_common.h> >> +#include <asm/arch-rockchip/sdram_rk3328.h> >> +#include <asm/arch-rockchip/uart.h> >> >> struct dram_info { >> +#ifdef CONFIG_TPL_BUILD >> + struct rk3328_ddr_pctl_regs *pctl; >> + struct rk3328_ddr_phy_regs *phy; >> + struct clk ddr_clk; >> + struct rk3328_cru *cru; >> + struct rk3328_msch_regs *msch; >> + struct rk3328_ddr_grf_regs *ddr_grf; >> +#endif >> struct ram_info info; >> struct rk3328_grf_regs *grf; >> }; >> >> +#ifdef CONFIG_TPL_BUILD >> + >> +struct rk3328_sdram_channel sdram_ch; >> + >> +struct rockchip_dmc_plat { >> +#if CONFIG_IS_ENABLED(OF_PLATDATA) >> + struct dtd_rockchip_rk3328_dmc dtplat; >> +#else >> + struct rk3328_sdram_params sdram_params; >> +#endif >> + struct regmap *map; >> +}; >> + >> +#if CONFIG_IS_ENABLED(OF_PLATDATA) >> +static int conv_of_platdata(struct udevice *dev) >> +{ >> + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); >> + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; >> + int ret; >> + >> + ret = regmap_init_mem_platdata(dev, dtplat->reg, >> + ARRAY_SIZE(dtplat->reg) / 2, >> + &plat->map); >> + if (ret) >> + return ret; >> + >> + return 0; >> +} >> +#endif >> + >> +static void rkclk_ddr_reset(struct dram_info *dram, >> + u32 ctl_srstn, u32 ctl_psrstn, >> + u32 phy_srstn, u32 phy_psrstn) >> +{ >> + writel(ddrctrl_srstn_req(ctl_srstn) | ddrctrl_psrstn_req(ctl_psrstn) | >> + ddrphy_srstn_req(phy_srstn) | ddrphy_psrstn_req(phy_psrstn), >> + &dram->cru->softrst_con[5]); >> + writel(ddrctrl_asrstn_req(ctl_srstn), &dram->cru->softrst_con[9]); >> +} >> + >> +static void rkclk_set_dpll(struct dram_info *dram, unsigned int mhz) >> +{ >> + unsigned int refdiv, postdiv1, postdiv2, fbdiv; >> + int delay = 1000; >> + >> + refdiv = 1; >> + if (mhz <= 300) { >> + postdiv1 = 4; >> + postdiv2 = 2; >> + } else if (mhz <= 400) { >> + postdiv1 = 6; >> + postdiv2 = 1; >> + } else if (mhz <= 600) { >> + postdiv1 = 4; >> + postdiv2 = 1; >> + } else if (mhz <= 800) { >> + postdiv1 = 3; >> + postdiv2 = 1; >> + } else if (mhz <= 1600) { >> + postdiv1 = 2; >> + postdiv2 = 1; >> + } else { >> + postdiv1 = 1; >> + postdiv2 = 1; >> + } >> + fbdiv = (mhz * refdiv * postdiv1 * postdiv2) / 24; >> + >> + writel(((0x1 << 4) << 16) | (0 << 4), &dram->cru->mode_con); >> + writel(POSTDIV1(postdiv1) | FBDIV(fbdiv), &dram->cru->dpll_con[0]); >> + writel(DSMPD(1) | POSTDIV2(postdiv2) | REFDIV(refdiv), >> + &dram->cru->dpll_con[1]); >> + >> + while (delay > 0) { >> + udelay(1); >> + if (LOCK(readl(&dram->cru->dpll_con[1]))) >> + break; >> + delay--; >> + } >> + >> + writel(((0x1 << 4) << 16) | (1 << 4), &dram->cru->mode_con); >> +} >> + >> +static void rkclk_configure_ddr(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + void __iomem *phy_base = dram->phy; >> + >> + /* choose DPLL for ddr clk source */ >> + clrbits_le32(PHY_REG(phy_base, 0xef), 1 << 7); >> + >> + /* for inno ddr phy need 2*freq */ >> + rkclk_set_dpll(dram, sdram_params->ddr_freq * 2); >> +} >> + >> +static void phy_soft_reset(struct dram_info *dram) >> +{ >> + void __iomem *phy_base = dram->phy; >> + >> + clrbits_le32(PHY_REG(phy_base, 0), 0x3 << 2); >> + udelay(1); >> + setbits_le32(PHY_REG(phy_base, 0), ANALOG_DERESET); >> + udelay(5); >> + setbits_le32(PHY_REG(phy_base, 0), DIGITAL_DERESET); >> + udelay(1); >> +} >> + >> +static int pctl_cfg(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + u32 i; >> + void __iomem *pctl_base = dram->pctl; >> + >> + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { >> + writel(sdram_params->pctl_regs.pctl[i][1], >> + pctl_base + sdram_params->pctl_regs.pctl[i][0]); >> + } >> + clrsetbits_le32(pctl_base + DDR_PCTL2_PWRTMG, >> + (0xff << 16) | 0x1f, >> + ((SR_IDLE & 0xff) << 16) | (PD_IDLE & 0x1f)); >> + /* >> + * dfi_lp_en_pd=1,dfi_lp_wakeup_pd=2 >> + * hw_lp_idle_x32=1 >> + */ >> + if (sdram_params->dramtype == LPDDR3) { >> + setbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, 1); >> + clrsetbits_le32(pctl_base + DDR_PCTL2_DFILPCFG0, >> + 0xf << 4, >> + 2 << 4); >> + } >> + clrsetbits_le32(pctl_base + DDR_PCTL2_HWLPCTL, >> + 0xfff << 16, >> + 1 << 16); >> + /* disable zqcs */ >> + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1u << 31); >> + setbits_le32(pctl_base + 0x2000 + DDR_PCTL2_ZQCTL0, 1u << 31); >> + >> + return 0; >> +} >> + >> +/* return ddrconfig value >> + * (-1), find ddrconfig fail >> + * other, the ddrconfig value >> + * only support cs0_row >= cs1_row >> + */ >> +static unsigned int calculate_ddrconfig(struct rk3328_sdram_params *sdram_params) >> +{ >> + static const u16 ddr_cfg_2_rbc[] = { >> + /*************************** >> + * [5:4] row(13+n) >> + * [3] cs(0:0 cs, 1:2 cs) >> + * [2] bank(0:0bank,1:8bank) >> + * [1:0] col(11+n) >> + ****************************/ >> + /* row, cs, bank, col */ >> + ((3 << 4) | (0 << 3) | (1 << 2) | 0), >> + ((3 << 4) | (0 << 3) | (1 << 2) | 1), >> + ((2 << 4) | (0 << 3) | (1 << 2) | 2), >> + ((3 << 4) | (0 << 3) | (1 << 2) | 2), >> + ((2 << 4) | (0 << 3) | (1 << 2) | 3), >> + ((3 << 4) | (1 << 3) | (1 << 2) | 0), >> + ((3 << 4) | (1 << 3) | (1 << 2) | 1), >> + ((2 << 4) | (1 << 3) | (1 << 2) | 2), >> + ((3 << 4) | (0 << 3) | (0 << 2) | 1), >> + ((2 << 4) | (0 << 3) | (1 << 2) | 1), >> + }; >> + >> + static const u16 ddr4_cfg_2_rbc[] = { >> + /*************************** >> + * [6] cs 0:0cs 1:2 cs >> + * [5:3] row(13+n) >> + * [2] cs(0:0 cs, 1:2 cs) >> + * [1] bw 0: 16bit 1:32bit >> + * [0] diebw 0:8bit 1:16bit >> + ***************************/ >> + /* cs, row, cs, bw, diebw */ >> + ((0 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 0), >> + ((1 << 6) | (2 << 3) | (0 << 2) | (1 << 1) | 0), >> + ((0 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 0), >> + ((1 << 6) | (3 << 3) | (0 << 2) | (0 << 1) | 0), >> + ((0 << 6) | (4 << 3) | (0 << 2) | (1 << 1) | 1), >> + ((1 << 6) | (3 << 3) | (0 << 2) | (1 << 1) | 1), >> + ((1 << 6) | (4 << 3) | (0 << 2) | (0 << 1) | 1), >> + ((0 << 6) | (2 << 3) | (1 << 2) | (1 << 1) | 0), >> + ((0 << 6) | (3 << 3) | (1 << 2) | (0 << 1) | 0), >> + ((0 << 6) | (3 << 3) | (1 << 2) | (1 << 1) | 1), >> + ((0 << 6) | (4 << 3) | (1 << 2) | (0 << 1) | 1), >> + }; >> + >> + u32 cs, bw, die_bw, col, row, bank; >> + u32 i, tmp; >> + u32 ddrconf = -1; >> + >> + cs = sdram_ch.rank; >> + bw = sdram_ch.bw; >> + die_bw = sdram_ch.dbw; >> + col = sdram_ch.col; >> + row = sdram_ch.cs0_row; >> + bank = sdram_ch.bk; >> + >> + if (sdram_params->dramtype == DDR4) { >> + tmp = ((cs - 1) << 6) | ((row - 13) << 3) | (bw & 0x2) | die_bw; >> + for (i = 10; i < 17; i++) { >> + if (((tmp & 0x7) == (ddr4_cfg_2_rbc[i - 10] & 0x7)) && >> + ((tmp & 0x3c) <= (ddr4_cfg_2_rbc[i - 10] & 0x3c)) && >> + ((tmp & 0x40) <= (ddr4_cfg_2_rbc[i - 10] & 0x40))) { >> + ddrconf = i; >> + goto out; >> + } >> + } >> + } else { >> + if (bank == 2) { >> + ddrconf = 8; >> + goto out; >> + } >> + >> + tmp = ((row - 13) << 4) | (1 << 2) | ((bw + col - 11) << 0); >> + for (i = 0; i < 5; i++) >> + if (((tmp & 0xf) == (ddr_cfg_2_rbc[i] & 0xf)) && >> + ((tmp & 0x30) <= (ddr_cfg_2_rbc[i] & 0x30))) { >> + ddrconf = i; >> + goto out; >> + } >> + } >> + >> +out: >> + if (ddrconf > 20) >> + printf("calculate_ddrconfig error\n"); >> + >> + return ddrconf; >> +} >> + >> +/* n: Unit bytes */ >> +static void copy_to_reg(u32 *dest, u32 *src, u32 n) >> +{ >> + int i; >> + >> + for (i = 0; i < n / sizeof(u32); i++) { >> + writel(*src, dest); >> + src++; >> + dest++; >> + } >> +} >> + >> +/******* >> + * calculate controller dram address map, and setting to register. >> + * argument sdram_ch.ddrconf must be right value before >> + * call this function. >> + *******/ >> +static void set_ctl_address_map(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + void __iomem *pctl_base = dram->pctl; >> + >> + copy_to_reg((u32 *)(pctl_base + DDR_PCTL2_ADDRMAP0), >> + &addrmap[sdram_ch.ddrconfig][0], 9 * 4); >> + if (sdram_params->dramtype == LPDDR3 && sdram_ch.row_3_4) >> + setbits_le32(pctl_base + DDR_PCTL2_ADDRMAP6, 1 << 31); >> + if (sdram_params->dramtype == DDR4 && sdram_ch.bw == 0x1) >> + setbits_le32(pctl_base + DDR_PCTL2_PCCFG, 1 << 8); >> + >> + if (sdram_ch.rank == 1) >> + clrsetbits_le32(pctl_base + DDR_PCTL2_ADDRMAP0, 0x1f, 0x1f); >> +} >> + >> +static void phy_dll_bypass_set(struct dram_info *dram, u32 freq) >> +{ >> + u32 tmp; >> + void __iomem *phy_base = dram->phy; >> + >> + setbits_le32(PHY_REG(phy_base, 0x13), 1 << 4); >> + clrbits_le32(PHY_REG(phy_base, 0x14), 1 << 3); >> + setbits_le32(PHY_REG(phy_base, 0x26), 1 << 4); >> + clrbits_le32(PHY_REG(phy_base, 0x27), 1 << 3); >> + setbits_le32(PHY_REG(phy_base, 0x36), 1 << 4); >> + clrbits_le32(PHY_REG(phy_base, 0x37), 1 << 3); >> + setbits_le32(PHY_REG(phy_base, 0x46), 1 << 4); >> + clrbits_le32(PHY_REG(phy_base, 0x47), 1 << 3); >> + setbits_le32(PHY_REG(phy_base, 0x56), 1 << 4); >> + clrbits_le32(PHY_REG(phy_base, 0x57), 1 << 3); >> + >> + if (freq <= (400 * MHz)) >> + /* DLL bypass */ >> + setbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); >> + else >> + clrbits_le32(PHY_REG(phy_base, 0xa4), 0x1f); >> + if (freq <= (680 * MHz)) >> + tmp = 2; >> + else >> + tmp = 1; >> + writel(tmp, PHY_REG(phy_base, 0x28)); >> + writel(tmp, PHY_REG(phy_base, 0x38)); >> + writel(tmp, PHY_REG(phy_base, 0x48)); >> + writel(tmp, PHY_REG(phy_base, 0x58)); >> +} >> + >> +static void set_ds_odt(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + u32 cmd_drv, clk_drv, dqs_drv, dqs_odt; >> + void __iomem *phy_base = dram->phy; >> + >> + if (sdram_params->dramtype == DDR3) { >> + cmd_drv = PHY_DDR3_RON_RTT_34ohm; >> + clk_drv = PHY_DDR3_RON_RTT_45ohm; >> + dqs_drv = PHY_DDR3_RON_RTT_34ohm; >> + dqs_odt = PHY_DDR3_RON_RTT_225ohm; >> + } else { >> + cmd_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; >> + clk_drv = PHY_DDR4_LPDDR3_RON_RTT_43ohm; >> + dqs_drv = PHY_DDR4_LPDDR3_RON_RTT_34ohm; >> + dqs_odt = PHY_DDR4_LPDDR3_RON_RTT_240ohm; >> + } >> + /* DS */ >> + writel(cmd_drv, PHY_REG(phy_base, 0x11)); >> + clrsetbits_le32(PHY_REG(phy_base, 0x12), 0x1f << 3, cmd_drv << 3); >> + writel(clk_drv, PHY_REG(phy_base, 0x16)); >> + writel(clk_drv, PHY_REG(phy_base, 0x18)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x20)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x2f)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x30)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x3f)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x40)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x4f)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x50)); >> + writel(dqs_drv, PHY_REG(phy_base, 0x5f)); >> + /* ODT */ >> + writel(dqs_odt, PHY_REG(phy_base, 0x21)); >> + writel(dqs_odt, PHY_REG(phy_base, 0x2e)); >> + writel(dqs_odt, PHY_REG(phy_base, 0x31)); >> + writel(dqs_odt, PHY_REG(phy_base, 0x3e)); >> + writel(dqs_odt, PHY_REG(phy_base, 0x41)); >> + writel(dqs_odt, PHY_REG(phy_base, 0x4e)); >> + writel(dqs_odt, PHY_REG(phy_base, 0x51)); >> + writel(dqs_odt, PHY_REG(phy_base, 0x5e)); >> +} >> + >> +static void phy_cfg(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + u32 i; >> + void __iomem *phy_base = dram->phy; >> + >> + phy_dll_bypass_set(dram, sdram_params->ddr_freq); >> + for (i = 0; sdram_params->phy_regs.phy[i][0] != 0xFFFFFFFF; i++) { >> + writel(sdram_params->phy_regs.phy[i][1], >> + phy_base + sdram_params->phy_regs.phy[i][0]); >> + } >> + if (sdram_ch.bw == 2) { >> + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 0xf << 4); >> + } else { >> + clrsetbits_le32(PHY_REG(phy_base, 0), 0xf << 4, 3 << 4); >> + /* disable DQS2,DQS3 tx dll for saving power */ >> + clrbits_le32(PHY_REG(phy_base, 0x46), 1 << 3); >> + clrbits_le32(PHY_REG(phy_base, 0x56), 1 << 3); >> + } >> + set_ds_odt(dram, sdram_params); >> + /* deskew */ >> + setbits_le32(PHY_REG(phy_base, 2), 8); >> + copy_to_reg(PHY_REG(phy_base, 0xb0), >> + &sdram_params->skew.a0_a1_skew[0], 15 * 4); >> + copy_to_reg(PHY_REG(phy_base, 0x70), >> + &sdram_params->skew.cs0_dm0_skew[0], 44 * 4); >> + copy_to_reg(PHY_REG(phy_base, 0xc0), >> + &sdram_params->skew.cs0_dm1_skew[0], 44 * 4); >> +} >> + >> +static int update_refresh_reg(struct dram_info *dram) >> +{ >> + void __iomem *pctl_base = dram->pctl; >> + u32 ret; >> + >> + ret = readl(pctl_base + DDR_PCTL2_RFSHCTL3) ^ (1 << 1); >> + writel(ret, pctl_base + DDR_PCTL2_RFSHCTL3); >> + >> + return 0; >> +} >> + >> +static int data_training(struct dram_info *dram, u32 cs, u32 dramtype) >> +{ >> + u32 ret; >> + u32 dis_auto_zq = 0; >> + void __iomem *pctl_base = dram->pctl; >> + void __iomem *phy_base = dram->phy; >> + >> + /* disable zqcs */ >> + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & >> + (1ul << 31))) { >> + dis_auto_zq = 1; >> + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); >> + } >> + /* disable auto refresh */ >> + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); >> + update_refresh_reg(dram); >> + >> + if (dramtype == DDR4) { >> + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0); >> + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0); >> + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0); >> + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0); >> + } >> + /* choose training cs */ >> + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs)); >> + /* enable gate training */ >> + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 1); >> + udelay(50); >> + ret = readl(PHY_REG(phy_base, 0xff)); >> + /* disable gate training */ >> + clrsetbits_le32(PHY_REG(phy_base, 2), 0x33, (0x20 >> cs) | 0); >> + /* restore zqcs */ >> + if (dis_auto_zq) >> + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); >> + /* restore auto refresh */ >> + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); >> + update_refresh_reg(dram); >> + >> + if (dramtype == DDR4) { >> + clrsetbits_le32(PHY_REG(phy_base, 0x29), 0x3, 0x2); >> + clrsetbits_le32(PHY_REG(phy_base, 0x39), 0x3, 0x2); >> + clrsetbits_le32(PHY_REG(phy_base, 0x49), 0x3, 0x2); >> + clrsetbits_le32(PHY_REG(phy_base, 0x59), 0x3, 0x2); >> + } >> + >> + if (ret & 0x10) { >> + ret = -1; >> + } else { >> + ret = (ret & 0xf) ^ (readl(PHY_REG(phy_base, 0)) >> 4); >> + ret = (ret == 0) ? 0 : -1; >> + } >> + return ret; >> +} >> + >> +/* rank = 1: cs0 >> + * rank = 2: cs1 >> + * rank = 3: cs0 & cs1 >> + * note: be careful of keep mr original val >> + */ >> +static int write_mr(struct dram_info *dram, u32 rank, u32 mr_num, u32 arg, >> + u32 dramtype) >> +{ >> + void __iomem *pctl_base = dram->pctl; >> + >> + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) >> + continue; >> + if (dramtype == DDR3 || dramtype == DDR4) { >> + writel((mr_num << 12) | (rank << 4) | (0 << 0), >> + pctl_base + DDR_PCTL2_MRCTRL0); >> + writel(arg, pctl_base + DDR_PCTL2_MRCTRL1); >> + } else { >> + writel((rank << 4) | (0 << 0), >> + pctl_base + DDR_PCTL2_MRCTRL0); >> + writel((mr_num << 8) | (arg & 0xff), >> + pctl_base + DDR_PCTL2_MRCTRL1); >> + } >> + >> + setbits_le32(pctl_base + DDR_PCTL2_MRCTRL0, 1u << 31); >> + while (readl(pctl_base + DDR_PCTL2_MRCTRL0) & (1u << 31)) >> + continue; >> + while (readl(pctl_base + DDR_PCTL2_MRSTAT) & MR_WR_BUSY) >> + continue; >> + >> + return 0; >> +} >> + >> +/* >> + * rank : 1:cs0, 2:cs1, 3:cs0&cs1 >> + * vrefrate: 4500: 45%, >> + */ >> +static int write_vrefdq(struct dram_info *dram, u32 rank, u32 vrefrate, >> + u32 dramtype) >> +{ >> + u32 tccd_l, value; >> + u32 dis_auto_zq = 0; >> + void __iomem *pctl_base = dram->pctl; >> + >> + if (dramtype != DDR4 || vrefrate < 4500 || vrefrate > 9200) >> + return -1; >> + >> + tccd_l = (readl(pctl_base + DDR_PCTL2_DRAMTMG4) >> 16) & 0xf; >> + tccd_l = (tccd_l - 4) << 10; >> + >> + if (vrefrate > 7500) { >> + /* range 1 */ >> + value = ((vrefrate - 6000) / 65) | tccd_l; >> + } else { >> + /* range 2 */ >> + value = ((vrefrate - 4500) / 65) | tccd_l | (1 << 6); >> + } >> + >> + /* disable zqcs */ >> + if (!(readl(pctl_base + DDR_PCTL2_ZQCTL0) & >> + (1ul << 31))) { >> + dis_auto_zq = 1; >> + setbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); >> + } >> + /* disable auto refresh */ >> + setbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); >> + update_refresh_reg(dram); >> + >> + /* enable vrefdq calibratin */ >> + write_mr(dram, rank, 6, value | (1 << 7), dramtype); >> + udelay(1);/* tvrefdqe */ >> + /* write vrefdq value */ >> + write_mr(dram, rank, 6, value | (1 << 7), dramtype); >> + udelay(1);/* tvref_time */ >> + write_mr(dram, rank, 6, value | (0 << 7), dramtype); >> + udelay(1);/* tvrefdqx */ >> + >> + /* restore zqcs */ >> + if (dis_auto_zq) >> + clrbits_le32(pctl_base + DDR_PCTL2_ZQCTL0, 1 << 31); >> + /* restore auto refresh */ >> + clrbits_le32(pctl_base + DDR_PCTL2_RFSHCTL3, 1); >> + update_refresh_reg(dram); >> + >> + return 0; >> +} >> + >> +#define _MAX_(x, y) ((x) > (y) ? (x) : (y)) >> + >> +static void rx_deskew_switch_adjust(struct dram_info *dram) >> +{ >> + u32 i, deskew_val; >> + u32 gate_val = 0; >> + void __iomem *phy_base = dram->phy; >> + >> + for (i = 0; i < 4; i++) >> + gate_val = _MAX_(readl(PHY_REG(phy_base, 0xfb + i)), gate_val); >> + >> + deskew_val = (gate_val >> 3) + 1; >> + deskew_val = (deskew_val > 0x1f) ? 0x1f : deskew_val; >> + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0xc, (deskew_val & 0x3) << 2); >> + clrsetbits_le32(PHY_REG(phy_base, 0x6f), 0x7 << 4, >> + (deskew_val & 0x1c) << 2); >> +} >> + >> +#undef _MAX_ >> + >> +static void tx_deskew_switch_adjust(struct dram_info *dram) >> +{ >> + void __iomem *phy_base = dram->phy; >> + >> + clrsetbits_le32(PHY_REG(phy_base, 0x6e), 0x3, 1); >> +} >> + >> +static void set_ddrconfig(struct dram_info *dram, u32 ddrconfig) >> +{ >> + writel(ddrconfig, &dram->msch->ddrconf); >> +} >> + >> +static void dram_all_config(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + u32 sys_reg = 0, tmp = 0; >> + >> + set_ddrconfig(dram, sdram_ch.ddrconfig); >> + >> + sys_reg |= SYS_REG_ENC_DDRTYPE(sdram_params->dramtype); >> + sys_reg |= SYS_REG_ENC_ROW_3_4(sdram_ch.row_3_4, 0); >> + sys_reg |= SYS_REG_ENC_RANK(sdram_ch.rank, 0); >> + sys_reg |= SYS_REG_ENC_COL(sdram_ch.col, 0); >> + sys_reg |= SYS_REG_ENC_BK(sdram_ch.bk, 0); >> + SYS_REG_ENC_CS0_ROW(sdram_ch.cs0_row, sys_reg, tmp, 0); >> + if (sdram_ch.cs1_row) >> + SYS_REG_ENC_CS1_ROW(sdram_ch.cs1_row, sys_reg, tmp, 0); >> + sys_reg |= SYS_REG_ENC_BW(sdram_ch.bw, 0); >> + sys_reg |= SYS_REG_ENC_DBW(sdram_ch.dbw, 0); >> + >> + writel(sys_reg, &dram->grf->os_reg[2]); >> + >> + writel(sdram_ch.noc_timings.ddrtiming.d32, &dram->msch->ddrtiming); >> + >> + writel(sdram_ch.noc_timings.ddrmode.d32, &dram->msch->ddrmode); >> + writel(sdram_ch.noc_timings.readlatency, &dram->msch->readlatency); >> + >> + writel(sdram_ch.noc_timings.activate.d32, &dram->msch->activate); >> + writel(sdram_ch.noc_timings.devtodev.d32, &dram->msch->devtodev); >> + writel(sdram_ch.noc_timings.ddr4timing.d32, &dram->msch->ddr4_timing); >> + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging0); >> + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging1); >> + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging2); >> + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging3); >> + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging4); >> + writel(sdram_ch.noc_timings.agingx0, &dram->msch->aging5); >> +} >> + >> +static void enable_low_power(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + void __iomem *pctl_base = dram->pctl; >> + >> + /* enable upctl2 axi clock auto gating */ >> + writel(0x00800000, &dram->ddr_grf->ddr_grf_con[0]); >> + writel(0x20012001, &dram->ddr_grf->ddr_grf_con[2]); >> + /* enable upctl2 core clock auto gating */ >> + writel(0x001e001a, &dram->ddr_grf->ddr_grf_con[2]); >> + /* enable sr, pd */ >> + if (PD_IDLE == 0) >> + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); >> + else >> + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 1)); >> + if (SR_IDLE == 0) >> + clrbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); >> + else >> + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, 1); >> + setbits_le32(pctl_base + DDR_PCTL2_PWRCTL, (1 << 3)); >> +} >> + >> +static int sdram_init(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params, u32 pre_init) >> +{ >> + void __iomem *pctl_base = dram->pctl; >> + >> + rkclk_ddr_reset(dram, 1, 1, 1, 1); >> + udelay(10); >> + /* >> + * dereset ddr phy psrstn to config pll, >> + * if using phy pll psrstn must be dereset >> + * before config pll >> + */ >> + rkclk_ddr_reset(dram, 1, 1, 1, 0); >> + rkclk_configure_ddr(dram, sdram_params); >> + if (pre_init == 0) { >> + switch (sdram_params->dramtype) { >> + case DDR3: >> + printf("DDR3\n"); >> + break; >> + case DDR4: >> + printf("DDR4\n"); >> + break; >> + case LPDDR3: >> + default: >> + printf("LPDDR3\n"); >> + break; >> + } >> + } >> + /* release phy srst to provide clk to ctrl */ >> + rkclk_ddr_reset(dram, 1, 1, 0, 0); >> + udelay(10); >> + phy_soft_reset(dram); >> + /* release ctrl presetn, and config ctl registers */ >> + rkclk_ddr_reset(dram, 1, 0, 0, 0); >> + pctl_cfg(dram, sdram_params); >> + sdram_ch.ddrconfig = calculate_ddrconfig(sdram_params); >> + set_ctl_address_map(dram, sdram_params); >> + phy_cfg(dram, sdram_params); >> + >> + /* enable dfi_init_start to init phy after ctl srstn deassert */ >> + setbits_le32(pctl_base + DDR_PCTL2_DFIMISC, (1 << 5) | (1 << 4)); >> + rkclk_ddr_reset(dram, 0, 0, 0, 0); >> + /* wait for dfi_init_done and dram init complete */ >> + while ((readl(pctl_base + DDR_PCTL2_STAT) & 0x7) == 0) >> + continue; >> + >> + /* do ddr gate training */ >> + if (data_training(dram, 0, sdram_params->dramtype) != 0) { >> + printf("data training error\n"); >> + return -1; >> + } >> + >> + if (sdram_params->dramtype == DDR4) >> + write_vrefdq(dram, 0x3, 5670, sdram_params->dramtype); >> + >> + if (pre_init == 0) { >> + rx_deskew_switch_adjust(dram); >> + tx_deskew_switch_adjust(dram); >> + } >> + >> + dram_all_config(dram, sdram_params); >> + enable_low_power(dram, sdram_params); >> + >> + return 0; >> +} >> + >> +static u64 dram_detect_cap(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params, >> + unsigned char channel) >> +{ >> + void __iomem *pctl_base = dram->pctl; >> + >> + /* >> + * for ddr3: ddrconf = 3 >> + * for ddr4: ddrconf = 12 >> + * for lpddr3: ddrconf = 3 >> + * default bw = 1 >> + */ >> + u32 bk, bktmp; >> + u32 col, coltmp; >> + u32 row, rowtmp, row_3_4; >> + void __iomem *test_addr, *test_addr1; >> + u32 dbw; >> + u32 cs; >> + u32 bw = 1; >> + u64 cap = 0; >> + u32 dram_type = sdram_params->dramtype; >> + u32 pwrctl; >> + >> + if (dram_type != DDR4) { >> + /* detect col and bk for ddr3/lpddr3 */ >> + coltmp = 12; >> + bktmp = 3; >> + rowtmp = 16; >> + >> + for (col = coltmp; col >= 9; col -= 1) { >> + writel(0, SDRAM_ADDR); >> + test_addr = (void __iomem *)(SDRAM_ADDR + >> + (1ul << (col + bw - 1ul))); >> + writel(PATTERN, test_addr); >> + if ((readl(test_addr) == PATTERN) && >> + (readl(SDRAM_ADDR) == 0)) >> + break; >> + } >> + if (col == 8) { >> + printf("col error\n"); >> + goto cap_err; >> + } >> + >> + test_addr = (void __iomem *)(SDRAM_ADDR + >> + (1ul << (coltmp + bktmp + bw - 1ul))); >> + writel(0, SDRAM_ADDR); >> + writel(PATTERN, test_addr); >> + if ((readl(test_addr) == PATTERN) && >> + (readl(SDRAM_ADDR) == 0)) >> + bk = 3; >> + else >> + bk = 2; >> + if (dram_type == LPDDR3) >> + dbw = 2; >> + else >> + dbw = 1; >> + } else { >> + /* detect bg for ddr4 */ >> + coltmp = 10; >> + bktmp = 4; >> + rowtmp = 17; >> + >> + col = 10; >> + bk = 2; >> + test_addr = (void __iomem *)(SDRAM_ADDR + >> + (1ul << (coltmp + bw + 1ul))); >> + writel(0, SDRAM_ADDR); >> + writel(PATTERN, test_addr); >> + if ((readl(test_addr) == PATTERN) && >> + (readl(SDRAM_ADDR) == 0)) >> + dbw = 0; >> + else >> + dbw = 1; >> + } >> + /* detect row */ >> + for (row = rowtmp; row > 12; row--) { >> + writel(0, SDRAM_ADDR); >> + test_addr = (void __iomem *)(SDRAM_ADDR + >> + (1ul << (row + bktmp + coltmp + bw - 1ul))); >> + writel(PATTERN, test_addr); >> + if ((readl(test_addr) == PATTERN) && >> + (readl(SDRAM_ADDR) == 0)) >> + break; >> + } >> + if (row == 12) { >> + printf("row error"); >> + goto cap_err; >> + } >> + /* detect row_3_4 */ >> + test_addr = SDRAM_ADDR; >> + test_addr1 = (void __iomem *)(SDRAM_ADDR + >> + (0x3ul << (row + bktmp + coltmp + bw - 1ul - 1ul))); >> + >> + writel(0, test_addr); >> + writel(PATTERN, test_addr1); >> + if ((readl(test_addr) == 0) && >> + (readl(test_addr1) == PATTERN)) >> + row_3_4 = 0; >> + else >> + row_3_4 = 1; >> + >> + /* disable auto low-power */ >> + pwrctl = readl(pctl_base + DDR_PCTL2_PWRCTL); >> + writel(0, pctl_base + DDR_PCTL2_PWRCTL); >> + >> + /* bw and cs detect using phy read gate training */ >> + if (data_training(dram, 1, dram_type) == 0) >> + cs = 1; >> + else >> + cs = 0; >> + >> + bw = 2; >> + >> + /* restore auto low-power */ >> + writel(pwrctl, pctl_base + DDR_PCTL2_PWRCTL); >> + >> + sdram_ch.rank = cs + 1; >> + sdram_ch.col = col; >> + sdram_ch.bk = bk; >> + sdram_ch.dbw = dbw; >> + sdram_ch.bw = bw; >> + sdram_ch.cs0_row = row; >> + if (cs) >> + sdram_ch.cs1_row = row; >> + else >> + sdram_ch.cs1_row = 0; >> + sdram_ch.row_3_4 = row_3_4; >> + >> + if (dram_type == DDR4) >> + cap = 1llu << (cs + row + bk + col + ((dbw == 0) ? 2 : 1) + bw); >> + else >> + cap = 1llu << (cs + row + bk + col + bw); >> + >> + return cap; >> + >> +cap_err: >> + return 0; >> +} >> + >> +static u32 remodify_sdram_params(struct rk3328_sdram_params *sdram_params) >> +{ >> + u32 tmp = 0, tmp_adr = 0, i; >> + >> + for (i = 0; sdram_params->pctl_regs.pctl[i][0] != 0xFFFFFFFF; i++) { >> + if (sdram_params->pctl_regs.pctl[i][0] == 0) { >> + tmp = sdram_params->pctl_regs.pctl[i][1];/* MSTR */ >> + tmp_adr = i; >> + } >> + } >> + >> + tmp &= ~((3ul << 30) | (3ul << 24) | (3ul << 12)); >> + >> + switch (sdram_ch.dbw) { >> + case 2: >> + tmp |= (3ul << 30); >> + break; >> + case 1: >> + tmp |= (2ul << 30); >> + break; >> + case 0: >> + default: >> + tmp |= (1ul << 30); >> + break; >> + } >> + >> + if (sdram_ch.rank == 2) >> + tmp |= 3 << 24; >> + else >> + tmp |= 1 << 24; >> + >> + tmp |= (2 - sdram_ch.bw) << 12; >> + >> + sdram_params->pctl_regs.pctl[tmp_adr][1] = tmp; >> + >> + if (sdram_ch.bw == 2) >> + sdram_ch.noc_timings.ddrtiming.b.bwratio = 0; >> + else >> + sdram_ch.noc_timings.ddrtiming.b.bwratio = 1; >> + >> + return 0; >> +} >> + >> +static int dram_detect_cs1_row(struct rk3328_sdram_params *sdram_params, >> + unsigned char channel) >> +{ >> + u32 ret = 0; >> + u32 cs1_bit; >> + void __iomem *test_addr, *cs1_addr; >> + u32 row, bktmp, coltmp, bw; >> + u32 ddrconf = sdram_ch.ddrconfig; >> + >> + if (sdram_ch.rank == 2) { >> + cs1_bit = addrmap[ddrconf][0] + 8; >> + >> + if (cs1_bit > 31) >> + goto out; >> + >> + cs1_addr = (void __iomem *)(1ul << cs1_bit); >> + if (cs1_bit < 20) >> + cs1_bit = 1; >> + else >> + cs1_bit = 0; >> + >> + if (sdram_params->dramtype == DDR4) { >> + if (sdram_ch.dbw == 0) >> + bktmp = sdram_ch.bk + 2; >> + else >> + bktmp = sdram_ch.bk + 1; >> + } else { >> + bktmp = sdram_ch.bk; >> + } >> + bw = sdram_ch.bw; >> + coltmp = sdram_ch.col; >> + >> + /* detect cs1 row */ >> + for (row = sdram_ch.cs0_row; row > 12; row--) { >> + test_addr = (void __iomem *)(SDRAM_ADDR + cs1_addr + >> + (1ul << (row + cs1_bit + bktmp + >> + coltmp + bw - 1ul))); >> + writel(0, SDRAM_ADDR + cs1_addr); >> + writel(PATTERN, test_addr); >> + if ((readl(test_addr) == PATTERN) && >> + (readl(SDRAM_ADDR + cs1_addr) == 0)) { >> + ret = row; >> + break; >> + } >> + } >> + } >> + >> +out: >> + return ret; >> +} >> + >> +static int sdram_init_detect(struct dram_info *dram, >> + struct rk3328_sdram_params *sdram_params) >> +{ >> + debug("Starting SDRAM initialization...\n"); >> + >> + memcpy(&sdram_ch, &sdram_params->ch, >> + sizeof(struct rk3328_sdram_channel)); >> + >> + sdram_init(dram, sdram_params, 1); >> + dram_detect_cap(dram, sdram_params, 0); >> + >> + /* modify bw, cs related timing */ >> + remodify_sdram_params(sdram_params); >> + /* reinit sdram by real dram cap */ >> + sdram_init(dram, sdram_params, 0); >> + >> + /* redetect cs1 row */ >> + sdram_ch.cs1_row = >> + dram_detect_cs1_row(sdram_params, 0); >> + >> + return 0; >> +} >> + >> +static int rk3328_dmc_init(struct udevice *dev) >> +{ >> + struct dram_info *priv = dev_get_priv(dev); >> + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); >> + int ret; >> + >> +#if !CONFIG_IS_ENABLED(OF_PLATDATA) >> + struct rk3328_sdram_params *params = &plat->sdram_params; >> +#else >> + struct dtd_rockchip_rk3328_dmc *dtplat = &plat->dtplat; >> + struct rk3328_sdram_params *params = >> + (void *)dtplat->rockchip_sdram_params; >> + >> + ret = conv_of_platdata(dev); >> + if (ret) >> + return ret; >> +#endif >> + priv->phy = regmap_get_range(plat->map, 0); >> + priv->pctl = regmap_get_range(plat->map, 1); >> + priv->grf = regmap_get_range(plat->map, 2); >> + priv->cru = regmap_get_range(plat->map, 3); >> + priv->msch = regmap_get_range(plat->map, 4); >> + priv->ddr_grf = regmap_get_range(plat->map, 5); >> + >> + debug("%s phy %p pctrl %p grf %p cru %p msch %p ddr_grf %p\n", >> + __func__, priv->phy, priv->pctl, priv->grf, priv->cru, >> + priv->msch, priv->ddr_grf); >> + ret = sdram_init_detect(priv, params); >> + if (ret < 0) { >> + printf("%s DRAM init failed%d\n", __func__, ret); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static int rk3328_dmc_ofdata_to_platdata(struct udevice *dev) >> +{ >> +#if !CONFIG_IS_ENABLED(OF_PLATDATA) >> + struct rockchip_dmc_plat *plat = dev_get_platdata(dev); >> + int ret; >> + >> + ret = dev_read_u32_array(dev, "rockchip,sdram-params", >> + (u32 *)&plat->sdram_params, >> + sizeof(plat->sdram_params) / sizeof(u32)); >> + if (ret) { >> + printf("%s: Cannot read rockchip,sdram-params %d\n", >> + __func__, ret); >> + return ret; >> + } >> + ret = regmap_init_mem(dev, &plat->map); >> + if (ret) >> + printf("%s: regmap failed %d\n", __func__, ret); >> +#endif >> + return 0; >> +} >> + >> +#endif >> + >> static int rk3328_dmc_probe(struct udevice *dev) >> { >> +#ifdef CONFIG_TPL_BUILD >> + if (rk3328_dmc_init(dev)) >> + return 0; >> +#else >> struct dram_info *priv = dev_get_priv(dev); >> >> priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); >> @@ -25,7 +1032,7 @@ static int rk3328_dmc_probe(struct udevice *dev) >> priv->info.base = CONFIG_SYS_SDRAM_BASE; >> priv->info.size = rockchip_sdram_size( >> (phys_addr_t)&priv->grf->os_reg[2]); >> - >> +#endif >> return 0; >> } >> >> @@ -42,7 +1049,6 @@ static struct ram_ops rk3328_dmc_ops = { >> .get_info = rk3328_dmc_get_info, >> }; >> >> - >> static const struct udevice_id rk3328_dmc_ids[] = { >> { .compatible = "rockchip,rk3328-dmc" }, >> { } >> @@ -53,6 +1059,12 @@ U_BOOT_DRIVER(dmc_rk3328) = { >> .id = UCLASS_RAM, >> .of_match = rk3328_dmc_ids, >> .ops = &rk3328_dmc_ops, >> +#ifdef CONFIG_TPL_BUILD >> + .ofdata_to_platdata = rk3328_dmc_ofdata_to_platdata, >> +#endif >> .probe = rk3328_dmc_probe, >> .priv_auto_alloc_size = sizeof(struct dram_info), >> +#ifdef CONFIG_TPL_BUILD >> + .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), >> +#endif >> }; >> -- >> 2.16.4 >> ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 3/7] rockchip: dts: rk3328: update dmc node for driver 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 1/7] rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov @ 2019-08-02 7:40 ` Matwey V. Kornilov 2019-08-05 13:02 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov ` (4 subsequent siblings) 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:40 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> Update dmc node for full feature driver. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/1e1495636574c78ea9d3af3e0aae95d5204612d6 with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/dts/rk3328-evb-u-boot.dtsi | 2 + arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++++++++++++++++++++++++++ arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ arch/arm/dts/rk3328.dtsi | 11 +- 6 files changed, 657 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi index 22bfaef72a..58ebf52b4b 100644 --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi @@ -3,6 +3,8 @@ * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ +#include "rk3328-sdram-ddr3-666.dtsi" + / { aliases { mmc0 = &emmc; diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi index b077436cbc..a01f758e9f 100644 --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi @@ -4,6 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include "rk3328-sdram-lpddr3-1600.dtsi" + / { aliases { mmc0 = &emmc; diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi new file mode 100644 index 0000000000..d99e7e0352 --- /dev/null +++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi @@ -0,0 +1,215 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&dmc { + rockchip,sdram-params = < + 0x1 + 0xC + 0x3 + 0x1 + 0x0 + 0x0 + 0x10 + 0x10 + 0 + + 0x9028b189 + 0x00000000 + 0x00000021 + 0x00000482 + 0x00000015 + 0x00000222 + 0x000000ff + + 333 + 3 + 0 + + 0x00000000 + 0x43041001 + 0x00000064 + 0x0028003b + 0x000000d0 + 0x00020053 + 0x000000d4 + 0x00020000 + 0x000000d8 + 0x00000100 + 0x000000dc + 0x03200000 + 0x000000e0 + 0x00000000 + 0x000000e4 + 0x00090000 + 0x000000f4 + 0x000f011f + 0x00000100 + 0x07090b06 + 0x00000104 + 0x00050209 + 0x00000108 + 0x03030407 + 0x0000010c + 0x00202006 + 0x00000110 + 0x03020204 + 0x00000114 + 0x03030202 + 0x00000120 + 0x00000903 + 0x00000180 + 0x00800020 + 0x00000184 + 0x00000000 + 0x00000190 + 0x07010001 + 0x00000198 + 0x05001100 + 0x000001a0 + 0xc0400003 + 0x00000240 + 0x06000604 + 0x00000244 + 0x00000201 + 0x00000250 + 0x00000f00 + 0x00000490 + 0x00000001 + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + + 0x00000004 + 0x0000000a + 0x00000028 + 0x00000006 + 0x0000002c + 0x00000000 + 0x00000030 + 0x00000005 + 0xffffffff + 0xffffffff + + 0x77 + 0x88 + 0x79 + 0x79 + 0x87 + 0x97 + 0x87 + 0x78 + 0x77 + 0x78 + 0x87 + 0x88 + 0x87 + 0x87 + 0x77 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + >; +}; diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi new file mode 100644 index 0000000000..cc0011cf7b --- /dev/null +++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi @@ -0,0 +1,215 @@ +/* + * (C) 2017 Theobroma Systems Design und Consulting GmbH + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&dmc { + rockchip,sdram-params = < + 0x1 + 0xC + 0x3 + 0x1 + 0x0 + 0x0 + 0x10 + 0x10 + 0 + + 0x98899459 + 0x00000000 + 0x0000002e + 0x00000544 + 0x00000015 + 0x00000432 + 0x000000ff + + 800 + 6 + 1 + + 0x00000000 + 0x43041008 + 0x00000064 + 0x00300054 + 0x000000d0 + 0x00500002 + 0x000000d4 + 0x00010000 + 0x000000d8 + 0x00000e03 + 0x000000dc + 0x0043001a + 0x000000e0 + 0x00010000 + 0x000000e4 + 0x000e0005 + 0x000000f4 + 0x000f011f + 0x00000100 + 0x0b141b11 + 0x00000104 + 0x0003031a + 0x00000108 + 0x03060809 + 0x0000010c + 0x00606000 + 0x00000110 + 0x08020409 + 0x00000114 + 0x01010606 + 0x00000118 + 0x02020004 + 0x00000120 + 0x00000404 + 0x00000138 + 0x00000058 + 0x00000180 + 0x00900024 + 0x00000184 + 0x01400000 + 0x00000190 + 0x07050002 + 0x00000198 + 0x05001100 + 0x000001a0 + 0xc0400003 + 0x00000240 + 0x0a020b28 + 0x00000244 + 0x00000101 + 0x00000250 + 0x00000f00 + 0x00000490 + 0x00000001 + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + + 0x00000004 + 0x0000000b + 0x00000028 + 0x0000000c + 0x0000002c + 0x00000000 + 0x00000030 + 0x00000006 + 0xffffffff + 0xffffffff + + 0x77 + 0x88 + 0x79 + 0x79 + 0x87 + 0x97 + 0x87 + 0x78 + 0x77 + 0x78 + 0x87 + 0x88 + 0x87 + 0x87 + 0x77 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + >; +}; diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi new file mode 100644 index 0000000000..62d809e833 --- /dev/null +++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi @@ -0,0 +1,215 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +&dmc { + rockchip,sdram-params = < + 0x1 + 0xC + 0x3 + 0x1 + 0x0 + 0x0 + 0x10 + 0x10 + 0 + + 0x0c48a18a + 0x00000000 + 0x00000021 + 0x00000482 + 0x00000015 + 0x0000021a + 0x000000ff + + 333 + 6 + 0 + + 0x00000000 + 0xc3040008 + 0x00000064 + 0x00140023 + 0x000000d0 + 0x00220002 + 0x000000d4 + 0x00010000 + 0x000000d8 + 0x00000703 + 0x000000dc + 0x00830004 + 0x000000e0 + 0x00010000 + 0x000000e4 + 0x00070003 + 0x00000100 + 0x06090b07 + 0x00000104 + 0x0002020b + 0x00000108 + 0x02030506 + 0x0000010c + 0x00505000 + 0x00000110 + 0x03020204 + 0x00000114 + 0x01010303 + 0x00000118 + 0x02020003 + 0x00000120 + 0x00000303 + 0x00000138 + 0x00000025 + 0x00000180 + 0x003c000f + 0x00000184 + 0x00900000 + 0x00000190 + 0x07020000 + 0x00000198 + 0x05001100 + 0x000001a0 + 0xc0400003 + 0x00000240 + 0x0900090c + 0x00000244 + 0x00000101 + 0x00000250 + 0x00000f00 + 0x00000490 + 0x00000001 + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + 0xffffffff + + 0x00000004 + 0x0000000b + 0x00000028 + 0x00000006 + 0x0000002c + 0x00000000 + 0x00000030 + 0x00000003 + 0xffffffff + 0xffffffff + + 0x77 + 0x88 + 0x79 + 0x79 + 0x87 + 0x97 + 0x87 + 0x78 + 0x77 + 0x78 + 0x87 + 0x88 + 0x87 + 0x87 + 0x77 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x78 + 0x77 + 0x79 + 0x9 + + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x78 + 0x69 + 0x9 + + 0x77 + 0x78 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x77 + 0x79 + 0x9 + >; +}; diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index 2d80addbb0..a080ae8d69 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -351,10 +351,15 @@ status = "disabled"; }; - dmc: dmc at ff400000 { + dmc: dmc { u-boot,dm-pre-reloc; - compatible = "rockchip,rk3328-dmc", "syscon"; - reg = <0x0 0xff400000 0x0 0x1000>; + compatible = "rockchip,rk3328-dmc"; + reg = <0x0 0xff400000 0x0 0x1000 + 0x0 0xff780000 0x0 0x3000 + 0x0 0xff100000 0x0 0x1000 + 0x0 0xff440000 0x0 0x1000 + 0x0 0xff720000 0x0 0x1000 + 0x0 0xff798000 0x0 0x1000>; }; cru: clock-controller at ff440000 { -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 3/7] rockchip: dts: rk3328: update dmc node for driver 2019-08-02 7:40 ` [U-Boot] [PATCH v2 3/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov @ 2019-08-05 13:02 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-05 13:02 UTC (permalink / raw) To: u-boot On 2019/8/2 下午3:40, Matwey V. Kornilov wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > Update dmc node for full feature driver. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/1e1495636574c78ea9d3af3e0aae95d5204612d6 with minor modifications] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3328-evb-u-boot.dtsi | 2 + > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + > arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ > arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++++++++++++++++++++++++++ > arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++++++++++++++++++++++++++ > arch/arm/dts/rk3328.dtsi | 11 +- > 6 files changed, 657 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > > diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi > index 22bfaef72a..58ebf52b4b 100644 > --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi > @@ -3,6 +3,8 @@ > * (C) Copyright 2016 Rockchip Electronics Co., Ltd > */ > > +#include "rk3328-sdram-ddr3-666.dtsi" > + > / { > aliases { > mmc0 = &emmc; > diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > index b077436cbc..a01f758e9f 100644 > --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > @@ -4,6 +4,8 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > +#include "rk3328-sdram-lpddr3-1600.dtsi" > + > / { > aliases { > mmc0 = &emmc; > diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > new file mode 100644 > index 0000000000..d99e7e0352 > --- /dev/null > +++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > @@ -0,0 +1,215 @@ > +/* > + * (C) Copyright 2017 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +&dmc { > + rockchip,sdram-params = < > + 0x1 > + 0xC > + 0x3 > + 0x1 > + 0x0 > + 0x0 > + 0x10 > + 0x10 > + 0 > + > + 0x9028b189 > + 0x00000000 > + 0x00000021 > + 0x00000482 > + 0x00000015 > + 0x00000222 > + 0x000000ff > + > + 333 > + 3 > + 0 > + > + 0x00000000 > + 0x43041001 > + 0x00000064 > + 0x0028003b > + 0x000000d0 > + 0x00020053 > + 0x000000d4 > + 0x00020000 > + 0x000000d8 > + 0x00000100 > + 0x000000dc > + 0x03200000 > + 0x000000e0 > + 0x00000000 > + 0x000000e4 > + 0x00090000 > + 0x000000f4 > + 0x000f011f > + 0x00000100 > + 0x07090b06 > + 0x00000104 > + 0x00050209 > + 0x00000108 > + 0x03030407 > + 0x0000010c > + 0x00202006 > + 0x00000110 > + 0x03020204 > + 0x00000114 > + 0x03030202 > + 0x00000120 > + 0x00000903 > + 0x00000180 > + 0x00800020 > + 0x00000184 > + 0x00000000 > + 0x00000190 > + 0x07010001 > + 0x00000198 > + 0x05001100 > + 0x000001a0 > + 0xc0400003 > + 0x00000240 > + 0x06000604 > + 0x00000244 > + 0x00000201 > + 0x00000250 > + 0x00000f00 > + 0x00000490 > + 0x00000001 > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + > + 0x00000004 > + 0x0000000a > + 0x00000028 > + 0x00000006 > + 0x0000002c > + 0x00000000 > + 0x00000030 > + 0x00000005 > + 0xffffffff > + 0xffffffff > + > + 0x77 > + 0x88 > + 0x79 > + 0x79 > + 0x87 > + 0x97 > + 0x87 > + 0x78 > + 0x77 > + 0x78 > + 0x87 > + 0x88 > + 0x87 > + 0x87 > + 0x77 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + >; > +}; > diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > new file mode 100644 > index 0000000000..cc0011cf7b > --- /dev/null > +++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > @@ -0,0 +1,215 @@ > +/* > + * (C) 2017 Theobroma Systems Design und Consulting GmbH > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +&dmc { > + rockchip,sdram-params = < > + 0x1 > + 0xC > + 0x3 > + 0x1 > + 0x0 > + 0x0 > + 0x10 > + 0x10 > + 0 > + > + 0x98899459 > + 0x00000000 > + 0x0000002e > + 0x00000544 > + 0x00000015 > + 0x00000432 > + 0x000000ff > + > + 800 > + 6 > + 1 > + > + 0x00000000 > + 0x43041008 > + 0x00000064 > + 0x00300054 > + 0x000000d0 > + 0x00500002 > + 0x000000d4 > + 0x00010000 > + 0x000000d8 > + 0x00000e03 > + 0x000000dc > + 0x0043001a > + 0x000000e0 > + 0x00010000 > + 0x000000e4 > + 0x000e0005 > + 0x000000f4 > + 0x000f011f > + 0x00000100 > + 0x0b141b11 > + 0x00000104 > + 0x0003031a > + 0x00000108 > + 0x03060809 > + 0x0000010c > + 0x00606000 > + 0x00000110 > + 0x08020409 > + 0x00000114 > + 0x01010606 > + 0x00000118 > + 0x02020004 > + 0x00000120 > + 0x00000404 > + 0x00000138 > + 0x00000058 > + 0x00000180 > + 0x00900024 > + 0x00000184 > + 0x01400000 > + 0x00000190 > + 0x07050002 > + 0x00000198 > + 0x05001100 > + 0x000001a0 > + 0xc0400003 > + 0x00000240 > + 0x0a020b28 > + 0x00000244 > + 0x00000101 > + 0x00000250 > + 0x00000f00 > + 0x00000490 > + 0x00000001 > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + > + 0x00000004 > + 0x0000000b > + 0x00000028 > + 0x0000000c > + 0x0000002c > + 0x00000000 > + 0x00000030 > + 0x00000006 > + 0xffffffff > + 0xffffffff > + > + 0x77 > + 0x88 > + 0x79 > + 0x79 > + 0x87 > + 0x97 > + 0x87 > + 0x78 > + 0x77 > + 0x78 > + 0x87 > + 0x88 > + 0x87 > + 0x87 > + 0x77 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + >; > +}; > diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > new file mode 100644 > index 0000000000..62d809e833 > --- /dev/null > +++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > @@ -0,0 +1,215 @@ > +/* > + * (C) Copyright 2017 Rockchip Electronics Co., Ltd > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +&dmc { > + rockchip,sdram-params = < > + 0x1 > + 0xC > + 0x3 > + 0x1 > + 0x0 > + 0x0 > + 0x10 > + 0x10 > + 0 > + > + 0x0c48a18a > + 0x00000000 > + 0x00000021 > + 0x00000482 > + 0x00000015 > + 0x0000021a > + 0x000000ff > + > + 333 > + 6 > + 0 > + > + 0x00000000 > + 0xc3040008 > + 0x00000064 > + 0x00140023 > + 0x000000d0 > + 0x00220002 > + 0x000000d4 > + 0x00010000 > + 0x000000d8 > + 0x00000703 > + 0x000000dc > + 0x00830004 > + 0x000000e0 > + 0x00010000 > + 0x000000e4 > + 0x00070003 > + 0x00000100 > + 0x06090b07 > + 0x00000104 > + 0x0002020b > + 0x00000108 > + 0x02030506 > + 0x0000010c > + 0x00505000 > + 0x00000110 > + 0x03020204 > + 0x00000114 > + 0x01010303 > + 0x00000118 > + 0x02020003 > + 0x00000120 > + 0x00000303 > + 0x00000138 > + 0x00000025 > + 0x00000180 > + 0x003c000f > + 0x00000184 > + 0x00900000 > + 0x00000190 > + 0x07020000 > + 0x00000198 > + 0x05001100 > + 0x000001a0 > + 0xc0400003 > + 0x00000240 > + 0x0900090c > + 0x00000244 > + 0x00000101 > + 0x00000250 > + 0x00000f00 > + 0x00000490 > + 0x00000001 > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + 0xffffffff > + > + 0x00000004 > + 0x0000000b > + 0x00000028 > + 0x00000006 > + 0x0000002c > + 0x00000000 > + 0x00000030 > + 0x00000003 > + 0xffffffff > + 0xffffffff > + > + 0x77 > + 0x88 > + 0x79 > + 0x79 > + 0x87 > + 0x97 > + 0x87 > + 0x78 > + 0x77 > + 0x78 > + 0x87 > + 0x88 > + 0x87 > + 0x87 > + 0x77 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x78 > + 0x77 > + 0x79 > + 0x9 > + > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x78 > + 0x69 > + 0x9 > + > + 0x77 > + 0x78 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x77 > + 0x79 > + 0x9 > + >; > +}; > diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi > index 2d80addbb0..a080ae8d69 100644 > --- a/arch/arm/dts/rk3328.dtsi > +++ b/arch/arm/dts/rk3328.dtsi > @@ -351,10 +351,15 @@ > status = "disabled"; > }; > > - dmc: dmc at ff400000 { > + dmc: dmc { > u-boot,dm-pre-reloc; > - compatible = "rockchip,rk3328-dmc", "syscon"; > - reg = <0x0 0xff400000 0x0 0x1000>; > + compatible = "rockchip,rk3328-dmc"; > + reg = <0x0 0xff400000 0x0 0x1000 > + 0x0 0xff780000 0x0 0x3000 > + 0x0 0xff100000 0x0 0x1000 > + 0x0 0xff440000 0x0 0x1000 > + 0x0 0xff720000 0x0 0x1000 > + 0x0 0xff798000 0x0 0x1000>; > }; > > cru: clock-controller at ff440000 { ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 4/7] rockchip: Kconfig: enable TPL support for rk3328 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov ` (2 preceding siblings ...) 2019-08-02 7:40 ` [U-Boot] [PATCH v2 3/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov @ 2019-08-02 7:40 ` Matwey V. Kornilov 2019-08-05 13:03 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov ` (3 subsequent siblings) 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:40 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> Enable TPL support and some related option in Kconfig. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/430b01462bf3f24aaf7920ae2587a6943c39ab5d with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/mach-rockchip/Kconfig | 5 +++++ arch/arm/mach-rockchip/rk3328/Kconfig | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index e337d06b99..f5a80b4f0c 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -110,9 +110,14 @@ config ROCKCHIP_RK3328 select ARM64 select SUPPORT_SPL select SPL + select SUPPORT_TPL + select TPL + select TPL_NEEDS_SEPARATE_TEXT_BASE if TPL + select TPL_NEEDS_SEPARATE_STACK if TPL imply ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD imply SPL_SERIAL_SUPPORT + imply TPL_SERIAL_SUPPORT imply SPL_SEPARATE_BSS select ENABLE_ARM_SOC_BOOT0_HOOK select DEBUG_UART_BOARD_INIT diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig index f8e15288e0..d13a169022 100644 --- a/arch/arm/mach-rockchip/rk3328/Kconfig +++ b/arch/arm/mach-rockchip/rk3328/Kconfig @@ -27,6 +27,18 @@ config SPL_LIBCOMMON_SUPPORT config SPL_LIBGENERIC_SUPPORT default y +config TPL_LDSCRIPT + default "arch/arm/mach-rockchip/u-boot-tpl-v8.lds" + +config TPL_TEXT_BASE + default 0xff091000 + +config TPL_MAX_SIZE + default 28672 + +config TPL_STACK + default 0xff098000 + source "board/rockchip/evb_rk3328/Kconfig" endif -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 4/7] rockchip: Kconfig: enable TPL support for rk3328 2019-08-02 7:40 ` [U-Boot] [PATCH v2 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov @ 2019-08-05 13:03 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-05 13:03 UTC (permalink / raw) To: u-boot On 2019/8/2 下午3:40, Matwey V. Kornilov wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > Enable TPL support and some related option in Kconfig. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/430b01462bf3f24aaf7920ae2587a6943c39ab5d with minor modifications] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/mach-rockchip/Kconfig | 5 +++++ > arch/arm/mach-rockchip/rk3328/Kconfig | 12 ++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > index e337d06b99..f5a80b4f0c 100644 > --- a/arch/arm/mach-rockchip/Kconfig > +++ b/arch/arm/mach-rockchip/Kconfig > @@ -110,9 +110,14 @@ config ROCKCHIP_RK3328 > select ARM64 > select SUPPORT_SPL > select SPL > + select SUPPORT_TPL > + select TPL > + select TPL_NEEDS_SEPARATE_TEXT_BASE if TPL > + select TPL_NEEDS_SEPARATE_STACK if TPL > imply ROCKCHIP_COMMON_BOARD > imply SPL_ROCKCHIP_COMMON_BOARD > imply SPL_SERIAL_SUPPORT > + imply TPL_SERIAL_SUPPORT > imply SPL_SEPARATE_BSS > select ENABLE_ARM_SOC_BOOT0_HOOK > select DEBUG_UART_BOARD_INIT > diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig > index f8e15288e0..d13a169022 100644 > --- a/arch/arm/mach-rockchip/rk3328/Kconfig > +++ b/arch/arm/mach-rockchip/rk3328/Kconfig > @@ -27,6 +27,18 @@ config SPL_LIBCOMMON_SUPPORT > config SPL_LIBGENERIC_SUPPORT > default y > > +config TPL_LDSCRIPT > + default "arch/arm/mach-rockchip/u-boot-tpl-v8.lds" > + > +config TPL_TEXT_BASE > + default 0xff091000 > + > +config TPL_MAX_SIZE > + default 28672 > + > +config TPL_STACK > + default 0xff098000 > + > source "board/rockchip/evb_rk3328/Kconfig" > > endif ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov ` (3 preceding siblings ...) 2019-08-02 7:40 ` [U-Boot] [PATCH v2 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov @ 2019-08-02 7:40 ` Matwey V. Kornilov 2019-08-05 13:03 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov ` (2 subsequent siblings) 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:40 UTC (permalink / raw) To: u-boot From: Kever Yang <kever.yang@rock-chips.com> Enable driver options for TPL/SPL in evb-rk3328_defconfig. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/df4f40acb449815384e397dcaf5b618bbc6cd855 with minor modifications] Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- configs/evb-rk3328_defconfig | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index fcc04f27ec..12be1dedc6 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -1,5 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_TPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_ROCKCHIP_RK3328=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y @@ -9,31 +15,50 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_TPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_ATF_SUPPORT=y +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_TPL_BOOTROM_SUPPORT=y +CONFIG_TPL_DRIVERS_MISC_SUPPORT=y +CONFIG_TPL_SERIAL_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_TPL_SERIAL_PRESENT=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x40000 +CONFIG_SPL_STACK_R_ADDR=0x600000 +CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y -CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_TPL_DM=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y +CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y +CONFIG_TPL_OF_PLATDATA=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y @@ -44,6 +69,7 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY=y CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y @@ -51,9 +77,14 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y @@ -69,4 +100,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207 CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USE_TINY_PRINTF=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL 2019-08-02 7:40 ` [U-Boot] [PATCH v2 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov @ 2019-08-05 13:03 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-05 13:03 UTC (permalink / raw) To: u-boot On 2019/8/2 下午3:40, Matwey V. Kornilov wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > Enable driver options for TPL/SPL in evb-rk3328_defconfig. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > [cherry picked from commit https://github.com/rockchip-linux/u-boot/commit/df4f40acb449815384e397dcaf5b618bbc6cd855 with minor modifications] > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > configs/evb-rk3328_defconfig | 37 +++++++++++++++++++++++++++++++++++-- > 1 file changed, 35 insertions(+), 2 deletions(-) > > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index fcc04f27ec..12be1dedc6 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -1,5 +1,11 @@ > CONFIG_ARM=y > CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SPL_LIBCOMMON_SUPPORT=y > +CONFIG_TPL_LIBCOMMON_SUPPORT=y > +CONFIG_SPL_LIBGENERIC_SUPPORT=y > +CONFIG_TPL_LIBGENERIC_SUPPORT=y > +CONFIG_SYS_MALLOC_F_LEN=0x2000 > +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 > CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_ROCKCHIP_RK3328=y > CONFIG_SPL_DRIVERS_MISC_SUPPORT=y > @@ -9,31 +15,50 @@ CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_DEBUG_UART=y > # CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_FIT=y > +CONFIG_FIT_VERBOSE=y > +CONFIG_SPL_LOAD_FIT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-evb.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_TPL_SYS_MALLOC_SIMPLE=y > +CONFIG_SPL_STACK_R=y > +CONFIG_SPL_ATF_SUPPORT=y > +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y > +CONFIG_TPL_BOOTROM_SUPPORT=y > +CONFIG_TPL_DRIVERS_MISC_SUPPORT=y > +CONFIG_TPL_SERIAL_SUPPORT=y > +CONFIG_SPL_SERIAL_SUPPORT=y > +CONFIG_TPL_SERIAL_PRESENT=y > +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x40000 > +CONFIG_SPL_STACK_R_ADDR=0x600000 > +CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > -CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_TIME=y > -CONFIG_DEFAULT_DEVICE_TREE="rk3328-evb" > CONFIG_SPL_OF_CONTROL=y > +CONFIG_TPL_OF_CONTROL=y > +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_NET_RANDOM_ETHADDR=y > +CONFIG_TPL_DM=y > CONFIG_REGMAP=y > CONFIG_SPL_REGMAP=y > +CONFIG_TPL_REGMAP=y > CONFIG_SYSCON=y > CONFIG_SPL_SYSCON=y > +CONFIG_TPL_SYSCON=y > CONFIG_CLK=y > CONFIG_SPL_CLK=y > +CONFIG_TPL_CLK=y > CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_FLASH=y > CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > +CONFIG_TPL_OF_PLATDATA=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > @@ -44,6 +69,7 @@ CONFIG_ETH_DESIGNWARE=y > CONFIG_GMAC_ROCKCHIP=y > CONFIG_PHY=y > CONFIG_PINCTRL=y > +CONFIG_SPL_PINCTRL=y > CONFIG_DM_PMIC=y > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > @@ -51,9 +77,14 @@ CONFIG_DM_REGULATOR_FIXED=y > CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM=y > +CONFIG_SPL_RAM=y > +CONFIG_TPL_RAM=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > +CONFIG_DEBUG_UART_ANNOUNCE=y > +CONFIG_DEBUG_UART_SKIP_INIT=y > CONFIG_SYSRESET=y > +CONFIG_SPL_SYSRESET=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > @@ -69,4 +100,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207 > CONFIG_USB_GADGET_PRODUCT_NUM=0x330a > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USE_TINY_PRINTF=y > +CONFIG_SPL_TINY_MEMSET=y > +CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov ` (4 preceding siblings ...) 2019-08-02 7:40 ` [U-Boot] [PATCH v2 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov @ 2019-08-02 7:40 ` Matwey V. Kornilov 2019-08-05 13:03 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions Matwey V. Kornilov 2019-08-02 10:41 ` [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board Chen-Yu Tsai 7 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:40 UTC (permalink / raw) To: u-boot Until now, binary TPL by Rockchip has been required for booting procedure. Starting from this commit we may use only u-boot to boot the device. Note, that using binary TPL instead of U-boot TPL is still working. Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- configs/rock64-rk3328_defconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index ef453e72c1..6484845fb6 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -34,15 +34,20 @@ CONFIG_CMD_USB=y CONFIG_CMD_TIME=y CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64" CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_TPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y +CONFIG_TPL_CLK=y CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y @@ -65,6 +70,7 @@ CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y CONFIG_DM_RESET=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 @@ -85,4 +91,12 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x330a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y +CONFIG_TPL_DM=y +CONFIG_TPL_LIBCOMMON_SUPPORT=y +CONFIG_TPL_LIBGENERIC_SUPPORT=y +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y +CONFIG_TPL_BOOTROM_SUPPORT=y +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 +CONFIG_TPL_SYS_MALLOC_SIMPLE=y -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig 2019-08-02 7:40 ` [U-Boot] [PATCH v2 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov @ 2019-08-05 13:03 ` Kever Yang 0 siblings, 0 replies; 34+ messages in thread From: Kever Yang @ 2019-08-05 13:03 UTC (permalink / raw) To: u-boot On 2019/8/2 下午3:40, Matwey V. Kornilov wrote: > Until now, binary TPL by Rockchip has been required for booting > procedure. Starting from this commit we may use only u-boot to boot > the device. > > Note, that using binary TPL instead of U-boot TPL is still working. > > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > configs/rock64-rk3328_defconfig | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > index ef453e72c1..6484845fb6 100644 > --- a/configs/rock64-rk3328_defconfig > +++ b/configs/rock64-rk3328_defconfig > @@ -34,15 +34,20 @@ CONFIG_CMD_USB=y > CONFIG_CMD_TIME=y > CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64" > CONFIG_SPL_OF_CONTROL=y > +CONFIG_TPL_OF_CONTROL=y > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_TPL_OF_PLATDATA=y > CONFIG_ENV_IS_IN_MMC=y > CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_REGMAP=y > CONFIG_SPL_REGMAP=y > +CONFIG_TPL_REGMAP=y > CONFIG_SYSCON=y > CONFIG_SPL_SYSCON=y > +CONFIG_TPL_SYSCON=y > CONFIG_CLK=y > CONFIG_SPL_CLK=y > +CONFIG_TPL_CLK=y > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > @@ -65,6 +70,7 @@ CONFIG_REGULATOR_RK8XX=y > CONFIG_PWM_ROCKCHIP=y > CONFIG_RAM=y > CONFIG_SPL_RAM=y > +CONFIG_TPL_RAM=y > CONFIG_DM_RESET=y > CONFIG_BAUDRATE=1500000 > CONFIG_DEBUG_UART_SHIFT=2 > @@ -85,4 +91,12 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x330a > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USE_TINY_PRINTF=y > CONFIG_SPL_TINY_MEMSET=y > +CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > +CONFIG_TPL_DM=y > +CONFIG_TPL_LIBCOMMON_SUPPORT=y > +CONFIG_TPL_LIBGENERIC_SUPPORT=y > +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y > +CONFIG_TPL_BOOTROM_SUPPORT=y > +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 > +CONFIG_TPL_SYS_MALLOC_SIMPLE=y ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov ` (5 preceding siblings ...) 2019-08-02 7:40 ` [U-Boot] [PATCH v2 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov @ 2019-08-02 7:40 ` Matwey V. Kornilov 2019-08-02 10:41 ` [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board Chen-Yu Tsai 7 siblings, 0 replies; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 7:40 UTC (permalink / raw) To: u-boot Now we have our own TPL implementation. Remove obsolete notes. Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> --- doc/README.rockchip | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/README.rockchip b/doc/README.rockchip index 8ccbb87264..7d4dc1b33b 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -309,17 +309,11 @@ Booting from an SD card on Pine64 Rock64 (RK3328) ================================================= For Rock64 rk3328 board the following three parts are required: -TPL, SPL, and the u-boot image tree blob. While u-boot-spl.bin and -u-boot.itb are to be compiled as usual, TPL is currently not -implemented in u-boot, so you need to pick one from rkbin: - - - Get the rkbin - - => git clone https://github.com/rockchip-linux/rkbin.git +TPL, SPL, and the u-boot image tree blob. - Create TPL/SPL image - => tools/mkimage -n rk3328 -T rksd -d rkbin/bin/rk33/rk3328_ddr_333MHz_v1.16.bin idbloader.img + => tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin idbloader.img => cat spl/u-boot-spl.bin >> idbloader.img - Write TPL/SPL image at 64 sector -- 2.16.4 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board. 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov ` (6 preceding siblings ...) 2019-08-02 7:40 ` [U-Boot] [PATCH v2 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions Matwey V. Kornilov @ 2019-08-02 10:41 ` Chen-Yu Tsai 2019-08-02 10:55 ` Matwey V. Kornilov 7 siblings, 1 reply; 34+ messages in thread From: Chen-Yu Tsai @ 2019-08-02 10:41 UTC (permalink / raw) To: u-boot On Fri, Aug 2, 2019 at 3:40 PM Matwey V. Kornilov <matwey.kornilov@gmail.com> wrote: > > This series adds initial TPL support for Pine64 Rock64 board. > > The ROCK64 is a credit card size SBC based on Rockchip RK3328 Quad-Core ARM Cortex A53. > > The series has been tested with ATF v2.1. > > Some patches in the series are taken from https://github.com/rockchip-linux/u-boot > Credits are given in each patch separately. > > Changes since v1: > - Added commit message in patch 6 > - Split config to rk3328/Kconfig in patch 4 > - Introduced rk3328-evb-u-boot.dtsi to collect u-boot specific dts configs > > Kever Yang (4): > rockchip: ram: add full feature rk3328 DRAM driver > rockchip: dts: rk3328: update dmc node for driver > rockchip: Kconfig: enable TPL support for rk3328 > rockchip: evb-rk3328: enable defconfig options for TPL/SPL > > Matwey V. Kornilov (3): > rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi > configs: rk3328: enable TPL for rock64-rk3328_defconfig > doc: rockchip: Adapt Pine64 Rock64 board instructions > > arch/arm/dts/rk3328-evb-u-boot.dtsi | 33 + > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + > arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++ > arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++ > arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++ > arch/arm/dts/rk3328.dtsi | 11 +- > arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ > arch/arm/mach-rockchip/Kconfig | 5 + > arch/arm/mach-rockchip/rk3328/Kconfig | 12 + > configs/evb-rk3328_defconfig | 37 +- > configs/rock64-rk3328_defconfig | 14 + > doc/README.rockchip | 10 +- > drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- > 13 files changed, 2212 insertions(+), 16 deletions(-) > create mode 100644 arch/arm/dts/rk3328-evb-u-boot.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h Tested-by: Chen-Yu Tsai <wens@csie.org> It correctly boots up to a U-boot prompt on my Rock64. However it fails to read data correctly from the SD card afterwards: U-Boot TPL 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:10:38) LPDDR3 Trying to boot from BOOTROM Returning to boot ROM... U-Boot SPL 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:10:38 +0800) Trying to boot from MMC2 Card did not respond to voltage select! spl: mmc init failed with error: -95 Trying to boot from MMC1 NOTICE: BL31: v2.1(release):v2.1-531-g3ee48f40f NOTICE: BL31: Built : 17:09:50, Aug 2 2019 ERROR: over or zero region, nr=4187640, max=10 NOTICE: BL31:Rockchip release version: v1.2 U-Boot 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:11:02 +0800) Model: Pine64 Rock64 DRAM: 4 GiB MMC: rksdmmc at ff500000: 1, rksdmmc at ff520000: 0 Loading Environment from MMC... *** Warning - bad CRC, using default environment In: serial at ff130000 Out: serial at ff130000 Err: serial at ff130000 Model: Pine64 Rock64 Net: Warning: ethernet at ff540000 (eth0) using random MAC address - 7e:ba:fc:e6:98:1f eth0: ethernet at ff540000 Hit any key to stop autoboot: 0 Card did not respond to voltage select! switch to partitions #0, OK mmc1 is current device Scanning mmc 1:1... Found U-Boot script /boot/boot.scr 588 bytes read in 13 ms (43.9 KiB/s) ## Executing script at 00500000 ** fs_devread read error - block ** No partition table - mmc 1 ** ** No partition table - mmc 1 ** ERROR: Did not find a cmdline Flattened Device Tree FDT and ATAGS support not compiled in - hanging ### ERROR ### Please RESET the board ### boot script contents: setenv bootargs console=ttyS2,1500000n8 earlycon=uart,mmio32,ff130000 loglevel=8 root=/dev/mmcblk0p1 rootwait kpti=off panic=10 debug load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}${fdtfile} if load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}rock64-audio-dac.dtbo; then fdt addr ${fdt_addr_r} fdt resize 2048 fdt apply ${ramdisk_addr_r} fi booti ${kernel_addr_r} - ${fdt_addr_r} ============= If I manually load the kernel Image, that also fails. If I manually load the fdt file, it completes, but the data is complete gibberish. ls works fine though. And removing the fifo-mode flag from arch/arm/dts/rk3328-rock64-u-boot.dtsi makes it not boot at all. Previously I was using an old build from Armbian, and that worked fine. ChenYu ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board. 2019-08-02 10:41 ` [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board Chen-Yu Tsai @ 2019-08-02 10:55 ` Matwey V. Kornilov 2019-08-02 11:21 ` Chen-Yu Tsai 0 siblings, 1 reply; 34+ messages in thread From: Matwey V. Kornilov @ 2019-08-02 10:55 UTC (permalink / raw) To: u-boot пт, 2 авг. 2019 г. в 13:41, Chen-Yu Tsai <wens@kernel.org>: > > On Fri, Aug 2, 2019 at 3:40 PM Matwey V. Kornilov > <matwey.kornilov@gmail.com> wrote: > > > > This series adds initial TPL support for Pine64 Rock64 board. > > > > The ROCK64 is a credit card size SBC based on Rockchip RK3328 Quad-Core ARM Cortex A53. > > > > The series has been tested with ATF v2.1. > > > > Some patches in the series are taken from https://github.com/rockchip-linux/u-boot > > Credits are given in each patch separately. > > > > Changes since v1: > > - Added commit message in patch 6 > > - Split config to rk3328/Kconfig in patch 4 > > - Introduced rk3328-evb-u-boot.dtsi to collect u-boot specific dts configs > > > > Kever Yang (4): > > rockchip: ram: add full feature rk3328 DRAM driver > > rockchip: dts: rk3328: update dmc node for driver > > rockchip: Kconfig: enable TPL support for rk3328 > > rockchip: evb-rk3328: enable defconfig options for TPL/SPL > > > > Matwey V. Kornilov (3): > > rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi > > configs: rk3328: enable TPL for rock64-rk3328_defconfig > > doc: rockchip: Adapt Pine64 Rock64 board instructions > > > > arch/arm/dts/rk3328-evb-u-boot.dtsi | 33 + > > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + > > arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++ > > arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++ > > arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++ > > arch/arm/dts/rk3328.dtsi | 11 +- > > arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ > > arch/arm/mach-rockchip/Kconfig | 5 + > > arch/arm/mach-rockchip/rk3328/Kconfig | 12 + > > configs/evb-rk3328_defconfig | 37 +- > > configs/rock64-rk3328_defconfig | 14 + > > doc/README.rockchip | 10 +- > > drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- > > 13 files changed, 2212 insertions(+), 16 deletions(-) > > create mode 100644 arch/arm/dts/rk3328-evb-u-boot.dtsi > > create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > > create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > > Tested-by: Chen-Yu Tsai <wens@csie.org> > > It correctly boots up to a U-boot prompt on my Rock64. However it > fails to read data correctly from the SD card afterwards: > > U-Boot TPL 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:10:38) > LPDDR3 > Trying to boot from BOOTROM > Returning to boot ROM... > > U-Boot SPL 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:10:38 +0800) > Trying to boot from MMC2 > Card did not respond to voltage select! > spl: mmc init failed with error: -95 > Trying to boot from MMC1 > NOTICE: BL31: v2.1(release):v2.1-531-g3ee48f40f > NOTICE: BL31: Built : 17:09:50, Aug 2 2019 > ERROR: over or zero region, nr=4187640, max=10 > NOTICE: BL31:Rockchip release version: v1.2 > > > U-Boot 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:11:02 +0800) > > Model: Pine64 Rock64 > DRAM: 4 GiB > MMC: rksdmmc at ff500000: 1, rksdmmc at ff520000: 0 > Loading Environment from MMC... *** Warning - bad CRC, using default environment > > In: serial at ff130000 > Out: serial at ff130000 > Err: serial at ff130000 > Model: Pine64 Rock64 > Net: > Warning: ethernet at ff540000 (eth0) using random MAC address - 7e:ba:fc:e6:98:1f > eth0: ethernet at ff540000 > Hit any key to stop autoboot: 0 > Card did not respond to voltage select! > switch to partitions #0, OK > mmc1 is current device > Scanning mmc 1:1... > Found U-Boot script /boot/boot.scr > 588 bytes read in 13 ms (43.9 KiB/s) > ## Executing script at 00500000 > ** fs_devread read error - block > ** No partition table - mmc 1 ** > ** No partition table - mmc 1 ** > ERROR: Did not find a cmdline Flattened Device Tree > FDT and ATAGS support not compiled in - hanging > ### ERROR ### Please RESET the board ### > > > boot script contents: > > setenv bootargs console=ttyS2,1500000n8 earlycon=uart,mmio32,ff130000 > loglevel=8 root=/dev/mmcblk0p1 rootwait kpti=off panic=10 debug > > load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image > load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}${fdtfile} > > if load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} > ${prefix}rock64-audio-dac.dtbo; then > fdt addr ${fdt_addr_r} > fdt resize 2048 > fdt apply ${ramdisk_addr_r} > fi > > booti ${kernel_addr_r} - ${fdt_addr_r} > > ============= > > If I manually load the kernel Image, that also fails. > If I manually load the fdt file, it completes, but the data is > complete gibberish. > ls works fine though. Hi, Thank you for testing! I've tested only EFI payload execution, running GRUB works fine for me (and it also boots Linux afterwards). If you could share your OS Image or tell how could I reproduce it, I would dig a little into this issue. My output: Model: Pine64 Rock64 DRAM: 2 GiB MMC: rksdmmc at ff500000: 1, rksdmmc at ff520000: 0 Loading Environment from MMC... *** Warning - bad CRC, using default environment In: serial at ff130000 Out: serial at ff130000 Err: serial at ff130000 Model: Pine64 Rock64 Net: Warning: ethernet at ff540000 (eth0) using random MAC address - 02:14:70:31:8b:96 eth0: ethernet at ff540000 Hit any key to stop autoboot: 0 Card did not respond to voltage select! switch to partitions #0, OK mmc1 is current device Scanning mmc 1:2... 52739 bytes read in 39 ms (1.3 MiB/s) ** Unrecognized filesystem type ** Scanning mmc 1:1... Found EFI removable media binary efi/boot/bootaa64.efi Scanning disk rksdmmc at ff500000.blk... Card did not respond to voltage select! Scanning disk rksdmmc at ff520000.blk... Disk rksdmmc at ff520000.blk not ready Found 5 disks BootOrder not defined EFI boot manager: Cannot load any image 1259360 bytes read in 440 ms (2.7 MiB/s) Welcome to GRUB! > > And removing the fifo-mode flag from > arch/arm/dts/rk3328-rock64-u-boot.dtsi makes it > not boot at all. It is expected behavior. fifo-mode is required until another patch-set: https://patchwork.ozlabs.org/patch/1138256/ > > Previously I was using an old build from Armbian, and that worked fine. > > ChenYu -- With best regards, Matwey V. Kornilov ^ permalink raw reply [flat|nested] 34+ messages in thread
* [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board. 2019-08-02 10:55 ` Matwey V. Kornilov @ 2019-08-02 11:21 ` Chen-Yu Tsai 0 siblings, 0 replies; 34+ messages in thread From: Chen-Yu Tsai @ 2019-08-02 11:21 UTC (permalink / raw) To: u-boot On Fri, Aug 2, 2019 at 6:55 PM Matwey V. Kornilov <matwey.kornilov@gmail.com> wrote: > > пт, 2 авг. 2019 г. в 13:41, Chen-Yu Tsai <wens@kernel.org>: > > > > On Fri, Aug 2, 2019 at 3:40 PM Matwey V. Kornilov > > <matwey.kornilov@gmail.com> wrote: > > > > > > This series adds initial TPL support for Pine64 Rock64 board. > > > > > > The ROCK64 is a credit card size SBC based on Rockchip RK3328 Quad-Core ARM Cortex A53. > > > > > > The series has been tested with ATF v2.1. > > > > > > Some patches in the series are taken from https://github.com/rockchip-linux/u-boot > > > Credits are given in each patch separately. > > > > > > Changes since v1: > > > - Added commit message in patch 6 > > > - Split config to rk3328/Kconfig in patch 4 > > > - Introduced rk3328-evb-u-boot.dtsi to collect u-boot specific dts configs > > > > > > Kever Yang (4): > > > rockchip: ram: add full feature rk3328 DRAM driver > > > rockchip: dts: rk3328: update dmc node for driver > > > rockchip: Kconfig: enable TPL support for rk3328 > > > rockchip: evb-rk3328: enable defconfig options for TPL/SPL > > > > > > Matwey V. Kornilov (3): > > > rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi > > > configs: rk3328: enable TPL for rock64-rk3328_defconfig > > > doc: rockchip: Adapt Pine64 Rock64 board instructions > > > > > > arch/arm/dts/rk3328-evb-u-boot.dtsi | 33 + > > > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 + > > > arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 215 +++++ > > > arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 215 +++++ > > > arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 215 +++++ > > > arch/arm/dts/rk3328.dtsi | 11 +- > > > arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 441 +++++++++ > > > arch/arm/mach-rockchip/Kconfig | 5 + > > > arch/arm/mach-rockchip/rk3328/Kconfig | 12 + > > > configs/evb-rk3328_defconfig | 37 +- > > > configs/rock64-rk3328_defconfig | 14 + > > > doc/README.rockchip | 10 +- > > > drivers/ram/rockchip/sdram_rk3328.c | 1018 ++++++++++++++++++++- > > > 13 files changed, 2212 insertions(+), 16 deletions(-) > > > create mode 100644 arch/arm/dts/rk3328-evb-u-boot.dtsi > > > create mode 100644 arch/arm/dts/rk3328-sdram-ddr3-666.dtsi > > > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi > > > create mode 100644 arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi > > > create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3328.h > > > > Tested-by: Chen-Yu Tsai <wens@csie.org> > > > > It correctly boots up to a U-boot prompt on my Rock64. However it > > fails to read data correctly from the SD card afterwards: > > > > U-Boot TPL 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:10:38) > > LPDDR3 > > Trying to boot from BOOTROM > > Returning to boot ROM... > > > > U-Boot SPL 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:10:38 +0800) > > Trying to boot from MMC2 > > Card did not respond to voltage select! > > spl: mmc init failed with error: -95 > > Trying to boot from MMC1 > > NOTICE: BL31: v2.1(release):v2.1-531-g3ee48f40f > > NOTICE: BL31: Built : 17:09:50, Aug 2 2019 > > ERROR: over or zero region, nr=4187640, max=10 > > NOTICE: BL31:Rockchip release version: v1.2 > > > > > > U-Boot 2019.10-rc1-00072-gaf0ea60e1a42 (Aug 02 2019 - 18:11:02 +0800) > > > > Model: Pine64 Rock64 > > DRAM: 4 GiB > > MMC: rksdmmc at ff500000: 1, rksdmmc at ff520000: 0 > > Loading Environment from MMC... *** Warning - bad CRC, using default environment > > > > In: serial at ff130000 > > Out: serial at ff130000 > > Err: serial at ff130000 > > Model: Pine64 Rock64 > > Net: > > Warning: ethernet at ff540000 (eth0) using random MAC address - 7e:ba:fc:e6:98:1f > > eth0: ethernet at ff540000 > > Hit any key to stop autoboot: 0 > > Card did not respond to voltage select! > > switch to partitions #0, OK > > mmc1 is current device > > Scanning mmc 1:1... > > Found U-Boot script /boot/boot.scr > > 588 bytes read in 13 ms (43.9 KiB/s) > > ## Executing script at 00500000 > > ** fs_devread read error - block > > ** No partition table - mmc 1 ** > > ** No partition table - mmc 1 ** > > ERROR: Did not find a cmdline Flattened Device Tree > > FDT and ATAGS support not compiled in - hanging > > ### ERROR ### Please RESET the board ### > > > > > > boot script contents: > > > > setenv bootargs console=ttyS2,1500000n8 earlycon=uart,mmio32,ff130000 > > loglevel=8 root=/dev/mmcblk0p1 rootwait kpti=off panic=10 debug > > > > load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image > > load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}${fdtfile} > > > > if load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} > > ${prefix}rock64-audio-dac.dtbo; then > > fdt addr ${fdt_addr_r} > > fdt resize 2048 > > fdt apply ${ramdisk_addr_r} > > fi > > > > booti ${kernel_addr_r} - ${fdt_addr_r} > > > > ============= > > > > If I manually load the kernel Image, that also fails. > > If I manually load the fdt file, it completes, but the data is > > complete gibberish. > > ls works fine though. > > Hi, > > Thank you for testing! I've tested only EFI payload execution, running > GRUB works fine for me (and it also boots Linux afterwards). > If you could share your OS Image or tell how could I reproduce it, I > would dig a little into this issue. I basically took Armbian's image, DD-ed to an SD card, then wiped out the rootfs and rebuilding it using debootstrap. I forgot if I did `rm -rf *` or `mkfs.ext4` for this particular one. But IIRC U-boot's ext4 code had been patched up to correctly support modern (64bit, checksum) ext4. > My output: > > Model: Pine64 Rock64 > DRAM: 2 GiB > MMC: rksdmmc at ff500000: 1, rksdmmc at ff520000: 0 > Loading Environment from MMC... *** Warning - bad CRC, using default environment > > In: serial at ff130000 > Out: serial at ff130000 > Err: serial at ff130000 > Model: Pine64 Rock64 > Net: > Warning: ethernet at ff540000 (eth0) using random MAC address - 02:14:70:31:8b:96 > eth0: ethernet at ff540000 > Hit any key to stop autoboot: 0 > Card did not respond to voltage select! > switch to partitions #0, OK > mmc1 is current device > Scanning mmc 1:2... > 52739 bytes read in 39 ms (1.3 MiB/s) > ** Unrecognized filesystem type ** > Scanning mmc 1:1... > Found EFI removable media binary efi/boot/bootaa64.efi > Scanning disk rksdmmc at ff500000.blk... > Card did not respond to voltage select! > Scanning disk rksdmmc at ff520000.blk... > Disk rksdmmc at ff520000.blk not ready > Found 5 disks > BootOrder not defined > EFI boot manager: Cannot load any image > 1259360 bytes read in 440 ms (2.7 MiB/s) > Welcome to GRUB! Maybe reading works for files up to some size? or I/O block size? I tried a couple files from /usr/lib, and it seems to fail around 2.5 ~ 3 MiB. > > > > > > And removing the fifo-mode flag from > > arch/arm/dts/rk3328-rock64-u-boot.dtsi makes it > > not boot at all. > > It is expected behavior. fifo-mode is required until another > patch-set: https://patchwork.ozlabs.org/patch/1138256/ With this patch set applied on top, things load correctly, so it must be something with the FIFO mode code. I'm still not getting anything from the kernel, but that's likely some other issue. ChenYu > > > > > Previously I was using an old build from Armbian, and that worked fine. > > > > ChenYu > > > > -- > With best regards, > Matwey V. Kornilov ^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2019-08-06 1:46 UTC | newest] Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-07-31 16:01 [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 1/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 2/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov 2019-08-01 2:38 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 3/7] rockchip: dts: rk3328: enable the drivers need by TPL/SPL Matwey V. Kornilov 2019-08-01 2:39 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov 2019-08-01 2:40 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov 2019-07-31 16:01 ` [U-Boot] [PATCH 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov 2019-08-01 2:42 ` Kever Yang 2019-07-31 16:01 ` [U-Boot] [PATCH 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions Matwey V. Kornilov 2019-08-01 2:42 ` Kever Yang 2019-08-01 2:36 ` [U-Boot] [PATCH 0/7] Add TPL support for Pine64 Rock64 board Kever Yang 2019-08-02 7:09 ` Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 " Matwey V. Kornilov 2019-08-02 7:39 ` [U-Boot] [PATCH v2 1/7] rockchip: dts: rk3328: Add rk3328-evb-u-boot.dtsi Matwey V. Kornilov 2019-08-05 13:01 ` Kever Yang 2019-08-02 7:39 ` [U-Boot] [PATCH v2 2/7] rockchip: ram: add full feature rk3328 DRAM driver Matwey V. Kornilov 2019-08-05 13:02 ` Kever Yang 2019-08-05 13:04 ` Philipp Tomsich 2019-08-06 1:46 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 3/7] rockchip: dts: rk3328: update dmc node for driver Matwey V. Kornilov 2019-08-05 13:02 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 4/7] rockchip: Kconfig: enable TPL support for rk3328 Matwey V. Kornilov 2019-08-05 13:03 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 5/7] rockchip: evb-rk3328: enable defconfig options for TPL/SPL Matwey V. Kornilov 2019-08-05 13:03 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 6/7] configs: rk3328: enable TPL for rock64-rk3328_defconfig Matwey V. Kornilov 2019-08-05 13:03 ` Kever Yang 2019-08-02 7:40 ` [U-Boot] [PATCH v2 7/7] doc: rockchip: Adapt Pine64 Rock64 board instructions Matwey V. Kornilov 2019-08-02 10:41 ` [U-Boot] [PATCH v2 0/7] Add TPL support for Pine64 Rock64 board Chen-Yu Tsai 2019-08-02 10:55 ` Matwey V. Kornilov 2019-08-02 11:21 ` Chen-Yu Tsai
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.