Commit Graph

13371 Commits

Author SHA1 Message Date
Jason Zhu 3a10ef3901 arm: rockchip: add RK3308 SGRF registers support
Change-Id: I04340035cf8c372ae9f30424871da3810c70c56b
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-05-17 15:27:48 +08:00
Joseph Chen 164b2a3361 rockchip: smccc: psci_system_suspend() effects by CONFIG_ARM_CPU_SUSPEND
Change-Id: I6ecc1c4db8232782af369e8e29b78a2c0cb13783
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-17 12:05:18 +08:00
Joseph Chen ff294bc6d1 arm: armv7/8: add CONFIG_ARM_CPU_SUSPEND definition
Make it as a optional choice.

Change-Id: I87c5d8ce863eb64f3922fb4124e1f4a6aaf79257
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-17 11:18:53 +08:00
Joseph Chen 272fdf68ed rockchip: dts: rk3399: add and enable crypto node
Change-Id: I63866f6f63e331e7c2722399f9a1621c55a7590a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-16 14:40:34 +08:00
Joseph Chen 5ee9804858 rockchip: clk: rk3399: rename and export rockchip_get_clk()
Change-Id: I454500829fe815f8374b957279949bd0c6c87c52
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-16 14:40:33 +08:00
Elaine Zhang 88cae289b5 clk: rockchip: rk3368: support crypto clk get/set rate
Change-Id: I736fdda1d994ebdb59c68f8be209bae0e206be99
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-05-16 14:40:33 +08:00
Elaine Zhang 582fa222b9 clk: rockchip: rk3128: support crypto clk get/set rate
Change-Id: I3a7d71a481aca04c9e6c0547cfc05a8106f79423
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-05-16 14:40:33 +08:00
Joseph Chen 44f308bd53 rockchip: param: add CONFIG_RKFLASH for bootdev "rknand 0"
Change-Id: Ifbb541d2b6ed883deaceff7838663763ab841dd1
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-15 10:17:51 +08:00
Joseph Chen fe2fac9531 rockchip: iomem: compare node name when compatible is not match
Change-Id: I37916390efb2be5d88e45e09bec51a09fa77c056
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-13 12:10:24 +08:00
Joseph Chen 60ea26bd95 rockchip: board: replace register reading with soc_is_rk3288w()
Change-Id: I4b5d7633093b0c544761f0e3724e4f7c0e6e928f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-13 11:50:47 +08:00
Joseph Chen 9dfc5f8744 rockchip: board: call console_record_print_purge()
Change-Id: I0ac68dfa66c641f180e33313706b279d0a10427e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-10 10:31:35 +08:00
Joseph Chen 0986a7dda1 common: android: add sysmem alloc for uncompress kernel
It helps check whether uncompress kernel overlap with other region
or not.

Change-Id: Ia7e6c027f68c2e8af398824afd8b7580531cb77e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 17:21:19 +08:00
Joseph Chen c664909e96 rockchip: board: add and use conosle hotkey interface
Change-Id: I9c7b3ce75b9b7652cdd60d0d94d55d34f0a7011e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 17:21:19 +08:00
Joseph Chen 363411a1e6 rockchip: board: use flushc() to flush console data
Change-Id: I422a8ab8423bbab1922059d1e80d757506a1ca73
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 16:24:08 +08:00
Joseph Chen 91cbfde1a2 arm: bootm: use flushc() to flush console data before linux
Remove GD_FLG_OS_RUN definition.

Change-Id: Ib78d4adf58dfea5e40ec79fcb9603020651c6daa
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-09 16:24:04 +08:00
Joseph Chen f6e1530165 lib: sysmem: support avb android memblk sysmem alloc
Because avb android image usually needs a large memory buffer,
always alloc avb android memblk right after U-Boot stack is a
better choice to avoid memblk overlap with others.

Since we have overflow protect magic for U-Boot stack, so we add
a pad(4KB) between them.

Change-Id: I72655d022f7e82f1ed9fbb381424d04bc86ccf6a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-07 19:46:37 +08:00
Joseph Chen 50d35c453f rockchip: board: add amp cpus on
implement cpu_secondary_init_r().

Change-Id: I840db566f18ee7dd270eb837ce0fd9a4e2409ebe
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-07 10:17:09 +08:00
Jason Zhu 94aee224c6 rockchip: param: use module config to decide whether use atags parameters
We can not call some drivers if this driver is closed. But this time we use
the parameters passed by atags directly but not test the drivers whether
exist. Add it.

Change-Id: I857ccf3b3e23a9e92502868d1514849770390ebb
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-05-07 09:55:29 +08:00
Jason Zhu c9f547d895 rockchip: param: add sdupdate variable to indicate card function
Add sdupdate variable to receive card function info from preloader atags.
If the sd card is updated-card, set sdupdate to bootargs. otherwise test
whether the sd cart is ROCKCHIP_SD_UPDATE_CARD or not by rkimgtest cmd.

Change-Id: I6c09ade4a31a2e4c8349245e9e345f735afd11e9
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-30 08:50:53 +08:00
Joseph Chen ff21a545f5 rockchip: resource: fix parse gpio base address error
We should parse node name to identify the gpio port before
reading base address, it avoids to use miss match address.

Move out gpio_parse_base_address() from sub string parse is
better.

Set gpio as input mode before reading.

Change-Id: Iffd4ef7f3ceb1bb56a65680265af74ca50b14712
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-29 16:36:08 +08:00
Zorro Liu 12bc9cd8e1 rockchip: dts: rk3368: enable sdmmc
Change-Id: I9c9147a952572b36a389dd6ea958f68cdc712121
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2019-04-22 15:13:12 +08:00
Jason Zhu 5c391abe02 rockchip: dts: rk3368: add cd-gpios
Add cd-gpios to test the mmc device whether exit.

Change-Id: I8ab96fd5300da25d82005ac638e6d2b728ed82ce
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-04-22 12:36:52 +08:00
Yu YongZhen ed73b76733 rockchip: rk3308: release GPIO0_A4 for other usage
After switch to io_vsel3 after system power on, we should release
GPIO0_A4 for other usage.

Change-Id: I16bc33fd976fe957b57cd3a0f90ff44659ca93f2
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
2019-04-16 08:56:12 +08:00
David Wu 860893596c ARM: dts: rk1808-evb: Add gmac support at dts level
Note that the gmac status is disabled.

Change-Id: Ifac56c5d5c1cc10d5f2882fbfd1ef02d97299127
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-10 14:14:15 +08:00
Elaine Zhang b9f5972251 clk: rockchip: rk1808: add mac clk interface
support mac clk set rate and set parent.

Change-Id: I3b4626fd3fcc5ffdf3c58add9c1bc002bb56429a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-10 12:04:10 +08:00
David Wu 6078abbb1f ARM: dts: px30-evb: Add gmac support at dts level for px30
Change-Id: I21d3b41b488297cb5374f74a1e28ba17f2c441f8
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-10 12:04:10 +08:00
Elaine Zhang a4e491228b clk: rockchip: rk3368: support pclk_wdt get rate
Change-Id: I8253532cfa6a1d492d68b0e778f625621cad5dab
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-09 17:39:21 +08:00
David Wu 9a272a6177 ARM: dts: rk3308-evb: Add mac node support at dts level for rk3308b
Note: the default status of mac is disabled.

Change-Id: I2f3cebb03f19f16c2553579e69e8312943d7ed75
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-09 11:09:22 +08:00
David Wu 22125d78ab ARM: dts: rk3308: Add mac node support at dtsi level
Change-Id: I8c109a092b0fb1f9df2d7d8da905b38c7e65b0de
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-09 11:09:22 +08:00
David Wu 200683ea3d clk: rockchip: Add mac clock support for rk3308
Change-Id: I972e2b7977f0f94164c72ae2205ec51780eb7373
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-04-09 11:09:22 +08:00
Joseph Chen 2dd104a51f rockchip: param: set common reserved memory only for ARM64
Follow legacy U-Boot rules(branch: rkdevelop).

Change-Id: Id181baf1b3fe77f2bf5f15405b1a7618920cbed1
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-09 10:54:14 +08:00
Joseph Chen 4e92aae1f9 rockchip: param: remove some function compile for TPL/SPL
Change-Id: I828e14d12c056a7dbc8a5a8863f2f0fab4285d22
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-09 10:54:14 +08:00
Joseph Chen a0ceee9227 rockchip: support early load dtb from distro images
It is optional to use dtb from distro images to initialize
periph drivers when kernel dtb function is enabled.

Change-Id: I7119962ba61d84c5ccdf2e515e21bb347e50b91b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-08 20:55:08 +08:00
Joseph Chen 5ae28c899a rockchip: dts: rk3229-evb: support recovery GPIO key
RK3229 hardware design reference is GPIO3_D1.

Change-Id: I49807081212c77a84d38200a87449eb91dc5a7d3
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-04 11:05:35 +08:00
Joseph Chen de573281d8 rockchip: dts: rk3399-evb: rename key node
Use different name for the volume up key node, dm framework
can't support the same device node since kernel dtb is enabled.

Change-Id: Ia99c9b8fd46fea63949f9d06072c0ebec0e76a46
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-04 11:05:35 +08:00
Kever Yang 9ac4198103 rockchip: rk3328: add boot order in chosen
Default boot from sdcard may fail in evb without sd.

Change-Id: Ifde49b6b28e7154a14f5e028d9863446f11cb59c
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-04-04 09:15:51 +08:00
Kever Yang 9560dcb992 rockchip: rk3368: fix uart2 iomux
RK3368 uart2 iomux config is not correct, fix it.

Change-Id: I992c4b0ae9d8c0a91c5ee1fb3e7850a1e94db206
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-04-04 09:15:19 +08:00
Joseph Chen 36620717fd arm: stacktrace: imporve guidance message
Change-Id: I186f80f64104b79d35aaae03e99a484bd1191c8f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-31 11:44:09 +08:00
Joseph Chen 0476014ebb ram: ramdisk: rename "readonly" to "ro"
Change-Id: I4f7c052e5750db78969f37125056906cacd222a0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-28 14:47:12 +08:00
Kever Yang 618713d1f2 arm64: enable async error handler
Enable the exception handler for async error so that we can get the
abort before kernel.

Change-Id: Ie0e7c89a0d03adf3b74b0d9ddf8c9117536dac6b
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 16:13:09 +08:00
Kever Yang a739a3a9b7 rockchip: px5 update dts for spl/tpl
TPL need dmc to init ddr sdram, and emmc, boot-order.

Change-Id: Ia783e1a47a7710bf618c556eefaf354b7097eacd
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 16:13:09 +08:00
Kever Yang d74e8763bb rockchip: spl: always try to init stimer
We always try to init stimer in case it's not init in previous stage,
but don't re-init if it already work.

Change-Id: I2133804560c6e31e51e6b2cb0a6e51b9544970d3
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 16:13:09 +08:00
Kever Yang 21379abcb5 rockchip: tpl: remove arch_cpu_init()
The arch_cpu_init() should be done in SPL only.

Change-Id: If96bad9694dbcb0d9821433d1f2cbead4517633c
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 16:12:55 +08:00
Kever Yang ddc9405d5b rockchip: spl: move arch_cpu_init() after spl_init()
arch_cpu_init() may use DM to get cru handler.

Change-Id: I5f2daa4718bcdcc5a4aa5601d26e9f4f31a01b69
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 16:12:43 +08:00
Kever Yang f67455c958 rockchip: add CONFIG_ROCKCHIP_PX5 soc type variant
Add variant for evb-px5

Change-Id: Id7bfa9719f3283f2dccc674b7e194c16d7ac7f65
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 11:54:30 +08:00
Kever Yang 33baa40f0f rockchip: rk3368: support UART4 in board_debug_uart_init()
PX5 evb is using UART4

Change-Id: I16ae5c7037123ef1c9d1c793e11d48081214b433
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 11:54:12 +08:00
Joseph Chen da051cc8bb rockchip: add ctrl+f hotkey to enter fastboot mode
Change-Id: I1f0a98793307b5a261958fe8c29da3271f2d8e4e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-26 11:04:33 +08:00
Joseph Chen 86f870d669 rockchip: board: import bidram for GD board bi_dram[]
Change-Id: I9183f3664aa770bb5139cf635136834a206b75f5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-26 11:04:33 +08:00
Joseph Chen b9bc76b4e1 rockchip: param: add ddr memory region parse
Change-Id: I7d59ee54a82da57b62970f4bc47faded60ba6ac8
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-26 11:04:33 +08:00
Joseph Chen e3fbd280ef rockchip: board: implement board_initr_caches_fixup()
Remove dram_initr_banksize().

Change-Id: Ie0da0b8ef43d90c52b3ab2a93d1ad13b4928e70a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-26 11:04:33 +08:00
Joseph Chen 6e15146eff lib: sysmem: refactor code
- import memblk id to manage memory blocks;
- change "sysmem_property" to generic "memblock";
- use alloc instead of reserve for all memory blocks;
- clean up and fix some logic;
- add U-Boot cmd for sysmem;

Change-Id: I614223ce3bf97a7b3566412a9d1864fb30b68fd8
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-26 11:04:33 +08:00
Zhangbin Tong a7774f5911 common: boot_rkimg: set "androidboot.mode=" as "normal" or "charger"
- The legacy setting rule is deprecated(Android SDK < 8.1).
- Provide CONFIG_RKIMG_ANDROID_BOOTMODE_LEGACY to enable legacy setting.

Change-Id: I5c8b442b02df068a0ab98ccc81a4f008ebe540c1
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-25 11:42:52 +08:00
Zhihuan He e5f393836b driver: ram: rv1108: use common code to setup ddr parameter
use rockchip_setup_ddr_param to setup ddr parameter.
The dram_init() and dram_init_banksize() make use of
sdram common code.

Change-Id: Icfc6cbef9fcc128e3a835184b46b89b9b22aab16
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2019-03-22 09:00:32 +08:00
Zhihuan He 4cd861d04b arm64: dts: rockchip: rv1108: add u-boot,dm-pre-reloc
The uart, dmc and grf device add "u-boot,dm-pre-reloc".
Before relocated, u-boot will analyse dram capacity which
is need the device of "u-boot,dm-pre-reloc" attribute.

