70 lines
2.4 KiB
Diff
70 lines
2.4 KiB
Diff
|
From daae9f66b29a04a94708b1b5a9b61e3ee14df031 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||
|
|
Date: Mon, 10 Feb 2020 18:06:52 +0100
|
||
|
|
Subject: [PATCH 1/2] dt-bindings: interconnect: sunxi: Add A64 MBUS compatible
|
||
|
|
|
||
|
|
A64 contains MBUS controller. Add a compatible for it.
|
||
|
|
|
||
|
|
Acked-by: Rob Herring <robh@kernel.org>
|
||
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
.../devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml b/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml
|
||
|
|
index 9370e64992dd..aa0738b4d534 100644
|
||
|
|
--- a/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml
|
||
|
|
+++ b/Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml
|
||
|
|
@@ -30,6 +30,7 @@ properties:
|
||
|
|
enum:
|
||
|
|
- allwinner,sun5i-a13-mbus
|
||
|
|
- allwinner,sun8i-h3-mbus
|
||
|
|
+ - allwinner,sun50i-a64-mbus
|
||
|
|
|
||
|
|
reg:
|
||
|
|
maxItems: 1
|
||
|
|
--
|
||
|
|
2.24.1
|
||
|
|
|
||
|
|
From 410bb2be7e1f1d329c238e2d6d06b6c25dcee404 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||
|
|
Date: Mon, 10 Feb 2020 18:06:54 +0100
|
||
|
|
Subject: [PATCH 2/2] arm64: dts: allwinner: a64: Add MBUS controller node
|
||
|
|
|
||
|
|
A64 contains MBUS, which is the bus used by DMA devices to access
|
||
|
|
system memory.
|
||
|
|
|
||
|
|
MBUS controller is responsible for arbitration between channels based
|
||
|
|
on set priority and can do some other things as well, like report
|
||
|
|
bandwidth used. It also maps RAM region to different address than CPU.
|
||
|
|
|
||
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 8 ++++++++
|
||
|
|
1 file changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||
|
|
index 862b47dc9dc9..251c91724de1 100644
|
||
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||
|
|
@@ -1061,6 +1061,14 @@ pwm: pwm@1c21400 {
|
||
|
|
status = "disabled";
|
||
|
|
};
|
||
|
|
|
||
|
|
+ mbus: dram-controller@1c62000 {
|
||
|
|
+ compatible = "allwinner,sun50i-a64-mbus";
|
||
|
|
+ reg = <0x01c62000 0x1000>;
|
||
|
|
+ clocks = <&ccu 112>;
|
||
|
|
+ dma-ranges = <0x00000000 0x40000000 0xc0000000>;
|
||
|
|
+ #interconnect-cells = <1>;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
csi: csi@1cb0000 {
|
||
|
|
compatible = "allwinner,sun50i-a64-csi";
|
||
|
|
reg = <0x01cb0000 0x1000>;
|
||
|
|
--
|
||
|
|
2.24.1
|
||
|
|
|