2069ccf24f
* Linux: Update kernel 5.10.53 Move back to the LTS kernel 5.10. [backport for rel-6] * Remove ODROID-N2 specific kernel update script
52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
<<<<<<< HEAD:buildroot-external/board/hardkernel/patches/linux/5.9.16/0005-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
|
|
From 3f2aecc668b172e0c91bf1bfdc78ee18a6bb6645 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <3f2aecc668b172e0c91bf1bfdc78ee18a6bb6645.1622055679.git.stefan@agner.ch>
|
|
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
From: Hyeonki Hong <hhk7734@gmail.com>
|
|
Date: Wed, 7 Apr 2021 04:26:08 +0000
|
|
Subject: [PATCH 05/11] arm64: dts: meson: add saradc node to ODROID N2/N2+
|
|
=======
|
|
From ec3b1240b428c5652ccb7fdadad217a2ff8ab4db Mon Sep 17 00:00:00 2001
|
|
Message-Id: <ec3b1240b428c5652ccb7fdadad217a2ff8ab4db.1627311993.git.stefan@agner.ch>
|
|
In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
|
|
References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
|
|
From: Hyeonki Hong <hhk7734@gmail.com>
|
|
Date: Wed, 7 Apr 2021 04:26:08 +0000
|
|
Subject: [PATCH 2/9] arm64: dts: meson: add saradc node to ODROID N2/N2+
|
|
>>>>>>> be3afe8b (Update to Linux 5.10.53 (#1475)):buildroot-external/board/hardkernel/patches/linux/5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
|
|
|
|
Add the meson saradc node to the ODROID N2/N2+ common dtsi.
|
|
|
|
Signed-off-by: Hyeonki Hong <hhk7734@gmail.com>
|
|
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
|
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
|
Link: https://lore.kernel.org/r/20210407042609.9736-3-christianshewitt@gmail.com
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
<<<<<<< HEAD:buildroot-external/board/hardkernel/patches/linux/5.9.16/0005-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
|
|
index 5927c4493f5a..194a437b4e3f 100644
|
|
=======
|
|
index b78be3e6974d..8a5e132c4b79 100644
|
|
>>>>>>> be3afe8b (Update to Linux 5.10.53 (#1475)):buildroot-external/board/hardkernel/patches/linux/5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
@@ -508,6 +508,11 @@ &pwm_AO_cd {
|
|
status = "okay";
|
|
};
|
|
|
|
+&saradc {
|
|
+ status = "okay";
|
|
+ vref-supply = <&vddao_1v8>;
|
|
+};
|
|
+
|
|
/* SD card */
|
|
&sd_emmc_b {
|
|
status = "okay";
|
|
--
|
|
2.31.1
|
|
|