Commit Graph

50624 Commits

Author SHA1 Message Date
Algea Cao f097e41095 drm/rockchip: inno-hdmi: Support inno-hdmi
Change-Id: Ib1b98c83de53053858c2cef2d3175cc55f12bdad
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-07-06 19:40:40 +08:00
Algea Cao 00997ff116 edid: Move functions of sorting modes to edid.c
Not only does dw-hdmi use these functions, but others
need to use them, such as inno-hdmi.

Change-Id: I1ced6e30b7634511fecbbfb39c24ede78894dd1d
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-07-06 19:40:40 +08:00
Algea Cao d34efd258b edid: Complete hdmi infoframe
Complete hdmi infoframe interfaces.

Change-Id: I4a5408c83d08fb13dc1123a87d9037d4d9dc96da
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2020-07-06 19:40:40 +08:00
Joseph Chen 8d26d4b38a rockchip: fit: panic if write rollback index failed
Call panic() here since there is not a return value
accepted in the top caller.

Reading rollback index failed is already not allowed.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic5235f01dc7e9791d8ebe546724078dbab91f993
2020-07-06 19:17:42 +08:00
Joseph Chen 7f6bf349e1 common: image-fit: print bad hash value
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I948ff79b68be626797bcc41e8c1cb4dd1bc330bf
2020-07-06 18:40:50 +08:00
Joseph Chen 0d2e36b834 rockchip: fit: return whole fit totalsize
Only for debug.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I48f6577abbb22d15c7b4fc0ea6bc6409c39d9b63
2020-07-06 16:10:46 +08:00
Joseph Chen 4fe117be42 common: image-fit: add API to get "/totalsize"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icca5200040ab14ad76515888cdaa4cd16f554af0
2020-07-06 16:10:46 +08:00
Joseph Chen 28e3182f59 configs: rv1126: enable tftpput command
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ieee8602fdfccbb12a4ba7f8e052c50feb82f2614
2020-07-06 16:10:46 +08:00
Yifeng Zhao 1da937e728 rockchip: support vendor storage with mtd devices
support vendor storage with mtd devices, the mtd partition
name is "vnvm".

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I6a895140df8ba12ef093acf9805f44bb436f7b29
2020-07-03 10:27:22 +08:00
Joseph Chen 0d7448d032 make.sh: fit: apply make_fit_boot.sh to make boot.img
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I406d519725c750386784576416b662b448859f67
2020-07-03 08:58:06 +08:00
Joseph Chen 146289715c rockchip: make fit: add scritp to make boot.its
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8432dabdaee9a1d5be182d504478516e7163a458
2020-07-03 08:58:06 +08:00
Joseph Chen eaeb6d442d rockchip: rv1126: make fit: add copyright
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib1d2b650a5386f01c34030a86e6d33a133650572
2020-07-02 17:05:11 +08:00
Joseph Chen 1a2ec6b5b5 make.sh: support assign compression
Use new args mechanism to call fit generator script.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ifc74852d5de1b76ea103981e7a71c3cb5e12a961
2020-07-01 14:29:56 +08:00
Joseph Chen 3882551536 rockchip: rv1126: make fit: support compression assignment
- Call make_fit_args.sh script to process all args.
- Clean up code.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icfa04c4fc2ab4f64dfd389f71309776d924e9ebd
2020-07-01 14:29:55 +08:00
Joseph Chen c012427467 rockchip: fit: add args process script
It's common for all rockchip platform to make its file.

