[alsa-devel] [GIT PULL] Please pull ASoC's tegra branch into Tegra for-next

Stephen Warren swarren at nvidia.com
Thu Apr 21 19:21:06 CEST 2011

Colin, Erik, Olof,

Please pull

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git tegra

into Tegra's for-next, or whichever branch is appropriate for 2.6.40 work.

This will bring in:

47912a6 ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903
61a6d07 ARM: Tegra: Add to tegra_wm8903_platform_data
7b33af2 ASoC: Tegra: Rename pdev tegra-snd-harmony to tegra-snd-wm8903
4651d55 ARM: Tegra: Rename harmony_audio.h -> tegra_wm8903_pdata.h
a6360dd Linux 2.6.39-rc3

The changes are required to add Seaboard audio support into the Tegra
branch. I'll post patches for that later today.

I have tested that:

* The merge has no conflicts.
* The merge result compiles.
* The resultant kernel runs OK on Harmony.
* With the addition of the patch below, which is required to fix an
  already-extant bug in Tegra's for-next branch, and which I'll repost
  later today, audio on Harmony works fully.
  ARM: Tegra: Harmony: Fix conflicting GPIO numbering

Thank you.


More information about the Alsa-devel mailing list