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

Update sunxi-6.6, switch to v6.6.43 #6887

Merged
merged 8 commits into from
Aug 2, 2024
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
Jump to file
Failed to load files.
Loading
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 @@ -30,7 +30,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.36"
declare -g KERNELBRANCH="tag:v6.6.43"
;;

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 @@ -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.36"
declare -g KERNELBRANCH="tag:v6.6.43"
;;

edge)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 7a6264fac2099b181564b09baa283157f19cc069 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 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 {

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From c6de1fe93692bf97c0057346eeadbab3b71d05d3 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 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 {
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

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From e18f494dcd6db8d9a7074939cd96f2c042acc169 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 All @@ -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 68e051ddecd6..aed686afff16 100644
Expand Down Expand Up @@ -839,5 +840,5 @@ index 000000000000..113a45408116
+MODULE_AUTHOR("Jernej Skrabec <[email protected]>");
+MODULE_LICENSE("GPL");
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From c8afe85b198d4dc383fe541cb2fb166b7d1132fb 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 5dda3c65a38e..8e491c9f6c0e 100644
Expand Down Expand Up @@ -149,5 +150,5 @@ index 000000000000..cad489cef595
+MODULE_AUTHOR("Alan Ma");
+MODULE_LICENSE("GPL");
--
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 9d110a13e2fe9c4a020985b3534f2a5be67dacbd 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 All @@ -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 625af75833fc..b26c72ad100c 100644
Expand Down Expand Up @@ -1539,5 +1547,5 @@ index 000000000000..a5b4e6c0b578
+MODULE_AUTHOR("xiafeng<[email protected]>");
+MODULE_DESCRIPTION("sunxi sys info.");
--
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 6f085079d8a204f54785bbac5225ef5c43572670 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 All @@ -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 57201f491f8d..26f2df508f70 100644
Expand Down Expand Up @@ -602,5 +606,5 @@ index 000000000000..f4f2dcecbb48
+MODULE_DESCRIPTION("Network MAC Addess Manager");
+MODULE_LICENSE("GPL");
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 68e3c93f16478ac7a1fe2d64b79c76b96e5782f6 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 62d716418e60..83ab07b7f18a 100644
index ad82da8e2aad..8b504ee408e7 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -48,6 +48,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
Expand Down Expand Up @@ -83,5 +84,5 @@ index 000000000000..551ad69f18a6
+ post-power-on-delay-ms = <0xc8>;
+};
--
Armbian
2.35.3

Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 190990bcecd1c3e1fddb09f77c31cfc653c9421f 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 183bccc06cf3..855cf847ff93 100644
Expand Down Expand Up @@ -270,5 +271,5 @@ index 000000000000..1af735ce8e4d
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ws2812_ctl");
--
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 073fe82934a9ca83fa80f9415d48f6d69dd6c69f 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 All @@ -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
Expand Down Expand Up @@ -58,5 +59,5 @@ index 000000000000..3f7714636785
+ };
+ };
--
Armbian
2.35.3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From b6b946580b8e87d715f6449c8023bb70ac649783 Mon Sep 17 00:00:00 2001
From: Samuel Holland <[email protected]>
Date: Sat, 2 Jan 2021 15:52:27 -0600
Subject: Input: axp20x-pek - allow wakeup after shutdown
Expand Down Expand Up @@ -44,5 +44,5 @@ index 4581606a28d6..7217dc6ed26a 100644
.driver = {
.name = "axp20x-pek",
--
Armbian
2.35.3

Loading