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

[alsa-devel] [PATCH] ASoC: mc13783: Provide codec->control_data
by Fabio Estevam 26 Jul '12

26 Jul '12

If codec->control_data is not provided, the following crash happens: Unable to handle kernel NULL pointer dereference at virtual address 00000078 pgd = 80004000 [00000078] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM Modules linked in: CPU: 0 Tainted: G W (3.5.0-next-20120725+ #1263) PC is at regmap_read+0x18/0x64 LR is at hw_read+0x50/0x98 pc : [<802bcd90>] lr : [<803cad18>] psr: 60000013 ... Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/codecs/mc13783.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 6276e35..c8251af 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -581,6 +581,8 @@ static int mc13783_probe(struct snd_soc_codec *codec) { struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec); + codec->control_data = priv->mc13xxx; + mc13xxx_lock(priv->mc13xxx); /* these are the reset values */ -- 1.7.1

2 1

[alsa-devel] [PATCH 00/21] Some fixes and DT enablement for ux500 audio
by Lee Jones 26 Jul '12

26 Jul '12

This patch-set sees some code reinforcement surrounding the recently accepted MOP500 MSP, PCM, AB8500 CODEC and ux500 Audio Machine Driver. It contains some extra error checking pertaining to the ux500 specific drivers themselves, along with bugfixes for issues in core SoC Audio code happened upon along the way. There are also a couple of minor clean-ups relating to ux500 platform code, which are hitching a ride for ease of status tracking. arch/arm/boot/dts/db8500.dtsi | 48 ++++++ arch/arm/mach-ux500/Kconfig | 1 + arch/arm/mach-ux500/Makefile | 2 +- arch/arm/mach-ux500/board-mop500-audio.c | 194 ++++++++++++++++++++++ arch/arm/mach-ux500/board-mop500-msp.c | 267 ------------------------------ arch/arm/mach-ux500/board-mop500-msp.h | 14 -- arch/arm/mach-ux500/board-mop500.c | 23 ++- arch/arm/mach-ux500/board-mop500.h | 6 + arch/arm/mach-ux500/include/mach/msp.h | 3 +- drivers/mfd/ab8500-core.c | 1 + drivers/mfd/db8500-prcmu.c | 1 + include/linux/mfd/abx500/ab8500-codec.h | 6 +- sound/soc/codecs/ab8500-codec.c | 79 +++++++++ sound/soc/soc-dapm.c | 2 - sound/soc/soc-io.c | 14 +- sound/soc/ux500/mop500.c | 41 +++++ sound/soc/ux500/ux500_msp_dai.c | 11 +- sound/soc/ux500/ux500_msp_i2s.c | 118 ++++++++++--- sound/soc/ux500/ux500_msp_i2s.h | 5 +- sound/soc/ux500/ux500_pcm.c | 6 + 20 files changed, 516 insertions(+), 326 deletions(-)

2 54

[alsa-devel] Crash when probing imx_mc13783
by Fabio Estevam 26 Jul '12

26 Jul '12

Hi, I have just tried 3.5.0-next-20120725+ on a mx31pdk board and I am getting: Unable to handle kernel NULL pointer dereference at virtual address 00000078 pgd = 80004000 [00000078] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM Modules linked in: CPU: 0 Tainted: G W (3.5.0-next-20120725+ #1263) PC is at regmap_read+0x18/0x64 LR is at hw_read+0x50/0x98 pc : [<802bcd90>] lr : [<803cad18>] psr: 60000013 sp : 87035cf0 ip : 87035d10 fp : 87035d0c r10: 80681f34 r9 : 805d113c r8 : 00000000 r7 : 871f0a00 r6 : 80681db0 r5 : 00000025 r4 : 00000000 r3 : 00000000 r2 : 87035d14 r1 : 00000025 r0 : 00000025 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 00c5387d Table: 80004000 DAC: 00000017 Process swapper/0 (pid: 1, stack limit = 0x870342f0) Stack: (0x87035cf0 to 0x87036000) 5ce0: 871f0a00 00000025 80681db0 871f0a00 5d00: 87035d2c 87035d10 803cad18 802bcd84 80681db0 871fb600 80681db0 871fb540 5d20: 87035d3c 87035d30 803bbe88 803cacd4 87035d4c 87035d40 803c1858 803bbe80 5d40: 87035d9c 87035d50 803c5abc 803c1844 804e6c00 00000000 00000000 871f0aa8 5d60: 00000000 00000000 00000000 00000000 00000000 80681db0 871ec810 80681db0 5d80: 871f0a00 00000000 805d113c 80681f34 87035dd4 87035da0 803be5d0 803c58fc 5da0: 871f5400 00000006 87035dd4 80681db0 871ec810 00000000 87167840 87167780 5dc0: 00000000 00000000 87035e44 87035dd8 803bfd98 803be590 80681dc0 87035e10 5de0: 00000000 00000000 80681eb0 80681e78 80681ea0 80681db0 80681e88 80681dd0 5e00: 80681e80 80681008 80681f34 871f0a00 80680ff8 00000002 87072a08 806d7544 5e20: 87072a08 87072a08 80681d74 00000095 80649140 8063cbfc 87035e5c 87035e48 5e40: 804b4cb8 803bf350 806d7544 80681d74 87035e6c 87035e60 802b341c 804b4ca4 5e60: 87035e94 87035e70 802b1f38 802b3408 87072a08 80681d74 87072a3c 00000000 5e80: 00000095 80649140 87035eb4 87035e98 802b2150 802b1ec4 80681d74 87035eb8 5ea0: 802b20bc 00000000 87035edc 87035eb8 802b06c4 802b20c8 87024158 870708b4 5ec0: 80681d74 80672f58 871f5600 00000000 87035eec 87035ee0 802b1d98 802b0668 5ee0: 87035f14 87035ef0 802b0ff4 802b1d84 805820cc 87035f00 87034000 80681d74 5f00: 80688480 00000000 87035f3c 87035f18 802b2780 802b0e7c 87034000 00000007 5f20: 80688480 00000000 00000095 80649140 87035f4c 87035f40 802b37c4 802b270c 5f40: 87035f5c 87035f50 8062c600 802b3784 87035fb4 87035f60 800086b4 8062c5f8 5f60: 87035fb4 87035f70 8062c5ec 00000000 00000000 00000006 00000006 8060071c 5f80: 805c7970 60000013 87035fb4 8063cbf4 00000007 80688480 80602270 00000095 5fa0: 80649140 8063cbfc 87035ff4 87035fb8 806023f4 80008680 00000006 00000006 5fc0: 80602270 806022f8 800280a8 00000000 806022f8 800280a8 00000013 00000000 5fe0: 00000000 00000000 00000000 87035ff8 800280a8 80602304 00000000 00000000 Backtrace: [<802bcd78>] (regmap_read+0x0/0x64) from [<803cad18>] (hw_read+0x50/0x98) r7:871f0a00 r6:80681db0 r5:00000025 r4:871f0a00 [<803cacc8>] (hw_read+0x0/0x98) from [<803bbe88>] (snd_soc_read+0x14/0x18) r5:871fb540 r4:80681db0 [<803bbe74>] (snd_soc_read+0x0/0x18) from [<803c1858>] (soc_widget_read+0x20/0x) [<803c1838>] (soc_widget_read+0x0/0x58) from [<803c5abc>] (snd_soc_dapm_new_wid) [<803c58f0>] (snd_soc_dapm_new_widgets+0x0/0x680) from [<803be5d0>] (soc_post_c) [<803be584>] (soc_post_component_init+0x0/0x290) from [<803bfd98>] (snd_soc_reg) [<803bf344>] (snd_soc_register_card+0x0/0x133c) from [<804b4cb8>] (imx_mc13783_) [<804b4c98>] (imx_mc13783_probe+0x0/0x70) from [<802b341c>] (platform_drv_probe) r5:80681d74 r4:806d7544 [<802b33fc>] (platform_drv_probe+0x0/0x24) from [<802b1f38>] (driver_probe_devi) [<802b1eb8>] (driver_probe_device+0x0/0x204) from [<802b2150>] (__driver_attach) r9:80649140 r8:00000095 r7:00000000 r6:87072a3c r5:80681d74 r4:87072a08 [<802b20bc>] (__driver_attach+0x0/0x98) from [<802b06c4>] (bus_for_each_dev+0x6) r7:00000000 r6:802b20bc r5:87035eb8 r4:80681d74 [<802b065c>] (bus_for_each_dev+0x0/0x94) from [<802b1d98>] (driver_attach+0x20/) r7:00000000 r6:871f5600 r5:80672f58 r4:80681d74 [<802b1d78>] (driver_attach+0x0/0x28) from [<802b0ff4>] (bus_add_driver+0x184/0) [<802b0e70>] (bus_add_driver+0x0/0x240) from [<802b2780>] (driver_register+0x80) r7:00000000 r6:80688480 r5:80681d74 r4:87034000 [<802b2700>] (driver_register+0x0/0x148) from [<802b37c4>] (platform_driver_reg) r9:80649140 r8:00000095 r7:00000000 r6:80688480 r5:00000007 r4:87034000 [<802b3778>] (platform_driver_register+0x0/0x60) from [<8062c600>] (imx_mc13783) [<8062c5ec>] (imx_mc13783_audio_driver_init+0x0/0x1c) from [<800086b4>] (do_one) [<80008674>] (do_one_initcall+0x0/0x194) from [<806023f4>] (kernel_init+0xfc/0x) [<806022f8>] (kernel_init+0x0/0x1cc) from [<800280a8>] (do_exit+0x0/0x810) Code: e24cb004 e1a04000 e1a05001 e1a00001 (e5941078) ---[ end trace 67a21a201b7e603a ]--- Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = 80004000 [00000000] *pgd=00000000 Internal error: Oops: 80000005 [#2] SMP ARM Modules linked in: CPU: 0 Tainted: G D W (3.5.0-next-20120725+ #1263) PC is at 0x0 LR is at smp_send_stop+0x58/0xfc pc : [<00000000>] lr : [<80013770>] psr: 60000193 sp : 87035a60 ip : 00000000 fp : 87035a84 r10: 87034000 r9 : 87035b37 r8 : 87035ad4 r7 : 8066819c r6 : 80654f18 r5 : 000f4240 r4 : 87035a64 r3 : 00000000 r2 : 00000000 r1 : 00000006 r0 : 87035a64 Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment user Control: 00c5387d Table: 80004000 DAC: 00000015 Process swapper/0 (pid: 1, stack limit = 0x870342f0) Stack: (0x87035a60 to 0x87036000) 5a60: 80689270 00000000 80689270 80689270 0000000b 87032000 87035a9c 87035a88 5a80: 804b8438 80013724 87032000 87035aa4 87035ae4 87035ab0 800287b0 804b83cc 5aa0: 805848c8 0000000b 8064e040 87036000 87034000 87035acc 00000001 8703225c 5ac0: 87035b37 806887e0 87035ae4 87035acc 87035acc 8703214c 87035b6c 87035ae8 5ae0: 8001286c 800280b4 870342f0 0000000b 00000001 00000008 87034000 00000000 5b00: 60000113 802bcd94 63343265 34303062 61316520 30303430 31652030 30353061 5b20: 65203130 30306131 20313030 39356528 37303134 00202938 8001578c 804b8608 5b40: 805d88e4 87035ca8 00000078 00000000 00000005 00000000 87032000 00000078 5b60: 87035b94 87035b70 80015858 8001267c 87034000 00000000 87035ca8 00000005 5b80: 00000000 87032000 87035bdc 87035b98 800159d0 800157f8 807e6b78 60000013 5ba0: 00000000 00000000 00000028 87035bb8 800b1cf8 00000005 80658c28 00000078 5bc0: 87035ca8 00000000 805d113c 80681f34 87035bfc 87035be0 80015bfc 80015884 5be0: 00000005 80658c28 00000078 87035ca8 87035ca4 87035c00 80008434 80015b64 5c00: 87035c3c 800cc3ec 0000012d 000000d0 00000000 8700cb00 00000000 00008124 5c20: 80655148 804e6c00 805d113c 86c1f6d8 87035c7c 87035c40 800b2298 800b1b90 5c40: 6b636162 800cf944 000000a1 000000d0 87035c7c 87035c60 800cf830 80045114 5c60: 86c20000 8704ec00 00008124 00000124 87035c94 87035c80 87035ca4 87035c88 5c80: 800ca310 804bb180 802bcd90 60000013 ffffffff 87035cdc 87035d0c 87035ca8 5ca0: 8000e760 80008404 00000025 00000025 87035d14 00000000 00000000 00000025 5cc0: 80681db0 871f0a00 00000000 805d113c 80681f34 87035d0c 87035d10 87035cf0 5ce0: 803cad18 802bcd90 60000013 ffffffff 871f0a00 00000025 80681db0 871f0a00 5d00: 87035d2c 87035d10 803cad18 802bcd84 80681db0 871fb600 80681db0 871fb540 5d20: 87035d3c 87035d30 803bbe88 803cacd4 87035d4c 87035d40 803c1858 803bbe80 5d40: 87035d9c 87035d50 803c5abc 803c1844 804e6c00 00000000 00000000 871f0aa8 5d60: 00000000 00000000 00000000 00000000 00000000 80681db0 871ec810 80681db0 5d80: 871f0a00 00000000 805d113c 80681f34 87035dd4 87035da0 803be5d0 803c58fc 5da0: 871f5400 00000006 87035dd4 80681db0 871ec810 00000000 87167840 87167780 5dc0: 00000000 00000000 87035e44 87035dd8 803bfd98 803be590 80681dc0 87035e10 5de0: 00000000 00000000 80681eb0 80681e78 80681ea0 80681db0 80681e88 80681dd0 5e00: 80681e80 80681008 80681f34 871f0a00 80680ff8 00000002 87072a08 806d7544 5e20: 87072a08 87072a08 80681d74 00000095 80649140 8063cbfc 87035e5c 87035e48 5e40: 804b4cb8 803bf350 806d7544 80681d74 87035e6c 87035e60 802b341c 804b4ca4 5e60: 87035e94 87035e70 802b1f38 802b3408 87072a08 80681d74 87072a3c 00000000 5e80: 00000095 80649140 87035eb4 87035e98 802b2150 802b1ec4 80681d74 87035eb8 5ea0: 802b20bc 00000000 87035edc 87035eb8 802b06c4 802b20c8 87024158 870708b4 5ec0: 80681d74 80672f58 871f5600 00000000 87035eec 87035ee0 802b1d98 802b0668 5ee0: 87035f14 87035ef0 802b0ff4 802b1d84 805820cc 87035f00 87034000 80681d74 5f00: 80688480 00000000 87035f3c 87035f18 802b2780 802b0e7c 87034000 00000007 5f20: 80688480 00000000 00000095 80649140 87035f4c 87035f40 802b37c4 802b270c 5f40: 87035f5c 87035f50 8062c600 802b3784 87035fb4 87035f60 800086b4 8062c5f8 5f60: 87035fb4 87035f70 8062c5ec 00000000 00000000 00000006 00000006 8060071c 5f80: 805c7970 60000013 87035fb4 8063cbf4 00000007 80688480 80602270 00000095 5fa0: 80649140 8063cbfc 87035ff4 87035fb8 806023f4 80008680 00000006 00000006 5fc0: 80602270 806022f8 800280a8 00000000 806022f8 800280a8 00000013 00000000 5fe0: 00000000 00000000 00000000 87035ff8 800280a8 80602304 00000000 00000000 Backtrace: [<80013718>] (smp_send_stop+0x0/0xfc) from [<804b8438>] (panic+0x7c/0x1bc) r7:87032000 r6:0000000b r5:80689270 r4:80689270 [<804b83bc>] (panic+0x0/0x1bc) from [<800287b0>] (do_exit+0x708/0x810) r3:87036000 r2:8064e040 r1:0000000b r0:805848c8 [<800280a8>] (do_exit+0x0/0x810) from [<8001286c>] (die+0x1fc/0x40c) [<80012670>] (die+0x0/0x40c) from [<80015858>] (__do_kernel_fault+0x6c/0x8c) [<800157ec>] (__do_kernel_fault+0x0/0x8c) from [<800159d0>] (do_page_fault+0x15) r9:87032000 r8:00000000 r7:00000005 r6:87035ca8 r5:00000000 r4:87034000 [<80015878>] (do_page_fault+0x0/0x26c) from [<80015bfc>] (do_translation_fault+) [<80015b58>] (do_translation_fault+0x0/0xac) from [<80008434>] (do_DataAbort+0x) r7:87035ca8 r6:00000078 r5:80658c28 r4:00000005 [<800083f8>] (do_DataAbort+0x0/0xa4) from [<8000e760>] (__dabt_svc+0x40/0x60) Exception stack(0x87035ca8 to 0x87035cf0) 5ca0: 00000025 00000025 87035d14 00000000 00000000 00000025 5cc0: 80681db0 871f0a00 00000000 805d113c 80681f34 87035d0c 87035d10 87035cf0 5ce0: 803cad18 802bcd90 60000013 ffffffff r7:87035cdc r6:ffffffff r5:60000013 r4:802bcd90 [<802bcd78>] (regmap_read+0x0/0x64) from [<803cad18>] (hw_read+0x50/0x98) r7:871f0a00 r6:80681db0 r5:00000025 r4:871f0a00 [<803cacc8>] (hw_read+0x0/0x98) from [<803bbe88>] (snd_soc_read+0x14/0x18) r5:871fb540 r4:80681db0 [<803bbe74>] (snd_soc_read+0x0/0x18) from [<803c1858>] (soc_widget_read+0x20/0x) [<803c1838>] (soc_widget_read+0x0/0x58) from [<803c5abc>] (snd_soc_dapm_new_wid) [<803c58f0>] (snd_soc_dapm_new_widgets+0x0/0x680) from [<803be5d0>] (soc_post_c) [<803be584>] (soc_post_component_init+0x0/0x290) from [<803bfd98>] (snd_soc_reg) [<803bf344>] (snd_soc_register_card+0x0/0x133c) from [<804b4cb8>] (imx_mc13783_) [<804b4c98>] (imx_mc13783_probe+0x0/0x70) from [<802b341c>] (platform_drv_probe) r5:80681d74 r4:806d7544 [<802b33fc>] (platform_drv_probe+0x0/0x24) from [<802b1f38>] (driver_probe_devi) [<802b1eb8>] (driver_probe_device+0x0/0x204) from [<802b2150>] (__driver_attach) r9:80649140 r8:00000095 r7:00000000 r6:87072a3c r5:80681d74 r4:87072a08 [<802b20bc>] (__driver_attach+0x0/0x98) from [<802b06c4>] (bus_for_each_dev+0x6) r7:00000000 r6:802b20bc r5:87035eb8 r4:80681d74 [<802b065c>] (bus_for_each_dev+0x0/0x94) from [<802b1d98>] (driver_attach+0x20/) r7:00000000 r6:871f5600 r5:80672f58 r4:80681d74 [<802b1d78>] (driver_attach+0x0/0x28) from [<802b0ff4>] (bus_add_driver+0x184/0) [<802b0e70>] (bus_add_driver+0x0/0x240) from [<802b2780>] (driver_register+0x80) r7:00000000 r6:80688480 r5:80681d74 r4:87034000 [<802b2700>] (driver_register+0x0/0x148) from [<802b37c4>] (platform_driver_reg) r9:80649140 r8:00000095 r7:00000000 r6:80688480 r5:00000007 r4:87034000 [<802b3778>] (platform_driver_register+0x0/0x60) from [<8062c600>] (imx_mc13783) [<8062c5ec>] (imx_mc13783_audio_driver_init+0x0/0x1c) from [<800086b4>] (do_one) [<80008674>] (do_one_initcall+0x0/0x194) from [<806023f4>] (kernel_init+0xfc/0x) [<806022f8>] (kernel_init+0x0/0x1cc) from [<800280a8>] (do_exit+0x0/0x810) Code: bad PC value ---[ end trace 67a21a201b7e603b ]--- Fixing recursive fault but reboot is needed! Before I start to investigate this, I would like to know if there is some recent patch I am missing or any other suggestion. Thanks, Fabio Estevam

4 6

[alsa-devel] Intel HDA Sound Randomly Dies
by Alexander V. 26 Jul '12

26 Jul '12

Hi! My sound will randomly quit. The levels (in alsamixer) remain unchanged and the speakers do not get muted, however there is no sound. The only way I can hear sound again is to reload the module "snd_hda_intel". No errors are logged anywhere I thought to check. I have attached the output of the information script that I found on alsa-project.org. I was told to write this email by nevyn in #alsa on Freenode. Please let me know if you need any more information. Alexander <http://www.kaributu.de>

1 0

[alsa-devel] [PATCH] ASoC: ab8500: Remove pointless cast
by Mark Brown 26 Jul '12

26 Jul '12

There's never any need to cast away from void. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/ab8500-codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 3c79592..05d70934 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2405,7 +2405,7 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) dev_dbg(dev, "%s: Enter.\n", __func__); /* Setup AB8500 according to board-settings */ - pdata = (struct ab8500_platform_data *)dev_get_platdata(dev->parent); + pdata = dev_get_platdata(dev->parent); status = ab8500_audio_setup_mics(codec, &pdata->codec->amics); if (status < 0) { pr_err("%s: Failed to setup mics (%d)!\n", __func__, status); -- 1.7.10.4

2 1

[alsa-devel] [PATCH] ASoC: wm8994: Fix some indentation issues
by Mark Brown 26 Jul '12

26 Jul '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index e0125e3..eaa77f9 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2273,7 +2273,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_4 + reg_offset, WM8994_FLL1_N_MASK, - fll.n << WM8994_FLL1_N_SHIFT); + fll.n << WM8994_FLL1_N_SHIFT); snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_5 + reg_offset, WM8994_FLL1_FRC_NCO | WM8958_FLL1_BYP | @@ -3501,7 +3501,7 @@ static void wm8958_default_micdet(u16 status, void *data) snd_soc_jack_report(wm8994->micdet[0].jack, 0, wm8994->btn_mask | - SND_JACK_HEADSET); + SND_JACK_HEADSET); } return; } -- 1.7.10.4

1 0

[alsa-devel] [PATCH] ASoC: wm8994: Ensure we get a notification on startup for jackdet
by Mark Brown 26 Jul '12

26 Jul '12

Since jackdet only reports deltas it won't generate an interrupt on startup when a jack is not present. This doesn't make a difference to userspace but does mean we don't generate a notification via the internal notifier chains. Fix that by scheduling a work to poll the chip after the clock is enabled. Use an extremely large timeout since there's no urgency and we don't want to report a false negative. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 37 ++++++++++++++++++++++++++++++++++++- sound/soc/codecs/wm8994.h | 2 ++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 1237c11..7bb0c2c 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -789,11 +789,27 @@ static int clk_sys_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_codec *codec = w->codec; + struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); switch (event) { case SND_SOC_DAPM_PRE_PMU: return configure_clock(codec); + case SND_SOC_DAPM_POST_PMU: + /* + * JACKDET won't run until we start the clock and it + * only reports deltas, make sure we notify the state + * up the stack on startup. Use a *very* generous + * timeout for paranoia, there's no urgency and we + * don't want false reports. + */ + if (wm8994->jackdet && !wm8994->clk_has_run) { + schedule_delayed_work(&wm8994->jackdet_bootstrap, + msecs_to_jiffies(1000)); + wm8994->clk_has_run = true; + } + break; + case SND_SOC_DAPM_POST_PMD: configure_clock(codec); break; @@ -1632,7 +1648,8 @@ SND_SOC_DAPM_SUPPLY("VMID", SND_SOC_NOPM, 0, 0, vmid_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_SUPPLY("CLK_SYS", SND_SOC_NOPM, 0, 0, clk_sys_event, - SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | + SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_SUPPLY("DSP1CLK", SND_SOC_NOPM, 3, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("DSP2CLK", SND_SOC_NOPM, 2, 0, NULL, 0), @@ -3508,10 +3525,22 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) SND_JACK_MECHANICAL | SND_JACK_HEADSET | wm8994->btn_mask); + /* Since we only report deltas force an update, ensures we + * avoid bootstrapping issues with the core. */ + snd_soc_jack_report(wm8994->micdet[0].jack, 0, 0); + pm_runtime_put(codec->dev); return IRQ_HANDLED; } +static void wm1811_jackdet_bootstrap(struct work_struct *work) +{ + struct wm8994_priv *wm8994 = container_of(work, + struct wm8994_priv, + jackdet_bootstrap.work); + wm1811_jackdet_irq(0, wm8994); +} + /** * wm8958_mic_detect - Enable microphone detection via the WM8958 IRQ * @@ -3582,6 +3611,10 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, * otherwise jump straight to microphone detection. */ if (wm8994->jackdet) { + /* Disable debounce for the initial detect */ + snd_soc_update_bits(codec, WM1811_JACKDET_CTRL, + WM1811_JACKDET_DB, 0); + snd_soc_update_bits(codec, WM8958_MICBIAS2, WM8958_MICB2_DISCH, WM8958_MICB2_DISCH); @@ -3706,6 +3739,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) mutex_init(&wm8994->accdet_lock); INIT_DELAYED_WORK(&wm8994->mic_work, wm8994_mic_work); + INIT_DELAYED_WORK(&wm8994->jackdet_bootstrap, + wm1811_jackdet_bootstrap); for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++) init_completion(&wm8994->fll_locked[i]); diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index e6d8209..f142ec1 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h @@ -81,6 +81,7 @@ struct wm8994_priv { struct completion fll_locked[2]; bool fll_locked_irq; bool fll_byp; + bool clk_has_run; int vmid_refcount; int active_refcount; @@ -134,6 +135,7 @@ struct wm8994_priv { int btn_mask; bool jackdet; int jackdet_mode; + struct delayed_work jackdet_bootstrap; wm8958_micdet_cb jack_cb; void *jack_cb_data; -- 1.7.10.4

1 0

[alsa-devel] [PATCH 1/2] ASoC: wm_hubs: Factor out DC servo readback code
by Mark Brown 26 Jul '12

26 Jul '12

It's currently only used in one place but another user will be added shortly and there's an argument it's clearer anyway. Also add support for readback in mode 1, though it's not currently used. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_hubs.c | 65 +++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 22 deletions(-) diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 728a180..6ab69f3 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -199,6 +199,47 @@ static void wm_hubs_dcs_cache_set(struct snd_soc_codec *codec, u16 dcs_cfg) list_add_tail(&cache->list, &hubs->dcs_cache); } +static void wm_hubs_read_dc_servo(struct snd_soc_codec *codec, + u16 *reg_l, u16 *reg_r) +{ + struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); + u16 dcs_reg, reg; + + switch (hubs->dcs_readback_mode) { + case 2: + dcs_reg = WM8994_DC_SERVO_4E; + break; + case 1: + dcs_reg = WM8994_DC_SERVO_READBACK; + break; + default: + dcs_reg = WM8993_DC_SERVO_3; + break; + } + + /* Different chips in the family support different readback + * methods. + */ + switch (hubs->dcs_readback_mode) { + case 0: + *reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1) + & WM8993_DCS_INTEG_CHAN_0_MASK; + *reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2) + & WM8993_DCS_INTEG_CHAN_1_MASK; + break; + case 2: + case 1: + reg = snd_soc_read(codec, dcs_reg); + *reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK) + >> WM8993_DCS_DAC_WR_VAL_1_SHIFT; + *reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK; + break; + default: + WARN(1, "Unknown DCS readback method\n"); + return; + } +} + /* * Startup calibration of the DC servo */ @@ -207,7 +248,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_dcs_cache *cache; s8 offset; - u16 reg, reg_l, reg_r, dcs_cfg, dcs_reg; + u16 reg_l, reg_r, dcs_cfg, dcs_reg; switch (hubs->dcs_readback_mode) { case 2: @@ -245,27 +286,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) WM8993_DCS_TRIG_STARTUP_1); } - /* Different chips in the family support different readback - * methods. - */ - switch (hubs->dcs_readback_mode) { - case 0: - reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1) - & WM8993_DCS_INTEG_CHAN_0_MASK; - reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2) - & WM8993_DCS_INTEG_CHAN_1_MASK; - break; - case 2: - case 1: - reg = snd_soc_read(codec, dcs_reg); - reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK) - >> WM8993_DCS_DAC_WR_VAL_1_SHIFT; - reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK; - break; - default: - WARN(1, "Unknown DCS readback method\n"); - return; - } + wm_hubs_read_dc_servo(codec, &reg_l, &reg_r); dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r); -- 1.7.10.4

