November 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 2/2] Improve hw_params documentation
by Andrew Eikum 23 Nov '11

23 Nov '11

--- include/pcm.h | 14 +++++++++++++- src/pcm/pcm.c | 10 +++++++++- 2 files changed, 22 insertions(+), 2 deletions(-)

3 10

[alsa-devel] [PATCH v2] ALSA: ASoC: cs4720: use snd_soc_cache_sync()
by Daniel Mack 23 Nov '11

23 Nov '11

Replace the manual register restore mechanism in cs4270.c and call the generic snd_soc_cache_sync() handler instead. This factors code out in favour of core facilities and also fixes a bus confusion that is most probably caused by intermixing i2c-regmap functions and i2c_smbus_* accessors. Signed-off-by: Daniel Mack <zonque(a)gmail.com> Reported-and-tested-by: Sven Neumann <s.neumann(a)raumfeld.com> --- sound/soc/codecs/cs4270.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index f1f237e..73f46eb 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -601,7 +601,6 @@ static int cs4270_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg) static int cs4270_soc_resume(struct snd_soc_codec *codec) { struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c_client = to_i2c_client(codec->dev); int reg; regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies), @@ -612,14 +611,7 @@ static int cs4270_soc_resume(struct snd_soc_codec *codec) ndelay(500); /* first restore the entire register cache ... */ - for (reg = CS4270_FIRSTREG; reg <= CS4270_LASTREG; reg++) { - u8 val = snd_soc_read(codec, reg); - - if (i2c_smbus_write_byte_data(i2c_client, reg, val)) { - dev_err(codec->dev, "i2c write failed\n"); - return -EIO; - } - } + snd_soc_cache_sync(codec); /* ... then disable the power-down bits */ reg = snd_soc_read(codec, CS4270_PWRCTL); -- 1.7.7.3

3 2

Re: [alsa-devel] [GIT PULL] ARM: amba: Enable module alias autogeneration for AMBA drivers
by Greg KH 22 Nov '11

22 Nov '11

On Tue, Nov 22, 2011 at 12:56:32PM +0100, Alessandro Rubini wrote: > > I have Acks on some of the driver patches and no comments on the > > rest. I've been circulating these for some time, so if you're > > happy to pull those driver patches via your tree, please go ahead. > > Sure I have no problem with the nomadik-rng.c, (so please have my > Acked-by: -- sorry for not noting it earlier) but I think this > file2alias thing needs a serious rework to split each bus in a > different file, using ELF sections like we do elsewhere. > > I posted a patch last week but I got no comment at all. Maybe this > is the time to ask for comments? I can rebase and repost if needed. > > lkml.org/lkml/2011/11/4/125 (0/2: description of the work) > lkml.org/lkml/2011/11/4/126 (1/2: turn the if plethora to table lookup) > lkml.org/lkml/2011/11/4/127 (2/2: partial split to type-specific files). Ah, I missed that, yes, this would be a good thing to have, we've been wanting it for _years_. greg k-h

1 0

[alsa-devel] ASoC updates for 3.3
by Mark Brown 22 Nov '11

22 Nov '11

The following changes since commit e94de1e864d2d205e4e503b0f083c07f288b45fe: ASoC: Avoid a redundant read in cs42l51_pdn_event (2011-11-08 11:02:31 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-3.3 A couple of new drivers here, plus some conversions of drivers to use regmap directly (saving some object size and letting us talk to the chips before the card is probed) and removal of the LZO cache type. Andrey Danin (1): ASoC: alc5632: rename volume/switch contols for master and speaker volumes. Axel Lin (8): ASoC: wm9081: Fix reading wrong register for setting VMID 2*240k ASoC: wm9081: Don't write WM9081_BIAS_ENA bit to WM9081_VMID_CONTROL register ASoC: wm9081: Use snd_soc_update_bits for read-modify-write ASoC: Remove unused control_data and mutex fields from struct alc5632_priv ASoC: cs4271: Fix wrong mask parameter in some snd_soc_update_bits calls ASoC: cs42l73: Return proper error code if device id mismatch ASoC: cs42l73: Show correct revision id ASoC: Remove redundant regcache_sync call in cs42l73_resume Brian Austin (1): ASoC: Add support for CS42L73 codec Clemens Ladisch (7): ASoC: adau1373: fix DB_RANGE size ASoC: rt5631: fix DB_RANGE size ASoC: sgtl5000: fix DB_RANGE size ASoC: wm8962: fix DB_RANGE size ASoC: wm8993: fix DB_RANGE size ASoC: wm9090: fix DB_RANGE size ASoC: wm_hubs: fix DB_RANGE size Jassi Brar (1): MAINTAINERS: Drop inactive Samsung ASoC maintainer Johannes Stezenbach (3): ASoC: sta32x: preserve coefficient RAM ASoC: sta32x: add platform data definition ASoC: sta32x: add workaround for ESD reset issue Kuninori Morimoto (5): ASoC: ak4642: add ak4642_set_bias_level() ASoC: ak4642: add DAPM support for HeadPhone Output ASoC: ak4642: add headphone mute switch control ASoC: ak4642: add Line out support ASoC: ak4642: add ak4648 support Leon Romanovsky (9): ASoC: Add new Realtek ALC5632 CODEC driver ASoC: Remove unused defines in alc5632 codec ASoC: Remove unnecessary backslash from alc5632 codec ASoC: alc5632: Fix compile without CONFIG_PM ASoC: Convert ALC5632 codec to use regmap API ASoC: alc5632: Remove unrelevant registers and name the relevant ASoC: alc5632: Added support of two undocumented registers ASoC: alc5632: Update of i2c_probe function to use regmap API only ASoC: alc5632: Remove volatile registers from regmap defaults Mark Brown (34): regmap: Track if the register cache is dirty and suppress unneeded syncs Merge branch 'topic/cache' of git://opensource.wolfsonmicro.com/regmap into for-3.3 ASoC: Convert WM8996 to direct regmap API usage ASoC: Move most WM8996 resource acquisition to I2C probe ASoC: Convert WM8996 gpiolib to regmap ASoC: Convert WM8962 to direct regmap usage ASoC: Convert wm5100 to direct regmap API usage ASoC: Convert WM9081 to direct regmap API usage Merge branch 'for-3.2' into for-3.3 ASoC: Disable debounce on some WM8962 interrupts ASoC: Convert wm8971 MICBIAS to a supply widget ASoC: Need to convert wm5100 cache sync to direct regmap usage too ASoC: Mark WM5100 MISC CONTROL as readable ASoC: Move most WM5100 resource allocation to I2C probe ASoC: Add Lowland machine driver ASoC: Convert WM5100 gpiolib support to direct regmap API usage ASoC: Fix duplicate const warnings in da7210.c ASoC: Remove extra space in runtime struct definition Merge branch 'for-3.2' into for-3.3 ASoC: Remove LZO cache type ASoC: Move WM5100 platform data based setup into I2C probe ASoC: Convert WM8995 to direct regmap usage Merge branch 'for-3.2' into for-3.3 ASoC: Say how long short WM8958 DSP2 firmwares are Merge branch 'for-3.2' into for-3.3 devicetree: Document Wolfson prefix Merge branch 'DB_RANGE-size-fixes' of git://git.alsa-project.org/alsa-kprivate into for-3.2 Merge branch 'for-3.2' into for-3.3 ASoC: Ensure WM8731 register cache is synced when resuming from disabled ASoC: Use table based init for wm8731_snd_controls Merge branch 'for-3.2' into for-3.3 ASoC: Convert WM8753 to table based DAPM and control init ASoC: Remove WM5100 DSP memory windows from register default data ASoC: Remove conditional I2C usage from tlv320aic3x driver Timo Juhani Lindfors (1): ASoC: wm8753: Skip noop reconfiguration of DAI mode Timur Tabi (1): ASoC: fsl_ssi: properly initialize the sysfs attribute object .../devicetree/bindings/vendor-prefixes.txt | 1 + MAINTAINERS | 1 - drivers/base/regmap/internal.h | 1 + drivers/base/regmap/regcache.c | 19 + drivers/base/regmap/regmap.c | 4 +- include/linux/regmap.h | 1 + include/sound/soc.h | 3 +- include/sound/sta32x.h | 35 + sound/soc/Kconfig | 15 - sound/soc/codecs/Kconfig | 7 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/adau1373.c | 2 +- sound/soc/codecs/ak4642.c | 133 ++- sound/soc/codecs/alc5632.c | 1159 ++++++++++++++ sound/soc/codecs/alc5632.h | 251 +++ sound/soc/codecs/cs4271.c | 8 +- sound/soc/codecs/cs42l73.c | 1454 ++++++++++++++++++ sound/soc/codecs/cs42l73.h | 227 +++ sound/soc/codecs/da7210.c | 4 +- sound/soc/codecs/rt5631.c | 2 +- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sta32x.c | 143 ++- sound/soc/codecs/sta32x.h | 1 + sound/soc/codecs/tlv320aic3x.c | 6 - sound/soc/codecs/wm5100-tables.c | 1489 ++++++++---------- sound/soc/codecs/wm5100.c | 400 +++--- sound/soc/codecs/wm5100.h | 7 +- sound/soc/codecs/wm8731.c | 6 +- sound/soc/codecs/wm8753.c | 27 +- sound/soc/codecs/wm8958-dsp2.c | 3 +- sound/soc/codecs/wm8962.c | 1603 ++++++++++---------- sound/soc/codecs/wm8971.c | 2 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm8995.c | 717 ++++++++-- sound/soc/codecs/wm8996.c | 912 ++++++----- sound/soc/codecs/wm9081.c | 363 +++-- sound/soc/codecs/wm9090.c | 6 +- sound/soc/codecs/wm_hubs.c | 2 +- sound/soc/fsl/fsl_ssi.c | 1 + sound/soc/samsung/Kconfig | 7 + sound/soc/samsung/Makefile | 2 + sound/soc/samsung/lowland.c | 246 +++ sound/soc/soc-cache.c | 384 ----- 43 files changed, 6708 insertions(+), 2954 deletions(-) create mode 100644 include/sound/sta32x.h create mode 100644 sound/soc/codecs/alc5632.c create mode 100644 sound/soc/codecs/alc5632.h create mode 100644 sound/soc/codecs/cs42l73.c create mode 100644 sound/soc/codecs/cs42l73.h create mode 100644 sound/soc/samsung/lowland.c

2 1

[alsa-devel] ASoC updates for 3.2
by Mark Brown 22 Nov '11

22 Nov '11

The following changes since commit 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad: Merge branch 'for-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.2 (2011-11-08 10:37:41 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-3.2 The sta32x fix is fairly large but is needed for suspend and resume and the driver is new in 3.2 with the only user being the board maintained by the patch submitter so reasonably low risk. Nothing else too exciting here - small, per-driver fixes for fairly obvious things. Axel Lin (3): ASoC: wm9081: Fix reading wrong register for setting VMID 2*240k ASoC: wm9081: Don't write WM9081_BIAS_ENA bit to WM9081_VMID_CONTROL register ASoC: cs4271: Fix wrong mask parameter in some snd_soc_update_bits calls Clemens Ladisch (7): ASoC: adau1373: fix DB_RANGE size ASoC: rt5631: fix DB_RANGE size ASoC: sgtl5000: fix DB_RANGE size ASoC: wm8962: fix DB_RANGE size ASoC: wm8993: fix DB_RANGE size ASoC: wm9090: fix DB_RANGE size ASoC: wm_hubs: fix DB_RANGE size Jassi Brar (1): MAINTAINERS: Drop inactive Samsung ASoC maintainer Johannes Stezenbach (1): ASoC: sta32x: preserve coefficient RAM Mark Brown (2): Merge branch 'DB_RANGE-size-fixes' of git://git.alsa-project.org/alsa-kprivate into for-3.2 ASoC: Ensure WM8731 register cache is synced when resuming from disabled Timo Juhani Lindfors (1): ASoC: wm8753: Skip noop reconfiguration of DAI mode Timur Tabi (1): ASoC: fsl_ssi: properly initialize the sysfs attribute object MAINTAINERS | 1 - sound/soc/codecs/adau1373.c | 2 +- sound/soc/codecs/cs4271.c | 8 +++-- sound/soc/codecs/rt5631.c | 2 +- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sta32x.c | 63 ++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/sta32x.h | 1 + sound/soc/codecs/wm8731.c | 1 + sound/soc/codecs/wm8753.c | 3 ++ sound/soc/codecs/wm8962.c | 4 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm9081.c | 10 +++--- sound/soc/codecs/wm9090.c | 6 ++-- sound/soc/codecs/wm_hubs.c | 2 +- sound/soc/fsl/fsl_ssi.c | 1 + 15 files changed, 88 insertions(+), 20 deletions(-)

2 1

[alsa-devel] Recent Alsa, 100% CPU with mixer
by Alan Horstmann 22 Nov '11

22 Nov '11

Hi, It's evidently been too long since I built and tested a recent Alsa on machines here. Having got 1.0.24 to load I am seeing a number of issues, which I am trying to separate, with some difficulty. Thus I have also built several previous versions for comparison. Alsa-1.0.20 seems to be fine as far as I have been able to test. Alsa-1.0.22 is OK, running ice1712 and au8820 modules, except that the alsamixer ice1712 ADC and DAC controls will go down to a negative number and then cannot be raised again. Using envy24control the ranges just show as 0-127 (eg DACs) and can raise them back up. So there's a bug but it can be worked around to get working sound. With 1.0.23 and 1.0.24 the driver also loads and works. But running any version of alsamixer causes 100% CPU, although the mixer is itself able to function and shows the same bug as 1.0.22. There are no console messages. And envy24control does not load properly, stalling before creating it's mixer window. Thus it is not possible to raise the volumes and get any sound from the ice1712 card. The au8820 does function, in-spite of the 100%CPU, and the volumes can be raised with alsamixer and sound played OK. So it is possible that without the alsamixer levels bug the ice1712 would also play sound? The 100% CPU behaviour is the most tricky to start with. Can you give any suggestions to identify the cause? This is the 2.4.21-99 kernel. Running with strace, I was able to catch this output on the konsole, in case it indicates anything:- select(1, [0], NULL, NULL, {0, 0}) = 0 (Timeout) gettimeofday({1321980134, 190869}, NULL) = 0 rt_sigaction(SIGTSTP, {SIG_IGN}, {0x401768f0, [], SA_RESTORER|SA_RESTART, 0x401e5aa8}, 8) = 0 select(1, [0], NULL, NULL, {0, 0}) = 0 (Timeout) select(1, [0], NULL, NULL, {0, 0}) = 0 (Timeout) rt_sigaction(SIGTSTP,0x401768f0, [], SA_RESTORER|SA_RESTART, 0x401e5aa8}, NULL, 8) = 0 poll([{fd=0, events=POLLIN}, {fd=3, events=POLLIN|POLLERR|POLLNVAL, revents=POLLIN}], 2, -1) = 1 read(3, 0xbffff130, 72) = -1 EAGAIN (Resource temporarily unavailable) gettimeofday({1321980134, 192090}, NULL) = 0 select(1, [0], NULL, NULL, {0, 0}) = 0 (Timeout) gettimeofday({1321980134, 192404}, NULL) = 0 rt_sigaction(SIGTSTP, {SIG_IGN}, {0x401768f0, [], SA_RESTORER|SA_RESTART, 0x401e5aa8}, 8) = 0 select(1, [0], NULL, NULL, {0, 0}) = 0 (Timeout) select(1, [0], NULL, NULL, {0, 0}) = 0 (Timeout) rt_sigaction(SIGTSTP, {0x401768f0, [], SA_RESTORER|SA_RESTART, 0x401e5aa8}, NULL, 8) = 0 Thanks, Alan

1 0

[alsa-devel] MAYA44 USB audio device no inputs control
by Kamil Sobolak 22 Nov '11

22 Nov '11

Hi! In our Youth Polish Radio we are using MAYA44 USB sound device, with JACK and Internet DJ Console (IDJC) to make lives show. On PC is Ubuntu 11.04 with alsa v1.0.24 and alsamixer but ther is no input control. > ALSA: ice1724 - Fix ESI Maya44 capture source control But this doesn't work. Now after contact with Takashi Iwai I know this entry is for PCI sound card version not USB. I have no more idea how to fix it, I have tried many thinks including booting Ubuntu 11.10 because there is 3.0 kernel but there is still no input controls. I have newest alsa 1.0.24, and can't control input levels. Here http://www.mail-archive.com/mixxx-devel@lists.sourceforge.net/msg03598.html somebody have similar problem, but he uses Maya to vinyl control. Please help me and for my Youth Polish Radio http://Bieszczady.FM we would appreciate! -- Kamil Sobolak

2 1

[alsa-devel] [PATCH] ALSA: ASoC: cs4720: use snd_soc_cache_sync()
by Daniel Mack 22 Nov '11

22 Nov '11

Replace the manual register restore mechanism in cs4270.c and call snd_soc_cache_sync() instead. The current is also wrong, as it doesn't update the internal cache, leading to cache inconsitency after suspend. Signed-off-by: Daniel Mack <zonque(a)gmail.com> Reported-and-tested-by: Sven Neumann <s.neumann(a)raumfeld.com> --- Not sure if it's worth marking this one for stable@? sound/soc/codecs/cs4270.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index f1f237e..73f46eb 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -601,7 +601,6 @@ static int cs4270_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg) static int cs4270_soc_resume(struct snd_soc_codec *codec) { struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); - struct i2c_client *i2c_client = to_i2c_client(codec->dev); int reg; regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies), @@ -612,14 +611,7 @@ static int cs4270_soc_resume(struct snd_soc_codec *codec) ndelay(500); /* first restore the entire register cache ... */ - for (reg = CS4270_FIRSTREG; reg <= CS4270_LASTREG; reg++) { - u8 val = snd_soc_read(codec, reg); - - if (i2c_smbus_write_byte_data(i2c_client, reg, val)) { - dev_err(codec->dev, "i2c write failed\n"); - return -EIO; - } - } + snd_soc_cache_sync(codec); /* ... then disable the power-down bits */ reg = snd_soc_read(codec, CS4270_PWRCTL); -- 1.7.7.3

