| Message ID | 20240127163247.384439-7-wens@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Sun, 28 Jan 2024 00:32:46 +0800 Chen-Yu Tsai <wens@kernel.org> wrote: > From: Chen-Yu Tsai <wens@csie.org> > > The DMA controllers found on the H616 and H618 are the same as the one > found on the A100. The only difference is the DMA endpoint (DRQ) layout. > > Add a device node for it, and add DMA channels for existing peripherals. Thanks for the changes! I compared all bits against the manual: they match. > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > Changes since v1: > - Fall back to A100 instead of H6 > - Add DMA channels for r_i2c > > .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 41 +++++++++++++++++++ > 1 file changed, 41 insertions(+) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi > index d549d277d972..885809137b9d 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi > @@ -133,6 +133,19 @@ ccu: clock@3001000 { > #reset-cells = <1>; > }; > > + dma: dma-controller@3002000 { > + compatible = "allwinner,sun50i-h616-dma", > + "allwinner,sun50i-a100-dma"; > + reg = <0x03002000 0x1000>; > + interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; > + clock-names = "bus", "mbus"; > + dma-channels = <16>; > + dma-requests = <49>; > + resets = <&ccu RST_BUS_DMA>; > + #dma-cells = <1>; > + }; > + > sid: efuse@3006000 { > compatible = "allwinner,sun50i-h616-sid", "allwinner,sun50i-a64-sid"; > reg = <0x03006000 0x1000>; > @@ -339,6 +352,8 @@ uart0: serial@5000000 { > reg-shift = <2>; > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART0>; > + dmas = <&dma 14>, <&dma 14>; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART0>; > status = "disabled"; > }; > @@ -350,6 +365,8 @@ uart1: serial@5000400 { > reg-shift = <2>; > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART1>; > + dmas = <&dma 15>, <&dma 15>; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART1>; > status = "disabled"; > }; > @@ -361,6 +378,8 @@ uart2: serial@5000800 { > reg-shift = <2>; > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART2>; > + dmas = <&dma 16>, <&dma 16>; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART2>; > status = "disabled"; > }; > @@ -372,6 +391,8 @@ uart3: serial@5000c00 { > reg-shift = <2>; > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART3>; > + dmas = <&dma 17>, <&dma 17>; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART3>; > status = "disabled"; > }; > @@ -383,6 +404,8 @@ uart4: serial@5001000 { > reg-shift = <2>; > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART4>; > + dmas = <&dma 18>, <&dma 18>; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART4>; > status = "disabled"; > }; > @@ -394,6 +417,8 @@ uart5: serial@5001400 { > reg-shift = <2>; > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART5>; > + dmas = <&dma 19>, <&dma 19>; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART5>; > status = "disabled"; > }; > @@ -405,6 +430,8 @@ i2c0: i2c@5002000 { > reg = <0x05002000 0x400>; > interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&ccu CLK_BUS_I2C0>; > + dmas = <&dma 43>, <&dma 43>; > + dma-names = "rx", "tx"; > resets = <&ccu RST_BUS_I2C0>; > pinctrl-names = "default"; > pinctrl-0 = <&i2c0_pins>; > @@ -420,6 +447,8 @@ i2c1: i2c@5002400 { > reg = <0x05002400 0x400>; > interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&ccu CLK_BUS_I2C1>; > + dmas = <&dma 44>, <&dma 44>; > + dma-names = "rx", "tx"; > resets = <&ccu RST_BUS_I2C1>; > status = "disabled"; > #address-cells = <1>; > @@ -433,6 +462,8 @@ i2c2: i2c@5002800 { > reg = <0x05002800 0x400>; > interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&ccu CLK_BUS_I2C2>; > + dmas = <&dma 45>, <&dma 45>; > + dma-names = "rx", "tx"; > resets = <&ccu RST_BUS_I2C2>; > status = "disabled"; > #address-cells = <1>; > @@ -446,6 +477,8 @@ i2c3: i2c@5002c00 { > reg = <0x05002c00 0x400>; > interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&ccu CLK_BUS_I2C3>; > + dmas = <&dma 46>, <&dma 46>; > + dma-names = "rx", "tx"; > resets = <&ccu RST_BUS_I2C3>; > status = "disabled"; > #address-cells = <1>; > @@ -459,6 +492,8 @@ i2c4: i2c@5003000 { > reg = <0x05003000 0x400>; > interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&ccu CLK_BUS_I2C4>; > + dmas = <&dma 47>, <&dma 47>; > + dma-names = "rx", "tx"; > resets = <&ccu RST_BUS_I2C4>; > status = "disabled"; > #address-cells = <1>; > @@ -472,6 +507,8 @@ spi0: spi@5010000 { > interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>; > clock-names = "ahb", "mod"; > + dmas = <&dma 22>, <&dma 22>; > + dma-names = "rx", "tx"; > resets = <&ccu RST_BUS_SPI0>; > status = "disabled"; > #address-cells = <1>; > @@ -485,6 +522,8 @@ spi1: spi@5011000 { > interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>; > clock-names = "ahb", "mod"; > + dmas = <&dma 23>, <&dma 23>; > + dma-names = "rx", "tx"; > resets = <&ccu RST_BUS_SPI1>; > status = "disabled"; > #address-cells = <1>; > @@ -734,6 +773,8 @@ r_i2c: i2c@7081400 { > reg = <0x07081400 0x400>; > interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&r_ccu CLK_R_APB2_I2C>; > + dmas = <&dma 48>, <&dma 48>; > + dma-names = "rx", "tx"; > resets = <&r_ccu RST_R_APB2_I2C>; > status = "disabled"; > #address-cells = <1>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi index d549d277d972..885809137b9d 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi @@ -133,6 +133,19 @@ ccu: clock@3001000 { #reset-cells = <1>; }; + dma: dma-controller@3002000 { + compatible = "allwinner,sun50i-h616-dma", + "allwinner,sun50i-a100-dma"; + reg = <0x03002000 0x1000>; + interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; + clock-names = "bus", "mbus"; + dma-channels = <16>; + dma-requests = <49>; + resets = <&ccu RST_BUS_DMA>; + #dma-cells = <1>; + }; + sid: efuse@3006000 { compatible = "allwinner,sun50i-h616-sid", "allwinner,sun50i-a64-sid"; reg = <0x03006000 0x1000>; @@ -339,6 +352,8 @@ uart0: serial@5000000 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART0>; + dmas = <&dma 14>, <&dma 14>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART0>; status = "disabled"; }; @@ -350,6 +365,8 @@ uart1: serial@5000400 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART1>; + dmas = <&dma 15>, <&dma 15>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART1>; status = "disabled"; }; @@ -361,6 +378,8 @@ uart2: serial@5000800 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART2>; + dmas = <&dma 16>, <&dma 16>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART2>; status = "disabled"; }; @@ -372,6 +391,8 @@ uart3: serial@5000c00 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART3>; + dmas = <&dma 17>, <&dma 17>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART3>; status = "disabled"; }; @@ -383,6 +404,8 @@ uart4: serial@5001000 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART4>; + dmas = <&dma 18>, <&dma 18>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART4>; status = "disabled"; }; @@ -394,6 +417,8 @@ uart5: serial@5001400 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART5>; + dmas = <&dma 19>, <&dma 19>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART5>; status = "disabled"; }; @@ -405,6 +430,8 @@ i2c0: i2c@5002000 { reg = <0x05002000 0x400>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_I2C0>; + dmas = <&dma 43>, <&dma 43>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C0>; pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; @@ -420,6 +447,8 @@ i2c1: i2c@5002400 { reg = <0x05002400 0x400>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_I2C1>; + dmas = <&dma 44>, <&dma 44>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C1>; status = "disabled"; #address-cells = <1>; @@ -433,6 +462,8 @@ i2c2: i2c@5002800 { reg = <0x05002800 0x400>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_I2C2>; + dmas = <&dma 45>, <&dma 45>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C2>; status = "disabled"; #address-cells = <1>; @@ -446,6 +477,8 @@ i2c3: i2c@5002c00 { reg = <0x05002c00 0x400>; interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_I2C3>; + dmas = <&dma 46>, <&dma 46>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C3>; status = "disabled"; #address-cells = <1>; @@ -459,6 +492,8 @@ i2c4: i2c@5003000 { reg = <0x05003000 0x400>; interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_I2C4>; + dmas = <&dma 47>, <&dma 47>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C4>; status = "disabled"; #address-cells = <1>; @@ -472,6 +507,8 @@ spi0: spi@5010000 { interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>; clock-names = "ahb", "mod"; + dmas = <&dma 22>, <&dma 22>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_SPI0>; status = "disabled"; #address-cells = <1>; @@ -485,6 +522,8 @@ spi1: spi@5011000 { interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>; clock-names = "ahb", "mod"; + dmas = <&dma 23>, <&dma 23>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_SPI1>; status = "disabled"; #address-cells = <1>; @@ -734,6 +773,8 @@ r_i2c: i2c@7081400 { reg = <0x07081400 0x400>; interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&r_ccu CLK_R_APB2_I2C>; + dmas = <&dma 48>, <&dma 48>; + dma-names = "rx", "tx"; resets = <&r_ccu RST_R_APB2_I2C>; status = "disabled"; #address-cells = <1>;