Skip to content

Commit

Permalink
Apply EMAC DMA support and PMU fix to edge kernel
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryzer58 committed Dec 7, 2024
1 parent 357ee4e commit 98e18bd
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ryzer58 <[email protected]>
Date: Sat, 30 Nov 2024 22:29:50 +0000
Subject: Enable DMA support for the Allwinner A10 EMAC, which already exist in the sun4i-emac driver
Signed-off-by: Ryzer58 <[email protected]>
---
arch/arm/boot/dts/allwinner/sun4i-a10.dtsi | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
index cabf619c2e21..08a8433b595e 100644
--- a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
@@ -313,10 +313,12 @@ emac: ethernet@1c0b000 {
compatible = "allwinner,sun4i-a10-emac";
reg = <0x01c0b000 0x1000>;
interrupts = <55>;
clocks = <&ccu CLK_AHB_EMAC>;
allwinner,sram = <&emac_sram 1>;
+ dmas = <&dma SUN4I_DMA_DEDICATED 7>;
+ dma-names = "rx";
pinctrl-names = "default";
pinctrl-0 = <&emac_pins>;
status = "disabled";
};

--
Created with Armbian build tools https://github.com/armbian/build

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ryzer58 <[email protected]>
Date: Sat, 30 Nov 2024 20:40:29 +0000
Subject: Correct perf interrupt source number as referenced in the Allwinner A10 User manual
to resolve conflict with UART2.

Signed-off-by: Ryzer58 <[email protected]>
---
arch/arm/boot/dts/allwinner/sun4i-a10.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
index 51a6464aab9a..cabf619c2e21 100644
--- a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
@@ -183,11 +183,11 @@ de: display-engine {
status = "disabled";
};

pmu {
compatible = "arm,cortex-a8-pmu";
- interrupts = <3>;
+ interrupts = <66>;
};

reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
--
Created with Armbian build tools https://github.com/armbian/build

2 changes: 2 additions & 0 deletions patch/kernel/archive/sunxi-6.11/series.conf
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@
patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch
patches.armbian/Compile-the-pwm-overlay.patch
patches.armbian/cb1-overlay.patch
patches.armbian/arm-dts-sun4i-a10-pmu-irq-fix.patch
patches.armbian/arm-dts-sun4i-a10-emac-dma-enable.patch
patches.armbian/arm-dts-sunxi-h3-h5.dtsi-add-i2s0-i2s1-pins.patch
patches.armbian/arm-dts-sun5i-a13-olinuxino-micro-add-panel-lcd-olinuxino-4.3.patch
patches.armbian/arm-dts-sun5i-a13-olinuxino-Add-panel-lcd-olinuxino-4.3-needed-.patch
Expand Down

0 comments on commit 98e18bd

Please sign in to comment.