Commit Graph

13203 Commits

Author SHA1 Message Date
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