From fb18554fc62138cb7b952853d6152f0a4416f9cd Mon Sep 17 00:00:00 2001 From: adamg Date: Tue, 28 Nov 2023 10:37:15 +0000 Subject: [PATCH] Amlogic/linux: fix-up ogu/max3 dts --- ...1.02-Add-ODROID-GO-Ultra-device-tree.patch | 34 ++++++------------- ...Add-Powkiddy-RGB10-MAX-3-device-tree.patch | 15 ++++---- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/projects/Amlogic/packages/linux/patches/S922X/001.02-Add-ODROID-GO-Ultra-device-tree.patch b/projects/Amlogic/packages/linux/patches/S922X/001.02-Add-ODROID-GO-Ultra-device-tree.patch index af1b464d0..d4cf36625 100644 --- a/projects/Amlogic/packages/linux/patches/S922X/001.02-Add-ODROID-GO-Ultra-device-tree.patch +++ b/projects/Amlogic/packages/linux/patches/S922X/001.02-Add-ODROID-GO-Ultra-device-tree.patch @@ -1,7 +1,9 @@ -diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts ---- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-09-12 13:20:28.956694441 +0000 -@@ -0,0 +1,1015 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +new file mode 100644 +index 000000000000..f42ebb59a59c +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +@@ -0,0 +1,1001 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2022 Neil Armstrong @@ -9,7 +11,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts + +/dts-v1/; + -+#include "meson-g12b-s922x.dtsi" ++#include "meson-g12b-a311d.dtsi" +#include +#include +#include @@ -379,14 +381,11 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts + opp-1704000000 { + opp-microvolt = <862500>; + }; -+ opp-1896000000 { ++ opp-1800000000 { + opp-microvolt = <987500>; + }; -+ opp-1992000000 { -+ opp-microvolt = <1050000>; -+ }; -+ opp-2016000000 { -+ opp-hz = /bits/ 64 <2016000000>; ++ opp-1908000000 { ++ opp-hz = /bits/ 64 <1908000000>; + opp-microvolt = <1050000>; + }; +}; @@ -418,23 +417,12 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts + opp-microvolt = <1025000>; + }; + opp-2016000000 { -+ opp-hz = /bits/ 64 <2016000000>; + opp-microvolt = <1025000>; + }; -+ opp-2100000000 { -+ opp-hz = /bits/ 64 <2100000000>; ++ opp-2108000000 { + opp-microvolt = <1025000>; + }; + opp-2208000000 { -+ opp-hz = /bits/ 64 <2208000000>; -+ opp-microvolt = <1050000>; -+ }; -+ opp-2304000000 { -+ opp-hz = /bits/ 64 <2304000000>; -+ opp-microvolt = <1050000>; -+ }; -+ opp-2400000000 { -+ opp-hz = /bits/ 64 <2400000000>; + opp-microvolt = <1050000>; + }; +}; diff --git a/projects/Amlogic/packages/linux/patches/S922X/001.03-Add-Powkiddy-RGB10-MAX-3-device-tree.patch b/projects/Amlogic/packages/linux/patches/S922X/001.03-Add-Powkiddy-RGB10-MAX-3-device-tree.patch index 4c947d5bc..dc18916df 100644 --- a/projects/Amlogic/packages/linux/patches/S922X/001.03-Add-Powkiddy-RGB10-MAX-3-device-tree.patch +++ b/projects/Amlogic/packages/linux/patches/S922X/001.03-Add-Powkiddy-RGB10-MAX-3-device-tree.patch @@ -1,7 +1,9 @@ -diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts ---- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts 2023-09-12 12:04:13.567330573 +0000 -@@ -0,0 +1,989 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts +new file mode 100644 +index 000000000000..877663f6fb7c +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-3.dts +@@ -0,0 +1,986 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2022 Neil Armstrong @@ -400,15 +402,12 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max- + opp-microvolt = <1025000>; + }; + opp-2016000000 { -+ opp-hz = /bits/ 64 <2016000000>; + opp-microvolt = <1025000>; + }; -+ opp-2100000000 { -+ opp-hz = /bits/ 64 <2100000000>; ++ opp-2108000000 { + opp-microvolt = <1025000>; + }; + opp-2208000000 { -+ opp-hz = /bits/ 64 <2208000000>; + opp-microvolt = <1050000>; + }; +};