Commit Graph

51367 Commits

Author SHA1 Message Date
Jason Zhu 98637248d5 clk: rockchip: rk3568: fix print error log
The log is "Fail to set the ACLK_BUS clock"

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ie22e5139e1446ae751d1e64729c7a0b4cdbac69e
2020-12-22 12:10:45 +08:00
YouMin Chen 3c13acb0a2 rockchip: sdram_msch: update noc define for rv1126
Change-Id: Ic545cacffabc0c726d6d0de3e6d72a3e6c971849
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-21 16:47:27 +08:00
YouMin Chen 5290223f29 rockchip: sdram: add define for lpddr4x
Change-Id: Ic7cd740e3498e47ad48376784ca0855d633baf65
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-12-21 16:42:02 +08:00
Tang Yun ping de9242dcd7 drivers: ram: sdram_common: add 4rank support for rk3568
Change-Id: I179ff4ef1f07a881f76ac086c4ab330e3ff82d73
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2020-12-21 16:42:01 +08:00
Tang Yun ping 600d0322ca driver: ram: rockchip: update sdram_pctl_px30.h
1)add ecc define
2)fix some define error

Change-Id: I7a5302c320850c2dc579036841b4b0aebd12e03e
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2020-12-21 16:42:01 +08:00
Shunqing Chen b327b5399a drm/rockchip: dw-hdmi: set HDMI/DVI mode
If sink is hdmi, but not set to hdmi mode,
will cause no sound after entering Android.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I5a8cc308c8064e0c372162145b1e814765e80630
2020-12-21 11:52:22 +08:00
Joseph Chen bc5b1ed874 Revert "rockchip: rk3568: remove TPL code"
This reverts commit d77dbb6e1c.

Reason: if we remove TPL code, there will be different compile
path for SPL to initial platform, which takes some unknonw issue
in kernel. So let's bring back TPL.

Change-Id: Iee1ab45d0a622425b616b22f8fbcdb7b28f057f7
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-12-19 17:11:36 +08:00
Joseph Chen bba527036a Revert "configs: rk3568: remove TPL"
This reverts commit 9f2604d889.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Idebf1b530ae0a3a171b4045d1631e380b137c1ec
2020-12-19 17:11:13 +08:00
Joseph Chen 9f2604d889 configs: rk3568: remove TPL
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8985b55d2939be88d0e641ff7b966393556d399f
2020-12-18 18:03:01 +08:00
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
Joseph Chen e6b2bd8785 irq: irq-gpio-switch: correct usage of strstr()
Fix gpio interrupt register with wrong gpio bank.

(Fixes: 8db677370c irq: irq-gpio-switch: add gpio alias name support)

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ia60e55a134cfab19ed015796486417e0699bd087
2020-12-18 18:02:39 +08:00
Joseph Chen 3bcf0b7c0e scripts: pack_resource.sh: support android and fit image
./scripts/pack_resource.sh boot.img
./scripts/pack_resource.sh recovery.img

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I067b00ecbadaab78962605e0caa03e04ff4f3c02
2020-12-18 18:02:35 +08:00
Joseph Chen b71a17c51e scripts: pack_resource.sh: clean up
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4b994653b1959c0c70507b524da37d9cb483c21d
2020-12-18 18:02:35 +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
Shunqing Chen 3c3ec66903 fuel gauge: rk817/rk809: fix get rsoc error
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Id946d56c9aafef87bb864218155e1b2353991140
2020-12-18 14:43:48 +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 173a9307d4 make/fit.sh: show itb making process info
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6dc634060044839ebbf545cdb20fa38ee05df04b
2020-12-17 17:35:45 +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 33e46123fc make/fit.sh: arm64 support pack mcu.bin
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic9324204075ebce4fd746593887894283bde0de1
2020-12-17 15:18:20 +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 68e2a28761 lib: avb: return flash unlock status
Return flash unlock status when close CONFIG_OPTEE_CLIENT.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I7a7a03b8305c864d83d3d2c14b0f9aa104b2ef59
2020-12-16 16:34:10 +08:00
Wenping Zhang e79e208579 video/rk_eink: fix screen display stripes after WF_TYPE_RESET update.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Id406c1103a0deea3e3ab9abcb8664e1ccc098520
2020-12-16 06:53:58 +00:00
Guochun Huang c3a1ac4926 video/drm: inno_mipi_phy: Add support for rk3568
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ie6e5810ad3614e28a540b3bbfc071cf36362da79
2020-12-15 17:41:28 +08:00
Joseph Chen 094465a906 power: charge animation: disable timer while uninit timer
Otherwise the time is still working in kernel if there is no
one to update it, which always wakeups system suspend.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic2291b26730557c50fb8cbd505d05b40bb582c74
2020-12-15 17:38:48 +08:00
Zorro Liu cd44409e4e drivers: video: rk_eink: update cmdline vcom parameter
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I80ac52356380bf4194d7115036634ffae35d21ce
2020-12-15 16:19:53 +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 cf432719d2 misc: rockchip-otp: support rk3568
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I21be09b06f7ac3a0f75e47e59ec094d6e254d05d
2020-12-15 16:19:19 +08:00
Jon Lin 4bf17e940b mtd: mtd_blk: Support mtd_dwrite in spl
Change-Id: I495ca5498fae9f03f6042cb074c9c8c3f590eea5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-13 19:25:20 +08:00
Jon Lin 8ff9c29cc8 mtd: spinor: Add more mtd information
1.erasesize_shift, erasesize_mask
2.it's useful for mtd_blk.c

