Skip to content

Commit 2619705

Browse files
author
Patrice Chotard
committed
ARM: dts: stm32: Sync DT with kernel v6.6-stm32mp-r3.1-rc3-preint1
Synchronize DT with kernel v6.6-stm32mp-r3.1-rc3-preint1 Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> Change-Id: I54df0bd477104a2fe7ddeb83789902907cd528a6
1 parent 83b681d commit 2619705

12 files changed

Lines changed: 112 additions & 94 deletions

‎arch/arm/dts/stm32mp131.dtsi‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,29 @@
858858
<&scmi_clk CK_SCMI_HSI>,
859859
<&scmi_clk CK_SCMI_CSI>,
860860
<&scmi_clk CK_SCMI_LSE>,
861-
<&scmi_clk CK_SCMI_LSI>;
861+
<&scmi_clk CK_SCMI_LSI>,
862+
<&scmi_clk CK_SCMI_HSE_DIV2>,
863+
<&scmi_clk CK_SCMI_PLL2_Q>,
864+
<&scmi_clk CK_SCMI_PLL2_R>,
865+
<&scmi_clk CK_SCMI_PLL3_P>,
866+
<&scmi_clk CK_SCMI_PLL3_Q>,
867+
<&scmi_clk CK_SCMI_PLL3_R>,
868+
<&scmi_clk CK_SCMI_PLL4_P>,
869+
<&scmi_clk CK_SCMI_PLL4_Q>,
870+
<&scmi_clk CK_SCMI_PLL4_R>,
871+
<&scmi_clk CK_SCMI_MPU>,
872+
<&scmi_clk CK_SCMI_AXI>,
873+
<&scmi_clk CK_SCMI_MLAHB>,
874+
<&scmi_clk CK_SCMI_CKPER>,
875+
<&scmi_clk CK_SCMI_PCLK1>,
876+
<&scmi_clk CK_SCMI_PCLK2>,
877+
<&scmi_clk CK_SCMI_PCLK3>,
878+
<&scmi_clk CK_SCMI_PCLK4>,
879+
<&scmi_clk CK_SCMI_PCLK5>,
880+
<&scmi_clk CK_SCMI_PCLK6>,
881+
<&scmi_clk CK_SCMI_CKTIMG1>,
882+
<&scmi_clk CK_SCMI_CKTIMG2>,
883+
<&scmi_clk CK_SCMI_CKTIMG3>;
862884
};
863885

864886
pinctrl: pinctrl@50002000 {
@@ -1826,7 +1848,7 @@
18261848
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
18271849
clocks = <&rcc HASH1>;
18281850
resets = <&rcc HASH1_R>;
1829-
dmas = <&mdma 30 0x2 0x1000a02 0x0 0x0 0x0>;
1851+
dmas = <&mdma 30 0x2 0x1000a02 0x0 0x0>;
18301852
dma-names = "in";
18311853
access-controllers = <&etzpc 41>;
18321854
status = "disabled";

‎arch/arm/dts/stm32mp151.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@
413413
#interrupt-cells = <2>;
414414
reg = <0x5000d000 0x400>;
415415
wakeup-parent = <&pwr_irq>;
416+
hwlocks = <&hsem 1 1>;
416417
interrupts-extended =
417418
<&intc GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, /* EXTI_0 */
418419
<&intc GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm/dts/stm32mp157a-dk1-scmi.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@
105105
resets = <&scmi_reset RST_SCMI_MDMA>;
106106
};
107107

108-
&mlahb {
109-
resets = <&scmi_reset RST_SCMI_MCU>;
110-
};
111-
112108
&rcc {
113109
compatible = "st,stm32mp1-rcc-secure", "syscon";
114110
clock-names = "hse", "hsi", "csi", "lse", "lsi";

‎arch/arm/dts/stm32mp157a-ed1-scmi.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@
105105
resets = <&scmi_reset RST_SCMI_MDMA>;
106106
};
107107

108-
&mlahb {
109-
resets = <&scmi_reset RST_SCMI_MCU>;
110-
};
111-
112108
&rcc {
113109
compatible = "st,stm32mp1-rcc-secure", "syscon";
114110
clock-names = "hse", "hsi", "csi", "lse", "lsi";

‎arch/arm/dts/stm32mp157a-ev1-scmi.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@
107107
resets = <&scmi_reset RST_SCMI_MDMA>;
108108
};
109109

110-
&mlahb {
111-
resets = <&scmi_reset RST_SCMI_MCU>;
112-
};
113-
114110
&rcc {
115111
compatible = "st,stm32mp1-rcc-secure", "syscon";
116112
clock-names = "hse", "hsi", "csi", "lse", "lsi";

‎arch/arm/dts/stm32mp157c-dk2-scmi.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@
110110
resets = <&scmi_reset RST_SCMI_MDMA>;
111111
};
112112

113-
&mlahb {
114-
resets = <&scmi_reset RST_SCMI_MCU>;
115-
};
116-
117113
&rcc {
118114
compatible = "st,stm32mp1-rcc-secure", "syscon";
119115
clock-names = "hse", "hsi", "csi", "lse", "lsi";

‎arch/arm/dts/stm32mp157c-ed1-scmi.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@
110110
resets = <&scmi_reset RST_SCMI_MDMA>;
111111
};
112112

113-
&mlahb {
114-
resets = <&scmi_reset RST_SCMI_MCU>;
115-
};
116-
117113
&rcc {
118114
compatible = "st,stm32mp1-rcc-secure", "syscon";
119115
clock-names = "hse", "hsi", "csi", "lse", "lsi";

‎arch/arm/dts/stm32mp157c-ev1-scmi.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@
112112
resets = <&scmi_reset RST_SCMI_MDMA>;
113113
};
114114

115-
&mlahb {
116-
resets = <&scmi_reset RST_SCMI_MCU>;
117-
};
118-
119115
&rcc {
120116
compatible = "st,stm32mp1-rcc-secure", "syscon";
121117
clock-names = "hse", "hsi", "csi", "lse", "lsi";

‎arch/arm/dts/stm32mp211.dtsi‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@
363363
clocks = <&rcc CK_BUS_SPI2>, <&rcc CK_KER_SPI2>;
364364
clock-names = "pclk", "i2sclk";
365365
resets = <&rcc SPI2_R>;
366-
dmas = <&hpdma 34 0x43 0x12>,
367-
<&hpdma 35 0x43 0x21>;
366+
dmas = <&hpdma 34 0x43 0x40012>,
367+
<&hpdma 35 0x43 0x40021>;
368368
dma-names = "rx", "tx";
369369
access-controllers = <&rifsc 23>;
370370
power-domains = <&d1_pd>;
@@ -736,8 +736,8 @@
736736
clocks = <&rcc CK_BUS_SPI3>, <&rcc CK_KER_SPI3>;
737737
clock-names = "pclk", "i2sclk";
738738
resets = <&rcc SPI3_R>;
739-
dmas = <&hpdma 36 0x43 0x12>,
740-
<&hpdma 37 0x43 0x21>;
739+
dmas = <&hpdma 36 0x43 0x40012>,
740+
<&hpdma 37 0x43 0x40021>;
741741
dma-names = "rx", "tx";
742742
access-controllers = <&rifsc 24>;
743743
power-domains = <&d1_pd>;
@@ -767,8 +767,8 @@
767767
clocks = <&rcc CK_KER_SPDIFRX>;
768768
clock-names = "kclk";
769769
interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
770-
dmas = <&hpdma 48 0x43 0x212>,
771-
<&hpdma 49 0x43 0x212>;
770+
dmas = <&hpdma 48 0x43 0x40212>,
771+
<&hpdma 49 0x43 0x40212>;
772772
dma-names = "rx", "rx-ctrl";
773773
access-controllers = <&rifsc 30>;
774774
status = "disabled";
@@ -1044,8 +1044,8 @@
10441044
clocks = <&rcc CK_BUS_SPI1>, <&rcc CK_KER_SPI1>;
10451045
clock-names = "pclk", "i2sclk";
10461046
resets = <&rcc SPI1_R>;
1047-
dmas = <&hpdma 32 0x43 0x12>,
1048-
<&hpdma 33 0x43 0x21>;
1047+
dmas = <&hpdma 32 0x43 0x40012>,
1048+
<&hpdma 33 0x43 0x40021>;
10491049
dma-names = "rx", "tx";
10501050
access-controllers = <&rifsc 22>;
10511051
power-domains = <&d1_pd>;
@@ -1212,7 +1212,7 @@
12121212
#sound-dai-cells = <0>;
12131213
clocks = <&rcc CK_KER_SAI1>;
12141214
clock-names = "sai_ck";
1215-
dmas = <&hpdma 50 0x43 0x21>;
1215+
dmas = <&hpdma 50 0x43 0x40021>;
12161216
power-domains = <&d1_pd>;
12171217
status = "disabled";
12181218
};
@@ -1223,7 +1223,7 @@
12231223
#sound-dai-cells = <0>;
12241224
clocks = <&rcc CK_KER_SAI1>;
12251225
clock-names = "sai_ck";
1226-
dmas = <&hpdma 51 0x43 0x12>;
1226+
dmas = <&hpdma 51 0x43 0x40012>;
12271227
power-domains = <&d1_pd>;
12281228
status = "disabled";
12291229
};
@@ -1248,7 +1248,7 @@
12481248
#sound-dai-cells = <0>;
12491249
clocks = <&rcc CK_KER_SAI2>;
12501250
clock-names = "sai_ck";
1251-
dmas = <&hpdma 52 0x43 0x21>;
1251+
dmas = <&hpdma 52 0x43 0x40021>;
12521252
power-domains = <&d1_pd>;
12531253
status = "disabled";
12541254
};
@@ -1259,7 +1259,7 @@
12591259
#sound-dai-cells = <0>;
12601260
clocks = <&rcc CK_KER_SAI2>;
12611261
clock-names = "sai_ck";
1262-
dmas = <&hpdma 53 0x43 0x12>;
1262+
dmas = <&hpdma 53 0x43 0x40012>;
12631263
power-domains = <&d1_pd>;
12641264
status = "disabled";
12651265
};
@@ -1284,18 +1284,18 @@
12841284
#sound-dai-cells = <0>;
12851285
clocks = <&rcc CK_KER_SAI3>;
12861286
clock-names = "sai_ck";
1287-
dmas = <&hpdma 54 0x43 0x21>;
1287+
dmas = <&hpdma 54 0x43 0x40021>;
12881288
power-domains = <&d1_pd>;
12891289
status = "disabled";
12901290
};
12911291

