Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP sunxi 6.6: Cleaning up the patches before the changes. Swith to v6.6.72 #7714

Merged
merged 5 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion config/sources/families/include/sunxi64_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ case $BRANCH in

current)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.6.70"
declare -g KERNELBRANCH="tag:v6.6.72"
;;

edge)
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/include/sunxi_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ case $BRANCH in

current)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.6.70"
declare -g KERNELBRANCH="tag:v6.6.72"
;;

edge)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 392c79c23faac67ed5f245b4cbe29056bc050cd7 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
Expand All @@ -12,7 +12,7 @@ the board back to life
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 111111111111..222222222222 100644
index 343b02b97155..4878d27bab3e 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 {
Expand All @@ -27,5 +27,5 @@ index 111111111111..222222222222 100644
};

--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From e6704827faef78da4398f4bc74f628c20d0a6a38 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
Expand All @@ -9,7 +9,7 @@ NanoPi Duo2 has pinout for ethernet. Lets enable the same in dts
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 111111111111..222222222222 100644
index 4878d27bab3e..8669fd0879e7 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 {
Expand All @@ -27,5 +27,5 @@ index 111111111111..222222222222 100644
bus-width = <4>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 914f1bb0305d9d481bbf3378d21ee8e3aad89718 Mon Sep 17 00:00:00 2001
From: JohnTheCoolingFan <[email protected]>
Date: Sat, 7 Sep 2024 10:57:35 +0000
Subject: ARM64 DTS: sun50i-h616 overlays: fix sun50i-h616-light overlay

Signed-off-by: JohnTheCoolingFan <[email protected]>
---
arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-light.dtso | 9 +--------
.../boot/dts/allwinner/overlay/sun50i-h616-light.dtso | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-light.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-light.dtso
index 111111111111..222222222222 100755
index 5010ea6a57b5..4ab9dc9527e7 100755
--- a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-light.dtso
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-light.dtso
@@ -11,17 +11,10 @@ __overlay__ {
Expand All @@ -32,5 +32,5 @@ index 111111111111..222222222222 100755
- };
};
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From e5e9c254e938ab9102e1fd3d087e2f1d45b56ee9 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]>
---
arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 18 ++++++++++
.../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 111111111111..222222222222 100644
index bbff30ccf5a9..b98e85a51261 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
@@ -144,6 +144,24 @@ mcp2515_clock: mcp2515_clock {
Expand Down Expand Up @@ -38,5 +38,5 @@ index 111111111111..222222222222 100644
vmmc-supply = <&reg_dldo1>;
broken-cd;
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From db7f159bc51ee1be1f23c90f2e491ba2f7312318 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]>
---
arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 26 ++++++++++
.../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 111111111111..222222222222 100644
index e82da4b6e340..bbff30ccf5a9 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
@@ -25,6 +25,17 @@ chosen {
Expand Down Expand Up @@ -53,5 +53,5 @@ index 111111111111..222222222222 100644
cpu-supply = <&reg_dcdc2>;
status = "okay";
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 9ae378cab2ba83b7957da743ba7429daffe62724 Mon Sep 17 00:00:00 2001
From: JohnTheCoolingFan <[email protected]>
Date: Mon, 12 Aug 2024 14:50:16 +0000
Subject: ARM64: dts: sun50i-h616: BigTreeTech CB1: Enable IR receiver

Signed-off-by: JohnTheCoolingFan <[email protected]>
---
arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 4 ++++
.../arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 4 ++++
1 file changed, 4 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 111111111111..222222222222 100644
index b98e85a51261..c2e20408cb66 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
@@ -354,6 +354,10 @@ &ohci3 {
Expand All @@ -24,5 +24,5 @@ index 111111111111..222222222222 100644
/*
* PHY0 pins are connected to a USB-C socket, but a role switch
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 50690caabb49cdb90d92333903c698f83b9d41f8 Mon Sep 17 00:00:00 2001
From da0f8fb2b57559756aa26350d4e0240313bc7f5f 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From dfee1d3e9957e15537f3b05e13e6970eeaccfe94 Mon Sep 17 00:00:00 2001
From e9feccc87afef86b64991dd5aabea264b1037af9 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <[email protected]>
Date: Tue, 7 Jan 2025 06:39:30 -0500
Subject: [PATCH] Add BananaPi BPI-M4-Zero overlays
Subject: Add BananaPi BPI-M4-Zero overlays

Signed-off-by: Patrick Yavitz <[email protected]>
---
Expand Down Expand Up @@ -373,5 +373,5 @@ index 000000000000..840357f2e9e0
+ };
+};
--
2.39.5
2.35.3

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 3be3aec3fb6b8c2c6a8fa95e6423f7cf95451a76 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <[email protected]>
Date: Thu, 12 Dec 2024 03:49:35 -0500
Subject: Add BananaPi BPI-M4-Zero pinctrl

Signed-off-by: Patrick Yavitz <[email protected]>
---
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 56 +++++++++-
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 56 ++++++++++++++++++-
1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 111111111111..222222222222 100644
index 8cb3ae91909f..4c1b61b3c64f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -387,10 +387,34 @@ ext_rgmii_pins: rgmii-pins {
Expand Down Expand Up @@ -86,5 +86,5 @@ index 111111111111..222222222222 100644
pins = "PH0", "PH1";
function = "uart0";
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b15c77999f79e42e1cb053527a56a24a44e603ce Mon Sep 17 00:00:00 2001
From dbce7b846300f8c8ffed1256b6201bb1590181b4 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3264e78bab3013fc6d4d7bdd482d5695b742d8f5 Mon Sep 17 00:00:00 2001
From dc07f3d282737804191419e67c38c4131f9fe690 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <[email protected]>
Date: Tue, 7 Jan 2025 06:24:13 -0500
Subject: Add board BananaPi BPI-M4-Zero
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3a6f43eef8b66081d73a10b9eb216065d7b42398 Mon Sep 17 00:00:00 2001
From 542f4693a2c4597d893ee806228b20debbbd035c Mon Sep 17 00:00:00 2001
From: The-going <[email protected]>
Date: Sun, 15 Dec 2024 13:22:18 +0300
Subject: Add board LonganPi 3H
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7d075618c8c2f4ce23ef1184cbfff338c7f56b8e Mon Sep 17 00:00:00 2001
From 58f891e23983c65b61297927aa6ee805c4f48f98 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 562c561956b600a5cbbc9e0fbbf69b8ee7dda69d Mon Sep 17 00:00:00 2001
From e1155a5cb4304e1a00334dbc6e78029d0877a841 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1a8742c981085e9cf5c45eff9e602c9c24182a9d Mon Sep 17 00:00:00 2001
From d0cd31772007ce4d6a05088a48d6db5ce5713c9f 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 581c2ba279727873b53675e490372eb66e7f6f39 Mon Sep 17 00:00:00 2001
From ed3d1b6829f2f804d21f9f84a3433447a8dc4969 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 56e1f48c456885da28a349b8a1c2ae74e62e94be Mon Sep 17 00:00:00 2001
From: The-going <[email protected]>
Date: Tue, 12 Apr 2022 21:14:36 +0300
Subject: Bananapro add AXP209 regulators

Author: Heiko Jehmlich <[email protected]>
Signed-off-by: Heiko Jehmlich <[email protected]>
---
arch/arm/boot/dts/allwinner/sun7i-a20-bananapro.dts | 50 ++++++++++
.../dts/allwinner/sun7i-a20-bananapro.dts | 50 +++++++++++++++++++
1 file changed, 50 insertions(+)

diff --git a/arch/arm/boot/dts/allwinner/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/allwinner/sun7i-a20-bananapro.dts
index 111111111111..222222222222 100644
index 3a34fb39a840..d5bc590604a9 100644
--- a/arch/arm/boot/dts/allwinner/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/allwinner/sun7i-a20-bananapro.dts
@@ -257,3 +257,53 @@ &usbphy {
Expand Down Expand Up @@ -68,5 +68,5 @@ index 111111111111..222222222222 100644
+ regulator-name = "vddio-csi1";
+};
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 8d04ab7f0d195b30556ef3644c06dd4f86fd2a0b Mon Sep 17 00:00:00 2001
From: afaulkner420 <[email protected]>
Date: Fri, 25 Mar 2022 19:26:16 +0000
Subject: Compile the pwm overlay
Expand All @@ -8,7 +8,7 @@ Subject: Compile the pwm overlay
1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile
index 111111111111..222222222222 100644
index 9e3def41669e..40d67ebb5932 100644
--- a/arch/arm64/boot/dts/allwinner/overlay/Makefile
+++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile
@@ -38,6 +38,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
Expand All @@ -20,5 +20,5 @@ index 111111111111..222222222222 100644
sun50i-h6-spi-add-cs1.dtbo \
sun50i-h6-spi-jedec-nor.dtbo \
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 46af98d43bb5fefb425c123459d2d4ba7ffcae9b Mon Sep 17 00:00:00 2001
From: Ryzer58 <[email protected]>
Date: Thu, 25 Apr 2024 22:18:22 +0100
Subject: Correct perf interrupt source number as referenced in the Allwinner
Expand All @@ -12,7 +12,7 @@ Signed-off-by: Ryzer58 <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
index 111111111111..222222222222 100644
index 51a6464aab9a..cabf619c2e21 100644
--- a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
@@ -185,7 +185,7 @@ de: display-engine {
Expand All @@ -25,5 +25,5 @@ index 111111111111..222222222222 100644

reserved-memory {
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a0e0783d8c16ce4398b627142883910d9b4dfe58 Mon Sep 17 00:00:00 2001
From 503fe616b219834479c902a7930c405392f55c8d 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 9427782c2a4d2babe7fec17e904bd99609fe2173 Mon Sep 17 00:00:00 2001
From: Ryzer58 <[email protected]>
Date: Sun, 4 Aug 2024 23:45:50 +0100
Subject: Enable DMA support for the Allwinner A10 EMAC, which already exist in
Expand All @@ -10,7 +10,7 @@ Signed-off-by: Ryzer58 <[email protected]>
1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
index 111111111111..222222222222 100644
index cabf619c2e21..08a8433b595e 100644
--- a/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
@@ -315,6 +315,8 @@ emac: ethernet@1c0b000 {
Expand All @@ -23,5 +23,5 @@ index 111111111111..222222222222 100644
pinctrl-0 = <&emac_pins>;
status = "disabled";
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5cc4c2e14d6479c309aa8b5e35035183e0481f28 Mon Sep 17 00:00:00 2001
From f95e0f97e5decca1dd3f25d82729af4dca3b80d7 Mon Sep 17 00:00:00 2001
From: JohnTheCoolingFan <[email protected]>
Date: Sun, 15 Dec 2024 13:59:13 +0000
Subject: Fix ghost touches on tsc2007 tft screen
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From d35f96377713613375f1970b04ccbac2791ccbbc Mon Sep 17 00:00:00 2001
From: The-going <[email protected]>
Date: Thu, 28 Apr 2022 15:45:14 +0300
Subject: Fix include uapi spi spidev module
Expand All @@ -8,7 +8,7 @@ Subject: Fix include uapi spi spidev module
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 111111111111..222222222222 100644
index c160eb173bc7..64c4fad9d377 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -21,8 +21,7 @@
Expand All @@ -22,5 +22,5 @@ index 111111111111..222222222222 100644
#include <linux/uaccess.h>

--
Armbian
2.35.3

Loading
Loading