b3b855191b
Kernel 5.10 receives the complete set of improvements from 5.11/5.12. While we are at it, move the patches accepted upstream to the 0xx series. Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 5b2c7e0ae762fff2b172caf16b2766cc3e1ad859 Mon Sep 17 00:00:00 2001
|
|
From: Rui Salvaterra <rsalvaterra@gmail.com>
|
|
Date: Wed, 17 Feb 2021 15:30:38 +0000
|
|
Subject: ARM: dts: turris-omnia: fix hardware buffer management
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Hardware buffer management has never worked on the Turris Omnia, as the
|
|
required MBus window hadn't been reserved. Fix thusly.
|
|
|
|
Fixes: 018b88eee1a2 ("ARM: dts: turris-omnia: enable HW buffer management")
|
|
|
|
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
|
|
Reviewed-by: Marek Behún <kabel@kernel.org>
|
|
Tested-by: Klaus Kudielka <klaus.kudielka@gmail.com>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
arch/arm/boot/dts/armada-385-turris-omnia.dts | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
|
|
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
|
|
@@ -32,7 +32,8 @@
|
|
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
|
|
MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
|
|
MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
|
|
- MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
|
|
+ MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
|
|
+ MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
|
|
|
|
internal-regs {
|
|
|