3 13

[alsa-devel] [PATCH v7 3/3] ARM: mx28evk: set a initial clock rate for saif
by Dong Aisheng 22 Nov '11

22 Nov '11

Signed-off-by: Dong Aisheng <b29396(a)freescale.com> Acked-by: Marek Vasut <marek.vasut(a)gmail.com> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Wolfram Sang <w.sang(a)pengutronix.de> Cc: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> --- Changes since v1: * make comments a little better. It's originally suggested by Uwe. --- arch/arm/mach-mxs/clock-mx28.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index c51fe85..b0c248d 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@ -808,6 +808,15 @@ int __init mx28_clocks_init(void) clk_set_parent(&saif0_clk, &pll0_clk); clk_set_parent(&saif1_clk, &pll0_clk); + /* + * Set an initial clock rate for the saif internal logic to work + * properly. This is important when working in EXTMASTER mode that + * uses the other saif's BITCLK&LRCLK but it still needs a basic + * clock which should be fast enough for the internal logic. + */ + clk_set_rate(&saif0_clk, 24000000); + clk_set_rate(&saif1_clk, 24000000); + clkdev_add_table(lookups, ARRAY_SIZE(lookups)); mxs_timer_init(&clk32k_clk, MX28_INT_TIMER0); -- 1.7.0.4

