Skip to content

Commit 2bb665a

Browse files
committed
Merge tag 'sunxi-dt-for-7.1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
Allwinner Device Tree Changes for 7.1 - Part 2 UART DMA channels added for A64 and H6. Standard resolution MMIO timer added for H616. This timer can be used as a broadcast timer for wakeup from idle states. * tag 'sunxi-dt-for-7.1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: enable h616 timer support arm64: dts: allwinner: sun50i-h6: add UART DMA channels arm64: dts: allwinner: sun50i-a64: add UART DMA channels Signed-off-by: Krzysztof Kozlowski <[email protected]>
2 parents b7e1557 + c755e39 commit 2bb665a

3 files changed

Lines changed: 27 additions & 0 deletions

File tree

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,8 @@
10001000
reg-io-width = <4>;
10011001
clocks = <&ccu CLK_BUS_UART0>;
10021002
resets = <&ccu RST_BUS_UART0>;
1003+
dmas = <&dma 6>, <&dma 6>;
1004+
dma-names = "tx", "rx";
10031005
status = "disabled";
10041006
};
10051007

@@ -1011,6 +1013,8 @@
10111013
reg-io-width = <4>;
10121014
clocks = <&ccu CLK_BUS_UART1>;
10131015
resets = <&ccu RST_BUS_UART1>;
1016+
dmas = <&dma 7>, <&dma 7>;
1017+
dma-names = "tx", "rx";
10141018
status = "disabled";
10151019
};
10161020

@@ -1022,6 +1026,8 @@
10221026
reg-io-width = <4>;
10231027
clocks = <&ccu CLK_BUS_UART2>;
10241028
resets = <&ccu RST_BUS_UART2>;
1029+
dmas = <&dma 8>, <&dma 8>;
1030+
dma-names = "tx", "rx";
10251031
status = "disabled";
10261032
};
10271033

@@ -1033,6 +1039,8 @@
10331039
reg-io-width = <4>;
10341040
clocks = <&ccu CLK_BUS_UART3>;
10351041
resets = <&ccu RST_BUS_UART3>;
1042+
dmas = <&dma 9>, <&dma 9>;
1043+
dma-names = "tx", "rx";
10361044
status = "disabled";
10371045
};
10381046

@@ -1044,6 +1052,8 @@
10441052
reg-io-width = <4>;
10451053
clocks = <&ccu CLK_BUS_UART4>;
10461054
resets = <&ccu RST_BUS_UART4>;
1055+
dmas = <&dma 10>, <&dma 10>;
1056+
dma-names = "tx", "rx";
10471057
status = "disabled";
10481058
};
10491059

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,8 @@
540540
reg-io-width = <4>;
541541
clocks = <&ccu CLK_BUS_UART0>;
542542
resets = <&ccu RST_BUS_UART0>;
543+
dmas = <&dma 14>, <&dma 14>;
544+
dma-names = "tx", "rx";
543545
status = "disabled";
544546
};
545547

@@ -551,6 +553,8 @@
551553
reg-io-width = <4>;
552554
clocks = <&ccu CLK_BUS_UART1>;
553555
resets = <&ccu RST_BUS_UART1>;
556+
dmas = <&dma 15>, <&dma 15>;
557+
dma-names = "tx", "rx";
554558
status = "disabled";
555559
};
556560

@@ -562,6 +566,8 @@
562566
reg-io-width = <4>;
563567
clocks = <&ccu CLK_BUS_UART2>;
564568
resets = <&ccu RST_BUS_UART2>;
569+
dmas = <&dma 16>, <&dma 16>;
570+
dma-names = "tx", "rx";
565571
status = "disabled";
566572
};
567573

@@ -573,6 +579,8 @@
573579
reg-io-width = <4>;
574580
clocks = <&ccu CLK_BUS_UART3>;
575581
resets = <&ccu RST_BUS_UART3>;
582+
dmas = <&dma 17>, <&dma 17>;
583+
dma-names = "tx", "rx";
576584
status = "disabled";
577585
};
578586

arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,15 @@
228228
};
229229
};
230230

231+
timer0: timer@3009000 {
232+
compatible = "allwinner,sun50i-h616-timer",
233+
"allwinner,sun8i-a23-timer";
234+
reg = <0x03009000 0xa0>;
235+
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
236+
<GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
237+
clocks = <&osc24M>;
238+
};
239+
231240
watchdog: watchdog@30090a0 {
232241
compatible = "allwinner,sun50i-h616-wdt",
233242
"allwinner,sun6i-a31-wdt";

0 commit comments

Comments
 (0)