1 1

[alsa-devel] [RESEND] ASoC: omap-abe-twl6040: Add device tree support
by Peter Ujfalusi 26 Jul '12

26 Jul '12

When the board boots with device tree the driver will receive the name of the card, DAPM routing map, phandle for the audio components described in the dts file, mclk speed, and the possibility of detecting the jack detection. The card will be set up based on this information. Since the routing is provided via DT we can mark the card fully routed so core can take care of disconnecting the unused pins. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Reviwed-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Hello, This is the v3 of the DT support patch rebased on latest ASoC: needed to be fixed because of this commit (cpu_dai_of_node renamed to cpu_of_node): bc92657 ASoC: make snd_soc_dai_link more symmetrical Could you queue this for 3.6? Thank you, Peter .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++++++++++++ sound/soc/omap/omap-abe-twl6040.c | 145 ++++++++++++++++---- 2 files changed, 206 insertions(+), 30 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt diff --git a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt new file mode 100644 index 0000000..65dec87 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt @@ -0,0 +1,91 @@ +* Texas Instruments OMAP4+ and twl6040 based audio setups + +Required properties: +- compatible: "ti,abe-twl6040" +- ti,model: Name of the sound card ( for example "SDP4430") +- ti,mclk-freq: MCLK frequency for HPPLL operation +- ti,mcpdm: phandle for the McPDM node +- ti,twl6040: phandle for the twl6040 core node +- ti,audio-routing: List of connections between audio components. + Each entry is a pair of strings, the first being the connection's sink, + the second being the connection's source. + +Optional properties: +- ti,dmic: phandle for the OMAP dmic node if the machine have it connected +- ti,jack_detection: Need to be set to <1> if the board capable to detect jack + insertion, removal. + +Available audio endpoints for the audio-routing table: + +Board connectors: + * Headset Stereophone + * Earphone Spk + * Ext Spk + * Line Out + * Vibrator + * Headset Mic + * Main Handset Mic + * Sub Handset Mic + * Line In + * Digital Mic + +twl6040 pins: + * HSOL + * HSOR + * EP + * HFL + * HFR + * AUXL + * AUXR + * VIBRAL + * VIBRAR + * HSMIC + * MAINMIC + * SUBMIC + * AFML + * AFMR + + * Headset Mic Bias + * Main Mic Bias + * Digital Mic1 Bias + * Digital Mic2 Bias + +Digital mic pins: + * DMic + +Example: + +sound { + compatible = "ti,abe-twl6040"; + ti,model = "SDP4430"; + + ti,jack-detection = <1>; + ti,mclk-freq = <38400000>; + + ti,mcpdm = <&mcpdm>; + ti,dmic = <&dmic>; + + ti,twl6040 = <&twl6040>; + + /* Audio routing */ + ti,audio-routing = + "Headset Stereophone", "HSOL", + "Headset Stereophone", "HSOR", + "Earphone Spk", "EP", + "Ext Spk", "HFL", + "Ext Spk", "HFR", + "Line Out", "AUXL", + "Line Out", "AUXR", + "Vibrator", "VIBRAL", + "Vibrator", "VIBRAR", + "HSMIC", "Headset Mic", + "Headset Mic", "Headset Mic Bias", + "MAINMIC", "Main Handset Mic", + "Main Handset Mic", "Main Mic Bias", + "SUBMIC", "Sub Handset Mic", + "Sub Handset Mic", "Main Mic Bias", + "AFML", "Line In", + "AFMR", "Line In", + "DMic", "Digital Mic", + "Digital Mic", "Digital Mic1 Bias"; +}; diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 9d93793..be525df 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -25,6 +25,7 @@ #include <linux/mfd/twl6040.h> #include <linux/platform_data/omap-abe-twl6040.h> #include <linux/module.h> +#include <linux/of.h> #include <sound/core.h> #include <sound/pcm.h> @@ -43,6 +44,8 @@ struct abe_twl6040 { int jack_detection; /* board can detect jack events */ int mclk_freq; /* MCLK frequency speed for twl6040 */ + + struct platform_device *dmic_codec_dev; }; static int omap_abe_hw_params(struct snd_pcm_substream *substream, @@ -185,17 +188,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) int hs_trim; int ret = 0; - /* Disable not connected paths if not used */ - twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone"); - twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk"); - twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk"); - twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out"); - twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator"); - twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In"); - /* * Configure McPDM offset cancellation based on the HSOTRIM value from * twl6040. @@ -216,6 +208,24 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); } + /* + * NULL pdata means we booted with DT. In this case the routing is + * provided and the card is fully routed, no need to mark pins. + */ + if (!pdata) + return ret; + + /* Disable not connected paths if not used */ + twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone"); + twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk"); + twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk"); + twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out"); + twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator"); + twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic"); + twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic"); + twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic"); + twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In"); + return ret; } @@ -270,52 +280,116 @@ static struct snd_soc_card omap_abe_card = { static __devinit int omap_abe_probe(struct platform_device *pdev) { struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev); + struct device_node *node = pdev->dev.of_node; struct snd_soc_card *card = &omap_abe_card; struct abe_twl6040 *priv; int num_links = 0; - int ret; + int ret = 0; card->dev = &pdev->dev; - if (!pdata) { - dev_err(&pdev->dev, "Missing pdata\n"); - return -ENODEV; - } - priv = devm_kzalloc(&pdev->dev, sizeof(struct abe_twl6040), GFP_KERNEL); if (priv == NULL) return -ENOMEM; - if (pdata->card_name) { - card->name = pdata->card_name; + priv->dmic_codec_dev = ERR_PTR(-EINVAL); + + if (node) { + struct device_node *dai_node; + + if (snd_soc_of_parse_card_name(card, "ti,model")) { + dev_err(&pdev->dev, "Card name is not provided\n"); + return -ENODEV; + } + + ret = snd_soc_of_parse_audio_routing(card, + "ti,audio-routing"); + if (ret) { + dev_err(&pdev->dev, + "Error while parsing DAPM routing\n"); + return ret; + } + + dai_node = of_parse_phandle(node, "ti,mcpdm", 0); + if (!dai_node) { + dev_err(&pdev->dev, "McPDM node is not provided\n"); + return -EINVAL; + } + abe_twl6040_dai_links[0].cpu_dai_name = NULL; + abe_twl6040_dai_links[0].cpu_of_node = dai_node; + + dai_node = of_parse_phandle(node, "ti,dmic", 0); + if (dai_node) { + num_links = 2; + abe_twl6040_dai_links[1].cpu_dai_name = NULL; + abe_twl6040_dai_links[1].cpu_of_node = dai_node; + + priv->dmic_codec_dev = platform_device_register_simple( + "dmic-codec", -1, NULL, 0); + if (IS_ERR(priv->dmic_codec_dev)) { + dev_err(&pdev->dev, + "Can't instantiate dmic-codec\n"); + return PTR_ERR(priv->dmic_codec_dev); + } + } else { + num_links = 1; + } + + of_property_read_u32(node, "ti,jack-detection", + &priv->jack_detection); + of_property_read_u32(node, "ti,mclk-freq", + &priv->mclk_freq); + if (!priv->mclk_freq) { + dev_err(&pdev->dev, "MCLK frequency not provided\n"); + ret = -EINVAL; + goto err_unregister; + } + + omap_abe_card.fully_routed = 1; + } else if (pdata) { + if (pdata->card_name) { + card->name = pdata->card_name; + } else { + dev_err(&pdev->dev, "Card name is not provided\n"); + return -ENODEV; + } + + if (pdata->has_dmic) + num_links = 2; + else + num_links = 1; + + priv->jack_detection = pdata->jack_detection; + priv->mclk_freq = pdata->mclk_freq; } else { - dev_err(&pdev->dev, "Card name is not provided\n"); + dev_err(&pdev->dev, "Missing pdata\n"); return -ENODEV; } - priv->jack_detection = pdata->jack_detection; - priv->mclk_freq = pdata->mclk_freq; - if (!priv->mclk_freq) { dev_err(&pdev->dev, "MCLK frequency missing\n"); - return -ENODEV; + ret = -ENODEV; + goto err_unregister; } - if (pdata->has_dmic) - num_links = 2; - else - num_links = 1; - card->dai_link = abe_twl6040_dai_links; card->num_links = num_links; snd_soc_card_set_drvdata(card, priv); ret = snd_soc_register_card(card); - if (ret) + if (ret) { dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); + goto err_unregister; + } + + return 0; + +err_unregister: + if (!IS_ERR(priv->dmic_codec_dev)) + platform_device_unregister(priv->dmic_codec_dev); return ret; } @@ -323,17 +397,28 @@ static __devinit int omap_abe_probe(struct platform_device *pdev) static int __devexit omap_abe_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); + struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); snd_soc_unregister_card(card); + if (!IS_ERR(priv->dmic_codec_dev)) + platform_device_unregister(priv->dmic_codec_dev); + return 0; } +static const struct of_device_id omap_abe_of_match[] = { + {.compatible = "ti,abe-twl6040", }, + { }, +}; +MODULE_DEVICE_TABLE(of, omap_abe_of_match); + static struct platform_driver omap_abe_driver = { .driver = { .name = "omap-abe-twl6040", .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, + .of_match_table = omap_abe_of_match, }, .probe = omap_abe_probe, .remove = __devexit_p(omap_abe_remove), -- 1.7.8.6

