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

Re: [PATCH/RESEND 2 v1] ASoC: trival spelling fix.
by Maurycy Z 23 Aug '22

23 Aug '22

"system" is mis-spelled as "ststem" in the help for SND_AUDIO_GRAPH_CARD. Acked-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Maurycy Zalewski <10maurycy10(a)gmail.com> --- diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig index b6df4e26b..72f3446e1 100644 --- a/sound/soc/generic/Kconfig +++ b/sound/soc/generic/Kconfig @@ -16,7 +16,7 @@ config SND_AUDIO_GRAPH_CARD help This option enables generic simple sound card support with OF-graph DT bindings. - It also support DPCM of multi CPU single Codec ststem. + It also support DPCM of multi CPU single Codec system. config SND_AUDIO_GRAPH_CARD2 tristate "ASoC Audio Graph sound card2 support"

1 0

data-race in snd_seq_client_use_ptr / snd_seq_client_use_ptr
by Abhishek Shah 22 Aug '22

22 Aug '22

Hi all, We found a data race involving the *card_requested[card]* variable here <https://elixir.bootlin.com/linux/v5.18-rc5/source/sound/core/seq/seq_client…>, which can cause *snd_request_card* to be called multiple times. We are not sure if this has security implications however, but we would still like to report it. Please let us know what you think. Thanks! *----------Report-----------* *write* to 0xffffffff88382191 of 1 bytes by task 6541 on cpu 0: snd_seq_client_use_ptr+0x254/0x610 sound/core/seq/seq_clientmgr.c:146 snd_seq_info_clients_read+0xd8/0x480 sound/core/seq/seq_clientmgr.c:2475 snd_info_seq_show+0x81/0xa0 sound/core/info.c:361 seq_read_iter+0x2d2/0x8e0 fs/seq_file.c:230 seq_read+0x1c9/0x210 fs/seq_file.c:162 pde_read fs/proc/inode.c:311 [inline] proc_reg_read+0x123/0x1b0 fs/proc/inode.c:323 vfs_read+0x1b5/0x6e0 fs/read_write.c:480 ksys_read+0xde/0x190 fs/read_write.c:620 __do_sys_read fs/read_write.c:630 [inline] __se_sys_read fs/read_write.c:628 [inline] __x64_sys_read+0x43/0x50 fs/read_write.c:628 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae *read* to 0xffffffff88382191 of 1 bytes by task 6542 on cpu 1: snd_seq_client_use_ptr+0x189/0x610 sound/core/seq/seq_clientmgr.c:145 snd_seq_info_clients_read+0xd8/0x480 sound/core/seq/seq_clientmgr.c:2475 snd_info_seq_show+0x81/0xa0 sound/core/info.c:361 seq_read_iter+0x2d2/0x8e0 fs/seq_file.c:230 seq_read+0x1c9/0x210 fs/seq_file.c:162 pde_read fs/proc/inode.c:311 [inline] proc_reg_read+0x123/0x1b0 fs/proc/inode.c:323 vfs_read+0x1b5/0x6e0 fs/read_write.c:480 ksys_read+0xde/0x190 fs/read_write.c:620 __do_sys_read fs/read_write.c:630 [inline] __se_sys_read fs/read_write.c:628 [inline] __x64_sys_read+0x43/0x50 fs/read_write.c:628 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae Reported by Kernel Concurrency Sanitizer on: CPU: 1 PID: 6542 Comm: syz-executor2-n Not tainted 5.18.0-rc5+ #107 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 *Reproducing Inputs* Input CPU 0: r0 = openat$procfs(0xffffffffffffff9c, &(0x7f00000004c0)='/proc/asound/seq/clients\x00', 0x0, 0x0) read$ptp(r0, &(0x7f0000001280)=""/4096, 0x1000) Input CPU 1: r0 = openat$procfs(0xffffff9c, &(0x7f0000000000)='/proc/asound/seq/clients\x00', 0x0, 0x0) syz_fuse_handle_req(r0, &(0x7f0000000040)="b49dac4d60a4ef29274ad6ec771da74d4c8c0fd83d0aeb9dfe8d26d06f9ce49c698d1b2dbca3915be594ab841c00c1928a4c4363e8b5d17b93829abe5cc366527d477458cd9ea1659ccb0c07b05158926dc748aefe7fbac30da85ef1aff793e0b99ff36257ec864a364666b2151e04e8d9a709e4c300368d5ba364e588c6f32a1829b7dab3a920b39918005984975164f1dedcfd04503f3659ab13386ab13bb7f2f160848a41792cb49eb2ffeca5915ee146e2c348b8fd37ff56d515b39d85fbb034b8e5e08c96b6579a19efe90844e30a790ec223767b8f5a409433b87dec579dc420a62ab203228136577a9945a59afda7efbe7dde89be13a4fdf54ead3624b1a5c70efe99d2e36cb5c1001427e116128ce2601e552e2f50642e1dba23f9526788a382acb79f92fd733f10bdcf9a4035122730498ca3481a4d2e7ae2c6bddd8cb1f8899f0f5d36975b1f1aa989a182029e3225d98a503e97073a728978795a6f27457df5fe5d19182d314ba3b15ad8a430e808bcda1bccfc1e6ea459aab7c062fb5d92b54098e73706e4d2b90b3985ce35736e715b04b7e590fa7349b639069928f5153a8d31e443a21546029d24943a69e44f65a4e253b538b8803366e45cdffa3c45c4c012981eb018dc04af8c082acaa2eff05cb91025d6424a2d9600ac2539deef60540c030f90c8adc939d3b68303babc5da851c88b15e238eb0515c1210398235eb76dba454f4e1f460d3cd13d85cc5a531968955064dae07b2c63d17d343fb80494fcce2f84775be037fd6d0e05834da6408fce3dc3c8d45bf33f500d83c4f5ce015544464daa6b4965987a6454eb6e29bf33d654ab0c6682cbbb5520afeb93c9c9b377886ef4b18f31c6c6e67fff8388e19c5ba73efda0e7874dc365c05da5ac4d360161a8a28aa41a3d410da55e464886bc2c69d2c441961f5eb7cd428e410d12c0a083f197abc4a249a7cee1d6f495f4513f8ca194c43e967ddd342ecb3c3cecef199a1beace9e374ebe04e9dfff46fa4d6e3b8296a1a3f8daa431e1a45598100f53292630c7e27efbf18a0236e33fa08b66af22c8325e04f1c6a7e48844fdd6d506663d15cfdd7c63f60803c6e0db5cef6d111a6401bccc09ec05f56bace7eacfbf2f6954c4e9c00f6e4b8cf6622f7f23570fc4b730d8cd8f9b322eabadffa9631105943e621a018d3cf7fc4242d457c068e94342f819808a491f2c62ea07fba2a08b15ab208d64e1cde2020f0ae9f8f903dcb78bafd589832e4e8a02ac3a27749acee64fba7081c782d68df0a7314f95514e9022845062f8caf3052ffe55a5bc538789ec6eca37a26055ff6768cb5d5158a8be6321233efdb9ce135fccf3f20e696dbeec3776986e210d1c36881657b9eb3708c0437955f8b1ba617b9440dee185741f554facdc7da8daa55015b19dc8f5e32499797e1b85941a801771717184ce09c569cacf82992b2f8c33ede8e02a8a3e1fbd4835c2d943f144498aa1edf50d1d2af669b148d433b7a7e55b08a0fbf49572b4815ae96d35a8297b57b73c8333e7d7718169ac83129eecea08565172ee26e8cc29682fc2af3f8f1fa1fa411205b8376389065551c7cfeb87b6036f91f20566f6274df1365f0122bb139ee6c6298854126ce7d2f69233d1d7a8edcaf6b15d97baaaaeafd1d4069b83bea98694dc9ef8fb6beae9dc5d1ede7458bd897b11fe93ef6f39858dc210419331327fd5dac69c6ff352ea04e439ce97e7ae904db5a86a5ed4bec35cd4e16bc1e3d54c591a93da93645eb697065719a7c41bfc0a4b573961eb6f0a944aea68e65e28713d4ce77bcf5e1cc8c25375f075ac66c2b1116f9d89a7614c60cd5afbc86fdad7fac5a629ed5b808480dd2cd0448f85ef5c308fb4cb9a618bed06155cfd7e6c18f4241bc63a960056dbf837de0dbbf742a23256af0acf855a722bf62630e8df2c57d92b3cb7aaa6cc26cbb20670fafee9af231f1d391f560f4257bd3a976ea0d22fc05c592adfe85c5f81ebf885eb93c23dd6ed3f84eb39766d28c1de7fd75250dcfc469cfad4ac3cecc8d148de571669ef7d1fe1f115ec7533fb8a81c87b54602a0726a9b47dd31b536fc51f4b7d292b83b191524c457dd618536e3b7ad20e222a1c9bf725ce5586463262d112f3336b9da8abb55fe4c756808a0b8617fd69d84f91d444a72c22116be94a52d1b2bb79cae60a4b9cf39d19819167d4bd689e752b1ecf5cd50040cf6e6eea9183dfc793c332ce666c66b179363b3fa865846d6774d050e5037776df34c7ab6672ae1b350dd849b540b8b285eaf6794f507e2c7c10acf7bf7ad9521e86a1b72a1418c90ab696f8e984ed6c7f0f1810fc9011e8f3f6cd4d1687ea682a42faffa296a00f9cc7c53210db85c9559207aa664f3c2716f524ad5fc0ed97bd880c14ace7d629c43f02e413c562046eeb2b58f0ead899286ea8b5826af76b3e3d02e71137cbebe552306d1dd1016e097a54928033ea63f0540b05a3bf331773694b2546e4679c05d488b356a2d37d275b4ccee590bb7ac7483ca0a72149cea3b39f687fded587e5e94d25c3b3e1b1b0d47b2bde830331905390837a3fefdda1feba5ffebb6cf9ec2ad3882e3094c39da450daac74592c20ae560c61cbcb1d487f8d54e76c808178b2cc0ab1d072820b291f3092c49b205981f45318135c8075d860e7eefbb640dd8e80498167db26b3ece09c8099eff0c3cf5cbfe6440472ed5d3ce8548b15004423868118b0e87655315856fc2102b804c1e28b6da7dcdba54ecae6b721477fca494bd3b72f46480ae87f334494c602819d6a3e9cbd6c2f2b3a9d32c8eae8c1484b8dc5eea2c006ad95fa3d7e80d89e1aa6ae8a98fcb95ecd8a654d176cc7ada0c6424a898ff8a9859b2a29a51d36b879011a24ae2a4e0f69f02c95ac3da7246a45681d91bc0ebf019e3e2031fb3336b2ec10f7d94186fc0520999b775bac2eb542e5e3cfbfbcc5f5f56df6d9d0ca8e2308c6cbaefc861a0acf0622ec9fa7c4cac8590c6b4692219ed38b136ce5d659d00a8710b1ddf384edf5737101448015ea3f8c3fef0cb07602064035a4579a2b6bfc5edc1e81a8ab9522d6711f606183b3f59ec32c4df67da8289ce54ed9f97c7515746b859027c8ab1ddcbec9ab3c37c6dc0a97cb255961c69bc71936364ec49076400b4d918265cfaba0a9475d5dd1b8179653c3892aeb3f434a9ac2d9d3dbb81598a44cd90beb48a8949dd31f907465dfd8bf651dc60ef0d535cc9d5493dda2c474a10b7726b63291b0d6107b47faf77ce62eea112fbdfb95481c7f84d6cf9312faea8888284cfc04854f58fce61988e25a2dc9dbaf8f7659b21ace61be9d83c04789a202d72f2e411ab3db416dcf63abbc1c6d827aad75579eecb3a81a6e0d0669012db51435d53d3c0bf2426dbb431e2f4bc4938fa458692051f5047610687bc2077edee95274bd653ef1105086563f858c0db245454fe5fc83e6788c82310a02008ef76a3ffd357d8452cf5a712f421f253cf81232f1ca4d6f8364cb96b9bb2f23ab27a6ce3a2682b615ed762c5210bfc17229b83551af482143374e21a115d77c98c8fb17487b2c9f25d8da17ff3e96b155354f611da1ff91bfd6d89436486a466642f96c5cbbbcedeee4d35d26ee982bd152bf309eb1c4f56bd77dc89861bb82eb56405af798c7100768461f1b21d8e98d498ed5e2f74104d0309b00bf376cf32a82397d1adca7ca86950f5e63c60bd0189bac5dcb596ac0d111f9e6d17ed06a47bb92e49ea2ec4a295acd84b37524fbbd3c7516d4135d6d0625781fa85316098c4a8f94c4f10497ada2332b524e5e91c63ba4df47e1b33e0ebb9f748f1d0a338993cd4f155608e8238d3d574b8b166d46211909128848e96a28282b7cb652d103307c0028653b4fb40379b6d545fb1e2f5b9ea9d57a5b270db019e228b1edde431bd44e5728216781a5ba01163fd803c98e46a440e5617a781f55502c73aa1c417cfdfa7ef95fc83cfc0d9e7140df356cc0a3bf0824d4f3233ca963d367f9e6bd53b78edc3f5b0c53c9a836e02eb57e0c16417f9e42338aeada43fe34b4c525c29835d77e7695142361a500e097f7d110f1912a534fa9441f1973b123d76817483f51deef7b2f7b3b180cf062b7acba7b77788d7ae6be6cce00296097ae60ad84e588711a5a63b66aed3e01010381dfe53bda06ee770cd3f96b3fb7ec9ad700949e6ad32062958e807b8b03204c3a77b5034143a6b342bb913dfc4a5db48c44235b56ee464e933b2bd7e46b49ab01166492d4d46a48b730532b13e231984c7afd18ae13663ab84c385e367021ad3dfa918860243454ac08e00e27ec0b193f67fa33cd43d9bd69b34ad29184924c98e61454afefc5cc69e32d0792c65aa0638b5d128fdee58bdaeae09969fc7493296c0f7689093e24609f44a1ea4a4cb7aa4e46082e89fbcae15862c5f1423ccb651a5b12f952797d0854ebfcf6dc494add5d140a5deee50f3c9729f2779aa0bb0339690770f090b3719a53b9e0a4521d3a9811bcd1702642f7c5d4142044826f97edf713bb6a695b5f34e705eefd386df6ab621fb8f4e39641926908c9a37df76bef9b40fb352c8b2266a079625c81f0b6823348e7dfe593fd6c155fc2b0c082b04a8098712b02a4bb9a60a4f68cbf60b58d61f32798c66edf64d387576630902a13b5a1f8f5f51a79c708d7d2c68d2be1c68e5fd8757a3c3ccf951e65727722868688133ce0cc22a7d3db72fd0d3ae51d9c169055d754011b1de6a6be680c55bf92e6fcbc645941b2e89afa7b91ad61726c87e3c4e131608ce244fea2018925ba74dd8cac6e6f5c455978b7151eb6e6e7a797590d784cd9464450f89a671c29804a1eb7c96612ba025fd4d2564a0199a1c18c20964c2fecc0c463fcf0c1d3089b46ae523b6fb259cce1a0171254f847945a862ceb3ae1fe7082958d06ce952f3f079df3490b448cda60acddbaed7ae50eb32eed1feab15b075e7fac69c4142dab32f9abd562c6a3ffcc6d3fc0595e202f3430080a8c85665a25889fa5f78f403f9ac93cfa160fd242d9cf123e43010891bfb21f7518588aa9f94393daf212c7a396cacfa27f29bdf8ce0c9269c3270466aae1df02832e605dd3aabfde47b93cfc812feb65bf1f0b326f48fa89f00059d0bcab950f229f128eea46d16a9d3feb5c04f5e707f835de686df16ceaae1ac98cb5a7abd0852cd80f8f2c093ca86b4fcdfcfb4648d244b5bc734ce2bff50880b4de5cad96aff1eca5e3f93dcecbde2a06b0371529d471908c05654e463c787e56e24edcdc363a93b22fa7925a4f205e62ef6d7f7f64b7e9525b7e8c694f19738d5311fbe12f1b8123035323775ba87e1e77bb9eddb09e22f65a175f51bce14ec6bceeca1bfba4bd69d4e18d8442c8f60d2747ec7373e8e49b412b769dde6486eca1b98231ddac5164ace299b5bc3b6cf82c00ae55a1a47af14a72a5f05ce3c94ad6dfb2af8712262a0d2dce422946d84fe643530a0528eafabe77a14c9da86eca5d7556832b2dff7005f79f61ba802b6c855ea38a043d18d996c21897f7c820b1ea63cd5d823472adfd8b56df62d0a14f15c9e48b9ca7d4aceb012a16778d88ebe48c501e9dd460d3a21a0a4bcc4bc7129bda1912eff1a3d43fdd75cf7c2c50978d94fbf65b34fe73d003084fcf6133f2336ffa4a4b927fed2ae7bcb010360805fa497af8cb3dfd2ea25419f3857899bdab0bdb61f3ea1de0f7d6aa6e79f5493fab9751eb0d9c5fe65956072125c47d94740f2a3ace54719f09ebf3e27d895d51935332265571596731ce3144330ea48d8995038d756986b111899c8630a24920261a1f9907fdabd970f7dc69058a8efc4381b414752b12f3974ded28a149760c7fef4ddf906b8210825d1c98dcdee80994996f6d93fe70d93f1736e362c311ea1fa5d3bce28fe7111c2a9d0baabf6bb77cb9054c863f2d40b990f41a0766364b31f4cb68bafc05a757abe072d0b389091acff20f3ea906d01b9ca4fb4b251b84be30e93cb1017f8e1b1147120f6788548c759cf42c399c6b643deeb66a98eee89ade40807724a20e1a3423641b5f03040141914d3d81f9717a85140ffc052c781a59a18a52e08f00da35a5754ca4fbfa77c0c1265d9e28644ba89d4499a31b60e350eb61746207a0469b464303dbec4dbe13d297de3fc3b4e6bd37805ea69bf79e847633a8f68d8a053401f82fafc0c1dbc5f7d03729f306f0d048994b53504aeb0e9dafb93394e6d425d22ff198579d546c63c0c77407c43bf9fbfbfd62ca8ac316ca4d19e4631cbbd9cdf21ecfbb3eeacdfa75605d803184c11bf9ee730942962e688c5fad693a6e88d21d61dfb51d8e84ffd090a5f7c31ef8f77e1a3e7ee77f71531e3d3e190bc8bbfd5e7b7792a0e361baee79c9db165033a83fda2f1972b75ad31e299ee69af7bb1c50870be803b17f6adc284bd18d10444b9af2a44be791515f2f229d549b8b85d0e05ac418c852336b917cf6b5cfde4f0521a19d3b888f72b71c5a5b11f96853f76da5cd954ecfde9b37f4f44f3187034c57790be1e696390b9ed4db6d660900b1bdf9f76447037ae56a1ec6d78560afa27aed79ef6b592db1056d97104d5cf8f16e5dc9e8c45915486c042ad29ed2c8084fb94ee9ebf18792b83220dc38936c3d2e09a1ef541fc7a440b6a09674a55860fd9467efe1580a6601720b36f128612b20837c6f4cc44a43deb771a001885bb17467d7ec350ddc648f3c13b579213b91d35c02481280efdee61cae175923fe9e5f218d61b146b71d9d7d60dbf740ee3f53fe46e7952cbca6595e56dfa02aecd623b6be5719f87de725d92df32838f1b61b4e7bae65b683619ed8286e70382f801c067548d6f83c701c92fb84d0e0256114882af2c8fe2b67e456f7c77637560a610693b6302d0f5e135c96036966aa6868b77d10e2272887491fce4ce8ec1e0fadc326707fa1a404384baec7b1ba0524ee1ee873662c1a530ea396fc5cf5fa3c8b117829cb144577bdce0cca193a180b0b2ba69ca8fec31e70f7f6d5c2f5cbed9bd5a5998ed896fb4d36432b9ba8a6508fac5529cba750da9e2b651127c171fa7774d4c75b5b62fafc114c5775275a8ba20cbe7441a1709c2b0444d7f1721c368f35278c0b294b3cf8cb7fcad332f0f1bd2fdccb4c7e402c7efbfe9260b95ce72dc608897dc394490607c8914d29fd0a37036cdbe69df74e78cad0f11221306fd15acd622dd709a19fdcf134362c358efc9398162c38b32ae9e66d12d50489643c43a19da922d14a90823d92bf3253a6916dee9768af98ec865f2d2413aeb1455a0d0264a1348757aae7746ad86ebdfe6971dbeec2b30c36802e007da501bf27c68c5a7103d9e437ae6ab58f64b0ed67e258a7c7f9a9b07d6bb11e3e511d877085170d8c33e20a62f34c655cdfc2a788e69339ed9c08be0019130ec88b4a4b213d089bc182f8595547353bb36e1fb2df57405c982070a4ceff26e4ea2a3d2faa45f1f6a965c83429ce4ce07c6b5db04a4031247babd3cd8cf39861f4702c92ee85251ebe2456e4429f8a32efbac1e57c6baa36554dc807720077a8ca19a9db71710eefa1e9c202878b8b7f4a124db303ccd3a2dfe31cb5f0be4df44b5835cb95b089f5495ce35651a84ac26552c343dc63832a36c966c92ba8e661ddbdab08775d50c40790e597bdc5b452565d0465cd93d6bb681b2596252fd255e4a208eed904dfbab2e6fe2329c97cb3d15ecb63d3aff17e226f2e40c88ea6322bc6bbba4f6d750ed7f50908c3da02b488a4fc86f0270227efb45b6a5382c1994d49fdd2544c0d03b88e410df64cc8dabf83916f3a40257c02ee9d4b67f8dd3297a9695c3ef0d06a28ad66e7619c0bf0fd2542483bd6ec8e9fa829e7a521c522a372364b4c20e5cab35442ce1ac237c3fd9d177c229bdb4ee9667430826e059c59b12bbb5cf03f7291b0afc303844dcf1df174357d7e2f833043595f2d8bcf6271bd2e844238f460ae082f59aebb3d18c87d482688c58c5541c79d10d44ca6dc221faeab71a36c0ca8fa5eb0cf337077ae07bab63f7aca2caaa588340f8796a564788d7436276039e83f25c6350121078c10d896eb6d9cf6e7ea99290c10378e88d5e7309f17518e28454078d04bcb38f15d1a624cbc5c0d76878df58f220726c8365641e1fd2a66c9233bb3143af62c72bb06fc3cc627fbc66c9b778e254c4680c143b936c69a977fdbd3d5fad2ad6d974796d03e96989863d25de45313bb49421bacb3cd52e379c182b28bdbf18622026619be32e059d267bb1342e82dd0004f48e838ba2a379cd1e2bfc978b8aab80b79630a139c4dd89302547dc3296838f95a211f7a6f74d9e9f977832e7a6c4ccdce6e79c4735d700c81d6bb4c461d3288f41037abade34b7998ace0af5e7f9697e3042b171cdac15a7102d1b146db3b9057e22c274e6a6c156da70fbf9a07e0b7b22b90400aca401c05f5168483f66d5fc1db6e467463e652ca41ead157d29ce14c19c493234287578e0e6c21b6aca9f59d6591c09c81649d5c1e4bbb43745e83cd9c23d5b7b89282efba61e3e790dbce7aaae0011c81dae1c48fc4400bd81da44b2417682744bd06ae1b9c63a004d9345202e63eb4a4708e6ddb20be55c843ee3fa19ddacf7ad32d1ded060d9d8bd46bff386e0a3fe41260a8c90a8eb0089083e1b72278e0a7398b6e2e27c256ea426174d6a1fbe4067685f9eab61ace1a655d3ca35cf566fd148112e11ca4f39d0fbe041aba99a93e11c44e4ff07e830a1acfa07132d287fbcdb2eec82e4fb4fad847c29f601c578e6c7109340555fe16f82c058d60aa57d19baf6eccd59b8ffd789de6376dc9356b78494c5ea3d1c29bbeeba8e76433d3caa4adf0db15377834f5bb90f88b680030eb82b63fdd9f922d5bb0b054a50c8ac82c0925902dd351e8d9d61141d34b36f0a1d2a7b6ef6205ee1ceba611964e9e1268c57bed9cd5779961f38c7bc42fb9b66c024727ebe72ed9f6374eb44fa29ac11bf71c626a43c67b917a4481829a053644f769d0024104c9fd8f72fc7534323aab7efb20572fdbf68851c79aeee8137726145e4328fa70c38189f8441438947d6a49e3dd3dc9d5185d810aef71afd8dfbf96339ebd0e2a159f75d8c34c9bf37ca5cdd791371e4e835962b7d92b5d0924ccb071b841e7f96d0552abcdb3fc692f216fc687f72fbd360f534e2407d01f30ba9427f2fa5007dccb470c60fce127a577f91f07aaeaeff524b3fcdf9311171f443c5ad08b74b60ecbd8bfbb0fa842c18a5c8487f0247acdbeb393dc7cf376f6de99b13550c8db32a08c02a182dd15760da6c8bd3a7259724edec715570bb18465330666bff3a7147bae0d500fe771410efb11b348a194d7ce949ce074ec24fe5f7716671eadb824ff5e1668563a5398b833b1cab4e9d2df97783a52fd91b60d1c700ec0616208f99ad376de03162dd07dd42ffaa7c9ff4af7d48cde82c9dd040bd724039c929219079d23a7ca412aab0ddc833aac5a9afe819fae46cd8c8006dc4e96e11fe826df073b1ad9520b0442af3bde997b97d23bcf7a284dc89703e0b41b597ca1c64a23944cf6ab196ecd33b1cd764396eded169bcf62c7faa61f386ac64910852ef409c4c4242eb11a0ce5d13205891f3f6e8f568d781fd86636af3393918adcee3a73fac340f486d3c511a64c6587d0e0c553d087c3706bb8498dc059056b8ffd0d185df6c52b482bd55532550e1c9d37279ccf0ba698b90f185dc4c43aee53dacff0887fe842ecffb450088407443b709691fb10a0e9b38c2af46a60e9a02db9d8efcb3e89d0a19ba31ed3975eaa95d8fc6aed274f3a0ebccc99d3c5fb1be2d5a2f5814688db811d8af8fc273a8e47620e23934c1ea642cf776fa276ad857cb023988ef39b237b00c72b85d86fed11fbdeaf31ced509c265822b560e7f0793eb5b53c5c7be3d855d146e2997f9974677dfa7a49f3c685bf24e8dcae56b3352c1038d8c7392af62ed22c5054157812ed4b14e6c7b9e4f8cba3fd99543ea467019ad74e2025b2b1c4195581ef91a88b999254ac748e748c4a50480a6cd3f5fd7d8bc919bdce7bf51925dc187df60af567ef232cb59d5583d604a19928c2699905446f2758fc7b640fbd0a2b9494b2b13cea88da31c5b643663f592e9b9ba580c16a2371dfdb223c7c803389b331e2412862c26cd9254e1db521f0851d9fe1d9d3cec7718fa785e227ffeda95e47944bd76ad718a1e27fdc7a51bea6f128f593cff860e82a9b474e0956830a35340616f4e8fbb10c94698b4310ee49b9398d0501af47982a7add81fef360000860926d09236532751a54107636120454e9b952ad891e645c74606a9869e5b6a4e20178decbf842d3aba603be3f4ff149b23776954b4b9898755f05b91fcee1574dc66de42547cee0b4f23c320224a737776bc4f04bcb996bef301b692d8b64d1d11d54dc5ef5760fda3e16571cac787d1f0e6de4a88b7f6ef8886734a451c4c971545d9ffe39d80eeaf9f1c77ab04364ad3281a4d41a250e410e138fc759cdf4e408a38d26a72bee16e1ddb1055c391a09fae22209e891d93be9c0cb1a8515e5ff69b55c5d9bc83bf92316d3addc29ed0d3cc1f8c6635f0726014fc7cf5236e7757cac9d391821f239267010b89d3918df46e1b483e5afa999ae7345850e17cf93d2da84d84e1a0d2e2bb95eb890ac6fca1ebfb7387b799b02c275f915b5e4780dde3f738fc2432636d89d620f541d218d39dc7b1854e77c85d3661030e79d7838935724804e5885e901856debc53fd947b6f5239961943ad48d581d88e4ce26c0fbd342fac6159d2264ef4051fa29cb850649650537bcbf3ad06cf8736cf09df521eba9098f532953e1541b223db5f37de855f8673c59fdb1acce1b2cfc9fe50d38dc13f9809ea382cd4863c7c1c691eae1863f563054fa6a0bfb039d1dda3f250f52d155269e3f2ecfbfc57cb3add84f986ef9cb84f4c4b75d32d3edd960ceafbe69ac71a0a524bd79777f20fdfdd29d063e06c0bae7fd247592f05432406afb207f4476e0bed4e7b76395361a1bb7a16db6a95c59ddc1930053b93c51eee3f405f62a9e412d5c1aef4cc7a7ccb70d6d91ae27d477fcee7d84e1e3e519995127a43eb576d9518bd6112686fe7a90c7053d94f67c2878d3537af078ddfbdda06ba4c01888dbe6be9ef4f38e2f8d49a7d023996c516f1289fd9cfd4936089f0bcd0de5156d580b68554e8e9c3874a6b2d56bc736f49217c88859aa63ea1384f3b9dbdc8b30262d0efffddec03fc4241740d23917ef92fc7de3ae3665ff3c9397bf4fcde524cc403f28806317a0059ae93d82e3fb5cc49596c785f46427317d2f3c9d285d239383dfbea914ad84213e1e0121533dc696bee622d0f93ed8eef2e1eb408364adfca90eef0236a85c8d5c4a55dd42793d18b9eaceb8727e1a5bf01b1156ca04452485c6e4a9d40185664eec10c5fecc9dfd48536d5aa70c29eeb43c7a1a2ed73ff66a2604ed959a811e2268980958b2ab1682fb2a5966ab85163a34a9efc27d349625970f1", 0x2000, &(0x7f00000048c0)={0x0, &(0x7f00000020c0)={0x18}, 0x0, 0x0, 0x0, 0x0, 0x0, &(0x7f0000002280)={0x18, 0x0, 0x0, {0x9}}, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0})

3 2

[PATCH v2] ASoC: codecs: add uspport for the TI SRC4392 codec
by Matt Flax 22 Aug '22

22 Aug '22

The src4xxx keyword is used for future capability to integrate other codecs similar to the src4392 to the same code base. Signed-off-by: Matt Flax <flatmax(a)flatmax.com> --- Notes: V2 changes : * Fixed indents in Kconfig * Comment header of source code is now one block * Documented the devicetree binding * sample rate converter MCLK src is non-user settable * hushed spurious dev_info output * src4xxx_remove was empty is removed. * Using switch in hw_params to select port reg. for clarity * Removed interrupt reg. settings - will re-intro. properly later * probe function is now EXPORT_SYMBOL_GPL .../devicetree/bindings/sound/src4xxx.txt | 20 + sound/soc/codecs/Kconfig | 13 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/src4xxx-i2c.c | 55 ++ sound/soc/codecs/src4xxx.c | 508 ++++++++++++++++++ sound/soc/codecs/src4xxx.h | 115 ++++ 6 files changed, 715 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/src4xxx.txt create mode 100644 sound/soc/codecs/src4xxx-i2c.c create mode 100644 sound/soc/codecs/src4xxx.c create mode 100644 sound/soc/codecs/src4xxx.h diff --git a/Documentation/devicetree/bindings/sound/src4xxx.txt b/Documentation/devicetree/bindings/sound/src4xxx.txt new file mode 100644 index 000000000000..f8d845d42f42 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/src4xxx.txt @@ -0,0 +1,20 @@ +Texas Instruments src4392 DT bindings + +SRC4392 is a digital audio codec that can be connected via +I2C or SPI. Currently, only I2C bus is supported. + +Required properties: + + - compatible: "ti,src4392" + +Required properties on I2C: + + - reg: the I2C address + +Examples: + + src4392@70 { + compatible = "ti,src4392"; + reg = <0x70>; + #sound-dai-cells = <0>; + }; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d16b4efb88a7..9c9d74074888 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -205,6 +205,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_SIMPLE_AMPLIFIER imply SND_SOC_SIMPLE_MUX imply SND_SOC_SPDIF + imply SND_SOC_SRC4XXX_I2C imply SND_SOC_SSM2305 imply SND_SOC_SSM2518 imply SND_SOC_SSM2602_SPI @@ -1471,6 +1472,18 @@ config SND_SOC_SIMPLE_MUX config SND_SOC_SPDIF tristate "S/PDIF CODEC" +config SND_SOC_SRC4XXX_I2C + tristate + depends on I2C + select SND_SOC_SRC4XXX + +config SND_SOC_SRC4XXX + tristate "Texas Instruments SRC4XXX DIR/DIT and SRC codecs" + help + Enable support for the TI SRC4XXX family of codecs. These include the + scr4392 which has digital receivers, transmitters, and + a sample rate converter, including numerous ports. + config SND_SOC_SSM2305 tristate "Analog Devices SSM2305 Class-D Amplifier" help diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 92fd441d426a..a599b727c65b 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -231,6 +231,8 @@ snd-soc-sigmadsp-regmap-objs := sigmadsp-regmap.o snd-soc-si476x-objs := si476x.o snd-soc-spdif-tx-objs := spdif_transmitter.o snd-soc-spdif-rx-objs := spdif_receiver.o +snd-soc-src4xxx-objs := src4xxx.o +snd-soc-src4xxx-i2c-objs := src4xxx-i2c.o snd-soc-ssm2305-objs := ssm2305.o snd-soc-ssm2518-objs := ssm2518.o snd-soc-ssm2602-objs := ssm2602.o @@ -579,6 +581,8 @@ obj-$(CONFIG_SND_SOC_SIGMADSP_I2C) += snd-soc-sigmadsp-i2c.o obj-$(CONFIG_SND_SOC_SIGMADSP_REGMAP) += snd-soc-sigmadsp-regmap.o obj-$(CONFIG_SND_SOC_SI476X) += snd-soc-si476x.o obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif-rx.o snd-soc-spdif-tx.o +obj-$(CONFIG_SND_SOC_SRC4XXX) += snd-soc-src4xxx.o +obj-$(CONFIG_SND_SOC_SRC4XXX_I2C) += snd-soc-src4xxx-i2c.o obj-$(CONFIG_SND_SOC_SSM2305) += snd-soc-ssm2305.o obj-$(CONFIG_SND_SOC_SSM2518) += snd-soc-ssm2518.o obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o diff --git a/sound/soc/codecs/src4xxx-i2c.c b/sound/soc/codecs/src4xxx-i2c.c new file mode 100644 index 000000000000..a42d1b463dbf --- /dev/null +++ b/sound/soc/codecs/src4xxx-i2c.c @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Driver for SRC4XXX codecs + * + * Copyright 2021-2022 Deqx Pty Ltd + * Author: Matt Flax <flatmax(a)flatmax.com> + */ + +#include <linux/i2c.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/regmap.h> + +#include "src4xxx.h" + +static int src4xxx_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + return src4xxx_probe(&i2c->dev, + devm_regmap_init_i2c(i2c, &src4xxx_regmap_config), NULL); +} + +static int src4xxx_i2c_remove(struct i2c_client *i2c) +{ + src4xxx_remove(&i2c->dev); + return 0; +} + +static const struct i2c_device_id src4xxx_i2c_ids[] = { + { "src4392", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, src4xxx_i2c_ids); + +static const struct of_device_id src4xxx_of_match[] = { + { .compatible = "ti,src4392", }, + { } +}; +MODULE_DEVICE_TABLE(of, src4xxx_of_match); + + +static struct i2c_driver src4xxx_i2c_driver = { + .driver = { + .name = "src4xxx", + .of_match_table = of_match_ptr(src4xxx_of_match), + }, + .probe = src4xxx_i2c_probe, + .remove = src4xxx_i2c_remove, + .id_table = src4xxx_i2c_ids, +}; +module_i2c_driver(src4xxx_i2c_driver); + +MODULE_DESCRIPTION("ASoC SRC4392 CODEC I2C driver"); +MODULE_AUTHOR("Matt Flax <flatmax(a)flatmax.com>"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/src4xxx.c b/sound/soc/codecs/src4xxx.c new file mode 100644 index 000000000000..46f693a59186 --- /dev/null +++ b/sound/soc/codecs/src4xxx.c @@ -0,0 +1,508 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * TI SRC4xxx Audio Codec driver + * + * Copyright 2021-2022 Deqx Pty Ltd + * Author: Matt Flax <flatmax(a)flatmax.com> + */ + +#include <linux/module.h> + +#include <sound/soc.h> +#include <sound/tlv.h> + +#include "src4xxx.h" + +struct src4xxx { + struct regmap *regmap; + bool master[2]; + int mclk_hz; + struct device *dev; +}; + +enum {SRC4XXX_PORTA, SRC4XXX_PORTB}; + +/* SRC attenuation */ +static const DECLARE_TLV_DB_SCALE(src_tlv, -12750, 50, 0); + +static const struct snd_kcontrol_new src4xxx_controls[] = { + SOC_DOUBLE_R_TLV("SRC vol", + SRC4XXX_SCR_CTL_30, SRC4XXX_SCR_CTL_31, 0, 255, 1, src_tlv), +}; + +/* I2S port control */ +static const char * const port_out_src_text[] = { + "loopback", "other_port", "DIR", "SRC" +}; +static SOC_ENUM_SINGLE_DECL(porta_out_src_enum, SRC4XXX_PORTA_CTL_03, 4, + port_out_src_text); +static SOC_ENUM_SINGLE_DECL(portb_out_src_enum, SRC4XXX_PORTB_CTL_05, 4, + port_out_src_text); +static const struct snd_kcontrol_new porta_out_control = + SOC_DAPM_ENUM("Port A source select", porta_out_src_enum); +static const struct snd_kcontrol_new portb_out_control = + SOC_DAPM_ENUM("Port B source select", portb_out_src_enum); + +/* Digital audio transmitter control */ +static const char * const dit_mux_text[] = {"Port A", "Port B", "DIR", "SRC"}; +static SOC_ENUM_SINGLE_DECL(dit_mux_enum, SRC4XXX_TX_CTL_07, 3, dit_mux_text); +static const struct snd_kcontrol_new dit_mux_control = + SOC_DAPM_ENUM("DIT source", dit_mux_enum); + +/* SRC control */ +static const char * const src_in_text[] = {"Port A", "Port B", "DIR"}; +static SOC_ENUM_SINGLE_DECL(src_in_enum, SRC4XXX_SCR_CTL_2D, 0, src_in_text); +static const struct snd_kcontrol_new src_in_control = + SOC_DAPM_ENUM("SRC source select", src_in_enum); + +/* DIR control */ +static const char * const dir_in_text[] = {"Ch 1", "Ch 2", "Ch 3", "Ch 4"}; +static SOC_ENUM_SINGLE_DECL(dir_in_enum, SRC4XXX_RCV_CTL_0D, 0, dir_in_text); +static const struct snd_kcontrol_new dir_in_control = + SOC_DAPM_ENUM("Digital Input", dir_in_enum); + +static const struct snd_soc_dapm_widget src4xxx_dapm_widgets[] = { + SND_SOC_DAPM_INPUT("loopback_A"), + SND_SOC_DAPM_INPUT("other_port_A"), + SND_SOC_DAPM_INPUT("DIR_A"), + SND_SOC_DAPM_INPUT("SRC_A"), + SND_SOC_DAPM_MUX("Port A source", + SND_SOC_NOPM, 0, 0, &porta_out_control), + + SND_SOC_DAPM_INPUT("loopback_B"), + SND_SOC_DAPM_INPUT("other_port_B"), + SND_SOC_DAPM_INPUT("DIR_B"), + SND_SOC_DAPM_INPUT("SRC_B"), + SND_SOC_DAPM_MUX("Port B source", + SND_SOC_NOPM, 0, 0, &portb_out_control), + + SND_SOC_DAPM_INPUT("Port_A"), + SND_SOC_DAPM_INPUT("Port_B"), + SND_SOC_DAPM_INPUT("DIR_"), + + /* Digital audio receivers and transmitters */ + SND_SOC_DAPM_OUTPUT("DIR_OUT"), + SND_SOC_DAPM_OUTPUT("SRC_OUT"), + SND_SOC_DAPM_MUX("DIT Out Src", SRC4XXX_PWR_RST_01, + SRC4XXX_ENABLE_DIT_SHIFT, 1, &dit_mux_control), + + /* Audio Interface */ + SND_SOC_DAPM_AIF_IN("AIF_A_RX", "Playback A", 0, + SRC4XXX_PWR_RST_01, SRC4XXX_ENABLE_PORT_A_SHIFT, 1), + SND_SOC_DAPM_AIF_OUT("AIF_A_TX", "Capture A", 0, + SRC4XXX_PWR_RST_01, SRC4XXX_ENABLE_PORT_A_SHIFT, 1), + SND_SOC_DAPM_AIF_IN("AIF_B_RX", "Playback B", 0, + SRC4XXX_PWR_RST_01, SRC4XXX_ENABLE_PORT_B_SHIFT, 1), + SND_SOC_DAPM_AIF_OUT("AIF_B_TX", "Capture B", 0, + SRC4XXX_PWR_RST_01, SRC4XXX_ENABLE_PORT_B_SHIFT, 1), + + SND_SOC_DAPM_MUX("SRC source", SND_SOC_NOPM, 0, 0, &src_in_control), + + SND_SOC_DAPM_INPUT("MCLK"), + SND_SOC_DAPM_INPUT("RXMCLKI"), + SND_SOC_DAPM_INPUT("RXMCLKO"), + + SND_SOC_DAPM_INPUT("RX1"), + SND_SOC_DAPM_INPUT("RX2"), + SND_SOC_DAPM_INPUT("RX3"), + SND_SOC_DAPM_INPUT("RX4"), + SND_SOC_DAPM_MUX("Digital Input", SRC4XXX_PWR_RST_01, + SRC4XXX_ENABLE_DIR_SHIFT, 1, &dir_in_control), +}; + +static const struct snd_soc_dapm_route src4xxx_audio_routes[] = { + /* I2S Input to Output Routing */ + {"Port A source", "loopback", "loopback_A"}, + {"Port A source", "other_port", "other_port_A"}, + {"Port A source", "DIR", "DIR_A"}, + {"Port A source", "SRC", "SRC_A"}, + {"Port B source", "loopback", "loopback_B"}, + {"Port B source", "other_port", "other_port_B"}, + {"Port B source", "DIR", "DIR_B"}, + {"Port B source", "SRC", "SRC_B"}, + /* DIT muxing */ + {"DIT Out Src", "Port A", "Capture A"}, + {"DIT Out Src", "Port B", "Capture B"}, + {"DIT Out Src", "DIR", "DIR_OUT"}, + {"DIT Out Src", "SRC", "SRC_OUT"}, + + /* SRC input selection */ + {"SRC source", "Port A", "Port_A"}, + {"SRC source", "Port B", "Port_B"}, + {"SRC source", "DIR", "DIR_"}, + /* SRC mclk selection */ + {"SRC mclk source", "Master (MCLK)", "MCLK"}, + {"SRC mclk source", "Master (RXCLKI)", "RXMCLKI"}, + {"SRC mclk source", "Recovered receiver clk", "RXMCLKO"}, + /* DIR input selection */ + {"Digital Input", "Ch 1", "RX1"}, + {"Digital Input", "Ch 2", "RX2"}, + {"Digital Input", "Ch 3", "RX3"}, + {"Digital Input", "Ch 4", "RX4"}, +}; + + +static const struct snd_soc_component_driver src4xxx_driver = { + .controls = src4xxx_controls, + .num_controls = ARRAY_SIZE(src4xxx_controls), + + .dapm_widgets = src4xxx_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(src4xxx_dapm_widgets), + .dapm_routes = src4xxx_audio_routes, + .num_dapm_routes = ARRAY_SIZE(src4xxx_audio_routes), +}; + +static int src4xxx_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) +{ + struct snd_soc_component *component = dai->component; + struct src4xxx *src4xxx = snd_soc_component_get_drvdata(component); + unsigned int ctrl; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + ctrl = SRC4XXX_BUS_MASTER; + src4xxx->master[dai->id] = true; + break; + case SND_SOC_DAIFMT_CBS_CFS: + ctrl = 0; + src4xxx->master[dai->id] = false; + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + ctrl |= SRC4XXX_BUS_I2S; + break; + case SND_SOC_DAIFMT_LEFT_J: + ctrl |= SRC4XXX_BUS_LEFT_J; + break; + case SND_SOC_DAIFMT_RIGHT_J: + ctrl |= SRC4XXX_BUS_RIGHT_J_24; + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + default: + return -EINVAL; + } + + regmap_update_bits(src4xxx->regmap, SRC4XXX_BUS_FMT(dai->id), + SRC4XXX_BUS_FMT_MS_MASK, ctrl); + + return 0; +} + +static int src4xxx_set_mclk_hz(struct snd_soc_dai *codec_dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_component *component = codec_dai->component; + struct src4xxx *src4xxx = snd_soc_component_get_drvdata(component); + + dev_info(component->dev, "changing mclk rate from %d to %d Hz\n", + src4xxx->mclk_hz, freq); + src4xxx->mclk_hz = freq; + + return 0; +} + +static int src4xxx_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct src4xxx *src4xxx = snd_soc_component_get_drvdata(component); + unsigned int mclk_div; + int val, pj, jd, d; + int reg; + int ret; + + switch (dai->id) { + case SRC4XXX_PORTB: + reg = SRC4XXX_PORTB_CTL_06; + break; + default: + reg = SRC4XXX_PORTA_CTL_04; + } + + if (src4xxx->master[dai->id]) { + mclk_div = src4xxx->mclk_hz/params_rate(params); + if (src4xxx->mclk_hz != mclk_div*params_rate(params)) { + dev_err(component->dev, + "mclk %d / rate %d has a remainder.\n", + src4xxx->mclk_hz, params_rate(params)); + return -EINVAL; + } + + val = ((int)mclk_div - 128) / 128; + if ((val < 0) | (val > 3)) { + dev_err(component->dev, + "div register setting %d is out of range\n", + val); + dev_err(component->dev, + "unsupported sample rate %d Hz for the master clock of %d Hz\n", + params_rate(params), src4xxx->mclk_hz); + return -EINVAL; + } + + /* set the TX DIV */ + ret = regmap_update_bits(src4xxx->regmap, + SRC4XXX_TX_CTL_07, SRC4XXX_TX_MCLK_DIV_MASK, + val<<SRC4XXX_TX_MCLK_DIV_SHIFT); + if (ret) { + dev_err(component->dev, + "Couldn't set the TX's div register to %d << %d = 0x%x\n", + val, SRC4XXX_TX_MCLK_DIV_SHIFT, + val<<SRC4XXX_TX_MCLK_DIV_SHIFT); + return ret; + } + + /* set the PLL for the digital receiver */ + switch (src4xxx->mclk_hz) { + case 24576000: + pj = 0x22; + jd = 0x00; + d = 0x00; + break; + case 22579200: + pj = 0x22; + jd = 0x1b; + d = 0xa3; + break; + default: + /* don't error out here, + * other parts of the chip are still functional + */ + dev_info(component->dev, + "Couldn't set the RCV PLL as this master clock rate is unknown\n"); + } + ret = regmap_write(src4xxx->regmap, SRC4XXX_RCV_PLL_0F, pj); + if (ret < 0) + dev_err(component->dev, + "Failed to update PLL register 0x%x\n", + SRC4XXX_RCV_PLL_0F); + ret = regmap_write(src4xxx->regmap, SRC4XXX_RCV_PLL_10, jd); + if (ret < 0) + dev_err(component->dev, + "Failed to update PLL register 0x%x\n", + SRC4XXX_RCV_PLL_10); + ret = regmap_write(src4xxx->regmap, SRC4XXX_RCV_PLL_11, d); + if (ret < 0) + dev_err(component->dev, + "Failed to update PLL register 0x%x\n", + SRC4XXX_RCV_PLL_11); + + ret = regmap_update_bits(src4xxx->regmap, + SRC4XXX_TX_CTL_07, SRC4XXX_TX_MCLK_DIV_MASK, + val<<SRC4XXX_TX_MCLK_DIV_SHIFT); + if (ret < 0) { + dev_err(component->dev, + "Couldn't set the TX's div register to %d << %d = 0x%x\n", + val, SRC4XXX_TX_MCLK_DIV_SHIFT, + val<<SRC4XXX_TX_MCLK_DIV_SHIFT); + return ret; + } + + return regmap_update_bits(src4xxx->regmap, reg, + SRC4XXX_MCLK_DIV_MASK, val); + } else + dev_info(dai->dev, "not setting up MCLK as not master\n"); + + return 0; +}; + +static const struct snd_soc_dai_ops src4xxx_dai_ops = { + .hw_params = src4xxx_hw_params, + .set_sysclk = src4xxx_set_mclk_hz, + .set_fmt = src4xxx_set_dai_fmt, +}; + +#define SRC4XXX_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE) +#define SRC4XXX_RATES (SNDRV_PCM_RATE_44100|SNDRV_PCM_RATE_48000|\ + SNDRV_PCM_RATE_88200|\ + SNDRV_PCM_RATE_96000|\ + SNDRV_PCM_RATE_176400|\ + SNDRV_PCM_RATE_192000) + +static struct snd_soc_dai_driver src4xxx_dai_driver[] = { + { + .id = SRC4XXX_PORTA, + .name = "src4xxx-portA", + .playback = { + .stream_name = "Playback A", + .channels_min = 2, + .channels_max = 2, + .rates = SRC4XXX_RATES, + .formats = SRC4XXX_FORMATS, + }, + .capture = { + .stream_name = "Capture A", + .channels_min = 2, + .channels_max = 2, + .rates = SRC4XXX_RATES, + .formats = SRC4XXX_FORMATS, + }, + .ops = &src4xxx_dai_ops, + }, + { + .id = SRC4XXX_PORTB, + .name = "src4xxx-portB", + .playback = { + .stream_name = "Playback B", + .channels_min = 2, + .channels_max = 2, + .rates = SRC4XXX_RATES, + .formats = SRC4XXX_FORMATS, + }, + .capture = { + .stream_name = "Capture B", + .channels_min = 2, + .channels_max = 2, + .rates = SRC4XXX_RATES, + .formats = SRC4XXX_FORMATS, + }, + .ops = &src4xxx_dai_ops, + }, +}; + +static const struct reg_default src4xxx_reg_defaults[] = { + { SRC4XXX_PWR_RST_01, 0x00 }, /* all powered down intially */ + { SRC4XXX_PORTA_CTL_03, 0x00 }, + { SRC4XXX_PORTA_CTL_04, 0x00 }, + { SRC4XXX_PORTB_CTL_05, 0x00 }, + { SRC4XXX_PORTB_CTL_06, 0x00 }, + { SRC4XXX_TX_CTL_07, 0x00 }, + { SRC4XXX_TX_CTL_08, 0x00 }, + { SRC4XXX_TX_CTL_09, 0x00 }, + { SRC4XXX_SRC_DIT_IRQ_MSK_0B, 0x00 }, + { SRC4XXX_SRC_DIT_IRQ_MODE_0C, 0x00 }, + { SRC4XXX_RCV_CTL_0D, 0x00 }, + { SRC4XXX_RCV_CTL_0E, 0x00 }, + { SRC4XXX_RCV_PLL_0F, 0x00 }, /* not spec. in the datasheet */ + { SRC4XXX_RCV_PLL_10, 0xff }, /* not spec. in the datasheet */ + { SRC4XXX_RCV_PLL_11, 0xff }, /* not spec. in the datasheet */ + { SRC4XXX_RVC_IRQ_MSK_16, 0x00 }, + { SRC4XXX_RVC_IRQ_MSK_17, 0x00 }, + { SRC4XXX_RVC_IRQ_MODE_18, 0x00 }, + { SRC4XXX_RVC_IRQ_MODE_19, 0x00 }, + { SRC4XXX_RVC_IRQ_MODE_1A, 0x00 }, + { SRC4XXX_GPIO_1_1B, 0x00 }, + { SRC4XXX_GPIO_2_1C, 0x00 }, + { SRC4XXX_GPIO_3_1D, 0x00 }, + { SRC4XXX_GPIO_4_1E, 0x00 }, + { SRC4XXX_SCR_CTL_2D, 0x00 }, + { SRC4XXX_SCR_CTL_2E, 0x00 }, + { SRC4XXX_SCR_CTL_2F, 0x00 }, + { SRC4XXX_SCR_CTL_30, 0x00 }, + { SRC4XXX_SCR_CTL_31, 0x00 }, +}; + +int src4xxx_probe(struct device *dev, struct regmap *regmap, + void (*switch_mode)(struct device *dev)) +{ + struct src4xxx *src4xxx; + int ret; + + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + src4xxx = devm_kzalloc(dev, sizeof(*src4xxx), GFP_KERNEL); + if (!src4xxx) + return -ENOMEM; + + src4xxx->regmap = regmap; + src4xxx->dev = dev; + src4xxx->mclk_hz = 0; /* mclk has not been configured yet */ + dev_set_drvdata(dev, src4xxx); + + ret = regmap_write(regmap, SRC4XXX_PWR_RST_01, SRC4XXX_RESET); + if (ret < 0) + dev_err(dev, "Failed to issue reset: %d\n", ret); + usleep_range(1, 500); /* sleep for more then 500 ns */ + ret = regmap_write(regmap, SRC4XXX_PWR_RST_01, SRC4XXX_POWER_DOWN); + if (ret < 0) + dev_err(dev, "Failed to decommission reset: %d\n", ret); + usleep_range(500, 1000); /* sleep for 500 us or more */ + + ret = regmap_update_bits(src4xxx->regmap, SRC4XXX_PWR_RST_01, + SRC4XXX_POWER_ENABLE, SRC4XXX_POWER_ENABLE); + if (ret < 0) + dev_err(dev, "Failed to port A and B : %d\n", ret); + + /* set receiver to use master clock (rcv mclk is most likely jittery) */ + ret = regmap_update_bits(src4xxx->regmap, SRC4XXX_RCV_CTL_0D, + SRC4XXX_RXCLK_MCLK, SRC4XXX_RXCLK_MCLK); + if (ret < 0) + dev_err(dev, + "Failed to enable mclk as the PLL1 DIR reference : %d\n", ret); + + /* default to leaving the PLL2 running on loss of lock, divide by 8 */ + ret = regmap_update_bits(src4xxx->regmap, SRC4XXX_RCV_CTL_0E, + SRC4XXX_PLL2_DIV_8 | SRC4XXX_REC_MCLK_EN | SRC4XXX_PLL2_LOL, + SRC4XXX_PLL2_DIV_8 | SRC4XXX_REC_MCLK_EN | SRC4XXX_PLL2_LOL); + if (ret < 0) + dev_err(dev, "Failed to enable mclk rec and div : %d\n", ret); + + ret = devm_snd_soc_register_component(dev, &src4xxx_driver, + src4xxx_dai_driver, ARRAY_SIZE(src4xxx_dai_driver)); + if (ret == 0) + dev_info(dev, "src4392 probe ok %d\n", ret); + return ret; +} +EXPORT_SYMBOL_GPL(src4xxx_probe); + +static bool src4xxx_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case SRC4XXX_RES_00: + case SRC4XXX_GLOBAL_ITR_STS_02: + case SRC4XXX_SRC_DIT_STS_0A: + case SRC4XXX_NON_AUDIO_D_12: + case SRC4XXX_RVC_STS_13: + case SRC4XXX_RVC_STS_14: + case SRC4XXX_RVC_STS_15: + case SRC4XXX_SUB_CODE_1F: + case SRC4XXX_SUB_CODE_20: + case SRC4XXX_SUB_CODE_21: + case SRC4XXX_SUB_CODE_22: + case SRC4XXX_SUB_CODE_23: + case SRC4XXX_SUB_CODE_24: + case SRC4XXX_SUB_CODE_25: + case SRC4XXX_SUB_CODE_26: + case SRC4XXX_SUB_CODE_27: + case SRC4XXX_SUB_CODE_28: + case SRC4XXX_PC_PREAMBLE_HI_29: + case SRC4XXX_PC_PREAMBLE_LO_2A: + case SRC4XXX_PD_PREAMBLE_HI_2B: + case SRC4XXX_PC_PREAMBLE_LO_2C: + case SRC4XXX_IO_RATIO_32: + case SRC4XXX_IO_RATIO_33: + return true; + } + + if (reg > SRC4XXX_IO_RATIO_33 && reg < SRC4XXX_PAGE_SEL_7F) + return true; + + return false; +} + +const struct regmap_config src4xxx_regmap_config = { + .val_bits = 8, + .reg_bits = 8, + .max_register = SRC4XXX_IO_RATIO_33, + + .reg_defaults = src4xxx_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(src4xxx_reg_defaults), + .volatile_reg = src4xxx_volatile_register, + .cache_type = REGCACHE_RBTREE, +}; +EXPORT_SYMBOL_GPL(src4xxx_regmap_config); + +MODULE_DESCRIPTION("ASoC SRC4XXX CODEC driver"); +MODULE_AUTHOR("Matt Flax <flatmax(a)flatmax.com>"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/src4xxx.h b/sound/soc/codecs/src4xxx.h new file mode 100644 index 000000000000..0407db8a8445 --- /dev/null +++ b/sound/soc/codecs/src4xxx.h @@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * src4xxx.h -- SRC4XXX ALSA SoC audio driver + * + * Copyright 2021-2022 Deqx Pty Ltd + * Author: Matt R Flax <flatmax(a)flatmax.com> + */ + +#ifndef __SRC4XXX_H__ +#define __SRC4XXX_H__ + +#define SRC4XXX_RES_00 0x00 +#define SRC4XXX_PWR_RST_01 0x01 +#define SRC4XXX_RESET 0x80 +#define SRC4XXX_POWER_DOWN 0x00 +#define SRC4XXX_POWER_ENABLE 0x20 +#define SRC4XXX_ENABLE_SRC 0x1 +#define SRC4XXX_ENABLE_SRC_SHIFT 0 +#define SRC4XXX_ENABLE_DIR 0x2 +#define SRC4XXX_ENABLE_DIR_SHIFT 1 +#define SRC4XXX_ENABLE_DIT 0x4 +#define SRC4XXX_ENABLE_DIT_SHIFT 2 +#define SRC4XXX_ENABLE_PORT_B 0x8 +#define SRC4XXX_ENABLE_PORT_B_SHIFT 3 +#define SRC4XXX_ENABLE_PORT_A 0x10 +#define SRC4XXX_ENABLE_PORT_A_SHIFT 4 + +#define SRC4XXX_PORTA_CTL_03 0x03 +#define SRC4XXX_BUS_MASTER 0x8 +#define SRC4XXX_BUS_LEFT_J 0x0 +#define SRC4XXX_BUS_I2S 0x1 +#define SRC4XXX_BUS_RIGHT_J_16 0x4 +#define SRC4XXX_BUS_RIGHT_J_18 0x5 +#define SRC4XXX_BUS_RIGHT_J_20 0x6 +#define SRC4XXX_BUS_RIGHT_J_24 0x7 +#define SRC4XXX_BUS_FMT_MS_MASK 0xf + +#define SRC4XXX_PORTA_CTL_04 0x04 +#define SRC4XXX_MCLK_DIV_MASK 0x3 + +#define SRC4XXX_BUS_FMT(id) (SRC4XXX_PORTA_CTL_03+2*id) +#define SRC4XXX_BUS_CLK(id) (SRC4XXX_PORTA_CTL_04+2*id) + +#define SRC4XXX_PORTB_CTL_05 0x05 +#define SRC4XXX_PORTB_CTL_06 0x06 + +#define SRC4XXX_TX_CTL_07 0x07 +#define SRC4XXX_TX_MCLK_DIV_MASK 0x60 +#define SRC4XXX_TX_MCLK_DIV_SHIFT 5 + +#define SRC4XXX_TX_CTL_08 0x08 +#define SRC4XXX_TX_CTL_09 0x09 +#define SRC4XXX_SRC_DIT_IRQ_MSK_0B 0x0B +#define SRC4XXX_SRC_BTI_EN 0x01 +#define SRC4XXX_SRC_TSLIP_EN 0x02 +#define SRC4XXX_SRC_DIT_IRQ_MODE_0C 0x0C +#define SRC4XXX_RCV_CTL_0D 0x0D +#define SRC4XXX_RXCLK_RXCKI 0x0 +#define SRC4XXX_RXCLK_MCLK 0x8 +#define SRC4XXX_RCV_CTL_0E 0x0E +#define SRC4XXX_REC_MCLK_EN 0x1 +#define SRC4XXX_PLL2_DIV_0 (0x0<<1) +#define SRC4XXX_PLL2_DIV_2 (0x1<<1) +#define SRC4XXX_PLL2_DIV_4 (0x2<<1) +#define SRC4XXX_PLL2_DIV_8 (0x3<<1) +#define SRC4XXX_PLL2_LOL 0x8 +#define SRC4XXX_RCV_PLL_0F 0x0F +#define SRC4XXX_RCV_PLL_10 0x10 +#define SRC4XXX_RCV_PLL_11 0x11 +#define SRC4XXX_RVC_IRQ_MSK_16 0x16 +#define SRC4XXX_RVC_IRQ_MSK_17 0x17 +#define SRC4XXX_RVC_IRQ_MODE_18 0x18 +#define SRC4XXX_RVC_IRQ_MODE_19 0x19 +#define SRC4XXX_RVC_IRQ_MODE_1A 0x1A +#define SRC4XXX_GPIO_1_1B 0x1B +#define SRC4XXX_GPIO_2_1C 0x1C +#define SRC4XXX_GPIO_3_1D 0x1D +#define SRC4XXX_GPIO_4_1E 0x1E +#define SRC4XXX_SCR_CTL_2D 0x2D +#define SRC4XXX_SCR_CTL_2E 0x2E +#define SRC4XXX_SCR_CTL_2F 0x2F +#define SRC4XXX_SCR_CTL_30 0x30 +#define SRC4XXX_SCR_CTL_31 0x31 +#define SRC4XXX_PAGE_SEL_7F 0x7F + +// read only registers +#define SRC4XXX_GLOBAL_ITR_STS_02 0x02 +#define SRC4XXX_SRC_DIT_STS_0A 0x0A +#define SRC4XXX_NON_AUDIO_D_12 0x12 +#define SRC4XXX_RVC_STS_13 0x13 +#define SRC4XXX_RVC_STS_14 0x14 +#define SRC4XXX_RVC_STS_15 0x15 +#define SRC4XXX_SUB_CODE_1F 0x1F +#define SRC4XXX_SUB_CODE_20 0x20 +#define SRC4XXX_SUB_CODE_21 0x21 +#define SRC4XXX_SUB_CODE_22 0x22 +#define SRC4XXX_SUB_CODE_23 0x23 +#define SRC4XXX_SUB_CODE_24 0x24 +#define SRC4XXX_SUB_CODE_25 0x25 +#define SRC4XXX_SUB_CODE_26 0x26 +#define SRC4XXX_SUB_CODE_27 0x27 +#define SRC4XXX_SUB_CODE_28 0x28 +#define SRC4XXX_PC_PREAMBLE_HI_29 0x29 +#define SRC4XXX_PC_PREAMBLE_LO_2A 0x2A +#define SRC4XXX_PD_PREAMBLE_HI_2B 0x2B +#define SRC4XXX_PC_PREAMBLE_LO_2C 0x2C +#define SRC4XXX_IO_RATIO_32 0x32 +#define SRC4XXX_IO_RATIO_33 0x33 + +int src4xxx_probe(struct device *dev, struct regmap *regmap, + void (*switch_mode)(struct device *dev)); +void src4xxx_remove(struct device *dev); +extern const struct regmap_config src4xxx_regmap_config; + +#endif /* __SRC4XXX_H__ */ -- 2.34.1

4 12

[PATCH] ASoC: ops: Don't modify the driver's plaform_max when reading state
by Mark Brown 22 Aug '22

22 Aug '22

Currently snd_soc_info_volsw() will set a platform_max based on the limit the control has if one is not already set. This isn't really great, we shouldn't be modifying the passed in driver data especially in a path like this which may not ever be executed or where we may execute other callbacks before this one. Instead make this function leave the data unchanged, and clarify things a bit by referring to max rather than platform_max within the function. platform_max is now applied as a limit after working out the natural maximum value for the control. This means that platform_max is no longer treated as a direct register value for controls were min is non-zero. The put() callbacks already validate on this basis, and there do not appear to be any in tree users that would be affected. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-ops.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 2d39370ddeca..93e72a016b4d 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -176,20 +176,21 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, { struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; - int platform_max; + int max; - if (!mc->platform_max) - mc->platform_max = mc->max; - platform_max = mc->platform_max; + max = uinfo->value.integer.max = mc->max - mc->min; + if (mc->platform_max && mc->platform_max < max) + max = mc->platform_max; - if (platform_max == 1 && !strstr(kcontrol->id.name, " Volume")) + if (max == 1 && !strstr(kcontrol->id.name, " Volume")) uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; else uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->count = snd_soc_volsw_is_stereo(mc) ? 2 : 1; uinfo->value.integer.min = 0; - uinfo->value.integer.max = platform_max - mc->min; + uinfo->value.integer.max = max; + return 0; } EXPORT_SYMBOL_GPL(snd_soc_info_volsw); -- 2.30.2

2 6

build failure of next-20220822 due to 4e6bedd3c396 ("ASoC: codecs: add support for the TI SRC4392 codec")
by Sudip Mukherjee (Codethink) 22 Aug '22

22 Aug '22

Hi All, Not sure if it has been reported, builds of arm64 with clang failed to build next-20220822 with the error: sound/soc/codecs/src4xxx.c:280:3: error: variable 'd' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized] default: ^~~~~~~ sound/soc/codecs/src4xxx.c:298:59: note: uninitialized use occurs here ret = regmap_write(src4xxx->regmap, SRC4XXX_RCV_PLL_11, d); ^ sound/soc/codecs/src4xxx.c:223:20: note: initialize the variable 'd' to silence this warning int val, pj, jd, d; ^ = 0 sound/soc/codecs/src4xxx.c:280:3: error: variable 'jd' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized] default: ^~~~~~~ sound/soc/codecs/src4xxx.c:293:59: note: uninitialized use occurs here ret = regmap_write(src4xxx->regmap, SRC4XXX_RCV_PLL_10, jd); ^~ sound/soc/codecs/src4xxx.c:223:17: note: initialize the variable 'jd' to silence this warning int val, pj, jd, d; ^ = 0 sound/soc/codecs/src4xxx.c:280:3: error: variable 'pj' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized] default: ^~~~~~~ sound/soc/codecs/src4xxx.c:288:59: note: uninitialized use occurs here ret = regmap_write(src4xxx->regmap, SRC4XXX_RCV_PLL_0F, pj); ^~ sound/soc/codecs/src4xxx.c:223:13: note: initialize the variable 'pj' to silence this warning int val, pj, jd, d; ^ = 0 3 errors generated. git bisect pointed to 4e6bedd3c396 ("ASoC: codecs: add support for the TI SRC4392 codec"). I will be happy to test any patch or provide any extra log if needed. -- Regards Sudip

2 1

[PATCH] ASoC: soc-pcm.c: summarize related settings at soc_new_pcm()
by Kuninori Morimoto 22 Aug '22

22 Aug '22

soc_new_pcm() sets pcm->no_device_suspend, but it sets other pcm->xxx at the same function with different timing. pcm->no_device_suspend setup timing has no effect. This patch tidyup it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-pcm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index ce4a4151e784..4baa24fbf924 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2898,6 +2898,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) rtd->pcm = pcm; pcm->nonatomic = rtd->dai_link->nonatomic; pcm->private_data = rtd; + pcm->no_device_suspend = true; if (rtd->dai_link->no_pcm || rtd->dai_link->params) { if (playback) @@ -2952,8 +2953,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) ret = snd_soc_pcm_component_new(rtd); if (ret < 0) return ret; - - pcm->no_device_suspend = true; out: dev_dbg(rtd->card->dev, "%s <-> %s mapping ok\n", soc_codec_dai_name(rtd), soc_cpu_dai_name(rtd)); -- 2.25.1

2 1

[PATCH] ASoC: samsung: Use iio_get_channel_type() accessor.
by Jonathan Cameron 22 Aug '22

22 Aug '22

From: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> struct iio_chan_spec is meant to be opaque to IIO consumer drivers which should only use the interfaces in linux/iio/consumer.h. Use the provided accessor function to find get the type of the channel instead of directly reading it form the structure. Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Cc: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Cc: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/samsung/aries_wm8994.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index e7d52d27132e..0fbbf3b02c09 100644 --- a/sound/soc/samsung/aries_wm8994.c +++ b/sound/soc/samsung/aries_wm8994.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ #include <linux/extcon.h> #include <linux/iio/consumer.h> -#include <linux/iio/iio.h> #include <linux/input-event-codes.h> #include <linux/mfd/wm8994/registers.h> #include <linux/module.h> @@ -543,6 +542,7 @@ static int aries_audio_probe(struct platform_device *pdev) struct aries_wm8994_data *priv; struct snd_soc_dai_link *dai_link; const struct of_device_id *match; + enum iio_chan_type channel_type; int ret, i; if (!np) @@ -594,7 +594,11 @@ static int aries_audio_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(priv->adc), "Failed to get ADC channel"); - if (priv->adc->channel->type != IIO_VOLTAGE) + ret = iio_get_channel_type(priv->adc, &channel_type); + if (ret) + return dev_err_probe(dev, ret, + "Failed to get ADC channel type"); + if (channel_type != IIO_VOLTAGE) return -EINVAL; priv->gpio_headset_key = devm_gpiod_get(dev, "headset-key", -- 2.37.2

