Skip to contentSkip to conversation

ASoC updates for 3.6

DISCUSSION Mark Brown 2 participants 6 messages Aug 2, 2012 – Aug 4, 2012

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

The following changes since commit 15d47763b354256053c390a9b7bc9f2b4f197711:

Merge branch 'for-3.5' into for-3.6 (2012-07-23 10:45:07 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.6

for you to fetch changes up to 98d3088e534a2a61f6690b5426909b0c3b57a785:

ASoC: core: Fix check before defaulting to regmap (2012-08-02 11:43:45 +0100)

(this is a new subkey on my key which I just realised I didn't upload to the server - will do that on Monday.)

----------------------------------------------------------------
ASoC: Additional updates for 3.6

A few updates for issues discovered during the merge window, the main one being the fix for the issues with defaulting to use of regmap without properly checking if there was I/O in place already.

----------------------------------------------------------------
Dong Aisheng (4):
ASoC: mxs-saif: fix clock prepare and enable unbalance issue
ASoC: mxs-saif: set a base clock rate for EXTMASTER mode work
ASoC: sgtl5000: remove unneeded snd_soc_dapm_new_widgets in probe
ASoC: sgtl5000: enable VAG_POWER for LINE_IN

Fabio Estevam (1):

      ASoC: mc13783: Provide codec->control_data

Guillaume Gardet (1):
ASoC: omap: Add missing modules aliases to get sound working on omap devices

Lee Jones (2):
ASoC: ux500: Include the correct header files
ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements

Manuel Lauss (1):
ASoC: AC97 doesn't use regmap by default

Mark Brown (4):
ASoC: wm8994: Ensure there are enough BCLKs for four channels
ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs
ASoC: wm8962: Allow VMID time to fully ramp
ASoC: core: Fix check before defaulting to regmap

Roland Stigge (2):
sound: tegra_wm8903: Adjust to of_get_named_gpio() change
sound: tegra_alc5632: Adjust to of_get_named_gpio() change

 sound/soc/codecs/ab8500-codec.c |    4 ++++
 sound/soc/codecs/ad1980.c       |    1 +
 sound/soc/codecs/mc13783.c      |    2 ++
 sound/soc/codecs/sgtl5000.c     |    3 +--
 sound/soc/codecs/stac9766.c     |    1 +
 sound/soc/codecs/wm8962.c       |    3 +++
 sound/soc/codecs/wm8994.c       |   15 ++++++++++++++-
 sound/soc/codecs/wm9712.c       |    1 +
 sound/soc/codecs/wm9713.c       |    1 +
 sound/soc/mxs/mxs-saif.c        |   24 ++++++++++++++++++++++++
 sound/soc/omap/omap-mcbsp.c     |    1 +
 sound/soc/omap/omap-pcm.c       |    1 +
 sound/soc/soc-core.c            |    2 +-
 sound/soc/tegra/tegra_alc5632.c |    2 +-
 sound/soc/tegra/tegra_wm8903.c  |   10 +++++-----
 sound/soc/ux500/ux500_msp_dai.c |    2 +-
 sound/soc/ux500/ux500_msp_i2s.c |    2 +-
 sound/soc/ux500/ux500_msp_i2s.h |    2 +-
 18 files changed, 64 insertions(+), 13 deletions(-)
#1 lore raw

At Thu, 2 Aug 2012 17:02:12 +0100,

Quoted 8 lines · Mark Brown

The following changes since commit 15d47763b354256053c390a9b7bc9f2b4f197711:

Merge branch 'for-3.5' into for-3.6 (2012-07-23 10:45:07 +0100)

are available in the git repository at:

Quoted 8 lines

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.6

for you to fetch changes up to 98d3088e534a2a61f6690b5426909b0c3b57a785:

ASoC: core: Fix check before defaulting to regmap (2012-08-02 11:43:45 +0100)

(this is a new subkey on my key which I just realised I didn't upload to the server - will do that on Monday.)

OK, I assume you are real Mark. Pulled now.

thanks,

Takashi

Quoted 57 lines

----------------------------------------------------------------
ASoC: Additional updates for 3.6

A few updates for issues discovered during the merge window, the main one being the fix for the issues with defaulting to use of regmap without properly checking if there was I/O in place already.

----------------------------------------------------------------
Dong Aisheng (4):
ASoC: mxs-saif: fix clock prepare and enable unbalance issue
ASoC: mxs-saif: set a base clock rate for EXTMASTER mode work
ASoC: sgtl5000: remove unneeded snd_soc_dapm_new_widgets in probe
ASoC: sgtl5000: enable VAG_POWER for LINE_IN

Fabio Estevam (1):

      ASoC: mc13783: Provide codec->control_data

Guillaume Gardet (1):
ASoC: omap: Add missing modules aliases to get sound working on omap devices

Lee Jones (2):
ASoC: ux500: Include the correct header files
ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements

Manuel Lauss (1):
ASoC: AC97 doesn't use regmap by default

Mark Brown (4):
ASoC: wm8994: Ensure there are enough BCLKs for four channels
ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs
ASoC: wm8962: Allow VMID time to fully ramp
ASoC: core: Fix check before defaulting to regmap

Roland Stigge (2):
sound: tegra_wm8903: Adjust to of_get_named_gpio() change
sound: tegra_alc5632: Adjust to of_get_named_gpio() change

 sound/soc/codecs/ab8500-codec.c |    4 ++++
 sound/soc/codecs/ad1980.c       |    1 +
 sound/soc/codecs/mc13783.c      |    2 ++
 sound/soc/codecs/sgtl5000.c     |    3 +--
 sound/soc/codecs/stac9766.c     |    1 +
 sound/soc/codecs/wm8962.c       |    3 +++
 sound/soc/codecs/wm8994.c       |   15 ++++++++++++++-
 sound/soc/codecs/wm9712.c       |    1 +
 sound/soc/codecs/wm9713.c       |    1 +
 sound/soc/mxs/mxs-saif.c        |   24 ++++++++++++++++++++++++
 sound/soc/omap/omap-mcbsp.c     |    1 +
 sound/soc/omap/omap-pcm.c       |    1 +
 sound/soc/soc-core.c            |    2 +-
 sound/soc/tegra/tegra_alc5632.c |    2 +-
 sound/soc/tegra/tegra_wm8903.c  |   10 +++++-----
 sound/soc/ux500/ux500_msp_dai.c |    2 +-
 sound/soc/ux500/ux500_msp_i2s.c |    2 +-
 sound/soc/ux500/ux500_msp_i2s.h |    2 +-
 18 files changed, 64 insertions(+), 13 deletions(-)
#2 lore raw

At Thu, 02 Aug 2012 18:15:06 +0200,

Quoted 13 lines · Takashi Iwai

At Thu, 2 Aug 2012 17:02:12 +0100,

Quoted 10 lines · Mark Brown

The following changes since commit 15d47763b354256053c390a9b7bc9f2b4f197711:

Merge branch 'for-3.5' into for-3.6 (2012-07-23 10:45:07 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.6

Quoted 8 lines
Quoted 6 lines

for you to fetch changes up to 98d3088e534a2a61f6690b5426909b0c3b57a785:

ASoC: core: Fix check before defaulting to regmap (2012-08-02 11:43:45 +0100)

(this is a new subkey on my key which I just realised I didn't upload to the server - will do that on Monday.)

OK, I assume you are real Mark. Pulled now.

BTW, your fix commit 98d3088e534a2a6 obsoletes the "fixes" for setting bogus value to codec->control_data, right?
I see three such commits:
d0e3cce9144eb8bff0852531aadbe221addaa2d5 58f598ff0bb0c030e026a0738450c6a46248f6a8 e13ab2aac7a273a890d18bb482849610be178bc5

But, it's harmless, so I'm going to send a pull request tomorrow as is if the build tests pass.

Takashi

Quoted 64 lines

thanks,

Takashi

Quoted 57 lines

----------------------------------------------------------------
ASoC: Additional updates for 3.6

A few updates for issues discovered during the merge window, the main one being the fix for the issues with defaulting to use of regmap without properly checking if there was I/O in place already.

----------------------------------------------------------------
Dong Aisheng (4):
ASoC: mxs-saif: fix clock prepare and enable unbalance issue
ASoC: mxs-saif: set a base clock rate for EXTMASTER mode work
ASoC: sgtl5000: remove unneeded snd_soc_dapm_new_widgets in probe
ASoC: sgtl5000: enable VAG_POWER for LINE_IN

Fabio Estevam (1):

      ASoC: mc13783: Provide codec->control_data

Guillaume Gardet (1):
ASoC: omap: Add missing modules aliases to get sound working on omap devices

Lee Jones (2):
ASoC: ux500: Include the correct header files
ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements

Manuel Lauss (1):
ASoC: AC97 doesn't use regmap by default

Mark Brown (4):
ASoC: wm8994: Ensure there are enough BCLKs for four channels
ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs
ASoC: wm8962: Allow VMID time to fully ramp
ASoC: core: Fix check before defaulting to regmap

Roland Stigge (2):
sound: tegra_wm8903: Adjust to of_get_named_gpio() change
sound: tegra_alc5632: Adjust to of_get_named_gpio() change

 sound/soc/codecs/ab8500-codec.c |    4 ++++
 sound/soc/codecs/ad1980.c       |    1 +
 sound/soc/codecs/mc13783.c      |    2 ++
 sound/soc/codecs/sgtl5000.c     |    3 +--
 sound/soc/codecs/stac9766.c     |    1 +
 sound/soc/codecs/wm8962.c       |    3 +++
 sound/soc/codecs/wm8994.c       |   15 ++++++++++++++-
 sound/soc/codecs/wm9712.c       |    1 +
 sound/soc/codecs/wm9713.c       |    1 +
 sound/soc/mxs/mxs-saif.c        |   24 ++++++++++++++++++++++++
 sound/soc/omap/omap-mcbsp.c     |    1 +
 sound/soc/omap/omap-pcm.c       |    1 +
 sound/soc/soc-core.c            |    2 +-
 sound/soc/tegra/tegra_alc5632.c |    2 +-
 sound/soc/tegra/tegra_wm8903.c  |   10 +++++-----
 sound/soc/ux500/ux500_msp_dai.c |    2 +-
 sound/soc/ux500/ux500_msp_i2s.c |    2 +-
 sound/soc/ux500/ux500_msp_i2s.h |    2 +-
 18 files changed, 64 insertions(+), 13 deletions(-)
author
#3 lore raw
Quoted 7 lines · Takashi Iwai

BTW, your fix commit 98d3088e534a2a6 obsoletes the "fixes" for setting bogus value to codec->control_data, right?

I see three such commits:
d0e3cce9144eb8bff0852531aadbe221addaa2d5
58f598ff0bb0c030e026a0738450c6a46248f6a8
e13ab2aac7a273a890d18bb482849610be178bc5

I remember those commit IDs well but I think you were thinking of some others. :P I'm going to revert them for 3.7 but didn't want to rebase them right now.

#4 lore raw

At Thu, 2 Aug 2012 18:58:08 +0100,

Quoted 6 lines · Mark Brown
Quoted 2 lines · Takashi Iwai

BTW, your fix commit 98d3088e534a2a6 obsoletes the "fixes" for setting bogus value to codec->control_data, right?

Quoted 8 lines
Quoted 4 lines

I see three such commits:
d0e3cce9144eb8bff0852531aadbe221addaa2d5
58f598ff0bb0c030e026a0738450c6a46248f6a8
e13ab2aac7a273a890d18bb482849610be178bc5

I remember those commit IDs well but I think you were thinking of some others. :P I'm going to revert them for 3.7 but didn't want to rebase them right now.

Oh no, I don't want to rebase them, too. I just have expected that you'll revert these changes in 3.6-rc2. But 3.7 is also fine, too.

Takashi

author
#5 lore raw
Quoted 8 lines · Takashi Iwai
Quoted 3 lines · Mark Brown

I remember those commit IDs well but I think you were thinking of some others. :P I'm going to revert them for 3.7 but didn't want to rebase them right now.

Oh no, I don't want to rebase them, too. I just have expected that you'll revert these changes in 3.6-rc2. But 3.7 is also fine, too.

I was contemplating just rebasing them out before I pushed my patch but ended up not doing that.