Change-Id: I0bd184fc86637849fbd079f9f539387465a07b8f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-13 18:00:31 +08:00
Jason Zhu d06e16f8b1 common: fit: fix calculate data error
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3bea25d1d4c2d9e846146e33dbd7a5454ceca853
2020-12-11 17:37:33 +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
Jason Zhu bd2c27cc92 rsa: read back to check the key hash after writing OTP
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9cee6e758b487e3947727dc4c68df66ef2c51f67
2020-12-10 17:53:52 +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
Wenping Zhang 255e57518a power: charge animation: add eink charging display.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Id9d84a27ae2bbc8746e99ed01a96c53e2335a2b6
2020-12-10 17:51:14 +08:00
Wenping Zhang 0466543ca9 tools: add tools for convert bmp to gray16 and saved as logo.img.
This tool support convert 16bpp/24bpp/32bpp bmp images into
4 bits grayscale image, and add header info to save as logo.img.
logo.img is flash into emmc and parsed in uboot to display
uboot/charging/lowpower/kernel logo.
[Note]the requirement of bmp files:
1. The resolution of all bmp image must be same.
2. The logo.img will be parsed in uboot, the uboot require the resolution
   of image must be same as screen resolution, otherwise will be failed.
3. The color depth of bmp image must be 16bpp/24bpp/32bpp, 8bpp is not supported.

The usage:
./tools/bmp2gray16 --uboot-logo tools/images/eink/uboot.bmp --kernel-logo tools/images/eink/kernel.bmp
--charge-logo tools/images/eink/battery_0.bmp tools/images/eink/battery_1.bmp tools/images/eink/battery_2.bmp
tools/images/eink/battery_3.bmp tools/images/eink/battery_4.bmp tools/images/eink/battery_5.bmp
tools/images/eink/battery_fail.bmp --output ./logo.img

Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Ifc39f0344693fb0b26b04d7904289847e6fa9b90
2020-12-10 17:51:14 +08:00
Wenping Zhang a6c9b6a3fb configs: rk3568: enable eink configs for rk3568.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: I671c08fd2a905d5b9c8c9a70d975b59fb96eabd1
2020-12-10 17:51:14 +08:00
Wenping Zhang 93a7515a89 video/rk_eink: add rockchip eink support.
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: I39e92ee00690ea1be274b1abd94d54284ef36898
2020-12-10 17:51:14 +08:00
Jason Zhu 78263d89a3 rsa: support write public hash in spl
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I4120d0cad1cb24b45c3b281649e1eba520a11ee2
2020-12-10 15:59:22 +08:00
Jason Zhu 5c0419f083 rockchip: rv1126: add some defination of secure otp
Include secure boot enable add rsa hash.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I70c4b030238c01ee1b569521bd5e1b03c70cbc68
2020-12-10 15:55:55 +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
Joseph Chen 8d853b0626 scripts: fit.sh: add "burn-key-hash = <1>" in u-boot-spl.dtb
The property path: /signature/key-dev/burn-key-hash.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6a9058d5f63ac4d98c863eaa9b726aa1deb1fb14
2020-12-10 15:40:26 +08:00
Joseph Chen 134814e52f scripts: fit.sh: remove unused hash node of rsa key
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9117428f812ed00f9b78971d2cabcf1e71aa0989
2020-12-10 15:40:26 +08:00
Joseph Chen f269c7e952 scripts: fit.sh: remove unused property but not initial as 0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3af669575ae53cd7cc72e307a07057a95b3b8955
2020-12-10 15:40:26 +08:00
Joseph Chen b6ea0cb4ad lib: rsa-sign: add rockchip rsa key hash
SPL requires key hash to verify and flash it to OTP/EFUSE.

- hash@c:  n, e, c
- hash@np: n, e, np

/ {
    signature {
        key-dev {
            required = "conf";
            algo = "sha256,rsa2048";
            rsa,np = <...>;
            rsa,c = <...>;
            rsa,modulus = <...>;
            rsa,exponent-BN = <...>;
            ...
            key-name-hint = "dev";
            hash@np {
                algo = "sha256";
                value = <0x0934bc4d 0xfbc31ffe 0x9224d6c2 0x1a3aa280 0x881d881e 0xe2006246 0x01b9e724 0x35c03428>;
            };
            hash@c {
                algo = "sha256";
                value = <0x08962385 0x34585e06 0x0b73a496 0x374b148d 0xa2700a75 0x4aae08ad 0xb2a324a3 0x95ee6b52>;
            };
        };
    };
    ...
};

But after processed by scripts/fit.sh, only one of "hash@c" and "hash@np" would be left.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id9454100f9fdb06b30f9a4b2a7bdd180f117cb68
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
Jon Lin a792c7e0c5 mtd: spinand: Support new devices
HYF1GQ4UDACAE, HYF4GQ4UAACBE

Change-Id: I7abcc925ccdf8be5507a8b584b58c6b03a78962c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-09 19:27:55 +08:00
Jon Lin 4cab706e7f mtd: spinand: Support new devices
FM25S01

Change-Id: I1c7eab8799b0a381b7fa32584e608c3a115d83e6
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-09 19:27:48 +08:00
Jon Lin 0659623d62 mtd: spinand: Support new devices
FS35ND02G-S3Y2, FS35ND04G-S2Y2

Change-Id: Idc74c823fc707ba4dbeac359c4f6ca0a7e3ee778
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-09 19:27:34 +08:00