2 1

Re: [PATCH] drm/bridge: dw-hdmi-i2s: set insert_pcuv bit if hardware supports it
by Geraldo Nascimento 22 Aug '22

22 Aug '22

On Mon, Aug 22, 2022 at 02:27:26PM +0100, Mark Brown wrote: > On Sat, Aug 20, 2022 at 09:36:53PM -0300, Geraldo Nascimento wrote: > > > + /* > > + * dw-hdmi introduced insert_pcuv bit in version 2.10a. > > + * When set (1'b1), this bit enables the insertion of the PCUV > > + * (Parity, Channel Status, User bit and Validity) bits on the > > + * incoming audio stream (support limited to Linear PCM audio) > > + */ > > + > > + if (hdmi_read(audio, HDMI_DESIGN_ID) >= 0x21) > > + conf2 |= HDMI_AUD_CONF2_INSERT_PCUV; > > So what if we're not handlign linear PCM? Good question, Mark. For HBR and NL-PCM there are different bits that need to be set in aud_conf2 Sample Register, and then insert_pcuv bit needs to be dropped. I don't have a sink handy however to test the other modes. Do you have a suggestion on how to make this the default for L-PCM specifically? Thanks, Geraldo Nascimento

1 0

[PATCH] ASoC: mediatek: mt8186: fix DMIC record noise
by Jiaxin Yu 22 Aug '22

