Merge remote-tracking branch 'asoc/topic/sunxi' into asoc-next

2015-12-23 00:23:34 +00:00
parent 10330401d8 6b803c611c
commit 1ab4f8519a
2 changed files with 235 additions and 51 deletions
--- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
@@ -14,6 +14,9 @@ Required properties:
   - "apb": the parent APB clock for this controller
   - "codec": the parent module clock

+Optional properties:
+- allwinner,pa-gpios: gpio to enable external amplifier
+
 Example:
 codec: codec@01c22c00 {
 	#sound-dai-cells = <0>;