sunxi-6.13: re-export armbian patches after changes

This commit is contained in:
The-going 2025-04-14 12:44:11 +03:00 committed by Igor
parent 61ad7cea8b
commit b10d00d30e
4 changed files with 16 additions and 16 deletions

View File

@ -1,4 +1,4 @@
From 973d692fae9cac5f9f7dd69db40cbcb107d26ef8 Mon Sep 17 00:00:00 2001 From 78a53cd64db4002e9c9a4f46406e7182b3f3b934 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com> From: Patrick Yavitz <pyavitz@armbian.com>
Date: Thu, 12 Dec 2024 06:49:59 -0500 Date: Thu, 12 Dec 2024 06:49:59 -0500
Subject: Add BananaPi BPI-M4-Zero pinctrl Subject: Add BananaPi BPI-M4-Zero pinctrl
@ -9,10 +9,10 @@ Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
1 file changed, 36 insertions(+) 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 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 949a94dfa7b3..624bc0e95295 100644 index 954c8eab2c44..004e824dfe0b 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -420,6 +420,12 @@ i2c0_pins: i2c0-pins { @@ -409,6 +409,12 @@ i2c0_pins: i2c0-pins {
function = "i2c0"; function = "i2c0";
}; };
@ -25,7 +25,7 @@ index 949a94dfa7b3..624bc0e95295 100644
/omit-if-no-ref/ /omit-if-no-ref/
i2c2_ph_pins: i2c2-ph-pins { i2c2_ph_pins: i2c2-ph-pins {
pins = "PH2", "PH3"; pins = "PH2", "PH3";
@@ -583,6 +589,12 @@ spi1_cs0_pin: spi1-cs0-pin { @@ -571,6 +577,12 @@ spi1_cs0_pin: spi1-cs0-pin {
function = "spi1"; function = "spi1";
}; };
@ -38,7 +38,7 @@ index 949a94dfa7b3..624bc0e95295 100644
spdif_tx_pin: spdif-tx-pin { spdif_tx_pin: spdif-tx-pin {
pins = "PH4"; pins = "PH4";
function = "spdif"; function = "spdif";
@@ -605,6 +617,12 @@ uart1_rts_cts_pins: uart1-rts-cts-pins { @@ -593,6 +605,12 @@ uart1_rts_cts_pins: uart1-rts-cts-pins {
function = "uart1"; function = "uart1";
}; };
@ -51,7 +51,7 @@ index 949a94dfa7b3..624bc0e95295 100644
/omit-if-no-ref/ /omit-if-no-ref/
uart2_pg_pins: uart2-pg-pins { uart2_pg_pins: uart2-pg-pins {
pins = "PG15", "PG16"; pins = "PG15", "PG16";
@@ -629,6 +647,24 @@ uart2_ph_rts_cts_pins: uart2-ph-rts-cts-pins { @@ -617,6 +635,24 @@ uart2_ph_rts_cts_pins: uart2-ph-rts-cts-pins {
function = "uart2"; function = "uart2";
}; };

View File

@ -1,4 +1,4 @@
From b150f6141f3ea8bed3783b34ba89e7438c4c1119 Mon Sep 17 00:00:00 2001 From fe8ed90523552584a15d26beebbb3458aea5b9da Mon Sep 17 00:00:00 2001
From: Stephen Graf <stephen.graf@gmail.com> From: Stephen Graf <stephen.graf@gmail.com>
Date: Wed, 26 Mar 2025 17:06:51 +0000 Date: Wed, 26 Mar 2025 17:06:51 +0000
Subject: Sound for H616, H618 Allwinner SOCs Subject: Sound for H616, H618 Allwinner SOCs
@ -80,10 +80,10 @@ index 60f643abb3eb..109c33c6558f 100644
status = "okay"; status = "okay";
}; };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 3d7405e2a95f..949a94dfa7b3 100644 index 6c1f1087f199..954c8eab2c44 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -654,7 +654,8 @@ gic: interrupt-controller@3021000 { @@ -642,7 +642,8 @@ gic: interrupt-controller@3021000 {
}; };
iommu: iommu@30f0000 { iommu: iommu@30f0000 {
@ -93,7 +93,7 @@ index 3d7405e2a95f..949a94dfa7b3 100644
reg = <0x030f0000 0x10000>; reg = <0x030f0000 0x10000>;
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_IOMMU>; clocks = <&ccu CLK_BUS_IOMMU>;
@@ -1021,6 +1022,63 @@ codec: codec@5096000 { @@ -1009,6 +1010,63 @@ codec: codec@5096000 {
status = "disabled"; status = "disabled";
}; };

View File

@ -1,4 +1,4 @@
From 7b908ec5809ba4bfb8d7f310fcbfe93feeb2e8f4 Mon Sep 17 00:00:00 2001 From 415c6765e95f564ae3f56b202b6200ea505748bd Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com> From: The-going <48602507+The-going@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:34:14 +0300 Date: Mon, 10 Feb 2025 13:34:14 +0300
Subject: arm64: allwinner: Add sun50i-h618-bananapi-m4-berry support Subject: arm64: allwinner: Add sun50i-h618-bananapi-m4-berry support
@ -23,10 +23,10 @@ index a676c57aad1d..a34f2dbcc9b4 100644
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-longanpi-3h.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-longanpi-3h.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.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 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 624bc0e95295..281c363e429d 100644 index 004e824dfe0b..0f4587be1c0e 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -402,8 +402,8 @@ pio: pinctrl@300b000 { @@ -391,8 +391,8 @@ pio: pinctrl@300b000 {
ext_rgmii_pins: rgmii-pins { ext_rgmii_pins: rgmii-pins {
pins = "PI0", "PI1", "PI2", "PI3", "PI4", pins = "PI0", "PI1", "PI2", "PI3", "PI4",
"PI5", "PI7", "PI8", "PI9", "PI10", "PI5", "PI7", "PI8", "PI9", "PI10",

View File

@ -1,4 +1,4 @@
From 8c593375ad60fcddda3b605810cc8d69308245d9 Mon Sep 17 00:00:00 2001 From 8d4c66671ff780d7b64b88666573ca392aa93e88 Mon Sep 17 00:00:00 2001
From: chraac <chraac@gmail.com> From: chraac <chraac@gmail.com>
Date: Fri, 15 Mar 2024 12:30:26 +0800 Date: Fri, 15 Mar 2024 12:30:26 +0800
Subject: arm64: dts: sun50i-h618-orangepi-zero2w: Add missing nodes Subject: arm64: dts: sun50i-h618-orangepi-zero2w: Add missing nodes
@ -9,7 +9,7 @@ Subject: arm64: dts: sun50i-h618-orangepi-zero2w: Add missing nodes
2 files changed, 306 insertions(+), 8 deletions(-) 2 files changed, 306 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index fc134db28f75..3d7405e2a95f 100644 index 72d008d6d4e7..6c1f1087f199 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -241,7 +241,7 @@ video-codec@1c0e000 { @@ -241,7 +241,7 @@ video-codec@1c0e000 {
@ -21,7 +21,7 @@ index fc134db28f75..3d7405e2a95f 100644
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
@@ -931,19 +931,28 @@ mdio0: mdio { @@ -919,19 +919,28 @@ mdio0: mdio {
}; };
emac1: ethernet@5030000 { emac1: ethernet@5030000 {