arm: dts: stm32mp15: alignment with v5.18
authorPatrick Delaunay <patrick.delaunay@foss.st.com>
Tue, 26 Apr 2022 13:38:05 +0000 (15:38 +0200)
committerPatrice Chotard <patrice.chotard@foss.st.com>
Tue, 10 May 2022 11:54:47 +0000 (13:54 +0200)
Device tree alignment with Linux kernel v5.18-rc2:
- ARM: dts: stm32: Add support for the emtrion emSBC-Argon
  (only the pincontrol part)
- ARM: dts: stm32: Drop duplicate status okay from DHCOM gpioc node
- ARM: dts: stm32: add st,stm32-sdmmc2 compatible on stm32mp151
- ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
- ARM: dts: stm32: use exti 19 as main interrupt to support RTC wakeup on
  stm32mp157
- ARM: dts: stm32: add DMA configuration to UART nodes on stm32mp151
- ARM: dts: stm32: keep uart4 behavior on *
- ARM: dts: stm32: Correct masks for GIC PPI interrupts on stm32mp15

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
16 files changed:
arch/arm/dts/stm32mp15-pinctrl.dtsi
arch/arm/dts/stm32mp15-u-boot.dtsi
arch/arm/dts/stm32mp151.dtsi
arch/arm/dts/stm32mp153.dtsi
arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts
arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts
arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts
arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts
arch/arm/dts/stm32mp157c-ed1.dts
arch/arm/dts/stm32mp157c-odyssey.dts
arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi
arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi
arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi
arch/arm/dts/stm32mp15xx-dhcom-som.dtsi
arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi
arch/arm/dts/stm32mp15xx-dkx.dtsi

index 6161f59..f0d66d8 100644 (file)
                };
        };
 
+       ethernet0_rmii_pins_b: rmii-1 {
+               pins1 {
+                       pinmux = <STM32_PINMUX('B', 5, AF0)>, /* ETH1_CLK */
+                               <STM32_PINMUX('C', 1, AF11)>, /* ETH1_MDC */
+                               <STM32_PINMUX('G', 13, AF11)>, /* ETH1_TXD0 */
+                               <STM32_PINMUX('G', 14, AF11)>; /* ETH1_TXD1 */
+                       bias-disable;
+                       drive-push-pull;
+                       slew-rate = <1>;
+               };
+               pins2 {
+                       pinmux = <STM32_PINMUX('A', 2, AF11)>; /* ETH1_MDIO */
+                       bias-disable;
+                       drive-push-pull;
+                       slew-rate = <0>;
+               };
+               pins3 {
+                       pinmux = <STM32_PINMUX('A', 7, AF11)>, /* ETH1_CRS_DV */
+                               <STM32_PINMUX('C', 4, AF11)>, /* ETH1_RXD0 */
+                               <STM32_PINMUX('C', 5, AF11)>; /* ETH1_RXD1 */
+                       bias-disable;
+               };
+               pins4 {
+                       pinmux = <STM32_PINMUX('B', 11, AF11)>; /* ETH1_TX_EN */
+               };
+       };
+
+       ethernet0_rmii_sleep_pins_b: rmii-sleep-1 {
+               pins1 {
+                       pinmux = <STM32_PINMUX('A', 2, ANALOG)>, /* ETH1_MDIO */
+                               <STM32_PINMUX('A', 7, ANALOG)>, /* ETH1_CRS_DV */
+                               <STM32_PINMUX('B', 5, ANALOG)>, /* ETH1_CLK */
+                               <STM32_PINMUX('B', 11, ANALOG)>, /* ETH1_TX_EN */
+                               <STM32_PINMUX('C', 1, ANALOG)>, /* ETH1_MDC */
+                               <STM32_PINMUX('C', 4, ANALOG)>, /* ETH1_RXD0 */
+                               <STM32_PINMUX('C', 5, ANALOG)>, /* ETH1_RXD1 */
+                               <STM32_PINMUX('G', 13, ANALOG)>, /* ETH1_TXD0 */
+                               <STM32_PINMUX('G', 14, ANALOG)>; /* ETH1_TXD1 */
+               };
+       };
+
        fmc_pins_a: fmc-0 {
                pins1 {
                        pinmux = <STM32_PINMUX('D', 4, AF12)>, /* FMC_NOE */
                };
        };
 
+       pwm1_pins_b: pwm1-1 {
+               pins {
+                       pinmux = <STM32_PINMUX('E', 9, AF1)>; /* TIM1_CH1 */
+                       bias-pull-down;
+                       drive-push-pull;
+                       slew-rate = <0>;
+               };
+       };
+
+       pwm1_sleep_pins_b: pwm1-sleep-1 {
+               pins {
+                       pinmux = <STM32_PINMUX('E', 9, ANALOG)>; /* TIM1_CH1 */
+               };
+       };
+
        pwm2_pins_a: pwm2-0 {
                pins {
                        pinmux = <STM32_PINMUX('A', 3, AF1)>; /* TIM2_CH4 */
                };
        };
 
+       usart3_pins_d: usart3-3 {
+               pins1 {
+                       pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */
+                                <STM32_PINMUX('G', 8, AF8)>; /* USART3_RTS */
+                       bias-disable;
+                       drive-push-pull;
+                       slew-rate = <0>;
+               };
+               pins2 {
+                       pinmux = <STM32_PINMUX('D', 9, AF7)>, /* USART3_RX */
+                                <STM32_PINMUX('D', 11, AF7)>; /* USART3_CTS_NSS */
+                       bias-disable;
+               };
+       };
+
+       usart3_idle_pins_d: usart3-idle-3 {
+               pins1 {
+                       pinmux = <STM32_PINMUX('B', 10, ANALOG)>, /* USART3_TX */
+                                <STM32_PINMUX('G', 8, ANALOG)>, /* USART3_RTS */
+                                <STM32_PINMUX('D', 11, ANALOG)>; /* USART3_CTS_NSS */
+               };
+               pins2 {
+                       pinmux = <STM32_PINMUX('D', 9, AF7)>; /* USART3_RX */
+                       bias-disable;
+               };
+       };
+
+       usart3_sleep_pins_d: usart3-sleep-3 {
+               pins {
+                       pinmux = <STM32_PINMUX('B', 10, ANALOG)>, /* USART3_TX */
+                                <STM32_PINMUX('G', 8, ANALOG)>, /* USART3_RTS */
+                                <STM32_PINMUX('D', 11, ANALOG)>, /* USART3_CTS_NSS */
+                                <STM32_PINMUX('D', 9, ANALOG)>; /* USART3_RX */
+               };
+       };
+
        usbotg_hs_pins_a: usbotg-hs-0 {
                pins {
                        pinmux = <STM32_PINMUX('A', 10, ANALOG)>; /* OTG_ID */
index e23d6c7..d9d0474 100644 (file)
        #size-cells = <0>;
 };
 
-&sdmmc1 {
-       compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
-};
-
-&sdmmc2 {
-       compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
-};
-
-&sdmmc3 {
-       compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
-};
-
 &usart1 {
        resets = <&rcc USART1_R>;
 };
index 5a2be00..e74a5fa 100644 (file)
 
        timer {
                compatible = "arm,armv7-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
                interrupt-parent = <&intc>;
        };
 
                        interrupts-extended = <&exti 27 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc USART2_K>;
                        wakeup-source;
+                       dmas = <&dmamux1 43 0x400 0x15>,
+                              <&dmamux1 44 0x400 0x11>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
 
                        interrupts-extended = <&exti 28 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc USART3_K>;
                        wakeup-source;
+                       dmas = <&dmamux1 45 0x400 0x15>,
+                              <&dmamux1 46 0x400 0x11>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
 
                        interrupts-extended = <&exti 30 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc UART4_K>;
                        wakeup-source;
+                       dmas = <&dmamux1 63 0x400 0x15>,
+                              <&dmamux1 64 0x400 0x11>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
 
                        interrupts-extended = <&exti 31 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc UART5_K>;
                        wakeup-source;
+                       dmas = <&dmamux1 65 0x400 0x15>,
+                              <&dmamux1 66 0x400 0x11>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
 
                        interrupts-extended = <&exti 32 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc UART7_K>;
                        wakeup-source;
+                       dmas = <&dmamux1 79 0x400 0x15>,
+                              <&dmamux1 80 0x400 0x11>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
 
                        interrupts-extended = <&exti 33 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc UART8_K>;
                        wakeup-source;
+                       dmas = <&dmamux1 81 0x400 0x15>,
+                              <&dmamux1 82 0x400 0x11>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
 
                        interrupts-extended = <&exti 29 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&rcc USART6_K>;
                        wakeup-source;
+                       dmas = <&dmamux1 71 0x400 0x15>,
+                              <&dmamux1 72 0x400 0x11>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
 
                };
 
                sdmmc3: mmc@48004000 {
-                       compatible = "arm,pl18x", "arm,primecell";
+                       compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
                        arm,primecell-periphid = <0x00253180>;
                        reg = <0x48004000 0x400>;
                        interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
                };
 
                sdmmc1: mmc@58005000 {
-                       compatible = "arm,pl18x", "arm,primecell";
+                       compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
                        arm,primecell-periphid = <0x00253180>;
                        reg = <0x58005000 0x1000>;
                        interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
                };
 
                sdmmc2: mmc@58007000 {
-                       compatible = "arm,pl18x", "arm,primecell";
+                       compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
                        arm,primecell-periphid = <0x00253180>;
                        reg = <0x58007000 0x1000>;
                        interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
                        reg = <0x5c004000 0x400>;
                        clocks = <&rcc RTCAPB>, <&rcc RTC>;
                        clock-names = "pclk", "rtc_ck";
-                       interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts-extended = <&exti 19 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
 
index 1c1889b..486084e 100644 (file)
                interrupt-affinity = <&cpu0>, <&cpu1>;
        };
 
