hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next

This commit is contained in:
Mark Brown 2013-10-24 11:23:59 +01:00
parent e447360474 193b2f65b8
commit bb80a5d4cd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/ak4104.c
View File

@ -45,8 +45,6 @@
#define AK4104_TX_TXE (1 << 0) #define AK4104_TX_TXE (1 << 0)
#define AK4104_TX_V (1 << 1) #define AK4104_TX_V (1 << 1)
#define DRV_NAME "ak4104-codec"
struct ak4104_private { struct ak4104_private {
struct regmap *regmap; struct regmap *regmap;
}; };
@ -291,12 +289,19 @@ static const struct of_device_id ak4104_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, 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 = { static struct spi_driver ak4104_spi_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = "ak4104",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = ak4104_of_match, .of_match_table = ak4104_of_match,
}, },
.id_table = ak4104_id_table,
.probe = ak4104_spi_probe, .probe = ak4104_spi_probe,
.remove = ak4104_spi_remove, .remove = ak4104_spi_remove,
}; };