2 6

Re: [alsa-devel] [PATCH - CA0132 HDA Codec 1/2] ALSA: Update Creative CA0132 codec to add DSP features.
by Takashi Iwai 26 Jul '12

26 Jul '12

At Fri, 13 Jul 2012 16:44:28 -0700, ian_minett(a)creativelabs.com wrote: > > From: Ian Minett <ian_minett(a)creativelabs.com> > > Thanks very much for the feedback on the last submission, apologies for the > delayed response. Please find attached the new set of patches for updating > the CA0132 codec, which takes many of the suggestions into account. > > - Ian > > --- > > ALSA: Update Creative CA0132 HDA codec to introduce DSP features. > > patch_ca0132.c: > - Add DSP support to codec. > - 3 capture subdevices supported: Analog Mic1/Digital Mic, > Analog Mic2 and What U Hear. > - Add jack detection kcontrol > - Use request_firmware() for loading DSP binaries. Ideally, these should be split to each patch. Though I see it's not so trivial in this case... But please provide more technical details. I can only guess what's VNID and what's effect module ID. Give more descriptions. > hda_intel.c: > - in azx_pcm_trigger(), change spin_lock()/spin_unlock() pair to > spin_lock_irqsave()/spin_unlock_irqrestore(). This still seems to be > necessary - if an interrupt occurs after azx_stream_start() and before > spin_unlock(), it will cause deadlock as azx_interrupt() also acquires > chip->reg_lock. Oh, this is basically because you are doing pretty bad things: calling PCM trigger callback from the codec driver. What's the reason behind it? Since the whole patch lacks the big and small pictures, it's hard to judge... > ctefx.bin: > - DSP binary for firmware repository, for driver to load from > /lib/firmware directory. Please submit the patch for adding this, too. Or, at least, give a kernel config to build without the firmware. Otherwise you'll break the driver. Looking though the code, the biggest problem is that you are using float in the code. This is now allowed in the kernel at all. You have to rewrite without float type -- i.e. never use "float" in the code, for both fields/arguments and computations. Also, some other review comments below: > diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c > index d0d3540..c7cdfe1 100644 > --- a/sound/pci/hda/patch_ca0132.c > +++ b/sound/pci/hda/patch_ca0132.c > @@ -1,5 +1,5 @@ > /* > - * HD audio interface patch for Creative CA0132 chip > + * HD audio interface patch for Creative Sound Core3D chip > * > * Copyright (c) 2011, Creative Technology Ltd. > * > @@ -25,18 +25,470 @@ > #include <linux/delay.h> > #include <linux/slab.h> > #include <linux/pci.h> > -#include <linux/mutex.h> > #include <linux/module.h> > +#include <linux/firmware.h> > #include <sound/core.h> > +#include <sound/tlv.h> > #include "hda_codec.h" > #include "hda_local.h" > +#include "hda_jack.h" > #include "hda_auto_parser.h" > > +#include "ca0132_regs.h" > + > +/* Enable this to see more debug messages. */ > +/*#define ENABLE_CA0132_DEBUG*/ > +/* Enable this to see controls for tuning purpose. */ > +/*#define ENABLE_TUNING_CONTROLS*/ > + > +#define FLOAT_ZERO 0x00000000 > +#define FLOAT_ONE 0x3f800000 > +#define FLOAT_TWO 0x40000000 > +#define FLOAT_MINUS_5 0xc0a00000 > + > +#define UNSOL_TAG_HP 0x10 > +#define UNSOL_TAG_AMIC1 0x12 > +#define UNSOL_TAG_DSP 0x16 > + > +#define SUCCEEDED(_x) (((int)(_x)) >= 0) > +#define FAILED(_x) (((int)(_x)) < 0) > +#define CT_OK (0) > +#define CT_FAIL (-1) Please avoid home-baked macros like this. Usually a function returns zero for succcess and a negative error code. No need to define special CT_XX macros. > + > +#define MIN(x, y) (((x) < (y)) ? (x) : (y)) > +#define MAX(x, y) (((x) > (y)) ? (x) : (y)) Use the standard min() and max() macros. > +#define DSP_DMA_WRITE_BUFLEN_INIT (1UL<<18) > +#define DSP_DMA_WRITE_BUFLEN_OVLY (1UL<<15) > + > +#define DMA_TRANSFER_FRAME_SIZE_NWORDS 8 > +#define DMA_TRANSFER_MAX_FRAME_SIZE_NWORDS 32 > +#define DMA_OVERLAY_FRAME_SIZE_NWORDS 2 > + > +#define MASTERCONTROL 0x80 > +#define MASTERCONTROL_ALLOC_DMA_CHAN 9 > +#define MASTERCONTROL_QUERY_SPEAKER_EQ_ADDRESS 22 > + > #define WIDGET_CHIP_CTRL 0x15 > #define WIDGET_DSP_CTRL 0x16 > > -#define WUH_MEM_CONNID 10 > -#define DSP_MEM_CONNID 16 > +#define MEM_CONNID_MICIN1 3 > +#define MEM_CONNID_MICIN2 5 > +#define MEM_CONNID_MICOUT1 12 > +#define MEM_CONNID_MICOUT2 14 > +#define MEM_CONNID_WUH 10 > +#define MEM_CONNID_DSP 16 > +#define MEM_CONNID_DMIC 100 > + > +#define SCP_SET 0 > +#define SCP_GET 1 > + > +#define SPEQ_FILE "ctspeq.bin" > +#define SPEQ_SIZE 0x2040 > +#define EFX_FILE "ctefx.bin" > +#define EFX_SIZE 0xA003C Don't forget to add MODULE_FIRMWARE() with these files, too. I stop at this point... Too big to review... thanks, Takashi

2 3