+       timer {
+               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+       };
+
        soc {
                m_can1: can@4400e000 {
                        compatible = "bosch,m_can";
index d3058a0..1f75f1d 100644 (file)
@@ -43,5 +43,7 @@
        pinctrl-0 = <&uart4_pins_a>;
        pinctrl-1 = <&uart4_sleep_pins_a>;
        pinctrl-2 = <&uart4_idle_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
index ec9f1d1..3a1295c 100644 (file)
@@ -43,5 +43,7 @@
        pinctrl-0 = <&uart4_pins_a>;
        pinctrl-1 = <&uart4_sleep_pins_a>;
        pinctrl-2 = <&uart4_idle_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
index 5670b23..fae656e 100644 (file)
        pinctrl-0 = <&uart4_pins_a>;
        pinctrl-1 = <&uart4_sleep_pins_a>;
        pinctrl-2 = <&uart4_idle_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
 &uart8 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart8_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
index 7a75868..b9d0d3d 100644 (file)
@@ -44,6 +44,8 @@
        pinctrl-0 = <&uart4_pins_a>;
        pinctrl-1 = <&uart4_sleep_pins_a>;
        pinctrl-2 = <&uart4_idle_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
@@ -51,5 +53,7 @@
 &uart8 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart8_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
index f62b46b..fe5c8f2 100644 (file)
        pinctrl-0 = <&uart4_pins_a>;
        pinctrl-1 = <&uart4_sleep_pins_a>;
        pinctrl-2 = <&uart4_idle_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
index 0e72549..17bcf56 100644 (file)
 &uart4 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart4_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
index 4b10b01..35b1034 100644 (file)
 &usart3 {
        pinctrl-names = "default";
        pinctrl-0 = <&usart3_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&uart8_pins_a>;
        rts-gpios = <&gpioe 6 GPIO_ACTIVE_HIGH>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
index fbf3826..5f586f0 100644 (file)
 &usart3 {
        pinctrl-names = "default";
        pinctrl-0 = <&usart3_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&uart8_pins_a &uart8_rtscts_pins_a>;
        uart-has-rtscts;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
index ba816ef..abc5953 100644 (file)
 &usart3 {
        pinctrl-names = "default";
        pinctrl-0 = <&usart3_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
 &uart8 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart8_pins_a &uart8_rtscts_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
index 8c41f81..83e2c87 100644 (file)
                          "", "", "DHCOM-E", "",
                          "", "", "", "",
                          "", "", "", "";
-       status = "okay";
 };
 
 &gpiod {
 &uart4 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart4_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
index 6885948..61e17f4 100644 (file)
        label = "LS-UART1";
        pinctrl-names = "default";
        pinctrl-0 = <&uart4_pins_b>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&uart7_pins_a>;
        uart-has-rtscts;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
        pinctrl-0 = <&usart2_pins_a>;
        pinctrl-1 = <&usart2_sleep_pins_a>;
        st,hw-flow-ctrl;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 
        bluetooth {
index f8130bf..3d36cac 100644 (file)
        pinctrl-0 = <&uart4_pins_a>;
        pinctrl-1 = <&uart4_sleep_pins_a>;
        pinctrl-2 = <&uart4_idle_pins_a>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "okay";
 };
 
        pinctrl-0 = <&uart7_pins_c>;
        pinctrl-1 = <&uart7_sleep_pins_c>;
        pinctrl-2 = <&uart7_idle_pins_c>;
+       /delete-property/dmas;
+       /delete-property/dma-names;
        status = "disabled";
 };