Commit 3b158386 authored by Arnaud Pouliquen's avatar Arnaud Pouliquen Committed by Alexandre Torgue
Browse files

ARM: dts: stm32: fix m4_rproc references to use SCMI for stm32mp15 



Fixes stm32mp15*-scmi DTS files introduced in [1]:
This patch fixes the node which uses the MCU reset and adds the
missing HOLD_BOOT which is also handled by the SCMI reset service.

This change cannot be applied as a fix on commit [1], the management
of the hold boot impacts also the stm32_rproc driver.

[1] 'commit 5b7e5831 ("ARM: dts: stm32: Add SCMI version of STM32 boards (DK1/DK2/ED1/EV1)")'

Signed-off-by: default avatarArnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Signed-off-by: default avatarAlexandre Torgue <alexandre.torgue@foss.st.com>
parent 9c994fcf

arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts

+5 −2
Original line number Diff line number Diff line
@@ -55,8 +55,11 @@ 
	resets = <&scmi_reset RST_SCMI_MDMA>;

};



&mlahb {

	resets = <&scmi_reset RST_SCMI_MCU>;

&m4_rproc {

	/delete-property/ st,syscfg-holdboot;

	resets = <&scmi_reset RST_SCMI_MCU>,

		 <&scmi_reset RST_SCMI_MCU_HOLD_BOOT>;

	reset-names =  "mcu_rst", "hold_boot";

};



&rcc {

arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts

+5 −2
Original line number Diff line number Diff line
@@ -61,8 +61,11 @@ 
	resets = <&scmi_reset RST_SCMI_MDMA>;

};



&mlahb {

	resets = <&scmi_reset RST_SCMI_MCU>;

&m4_rproc {

	/delete-property/ st,syscfg-holdboot;

	resets = <&scmi_reset RST_SCMI_MCU>,

		 <&scmi_reset RST_SCMI_MCU_HOLD_BOOT>;

	reset-names =  "mcu_rst", "hold_boot";

};



&rcc {

arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts

+5 −2
Original line number Diff line number Diff line
@@ -60,8 +60,11 @@ 
	resets = <&scmi_reset RST_SCMI_MDMA>;

};



&mlahb {

	resets = <&scmi_reset RST_SCMI_MCU>;

&m4_rproc {

	/delete-property/ st,syscfg-holdboot;

	resets = <&scmi_reset RST_SCMI_MCU>,

		 <&scmi_reset RST_SCMI_MCU_HOLD_BOOT>;

	reset-names =  "mcu_rst", "hold_boot";

};



&rcc {

arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts

+5 −2
Original line number Diff line number Diff line
@@ -66,8 +66,11 @@ 
	resets = <&scmi_reset RST_SCMI_MDMA>;

};



&mlahb {

	resets = <&scmi_reset RST_SCMI_MCU>;

&m4_rproc {

	/delete-property/ st,syscfg-holdboot;

	resets = <&scmi_reset RST_SCMI_MCU>,

		 <&scmi_reset RST_SCMI_MCU_HOLD_BOOT>;

	reset-names =  "mcu_rst", "hold_boot";

};



&rcc {