mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-27 15:06:29 +00:00
Bump ODROID-N2 to Linux 5.12 (#1414)
Use the latest Linux stable release 5.12 for ODROID-N2. This allows to test if we see the random kernel crashes observed with 5.10 in latest stable 5.12 as well.
This commit is contained in:
parent
f7c5154bda
commit
084636b6cf
@ -1,10 +1,8 @@
|
|||||||
From 3f2aecc668b172e0c91bf1bfdc78ee18a6bb6645 Mon Sep 17 00:00:00 2001
|
From 287005e14b9ba3a4c19f7b96a2011323e0f3f1bc Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <3f2aecc668b172e0c91bf1bfdc78ee18a6bb6645.1622055679.git.stefan@agner.ch>
|
Message-Id: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.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>
|
From: Hyeonki Hong <hhk7734@gmail.com>
|
||||||
Date: Wed, 7 Apr 2021 04:26:08 +0000
|
Date: Wed, 7 Apr 2021 04:26:08 +0000
|
||||||
Subject: [PATCH 05/11] arm64: dts: meson: add saradc node to ODROID N2/N2+
|
Subject: [PATCH 1/8] arm64: dts: meson: add saradc node to ODROID N2/N2+
|
||||||
|
|
||||||
Add the meson saradc node to the ODROID N2/N2+ common dtsi.
|
Add the meson saradc node to the ODROID N2/N2+ common dtsi.
|
||||||
|
|
||||||
@ -17,7 +15,7 @@ Link: https://lore.kernel.org/r/20210407042609.9736-3-christianshewitt@gmail.com
|
|||||||
1 file changed, 5 insertions(+)
|
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
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
index 5927c4493f5a..194a437b4e3f 100644
|
index 58ce569b2ace..4f22d00756a9 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
+++ b/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 {
|
@@ -508,6 +508,11 @@ &pwm_AO_cd {
|
||||||
@ -33,5 +31,5 @@ index 5927c4493f5a..194a437b4e3f 100644
|
|||||||
&sd_emmc_b {
|
&sd_emmc_b {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
--
|
--
|
||||||
2.31.1
|
2.32.0
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
From d13c62fab2c91cacda74a9001ea6a6c7d8a9af39 Mon Sep 17 00:00:00 2001
|
From 782eddd7ab8b256023c49d258c66248990d0f063 Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <d13c62fab2c91cacda74a9001ea6a6c7d8a9af39.1622055679.git.stefan@agner.ch>
|
Message-Id: <782eddd7ab8b256023c49d258c66248990d0f063.1623663122.git.stefan@agner.ch>
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
From: Hyeonki Hong <hhk7734@gmail.com>
|
From: Hyeonki Hong <hhk7734@gmail.com>
|
||||||
Date: Wed, 7 Apr 2021 04:26:09 +0000
|
Date: Wed, 7 Apr 2021 04:26:09 +0000
|
||||||
Subject: [PATCH 06/11] arm64: dts: meson: add GPIO line names to ODROID N2/N2+
|
Subject: [PATCH 2/8] arm64: dts: meson: add GPIO line names to ODROID N2/N2+
|
||||||
|
|
||||||
Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi.
|
Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi.
|
||||||
|
|
||||||
@ -18,7 +18,7 @@ Link: https://lore.kernel.org/r/20210407042609.9736-4-christianshewitt@gmail.com
|
|||||||
1 file changed, 45 insertions(+)
|
1 file changed, 45 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
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
index 194a437b4e3f..fe85aa6da460 100644
|
index 4f22d00756a9..163449aa23a7 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
@@ -446,6 +446,51 @@ &frddr_c {
|
@@ -446,6 +446,51 @@ &frddr_c {
|
||||||
@ -74,5 +74,5 @@ index 194a437b4e3f..fe85aa6da460 100644
|
|||||||
* WARNING: The USB Hub on the Odroid-N2 needs a reset signal
|
* WARNING: The USB Hub on the Odroid-N2 needs a reset signal
|
||||||
* to be turned high in order to be detected by the USB Controller
|
* to be turned high in order to be detected by the USB Controller
|
||||||
--
|
--
|
||||||
2.31.1
|
2.32.0
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
From 25cd545d370b67f5e5e19d93484d378571526da2 Mon Sep 17 00:00:00 2001
|
From 02c65953107991b87b9b85615c1e43af6be366d5 Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <25cd545d370b67f5e5e19d93484d378571526da2.1622055679.git.stefan@agner.ch>
|
Message-Id: <02c65953107991b87b9b85615c1e43af6be366d5.1623663122.git.stefan@agner.ch>
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
From: Stefan Agner <stefan@agner.ch>
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
Date: Mon, 11 Jan 2021 11:20:48 +0100
|
Date: Mon, 11 Jan 2021 11:20:48 +0100
|
||||||
Subject: [PATCH 07/11] arm64: dts: meson: g12b: add power button support
|
Subject: [PATCH 3/8] arm64: dts: meson: g12b: add power button support
|
||||||
|
|
||||||
Add power button support on J2 pin 11 (GPIOX_3 on the SoC side). The
|
Add power button support on J2 pin 11 (GPIOX_3 on the SoC side). The
|
||||||
GPIO is low active, e.g. when connecting with pin 9 (GND) a power
|
GPIO is low active, e.g. when connecting with pin 9 (GND) a power
|
||||||
@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|||||||
1 file changed, 11 insertions(+)
|
1 file changed, 11 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
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
index fe85aa6da460..9b1541ee2273 100644
|
index 163449aa23a7..80f7557ebd98 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
|
@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
|
||||||
@ -38,5 +38,5 @@ index fe85aa6da460..9b1541ee2273 100644
|
|||||||
compatible = "gpio-leds";
|
compatible = "gpio-leds";
|
||||||
|
|
||||||
--
|
--
|
||||||
2.31.1
|
2.32.0
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
From b94a0698f21a2d8f6623b69fc17fe9491bc22a9b Mon Sep 17 00:00:00 2001
|
From f55e45c5cb4875d535af546893c60d729e29fb24 Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <b94a0698f21a2d8f6623b69fc17fe9491bc22a9b.1622055679.git.stefan@agner.ch>
|
Message-Id: <f55e45c5cb4875d535af546893c60d729e29fb24.1623663122.git.stefan@agner.ch>
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
From: Stefan Agner <stefan@agner.ch>
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
Date: Mon, 11 Jan 2021 11:38:54 +0100
|
Date: Mon, 11 Jan 2021 11:38:54 +0100
|
||||||
Subject: [PATCH 08/11] arm64: dts: meson: g12b: add GPIO fan support
|
Subject: [PATCH 4/8] arm64: dts: meson: g12b: add GPIO fan support
|
||||||
|
|
||||||
Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the
|
Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the
|
||||||
pad used to control the fan does not support real PWM, hence the RPM
|
pad used to control the fan does not support real PWM, hence the RPM
|
||||||
@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|||||||
1 file changed, 11 insertions(+)
|
1 file changed, 11 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
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
index 9b1541ee2273..8ad7c3ee1aa3 100644
|
index 80f7557ebd98..81541dcc7a01 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
|
@@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq {
|
||||||
@ -38,5 +38,5 @@ index 9b1541ee2273..8ad7c3ee1aa3 100644
|
|||||||
compatible = "gpio-keys-polled";
|
compatible = "gpio-keys-polled";
|
||||||
poll-interval = <100>;
|
poll-interval = <100>;
|
||||||
--
|
--
|
||||||
2.31.1
|
2.32.0
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
From 4d9f93dbdc93e83ba8ddf01893b3c29cd11a87f9 Mon Sep 17 00:00:00 2001
|
From 69e93af55c78d4b4dca6f9f2f2a422bab1ba42d2 Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <4d9f93dbdc93e83ba8ddf01893b3c29cd11a87f9.1622055679.git.stefan@agner.ch>
|
Message-Id: <69e93af55c78d4b4dca6f9f2f2a422bab1ba42d2.1623663122.git.stefan@agner.ch>
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
From: Stefan Agner <stefan@agner.ch>
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
Date: Mon, 11 Jan 2021 15:53:55 +0100
|
Date: Mon, 11 Jan 2021 15:53:55 +0100
|
||||||
Subject: [PATCH 09/11] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
|
Subject: [PATCH 5/8] arm64: dts: meson: g12b: odroid-n2: add fan as cooling
|
||||||
device
|
device
|
||||||
MIME-Version: 1.0
|
MIME-Version: 1.0
|
||||||
Content-Type: text/plain; charset=UTF-8
|
Content-Type: text/plain; charset=UTF-8
|
||||||
@ -21,7 +21,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|||||||
1 file changed, 38 insertions(+)
|
1 file changed, 38 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
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
index 8ad7c3ee1aa3..c4052293ea0d 100644
|
index 81541dcc7a01..2a88a63883b4 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
@@ -388,6 +388,44 @@ &clkc_audio {
|
@@ -388,6 +388,44 @@ &clkc_audio {
|
||||||
@ -70,5 +70,5 @@ index 8ad7c3ee1aa3..c4052293ea0d 100644
|
|||||||
cpu-supply = <&vddcpu_b>;
|
cpu-supply = <&vddcpu_b>;
|
||||||
operating-points-v2 = <&cpu_opp_table_0>;
|
operating-points-v2 = <&cpu_opp_table_0>;
|
||||||
--
|
--
|
||||||
2.31.1
|
2.32.0
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
From 1eeec94aa6dd6f9900e6213025916eb85f6b3b62 Mon Sep 17 00:00:00 2001
|
From d1735a6a414ff1119bf32b27c2bd607241e2152f Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <1eeec94aa6dd6f9900e6213025916eb85f6b3b62.1622055679.git.stefan@agner.ch>
|
Message-Id: <d1735a6a414ff1119bf32b27c2bd607241e2152f.1623663122.git.stefan@agner.ch>
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
From: Hyeonki Hong <hhk7734@gmail.com>
|
From: Hyeonki Hong <hhk7734@gmail.com>
|
||||||
Date: Fri, 27 Mar 2020 17:05:22 +0900
|
Date: Fri, 27 Mar 2020 17:05:22 +0900
|
||||||
Subject: [PATCH 10/11] arm64: dts: meson: add uart_A node
|
Subject: [PATCH 6/8] arm64: dts: meson: add uart_A node
|
||||||
|
|
||||||
The UART_A is available through J3 pin 8/10 and documented to be
|
The UART_A is available through J3 pin 8/10 and documented to be
|
||||||
available as UART by default.
|
available as UART by default.
|
||||||
@ -15,7 +15,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|||||||
1 file changed, 7 insertions(+)
|
1 file changed, 7 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
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
index c4052293ea0d..38a996ed3e19 100644
|
index 2a88a63883b4..4922841e4af4 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
@@ -12,6 +12,7 @@
|
@@ -12,6 +12,7 @@
|
||||||
@ -40,5 +40,5 @@ index c4052293ea0d..38a996ed3e19 100644
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
pinctrl-0 = <&uart_ao_a_pins>;
|
pinctrl-0 = <&uart_ao_a_pins>;
|
||||||
--
|
--
|
||||||
2.31.1
|
2.32.0
|
||||||
|
|
@ -1,10 +1,10 @@
|
|||||||
From 400fce2e1eaab6d04f542eaa0fe3b53fb9d79d82 Mon Sep 17 00:00:00 2001
|
From 84bf054b6812ccbccdc4535b9baf88fe32324aca Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <400fce2e1eaab6d04f542eaa0fe3b53fb9d79d82.1622055679.git.stefan@agner.ch>
|
Message-Id: <84bf054b6812ccbccdc4535b9baf88fe32324aca.1623663122.git.stefan@agner.ch>
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch>
|
||||||
From: Stefan Agner <stefan@agner.ch>
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
Date: Thu, 29 Apr 2021 21:32:43 +0200
|
Date: Thu, 29 Apr 2021 21:32:43 +0200
|
||||||
Subject: [PATCH 11/11] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
|
Subject: [PATCH 7/8] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
|
||||||
|
|
||||||
The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which
|
The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which
|
||||||
are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second
|
are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second
|
||||||
@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|||||||
1 file changed, 6 insertions(+)
|
1 file changed, 6 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
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
index 38a996ed3e19..45a8998c4a3a 100644
|
index 4922841e4af4..96114e8f8cb6 100644
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
||||||
@@ -586,6 +586,12 @@ &ir {
|
@@ -586,6 +586,12 @@ &ir {
|
||||||
@ -33,5 +33,5 @@ index 38a996ed3e19..45a8998c4a3a 100644
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
|
pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
|
||||||
--
|
--
|
||||||
2.31.1
|
2.32.0
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
@ -1,38 +0,0 @@
|
|||||||
From a189f6229a9462ae2fc406b1e45286d2eea32b40 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <a189f6229a9462ae2fc406b1e45286d2eea32b40.1622055679.git.stefan@agner.ch>
|
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
||||||
Date: Tue, 15 Sep 2020 17:24:31 +0200
|
|
||||||
Subject: [PATCH 02/11] dt-bindings: arm: amlogic: add support for the
|
|
||||||
ODROID-N2+
|
|
||||||
|
|
||||||
HardKernel ODROID-N2+ uses a revised Amlogic S922X v2 chip that supports
|
|
||||||
higher cpu clock speeds than the original ODROID-N2.
|
|
||||||
|
|
||||||
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: Rob Herring <robh@kernel.org>
|
|
||||||
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
||||||
Link: https://lore.kernel.org/r/20200915152432.30616-3-narmstrong@baylibre.com
|
|
||||||
(cherry picked from commit 88ba71cdc5497390350c87e68ce35688e88be3e8)
|
|
||||||
---
|
|
||||||
Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
|
||||||
index 5eba9f48823e..12ba8d074370 100644
|
|
||||||
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
|
|
||||||
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
|
|
||||||
@@ -153,6 +153,7 @@ properties:
|
|
||||||
- azw,gtking
|
|
||||||
- azw,gtking-pro
|
|
||||||
- hardkernel,odroid-n2
|
|
||||||
+ - hardkernel,odroid-n2-plus
|
|
||||||
- khadas,vim3
|
|
||||||
- ugoos,am6
|
|
||||||
- const: amlogic,s922x
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
@ -1,79 +0,0 @@
|
|||||||
From 2f09401241a0f2348d3e30617e89a00c1dc45895 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <2f09401241a0f2348d3e30617e89a00c1dc45895.1622055679.git.stefan@agner.ch>
|
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
||||||
Date: Tue, 15 Sep 2020 17:24:32 +0200
|
|
||||||
Subject: [PATCH 03/11] 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
|
|
||||||
(cherry picked from commit 98d24896ee117b1f0969405476c943e9307e30d4)
|
|
||||||
---
|
|
||||||
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 4e2239ffcaa5..b0b3d6791499 100644
|
|
||||||
--- a/arch/arm64/boot/dts/amlogic/Makefile
|
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/Makefile
|
|
||||||
@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.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.31.1
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
|||||||
From 7dba042e7863dc61ec74c0759493264e48d32df2 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <7dba042e7863dc61ec74c0759493264e48d32df2.1622055679.git.stefan@agner.ch>
|
|
||||||
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
||||||
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
||||||
Date: Mon, 11 Jan 2021 13:58:31 +0000
|
|
||||||
Subject: [PATCH 04/11] arm64: dts: meson: add i2c3/rtc nodes and rtc aliases
|
|
||||||
to ODROID-N2 dtsi
|
|
||||||
|
|
||||||
Enable the onboard pcf8563 rtc hardware on ODROID N2/N2+ boards via the
|
|
||||||
common dtsi. Also add aliases to ensure vrtc does not claim /dev/rtc0.
|
|
||||||
|
|
||||||
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
|
|
||||||
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
|
|
||||||
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
|
||||||
Link: https://lore.kernel.org/r/20210111135831.2218-1-christianshewitt@gmail.com
|
|
||||||
---
|
|
||||||
.../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 14 ++++++++++++++
|
|
||||||
1 file changed, 14 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
|
|
||||||
index 6982632ae646..5927c4493f5a 100644
|
|
||||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
||||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
||||||
@@ -13,6 +13,8 @@ / {
|
|
||||||
aliases {
|
|
||||||
serial0 = &uart_AO;
|
|
||||||
ethernet0 = ðmac;
|
|
||||||
+ rtc0 = &rtc;
|
|
||||||
+ rtc1 = &vrtc;
|
|
||||||
};
|
|
||||||
|
|
||||||
dioo2133: audio-amplifier-0 {
|
|
||||||
@@ -478,6 +480,18 @@ &ir {
|
|
||||||
linux,rc-map-name = "rc-odroid";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&i2c3 {
|
|
||||||
+ status = "okay";
|
|
||||||
+ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+
|
|
||||||
+ rtc: rtc@51 {
|
|
||||||
+ compatible = "nxp,pcf8563";
|
|
||||||
+ reg = <0x51>;
|
|
||||||
+ wakeup-source;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&pwm_ab {
|
|
||||||
pinctrl-0 = <&pwm_a_e_pins>;
|
|
||||||
pinctrl-names = "default";
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
|||||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
|
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
|
||||||
BR2_LINUX_KERNEL=y
|
BR2_LINUX_KERNEL=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.16"
|
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
|
||||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
|
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
|
||||||
@ -94,7 +94,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
|
|||||||
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
|
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
|
||||||
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
|
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
|
||||||
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush"
|
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush"
|
||||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
|
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
|
||||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||||
BR2_PACKAGE_HOST_E2FSPROGS=y
|
BR2_PACKAGE_HOST_E2FSPROGS=y
|
||||||
BR2_PACKAGE_HOST_GPTFDISK=y
|
BR2_PACKAGE_HOST_GPTFDISK=y
|
||||||
|
Loading…
x
Reference in New Issue
Block a user