| Message ID | 20220203171114.10888-17-erwan.leray@foss.st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | STM32 configure UART nodes for DMA | expand |
On 2/3/22 18:11, Erwan Le Ray wrote: > DMA configuration is added to uart nodes in stm32mp15x device tree. > Delete uart4 DMA property in stm32mp15xx-dhcor-avenger96 board device > tree to keep console in irq mode, as DMA support for console has been > removed from the driver by commit e359b4411c28 ("serial: stm32: fix > threaded interrupt handling"). > Delete also usart2 and uart7 DMA property to keep current behavior. > > Signed-off-by: Erwan Le Ray <erwan.leray@foss.st.com> > > diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi > index 6885948f3024..61e17f44ce81 100644 > --- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi > +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi > @@ -376,6 +376,8 @@ > label = "LS-UART1"; > pinctrl-names = "default"; > pinctrl-0 = <&uart4_pins_b>; > + /delete-property/dmas; > + /delete-property/dma-names; > status = "okay"; > }; > > @@ -385,6 +387,8 @@ > pinctrl-names = "default"; > pinctrl-0 = <&uart7_pins_a>; > uart-has-rtscts; > + /delete-property/dmas; > + /delete-property/dma-names; > status = "okay"; > }; > > @@ -394,6 +398,8 @@ > 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 { Maybe you can squash all the DHSOM board changes into a single patch ? That said, the change is fine on DHSOM.
diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi index 6885948f3024..61e17f44ce81 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi @@ -376,6 +376,8 @@ label = "LS-UART1"; pinctrl-names = "default"; pinctrl-0 = <&uart4_pins_b>; + /delete-property/dmas; + /delete-property/dma-names; status = "okay"; }; @@ -385,6 +387,8 @@ pinctrl-names = "default"; pinctrl-0 = <&uart7_pins_a>; uart-has-rtscts; + /delete-property/dmas; + /delete-property/dma-names; status = "okay"; }; @@ -394,6 +398,8 @@ 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 {
DMA configuration is added to uart nodes in stm32mp15x device tree. Delete uart4 DMA property in stm32mp15xx-dhcor-avenger96 board device tree to keep console in irq mode, as DMA support for console has been removed from the driver by commit e359b4411c28 ("serial: stm32: fix threaded interrupt handling"). Delete also usart2 and uart7 DMA property to keep current behavior. Signed-off-by: Erwan Le Ray <erwan.leray@foss.st.com>