May 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] sound: soc: samsung: dma.c: Fix to remove null pointer checks that could never happen
by Rickard Strandqvist 23 May '14

23 May '14

Removal of null pointer checks that could never happen Signed-off-by: Rickard Strandqvist <rickard_strandqvist(a)spectrumdigital.se> --- sound/soc/samsung/dma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index dc09b71..0f17ae0 100644 --- a/sound/soc/samsung/dma.c +++ b/sound/soc/samsung/dma.c @@ -124,8 +124,7 @@ static void audio_buffdone(void *data) if (prtd->dma_pos >= prtd->dma_end) prtd->dma_pos = prtd->dma_start; - if (substream) - snd_pcm_period_elapsed(substream); + snd_pcm_period_elapsed(substream); spin_lock(&prtd->lock); if (!samsung_dma_has_circular()) { -- 1.7.10.4

2 1

[alsa-devel] The resume of sgtl5000 causes kernel Oops
by Shawn Guo 23 May '14

23 May '14

The suspend/resume test on imx51-babbage board discovers a kernel Oops caused by sgtl5000_resume(). I believe it happens due to commit e5d80e82e32e (ASoC: sgtl5000: Convert to use regmap directly). After the commit, it seems that the codec->reg_cache in function sgtl5000_restore_regs() becomes invalid. It looks that the register restoring in the function requires some strict sequence, I'm not sure what the correct fix is. Shawn $ echo mem > /sys/power/state PM: Syncing filesystems ... done. PM: Preparing system for mem sleep Freezing user space processes ... (elapsed 0.006 seconds) done. Freezing remaining freezable tasks ... (elapsed 0.004 seconds) done. PM: Entering mem sleep PM: suspend of devices complete after 41.598 msecs PM: suspend devices took 0.050 seconds PM: late suspend of devices complete after 6.434 msecs PM: noirq suspend of devices complete after 6.735 msecs Disabling non-boot CPUs ... PM: noirq resume of devices complete after 10.871 msecs PM: early resume of devices complete after 5.241 msecs Unable to handle kernel NULL pointer dereference at virtual address 00000010 pgd = 80004000 [00000010] *pgd=00000000 Internal error: Oops: 17 [#1] SMP ARM Modules linked in: CPU: 0 PID: 21 Comm: kworker/0:1 Not tainted 3.15.0-rc3-00071-g49a96400a142-dirty #118 Workqueue: events soc_resume_deferred task: 9e11c440 ti: 9e14e000 task.ti: 9e14e000 PC is at sgtl5000_resume+0x7c/0x124 LR is at mark_held_locks+0x70/0x94 pc : [<804e8fb8>] lr : [<800661b8>] psr: 80000013 sp : 9e14fe40 ip : 80a26e60 fp : 9e14fe5c r10: 9fbd6b00 r9 : 00000001 r8 : 00000000 r7 : 00000010 r6 : 9e369a00 r5 : 00000002 r4 : 00000000 r3 : 00000000 r2 : 00000000 r1 : 00000000 r0 : 9e369a00 Flags: Nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c5387d Table: ac828019 DAC: 00000015 Process kworker/0:1 (pid: 21, stack limit = 0x9e14e240) Stack: (0x9e14fe40 to 0x9e150000) fe40: 9e387d84 9e369a00 9e387c64 9e387da4 9e14fe84 9e14fe60 804d90d0 804e8f48 fe60: 9e135300 9e387d84 9fbd36c0 9e14e000 00000000 9fbd6b00 9e14fee4 9e14fe88 fe80: 8003f060 804d8fd0 00000001 00000000 8003efec 9fbd36c0 8003f620 00000000 fea0: 00000000 9e14fea8 80e981a0 80a26e60 00000000 80843dfc 80661fac 9e135300 fec0: 9fbd36f0 9e14e000 9e135318 9e14e000 9fbd36c0 8094e442 9e14ff24 9e14fee8 fee0: 8003f700 8003eec4 80662510 00000000 9e134ac0 9e14e000 8003f5dc 00000000 ff00: 9e134ac0 9e135300 8003f5dc 00000000 00000000 00000000 9e14ffac 9e14ff28 ff20: 800463bc 8003f5e8 800663bc 00000000 9e14ff54 9e135300 00000000 00000000 ff40: dead4ead ffffffff ffffffff 80952424 00000000 00000000 807cc28c 9e14ff5c ff60: 9e14ff5c 00000000 00000000 dead4ead ffffffff ffffffff 80952424 00000000 ff80: 00000000 807cc28c 9e14ff88 9e14ff88 9e134ac0 800462ec 00000000 00000000 ffa0: 00000000 9e14ffb0 8000eb68 800462f8 00000000 00000000 00000000 00000000 ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 00c37f70 76f142d0 Backtrace: [<804e8f3c>] (sgtl5000_resume) from [<804d90d0>] (soc_resume_deferred+0x10c/0x30c) r7:9e387da4 r6:9e387c64 r5:9e369a00 r4:9e387d84 [<804d8fc4>] (soc_resume_deferred) from [<8003f060>] (process_one_work+0x1a8/0x444) r10:9fbd6b00 r8:00000000 r7:9e14e000 r6:9fbd36c0 r5:9e387d84 r4:9e135300 [<8003eeb8>] (process_one_work) from [<8003f700>] (worker_thread+0x124/0x398) r10:8094e442 r9:9fbd36c0 r8:9e14e000 r7:9e135318 r6:9e14e000 r5:9fbd36f0 r4:9e135300 [<8003f5dc>] (worker_thread) from [<800463bc>] (kthread+0xd0/0xec) r10:00000000 r9:00000000 r8:00000000 r7:8003f5dc r6:9e135300 r5:9e134ac0 r4:00000000 [<800462ec>] (kthread) from [<8000eb68>] (ret_from_fork+0x14/0x2c) r7:00000000 r6:00000000 r5:800462ec r4:9e134ac0 Code: e1a03084 e1a01004 e1a00006 0afffff0 (e19720b3) ---[ end trace eeb2712470f0de34 ]--- Unable to handle kernel paging request at virtual address ffffffd0 pgd = 80004000 [ffffffd0] *pgd=afff6821, *pte=00000000, *ppte=00000000 Internal error: Oops: 17 [#2] SMP ARM Modules linked in: CPU: 0 PID: 21 Comm: kworker/0:1 Tainted: G D 3.15.0-rc3-00071-g49a96400a142-dirty #118 task: 9e11c440 ti: 9e14e000 task.ti: 9e14e000 PC is at kthread_data+0x10/0x18 LR is at wq_worker_sleeping+0x14/0xc8 pc : [<8004673c>] lr : [<8004047c>] psr: 00000193 sp : 9e14fb00 ip : 9e14fb10 fp : 9e14fb0c r10: 808f2d2c r9 : 9e11c698 r8 : 808e8c40 r7 : 00000000 r6 : 9e14e000 r5 : 9e11c440 r4 : 00000000 r3 : 00000000 r2 : 00000000 r1 : 00000000 r0 : 9e11c440 Flags: nzcv IRQs off FIQs on Mode SVC_32 ISA ARM Segment user Control: 10c5387d Table: ac828019 DAC: 00000015 Process kworker/0:1 (pid: 21, stack limit = 0x9e14e240) Stack: (0x9e14fb00 to 0x9e150000) fb00: 9e14fb24 9e14fb10 8004047c 80046738 00000020 9fbd3c40 9e14fbc4 9e14fb28 fb20: 8065dd8c 80040474 9e14e000 60000113 9e14fb4c 9e14fb40 800663bc 800661e8 fb40: 9e14fb74 9e14fb50 808e8c40 808e8c40 9e11c440 9e1078c0 8094fe04 9e116100 fb60: 9e116604 9e11c440 9e14fb84 9e14fb78 800786f0 80078498 9e14fbd4 9e14fb88 fb80: 80029c60 800786e4 00000000 00000000 800299ec 9e11c438 808e7390 00000001 fba0: 9e11c438 9e11c440 9e11c438 9e14e000 9e11c614 9e068000 9e14fbd4 9e14fbc8 fbc0: 8065e114 8065da60 9e14fc0c 9e14fbd8 8002b088 8065e0e8 9e14e000 00000001 fbe0: 9e11c614 9e14fbf0 8094e944 9e11c65c 9e14fbf0 9e14fbf0 80028d90 808f760c fc00: 9e14fc8c 9e14fc10 80011ff4 8002aa90 9e14e240 0000000b 00000008 00000000 fc20: 00000000 60000113 65000001 33306131 20343830 30613165 34303031 61316520 fc40: 30303030 61302036 66666666 28203066 37393165 33623032 80002029 80659664 fc60: 80823f48 00000010 00000017 00000000 9e14fdf8 00000010 00000001 9e11c440 fc80: 9e14fca4 9e14fc90 80658498 80011dfc 9e14fdf8 00000017 9e14fd44 9e14fca8 fca0: 8001bcd8 80658448 00000037 00000000 9e14fccc 9e14fcc0 800613d0 800612f8 fcc0: 9e14fcf4 9e14fcd0 8007911c 800613c8 9fbd3c40 9e14e000 808e7ffc 9e14e000 fce0: 00000004 00000001 00000004 00000006 9e11c440 60000013 60000013 00000000 fd00: 9e14fd2c 9e14fd10 800661b8 80063254 9e14e000 80012928 9e11c440 00000017 fd20: 8001bb20 808f8314 00000010 9e14fdf8 00000001 9fbd6b00 9e14fdf4 9e14fd48 fd40: 8000840c 8001bb2c 800663bc 800661e8 9e14fe0c 9e14fd60 80012928 800663b4 fd60: 00000001 9e11c8a0 00000000 9e11c440 00000001 00000007 80903a24 80e3ea20 fd80: 60000013 60000013 00000000 9e14fe0c 80a26e60 9e14fda8 800661b8 8006d650 fda0: 20000013 ffffffff 00000000 00000000 00000000 00000000 80e3f308 00000007 fdc0: 60000013 80660be4 9e14fde4 00000000 00000000 804e8fb8 80000013 ffffffff fde0: 9e14fe2c 00000000 9e14fe5c 9e14fdf8 800128a4 800083dc 9e369a00 00000000 fe00: 00000000 00000000 00000000 00000002 9e369a00 00000010 00000000 00000001 fe20: 9fbd6b00 9e14fe5c 80a26e60 9e14fe40 800661b8 804e8fb8 80000013 ffffffff fe40: 9e387d84 9e369a00 9e387c64 9e387da4 9e14fe84 9e14fe60 804d90d0 804e8f48 fe60: 9e135300 9e387d84 9fbd36c0 9e14e000 00000000 9fbd6b00 9e14fee4 9e14fe88 fe80: 8003f060 804d8fd0 00000001 00000000 8003efec 9fbd36c0 8003f620 00000000 fea0: 00000000 9e14fea8 80e981a0 80a26e60 00000000 80843dfc 80661fac 9e135300 fec0: 9fbd36f0 9e14e000 9e135318 9e14e000 9fbd36c0 8094e442 9e14ff24 9e14fee8 fee0: 8003f700 8003eec4 80662510 00000000 9e134ac0 9e14e000 8003f5dc 00000000 ff00: 9e134ac0 9e135300 8003f5dc 00000000 00000000 00000000 9e14ffac 9e14ff28 ff20: 800463bc 8003f5e8 800663bc 00000000 9e14ff54 9e135300 00000000 00000000 ff40: dead4ead ffffffff ffffffff 80952424 00000000 00000000 807cc28c 9e14ff5c ff60: 9e14ff5c 00000001 00010001 dead4ead ffffffff ffffffff 80952424 00000000 ff80: 00000000 807cc28c 9e14ff88 9e14ff88 9e134ac0 800462ec 00000000 00000000 ffa0: 00000000 9e14ffb0 8000eb68 800462f8 00000000 00000000 00000000 00000000 ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 00c37f70 76f142d0 Backtrace: [<8004672c>] (kthread_data) from [<8004047c>] (wq_worker_sleeping+0x14/0xc8) [<80040468>] (wq_worker_sleeping) from [<8065dd8c>] (__schedule+0x338/0x5cc) r4:9fbd3c40 r3:00000020 [<8065da54>] (__schedule) from [<8065e114>] (schedule+0x38/0x88) r10:9e068000 r9:9e11c614 r8:9e14e000 r7:9e11c438 r6:9e11c440 r5:9e11c438 r4:00000001 [<8065e0dc>] (schedule) from [<8002b088>] (do_exit+0x604/0x8d8) [<8002aa84>] (do_exit) from [<80011ff4>] (die+0x204/0x3c0) r7:808f760c [<80011df0>] (die) from [<80658498>] (__do_kernel_fault.part.9+0x5c/0x7c) r10:9e11c440 r9:00000001 r8:00000010 r7:9e14fdf8 r6:00000000 r5:00000017 r4:00000010 [<8065843c>] (__do_kernel_fault.part.9) from [<8001bcd8>] (do_page_fault+0x1b8/0x3e4) r7:00000017 r3:9e14fdf8 [<8001bb20>] (do_page_fault) from [<8000840c>] (do_DataAbort+0x3c/0xa0) r10:9fbd6b00 r9:00000001 r8:9e14fdf8 r7:00000010 r6:808f8314 r5:8001bb20 r4:00000017 [<800083d0>] (do_DataAbort) from [<800128a4>] (__dabt_svc+0x44/0x80) Exception stack(0x9e14fdf8 to 0x9e14fe40) fde0: 9e369a00 00000000 fe00: 00000000 00000000 00000000 00000002 9e369a00 00000010 00000000 00000001 fe20: 9fbd6b00 9e14fe5c 80a26e60 9e14fe40 800661b8 804e8fb8 80000013 ffffffff r8:00000000 r7:9e14fe2c r6:ffffffff r5:80000013 r4:804e8fb8 [<804e8f3c>] (sgtl5000_resume) from [<804d90d0>] (soc_resume_deferred+0x10c/0x30c) r7:9e387da4 r6:9e387c64 r5:9e369a00 r4:9e387d84 [<804d8fc4>] (soc_resume_deferred) from [<8003f060>] (process_one_work+0x1a8/0x444) r10:9fbd6b00 r8:00000000 r7:9e14e000 r6:9fbd36c0 r5:9e387d84 r4:9e135300 [<8003eeb8>] (process_one_work) from [<8003f700>] (worker_thread+0x124/0x398) r10:8094e442 r9:9fbd36c0 r8:9e14e000 r7:9e135318 r6:9e14e000 r5:9fbd36f0 r4:9e135300 [<8003f5dc>] (worker_thread) from [<800463bc>] (kthread+0xd0/0xec) r10:00000000 r9:00000000 r8:00000000 r7:8003f5dc r6:9e135300 r5:9e134ac0 r4:00000000 [<800462ec>] (kthread) from [<8000eb68>] (ret_from_fork+0x14/0x2c) r7:00000000 r6:00000000 r5:800462ec r4:9e134ac0 Code: e1a0c00d e92dd800 e24cb004 e590322c (e5130030) ---[ end trace eeb2712470f0de35 ]--- Fixing recursive fault but reboot is needed! BUG: spinlock lockup suspected on CPU#0, kworker/0:1/21 lock: 0x9fbd3c40, .magic: dead4ead, .owner: kworker/0:1/21, .owner_cpu: 0 CPU: 0 PID: 21 Comm: kworker/0:1 Tainted: G D 3.15.0-rc3-00071-g49a96400a142-dirty #118 Backtrace: [<80011c50>] (dump_backtrace) from [<80011dec>] (show_stack+0x18/0x1c) r6:016e3600 r5:00000000 r4:00000000 r3:00000000 [<80011dd4>] (show_stack) from [<8065b720>] (dump_stack+0x88/0xa4) [<8065b698>] (dump_stack) from [<806595ac>] (spin_dump+0x7c/0x90) r5:9fbd3c40 r4:9e11c440 [<80659530>] (spin_dump) from [<80068a74>] (do_raw_spin_lock+0x110/0x198) r5:00000000 r4:016e3600 [<80068964>] (do_raw_spin_lock) from [<80661fac>] (_raw_spin_lock_irq+0x44/0x4c) r10:808f2d2c r9:8094e944 r8:808e8c40 r7:00000000 r6:9e14e000 r5:8065dab4 r4:9fbd3c40 r3:9e11c440 [<80661f68>] (_raw_spin_lock_irq) from [<8065dab4>] (__schedule+0x60/0x5cc) r5:9e11c440 r4:9fbd3c40 [<8065da54>] (__schedule) from [<8065e114>] (schedule+0x38/0x88) r10:00000001 r9:8094e944 r8:9e14e000 r7:808f760c r6:9e11c440 r5:0000000b r4:0000000b [<8065e0dc>] (schedule) from [<8002b2dc>] (do_exit+0x858/0x8d8) [<8002aa84>] (do_exit) from [<80011ff4>] (die+0x204/0x3c0) r7:808f760c [<80011df0>] (die) from [<80658498>] (__do_kernel_fault.part.9+0x5c/0x7c) r10:9e11c440 r9:9e11c698 r8:ffffffd0 r7:9e14fab8 r6:00000000 r5:00000017 r4:ffffffd0 [<8065843c>] (__do_kernel_fault.part.9) from [<8001bcd8>] (do_page_fault+0x1b8/0x3e4) r7:00000017 r3:9e14fab8 [<8001bb20>] (do_page_fault) from [<8000840c>] (do_DataAbort+0x3c/0xa0) r10:808f2d2c r9:9e11c698 r8:9e14fab8 r7:ffffffd0 r6:808f8314 r5:8001bb20 r4:00000017 [<800083d0>] (do_DataAbort) from [<800128a4>] (__dabt_svc+0x44/0x80) Exception stack(0x9e14fab8 to 0x9e14fb00) faa0: 9e11c440 00000000 fac0: 00000000 00000000 00000000 9e11c440 9e14e000 00000000 808e8c40 9e11c698 fae0: 808f2d2c 9e14fb0c 9e14fb10 9e14fb00 8004047c 8004673c 00000193 ffffffff r8:808e8c40 r7:9e14faec r6:ffffffff r5:00000193 r4:8004673c [<8004672c>] (kthread_data) from [<8004047c>] (wq_worker_sleeping+0x14/0xc8) [<80040468>] (wq_worker_sleeping) from [<8065dd8c>] (__schedule+0x338/0x5cc) r4:9fbd3c40 r3:00000020 [<8065da54>] (__schedule) from [<8065e114>] (schedule+0x38/0x88) r10:9e068000 r9:9e11c614 r8:9e14e000 r7:9e11c438 r6:9e11c440 r5:9e11c438 r4:00000001 [<8065e0dc>] (schedule) from [<8002b088>] (do_exit+0x604/0x8d8) [<8002aa84>] (do_exit) from [<80011ff4>] (die+0x204/0x3c0) r7:808f760c [<80011df0>] (die) from [<80658498>] (__do_kernel_fault.part.9+0x5c/0x7c) r10:9e11c440 r9:00000001 r8:00000010 r7:9e14fdf8 r6:00000000 r5:00000017 r4:00000010 [<8065843c>] (__do_kernel_fault.part.9) from [<8001bcd8>] (do_page_fault+0x1b8/0x3e4) r7:00000017 r3:9e14fdf8 [<8001bb20>] (do_page_fault) from [<8000840c>] (do_DataAbort+0x3c/0xa0) r10:9fbd6b00 r9:00000001 r8:9e14fdf8 r7:00000010 r6:808f8314 r5:8001bb20 r4:00000017 [<800083d0>] (do_DataAbort) from [<800128a4>] (__dabt_svc+0x44/0x80) Exception stack(0x9e14fdf8 to 0x9e14fe40) fde0: 9e369a00 00000000 fe00: 00000000 00000000 00000000 00000002 9e369a00 00000010 00000000 00000001 fe20: 9fbd6b00 9e14fe5c 80a26e60 9e14fe40 800661b8 804e8fb8 80000013 ffffffff r8:00000000 r7:9e14fe2c r6:ffffffff r5:80000013 r4:804e8fb8 [<804e8f3c>] (sgtl5000_resume) from [<804d90d0>] (soc_resume_deferred+0x10c/0x30c) r7:9e387da4 r6:9e387c64 r5:9e369a00 r4:9e387d84 [<804d8fc4>] (soc_resume_deferred) from [<8003f060>] (process_one_work+0x1a8/0x444) r10:9fbd6b00 r8:00000000 r7:9e14e000 r6:9fbd36c0 r5:9e387d84 r4:9e135300 [<8003eeb8>] (process_one_work) from [<8003f700>] (worker_thread+0x124/0x398) r10:8094e442 r9:9fbd36c0 r8:9e14e000 r7:9e135318 r6:9e14e000 r5:9fbd36f0 r4:9e135300 [<8003f5dc>] (worker_thread) from [<800463bc>] (kthread+0xd0/0xec) r10:00000000 r9:00000000 r8:00000000 r7:8003f5dc r6:9e135300 r5:9e134ac0 r4:00000000 [<800462ec>] (kthread) from [<8000eb68>] (ret_from_fork+0x14/0x2c) r7:00000000 r6:00000000 r5:800462ec r4:9e134ac0

3 4

[alsa-devel] [PATCH v2] ASoC: cs42l56: Fix new value argument in snd_soc_update_bits calls
by Axel Lin 23 May '14

23 May '14

The new value argument needs proper shift to match the mask bit fields. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/cs42l56.c | 68 +++++++++++++++++++++------------------------- sound/soc/codecs/cs42l56.h | 13 +++++---- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index 5bb134b..5d7a800 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -763,14 +763,14 @@ static int cs42l56_set_sysclk(struct snd_soc_dai *codec_dai, case CS42L56_MCLK_11P2896MHZ: case CS42L56_MCLK_12MHZ: case CS42L56_MCLK_12P288MHZ: - cs42l56->mclk_div2 = 1; + cs42l56->mclk_div2 = CS42L56_MCLK_DIV2; cs42l56->mclk_prediv = 0; break; case CS42L56_MCLK_22P5792MHZ: case CS42L56_MCLK_24MHZ: case CS42L56_MCLK_24P576MHZ: - cs42l56->mclk_div2 = 1; - cs42l56->mclk_prediv = 1; + cs42l56->mclk_div2 = CS42L56_MCLK_DIV2; + cs42l56->mclk_prediv = CS42L56_MCLK_PREDIV; break; default: return -EINVAL; @@ -844,57 +844,51 @@ static int cs42l56_digital_mute(struct snd_soc_dai *dai, int mute) /* Hit the DSP Mixer first */ snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL, CS42L56_ADCAMIX_MUTE_MASK | - CS42L56_ADCBMIX_MUTE_MASK | - CS42L56_PCMAMIX_MUTE_MASK | - CS42L56_PCMBMIX_MUTE_MASK | - CS42L56_MSTB_MUTE_MASK | - CS42L56_MSTA_MUTE_MASK, - CS42L56_MUTE); + CS42L56_ADCBMIX_MUTE_MASK | + CS42L56_PCMAMIX_MUTE_MASK | + CS42L56_PCMBMIX_MUTE_MASK | + CS42L56_MSTB_MUTE_MASK | + CS42L56_MSTA_MUTE_MASK, + CS42L56_MUTE_ALL_DSP); /* Mute ADC's */ snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL, - CS42L56_ADCA_MUTE_MASK | - CS42L56_ADCB_MUTE_MASK, - CS42L56_MUTE); + CS42L56_ADCA_MUTE_MASK | + CS42L56_ADCB_MUTE_MASK, + CS42L56_MUTE_ALL_ADC); /* HP And LO */ snd_soc_update_bits(codec, CS42L56_HPA_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_MUTE); + CS42L56_HP_MUTE_MASK, CS42L56_HP_MUTE_MASK); snd_soc_update_bits(codec, CS42L56_HPB_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_MUTE); + CS42L56_HP_MUTE_MASK, CS42L56_HP_MUTE_MASK); snd_soc_update_bits(codec, CS42L56_LOA_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_MUTE); + CS42L56_LO_MUTE_MASK, CS42L56_LO_MUTE_MASK); snd_soc_update_bits(codec, CS42L56_LOB_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_MUTE); + CS42L56_LO_MUTE_MASK, CS42L56_LO_MUTE_MASK); } else { snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL, CS42L56_ADCAMIX_MUTE_MASK | - CS42L56_ADCBMIX_MUTE_MASK | - CS42L56_PCMAMIX_MUTE_MASK | - CS42L56_PCMBMIX_MUTE_MASK | - CS42L56_MSTB_MUTE_MASK | - CS42L56_MSTA_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_ADCBMIX_MUTE_MASK | + CS42L56_PCMAMIX_MUTE_MASK | + CS42L56_PCMBMIX_MUTE_MASK | + CS42L56_MSTB_MUTE_MASK | + CS42L56_MSTA_MUTE_MASK, + CS42L56_UNMUTE); + snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL, - CS42L56_ADCA_MUTE_MASK | - CS42L56_ADCB_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_ADCA_MUTE_MASK | + CS42L56_ADCB_MUTE_MASK, + CS42L56_UNMUTE); + snd_soc_update_bits(codec, CS42L56_HPA_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_HP_MUTE_MASK, CS42L56_UNMUTE); snd_soc_update_bits(codec, CS42L56_HPB_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_HP_MUTE_MASK, CS42L56_UNMUTE); snd_soc_update_bits(codec, CS42L56_LOA_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_LO_MUTE_MASK, CS42L56_UNMUTE); snd_soc_update_bits(codec, CS42L56_LOB_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_LO_MUTE_MASK, CS42L56_UNMUTE); } return 0; } diff --git a/sound/soc/codecs/cs42l56.h b/sound/soc/codecs/cs42l56.h index ad2b50a..3fb73dc 100644 --- a/sound/soc/codecs/cs42l56.h +++ b/sound/soc/codecs/cs42l56.h @@ -80,19 +80,21 @@ #define CS42L56_PDN_HPB_MASK 0xc0 /* serial port and clk masks */ -#define CS42L56_MASTER_MODE 1 +#define CS42L56_MASTER_MODE 0x40 #define CS42L56_SLAVE_MODE 0 #define CS42L56_MS_MODE_MASK 0x40 -#define CS42L56_SCLK_INV 1 +#define CS42L56_SCLK_INV 0x20 #define CS42L56_SCLK_INV_MASK 0x20 #define CS42L56_SCLK_MCLK_MASK 0x18 +#define CS42L56_MCLK_PREDIV 0x04 #define CS42L56_MCLK_PREDIV_MASK 0x04 +#define CS42L56_MCLK_DIV2 0x02 #define CS42L56_MCLK_DIV2_MASK 0x02 #define CS42L56_MCLK_DIS_MASK 0x01 #define CS42L56_CLK_AUTO_MASK 0x20 #define CS42L56_CLK_RATIO_MASK 0x1f #define CS42L56_DIG_FMT_I2S 0 -#define CS42L56_DIG_FMT_LEFT_J 1 +#define CS42L56_DIG_FMT_LEFT_J 0x08 #define CS42L56_DIG_FMT_MASK 0x08 /* Class H and misc ctl masks */ @@ -116,8 +118,6 @@ #define CS42L56_DEEMPH_MASK 0x40 #define CS42L56_PLYBCK_GANG_MASK 0x10 #define CS42L56_PCM_INV_MASK 0x0c -#define CS42L56_MUTE 1 -#define CS42L56_UNMUTE 0 #define CS42L56_ADCAMIX_MUTE_MASK 0x40 #define CS42L56_ADCBMIX_MUTE_MASK 0x80 #define CS42L56_PCMAMIX_MUTE_MASK 0x10 @@ -128,6 +128,9 @@ #define CS42L56_ADCB_MUTE_MASK 0x02 #define CS42L56_HP_MUTE_MASK 0x80 #define CS42L56_LO_MUTE_MASK 0x80 +#define CS42L56_MUTE_ALL_DSP 0xf3 +#define CS42L56_MUTE_ALL_ADC 0x03 +#define CS42L56_UNMUTE 0 /* Beep masks */ #define CS42L56_BEEP_FREQ_MASK 0xf0 -- 1.8.3.2

2 1

[alsa-devel] Fwd: enabling a20 allwinner audio codec to 24bit
by Ricardo Crudo 22 May '14

22 May '14

Hello, I'm working with sunxi-codec of allwinner A20 device. Currently the codec driver works only for 16bit mode, the source code can be found here: https://github.com/linux-sunxi/linux-sunxi/tree/sunxi-3.4/sound/soc/sunxi, and the A20 datasheet here: https://github.com/OLIMEX/OLINUXINO/blob/master/HARDWARE/A20-PDFs/A20%20Use…. Reading the allwinner A20 datasheet and doing some modifications on sunxi code I managed the codec to work in 24bit mode. However, it isn't working properly. When I play a stereo wav file using the aplay command the audio data of both channels are played mixed in only one channel and the another channel didn't plays any sound. For example, picture a wav stereo file with this samples: left right 0.5 -0.5 0.4 -0.4 0.3 -0.3 0.2 -0.2 The played sound is: left right 0.5 0.0 -0.5 0.0 0.4 0.0 -0.4 0.0 0.3 0.0 -0.3 0.0 0.2 0.0 -0.2 0.0 The A20 datasheet says: "DAC TX DATA REGISTER (TXDATA): Transmitting left, right channel sample data should be written this register one by one. The left channel sample data is first and then the right channel sample." I guess that this is related with the problem, despite the datasheet didn't notify, I think that in 16bit mode the TXDATA transmits both channels data together as the register is 32bit. I'm not familiar writing alsa driver and other alsa working concepts. I hope someone can help me with this. The diff file of sunxi-codec.c is here: http://pastebin.com/raw.php?i=SvypkVU6 I appreciate any help. Regards, Ricardo