Change-Id: I1d18b564b0c521b176a2293a03403139034ccc0b
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2019-03-22 08:50:01 +08:00
Jason Zhu 4df150d128 rockchip: dts: rk322x: add cd-gpios
Add cd-gpios to test the mmc device whether exit.

Change-Id: I171f4c0d895baf1a1b54c971fc88370a0b10ce3a
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-03-15 14:29:05 +08:00
Joseph Chen eef7c6f46a rockchip: board: ignore mmc strength fdt fixup for rk3399pro-npu
Change-Id: Ic2b787e2bff49e73ca3ec3404fc74751d2903aa6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-14 20:14:26 +08:00
Joseph Chen 28e9b49d47 rockchip: board: fdt fixup mmc strength as 2mA for rk1808
Change-Id: I183e671a6a3ea753f163b2c3f534de85f584bd38
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-12 19:28:01 +08:00
Joseph Chen 841c4e1755 rockchip: atags: add tag for SoC information
Change-Id: Ic2f89b8deb5cebeaaa05fb6cd67997429821904c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-12 10:00:40 +08:00
Joseph Chen dd9ee2cc6f rockchip: rk3368: correct MMU ram map size
Change-Id: I4884a88613fe5c2fa515360d4c754f4eade84ed3
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-08 17:41:06 +08:00
Joseph Chen d17dc7d485 Revert "rockchip: dts: rk3308: add cd-gpios"
This reverts commit 18601cb12a.

Change-Id: I9d1501ab0492a24ddbd6877b3cc735dfbc5a6944
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-08 17:35:12 +08:00
Jason Zhu 18601cb12a rockchip: dts: rk3308: add cd-gpios
Add cd-gpios to test the mmc device whether exit.

Change-Id: I6a07ff130e506678a20e5128ef4c8e608e0ec448
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-03-08 09:11:39 +08:00
Jason Zhu b73a762978 dts: rockchip: rk3288: add cd-gpios
Add cd-gpios to test the mmc device whether exit.

Change-Id: I3d4839180b36de22ce1e5f2b26c9090b0686a8a0
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-03-08 09:10:32 +08:00
Jason Zhu aa0fd9f34b rockchip: px30: add cd-gpios
Add cd-gpios to test the mmc device whether exit.

Change-Id: Ie1cfffe0f7826eae47fab705d3a3bb7d1a85f8ce
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-03-08 09:10:24 +08:00
Joseph Chen 01ff14b054 rockchip: resource: add return value validation
Change-Id: I3ed362564e7aed48fc212f299f3712fdbc19ee53
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-07 10:13:40 +08:00
Jason Zhu 641abd2eec rockchip: atags: pass public key through atags
Change-Id: I202f354a3b48b8e64c7b2ade7e3b65fa3b78500a
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-03-06 17:30:58 +08:00
Joseph Chen 2291ec7c6f rockchip: atags: add JShash for tag
Since atags is passed between so many pre-loader, it's better
add hash check for tag.

It compatibles with legacy code and tag data, because 'hash'
is reserved field in old tag data.

Change-Id: I18b4c46f75b2c5a50194c23576e6f1437c83ccf5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-06 15:34:20 +08:00
Joseph Chen 716ab2e7e6 rockchip: atags: add tag overflow check when tag lookup
Change-Id: I0fca9559a6656338e4c956bffa3734ff744dcc4c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-06 15:34:20 +08:00
Joseph Chen 7b2d6d6e23 rockchip: atags: move error message to bad_magic()
Change-Id: I4c41fa05361f4c8ad2e33530764c2ba5090aeb00
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-06 15:34:20 +08:00
Joseph Chen 3043118598 rockchip: rk3308: disable uart2-m1 configure when pre-loader serial enable
pre-loader has configure it.

Change-Id: I2786ff7c438a38036a7a5be3337052f7e51423a3
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-05 14:11:41 +08:00
Joseph Chen 0023d94b4b arm: dts: rk3399pro-npu-evb: remove unused node
Change-Id: Ib8ee8e69b6fb92038ad6fb7cd6bf5eac456bb1d6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-25 14:29:33 +08:00
Joseph Chen 73595a322a rockchip: rk1808: select GICV3 if !COPROCESSOR_RK1808
Change-Id: Id2593e1172e02c8a8aa296efd43bc7e6c1e0d88d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-25 10:50:38 +08:00
lanshh 2549364d44 rockchip: board: set macaddr from vendor storage
Change-Id: Ic80a036977fb67fb22892664d9c69ac7a38704de
Signed-off-by: lanshh <lsh@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-25 10:38:54 +08:00
Joseph Chen f2835bc289 arm: asm: add read_mpidr() for 32-bit ARM
Change-Id: I2556d589802d2290da129e03bb33ec11536119cd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-25 09:59:46 +08:00
Joseph Chen ba70cc538e rockchip: boot_mode: fix enter recovery mode failed
enter recovery mode when recovery key is pressed but usb is absent.

Change-Id: I4e29d657e6c42f04db1076a2eaed23974e375404
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-25 09:59:46 +08:00
Joseph Chen 2c9d117912 sysmem: fdt: reserve more CONFIG_SYS_FDT_PAD size for fdt
Sometimes, framework or user would call fdt_increase_size() to update
fdt size, it's better reserve more space to avoid sysmem gives the fdt
region overflow report.

The CONFIG_SYS_FDT_PAD default value is sync with bootm framework
in: common/image-fdt.c

Change-Id: I363e9a4182e13b1628a76666acd8272d25db659d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-19 14:37:36 +08:00
Jon Lin 039b194e00 rockchip: dts: rv1108: add nandc node
Change-Id: I1256b84cc40fc2836d301027b1c1ef25aa537ec4
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-02-19 12:49:42 +08:00
Joseph Chen 07ea4f345b rockchip: param: fix bl32 enable flag not set when atags effect
Change-Id: I3a57dcdbd3e247fbe7f2230d70dd9687251cce0a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-15 11:32:32 +08:00
Joseph Chen 644804ed62 rockchip: board: support enter download mode by hotkey
- ctrl+b: enter bootrom download mode, ('b': bootrom);
- ctrl+d: enter rockusb download mode; ('d': default download, ie. rockusb);

This patch provides convenience for download when rockusb/recovery-key is
absent or not work, or U-Boot early panic.

Change-Id: I7709183c645400f60af3d480f84f6e6887ddc20e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-15 09:04:24 +08:00
Kever Yang 1feaf21adf rockchip: dts: rv1108: enable emmc
Enable emmc node.

Change-Id: I4ee5b078429e8e0686f301d03602e0875a613ee2
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-02-14 17:35:31 +08:00
Joseph Chen a059684b23 armv7: sleep.S: support other v7 cpu
Change-Id: Ib1b1cb973054c9faa6a11da8fc1ad7f1d5aec214
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-14 14:32:56 +08:00
Joseph Chen abf4f55116 armv7: sleep.S: rename _suspend_gd to __suspend_gd
Change-Id: I97911822c5616dbcbb3b28a156a3759f3b6b2af3
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-14 14:32:56 +08:00
Zhangbin Tong 0a5f26cb4b rockchip: dts: rk322x: enable nandc
Change-Id: I495bc11aa8db9f6a916aaad3c5dad40f4c07b8e2
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
2019-02-14 09:06:23 +08:00
Joseph Chen d554a7b28e arm: interrupt: add stacktrace dump for all exceptions routine
show_regs() is called by all exceptions.

