diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-09-29 14:30:51 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-29 14:30:51 -0700 |
commit | accc3b4a572bba903a801a393532272727f83f5b (patch) | |
tree | b6677755ec43793d5719246f51e27f0e9d12b6c0 /arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | |
parent | 510bbf82f8dc36804114873d30ed1d0c8533af81 (diff) | |
parent | 511cce163b75bc3933fa3de769a82bb7e8663f2b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index b1ac3a89f259..aa3e21bd6c8f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -62,7 +62,6 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; - enable-active-low; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; regulator-name = "vcc5v0_host"; |