0067-ASoC-dt-bindings-sun4i-spdif-Add-compatible-for-D1.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. From 4e72722bfb7dec028e11278a924bb8bef3e10897 Mon Sep 17 00:00:00 2001
  2. From: Samuel Holland <[email protected]>
  3. Date: Sat, 13 Nov 2021 10:48:24 -0600
  4. Subject: [PATCH 067/117] ASoC: dt-bindings: sun4i-spdif: Add compatible for D1
  5. D1 mostly keeps the existing register layout, but it separates the
  6. module clock into separate clocks for the RX block and the TX block.
  7. Signed-off-by: Samuel Holland <[email protected]>
  8. ---
  9. .../sound/allwinner,sun4i-a10-spdif.yaml | 54 +++++++++++++++----
  10. 1 file changed, 44 insertions(+), 10 deletions(-)
  11. --- a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml
  12. +++ b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml
  13. @@ -18,10 +18,12 @@ properties:
  14. compatible:
  15. oneOf:
  16. - - const: allwinner,sun4i-a10-spdif
  17. - - const: allwinner,sun6i-a31-spdif
  18. - - const: allwinner,sun8i-h3-spdif
  19. - - const: allwinner,sun50i-h6-spdif
  20. + - enum:
  21. + - allwinner,sun4i-a10-spdif
  22. + - allwinner,sun6i-a31-spdif
  23. + - allwinner,sun8i-h3-spdif
  24. + - allwinner,sun20i-d1-spdif
  25. + - allwinner,sun50i-h6-spdif
  26. - items:
  27. - const: allwinner,sun8i-a83t-spdif
  28. - const: allwinner,sun8i-h3-spdif
  29. @@ -36,14 +38,12 @@ properties:
  30. maxItems: 1
  31. clocks:
  32. - items:
  33. - - description: Bus Clock
  34. - - description: Module Clock
  35. + minItems: 2
  36. + maxItems: 3
  37. clock-names:
  38. - items:
  39. - - const: apb
  40. - - const: spdif
  41. + minItems: 2
  42. + maxItems: 3
  43. # Even though it only applies to subschemas under the conditionals,
  44. # not listing them here will trigger a warning because of the
  45. @@ -59,8 +59,42 @@ allOf:
  46. compatible:
  47. contains:
  48. enum:
  49. + - allwinner,sun20i-d1-spdif
  50. +
  51. + then:
  52. + properties:
  53. + clocks:
  54. + items:
  55. + - description: Bus Clock
  56. + - description: RX Module Clock
  57. + - description: TX Module Clock
  58. +
  59. + clock-names:
  60. + items:
  61. + - const: apb
  62. + - const: rx
  63. + - const: tx
  64. +
  65. + else:
  66. + properties:
  67. + clocks:
  68. + items:
  69. + - description: Bus Clock
  70. + - description: Module Clock
  71. +
  72. + clock-names:
  73. + items:
  74. + - const: apb
  75. + - const: spdif
  76. +
  77. + - if:
  78. + properties:
  79. + compatible:
  80. + contains:
  81. + enum:
  82. - allwinner,sun6i-a31-spdif
  83. - allwinner,sun8i-h3-spdif
  84. + - allwinner,sun20i-d1-spdif
  85. - allwinner,sun50i-h6-spdif
  86. then: