Unverified Commit 14edf33d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-7.0' of...

Merge tag 'sunxi-fixes-for-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Allwinner fixes for 7.0

Just one fix to make the r-spi SPI controller use the mcu-dma DMA
controller for DMA instead of the main DMA controller.

* tag 'sunxi-fixes-for-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  arm64: dts: allwinner: sun55i: Fix r-spi DMA

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b09719b9 6896ca5a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ r_spi0: spi@7092000 {
			interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
			clocks = <&r_ccu CLK_BUS_R_SPI>, <&r_ccu CLK_R_SPI>;
			clock-names = "ahb", "mod";
			dmas = <&dma 53>, <&dma 53>;
			dmas = <&mcu_dma 13>, <&mcu_dma 13>;
			dma-names = "rx", "tx";
			resets = <&r_ccu RST_BUS_R_SPI>;
			status = "disabled";