-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ASoC: pcm512x: Split out bus drivers
Move to the new style of defining the bus interfaces in separate modules in order to simplify dependencies. Signed-off-by: Mark Brown <broonie@linaro.org>
- Loading branch information
Mark Brown
committed
Mar 9, 2014
1 parent
f951f83
commit 2206622
Showing
6 changed files
with
176 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Driver for the PCM512x CODECs | ||
| * | ||
| * Author: Mark Brown <broonie@linaro.org> | ||
| * Copyright 2014 Linaro Ltd | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * version 2 as published by the Free Software Foundation. | ||
| * | ||
| * 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/init.h> | ||
| #include <linux/module.h> | ||
| #include <linux/i2c.h> | ||
|
|
||
| #include "pcm512x.h" | ||
|
|
||
| static int pcm512x_i2c_probe(struct i2c_client *i2c, | ||
| const struct i2c_device_id *id) | ||
| { | ||
| struct regmap *regmap; | ||
|
|
||
| regmap = devm_regmap_init_i2c(i2c, &pcm512x_regmap); | ||
| if (IS_ERR(regmap)) | ||
| return PTR_ERR(regmap); | ||
|
|
||
| return pcm512x_probe(&i2c->dev, regmap); | ||
| } | ||
|
|
||
| static int pcm512x_i2c_remove(struct i2c_client *i2c) | ||
| { | ||
| pcm512x_remove(&i2c->dev); | ||
| return 0; | ||
| } | ||
|
|
||
| static const struct i2c_device_id pcm512x_i2c_id[] = { | ||
| { "pcm5121", }, | ||
| { "pcm5122", }, | ||
| { } | ||
| }; | ||
| MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id); | ||
|
|
||
| static const struct of_device_id pcm512x_of_match[] = { | ||
| { .compatible = "ti,pcm5121", }, | ||
| { .compatible = "ti,pcm5122", }, | ||
| { } | ||
| }; | ||
| MODULE_DEVICE_TABLE(of, pcm512x_of_match); | ||
|
|
||
| static struct i2c_driver pcm512x_i2c_driver = { | ||
| .probe = pcm512x_i2c_probe, | ||
| .remove = pcm512x_i2c_remove, | ||
| .id_table = pcm512x_i2c_id, | ||
| .driver = { | ||
| .name = "pcm512x", | ||
| .owner = THIS_MODULE, | ||
| .of_match_table = pcm512x_of_match, | ||
| .pm = &pcm512x_pm_ops, | ||
| }, | ||
| }; | ||
|
|
||
| module_i2c_driver(pcm512x_i2c_driver); | ||
|
|
||
| MODULE_DESCRIPTION("ASoC PCM512x codec driver - I2C"); | ||
| MODULE_AUTHOR("Mark Brown <broonie@linaro.org>"); | ||
| MODULE_LICENSE("GPL v2"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Driver for the PCM512x CODECs | ||
| * | ||
| * Author: Mark Brown <broonie@linaro.org> | ||
| * Copyright 2014 Linaro Ltd | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * version 2 as published by the Free Software Foundation. | ||
| * | ||
| * 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/init.h> | ||
| #include <linux/module.h> | ||
| #include <linux/spi/spi.h> | ||
|
|
||
| #include "pcm512x.h" | ||
|
|
||
| static int pcm512x_spi_probe(struct spi_device *spi) | ||
| { | ||
| struct regmap *regmap; | ||
| int ret; | ||
|
|
||
| regmap = devm_regmap_init_spi(spi, &pcm512x_regmap); | ||
| if (IS_ERR(regmap)) { | ||
| ret = PTR_ERR(regmap); | ||
| return ret; | ||
| } | ||
|
|
||
| return pcm512x_probe(&spi->dev, regmap); | ||
| } | ||
|
|
||
| static int pcm512x_spi_remove(struct spi_device *spi) | ||
| { | ||
| pcm512x_remove(&spi->dev); | ||
| return 0; | ||
| } | ||
|
|
||
| static const struct spi_device_id pcm512x_spi_id[] = { | ||
| { "pcm5121", }, | ||
| { "pcm5122", }, | ||
| { }, | ||
| }; | ||
| MODULE_DEVICE_TABLE(spi, pcm512x_spi_id); | ||
|
|
||
| static const struct of_device_id pcm512x_of_match[] = { | ||
| { .compatible = "ti,pcm5121", }, | ||
| { .compatible = "ti,pcm5122", }, | ||
| { } | ||
| }; | ||
| MODULE_DEVICE_TABLE(of, pcm512x_of_match); | ||
|
|
||
| static struct spi_driver pcm512x_spi_driver = { | ||
| .probe = pcm512x_spi_probe, | ||
| .remove = pcm512x_spi_remove, | ||
| .id_table = pcm512x_spi_id, | ||
| .driver = { | ||
| .name = "pcm512x", | ||
| .owner = THIS_MODULE, | ||
| .of_match_table = pcm512x_of_match, | ||
| .pm = &pcm512x_pm_ops, | ||
| }, | ||
| }; | ||
|
|
||
| module_spi_driver(pcm512x_spi_driver); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters