sunxi-6.10: Delete unused patches and add newly extracted patches.

The patches in the series were applied to the Linux kernel git repository as the "git am" command. And then re-extracted to the target patches.armbian folder using the tools/mk_format_patch script. In this case, the series.armbian file is created anew and all patches in the series strictly correspond to this list. I.e. unused ones will be deleted. The name of the patch file will match the string "Subject:". Signed-off-by: The-going <[email protected]>
armbian · Aug 25, 2024 · 8d3af64 · 8d3af64
1 parent 382aee3
commit 8d3af64
Show file tree

Hide file tree

Showing 118 changed files with 1,331 additions and 8,318 deletions.
diff --git a/...chive/sunxi-6.10/patches.armbian/ARM-dts-sun8i-nanopiduo2-Use-key-0-as-power-button.patch b/...chive/sunxi-6.10/patches.armbian/ARM-dts-sun8i-nanopiduo2-Use-key-0-as-power-button.patch
@@ -0,0 +1,31 @@
+From c2c61310e4f328da39cabdae74cc8a08dc2d4150 Mon Sep 17 00:00:00 2001
+From: Gunjan Gupta <[email protected]>
+Date: Mon, 26 Jun 2023 13:29:46 +0000
+Subject: ARM: dts: sun8i: nanopiduo2: Use key-0 as power button
+
+The onboard button key-0 was not marked as power button. This meant
+that once the board was suspended, there was no way to bring it back
+to life. Mark key-0 as power button so that it can be used to bring
+the board back to life
+---
+ arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts
+index 2b0566d4b386..5b6de5637b0f 100644
+--- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts
+@@ -42,8 +42,9 @@ gpio-keys {
+
+ 		key-0 {
+ 			label = "k1";
+-			linux,code = <BTN_0>;
++			linux,code = <KEY_POWER>;
+ 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; /* PL3 */
++			wakeup-source;
+ 		};
+ 	};
+
+-- 
+2.35.3
+
diff --git a/.../kernel/archive/sunxi-6.10/patches.armbian/ARM-dts-sun8i-nanopiduo2-enable-ethernet.patch b/.../kernel/archive/sunxi-6.10/patches.armbian/ARM-dts-sun8i-nanopiduo2-enable-ethernet.patch
@@ -0,0 +1,31 @@
+From f2064f53dc7f57e4e07a98ec77e5052b19899d6b Mon Sep 17 00:00:00 2001
+From: Gunjan Gupta <[email protected]>
+Date: Mon, 26 Jun 2023 13:53:14 +0000
+Subject: ARM: dts: sun8i: nanopiduo2: enable ethernet
+
+NanoPi Duo2 has pinout for ethernet. Lets enable the same in dts
+---
+ arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts
+index 5b6de5637b0f..c069cb6da85d 100644
+--- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts
++++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts
+@@ -105,6 +105,13 @@ &ehci0 {
+ 	status = "okay";
+ };
+
++&emac {
++	phy-handle = <&int_mii_phy>;
++	phy-mode = "mii";
++	allwinner,leds-active-low;
++	status = "okay";
++};
++
+ &mmc0 {
+ 	bus-width = <4>;
+ 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+-- 
+2.35.3
+
diff --git a/...chive/sunxi-6.10/patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-EMAC1.patch b/...chive/sunxi-6.10/patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-EMAC1.patch
@@ -0,0 +1,42 @@
+From 44e2ed7e9aa6ee3e0b0c7ae520463ebdc29a87c5 Mon Sep 17 00:00:00 2001
+From: JohnTheCoolingFan <[email protected]>
+Date: Thu, 13 Jun 2024 11:50:55 +0000
+Subject: ARM64: dts: sun50i-h616: BigTreeTech CB1: Enable EMAC1
+
+Signed-off-by: JohnTheCoolingFan <[email protected]>
+---
+ .../allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+index 853a0533c868..2022990e4bc0 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+@@ -149,6 +149,24 @@ &cpu0 {
+ 	cpu-supply = <&reg_dcdc2>;
+ };
+
++&emac1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&rmii_pins>;
++	phy-mode = "rmii";
++	phy-handle = <&rmii_phy>;
++	phy-supply = <&reg_dldo1>;
++	allwinner,rx-delay-ps = <3100>;
++	allwinner,tx-delay-ps = <700>;
++	status = "okay";
++};
++
++&mdio1 {
++	rmii_phy: ethernet-phy@1 {
++		compatible = "ethernet-phy-ieee802.3-c22";
++		reg = <1>;
++	};
++};
++
+ &mmc0 {
+ 	vmmc-supply = <&reg_dldo1>;
+ 	broken-cd;
+-- 
+2.35.3
+
diff --git a/...rchive/sunxi-6.10/patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-HDMI.patch b/...rchive/sunxi-6.10/patches.armbian/ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-HDMI.patch
@@ -0,0 +1,57 @@
+From 3050dec5c81cb295c449f3ec3ce921293c096728 Mon Sep 17 00:00:00 2001
+From: JohnTheCoolingFan <[email protected]>
+Date: Thu, 13 Jun 2024 11:07:35 +0000
+Subject: ARM64: dts: sun50i-h616: BigTreeTech CB1: Enable HDMI
+
+Signed-off-by: JohnTheCoolingFan <[email protected]>
+---
+ .../sun50i-h616-bigtreetech-cb1.dtsi          | 26 +++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+index 0da8f2e6e3d4..853a0533c868 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+@@ -26,6 +26,17 @@ chosen {
+ 		stdout-path = "serial0:115200n8";
+ 	};
+
++	connector {
++		compatible = "hdmi-connector";
++		type = "d";
++
++		port {
++			hdmi_con_in: endpoint {
++				remote-endpoint = <&hdmi_out_con>;
++			};
++		};
++	};
++
+ 	leds {
+ 		compatible = "gpio-leds";
+
+@@ -262,6 +273,21 @@ reg_dldo1: dldo1 {
+ 	};
+ };
+
++&de {
++	status = "okay";
++};
++
++&hdmi {
++	hvcc-supply = <&reg_aldo1>;
++	status = "okay";
++};
++
++&hdmi_out {
++	hdmi_out_con: endpoint {
++		remote-endpoint = <&hdmi_con_in>;
++	};
++};
++
+ &cpu0 {
+ 	cpu-supply = <&reg_dcdc2>;
+ 	status = "okay";
+-- 
+2.35.3
+
diff --git a/patch/kernel/archive/sunxi-6.10/patches.armbian/ASoC-AC200-Initial-driver.patch b/patch/kernel/archive/sunxi-6.10/patches.armbian/ASoC-AC200-Initial-driver.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 6e5bb89a202cee80bdd9c4289bd294cacca68829 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Thu, 1 Sep 2022 17:36:53 +0200
 Subject: ASoC: AC200: Initial driver
@@ -7,8 +7,9 @@ Signed-off-by: Jernej Skrabec <[email protected]>
 ---
  sound/soc/codecs/Kconfig  |  10 +
  sound/soc/codecs/Makefile |   2 +
- sound/soc/codecs/ac200.c  | 774 ++++++++++
+ sound/soc/codecs/ac200.c  | 774 ++++++++++++++++++++++++++++++++++++++
  3 files changed, 786 insertions(+)
+ create mode 100644 sound/soc/codecs/ac200.c
 
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
 index beae7bf571b4..485e52babfe9 100644
@@ -839,5 +840,5 @@ index 000000000000..113a45408116
 +MODULE_AUTHOR("Jernej Skrabec <[email protected]>");
 +MODULE_LICENSE("GPL");
 -- 
-Armbian
+2.35.3
 
diff --git a/...mbian/drv-staging-fbtft-add-st7796s.patch → ...s.armbian/Add-FB_TFT-ST7796S-driver.patch b/...mbian/drv-staging-fbtft-add-st7796s.patch → ...s.armbian/Add-FB_TFT-ST7796S-driver.patch
@@ -1,13 +1,14 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From c8bb533576f2c6031fba32e705c012def6e9a7b1 Mon Sep 17 00:00:00 2001
 From: Alan <Alan>
 Date: Sat, 20 May 2023 14:33:52 +0800
 Subject: Add: FB_TFT ST7796S driver
 
 ---
- drivers/staging/fbtft/Kconfig      |  10 +
+ drivers/staging/fbtft/Kconfig      |  10 +++
  drivers/staging/fbtft/Makefile     |   1 +
- drivers/staging/fbtft/fb_st7796s.c | 100 ++++++++++
+ drivers/staging/fbtft/fb_st7796s.c | 100 +++++++++++++++++++++++++++++
  3 files changed, 111 insertions(+)
+ create mode 100644 drivers/staging/fbtft/fb_st7796s.c
 
 diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig
 index 77ab44362f16..107065985eb4 100644
@@ -149,5 +150,5 @@ index 000000000000..cad489cef595
 +MODULE_AUTHOR("Alan Ma");
 +MODULE_LICENSE("GPL");
 -- 
-Armbian
+2.35.3
 
diff --git a/patch/kernel/archive/sunxi-6.10/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch b/patch/kernel/archive/sunxi-6.10/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 329a85b6b0e78cb8acb3404ea0fcf289a42a18da Mon Sep 17 00:00:00 2001
 From: afaulkner420 <[email protected]>
 Date: Fri, 25 Mar 2022 19:28:00 +0000
 Subject: Add dump_reg and sunxi-sysinfo drivers
@@ -8,13 +8,21 @@ 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.h           | 132 ++
- drivers/char/dump_reg/dump_reg_misc.c      | 209 +++
+ drivers/char/dump_reg/dump_reg.c           | 888 +++++++++++++++++++++
+ 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 ++
+ drivers/char/sunxi-sysinfo/sunxi-sysinfo.c | 177 ++++
  10 files changed, 1448 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
+ create mode 100644 drivers/char/dump_reg/dump_reg.h
+ create mode 100644 drivers/char/dump_reg/dump_reg_misc.c
+ create mode 100644 drivers/char/sunxi-sysinfo/Kconfig
+ create mode 100644 drivers/char/sunxi-sysinfo/Makefile
+ create mode 100644 drivers/char/sunxi-sysinfo/sunxi-sysinfo.c
 
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
 index 7c8dd0abcfdf..aaa164708947 100644
@@ -1539,5 +1547,5 @@ index 000000000000..a5b4e6c0b578
 +MODULE_AUTHOR("xiafeng<[email protected]>");
 +MODULE_DESCRIPTION("sunxi sys info.");
 -- 
-Armbian
+2.35.3
 
diff --git a/....10/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch b/....10/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 9737d174f06271720d7b595429deb8f7d79038e5 Mon Sep 17 00:00:00 2001
 From: afaulkner420 <[email protected]>
 Date: Fri, 25 Mar 2022 20:18:18 +0000
 Subject: Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses
@@ -8,9 +8,13 @@ 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 ++++++++++
+ drivers/misc/sunxi-addr/sha256.c     | 178 +++++++++++++
+ drivers/misc/sunxi-addr/sunxi-addr.c | 357 +++++++++++++++++++++++++++
  6 files changed, 548 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
+ create mode 100644 drivers/misc/sunxi-addr/sunxi-addr.c
 
 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
 index c702600975ef..c4aea8d109c6 100644
@@ -602,5 +606,5 @@ index 000000000000..f4f2dcecbb48
 +MODULE_DESCRIPTION("Network MAC Addess Manager");
 +MODULE_LICENSE("GPL");
 -- 
-Armbian
+2.35.3
 
diff --git a/...s-add-wifi-nodes-for-Inovato-Quadra.patch → ...n/Add-wifi-nodes-for-Inovato-Quadra.patch b/...s-add-wifi-nodes-for-Inovato-Quadra.patch → ...n/Add-wifi-nodes-for-Inovato-Quadra.patch
@@ -1,15 +1,16 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 0962f796fa17dc3477c6b7ea8190fd606af35d9b Mon Sep 17 00:00:00 2001
 From: Gunjan Gupta <[email protected]>
 Date: Tue, 19 Sep 2023 11:06:01 +0000
 Subject: Add wifi nodes for Inovato Quadra
 
 ---
- arch/arm64/boot/dts/allwinner/Makefile                     |  1 +
- arch/arm64/boot/dts/allwinner/sun50i-h6-inovato-quadra.dts | 56 ++++++++++
+ arch/arm64/boot/dts/allwinner/Makefile        |  1 +
+ .../allwinner/sun50i-h6-inovato-quadra.dts    | 56 +++++++++++++++++++
  2 files changed, 57 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-inovato-quadra.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index a90155cb6c57..abd85a78bfb9 100644
+index fe3b5da4b57a..7c63cb1fcc48 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -50,6 +50,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
@@ -83,5 +84,5 @@ index 000000000000..551ad69f18a6
 +	post-power-on-delay-ms = <0xc8>;
 +};
 -- 
-Armbian
+2.35.3
 
diff --git a/.../patches.armbian/drv-rgb-add-ws2812.patch → ...s2812-RGB-driver-for-allwinner-H616.patch b/.../patches.armbian/drv-rgb-add-ws2812.patch → ...s2812-RGB-driver-for-allwinner-H616.patch
@@ -1,19 +1,20 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 0ff062bd8f4e12ae6f4700f594df8df276de964c 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
 
 ---
  drivers/leds/rgb/Kconfig       |   7 +
  drivers/leds/rgb/Makefile      |   1 +
- drivers/leds/rgb/leds-ws2812.c | 229 ++++++++++
+ drivers/leds/rgb/leds-ws2812.c | 229 +++++++++++++++++++++++++++++++++
  3 files changed, 237 insertions(+)
+ create mode 100644 drivers/leds/rgb/leds-ws2812.c
 
 diff --git a/drivers/leds/rgb/Kconfig b/drivers/leds/rgb/Kconfig
-index a6a21f564673..746017948715 100644
+index 8fc12d6a2958..67e65f72b0be 100644
 --- a/drivers/leds/rgb/Kconfig
 +++ b/drivers/leds/rgb/Kconfig
-@@ -65,3 +65,10 @@ config LEDS_MT6370_RGB
+@@ -77,3 +77,10 @@ config LEDS_MT6370_RGB
  	  will be called "leds-mt6370-rgb".
 
  endif # LEDS_CLASS_MULTICOLOR
@@ -26,10 +27,10 @@ index a6a21f564673..746017948715 100644
 +	  Say Y here if you want to use the WS2812.
 \ No newline at end of file
 diff --git a/drivers/leds/rgb/Makefile b/drivers/leds/rgb/Makefile
-index 243f31e4d70d..90d9abbb072f 100644
+index a501fd27f179..8f7646ead3c1 100644
 --- a/drivers/leds/rgb/Makefile
 +++ b/drivers/leds/rgb/Makefile
-@@ -5,3 +5,4 @@ obj-$(CONFIG_LEDS_KTD202X)		+= leds-ktd202x.o
+@@ -6,3 +6,4 @@ obj-$(CONFIG_LEDS_NCP5623)		+= leds-ncp5623.o
  obj-$(CONFIG_LEDS_PWM_MULTICOLOR)	+= leds-pwm-multicolor.o
  obj-$(CONFIG_LEDS_QCOM_LPG)		+= leds-qcom-lpg.o
  obj-$(CONFIG_LEDS_MT6370_RGB)		+= leds-mt6370-rgb.o
@@ -270,5 +271,5 @@ index 000000000000..1af735ce8e4d
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:ws2812_ctl");
 -- 
-Armbian
+2.35.3
 
diff --git a/....10/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch b/....10/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From c7d4dd67cdd449de56147841d0de25ca870d479c Mon Sep 17 00:00:00 2001
 From: Icenowy Zheng <[email protected]>
 Date: Mon, 25 Dec 2017 12:08:01 +0800
 Subject: Doc:dt-bindings:usb: add binding for DWC3 controller on Allwinner SoC
@@ -9,8 +9,9 @@ Add its device tree binding document.
 
 Signed-off-by: Icenowy Zheng <[email protected]>
 ---
- Documentation/devicetree/bindings/usb/allwinner,dwc3.txt | 39 ++++++++++
+ .../bindings/usb/allwinner,dwc3.txt           | 39 +++++++++++++++++++
  1 file changed, 39 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/usb/allwinner,dwc3.txt
 
 diff --git a/Documentation/devicetree/bindings/usb/allwinner,dwc3.txt b/Documentation/devicetree/bindings/usb/allwinner,dwc3.txt
 new file mode 100644
@@ -58,5 +59,5 @@ index 000000000000..3f7714636785
 +		};
 +	};
 -- 
-Armbian
+2.35.3