| Message ID | 20241004225916.361000-1-marex@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Patrice Chotard |
| Headers | show |
| Series | [1/3] ARM: dts: stm32: Duplicate cpu0-opp-table node into stm32mp15-u-boot.dtsi | expand |
Hi, On 10/5/24 00:57, Marek Vasut wrote: > The cpu0-opp-table {} node does not exist in upstream Linux stm32mp151.dtsi > file, in order to enable conversion to OF_UPSTREAM, duplicate the node from > current U-Boot stm32mp151.dtsi into stm32mp15-u-boot.dtsi. This makes STM32 > DTs buildable even with OF_UPSTREAM enabled. No functional change, since the > current U-Boot stm32mp151.dtsi already contains the cpu0-opp-table {} node, > stm32mp15-u-boot.dtsi is applied at the end, and does not bring in any new > content. > > Signed-off-by: Marek Vasut <marex@denx.de> > --- > Cc: Patrice Chotard <patrice.chotard@foss.st.com> > Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> > Cc: Sean Anderson <seanga2@gmail.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Tom Rini <trini@konsulko.com> > Cc: u-boot@dh-electronics.com > Cc: u-boot@lists.denx.de > Cc: uboot-stm32@st-md-mailman.stormreply.com > --- > arch/arm/dts/stm32mp15-u-boot.dtsi | 30 ++++++++++++++++++++++-------- > 1 file changed, 22 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi b/arch/arm/dts/stm32mp15-u-boot.dtsi > index fe56f05616a..66d4c40c6a8 100644 > --- a/arch/arm/dts/stm32mp15-u-boot.dtsi > +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi > @@ -56,6 +56,24 @@ > status = "okay"; > }; > }; > + > + cpu0_opp_table: cpu0-opp-table { > + compatible = "operating-points-v2"; > + opp-shared; > + bootph-pre-ram; > + opp-650000000 { > + bootph-pre-ram; > + opp-hz = /bits/ 64 <650000000>; > + opp-microvolt = <1200000>; > + opp-supported-hw = <0x1>; > + }; > + opp-800000000 { > + bootph-pre-ram; > + opp-hz = /bits/ 64 <800000000>; > + opp-microvolt = <1350000>; > + opp-supported-hw = <0x2>; > + }; > + }; > }; > > &bsec { > @@ -82,14 +100,10 @@ > bootph-all; > }; > > -&cpu0_opp_table { > - bootph-pre-ram; > - opp-650000000 { > - bootph-pre-ram; > - }; > - opp-800000000 { > - bootph-pre-ram; > - }; > +&cpu0 { > + nvmem-cells = <&part_number_otp>; > + nvmem-cell-names = "part_number"; > + operating-points-v2 = <&cpu0_opp_table>; > }; > > &gpioa { Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com> Thanks Patrick
diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi b/arch/arm/dts/stm32mp15-u-boot.dtsi index fe56f05616a..66d4c40c6a8 100644 --- a/arch/arm/dts/stm32mp15-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi @@ -56,6 +56,24 @@ status = "okay"; }; }; + + cpu0_opp_table: cpu0-opp-table { + compatible = "operating-points-v2"; + opp-shared; + bootph-pre-ram; + opp-650000000 { + bootph-pre-ram; + opp-hz = /bits/ 64 <650000000>; + opp-microvolt = <1200000>; + opp-supported-hw = <0x1>; + }; + opp-800000000 { + bootph-pre-ram; + opp-hz = /bits/ 64 <800000000>; + opp-microvolt = <1350000>; + opp-supported-hw = <0x2>; + }; + }; }; &bsec { @@ -82,14 +100,10 @@ bootph-all; }; -&cpu0_opp_table { - bootph-pre-ram; - opp-650000000 { - bootph-pre-ram; - }; - opp-800000000 { - bootph-pre-ram; - }; +&cpu0 { + nvmem-cells = <&part_number_otp>; + nvmem-cell-names = "part_number"; + operating-points-v2 = <&cpu0_opp_table>; }; &gpioa {
The cpu0-opp-table {} node does not exist in upstream Linux stm32mp151.dtsi file, in order to enable conversion to OF_UPSTREAM, duplicate the node from current U-Boot stm32mp151.dtsi into stm32mp15-u-boot.dtsi. This makes STM32 DTs buildable even with OF_UPSTREAM enabled. No functional change, since the current U-Boot stm32mp151.dtsi already contains the cpu0-opp-table {} node, stm32mp15-u-boot.dtsi is applied at the end, and does not bring in any new content. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Patrice Chotard <patrice.chotard@foss.st.com> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> Cc: Sean Anderson <seanga2@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com --- arch/arm/dts/stm32mp15-u-boot.dtsi | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)