Commit Graph

50426 Commits

Author SHA1 Message Date
Joseph Chen 1619e70322 rockchip: dts: rv1126: add gmac support
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I19edafc1fc9402d6f9a4123c935e8a0881071960
2020-06-02 16:05:02 +08:00
Joseph Chen 11a331d232 cmd: source: update terminal value
According to commit:
(40d08d0 tools: mkimage: support pack empty file for multi image)

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie370e9137b7441bd75582c95b3f60d76d8945629
2020-06-02 16:04:50 +08:00
Finley Xiao 24f48ac9a8 clk: rockchip: rv1126: Change pclk pdbus parent to gpll
As dmac aclk comes from hclk pdbus, dmac pclk comes frome pclk pdbus,
dmac aclk should be an integer multiple of dmac pclk and the same
parent with dmac pclk. so let hclk pdbus and pclk pdbus only come from
gpll.

Change-Id: Idd2f362fcf160352dcb4577ad8a13b4dbec7c65f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-06-02 11:01:58 +08:00
Jason Zhu 33e40bac6a mmc: dw_mmc: set DWMCI_CARDTHRCTL
Since v2.80a, dwmmc controller introduced the card write threshold for
HS200 & HS400 mode. So CardThrCtl can be supported during write operation, not
only read operation.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I7f345660107c2978d2f874d36f2dffd2acdfbcb6
2020-06-02 09:49:38 +08:00
Joseph Chen ca0130caa2 common: image-fit: correct fit_set_totalsize()
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2febc67bf0b16611cd54afad75fa79ac7454f4a5
2020-06-01 14:44:48 +08:00
Jianqun Xu 012d0ecf96 rockchip: rv1126: disable force_jtag
Change-Id: I16b1c30495e68ac58845e9f45014319384a4d5a6
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-29 11:55:36 +08:00
Joseph Chen 7c7344b17a rockchip: rv1126: use imply for CONFIG_ROCKCHIP_GPIO_V2
Fixes warning from rv1126-usbplug_defconfig:
	......
	warning: (ROCKCHIP_RV1126) selects ROCKCHIP_GPIO_V2 which has unmet direct dependencies (ROCKCHIP_GPIO)
	warning: (ROCKCHIP_RV1126) selects ROCKCHIP_GPIO_V2 which has unmet direct dependencies (ROCKCHIP_GPIO)
	......

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2c7d64e9cdd03f3e8dcbbb948d747a67d7dff4da
2020-05-29 09:25:06 +08:00
Joseph Chen d44b14ecc8 configs: rv1126: enable optee client v2
Enable otp verified-boot flag verify for U-Boot proper.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I64547de92cde34f71e14b418c4c2e64ae70fa676
2020-05-29 09:16:00 +08:00
Joseph Chen e59905bf16 irq: use CONFIG_ROCKCHIP_GPIO_V2 instead of CONFIG_IRQ2GPIO_V2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id8b232efce483501053bcbd779a444d395c061fc
2020-05-28 19:20:09 +08:00
Jianqun Xu 1c0910cb6f rockchip: rv1126: select ROCKCHIP_GPIO_V2
Change-Id: Id6c97ee21e5692b873c5711340b3e85ead06e679
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-28 19:20:09 +08:00
Jianqun Xu d1aef94b5a gpio/rockchip: rk_gpio support v2 gpio controller
The v2 gpio controller add write enable bit for some register,
such as data register, data direction register and so on.

This patch support v2 gpio controller by redefine the read and
write operation functions.

Change-Id: I2adbcca06a37c48e6f494b89833cd034ba0dae29
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-28 19:20:09 +08:00
Jianqun Xu 7d13e745d6 gpio/rockchip: rk_gpio correct pin count for each bank
Do 'gpio status -a' will cause system crash, due to the pins number
error for gpio4 (last gpio controller).

Test on RV1126 IOTEST board, which has only 8 pins for GPIO4.

Change-Id: I4150abd0ca97bc4f3043eb7fcae2287818125031
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-28 19:20:09 +08:00
Jianqun Xu 33f8d8a65e pinctrl: export pinctrl_get_pins_count as generic API
Change-Id: I0c5e4977b068a09276a1d0561058679bd1791e0a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-28 19:20:09 +08:00
Jianqun Xu 09989a56e1 pinctrl/rockchip: pinctrol support get_pins_count operation
Change-Id: I8459d9e21a7c95e62c053ea7848b189b714ddbfd
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-05-28 19:20:09 +08:00
Joseph Chen 17a682eab6 common: fit: verify otp verified-boot flag along with kernel image
Don't verify otp verified-boot flag for every image, the same as
signature verify.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I48c230db4429c9530066d0f42de1eea7609ba4b5
2020-05-28 19:13:38 +08:00
Joseph Chen 432f85160b rochchip: board: map op-tee memory as dcache enabled
For all 32-bit platforms with CONFIG_OPTEE_V2 enabled.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I991af1639a51938a880f839b2cba472495e0afc3
2020-05-28 19:13:38 +08:00
Hisping Lin 020c79da1e lib: optee_client: communicate with optee os v2 32 bits
Change-Id: Ic352f86e73631b64110b9d0d1742dc6b98e97d59
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2020-05-28 19:13:38 +08:00
Hisping Lin 4770b276c4 lib: optee_client: free section in write and truncate func
Change-Id: Ifd7b53d4c2d1e08591192aa44f04af2b1ff07e5b
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2020-05-28 19:13:38 +08:00
Joseph Chen d1ffb5dd43 rockchip: dts: rv1126: sync from kernel-4.19
from kernel-4.19:
(3bd4dd9 ARM: dts: rv1126: Add CPU idle states node.)

otp and secure-otp nodes are only defined in U-Boot.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2fcdf677bd86a477dc087d3e4986ee6cd2dfe4de
2020-05-28 19:12:02 +08:00
Joseph Chen d5cc49d9e2 core: dump: update "dm uclass" print format
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I751a9458721df165e6cfb1ce34d00dc85edf4716
2020-05-28 16:24:55 +08:00
Finley Xiao 66a980ae49 ARM: dts: rv1126: Change some clocks to PMUCRU
Change-Id: I41b1ed6774dc8f124cd4d973c186818eb1ddb746
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-27 16:11:43 +08:00
Joseph Chen 25a7c60a0b Revert "regulator: pwm: remove init voltage setting"
This reverts commit ef473e3642.

We merged this commit while we didn't notice that this driver gets
init voltage from legacy "rockchip,pwm_voltage = <...>", but regulator
uclass gets it from "regulator-init-microvolt = <...>". so we have to
revert this commit to compatible the legacy one.

