Currently the cs4271 driver depends on SND_SOC_I2C_AND_SPI. So the driver cannot be built as built-in if CONFIG_I2C=m. Split SPI and I2C code into different modules to avoid this issue. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>tirimbino
Axel Lin
10 years ago
committed by
Mark Brown
parent
f114040e3e
commit
c973b8a7dc
@ -0,0 +1,62 @@ |
||||
/*
|
||||
* CS4271 I2C audio driver |
||||
* |
||||
* Copyright (c) 2010 Alexander Sverdlin <subaparts@yandex.ru> |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License |
||||
* as published by the Free Software Foundation; either version 2 |
||||
* of the License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
*/ |
||||
|
||||
#include <linux/module.h> |
||||
#include <linux/i2c.h> |
||||
#include <linux/regmap.h> |
||||
#include <sound/soc.h> |
||||
#include "cs4271.h" |
||||
|
||||
static int cs4271_i2c_probe(struct i2c_client *client, |
||||
const struct i2c_device_id *id) |
||||
{ |
||||
struct regmap_config config; |
||||
|
||||
config = cs4271_regmap_config; |
||||
config.reg_bits = 8; |
||||
config.val_bits = 8; |
||||
|
||||
return cs4271_probe(&client->dev, |
||||
devm_regmap_init_i2c(client, &config)); |
||||
} |
||||
|
||||
static int cs4271_i2c_remove(struct i2c_client *client) |
||||
{ |
||||
snd_soc_unregister_codec(&client->dev); |
||||
return 0; |
||||
} |
||||
|
||||
static const struct i2c_device_id cs4271_i2c_id[] = { |
||||
{ "cs4271", 0 }, |
||||
{ } |
||||
}; |
||||
MODULE_DEVICE_TABLE(i2c, cs4271_i2c_id); |
||||
|
||||
static struct i2c_driver cs4271_i2c_driver = { |
||||
.driver = { |
||||
.name = "cs4271", |
||||
.owner = THIS_MODULE, |
||||
.of_match_table = of_match_ptr(cs4271_dt_ids), |
||||
}, |
||||
.probe = cs4271_i2c_probe, |
||||
.remove = cs4271_i2c_remove, |
||||
.id_table = cs4271_i2c_id, |
||||
}; |
||||
module_i2c_driver(cs4271_i2c_driver); |
||||
|
||||
MODULE_DESCRIPTION("ASoC CS4271 I2C Driver"); |
||||
MODULE_AUTHOR("Alexander Sverdlin <subaparts@yandex.ru>"); |
||||
MODULE_LICENSE("GPL"); |
||||
@ -0,0 +1,55 @@ |
||||
/*
|
||||
* CS4271 SPI audio driver |
||||
* |
||||
* Copyright (c) 2010 Alexander Sverdlin <subaparts@yandex.ru> |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License |
||||
* as published by the Free Software Foundation; either version 2 |
||||
* of the License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
*/ |
||||
|
||||
#include <linux/module.h> |
||||
#include <linux/spi/spi.h> |
||||
#include <linux/regmap.h> |
||||
#include <sound/soc.h> |
||||
#include "cs4271.h" |
||||
|
||||
static int cs4271_spi_probe(struct spi_device *spi) |
||||
{ |
||||
struct regmap_config config; |
||||
|
||||
config = cs4271_regmap_config; |
||||
config.reg_bits = 16; |
||||
config.val_bits = 8; |
||||
config.read_flag_mask = 0x21; |
||||
config.write_flag_mask = 0x20; |
||||
|
||||
return cs4271_probe(&spi->dev, devm_regmap_init_spi(spi, &config)); |
||||
} |
||||
|
||||
static int cs4271_spi_remove(struct spi_device *spi) |
||||
{ |
||||
snd_soc_unregister_codec(&spi->dev); |
||||
return 0; |
||||
} |
||||
|
||||
static struct spi_driver cs4271_spi_driver = { |
||||
.driver = { |
||||
.name = "cs4271", |
||||
.owner = THIS_MODULE, |
||||
.of_match_table = of_match_ptr(cs4271_dt_ids), |
||||
}, |
||||
.probe = cs4271_spi_probe, |
||||
.remove = cs4271_spi_remove, |
||||
}; |
||||
module_spi_driver(cs4271_spi_driver); |
||||
|
||||
MODULE_DESCRIPTION("ASoC CS4271 SPI Driver"); |
||||
MODULE_AUTHOR("Alexander Sverdlin <subaparts@yandex.ru>"); |
||||
MODULE_LICENSE("GPL"); |
||||
@ -0,0 +1,11 @@ |
||||
#ifndef _CS4271_PRIV_H |
||||
#define _CS4271_PRIV_H |
||||
|
||||
#include <linux/regmap.h> |
||||
|
||||
extern const struct of_device_id cs4271_dt_ids[]; |
||||
extern const struct regmap_config cs4271_regmap_config; |
||||
|
||||
int cs4271_probe(struct device *dev, struct regmap *regmap); |
||||
|
||||
#endif |
||||
Loading…
Reference in new issue