Skip to content

Commit 5d71e60

Browse files
committed
arm64: sun50i-h616: Add DMA and SPDIF controllers
Merge series from Chen-Yu Tsai <wens@kernel.org>: This series adds SPDIF controllers for the H616 and H618. There's also a fix for SPDIF on H6: the controller also has a receiver that was not correctly modeled.
2 parents c6dce23 + 7a9dc94 commit 5d71e60

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- const: allwinner,sun6i-a31-spdif
2323
- const: allwinner,sun8i-h3-spdif
2424
- const: allwinner,sun50i-h6-spdif
25+
- const: allwinner,sun50i-h616-spdif
2526
- items:
2627
- const: allwinner,sun8i-a83t-spdif
2728
- const: allwinner,sun8i-h3-spdif
@@ -62,6 +63,8 @@ allOf:
6263
enum:
6364
- allwinner,sun6i-a31-spdif
6465
- allwinner,sun8i-h3-spdif
66+
- allwinner,sun50i-h6-spdif
67+
- allwinner,sun50i-h616-spdif
6568

6669
then:
6770
required:
@@ -73,7 +76,7 @@ allOf:
7376
contains:
7477
enum:
7578
- allwinner,sun8i-h3-spdif
76-
- allwinner,sun50i-h6-spdif
79+
- allwinner,sun50i-h616-spdif
7780

7881
then:
7982
properties:

sound/soc/sunxi/sun4i-spdif.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,11 @@ static const struct of_device_id sun4i_spdif_of_match[] = {
577577
.compatible = "allwinner,sun50i-h6-spdif",
578578
.data = &sun50i_h6_spdif_quirks,
579579
},
580+
{
581+
.compatible = "allwinner,sun50i-h616-spdif",
582+
/* Essentially the same as the H6, but without RX */
583+
.data = &sun50i_h6_spdif_quirks,
584+
},
580585
{ /* sentinel */ }
581586
};
582587
MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);

0 commit comments

Comments
 (0)