1292-
sai3b: audio-controller@502b0024 {
1292+
sai3b: audio-controller@402b0024 {
12931293
compatible = "st,stm32-sai-sub-b";
12941294
reg = <0x24 0x20>;
12951295
#sound-dai-cells = <0>;
12961296
clocks = <&rcc CK_KER_SAI3>;
12971297
clock-names = "sai_ck";
1298-
dmas = <&hpdma 55 0x43 0x12>;
1298+
dmas = <&hpdma 55 0x43 0x40012>;
12991299
power-domains = <&d1_pd>;
13001300
status = "disabled";
13011301
};
@@ -1334,7 +1334,7 @@
13341334
#sound-dai-cells = <0>;
13351335
clocks = <&rcc CK_KER_SAI4>;
13361336
clock-names = "sai_ck";
1337-
dmas = <&hpdma 56 0x63 0x21>;
1337+
dmas = <&hpdma 56 0x63 0x40021>;
13381338
power-domains = <&d1_pd>;
13391339
status = "disabled";
13401340
};
@@ -1345,7 +1345,7 @@
13451345
#sound-dai-cells = <0>;
13461346
clocks = <&rcc CK_KER_SAI4>;
13471347
clock-names = "sai_ck";
1348-
dmas = <&hpdma 57 0x43 0x12>;
1348+
dmas = <&hpdma 57 0x43 0x40012>;
13491349
power-domains = <&d1_pd>;
13501350
status = "disabled";
13511351
};
@@ -1395,7 +1395,7 @@
13951395
reg = <0x84 0x70>;
13961396
#io-channel-cells = <1>;
13971397
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
1398-
dmas = <&hpdma 44 0x63 0x12>;
1398+
dmas = <&hpdma 44 0x63 0x40012>;
13991399
dma-names = "rx";
14001400
status = "disabled";
14011401
};
@@ -1405,7 +1405,7 @@
14051405
reg = <0x104 0x70>;
14061406
#io-channel-cells = <1>;
14071407
interrupts = <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
1408-
dmas = <&hpdma 45 0x63 0x12>;
1408+
dmas = <&hpdma 45 0x63 0x40012>;
14091409
dma-names = "rx";
14101410
status = "disabled";
14111411
};
@@ -1415,7 +1415,7 @@
14151415
reg = <0x184 0x70>;
14161416
#io-channel-cells = <1>;
14171417
interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
1418-
dmas = <&hpdma 46 0x63 0x12>;
1418+
dmas = <&hpdma 46 0x63 0x40012>;
14191419
dma-names = "rx";
14201420
status = "disabled";
14211421
};
@@ -1425,7 +1425,7 @@
14251425
reg = <0x204 0x70>;
14261426
#io-channel-cells = <1>;
14271427
interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
1428-
dmas = <&hpdma 47 0x63 0x12>;
1428+
dmas = <&hpdma 47 0x63 0x40012>;
14291429
dma-names = "rx";
14301430
status = "disabled";
14311431
};
@@ -1646,6 +1646,20 @@
16461646
status = "disabled";
16471647
};
16481648

1649+
lpuart1: serial@46030000 {
1650+
compatible = "st,stm32h7-uart";
1651+
reg = <0x46030000 0x0 0x400>;
1652+
interrupts-extended = <&exti2 26 IRQ_TYPE_LEVEL_HIGH>;
1653+
clocks = <&rcc CK_KER_LPUART1>;
1654+
dmas = <&hpdma 134 0x20 0x10012>,
1655+
<&hpdma 135 0x20 0x3021>;
1656+
dma-names = "rx", "tx";
1657+
access-controllers = <&rifsc 40>;
1658+
power-domains = <&d1_pd>;
1659+
wakeup-source;
1660+
status = "disabled";
1661+
};
1662+
16491663
i2c3: i2c@46040000 {
16501664
compatible = "st,stm32mp25-i2c";
16511665
reg = <0x46040000 0x0 0x400>;

‎arch/arm/dts/stm32mp215f-dk.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@
205205
wifi_pwrseq: wifi-pwrseq {
206206
compatible = "mmc-pwrseq-simple";
207207
reset-gpios = <&gpiob 2 GPIO_ACTIVE_LOW>;
208+
clocks = <&rtc>;
209+
clock-names = "ext_clock";
208210
};
209211
};
210212

0 commit comments

Comments
 (0)