1 0

[alsa-devel] [PATCH] ASoC: samsung: Handle errors when getting the op_clk clock
by Sylwester Nawrocki 22 May '14

22 May '14

Ensure i2s->op_clk is not used when clk_get() for this clock fails. This prevents working with an incorrectly configured clock in some conditions. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/samsung/i2s.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index ae02811..a634a66 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -488,7 +488,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, clk_id = 1; if (!any_active(i2s)) { - if (i2s->op_clk) { + if (i2s->op_clk && !IS_ERR(i2s->op_clk)) { if ((clk_id && !(mod & MOD_IMS_SYSMUX)) || (!clk_id && (mod & MOD_IMS_SYSMUX))) { clk_disable_unprepare(i2s->op_clk); @@ -506,6 +506,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, else i2s->op_clk = clk_get(&i2s->pdev->dev, "i2s_opclk0"); + + if (WARN_ON(IS_ERR(i2s->op_clk))) + return PTR_ERR(i2s->op_clk); + clk_prepare_enable(i2s->op_clk); i2s->rclk_srcrate = clk_get_rate(i2s->op_clk); -- 1.7.9.5

2 1

Re: [alsa-devel] [GIT PULL] ASoC updates for v3.16
by Takashi Iwai 22 May '14

22 May '14

At Thu, 22 May 2014 16:47:01 +0100, Mark Brown wrote: > > The following changes since commit d6d211db37e75de2ddc3a4f979038c40df7cc79c: > > Linux 3.15-rc5 (2014-05-09 13:10:52 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-v3.16 > > for you to fetch changes up to cee429e5c53f7ffc1dd500001d9dff567833c23d: > > Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc/topic/wm8804', 'asoc/topic/wm8955' and 'asoc/topic/wm8985' into asoc-next (2014-05-22 00:24:04 +0100) > > ---------------------------------------------------------------- > > ASoC: Updates for v3.16 > > Lots of cleanup work going on in the core this release but very little > visible to external users except for the new drivers that have been > added. > > - Support for specifying aux CODECs in DT. > - Removal of the deprecated mux and enum macros. > - More moves towards full componentisation. > - Removal of some unused I/O code. > - Lots of cleanups, fixes and enhancements to the davinci, Freescale, > Haswell and Realtek drivers. > - Several drivers exposed directly in Kconfig for use with simple-card. > - New drivers for Cirrus CS42L56, Realtek RT5639, RT5642 and RT5651 and > ST STA350. Thanks, pulled now. Takashi > > ---------------------------------------------------------------- > Alexander Shiyan (3): > ASoC: fsl: Separation of the main audio options and boards > ASoC: fsl: Allow to select individual common options > ASoC: mc13783: Add devicetree support > > Andrew Lunn (1): > ASoC: alc5623: Add device tree binding > > Arnd Bergmann (15): > ASoC: cq93vc: fix cq93vc_get_regmap build error > ASoC: CS42L51 and WM8962 codecs depend on INPUT > ASoC: davinci: add dependencies for SND_SOC_TLV320AIC3X > ASoC: samsung: SMDK_WM8580_PCM needs REGMAP_I2C > ASoC: samsung-idma: avoid 64-bit division > ASoC: nuc900: export nuc900_ac97_data > ASoC: omap: RX-51 audio needs I2C > ASoC: samsung: UDA1380 needs I2C > ASoC: pxa: TTC DKB audio needs I2C > ASoC: atmel: Atmel WM8904 codec support needs I2C > ASoC: samsung: TLV320AIC23 and Simtec Hermes audio need I2C > ASoC: sh: Migo-R sound needs I2C > ASoC: omap: Amstrad E3 needs TTY support for codec > ASoC: fsl: select SND_SOC_IMX_PCM_DMA where needed > ASoC: pxa: remove mach header dependency > > Axel Lin (2): > ASoC: cs42l51: Fix mask for REVID > ASoC: rt5645: Fix updating wrong register for T5645_AIF2 case > > Bard Liao (6): > ASoC: core: Allow snd_soc_update_bits use 32 bits register > ASoC: dapm: Allow update_bits use 32 bits reg > ASoC: add RT5651 CODEC driver > ASoC: rt5640: Add minimal support for RT5642 > ASoC: rt5640: correct 5640's device ID > ASoC: rt5640: add default case for unexpected ID > > Benoit Cousson (1): > ASoC: core: Add one dai_get_widget helper instead of two rtd based ones > > Brian Austin (4): > ASoC: cs42l51: split i2c from codec driver > ASoC: Remove IS_ENABLED for INPUT in CS42L52 and WM8962 > ASoC: Add support for CS42L56 CODEC > ASoC: cs42l56: bindings: sound: Add bindings for CS42L56 CODEC > > Charles Keepax (3): > ASoC: wm5110: Add in OSR controls for OUT5/6 > ASoC: wm_adsp: Remove uneeded semicolon > ASoC: wm8962: Update register CLASS_D_CONTROL_1 to be non-volatile > > Christian Engelmayer (2): > ASoC: Intel: Fix incorrect sizeof() in sst_hsw_stream_get_volume() > ASoC: Intel: Fix a self assignment in sst_mem_block_alloc_scratch() > > Christoph Jaeger (1): > ASoC: core: use PTR_ERR instead of PTR_RET > > Dan Carpenter (1): > ASoC: compress: indent an if statement > > Daniel Mack (4): > ASoC: ak4104: add regulator consumer support > ASoC: ak4104: Add regulator to documentation > ASoC: sta350: fix DT bindings document > ASoC: sta350: add support for bits in miscellaneous registers > > Fabio Estevam (6): > ASoC: sgtl5000: Use devm_regulator_bulk_get() > ASoC: tlv320dac33: Use devm_regulator_bulk_get() > ASoC: wm8804: Use devm_regulator_bulk_get() > ASoC: wm8731: Use devm_regulator_bulk_get() > ASoC: wm8955: Use devm_regulator_bulk_get() > ASoC: wm8985: Use devm_regulator_bulk_get() > > Geert Uytterhoeven (4): > ARM: shmobile: r8a7791: Use rcar_gen2_read_mode_pins() helper > ARM: shmobile: koelsch-reference: Work around core clock issues > ARM: shmobile: koelsch legacy: Enable Quad SPI transfers for the SPI FLASH > ARM: shmobile: lager legacy: Enable Quad SPI transfers for the SPI FLASH > > Jarkko Nikula (15): > ASoC: Intel: Cancel hsw_notification_work before freeing the stream > ASoC: core: Fix component_list corruption when unloading modules > ASoC: core: Add support for machine specific trigger callback > ASoC: Intel: Sample Baytrail DSP DMA pointer only after each period > ASoC: Intel: Simplify Baytrail stream control IPC construction > ASoC: Intel: Pass stream start position to sst_byt_stream_start() > ASoC: Intel: Move Baytrail extended fw address saving to sst_byt_boot() > ASoC: Intel: Allow byt-5640 machine driver and SST core go to suspend > ASoC: Intel: Use ACPI device for Baytrail PCM buffer allocation > ASoC: Intel: Fix Baytrail SST DSP firmware loading > ASoC: Intel: Fix simultaneous Baytrail SST capture and playback > ASoC: max98090: Add ACPI probing support > ASoC: max98090: Move microphone bias voltage setting to probe function > ASoC: Remove needless snd_soc_dapm_sync() from machine driver inits > ASoC: Remove needless snd_soc_dapm_enable_pin() from machine driver inits > > Joe Perches (1): > ASoC: tlv320aic31xx: Convert /n to \n > > Jyri Sarha (2): > ASoC: core: Update snd_soc_of_parse_daifmt() interface > ASoC: simple-card: Move dai-link level properties away from dai subnodes > > Kevin Strasser (1): > ASoC: Intel: Fix pcm stream context restore crash > > Kuninori Morimoto (13): > ARM: shmobile: r8a7778: remove old style audio clock > ARM: shmobile: r8a7790: remove old style audio clock > ARM: shmobile: bockw: remove old style audio clock > ARM: shmobile: bockw: switch to use dai info for R-Car sound > ARM: shmobile: lager: switch to use dai info for R-Car sound > ASoC: rsnd: call rsnd_dai_pointer_update() from outside of lock > ASoC: rsnd: remove old clock style support > ASoC: rsnd: remove compatibility code > ASoC: rsnd: add rsnd_path_parse() macro > ASoC: rsnd: add rsnd_get_adinr() > ASoC: rsnd: remove duplicate parameter from rsnd_mod_ops > ASoC: rsnd: enable to use multi parameter on rsnd_dai_call/rsnd_mod_call > ASoC: rsnd: add DVC support > > Lars-Peter Clausen (65): > ASoC: Add snd_soc_kcontrol_codec() helper function > ASoC: Add snd_soc_kcontrol_platform() helper function > ASoC: Prepare SOC_SINGLE_XR_SX controls for regmap > ASoC: Move IO functions to soc-io.c > ASoC: Remove IO register modifier callbacks > ASoC: Track which components have been registered with snd_soc_register_component() > ASoC: Let snd_soc_platform subclass snd_soc_component > ASoC: ams-delta: Convert to table based DAPM and control setup > ASoC: omap: rx51: Convert to table based control and DAPM setup > ASoC: omap3pandora: Convert to table based DAPM setup > ASoC: adau1373: Replace usage deprecated MUX/ENUM macros > ASoC: adav80x: Replace usage deprecated MUX/ENUM macros > ASoC: arizona: Replace usage deprecated MUX/ENUM macros > ASoC: max98090: Replace usage deprecated MUX/ENUM macros > ASoC: mc13783: Replace usage deprecated MUX/ENUM macros > ASoC: pcm512x: Replace usage deprecated SOC_VALUE_ENUM macro > ASoC: rt5640: Replace usage deprecated MUX/ENUM macros > ASoC: wm2200: Replace usage deprecated MUX/ENUM macros > ASoC: wm5100: Replace usage deprecated MUX/ENUM macros > ASoC: wm5102: Replace usage deprecated MUX/ENUM macros > ASoC: wm5110: Replace usage deprecated MUX/ENUM macros > ASoC: wm8988: Replace usage deprecated MUX/ENUM macros > ASoC: wm5102: Replace usage deprecated SOC_VALUE_ENUM macro > ASoC: wm8994: Replace usage deprecated MUX/ENUM macros > ASoC: wm8995: Replace usage deprecated MUX/ENUM macros > ASoC: wm8997: Replace usage deprecated MUX/ENUM macros > ASoC: Remove deprecated ENUM/MUX macros > ASoC: wm8997: Fix compile error > ASoC: Fix snd_soc_kcontrol_platform() return type > ASoC: sta350: Use snd_soc_kcontrol_codec() > ASoC: Change return type of snd_soc_write() to int > ASoC: Move IO abstraction to the component level > ASoC: Remove snd_soc_update_bits_locked() > ASoC: dapm: Rename soc_widget_update_bits_locked() to soc_widget_update_bits() > ASoC: Remove ASoC level IO tracing > ASoC: Move standard kcontrol helpers to the component level > ASoC: qi_lb60: Set fully_routed flag > ASoC: qi_lb60: Set .dai_fmt instead of calling snd_soc_set_dai_fmt() > ASoC: qi_lb60: Use devm_snd_soc_register_card() > ASoC: Export devm_snd_soc_register_platform() > ASoC: qi_lb60: Use GPIO descriptor API > ASoC: jz4740: Improve build test coverage > ASoC: imx-audmux: Fix section mismatch > ASoC: Remove name_prefix unset during DAI link init hack again > ASoC: dapm: Factor out duplicated code in soc_dapm_stream_event() > ASoC: Make soc_find_matching_codec() static > ASoC: dapm: Make sure to always update the DAPM graph in _put_volsw() > ASoC: Remove card's DAI list > ASoC: Remove unused 'list' field form card > ASoC: Remove unused num_dai field from CODEC > ASoC: dapm: Skip CODEC<->CODEC links in connect_dai_link_widgets() > ASoC: dapm: Revert "ASoC: dapm: Fix double prefix addition" > ASoC: dapm: Use snd_soc_dapm_add_path() in connect_dai_link_widgets() > ASoC: dapm: Use snd_soc_dapm_add_path() in snd_soc_dapm_new_pcm() > ASoC: dapm: Simplify snd_soc_dapm_link_dai_widgets() > ASoC: dapm: Handle SND_SOC_DAPM_REG() generically > ASoC: dapm: Fix SUSPEND -> OFF bias sequence > ASoC: atmel-pcm-pdc: Remove broken suspend/resume code > ASoC: Remove runtime field from DAI > ASoC: cs42xx8: Do not use rtd->codec > ASoC: rt5651: Do not use rtd->codec > ASoC: ad1980: Replace goto loop with do-while loop > ASoC: omap: Replace instances of rtd->codec->card with rtd->card > ASoC: mop500_ab8500: Replace instances of rtd->codec->card with rtd->card > ASoC: neo1973_wm8753: Automatically disconnected non-connected pins > > Laurent Pinchart (5): > ARM: shmobile: r8a7790: Fix the I2C clocks parents in legacy code > ARM: shmobile: r8a7791: Fix the I2C clocks parents in legacy code > ARM: shmobile: r8a7790: Rename VSP1_(SY|RT) clocks to VSP1_(S|R) > ARM: shmobile: r8a7791: Rename VSP1_SY clocks to VSP1_S > ASoC: rsnd: Fix warnings due to improper printk formats > > Liam Girdwood (18): > ASoC: Intel: Fix block allocation so we only allocate blocks once. > ASoC: Intel: Fix allocated block list usage when adding blocks. > ASoC: Intel: Fix Haswell/Broadwell DSP page table creation. > ASoC: Intel: Fix Audio DSP usage when IOMMU is enabled. > ASoC: Intel: Fix allow hw_params to be called more than once. > ASoC: Intel: Fix stream position pointer. > ASoC: Intel: Fix check for pdata usage before dereference. > ASoC: Intel: Fix block offset calculations. > ASoC: Intel: Add support to unload/reload firmware modules. > ASoC: Intel: Allow Rx/Tx message list can be cleared prior to suspend > ASoC: Intel: Add Baytrail suspend/resume support > ASoC: Intel: Make Baytrail PCM data per stream rather than per DAI device > ASoC: Intel: Only export one Baytrail DAI > ASoC: max98090: Fix digital sidetone gain TLV > ASoC: max98090: Fix reset at resume time > ASoC: max98090: Reset codec on resume > ASoC: max98090: Mark cache as dirty prior to restoring > ASoC: max98090: Make sure we configure BCLK in one place > > Magnus Damm (5): > ARM: shmobile: Introduce shmobile_clk_workaround() > ARM: shmobile: Use shmobile_clk_workaround() on Lager > ARM: shmobile: Use shmobile_clk_workaround() on Koelsch > ARM: shmobile: Add Lager clock workarounds for SDHI and MMCIF > ARM: shmobile: Add Koelsch clock workarounds for SDHI > > Mark Brown (37): > Merge branch 'topic/component' of git://git.kernel.org/.../broonie/sound into asoc-core > ASoC: fsl: Add explicit include of of.h > Merge branch 'topic/devm' of git://git.kernel.org/.../broonie/sound into asoc-omap > Merge commit 'topic/omap' into asoc-davinci > ASoC: rt5651: Staticise non-exported symbols > Merge branches 'topic/sta350', 'topic/core', 'topic/dapm' and 'topic/cache' of git://git.kernel.org/.../broonie/sound into asoc-component > Merge branch 'topic/multicodec' of git://git.kernel.org/.../broonie/sound into asoc-component > Merge branch 'topic/component' of git://git.kernel.org/.../broonie/sound into asoc-dapm > Merge branch 'asoc-dt' into asoc-omap > Merge branch 'topic/input' of git://git.kernel.org/.../broonie/sound into asoc-cs42l51 > Merge tag 'v3.15-rc4' into asoc-fsl-spdif > Merge branch 'topic/component' of git://git.kernel.org/.../broonie/sound into asoc-core > Merge tags 'renesas-clock-for-v3.16' and 'renesas-boards-for-v3.16' of git://git.kernel.org/.../horms/renesas into asoc-rcar > ASoC: Intel: Build Medfield compressed ops > Merge branch 'fix/intel' of git://git.kernel.org/.../broonie/sound into asoc-intel > Merge remote-tracking branches 'asoc/fix/audmux', 'asoc/fix/cs42l52', 'asoc/fix/fsl-esai', 'asoc/fix/fsl-spdif', 'asoc/fix/rcar', 'asoc/fix/tlv320aic31xx' and 'asoc/fix/wm8962' into asoc-linus > Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus > Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus > Merge tag 'asoc-v3.15-rc5-core' into asoc-linus > Merge tag 'asoc-v3.15-rc5-drivers' into asoc-linus > Merge tag 'asoc-v3.15-rc5-intel' into asoc-linus > Merge remote-tracking branch 'asoc/fix/max98090' into asoc-linus > Merge remote-tracking branch 'asoc/topic/component' into asoc-next > Merge remote-tracking branch 'asoc/topic/core' into asoc-next > Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next > Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next > Merge remote-tracking branch 'asoc/topic/dt' into asoc-next > Merge remote-tracking branch 'asoc/topic/enum' into asoc-next > Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next > Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next > Merge remote-tracking branches 'asoc/topic/ad1980', 'asoc/topic/adsp', 'asoc/topic/ak4104', 'asoc/topic/ak4642', 'asoc/topic/alc5623', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/cache' into asoc-next > Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc/topic/davinci' into asoc-next > Merge remote-tracking branches 'asoc/topic/devm', 'asoc/topic/fsl', 'asoc/topic/fsl-esai', 'asoc/topic/fsl-sai', 'asoc/topic/fsl-spdif' and 'asoc/topic/fsl-ssi' into asoc-next > Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/mc13783' and 'asoc/topic/multicodec' into asoc-next > Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/rt5640' and 'asoc/topic/rt5645' into asoc-next > Merge remote-tracking branches 'asoc/topic/rt5651', 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/sta350' and 'asoc/topic/tlv320dac33' into asoc-next > Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc/topic/wm8804', 'asoc/topic/wm8955' and 'asoc/topic/wm8985' into asoc-next > > Markus Pargmann (10): > ASoC: fsl-ssi: Remove fsl_ssi_setup > ASoC: fsl-ssi: Fix i2s_mode variable setup > ASoC: fsl-ssi: Fix register values when disabling > ASoC: fsl-ssi: Move debugging to seperate file > ASoC: fsl-ssi: Use dev_name for DAI driver struct > ASoC: fsl-ssi: Move imx-specific probe to seperate function > ASoC: fsl-ssi: Remove useless DMA code > ASoC: fsl-ssi: Cleanup probe function > ASoC: fsl-ssi: Remove unnecessary variables from ssi_private > ASoC: fsl-ssi: Transmit enable synchronization > > Misael Lopez Cruz (5): > ASoC: core: Add helpers for codec and codec_dai search > ASoC: core: Add helpers for codec DAI probe & remove > ASoC: core: Add helper for DAI widgets linking > ASoC: core: Add function for ac97 codec registration > ASoC: core: Add helpers for dai link and aux dev init > > Nariman Poushin (2): > ASoC: core: Fail probe if we fail to add dai widgets > ASoC: core: Fail codec probe if we fail to add controls > > Nicolin Chen (24): > ASoC: fsl_sai: Improve fsl_sai_isr() > ASoC: fsl_sai: Fix buggy configurations in trigger() > ASoC: fsl_sai: Separately enable interrupts for Tx and Rx streams > ASoC: fsl_sai: Add imx6sx platform support > ASoC: fsl_sai: Add clock controls for SAI > ASoC: fsl_sai: Fix incorrect condition check in trigger() > ASoC: fsl_sai: Use FSL_SAI_xXR() and regmap_update_bits() to simplify code > ASoC: core: Don't break component searching if both id and num_dai are 0 > ASoC: fsl_spdif: Add core clock control for DMA access > ASoC: fsl: Drop formats limitation for imx-pcm-dma.c > ASoC: simple-card: Drop node->name checking > ASoC: simple-card: Simplify error msg in simple_card_dai_link_of() > ASoC: simple-card: Improve coding style > ASoC: fsl_spdif: Fix clock source for rxclk rate measurement > ASoC: fsl_spdif: Use clk_set_rate() for spdif root clock only > ASoC: fsl_spdif: Rename all _div to _df > ASoC: fsl_spdif: Add sysclk df support to derive txclk from sysclk > ASoC: fsl_spdif: Print actual sample rate for debug > ASoc: fsl_spdif: Add descriptions for fsl_spdif_priv > ASoC: pcm: Fix incorrect condition check for case SNDRV_PCM_TRIGGER_SUSPEND > ASoC: fsl_esai: Fix incorrect condition within ratio range check for FP > ASoC: fsl_esai: Only bypass sck_div for EXTAL source > ASoC: fsl_esai: Set PCRC and PRRC registers at the end of hw_params() > ASoC: fsl_esai: Bypass divider settings if clock requirement is not changed > > Oder Chiou (19): > ASoC: rt5640: Move cache sync() to resume() > ASoC: rt5640: Correct the judgement of data length > ASoC: rt5640: Use the platform data for DMIC settings > ASoC: rt5640: Remove the pre-allocated size of reg_default > ASoC: rt5640: Rename the function of clock checking > ASoC: rt5640: Remove the unused or incorrect setting of clock source > ASoC: rt5640: Remove the unused field in private data > ASoC: rt5640: Remove the unnecessary parentheses > ASoC: rt5640: Change the setting method of idle_bias_off > ASoC: rt5640: add rt5639 support > ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs > ASoC: rt5640: Add the info of rt5639 to the binding document > ASoC: rt5640: Add the rt5639 support to the OF match table > ASoC: rt5645: Add codec driver > ASoC: rt5645: Remove the unused variable > ASoC: rt5645: Staticise non-exported symbols > ASoC: rt5645: Move settings from probe() to reg_default struct > ASoC: rt5645: Correct the cache sync function > ASoC: rt5645: fix coccinelle warnings > > Paul Handrigan (1): > ASoC: Update Cirrus Logic CODEC maintainers. > > Peter Ujfalusi (37): > ASoC: davinci-pcm: Add empty functions for !CONFIG_SND_DAVINCI_SOC builds > ASoC: davinci-mcasp: Assign the dma_data earlier in dai_probe callback > ASoC: davinci-mcasp: Fix debug typo in davinci_mcasp_hw_params() > ASoC: davinci-mcasp: Simplify and clean up the AFIFO configuration code > ASoC: davinci-mcasp: Configure the AFIFO and DMA burst size at the same place > ASoC: davinic-mcasp: Adopt the AFIFO/DMA configuration to the stream (dynamic depth) > ASoC: davinci-mcasp: Fine tune and correct the DMA burst configuration > ASoC: davinci-mcasp: Format data delay configuration enhancement > ASoC: davinci-mcasp: Support for DSP_A format > ASoC: davinci-mcasp: Move the FS polarity change out from the switch case > ASoC: davinci-mcasp: Add support for I2S format > ASoC: davinci-mcasp: Support for LEFT_J format > ASoC: davinci-mcasp: Remove excess empty lines from davinci_mcasp_set_dai_fmt() > ASoC: davinci-mcasp: Do not touch 0x04 register above McASP_VERSION_2 > ASoC: Add resource managed snd_soc_register_platform() > ASoC: omap-mcpdm: Assign the dai DMA data at earlier time > ASoC: omap-mcpdm: Bind the platform driver to the dai driver when loading > ASoC: omap-mcbsp: Assign the dai DMA data at earlier time > ASoC: omap-mcbsp: Bind the platform driver to the dai driver when loading > ASoC: omap-pcm: Support for binding the platform driver to dai devices > ASoC: omap-dmic: Assign the dai DMA data at earlier time > ASoC: omap-dmic: Bind the platform driver to the dai driver when loading > ASoC: omap-hdmi: Bind the platform driver to the dai driver when loading > ASoC: omap-abe-twl6040: Use the cpu_dai node to specify the platform driver > ASoC: omap-twl4030: Use the same name/node for platform as the cpu_dai > ASoC: am3517evm: Use the same name for platform as the cpu_dai > ASoC: ams-delta: Use the same name for platform as the cpu_dai > ASoC: n810: Use the same name for platform as the cpu_dai > ASoC: omap3pandora: Use the same name for platform as the cpu_dai > ASoC: osk5912: Use the same name for platform as the cpu_dai > ASoC: rx51: Use the same name for platform as the cpu_dai > ASoC: omap-hdmi-card: Use the same name for platform as the cpu_dai > ASoC: omap-pcm: Drop the platform driver init code > ASoC: davinci-mcasp: Update MCASP_VERSION_4 platform driver registration > ASoC: omap-hdmi: Remove excess curly bracket > ASoC: davinci-pcm: Convert to use devm_snd_soc_register_platform() > ASoC: davinci-mcasp: Convert to use devm_snd_soc_register_component() > > Rongjun Ying (1): > ASoC: sirf: Move the tx rx enable from port to codec, that will not need register sharing > > Sachin Kamat (6): > ASoC: pcm512x: Use CONFIG_PM_RUNTIME macro > ASoC: hdmi: Include of.h > ASoC: max98090: Include of.h > ASoC: rt5640: Include of.h > ASoC: tlv320aic23: Include of.h > ASoC: tpa6130a2: Include of.h > > Sascha Hauer (5): > ASoC: ak4642: Fix typo zoro -> zero > ASoC: ak4642: Add ALC controls > ASoC: ak4642: Add driver data and driver private struct > ASoC: ak4642: Add support for extended sysclk frequencies of the ak4648 > ASoC: fsl-ssi: Move fsl_ssi_set_dai_sysclk above fsl_ssi_hw_params > > Sebastian Reichel (8): > ASoC: omap: rx51: Use static const char * const arrays > ASoC: omap: rx51: Add module alias > ASoC: omap: rx51: Use devm_snd_soc_register_card > ASoC: omap: rx51: omap_mcbsp_st_add_controls: add id parameter > ASoC: omap: rx51: get GPIO numbers via gpiod API > ASoC: omap: rx51: Add some error messages > ASoC: dt: Allow Aux Codecs to be specified using DT > ASoC: omap: rx51: Add DT support > > Simon Horman (4): > ARM: shmobile: koelsch: Annotate clk_names with __initconst > ARM: shmobile: lager: Annotate clk_names with __initconst > ARM: shmobile: koelsch-reference: Annotate clk_enables as __initconst > ARM: shmobile: lager-reference: Work around core clock issues > > Sven Brandau (1): > ASoC: sta350: Add codec driver > > Sylwester Nawrocki (1): > ASoC: samsung: Allow setting OP_CLK of the IIS Multi Audio Interface > > Tushar Behera (8): > ASoC: max98095: Add an explicit of_match_table > ASoC: samsung: Don't clear clock setting during i2s_startup > ASoC: samsung: Add sound card driver for Snow board > ASoC: samsung: Add missing pm ops for Snow sound card driver > ASoC: samsung: Use devm_snd_soc_register_card > ASoC: samsung: Use devm_snd_soc_register_platform > ASoC: samsung: Use devm_snd_soc_register_component > ASoC: samsung: Add devm_clk_get to pcm.c > > Vinod Koul (11): > ASoC: add SND_SOC_BYTES_EXT > ASoC: Intel: move component registration blob > ASoC: Intel: remove FSF snail mail address > ASoc: Intel: rename sst-mfld-platform.c > ASoC: Intel: mark sst_set_stream_status as non static > ASoC: Intel: split the pcm and compress to different files > ASoC: Intel: remove unused sst-mfld platform dais > ASoC: Intel: rename pcm dias to media dai > ASoC: Intel: Revert "rename pcm dias to media dai" > ASoC: Intel: add drain_notify support > ASoC: Intel: remove codec memeber from codec structs > > Wenkai Du (1): > ASoC: Intel: Fix audio crash due to race condition in stream deletion > > Xiubo Li (18): > ASoC: core: Move the default regmap I/O setting to snd_soc_register_codec() > ASoC: 88pm860x: Remove the set_cache_io() entirely from ASoC probe. > ASoC: cq93vc: Remove the set_cache_io() entirely from ASoC probe. > ASoC: mc13783: Remove the set_cache_io() entirely from ASoC probe. > ASoC: si476x: Remove the set_cache_io() entirely from ASoC probe. > ASoC: wm5102: Remove the set_cache_io() entirely from ASoC probe. > ASoC: wm5110: Remove the set_cache_io() entirely from ASoC probe. > ASoC: wm8350: Remove the set_cache_io() entirely from ASoC probe. > ASoC: wm8400: Remove the set_cache_io() entirely from ASoC probe. > ASoC: wm8994: Remove the set_cache_io() entirely from ASoC probe. > ASoC: wm8997: Remove the set_cache_io() entirely from ASoC probe. > ASoC: codec: fix the sparse check warnings. > ASoC: esai: use the precise definition of 'ret'. > ASoC: spdif: Sort the header files alphabetically. > ASoC: esai: Add VF610+ compatibles support. > ASoC: spdif: Add VF610+ compatibles support. > ASoC: fsl: Allow to select SAI device individually > ASoC: fsl: Allow to select ESAI device individually > > Documentation/devicetree/bindings/mfd/mc13xxx.txt | 3 + > Documentation/devicetree/bindings/sound/ak4104.txt | 3 + > .../devicetree/bindings/sound/alc5623.txt | 25 + > .../devicetree/bindings/sound/cs42l56.txt | 63 + > .../devicetree/bindings/sound/fsl-sai.txt | 11 +- > .../devicetree/bindings/sound/max98095.txt | 16 + > .../devicetree/bindings/sound/nokia,rx51.txt | 27 + > Documentation/devicetree/bindings/sound/rt5640.txt | 13 +- > .../devicetree/bindings/sound/simple-card.txt | 88 +- > Documentation/devicetree/bindings/sound/snow.txt | 17 + > .../devicetree/bindings/sound/st,sta350.txt | 131 ++ > MAINTAINERS | 6 - > arch/arm/boot/dts/r8a7790.dtsi | 2 +- > arch/arm/boot/dts/r8a7791.dtsi | 2 +- > arch/arm/mach-shmobile/Makefile | 2 +- > arch/arm/mach-shmobile/board-bockw.c | 63 +- > arch/arm/mach-shmobile/board-koelsch-reference.c | 86 +- > arch/arm/mach-shmobile/board-koelsch.c | 2 +- > arch/arm/mach-shmobile/board-lager-reference.c | 79 +- > arch/arm/mach-shmobile/board-lager.c | 29 +- > arch/arm/mach-shmobile/clock-r8a7778.c | 22 +- > arch/arm/mach-shmobile/clock-r8a7790.c | 32 +- > arch/arm/mach-shmobile/clock-r8a7791.c | 23 +- > arch/arm/mach-shmobile/clock.c | 28 + > arch/arm/mach-shmobile/include/mach/clock.h | 16 + > arch/mips/include/asm/mach-jz4740/dma.h | 2 - > arch/mips/jz4740/board-qi_lb60.c | 11 + > drivers/mfd/mc13xxx-core.c | 10 +- > include/dt-bindings/clock/r8a7790-clock.h | 4 +- > include/dt-bindings/clock/r8a7791-clock.h | 2 +- > include/sound/cs42l56.h | 48 + > include/sound/rcar_snd.h | 32 +- > include/sound/rt5640.h | 4 + > include/sound/rt5645.h | 25 + > include/sound/rt5651.h | 21 + > include/sound/soc-dai.h | 2 - > include/sound/soc-dapm.h | 20 +- > include/sound/soc.h | 155 +- > include/sound/sta350.h | 57 + > include/trace/events/asoc.h | 92 - > sound/arm/pxa2xx-pcm.c | 2 + > sound/arm/pxa2xx-pcm.h | 3 +- > sound/soc/atmel/Kconfig | 2 +- > sound/soc/atmel/atmel-pcm-pdc.c | 63 - > sound/soc/atmel/snd-soc-afeb9260.c | 12 - > sound/soc/codecs/88pm860x-codec.c | 20 +- > sound/soc/codecs/Kconfig | 34 +- > sound/soc/codecs/Makefile | 10 + > sound/soc/codecs/ab8500-codec.c | 12 +- > sound/soc/codecs/ad1980.c | 39 +- > sound/soc/codecs/adau1373.c | 7 +- > sound/soc/codecs/adav80x.c | 12 +- > sound/soc/codecs/ak4104.c | 62 +- > sound/soc/codecs/ak4641.c | 4 +- > sound/soc/codecs/ak4642.c | 75 +- > sound/soc/codecs/alc5623.c | 20 + > sound/soc/codecs/arizona.h | 4 +- > sound/soc/codecs/cq93vc.c | 10 +- > sound/soc/codecs/cs4270.c | 2 +- > sound/soc/codecs/cs4271.c | 4 +- > sound/soc/codecs/cs42l51-i2c.c | 59 + > sound/soc/codecs/cs42l51.c | 80 +- > sound/soc/codecs/cs42l51.h | 6 + > sound/soc/codecs/cs42l52.c | 12 - > sound/soc/codecs/cs42l56.c | 1427 +++++++++++ > sound/soc/codecs/cs42l56.h | 175 ++ > sound/soc/codecs/cs42xx8.c | 3 +- > sound/soc/codecs/da7210.c | 4 +- > sound/soc/codecs/da7213.c | 4 +- > sound/soc/codecs/da732x.c | 4 +- > sound/soc/codecs/da9055.c | 2 +- > sound/soc/codecs/hdmi.c | 1 + > sound/soc/codecs/lm4857.c | 4 +- > sound/soc/codecs/max9768.c | 4 +- > sound/soc/codecs/max98088.c | 12 +- > sound/soc/codecs/max98090.c | 87 +- > sound/soc/codecs/max98090.h | 1 + > sound/soc/codecs/max98095.c | 23 +- > sound/soc/codecs/mc13783.c | 36 +- > sound/soc/codecs/pcm1681.c | 4 +- > sound/soc/codecs/pcm512x.c | 4 +- > sound/soc/codecs/rt5631.c | 4 +- > sound/soc/codecs/rt5640.c | 424 ++-- > sound/soc/codecs/rt5640.h | 10 +- > sound/soc/codecs/rt5645.c | 2475 ++++++++++++++++++++ > sound/soc/codecs/rt5645.h | 2188 +++++++++++++++++ > sound/soc/codecs/rt5651.c | 1897 +++++++++++++++ > sound/soc/codecs/rt5651.h | 2081 ++++++++++++++++ > sound/soc/codecs/sgtl5000.c | 15 +- > sound/soc/codecs/si476x.c | 14 +- > sound/soc/codecs/sirf-audio-codec.c | 74 +- > sound/soc/codecs/sirf-audio-codec.h | 50 + > sound/soc/codecs/sta32x.c | 4 +- > sound/soc/codecs/sta350.c | 1311 +++++++++++ > sound/soc/codecs/sta350.h | 238 ++ > sound/soc/codecs/tas5086.c | 4 +- > sound/soc/codecs/tlv320aic23-i2c.c | 1 + > sound/soc/codecs/tlv320aic23.c | 4 +- > sound/soc/codecs/tlv320aic31xx.c | 3 +- > sound/soc/codecs/tlv320dac33.c | 12 +- > sound/soc/codecs/tpa6130a2.c | 1 + > sound/soc/codecs/twl4030.c | 10 +- > sound/soc/codecs/twl6040.c | 8 +- > sound/soc/codecs/wl1273.c | 12 +- > sound/soc/codecs/wm2000.c | 8 +- > sound/soc/codecs/wm2200.c | 4 +- > sound/soc/codecs/wm5100.c | 4 +- > sound/soc/codecs/wm5102.c | 26 +- > sound/soc/codecs/wm5110.c | 35 +- > sound/soc/codecs/wm8350.c | 14 +- > sound/soc/codecs/wm8400.c | 12 +- > sound/soc/codecs/wm8580.c | 2 +- > sound/soc/codecs/wm8731.c | 11 +- > sound/soc/codecs/wm8753.c | 4 +- > sound/soc/codecs/wm8804.c | 11 +- > sound/soc/codecs/wm8903.c | 4 +- > sound/soc/codecs/wm8904.c | 14 +- > sound/soc/codecs/wm8955.c | 13 +- > sound/soc/codecs/wm8958-dsp2.c | 32 +- > sound/soc/codecs/wm8960.c | 4 +- > sound/soc/codecs/wm8962.c | 35 +- > sound/soc/codecs/wm8962.h | 4 + > sound/soc/codecs/wm8983.c | 4 +- > sound/soc/codecs/wm8985.c | 11 +- > sound/soc/codecs/wm8988.c | 8 +- > sound/soc/codecs/wm8990.c | 2 +- > sound/soc/codecs/wm8991.c | 2 +- > sound/soc/codecs/wm8994.c | 32 +- > sound/soc/codecs/wm8995.c | 10 +- > sound/soc/codecs/wm8996.c | 4 +- > sound/soc/codecs/wm8997.c | 25 +- > sound/soc/codecs/wm9081.c | 4 +- > sound/soc/codecs/wm_adsp.c | 6 +- > sound/soc/codecs/wm_hubs.c | 2 +- > sound/soc/davinci/Kconfig | 10 +- > sound/soc/davinci/davinci-i2s.c | 1 - > sound/soc/davinci/davinci-mcasp.c | 260 +- > sound/soc/davinci/davinci-mcasp.h | 1 + > sound/soc/davinci/davinci-pcm.c | 8 +- > sound/soc/davinci/davinci-pcm.h | 8 +- > sound/soc/davinci/davinci-vcif.c | 1 - > sound/soc/fsl/Kconfig | 77 +- > sound/soc/fsl/Makefile | 3 +- > sound/soc/fsl/fsl_esai.c | 54 +- > sound/soc/fsl/fsl_sai.c | 255 +- > sound/soc/fsl/fsl_sai.h | 16 + > sound/soc/fsl/fsl_spdif.c | 186 +- > sound/soc/fsl/fsl_spdif.h | 14 +- > sound/soc/fsl/fsl_ssi.c | 996 +++----- > sound/soc/fsl/fsl_ssi.h | 62 +- > sound/soc/fsl/fsl_ssi_dbg.c | 163 ++ > sound/soc/fsl/imx-audmux.c | 2 +- > sound/soc/fsl/imx-pcm-dma.c | 1 - > sound/soc/generic/simple-card.c | 250 +- > sound/soc/intel/Makefile | 2 +- > sound/soc/intel/byt-rt5640.c | 34 +- > sound/soc/intel/haswell.c | 6 - > sound/soc/intel/sst-acpi.c | 1 + > sound/soc/intel/sst-baytrail-dsp.c | 16 +- > sound/soc/intel/sst-baytrail-ipc.c | 132 +- > sound/soc/intel/sst-baytrail-ipc.h | 7 +- > sound/soc/intel/sst-baytrail-pcm.c | 162 +- > sound/soc/intel/sst-dsp-priv.h | 3 + > sound/soc/intel/sst-dsp.c | 1 + > sound/soc/intel/sst-dsp.h | 1 + > sound/soc/intel/sst-firmware.c | 67 +- > sound/soc/intel/sst-haswell-dsp.c | 4 +- > sound/soc/intel/sst-haswell-ipc.c | 31 +- > sound/soc/intel/sst-haswell-ipc.h | 4 +- > sound/soc/intel/sst-haswell-pcm.c | 115 +- > sound/soc/intel/sst-mfld-dsp.h | 8 - > sound/soc/intel/sst-mfld-platform-compress.c | 237 ++ > ...sst-mfld-platform.c => sst-mfld-platform-pcm.c} | 250 +- > sound/soc/intel/sst-mfld-platform.h | 11 +- > sound/soc/jz4740/Kconfig | 11 +- > sound/soc/jz4740/jz4740-i2s.c | 5 +- > sound/soc/jz4740/qi_lb60.c | 84 +- > sound/soc/kirkwood/kirkwood-t5325.c | 13 - > sound/soc/nuc900/Kconfig | 1 + > sound/soc/nuc900/nuc900-ac97.c | 1 + > sound/soc/omap/Kconfig | 4 +- > sound/soc/omap/am3517evm.c | 2 +- > sound/soc/omap/ams-delta.c | 68 +- > sound/soc/omap/n810.c | 2 +- > sound/soc/omap/omap-abe-twl6040.c | 13 +- > sound/soc/omap/omap-dmic.c | 9 +- > sound/soc/omap/omap-hdmi-card.c | 2 +- > sound/soc/omap/omap-hdmi.c | 6 +- > sound/soc/omap/omap-mcbsp.c | 25 +- > sound/soc/omap/omap-mcbsp.h | 2 +- > sound/soc/omap/omap-mcpdm.c | 16 +- > sound/soc/omap/omap-pcm.c | 25 +- > sound/soc/omap/omap-pcm.h | 30 + > sound/soc/omap/omap-twl4030.c | 15 +- > sound/soc/omap/omap3pandora.c | 35 +- > sound/soc/omap/osk5912.c | 2 +- > sound/soc/omap/rx51.c | 275 ++- > sound/soc/pxa/Kconfig | 2 +- > sound/soc/pxa/brownstone.c | 7 - > sound/soc/pxa/palm27x.c | 8 - > sound/soc/pxa/poodle.c | 1 - > sound/soc/pxa/pxa-ssp.c | 2 - > sound/soc/pxa/pxa2xx-pcm.c | 2 + > sound/soc/pxa/ttc-dkb.c | 4 - > sound/soc/samsung/Kconfig | 22 +- > sound/soc/samsung/Makefile | 2 + > sound/soc/samsung/ac97.c | 9 +- > sound/soc/samsung/bells.c | 16 +- > sound/soc/samsung/dma.c | 8 +- > sound/soc/samsung/dma.h | 1 - > sound/soc/samsung/dmaengine.c | 13 +- > sound/soc/samsung/goni_wm8994.c | 9 +- > sound/soc/samsung/h1940_uda1380.c | 5 - > sound/soc/samsung/i2s.c | 10 +- > sound/soc/samsung/i2s.h | 1 + > sound/soc/samsung/idma.c | 11 +- > sound/soc/samsung/littlemill.c | 18 +- > sound/soc/samsung/lowland.c | 18 +- > sound/soc/samsung/neo1973_wm8753.c | 8 +- > sound/soc/samsung/pcm.c | 17 +- > sound/soc/samsung/rx1950_uda1380.c | 5 - > sound/soc/samsung/s3c-i2s-v2.c | 2 +- > sound/soc/samsung/s3c2412-i2s.c | 15 +- > sound/soc/samsung/s3c24xx-i2s.c | 19 +- > sound/soc/samsung/s3c24xx_simtec_hermes.c | 8 - > sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 8 - > sound/soc/samsung/smartq_wm8987.c | 2 - > sound/soc/samsung/smdk_wm8580pcm.c | 15 +- > sound/soc/samsung/smdk_wm8994.c | 12 - > sound/soc/samsung/smdk_wm8994pcm.c | 15 +- > sound/soc/samsung/snow.c | 123 + > sound/soc/samsung/spdif.c | 11 +- > sound/soc/samsung/speyside.c | 18 +- > sound/soc/samsung/tobermory.c | 18 +- > sound/soc/sh/Kconfig | 2 +- > sound/soc/sh/rcar/Makefile | 2 +- > sound/soc/sh/rcar/adg.c | 57 +- > sound/soc/sh/rcar/core.c | 168 +- > sound/soc/sh/rcar/dvc.c | 273 +++ > sound/soc/sh/rcar/gen.c | 25 +- > sound/soc/sh/rcar/rsnd.h | 68 +- > sound/soc/sh/rcar/src.c | 190 +- > sound/soc/sh/rcar/ssi.c | 85 +- > sound/soc/sirf/sirf-audio-port.c | 107 - > sound/soc/sirf/sirf-audio-port.h | 62 - > sound/soc/soc-cache.c | 2 - > sound/soc/soc-compress.c | 6 +- > sound/soc/soc-core.c | 991 ++++---- > sound/soc/soc-dapm.c | 273 +-- > sound/soc/soc-devres.c | 35 + > sound/soc/soc-io.c | 296 ++- > sound/soc/soc-pcm.c | 29 +- > sound/soc/tegra/tegra_wm9712.c | 4 +- > sound/soc/ux500/mop500_ab8500.c | 2 +- > 254 files changed, 17727 insertions(+), 4331 deletions(-) > create mode 100644 Documentation/devicetree/bindings/sound/alc5623.txt > create mode 100644 Documentation/devicetree/bindings/sound/cs42l56.txt > create mode 100644 Documentation/devicetree/bindings/sound/max98095.txt > create mode 100644 Documentation/devicetree/bindings/sound/nokia,rx51.txt > create mode 100644 Documentation/devicetree/bindings/sound/snow.txt > create mode 100644 Documentation/devicetree/bindings/sound/st,sta350.txt > create mode 100644 include/sound/cs42l56.h > create mode 100644 include/sound/rt5645.h > create mode 100644 include/sound/rt5651.h > create mode 100644 include/sound/sta350.h > create mode 100644 sound/soc/codecs/cs42l51-i2c.c > create mode 100644 sound/soc/codecs/cs42l56.c > create mode 100644 sound/soc/codecs/cs42l56.h > create mode 100644 sound/soc/codecs/rt5645.c > create mode 100644 sound/soc/codecs/rt5645.h > create mode 100644 sound/soc/codecs/rt5651.c > create mode 100644 sound/soc/codecs/rt5651.h > create mode 100644 sound/soc/codecs/sta350.c > create mode 100644 sound/soc/codecs/sta350.h > create mode 100644 sound/soc/fsl/fsl_ssi_dbg.c > create mode 100644 sound/soc/intel/sst-mfld-platform-compress.c > rename sound/soc/intel/{sst-mfld-platform.c => sst-mfld-platform-pcm.c} (67%) > create mode 100644 sound/soc/omap/omap-pcm.h > create mode 100644 sound/soc/samsung/snow.c > create mode 100644 sound/soc/sh/rcar/dvc.c > delete mode 100644 sound/soc/sirf/sirf-audio-port.h > [2 Digital signature <application/pgp-signature (7bit)>] >

1 0

[alsa-devel] [PATCH] ASoC: alc5623: Depend on I2C.
by Andrew Lunn 22 May '14

22 May '14

This is an i2c driver, so make the Kconfig entry depend on I2C. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c59943a19f94..397b66c2b999 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -274,6 +274,7 @@ config SND_SOC_AK5386 config SND_SOC_ALC5623 tristate "Realtek ALC5623 CODEC" + depends on I2C config SND_SOC_ALC5632 tristate -- 2.0.0.rc2

1 0

[alsa-devel] [PATCH] ALSA: Replace DEFINE_PCI_DEVICE_TABLE macro use
by Benoit Taine 22 May '14

22 May '14

We should prefer `const struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines. This issue was reported by checkpatch. A simplified version of the semantic patch that makes this change is as follows (http://coccinelle.lip6.fr/): // <smpl> @@ identifier i; declarer name DEFINE_PCI_DEVICE_TABLE; initializer z; @@ - DEFINE_PCI_DEVICE_TABLE(i) + const struct pci_device_id i[] = z; // </smpl> It has been tested by compilation. Signed-off-by: Benoit Taine <benoit.taine(a)lip6.fr> --- sound/pci/hda/hda_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 2c54629..ab0fd6d 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1730,7 +1730,7 @@ static void azx_remove(struct pci_dev *pci) } /* PCI IDs */ -static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { +static const struct pci_device_id azx_ids[] = { /* CPT */ { PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },

2 1

[alsa-devel] ASoC: Two codecs on a single CPU DAI
by Petr Kulhavy 22 May '14

22 May '14

Hi, I'm writing a driver for a custom DaVinci board, which has two codecs (Wolfson and STA323 amplifier) connected to the same CPU DAI. The intention is that both codecs always play the same audio, only the volume/mixer settings are controlled separately. In addition to that the design is atypical by the fact, that the Wolfson is the clock master. So in order to play audio on the amplifier the Wolfson must be initialized as well. My question is: how to reflect this architecture in a SOC platform driver? As the first approach I tried to create two DAI links, one for each codec. That worked if audio was first played on the Wolfson link (clock master was initialized) and then on the second link, using the same sampling rate. But in fact I would need only one DAI link to both. So then I tried to make just one link to Wolfson and put the amplifier as an "aux_dev". However there I need to set hw_params and format for the amplifier codec DAI and those functions were not called. In fact there was no codec DAI created for the amplifier. I've also seen that one can define rtd_aux runtimes, but have nowhere found how to use it. Could someone please help me? Thanks a lot Petr -- Petr Kulhavy, MSc System Architect BARIX AG

3 3

Re: [alsa-devel] [ALC1150] combined with Intel H97/Z97
by Takashi Iwai 22 May '14

22 May '14

At Thu, 22 May 2014 14:04:55 +0200, Arthur Borsboom wrote: > > No, I did not and it resolved the issue!! Awesome! > > What does this option do? Does it have any side effects? This disables snooping mode. It's rather a problem of controller, not the codec chip. There can be a slight performance decrease. > If this is the final solution, I will communicate to the other users this > solution. Looking at alsa-info.sh, it's a new chip, and the workarounds for Intel PCH & co aren't applied to it yet. That's the likely problem. Could you try the patch below without snoop=0 option? Takashi --- diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 2c54629d62d1..36b98b89c4c0 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1743,6 +1743,9 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { /* Lynx Point */ { PCI_DEVICE(0x8086, 0x8c20), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, + /* ?? New chip */ + { PCI_DEVICE(0x8086, 0x8ca0), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, /* Wellsburg */ { PCI_DEVICE(0x8086, 0x8d20), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },

1 0