From 1177443bafdbabcdd2556f3e176a1214cb0eea47 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 21 Mar 2025 17:29:48 +0300 Subject: [PATCH] sunxi-6.12: re-export armbian patches to v6.12.19 --- .../Add-BananaPi-BPI-M4-Zero-overlays.patch | 6 +-- .../Add-BananaPi-BPI-M4-Zero-pinctrl.patch | 12 ++--- .../Sound-for-H616-H618-Allwinner-SOCs.patch | 8 ++-- .../add-dtb-overlay-for-zero2w.patch | 6 +-- ...i-info-sunxi-addr-and-sunxi-dump-reg.patch | 6 +-- ...us-orangepi-zero-fix-usb_otg-dr_mode.patch | 6 +-- ...un50i-h618-bananapi-m4-berry-support.patch | 44 ++++++----------- ...s-allwinner-sun50i-h616-Add-GPU-node.patch | 38 --------------- ...s-allwinner-sun50i-h616-Add-VPU-node.patch | 12 ++--- ...overlays-i2c-234-ph-pg-uart-25-ph-pg.patch | 6 +-- ...add-hdmi-support-for-zero2-and-zero3.patch | 20 ++++---- ...i-h616-x96-mate-T95-eth-sd-card-hack.patch | 14 +++--- ...18-orangepi-zero2w-Add-missing-nodes.patch | 8 ++-- ...50i-h616-Add-i2c-2-3-4-uart-2-5-pins.patch | 10 ++-- ...name-gadget-serial-console-manufactu.patch | 8 ++-- ...nable-TV-Output-on-OrangePi-Zero-LTE.patch | 48 +++++++++---------- .../kernel/archive/sunxi-6.12/series.armbian | 1 - patch/kernel/archive/sunxi-6.12/series.conf | 3 +- 18 files changed, 100 insertions(+), 156 deletions(-) delete mode 100644 patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch index eb209c5d7e..700151dda7 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch @@ -1,4 +1,4 @@ -From 5591d18fda3fdc9ffbd20ed6e42374a27696758f Mon Sep 17 00:00:00 2001 +From 46621b4dec5eebae1b49acfd781f64232478dc8a Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Tue, 7 Jan 2025 06:39:30 -0500 Subject: Add BananaPi BPI-M4-Zero overlays @@ -35,10 +35,10 @@ Signed-off-by: Patrick Yavitz create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile -index 6f83b69f8525..f465c4e17673 100644 +index ccb89b5bf495..3e87d21c9d14 100644 --- a/arch/arm64/boot/dts/allwinner/overlay/Makefile +++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile -@@ -48,6 +48,19 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ +@@ -49,6 +49,19 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun50i-h6-uart2.dtbo \ sun50i-h6-uart3.dtbo \ sun50i-h6-w1-gpio.dtbo \ diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-pinctrl.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-pinctrl.patch index 2356b6efd6..f89bce9265 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-pinctrl.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-pinctrl.patch @@ -1,4 +1,4 @@ -From 8bfdf1f41fd547404d40f19e198adcb4c89fe0ce Mon Sep 17 00:00:00 2001 +From ce371b30ca01eefda0dd27448ab95dad409df794 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 12 Dec 2024 06:49:59 -0500 Subject: Add BananaPi BPI-M4-Zero pinctrl @@ -9,10 +9,10 @@ Signed-off-by: Patrick Yavitz 1 file changed, 36 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index 94be1b00d80a..e3659fb52dea 100644 +index a2e688d8cd11..8124eeff75c7 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -370,6 +370,12 @@ i2c0_pins: i2c0-pins { +@@ -371,6 +371,12 @@ i2c0_pins: i2c0-pins { function = "i2c0"; }; @@ -25,7 +25,7 @@ index 94be1b00d80a..e3659fb52dea 100644 /omit-if-no-ref/ i2c2_ph_pins: i2c2-ph-pins { pins = "PH2", "PH3"; -@@ -461,6 +467,12 @@ spi1_cs0_pin: spi1-cs0-pin { +@@ -462,6 +468,12 @@ spi1_cs0_pin: spi1-cs0-pin { function = "spi1"; }; @@ -38,7 +38,7 @@ index 94be1b00d80a..e3659fb52dea 100644 spdif_tx_pin: spdif-tx-pin { pins = "PH4"; function = "spdif"; -@@ -483,6 +495,12 @@ uart1_rts_cts_pins: uart1-rts-cts-pins { +@@ -484,6 +496,12 @@ uart1_rts_cts_pins: uart1-rts-cts-pins { function = "uart1"; }; @@ -51,7 +51,7 @@ index 94be1b00d80a..e3659fb52dea 100644 /omit-if-no-ref/ uart2_pg_pins: uart2-pg-pins { pins = "PG15", "PG16"; -@@ -507,6 +525,24 @@ uart2_ph_rts_cts_pins: uart2-ph-rts-cts-pins { +@@ -508,6 +526,24 @@ uart2_ph_rts_cts_pins: uart2-ph-rts-cts-pins { function = "uart2"; }; diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch index b9f5609202..59427d4dfb 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch @@ -1,4 +1,4 @@ -From 22f0c35104ec92aea34d6979c8a0e8cc8ff95196 Mon Sep 17 00:00:00 2001 +From 32c434af8b723ae3fb92e751b6ad2013205531ac Mon Sep 17 00:00:00 2001 From: Stephen Graf Date: Thu, 9 May 2024 20:59:34 -0700 Subject: Sound for H616, H618 Allwinner SOCs @@ -77,10 +77,10 @@ index ce3dc6d9cd66..6319eb544c45 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index ed68a644148e..5c0b573b622e 100644 +index f5674ffced07..a2e688d8cd11 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -532,7 +532,8 @@ gic: interrupt-controller@3021000 { +@@ -533,7 +533,8 @@ gic: interrupt-controller@3021000 { }; iommu: iommu@30f0000 { @@ -90,7 +90,7 @@ index ed68a644148e..5c0b573b622e 100644 reg = <0x030f0000 0x10000>; interrupts = ; clocks = <&ccu CLK_BUS_IOMMU>; -@@ -885,6 +886,78 @@ lradc: lradc@5070800 { +@@ -886,6 +887,78 @@ lradc: lradc@5070800 { status = "disabled"; }; diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/add-dtb-overlay-for-zero2w.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/add-dtb-overlay-for-zero2w.patch index 004434d67c..d4cd575b3e 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/add-dtb-overlay-for-zero2w.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/add-dtb-overlay-for-zero2w.patch @@ -1,4 +1,4 @@ -From c54796ce751b78c6bdab7ee9622aaf6a3d5a9397 Mon Sep 17 00:00:00 2001 +From e4947fb8cfced0a4e54de6f65c20c98371bc1f97 Mon Sep 17 00:00:00 2001 From: chraac Date: Fri, 5 Apr 2024 10:57:18 +0800 Subject: add dtb overlay for zero2w @@ -16,10 +16,10 @@ Subject: add dtb overlay for zero2w create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2-pi.dtso diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile -index 775290d031bf..6f83b69f8525 100644 +index 718909b607a6..ccb89b5bf495 100644 --- a/arch/arm64/boot/dts/allwinner/overlay/Makefile +++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile -@@ -48,6 +48,10 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ +@@ -49,6 +49,10 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun50i-h6-uart2.dtbo \ sun50i-h6-uart3.dtbo \ sun50i-h6-w1-gpio.dtbo \ diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/add-nodes-for-sunxi-info-sunxi-addr-and-sunxi-dump-reg.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/add-nodes-for-sunxi-info-sunxi-addr-and-sunxi-dump-reg.patch index 43ffdd0682..2fa56bac65 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/add-nodes-for-sunxi-info-sunxi-addr-and-sunxi-dump-reg.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/add-nodes-for-sunxi-info-sunxi-addr-and-sunxi-dump-reg.patch @@ -1,4 +1,4 @@ -From e8bbd9b6907278702499477267c1dd9ffa3b7530 Mon Sep 17 00:00:00 2001 +From 2045f9f6276f2c6a6b8414da264530b66d323f7f Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sat, 16 Apr 2022 11:51:35 +0300 Subject: add nodes for sunxi-info, sunxi-addr and sunxi-dump-reg @@ -39,10 +39,10 @@ index 0e7f44cf90c6..342dd620126c 100644 thermal-zones { diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index 440104413a30..450382ae1900 100644 +index 699b9aa5168c..21520ee2958b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -999,6 +999,25 @@ r_rsb: rsb@7083000 { +@@ -1006,6 +1006,25 @@ r_rsb: rsb@7083000 { #address-cells = <1>; #size-cells = <0>; }; diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch index fef0f327e0..97855254fd 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch @@ -1,4 +1,4 @@ -From 082e234245612d251233ac4eb8804eaf41cc9a0a Mon Sep 17 00:00:00 2001 +From bffa0457046ab5a4ff4ef29f1d38cc9f56ab8fe5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 10 Jan 2025 20:56:39 +0300 Subject: arm: dts: sun8i-h2-plus-orangepi-zero: fix usb_otg dr_mode @@ -8,10 +8,10 @@ Subject: arm: dts: sun8i-h2-plus-orangepi-zero: fix usb_otg dr_mode 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index c9e84ad69113..ca149f920fac 100644 +index 1bb54edb00ce..f5c0e103b748 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -199,7 +199,7 @@ &uart2 { +@@ -203,7 +203,7 @@ &uart2 { }; &usb_otg { diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-allwinner-Add-sun50i-h618-bananapi-m4-berry-support.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-allwinner-Add-sun50i-h618-bananapi-m4-berry-support.patch index b0303c4db6..d9aa145f3b 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-allwinner-Add-sun50i-h618-bananapi-m4-berry-support.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-allwinner-Add-sun50i-h618-bananapi-m4-berry-support.patch @@ -1,13 +1,13 @@ -From 9d796d662d26f23446739ce19e838a17b218b2fc Mon Sep 17 00:00:00 2001 +From 84b1d4a5c7ccea11cf80e5839ed257604c61a6be Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 10 Feb 2025 13:34:14 +0300 -Subject: [PATCH] arm64: allwinner: Add sun50i-h618-bananapi-m4-berry support +Subject: arm64: allwinner: Add sun50i-h618-bananapi-m4-berry support --- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 54 ++- - .../sun50i-h618-bananapi-m4-berry.dts | 432 ++++++++++++++++++ - 3 files changed, 482 insertions(+), 5 deletions(-) + .../sun50i-h618-bananapi-m4-berry.dts | 418 ++++++++++++++++++ + 3 files changed, 468 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile @@ -23,10 +23,10 @@ index a676c57aad1d..a34f2dbcc9b4 100644 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-longanpi-3h.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index e3659fb52dea..edb01fbbd2a1 100644 +index 8124eeff75c7..2fa14c490a30 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -388,6 +388,12 @@ i2c2_pi_pins: i2c2-pi-pins { +@@ -389,6 +389,12 @@ i2c2_pi_pins: i2c2-pi-pins { function = "i2c2"; }; @@ -39,7 +39,7 @@ index e3659fb52dea..edb01fbbd2a1 100644 /omit-if-no-ref/ i2c3_pg_pins: i2c3-pg-pins { pins = "PG17", "PG18"; -@@ -443,6 +449,48 @@ mmc2_pins: mmc2-pins { +@@ -444,6 +450,48 @@ mmc2_pins: mmc2-pins { bias-pull-up; }; @@ -88,7 +88,7 @@ index e3659fb52dea..edb01fbbd2a1 100644 /omit-if-no-ref/ spi0_pins: spi0-pins { pins = "PC0", "PC2", "PC4"; -@@ -860,10 +908,6 @@ emac1: ethernet@5030000 { +@@ -861,10 +909,6 @@ emac1: ethernet@5030000 { pinctrl-names = "default"; tx-delay = <7>; rx-delay = <31>; @@ -99,7 +99,7 @@ index e3659fb52dea..edb01fbbd2a1 100644 status = "disabled"; mdio1: mdio { -@@ -922,7 +966,7 @@ lradc: lradc@5070800 { +@@ -923,7 +967,7 @@ lradc: lradc@5070800 { status = "disabled"; }; @@ -110,10 +110,10 @@ index e3659fb52dea..edb01fbbd2a1 100644 reg = <0x05096000 0x31c>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts new file mode 100644 -index 000000000000..6dcb0b4b9eef +index 000000000000..33e4b4ed4e7d --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts -@@ -0,0 +1,432 @@ +@@ -0,0 +1,418 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +/* + * Copyright (C) 2020 Arm Ltd. @@ -179,7 +179,7 @@ index 000000000000..6dcb0b4b9eef + wifi_usb { + compatible = "usb-wifi"; + status = "okay"; -+ power_on_pin = <&pio 2 2 GPIO_ACTIVE_HIGH>; /* PC2 */ ++ reset-gpios = <&pio 2 2 GPIO_ACTIVE_HIGH>; /* PC2 */ + }; + + reg_vcc5v: vcc5v { @@ -320,7 +320,7 @@ index 000000000000..6dcb0b4b9eef + +&gpu { + mali-supply = <®_dcdc1>; -+ status = "disabled"; ++ status = "okay"; +}; + +&mmc0 { @@ -353,7 +353,7 @@ index 000000000000..6dcb0b4b9eef +&emac0 { + compatible = "allwinner,sun50i-h616-emac0"; + pinctrl-names = "default"; -+ pinctrl-0 = <&ext_rgmii_pins>; ++ pinctrl-0 = <&ext_rgmii_pins>; + phy-mode = "rgmii"; + phy-handle = <&ext_rgmii_phy>; + phy-supply = <®_gmac_3v3>; @@ -367,6 +367,7 @@ index 000000000000..6dcb0b4b9eef + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; ++ reset-gpios = <&pio 8 16 GPIO_ACTIVE_LOW>; /* PI16 */ + }; +}; + @@ -508,21 +509,6 @@ index 000000000000..6dcb0b4b9eef + status = "disabled"; +}; + -+&spi1 { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi1_pins>, <&spi1_cs1_pin>; -+ -+ spidev@1 { -+ compatible = "rohm,dh2228fv"; -+ status = "okay"; -+ reg = <1>; -+ spi-max-frequency = <1000000>; -+ }; -+}; -+ +&codec { + allwinner,audio-routing = + "Line Out", "LINEOUT"; diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch deleted file mode 100644 index 4811159b31..0000000000 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Fri, 15 Oct 2021 21:07:46 +0200 -Subject: arm64:dts: allwinner: sun50i-h616 Add GPU node - -Signed-off-by: Jernej Skrabec ---- - arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 14 ++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -150,6 +150,20 @@ soc { - #size-cells = <1>; - ranges = <0x0 0x0 0x0 0x40000000>; - -+ gpu: gpu@1800000 { -+ compatible = "allwinner,sun50i-h616-mali", -+ "arm,mali-bifrost"; -+ reg = <0x1800000 0x40000>; -+ interrupts = , -+ , -+ ; -+ interrupt-names = "job", "mmu", "gpu"; -+ clocks = <&ccu CLK_GPU0>, <&ccu CLK_BUS_GPU>; -+ clock-names = "core", "bus"; -+ resets = <&ccu RST_BUS_GPU>; -+ status = "disabled"; -+ }; -+ - crypto: crypto@1904000 { - compatible = "allwinner,sun50i-h616-crypto"; - reg = <0x01904000 0x800>; --- -Armbian - diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch index 478921f433..8e80a87394 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch @@ -1,18 +1,18 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 778204df84f4efa0fdefcdcd7f56a955391246a9 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 15 Oct 2021 21:14:55 +0200 Subject: arm64:dts:allwinner: sun50i-h616 Add VPU node Signed-off-by: Jernej Skrabec --- - arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 24 ++++++++++ + .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index 6109f46d3fed..44906eb25c80 100644 +index ae2403a6a565..dca17e8d51fb 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -174,6 +174,17 @@ crypto: crypto@1904000 { +@@ -175,6 +175,17 @@ crypto: crypto@1904000 { resets = <&ccu RST_BUS_CE>; }; @@ -30,7 +30,7 @@ index 6109f46d3fed..44906eb25c80 100644 syscon: syscon@3000000 { compatible = "allwinner,sun50i-h616-system-control"; reg = <0x03000000 0x1000>; -@@ -188,6 +199,19 @@ sram_c: sram@28000 { +@@ -189,6 +200,19 @@ sram_c: sram@28000 { #size-cells = <1>; ranges = <0 0x00028000 0x30000>; }; @@ -51,5 +51,5 @@ index 6109f46d3fed..44906eb25c80 100644 ccu: clock@3001000 { -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-8-Add-overlays-i2c-234-ph-pg-uart-25-ph-pg.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-8-Add-overlays-i2c-234-ph-pg-uart-25-ph-pg.patch index 3f7ed2a186..cd266ef76b 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-8-Add-overlays-i2c-234-ph-pg-uart-25-ph-pg.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-8-Add-overlays-i2c-234-ph-pg-uart-25-ph-pg.patch @@ -1,4 +1,4 @@ -From 428b6d645ccf1acf574c3e13c6261ff75ade2411 Mon Sep 17 00:00:00 2001 +From 05a4e906c635f2e152b3878be8957af28048e9ce Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sat, 8 Feb 2025 16:38:23 +0300 Subject: arm64: dts: h616(8): Add overlays i2c(234)ph,pg; uart(25)ph,pg @@ -28,10 +28,10 @@ Subject: arm64: dts: h616(8): Add overlays i2c(234)ph,pg; uart(25)ph,pg create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart5.dtso diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile -index fb6b30d5753e..775290d031bf 100644 +index 84711585fc86..718909b607a6 100644 --- a/arch/arm64/boot/dts/allwinner/overlay/Makefile +++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile -@@ -48,6 +48,16 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ +@@ -49,6 +49,16 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun50i-h6-uart2.dtbo \ sun50i-h6-uart3.dtbo \ sun50i-h6-w1-gpio.dtbo \ diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch index 9898f2242f..5eee21aae5 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch @@ -1,16 +1,16 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f95a697eb0d74189ce5a78eb85bb7da300a9ec55 Mon Sep 17 00:00:00 2001 From: Gunjan Gupta Date: Fri, 29 Dec 2023 11:18:33 +0000 Subject: arm64: dts: h616: add hdmi support for zero2 and zero3 --- - arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 25 ++ - arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 4 + - arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 213 ++++++++++ + .../allwinner/sun50i-h616-orangepi-zero.dtsi | 25 ++ + .../allwinner/sun50i-h616-orangepi-zero2.dts | 4 + + .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 213 ++++++++++++++++++ 3 files changed, 242 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi -index 111111111111..222222222222 100644 +index 6aca609464c0..ce3dc6d9cd66 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi @@ -23,6 +23,17 @@ chosen { @@ -60,7 +60,7 @@ index 111111111111..222222222222 100644 ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -index 111111111111..222222222222 100644 +index 42c099483fdd..60dd0860f49f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts @@ -29,6 +29,10 @@ &gpu { @@ -75,7 +75,7 @@ index 111111111111..222222222222 100644 vmmc-supply = <®_dcdce>; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index 450382ae1900..b7df6e4c054f 100644 +index 21520ee2958b..9ac31226ac43 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi @@ -7,8 +7,11 @@ @@ -154,7 +154,7 @@ index 450382ae1900..b7df6e4c054f 100644 gpu: gpu@1800000 { compatible = "allwinner,sun50i-h616-mali", "arm,mali-bifrost"; -@@ -192,12 +245,31 @@ syscon: syscon@3000000 { +@@ -193,12 +246,31 @@ syscon: syscon@3000000 { #size-cells = <1>; ranges; @@ -186,7 +186,7 @@ index 450382ae1900..b7df6e4c054f 100644 }; sram_c1: sram@1a00000 { -@@ -903,6 +975,147 @@ ohci3: usb@5311400 { +@@ -904,6 +976,147 @@ ohci3: usb@5311400 { status = "disabled"; }; @@ -335,5 +335,5 @@ index 450382ae1900..b7df6e4c054f 100644 compatible = "allwinner,sun50i-h616-rtc"; reg = <0x07000000 0x400>; -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch index 95337d8684..ea6a415f31 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch @@ -1,12 +1,12 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f5ba5cd158e1c882d7bda7e0ffd9cb166307ea12 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Mon, 14 Jun 2021 20:48:15 +0200 Subject: arm64:dts: sun50i-h616-x96-mate T95 eth & sd card hack Signed-off-by: Jernej Skrabec --- - arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts | 21 +++++++- - arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 26 ++++++++++ + .../dts/allwinner/sun50i-h616-x96-mate.dts | 21 ++++++++++++++- + .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 26 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts @@ -55,10 +55,10 @@ index 26d25b5b59e0..2ccdc317af14 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index 44906eb25c80..440104413a30 100644 +index dca17e8d51fb..699b9aa5168c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -286,6 +286,13 @@ ext_rgmii_pins: rgmii-pins { +@@ -287,6 +287,13 @@ ext_rgmii_pins: rgmii-pins { drive-strength = <40>; }; @@ -72,7 +72,7 @@ index 44906eb25c80..440104413a30 100644 i2c0_pins: i2c0-pins { pins = "PI5", "PI6"; function = "i2c0"; -@@ -668,6 +675,25 @@ mdio0: mdio { +@@ -669,6 +676,25 @@ mdio0: mdio { }; }; @@ -99,5 +99,5 @@ index 44906eb25c80..440104413a30 100644 compatible = "allwinner,sun50i-h616-spdif"; reg = <0x05093000 0x400>; -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch index eb89053da9..e110eb9779 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch @@ -1,4 +1,4 @@ -From 19643d4a52afccb60743c52906065adb29a7a27a Mon Sep 17 00:00:00 2001 +From 1cf0841a9436c6d293436063b21276468352b81c Mon Sep 17 00:00:00 2001 From: chraac Date: Fri, 15 Mar 2024 12:30:26 +0800 Subject: arm64: dts: sun50i-h618-orangepi-zero2w: Add missing nodes @@ -9,10 +9,10 @@ Subject: arm64: dts: sun50i-h618-orangepi-zero2w: Add missing nodes 2 files changed, 586 insertions(+), 67 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index 971b3fd80763..67d0621b6dbd 100644 +index 5d35e71e230b..f5674ffced07 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -240,7 +240,7 @@ video-codec@1c0e000 { +@@ -241,7 +241,7 @@ video-codec@1c0e000 { syscon: syscon@3000000 { compatible = "allwinner,sun50i-h616-system-control"; @@ -21,7 +21,7 @@ index 971b3fd80763..67d0621b6dbd 100644 #address-cells = <1>; #size-cells = <1>; ranges; -@@ -809,19 +809,28 @@ mdio0: mdio { +@@ -810,19 +810,28 @@ mdio0: mdio { }; emac1: ethernet@5030000 { diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-sun50i-h616-Add-i2c-2-3-4-uart-2-5-pins.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-sun50i-h616-Add-i2c-2-3-4-uart-2-5-pins.patch index 3a09e6f983..cad4078dc1 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-sun50i-h616-Add-i2c-2-3-4-uart-2-5-pins.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm64-sun50i-h616-Add-i2c-2-3-4-uart-2-5-pins.patch @@ -1,7 +1,7 @@ -From 5942e98140a7d7e58f335d578bd7f5a91b2068f1 Mon Sep 17 00:00:00 2001 +From 5b1af443c495ced8e95d7403303ac592942888c5 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sat, 8 Feb 2025 12:37:21 +0300 -Subject: [PATCH] arm64: sun50i-h616: Add i2c(2,3,4), uart(2,5) pins +Subject: arm64: sun50i-h616: Add i2c(2,3,4), uart(2,5) pins Add a description of the pins for further use in device trees and overlays. @@ -13,10 +13,10 @@ drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c 1 file changed, 61 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -index b7df6e4c054f..971b3fd80763 100644 +index 9ac31226ac43..5d35e71e230b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi -@@ -370,11 +370,42 @@ i2c0_pins: i2c0-pins { +@@ -371,11 +371,42 @@ i2c0_pins: i2c0-pins { function = "i2c0"; }; @@ -59,7 +59,7 @@ index b7df6e4c054f..971b3fd80763 100644 ir_rx_pin: ir-rx-pin { pins = "PH10"; function = "ir_rx"; -@@ -452,6 +483,36 @@ uart1_rts_cts_pins: uart1-rts-cts-pins { +@@ -453,6 +484,36 @@ uart1_rts_cts_pins: uart1-rts-cts-pins { function = "uart1"; }; diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch index be83c21801..ac7a353620 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9adef04ccfa99d86e2168232a7bcb1d2f4e91a2d Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 20:08:50 +0300 Subject: drv:usb:gadget:composite rename gadget serial console manufacturer @@ -10,10 +10,10 @@ to the Armbian brand. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c -index 111111111111..222222222222 100644 +index 8402a86176f4..e4532a7d66f3 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c -@@ -2770,7 +2770,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue); +@@ -2777,7 +2777,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue); static char *composite_default_mfr(struct usb_gadget *gadget) { @@ -23,5 +23,5 @@ index 111111111111..222222222222 100644 } -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/enable-TV-Output-on-OrangePi-Zero-LTE.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/enable-TV-Output-on-OrangePi-Zero-LTE.patch index b1e3e9c73d..0e051b51c0 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/enable-TV-Output-on-OrangePi-Zero-LTE.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/enable-TV-Output-on-OrangePi-Zero-LTE.patch @@ -1,4 +1,4 @@ -From 798259bd159149b069f7ce6bb2340f58bd872cd4 Mon Sep 17 00:00:00 2001 +From 914a90eef65653b88e19d829c5cb55bc214b9149 Mon Sep 17 00:00:00 2001 From: Radoslav Date: Sat, 15 Apr 2023 22:47:26 +0200 Subject: enable TV Output on OrangePi Zero LTE @@ -31,9 +31,9 @@ Merged: drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 14 ++- drivers/gpu/drm/sun4i/Makefile | 2 +- drivers/gpu/drm/sun4i/sun4i_tv.c | 35 ++++++- - drivers/gpu/drm/sun4i/sun8i_mixer.c | 36 ++++++- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 30 +++++- drivers/gpu/drm/sun4i/sun8i_mixer.h | 5 +- - 16 files changed, 310 insertions(+), 14 deletions(-) + 16 files changed, 307 insertions(+), 11 deletions(-) create mode 100644 arch/arm/boot/dts/allwinner/overlay/sun8i-h3-tve.dtso create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h5-tve.dtso @@ -468,15 +468,15 @@ index eed11bb2d631..80650ec914fd 100644 static const char * const deinterlace_parents[] = { "pll-periph0", "pll-periph1" }; static SUNXI_CCU_M_WITH_MUX_GATE(deinterlace_clk, "deinterlace", deinterlace_parents, diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile -index 5e9dc9370584..3a7130623351 100644 +index 8ffddaa3e069..e557b9cd51ff 100644 --- a/drivers/gpu/drm/sun4i/Makefile +++ b/drivers/gpu/drm/sun4i/Makefile -@@ -19,7 +19,7 @@ sun8i-drm-hdmi-y += sun8i_hdmi_phy_clk.o - +@@ -20,7 +20,7 @@ sun8i-drm-hdmi-y += sun8i_hdmi_phy_clk.o sun8i-mixer-y += sun8i_mixer.o sun8i_ui_layer.o \ sun8i_vi_layer.o sun8i_ui_scaler.o \ -- sun8i_vi_scaler.o sun8i_csc.o -+ sun8i_vi_scaler.o sun8i_csc.o sun4i_tv.o + sun8i_vi_scaler.o sun8i_csc.o \ +- sun50i_fmt.o sun50i_afbc.o ++ sun50i_fmt.o sun50i_afbc.o sun4i_tv.o sun4i-tcon-y += sun4i_crtc.o sun4i-tcon-y += sun4i_tcon_dclk.o @@ -570,12 +570,12 @@ index ec65d9d59de7..d2235d5a7416 100644 }; MODULE_DEVICE_TABLE(of, sun4i_tv_of_table); diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c -index c82adcb928b9..537a97599f93 100644 +index 6d5420ada86d..3876ca879ca1 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -37,6 +37,12 @@ struct de2_fmt_info { - - static bool hw_preconfigured; + u32 de2_fmt; + }; +static const u32 sun8i_rgb2yuv_coef[12] = { + 0x00000107, 0x00000204, 0x00000064, 0x00004200, @@ -586,8 +586,8 @@ index c82adcb928b9..537a97599f93 100644 static const struct de2_fmt_info de2_formats[] = { { .drm_fmt = DRM_FORMAT_ARGB8888, -@@ -427,10 +433,29 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine, - interlaced ? "on" : "off"); +@@ -445,11 +451,30 @@ static u32 *sun8i_mixer_get_supported_fmts(struct sunxi_engine *engine, u32 *num + return formats; } +static void sun8i_mixer_apply_color_correction(struct sunxi_engine *engine) @@ -608,18 +608,16 @@ index c82adcb928b9..537a97599f93 100644 +} + static const struct sunxi_engine_ops sun8i_engine_ops = { -- .commit = sun8i_mixer_commit, -- .layers_init = sun8i_layers_init, -- .mode_set = sun8i_mixer_mode_set, -+ .commit = sun8i_mixer_commit, -+ .layers_init = sun8i_layers_init, -+ .mode_set = sun8i_mixer_mode_set, -+ .apply_color_correction = sun8i_mixer_apply_color_correction, -+ .disable_color_correction = sun8i_mixer_disable_color_correction, + .commit = sun8i_mixer_commit, + .layers_init = sun8i_layers_init, + .mode_set = sun8i_mixer_mode_set, + .get_supported_fmts = sun8i_mixer_get_supported_fmts, ++ .apply_color_correction = sun8i_mixer_apply_color_correction, ++ .disable_color_correction = sun8i_mixer_disable_color_correction, }; static const struct regmap_config sun8i_mixer_regmap_config = { -@@ -711,8 +736,9 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { +@@ -772,8 +797,9 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = { .ccsc = CCSC_MIXER1_LAYOUT, .mod_rate = 432000000, @@ -632,10 +630,10 @@ index c82adcb928b9..537a97599f93 100644 }; diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h -index 68e2741b0962..7bc8efca6980 100644 +index 26b001164647..f01fc514a7e8 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.h +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h -@@ -119,6 +119,10 @@ +@@ -123,6 +123,10 @@ /* format 20 is packed YVU444 10-bit */ /* format 21 is packed YUV444 10-bit */ @@ -646,7 +644,7 @@ index 68e2741b0962..7bc8efca6980 100644 /* * Sub-engines listed bellow are unused for now. The EN registers are here only * to be used to disable these sub-engines. -@@ -129,7 +133,6 @@ +@@ -133,7 +137,6 @@ #define SUN8I_MIXER_PEAK_EN 0xa6000 #define SUN8I_MIXER_ASE_EN 0xa8000 #define SUN8I_MIXER_FCC_EN 0xaa000 diff --git a/patch/kernel/archive/sunxi-6.12/series.armbian b/patch/kernel/archive/sunxi-6.12/series.armbian index 4a179f58d4..f904c8aafc 100644 --- a/patch/kernel/archive/sunxi-6.12/series.armbian +++ b/patch/kernel/archive/sunxi-6.12/series.armbian @@ -80,7 +80,6 @@ patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch patches.armbian/arm64-dts-sun50i-h616.dtsi-reserved-memory-512K-for-BL31.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch diff --git a/patch/kernel/archive/sunxi-6.12/series.conf b/patch/kernel/archive/sunxi-6.12/series.conf index d60c31aaed..c4aca31d66 100644 --- a/patch/kernel/archive/sunxi-6.12/series.conf +++ b/patch/kernel/archive/sunxi-6.12/series.conf @@ -376,7 +376,6 @@ patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch patches.armbian/arm64-dts-sun50i-h616.dtsi-reserved-memory-512K-for-BL31.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch patches.armbian/arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack.patch @@ -450,7 +449,7 @@ patches.armbian/ARM-dts-sun8i-nanopiduo2-enable-ethernet.patch patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not-supported-.patch patches.armbian/arm64-dts-sun50i-h5-enable-power-button-for-orangepi-prime.patch -- patches.armbian/enable-TV-Output-on-OrangePi-Zero-LTE.patch + patches.armbian/enable-TV-Output-on-OrangePi-Zero-LTE.patch patches.armbian/arm64-dts-allwinner-h6-Add-AC200-EPHY-nodes.patch patches.armbian/arm64-dts-allwinner-h6-tanix-enable-Ethernet.patch patches.armbian/arm64-dts-allwinner-h6-add-AC200-codec-nodes.patch