Merge pull request #1385 from brooksytech/dev

Add lower clock speeds for S922X
This commit is contained in:
Brooksytech 2023-05-02 05:43:55 -07:00 committed by GitHub
commit e1214a4182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -93,8 +93,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar
#cooling-cells = <2>; #cooling-cells = <2>;
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 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.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-05-01 16:43:56.922458695 +0000 +++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-05-02 04:09:00.103047103 +0000
@@ -0,0 +1,932 @@ @@ -0,0 +1,944 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/* +/*
+ * Copyright (c) 2022 Neil Armstrong <narmstrong@kernel.org> + * Copyright (c) 2022 Neil Armstrong <narmstrong@kernel.org>
@ -439,6 +439,12 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+ +
+/* RK817 only supports 12.5mV steps, round up the values */ +/* RK817 only supports 12.5mV steps, round up the values */
+&cpu_opp_table_0 { +&cpu_opp_table_0 {
+ opp-500000000 {
+ opp-microvolt = <725000>;
+ };
+ opp-667000000 {
+ opp-microvolt = <725000>;
+ };
+ opp-1000000000 { + opp-1000000000 {
+ opp-microvolt = <737500>; + opp-microvolt = <737500>;
+ }; + };
@ -471,6 +477,12 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+ +
+/* RK818 only supports 12.5mV steps, round up the values */ +/* RK818 only supports 12.5mV steps, round up the values */
+&cpub_opp_table_1 { +&cpub_opp_table_1 {
+ opp-500000000 {
+ opp-microvolt = <750000>;
+ };
+ opp-667000000 {
+ opp-microvolt = <750000>;
+ };
+ opp-1000000000 { + opp-1000000000 {
+ opp-microvolt = <775000>; + opp-microvolt = <775000>;
+ }; + };
@ -544,12 +556,12 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+ regulator-name = "vddcpu_a"; + regulator-name = "vddcpu_a";
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-boot-on;
+ regulator-min-microvolt = <775000>; + regulator-min-microvolt = <750000>;
+ regulator-max-microvolt = <1050000>; + regulator-max-microvolt = <1050000>;
+ regulator-ramp-delay = <6001>; + regulator-ramp-delay = <6001>;
+ regulator-state-mem { + regulator-state-mem {
+ regulator-on-in-suspend; + regulator-on-in-suspend;
+ regulator-suspend-microvolt = <775000>; + regulator-suspend-microvolt = <750000>;
+ }; + };
+ }; + };
+ +
@ -772,7 +784,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+ vddcpu_b: DCDC_REG2 { + vddcpu_b: DCDC_REG2 {
+ regulator-always-on; + regulator-always-on;
+ regulator-boot-on; + regulator-boot-on;
+ regulator-min-microvolt = <737500>; + regulator-min-microvolt = <725000>;
+ regulator-max-microvolt = <1050000>; + regulator-max-microvolt = <1050000>;
+ regulator-ramp-delay = <6001>; + regulator-ramp-delay = <6001>;
+ regulator-initial-mode = <0x2>; + regulator-initial-mode = <0x2>;
@ -1186,6 +1198,43 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts linu
+ +
+ pwms = <&pwm_AO_cd 1 1500 0>; + pwms = <&pwm_AO_cd 1 1500 0>;
+}; +};
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi 2023-03-22 12:34:07.000000000 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi 2023-05-02 04:37:30.426592066 +0000
@@ -11,6 +11,16 @@
compatible = "operating-points-v2";
opp-shared;
+ opp-500000000 {
+ opp-hz = /bits/ 64 <500000000>;
+ opp-microvolt = <731000>;
+ };
+
+ opp-667000000 {
+ opp-hz = /bits/ 64 <667000000>;
+ opp-microvolt = <731000>;
+ };
+
opp-1000000000 {
opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <731000>;
@@ -56,6 +66,16 @@
compatible = "operating-points-v2";
opp-shared;
+ opp-500000000 {
+ opp-hz = /bits/ 64 <500000000>;
+ opp-microvolt = <751000>;
+ };
+
+ opp-667000000 {
+ opp-hz = /bits/ 64 <667000000>;
+ opp-microvolt = <751000>;
+ };
+
opp-1000000000 {
opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <771000>;
diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
--- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-22 12:34:07.000000000 +0000 --- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-22 12:34:07.000000000 +0000
+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-05-01 16:43:56.922458695 +0000 +++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-05-01 16:43:56.922458695 +0000