diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 67bb75182417..5df01563e89b 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -36,7 +36,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.11.1" + declare -g KERNELBRANCH="tag:v6.11.2" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 6a45d750d916..08bc12719e67 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -37,7 +37,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.11.1" + declare -g KERNELBRANCH="tag:v6.11.2" ;; esac diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/ASoC-AC200-Initial-driver.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/ASoC-AC200-Initial-driver.patch index ed6fc2039d41..2892599482ae 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/ASoC-AC200-Initial-driver.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/ASoC-AC200-Initial-driver.patch @@ -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 Date: Thu, 1 Sep 2022 17:36:53 +0200 Subject: ASoC: AC200: Initial driver @@ -7,8 +7,8 @@ Signed-off-by: Jernej Skrabec --- 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 @@ diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BPI-M4-ZERO-sdio-wifi-bt-overlay.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BPI-M4-ZERO-sdio-wifi-bt-overlay.patch index 0e51cb35eb99..fca59b396696 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BPI-M4-ZERO-sdio-wifi-bt-overlay.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BPI-M4-ZERO-sdio-wifi-bt-overlay.patch @@ -1,6 +1,6 @@ -From b9d3b6e919bf6c82e8fd3cdaed11d212b066e61d Mon Sep 17 00:00:00 2001 +From 57f3aa16ec2a46967b56f7849eaf7f34c09fe5b8 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Thu, 3 Oct 2024 12:59:06 -0400 +Date: Wed, 9 Oct 2024 08:05:54 -0400 Subject: [PATCH] Add BPI-M4-ZERO sdio wifi bt overlay sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso @@ -8,12 +8,12 @@ sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso Signed-off-by: Patrick Yavitz --- .../arm64/boot/dts/allwinner/overlay/Makefile | 3 +- - .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 45 +++++++++++++++++++ - 2 files changed, 47 insertions(+), 1 deletion(-) + .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 29 +++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) 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 76a4952e3ecc..b10db212cdf2 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) += \ @@ -28,21 +28,13 @@ 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..b672807fab66 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso -@@ -0,0 +1,45 @@ +@@ -0,0 +1,29 @@ +/dts-v1/; +/plugin/; + -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ +/ { + compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618"; + @@ -65,47 +57,10 @@ index 000000000000..d73673cc38ba + fragment@2 { + target = <&uart1>; + __overlay__ { -+ bluetooth { -+ compatible = "brcm,bcm43438-bt"; -+ host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>; -+ device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>; -+ shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>; -+ max-speed = <1500000>; -+ vbat-supply = <®_dldo1>; -+ vddio-supply = <®_aldo1>; -+ }; ++ status = "okay"; + }; + }; +}; -- 2.39.5 -From 3d9f8f85c01d3e0fe1cf4a28aeab938c34b7eb76 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Fri, 4 Oct 2024 09:59:31 -0400 -Subject: [PATCH] Disable bluetooth as it wont load in Armbian - -Signed-off-by: Patrick Yavitz ---- - .../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 - diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-board-BananaPi-BPI-M4-ZERO.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-board-BananaPi-BPI-M4-ZERO.patch index d168cfba64d7..2c717dc547e8 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-board-BananaPi-BPI-M4-ZERO.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-board-BananaPi-BPI-M4-ZERO.patch @@ -1,6 +1,6 @@ -From fa35b83620c8bd415487197eba69d09b998c964f Mon Sep 17 00:00:00 2001 +From 946c4756a270d64c9a128e629ff7c4789a5ff8c4 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Thu, 3 Oct 2024 12:46:14 -0400 +Date: Mon, 7 Oct 2024 08:37:08 -0400 Subject: [PATCH] Add board BananaPi BPI-M4-ZERO sun50i-h618-bananapi-m4-zero.dts @@ -10,8 +10,8 @@ Signed-off-by: Patrick Yavitz --- arch/arm64/boot/dts/allwinner/Makefile | 1 + .../sun50i-h618-bananapi-m4-zero.dts | 73 +++++ - .../allwinner/sun50i-h618-bananapi-m4.dtsi | 252 ++++++++++++++++++ - 3 files changed, 326 insertions(+) + .../allwinner/sun50i-h618-bananapi-m4.dtsi | 280 ++++++++++++++++++ + 3 files changed, 354 insertions(+) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi @@ -108,10 +108,10 @@ 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..32fa9588efda --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi -@@ -0,0 +1,252 @@ +@@ -0,0 +1,280 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2024 Patrick Yavitz @@ -147,16 +147,6 @@ index 000000000000..8a73b9e81fdb + }; + }; + -+ gpio-keys { -+ compatible = "gpio-keys"; -+ -+ key-sw3 { -+ label = "sw3"; -+ linux,code = ; -+ gpios = <&pio 2 7 GPIO_ACTIVE_LOW>; /* PC7 */ -+ }; -+ }; -+ + leds { + compatible = "gpio-leds"; + @@ -171,19 +161,37 @@ index 000000000000..8a73b9e81fdb + reg_usb_vbus: regulator-usb-vbus { + /* Separate discrete regulator for the USB ports */ + compatible = "regulator-fixed"; -+ regulator-name = "usb-vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; ++ regulator-name = "usb-vbus"; + vin-supply = <®_vcc5v>; + }; + + reg_vcc5v: regulator-vcc5v { + /* Board wide 5V supply directly from the USB-C socket */ + compatible = "regulator-fixed"; -+ regulator-name = "vcc-5v"; ++ regulator-always-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; ++ regulator-name = "vcc-5v"; ++ }; ++ ++ reg_vcc3v3: regulator-vcc3v3 { ++ compatible = "regulator-fixed"; + regulator-always-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc-3v3"; ++ vin-supply = <®_vcc5v>; ++ }; ++ ++ reg_vcc1v8: regulator-vcc1v8 { ++ compatible = "regulator-fixed"; ++ regulator-always-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "vcc-1v8"; ++ vin-supply = <®_vcc3v3>; + }; + + wifi_pwrseq: wifi-pwrseq { @@ -240,38 +248,48 @@ index 000000000000..8a73b9e81fdb + +&mmc0 { + status = "okay"; -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ -+ disable-wp; + bus-width = <4>; + max-frequency = <50000000>; -+ vmmc-supply = <®_dldo1>; ++ ++ disable-wp; ++ ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ ++ vmmc-supply = <®_vcc3v3>; +}; + +&mmc1 { + status = "disabled"; + bus-width = <4>; ++ max-frequency = <100000000>; ++ + non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power to be kept while in suspend */ ++ keep-power-in-suspend; ++ + mmc-pwrseq = <&wifi_pwrseq>; -+ vmmc-supply = <®_dldo1>; -+ vqmmc-supply = <®_aldo1>; + -+ sdio_wifi: wifi@1 { ++ cd-gpios = <&pio 6 15 GPIO_ACTIVE_HIGH>; /* PG15 */ ++ vmmc-supply = <®_vcc3v3>; ++ ++ sdio: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; -+ interrupt-parent = <&pio>; -+ interrupts = <6 15 IRQ_TYPE_LEVEL_LOW>; /* PG15 */ -+ interrupt-names = "host-wake"; + }; +}; + +&mmc2 { + status = "okay"; + bus-width = <8>; -+ non-removable; + cap-mmc-hw-reset; + mmc-hs200-1_8v; -+ vmmc-supply = <®_dldo1>; -+ vqmmc-supply = <®_aldo1>; ++ ++ non-removable; ++ disable-wp; ++ ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc1v8>; +}; + +&pio { @@ -353,10 +371,20 @@ index 000000000000..8a73b9e81fdb +}; + +&uart1 { -+ status = "okay"; ++ status = "disabled"; + pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "brcm,bcm43540-bt"; ++ host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>; ++ device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>; ++ shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>; ++ max-speed = <1500000>; ++ vbat-supply = <®_vcc3v3>; ++ vddio-supply = <®_vcc3v3>; ++ }; +}; + +&uart5 { diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch index 0abe76eac47a..0ed9538aa667 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch @@ -1,4 +1,4 @@ -From 329a85b6b0e78cb8acb3404ea0fcf289a42a18da Mon Sep 17 00:00:00 2001 +From 2b58dc044c4d6d66b4bfa970edbbccdd62a9ed45 Mon Sep 17 00:00:00 2001 From: afaulkner420 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 @@ diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch index 9f1e8abfafde..7de73bbf9034 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch @@ -1,4 +1,4 @@ -From 9737d174f06271720d7b595429deb8f7d79038e5 Mon Sep 17 00:00:00 2001 +From 48aed9ce68a4a332928a1722bf36ecd95aa6bda3 Mon Sep 17 00:00:00 2001 From: afaulkner420 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 @@ diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-ws2812-RGB-driver-for-allwinner-H616.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-ws2812-RGB-driver-for-allwinner-H616.patch index 2bc7dc76c769..b3e12b12e0a1 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-ws2812-RGB-driver-for-allwinner-H616.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-ws2812-RGB-driver-for-allwinner-H616.patch @@ -1,4 +1,4 @@ -From e7df6e95559a14fba51b428022f048dd9aca2dda Mon Sep 17 00:00:00 2001 +From 09864f42f1f49c76f695a63256ce9f077092f4b4 Mon Sep 17 00:00:00 2001 From: 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 @@ diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch index 1ed20ef1dece..a90bd511ac8b 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch @@ -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 Date: Thu, 9 May 2024 20:59:34 -0700 Subject: Sound for H616, H618 Allwinner SOCs Signed-off-by: Stephen Graf 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 = ; clocks = <&ccu CLK_BUS_IOMMU>; -@@ -870,6 +871,78 @@ mdio1: mdio { +@@ -888,6 +889,78 @@ mdio1: mdio { }; }; diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/drivers-pwm-Add-pwm-sunxi-enhance-driver-for-h616.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/drivers-pwm-Add-pwm-sunxi-enhance-driver-for-h616.patch index 40d55c955364..4d5609da3f87 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/drivers-pwm-Add-pwm-sunxi-enhance-driver-for-h616.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/drivers-pwm-Add-pwm-sunxi-enhance-driver-for-h616.patch @@ -1,4 +1,4 @@ -From 5c433ccca61386f24e30e2d124681ceba109f48f Mon Sep 17 00:00:00 2001 +From b4ea287b834fc89cb06a938614527eea5d5c676c Mon Sep 17 00:00:00 2001 From: chraac 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 @@ diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/mfd-Add-support-for-X-Powers-AC200-EPHY-syscon.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/mfd-Add-support-for-X-Powers-AC200-EPHY-syscon.patch index 80b03c9adb78..e6501842f5d9 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/mfd-Add-support-for-X-Powers-AC200-EPHY-syscon.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/mfd-Add-support-for-X-Powers-AC200-EPHY-syscon.patch @@ -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 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 --- 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 @@ diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch index 93b1132d2d55..ab0caf68400e 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Add-support-for-POWER_SUPPLY_PROP_E.patch @@ -41,8 +41,8 @@ index 210be590691c..19b5f332fa75 100644 return -EINVAL; } @@ -563,6 +574,8 @@ static enum power_supply_property axp20x_battery_props[] = { - POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, - POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, + POWER_SUPPLY_PROP_VOLTAGE_MAX, + POWER_SUPPLY_PROP_VOLTAGE_MIN, POWER_SUPPLY_PROP_CAPACITY, + POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN, + POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN, diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch index 13018f08d4d6..758787efe608 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x-battery-Support-POWER_SUPPLY_PROP_CHARGE_BE.patch @@ -70,8 +70,8 @@ index b7b3e6b945dd..4e084b83e7cf 100644 { return psp == POWER_SUPPLY_PROP_STATUS || + psp == POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR || - psp == POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN || - psp == POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN || + psp == POWER_SUPPLY_PROP_VOLTAGE_MIN || + psp == POWER_SUPPLY_PROP_VOLTAGE_MAX || psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT || @@ -554,6 +584,7 @@ static const struct power_supply_desc axp20x_batt_ps_desc = { .property_is_writeable = axp20x_battery_prop_writeable, diff --git a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch index 03a781b74943..2a0095a0311d 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.megous/power-supply-axp20x_battery-Add-support-for-reporting-OCV.patch @@ -55,8 +55,8 @@ index f24520719a74..bad981c349ff 100644 POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, POWER_SUPPLY_PROP_HEALTH, + POWER_SUPPLY_PROP_VOLTAGE_OCV, - POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, - POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, + POWER_SUPPLY_PROP_VOLTAGE_MAX, + POWER_SUPPLY_PROP_VOLTAGE_MIN, POWER_SUPPLY_PROP_CAPACITY, -- 2.35.3