From 6abd384e6f5b6c03dc0f1e20f71370df7482317e Mon Sep 17 00:00:00 2001 From: Gunjan Gupta Date: Thu, 28 Dec 2023 20:37:13 +0530 Subject: [PATCH] Port few zero2 patches to cover zero3 as well --- ...e_xlate-cpu-frequency-scaling-v1_6_2.patch | 45 ++++++++++++++----- ...ro2-Enable-expansion-board-USB-ports.patch | 39 ++++++++++------ ...-h618-orangepi-zero3-Enable-GPU-mali.patch | 28 ++++++++++++ patch/kernel/archive/sunxi-6.6/series.armbian | 1 + patch/kernel/archive/sunxi-6.6/series.conf | 1 + ...e_xlate-cpu-frequency-scaling-v1_6_2.patch | 45 ++++++++++++++----- ...ro2-Enable-expansion-board-USB-ports.patch | 39 ++++++++++------ ...-h618-orangepi-zero3-Enable-GPU-mali.patch | 28 ++++++++++++ patch/kernel/archive/sunxi-6.7/series.armbian | 1 + patch/kernel/archive/sunxi-6.7/series.conf | 1 + 10 files changed, 180 insertions(+), 48 deletions(-) create mode 100644 patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch create mode 100644 patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch index 43a2e3a2eb..4b046b04b6 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch @@ -9,10 +9,12 @@ Subject: arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2 Signed-off-by: AGM1968 --- arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi | 75 ++++++++ - arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 6 + + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 1 + + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 5 + + arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 5 + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 91 +++++++--- - 4 files changed, 149 insertions(+), 24 deletions(-) + 6 files changed, 154 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi new file mode 100644 @@ -95,18 +97,23 @@ index 000000000000..36f2950367c6 +&cpu3 { + operating-points-v2 = <&cpu_opp_table>; +}; -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -index 8d8009c7f9a3..28b5b1be932f 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -@@ -6,12 +6,18 @@ - /dts-v1/; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +index 0666d16ba7d0..54d706286554 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +@@ -7,6 +7,7 @@ + */ - #include "sun50i-h616-orangepi-zero.dtsi" + #include "sun50i-h616.dtsi" +#include "sun50i-h616-cpu-opp.dtsi" - / { - model = "OrangePi Zero2"; + #include + #include +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts +index 8d8009c7f9a3..41a5a4013091 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts +@@ -12,6 +12,11 @@ / { compatible = "xunlong,orangepi-zero2", "allwinner,sun50i-h616"; }; @@ -118,6 +125,22 @@ index 8d8009c7f9a3..28b5b1be932f 100644 &emac0 { phy-supply = <®_dcdce>; }; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +index 00fe28caac93..edbfc83f390a 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +@@ -12,6 +12,11 @@ / { + compatible = "xunlong,orangepi-zero3", "allwinner,sun50i-h618"; + }; + ++&cpu0 { ++ cpu-supply = <®_dcdc2>; ++ status = "okay"; ++}; ++ + &emac0 { + phy-supply = <®_dldo1>; + }; diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index fb2875ce1fdd..e63d36839769 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch index f4dd506dc8..bde26a3168 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch @@ -7,29 +7,42 @@ Subject: arm64: dts: allwinner: h616 orangepi zero2: Enable expansion board Signed-off-by: Michal Dziekonski --- - arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 15 ++++++++++ + 1 file changed, 15 insertions(+) -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -index 28b5b1be932f..22434978bc49 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -@@ -22,6 +22,15 @@ &emac0 { - phy-supply = <®_dcdce>; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +index 9dbf5ce0c338..e4281a47e290 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +@@ -67,6 +67,13 @@ &ehci1 { }; -+ -+/* USB 2 & 3 are on headers used by expansion board */ + /* USB 2 & 3 are on headers only. */ +&ehci2 { + status = "okay"; +}; ++ +&ehci3 { + status = "okay"; +}; -+ - &gpu { - mali-supply = <®_dcdcc>; + + &emac0 { + pinctrl-names = "default"; +@@ -95,6 +102,14 @@ &ohci1 { status = "okay"; + }; + ++&ohci2 { ++ status = "okay"; ++}; ++ ++&ohci3 { ++ status = "okay"; ++}; ++ + &spi0 { + status = "okay"; + pinctrl-names = "default"; -- Armbian diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch new file mode 100644 index 0000000000..fed1e1272d --- /dev/null +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Thu, 28 Dec 2023 15:01:03 +0000 +Subject: arm64:dts: sun50i-h618-orangepi-zero3 Enable GPU mali + +--- + arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +index edbfc83f390a..d8cb4deafde7 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +@@ -25,6 +25,11 @@ &ext_rgmii_phy { + motorcomm,clk-out-frequency-hz = <125000000>; + }; + ++&gpu { ++ mali-supply = <®_dcdc1>; ++ status = "disabled"; ++}; ++ + &mmc0 { + /* + * The schematic shows the card detect pin wired up to PF6, via an +-- +Armbian + diff --git a/patch/kernel/archive/sunxi-6.6/series.armbian b/patch/kernel/archive/sunxi-6.6/series.armbian index cc71d02497..d3de5d7429 100644 --- a/patch/kernel/archive/sunxi-6.6/series.armbian +++ b/patch/kernel/archive/sunxi-6.6/series.armbian @@ -192,3 +192,4 @@ patches.armbian/drivers-input-axp20x-pek-allow-wakeup-after-shutdown.patch patches.armbian/arm64-dts-add-wifi-nodes-for-Inovato-Quadra.patch patches.armbian/arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch + patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch diff --git a/patch/kernel/archive/sunxi-6.6/series.conf b/patch/kernel/archive/sunxi-6.6/series.conf index 7a9b5998c7..fa342be901 100644 --- a/patch/kernel/archive/sunxi-6.6/series.conf +++ b/patch/kernel/archive/sunxi-6.6/series.conf @@ -461,3 +461,4 @@ patches.armbian/drivers-input-axp20x-pek-allow-wakeup-after-shutdown.patch patches.armbian/arm64-dts-add-wifi-nodes-for-Inovato-Quadra.patch patches.armbian/arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch + patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch index 0dd0ea0c79..02352f1802 100644 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch @@ -9,10 +9,12 @@ Subject: arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2 Signed-off-by: AGM1968 --- arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi | 75 ++++++++ - arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 6 + + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 1 + + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 5 + + arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 5 + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 91 +++++++--- - 4 files changed, 149 insertions(+), 24 deletions(-) + 6 files changed, 154 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi new file mode 100644 @@ -95,18 +97,23 @@ index 000000000000..36f2950367c6 +&cpu3 { + operating-points-v2 = <&cpu_opp_table>; +}; -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -index 8d8009c7f9a3..28b5b1be932f 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -@@ -6,12 +6,18 @@ - /dts-v1/; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +index 0666d16ba7d0..54d706286554 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +@@ -7,6 +7,7 @@ + */ - #include "sun50i-h616-orangepi-zero.dtsi" + #include "sun50i-h616.dtsi" +#include "sun50i-h616-cpu-opp.dtsi" - / { - model = "OrangePi Zero2"; + #include + #include +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts +index 8d8009c7f9a3..41a5a4013091 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts +@@ -12,6 +12,11 @@ / { compatible = "xunlong,orangepi-zero2", "allwinner,sun50i-h616"; }; @@ -118,6 +125,22 @@ index 8d8009c7f9a3..28b5b1be932f 100644 &emac0 { phy-supply = <®_dcdce>; }; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +index 00fe28caac93..edbfc83f390a 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +@@ -12,6 +12,11 @@ / { + compatible = "xunlong,orangepi-zero3", "allwinner,sun50i-h618"; + }; + ++&cpu0 { ++ cpu-supply = <®_dcdc2>; ++ status = "okay"; ++}; ++ + &emac0 { + phy-supply = <®_dldo1>; + }; diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index bd1e1357cef8..1cab455c0aaf 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch index f4dd506dc8..bde26a3168 100644 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-USB-ports.patch @@ -7,29 +7,42 @@ Subject: arm64: dts: allwinner: h616 orangepi zero2: Enable expansion board Signed-off-by: Michal Dziekonski --- - arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) + arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 15 ++++++++++ + 1 file changed, 15 insertions(+) -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -index 28b5b1be932f..22434978bc49 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts -@@ -22,6 +22,15 @@ &emac0 { - phy-supply = <®_dcdce>; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +index 9dbf5ce0c338..e4281a47e290 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +@@ -67,6 +67,13 @@ &ehci1 { }; -+ -+/* USB 2 & 3 are on headers used by expansion board */ + /* USB 2 & 3 are on headers only. */ +&ehci2 { + status = "okay"; +}; ++ +&ehci3 { + status = "okay"; +}; -+ - &gpu { - mali-supply = <®_dcdcc>; + + &emac0 { + pinctrl-names = "default"; +@@ -95,6 +102,14 @@ &ohci1 { status = "okay"; + }; + ++&ohci2 { ++ status = "okay"; ++}; ++ ++&ohci3 { ++ status = "okay"; ++}; ++ + &spi0 { + status = "okay"; + pinctrl-names = "default"; -- Armbian diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch new file mode 100644 index 0000000000..fed1e1272d --- /dev/null +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Gunjan Gupta +Date: Thu, 28 Dec 2023 15:01:03 +0000 +Subject: arm64:dts: sun50i-h618-orangepi-zero3 Enable GPU mali + +--- + arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +index edbfc83f390a..d8cb4deafde7 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +@@ -25,6 +25,11 @@ &ext_rgmii_phy { + motorcomm,clk-out-frequency-hz = <125000000>; + }; + ++&gpu { ++ mali-supply = <®_dcdc1>; ++ status = "disabled"; ++}; ++ + &mmc0 { + /* + * The schematic shows the card detect pin wired up to PF6, via an +-- +Armbian + diff --git a/patch/kernel/archive/sunxi-6.7/series.armbian b/patch/kernel/archive/sunxi-6.7/series.armbian index cc71d02497..d3de5d7429 100644 --- a/patch/kernel/archive/sunxi-6.7/series.armbian +++ b/patch/kernel/archive/sunxi-6.7/series.armbian @@ -192,3 +192,4 @@ patches.armbian/drivers-input-axp20x-pek-allow-wakeup-after-shutdown.patch patches.armbian/arm64-dts-add-wifi-nodes-for-Inovato-Quadra.patch patches.armbian/arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch + patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch diff --git a/patch/kernel/archive/sunxi-6.7/series.conf b/patch/kernel/archive/sunxi-6.7/series.conf index 3b37aa357d..4354344a60 100644 --- a/patch/kernel/archive/sunxi-6.7/series.conf +++ b/patch/kernel/archive/sunxi-6.7/series.conf @@ -514,3 +514,4 @@ patches.armbian/drivers-input-axp20x-pek-allow-wakeup-after-shutdown.patch patches.armbian/arm64-dts-add-wifi-nodes-for-Inovato-Quadra.patch patches.armbian/arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2.patch + patches.armbian/arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali.patch