Process args for all rockchip fit generator script, and
providing variables for it's caller.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If9d741d16e397234d265f4ae32739514bfd7a5d1
2020-07-01 14:29:55 +08:00
Joseph Chen 0600347b91 tools: rockchip: trust_merger: allow unknown option
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I88eb3946c7a343a0af5ed662d6fb5ef848d8c929
2020-07-01 10:39:13 +08:00
Joseph Chen 2833da14a1 pmic: rk8xx: fix compile error if CONFIG_IRQ is disabled
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I23a0da11618822be08f233cd0c75f550e8d8ca3a
2020-07-01 10:37:08 +08:00
Jason Zhu a79c31be17 rockchip: dts: rv1126: enlarge spi_nor's spi-max-frequency
The high speed spi nor's max frequency is about 133MHz and the
IO interface rate is about 100MHz, so enlarge spi-max-frequency
to 100MHz.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9ef7e459dece5e70eefd72024264a94a672636d1
2020-07-01 10:21:26 +08:00
Joseph Chen cf13b78438 rockchip: spl: add rollback index check with otp
Add rollback index check with otp, support OTP V2 only.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I640a44e55f00ac55215fa8aa3a3b63e0d75f6422
2020-06-30 13:05:49 +08:00
Joseph Chen c29dd8c434 rockchip: board: add rollback index check with trusty
None-zero gd->rollback_index value should be written into
trusty.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib964c5883e5083a3f9828415ee05819960d20139
2020-06-30 13:05:49 +08:00
Joseph Chen 6192a90a8a rockchip: weak: implement fit_rollback_index_verify()
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8156718ccd0e0b3d6ed470f45ff3d5f5c03715ef
2020-06-30 13:05:40 +08:00
Joseph Chen 8438d871e2 rockchip: add weak.c for SPL and U-Boot proper
Implement __weak functions in this file.
Move fit_board_verify_required_sigs() to here.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4d748f7bfe4cbc9a8f2f96f30978d3e64b73b9aa
2020-06-30 12:38:36 +08:00
Joseph Chen 9db5ffeb00 common: image: add weak fit_read_otp_rollback_index()
Board should implement it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I95023ce489c4335fdd9034d9577ce242eac0f1ea
2020-06-30 12:30:23 +08:00
Joseph Chen e5ca21e884 common: fit: add more info for otp index
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9360d3d4bc16c1c1f5e4a2310e79858d38413eb8
2020-06-30 12:24:31 +08:00
Joseph Chen ed5a55bae6 rockchip: spl: place spl_board_prepare_for_jump() at the bottom
Being convenient for other functions to be called.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibfa3f30a50befa8773cc8729a5359f7a36e8180d
2020-06-30 12:24:31 +08:00
Joseph Chen d08e47d1cf rockchip: dts: rk3288: add volume up key
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If1663a85ee0d594bf9a34506e40cb55ed7a4c30c
2020-06-30 11:33:11 +08:00
Joseph Chen c06873ff93 rockchip: dts: rk3368: add volume up key
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iab8f867ed652d83c2dc07a1f6aacb755d533c4a6
2020-06-30 11:33:11 +08:00
Jason Zhu 313607e76a rockchip: rv1126: release and run mcu address depended on entry_point
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I040c92ed3e34ade2585966556d1ad3934c8b9cb0
2020-06-29 17:19:42 +08:00
Jason Zhu 9a65720b98 spl: fit: release and run mcu address depended on entry_point
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ibbd28c604c6f6bf558f74c4b5a8064d894492015
2020-06-29 17:19:42 +08:00
Yifeng Zhao 5b69ab5af5 tools: rockchip: fix compilation warnings
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ib27aa885eef05c6f88fcbf41dd4d0a5a0f965a52
2020-06-29 15:27:00 +08:00
Joseph Chen 35176ccb87 Revert "spl: fit: check image length"
This reverts commit 359ed52cc2.

This early return causes variable "image_info" not initialized.
spl_load_fit_image() should return 0 only at the end.

Change-Id: I7dba24826758763e6e4da56579546cb50b9cb984
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-06-29 10:14:11 +08:00
Jon Lin 78cac1dffd mtd: nand: Remove bbt option property if scan fail
Change-Id: Ifb5b500b6ffee551aea5b6aecea629b3d0ea6207
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-06-29 09:18:21 +08:00
Wyon Bi f0f5bdc29d video/drm: inno_video_phy: Increase the timeout delay of PLL lock status to 100ms
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I60422087623c6c9f3a0219cb1a3e1c59ec523e73
2020-06-29 09:17:52 +08:00
Joseph Chen 89d0489d59 make.sh: support image size pack of ARMv7 platform
Without this patch, only ARMv8 and AArch32 support assign
image size.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I7d15d366251328ac2283172ef6f3a173298d451b
2020-06-28 10:57:38 +08:00
Hisping Lin df538e29bd lib: optee_client v2: support RKFS version 2
1.use get_rkss_version function to get rkss version,
  if security partition have data with rkss version 1, then
  we choice rkss version 1, if security partition is empty,
  then we choice rkss version 2
2.rkss version 2 support dual backup mechanism,
  security partition total use 1M
3.rkss version 2 R&W 256k data one time

Change-Id: I2f17b22d6a442df84be0d94a808b03465dc6fefe
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2020-06-24 11:45:46 +08:00
Hisping Lin d079c1a5ed lib: optee_client v1: support RKFS version 2
1.use get_rkss_version function to get rkss version,
  if security partition have data with rkss version 1, then
  we choice rkss version 1, if security partition is empty,
  then we choice rkss version 2
