Skip to contentSkip to conversation

ASoC updates for v3.16

DISCUSSION Mark Brown 2 participants 6 messages Jun 17, 2014

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:

Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.16-rc1

for you to fetch changes up to 28e48f0e262fd94a613613d06ac5eaf6745b18a8:

Merge remote-tracking branches 'asoc/fix/fsl-dma', 'asoc/fix/fsl-spdif', 'asoc/fix/pxa', 'asoc/fix/rcar' and 'asoc/fix/sigmadsp' into asoc-linus (2014-06-16 16:05:16 +0100)

----------------------------------------------------------------

ASoC: Fixes for v3.16

Quite a few build coverage fixes in here among the usual small driver fixes includling the sigmadsp change from Lars - moving the driver to separate modules per bus (which is basically just code motion) avoids issues with some combinations of buses being enabled.

----------------------------------------------------------------

Anssi Hannula (1):
ASoC: fsl_spdif: Fix integer overflow when calculating divisors

Arnd Bergmann (2):
ASoC: pxa: add I2C dependencies as needed
ASoC: MMP audio needs sram support

Guenter Roeck (1):
ASoC: fsl: Fix build problem

Jarkko Nikula (1):
ASoC: dapm: Make sure register value is in sync with DAPM kcontrol state

Kuninori Morimoto (1):
ASoC: rsnd: fixup index of src/dst mod when capture

Lars-Peter Clausen (1):
ASoC: sigmadsp: Split regmap and I2C support into separate modules

Mark Brown (2):
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Merge remote-tracking branches 'asoc/fix/fsl-dma', 'asoc/fix/fsl-spdif', 'asoc/fix/pxa', 'asoc/fix/rcar' and 'asoc/fix/sigmadsp' into asoc-linus

Nicolin Chen (1):
ASoC: fsl_spdif: Fix incorrect usage of regmap_read()

 sound/soc/codecs/Kconfig           | 12 +++++--
 sound/soc/codecs/Makefile          |  4 +++
 sound/soc/codecs/sigmadsp-i2c.c    | 35 ++++++++++++++++++++
 sound/soc/codecs/sigmadsp-regmap.c | 36 +++++++++++++++++++++
 sound/soc/codecs/sigmadsp.c        | 65 ++------------------------------------
 sound/soc/codecs/sigmadsp.h        | 20 ++++++++++++
 sound/soc/fsl/fsl_dma.c            |  4 +--
 sound/soc/fsl/fsl_spdif.c          |  6 ++--
 sound/soc/pxa/Kconfig              | 11 ++++---
 sound/soc/sh/rcar/core.c           |  2 +-
 sound/soc/soc-dapm.c               | 29 +++++++++--------
 11 files changed, 135 insertions(+), 89 deletions(-)
 create mode 100644 sound/soc/codecs/sigmadsp-i2c.c
 create mode 100644 sound/soc/codecs/sigmadsp-regmap.c
#1 lore raw

At Tue, 17 Jun 2014 12:07:25 +0100,

Quoted 13 lines · Mark Brown

The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:

Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.16-rc1

for you to fetch changes up to 28e48f0e262fd94a613613d06ac5eaf6745b18a8:

Merge remote-tracking branches 'asoc/fix/fsl-dma', 'asoc/fix/fsl-spdif', 'asoc/fix/pxa', 'asoc/fix/rcar' and 'asoc/fix/sigmadsp' into asoc-linus (2014-06-16 16:05:16 +0100)

Quoted 8 lines

----------------------------------------------------------------

ASoC: Fixes for v3.16

Quite a few build coverage fixes in here among the usual small driver fixes includling the sigmadsp change from Lars - moving the driver to separate modules per bus (which is basically just code motion) avoids issues with some combinations of buses being enabled.

The commit log of 5ab0862e5df9 looks strange. Could you fix it?

Takashi

Quoted 43 lines

----------------------------------------------------------------

Anssi Hannula (1):
ASoC: fsl_spdif: Fix integer overflow when calculating divisors

