Commit 5d71e600 authored by Mark Brown's avatar Mark Brown

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.
parents c6dce23e 7a9dc944
...@@ -22,6 +22,7 @@ properties: ...@@ -22,6 +22,7 @@ properties:
- const: allwinner,sun6i-a31-spdif - const: allwinner,sun6i-a31-spdif
- const: allwinner,sun8i-h3-spdif - const: allwinner,sun8i-h3-spdif
- const: allwinner,sun50i-h6-spdif - const: allwinner,sun50i-h6-spdif
- const: allwinner,sun50i-h616-spdif
- items: - items:
- const: allwinner,sun8i-a83t-spdif - const: allwinner,sun8i-a83t-spdif
- const: allwinner,sun8i-h3-spdif - const: allwinner,sun8i-h3-spdif
...@@ -62,6 +63,8 @@ allOf: ...@@ -62,6 +63,8 @@ allOf:
enum: enum:
- allwinner,sun6i-a31-spdif - allwinner,sun6i-a31-spdif
- allwinner,sun8i-h3-spdif - allwinner,sun8i-h3-spdif
- allwinner,sun50i-h6-spdif
- allwinner,sun50i-h616-spdif
then: then:
required: required:
...@@ -73,7 +76,7 @@ allOf: ...@@ -73,7 +76,7 @@ allOf:
contains: contains:
enum: enum:
- allwinner,sun8i-h3-spdif - allwinner,sun8i-h3-spdif
- allwinner,sun50i-h6-spdif - allwinner,sun50i-h616-spdif
then: then:
properties: properties:
......
...@@ -577,6 +577,11 @@ static const struct of_device_id sun4i_spdif_of_match[] = { ...@@ -577,6 +577,11 @@ static const struct of_device_id sun4i_spdif_of_match[] = {
.compatible = "allwinner,sun50i-h6-spdif", .compatible = "allwinner,sun50i-h6-spdif",
.data = &sun50i_h6_spdif_quirks, .data = &sun50i_h6_spdif_quirks,
}, },
{
.compatible = "allwinner,sun50i-h616-spdif",
/* Essentially the same as the H6, but without RX */
.data = &sun50i_h6_spdif_quirks,
},
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match); MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment