← Back to branch summary

~diwic/sound-2.6/filtered

« back to all changes in this revision

Viewing changes to soc/codecs/wm8731.c

  • Committer: Takashi Iwai
  • Date: 2011-08-12 17:48:16 UTC
  • mfrom: (2927.505.40)
  • Revision ID: git-v1:2b3eb625c1695190b9e9bad701b026d53606f4c6
Merge branch 'topic/asoc'

Show diffs side-by-side

added added

removed removed

Lines of Context:
soc/codecs/wm8731.c
22
22
#include <linux/platform_device.h>
23
23
#include <linux/regulator/consumer.h>
24
24
#include <linux/spi/spi.h>
 
25
#include <linux/of_device.h>
25
26
#include <sound/core.h>
26
27
#include <sound/pcm.h>
27
28
#include <sound/pcm_params.h>
607
608
        .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
608
609
};
609
610
 
 
611
static const struct of_device_id wm8731_of_match[] = {
 
612
        { .compatible = "wlf,wm8731", },
 
613
        { }
 
614
};
 
615
 
 
616
MODULE_DEVICE_TABLE(of, wm8731_of_match);
 
617
 
610
618
#if defined(CONFIG_SPI_MASTER)
611
619
static int __devinit wm8731_spi_probe(struct spi_device *spi)
612
620
{
638
646
        .driver = {
639
647
                .name   = "wm8731",
640
648
                .owner  = THIS_MODULE,
 
649
                .of_match_table = wm8731_of_match,
641
650
        },
642
651
        .probe          = wm8731_spi_probe,
643
652
        .remove         = __devexit_p(wm8731_spi_remove),
682
691
        .driver = {
683
692
                .name = "wm8731",
684
693
                .owner = THIS_MODULE,
 
694
                .of_match_table = wm8731_of_match,
685
695
        },
686
696
        .probe =    wm8731_i2c_probe,
687
697
        .remove =   __devexit_p(wm8731_i2c_remove),