mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #7636 from chewitt/amlogic-11.0
linux: update Amlogic 6.1.y patches
This commit is contained in:
commit
cf1296b3d1
@ -1,4 +1,4 @@
|
|||||||
From 573181cefb8ff2013dd1f1d796d681ea99ac579a Mon Sep 17 00:00:00 2001
|
From af63c7cf2d001f7c3e86c310e8e0c42e681c1e8a Mon Sep 17 00:00:00 2001
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||||
Date: Mon, 13 Feb 2023 13:11:14 +0000
|
Date: Mon, 13 Feb 2023 13:11:14 +0000
|
||||||
Subject: [PATCH 115/120] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z
|
Subject: [PATCH 115/120] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z
|
||||||
@ -8,14 +8,35 @@ making guesses at the config..
|
|||||||
|
|
||||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||||
---
|
---
|
||||||
.../boot/dts/amlogic/meson-gxm-t95z-plus.dts | 67 +++++++++++++++++++
|
.../boot/dts/amlogic/meson-gxm-t95z-plus.dts | 79 ++++++++++++++++++-
|
||||||
1 file changed, 67 insertions(+)
|
1 file changed, 77 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts
|
||||||
index 30ed5b6d325f..54a08da0a7eb 100644
|
index 30ed5b6d325f..5f4bd19d5d77 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts
|
||||||
@@ -38,6 +38,73 @@ button-function {
|
@@ -17,11 +17,18 @@ / {
|
||||||
|
leds {
|
||||||
|
compatible = "gpio-leds";
|
||||||
|
|
||||||
|
- led-white {
|
||||||
|
- color = <LED_COLOR_ID_WHITE>;
|
||||||
|
+ led-green {
|
||||||
|
+ color = <LED_COLOR_ID_GREEN>;
|
||||||
|
function = LED_FUNCTION_POWER;
|
||||||
|
gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
|
||||||
|
default-state = "on";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ led-blue {
|
||||||
|
+ color = <LED_COLOR_ID_BLUE>;
|
||||||
|
+ function = LED_FUNCTION_POWER;
|
||||||
|
+ gpios = <&gpio GPIODV_25 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ default-state = "off";
|
||||||
|
panic-indicator;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
@@ -38,6 +45,74 @@ button-function {
|
||||||
press-threshold-microvolt = <10000>;
|
press-threshold-microvolt = <10000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -49,39 +70,40 @@ index 30ed5b6d325f..54a08da0a7eb 100644
|
|||||||
+ #size-cells = <0>;
|
+ #size-cells = <0>;
|
||||||
+
|
+
|
||||||
+ titanmec,segment-mapping = /bits/ 8 <4 5 6 1 2 3 7>;
|
+ titanmec,segment-mapping = /bits/ 8 <4 5 6 1 2 3 7>;
|
||||||
+ titanmec,grid = /bits/ 8 <4 3 2 1>;
|
+ titanmec,grid = /bits/ 8 <2 3 4 5 1>;
|
||||||
+
|
+
|
||||||
+ alarm@5,1 {
|
+ alarm@1,1 {
|
||||||
+ reg = <5 1>;
|
+ reg = <1 1>;
|
||||||
+ function = LED_FUNCTION_ALARM;
|
+ function = LED_FUNCTION_ALARM;
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ usb@5,2 {
|
+ usb@1,2 {
|
||||||
+ reg = <5 2>;
|
+ reg = <1 2>;
|
||||||
+ function = LED_FUNCTION_USB;
|
+ function = LED_FUNCTION_USB;
|
||||||
+ };
|
+ };
|
||||||
+ play@5,3 {
|
+
|
||||||
+ reg = <5 3>;
|
+ play@1,3 {
|
||||||
|
+ reg = <1 3>;
|
||||||
+ function = "play";
|
+ function = "play";
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ pause@5,4 {
|
+ pause@1,4 {
|
||||||
+ reg = <5 4>;
|
+ reg = <1 4>;
|
||||||
+ function = "pause";
|
+ function = "pause";
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ colon@5,5 {
|
+ colon@1,5 {
|
||||||
+ reg = <5 5>;
|
+ reg = <1 5>;
|
||||||
+ function = "colon";
|
+ function = "colon";
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ lan@5,6 {
|
+ lan@1,6 {
|
||||||
+ reg = <5 6>;
|
+ reg = <1 6>;
|
||||||
+ function = LED_FUNCTION_LAN;
|
+ function = LED_FUNCTION_LAN;
|
||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+ wlan@5,7 {
|
+ wlan@1,7 {
|
||||||
+ reg = <5 7>;
|
+ reg = <1 7>;
|
||||||
+ function = LED_FUNCTION_WLAN;
|
+ function = LED_FUNCTION_WLAN;
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From eab9517d3b0b48c6b62442f5c8c0edcc2e3e95e2 Mon Sep 17 00:00:00 2001
|
From b5c002dd9e9e461be065de69ee0e6d25ac32eeb4 Mon Sep 17 00:00:00 2001
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||||
Date: Fri, 17 Feb 2023 19:25:18 +0000
|
Date: Fri, 17 Feb 2023 19:25:18 +0000
|
||||||
Subject: [PATCH 116/120] WIP: dt-bindings: arm: amlogic: add support for
|
Subject: [PATCH 116/120] WIP: dt-bindings: arm: amlogic: add support for
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 612b811375ca47c232e4edba77ef886f1597d55b Mon Sep 17 00:00:00 2001
|
From e3881a15e8b7bae508479ca00187ccc44f6435f2 Mon Sep 17 00:00:00 2001
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||||
Date: Fri, 17 Feb 2023 09:22:24 +0000
|
Date: Fri, 17 Feb 2023 09:22:24 +0000
|
||||||
Subject: [PATCH 117/120] WIP: arm64: dts: meson: add support for BananaPi M2S
|
Subject: [PATCH 117/120] WIP: arm64: dts: meson: add support for BananaPi M2S
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 295d65e7123908556d5fb78683c256459b9be871 Mon Sep 17 00:00:00 2001
|
From eebf83427d051da9c8424ab5c351d98e31256c95 Mon Sep 17 00:00:00 2001
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||||
Date: Tue, 14 Feb 2023 08:28:00 +0000
|
Date: Tue, 14 Feb 2023 08:28:00 +0000
|
||||||
Subject: [PATCH 118/120] WIP: arm64: dts: meson: p23x-q20x: fix usb init -
|
Subject: [PATCH 118/120] WIP: arm64: dts: meson: p23x-q20x: fix usb init -
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 43a534f7b59e2364221f972df637f5cc8e8ab153 Mon Sep 17 00:00:00 2001
|
From 9aac0fbe0ef9eb783562b52461504fd221efe92b Mon Sep 17 00:00:00 2001
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||||
Date: Tue, 7 Mar 2023 13:17:16 +0000
|
Date: Tue, 7 Mar 2023 13:17:16 +0000
|
||||||
Subject: [PATCH 119/120] WIP: arm64: dts: meson: add WiFi/BT support to
|
Subject: [PATCH 119/120] WIP: arm64: dts: meson: add WiFi/BT support to
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From df325d11ba5958c576be5594b3fd08d934d4139f Mon Sep 17 00:00:00 2001
|
From ffd9b1381e35fb4244a7173dfa8fbddfcc37c195 Mon Sep 17 00:00:00 2001
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||||
Date: Tue, 14 Mar 2023 01:13:15 +0000
|
Date: Tue, 14 Mar 2023 01:13:15 +0000
|
||||||
Subject: [PATCH 120/120] WIP: media: meson: vdec: fix memory leak of
|
Subject: [PATCH 120/120] WIP: media: meson: vdec: fix memory leak of
|
||||||
|
Loading…
x
Reference in New Issue
Block a user