JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

meson64/edge 6.5.y: move meson-g12b-waveshare-cm4-io-base-b.dts out of null patch, avoid patching Makefile

Browse Source
This commit is contained in:
Ricardo Pardini
2023-09-28 12:41:37 +02:00
parent 800d92045d
commit 97c8138e16
2 changed files with 30 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
patch/kernel/archive/meson64-6.5/add-board-waveshare-cm4-io-base-b.patch
View File

@@ -1,64 +0,0 @@
From 3e3978156fb2347e813ed8cc41d6be7fd1cd7cff Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Thu, 21 Sep 2023 07:29:08 -0400
Subject: [PATCH] arch: arm64: dts: amlogic: meson-g12b-waveshare-cm4-io-base-b
https://www.waveshare.com/wiki/CM4-IO-BASE-B
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../meson-g12b-waveshare-cm4-io-base-b.dts | 29 +++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 6f61798a109f..9a9a754c77c7 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -23,6 +23,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-bananapi-m2s.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-waveshare-cm4-io-base-b.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
new file mode 100644
index 000000000000..3a65d7c9c1dc
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Patrick Yavitz <pyavitz@xxxxx.com>
+ */
+
+/dts-v1/;
+
+#include "meson-g12b-bananapi-cm4-cm4io.dts"
+
+/ {
+ compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
+ model = "Waveshare CM4-IO-BASE-B with BPI-CM4 Module";
+
+ aliases {
+ rtc0 = &rtc;
+ };
+};
+
+&i2c1 {
+ rtc: rtc@51 {
+ compatible = "nxp,pcf85063a";
+ reg = <0x51>;
+ wakeup-source;
+ };
+};
+
+&usb {
+ dr_mode = "host";
+};
--
2.39.2

30
patch/kernel/archive/meson64-6.5/dt/meson-g12b-waveshare-cm4-io-base-b.dts Normal file
View File

@@ -0,0 +1,30 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2023 Patrick Yavitz <pyavitz@xxxxx.com>
* See https://www.waveshare.com/wiki/CM4-IO-BASE-B
*/
/dts-v1/;
#include "meson-g12b-bananapi-cm4-cm4io.dts"
/ {
compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
model = "Waveshare CM4-IO-BASE-B with BPI-CM4 Module";
aliases {
rtc0 = &rtc;
};
};
&i2c1 {
rtc: rtc@51 {
compatible = "nxp,pcf85063a";
reg = <0x51>;
wakeup-source;
};
};
&usb {
dr_mode = "host";
};