ARM: dts: stm32mp1: use OPP information for PLL1 settings in SPL

This patch allows to switch the CPU frequency to 800MHz on the
ST Microelectronics board (DK1/DK2 and EV1) or dh electronics SOM
using the STM32MP15x SOC and when it is supported by the HW
(for STM32MP15xD and STM32MP15xF).

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi b/arch/arm/dts/stm32mp15-u-boot.dtsi
index a0d971ad88a4127353c400b4a30d1b67d5aa2eff..66be7df9ae77e4eb3619008507ba8a994676e63c 100644 (file)
--- a/arch/arm/dts/stm32mp15-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15-u-boot.dtsi
@@ -88,6 +88,16 @@
        u-boot,dm-pre-reloc;
 };
 
+&cpu0_opp_table {
+       u-boot,dm-spl;
+       opp-650000000 {
+               u-boot,dm-spl;
+       };
+       opp-800000000 {
+               u-boot,dm-spl;
+       };
+};
+
 &gpioa {
        u-boot,dm-pre-reloc;
 };

diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
index e13dade4633537d309b0f752fb0fe28903f2d7d9..7b8c1c1cc7ffed90b4d83fd619a68a40bedb80c0 100644 (file)
--- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
@@ -133,15 +133,6 @@
                CLK_LPTIM45_LSE
        >;
 
-       /* VCO = 1300.0 MHz => P = 650 (CPU) */
-       pll1: st,pll@0 {
-               compatible = "st,stm32mp1-pll";
-               reg = <0>;
-               cfg = < 2 80 0 0 0 PQR(1,0,0) >;
-               frac = < 0x800 >;
-               u-boot,dm-pre-reloc;
-       };
-
        /* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU), R = 533 (DDR) */
        pll2: st,pll@1 {
                compatible = "st,stm32mp1-pll";

diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
index b16dc28d47a5daf635f80c22da3a83d46d654737..ef3e7f45a3620905254ec2275e1764b4b3400398 100644 (file)
--- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
@@ -129,15 +129,6 @@
                CLK_LPTIM45_LSE
        >;
 
-       /* VCO = 1300.0 MHz => P = 650 (CPU) */
-       pll1: st,pll@0 {
-               compatible = "st,stm32mp1-pll";
-               reg = <0>;
-               cfg = < 2 80 0 0 0 PQR(1,0,0) >;
-               frac = < 0x800 >;
-               u-boot,dm-pre-reloc;
-       };
-
        /* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU), R = 533 (DDR) */
        pll2: st,pll@1 {
                compatible = "st,stm32mp1-pll";

diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
index df63ad4a2417f75b9314c24735ac9b50ef36f301..69c5af4241563459026dbd386a724f69324641a0 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi
@@ -235,15 +235,6 @@
                CLK_LPTIM45_LSE
        >;
 
-       /* VCO = 1300.0 MHz => P = 650 (CPU) */
-       pll1: st,pll@0 {
-               compatible = "st,stm32mp1-pll";
-               reg = <0>;
-               cfg = < 2 80 0 0 0 PQR(1,0,0) >;
-               frac = < 0x800 >;
-               u-boot,dm-pre-reloc;
-       };
-
        /* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU), R = 533 (DDR) */
        pll2: st,pll@1 {
                compatible = "st,stm32mp1-pll";

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
index bd4c2adc3589887961fec1bf4f6fe99bf3998a9b..7529068c517ee22d395a8af2fb631a0310f47d9b 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
@@ -114,15 +114,6 @@
                CLK_LPTIM45_LSE
        >;
 
-       /* VCO = 1300.0 MHz => P = 650 (CPU) */
-       pll1: st,pll@0 {
-               compatible = "st,stm32mp1-pll";
-               reg = <0>;
-               cfg = < 2 80 0 0 0 PQR(1,0,0) >;
-               frac = < 0x800 >;
-               u-boot,dm-pre-reloc;
-       };
-
        /* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU), R = 533 (DDR) */
        pll2: st,pll@1 {
                compatible = "st,stm32mp1-pll";