743c770326
* Use latest ODROID-N2+ patches (partial #929) Use the queued patches (and fixes) for upstream ODROID-N2+ support. This uses the clock settings from meson-g12b-a311d.dtsi running the CPUs at the following clocks: - 4xA73@2.2GHz - 2xA53@1.8GHz * Actually fix CDC ACM error recovery path (#921) Remove the revert of the cool-down patch and add the actual fix for the CDC ACM error recovery path.
79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
From 45ac6c04283dce57e0e911d5dc794eeb9446394c Mon Sep 17 00:00:00 2001
|
|
Message-Id: <45ac6c04283dce57e0e911d5dc794eeb9446394c.1603880585.git.stefan@agner.ch>
|
|
In-Reply-To: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
|
|
References: <59bbf3567b02c36edfa4ee013d7e7e8c492756f2.1603880585.git.stefan@agner.ch>
|
|
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
Date: Tue, 15 Sep 2020 17:24:32 +0200
|
|
Subject: [PATCH 10/14] arm64: dts: meson: add support for the ODROID-N2+
|
|
|
|
HardKernel ODROID-N2+ uses an Amlogic S922X rev. C chip capable of higher
|
|
clock speeds than the original ODROID-N2.
|
|
|
|
The rev. C support a slighly higher VDDCPU_A & VDDCPU_B voltages and supports
|
|
the same OPPs as the Amlogic A311D SoC from the same G12B family.
|
|
|
|
Suggested-by: Dongjin Kim <tobetter@hardkernel.com>
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
|
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
|
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
|
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
Link: https://lore.kernel.org/r/20200915152432.30616-4-narmstrong@baylibre.com
|
|
---
|
|
arch/arm64/boot/dts/amlogic/Makefile | 1 +
|
|
.../dts/amlogic/meson-g12b-odroid-n2-plus.dts | 31 +++++++++++++++++++
|
|
2 files changed, 32 insertions(+)
|
|
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
|
|
index eef0045320f2..7524cf9680f5 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
|
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
|
@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
|
|
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
|
|
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-nanopi-k2.dtb
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
|
|
new file mode 100644
|
|
index 000000000000..5de2815ba99d
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
|
|
@@ -0,0 +1,31 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+/*
|
|
+ * Copyright (c) 2019 BayLibre, SAS
|
|
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+
|
|
+/* The Amlogic S922X Rev. C supports the same OPPs as the A311D variant */
|
|
+#include "meson-g12b-a311d.dtsi"
|
|
+#include "meson-g12b-odroid-n2.dtsi"
|
|
+
|
|
+/ {
|
|
+ compatible = "hardkernel,odroid-n2-plus", "amlogic,s922x", "amlogic,g12b";
|
|
+ model = "Hardkernel ODROID-N2Plus";
|
|
+};
|
|
+
|
|
+&vddcpu_a {
|
|
+ regulator-min-microvolt = <680000>;
|
|
+ regulator-max-microvolt = <1040000>;
|
|
+
|
|
+ pwms = <&pwm_AO_cd 1 1500 0>;
|
|
+};
|
|
+
|
|
+&vddcpu_b {
|
|
+ regulator-min-microvolt = <680000>;
|
|
+ regulator-max-microvolt = <1040000>;
|
|
+
|
|
+ pwms = <&pwm_AO_cd 1 1500 0>;
|
|
+};
|
|
+
|
|
--
|
|
2.29.1
|
|
|