diff options
author | Tom Rini <trini@konsulko.com> | 2020-05-04 07:28:14 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-04 07:28:14 -0400 |
commit | 04da42770b0cc3bea8841972bfc9568299ece826 (patch) | |
tree | 11866d151096ebcd8af810a1191886d9619e2779 /arch/arm/dts/rk3328-u-boot.dtsi | |
parent | 1d5d0275d7684005643952b4591eb5899f55beaf (diff) | |
parent | d597e613745155d2c48ed90617b3fce81af92fbd (diff) |
Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- dts clean up to use -u-boot for px30, rk3399 boards
- dts sycn from upstream kernel for rk3328, rk3399
- add rockchip rng driver
- new board support: rk3328-roc-cc, rk3399-roc-pc,Nanopi M4 2GB
Diffstat (limited to 'arch/arm/dts/rk3328-u-boot.dtsi')
-rw-r--r-- | arch/arm/dts/rk3328-u-boot.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index 6d5b3ec06e..c69e13e11e 100644 --- a/arch/arm/dts/rk3328-u-boot.dtsi +++ b/arch/arm/dts/rk3328-u-boot.dtsi @@ -62,3 +62,7 @@ /* mmc to sram can't do dma, prevent aborts transfering TF-A parts */ u-boot,spl-fifo-mode; }; + +&usb20_otg { + hnp-srp-disable; +}; |