mirror of
https://github.com/armbian/build.git
synced 2025-08-14 15:16:58 +02:00
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
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
Date: Thu, 21 Jan 2021 01:35:36 +0000
|
|
Subject: HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM
|
|
|
|
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1
|
|
while the onboard rtc chip claims /dev/rtc0.
|
|
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
|
index fea65f20523a..dacbca73279c 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
|
@@ -29,6 +29,8 @@ button-function {
|
|
aliases {
|
|
serial2 = &uart_AO_B;
|
|
ethernet0 = ðmac;
|
|
+ rtc0 = &rtc;
|
|
+ rtc1 = &vrtc;
|
|
};
|
|
|
|
gpio-keys-polled {
|
|
--
|
|
Armbian
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
Date: Sat, 6 Nov 2021 13:01:08 +0000
|
|
Subject: HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM2
|
|
|
|
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1
|
|
while the onboard rtc chip claims /dev/rtc0.
|
|
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
index 860f307494c5..cee27e7222c8 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
|
@@ -18,6 +18,8 @@ / {
|
|
aliases {
|
|
serial0 = &uart_AO;
|
|
serial2 = &uart_AO_B;
|
|
+ rtc0 = &rtc;
|
|
+ rtc1 = &vrtc;
|
|
};
|
|
|
|
chosen {
|
|
--
|
|
Armbian
|
|
|