diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-08 11:09:27 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-08 11:09:27 +0300 |
commit | d8c849037d9398abe6a5f5d065eafc777eb3bdaf (patch) | |
tree | 2ebe56d73c84619214ee9e131c586ad98b817e81 /arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | |
parent | 8cf9045b91382df9fb1eb420daa4d1c2697d2f44 (diff) | |
parent | 92bf22614b21a2706f4993b278017e437f7785b3 (diff) | |
download | linux-d8c849037d9398abe6a5f5d065eafc777eb3bdaf.tar.xz |
Merge 5.11-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts index 2ee07d15a6e3..1eecad724f04 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts @@ -114,6 +114,10 @@ cpu-supply = <&vdd_arm>; }; +&display_subsystem { + status = "disabled"; +}; + &gmac2io { assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; |