Change-Id: Iac271d8d7b5d42ed9cf3d8a860a17f8080acf3bc
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-13 10:17:47 +08:00
Joseph Chen 6aa65bb1ee armv7: add -funwind-tables compile option to support stacktrace
Change-Id: Icfa223397e05dcd42ea3c12275385104bf275213
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-13 10:04:11 +08:00
Joseph Chen d0df954bf3 arm: lib: add arm32/64 stacktrace support
This patch supports dump arm32/64 stacktrace as the format of raw
address info. The U-Boot symbol table is not available now, please
use ./scripts/stacktrace.sh script to parse stacktrace info with command:

    ./scripts/stacktrace.sh <file>       // stacktrace info file

Example on RK3399:
    Call trace:
     PC:   [< 00258a7c >]  dwc3_gadget_uboot_handle_interrupt+0xa0/0x5bc
     LR:   [< 002052f8 >]  usb_gadget_handle_interrupts+0x10/0x1c

    Stack:
           [< 00258a7c >]  dwc3_gadget_uboot_handle_interrupt+0xa0/0x5bc
           [< 0025bd6c >]  sleep_thread.isra.20+0xb0/0x114
           [< 0025cf58 >]  fsg_main_thread+0x2c8/0x1814
           [< 0020db58 >]  do_rkusb+0x250/0x338
           [< 00226a00 >]  cmd_process+0xac/0xe0
           [< 00212df4 >]  run_list_real+0x6fc/0x72c
           [< 00212f94 >]  parse_stream_outer+0x170/0x67c
           [< 002126e0 >]  parse_string_outer+0xdc/0xf4
           [< 00212bb0 >]  run_list_real+0x4b8/0x72c
           [< 00212f94 >]  parse_stream_outer+0x170/0x67c
           [< 00212698 >]  parse_string_outer+0x94/0xf4
           [< 00225f30 >]  run_command_list+0x38/0x90
           [< 00202d08 >]  rockchip_dnl_mode_check+0x4c/0xd4
           [< 00202db0 >]  setup_boot_mode+0x20/0xf0
           [< 00203010 >]  board_late_init+0x10/0x40
           [< 0027071c >]  initcall_run_list+0x44/0x80
           [< 00213d68 >]  board_init_r+0x20/0x24

The "dump_stack()" is available to trigger stacktrace.

Change-Id: Ib1423269dd255fa4a34231489cd3b7e6ddd22540
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-13 09:04:23 +08:00
Joseph Chen 5315192f60 rockchip: resource: add resource hdr magic validation
It fixes the dead loop issue of "bootrkp" command:
	......
	=Booting Rockchip format image=
	boot: invalid image tag(0x0)
	boot_rockchip_image ramdisk part boot read error
	bad resource image magic:
	DTB: rk-kernel.dtb
	invalid entry tag
	invalid entry tag
	invalid entry tag
	invalid entry tag
	......

Change-Id: Ia15f315eee94dce06800139ff547ebeee3847cae
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-12 17:40:24 +08:00
Elaine Zhang 5561190119 clk: rockchip: rk3288: add clk_set_default
support aclk_vio\hclk_vio clk setting.

Change-Id: Ie826c770670598161f22208f504d8762b8597811
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-01 16:17:34 +08:00
Joseph Chen 683a8d16be arm: interrupt: clean up registers show
Change-Id: I0ecb11c5e67cb7e0e95d3fcaad9220628fddbfc6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-01 11:53:47 +08:00
Joseph Chen 9fa74d15b8 arm: vectors: irq context get svc_lr and svc_sp
Without this patch, the irq context get the irq_lr and irq_sp
which doesn't make any sense, what we need are svc_lr and svc_sp.

Change-Id: I4c07e3688e818cd4516824a78d57ff092fdbe2b9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-01 11:53:47 +08:00
William Wu 294ad6176b rockchip: board: rework board usb init
Currently, usb 2.0 otg node was found by the compatible
"snps,dwc2" and the property "dr_mode". However, the
"dr_mode" isn't a necessary condition, more seriously,
if the dr_mode is set to "host" or "peripheral", we
will fail to get the otg node.

This patch finds otg node by the compatible "snps,dwc2"
for most of Rockchip SoCs supported only one DWC2 controller.
For RK3288, it supports two DWC2 controllers with the
same compatible "snps,dwc2", so we add another condition
(reg addr = 0xff580000) to get the otg node.

Change-Id: I16acbf3e8da9bec19b8ec0a331b9114cb5462ac0
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-31 17:55:14 +08:00
Jason Zhu 9136a2d39c rockchip: dts: px30/rk3326: add emmc hs200 support
Change-Id: I0080a12452dd7fa77b8b7fd26a61bc429b3cfa27
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-01-31 11:17:22 +08:00
Joseph Chen 98e497fd55 arm: arm32_macros: fix coding style
Change-Id: I736139237d184aa7a35c840ea0ed3214d7e47e44
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-30 17:57:45 +08:00
David Wu 81681b40b9 rockchip: dts: rv1108-evb: Fix gmac dts configuration
Add the phy regulator supply for rv1108-evb, and fix the
configuration of clock_in_out.

But the phy will init failed because the phy-reset pin is
the same as the mipi data pin.

Change-Id: I14b0accd083742ca6eb4ae6bec1139ef5ba65db0
Signed-off-by: David Wu <david.wu@rock-chips.com>
2019-01-30 11:39:48 +08:00
Elaine Zhang 524f26463d clk: rockchip: rk3066: print arm enter and init rate
Change-Id: Iaf4ffbb61830b7bb7cef31843f0e9b75c34d08ec
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-25 16:19:57 +08:00
Elaine Zhang 441bfb788a clk: rockchip: rk3188: print arm enter and init rate
Change-Id: I604c18050e8ccbbc9aa25ecd8f4379a877239d49
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-25 16:19:57 +08:00
Jason Zhu f17295bfb0 rockchip: rk3328: update sdmmc&emmc's clocks
Add the SCLK_EMMC_DRV and SCLK_EMMC_SAMPLE to clocks.

Change-Id: I3c633bd973bb1f5cafb98a295ded6cfae704382d
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2019-01-25 14:56:21 +08:00
Joseph Chen f36a2342cd rockchip: board: move charge display function to charge display uclass
Change-Id: Ib5143d8bd9beafc585438e57216f2b7c17932859
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:44:08 +08:00
Joseph Chen 6bc040a32c rockchip: resource: import sysmem to alloc fdt buffer
sysmem avoids memory block overlap with each other.

Change-Id: I0013c3d05c69e19286cf1c76f936a17eaab1db49
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:33:12 +08:00
Joseph Chen 4ec36d6839 rockchip: resource: add interface to get resource file size
clean up code and add comment for other interfaces.

Change-Id: Ibc64978d8db595c4fe76432faca77cdad9c949e6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:33:12 +08:00
Joseph Chen 6929f85b13 rockchip: board: implement board_sysmem_reserve()
sysmem provides a mechanism to avoid memory block overlap with
each other.

