mirror of
https://github.com/armbian/build.git
synced 2025-09-19 04:31:38 +02:00
f5575f64ac
* Bump meson and meson64 EDGE kernel to 6.9.y * Rename patch folders * Adjust broken patches, one remaining * Add overlay support * meson64: rename overlays to dtso, update makefile * Update meson-gx-socinfo-sm driver patchset for meson64-6.9: * add SoC ID patches for S905L, A113X * fix memory double free in driver * update dt bindings --------- Signed-off-by: Patrick Yavitz <pyavitz@armbian.com> Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com> Signed-off-by: Viacheslav Bocharov <adeep@lexina.in> Co-authored-by: Patrick Yavitz <pyavitz@xxxxx.com> Co-authored-by: Paolo Sabatino <paolo.sabatino@gmail.com> Co-authored-by: Viacheslav Bocharov <adeep@lexina.in>
78 lines
2.3 KiB
Diff
78 lines
2.3 KiB
Diff
From 5fb77258c07ec1cbad6f21d66bafde7c64a4f89a Mon Sep 17 00:00:00 2001
|
|
From: Patrick Yavitz <pyavitz@xxxxx.com>
|
|
Date: Tue, 25 Jul 2023 13:31:54 -0400
|
|
Subject: [PATCH] arch: arm64: dts: amlogic: meson g12b bananapi cm4
|
|
|
|
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
|
|
---
|
|
.../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++++--
|
|
.../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++++--
|
|
2 files changed, 17 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
|
|
index 1b0c3881c6a1..027422f7a21b 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
|
|
@@ -50,14 +50,15 @@ leds {
|
|
led-blue {
|
|
color = <LED_COLOR_ID_BLUE>;
|
|
function = LED_FUNCTION_STATUS;
|
|
- gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
|
|
+ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_LOW>;
|
|
linux,default-trigger = "heartbeat";
|
|
};
|
|
|
|
led-green {
|
|
color = <LED_COLOR_ID_GREEN>;
|
|
function = LED_FUNCTION_STATUS;
|
|
- gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
|
|
+ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
|
|
+ linux,default-trigger = "default-on";
|
|
};
|
|
};
|
|
|
|
@@ -116,6 +117,10 @@ codec {
|
|
};
|
|
};
|
|
|
|
+&reboot {
|
|
+ sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
|
|
+};
|
|
+
|
|
&cecb_AO {
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
|
index 97e522921b06..b90097f07be9 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
|
@@ -12,6 +12,15 @@ aliases {
|
|
rtc1 = &vrtc;
|
|
};
|
|
|
|
+ reboot: meson64-reboot {
|
|
+ compatible = "meson64,reboot";
|
|
+ sys_reset = <0x84000009>;
|
|
+ sys_poweroff = <0x84000008>;
|
|
+
|
|
+ sd-vqsw = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>;
|
|
+ sd-vmmc = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
|
|
+ };
|
|
+
|
|
chosen {
|
|
stdout-path = "serial0:115200n8";
|
|
};
|
|
@@ -369,8 +378,7 @@ &uart_A {
|
|
|
|
bluetooth {
|
|
compatible = "realtek,rtl8822cs-bt";
|
|
- enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
|
|
- host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
|
|
+ enable-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
|
|
device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
--
|
|
2.39.2
|
|
|