d4093bd18e
* Bump meson64 edge from 6.7 to 6.8 Changes to be committed: modified: config/sources/families/include/meson64_common.inc renamed: patch/kernel/archive/meson64-6.7 -> patch/kernel/archive/meson64-6.8 modified: patch/kernel/archive/meson64-6.8/board-bananapi-cm4-cm4io-fixes.patch modified: patch/kernel/archive/meson64-6.8/general-input-touchscreen-Add-D-WAV-Multitouch.patch new file: patch/kernel/archive/meson64-6.8/kernel-6.8-tools-cgroup-makefile.patch * updates from rewrite-kernel-patches * updates from rewrite-kernel-config
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Yavitz <pyavitz@gmail.com>
|
|
Date: Thu, 1 Jun 2023 06:32:23 +0200
|
|
Subject: arm64: dts: amlogic: pyavitz's fixes for the BananaPi CM4
|
|
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 11 ++++++++--
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 4 ++--
|
|
2 files changed, 11 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 13d478f9c891..a7d460e46611 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
|
|
@@ -20,6 +20,12 @@ aliases {
|
|
i2c1 = &i2c3;
|
|
};
|
|
|
|
+ reboot: meson64-reboot {
|
|
+ compatible = "meson64,reboot";
|
|
+ sys_reset = <0x84000009>;
|
|
+ sys_poweroff = <0x84000008>;
|
|
+ };
|
|
+
|
|
adc-keys {
|
|
compatible = "adc-keys";
|
|
io-channels = <&saradc 2>;
|
|
@@ -50,14 +56,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";
|
|
};
|
|
};
|
|
|
|
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 08c33ec7e9f1..528741fcc0ec 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
|
|
@@ -369,8 +369,8 @@ &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>;
|
|
+ //host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
|
|
device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
--
|
|
Armbian
|
|
|