All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] ASoC updates for 2.6.38
@ 2010-11-23 11:06 Liam Girdwood
  2010-11-23 11:59 ` Takashi Iwai
  0 siblings, 1 reply; 4+ messages in thread
From: Liam Girdwood @ 2010-11-23 11:06 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: alsa-devel, Mark Brown

Some updates for 2.6.38 too :-


The following changes since commit 33ee617f4dad370bee016e4462e69481257453b0:

  Merge remote branch 'tiwai/topic/asoc' into for-2.6.38 (2010-11-03 14:18:42 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.38

Axel Lin (1):
      ASoC: Move kfree(twl4030) to twl4030_soc_remove()

Jarkko Nikula (3):
      ASoC: tlv320aic3x: Use gpio_is_valid in checking for valid gpio_reset
      ASoC: tlv320aic3x: Add support to shared common reset line
      ASoC: tpa6130a2: Revisit power-up sequence

 sound/soc/codecs/tlv320aic3x.c |   32 +++++++++++++++++++++++++++-----
 sound/soc/codecs/tpa6130a2.c   |    6 +++---
 sound/soc/codecs/twl4030.c     |    6 +++---
 3 files changed, 33 insertions(+), 11 deletions(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] ASoC updates for 2.6.38
  2010-11-23 11:06 [GIT PULL] ASoC updates for 2.6.38 Liam Girdwood
@ 2010-11-23 11:59 ` Takashi Iwai
  0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2010-11-23 11:59 UTC (permalink / raw)
  To: Liam Girdwood; +Cc: alsa-devel, Mark Brown

