diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-20 09:39:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-20 09:39:11 +0200 |
| commit | 6f2c6599ba70da7ca9603f8026c4e3cdc273ee02 (patch) | |
| tree | 88228298182133d9522be62c8cb3eecfcb595d49 /arch/arm/boot/dts/bcm958525er.dts | |
| parent | ea1be1e59b19017e61aa357d524b743ba5602d3c (diff) | |
| parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 (diff) | |
| download | linux-stable-6f2c6599ba70da7ca9603f8026c4e3cdc273ee02.tar.gz linux-stable-6f2c6599ba70da7ca9603f8026c4e3cdc273ee02.tar.bz2 linux-stable-6f2c6599ba70da7ca9603f8026c4e3cdc273ee02.zip | |
Merge 5.8-rc6 into tty-next
We need the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/bcm958525er.dts')
| -rw-r--r-- | arch/arm/boot/dts/bcm958525er.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts index c339771bb22e..e58ed7e95346 100644 --- a/arch/arm/boot/dts/bcm958525er.dts +++ b/arch/arm/boot/dts/bcm958525er.dts @@ -58,6 +58,10 @@ /* USB 3 support needed to be complete */ +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; |