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

[alsa-devel] Underrun on Jade controller...
by Sandulescu Bogdan 23 Nov '12

23 Nov '12

Hello ALSA community. I'm an User-Space application developer, using the ALSA library to play mixed sounds. My application (and for that matter also aplay) are having one underrun problem, and I need help on how to interpret the following debug information and receive some possible workarounds/solutions. The underrun occurs only: once after writei() was performed with get_buffer_size bytes written, and try to do another writei(). Target: Fujitsu Jade microcontroller ALSA: 1.0.25 ALSA PCM interface for Jade-xxsvideo: /kernel/linux-2.6.31.4/sound/soc/xxsvideo/jade-pcm.c DMA driver: /kernel/linux-2.6.31.4/arch/arm/mach-xxsvideo/dma.c Here are the traces I managed to do, if there is any other information needed, please ask me for it. Application trace: [line: 1297 ]: Trying to open the ALSA plugin = plug:'dmix:RATE=8000' [463379 ms] : Play ThreadID [1126167328]: before open ALSA [line: 1313 ]: Play Sound No: 0, Sound name: Snd_000.wav - from Thread-ID: 1126167328 [463417 ms] : Play ThreadID [1126167328]: before setting parameters [line: 1377 ]: 16 Bit format [line: 1386 ]: Channel count: 1 [line: 1394 ]: Sample rate: 8000 [line: 1473 ]: Period size = 1024 ; Buffer size = 4096 [line: 1514 ]: Start threshold = 4096 [463441 ms] : Play ThreadID [1126167328]: after parmas ended [463442 ms] : Play ThreadID [1126167328]: before malloc [463442 ms] : Play ThreadID [1126167328]: before reading/writing [line: 1691 ]: Writei() ended, bytes written = 2048, available bytes to be written = 2048 [line: 1691 ]: Writei() ended, bytes written = 2048, available bytes to be written = 48 underrun!!! (at least 0.019 ms long) [line: 1660 ]: Underrun encountered: status = -32 ALSA lib pcm.c:7339:(snd_pcm_recover) underrun occurred [line: 1691 ]: Writei() ended, bytes written = 0, available bytes to be written = 4096 [line: 1691 ]: Writei() ended, bytes written = 2048, available bytes to be written = 2048 [line: 1615 ]: Add silence in last buffer, with size = 1948 [line: 1691 ]: Writei() ended, bytes written = 2048, available bytes to be written = 64 [463526 ms] : Play ThreadID [1126167328]: after reading/writing fully ended [464152 ms] : Play ThreadID [1126167328]: after ALSA drain X_RUN DEBUG TRACE: echo 1 > /proc/asound/card0/pcm0p/xrun_debug ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:330: PCM: Lost interrupts? (stream=0, delta=15360, intr_ptr=1024) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=0, intr_ptr=17408) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=1024, intr_ptr=18432) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=2048, intr_ptr=19456) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=3072, intr_ptr=20480) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=4096, intr_ptr=21504) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=5120, intr_ptr=22528) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=6144, intr_ptr=23552) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=7168, intr_ptr=24576) ALSA /home/kernel/linux-2.6.31.4/sound/core/pcm_lib.c:266: PCM: Unexpected hw_pointer value (stream=0, pos=8192, intr_ptr=25600) Additional note: using the : #echo 2 > /proc/asound/card0/pcm0p/xrun_debug there are no more underruns occurrences!! And this seems to be normal, according to Procfile.txt description from Takashi Iwai (...can be lead to too much corrections for a (mostly buggy) hardware that doesn't give smooth pointer updates) Thank you for any information and help given.

2 5

[alsa-devel] [asoc:topic/wm8994 8/8] sound/soc/codecs/wm8994.c:3454:14: error: 'struct wm8994_priv' has no member named 'pdata'
by kbuild test robot 23 Nov '12

