Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328',... (96f0e8a5) · Commits · Bryan O'Donoghue / Kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kernel
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

96f0e8a5

Commit 96f0e8a5 authored 8 years ago by Mark Brown

Downloads
- Plain Diff

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328',...

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic/fsl', 'asoc/topic/fsl-sai' and 'asoc/topic/graph' into asoc-next

parents 59acd5df e21ab179 245c5c7b d61b23da 4957b556 b07609ce

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/sound/es8328.txt 1 addition, 1 deletion

Documentation/devicetree/bindings/sound/es8328.txt
include/sound/soc.h 7 additions, 23 deletions

include/sound/soc.h
sound/soc/codecs/Kconfig 5 additions, 3 deletions

sound/soc/codecs/Kconfig
sound/soc/codecs/es8328-i2c.c 2 additions, 0 deletions

sound/soc/codecs/es8328-i2c.c
sound/soc/codecs/es8328.c 14 additions, 6 deletions

sound/soc/codecs/es8328.c
sound/soc/dwc/designware_i2s.c 7 additions, 2 deletions

sound/soc/dwc/designware_i2s.c
sound/soc/dwc/designware_pcm.c 79 additions, 20 deletions

sound/soc/dwc/designware_pcm.c
sound/soc/dwc/local.h 8 additions, 1 deletion

sound/soc/dwc/local.h
sound/soc/fsl/efika-audio-fabric.c 0 additions, 1 deletion

sound/soc/fsl/efika-audio-fabric.c
sound/soc/fsl/fsl_sai.c 2 additions, 2 deletions

sound/soc/fsl/fsl_sai.c
sound/soc/fsl/mpc5200_psc_ac97.c 0 additions, 1 deletion

sound/soc/fsl/mpc5200_psc_ac97.c
sound/soc/fsl/mpc5200_psc_ac97.h 0 additions, 13 deletions

sound/soc/fsl/mpc5200_psc_ac97.h
sound/soc/soc-core.c 14 additions, 24 deletions

sound/soc/soc-core.c

with 139 additions and 97 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment