aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8510.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8510.c')
-rw-r--r--sound/soc/codecs/wm8510.c300
1 files changed, 98 insertions, 202 deletions
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 0f7bcb61071a..db0dced74843 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -24,15 +24,10 @@
24#include <sound/pcm.h> 24#include <sound/pcm.h>
25#include <sound/pcm_params.h> 25#include <sound/pcm_params.h>
26#include <sound/soc.h> 26#include <sound/soc.h>
27#include <sound/soc-dapm.h>
28#include <sound/initval.h> 27#include <sound/initval.h>
29 28
30#include "wm8510.h" 29#include "wm8510.h"
31 30
32#define WM8510_VERSION "0.6"
33
34struct snd_soc_codec_device soc_codec_dev_wm8510;
35
36/* 31/*
37 * wm8510 register cache 32 * wm8510 register cache
38 * We can't read the WM8510 register space when we are 33 * We can't read the WM8510 register space when we are
@@ -61,6 +56,11 @@ static const u16 wm8510_reg[WM8510_CACHEREGNUM] = {
61 56
62#define wm8510_reset(c) snd_soc_write(c, WM8510_RESET, 0) 57#define wm8510_reset(c) snd_soc_write(c, WM8510_RESET, 0)
63 58
59/* codec private data */
60struct wm8510_priv {
61 enum snd_soc_control_type control_type;
62};
63
64static const char *wm8510_companding[] = { "Off", "NC", "u-law", "A-law" }; 64static const char *wm8510_companding[] = { "Off", "NC", "u-law", "A-law" };
65static const char *wm8510_deemp[] = { "None", "32kHz", "44.1kHz", "48kHz" }; 65static const char *wm8510_deemp[] = { "None", "32kHz", "44.1kHz", "48kHz" };
66static const char *wm8510_alc[] = { "ALC", "Limiter" }; 66static const char *wm8510_alc[] = { "ALC", "Limiter" };
@@ -215,10 +215,11 @@ static const struct snd_soc_dapm_route audio_map[] = {
215 215
216static int wm8510_add_widgets(struct snd_soc_codec *codec) 216static int wm8510_add_widgets(struct snd_soc_codec *codec)
217{ 217{
218 snd_soc_dapm_new_controls(codec, wm8510_dapm_widgets, 218 struct snd_soc_dapm_context *dapm = &codec->dapm;
219 ARRAY_SIZE(wm8510_dapm_widgets));
220 219
221 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); 220 snd_soc_dapm_new_controls(dapm, wm8510_dapm_widgets,
221 ARRAY_SIZE(wm8510_dapm_widgets));
222 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
222 223
223 return 0; 224 return 0;
224} 225}
@@ -403,8 +404,7 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream,
403 struct snd_soc_dai *dai) 404 struct snd_soc_dai *dai)
404{ 405{
405 struct snd_soc_pcm_runtime *rtd = substream->private_data; 406 struct snd_soc_pcm_runtime *rtd = substream->private_data;
406 struct snd_soc_device *socdev = rtd->socdev; 407 struct snd_soc_codec *codec = rtd->codec;
407 struct snd_soc_codec *codec = socdev->card->codec;
408 u16 iface = snd_soc_read(codec, WM8510_IFACE) & 0x19f; 408 u16 iface = snd_soc_read(codec, WM8510_IFACE) & 0x19f;
409 u16 adn = snd_soc_read(codec, WM8510_ADD) & 0x1f1; 409 u16 adn = snd_soc_read(codec, WM8510_ADD) & 0x1f1;
410 410
@@ -478,7 +478,7 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
478 case SND_SOC_BIAS_STANDBY: 478 case SND_SOC_BIAS_STANDBY:
479 power1 |= WM8510_POWER1_BIASEN | WM8510_POWER1_BUFIOEN; 479 power1 |= WM8510_POWER1_BIASEN | WM8510_POWER1_BUFIOEN;
480 480
481 if (codec->bias_level == SND_SOC_BIAS_OFF) { 481 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
482 /* Initial cap charge at VMID 5k */ 482 /* Initial cap charge at VMID 5k */
483 snd_soc_write(codec, WM8510_POWER1, power1 | 0x3); 483 snd_soc_write(codec, WM8510_POWER1, power1 | 0x3);
484 mdelay(100); 484 mdelay(100);
@@ -495,7 +495,7 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
495 break; 495 break;
496 } 496 }
497 497
498 codec->bias_level = level; 498 codec->dapm.bias_level = level;
499 return 0; 499 return 0;
500} 500}
501 501
@@ -514,8 +514,8 @@ static struct snd_soc_dai_ops wm8510_dai_ops = {
514 .set_pll = wm8510_set_dai_pll, 514 .set_pll = wm8510_set_dai_pll,
515}; 515};
516 516
517struct snd_soc_dai wm8510_dai = { 517static struct snd_soc_dai_driver wm8510_dai = {
518 .name = "WM8510 HiFi", 518 .name = "wm8510-hifi",
519 .playback = { 519 .playback = {
520 .stream_name = "Playback", 520 .stream_name = "Playback",
521 .channels_min = 2, 521 .channels_min = 2,
@@ -531,21 +531,15 @@ struct snd_soc_dai wm8510_dai = {
531 .ops = &wm8510_dai_ops, 531 .ops = &wm8510_dai_ops,
532 .symmetric_rates = 1, 532 .symmetric_rates = 1,
533}; 533};
534EXPORT_SYMBOL_GPL(wm8510_dai);
535 534
536static int wm8510_suspend(struct platform_device *pdev, pm_message_t state) 535static int wm8510_suspend(struct snd_soc_codec *codec, pm_message_t state)
537{ 536{
538 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
539 struct snd_soc_codec *codec = socdev->card->codec;
540
541 wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF); 537 wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
542 return 0; 538 return 0;
543} 539}
544 540
545static int wm8510_resume(struct platform_device *pdev) 541static int wm8510_resume(struct snd_soc_codec *codec)
546{ 542{
547 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
548 struct snd_soc_codec *codec = socdev->card->codec;
549 int i; 543 int i;
550 u8 data[2]; 544 u8 data[2];
551 u16 *cache = codec->reg_cache; 545 u16 *cache = codec->reg_cache;
@@ -561,256 +555,158 @@ static int wm8510_resume(struct platform_device *pdev)
561 return 0; 555 return 0;
562} 556}
563 557
564/* 558static int wm8510_probe(struct snd_soc_codec *codec)
565 * initialise the WM8510 driver
566 * register the mixer and dsp interfaces with the kernel
567 */
568static int wm8510_init(struct snd_soc_device *socdev,
569 enum snd_soc_control_type control)
570{ 559{
571 struct snd_soc_codec *codec = socdev->card->codec; 560 struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec);
572 int ret = 0; 561 int ret;
573
574 codec->name = "WM8510";
575 codec->owner = THIS_MODULE;
576 codec->set_bias_level = wm8510_set_bias_level;
577 codec->dai = &wm8510_dai;
578 codec->num_dai = 1;
579 codec->reg_cache_size = ARRAY_SIZE(wm8510_reg);
580 codec->reg_cache = kmemdup(wm8510_reg, sizeof(wm8510_reg), GFP_KERNEL);
581
582 if (codec->reg_cache == NULL)
583 return -ENOMEM;
584 562
585 ret = snd_soc_codec_set_cache_io(codec, 7, 9, control); 563 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8510->control_type);
586 if (ret < 0) { 564 if (ret < 0) {
587 printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", 565 printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", ret);
588 ret); 566 return ret;
589 goto err;
590 } 567 }
591 568
592 wm8510_reset(codec); 569 wm8510_reset(codec);
593 570
594 /* register pcms */
595 ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
596 if (ret < 0) {
597 printk(KERN_ERR "wm8510: failed to create pcms\n");
598 goto err;
599 }
600
601 /* power on device */ 571 /* power on device */
602 codec->bias_level = SND_SOC_BIAS_OFF;
603 wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY); 572 wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
604 snd_soc_add_controls(codec, wm8510_snd_controls, 573 snd_soc_add_controls(codec, wm8510_snd_controls,
605 ARRAY_SIZE(wm8510_snd_controls)); 574 ARRAY_SIZE(wm8510_snd_controls));
606 wm8510_add_widgets(codec); 575 wm8510_add_widgets(codec);
607 576
608 return ret; 577 return ret;
609
610err:
611 kfree(codec->reg_cache);
612 return ret;
613} 578}
614 579
615static struct snd_soc_device *wm8510_socdev; 580/* power down chip */
581static int wm8510_remove(struct snd_soc_codec *codec)
582{
583 struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec);
616 584
617#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 585 wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
586 kfree(wm8510);
587 return 0;
588}
618 589
619/* 590static struct snd_soc_codec_driver soc_codec_dev_wm8510 = {
620 * WM8510 2 wire address is 0x1a 591 .probe = wm8510_probe,
621 */ 592 .remove = wm8510_remove,
593 .suspend = wm8510_suspend,
594 .resume = wm8510_resume,
595 .set_bias_level = wm8510_set_bias_level,
596 .reg_cache_size = ARRAY_SIZE(wm8510_reg),
597 .reg_word_size = sizeof(u16),
598 .reg_cache_default =wm8510_reg,
599};
622 600
623static int wm8510_i2c_probe(struct i2c_client *i2c, 601#if defined(CONFIG_SPI_MASTER)
624 const struct i2c_device_id *id) 602static int __devinit wm8510_spi_probe(struct spi_device *spi)
625{ 603{
626 struct snd_soc_device *socdev = wm8510_socdev; 604 struct wm8510_priv *wm8510;
627 struct snd_soc_codec *codec = socdev->card->codec;
628 int ret; 605 int ret;
629 606
630 i2c_set_clientdata(i2c, codec); 607 wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
631 codec->control_data = i2c; 608 if (wm8510 == NULL)
609 return -ENOMEM;
610
611 wm8510->control_type = SND_SOC_SPI;
612 spi_set_drvdata(spi, wm8510);
632 613
633 ret = wm8510_init(socdev, SND_SOC_I2C); 614 ret = snd_soc_register_codec(&spi->dev,
615 &soc_codec_dev_wm8510, &wm8510_dai, 1);
634 if (ret < 0) 616 if (ret < 0)
635 pr_err("failed to initialise WM8510\n"); 617 kfree(wm8510);
636
637 return ret; 618 return ret;
638} 619}
639 620
640static int wm8510_i2c_remove(struct i2c_client *client) 621static int __devexit wm8510_spi_remove(struct spi_device *spi)
641{ 622{
642 struct snd_soc_codec *codec = i2c_get_clientdata(client); 623 snd_soc_unregister_codec(&spi->dev);
643 kfree(codec->reg_cache);
644 return 0; 624 return 0;
645} 625}
646 626
647static const struct i2c_device_id wm8510_i2c_id[] = { 627static struct spi_driver wm8510_spi_driver = {
648 { "wm8510", 0 },
649 { }
650};
651MODULE_DEVICE_TABLE(i2c, wm8510_i2c_id);
652
653static struct i2c_driver wm8510_i2c_driver = {
654 .driver = { 628 .driver = {
655 .name = "WM8510 I2C Codec", 629 .name = "wm8510",
656 .owner = THIS_MODULE, 630 .owner = THIS_MODULE,
657 }, 631 },
658 .probe = wm8510_i2c_probe, 632 .probe = wm8510_spi_probe,
659 .remove = wm8510_i2c_remove, 633 .remove = __devexit_p(wm8510_spi_remove),
660 .id_table = wm8510_i2c_id,
661}; 634};
635#endif /* CONFIG_SPI_MASTER */
662 636
663static int wm8510_add_i2c_device(struct platform_device *pdev, 637#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
664 const struct wm8510_setup_data *setup) 638static __devinit int wm8510_i2c_probe(struct i2c_client *i2c,
639 const struct i2c_device_id *id)
665{ 640{
666 struct i2c_board_info info; 641 struct wm8510_priv *wm8510;
667 struct i2c_adapter *adapter;
668 struct i2c_client *client;
669 int ret; 642 int ret;
670 643
671 ret = i2c_add_driver(&wm8510_i2c_driver); 644 wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
672 if (ret != 0) { 645 if (wm8510 == NULL)
673 dev_err(&pdev->dev, "can't add i2c driver\n"); 646 return -ENOMEM;
674 return ret;
675 }
676
677 memset(&info, 0, sizeof(struct i2c_board_info));
678 info.addr = setup->i2c_address;
679 strlcpy(info.type, "wm8510", I2C_NAME_SIZE);
680
681 adapter = i2c_get_adapter(setup->i2c_bus);
682 if (!adapter) {
683 dev_err(&pdev->dev, "can't get i2c adapter %d\n",
684 setup->i2c_bus);
685 goto err_driver;
686 }
687
688 client = i2c_new_device(adapter, &info);
689 i2c_put_adapter(adapter);
690 if (!client) {
691 dev_err(&pdev->dev, "can't add i2c device at 0x%x\n",
692 (unsigned int)info.addr);
693 goto err_driver;
694 }
695
696 return 0;
697
698err_driver:
699 i2c_del_driver(&wm8510_i2c_driver);
700 return -ENODEV;
701}
702#endif
703
704#if defined(CONFIG_SPI_MASTER)
705static int __devinit wm8510_spi_probe(struct spi_device *spi)
706{
707 struct snd_soc_device *socdev = wm8510_socdev;
708 struct snd_soc_codec *codec = socdev->card->codec;
709 int ret;
710 647
711 codec->control_data = spi; 648 i2c_set_clientdata(i2c, wm8510);
649 wm8510->control_type = SND_SOC_I2C;
712 650
713 ret = wm8510_init(socdev, SND_SOC_SPI); 651 ret = snd_soc_register_codec(&i2c->dev,
652 &soc_codec_dev_wm8510, &wm8510_dai, 1);
714 if (ret < 0) 653 if (ret < 0)
715 dev_err(&spi->dev, "failed to initialise WM8510\n"); 654 kfree(wm8510);
716
717 return ret; 655 return ret;
718} 656}
719 657
720static int __devexit wm8510_spi_remove(struct spi_device *spi) 658static __devexit int wm8510_i2c_remove(struct i2c_client *client)
721{ 659{
660 snd_soc_unregister_codec(&client->dev);
722 return 0; 661 return 0;
723} 662}
724 663
725static struct spi_driver wm8510_spi_driver = { 664static const struct i2c_device_id wm8510_i2c_id[] = {
665 { "wm8510", 0 },
666 { }
667};
668MODULE_DEVICE_TABLE(i2c, wm8510_i2c_id);
669
670static struct i2c_driver wm8510_i2c_driver = {
726 .driver = { 671 .driver = {
727 .name = "wm8510", 672 .name = "wm8510-codec",
728 .bus = &spi_bus_type, 673 .owner = THIS_MODULE,
729 .owner = THIS_MODULE,
730 }, 674 },
731 .probe = wm8510_spi_probe, 675 .probe = wm8510_i2c_probe,
732 .remove = __devexit_p(wm8510_spi_remove), 676 .remove = __devexit_p(wm8510_i2c_remove),
677 .id_table = wm8510_i2c_id,
733}; 678};
734#endif /* CONFIG_SPI_MASTER */ 679#endif
735 680
736static int wm8510_probe(struct platform_device *pdev) 681static int __init wm8510_modinit(void)
737{ 682{
738 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
739 struct wm8510_setup_data *setup;
740 struct snd_soc_codec *codec;
741 int ret = 0; 683 int ret = 0;
742
743 pr_info("WM8510 Audio Codec %s", WM8510_VERSION);
744
745 setup = socdev->codec_data;
746 codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
747 if (codec == NULL)
748 return -ENOMEM;
749
750 socdev->card->codec = codec;
751 mutex_init(&codec->mutex);
752 INIT_LIST_HEAD(&codec->dapm_widgets);
753 INIT_LIST_HEAD(&codec->dapm_paths);
754
755 wm8510_socdev = socdev;
756#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 684#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
757 if (setup->i2c_address) { 685 ret = i2c_add_driver(&wm8510_i2c_driver);
758 ret = wm8510_add_i2c_device(pdev, setup); 686 if (ret != 0) {
687 printk(KERN_ERR "Failed to register WM8510 I2C driver: %d\n",
688 ret);
759 } 689 }
760#endif 690#endif
761#if defined(CONFIG_SPI_MASTER) 691#if defined(CONFIG_SPI_MASTER)
762 if (setup->spi) { 692 ret = spi_register_driver(&wm8510_spi_driver);
763 ret = spi_register_driver(&wm8510_spi_driver); 693 if (ret != 0) {
764 if (ret != 0) 694 printk(KERN_ERR "Failed to register WM8510 SPI driver: %d\n",
765 printk(KERN_ERR "can't add spi driver"); 695 ret);
766 } 696 }
767#endif 697#endif
768
769 if (ret != 0)
770 kfree(codec);
771 return ret; 698 return ret;
772} 699}
700module_init(wm8510_modinit);
773 701
774/* power down chip */ 702static void __exit wm8510_exit(void)
775static int wm8510_remove(struct platform_device *pdev)
776{ 703{
777 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
778 struct snd_soc_codec *codec = socdev->card->codec;
779
780 if (codec->control_data)
781 wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
782
783 snd_soc_free_pcms(socdev);
784 snd_soc_dapm_free(socdev);
785#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 704#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
786 i2c_unregister_device(codec->control_data);
787 i2c_del_driver(&wm8510_i2c_driver); 705 i2c_del_driver(&wm8510_i2c_driver);
788#endif 706#endif
789#if defined(CONFIG_SPI_MASTER) 707#if defined(CONFIG_SPI_MASTER)
790 spi_unregister_driver(&wm8510_spi_driver); 708 spi_unregister_driver(&wm8510_spi_driver);
791#endif 709#endif
792 kfree(codec);
793
794 return 0;
795}
796
797struct snd_soc_codec_device soc_codec_dev_wm8510 = {
798 .probe = wm8510_probe,
799 .remove = wm8510_remove,
800 .suspend = wm8510_suspend,
801 .resume = wm8510_resume,
802};
803EXPORT_SYMBOL_GPL(soc_codec_dev_wm8510);
804
805static int __init wm8510_modinit(void)
806{
807 return snd_soc_register_dai(&wm8510_dai);
808}
809module_init(wm8510_modinit);
810
811static void __exit wm8510_exit(void)
812{
813 snd_soc_unregister_dai(&wm8510_dai);
814} 710}
815module_exit(wm8510_exit); 711module_exit(wm8510_exit);
816 712
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-04 16:48:38 -0400