Commit Graph

13747 Commits

Author SHA1 Message Date
Joseph Chen d77dbb6e1c rockchip: rk3568: remove TPL code
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4b7d7f830d7cc9a5d6623f2add9a4755ce833f2c
2020-12-18 18:03:01 +08:00
Ibai Erkiaga 559b4bfa7c UPSTREAM: arm: arm64 32bit address relocation
Current relocation code is limited to 21bit PC-relative addressing
which might not be enough for bigger code sizes. The following patch
increases the addressing to 32bit PC-relative. This feature is
specially interesting if U-Boot is build without optimiation (-O0) as
the text section is increased significativelly.

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib54540ff040642588b4bfe2d030e5d9eabf8348c
2020-12-18 15:13:24 +08:00
Joseph Chen d107cc5697 rockchip: make_fit_atf: correct sign-images for standalone
Fixes:
(ab011df20d rockchip: make_fit_atf: support pack mcu.bin)

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I80d3f7e5dd4f6e713053fa8cbd5c018dc5218748
2020-12-17 18:33:39 +08:00
Joseph Chen ed474e7a97 rockchip: make_fit_atf/optee: add platform name
It's better to add platform name for the uboot.img.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I050981356d68ac1816ebd2cdc8c0cc69bfd841bd
2020-12-17 17:35:35 +08:00
Joseph Chen ab011df20d rockchip: make_fit_atf: support pack mcu.bin
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I80e158050e1af1cd1c3c44669fab87402397cc09
2020-12-17 15:18:20 +08:00
Jason Zhu ab1a0b8da2 rockchip: dts: rk3568: add secure_otp node
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I67af428fbd0ae016b25a6aafc8c28d36e055d765
2020-12-15 16:19:19 +08:00
Jason Zhu b341628592 rockchip: dts: px30: correct the secure_otp's compatible
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I77080f8cb05571b9ac6501a3226a680de0d3c35c
2020-12-11 15:19:47 +08:00
Wu Liangqing 26cf79001d rockchip: rk3568: rkvdec set clk 400MHZ
Change-Id: I3b154200fd81dab82a3c4956adf99437a51f88f9
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-11 15:16:03 +08:00
Wenping Zhang efeef7e54d rockchip: board: add logo display for eink screen.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: If2115b257b6928c4a24afad09c04943bdd72893e
2020-12-10 17:51:14 +08:00
Joseph Chen d4b31d1047 Revert "rockchip: make_fit_optee/atf: add "burn-key-hash = <0>"."
This reverts commit 34b05be1cb.

This property is added in u-boot-spl.dtb file.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4d102c1acab2d659e4dc8ce493cfd768639ef5bb
2020-12-10 15:40:26 +08:00
Elaine Zhang bf8034353d rockchip: rk3568: fixup cru node frequency
Support 25M\50M Gmac clk.