2.rkss version 2 support dual backup mechanism,
  security partition total use 1M
3.rkss version 2 R&W 256k data one time

Change-Id: I4103b6600666dffccf473ec4ed8854776a46da31
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2020-06-24 11:45:46 +08:00
Joseph Chen 986192a2bc common: image-fit: remove fit_get_image_defconf_node()
It's not a standard and nice interface, remove it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib918c4759fa5e01393c36eccd5673b8ca754ef35
2020-06-24 11:21:14 +08:00
Joseph Chen 189c0d68bd rockchip: board: place board_quiesce_devices() at the bottom
Being convenient for other functions to be called.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1a02a150cf66ccf3dfc4be3621ad62829c3e6eb5
2020-06-24 11:21:14 +08:00
Joseph Chen 89d8b5fba1 include: global_data: add rollback index
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6f8a558246e8003c7124609b604c0331cec1204a
2020-06-24 11:21:14 +08:00
Joseph Chen c8b8e10892 common: image-sig: make fit_rollback_index_verify() __weak function.
Allow board to implement it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id5f87214510ccfea58621086c7c49c92ec36c06a
2020-06-24 11:21:14 +08:00
Tang Yun ping 970fa5d876 drivers: ram: rv1126: optimizing dram type select code
Use CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE to select dram type.
Use the same define with arch/arm/include/asm/arch-rockchip/sdram.h (0 for
DDR4, 2 for DDR2, 3 for DDR3, 5 for LPDDR2, 6 for LPDDR3, 7 for LPDDR4).

Change-Id: I982db49c1881f6975afd4ba48f88ee3dd9286d3e
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2020-06-24 10:11:36 +08:00
Wu Liangqing f5b9cd907b configs: rk3368: enable POWER_FG_RK817
Change-Id: Ie57836c14e632a3338e38fa3943a6832e23cb131
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-06-24 08:59:04 +08:00
Wu Liangqing 58cb0c2b99 configs: rk3399: enable POWER_FG_RK817
Change-Id: If217a6f8cda64fb35aad3842594f66bb4483b11f
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-06-24 08:31:33 +08:00
Joseph Chen ed71c65549 pmic: rk8xx: add "addr" filed for battery bind
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I073dcd49f89a75d1d320f3e80307b137814d0e2f
2020-06-23 19:30:23 +08:00
Joseph Chen 50454a094f dm: pmic: add "addr" field for binding children
If some child info->prefix are the same, try to
distinguish them by parent addr.

Example:
	pmic@20, pmic@1a...

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I504cd887e232bb309d8e1790f6d55910172d08b5
2020-06-23 19:30:21 +08:00
Tang Yun ping d3f5f12c3c rockchip: rv1126: tpl support thunder boot
If CONFIG_ROCKCHIP_THUNDER_BOOT=y, it will enable ddr fast boot.

Change-Id: Ia43039dd1247ebb937aaa8b6d9a9103df2dfe1f5
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2020-06-23 16:41:26 +08:00
Tang Yun ping 0b4032fdb0 rockchip: rv1126: delete some unused code for tpl
Change-Id: Iae5a157dacf8c189633ca73028b35b375688860d
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2020-06-23 16:41:26 +08:00
Liang Chen a96802b209 rockchip: px30: switch VCCIO6 voltage controlled by io_vsel6
According to the description of GRF_IO_VSEL, the voltage of
VCCIO6(which is the concern of emmc/flash/sfc controller) will
indicate by GPIO0_B6 or io_vsel6. The SOC defaults use GPIO0_B6
to indicate power supply voltage for VCCIO6 by hardware, then
we can switch to io_vsel6 after system power on, and release
GPIO0_B6 for other usage.

Change-Id: I9c8339e357a7328d9ffeb711ba5d0bdd41971101
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-06-23 10:53:51 +08:00
Joseph Chen cd1c982e9a test: rockchip: power: call do_test_charge()
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4784b5f21ff4f39b0112d5cc5626c26b853a0246
2020-06-23 10:38:21 +08:00
Joseph Chen 00dada44a9 make.sh: update tpl pack command
All available:
	./make.sh tpl-spl    --- pack tpl+spl
	./make.sh tpl        --- pack tpl
	./make.sh spl-s      --- pack spl
	./make.sh spl        --- pack spl

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iea58976bb7fc87775b8c3c1bd2c1fd151c6be51c
2020-06-23 10:24:26 +08:00