At Tue, 23 Nov 2010 11:06:47 +0000,
Liam Girdwood wrote:
> 
> Some updates for 2.6.38 too :-
> 
> 
> The following changes since commit 33ee617f4dad370bee016e4462e69481257453b0:
> 
>   Merge remote branch 'tiwai/topic/asoc' into for-2.6.38 (2010-11-03 14:18:42 +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.38

I got a merge conflict, so fixed manually here.
Please check whether it's OK for you later.


thanks,

Takashi

> Axel Lin (1):
>       ASoC: Move kfree(twl4030) to twl4030_soc_remove()
> 
> Jarkko Nikula (3):
>       ASoC: tlv320aic3x: Use gpio_is_valid in checking for valid gpio_reset
>       ASoC: tlv320aic3x: Add support to shared common reset line
>       ASoC: tpa6130a2: Revisit power-up sequence
> 
>  sound/soc/codecs/tlv320aic3x.c |   32 +++++++++++++++++++++++++++-----
>  sound/soc/codecs/tpa6130a2.c   |    6 +++---
>  sound/soc/codecs/twl4030.c     |    6 +++---
>  3 files changed, 33 insertions(+), 11 deletions(-)
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [GIT PULL] ASoC updates for 2.6.38
@ 2010-12-17 13:55 Liam Girdwood
  2010-12-17 15:46 ` Takashi Iwai
  0 siblings, 1 reply; 4+ messages in thread
From: Liam Girdwood @ 2010-12-17 13:55 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: alsa-devel, Mark Brown


More updates for 2.6.38, mainly wrt TI CODECs.

Thanks

Liam

---


The following changes since commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0:

  Merge branch 'for-2.6.37' into for-2.6.38 (2010-11-29 18:33:47 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.38

Axel Lin (1):
      ASoC: Remove unused aic3x_i2c_init and aic3x_i2c_exit functions

Francois Mazard (1):
      ASoC: twl6040: Fix analog Mic L & R mux controls

Jorge Eduardo Candelaria (6):
      ASoC: sdp4430: Enable FM stereo pins
      ASoC: twl6040: Add jack support for headset and handset
      ASoC: sdp4430: Add Jack support
      ASoC: twl6040: Add headset and handset mux controls
      ASoC: twl6040: Clear interrupt status at boot time
      ASoC: twl6040: Increase timeout for power up

Margarita Olaya Cabrera (1):
      ASoC: twl6040: Add ramp up/down volume for HS and HF

Misael Lopez Cruz (2):
      ASoC: twl6040: Enable plug detection interrupts
      ASoC: twl6040: Use correct offset for LineInAmp Right

Olaya, Margarita (8):
      ASoC: twl6040: Update twl IO macro
      ASoC: twl6040: Modify the IRQ handler
      ASoC: twl6040: Restore bias level at resume
      ASoC: twl6040: Fix PCM error handling ops
      ASoC: twl6040: Support other sample rates.
      ASoC: twl6040: Enable automatic power for phoenix 1.1
      ASoC: twl6040: Fix TLV dB step values for gains
      ASoC: twl6040: Set default gains to minimun value

Peter Ujfalusi (12):
      ASoC: tlv320dac33: Do not enable the codec in init_chip
      ASoC: tlv320dac33: Avoid multiple soft power up
      ASoC: tpa6130a2: Simplify power state management
      ASoC: tpa6130a2: Defer SW enable from power enable
      ASoC: tpa6130a2: Use one event handler for PGA_E
      ASoC: tpa6130a2: Add stereo DAPM path
      ASoC: tpa6130a2: Replace DAPM code with direct interface
      ASoC: tlv320dac33: Rename outpup amplifier widget
      ASoC: tlv320dac33: Move DAC LR power on to a supply widget
      ASoC: tlv320dac33: Fix compillation error
      ASoC: tlv320dac33: Power down digital parts, when not needed
      ASoC: TWL4030: Fix 24bit support

 sound/soc/codecs/tlv320aic3x.c |   15 -
 sound/soc/codecs/tlv320dac33.c |   57 ++-
 sound/soc/codecs/tpa6130a2.c   |   92 +----
 sound/soc/codecs/tpa6130a2.h   |    1 +
 sound/soc/codecs/twl4030.c     |    5 +-
 sound/soc/codecs/twl6040.c     |  842 ++++++++++++++++++++++++++++++++++------
 sound/soc/codecs/twl6040.h     |    8 +
 sound/soc/omap/sdp4430.c       |   43 ++-
 8 files changed, 844 insertions(+), 219 deletions(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] ASoC updates for 2.6.38
  2010-12-17 13:55 Liam Girdwood
@ 2010-12-17 15:46 ` Takashi Iwai
  0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2010-12-17 15:46 UTC (permalink / raw)
  To: Liam Girdwood; +Cc: alsa-devel, Mark Brown

At Fri, 17 Dec 2010 13:55:12 +0000,
Liam Girdwood wrote:
> 
> 
> More updates for 2.6.38, mainly wrt TI CODECs.

Pulled now.  Thanks.


Takashi

> 
> Thanks
> 
> Liam
> 
> ---
> 
> 
> The following changes since commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0:
> 
>   Merge branch 'for-2.6.37' into for-2.6.38 (2010-11-29 18:33:47 +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.38
> 
> Axel Lin (1):
>       ASoC: Remove unused aic3x_i2c_init and aic3x_i2c_exit functions
> 
> Francois Mazard (1):
>       ASoC: twl6040: Fix analog Mic L & R mux controls
> 
> Jorge Eduardo Candelaria (6):
>       ASoC: sdp4430: Enable FM stereo pins
>       ASoC: twl6040: Add jack support for headset and handset
>       ASoC: sdp4430: Add Jack support
>       ASoC: twl6040: Add headset and handset mux controls
>       ASoC: twl6040: Clear interrupt status at boot time
>       ASoC: twl6040: Increase timeout for power up
> 
> Margarita Olaya Cabrera (1):
>       ASoC: twl6040: Add ramp up/down volume for HS and HF
> 
> Misael Lopez Cruz (2):
>       ASoC: twl6040: Enable plug detection interrupts
>       ASoC: twl6040: Use correct offset for LineInAmp Right
> 
> Olaya, Margarita (8):
>       ASoC: twl6040: Update twl IO macro
>       ASoC: twl6040: Modify the IRQ handler
>       ASoC: twl6040: Restore bias level at resume
>       ASoC: twl6040: Fix PCM error handling ops
>       ASoC: twl6040: Support other sample rates.
>       ASoC: twl6040: Enable automatic power for phoenix 1.1
>       ASoC: twl6040: Fix TLV dB step values for gains
>       ASoC: twl6040: Set default gains to minimun value
> 
> Peter Ujfalusi (12):
>       ASoC: tlv320dac33: Do not enable the codec in init_chip
>       ASoC: tlv320dac33: Avoid multiple soft power up
>       ASoC: tpa6130a2: Simplify power state management
>       ASoC: tpa6130a2: Defer SW enable from power enable
>       ASoC: tpa6130a2: Use one event handler for PGA_E
>       ASoC: tpa6130a2: Add stereo DAPM path
>       ASoC: tpa6130a2: Replace DAPM code with direct interface
>       ASoC: tlv320dac33: Rename outpup amplifier widget
>       ASoC: tlv320dac33: Move DAC LR power on to a supply widget
>       ASoC: tlv320dac33: Fix compillation error
>       ASoC: tlv320dac33: Power down digital parts, when not needed
>       ASoC: TWL4030: Fix 24bit support
> 
>  sound/soc/codecs/tlv320aic3x.c |   15 -
>  sound/soc/codecs/tlv320dac33.c |   57 ++-
>  sound/soc/codecs/tpa6130a2.c   |   92 +----
>  sound/soc/codecs/tpa6130a2.h   |    1 +
>  sound/soc/codecs/twl4030.c     |    5 +-
>  sound/soc/codecs/twl6040.c     |  842 ++++++++++++++++++++++++++++++++++------
>  sound/soc/codecs/twl6040.h     |    8 +
>  sound/soc/omap/sdp4430.c       |   43 ++-
>  8 files changed, 844 insertions(+), 219 deletions(-)
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-12-17 15:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-23 11:06 [GIT PULL] ASoC updates for 2.6.38 Liam Girdwood
2010-11-23 11:59 ` Takashi Iwai
  -- strict thread matches above, loose matches on Subject: below --
2010-12-17 13:55 Liam Girdwood
2010-12-17 15:46 ` Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.