Skip to content

Commit 8a85891

Browse files
madhukar-ArmTrustedFirmware Code Review
authored and
TrustedFirmware Code Review
committed
Merge changes from topic "stm32mp15-dt-updates" into integration
* changes: refactor(stm32mp15-fdts): remove timers15 node refactor(stm32mp15-fdts): remove unused secure-status properties refactor(stm32mp15-fdts): remove RCC secure-status
2 parents f1f2384 + 5dbda5c commit 8a85891

7 files changed

+0
-15
lines changed

fdts/stm32mp157a-avenger96.dts

-2
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@
163163
&iwdg2 {
164164
timeout-sec = <32>;
165165
status = "okay";
166-
secure-status = "okay";
167166
};
168167

169168
&pwr_regulators {
@@ -172,7 +171,6 @@
172171
};
173172

174173
&rcc {
175-
secure-status = "disabled";
176174
st,clksrc = <
177175
CLK_MPU_PLL1P
178176
CLK_AXI_PLL2P

fdts/stm32mp157c-ed1.dts

-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@
201201
};
202202

203203
&rcc {
204-
secure-status = "disabled";
205204
st,clksrc = <
206205
CLK_MPU_PLL1P
207206
CLK_AXI_PLL2P

fdts/stm32mp157c-odyssey-som.dtsi

-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@
203203
};
204204

205205
&rcc {
206-
secure-status = "disabled";
207206
st,clksrc = <
208207
CLK_MPU_PLL1P
209208
CLK_AXI_PLL2P

fdts/stm32mp15xx-dhcom-som.dtsi

-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
&iwdg2 {
161161
timeout-sec = <32>;
162162
status = "okay";
163-
secure-status = "okay";
164163
};
165164

166165
&pwr_regulators {
@@ -187,7 +186,6 @@
187186
};
188187

189188
&rcc {
190-
secure-status = "disabled";
191189
st,clksrc = <
192190
CLK_MPU_PLL1P
193191
CLK_AXI_PLL2P

fdts/stm32mp15xx-dhcor-som.dtsi

-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
&iwdg2 {
156156
timeout-sec = <32>;
157157
status = "okay";
158-
secure-status = "okay";
159158
};
160159

161160
&pwr_regulators {
@@ -182,7 +181,6 @@
182181
};
183182

184183
&rcc {
185-
secure-status = "disabled";
186184
st,clksrc = <
187185
CLK_MPU_PLL1P
188186
CLK_AXI_PLL2P

fdts/stm32mp15xx-dkx.dtsi

-6
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
&iwdg2 {
181181
timeout-sec = <32>;
182182
status = "okay";
183-
secure-status = "okay";
184183
};
185184

186185
&pwr_regulators {
@@ -189,7 +188,6 @@
189188
};
190189

191190
&rcc {
192-
secure-status = "disabled";
193191
st,clksrc = <
194192
CLK_MPU_PLL1P
195193
CLK_AXI_PLL2P
@@ -304,10 +302,6 @@
304302
status = "okay";
305303
};
306304

307-
&timers15 {
308-
secure-status = "okay";
309-
};
310-
311305
&uart4 {
312306
pinctrl-names = "default";
313307
pinctrl-0 = <&uart4_pins_a>;

fdts/stm32mp15xx-osd32.dtsi

-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181

182182
/* CLOCK init */
183183
&rcc {
184-
secure-status = "disabled";
185184
st,clksrc = <
186185
CLK_MPU_PLL1P
187186
CLK_AXI_PLL2P

0 commit comments

Comments
 (0)