Merge remote-tracking branches 'asoc/topic/doc', 'asoc/topic/dwc', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/fsl-asrc' into asoc-next

Browse source

...

This commit is contained in:

Mark Brown 2015-02-09 15:10:17 +08:00

parent 3f1cf65757 2f1a11e624 acae254a8e 180cf794d4 4536a00116 888c819d0f

commit 97edc4164f

11 changed files with 272 additions and 70 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

31

Documentation/devicetree/bindings/sound/designware-i2s.txt

View file

1

sound/soc/dwc/Kconfig

View file

281

sound/soc/dwc/designware_i2s.c

View file

5

sound/soc/fsl/fsl_asrc.c

View file

3

sound/soc/fsl/fsl_asrc.h

View file

2

sound/soc/fsl/fsl_esai.c

View file

2

sound/soc/fsl/fsl_sai.c

View file

2

sound/soc/fsl/fsl_spdif.c

View file

4

sound/soc/fsl/fsl_ssi.c

View file

9

sound/soc/sh/fsi.c

View file

2

sound/soc/soc-devres.c

View file