Skip to content

Commit df1a86a

Browse files
author
Patrice Chotard
committed
ARM: dts: stm32: Sync DT with kernel v6.1-stm32mp-r2-rc17-preint4
Sync DT with kernel v6.1-stm32mp-r2-rc17-preint4. Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> Change-Id: I1d5fb325ffd87daf3806293f68ce5a70688d1630
1 parent a147574 commit df1a86a

4 files changed

Lines changed: 34 additions & 7 deletions

File tree

arch/arm/dts/stm32mp25-pinctrl.dtsi

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,28 @@
721721
};
722722
};
723723

724+
spi6_pins_a: spi6-0 {
725+
pins1 {
726+
pinmux = <STM32_PINMUX('F', 7, AF3)>, /* SPI6_SCK */
727+
<STM32_PINMUX('C', 7, AF3)>; /* SPI6_MOSI */
728+
drive-push-pull;
729+
bias-disable;
730+
slew-rate = <1>;
731+
};
732+
pins2 {
733+
pinmux = <STM32_PINMUX('C', 4, AF3)>; /* SPI6_MISO */
734+
bias-disable;
735+
};
736+
};
737+
738+
spi6_sleep_pins_a: spi6-sleep-0 {
739+
pins1 {
740+
pinmux = <STM32_PINMUX('F', 7, ANALOG)>, /* SPI6_SCK */
741+
<STM32_PINMUX('C', 7, ANALOG)>, /* SPI6_MOSI */
742+
<STM32_PINMUX('C', 4, ANALOG)>; /* SPI6_MISO */
743+
};
744+
};
745+
724746
usart1_pins_a: usart1-0 {
725747
pins1 {
726748
pinmux = <STM32_PINMUX('G', 14, AF6)>, /* USART1_TX */

arch/arm/dts/stm32mp251.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>,
401401
<GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
402402
interrupt-names = "rx", "tx";
403-
clocks = <&scmi_clk CK_BUS_IPCC1>;
403+
clocks = <&scmi_clk CK_SCMI_IPCC1>;
404404
status = "disabled";
405405
};
406406

@@ -2395,10 +2395,10 @@
23952395
st,syscfg = <&syscfg>;
23962396
#interrupt-cells = <1>;
23972397
interrupt-map-mask = <0 0 0 7>;
2398-
interrupt-map = <0 0 0 1 &intc 0 GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>,
2399-
<0 0 0 2 &intc 0 GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>,
2400-
<0 0 0 3 &intc 0 GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>,
2401-
<0 0 0 4 &intc 0 GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
2398+
interrupt-map = <0 0 0 1 &intc 0 0 GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>,
2399+
<0 0 0 2 &intc 0 0 GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>,
2400+
<0 0 0 3 &intc 0 0 GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>,
2401+
<0 0 0 4 &intc 0 0 GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
24022402
interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>,
24032403
<GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
24042404
interrupt-names = "aer_msi", "pme_msi";

arch/arm/dts/stm32mp257f-dk.dts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
label = "wake-up";
9999
linux,code = <KEY_WAKEUP>;
100100
interrupts-extended = <&optee 0>;
101-
wakeup-source;
102101
status = "okay";
103102
};
104103
};
@@ -677,6 +676,13 @@
677676
};
678677
};
679678

679+
&spi6 {
680+
pinctrl-names = "default", "sleep";
681+
pinctrl-0 = <&spi6_pins_a>;
682+
pinctrl-1 = <&spi6_sleep_pins_a>;
683+
status = "disabled";
684+
};
685+
680686
/* Bluetooth */
681687
&usart1 {
682688
pinctrl-names = "default", "sleep", "idle";

arch/arm/dts/stm32mp257f-ev1.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
label = "wake-up";
8484
linux,code = <KEY_WAKEUP>;
8585
interrupts-extended = <&optee 0>;
86-
wakeup-source;
8786
status = "okay";
8887
};
8988
};

0 commit comments

Comments
 (0)