diff --git a/arch/loongarch/boot/dts/loongson2k1000.dtsi b/arch/loongarch/boot/dts/loongson2k1000.dtsi index f6f92bb55..d0b8950b3 100644 --- a/arch/loongarch/boot/dts/loongson2k1000.dtsi +++ b/arch/loongarch/boot/dts/loongson2k1000.dtsi @@ -446,54 +446,16 @@ #thermal-sensor-cells = <1>; }; - apbdma0: dma-controller@1fe00c00 { - compatible = "loongson,ls2k1000-apbdma"; - reg = <0x0 0x1fe00c00 0x0 0x8>; + dma: dma@0x1fe00c00 { + compatible = "loongson,lsia-dma"; + reg = <0x0 0x1fe00c00 0x0 0x100>; + #config-nr = <5>; interrupt-parent = <&liointc1>; - interrupts = <12 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk LOONGSON2_APB_CLK>; - #dma-cells = <1>; - status = "disabled"; - }; - - apbdma1: dma-controller@1fe00c10 { - compatible = "loongson,ls2k1000-apbdma"; - reg = <0x0 0x1fe00c10 0x0 0x8>; - interrupt-parent = <&liointc1>; - interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk LOONGSON2_APB_CLK>; - #dma-cells = <1>; - status = "disabled"; - }; - - apbdma2: dma-controller@1fe00c20 { - compatible = "loongson,ls2k1000-apbdma"; - reg = <0x0 0x1fe00c20 0x0 0x8>; - interrupt-parent = <&liointc1>; - interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk LOONGSON2_APB_CLK>; - #dma-cells = <1>; - status = "disabled"; - }; - - apbdma3: dma-controller@1fe00c30 { - compatible = "loongson,ls2k1000-apbdma"; - reg = <0x0 0x1fe00c30 0x0 0x8>; - interrupt-parent = <&liointc1>; - interrupts = <15 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk LOONGSON2_APB_CLK>; - #dma-cells = <1>; - status = "disabled"; - }; - - dma-controller@1fe00c40 { - compatible = "loongson,ls2k1000-apbdma"; - reg = <0x0 0x1fe00c40 0x0 0x8>; - interrupt-parent = <&liointc1>; - interrupts = <16 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk LOONGSON2_APB_CLK>; - #dma-cells = <1>; - status = "disabled"; + interrupts = <12 IRQ_TYPE_LEVEL_HIGH>, <13 IRQ_TYPE_LEVEL_HIGH>, + <14 IRQ_TYPE_LEVEL_HIGH>, <15 IRQ_TYPE_LEVEL_HIGH>, + <16 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <2>; + dma-channels = <5>; }; uart0: serial@1fe20000 { @@ -684,7 +646,7 @@ interrupt-parent = <&liointc0>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk LOONGSON2_APB_CLK>; - dmas = <&apbdma2 0>, <&apbdma3 0>; + dmas = <&dma 2 0xaae>, <&dma 1 0xaae>; dma-names = "tx", "rx"; #sound-dai-cells = <0>; status = "disabled"; @@ -706,8 +668,7 @@ interrupt-parent = <&liointc0>; interrupts = <20 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "nand_irq"; - - dmas = <&apbdma0 1>; + dmas = <&dma 0 0xaae>; dma-names = "nand_rw"; dma-mask = <0xffffffff 0xffffffff>;