Fixes: d83e3037ee ("rockchip: rk3568: fixup cru node for legacy
variant chip")
Change-Id: I89a535655dd01e779898188943d8f1e491c5753e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-12-10 15:26:42 +08:00
Elaine Zhang 0a04fb5062 clk: rockchip: rk3568: support rkvdec clk setting
Change-Id: Ic63b3c8ecbefcdf551d646ebb40521e6b521610b
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-12-10 15:26:42 +08:00
Jason Zhu ae17d6d435 rockchip: dts: px30: add secure_otp node
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I65956e2386f1bb8c9f9594547f0135837a132b7f
2020-12-09 14:57:25 +08:00
Joseph Chen d83e3037ee rockchip: rk3568: fixup cru node for legacy variant chip
Implement weak function: rk_board_fdt_fixup().

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id8ef49959220b145bb9219e456a3ae00cbb6bb13
2020-12-08 14:48:06 +08:00
Jason Zhu a230447799 rockchip: dts: rk3568: support bring-up from sdmmc0
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I4c36e2968f4a82e64f8583ce20270edffd9c50e3
2020-12-07 09:24:24 +08:00
Jason Zhu d6af9bf824 rockchip: rk3568: set sdmmc0 to secure
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I8fbbc79e6e72dac688f0b46b2f961e97e80b7383
2020-12-07 09:24:24 +08:00
zhangqing f6d2779458 clk: rockchip: rk3568: support more clk setting
support cpll_xxx settings.

Change-Id: I2735f6abe0fb02828b7ace76b58a60757199cab8
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2020-12-07 09:22:55 +08:00
David Wu 2e32f6669c rockchip: board: Support more mac address
The RK3568 has two gmac, but only support one mac address right now,
define the more ethernet mac address at vendor storage to support it.
We also write random address back to vendor storage, so that we can
not generate random address every time.

Change-Id: I2aba82c4af70d9dfdfdbc5d7e776d8100ae2fda9
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-12-03 16:47:01 +08:00
Jon Lin 32b04d78e7 rockchip: rk3568: Modify fspi pins property
Change-Id: Icc50a2087cde8a716b306e90ba4c3793883e684c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-02 13:02:33 +08:00
Jason Zhu 91fb3e0a6b rockchip: dts: rv1126: add sdmmc pinctrl node
Add sdmmc pinctrl node so that the sdmmc io can be set when in
sd-boot process. And delete some unused pinctrl node such as
sfc and nandc.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I675262800dbfaeaf9beb9f7f1724faa6688bbf92
2020-11-30 15:10:50 +08:00
Yifeng Zhao 5d96bba97e rk3568: add nand support for spl and uboot
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I3b849db025ae15dde22636ae17ac2d19c5484dd6
2020-11-30 09:53:23 +08:00
Yifeng Zhao 568252a02c rockchip: spl-boot-order: support scan rknand device
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I49da396e3e8d10572be9b9f9dac57bd317c4cf83
2020-11-30 09:53:23 +08:00
Yifeng Zhao ffc357038c spl: support boot from rknand device
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I168ec42ec1ac4bc1e8b640fba22357cde4a26aac
2020-11-30 09:53:12 +08:00
Joseph Chen 34b05be1cb rockchip: make_fit_optee/atf: add "burn-key-hash = <0>".
It is available when verified boot is enabled, to active
this feature: ./make.sh ... --burn-key-hash

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2224bae079f12d48609989b080b287dfe4fd2cb3
2020-11-26 14:44:34 +08:00
Sugar Zhang 0838e4e69d rockchip: rv1126: Fix ram boot fail
The OTP_S access is not allowed from the non-secure world.
so, remove it for ramboot which have already done in trust.

ram boot flow:

usb boot -> trust/op-tee -> uboot -> kernel -> rootfs

normal boot flow:

spl boot -> trust/op-tee -> uboot -> kernel -> rootfs

Fixes: 1ac424cf03 ("rockchip: rv1126: Increase otp tRWH timing for stable read")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I76ef84cb79ca29837cae01120296523804a75ff8
2020-11-25 15:35:28 +08:00
Lin Jinhan 94d677da26 rockchip: dts: rk3568: add and enable crypto node
Change-Id: I1ca3dc64c23663a5b30fc369f287f391d17ca3f3
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2020-11-24 16:02:35 +08:00
Joseph Chen 757632eec4 rockchip: rk3568: enable GICV3
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I98e121cf4300631c04793c73e7af3bef1f1009d9
2020-11-23 14:21:15 +08:00
Elaine Zhang 2c36608a71 rockchip: rk3568: init core pvtpll ring length
Change-Id: I2a7957ce1c2b38dec984c6b4f36392f92c185190
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-11-21 11:29:33 +08:00
Joseph Chen 666b2d1f24 rockchip: boot-mode: clean up rockchip_get_boot_mode()
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4a11fa846a8fd74ecffe1ee0ac46ebdeaa2413a7
2020-11-20 21:17:34 +08:00
Joseph Chen ea8b124a0e rockchip: boot-mode: fix lost boot-mode from register
PH and PL is from boot mode register, reading once.
PM is from misc.img and should be updated if BCB offset is changed.
Return the boot mode according to priority: PH > PM > PL.

Fixes:
(3aaa96e8af rockchip: boot-mode: reinitialize static variable "boot_mode")

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibd577dd8ebfb0d4c36ac8b90e176d3b1103f347e
2020-11-20 21:17:34 +08:00
Joseph Chen 2d25c32e07 rockchip: dts: rk3568: Resync from kernel-4.19
Resync from kernel-4.19:
(2f153f1fa73c arm64: dts: rockchip: rk3568: add thermal-zone for pvtm)

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I36fdfc366f4d44f3226b6f8b35ee496701fe021e
2020-11-19 15:34:01 +08:00
Elaine Zhang fdd74c3220 clk: rockchip: rk3568: support ebc clk setting/getting rate
Change-Id: Iecac8e56b2b5615b54c8969767053b6282fe6fb8
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-11-19 14:48:18 +08:00
Jason Zhu d181efcb77 rockchip: rk3568: delete useless code
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Idf90798700f1128d275d0311ed50ed531acaa42c
2020-11-18 17:26:20 +08:00
Zhihuan He 379e9cabde drivers: ram: rk3308: add sdram_rk3308.c build
Change-Id: I43079e6709d6eeb691eb73786bba7920c081b9c9
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2020-11-17 20:56:28 +08:00
Wyon Bi 046cd38054 rockchip: rk3568: disable eDP phy to save power
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I4b94c5c28196f72c9d41efe7bdb9eb837eb6adf4
2020-11-17 19:51:52 +08:00
Finley Xiao b85730d9e9 clk: rockchip: rv1126: Fix mask bits for gmac src clks
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7f81a3e7586dcb85511502d3a329ac1cba7ccc8a
2020-11-17 14:46:27 +08:00
Ren Jianing 08d283a46e rockchip: dts: rk3568: disable usb2 host by default
If we enable usb2phy1 with dm-pre-reloc in uboot and disable it
in kernel, the status of usb2phy1 will be "okay" and usb2phy1
node will be put ahead of usb2phy0 which leads to vbus detect
fail.

Here is the error log:
  get syscon usbgrf failed
  rockchip_chg_get_type: get u2phy node failed: -19

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I16c1ddd42bf1a2e7a98fc9cdf1509a62714c8b6b
2020-11-17 14:45:08 +08:00
Jason Zhu 0934588e54 rockchip: rk3568: support bring-up the mcu
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib992d4ebe078d8d8752f72c8a9824e85b5f24da2
2020-11-17 10:58:45 +08:00
Jason Zhu bb82cbf82d rockchip: rv1126: hold a few time for mcu to capture the boot address
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: If30b429577e715d2851eaab1c0fa6a84f0ad8850
2020-11-17 10:20:15 +08:00
Zhihuan He 8ec8d58eeb drivers: ram: rockchip: add rk3308 sdram driver
Change-Id: I96160af2095ba21b440c6d3789349d8cbc4fea75
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2020-11-16 20:40:52 +08:00
Zhihuan He b86c816ccb drivers: ram: rockchip: rv1108: clean up the code
Change-Id: I3446805fd9c320ddd49b9cb12df82943057ed9ee
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2020-11-16 20:39:39 +08:00
Zhihuan He ad11931911 rockchip: tpl: add arch_cpu_init()
The arch_cpu_init() should be called for cpu early init
for tpl.

Change-Id: I3aad0f284089d8523710a2d24daab44995fa148d
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2020-11-16 20:39:39 +08:00
Joseph Chen aa8e825b4b rockchip: rename fit.c => fit_misc.c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8afc870973d75f5e0e3bc968eaf6966f1696ac77
2020-11-14 08:35:40 +00:00
Joseph Chen a14492767c rockchip: make_fit_atf/optee.sh: add "kernel-fdt" node
kernel FDT is for U-Boot if there is not valid one from images,
ie: resource.img, boot.img or recovery.img. It is put right
after U-Boot FDT.

This is used for U-disk bing up.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iab1ddbbf3978a6b2fc08316bb136c43c0d2eef60
2020-11-14 15:32:03 +08:00
Joseph Chen 20647277f1 rockchip: kernel-dtb: check mismatch of kernel dtb
Simply check cru node to verify if this kernel dtb
is belong to current platform.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8c0b2181a2ca3cada72a9e18788de0bfdc9ba3c5
2020-11-14 15:32:03 +08:00
Joseph Chen 7d70ffaead rockchip: make_fit_atf.sh: use "-" instead of "@"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I02b6a5f376184ea50c0db8714d225a1cd0cb39e1
2020-11-14 15:25:33 +08:00
Jason Zhu cce972667a rockchip: rk3568: set the emmc drive strength to level 2
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ic515e9aa81448ac1abcf378e9f4cd9b08247bdde
2020-11-14 11:55:39 +08:00
Elaine Zhang 9f408268dc rockchip: rk3568: support rockchip_get_cru for rk3568
Change-Id: I2029c26da80b5ed5cd18e154751688fd29862813
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-11-12 10:32:25 +08:00
Jason Zhu b48cb5c290 rockchip: dts: rk3568: set emmc bus width to 8
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ifdbe8ed76caa746070c3c5cf166573ffeb8d9645
2020-11-11 15:04:39 +08:00
Sugar Zhang 1ac424cf03 rockchip: rv1126: Increase otp tRWH timing for stable read
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I42d57e6a9eaeb30e24b755821c7672ea9ffce56d
2020-11-11 10:17:09 +08:00