]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ARM: dts: artpec: add and utilize nbpfaxi DMA controllers
authorNiklas Cassel <niklas.cassel@axis.com>
Wed, 21 Feb 2018 08:59:58 +0000 (09:59 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Mar 2018 16:41:12 +0000 (17:41 +0100)
Add nodes for the nbpfaxi DMA controllers used in the artpec6 SoC,
and start using them for the exising UARTs.

Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/artpec6.dtsi

index 7a6d8f39823adea3b094b7560aaf6b5a1320d6e9..1c46df0c03ce18d9c2c239209b3c73a2cc711550 100644 (file)
@@ -41,6 +41,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/dma/nbpfaxi.h>
 #include <dt-bindings/clock/axis,artpec6-clkctrl.h>
 #include "skeleton.dtsi"
 
                ranges;
                dma-ranges;
 
+               dma0: dma@f8019000 {
+                       compatible = "renesas,nbpfaxi64dmac8b16";
+                       reg = <0xf8019000 0x400>;
+                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */
+                                    <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch12",
+                                         "ch12", "ch13", "ch14", "ch15";
+                       clocks = <&clkctrl ARTPEC6_CLK_DMA_ACLK>;
+                       #dma-cells = <2>;
+                       dma-channels = <8>;
+                       dma-requests = <8>;
+               };
+               dma1: dma@f8019400 {
+                       compatible = "renesas,nbpfaxi64dmac8b16";
+                       reg = <0xf8019400 0x400>;
+                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */
+                                    <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "error",
+                                         "ch0", "ch1", "ch2", "ch3",
+                                         "ch4", "ch5", "ch6", "ch7",
+                                         "ch8", "ch9", "ch10", "ch12",
+                                         "ch12", "ch13", "ch14", "ch15";
+                       clocks = <&clkctrl ARTPEC6_CLK_DMA_ACLK>;
+                       #dma-cells = <2>;
+                       dma-channels = <8>;
+                       dma-requests = <8>;
+               };
+
                ethernet: ethernet@f8010000 {
                        clock-names = "stmmaceth", "ptp_ref";
                        clocks = <&clkctrl ARTPEC6_CLK_ETH_ACLK>,
                        clock-names = "uart_clk", "apb_pclk";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
+                       dmas = <&dma0 4 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                              <&dma0 5 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
                uart1: serial@f8037000 {
                        clock-names = "uart_clk", "apb_pclk";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
+                       dmas = <&dma0 6 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                              <&dma0 7 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
                uart2: serial@f8038000 {
                        clock-names = "uart_clk", "apb_pclk";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
+                       dmas = <&dma1 0 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                              <&dma1 1 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
                uart3: serial@f8039000 {
                        clock-names = "uart_clk", "apb_pclk";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
+                       dmas = <&dma1 2 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                              <&dma1 3 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
        };