Skip to content

Commit b7b0742

Browse files
committed
Merge tag 'stm32-dt-for-v6.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/fixes
STM32 DT fixes for v6.2, round 1 Highlights: ----------- -STM32MP15: - Fix missing chip select phandle in several stm32mp15x based boards. * tag 'stm32-dt-for-v6.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp151a-prtt1l ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp157c-emstamp-argon ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcom-som ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcor-som Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents e2f7096 + 175281f commit b7b0742

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,12 @@
101101

102102
&qspi {
103103
pinctrl-names = "default", "sleep";
104-
pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>;
105-
pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>;
104+
pinctrl-0 = <&qspi_clk_pins_a
105+
&qspi_bk1_pins_a
106+
&qspi_cs1_pins_a>;
107+
pinctrl-1 = <&qspi_clk_sleep_pins_a
108+
&qspi_bk1_sleep_pins_a
109+
&qspi_cs1_sleep_pins_a>;
106110
reg = <0x58003000 0x1000>, <0x70000000 0x4000000>;
107111
#address-cells = <1>;
108112
#size-cells = <0>;

arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,12 @@
391391

392392
&qspi {
393393
pinctrl-names = "default", "sleep";
394-
pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>;
395-
pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>;
394+
pinctrl-0 = <&qspi_clk_pins_a
395+
&qspi_bk1_pins_a
396+
&qspi_cs1_pins_a>;
397+
pinctrl-1 = <&qspi_clk_sleep_pins_a
398+
&qspi_bk1_sleep_pins_a
399+
&qspi_cs1_sleep_pins_a>;
396400
reg = <0x58003000 0x1000>, <0x70000000 0x4000000>;
397401
#address-cells = <1>;
398402
#size-cells = <0>;

arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,12 @@
428428

429429
&qspi {
430430
pinctrl-names = "default", "sleep";
431-
pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>;
432-
pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>;
431+
pinctrl-0 = <&qspi_clk_pins_a
432+
&qspi_bk1_pins_a
433+
&qspi_cs1_pins_a>;
434+
pinctrl-1 = <&qspi_clk_sleep_pins_a
435+
&qspi_bk1_sleep_pins_a
436+
&qspi_cs1_sleep_pins_a>;
433437
reg = <0x58003000 0x1000>, <0x70000000 0x4000000>;
434438
#address-cells = <1>;
435439
#size-cells = <0>;

arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,12 @@
247247

248248
&qspi {
249249
pinctrl-names = "default", "sleep";
250-
pinctrl-0 = <&qspi_clk_pins_a &qspi_bk1_pins_a>;
251-
pinctrl-1 = <&qspi_clk_sleep_pins_a &qspi_bk1_sleep_pins_a>;
250+
pinctrl-0 = <&qspi_clk_pins_a
251+
&qspi_bk1_pins_a
252+
&qspi_cs1_pins_a>;
253+
pinctrl-1 = <&qspi_clk_sleep_pins_a
254+
&qspi_bk1_sleep_pins_a
255+
&qspi_cs1_sleep_pins_a>;
252256
reg = <0x58003000 0x1000>, <0x70000000 0x200000>;
253257
#address-cells = <1>;
254258
#size-cells = <0>;

0 commit comments

Comments
 (0)