Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm

Trivial add/add conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile

1 files changed, 15 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/sound/ti,pcm1681.txt b/Documentation/devicetree/bindings/sound/ti,pcm1681.txt
new file mode 100644
index 000000000000..4df17185ab80
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ti,pcm1681.txt
@@ -0,0 +1,15 @@
+Texas Instruments PCM1681 8-channel PWM Processor
+
+Required properties:
+
+ - compatible:          Should contain "ti,pcm1681".
+ - reg:                 The i2c address. Should contain <0x4c>.
+
+Examples:
+
+        i2c_bus {
+                pcm1681@4c {
+                        compatible = "ti,pcm1681";
+                        reg = <0x4c>;
+                };
+        };