[alsa-devel] [GIT PULL] ASoC updates for 2.6.36
Hi Takashi,
More updates for 2.6.36. Btw, when are you thinking of doing a pull request for 2.6.36 ? I'm doing a multi-component patch series later today and if all goes well it would be nice to get it in for the 2.6.36 merge window.
Thanks
Liam
---
The following changes since commit a7e7cd5bd7d1e0134032b8db5e64ceb9dac8b3ca: Kuninori Morimoto (1): ASoC: da7210: Add HeadPhone Playback Volume control
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.36
Peter Ujfalusi (7): ASoC: TWL4030: Capture route DAPM event fix ASoC: tlv320dac33: Revisit the FIFO Mode1 handling ASoC: tlv320dac33: Add support for automatic FIFO configuration ASoC: omap-mcbsp: Restructure the code within omap_mcbsp_dai_hw_params ASoC: omap-mcbsp: Code cleanup in omap_mcbsp_dai_hw_params ASoC: omap-mcbsp: Support for sDMA packet mode ASoC: omap-mcbsp: Remove period size constraint in THRESHOLD mode
include/sound/tlv320dac33-plat.h | 2 + sound/soc/codecs/tlv320dac33.c | 125 ++++++++++++++++++++++------------ sound/soc/codecs/twl4030.c | 2 - sound/soc/omap/omap-mcbsp.c | 137 +++++++++++++++++++++----------------- 4 files changed, 158 insertions(+), 108 deletions(-)
At Mon, 02 Aug 2010 10:53:50 +0100, Liam Girdwood wrote:
Hi Takashi,
More updates for 2.6.36.
Pulled now.
Btw, when are you thinking of doing a pull request for 2.6.36 ? I'm doing a multi-component patch series later today and if all goes well it would be nice to get it in for the 2.6.36 merge window.
I thought to send a pull request in the middle of this week, depending on the pending bugs / features. So I'm still open for new stuff for a few days. As long as it's local to ASoC, I'm fine to merge it now.
thanks,
Takashi
Thanks
Liam
The following changes since commit a7e7cd5bd7d1e0134032b8db5e64ceb9dac8b3ca: Kuninori Morimoto (1): ASoC: da7210: Add HeadPhone Playback Volume control
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.36
Peter Ujfalusi (7): ASoC: TWL4030: Capture route DAPM event fix ASoC: tlv320dac33: Revisit the FIFO Mode1 handling ASoC: tlv320dac33: Add support for automatic FIFO configuration ASoC: omap-mcbsp: Restructure the code within omap_mcbsp_dai_hw_params ASoC: omap-mcbsp: Code cleanup in omap_mcbsp_dai_hw_params ASoC: omap-mcbsp: Support for sDMA packet mode ASoC: omap-mcbsp: Remove period size constraint in THRESHOLD mode
include/sound/tlv320dac33-plat.h | 2 + sound/soc/codecs/tlv320dac33.c | 125 ++++++++++++++++++++++------------ sound/soc/codecs/twl4030.c | 2 - sound/soc/omap/omap-mcbsp.c | 137 +++++++++++++++++++++----------------- 4 files changed, 158 insertions(+), 108 deletions(-)
On Mon, 2010-08-02 at 12:13 +0200, Takashi Iwai wrote:
At Mon, 02 Aug 2010 10:53:50 +0100, Liam Girdwood wrote:
Btw, when are you thinking of doing a pull request for 2.6.36 ? I'm doing a multi-component patch series later today and if all goes well it would be nice to get it in for the 2.6.36 merge window.
I thought to send a pull request in the middle of this week, depending on the pending bugs / features. So I'm still open for new stuff for a few days. As long as it's local to ASoC, I'm fine to merge it now.
Ok, the multi-component branch does touch arch quite a bit as we are adding platform devices for all our components. So it's probably safer for merging (after your pull request) in the for 2.6.37 period to reduce any merge conflict with arch.
Fwiw, the release yesterday did take me a little by surprise as I was at least expecting an rc7 and a little extra time for multi-comp ;)
Thanks
Liam
On 2 Aug 2010, at 11:30, Liam Girdwood wrote:
Ok, the multi-component branch does touch arch quite a bit as we are adding platform devices for all our components. So it's probably safer for merging (after your pull request) in the for 2.6.37 period to reduce any merge conflict with arch.
Fwiw, the release yesterday did take me a little by surprise as I was at least expecting an rc7 and a little extra time for multi-comp ;)
In that case I guess I'll send a pull request with WM8741 tomorrow and send you the multi-component updates for it separately if that's OK with you (I'm about to crash, just got in from 16 hours of flying)?
On Mon, 2010-08-02 at 11:33 +0100, Mark Brown wrote:
On 2 Aug 2010, at 11:30, Liam Girdwood wrote:
Ok, the multi-component branch does touch arch quite a bit as we are adding platform devices for all our components. So it's probably safer for merging (after your pull request) in the for 2.6.37 period to reduce any merge conflict with arch.
Fwiw, the release yesterday did take me a little by surprise as I was at least expecting an rc7 and a little extra time for multi-comp ;)
In that case I guess I'll send a pull request with WM8741 tomorrow and send you the multi-component updates for it separately if that's OK with you (I'm about to crash, just got in from 16 hours of flying)?
Yep, that's cool.
Thanks
Liam
On Mon, Aug 2, 2010 at 5:30 AM, Liam Girdwood lrg@slimlogic.co.uk wrote:
Ok, the multi-component branch does touch arch quite a bit as we are adding platform devices for all our components. So it's probably safer for merging (after your pull request) in the for 2.6.37 period to reduce any merge conflict with arch.
Um, I was really expecting my code to be part of 2.6.36. Why are we concerned with merge conflicts? That's going to happen no matter what.
On Mon, Aug 2, 2010 at 11:24 AM, Timur Tabi timur@freescale.com wrote:
Um, I was really expecting my code to be part of 2.6.36. Why are we concerned with merge conflicts? That's going to happen no matter what.
Never mind, Liam explained the whole thing to me on IRC. I'm just frustrated that code I wrote back in April won't be in a kernel release until the end of this year.
participants (4)
-
Liam Girdwood -
Mark Brown -
Takashi Iwai -
Timur Tabi