1 0

[alsa-devel] [PATCH v7 2/3] ARM: mx28evk: add platform data for saif
by Dong Aisheng 22 Nov '11

22 Nov '11

This is for supporting saif record function. Signed-off-by: Dong Aisheng <b29396(a)freescale.com> Acked-by: Marek Vasut <marek.vasut(a)gmail.com> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Wolfram Sang <w.sang(a)pengutronix.de> Cc: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> --- Changes since v6: * fix a typo suggested by Shawn Changes since v4: * Using the new added master_id and master_mode in platfrom_data No changes since v3: Changes since v2: * separate clkmux code into another patch * A few minus fixes suggested by Uwe & Wolfram. Changes since v1: * move saif clkmux code into mach-specific part --- arch/arm/mach-mxs/devices-mx28.h | 3 ++- arch/arm/mach-mxs/devices/platform-mxs-saif.c | 5 +++-- arch/arm/mach-mxs/include/mach/devices-common.h | 4 +++- arch/arm/mach-mxs/mach-mx28evk.c | 18 ++++++++++++++++-- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h index c888710..4f50094 100644 --- a/arch/arm/mach-mxs/devices-mx28.h +++ b/arch/arm/mach-mxs/devices-mx28.h @@ -47,6 +47,7 @@ struct platform_device *__init mx28_add_mxsfb( const struct mxsfb_platform_data *pdata); extern const struct mxs_saif_data mx28_saif_data[] __initconst; -#define mx28_add_saif(id) mxs_add_saif(&mx28_saif_data[id]) +#define mx28_add_saif(id, pdata) \ + mxs_add_saif(&mx28_saif_data[id], pdata) struct platform_device *__init mx28_add_rtc_stmp3xxx(void); diff --git a/arch/arm/mach-mxs/devices/platform-mxs-saif.c b/arch/arm/mach-mxs/devices/platform-mxs-saif.c index 1ec965e..f6e3a60 100644 --- a/arch/arm/mach-mxs/devices/platform-mxs-saif.c +++ b/arch/arm/mach-mxs/devices/platform-mxs-saif.c @@ -32,7 +32,8 @@ const struct mxs_saif_data mx28_saif_data[] __initconst = { }; #endif -struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data) +struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data, + const struct mxs_saif_platform_data *pdata) { struct resource res[] = { { @@ -56,5 +57,5 @@ struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data) }; return mxs_add_platform_device("mxs-saif", data->id, res, - ARRAY_SIZE(res), NULL, 0); + ARRAY_SIZE(res), pdata, sizeof(*pdata)); } diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h index a8080f4..dc369c1 100644 --- a/arch/arm/mach-mxs/include/mach/devices-common.h +++ b/arch/arm/mach-mxs/include/mach/devices-common.h @@ -94,6 +94,7 @@ struct platform_device *__init mxs_add_mxs_pwm( resource_size_t iobase, int id); /* saif */ +#include <sound/saif.h> struct mxs_saif_data { int id; resource_size_t iobase; @@ -103,4 +104,5 @@ struct mxs_saif_data { }; struct platform_device *__init mxs_add_saif( - const struct mxs_saif_data *data); + const struct mxs_saif_data *data, + const struct mxs_saif_platform_data *pdata); diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index 4a3cca3..1bad69e 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c @@ -28,6 +28,7 @@ #include <mach/common.h> #include <mach/iomux-mx28.h> +#include <mach/digctl.h> #include "devices-mx28.h" @@ -417,6 +418,18 @@ static void __init mx28evk_add_regulators(void) static void __init mx28evk_add_regulators(void) {} #endif +static const struct mxs_saif_platform_data + mx28evk_mxs_saif_pdata[] __initconst = { + /* working on EXTMSTR0 mode (saif0 master, saif1 slave) */ + { + .master_mode = 1, + .master_id = 0, + }, { + .master_mode = 0, + .master_id = 0, + }, +}; + static void __init mx28evk_init(void) { int ret; @@ -457,8 +470,9 @@ static void __init mx28evk_init(void) mx28_add_mxsfb(&mx28evk_mxsfb_pdata); - mx28_add_saif(0); - mx28_add_saif(1); + mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0); + mx28_add_saif(0, &mx28evk_mxs_saif_pdata[0]); + mx28_add_saif(1, &mx28evk_mxs_saif_pdata[1]); mx28_add_mxs_i2c(0); i2c_register_board_info(0, mxs_i2c0_board_info, -- 1.7.0.4

1 0