22 Aug '22

When the first DMIC recording is power down, mtkaif_dmic will be reset. This will cause configuration error in the second DMIC recording. So do not reset mtkaif_dmic except in "MTKAIF_DMIC Switch" kcontrol. Signed-off-by: Jiaxin Yu <jiaxin.yu(a)mediatek.com> --- sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c index 266704556f37..094402470dc2 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c @@ -271,9 +271,6 @@ static int mtk_adda_ul_event(struct snd_soc_dapm_widget *w, /* should delayed 1/fs(smallest is 8k) = 125us before afe off */ usleep_range(125, 135); mt8186_afe_gpio_request(afe->dev, false, MT8186_DAI_ADDA, 1); - - /* reset dmic */ - afe_priv->mtkaif_dmic = 0; break; default: break; -- 2.25.1

2 1

[PATCH] Add quirk to enable Avid Mbox 3 support
by connerknoxpublic＠gmail.com 22 Aug '22

22 Aug '22

From: Conner Knox <connerknoxpublic(a)gmail.com> Hi all, I believe these are the right emails to send this patch to, but if I've missed something please let me know. This patch enables the Avid Mbox 3 audio interface to be used through ALSA. It locks the device at a 48khz sample rate. Then it mutes and raises the appropriate channels/inputs to allow for expected functionality. Thanks for your time. --- sound/usb/quirks-table.h | 76 ++++++++++ sound/usb/quirks.c | 311 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 387 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 0ea39565e623..5f43863e5a5f 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2978,6 +2978,82 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +/* DIGIDESIGN MBOX 3 */ +{ + USB_DEVICE(0x0dba, 0x5000), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .vendor_name = "Digidesign", + .product_name = "Mbox 3", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_IGNORE_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_IGNORE_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S24_3LE, + .channels = 4, + .iface = 2, + .altsetting = 1, + .altset_idx = 1, + .attributes = 0x00, + .endpoint = 0x01, + .ep_attr = USB_ENDPOINT_XFER_ISOC | + USB_ENDPOINT_SYNC_ASYNC, + .rates = SNDRV_PCM_RATE_48000, + .rate_min = 48000, + .rate_max = 48000, + .nr_rates = 1, + .rate_table = (unsigned int[]) { + 48000 + } + } + }, + { + .ifnum = 3, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S24_3LE, + .channels = 4, + .iface = 3, + .altsetting = 1, + .altset_idx = 1, + .endpoint = 0x81, + .attributes = 0x00, + .ep_attr = USB_ENDPOINT_XFER_ISOC | + USB_ENDPOINT_SYNC_ASYNC, + .maxpacksize = 0x009c, + .rates = SNDRV_PCM_RATE_48000, + .rate_min = 48000, + .rate_max = 48000, + .nr_rates = 1, + .rate_table = (unsigned int[]) { + 48000 + } + } + }, + { + .ifnum = 4, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0001, + .in_cables = 0x0001 + } + }, + { + .ifnum = -1 + } + } + } +}, { /* Tascam US122 MKII - playback-only support */ USB_DEVICE_VENDOR_SPEC(0x0644, 0x8021), diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index ab9f3da49941..e7caa7eeb955 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1020,6 +1020,313 @@ static int snd_usb_axefx3_boot_quirk(struct usb_device *dev) return 0; } +static void mbox3_setup_48_24_magic(struct usb_device *dev) +{ + u8 com_buff[4]; + + /* Load 48000Hz rate into buffer */ + com_buff[0] = 0x80; + com_buff[1] = 0xbb; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + + /* Set 48000Hz sample rate */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 0x01, 0x21, 0x0100, 0x0001, &com_buff, 0x0004); + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 0x01, 0x21, 0x0100, 0x8101, &com_buff, 0x0004); + + /* Set clock source to Internal (as opposed to S/PDIF) */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x01; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0100, 0x8001, &com_buff, 1); + + /* Mute the hardware loopbacks to start the device in a known state. + * The Mbox 3 is little endian and + * the data written here seems a bit odd. + * 0x8000 (shown in big endian form) is muted + * and volume increases to 0xffff it seems. + * I've yet to observe 0xffff being sent. + * Instead, full volume seems to be 0x0000. + * Per my understanding of 16 bit integers, this is seems strange, but maybe I'm missing something + */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x80; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + /* Analogue input 1 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0110, 0x4001, &com_buff, 2); + /* Analogue input 1 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0111, 0x4001, &com_buff, 2); + /* Analogue input 2 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0114, 0x4001, &com_buff, 2); + /* Analogue input 2 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0115, 0x4001, &com_buff, 2); + /* Analogue input 3 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0118, 0x4001, &com_buff, 2); + /* Analogue input 3 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0119, 0x4001, &com_buff, 2); + /* Analogue input 4 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x011c, 0x4001, &com_buff, 2); + /* Analogue input 4 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x011d, 0x4001, &com_buff, 2); + + /* Set software sends to output */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + /* Analogue software return 1 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0100, 0x4001, &com_buff, 2); + /* Analogue software return 1 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0101, 0x4001, &com_buff, 2); + /* Analogue software return 2 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0104, 0x4001, &com_buff, 2); + /* Analogue software return 2 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0105, 0x4001, &com_buff, 2); + /* Analogue software return 3 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0108, 0x4001, &com_buff, 2); + /* Analogue software return 3 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0109, 0x4001, &com_buff, 2); + /* Analogue software return 4 left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x010c, 0x4001, &com_buff, 2); + /* Analogue software return 4 right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x010d, 0x4001, &com_buff, 2); + + /* Return to muting sends */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x80; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + /* Analogue fx return left channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0120, 0x4001, &com_buff, 2); + /* Analogue fx return right channel: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0121, 0x4001, &com_buff, 2); + + /* Analogue software input 1 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0100, 0x4201, &com_buff, 2); + /* Analogue software input 2 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0101, 0x4201, &com_buff, 2); + /* Analogue software input 3 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0102, 0x4201, &com_buff, 2); + /* Analogue software input 4 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0103, 0x4201, &com_buff, 2); + /* Analogue input 1 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0104, 0x4201, &com_buff, 2); + /* Analogue input 2 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0105, 0x4201, &com_buff, 2); + /* Analogue input 3 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0106, 0x4201, &com_buff, 2); + /* Analogue input 4 fx send: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0107, 0x4201, &com_buff, 2); + + /* Toggle allowing host control */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x02; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 3, 0x21, 0x0000, 0x2001, &com_buff, 1); + + /* Do not dim fx returns */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), 3, 0x21, 0x0002, 0x2001, &com_buff, 1); + + /* Do not set fx returns to mono */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), 3, 0x21, 0x0001, 0x2001, &com_buff, 1); + + /* Mute the S/PDIF hardware loopback + * same odd volume logic here as above + */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x80; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + /* S/PDIF hardware input 1 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0112, 0x4001, &com_buff, 2); + /* S/PDIF hardware input 1 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0113, 0x4001, &com_buff, 2); + /* S/PDIF hardware input 2 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0116, 0x4001, &com_buff, 2); + /* S/PDIF hardware input 2 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0117, 0x4001, &com_buff, 2); + /* S/PDIF hardware input 3 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x011a, 0x4001, &com_buff, 2); + /* S/PDIF hardware input 3 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x011b, 0x4001, &com_buff, 2); + /* S/PDIF hardware input 4 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x011e, 0x4001, &com_buff, 2); + /* S/PDIF hardware input 4 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x011f, 0x4001, &com_buff, 2); + /* S/PDIF software return 1 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0102, 0x4001, &com_buff, 2); + /* S/PDIF software return 1 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0103, 0x4001, &com_buff, 2); + /* S/PDIF software return 2 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0106, 0x4001, &com_buff, 2); + /* S/PDIF software return 2 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0107, 0x4001, &com_buff, 2); + /* S/PDIF software return 3 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x010a, 0x4001, &com_buff, 2); + /* S/PDIF software return 3 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x010b, 0x4001, &com_buff, 2); + /* S/PDIF software return 4 left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x010e, 0x4001, &com_buff, 2); + /* S/PDIF software return 4 right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x010f, 0x4001, &com_buff, 2); + /* S/PDIF fx returns left channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0122, 0x4001, &com_buff, 2); + /* S/PDIF fx returns right channel */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0123, 0x4001, &com_buff, 2); + + /* Set the dropdown "Effect" to the first option */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0200, 0x4301, &com_buff, 1); + + /* Set the effect duration to 0 */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0400, 0x4301, &com_buff, 2); + + /* Set the effect volume and feedback to 0 */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + /* feedback: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0500, 0x4301, &com_buff, 1); + /* volume: */ + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 1, 0x21, 0x0300, 0x4301, &com_buff, 1); + + /* Set soft button hold duration */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x05; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 3, 0x21, 0x0005, 0x2001, &com_buff, 1); + + /* Use dim LEDs for button of state */ + memset(com_buff, 0x00, 4); + com_buff[0] = 0x00; + com_buff[1] = 0x00; + com_buff[2] = 0x00; + com_buff[3] = 0x00; + snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), + 3, 0x21, 0x0004, 0x2001, &com_buff, 1); + + return; +} + +#define MBOX3_DESCRIPTOR_SIZE 464 + +static int snd_usb_mbox3_boot_quirk(struct usb_device *dev) +{ + struct usb_host_config *config = dev->actconfig; + int err; + int descriptor_size; + + descriptor_size = le16_to_cpu(get_cfg_desc(config)->wTotalLength); + + if (descriptor_size != MBOX3_DESCRIPTOR_SIZE) { + dev_err(&dev->dev, "Invalid descriptor size=%d.\n", descriptor_size); + return -ENODEV; + } + + dev_dbg(&dev->dev, "device initialised!\n"); + + err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, + &dev->descriptor, sizeof(dev->descriptor)); + config = dev->actconfig; + if (err < 0) + dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err); + + err = usb_reset_configuration(dev); + if (err < 0) + dev_dbg(&dev->dev, "error usb_reset_configuration: %d\n", err); + dev_dbg(&dev->dev, "mbox3_boot: new boot length = %d\n", + le16_to_cpu(get_cfg_desc(config)->wTotalLength)); + + mbox3_setup_48_24_magic(dev); + dev_info(&dev->dev, "Digidesign Mbox 3: 24bit 48kHz"); + + return 0; /* Successful boot */ +} #define MICROBOOK_BUF_SIZE 128 @@ -1324,6 +1631,10 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, case USB_ID(0x0dba, 0x3000): /* Digidesign Mbox 2 */ return snd_usb_mbox2_boot_quirk(dev); + case USB_ID(0x0dba, 0x5000): + /* Digidesign Mbox 3 */ + return snd_usb_mbox3_boot_quirk(dev); + case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */ case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */ -- 2.35.1

4 8