enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi-6.13: Switching to v6.13.11; re-export all patches

Browse Source
This commit is contained in:
The-going 2025-04-11 15:19:28 +03:00 committed by Igor
parent c5fc8be5e7
commit 83d866af09
10 changed files with 95 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/sources/families/include/sunxi64_common.inc
View File

@ -36,7 +36,7 @@ case $BRANCH in
edge)
declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.13.7"
declare -g KERNELBRANCH="tag:v6.13.11"
;;
esac

2
config/sources/families/include/sunxi_common.inc
View File

@ -37,7 +37,7 @@ case $BRANCH in
edge)
declare -g KERNEL_MAJOR_MINOR="6.13" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.13.7"
declare -g KERNELBRANCH="tag:v6.13.11"
;;
esac

12
patch/kernel/archive/sunxi-6.13/patches.armbian/Add-BananaPi-BPI-M4-Zero-pinctrl.patch
View File

@ -1,4 +1,4 @@
From 49aa3e423cc2544e27479334d1a1aeff2741da8c Mon Sep 17 00:00:00 2001
From 973d692fae9cac5f9f7dd69db40cbcb107d26ef8 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
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 <pyavitz@armbian.com>
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 8f992bd4a9d2..80a7b12b6b5c 100644
index 949a94dfa7b3..624bc0e95295 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -371,6 +371,12 @@ i2c0_pins: i2c0-pins {
@@ -420,6 +420,12 @@ i2c0_pins: i2c0-pins {
function = "i2c0";
};
@ -25,7 +25,7 @@ index 8f992bd4a9d2..80a7b12b6b5c 100644
/omit-if-no-ref/
i2c2_ph_pins: i2c2-ph-pins {
pins = "PH2", "PH3";
@@ -468,6 +474,12 @@ spi1_cs0_pin: spi1-cs0-pin {
@@ -583,6 +589,12 @@ spi1_cs0_pin: spi1-cs0-pin {
function = "spi1";
};
@ -38,7 +38,7 @@ index 8f992bd4a9d2..80a7b12b6b5c 100644
spdif_tx_pin: spdif-tx-pin {
pins = "PH4";
function = "spdif";
@@ -490,6 +502,12 @@ uart1_rts_cts_pins: uart1-rts-cts-pins {
@@ -605,6 +617,12 @@ uart1_rts_cts_pins: uart1-rts-cts-pins {
function = "uart1";
};
@ -51,7 +51,7 @@ index 8f992bd4a9d2..80a7b12b6b5c 100644
/omit-if-no-ref/
uart2_pg_pins: uart2-pg-pins {
pins = "PG15", "PG16";
@@ -514,6 +532,24 @@ uart2_ph_rts_cts_pins: uart2-ph-rts-cts-pins {
@@ -629,6 +647,24 @@ uart2_ph_rts_cts_pins: uart2-ph-rts-cts-pins {
function = "uart2";
};

151
patch/kernel/archive/sunxi-6.13/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch
View File

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From b150f6141f3ea8bed3783b34ba89e7438c4c1119 Mon Sep 17 00:00:00 2001
From: Stephen Graf <stephen.graf@gmail.com>
Date: Wed, 26 Mar 2025 17:06:51 +0000
Subject: Sound for H616, H618 Allwinner SOCs
@ -20,35 +20,47 @@ for H616 SoCs in sun41.codec.c. We will use it.
Signed-off-by: Stephen Graf <stephen.graf@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 12 +
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 60 +-
include/sound/soc-dai.h | 13 +
sound/soc/Kconfig | 1 +
sound/soc/Makefile | 1 +
sound/soc/soc-core.c | 25 +
sound/soc/sunxi_v2/Kconfig | 45 +
sound/soc/sunxi_v2/Makefile | 11 +
sound/soc/sunxi_v2/drv_hdmi.h | 63 +
sound/soc/sunxi_v2/snd_sunxi_ahub.c | 1475 ++++++++++
sound/soc/sunxi_v2/snd_sunxi_ahub.h | 74 +
sound/soc/sunxi_v2/snd_sunxi_ahub_dam.c | 532 ++++
sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h | 294 ++
sound/soc/sunxi_v2/snd_sunxi_common.c | 267 ++
sound/soc/sunxi_v2/snd_sunxi_common.h | 67 +
sound/soc/sunxi_v2/snd_sunxi_log.h | 29 +
sound/soc/sunxi_v2/snd_sunxi_mach.c | 479 +++
sound/soc/sunxi_v2/snd_sunxi_mach.h | 20 +
sound/soc/sunxi_v2/snd_sunxi_mach_utils.c | 422 +++
sound/soc/sunxi_v2/snd_sunxi_mach_utils.h | 116 +
.../allwinner/sun50i-h616-orangepi-zero.dtsi | 12 +
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 60 +-
include/sound/soc-dai.h | 13 +
sound/soc/Kconfig | 1 +
sound/soc/Makefile | 1 +
sound/soc/soc-core.c | 25 +
sound/soc/sunxi_v2/Kconfig | 45 +
sound/soc/sunxi_v2/Makefile | 11 +
sound/soc/sunxi_v2/drv_hdmi.h | 63 +
sound/soc/sunxi_v2/snd_sunxi_ahub.c | 1475 +++++++++++++++++
sound/soc/sunxi_v2/snd_sunxi_ahub.h | 74 +
sound/soc/sunxi_v2/snd_sunxi_ahub_dam.c | 532 ++++++
sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h | 294 ++++
sound/soc/sunxi_v2/snd_sunxi_common.c | 267 +++
sound/soc/sunxi_v2/snd_sunxi_common.h | 67 +
sound/soc/sunxi_v2/snd_sunxi_log.h | 29 +
sound/soc/sunxi_v2/snd_sunxi_mach.c | 479 ++++++
sound/soc/sunxi_v2/snd_sunxi_mach.h | 20 +
sound/soc/sunxi_v2/snd_sunxi_mach_utils.c | 422 +++++
sound/soc/sunxi_v2/snd_sunxi_mach_utils.h | 116 ++
20 files changed, 4005 insertions(+), 1 deletion(-)
create mode 100644 sound/soc/sunxi_v2/Kconfig
create mode 100644 sound/soc/sunxi_v2/Makefile
create mode 100644 sound/soc/sunxi_v2/drv_hdmi.h
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_ahub.c
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_ahub.h
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_ahub_dam.c
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_common.c
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_common.h
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_log.h
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_mach.c
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_mach.h
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_mach_utils.c
create mode 100644 sound/soc/sunxi_v2/snd_sunxi_mach_utils.h
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 60f643abb..109c33c65 100644
index 60f643abb3eb..109c33c6558f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
@@ -108,10 +108,22 @@ &codec {
&de {
@@ -110,6 +110,18 @@ &de {
status = "okay";
};
@ -67,15 +79,11 @@ index 60f643abb..109c33c65 100644
&ehci1 {
status = "okay";
};
/* USB 2 & 3 are on headers only. */
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 62fd294e5..90e65be77 100644
index 3d7405e2a95f..949a94dfa7b3 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -615,11 +615,12 @@ gic: interrupt-controller@3021000 {
interrupt-controller;
#interrupt-cells = <3>;
@@ -654,7 +654,8 @@ gic: interrupt-controller@3021000 {
};
iommu: iommu@30f0000 {
@ -85,11 +93,7 @@ index 62fd294e5..90e65be77 100644
reg = <0x030f0000 0x10000>;
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_IOMMU>;
resets = <&ccu RST_BUS_IOMMU>;
#iommu-cells = <1>;
@@ -973,10 +974,67 @@ codec: codec@5096000 {
dmas = <&dma 6>;
dma-names = "tx";
@@ -1021,6 +1022,63 @@ codec: codec@5096000 {
status = "disabled";
};
@ -153,15 +157,11 @@ index 62fd294e5..90e65be77 100644
usbotg: usb@5100000 {
compatible = "allwinner,sun50i-h616-musb",
"allwinner,sun8i-h3-musb";
reg = <0x05100000 0x0400>;
clocks = <&ccu CLK_BUS_OTG>;
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index aab57c19f..91309f090 100644
index aab57c19f62b..91309f090e27 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -408,20 +408,33 @@ struct snd_soc_dai_driver {
unsigned int id;
unsigned int base;
@@ -410,6 +410,15 @@ struct snd_soc_dai_driver {
struct snd_soc_dobj dobj;
const struct of_phandle_args *dai_args;
@ -177,10 +177,7 @@ index aab57c19f..91309f090 100644
/* ops */
const struct snd_soc_dai_ops *ops;
const struct snd_soc_cdai_ops *cops;
/* DAI capabilities */
struct snd_soc_pcm_stream capture;
struct snd_soc_pcm_stream playback;
@@ -420,6 +429,10 @@ struct snd_soc_dai_driver {
unsigned int symmetric_rate:1;
unsigned int symmetric_channels:1;
unsigned int symmetric_sample_bits:1;
@ -191,15 +188,11 @@ index aab57c19f..91309f090 100644
};
/* for Playback/Capture */
struct snd_soc_dai_stream {
struct snd_soc_dapm_widget *widget;
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 5efba76ab..b1b4693ca 100644
index 5efba76abb31..b1b4693ca49b 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -115,10 +115,11 @@ source "sound/soc/spear/Kconfig"
source "sound/soc/sprd/Kconfig"
source "sound/soc/starfive/Kconfig"
@@ -117,6 +117,7 @@ source "sound/soc/starfive/Kconfig"
source "sound/soc/sti/Kconfig"
source "sound/soc/stm/Kconfig"
source "sound/soc/sunxi/Kconfig"
@ -207,15 +200,11 @@ index 5efba76ab..b1b4693ca 100644
source "sound/soc/tegra/Kconfig"
source "sound/soc/ti/Kconfig"
source "sound/soc/uniphier/Kconfig"
source "sound/soc/ux500/Kconfig"
source "sound/soc/xilinx/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 08baaa11d..ca53a0853 100644
index 08baaa11d813..ca53a0853e0f 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -68,10 +68,11 @@ obj-$(CONFIG_SND_SOC) += spear/
obj-$(CONFIG_SND_SOC) += sprd/
obj-$(CONFIG_SND_SOC) += starfive/
@@ -70,6 +70,7 @@ obj-$(CONFIG_SND_SOC) += starfive/
obj-$(CONFIG_SND_SOC) += sti/
obj-$(CONFIG_SND_SOC) += stm/
obj-$(CONFIG_SND_SOC) += sunxi/
@ -223,15 +212,11 @@ index 08baaa11d..ca53a0853 100644
obj-$(CONFIG_SND_SOC) += tegra/
obj-$(CONFIG_SND_SOC) += ti/
obj-$(CONFIG_SND_SOC) += uniphier/
obj-$(CONFIG_SND_SOC) += ux500/
obj-$(CONFIG_SND_SOC) += xilinx/
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a1dace4bb..ec05135e2 100644
index a1dace4bb616..ec05135e25fa 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2627,10 +2627,11 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv,
bool legacy_dai_naming)
@@ -2629,6 +2629,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
{
struct device *dev = component->dev;
struct snd_soc_dai *dai;
@ -239,11 +224,7 @@ index a1dace4bb..ec05135e2 100644
lockdep_assert_held(&client_mutex);
dai = devm_kzalloc(dev, sizeof(*dai), GFP_KERNEL);
if (dai == NULL)
@@ -2655,10 +2656,34 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
dai->id = component->num_dai;
}
@@ -2657,6 +2658,30 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
if (!dai->name)
return NULL;
@ -274,11 +255,9 @@ index a1dace4bb..ec05135e2 100644
dai->component = component;
dai->dev = dev;
dai->driver = dai_drv;
/* see for_each_component_dais */
diff --git a/sound/soc/sunxi_v2/Kconfig b/sound/soc/sunxi_v2/Kconfig
new file mode 100644
index 000000000..e5d4aff7e
index 000000000000..e5d4aff7e6ca
--- /dev/null
+++ b/sound/soc/sunxi_v2/Kconfig
@@ -0,0 +1,45 @@
@ -329,7 +308,7 @@ index 000000000..e5d4aff7e
+endmenu
diff --git a/sound/soc/sunxi_v2/Makefile b/sound/soc/sunxi_v2/Makefile
new file mode 100644
index 000000000..c7c2ef8f9
index 000000000000..c7c2ef8f9fe9
--- /dev/null
+++ b/sound/soc/sunxi_v2/Makefile
@@ -0,0 +1,11 @@
@ -346,7 +325,7 @@ index 000000000..c7c2ef8f9
+obj-$(CONFIG_SND_SOC_SUNXI_MACH) += snd_soc_sunxi_machine.o
diff --git a/sound/soc/sunxi_v2/drv_hdmi.h b/sound/soc/sunxi_v2/drv_hdmi.h
new file mode 100644
index 000000000..2e05489b0
index 000000000000..2e05489b01e1
--- /dev/null
+++ b/sound/soc/sunxi_v2/drv_hdmi.h
@@ -0,0 +1,63 @@
@ -415,7 +394,7 @@ index 000000000..2e05489b0
+#endif
diff --git a/sound/soc/sunxi_v2/snd_sunxi_ahub.c b/sound/soc/sunxi_v2/snd_sunxi_ahub.c
new file mode 100644
index 000000000..6d4a847a9
index 000000000000..6d4a847a928f
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_ahub.c
@@ -0,0 +1,1475 @@
@ -1896,7 +1875,7 @@ index 000000000..6d4a847a9
+MODULE_DESCRIPTION("sunxi soundcard platform of ahub");
diff --git a/sound/soc/sunxi_v2/snd_sunxi_ahub.h b/sound/soc/sunxi_v2/snd_sunxi_ahub.h
new file mode 100644
index 000000000..cd4be46b6
index 000000000000..cd4be46b6ebf
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_ahub.h
@@ -0,0 +1,74 @@
@ -1976,7 +1955,7 @@ index 000000000..cd4be46b6
+#endif /* __SND_SUNXI_AHUB_H */
diff --git a/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.c b/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.c
new file mode 100644
index 000000000..f3c7bb3c7
index 000000000000..f3c7bb3c7cd2
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.c
@@ -0,0 +1,532 @@
@ -2514,7 +2493,7 @@ index 000000000..f3c7bb3c7
+MODULE_DESCRIPTION("sunxi soundcard platform of ahub_dam");
diff --git a/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h b/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h
new file mode 100644
index 000000000..436742d87
index 000000000000..436742d87e8f
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h
@@ -0,0 +1,294 @@
@ -2814,7 +2793,7 @@ index 000000000..436742d87
+#endif /* __SND_SUNXI_AHUB_DAM_H */
diff --git a/sound/soc/sunxi_v2/snd_sunxi_common.c b/sound/soc/sunxi_v2/snd_sunxi_common.c
new file mode 100644
index 000000000..410ab75ae
index 000000000000..410ab75aea5a
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_common.c
@@ -0,0 +1,267 @@
@ -3087,7 +3066,7 @@ index 000000000..410ab75ae
+}
diff --git a/sound/soc/sunxi_v2/snd_sunxi_common.h b/sound/soc/sunxi_v2/snd_sunxi_common.h
new file mode 100644
index 000000000..7b88d20c2
index 000000000000..7b88d20c25e0
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_common.h
@@ -0,0 +1,67 @@
@ -3161,7 +3140,7 @@ index 000000000..7b88d20c2
\ No newline at end of file
diff --git a/sound/soc/sunxi_v2/snd_sunxi_log.h b/sound/soc/sunxi_v2/snd_sunxi_log.h
new file mode 100644
index 000000000..89ad9fe71
index 000000000000..89ad9fe71936
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_log.h
@@ -0,0 +1,29 @@
@ -3196,7 +3175,7 @@ index 000000000..89ad9fe71
+#endif /* __SND_SUNXI_LOG_H */
diff --git a/sound/soc/sunxi_v2/snd_sunxi_mach.c b/sound/soc/sunxi_v2/snd_sunxi_mach.c
new file mode 100644
index 000000000..74d276a2d
index 000000000000..74d276a2da92
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_mach.c
@@ -0,0 +1,479 @@
@ -3681,7 +3660,7 @@ index 000000000..74d276a2d
+MODULE_DESCRIPTION("sunxi soundcard machine");
diff --git a/sound/soc/sunxi_v2/snd_sunxi_mach.h b/sound/soc/sunxi_v2/snd_sunxi_mach.h
new file mode 100644
index 000000000..6f9ea8ccf
index 000000000000..6f9ea8ccf8b5
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_mach.h
@@ -0,0 +1,20 @@
@ -3707,7 +3686,7 @@ index 000000000..6f9ea8ccf
+#endif /* __SND_SUNXI_MACH_H */
diff --git a/sound/soc/sunxi_v2/snd_sunxi_mach_utils.c b/sound/soc/sunxi_v2/snd_sunxi_mach_utils.c
new file mode 100644
index 000000000..15f474e5c
index 000000000000..15f474e5cbeb
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_mach_utils.c
@@ -0,0 +1,422 @@
@ -4135,7 +4114,7 @@ index 000000000..15f474e5c
+MODULE_DESCRIPTION("sunxi soundcard machine utils");
diff --git a/sound/soc/sunxi_v2/snd_sunxi_mach_utils.h b/sound/soc/sunxi_v2/snd_sunxi_mach_utils.h
new file mode 100644
index 000000000..a9cffa0d8
index 000000000000..a9cffa0d859b
--- /dev/null
+++ b/sound/soc/sunxi_v2/snd_sunxi_mach_utils.h
@@ -0,0 +1,116 @@
@ -4256,5 +4235,5 @@ index 000000000..a9cffa0d8
+
+#endif /* __SND_SUNXI_MACH_UTILS_H */
--
Created with Armbian build tools https://github.com/armbian/build
2.35.3

6
patch/kernel/archive/sunxi-6.13/patches.armbian/arm64-allwinner-Add-sun50i-h618-bananapi-m4-berry-support.patch
View File

@ -1,4 +1,4 @@
From e8368d61ef83b704d019ba86e468f058375d9d43 Mon Sep 17 00:00:00 2001
From 65f6f6ed38bc3aae4790c198b4ed2f527ddcbe2e 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: 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-orangepi-zero2w.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 80a7b12b6b5c..71ae4e6c5f94 100644
index 624bc0e95295..5685d929cf0b 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -450,6 +450,48 @@ mmc2_pins: mmc2-pins {
@@ -565,6 +565,48 @@ pwm5_pin: pwm5-pin {
bias-pull-up;
};

24
patch/kernel/archive/sunxi-6.13/patches.armbian/arm64-dts-sun50i-h616-add-pwm-nodes-support.patch
View File

@ -1,17 +1,17 @@
From 27928e904c38bafc1702ac3f02e84be6ad7a6d12 Mon Sep 17 00:00:00 2001
From 476ae5840384c7b61eb4270cdf7641772807f100 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Thu, 10 Apr 2025 13:19:52 +0300
Subject: arm64: dts: sun50i-h616: add pwm nodes support
---
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 115 ++++++++++++++++++
1 file changed, 115 insertions(+)
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 103 ++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 668ed3b9090a..fc134db28f75 100644
index 668ed3b9090a..72d008d6d4e7 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -332,6 +332,55 @@ watchdog: watchdog@30090a0 {
@@ -332,6 +332,44 @@ watchdog: watchdog@30090a0 {
clocks = <&osc24M>;
};
@ -31,43 +31,32 @@ index 668ed3b9090a..fc134db28f75 100644
+
+ pwm0: pwm0@0300a000 {
+ compatible = "allwinner,sunxi-pwm0";
+ /* pinctrl-names = "default"; */
+ /* pinctrl-0 = <&pwm0_pin>; */
+ /* status = "disabled"; */
+ };
+
+ pwm1: pwm1@0300a000 {
+ compatible = "allwinner,sunxi-pwm1";
+ pinctrl-names = "default";
+ };
+
+ pwm2: pwm2@0300a000 {
+ compatible = "allwinner,sunxi-pwm2";
+ pinctrl-names = "default";
+ };
+
+ pwm3: pwm3@0300a000 {
+ compatible = "allwinner,sunxi-pwm3";
+ pinctrl-names = "default";
+ };
+
+ pwm4: pwm4@0300a000 {
+ compatible = "allwinner,sunxi-pwm4";
+ pinctrl-names = "default";
+ };
+
+ pwm5: pwm5@0300a000 {
+ compatible = "allwinner,sunxi-pwm5";
+ pinctrl-names = "default";
+ /* pinctrl-0 = <&pwm5_pin>;
+ clk_bypass_output = <0x1>;
+ status = "disabled"; */
+ };
+
pio: pinctrl@300b000 {
compatible = "allwinner,sun50i-h616-pinctrl";
reg = <0x0300b000 0x400>;
@@ -444,6 +493,72 @@ mmc2_pins: mmc2-pins {
@@ -444,6 +482,71 @@ mmc2_pins: mmc2-pins {
bias-pull-up;
};
@ -134,7 +123,6 @@ index 668ed3b9090a..fc134db28f75 100644
+ pwm5_pin: pwm5-pin {
+ pins = "PA12";
+ function = "pwm5";
+ bias-pull-up;
+ };
+
/omit-if-no-ref/

12
patch/kernel/archive/sunxi-6.13/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch
View File

@ -1,15 +1,15 @@
From 140794c4bcf8efd9551b88d5c7e7c79c83d97a70 Mon Sep 17 00:00:00 2001
From 8abc92df29fd8026d4ee52c6f5b8bd1a21d4ae15 Mon Sep 17 00:00:00 2001
From: chraac <chraac@gmail.com>
Date: Fri, 15 Mar 2024 12:30:26 +0800
Subject: arm64: dts: sun50i-h618-orangepi-zero2w: Add missing nodes
---
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 25 +-
.../allwinner/sun50i-h618-orangepi-zero2w.dts | 269 ++++++++++++++++++
2 files changed, 286 insertions(+), 8 deletions(-)
.../allwinner/sun50i-h618-orangepi-zero2w.dts | 270 ++++++++++++++++++
2 files changed, 287 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 668ed3b9090a..e9bbd5441980 100644
index fc134db28f75..3d7405e2a95f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -241,7 +241,7 @@ video-codec@1c0e000 {
@ -21,7 +21,7 @@ index 668ed3b9090a..e9bbd5441980 100644
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -816,19 +816,28 @@ mdio0: mdio {
@@ -931,19 +931,28 @@ mdio0: mdio {
};
emac1: ethernet@5030000 {
@ -58,7 +58,7 @@ index 668ed3b9090a..e9bbd5441980 100644
#size-cells = <0>;
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
index a0fe7a9afb77..dcc3a0df5922 100644
index a0fe7a9afb77..9353d3bf8115 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
@@ -18,12 +18,27 @@ / {

2
patch/kernel/archive/sunxi-6.13/patches.megous/cpufreq-sun50i-Show-detected-CPU-bin-for-easier-debugging.patch
View File

@ -21,7 +21,7 @@ index 17d6a149f580..be35841c5c61 100644
+ pr_info("Using CPU speed bin %s\n", name);
+
for_each_possible_cpu(cpu) {
for_each_present_cpu(cpu) {
struct device *cpu_dev = get_cpu_device(cpu);
--

6
patch/kernel/archive/sunxi-6.13/patches.megous/pci-Workaround-ITS-timeouts-on-poweroff-reboot-on-Orange-Pi-5-P.patch
View File

@ -1,4 +1,4 @@
From 16e2a08ccbd82674594bb15b75a62afe4610373e Mon Sep 17 00:00:00 2001
From bf4aff29b26c41d436d6c65d759d148035a1b2f5 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Wed, 14 Jun 2023 00:48:21 +0200
Subject: pci: Workaround ITS timeouts on poweroff/reboot on Orange Pi 5 Plus
@ -15,10 +15,10 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/portdrv.c b/drivers/pci/pcie/portdrv.c
index 02e73099bad0..c4387953fd23 100644
index e8318fd5f6ed..22d65c83396e 100644
--- a/drivers/pci/pcie/portdrv.c
+++ b/drivers/pci/pcie/portdrv.c
@@ -741,7 +741,7 @@ static void pcie_portdrv_shutdown(struct pci_dev *dev)
@@ -743,7 +743,7 @@ static void pcie_portdrv_shutdown(struct pci_dev *dev)
pm_runtime_dont_use_autosuspend(&dev->dev);
}

5
patch/kernel/archive/sunxi-6.13/series.conf
View File

@ -290,7 +290,7 @@
patches.drm/arm64-dts-allwinner-h616-Add-Mali-GPU-node.patch
patches.drm/drm-panfrost-Add-PM-runtime-flags.patch
patches.drm/drm-panfrost-add-h616-compatible-string.patch
patches.drm/drm-panfrost-reorder-pd-clk-rst-sequence
patches.drm/drm-panfrost-reorder-pd-clk-rst-sequence.patch
################################################################################
#
@ -471,7 +471,8 @@
patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch
patches.armbian/arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3.patch
patches.armbian/arm64-sun50i-h616-Add-i2c-2-3-4-uart-2-5-pins.patch
patches.armbian/arm64-dts-h616-8-Add-overlays-i2c-234-ph-pg-uart-25-ph-pg.patch
patches.armbian/arm64-dts-sun50i-h616-add-pwm-nodes-support.patch
patches.armbian/arm64-dts-h616-8-Add-overlays-i2c-pwm-uart.patch
patches.armbian/arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes.patch
patches.armbian/add-dtb-overlay-for-zero2w.patch
patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch