diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 10:19:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 10:19:09 -0500 |
| commit | 8bf3c2442b59aedd1e58b7013fc12180cab0b541 (patch) | |
| tree | 40aa7037d11543969c05a5fbd187b1ca4a3af050 /arch | |
| parent | 7ff485c68b7e5573e5a4a877066e98398283a24f (diff) | |
| parent | eff43904b7f0c05ed316755e83b5474792059a5c (diff) | |
| download | u-boot-8bf3c2442b59aedd1e58b7013fc12180cab0b541.zip u-boot-8bf3c2442b59aedd1e58b7013fc12180cab0b541.tar.gz u-boot-8bf3c2442b59aedd1e58b7013fc12180cab0b541.tar.bz2 | |
Merge tag 'for-master-20181210' of git://git.denx.de/u-boot-rockchip
Improvements:
- init DRAM for RK322x in SPL
- add FAN53555 PMIC/regulator driver
- update MicroCrystal RV3029 driver to Kconfig and sync from Linux
- add bootcount uclass and first DM-driver for bootcount
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/rk3399-puma.dtsi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 11ffcb7..ba9bb4c 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -218,7 +218,8 @@ i2c-scl-falling-time-ns = <4>; clock-frequency = <400000>; - vdd_gpu: fan535555@60 { + vdd_gpu: vdd_gpu { + status = "okay"; compatible = "fcs,fan53555"; reg = <0x60>; vsel-gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_HIGH>; @@ -420,7 +421,8 @@ status = "okay"; clock-frequency = <400000>; - vdd_cpu_b: fan53555@60 { + vdd_cpu_b: vdd_cpu_b { + status = "okay"; compatible = "fcs,fan53555"; reg = <0x60>; vsel-gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; |