diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:22 +0000 |
| commit | 5176dfcd47327cbee4009e2372cd1ae0710313db (patch) | |
| tree | 720b42a2cef285716a5ae5cb6ba24651c74607b8 /sound/soc | |
| parent | 47973c6eb803d54411533aa1693b6d0af1eb5f83 (diff) | |
| parent | 193b2f65b87e9da78b15f3e3a0cae1d37fbafa57 (diff) | |
| download | linux-5176dfcd47327cbee4009e2372cd1ae0710313db.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/ak4104.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index 71059c07ae7b..b4819dcd4f4d 100644 --- a/sound/soc/codecs/ak4104.c +++ b/sound/soc/codecs/ak4104.c @@ -45,8 +45,6 @@ #define AK4104_TX_TXE (1 << 0) #define AK4104_TX_V (1 << 1) -#define DRV_NAME "ak4104-codec" - struct ak4104_private { struct regmap *regmap; }; @@ -291,12 +289,19 @@ static const struct of_device_id ak4104_of_match[] = { }; MODULE_DEVICE_TABLE(of, ak4104_of_match); +static const struct spi_device_id ak4104_id_table[] = { + { "ak4104", 0 }, + { } +}; +MODULE_DEVICE_TABLE(spi, ak4104_id_table); + static struct spi_driver ak4104_spi_driver = { .driver = { - .name = DRV_NAME, + .name = "ak4104", .owner = THIS_MODULE, .of_match_table = ak4104_of_match, }, + .id_table = ak4104_id_table, .probe = ak4104_spi_probe, .remove = ak4104_spi_remove, }; |