sunxi-6.11: Re-extract armbian patches

This commit is contained in:
The-going 2024-10-08 19:34:53 +03:00 committed by Igor
parent ed323cbda6
commit c7c39d91b9
9 changed files with 44 additions and 74 deletions

View File

@ -1,4 +1,4 @@
From c83ad4e6eaec26f1cafa2765968b9fa1d71fe3c1 Mon Sep 17 00:00:00 2001
From 8c08442e2c5d2d57a109b05d35276e4f04416a8e Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Thu, 1 Sep 2022 17:36:53 +0200
Subject: ASoC: AC200: Initial driver
@ -7,8 +7,8 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
sound/soc/codecs/Kconfig | 10 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/ac200.c | 774 ++++++++++++++++++++++++++++++++++++++
3 files changed, 786 insertions(+)
sound/soc/codecs/ac200.c | 772 ++++++++++++++++++++++++++++++++++++++
3 files changed, 784 insertions(+)
create mode 100644 sound/soc/codecs/ac200.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
@ -61,7 +61,7 @@ index 571c08fdeae3..3e5614fe4d60 100644
obj-$(CONFIG_SND_SOC_AD193X) += snd-soc-ad193x.o
diff --git a/sound/soc/codecs/ac200.c b/sound/soc/codecs/ac200.c
new file mode 100644
index 000000000000..113a45408116
index 000000000000..662de230dc83
--- /dev/null
+++ b/sound/soc/codecs/ac200.c
@@ -0,0 +1,772 @@

View File

@ -1,7 +1,7 @@
From b9d3b6e919bf6c82e8fd3cdaed11d212b066e61d Mon Sep 17 00:00:00 2001
From ab89eadbd909022e7be9052e5765d1309f64984b Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Thu, 3 Oct 2024 12:59:06 -0400
Subject: [PATCH] Add BPI-M4-ZERO sdio wifi bt overlay
Subject: Add BPI-M4-ZERO sdio wifi bt overlay
sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
@ -13,10 +13,10 @@ Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile
index 76a4952e3ecc..cd4dda360f3c 100644
index 24383cb63770..3d3f715c15d4 100644
--- a/arch/arm64/boot/dts/allwinner/overlay/Makefile
+++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile
@@ -66,7 +66,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
@@ -67,7 +67,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
sun50i-h616-i2c0-pi.dtbo \
sun50i-h616-i2c1-pi.dtbo \
sun50i-h616-i2c2-pi.dtbo \
@ -28,7 +28,7 @@ index 76a4952e3ecc..cd4dda360f3c 100644
sun50i-a64-fixup.scr \
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
new file mode 100644
index 000000000000..d73673cc38ba
index 000000000000..f52d445dfc4f
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
@@ -0,0 +1,45 @@
@ -78,34 +78,5 @@ index 000000000000..d73673cc38ba
+ };
+};
--
2.39.5
From 3d9f8f85c01d3e0fe1cf4a28aeab938c34b7eb76 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Fri, 4 Oct 2024 09:59:31 -0400
Subject: [PATCH] Disable bluetooth as it wont load in Armbian
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
.../overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
index d73673cc38ba..352e8bdc2360 100644
--- a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso
@@ -31,6 +31,11 @@ __overlay__ {
fragment@2 {
target = <&uart1>;
__overlay__ {
+ /*
+ * Until figured out disable bluetooth as it won't currently load properly in Armbian.
+ */
+ status = "disabled";
+
bluetooth {
compatible = "brcm,bcm43438-bt";
host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>;
--
2.39.5
2.35.3

View File

@ -1,7 +1,7 @@
From fa35b83620c8bd415487197eba69d09b998c964f Mon Sep 17 00:00:00 2001
From 35466d40a5d04ad03ef7a5d5abf1512e5e1df1bd Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Thu, 3 Oct 2024 12:46:14 -0400
Subject: [PATCH] Add board BananaPi BPI-M4-ZERO
Subject: Add board BananaPi BPI-M4-ZERO
sun50i-h618-bananapi-m4-zero.dts
sun50i-h618-bananapi-m4.dtsi
@ -16,10 +16,10 @@ Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index 717ef4a7ca1c..c2922d51cee2 100644
index a2ca84f2e3fe..0df5a842ce1f 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-pi.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb
@ -29,7 +29,7 @@ index 717ef4a7ca1c..c2922d51cee2 100644
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
new file mode 100644
index 000000000000..61829ab55218
index 000000000000..d7c6e0fdf2ff
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts
@@ -0,0 +1,73 @@
@ -108,7 +108,7 @@ index 000000000000..61829ab55218
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
new file mode 100644
index 000000000000..8a73b9e81fdb
index 000000000000..9a975de996c6
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi
@@ -0,0 +1,252 @@
@ -365,5 +365,5 @@ index 000000000000..8a73b9e81fdb
+ pinctrl-names = "default";
+};
--
2.39.5
2.35.3

View File

@ -1,4 +1,4 @@
From 329a85b6b0e78cb8acb3404ea0fcf289a42a18da Mon Sep 17 00:00:00 2001
From 2b58dc044c4d6d66b4bfa970edbbccdd62a9ed45 Mon Sep 17 00:00:00 2001
From: afaulkner420 <afaulkner420@gmail.com>
Date: Fri, 25 Mar 2022 19:28:00 +0000
Subject: Add dump_reg and sunxi-sysinfo drivers
@ -8,13 +8,13 @@ Subject: Add dump_reg and sunxi-sysinfo drivers
drivers/char/Makefile | 2 +
drivers/char/dump_reg/Kconfig | 21 +
drivers/char/dump_reg/Makefile | 2 +
drivers/char/dump_reg/dump_reg.c | 888 +++++++++++++++++++++
drivers/char/dump_reg/dump_reg.c | 887 +++++++++++++++++++++
drivers/char/dump_reg/dump_reg.h | 132 +++
drivers/char/dump_reg/dump_reg_misc.c | 209 +++++
drivers/char/sunxi-sysinfo/Kconfig | 10 +
drivers/char/sunxi-sysinfo/Makefile | 5 +
drivers/char/sunxi-sysinfo/sunxi-sysinfo.c | 177 ++++
10 files changed, 1448 insertions(+)
drivers/char/sunxi-sysinfo/sunxi-sysinfo.c | 175 ++++
10 files changed, 1445 insertions(+)
create mode 100644 drivers/char/dump_reg/Kconfig
create mode 100644 drivers/char/dump_reg/Makefile
create mode 100644 drivers/char/dump_reg/dump_reg.c
@ -91,7 +91,7 @@ index 000000000000..e953f413b128
+obj-$(CONFIG_DUMP_REG_MISC) += dump_reg_misc.o
diff --git a/drivers/char/dump_reg/dump_reg.c b/drivers/char/dump_reg/dump_reg.c
new file mode 100644
index 000000000000..a839666c50a5
index 000000000000..f5d64c4af036
--- /dev/null
+++ b/drivers/char/dump_reg/dump_reg.c
@@ -0,0 +1,887 @@
@ -1364,7 +1364,7 @@ index 000000000000..188696592114
+obj-$(CONFIG_SUNXI_SYS_INFO) += sunxi-sysinfo.o
diff --git a/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c b/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c
new file mode 100644
index 000000000000..a5b4e6c0b578
index 000000000000..21f59363cabf
--- /dev/null
+++ b/drivers/char/sunxi-sysinfo/sunxi-sysinfo.c
@@ -0,0 +1,175 @@

View File

@ -1,4 +1,4 @@
From 9737d174f06271720d7b595429deb8f7d79038e5 Mon Sep 17 00:00:00 2001
From 48aed9ce68a4a332928a1722bf36ecd95aa6bda3 Mon Sep 17 00:00:00 2001
From: afaulkner420 <afaulkner420@gmail.com>
Date: Fri, 25 Mar 2022 20:18:18 +0000
Subject: Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses
@ -8,9 +8,9 @@ Subject: Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses
drivers/misc/Makefile | 1 +
drivers/misc/sunxi-addr/Kconfig | 6 +
drivers/misc/sunxi-addr/Makefile | 5 +
drivers/misc/sunxi-addr/sha256.c | 178 +++++++++++++
drivers/misc/sunxi-addr/sunxi-addr.c | 357 +++++++++++++++++++++++++++
6 files changed, 548 insertions(+)
drivers/misc/sunxi-addr/sha256.c | 178 ++++++++++++++
drivers/misc/sunxi-addr/sunxi-addr.c | 356 +++++++++++++++++++++++++++
6 files changed, 547 insertions(+)
create mode 100644 drivers/misc/sunxi-addr/Kconfig
create mode 100644 drivers/misc/sunxi-addr/Makefile
create mode 100644 drivers/misc/sunxi-addr/sha256.c
@ -244,7 +244,7 @@ index 000000000000..78825810c53f
+}
diff --git a/drivers/misc/sunxi-addr/sunxi-addr.c b/drivers/misc/sunxi-addr/sunxi-addr.c
new file mode 100644
index 000000000000..f4f2dcecbb48
index 000000000000..c8a50c8dbac6
--- /dev/null
+++ b/drivers/misc/sunxi-addr/sunxi-addr.c
@@ -0,0 +1,356 @@

View File

@ -1,4 +1,4 @@
From e7df6e95559a14fba51b428022f048dd9aca2dda Mon Sep 17 00:00:00 2001
From 09864f42f1f49c76f695a63256ce9f077092f4b4 Mon Sep 17 00:00:00 2001
From: Alan <Alan>
Date: Sat, 20 May 2023 17:26:21 +0800
Subject: Add: ws2812 RGB driver for allwinner H616
@ -6,8 +6,8 @@ Subject: Add: ws2812 RGB driver for allwinner H616
---
drivers/leds/rgb/Kconfig | 7 +
drivers/leds/rgb/Makefile | 1 +
drivers/leds/rgb/leds-ws2812.c | 229 +++++++++++++++++++++++++++++++++
3 files changed, 237 insertions(+)
drivers/leds/rgb/leds-ws2812.c | 227 +++++++++++++++++++++++++++++++++
3 files changed, 235 insertions(+)
create mode 100644 drivers/leds/rgb/leds-ws2812.c
diff --git a/drivers/leds/rgb/Kconfig b/drivers/leds/rgb/Kconfig
@ -37,7 +37,7 @@ index a501fd27f179..8f7646ead3c1 100644
+obj-$(CONFIG_LEDS_WS2812) += leds-ws2812.o
diff --git a/drivers/leds/rgb/leds-ws2812.c b/drivers/leds/rgb/leds-ws2812.c
new file mode 100644
index 000000000000..1af735ce8e4d
index 000000000000..c9981724bba9
--- /dev/null
+++ b/drivers/leds/rgb/leds-ws2812.c
@@ -0,0 +1,227 @@

View File

@ -1,11 +1,10 @@
From 1521eb641d2e14399b88f22020322b1800cebc83 Mon Sep 17 00:00:00 2001
From 27ce5eef6b563fc98f0cb20b045b6fe7568e38f9 Mon Sep 17 00:00:00 2001
From: Stephen Graf <stephen.graf@gmail.com>
Date: Thu, 9 May 2024 20:59:34 -0700
Subject: Sound for H616, H618 Allwinner SOCs
Signed-off-by: Stephen Graf <stephen.graf@gmail.com>
Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>
---
.../allwinner/sun50i-h616-orangepi-zero.dtsi | 18 +
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 75 +-
@ -78,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 d91f372d29eb..6fd1e5a36cf5 100644
index 608bcb926ded..c15e83e443d0 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -513,7 +513,8 @@ gic: interrupt-controller@3021000 {
@@ -531,7 +531,8 @@ gic: interrupt-controller@3021000 {
};
iommu: iommu@30f0000 {
@ -91,7 +90,7 @@ index d91f372d29eb..6fd1e5a36cf5 100644
reg = <0x030f0000 0x10000>;
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_IOMMU>;
@@ -870,6 +871,78 @@ mdio1: mdio {
@@ -888,6 +889,78 @@ mdio1: mdio {
};
};

View File

@ -1,4 +1,4 @@
From 5c433ccca61386f24e30e2d124681ceba109f48f Mon Sep 17 00:00:00 2001
From b4ea287b834fc89cb06a938614527eea5d5c676c Mon Sep 17 00:00:00 2001
From: chraac <chraac@gmail.com>
Date: Thu, 15 Aug 2024 23:38:44 +0800
Subject: drivers: pwm: Add pwm-sunxi-enhance driver for h616
@ -6,9 +6,9 @@ Subject: drivers: pwm: Add pwm-sunxi-enhance driver for h616
---
drivers/pwm/Kconfig | 9 +
drivers/pwm/Makefile | 1 +
drivers/pwm/pwm-sunxi-enhance.c | 1196 +++++++++++++++++++++++++++++++
drivers/pwm/pwm-sunxi-enhance.c | 1194 +++++++++++++++++++++++++++++++
drivers/pwm/pwm-sunxi-enhance.h | 60 ++
4 files changed, 1266 insertions(+)
4 files changed, 1264 insertions(+)
create mode 100644 drivers/pwm/pwm-sunxi-enhance.c
create mode 100644 drivers/pwm/pwm-sunxi-enhance.h
@ -46,7 +46,7 @@ index 0be4f3e6dd43..e5535d30b460 100644
obj-$(CONFIG_PWM_TIECAP) += pwm-tiecap.o
diff --git a/drivers/pwm/pwm-sunxi-enhance.c b/drivers/pwm/pwm-sunxi-enhance.c
new file mode 100644
index 000000000000..1216cae54856
index 000000000000..6604c447b3b0
--- /dev/null
+++ b/drivers/pwm/pwm-sunxi-enhance.c
@@ -0,0 +1,1194 @@

View File

@ -1,4 +1,4 @@
From e448fd218bb1e7b356fec0b23ac1a39cb15d7ca9 Mon Sep 17 00:00:00 2001
From e2ec74ef55c32da2987960d5816a9f6e78afee80 Mon Sep 17 00:00:00 2001
From: Andre Przywara <andre.przywara@arm.com>
Date: Mon, 13 Jun 2022 17:37:19 +0100
Subject: mfd: Add support for X-Powers AC200 EPHY syscon
@ -33,8 +33,8 @@ Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
drivers/phy/allwinner/Kconfig | 9 +
drivers/phy/allwinner/Makefile | 1 +
drivers/phy/allwinner/ac200-ephy-ctl.c | 301 +++++++++++++++++++++++++
3 files changed, 311 insertions(+)
drivers/phy/allwinner/ac200-ephy-ctl.c | 299 +++++++++++++++++++++++++
3 files changed, 309 insertions(+)
create mode 100644 drivers/phy/allwinner/ac200-ephy-ctl.c
diff --git a/drivers/phy/allwinner/Kconfig b/drivers/phy/allwinner/Kconfig
@ -65,7 +65,7 @@ index bd74901a1255..0eecec7a908a 100644
+obj-$(CONFIG_AC200_PHY_CTL) += ac200-ephy-ctl.o
diff --git a/drivers/phy/allwinner/ac200-ephy-ctl.c b/drivers/phy/allwinner/ac200-ephy-ctl.c
new file mode 100644
index 000000000000..8efeaf18e42c
index 000000000000..f721ea72223c
--- /dev/null
+++ b/drivers/phy/allwinner/ac200-ephy-ctl.c
@@ -0,0 +1,299 @@