mirror of https://github.com/armbian/build.git
sunxi-6.10: switch v6.10.9, re-export patches
This commit is contained in:
The-going
Igor
parent
789bbf17d5
commit
661b3658ea
|
|
@ -35,7 +35,7 @@ case $BRANCH in
|
|||
|
||||
edge)
|
||||
declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
|
||||
declare -g KERNELBRANCH="tag:v6.10.5"
|
||||
declare -g KERNELBRANCH="tag:v6.10.9"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ case $BRANCH in
|
|||
|
||||
edge)
|
||||
declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
|
||||
declare -g KERNELBRANCH="tag:v6.10.5"
|
||||
declare -g KERNELBRANCH="tag:v6.10.9"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
From bacdb9da06bb291ced710b2fe1f702711f97ec9e Mon Sep 17 00:00:00 2001
|
||||
From 16b46bcef1b6a83f8eea68915d57fc48c51f4ae2 Mon Sep 17 00:00:00 2001
|
||||
From: chraac <chraac@gmail.com>
|
||||
Date: Fri, 15 Mar 2024 12:30:26 +0800
|
||||
Subject: arm64: dts: sun50i-h618-orangepi-zero2w: Add missing nodes
|
||||
|
||||
---
|
||||
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 30 +-
|
||||
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 25 +-
|
||||
.../allwinner/sun50i-h618-orangepi-zero2w.dts | 628 ++++++++++++++++--
|
||||
2 files changed, 586 insertions(+), 67 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
|
||||
index 1bf71a0a0202..cccdcb55eecd 100644
|
||||
index 1448fad0793a..1b75c30005a9 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
|
||||
@@ -197,7 +197,7 @@ video-codec@1c0e000 {
|
||||
@@ -193,7 +193,7 @@ video-codec@1c0e000 {
|
||||
|
||||
syscon: syscon@3000000 {
|
||||
compatible = "allwinner,sun50i-h616-system-control";
|
||||
|
|
@ -20,7 +21,7 @@ index 1bf71a0a0202..cccdcb55eecd 100644
|
|||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
@@ -770,19 +770,28 @@ ths: thermal-sensor@5070400 {
|
||||
@@ -748,19 +748,28 @@ ths: thermal-sensor@5070400 {
|
||||
};
|
||||
|
||||
emac1: ethernet@5030000 {
|
||||
|
|
@ -57,7 +58,7 @@ index 1bf71a0a0202..cccdcb55eecd 100644
|
|||
#size-cells = <0>;
|
||||
};
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
|
||||
index 6a4f0da97233..bdfc3a1af689 100644
|
||||
index 6a4f0da97233..5a550d904534 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
|
||||
@@ -7,10 +7,15 @@
|
||||
|
|
@ -475,13 +476,13 @@ index 6a4f0da97233..bdfc3a1af689 100644
|
|||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <1>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&ehci0 {
|
||||
+ status = "disabled";
|
||||
};
|
||||
|
||||
-&r_i2c {
|
||||
+&ehci0 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&ehci1 {
|
||||
status = "okay";
|
||||
+};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 67f590e9b88e5af4dbe78bb4f4451b818f90359c Mon Sep 17 00:00:00 2001
|
||||
From 75f4c89de48bea7c4c64d36cfd09ab109a2bbd67 Mon Sep 17 00:00:00 2001
|
||||
From: chraac <chraac@gmail.com>
|
||||
Date: Fri, 16 Aug 2024 16:44:41 +0800
|
||||
Subject: driver: allwinner h618 emac
|
||||
|
|
@ -4513,4 +4513,5 @@ index d0f66a5e1b2a..71349cac1a67 100644
|
|||
|
||||
#include <linux/errno.h>
|
||||
--
|
||||
GitLab
|
||||
2.35.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 2ece6b65c03422edc7c3b31df0d19b5b5ac5b534 Mon Sep 17 00:00:00 2001
|
||||
From 8b3669b72de6c0e60362514693ff83d4a72b6336 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
|
||||
|
|
@ -1313,5 +1313,5 @@ index 000000000000..e25e10bf5a3d
|
|||
+#endif
|
||||
+
|
||||
--
|
||||
GitLab
|
||||
2.35.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From d8e8b0c058e907df2290d4ee9464cbf09c8daf81 Mon Sep 17 00:00:00 2001
|
||||
From 846b77cef83a6549c31eaff8d3cc12ccfe97da6f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Thorne <Thomas.Thorne@Net2Edge.com>
|
||||
Date: Tue, 20 Sep 2022 20:34:57 -0400
|
||||
Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
|
||||
|
|
@ -17,10 +17,10 @@ However the rest of the patch is not needed/already upstreamed.
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
|
||||
index 311040f9b935..75528309851f 100644
|
||||
index 176f38750ad5..ec784468f05a 100644
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -2399,6 +2399,7 @@ static struct usb_serial_driver option_1port_device = {
|
||||
@@ -2404,6 +2404,7 @@ static struct usb_serial_driver option_1port_device = {
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = usb_wwan_suspend,
|
||||
.resume = usb_wwan_resume,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From a3872930164ccfbfb7efeaec41b60de9552f2042 Mon Sep 17 00:00:00 2001
|
||||
From a7e917312c926c27877bb2f3ca16aa9c57623cfa Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Sat, 18 Feb 2023 00:38:44 +0100
|
||||
Subject: usb: typec: tcpm: Fix PD devices/capabilities registration
|
||||
|
|
@ -15,7 +15,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|||
1 file changed, 29 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
|
||||
index b60bc1be25dc..138d8c857827 100644
|
||||
index 797d9b7c94bb..13a5e173f6bf 100644
|
||||
--- a/drivers/usb/typec/tcpm/tcpm.c
|
||||
+++ b/drivers/usb/typec/tcpm/tcpm.c
|
||||
@@ -3008,15 +3008,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
|
||||
|
|
@ -72,7 +72,7 @@ index b60bc1be25dc..138d8c857827 100644
|
|||
cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps);
|
||||
if (IS_ERR(cap))
|
||||
return PTR_ERR(cap);
|
||||
@@ -6991,10 +7005,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
|
||||
@@ -6990,10 +7004,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
|
||||
port->pds[i] = usb_power_delivery_register(port->dev, &desc);
|
||||
if (IS_ERR(port->pds[i])) {
|
||||
ret = PTR_ERR(port->pds[i]);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f0b6f55e2d37dd6bcd14eb25ff1ef2c845cb2424 Mon Sep 17 00:00:00 2001
|
||||
From 3a8652af39c00f2130a176beb2a44365433aa351 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
|
||||
Date: Tue, 23 Nov 2021 17:58:05 +0100
|
||||
Subject: usb: typec: tcpm: Improve logs
|
||||
|
|
@ -11,7 +11,7 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|||
1 file changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
|
||||
index 138d8c857827..dac00c42f07f 100644
|
||||
index 13a5e173f6bf..37cfcdd30b90 100644
|
||||
--- a/drivers/usb/typec/tcpm/tcpm.c
|
||||
+++ b/drivers/usb/typec/tcpm/tcpm.c
|
||||
@@ -957,10 +957,13 @@ static int tcpm_pd_transmit(struct tcpm_port *port,
|
||||
|
|
@ -41,7 +41,7 @@ index 138d8c857827..dac00c42f07f 100644
|
|||
|
||||
event = kzalloc(sizeof(*event), GFP_ATOMIC);
|
||||
if (!event)
|
||||
@@ -5938,7 +5945,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
|
||||
@@ -5937,7 +5944,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
|
||||
|
||||
static void _tcpm_pd_vbus_on(struct tcpm_port *port)
|
||||
{
|
||||
|
|
@ -50,7 +50,7 @@ index 138d8c857827..dac00c42f07f 100644
|
|||
port->vbus_present = true;
|
||||
/*
|
||||
* When vbus_present is true i.e. Voltage at VBUS is greater than VSAFE5V implicitly
|
||||
@@ -6028,7 +6035,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
|
||||
@@ -6027,7 +6034,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
|
||||
|
||||
static void _tcpm_pd_vbus_off(struct tcpm_port *port)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue