diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:30 -0400 |
| commit | 325b83e04072e22c19d6395f69264bf6bf800146 (patch) | |
| tree | 84097b656cae3180a483f8843a2d8070bc959970 /arch/arm/dts/rk3399-puma.dtsi | |
| parent | 62005e20832135bda2d7539a29f7d2e9026f590a (diff) | |
| parent | 187ab38e766393cda7bf3bf4926c1e55f48ad0cb (diff) | |
Merge tag 'u-boot-rockchip-20200607' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- revive rk3399 puma board to adapt mainline dts;
- Fix rk3399-evb stdout path;
- Enable PCIe for rk3399: Rockpro64, firefly, pinebookpro;
- Add rk3328 Rock-pi-e board;
- Enable SPI boot for rockpro64 and roc-pc-rk3399;
Diffstat (limited to 'arch/arm/dts/rk3399-puma.dtsi')
| -rw-r--r-- | arch/arm/dts/rk3399-puma.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 07694b196f..72c06abd27 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -101,7 +101,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; - gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; + gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; enable-active-low; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; @@ -157,7 +157,7 @@ phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; - snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>; + snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>; snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; tx_delay = <0x10>; |