diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:11 +0100 |
| commit | e6defd1992be318c16957a881dde60114597bced (patch) | |
| tree | c3a48729af7ecce699e0fe92ba55eb4f371e635e /dts/src/arm64/rockchip | |
| parent | 718300767db51d2751cc2b223e777749704991ba (diff) | |
| download | barebox-e6defd1992be318c16957a881dde60114597bced.tar.gz barebox-e6defd1992be318c16957a881dde60114597bced.tar.xz | |
dts: update to v4.20-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm64/rockchip')
| -rw-r--r-- | dts/src/arm64/rockchip/rk3399-puma-haikou.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm64/rockchip/rk3399-rock960.dtsi | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/dts/src/arm64/rockchip/rk3399-puma-haikou.dts b/dts/src/arm64/rockchip/rk3399-puma-haikou.dts index 2dceeea29b..1e6a71066c 100644 --- a/dts/src/arm64/rockchip/rk3399-puma-haikou.dts +++ b/dts/src/arm64/rockchip/rk3399-puma-haikou.dts @@ -153,7 +153,7 @@ }; &pcie0 { - ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>; + ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; num-lanes = <4>; pinctrl-names = "default"; pinctrl-0 = <&pcie_clkreqn_cpm>; diff --git a/dts/src/arm64/rockchip/rk3399-rock960.dtsi b/dts/src/arm64/rockchip/rk3399-rock960.dtsi index 6c8c4ab044..56abbb08c1 100644 --- a/dts/src/arm64/rockchip/rk3399-rock960.dtsi +++ b/dts/src/arm64/rockchip/rk3399-rock960.dtsi @@ -57,18 +57,6 @@ regulator-always-on; vin-supply = <&vcc_sys>; }; - - vdd_log: vdd-log { - compatible = "pwm-regulator"; - pwms = <&pwm2 0 25000 0>; - regulator-name = "vdd_log"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc_sys>; - }; - }; &cpu_l0 { |