diff --git a/config/boards/nanopiduo2.conf b/config/boards/nanopiduo2.conf index 7325d17ab1..9dd4065e37 100644 --- a/config/boards/nanopiduo2.conf +++ b/config/boards/nanopiduo2.conf @@ -9,6 +9,6 @@ DEFAULT_OVERLAYS="usbhost0 usbhost2 usbhost3" DEFAULT_CONSOLE="serial" HAS_VIDEO_OUTPUT="no" SERIALCON="ttyS0,ttyGS0" -KERNEL_TARGET="current,edge" +KERNEL_TARGET="legacy,current,edge" BOOT_FDT_FILE="sun8i-h3-nanopi-duo2.dtb" CRUSTCONFIG="nanopi_m1_plus_defconfig" diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch new file mode 100644 index 0000000000..fc1e2db545 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch @@ -0,0 +1,63 @@ +From f6f0b76bcfcb1163e304c262207aeb714d16307b Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Mon, 26 Jun 2023 13:29:46 +0000 +Subject: [PATCH 1/2] ARM: dts: sun8i: nanopiduo2: Use key-0 as power button + +The onboard button key-0 was not marked as power button. This meant +that once the board was suspended, there was no way to bring it back +to life. Mark key-0 as power button so that it can be used to bring +the board back to life +--- + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts +index 343b02b97..4878d27ba 100644 +--- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts ++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts +@@ -42,8 +42,9 @@ gpio-keys { + + key-0 { + label = "k1"; +- linux,code = ; ++ linux,code = ; + gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; /* PL3 */ ++ wakeup-source; + }; + }; + +-- +2.34.1 + + +From 51af316406c82571be4a30665fbf93cab9caf080 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Mon, 26 Jun 2023 13:53:14 +0000 +Subject: [PATCH 2/2] ARM: dts: sun8i: nanopiduo2: enable ethernet + +NanoPi Duo2 has pinout for ethernet. Lets enable the same in dts +--- + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts +index 4878d27ba..8669fd087 100644 +--- a/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts ++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts +@@ -105,6 +105,13 @@ &ehci0 { + status = "okay"; + }; + ++&emac { ++ phy-handle = <&int_mii_phy>; ++ phy-mode = "mii"; ++ allwinner,leds-active-low; ++ status = "okay"; ++}; ++ + &mmc0 { + bus-width = <4>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ +-- +2.34.1 + diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch new file mode 100644 index 0000000000..8ed25c20e0 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch @@ -0,0 +1,48 @@ +From 3181c24ccea20fac9ff614ad04de182ed752ba83 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Mon, 10 Jul 2023 19:24:21 +0000 +Subject: [PATCH] arm: dts: sun8i: h3: reduce opp-microvolt to prevent not + supported by regulator error + +--- + arch/arm/boot/dts/sun8i-h3.dtsi | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi +index 1b02a4c3f05d..8c2f597772fe 100644 +--- a/arch/arm/boot/dts/sun8i-h3.dtsi ++++ b/arch/arm/boot/dts/sun8i-h3.dtsi +@@ -86,19 +86,19 @@ opp-1008000000 { + + opp-1104000000 { + opp-hz = /bits/ 64 <1104000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; +- opp-microvolt = <1340000 1340000 1340000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + +@@ -106,6 +106,7 @@ opp-1368000000 { + opp-hz = /bits/ 64 <1368000000>; + opp-microvolt = <1400000 1400000 1400000>; + clock-latency-ns = <244144>; /* 8 32k periods */ ++ status = "disabled"; + }; + }; + +-- +2.34.1 + diff --git a/patch/kernel/archive/sunxi-5.15/series.armbian b/patch/kernel/archive/sunxi-5.15/series.armbian index 6e78c8340e..3ae0dea099 100644 --- a/patch/kernel/archive/sunxi-5.15/series.armbian +++ b/patch/kernel/archive/sunxi-5.15/series.armbian @@ -188,3 +188,5 @@ patches.armbian/arm-dts-sun8i-r40-add-nodes-for-audio-codec.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-enable-audio-codec.patch patches.armbian/arm-dts-sun8i-v40-bananapi-m2-berry-enable-audio-codec.patch + patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-5.15/series.conf b/patch/kernel/archive/sunxi-5.15/series.conf index f22de5fe85..8fc4aa551b 100644 --- a/patch/kernel/archive/sunxi-5.15/series.conf +++ b/patch/kernel/archive/sunxi-5.15/series.conf @@ -656,3 +656,5 @@ patches.armbian/arm-dts-sun8i-r40-add-nodes-for-audio-codec.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-enable-audio-codec.patch patches.armbian/arm-dts-sun8i-v40-bananapi-m2-berry-enable-audio-codec.patch + patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch new file mode 100644 index 0000000000..8ed25c20e0 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch @@ -0,0 +1,48 @@ +From 3181c24ccea20fac9ff614ad04de182ed752ba83 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Mon, 10 Jul 2023 19:24:21 +0000 +Subject: [PATCH] arm: dts: sun8i: h3: reduce opp-microvolt to prevent not + supported by regulator error + +--- + arch/arm/boot/dts/sun8i-h3.dtsi | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi +index 1b02a4c3f05d..8c2f597772fe 100644 +--- a/arch/arm/boot/dts/sun8i-h3.dtsi ++++ b/arch/arm/boot/dts/sun8i-h3.dtsi +@@ -86,19 +86,19 @@ opp-1008000000 { + + opp-1104000000 { + opp-hz = /bits/ 64 <1104000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; +- opp-microvolt = <1340000 1340000 1340000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + +@@ -106,6 +106,7 @@ opp-1368000000 { + opp-hz = /bits/ 64 <1368000000>; + opp-microvolt = <1400000 1400000 1400000>; + clock-latency-ns = <244144>; /* 8 32k periods */ ++ status = "disabled"; + }; + }; + +-- +2.34.1 + diff --git a/patch/kernel/archive/sunxi-6.1/series.armbian b/patch/kernel/archive/sunxi-6.1/series.armbian index 1f919ef608..8f3613744f 100644 --- a/patch/kernel/archive/sunxi-6.1/series.armbian +++ b/patch/kernel/archive/sunxi-6.1/series.armbian @@ -177,3 +177,4 @@ patches.armbian/arm-dts-sun8i-h3-fix-thermal-read.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.1/series.conf b/patch/kernel/archive/sunxi-6.1/series.conf index 07c8b45a4f..3471eb5065 100644 --- a/patch/kernel/archive/sunxi-6.1/series.conf +++ b/patch/kernel/archive/sunxi-6.1/series.conf @@ -581,3 +581,4 @@ patches.armbian/arm-dts-sun8i-h3-fix-thermal-read.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.2/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch b/patch/kernel/archive/sunxi-6.2/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch new file mode 100644 index 0000000000..8ed25c20e0 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.2/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch @@ -0,0 +1,48 @@ +From 3181c24ccea20fac9ff614ad04de182ed752ba83 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Mon, 10 Jul 2023 19:24:21 +0000 +Subject: [PATCH] arm: dts: sun8i: h3: reduce opp-microvolt to prevent not + supported by regulator error + +--- + arch/arm/boot/dts/sun8i-h3.dtsi | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi +index 1b02a4c3f05d..8c2f597772fe 100644 +--- a/arch/arm/boot/dts/sun8i-h3.dtsi ++++ b/arch/arm/boot/dts/sun8i-h3.dtsi +@@ -86,19 +86,19 @@ opp-1008000000 { + + opp-1104000000 { + opp-hz = /bits/ 64 <1104000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; +- opp-microvolt = <1340000 1340000 1340000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + +@@ -106,6 +106,7 @@ opp-1368000000 { + opp-hz = /bits/ 64 <1368000000>; + opp-microvolt = <1400000 1400000 1400000>; + clock-latency-ns = <244144>; /* 8 32k periods */ ++ status = "disabled"; + }; + }; + +-- +2.34.1 + diff --git a/patch/kernel/archive/sunxi-6.2/series.armbian b/patch/kernel/archive/sunxi-6.2/series.armbian index eae1ed80f4..48054a6fe5 100644 --- a/patch/kernel/archive/sunxi-6.2/series.armbian +++ b/patch/kernel/archive/sunxi-6.2/series.armbian @@ -183,3 +183,4 @@ patches.armbian/mfd-sunxi-ac200-fix-error-initialization.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.2/series.conf b/patch/kernel/archive/sunxi-6.2/series.conf index c7a2e22958..fa85fe49ba 100644 --- a/patch/kernel/archive/sunxi-6.2/series.conf +++ b/patch/kernel/archive/sunxi-6.2/series.conf @@ -588,3 +588,4 @@ patches.armbian/mfd-sunxi-ac200-fix-error-initialization.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.3/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch b/patch/kernel/archive/sunxi-6.3/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch new file mode 100644 index 0000000000..8ed25c20e0 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.3/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch @@ -0,0 +1,48 @@ +From 3181c24ccea20fac9ff614ad04de182ed752ba83 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Mon, 10 Jul 2023 19:24:21 +0000 +Subject: [PATCH] arm: dts: sun8i: h3: reduce opp-microvolt to prevent not + supported by regulator error + +--- + arch/arm/boot/dts/sun8i-h3.dtsi | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi +index 1b02a4c3f05d..8c2f597772fe 100644 +--- a/arch/arm/boot/dts/sun8i-h3.dtsi ++++ b/arch/arm/boot/dts/sun8i-h3.dtsi +@@ -86,19 +86,19 @@ opp-1008000000 { + + opp-1104000000 { + opp-hz = /bits/ 64 <1104000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; +- opp-microvolt = <1340000 1340000 1340000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + +@@ -106,6 +106,7 @@ opp-1368000000 { + opp-hz = /bits/ 64 <1368000000>; + opp-microvolt = <1400000 1400000 1400000>; + clock-latency-ns = <244144>; /* 8 32k periods */ ++ status = "disabled"; + }; + }; + +-- +2.34.1 + diff --git a/patch/kernel/archive/sunxi-6.3/series.armbian b/patch/kernel/archive/sunxi-6.3/series.armbian index eae1ed80f4..48054a6fe5 100644 --- a/patch/kernel/archive/sunxi-6.3/series.armbian +++ b/patch/kernel/archive/sunxi-6.3/series.armbian @@ -183,3 +183,4 @@ patches.armbian/mfd-sunxi-ac200-fix-error-initialization.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.3/series.conf b/patch/kernel/archive/sunxi-6.3/series.conf index 353e35154e..bb04d29207 100644 --- a/patch/kernel/archive/sunxi-6.3/series.conf +++ b/patch/kernel/archive/sunxi-6.3/series.conf @@ -600,3 +600,4 @@ patches.armbian/mfd-sunxi-ac200-fix-error-initialization.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.4/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch b/patch/kernel/archive/sunxi-6.4/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch new file mode 100644 index 0000000000..8ed25c20e0 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.4/patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch @@ -0,0 +1,48 @@ +From 3181c24ccea20fac9ff614ad04de182ed752ba83 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Mon, 10 Jul 2023 19:24:21 +0000 +Subject: [PATCH] arm: dts: sun8i: h3: reduce opp-microvolt to prevent not + supported by regulator error + +--- + arch/arm/boot/dts/sun8i-h3.dtsi | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi +index 1b02a4c3f05d..8c2f597772fe 100644 +--- a/arch/arm/boot/dts/sun8i-h3.dtsi ++++ b/arch/arm/boot/dts/sun8i-h3.dtsi +@@ -86,19 +86,19 @@ opp-1008000000 { + + opp-1104000000 { + opp-hz = /bits/ 64 <1104000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; +- opp-microvolt = <1320000 1320000 1320000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; +- opp-microvolt = <1340000 1340000 1340000>; ++ opp-microvolt = <1300000 1300000 1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + +@@ -106,6 +106,7 @@ opp-1368000000 { + opp-hz = /bits/ 64 <1368000000>; + opp-microvolt = <1400000 1400000 1400000>; + clock-latency-ns = <244144>; /* 8 32k periods */ ++ status = "disabled"; + }; + }; + +-- +2.34.1 + diff --git a/patch/kernel/archive/sunxi-6.4/series.armbian b/patch/kernel/archive/sunxi-6.4/series.armbian index eae1ed80f4..48054a6fe5 100644 --- a/patch/kernel/archive/sunxi-6.4/series.armbian +++ b/patch/kernel/archive/sunxi-6.4/series.armbian @@ -183,3 +183,4 @@ patches.armbian/mfd-sunxi-ac200-fix-error-initialization.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch diff --git a/patch/kernel/archive/sunxi-6.4/series.conf b/patch/kernel/archive/sunxi-6.4/series.conf index c013bdaf4e..7356508931 100644 --- a/patch/kernel/archive/sunxi-6.4/series.conf +++ b/patch/kernel/archive/sunxi-6.4/series.conf @@ -663,3 +663,4 @@ patches.armbian/mfd-sunxi-ac200-fix-error-initialization.patch patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun8i-h3-nanopi-duo2-enable-powerbutton-and-ethernet.patch + patches.armbian/arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not.patch