Change-Id: I84796f4fd5b06283ca23e0ec9da9d0421701a957
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:33:12 +08:00
Joseph Chen 4892a977d7 rockchip: board: fix compile warning when atags is disabled
Change-Id: I494f06a715bf7b40c7f56a5ce3aabe1c63ee9bb0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:33:12 +08:00
Joseph Chen 7c015044fd rockchip: boot_mode: use param_parse_bootdev() to get bootdev
Change-Id: I735471aa89502acfc647dbeeb4d487f1001ccad7
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:33:12 +08:00
Joseph Chen f0a9765fb1 rockchip: sdram: use common interface to get atf/optee memory info.
using param_parse_atf_mem() and param_parse_optee_mem().

Change-Id: I0d42f80ea4bac61efdc38a0be97c3f416ce90622
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:33:12 +08:00
Joseph Chen dbf8423e37 rockchip: add platform param parse interface to param.c
parse: atf/optee/bootdev and common reserved memory.

Change-Id: I829eb42370b217e567cdafe03de4dab6063aa251
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-24 15:33:12 +08:00
Joseph Chen 47ad810789 rockchip: rk1808: enable GICV3
Change-Id: I47a459e2408a7a56794cf7f72ff58a616100b7eb
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-23 21:17:03 +08:00
Elaine Zhang 92c6b64268 clk: rockchip: rk3128: print arm enter and init rate
Change-Id: I0be1752522a83a2d111870e5a8ac95f92bd7f9a5
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 21:13:55 +08:00
Elaine Zhang 3a1c76d931 clk: rockchip: rk3036: print arm enter and init rate
Change-Id: Ic9212c8a0f1d50006f7121957b8bd5f34d2622d9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 21:13:26 +08:00
Elaine Zhang ec0307ef3a clk: rockchip: rk3288: print arm enter and init rate
Change-Id: I5a6d564a973111841df6b53a4df64a54f728e116
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 21:13:26 +08:00
Elaine Zhang 2401c256ec clk: rockchip: rk322x: print arm enter and init rate
Change-Id: Iab7034c8cef09908a99b5a1e396f6e015da350fb
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 21:13:26 +08:00
Elaine Zhang 093fdd9f5d clk: rockchip: rk3308: print arm enter and init rate
Change-Id: I6df66d7b5dda643dba49ee87c2a2c0544ddbcded
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 21:13:26 +08:00
Elaine Zhang f7913bc128 clk: rockchip: rk3328: print arm enter and init rate
Change-Id: I80ebeee0d6d8b151061d0bbb0d1d12070dcc6f98
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 21:13:26 +08:00
Elaine Zhang ae79bf6827 clk: rockchip: rk3368: print arm enter and init rate
Change-Id: Ib201cf442ce7398bbe8009ce9b7de9dc1f53c587
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 21:13:26 +08:00
Elaine Zhang 044bc79de9 clk: rockchip: rk3399: print arm enter and init rate
Change-Id: Ib5e3e0f9a3e1a5b535ec852e7c58966dc0db77cf
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 11:01:59 +08:00
Elaine Zhang dfce009693 clk: rockchip: px30: print arm enter and init rate
Change-Id: I0d2a1c6bb92397210314322fd147c4a8a6e81abd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 11:01:59 +08:00
Elaine Zhang ed6f5d94b5 clk: rockchip: rk1808: print arm enter and init rate
Change-Id: I14f0b0c95b1367266fe9c64050a602ad58208d53
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-23 11:01:59 +08:00
Kever Yang 231617c5ab rockchip: update TPL_MAX_SIZE for rk3288
RK3288 sram size can be used for TPL is 32768

Change-Id: I1b0ae5209d97f59b53349f6787439090539a5ac0
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-01-23 09:36:35 +08:00
Jon Lin 8094aeb8cd clk: rockchip: rv1108: add NANDC and SFC clk init
Currently RV1108 run in 1.2G GPLL.
NANDC need 1200 / 8 div = 150MHz.
SFC need 1200 / 12 div = 100MHz.

Change-Id: Ia3f401b0cf13587209d0d68d76a9891dd3bcf990
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-01-22 17:06:35 +08:00
William Wu 933ae82de1 rockchip: dts: rk3399: add u-boot,dm-pre-reloc for usb2 phy
The usb vbus detection is depend on the usb2 phy driver.
This patch fix the usb vbus detection issue if there is
no valid kernel dtb, and make rockusb to enter download
mode successfully.

Change-Id: Icf86cfaf67e20f2368370eb2aedc4fa9d5777c50
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-15 10:24:38 +08:00
Tang Yun ping a2f7540398 rockchip: sdram: add ddr page size and bandwidth get interface
Change-Id: I05e0f32c7e8423843c7b874f8ff89e8e9d093390
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2019-01-11 14:31:29 +08:00
Tang Yun ping 6bce753f9d rockchip dmc: add ddr set rate interface
Change-Id: Ie3f5ac29621f1298a759daf44a1caf68d18b9a46
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2019-01-11 14:31:29 +08:00
Joseph Chen 6ff768feef common: add system boot time report
Change-Id: Id7db8f7f7e30719188403f92282ca17c6fe564d6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-10 16:02:35 +08:00
Wyon Bi de867820fc rockchip: rk3288: scan sub-nodes of the syscon node
Change-Id: I74eec80993664173e57e0c03f662790cf9e66b5a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2019-01-10 09:50:27 +08:00
Joseph Chen 5716d3430d rockchip: smccc: sync sip id definition from kernel
Change-Id: Iefc9baab29abe8ba23ad58e74a24b4b6d9bb85d1
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-08 15:01:43 +08:00
William Wu ab6f0fad65 rockchip: rk3399: set qos priority for perilp_nsp
This patch increase the qos priority of perilp_nsp from
2 to 3 for USB 3.0 controllers.

Change-Id: I813f9190cc894ac15452686aa68d187200be3888
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-04 18:23:24 +08:00
Kever Yang 64e35efeb2 rockchip: boot_mode: fix usb vbus check value
rockchip_u2phy_vbus_detect() may return negative number when driver
not implemented, only positive number means vbus available.

Change-Id: I06e9b36c7bbcdbb097abe204f4ff0318541ea869
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-01-03 11:53:45 +08:00
YouMin Chen 4652b3041d rockchip: dts: rk3399: add lpddr4 support
Change-Id: I5bf0d19a6ebbdbcfe3b00a6f3fdddeb6ab572826
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-12-29 09:38:09 +08:00
YouMin Chen 8b36ec9feb driver: ram: rockchip: rk3399: add lpddr4 support
Select rk3399-sdram-lpddr4-100.dtsi to initialize LPDDR4
at 50MHz, it will change clock frequency to 800MHz
after initialization is complete.

Change-Id: I803ed2c809f17bbea40f379194bce548adc338ea
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-12-29 09:38:03 +08:00
YouMin Chen e4011c0133 rockchip: dts: rk3399: use u-boot,dm-pre-reloc for pmu
Change-Id: I3df556ff7133532ceb8f38bd69f7d8e378d265c8
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-12-29 09:37:57 +08:00
YouMin Chen d6f493bc55 rockchip: arm64: rk3399: syscon add support for pmu
Change-Id: Ibc89ac33df07c6ea3e38d4c6cb4f07b8747589df
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-12-29 09:37:52 +08:00
YouMin Chen 31d8c61d58 driver: ram: rockchip: rk3399: dram init select common code
Add support dram capacity detect.
Select dram timing file base on dram type and clock frequency,
don't need care dram capacity.Dram capacity will auto detect.