Arnd Bergmann (2):
ASoC: pxa: add I2C dependencies as needed
ASoC: MMP audio needs sram support

Guenter Roeck (1):
ASoC: fsl: Fix build problem

Jarkko Nikula (1):
ASoC: dapm: Make sure register value is in sync with DAPM kcontrol state

Kuninori Morimoto (1):
ASoC: rsnd: fixup index of src/dst mod when capture

Lars-Peter Clausen (1):
ASoC: sigmadsp: Split regmap and I2C support into separate modules

Mark Brown (2):
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Merge remote-tracking branches 'asoc/fix/fsl-dma', 'asoc/fix/fsl-spdif', 'asoc/fix/pxa', 'asoc/fix/rcar' and 'asoc/fix/sigmadsp' into asoc-linus

Nicolin Chen (1):
ASoC: fsl_spdif: Fix incorrect usage of regmap_read()

 sound/soc/codecs/Kconfig           | 12 +++++--
 sound/soc/codecs/Makefile          |  4 +++
 sound/soc/codecs/sigmadsp-i2c.c    | 35 ++++++++++++++++++++
 sound/soc/codecs/sigmadsp-regmap.c | 36 +++++++++++++++++++++
 sound/soc/codecs/sigmadsp.c        | 65 ++------------------------------------
 sound/soc/codecs/sigmadsp.h        | 20 ++++++++++++
 sound/soc/fsl/fsl_dma.c            |  4 +--
 sound/soc/fsl/fsl_spdif.c          |  6 ++--
 sound/soc/pxa/Kconfig              | 11 ++++---
 sound/soc/sh/rcar/core.c           |  2 +-
 sound/soc/soc-dapm.c               | 29 +++++++++--------
 11 files changed, 135 insertions(+), 89 deletions(-)
 create mode 100644 sound/soc/codecs/sigmadsp-i2c.c
 create mode 100644 sound/soc/codecs/sigmadsp-regmap.c
author
#2 lore raw
Quoted 1 line · Takashi Iwai

The commit log of 5ab0862e5df9 looks strange. Could you fix it?

OK, but it'll have to be later this week since I applied a bunch more things since and I'd be much more comfortable if they'd been in -next for at least one day before sending them on.

#3 lore raw

At Tue, 17 Jun 2014 15:54:27 +0100,

Quoted 8 lines · Mark Brown
Quoted 1 line · Takashi Iwai

The commit log of 5ab0862e5df9 looks strange. Could you fix it?

OK, but it'll have to be later this week since I applied a bunch more things since and I'd be much more comfortable if they'd been in -next for at least one day before sending them on.

OK, if you've already applied on top of it, I don't mind to pull as is. Although it doesn't look good, it's easy enough to judge that it's a simple git am error. I just hoped that it were still the top most on the branch and easy to rebase.

Takashi

author
#4 lore raw
Quoted 4 lines · Takashi Iwai

OK, if you've already applied on top of it, I don't mind to pull as is. Although it doesn't look good, it's easy enough to judge that it's a simple git am error. I just hoped that it were still the top most on the branch and easy to rebase.

It's easy to replace that one branch (I did an update already) but the thing I send to you is an automatic merge of that and all my other fixes branches and there's some new fixes branches, I'll either need to redo everything by hand or wait for at least tomorrow.

#5 lore raw

At Tue, 17 Jun 2014 16:04:57 +0100,

Quoted 8 lines · Mark Brown
Quoted 4 lines · Takashi Iwai

OK, if you've already applied on top of it, I don't mind to pull as is. Although it doesn't look good, it's easy enough to judge that it's a simple git am error. I just hoped that it were still the top most on the branch and easy to rebase.

Quoted 4 lines

It's easy to replace that one branch (I did an update already) but the thing I send to you is an automatic merge of that and all my other fixes branches and there's some new fixes branches, I'll either need to redo everything by hand or wait for at least tomorrow.

I don't mind either way. I'll be still available tomorrow, but maybe absent from Thursday to the next week. So, if any, please resend a pull request in tomorrow so that I can wrap up and pass it to Linus for rc2.

Takashi