Unverified Commit 5d71e600 authored by Mark Brown's avatar Mark Brown
Browse files

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

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

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
      - const: allwinner,sun6i-a31-spdif

      - const: allwinner,sun8i-h3-spdif

      - const: allwinner,sun50i-h6-spdif

      - const: allwinner,sun50i-h616-spdif

      - items:

          - const: allwinner,sun8i-a83t-spdif

          - const: allwinner,sun8i-h3-spdif
@@ -62,6 +63,8 @@ allOf: 
            enum:

              - allwinner,sun6i-a31-spdif

              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif

              - allwinner,sun50i-h616-spdif



    then:

      required:
@@ -73,7 +76,7 @@ allOf: 
          contains:

            enum:

              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif

              - allwinner,sun50i-h616-spdif



    then:

      properties:

sound/soc/sunxi/sun4i-spdif.c

+5 −0
Original line number Diff line number Diff line
@@ -577,6 +577,11 @@ static const struct of_device_id sun4i_spdif_of_match[] = { 
		.compatible = "allwinner,sun50i-h6-spdif",

		.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 */ }

};

MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);