diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-02 08:18:19 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-02 08:18:19 -0400 |
commit | ca4491f2d2af93d8b77c48c5d272d88094fc06eb (patch) | |
tree | b9b490d970c909e9b7cffcc857eca3b6ffbed3da /arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi | |
parent | 8c2d42d526574a6d972d7711660b652d2aeba7e1 (diff) | |
parent | 665ebcadd69b8d3ebce946709e23f0df0bee7b56 (diff) |
Merge tag 'rockchip-for-v2019.07-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- fix for atf bl31_image_info pointer
- fix for rockpro64 vdd_log init
- fix for tinker-rk3288 SPL size too big
Diffstat (limited to 'arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi')
-rw-r--r-- | arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi index 22ba3490f2..eccc069368 100644 --- a/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi +++ b/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright 2015 Google, Inc */ +#include "rk3288-u-boot.dtsi" + &dmc { rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d 0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6 |