23 Nov '12

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/wm8994 head: ca37243f5661ede314153445cc9eaac73a9745d7 commit: ca37243f5661ede314153445cc9eaac73a9745d7 [8/8] ASoC: wm8994: Use pdata cached in MFD driver config: make ARCH=i386 allmodconfig All error/warnings: sound/soc/codecs/wm8994.c: In function 'wm8958_default_micdet': sound/soc/codecs/wm8994.c:3454:14: error: 'struct wm8994_priv' has no member named 'pdata' vim +3454 sound/soc/codecs/wm8994.c af6b6fe4 Mark Brown 2011-11-30 3448 c986564b Mark Brown 2012-03-12 3449 wm1811_jackdet_set_mode(codec, c986564b Mark Brown 2012-03-12 3450 WM1811_JACKDET_MODE_JACK); c986564b Mark Brown 2012-03-12 3451 c986564b Mark Brown 2012-03-12 3452 mutex_unlock(&wm8994->accdet_lock); c986564b Mark Brown 2012-03-12 3453 ecd1732f Mark Brown 2012-03-12 @3454 if (wm8994->pdata->jd_ext_cap) 07fb9d9e Mark Brown 2012-02-21 3455 snd_soc_dapm_disable_pin(&codec->dapm, 07fb9d9e Mark Brown 2012-02-21 3456 "MICBIAS2"); af6b6fe4 Mark Brown 2011-11-30 3457 } --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: wm0010: Add checking for .dfw info record version.
by Scott Ling 23 Nov '12

23 Nov '12

The info record at the start of the dsp firmware file has been expanded to incorporate additional version information. We need to check the version to make sure we understand the layout of the information in the record. The srec2image tool is currently used to create this record during creation of the .dfw file. Signed-off-by: Scott Ling <sl(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm0010.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index d795860..e7e6c2f 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -32,6 +32,9 @@ #define DEVICE_ID_WM0010 10 #define S2_LOADER_ID_OFFSET 8 +/* We only support v1 of the .dfw INFO record */ +#define INFO_VERSION 1 + enum dfw_cmd { DFW_CMD_FUSE = 0x01, DFW_CMD_CODE_HDR, @@ -47,6 +50,13 @@ struct dfw_binrec { uint8_t data[0]; } __packed; +struct dfw_inforec { + u8 info_version; + u8 tool_major_version; + u8 tool_minor_version; + u8 dsp_target; +}; + struct dfw_pllrec { u8 command; u32 length:24; @@ -343,6 +353,7 @@ static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec) struct completion done; const struct firmware *fw; const struct dfw_binrec *rec; + const struct dfw_inforec *inforec; u64 *img; u8 *out, dsp; u32 len, offset; @@ -357,8 +368,9 @@ static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec) } rec = (const struct dfw_binrec *)fw->data; + inforec = (const struct dfw_inforec *)rec->data; offset = 0; - dsp = rec->data[0]; + dsp = inforec->dsp_target; wm0010->boot_failed = false; BUG_ON(!list_empty(&xfer_list)); init_completion(&done); @@ -370,6 +382,17 @@ static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec) goto abort; } + if (inforec->info_version != INFO_VERSION) { + dev_err(codec->dev, + "Unsupported version (%02d) of INFO record\r\n", + inforec->info_version); + ret = -EINVAL; + goto abort; + } + + dev_dbg(codec->dev, "Version v%02d INFO record found\r\n", + inforec->info_version); + /* Check it's a DSP file */ if (dsp != DEVICE_ID_WM0010) { dev_err(codec->dev, "Not a WM0010 firmware file.\r\n"); -- 1.7.9.5

2 1

Re: [alsa-devel] [RFC PATCH] ASoC: Samsung: Register the audio platform device
by Padma Venkat 23 Nov '12

23 Nov '12

cc'ing Mark Brown On Wed, Nov 14, 2012 at 5:39 PM, Padmavathi Venna <padma.v(a)samsung.com> wrote: > Audio platform device is not a hardware peripherial. > So this device can't be added in the dt devices list. > So expanded the module_platform_driver and registered > this device using "platform_device_register_simple". > > Also added the soc-core pm ops structure in the audio > platform driver. > > Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> > --- > sound/soc/samsung/smdk_wm8994.c | 31 ++++++++++++++++++++++++++++++- > 1 files changed, 30 insertions(+), 1 deletions(-) > > diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c > index 48dd4dd..7f97969 100644 > --- a/sound/soc/samsung/smdk_wm8994.c > +++ b/sound/soc/samsung/smdk_wm8994.c > @@ -173,16 +173,45 @@ static int __devexit smdk_audio_remove(struct platform_device *pdev) > return 0; > } > > +static struct platform_device *smdk_audio_device; > + > static struct platform_driver smdk_audio_driver = { > .driver = { > .name = "smdk-audio", > .owner = THIS_MODULE, > + .pm = &snd_soc_pm_ops, > }, > .probe = smdk_audio_probe, > .remove = __devexit_p(smdk_audio_remove), > }; > > -module_platform_driver(smdk_audio_driver); > +static int __init smdk_audio_init(void) > +{ > + int ret; > + > + ret = platform_driver_register(&smdk_audio_driver); > + if (ret) { > + pr_err("unable to register driver\n"); > + return ret; > + } > + > + smdk_audio_device = platform_device_register_simple("smdk-audio", -1, NULL, 0); > + if (IS_ERR(smdk_audio_device)) { > + platform_driver_unregister(&smdk_audio_driver); > + return PTR_ERR(smdk_audio_device); > + } > + > + return 0; > +} > + > +static void __exit smdk_audio_exit(void) > +{ > + platform_device_unregister(smdk_audio_device); > + platform_driver_unregister(&smdk_audio_driver); > +} > + > +module_init(smdk_audio_init); > +module_exit(smdk_audio_exit); > > MODULE_DESCRIPTION("ALSA SoC SMDK WM8994"); > MODULE_LICENSE("GPL"); > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [RFC PATCH] ASoC: Samsung: Register the audio dma platform device
by Padma Venkat 23 Nov '12

23 Nov '12

cc'ing Mark Brown On Wed, Nov 14, 2012 at 5:39 PM, Padmavathi Venna <padma.v(a)samsung.com> wrote: > Audio dma device is not a hardware peripherial. > So this device can't be added in the dt devices list. > So expanded the module_platform_driver and registered > this device using "platform_device_register_simple". > > Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> > --- > sound/soc/samsung/dma.c | 30 +++++++++++++++++++++++++++++- > 1 files changed, 29 insertions(+), 1 deletions(-) > > diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c > index 359708c..17ae9c0 100644 > --- a/sound/soc/samsung/dma.c > +++ b/sound/soc/samsung/dma.c > @@ -444,6 +444,8 @@ static int __devexit samsung_asoc_platform_remove(struct platform_device *pdev) > return 0; > } > > +static struct platform_device *asoc_dma_device; > + > static struct platform_driver asoc_dma_driver = { > .driver = { > .name = "samsung-audio", > @@ -454,7 +456,33 @@ static struct platform_driver asoc_dma_driver = { > .remove = __devexit_p(samsung_asoc_platform_remove), > }; > > -module_platform_driver(asoc_dma_driver); > +static int __init asoc_dma_init(void) > +{ > + int ret; > + > + ret = platform_driver_register(&asoc_dma_driver); > + if (ret) { > + pr_err("unable to register driver\n"); > + return ret; > + } > + > + asoc_dma_device = platform_device_register_simple("samsung-audio", -1, NULL, 0); > + if (IS_ERR(asoc_dma_device)) { > + platform_driver_unregister(&asoc_dma_driver); > + return PTR_ERR(asoc_dma_device); > + } > + > + return 0; > +} > + > +static void __exit asoc_dma_exit(void) > +{ > + platform_device_unregister(asoc_dma_device); > + platform_driver_unregister(&asoc_dma_driver); > +} > + > +module_init(asoc_dma_init); > +module_exit(asoc_dma_exit); > > MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); > MODULE_DESCRIPTION("Samsung ASoC DMA Driver"); > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [PATCH V3 0/2] ARM: Exynos: Enable I2S platform support for Exynos5
by Padma Venkat 23 Nov '12

23 Nov '12

cc'ing Mark Brown On Tue, Nov 6, 2012 at 10:14 AM, Padmavathi Venna <padma.v(a)samsung.com> wrote: > Changes since V2: > - Rebased to 3.7-rc3 > - Custom DT bindings are prefixed with samsung > - idma address is moved from dts file dtsi file as it is soc specific > property > > Changes since V1: > - Rebased to 3.6-rc6 > > This patch set enables device tree based platform support for the three I2S > controllers on Samsung's Exynos5 SoC's. > > Padmavathi Venna (2): > ARM: dts: Add nodes for i2s controllers for Samsung Exynos5 platforms > ARM: EXYNOS: Enable platform support for I2S controllers > > arch/arm/boot/dts/exynos5250-smdk5250.dts | 15 +++++++++++++++ > arch/arm/boot/dts/exynos5250.dtsi | 28 ++++++++++++++++++++++++++++ > arch/arm/mach-exynos/mach-exynos5-dt.c | 6 ++++++ > 3 files changed, 49 insertions(+), 0 deletions(-) > > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [PATCH V3 2/2] ARM: EXYNOS: Enable platform support for I2S controllers
by Padma Venkat 23 Nov '12

23 Nov '12

cc'ing Mark Brown On Tue, Nov 6, 2012 at 10:14 AM, Padmavathi Venna <padma.v(a)samsung.com> wrote: > Add AUXDATA entries for i2s controller driver so as to set the device > name for clock lookups > > Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> > --- > arch/arm/mach-exynos/mach-exynos5-dt.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c > index ed37273..93e63ec 100644 > --- a/arch/arm/mach-exynos/mach-exynos5-dt.c > +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c > @@ -86,6 +86,12 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { > "exynos5-hdmi", NULL), > OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000, > "exynos5-mixer", NULL), > + OF_DEV_AUXDATA("samsung,samsung-i2s", EXYNOS5_PA_I2S0, > + "samsung-i2s.0", NULL), > + OF_DEV_AUXDATA("samsung,samsung-i2s", EXYNOS5_PA_I2S1, > + "samsung-i2s.1", NULL), > + OF_DEV_AUXDATA("samsung,samsung-i2s", EXYNOS5_PA_I2S2, > + "samsung-i2s.2", NULL), > {}, > }; > > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [PATCH V3 1/2] ARM: dts: Add nodes for i2s controllers for Samsung Exynos5 platforms
by Padma Venkat 23 Nov '12

23 Nov '12

cc'ing Mark Brown. On Tue, Nov 6, 2012 at 10:14 AM, Padmavathi Venna <padma.v(a)samsung.com> wrote: > Add device nodes for the three instances of i2s controllers in Exynos5 > platforms. Enable instance i2s 0 for exynos5250 board and disable all > other i2s instances. > > Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> > --- > arch/arm/boot/dts/exynos5250-smdk5250.dts | 14 ++++++++++++++ > arch/arm/boot/dts/exynos5250.dtsi | 29 +++++++++++++++++++++++++++++ > 2 files changed, 43 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts > index 405009c..3b2a3c9 100644 > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts > @@ -193,4 +193,18 @@ > hdmi { > hpd-gpio = <&gpx3 7 0xf 1 3>; > }; > + > + i2s_0: i2s@03830000 { > + gpios = <&gpz 0 2 0 0>, <&gpz 1 2 0 0>, <&gpz 2 2 0 0>, > + <&gpz 3 2 0 0>, <&gpz 4 2 0 0>, <&gpz 5 2 0 0>, > + <&gpz 6 2 0 0>; > + }; > + > + i2s_1: i2s@12D60000 { > + status = "disabled"; > + }; > + > + i2s_2: i2s@12D70000 { > + status = "disabled"; > + }; > }; > diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi > index cf6a02d..a168e98 100644 > --- a/arch/arm/boot/dts/exynos5250.dtsi > +++ b/arch/arm/boot/dts/exynos5250.dtsi > @@ -31,6 +31,9 @@ > gsc1 = &gsc_1; > gsc2 = &gsc_2; > gsc3 = &gsc_3; > + i2s0 = &i2s_0; > + i2s1 = &i2s_1; > + i2s2 = &i2s_2; > }; > > gic:interrupt-controller@10481000 { > @@ -238,6 +241,32 @@ > #size-cells = <0>; > }; > > + i2s_0: i2s@03830000 { > + compatible = "samsung,samsung-i2s"; > + reg = <0x03830000 0x100>; > + tx-dma-channel-secondary = <&pdma0 8>; /* preliminary */ > + tx-dma-channel = <&pdma0 10>; /* preliminary */ > + rx-dma-channel = <&pdma0 9>; /* preliminary */ > + samsung,supports-6ch; > + samsung,supports-rstclr; > + samsung,supports-secdai; > + samsung,idma-addr = <0x03000000>; > + }; > + > + i2s_1: i2s@12D60000 { > + compatible = "samsung,samsung-i2s"; > + reg = <0x12D60000 0x100>; > + tx-dma-channel = <&pdma1 12>; /* preliminary */ > + rx-dma-channel = <&pdma1 11>; /* preliminary */ > + }; > + > + i2s_2: i2s@12D70000 { > + compatible = "samsung,samsung-i2s"; > + reg = <0x12D70000 0x100>; > + tx-dma-channel = <&pdma0 12>; /* preliminary */ > + rx-dma-channel = <&pdma0 11>; /* preliminary */ > + }; > + > amba { > #address-cells = <1>; > #size-cells = <1>; > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [PATCH V3] ASoC: SAMSUNG: Add DT support for i2s
by Padma Venkat 23 Nov '12

23 Nov '12

cc'ing Mark Brown. On Tue, Nov 6, 2012 at 10:11 AM, Padmavathi Venna <padma.v(a)samsung.com> wrote: > Add support for device based discovery. > > Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> > --- > > Changes since V2: > - Rebased on 3.7-rc3 > - Custom DT bindings are prefixed with samsung > - As generic device tree DMA helpers not yet mainlined > I am still using custom dma bindings. So added a > priliminary statement regarding the same. I will rework > on my patch once generic DMA helpers are mainlined. > > Chnages since V1: > - Rebased on 3.6-rc6 > > .../devicetree/bindings/sound/samsung-i2s.txt | 69 ++++++ > sound/soc/samsung/dma.c | 1 + > sound/soc/samsung/dma.h | 1 + > sound/soc/samsung/i2s.c | 234 ++++++++++++++++---- > 4 files changed, 256 insertions(+), 49 deletions(-) > create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt > > diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt > new file mode 100644 > index 0000000..dca61a6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt > @@ -0,0 +1,69 @@ > +* Samsung I2S controller > + > +Required SoC Specific Properties: > + > +- compatible : "samsung,samsung-i2s" > +- reg: physical base address of the controller and length of memory mapped > + region. > + > +[PRELIMINARY: the dma channel allocation will change once there are > +official DMA bindings] > + > +- tx-dma-channel-secondary: The dma channel specifier for secondary tx > + operations. The format of the dma specifier depends on the dma > + controller. > +- tx-dma-channel: The dma channel specifier for tx operations. The format of > + the dma specifier depends on the dma controller. > +- rx-dma-channel: The dma channel specifier for rx operations. The format of > + the dma specifier depends on the dma controller. > + > +Optional SoC Specific Properties: > + > +- samsung,supports-6ch: If the I2S Primary sound source has 5.1 Channel > + support, this flag is enabled. > +- samsung,supports-rstclr: This flag should be set if I2S software reset bit > + control is required. When this flag is set I2S software reset bit will be > + enabled or disabled based on need. > +- samsung,supports-secdai:If I2S block has a secondary FIFO and internal DMA, > + then this flag is enabled. > +- samsung,idma-addr: Internal DMA register base address of the audio > + sub system(used in secondary sound source). > + > +Required Board Specific Properties: > + > +- gpios: The gpio specifier for data out,data in, LRCLK, CDCLK and SCLK > + interface lines. The format of the gpio specifier depends on the gpio > + controller. > + > +Aliases: > + > +- All the I2S controller nodes should be represented in the aliases node using > + the following format 'i2s{n}' where n is a unique number for the alias. > + > +Example: > + > +- SoC Specific Portion: > + > +i2s@03830000 { > + compatible = "samsung,samsung-i2s"; > + reg = <0x03830000 0x100>; > + tx-dma-channel-secondary = <&pdma0 8>; > + tx-dma-channel = <&pdma0 10>; > + rx-dma-channel = <&pdma0 9>; > + samsung,supports-6ch; > + samsung,supports-rstclr; > + samsung,supports-secdai; > + samsung,idma-addr = <0x03000000>; > +}; > + > +- Board Specific Portion: > + > +i2s_0: i2s@03830000 { > + gpios = <&gpz 0 2 0 0>, > + <&gpz 1 2 0 0>, > + <&gpz 2 2 0 0>, > + <&gpz 3 2 0 0>, > + <&gpz 4 2 0 0>, > + <&gpz 5 2 0 0>, > + <&gpz 6 2 0 0>; > +}; > diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c > index b70964e..359708c 100644 > --- a/sound/soc/samsung/dma.c > +++ b/sound/soc/samsung/dma.c > @@ -168,6 +168,7 @@ static int dma_hw_params(struct snd_pcm_substream *substream, > req.cap = (samsung_dma_has_circular() ? > DMA_CYCLIC : DMA_SLAVE); > req.client = prtd->params->client; > + req.dt_dmach_prop = prtd->params->dma_prop; > config.direction = > (substream->stream == SNDRV_PCM_STREAM_PLAYBACK > ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM); > diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h > index 7d1ead7..2e60415 100644 > --- a/sound/soc/samsung/dma.h > +++ b/sound/soc/samsung/dma.h > @@ -19,6 +19,7 @@ struct s3c_dma_params { > int dma_size; /* Size of the DMA transfer */ > unsigned ch; > struct samsung_dma_ops *ops; > + struct property *dma_prop; > }; > > #endif > diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c > index 40b00a1..f9d55e5 100644 > --- a/sound/soc/samsung/i2s.c > +++ b/sound/soc/samsung/i2s.c > @@ -15,11 +15,15 @@ > #include <linux/clk.h> > #include <linux/io.h> > #include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_gpio.h> > #include <linux/pm_runtime.h> > > #include <sound/soc.h> > #include <sound/pcm_params.h> > > +#include <mach/dma.h> > + > #include <linux/platform_data/asoc-s3c.h> > > #include "dma.h" > @@ -49,8 +53,6 @@ struct i2s_dai { > struct clk *clk; > /* Clock for generating I2S signals */ > struct clk *op_clk; > - /* Array of clock names for op_clk */ > - const char **src_clk; > /* Pointer to the Primary_Fifo if this is Sec_Fifo, NULL otherwise */ > struct i2s_dai *pri_dai; > /* Pointer to the Secondary_Fifo if it has one, NULL otherwise */ > @@ -68,6 +70,8 @@ struct i2s_dai { > u32 suspend_i2smod; > u32 suspend_i2scon; > u32 suspend_i2spsr; > + unsigned long gpios[7]; /* i2s gpio line numbers */ > + int dev_id; /* i2s dev id */ > }; > > /* Lock for cross i/f checks */ > @@ -385,6 +389,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, > struct i2s_dai *i2s = to_info(dai); > struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai; > u32 mod = readl(i2s->addr + I2SMOD); > + char clk_name[16]; > > switch (clk_id) { > case SAMSUNG_I2S_CDCLK: > @@ -432,8 +437,9 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, > } > } > > + sprintf(clk_name, "i2s_opclk%d", clk_id); > i2s->op_clk = clk_get(&i2s->pdev->dev, > - i2s->src_clk[clk_id]); > + clk_name); > clk_enable(i2s->op_clk); > i2s->rclk_srcrate = clk_get_rate(i2s->op_clk); > > @@ -980,8 +986,9 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) > i2s->i2s_dai_drv.capture.formats = SAMSUNG_I2S_FMTS; > } else { /* Create a new platform_device for Secondary */ > i2s->pdev = platform_device_register_resndata(NULL, > - pdev->name, pdev->id + SAMSUNG_I2S_SECOFF, > - NULL, 0, NULL, 0); > + "samsung-i2s", > + i2s->dev_id + SAMSUNG_I2S_SECOFF, NULL, 0, > + NULL, 0); > if (IS_ERR(i2s->pdev)) > return NULL; > } > @@ -992,49 +999,154 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) > return i2s; > } > > +#ifdef CONFIG_OF > +static int samsung_i2s_parse_dt_gpio(struct i2s_dai *i2s) > +{ > + struct device *dev = &i2s->pdev->dev; > + int index, gpio, ret; > + > + for (index = 0; index < 7; index++) { > + gpio = of_get_gpio(dev->of_node, index); > + if (!gpio_is_valid(gpio)) { > + dev_err(dev, "invalid gpio[%d]: %d\n", index, gpio); > + goto free_gpio; > + } > + > + ret = gpio_request(gpio, dev_name(dev)); > + if (ret) { > + dev_err(dev, "gpio [%d] request failed\n", gpio); > + goto free_gpio; > + } > + i2s->gpios[index] = gpio; > + } > + return 0; > + > +free_gpio: > + while (--index >= 0) > + gpio_free(i2s->gpios[index]); > + return -EINVAL; > +} > + > +static void samsung_i2s_dt_gpio_free(struct i2s_dai *i2s) > +{ > + unsigned int index; > + for (index = 0; index < 7; index++) > + gpio_free(i2s->gpios[index]); > +} > +#else > +static int samsung_i2s_parse_dt_gpio(struct i2s_dai *dai) > +{ > + return -EINVAL; > +} > + > +static void samsung_i2s_dt_gpio_free(struct i2s_dai *dai) > +{ > +} > + > +#endif > + > static __devinit int samsung_i2s_probe(struct platform_device *pdev) > { > - u32 dma_pl_chan, dma_cp_chan, dma_pl_sec_chan; > + u32 dma_pl_chan, dma_cp_chan; > + u32 dma_pl_sec_chan = 0; > struct i2s_dai *pri_dai, *sec_dai = NULL; > - struct s3c_audio_pdata *i2s_pdata; > - struct samsung_i2s *i2s_cfg; > + struct s3c_audio_pdata *i2s_pdata = pdev->dev.platform_data; > + struct samsung_i2s *i2s_cfg = NULL; > struct resource *res; > - u32 regs_base, quirks; > - int ret = 0; > + u32 regs_base, quirks = 0, idma_addr = 0; > + struct property *prop; > + struct device_node *np = pdev->dev.of_node; > + int ret = 0, id; > > /* Call during Seconday interface registration */ > - if (pdev->id >= SAMSUNG_I2S_SECOFF) { > + if (np) { > + id = of_alias_get_id(np, "i2s"); > + if (id < 0) { > + dev_err(&pdev->dev, "failed to get alias id:%d\n", id); > + return id; > + } > + } else { > + id = pdev->id; > + } > + > + if (id >= SAMSUNG_I2S_SECOFF) { > sec_dai = dev_get_drvdata(&pdev->dev); > snd_soc_register_dai(&sec_dai->pdev->dev, > &sec_dai->i2s_dai_drv); > return 0; > } > > - i2s_pdata = pdev->dev.platform_data; > - if (i2s_pdata == NULL) { > - dev_err(&pdev->dev, "Can't work without s3c_audio_pdata\n"); > - return -EINVAL; > + pri_dai = i2s_alloc_dai(pdev, false); > + if (!pri_dai) { > + dev_err(&pdev->dev, "Unable to alloc I2S_pri\n"); > + return -ENOMEM; > } > > - res = platform_get_resource(pdev, IORESOURCE_DMA, 0); > - if (!res) { > - dev_err(&pdev->dev, "Unable to get I2S-TX dma resource\n"); > - return -ENXIO; > - } > - dma_pl_chan = res->start; > + if (!np) { > + res = platform_get_resource(pdev, IORESOURCE_DMA, 0); > + if (!res) { > + dev_err(&pdev->dev, > + "Unable to get I2S-TX dma resource\n"); > + return -ENXIO; > + } > + dma_pl_chan = res->start; > > - res = platform_get_resource(pdev, IORESOURCE_DMA, 1); > - if (!res) { > - dev_err(&pdev->dev, "Unable to get I2S-RX dma resource\n"); > - return -ENXIO; > - } > - dma_cp_chan = res->start; > + res = platform_get_resource(pdev, IORESOURCE_DMA, 1); > + if (!res) { > + dev_err(&pdev->dev, > + "Unable to get I2S-RX dma resource\n"); > + return -ENXIO; > + } > + dma_cp_chan = res->start; > > - res = platform_get_resource(pdev, IORESOURCE_DMA, 2); > - if (res) > - dma_pl_sec_chan = res->start; > - else > - dma_pl_sec_chan = 0; > + res = platform_get_resource(pdev, IORESOURCE_DMA, 2); > + if (res) > + dma_pl_sec_chan = res->start; > + > + if (&i2s_pdata->type) > + i2s_cfg = &i2s_pdata->type.i2s; > + > + if (i2s_cfg) { > + quirks = i2s_cfg->quirks; > + idma_addr = i2s_cfg->idma_addr; > + } > + } else { > + prop = of_find_property(np, "tx-dma-channel", NULL); > + if (!prop) { > + dev_err(&pdev->dev, "tx dma channel property not"\ > + "specified\n"); > + return -ENXIO; > + } > + dma_pl_chan = DMACH_DT_PROP; > + pri_dai->dma_playback.dma_prop = prop; > + > + prop = of_find_property(np, "rx-dma-channel", NULL); > + if (!prop) { > + dev_err(&pdev->dev, "tx dma channel property not"\ > + "specified\n"); > + return -ENXIO; > + } > + dma_cp_chan = DMACH_DT_PROP; > + pri_dai->dma_capture.dma_prop = prop; > + > + if (of_find_property(np, "samsung,supports-6ch", NULL)) > + quirks |= QUIRK_PRI_6CHAN; > + > + if (of_find_property(np, "samsung,supports-secdai", NULL)) > + quirks |= QUIRK_SEC_DAI; > + > + if (of_find_property(np, "samsung,supports-rstclr", NULL)) > + quirks |= QUIRK_NEED_RSTCLR; > + > + if (of_property_read_u32(np, "samsung,idma-addr", > + &idma_addr)) { > + if (quirks & QUIRK_SEC_DAI) { > + dev_err(&pdev->dev, "idma address is not"\ > + "specified"); > + return -EINVAL; > + } > + } > + } > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (!res) { > @@ -1049,16 +1161,6 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) > } > regs_base = res->start; > > - i2s_cfg = &i2s_pdata->type.i2s; > - quirks = i2s_cfg->quirks; > - > - pri_dai = i2s_alloc_dai(pdev, false); > - if (!pri_dai) { > - dev_err(&pdev->dev, "Unable to alloc I2S_pri\n"); > - ret = -ENOMEM; > - goto err; > - } > - > pri_dai->dma_playback.dma_addr = regs_base + I2STXD; > pri_dai->dma_capture.dma_addr = regs_base + I2SRXD; > pri_dai->dma_playback.client = > @@ -1067,11 +1169,11 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) > (struct s3c2410_dma_client *)&pri_dai->dma_capture; > pri_dai->dma_playback.channel = dma_pl_chan; > pri_dai->dma_capture.channel = dma_cp_chan; > - pri_dai->src_clk = i2s_cfg->src_clk; > pri_dai->dma_playback.dma_size = 4; > pri_dai->dma_capture.dma_size = 4; > pri_dai->base = regs_base; > pri_dai->quirks = quirks; > + pri_dai->dev_id = id; > > if (quirks & QUIRK_PRI_6CHAN) > pri_dai->i2s_dai_drv.playback.channels_max = 6; > @@ -1086,21 +1188,42 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) > sec_dai->dma_playback.dma_addr = regs_base + I2STXDS; > sec_dai->dma_playback.client = > (struct s3c2410_dma_client *)&sec_dai->dma_playback; > + > + if (np) { > + prop = of_find_property(np, "tx-dma-channel-secondary", > + NULL); > + if (!prop) { > + dev_err(&pdev->dev, "tx dma channel property"\ > + "not specified\n"); > + ret = -ENXIO; > + goto err; > + } > + sec_dai->dma_playback.dma_prop = prop; > + } > + > /* Use iDMA always if SysDMA not provided */ > sec_dai->dma_playback.channel = dma_pl_sec_chan ? : -1; > - sec_dai->src_clk = i2s_cfg->src_clk; > sec_dai->dma_playback.dma_size = 4; > sec_dai->base = regs_base; > sec_dai->quirks = quirks; > - sec_dai->idma_playback.dma_addr = i2s_cfg->idma_addr; > + sec_dai->dev_id = id; > + sec_dai->idma_playback.dma_addr = idma_addr; > sec_dai->pri_dai = pri_dai; > pri_dai->sec_dai = sec_dai; > } > > - if (i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { > - dev_err(&pdev->dev, "Unable to configure gpio\n"); > - ret = -EINVAL; > - goto err; > + if (np) { > + if (samsung_i2s_parse_dt_gpio(pri_dai)) { > + dev_err(&pdev->dev, "Unable to configure gpio\n"); > + ret = -EINVAL; > + goto err; > + } > + } else { > + if (i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { > + dev_err(&pdev->dev, "Unable to configure gpio\n"); > + ret = -EINVAL; > + goto err; > + } > } > > snd_soc_register_dai(&pri_dai->pdev->dev, &pri_dai->i2s_dai_drv); > @@ -1118,10 +1241,14 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev) > { > struct i2s_dai *i2s, *other; > struct resource *res; > + struct s3c_audio_pdata *i2s_pdata = pdev->dev.platform_data; > > i2s = dev_get_drvdata(&pdev->dev); > other = i2s->pri_dai ? : i2s->sec_dai; > > + if (!i2s_pdata->cfg_gpio && pdev->dev.of_node) > + samsung_i2s_dt_gpio_free(i2s->pri_dai); > + > if (other) { > other->pri_dai = NULL; > other->sec_dai = NULL; > @@ -1140,12 +1267,21 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_OF > +static const struct of_device_id exynos_i2s_match[] = { > + { .compatible = "samsung,samsung-i2s" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, exynos_i2s_match); > +#endif > + > static struct platform_driver samsung_i2s_driver = { > .probe = samsung_i2s_probe, > .remove = __devexit_p(samsung_i2s_remove), > .driver = { > .name = "samsung-i2s", > .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(exynos_i2s_match), > }, > }; > > -- > 1.7.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [RESENDING] [PATCH 07/22] ASoC: Ux500: Initialise PCM from MSP probe rather than as a device
by Mark Brown 23 Nov '12

23 Nov '12

On Thu, Nov 22, 2012 at 02:05:40PM +0000, Lee Jones wrote: > On Thu, 20 Sep 2012, Lee Jones wrote: > > > > Can we have some closure on this patch please, as it's blocking the > > > > patch-set? I'm fairly sure the patch is doing the correct thing, as > > > > seconded by Mark. > > > I still don't like this. It is the dai_link-struct that bothers me. We have > > > "ux500-msp-i2s.1" as name of the platform AND the cpu_dai. The MSP I2S-block is > > > not the platform and it is certainly not both platform and cpu-DAI at the same time. > > > Mark: Did you have a solution for this? Couldn't we just put NULL on the > > > platform_name instead? > > There are other drivers which do this already. > > I don't think it's an issue to do this. > Has anyone had any more bright ideas on how we might handle this? > The device is still being handled in platform code and I'm desperate > to get it out of there. Why do we need any ideas? Just implement it already.

2 2