mirror of
https://github.com/armbian/build.git
synced 2025-08-13 06:36:58 +02:00
3b3d85e25c
* Bump imx6 edge to 5.12.y * Bump odroid xu4 edge to 5.12.y * Bump Jetson nano edge to 5.12.y * WIP: Bump sunxi to 5.12.y - create a copy of patches and make a new link - wireless patches needs adjutement to 5.12 - some patches are still failing * Adjust wireless patches to build on 5.12.y * Remove template wireless patch * Move Espressobin edge to 5.12.y * Bump mvebu to 5.12 - patch 92-mvebu-gpio-remove-hardcoded-timer-assignment.patch was disabled @heisath - adjusted wireless driver for 8723ds * Adjust sunxi / sunxi64 edge to compile * Fix kernel config for Jetson nano edge * bump meson64 to 5.12.y * bump rockchip edge to 5.12.y * Bump rockchip64 to 5.12.y * Bump rk322x edge to 5.12.y @paolosabatino * Cleanup im6, re-add 5.10.y patches since one is missing in 5.12.y * Update odroidxu4 edge links * rk322x: moved rk322x-edge to kernel 5.12, fix overlay compilation, retouched included kernel modules * Cleanup: remove deprecated config Co-authored-by: Paolo Sabatino <paolo.sabatino@gmail.com>
265 lines
8.5 KiB
Diff
265 lines
8.5 KiB
Diff
From a7808c93aacd4d9a92820afd44c67dd653e44fa1 Mon Sep 17 00:00:00 2001
|
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
Date: Mon, 21 Oct 2019 03:58:06 +0000
|
|
Subject: [PATCH 57/58] arm64: dts: meson: add multiple MeCool device trees
|
|
|
|
This adds initial device trees for a range of MeCool devices based on various
|
|
Amlogic GXBB, GXL and GXM reference designs. The current purpose is to allow
|
|
devices to be associated with their respective IR remote keymaps. It also
|
|
prepares for the addition of DVB support in the future.
|
|
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/Makefile | 7 ++++
|
|
.../dts/amlogic/meson-gxbb-mecool-ki-plus.dts | 34 +++++++++++++++++++
|
|
.../dts/amlogic/meson-gxbb-mecool-kii-pro.dts | 34 +++++++++++++++++++
|
|
.../meson-gxl-s905d-mecool-ki-plus.dts | 21 ++++++++++++
|
|
.../amlogic/meson-gxl-s905d-mecool-ki-pro.dts | 16 +++++++++
|
|
.../meson-gxl-s905d-mecool-kii-pro.dts | 16 +++++++++
|
|
.../meson-gxl-s905d-mecool-m8s-plus.dts | 16 +++++++++
|
|
.../dts/amlogic/meson-gxm-mecool-kiii-pro.dts | 21 ++++++++++++
|
|
8 files changed, 165 insertions(+)
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
|
|
index 7d8586c718a1..3e72b2ad3a2d 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
|
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
|
@@ -13,6 +13,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-ki-plus.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-kii-pro.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
|
|
@@ -30,6 +32,10 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-ki-plus.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-ki-pro.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-m8s-plus.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb
|
|
@@ -39,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
|
|
+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts
|
|
new file mode 100644
|
|
index 000000000000..0c27f7e67d5a
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts
|
|
@@ -0,0 +1,34 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Author: Christian Hewitt <christianshewitt@gmail.com>
|
|
+ */
|
|
+
|
|
+#include "meson-gxbb-p201.dts"
|
|
+
|
|
+/ {
|
|
+ compatible = "mecool,gxbb-ki-plus", "amlogic,meson-gxbb";
|
|
+ model = "MeCool KI Plus";
|
|
+
|
|
+ clock: meson_clock {
|
|
+ compatible = "amlogic, gxbb-clock";
|
|
+ reg = <0x0 0xc883c000 0x0 0x1000>,
|
|
+ <0x0 0xc8100000 0x0 0x1000>;
|
|
+ #clock-cells = <1>;
|
|
+ #reset-cells = <1>;
|
|
+ sys_max = <1536000000>;
|
|
+ };
|
|
+
|
|
+ memory@0 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x0 0x0 0x0 0x40000000>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&ir {
|
|
+ linux,rc-map-name = "rc-mecool-ki-plus";
|
|
+};
|
|
+
|
|
+&usb_pwr {
|
|
+ gpio = <>;
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts
|
|
new file mode 100644
|
|
index 000000000000..83bd0204b153
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts
|
|
@@ -0,0 +1,34 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Author: Christian Hewitt <christianshewitt@gmail.com>
|
|
+ */
|
|
+
|
|
+#include "meson-gxbb-p201.dts"
|
|
+
|
|
+/ {
|
|
+ compatible = "mecool,gxbb-kii-pro", "amlogic,meson-gxbb";
|
|
+ model = "MeCool KII Pro";
|
|
+
|
|
+ clock: meson_clock {
|
|
+ compatible = "amlogic, gxbb-clock";
|
|
+ reg = <0x0 0xc883c000 0x0 0x1000>,
|
|
+ <0x0 0xc8100000 0x0 0x1000>;
|
|
+ #clock-cells = <1>;
|
|
+ #reset-cells = <1>;
|
|
+ sys_max = <1536000000>;
|
|
+ };
|
|
+
|
|
+ memory@0 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x0 0x0 0x0 0x40000000>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&ir {
|
|
+ linux,rc-map-name = "rc-mecool-kii-pro";
|
|
+};
|
|
+
|
|
+&usb_pwr {
|
|
+ gpio = <>;
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts
|
|
new file mode 100644
|
|
index 000000000000..7369c4111c43
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts
|
|
@@ -0,0 +1,21 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Author: Christian Hewitt <christianshewitt@gmail.com>
|
|
+ */
|
|
+
|
|
+#include "meson-gxl-s905d-p231.dts"
|
|
+
|
|
+/ {
|
|
+ compatible = "mecool,ki-plus", "amlogic,s905d", "amlogic,meson-gxl";
|
|
+ model = "MeCool KI Plus";
|
|
+
|
|
+ memory@0 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x0 0x0 0x0 0x40000000>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&ir {
|
|
+ linux,rc-map-name = "rc-mecool-ki-plus";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts
|
|
new file mode 100644
|
|
index 000000000000..65e1a738a563
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts
|
|
@@ -0,0 +1,16 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Author: Christian Hewitt <christianshewitt@gmail.com>
|
|
+ */
|
|
+
|
|
+#include "meson-gxl-s905d-p230.dts"
|
|
+
|
|
+/ {
|
|
+ compatible = "mecool,ki-pro", "amlogic,s905d", "amlogic,meson-gxl";
|
|
+ model = "MeCool KI Pro";
|
|
+};
|
|
+
|
|
+&ir {
|
|
+ linux,rc-map-name = "rc-mecool-ki-pro";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
|
|
new file mode 100644
|
|
index 000000000000..2605d6eb6ca5
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
|
|
@@ -0,0 +1,16 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Author: Christian Hewitt <christianshewitt@gmail.com>
|
|
+ */
|
|
+
|
|
+#include "meson-gxl-s905d-p231.dts"
|
|
+
|
|
+/ {
|
|
+ compatible = "mecool,kii-pro", "amlogic,s905d", "amlogic,meson-gxl";
|
|
+ model = "MeCool KII Pro";
|
|
+};
|
|
+
|
|
+&ir {
|
|
+ linux,rc-map-name = "rc-mecool-kii-pro";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts
|
|
new file mode 100644
|
|
index 000000000000..ac9f4ad205ac
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts
|
|
@@ -0,0 +1,16 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Author: Christian Hewitt <christianshewitt@gmail.com>
|
|
+ */
|
|
+
|
|
+#include "meson-gxl-s905d-p231.dts"
|
|
+
|
|
+/ {
|
|
+ compatible = "mecool,kii-pro", "amlogic,s905d", "amlogic,meson-gxl";
|
|
+ model = "MeCool M8S Plus";
|
|
+};
|
|
+
|
|
+&ir {
|
|
+ linux,rc-map-name = "rc-mecool-m8s-plus";
|
|
+};
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
|
|
new file mode 100644
|
|
index 000000000000..ca0ac6bc52ad
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
|
|
@@ -0,0 +1,21 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+/*
|
|
+ * Author: Christian Hewitt <christianshewitt@gmail.com>
|
|
+ */
|
|
+
|
|
+#include "meson-gxm-q200.dts"
|
|
+
|
|
+/ {
|
|
+ compatible = "mecool,gxm-kiii-pro", "amlogic,s912", "amlogic,meson-gxm";
|
|
+ model = "MeCool KIII Pro";
|
|
+
|
|
+ memory@0 {
|
|
+ device_type = "memory";
|
|
+ reg = <0x0 0x0 0x0 0xC0000000>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&ir {
|
|
+ linux,rc-map-name = "rc-mecool-kiii-pro";
|
|
+};
|
|
--
|
|
2.25.1
|
|
|