Change-Id: I52606d9a9268659d3d77f7d29d1eed1d80b30b1e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-05-27 15:45:58 +08:00
Joseph Chen 7c79bd2280 common: board_r: fix mtd blk compile error
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie24f8c9c7e0b2642d021ec5ce673e17b5c815514
2020-05-27 11:42:03 +08:00
Jason Zhu ddb43797d5 spl: mtd_blk: apply mtd_blk_map_partitions()
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9ed6ff49d5e366797ae1b4d9128432d1ad0e7728
2020-05-26 22:13:28 +08:00
Jason Zhu 4e2ae7292a common: board_r: apply mtd_blk_map_partitions()
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I2e1fd21a6a41f8b86ab6f52c69631018a88445ec
2020-05-26 22:13:22 +08:00
Jason Zhu 459f5cb0d9 rockchip: board: apply mtd_blk_map_partitions()
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I8c693d047349f3f688eb3304ca99b091110ebf01
2020-05-26 22:13:17 +08:00
Jason Zhu a07b97f223 mtd: mtd_blk: map the part address if dev is mtd_blk
The blk_dread will occor error if the image is packed with multiple
firmwares, for example boot.img, when nand or spi nand have bad block.
So call mtd_blk_map_table_init to remap part address to make sure
reading correct data.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Icebc6b1c5a10758efa615424d0706b9ed6ec23ad
2020-05-26 22:13:07 +08:00
Joseph Chen 2b7be5df0e rockchip: spl: fix verified-boot flag state print
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic787533a9a4bdb985a63750dbed9c5c112f30da4
2020-05-26 19:55:24 +08:00
Jason Zhu 69808149dc spl: rkfw: call misc_decompress_stop() to clear the decompress irq
Otherwise the next stage will respond to the decompress completed interrupt.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ie56a7eb939374bd5aac326bb3cd022225bf71dd2
2020-05-26 18:17:17 +08:00
Joseph Chen 9bddc4c3dc rockchip: dts: rv1109 remove unused files
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id6ce34e554cd392f8361580feb9af31f6a7635ce
2020-05-26 15:24:35 +08:00
Joseph Chen 37bbf320ac configs: rv1109: sync from rv1126_defconfig
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I995c96f730c080ee082b092062daab8efec4945d
2020-05-26 15:19:23 +08:00
Joseph Chen f30634031c configs: rv1126: clean with make savedefconfig
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib817179165d697b9544099ac5f1409a6d91d333f
2020-05-26 15:18:25 +08:00
Jason Zhu c10175d521 configs: rv1126: support fastboot
1.support boot kernel by spl
2.support pressing key to enter uboot
3.rename the defconfig

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I56e4aa9d90a7fa3efae9e0d7dbdf73741eeb9040
2020-05-26 14:25:11 +08:00
Finley Xiao 5410c5c273 clk: rockchip: rv1126: Add clock init for isp and vop
Change-Id: I1c4a1267e90f84f6f7777a35e0ad5824b6eff2d1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-25 17:44:27 +08:00
Finley Xiao 5ecc545e4e clk: rockchip: rv1126: Add support for decom clock
Change-Id: I90eacb03ed191b804911429af5ad80daab3776cc
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-25 17:44:27 +08:00
Finley Xiao c17ccbf6fd clk: rockchip: rv1126: Add support for isp and ispp clocks
Change-Id: Icfd87f56c30bfa81b6e7fecadcda090c26a8c465
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-05-25 17:44:27 +08:00
Jon Lin c402731f2d mtd: mtd_blk: Add api to get mtd_blk mapped address
Change-Id: I197df5f03e0894584cd2ffb3b7ac1423e84e43df
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-05-25 15:20:43 +08:00
Joseph Chen eaa66b0d6a tools: fit: add "/totalsize" property for itb size
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1aa87d5c0e1dd39762c470b134c4d8a57cab4f29
2020-05-25 14:57:18 +08:00
Joseph Chen c516743f40 common: fit: add fit_set_totalsize() interface
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib10984da99aa82d5dd4bbfe2b13233e7155aee41
2020-05-25 14:57:18 +08:00
Joseph Chen b4b532de54 configs: rv1126: verify otp verified-boot flag for SPL
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I7277606c3e46ba1f10f49e9d2cbdea68ba30bc59
2020-05-25 14:57:18 +08:00
Joseph Chen c22a6b218d rockchip: return boolean for otp verified-boot flag
Print this important information.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibf59f5c13285960d3b022a9c67d6cee3a274eaf1
2020-05-25 14:57:18 +08:00
Joseph Chen 1ab43d022e rockchip: its: remove unused property
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I540d4e741d362c0f2d871d4f14700507e2653b31
2020-05-25 11:05:03 +08:00
Joseph Chen f1d6518991 rockchip: board: fix typo
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I21bf8e925b2746ca62344ffa49b9ccb7c7cdb7c7
2020-05-25 11:05:03 +08:00
Joseph Chen d6f41d79d9 configs: add rv1126-usbplug_defconfig
- enable CONFIG_SUPPORT_USBPLUG to generate mininum usbplug.bin
- only "rockusb" command is supported
- run_command_list() doesn't support powerful syntax, it falls
  back to run_command().

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
Change-Id: I67ac23aedc48359032c9b44cbf417515090cbd95
2020-05-22 16:58:04 +08:00
Joseph Chen f79adc89c3 rockchip: rv1126: support usbplug
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
Change-Id: I841df666100e78dda2bac4b7ce9a8495a5e4a171
2020-05-22 16:58:04 +08:00
Joseph Chen e90e674ffd rockchip: add usbplug support
The output usbplug.bin is used to replace the rockchip
usbplug binary in the "rkbin" repository.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0ec488bd37f3b3e96232f2ed653a0af453199105
2020-05-22 16:58:04 +08:00
Joseph Chen 4a2b8db466 common: add usbplug support
- disable some message
- add "usbplug.bin" generation
- add minimum usbplug dtb support
- add individual board_init_r() init sequence.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If48ee49247fca6108db3a1fbab3b403241b3a8eb
2020-05-22 16:58:04 +08:00
Joseph Chen 9542469246 gadget: rockusb: support usbplug download mode
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic265243834ce294e6d979bcae89774a42600e5f3
2020-05-22 16:47:41 +08:00
Joseph Chen d45e5655df dm: serial: allow skip console serial init
Always use debug uart.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id751856abd7be219e8acb4c5986469a804051934
2020-05-22 16:46:40 +08:00
Joseph Chen 50c379531a rockchip: rkimg: add configure wrap for kernel dtb code
Allow disable some configure without bringing compile error.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6fddf3368c3e63b82cfb071a2cfe70ebcad7de7b
2020-05-22 16:46:40 +08:00