diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-05 18:12:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-05 18:12:39 +0100 |
| commit | 6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2 (patch) | |
| tree | 92a6b7232a02ed69b86219e8f125e08bf95f3837 /Documentation | |
| parent | 13b02fa0dbb1311d08dfacd897a6ff41232d7cfb (diff) | |
| parent | 95169d080fcaad6c990ce3602d9b3d38753b1fa4 (diff) | |
| download | op-kernel-dev-6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2.zip op-kernel-dev-6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2.tar.gz | |
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
Trivial add/add conflicts:
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/ti,pcm1681.txt | 15 |
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 0000000..4df1718 --- /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>; + }; + }; |