Change-Id: I0554a0ec0c753a159406330aa0baa2daafe7ab93
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-12-29 09:37:39 +08:00
YouMin Chen 55c5751eba driver: ram: rockchip: px30: dram init select common code
Change-Id: I4f01c354355d61884f84bad160a54db927bb72cf
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-12-29 09:37:33 +08:00
YouMin Chen 74803dece4 driver: ram: rockchip: add common code about dram init
Add commond code about rockchip dram init,include print dram info,
capacity detect,config msch timing,config os_regs and so on.

Change-Id: Ie4223dac31bde290d19627c96088542fcdd5521d
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-12-29 09:30:10 +08:00
Jianqun Xu 47fb924aca arm: rockchip: rk1808 add set qos priority for cif
Set cif qos priority to 2.

Change-Id: I42354ae12394472d99af17af1d586a7bc3bb3c37
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-12-25 12:23:40 +08:00
Alexey Brodkin f05ce84792 UPSTREAM: fdt: Implement weak arch_fixup_fdt()
Only ARM and in some configs MIPS really implement arch_fixup_fdt().
Others just use the same boilerplate which is not good by itself,
but what's worse if we try to build with disabled CONFIG_CMD_BOOTM
and enabled CONFIG_OF_LIBFDT we'll hit an unknown symbol which was
apparently implemented in arch/xxx/lib/bootm.c.

Now with weak arch_fixup_fdt() right in image-fdt.c where it is
used we get both items highlighted above fixed.

Change-Id: Iaac96fbb0bcc484906952ced132b10b2cead782e
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: York Sun <york.sun@nxp.com>
Cc: Stefan Roese <sr@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-12-24 17:20:37 +08:00
Masahiro Yamada 0e00a84cde UPSTREAM: libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>
Thomas reported U-Boot failed to build host tools if libfdt-devel
package is installed because tools include libfdt headers from
/usr/include/ instead of using internal ones.

This commit moves the header code:
  include/libfdt.h         -> include/linux/libfdt.h
  include/libfdt_env.h     -> include/linux/libfdt_env.h

and replaces include directives:
  #include <libfdt.h>      -> #include <linux/libfdt.h>
  #include <libfdt_env.h>  -> #include <linux/libfdt_env.h>

Change-Id: I6c0f7e50e8b571106627f25ddac008a62bd2994e
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-12-24 17:20:37 +08:00
Jianqun Xu dae202865e rockchip: board: add io-domain init
Change-Id: I073cb6567e8becfdb1be09c7faef3c06b308dc6f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-12-24 16:44:06 +08:00
Joseph Chen a1e5c945ad rockchip: dts: rk3368: enable nandc
fix model string typo.

Change-Id: I1e96a986a381c86999839efd486fb371ca8ed82c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-21 15:16:54 +08:00
Joseph Chen 8d1dd0c451 rockchip: atags: add serial id print
Change-Id: I8b41ba9e1b02b300c385b2036e7af78ac544cfe1
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-19 17:08:21 +08:00
Joseph Chen 717cd360ca rockchip: boot_mode: fallback to legacy bootdev init when atags is invalid
verbose "Bootdev(atags):" if bootdev is from preloader atags, otherwise "Bootdev:"

Change-Id: Ib02a1f6deea330bf33aca60f752a3006a48bc3ac
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-19 17:08:21 +08:00
Joseph Chen dc11069f97 rockchip: boot_mode: separate key press and vbus attach conditions message
Change-Id: Iace9c890526179cdceef327f1113db5c8a4c26bd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-18 17:35:07 +08:00
jon.lin c09b5fad43 rockchip: dts: rk1808: add sfc node and enable it
Change-Id: Iaebdadf5eb45fdfa7c693156c851c573a6acb45e
Signed-off-by: jon.lin <jon.lin@rock-chips.com>
2018-12-18 16:35:47 +08:00
Joseph Chen 95351b7a0e rockchip: dts: rk3399: add rk3399pro evb board recovery key
Change-Id: I5fe5a5532e7a6d47209ac38774497575b9c3072a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-17 20:50:38 +08:00
Joseph Chen 8171b1ba1b rockchip: rk3399: support rk3399pro uart2 input
RK3399: uart2c; RK3399PRO: uart2a.

Change-Id: Ic750e862c30cfd63de4ad800ebf49133feaefb01
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-17 20:31:40 +08:00
Joseph Chen 4d763c7bd8 rockchip: rk3399: add syscon scan sub dev
Change-Id: Icb0b59fa7cb61e41fc611b5671625854894d2283
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-17 15:08:51 +08:00
Nickey Yang 80cc390792 dts: rockchip: rk3288: update ddc-bus for hdmi
use hdmi_ddc instead of i2c5 for read edid.

Change-Id: Ie2efcf99a50bb7cdb68eaa4b8c3a783a743e758e
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-17 14:26:15 +08:00
Nickey Yang 048ac2b721 dts: rockchip: rk3288: update dsi node from kernel.
Change-Id: I43ffd5e2d782bb18ac6c7fb96db0628458bb5a2d
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-17 14:20:08 +08:00
Nickey Yang 03773c159a dts: rockchip: rk3288: sync display-subsystem route node form kernel.
Change-Id: I6758525abe308a35e4dcf3b20905c114d8a5ab46
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-17 14:20:08 +08:00
Elaine Zhang 8b75ff3444 clk: rockchip: rk3399: support clk dump
add clk_dump.
add peri clk getting rate.
modify aplll init freq to 816M.

Change-Id: I57a9c2f708c12968909b804f957e80fb0c6d3573
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-17 14:17:10 +08:00
Elaine Zhang cf04b7e8f2 clk: rockchip: rk3328: support crypto clk setting
Change-Id: I9e4d58050b087c3da6649efe4d3115da2ce6dce7
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-17 14:17:10 +08:00
Elaine Zhang a7c5f87313 clk: rockchip: rk322x: support crypto clk setting
Change-Id: Id92acae9424fd0b200f9b4f33982f753f6123207
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-17 14:17:10 +08:00
Elaine Zhang 51d1c6b1dd clk: rockchip: px30: support crypto clk setting
Change-Id: I9971fb2b6a40640d78fb259c72aac32582f8e90d
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-17 14:17:10 +08:00
Elaine Zhang 0cde592567 clk: rockchip: rk3308: support crypto clk setting
Change-Id: I58967fe70fbae6630fe0404414daaee6b1498b72
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-12-17 14:17:10 +08:00
Weixin Zhou ce18b1fcdc rk3399pro: set wifi_26M to 24M and disable by default
fix current leak due to wifi_26M clk enable by default

Change-Id: I53cb7fbfa49a0cda29834bb2e2871aedde6b7d15
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2018-12-13 20:08:58 +08:00
Joseph Chen d60cbc66d7 rockchip: add rk3399pro project build
build command: ./make.sh rk3399pro

Change-Id: I50d4aba026d35ff7ed73257dc1edcb50426aa64f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-11 09:34:57 +08:00
Joseph Chen 3acf4edfaf rockchip: board: add dvfs init
Change-Id: I24bff1e8528f0e8ad17718a47d3f725a9e5a5c8c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-10 18:03:59 +08:00
Joseph Chen 3e6a97f92c rockchip: destroy atags before jump to kernel
Change-Id: I69f1050ed57a1ebccbc9c7cd5bf9c2eaac9ab30e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-10 17:51:46 +08:00
Joseph Chen bc04a3dd9a rockchip: fixup "kernel_addr_r" when bl32 is disabled
some platform which is not determined to enable bl32,
we had better choose kernel load address dynamically in
order to make full use of memory for kernel.

Change-Id: If5c15a3755dabfff8d3cce8dec38c9215c464ed2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-10 14:51:17 +08:00
Joseph Chen 509ea9e58d arm: rockchip: select SKIP_RELOCATE_UBOOT if !ARM64
According to kernel: Documentation/arm64/booting.txt introduce:

NOTE: versions prior to v4.6 cannot make use of memory below the
physical offset of the Image so it is recommended that the Image be
placed as close as possible to the start of system RAM.

We shall remain ARM64 relocation to avoid ram overlap between uboot
and kernel.

fixes: 9841897eb9
(arm: rockchip: select SKIP_RELOCATE_UBOOT)

Change-Id: I6b092e979c9f365ca9d9b9dbb8b4e7afbf864d6e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-04 17:45:54 +08:00
Joseph Chen 0b4bf9764e rockchip: rk3308: enable IRQs
Change-Id: I1d708bd89bbe9e2ad7a5213cc7bed22a0c2655a5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-04 14:37:59 +08:00
Joseph Chen f6fe8359aa arm: crt0: don't relocate vector if CONFIG_SKIP_RELOCATE_UBOOT is enabled
This patch fixes interrupt issue when uboot disable relocation.

fixes: 645a442d90
(common: support skip U-Boot relocation)

Change-Id: I58928744625a10beb9cd1b60cbcefdbb521149d5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-04 10:01:25 +08:00
Joseph Chen ac374906e8 rockchip: smccc: add secure region read/write interface
Adding more qoute for APIs.

Change-Id: I976cfe3193c242c439195efd9d774a31af003f3c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-03 16:53:44 +08:00
Tang Yun ping 16a92a426e rockchip dmc: add rockchip dmc code
This dmc code is prepare for ddr test tool to scanning ddr freq,
normal firmware no need to enable it.
Current version only support PX30/RK3326 and RK3328/RK3228H,
CONFIG_ROCKCHIP_DMC=y to enable it

Change-Id: I25360846bb5af74eb82bdc6e64bdaa2d55ab0f64
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2018-12-03 16:26:08 +08:00
Joseph Chen 9841897eb9 arm: rockchip: select SKIP_RELOCATE_UBOOT
there is no necessary reason to do uboot relocation, and actually
it brings trouble for our debug at some time, so skip it.

Change-Id: I56567a6ff13c8431e7e1773652826692ec0e6c9e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-01 11:47:26 +08:00
Joseph Chen 645a442d90 common: support skip U-Boot relocation
Change-Id: I8640907204c82928c2fb07177835dc55a126aaf0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-01 11:47:26 +08:00
Shunqian Zheng 3065df6c98 ARCH: arm: px30: clear force_jtag mode
If SDMMC0_DET pull low gpio1_d4/d5 mux as sdmmc functions, otherwise
they mux as JTAG or UART. But the jtag_force(grf_cpu_con1[7])
is enable after reset.

This clear force_jtag mode to enable uart4 when SDMMC0_DET is high.

Change-Id: I2a2dadaad7dc2df8de3b43ff47d27d266caca62f
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-12-01 11:45:25 +08:00
vicent.chi 98ebaf0e5b CRU: rv1108 add emmc clk get and set
Change-Id: I8cbfda46d2f7e84f11dbcca844d00c87559d0aa0
Signed-off-by: vicent.chi <vicent.chi@rock-chips.com>
2018-12-01 11:40:42 +08:00
Joseph Chen 0a9c335c55 rockchip: dts: rk3288: add u-boot,dm-pre-reloc for usb otg
It makes rockusb works normally even there is no valid kernel dtb.

Change-Id: Ie7a125450de1b9394ed5c17fc5a0df3239e203d6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-30 08:49:08 +08:00
Joseph Chen 1927b5fd8a rockchip: dts: rk3368: add u-boot,dm-pre-reloc for usb otg
It makes rockusb works normally even there is no valid kernel dtb.

Change-Id: Ic2996614b9cddc1835b079c2e7ac784daa99ad3e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-30 08:44:51 +08:00
Finley Xiao 21ab40a873 rockchip: clk: rk3308: Add flag for clk_set_defaults
Change-Id: Ic9009b35e395cfe8c2a8f8d367b75b85294c7354
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-29 20:40:09 +08:00
Joseph Chen a33c12a6fe rockchip: rk3308: add rockchip_get_clk/cru interface
Change-Id: I63bb32228af0fc9bb86374aae3a3c96d0901540d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-29 20:40:09 +08:00
Joseph Chen 61184b8f14 rockchip: board: remove verbose "Using kernel dtb"
This is a debug message to know if we use kernel dtb.
We have already got this info from "DTB: rk-kernel.dtb",
so remove it.

Change-Id: I28e29e43aa818ac61c9864b94bd80ceb85fc9c3a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-29 20:40:08 +08:00
Joseph Chen 0e107a57eb rockchip: dts: rk3128: add u-boot,dm-pre-reloc for usb otg
It makes rockusb works normally even there is no valid kernel dtb.

Change-Id: I7f17bda7fdd841135d0ab0392db58cfc65cc7f5e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-28 20:45:10 +08:00
Joseph Chen 0a6aa43dec rockchip: dts: rk322x: add u-boot,dm-pre-reloc for usb otg
It makes rockusb works normally even there is no valid kernel dtb.

Change-Id: Icdb2f9611d25525bbe15d4aafb9120e31e749af2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-28 20:45:10 +08:00
Lin Huang 08b717aba0 clk: rockchip: rk1808: set apll default frequency to 1.2GHz
For cpu_vdd default voltage enough to support cpu frequency to 1.2GHz,
so set rk1808 default cpu frequency to 1.2GHz.

Change-Id: Ia8a888ee79ab3ae3868790bcc1851552acf90086
Signed-off-by: Lin Huang <hl@rock-chips.com>
2018-11-28 10:53:15 +08:00
Jason Zhu fc1a55637d rockush: add serialnumber to usb_device_descriptor
Change-Id: I498be22dd73ffa8e8844bd9ceedb294b5bba72ce
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2018-11-23 11:06:51 +08:00
Andy Yan 58e5d8f2cd rockchip: add api to distinguish soc variants
Add api soc_is_xxx for soc variants distinguishing.
Most of them borrowed from linux kernel
include/linux/rockchip/cpu.h.

Change-Id: Ifb932c022ffdf001b64979fe2554452f0d480e88
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2018-11-22 17:45:06 +08:00
Kever Yang 31bc0a57fb rockchip: make_fit_optee: update output dir
The output directory is not the same for different build system,
let's get it from environment.

Change-Id: Ifa05c9bc09d5b609d16bcbed767bccd3c2bbaa38
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-22 09:18:34 +08:00
YouMin Chen da54d0c8b4 rockchip: rk3328: add support ddr4
Change-Id: Id4d5faa579c8715ea3833744420c61fbf34ddfea
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-11-21 10:10:52 +08:00
Wyon Bi 206cad104e rockchip: px30: disable video phy bandgap by default to reduce power consumption
Change-Id: I98f84a9fd73a42252c695ab0dcc8fe0185ecd611
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2018-11-21 09:45:05 +08:00
Joseph Chen a21c2f0ae1 rockchip: dts: rk3368-evb: move chosen to *-u-boot.dtsi
Change-Id: I642736143d7a01df24a2814ad188247314d9315f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-20 14:20:32 +08:00
Kever Yang 2b78fc239c rockchip: remove unused fit source file
We use fit generator script instead.

Change-Id: Ia799d5032e5f4ce21647548eca6efa70856da1a5
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-19 15:15:57 +08:00
Kever Yang 6d64bf28b2 rockchip: add script to generate optee fit its
The U-Boot and OP-TEE load&entry address may not the same for
different SoCs, so we need a script to adapt it.

Change-Id: Id5418aa8ac8b35045be9310f317a73e7c24d7518
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-19 15:15:57 +08:00
Kever Yang 3ddbcffe0c rockchip: rk3288: enable FIT and OPTEE for SPL
rk3288 is going to enable trust(OPTEE), which pack in FIT image.

Change-Id: Ic8872b4b6cb68d321c6996fde1b3e4083ef3b6da
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-19 15:15:57 +08:00
Kever Yang 0adb499810 rockchip: rk3288: support TPL
rk3288 is going to use TPL+SPL as preloader.

Change-Id: I2c712564b7c3b4d7c826bda09135f7188b0abc22
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-19 15:15:57 +08:00
Kever Yang cd08d188cf rockchip: dts: rk3288: add spl-boot-order
SPL can boot from EMMC or SD card.

Change-Id: Id6cf82880760a734eb9324bb4715dfd2e1c9d9ca
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-19 15:15:57 +08:00
Kever Yang 8b2c667148 rockchip: rk3036: add boot order to enable both emmc and sdmmc
The SPL can scan sdmmc and emmc one by one.

Change-Id: Iaac25a606528c59420613e648573993009b7f2c1
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-16 09:09:57 +08:00
Joseph Chen 2dc2d048e2 rockchip: lmb: limit highest memory from 768MB to 512MB for 32-bit platform
Ramdisk is a compressed image and it expands after descompress, which accesses
768MB+ memory and brings "Unable to handle kernel paging request at virtual address ...".

We make a appointment that the highest memory is 512MB, it makes lmb alloc safer.

fixes: 2c6a058b7e
(rockchip: implement board_lmb_reserve())

Change-Id: I728a1fbff216194b940372713387cf171028b20b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-16 08:41:36 +08:00
Joseph Chen 8f88277439 rockchip: support get boot devtype and devnum from atags
- preloader would pass bootdev info;
- avoid going through all the possible bootdev;
- rename devtype_num_envset() to boot_devtype_init();

Change-Id: Ia047c744dc7aca97db97664fc92473e46ba102a9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-16 08:41:36 +08:00
Kever Yang b9756a5b08 rockchip: boot0: init gd as null in TINY_TPL
Init gd to NULL in case someone using it.
For example, below patch using gd in debug_uart_init:
064eb49314 serial: ns16550: support using pre-loader serial

Change-Id: Iee71dc8bc9168a0364598a3b4027807cba522594
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-15 17:59:28 +08:00
Dingqiang Lin a2795c339d clk: rockchip: rk312x: add sfc clk init
Change-Id: I5edf0a4b650a57a48f837fa3e007cfaf6a733f92
Signed-off-by: Dingqiang Lin <jon.lin@rock-chips.com>
2018-11-14 14:32:24 +08:00
Joseph Chen a95a20c783 rockchip: dts: rk3288-evb: move dm-pre-reloc nodes to *-u-boot.dtsi
it makes users easy to override their kernel dts when
CONFIG_USING_KERNEL_DTB is disabled.

Change-Id: If794a5d3e8be334e81519d5bd69f97062db4b208
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-14 11:55:03 +08:00
Joseph Chen d153e81420 rockchip: dts: rk3128: move dm-pre-reloc nodes to *-u-boot.dtsi
it makes users easy to override their kernel dts when
CONFIG_USING_KERNEL_DTB is disabled.

Change-Id: Id038494e1cbd1c63afa3397e64cb60f981aa0509
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-14 11:55:03 +08:00
Joseph Chen b000829baf rockchip: atags: give a valid range for magic check
Avoid "bad magic" report in case that new atags magic has been
added in preloader but U-Boot not.

Change-Id: Id144bd7ae3245323f792bd5fe5d4e0cdef15ea22
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-14 11:55:03 +08:00
Joseph Chen 2c6a058b7e rockchip: implement board_lmb_reserve()
Using last bi_dram[...] to initialize "bootm_low" and "bootm_mapsize".
This makes lmb_alloc_base() always alloc from tail of sdram.
If we don't assign it, bi_dram[0] is used by default and it may cause
lmb_alloc_base() fail when bi_dram[0] range is small.

Change-Id: I13c2c2d6135e26e647dcfde4c173d896c800fea5
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-13 14:07:56 +08:00
Kever Yang c7b9ee6b6f rockchip: rk3399: add tpl support in Kconfig
Rockchp platform suppose to use TPL(run in SRAM) as dram init and
SPL(run in DDR SDRAM) as pre-loader, so that the SPL would not be
limited by SRAM size.

Change-Id: Ib4115dbf6679fd4649e694d069a6489346112a97
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-12 16:48:38 +08:00
Kever Yang cd2964574b rockchip: rk3229: add spl-boot-order in chosen
Add spl-boot-order to boot from both EMMC and SD.

Change-Id: I7975a6faa79ad5a536faccac33ed6b342f99dc3f
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-12 16:48:06 +08:00
YouMin Chen cfadd6bbce driver: ram: rockchip: fix rockchip_setup_ddr_param
rockchip_setup_ddr_param use to write ddr param to
a known place for trustos.

Change-Id: Ied4636d5e709ed036a45434202d99e916a5f1dcb
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2018-11-07 15:56:16 +08:00
Joseph Chen ff6f33d024 rockchip: rk3308: rename rk3308-evb-u-boot.dtsi to rk3308-u-boot.dtsi
follow other platforms name style, like: rkxx-u-boot.dtsi

Change-Id: Ic05c37bf49daad1c531c07f7d82abde4a485e432
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-07 11:00:13 +08:00
William Wu 50aff7d28a rockchip: dts: rk1808: enable usb
Change-Id: Ie0d4862c1ea835357c1e2adecab2d813c6240a66
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-11-02 09:46:58 +08:00
Kever Yang 460677440c rockchip: rk322x: update mmc base in boot info
Correct sdmmc and emmc base addr for rk322x.

Change-Id: I1a05fa5a477924c2ae829e7094f81766db41e95c
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-11-01 17:20:31 +08:00