047695a029
This reverts commit 51397d7d95.
There are some unresolved random crashes on WRT1900AC v1 that still need
to be sorted out
Signed-off-by: Felix Fietkau <nbd@nbd.name>
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From: Marcin Wojtas <mw@semihalf.com>
|
|
Date: Mon, 14 Mar 2016 09:38:57 +0100
|
|
Subject: [PATCH] ARM: dts: armada-38x: add buffer manager nodes
|
|
|
|
Armada 38x network controller supports hardware buffer management (BM).
|
|
Since it is now enabled in mvneta driver, appropriate nodes can be added
|
|
to armada-38x.dtsi - for the actual common BM unit (bm@c8000) and its
|
|
internal SRAM (bm-bppi), which is used for indirect access to buffer
|
|
pointer ring residing in DRAM.
|
|
|
|
Pools - ports mapping, bm-bppi entry in 'soc' node's ranges and optional
|
|
parameters are supposed to be set in board files.
|
|
|
|
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/arch/arm/boot/dts/armada-38x.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-38x.dtsi
|
|
@@ -540,6 +540,14 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ bm: bm@c8000 {
|
|
+ compatible = "marvell,armada-380-neta-bm";
|
|
+ reg = <0xc8000 0xac>;
|
|
+ clocks = <&gateclk 13>;
|
|
+ internal-mem = <&bm_bppi>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
sata@e0000 {
|
|
compatible = "marvell,armada-380-ahci";
|
|
reg = <0xe0000 0x2000>;
|
|
@@ -618,6 +626,17 @@
|
|
#size-cells = <1>;
|
|
ranges = <0 MBUS_ID(0x09, 0x15) 0 0x800>;
|
|
};
|
|
+
|
|
+ bm_bppi: bm-bppi {
|
|
+ compatible = "mmio-sram";
|
|
+ reg = <MBUS_ID(0x0c, 0x04) 0 0x100000>;
|
|
+ ranges = <0 MBUS_ID(0x0c, 0x04) 0 0x100000>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ clocks = <&gateclk 13>;
|
|
+ no-memory-wc;
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
|
|
clocks {
|