mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
ASoC: wm8731: Overhaul of the driver
Merge series from Mark Brown <broonie@kernel.org>: This series contains a bunch of fairly minor changes which overhaul and modernise the WM8731 driver, there should be no impact on the driver's functionality.
This commit is contained in:
Mark Brown
commit
5c5c69e943
12 changed files with 323 additions and 257 deletions
97
Documentation/devicetree/bindings/sound/wlf,wm8731.yaml
Normal file
97
Documentation/devicetree/bindings/sound/wlf,wm8731.yaml
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/sound/wlf,wm8731.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Wolfson Microelectromics WM8731 audio CODEC
|
||||
|
||||
maintainers:
|
||||
- patches@opensource.cirrus.com
|
||||
|
||||
description: |
|
||||
Wolfson Microelectronics WM8731 audio CODEC
|
||||
|
||||
Pins on the device (for linking into audio routes):
|
||||
* LOUT: Left Channel Line Output
|
||||
* ROUT: Right Channel Line Output
|
||||
* LHPOUT: Left Channel Headphone Output
|
||||
* RHPOUT: Right Channel Headphone Output
|
||||
* LLINEIN: Left Channel Line Input
|
||||
* RLINEIN: Right Channel Line Input
|
||||
* MICIN: Microphone Input
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- wlf,wm8731
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
"#sound-dai-cells":
|
||||
const: 0
|
||||
|
||||
clocks:
|
||||
description: Clock provider for MCLK pin.
|
||||
maxItems: 1
|
||||
|
||||
clock-names:
|
||||
items:
|
||||
- const: mclk
|
||||
|
||||
AVDD-supply:
|
||||
description: Analog power supply regulator on the AVDD pin.
|
||||
|
||||
HPVDD-supply:
|
||||
description: Headphone power supply regulator on the HPVDD pin.
|
||||
|
||||
DBVDD-supply:
|
||||
description: Digital buffer supply regulator for the DBVDD pin.
|
||||
|
||||
DCVDD-supply:
|
||||
description: Digital core supply regulator for the DCVDD pin.
|
||||
|
||||
spi-max-frequency: true
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
required:
|
||||
- reg
|
||||
- compatible
|
||||
- AVDD-supply
|
||||
- HPVDD-supply
|
||||
- DBVDD-supply
|
||||
- DCVDD-supply
|
||||
|
||||
examples:
|
||||
- |
|
||||
spi {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
wm8731_i2c: codec@0 {
|
||||
compatible = "wlf,wm8731";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <12500000>;
|
||||
|
||||
AVDD-supply = <&avdd_reg>;
|
||||
HPVDD-supply = <&hpvdd_reg>;
|
||||
DCVDD-supply = <&dcvdd_reg>;
|
||||
DBVDD-supply = <&dbvdd_reg>;
|
||||
};
|
||||
};
|
||||
- |
|
||||
|
||||
i2c {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
wm8731_spi: codec@1b {
|
||||
compatible = "wlf,wm8731";
|
||||
reg = <0x1b>;
|
||||
|
||||
AVDD-supply = <&avdd_reg>;
|
||||
HPVDD-supply = <&hpvdd_reg>;
|
||||
DCVDD-supply = <&dcvdd_reg>;
|
||||
DBVDD-supply = <&dbvdd_reg>;
|
||||
};
|
||||
};
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
WM8731 audio CODEC
|
||||
|
||||
This device supports both I2C and SPI (configured with pin strapping
|
||||
on the board).
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible : "wlf,wm8731"
|
||||
|
||||
- reg : the I2C address of the device for I2C, the chip select
|
||||
number for SPI.
|
||||
|
||||
Example:
|
||||
|
||||
wm8731: codec@1a {
|
||||
compatible = "wlf,wm8731";
|
||||
reg = <0x1a>;
|
||||
};
|
||||
|
||||
Available audio endpoints for an audio-routing table:
|
||||
* LOUT: Left Channel Line Output
|
||||
* ROUT: Right Channel Line Output
|
||||
* LHPOUT: Left Channel Headphone Output
|
||||
* RHPOUT: Right Channel Headphone Output
|
||||
* LLINEIN: Left Channel Line Input
|
||||
* RLINEIN: Right Channel Line Input
|
||||
* MICIN: Microphone Input
|
||||
|
|
@ -211,7 +211,8 @@ CONFIG_SND_ATMEL_SOC_WM8904=m
|
|||
CONFIG_SND_AT91_SOC_SAM9X5_WM8731=m
|
||||
CONFIG_SND_KIRKWOOD_SOC=y
|
||||
CONFIG_SND_SOC_ALC5623=y
|
||||
CONFIG_SND_SOC_WM8731=y
|
||||
CONFIG_SND_SOC_WM8731_I2C=y
|
||||
CONFIG_SND_SOC_WM8731_SPI=y
|
||||
CONFIG_SND_SIMPLE_CARD=y
|
||||
CONFIG_HID_DRAGONRISE=y
|
||||
CONFIG_HID_GYRATION=y
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ config SND_ATMEL_SOC_SSC_DMA
|
|||
config SND_AT91_SOC_SAM9G20_WM8731
|
||||
tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
|
||||
depends on ARCH_AT91 || COMPILE_TEST
|
||||
depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
|
||||
depends on ATMEL_SSC && I2C
|
||||
select SND_ATMEL_SOC_SSC_PDC
|
||||
select SND_SOC_WM8731
|
||||
select SND_SOC_WM8731_I2C
|
||||
help
|
||||
Say Y if you want to add support for SoC audio on WM8731-based
|
||||
AT91sam9g20 evaluation board.
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ config SND_SOC_DB1200
|
|||
select SND_SOC_AC97_CODEC
|
||||
select SND_SOC_WM9712
|
||||
select SND_SOC_AU1XPSC_I2S
|
||||
select SND_SOC_WM8731
|
||||
select SND_SOC_WM8731_I2C
|
||||
help
|
||||
Select this option to enable audio (AC97 and I2S) on the
|
||||
Alchemy/AMD/RMI/NetLogic Db1200, Db1550 and Db1300 evaluation boards.
|
||||
|
|
|
|||
|
|
@ -265,7 +265,8 @@ config SND_SOC_ALL_CODECS
|
|||
imply SND_SOC_WM8711
|
||||
imply SND_SOC_WM8727
|
||||
imply SND_SOC_WM8728
|
||||
imply SND_SOC_WM8731
|
||||
imply SND_SOC_WM8731_I2C
|
||||
imply SND_SOC_WM8731_SPI
|
||||
imply SND_SOC_WM8737
|
||||
imply SND_SOC_WM8741
|
||||
imply SND_SOC_WM8750
|
||||
|
|
@ -1753,8 +1754,19 @@ config SND_SOC_WM8728
|
|||
depends on SND_SOC_I2C_AND_SPI
|
||||
|
||||
config SND_SOC_WM8731
|
||||
tristate "Wolfson Microelectronics WM8731 CODEC"
|
||||
depends on SND_SOC_I2C_AND_SPI
|
||||
tristate
|
||||
|
||||
config SND_SOC_WM8731_I2C
|
||||
tristate "Wolfson Microelectronics WM8731 CODEC with I2C"
|
||||
depends on I2C
|
||||
select REGMAP
|
||||
select SND_SOC_WM8731
|
||||
|
||||
config SND_SOC_WM8731_SPI
|
||||
tristate "Wolfson Microelectronics WM8731 CODEC with SPI"
|
||||
depends on SPI
|
||||
select REGMAP
|
||||
select SND_SOC_WM8731
|
||||
|
||||
config SND_SOC_WM8737
|
||||
tristate "Wolfson Microelectronics WM8737 ADC"
|
||||
|
|
|
|||
|
|
@ -290,6 +290,8 @@ snd-soc-wm8711-objs := wm8711.o
|
|||
snd-soc-wm8727-objs := wm8727.o
|
||||
snd-soc-wm8728-objs := wm8728.o
|
||||
snd-soc-wm8731-objs := wm8731.o
|
||||
snd-soc-wm8731-i2c-objs := wm8731-i2c.o
|
||||
snd-soc-wm8731-spi-objs := wm8731-spi.o
|
||||
snd-soc-wm8737-objs := wm8737.o
|
||||
snd-soc-wm8741-objs := wm8741.o
|
||||
snd-soc-wm8750-objs := wm8750.o
|
||||
|
|
@ -632,6 +634,8 @@ obj-$(CONFIG_SND_SOC_WM8711) += snd-soc-wm8711.o
|
|||
obj-$(CONFIG_SND_SOC_WM8727) += snd-soc-wm8727.o
|
||||
obj-$(CONFIG_SND_SOC_WM8728) += snd-soc-wm8728.o
|
||||
obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o
|
||||
obj-$(CONFIG_SND_SOC_WM8731_I2C) += snd-soc-wm8731-i2c.o
|
||||
obj-$(CONFIG_SND_SOC_WM8731_SPI) += snd-soc-wm8731-spi.o
|
||||
obj-$(CONFIG_SND_SOC_WM8737) += snd-soc-wm8737.o
|
||||
obj-$(CONFIG_SND_SOC_WM8741) += snd-soc-wm8741.o
|
||||
obj-$(CONFIG_SND_SOC_WM8750) += snd-soc-wm8750.o
|
||||
|
|
|
|||
69
sound/soc/codecs/wm8731-i2c.c
Normal file
69
sound/soc/codecs/wm8731-i2c.c
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* wm8731-i2c.c -- WM8731 ALSA SoC Audio driver I2C code
|
||||
*
|
||||
* Copyright 2005 Openedhand Ltd.
|
||||
* Copyright 2006-12 Wolfson Microelectronics, plc
|
||||
*
|
||||
* Author: Richard Purdie <richard@openedhand.com>
|
||||
*
|
||||
* Based on wm8753.c by Liam Girdwood
|
||||
*/
|
||||
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
|
||||
#include "wm8731.h"
|
||||
|
||||
|
||||
static const struct of_device_id wm8731_of_match[] = {
|
||||
{ .compatible = "wlf,wm8731", },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, wm8731_of_match);
|
||||
|
||||
static int wm8731_i2c_probe(struct i2c_client *i2c,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct wm8731_priv *wm8731;
|
||||
int ret;
|
||||
|
||||
wm8731 = devm_kzalloc(&i2c->dev, sizeof(struct wm8731_priv),
|
||||
GFP_KERNEL);
|
||||
if (wm8731 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
i2c_set_clientdata(i2c, wm8731);
|
||||
|
||||
wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
|
||||
if (IS_ERR(wm8731->regmap)) {
|
||||
ret = PTR_ERR(wm8731->regmap);
|
||||
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return wm8731_init(&i2c->dev, wm8731);
|
||||
}
|
||||
|
||||
static const struct i2c_device_id wm8731_i2c_id[] = {
|
||||
{ "wm8731", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id);
|
||||
|
||||
static struct i2c_driver wm8731_i2c_driver = {
|
||||
.driver = {
|
||||
.name = "wm8731",
|
||||
.of_match_table = wm8731_of_match,
|
||||
},
|
||||
.probe = wm8731_i2c_probe,
|
||||
.id_table = wm8731_i2c_id,
|
||||
};
|
||||
|
||||
module_i2c_driver(wm8731_i2c_driver);
|
||||
|
||||
MODULE_DESCRIPTION("ASoC WM8731 driver - I2C");
|
||||
MODULE_AUTHOR("Richard Purdie");
|
||||
MODULE_LICENSE("GPL");
|
||||
59
sound/soc/codecs/wm8731-spi.c
Normal file
59
sound/soc/codecs/wm8731-spi.c
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* wm8731.c -- WM8731 ALSA SoC Audio driver
|
||||
*
|
||||
* Copyright 2005 Openedhand Ltd.
|
||||
* Copyright 2006-12 Wolfson Microelectronics, plc
|
||||
*
|
||||
* Author: Richard Purdie <richard@openedhand.com>
|
||||
*
|
||||
* Based on wm8753.c by Liam Girdwood
|
||||
*/
|
||||
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
|
||||
#include "wm8731.h"
|
||||
|
||||
static const struct of_device_id wm8731_of_match[] = {
|
||||
{ .compatible = "wlf,wm8731", },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, wm8731_of_match);
|
||||
|
||||
static int wm8731_spi_probe(struct spi_device *spi)
|
||||
{
|
||||
struct wm8731_priv *wm8731;
|
||||
int ret;
|
||||
|
||||
wm8731 = devm_kzalloc(&spi->dev, sizeof(*wm8731), GFP_KERNEL);
|
||||
if (wm8731 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
spi_set_drvdata(spi, wm8731);
|
||||
|
||||
wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);
|
||||
if (IS_ERR(wm8731->regmap)) {
|
||||
ret = PTR_ERR(wm8731->regmap);
|
||||
dev_err(&spi->dev, "Failed to allocate register map: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return wm8731_init(&spi->dev, wm8731);
|
||||
}
|
||||
|
||||
static struct spi_driver wm8731_spi_driver = {
|
||||
.driver = {
|
||||
.name = "wm8731",
|
||||
.of_match_table = wm8731_of_match,
|
||||
},
|
||||
.probe = wm8731_spi_probe,
|
||||
};
|
||||
|
||||
module_spi_driver(wm8731_spi_driver);
|
||||
|
||||
MODULE_DESCRIPTION("ASoC WM8731 driver - SPI");
|
||||
MODULE_AUTHOR("Richard Purdie");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
@ -15,13 +15,9 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/clk.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/pcm.h>
|
||||
|
|
@ -32,7 +28,6 @@
|
|||
|
||||
#include "wm8731.h"
|
||||
|
||||
#define WM8731_NUM_SUPPLIES 4
|
||||
static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
|
||||
"AVDD",
|
||||
"HPVDD",
|
||||
|
|
@ -40,21 +35,6 @@ static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
|
|||
"DBVDD",
|
||||
};
|
||||
|
||||
/* codec private data */
|
||||
struct wm8731_priv {
|
||||
struct regmap *regmap;
|
||||
struct clk *mclk;
|
||||
struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
|
||||
const struct snd_pcm_hw_constraint_list *constraints;
|
||||
unsigned int sysclk;
|
||||
int sysclk_type;
|
||||
int playback_fs;
|
||||
bool deemph;
|
||||
|
||||
struct mutex lock;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* wm8731 register cache
|
||||
*/
|
||||
|
|
@ -429,12 +409,11 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
|||
struct snd_soc_component *component = codec_dai->component;
|
||||
u16 iface = 0;
|
||||
|
||||
/* set master/slave audio interface */
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBP_CFP:
|
||||
iface |= 0x0040;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
case SND_SOC_DAIFMT_CBC_CFC:
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
|
|
@ -570,11 +549,39 @@ static struct snd_soc_dai_driver wm8731_dai = {
|
|||
.symmetric_rate = 1,
|
||||
};
|
||||
|
||||
static int wm8731_request_supplies(struct device *dev,
|
||||
struct wm8731_priv *wm8731)
|
||||
static const struct snd_soc_component_driver soc_component_dev_wm8731 = {
|
||||
.set_bias_level = wm8731_set_bias_level,
|
||||
.controls = wm8731_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8731_snd_controls),
|
||||
.dapm_widgets = wm8731_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
|
||||
.dapm_routes = wm8731_intercon,
|
||||
.num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
|
||||
.suspend_bias_off = 1,
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
int wm8731_init(struct device *dev, struct wm8731_priv *wm8731)
|
||||
{
|
||||
int ret = 0, i;
|
||||
|
||||
wm8731->mclk = devm_clk_get(dev, "mclk");
|
||||
if (IS_ERR(wm8731->mclk)) {
|
||||
ret = PTR_ERR(wm8731->mclk);
|
||||
if (ret == -ENOENT) {
|
||||
wm8731->mclk = NULL;
|
||||
dev_warn(dev, "Assuming static MCLK\n");
|
||||
} else {
|
||||
dev_err(dev, "Failed to get MCLK: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
mutex_init(&wm8731->lock);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(wm8731->supplies); i++)
|
||||
wm8731->supplies[i].supply = wm8731_supply_names[i];
|
||||
|
||||
|
|
@ -592,13 +599,6 @@ static int wm8731_request_supplies(struct device *dev,
|
|||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
ret = wm8731_reset(wm8731->regmap);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to issue reset: %d\n", ret);
|
||||
|
|
@ -619,36 +619,24 @@ static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731)
|
|||
|
||||
regcache_mark_dirty(wm8731->regmap);
|
||||
|
||||
ret = devm_snd_soc_register_component(dev,
|
||||
&soc_component_dev_wm8731, &wm8731_dai, 1);
|
||||
if (ret != 0) {
|
||||
dev_err(dev, "Failed to register CODEC: %d\n", ret);
|
||||
goto err_regulator_enable;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_regulator_enable:
|
||||
/* Regulators will be enabled by bias management */
|
||||
regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(wm8731_init);
|
||||
|
||||
static const struct snd_soc_component_driver soc_component_dev_wm8731 = {
|
||||
.set_bias_level = wm8731_set_bias_level,
|
||||
.controls = wm8731_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8731_snd_controls),
|
||||
.dapm_widgets = wm8731_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
|
||||
.dapm_routes = wm8731_intercon,
|
||||
.num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
|
||||
.suspend_bias_off = 1,
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
static const struct of_device_id wm8731_of_match[] = {
|
||||
{ .compatible = "wlf,wm8731", },
|
||||
{ }
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(of, wm8731_of_match);
|
||||
|
||||
static const struct regmap_config wm8731_regmap = {
|
||||
const struct regmap_config wm8731_regmap = {
|
||||
.reg_bits = 7,
|
||||
.val_bits = 9,
|
||||
|
||||
|
|
@ -659,171 +647,7 @@ static const struct regmap_config wm8731_regmap = {
|
|||
.reg_defaults = wm8731_reg_defaults,
|
||||
.num_reg_defaults = ARRAY_SIZE(wm8731_reg_defaults),
|
||||
};
|
||||
|
||||
#if defined(CONFIG_SPI_MASTER)
|
||||
static int wm8731_spi_probe(struct spi_device *spi)
|
||||
{
|
||||
struct wm8731_priv *wm8731;
|
||||
int ret;
|
||||
|
||||
wm8731 = devm_kzalloc(&spi->dev, sizeof(*wm8731), GFP_KERNEL);
|
||||
if (wm8731 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
wm8731->mclk = devm_clk_get(&spi->dev, "mclk");
|
||||
if (IS_ERR(wm8731->mclk)) {
|
||||
ret = PTR_ERR(wm8731->mclk);
|
||||
if (ret == -ENOENT) {
|
||||
wm8731->mclk = NULL;
|
||||
dev_warn(&spi->dev, "Assuming static MCLK\n");
|
||||
} else {
|
||||
dev_err(&spi->dev, "Failed to get MCLK: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
mutex_init(&wm8731->lock);
|
||||
|
||||
spi_set_drvdata(spi, wm8731);
|
||||
|
||||
ret = wm8731_request_supplies(&spi->dev, wm8731);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);
|
||||
if (IS_ERR(wm8731->regmap)) {
|
||||
ret = PTR_ERR(wm8731->regmap);
|
||||
dev_err(&spi->dev, "Failed to allocate register map: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = wm8731_hw_init(&spi->dev, wm8731);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
ret = devm_snd_soc_register_component(&spi->dev,
|
||||
&soc_component_dev_wm8731, &wm8731_dai, 1);
|
||||
if (ret != 0) {
|
||||
dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct spi_driver wm8731_spi_driver = {
|
||||
.driver = {
|
||||
.name = "wm8731",
|
||||
.of_match_table = wm8731_of_match,
|
||||
},
|
||||
.probe = wm8731_spi_probe,
|
||||
};
|
||||
#endif /* CONFIG_SPI_MASTER */
|
||||
|
||||
#if IS_ENABLED(CONFIG_I2C)
|
||||
static int wm8731_i2c_probe(struct i2c_client *i2c,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct wm8731_priv *wm8731;
|
||||
int ret;
|
||||
|
||||
wm8731 = devm_kzalloc(&i2c->dev, sizeof(struct wm8731_priv),
|
||||
GFP_KERNEL);
|
||||
if (wm8731 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
wm8731->mclk = devm_clk_get(&i2c->dev, "mclk");
|
||||
if (IS_ERR(wm8731->mclk)) {
|
||||
ret = PTR_ERR(wm8731->mclk);
|
||||
if (ret == -ENOENT) {
|
||||
wm8731->mclk = NULL;
|
||||
dev_warn(&i2c->dev, "Assuming static MCLK\n");
|
||||
} else {
|
||||
dev_err(&i2c->dev, "Failed to get MCLK: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
mutex_init(&wm8731->lock);
|
||||
|
||||
i2c_set_clientdata(i2c, wm8731);
|
||||
|
||||
ret = wm8731_request_supplies(&i2c->dev, wm8731);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
|
||||
if (IS_ERR(wm8731->regmap)) {
|
||||
ret = PTR_ERR(wm8731->regmap);
|
||||
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = wm8731_hw_init(&i2c->dev, wm8731);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
ret = devm_snd_soc_register_component(&i2c->dev,
|
||||
&soc_component_dev_wm8731, &wm8731_dai, 1);
|
||||
if (ret != 0) {
|
||||
dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id wm8731_i2c_id[] = {
|
||||
{ "wm8731", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id);
|
||||
|
||||
static struct i2c_driver wm8731_i2c_driver = {
|
||||
.driver = {
|
||||
.name = "wm8731",
|
||||
.of_match_table = wm8731_of_match,
|
||||
},
|
||||
.probe = wm8731_i2c_probe,
|
||||
.id_table = wm8731_i2c_id,
|
||||
};
|
||||
#endif
|
||||
|
||||
static int __init wm8731_modinit(void)
|
||||
{
|
||||
int ret = 0;
|
||||
#if IS_ENABLED(CONFIG_I2C)
|
||||
ret = i2c_add_driver(&wm8731_i2c_driver);
|
||||
if (ret != 0) {
|
||||
printk(KERN_ERR "Failed to register WM8731 I2C driver: %d\n",
|
||||
ret);
|
||||
}
|
||||
#endif
|
||||
#if defined(CONFIG_SPI_MASTER)
|
||||
ret = spi_register_driver(&wm8731_spi_driver);
|
||||
if (ret != 0) {
|
||||
printk(KERN_ERR "Failed to register WM8731 SPI driver: %d\n",
|
||||
ret);
|
||||
}
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
module_init(wm8731_modinit);
|
||||
|
||||
static void __exit wm8731_exit(void)
|
||||
{
|
||||
#if IS_ENABLED(CONFIG_I2C)
|
||||
i2c_del_driver(&wm8731_i2c_driver);
|
||||
#endif
|
||||
#if defined(CONFIG_SPI_MASTER)
|
||||
spi_unregister_driver(&wm8731_spi_driver);
|
||||
#endif
|
||||
}
|
||||
module_exit(wm8731_exit);
|
||||
EXPORT_SYMBOL_GPL(wm8731_regmap);
|
||||
|
||||
MODULE_DESCRIPTION("ASoC WM8731 driver");
|
||||
MODULE_AUTHOR("Richard Purdie");
|
||||
|
|
|
|||
|
|
@ -12,6 +12,13 @@
|
|||
#ifndef _WM8731_H
|
||||
#define _WM8731_H
|
||||
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
|
||||
struct clk;
|
||||
struct snd_pcm_hw_constraint_list;
|
||||
|
||||
/* WM8731 register space */
|
||||
|
||||
#define WM8731_LINVOL 0x00
|
||||
|
|
@ -33,4 +40,24 @@
|
|||
|
||||
#define WM8731_DAI 0
|
||||
|
||||
#define WM8731_NUM_SUPPLIES 4
|
||||
|
||||
/* codec private data */
|
||||
struct wm8731_priv {
|
||||
struct regmap *regmap;
|
||||
struct clk *mclk;
|
||||
struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
|
||||
const struct snd_pcm_hw_constraint_list *constraints;
|
||||
unsigned int sysclk;
|
||||
int sysclk_type;
|
||||
int playback_fs;
|
||||
bool deemph;
|
||||
|
||||
struct mutex lock;
|
||||
};
|
||||
|
||||
extern const struct regmap_config wm8731_regmap;
|
||||
|
||||
int wm8731_init(struct device *dev, struct wm8731_priv *wm8731);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ config SND_PXA2XX_SOC_CORGI
|
|||
tristate "SoC Audio support for Sharp Zaurus SL-C7x0"
|
||||
depends on SND_PXA2XX_SOC && PXA_SHARP_C7xx && I2C
|
||||
select SND_PXA2XX_SOC_I2S
|
||||
select SND_SOC_WM8731
|
||||
select SND_SOC_WM8731_I2C
|
||||
help
|
||||
Say Y if you want to add support for SoC audio on Sharp
|
||||
Zaurus SL-C7x0 models (Corgi, Shepherd, Husky).
|
||||
|
|
@ -71,7 +71,7 @@ config SND_PXA2XX_SOC_POODLE
|
|||
tristate "SoC Audio support for Poodle"
|
||||
depends on SND_PXA2XX_SOC && MACH_POODLE && I2C
|
||||
select SND_PXA2XX_SOC_I2S
|
||||
select SND_SOC_WM8731
|
||||
select SND_SOC_WM8731_I2C
|
||||
help
|
||||
Say Y if you want to add support for SoC audio on Sharp
|
||||
Zaurus SL-5600 model (Poodle).
|
||||
|
|
|
|||
Loading…
Reference in a new issue