forked from Minki/linux
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/spdif', 'asoc/topic/ssm2602' and 'asoc/topic/ssm4567' into asoc-next
This commit is contained in:
Mark Brown
commit
248519c00e
19
Documentation/devicetree/bindings/sound/adi,ssm2602.txt
Normal file
19
Documentation/devicetree/bindings/sound/adi,ssm2602.txt
Normal file
@ -0,0 +1,19 @@
|
||||
Analog Devices SSM2602, SSM2603 and SSM2604 I2S audio CODEC devices
|
||||
|
||||
SSM2602 support both I2C and SPI as the configuration interface,
|
||||
the selection is made by the MODE strap-in pin.
|
||||
SSM2603 and SSM2604 only support I2C as the configuration interface.
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible : One of "adi,ssm2602", "adi,ssm2603" or "adi,ssm2604"
|
||||
|
||||
- reg : the I2C address of the device for I2C, the chip select
|
||||
number for SPI.
|
||||
|
||||
Example:
|
||||
|
||||
ssm2602: ssm2602@1a {
|
||||
compatible = "adi,ssm2602";
|
||||
reg = <0x1a>;
|
||||
};
|
||||
@ -17,6 +17,10 @@ Optional properties:
|
||||
source.
|
||||
- simple-audio-card,mclk-fs : Multiplication factor between stream rate and codec
|
||||
mclk.
|
||||
- simple-audio-card,hp-det-gpio : Reference to GPIO that signals when
|
||||
headphones are attached.
|
||||
- simple-audio-card,mic-det-gpio : Reference to GPIO that signals when
|
||||
a microphone is attached.
|
||||
|
||||
Optional subnodes:
|
||||
|
||||
|
||||
15
Documentation/devicetree/bindings/sound/ssm4567.txt
Normal file
15
Documentation/devicetree/bindings/sound/ssm4567.txt
Normal file
@ -0,0 +1,15 @@
|
||||
Analog Devices SSM4567 audio amplifier
|
||||
|
||||
This device supports I2C only.
|
||||
|
||||
Required properties:
|
||||
- compatible : Must be "adi,ssm4567"
|
||||
- reg : the I2C address of the device. This will either be 0x34 (LR_SEL/ADDR connected to AGND),
|
||||
0x35 (LR_SEL/ADDR connected to IOVDD) or 0x36 (LR_SEL/ADDR open).
|
||||
|
||||
Example:
|
||||
|
||||
ssm4567: ssm4567@34 {
|
||||
compatible = "adi,ssm4567";
|
||||
reg = <0x34>;
|
||||
};
|
||||
@ -94,6 +94,7 @@ config SND_SOC_ALL_CODECS
|
||||
select SND_SOC_SSM2518 if I2C
|
||||
select SND_SOC_SSM2602_SPI if SPI_MASTER
|
||||
select SND_SOC_SSM2602_I2C if I2C
|
||||
select SND_SOC_SSM4567 if I2C
|
||||
select SND_SOC_STA32X if I2C
|
||||
select SND_SOC_STA350 if I2C
|
||||
select SND_SOC_STA529 if I2C
|
||||
@ -540,12 +541,20 @@ config SND_SOC_SSM2602
|
||||
tristate
|
||||
|
||||
config SND_SOC_SSM2602_SPI
|
||||
tristate "Analog Devices SSM2602 CODEC - SPI"
|
||||
depends on SPI_MASTER
|
||||
select SND_SOC_SSM2602
|
||||
tristate
|
||||
select REGMAP_SPI
|
||||
|
||||
config SND_SOC_SSM2602_I2C
|
||||
tristate "Analog Devices SSM2602 CODEC - I2C"
|
||||
depends on I2C
|
||||
select SND_SOC_SSM2602
|
||||
tristate
|
||||
select REGMAP_I2C
|
||||
|
||||
config SND_SOC_SSM4567
|
||||
tristate "Analog Devices ssm4567 amplifier driver support"
|
||||
depends on I2C
|
||||
|
||||
config SND_SOC_STA32X
|
||||
tristate
|
||||
|
||||
@ -95,6 +95,7 @@ snd-soc-ssm2518-objs := ssm2518.o
|
||||
snd-soc-ssm2602-objs := ssm2602.o
|
||||
snd-soc-ssm2602-spi-objs := ssm2602-spi.o
|
||||
snd-soc-ssm2602-i2c-objs := ssm2602-i2c.o
|
||||
snd-soc-ssm4567-objs := ssm4567.o
|
||||
snd-soc-sta32x-objs := sta32x.o
|
||||
snd-soc-sta350-objs := sta350.o
|
||||
snd-soc-sta529-objs := sta529.o
|
||||
@ -266,6 +267,7 @@ obj-$(CONFIG_SND_SOC_SSM2518) += snd-soc-ssm2518.o
|
||||
obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o
|
||||
obj-$(CONFIG_SND_SOC_SSM2602_SPI) += snd-soc-ssm2602-spi.o
|
||||
obj-$(CONFIG_SND_SOC_SSM2602_I2C) += snd-soc-ssm2602-i2c.o
|
||||
obj-$(CONFIG_SND_SOC_SSM4567) += snd-soc-ssm4567.o
|
||||
obj-$(CONFIG_SND_SOC_STA32X) += snd-soc-sta32x.o
|
||||
obj-$(CONFIG_SND_SOC_STA350) += snd-soc-sta350.o
|
||||
obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o
|
||||
|
||||
@ -41,10 +41,19 @@ static const struct i2c_device_id ssm2602_i2c_id[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, ssm2602_i2c_id);
|
||||
|
||||
static const struct of_device_id ssm2602_of_match[] = {
|
||||
{ .compatible = "adi,ssm2602", },
|
||||
{ .compatible = "adi,ssm2603", },
|
||||
{ .compatible = "adi,ssm2604", },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, ssm2602_of_match);
|
||||
|
||||
static struct i2c_driver ssm2602_i2c_driver = {
|
||||
.driver = {
|
||||
.name = "ssm2602",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = ssm2602_of_match,
|
||||
},
|
||||
.probe = ssm2602_i2c_probe,
|
||||
.remove = ssm2602_i2c_remove,
|
||||
|
||||
@ -26,10 +26,17 @@ static int ssm2602_spi_remove(struct spi_device *spi)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id ssm2602_of_match[] = {
|
||||
{ .compatible = "adi,ssm2602", },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, ssm2602_of_match);
|
||||
|
||||
static struct spi_driver ssm2602_spi_driver = {
|
||||
.driver = {
|
||||
.name = "ssm2602",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = ssm2602_of_match,
|
||||
},
|
||||
.probe = ssm2602_spi_probe,
|
||||
.remove = ssm2602_spi_remove,
|
||||
|
||||
@ -192,7 +192,7 @@ static const struct snd_pcm_hw_constraint_list ssm2602_constraints_12288000 = {
|
||||
};
|
||||
|
||||
static const unsigned int ssm2602_rates_11289600[] = {
|
||||
8000, 44100, 88200,
|
||||
8000, 11025, 22050, 44100, 88200,
|
||||
};
|
||||
|
||||
static const struct snd_pcm_hw_constraint_list ssm2602_constraints_11289600 = {
|
||||
@ -237,6 +237,16 @@ static const struct ssm2602_coeff ssm2602_coeff_table[] = {
|
||||
{18432000, 96000, SSM2602_COEFF_SRATE(0x7, 0x1, 0x0)},
|
||||
{12000000, 96000, SSM2602_COEFF_SRATE(0x7, 0x0, 0x1)},
|
||||
|
||||
/* 11.025k */
|
||||
{11289600, 11025, SSM2602_COEFF_SRATE(0xc, 0x0, 0x0)},
|
||||
{16934400, 11025, SSM2602_COEFF_SRATE(0xc, 0x1, 0x0)},
|
||||
{12000000, 11025, SSM2602_COEFF_SRATE(0xc, 0x1, 0x1)},
|
||||
|
||||
/* 22.05k */
|
||||
{11289600, 22050, SSM2602_COEFF_SRATE(0xd, 0x0, 0x0)},
|
||||
{16934400, 22050, SSM2602_COEFF_SRATE(0xd, 0x1, 0x0)},
|
||||
{12000000, 22050, SSM2602_COEFF_SRATE(0xd, 0x1, 0x1)},
|
||||
|
||||
/* 44.1k */
|
||||
{11289600, 44100, SSM2602_COEFF_SRATE(0x8, 0x0, 0x0)},
|
||||
{16934400, 44100, SSM2602_COEFF_SRATE(0x8, 0x1, 0x0)},
|
||||
@ -467,7 +477,8 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
|
||||
#define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
|
||||
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
|
||||
SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\
|
||||
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\
|
||||
SNDRV_PCM_RATE_96000)
|
||||
|
||||
343
sound/soc/codecs/ssm4567.c
Normal file
343
sound/soc/codecs/ssm4567.c
Normal file
@ -0,0 +1,343 @@
|
||||
/*
|
||||
* SSM4567 amplifier audio driver
|
||||
*
|
||||
* Copyright 2014 Google Chromium project.
|
||||
* Author: Anatol Pomozov <anatol@chromium.org>
|
||||
*
|
||||
* Based on code copyright/by:
|
||||
* Copyright 2013 Analog Devices Inc.
|
||||
*
|
||||
* Licensed under the GPL-2.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/slab.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/pcm.h>
|
||||
#include <sound/pcm_params.h>
|
||||
#include <sound/soc.h>
|
||||
#include <sound/initval.h>
|
||||
#include <sound/tlv.h>
|
||||
|
||||
#define SSM4567_REG_POWER_CTRL 0x00
|
||||
#define SSM4567_REG_AMP_SNS_CTRL 0x01
|
||||
#define SSM4567_REG_DAC_CTRL 0x02
|
||||
#define SSM4567_REG_DAC_VOLUME 0x03
|
||||
#define SSM4567_REG_SAI_CTRL_1 0x04
|
||||
#define SSM4567_REG_SAI_CTRL_2 0x05
|
||||
#define SSM4567_REG_SAI_PLACEMENT_1 0x06
|
||||
#define SSM4567_REG_SAI_PLACEMENT_2 0x07
|
||||
#define SSM4567_REG_SAI_PLACEMENT_3 0x08
|
||||
#define SSM4567_REG_SAI_PLACEMENT_4 0x09
|
||||
#define SSM4567_REG_SAI_PLACEMENT_5 0x0a
|
||||
#define SSM4567_REG_SAI_PLACEMENT_6 0x0b
|
||||
#define SSM4567_REG_BATTERY_V_OUT 0x0c
|
||||
#define SSM4567_REG_LIMITER_CTRL_1 0x0d
|
||||
#define SSM4567_REG_LIMITER_CTRL_2 0x0e
|
||||
#define SSM4567_REG_LIMITER_CTRL_3 0x0f
|
||||
#define SSM4567_REG_STATUS_1 0x10
|
||||
#define SSM4567_REG_STATUS_2 0x11
|
||||
#define SSM4567_REG_FAULT_CTRL 0x12
|
||||
#define SSM4567_REG_PDM_CTRL 0x13
|
||||
#define SSM4567_REG_MCLK_RATIO 0x14
|
||||
#define SSM4567_REG_BOOST_CTRL_1 0x15
|
||||
#define SSM4567_REG_BOOST_CTRL_2 0x16
|
||||
#define SSM4567_REG_SOFT_RESET 0xff
|
||||
|
||||
/* POWER_CTRL */
|
||||
#define SSM4567_POWER_APWDN_EN BIT(7)
|
||||
#define SSM4567_POWER_BSNS_PWDN BIT(6)
|
||||
#define SSM4567_POWER_VSNS_PWDN BIT(5)
|
||||
#define SSM4567_POWER_ISNS_PWDN BIT(4)
|
||||
#define SSM4567_POWER_BOOST_PWDN BIT(3)
|
||||
#define SSM4567_POWER_AMP_PWDN BIT(2)
|
||||
#define SSM4567_POWER_VBAT_ONLY BIT(1)
|
||||
#define SSM4567_POWER_SPWDN BIT(0)
|
||||
|
||||
/* DAC_CTRL */
|
||||
#define SSM4567_DAC_HV BIT(7)
|
||||
#define SSM4567_DAC_MUTE BIT(6)
|
||||
#define SSM4567_DAC_HPF BIT(5)
|
||||
#define SSM4567_DAC_LPM BIT(4)
|
||||
#define SSM4567_DAC_FS_MASK 0x7
|
||||
#define SSM4567_DAC_FS_8000_12000 0x0
|
||||
#define SSM4567_DAC_FS_16000_24000 0x1
|
||||
#define SSM4567_DAC_FS_32000_48000 0x2
|
||||
#define SSM4567_DAC_FS_64000_96000 0x3
|
||||
#define SSM4567_DAC_FS_128000_192000 0x4
|
||||
|
||||
struct ssm4567 {
|
||||
struct regmap *regmap;
|
||||
};
|
||||
|
||||
static const struct reg_default ssm4567_reg_defaults[] = {
|
||||
{ SSM4567_REG_POWER_CTRL, 0x81 },
|
||||
{ SSM4567_REG_AMP_SNS_CTRL, 0x09 },
|
||||
{ SSM4567_REG_DAC_CTRL, 0x32 },
|
||||
{ SSM4567_REG_DAC_VOLUME, 0x40 },
|
||||
{ SSM4567_REG_SAI_CTRL_1, 0x00 },
|
||||
{ SSM4567_REG_SAI_CTRL_2, 0x08 },
|
||||
{ SSM4567_REG_SAI_PLACEMENT_1, 0x01 },
|
||||
{ SSM4567_REG_SAI_PLACEMENT_2, 0x20 },
|
||||
{ SSM4567_REG_SAI_PLACEMENT_3, 0x32 },
|
||||
{ SSM4567_REG_SAI_PLACEMENT_4, 0x07 },
|
||||
{ SSM4567_REG_SAI_PLACEMENT_5, 0x07 },
|
||||
{ SSM4567_REG_SAI_PLACEMENT_6, 0x07 },
|
||||
{ SSM4567_REG_BATTERY_V_OUT, 0x00 },
|
||||
{ SSM4567_REG_LIMITER_CTRL_1, 0xa4 },
|
||||
{ SSM4567_REG_LIMITER_CTRL_2, 0x73 },
|
||||
{ SSM4567_REG_LIMITER_CTRL_3, 0x00 },
|
||||
{ SSM4567_REG_STATUS_1, 0x00 },
|
||||
{ SSM4567_REG_STATUS_2, 0x00 },
|
||||
{ SSM4567_REG_FAULT_CTRL, 0x30 },
|
||||
{ SSM4567_REG_PDM_CTRL, 0x40 },
|
||||
{ SSM4567_REG_MCLK_RATIO, 0x11 },
|
||||
{ SSM4567_REG_BOOST_CTRL_1, 0x03 },
|
||||
{ SSM4567_REG_BOOST_CTRL_2, 0x00 },
|
||||
{ SSM4567_REG_SOFT_RESET, 0x00 },
|
||||
};
|
||||
|
||||
|
||||
static bool ssm4567_readable_reg(struct device *dev, unsigned int reg)
|
||||
{
|
||||
switch (reg) {
|
||||
case SSM4567_REG_POWER_CTRL ... SSM4567_REG_BOOST_CTRL_2:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static bool ssm4567_writeable_reg(struct device *dev, unsigned int reg)
|
||||
{
|
||||
switch (reg) {
|
||||
case SSM4567_REG_POWER_CTRL ... SSM4567_REG_SAI_PLACEMENT_6:
|
||||
case SSM4567_REG_LIMITER_CTRL_1 ... SSM4567_REG_LIMITER_CTRL_3:
|
||||
case SSM4567_REG_FAULT_CTRL ... SSM4567_REG_BOOST_CTRL_2:
|
||||
/* The datasheet states that soft reset register is read-only,
|
||||
* but logically it is write-only. */
|
||||
case SSM4567_REG_SOFT_RESET:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static bool ssm4567_volatile_reg(struct device *dev, unsigned int reg)
|
||||
{
|
||||
switch (reg) {
|
||||
case SSM4567_REG_BATTERY_V_OUT:
|
||||
case SSM4567_REG_STATUS_1 ... SSM4567_REG_STATUS_2:
|
||||
case SSM4567_REG_SOFT_RESET:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static const DECLARE_TLV_DB_MINMAX_MUTE(ssm4567_vol_tlv, -7125, 2400);
|
||||
|
||||
static const struct snd_kcontrol_new ssm4567_snd_controls[] = {
|
||||
SOC_SINGLE_TLV("Master Playback Volume", SSM4567_REG_DAC_VOLUME, 0,
|
||||
0xff, 1, ssm4567_vol_tlv),
|
||||
SOC_SINGLE("DAC Low Power Mode Switch", SSM4567_REG_DAC_CTRL, 4, 1, 0),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_widget ssm4567_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_DAC("DAC", "HiFi Playback", SSM4567_REG_POWER_CTRL, 2, 1),
|
||||
|
||||
SND_SOC_DAPM_OUTPUT("OUT"),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_route ssm4567_routes[] = {
|
||||
{ "OUT", NULL, "DAC" },
|
||||
};
|
||||
|
||||
static int ssm4567_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct ssm4567 *ssm4567 = snd_soc_codec_get_drvdata(codec);
|
||||
unsigned int rate = params_rate(params);
|
||||
unsigned int dacfs;
|
||||
|
||||
if (rate >= 8000 && rate <= 12000)
|
||||
dacfs = SSM4567_DAC_FS_8000_12000;
|
||||
else if (rate >= 16000 && rate <= 24000)
|
||||
dacfs = SSM4567_DAC_FS_16000_24000;
|
||||
else if (rate >= 32000 && rate <= 48000)
|
||||
dacfs = SSM4567_DAC_FS_32000_48000;
|
||||
else if (rate >= 64000 && rate <= 96000)
|
||||
dacfs = SSM4567_DAC_FS_64000_96000;
|
||||
else if (rate >= 128000 && rate <= 192000)
|
||||
dacfs = SSM4567_DAC_FS_128000_192000;
|
||||
else
|
||||
return -EINVAL;
|
||||
|
||||
return regmap_update_bits(ssm4567->regmap, SSM4567_REG_DAC_CTRL,
|
||||
SSM4567_DAC_FS_MASK, dacfs);
|
||||
}
|
||||
|
||||
static int ssm4567_mute(struct snd_soc_dai *dai, int mute)
|
||||
{
|
||||
struct ssm4567 *ssm4567 = snd_soc_codec_get_drvdata(dai->codec);
|
||||
unsigned int val;
|
||||
|
||||
val = mute ? SSM4567_DAC_MUTE : 0;
|
||||
return regmap_update_bits(ssm4567->regmap, SSM4567_REG_DAC_CTRL,
|
||||
SSM4567_DAC_MUTE, val);
|
||||
}
|
||||
|
||||
static int ssm4567_set_power(struct ssm4567 *ssm4567, bool enable)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (!enable) {
|
||||
ret = regmap_update_bits(ssm4567->regmap,
|
||||
SSM4567_REG_POWER_CTRL,
|
||||
SSM4567_POWER_SPWDN, SSM4567_POWER_SPWDN);
|
||||
regcache_mark_dirty(ssm4567->regmap);
|
||||
}
|
||||
|
||||
regcache_cache_only(ssm4567->regmap, !enable);
|
||||
|
||||
if (enable) {
|
||||
ret = regmap_update_bits(ssm4567->regmap,
|
||||
SSM4567_REG_POWER_CTRL,
|
||||
SSM4567_POWER_SPWDN, 0x00);
|
||||
regcache_sync(ssm4567->regmap);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ssm4567_set_bias_level(struct snd_soc_codec *codec,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
struct ssm4567 *ssm4567 = snd_soc_codec_get_drvdata(codec);
|
||||
int ret = 0;
|
||||
|
||||
switch (level) {
|
||||
case SND_SOC_BIAS_ON:
|
||||
break;
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
break;
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
|
||||
ret = ssm4567_set_power(ssm4567, true);
|
||||
break;
|
||||
case SND_SOC_BIAS_OFF:
|
||||
ret = ssm4567_set_power(ssm4567, false);
|
||||
break;
|
||||
}
|
||||
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
codec->dapm.bias_level = level;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_dai_ops ssm4567_dai_ops = {
|
||||
.hw_params = ssm4567_hw_params,
|
||||
.digital_mute = ssm4567_mute,
|
||||
};
|
||||
|
||||
static struct snd_soc_dai_driver ssm4567_dai = {
|
||||
.name = "ssm4567-hifi",
|
||||
.playback = {
|
||||
.stream_name = "Playback",
|
||||
.channels_min = 1,
|
||||
.channels_max = 1,
|
||||
.rates = SNDRV_PCM_RATE_8000_192000,
|
||||
.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S32,
|
||||
},
|
||||
.ops = &ssm4567_dai_ops,
|
||||
};
|
||||
|
||||
static struct snd_soc_codec_driver ssm4567_codec_driver = {
|
||||
.set_bias_level = ssm4567_set_bias_level,
|
||||
.idle_bias_off = true,
|
||||
|
||||
.controls = ssm4567_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(ssm4567_snd_controls),
|
||||
.dapm_widgets = ssm4567_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(ssm4567_dapm_widgets),
|
||||
.dapm_routes = ssm4567_routes,
|
||||
.num_dapm_routes = ARRAY_SIZE(ssm4567_routes),
|
||||
};
|
||||
|
||||
static const struct regmap_config ssm4567_regmap_config = {
|
||||
.val_bits = 8,
|
||||
.reg_bits = 8,
|
||||
|
||||
.max_register = SSM4567_REG_SOFT_RESET,
|
||||
.readable_reg = ssm4567_readable_reg,
|
||||
.writeable_reg = ssm4567_writeable_reg,
|
||||
.volatile_reg = ssm4567_volatile_reg,
|
||||
|
||||
.cache_type = REGCACHE_RBTREE,
|
||||
.reg_defaults = ssm4567_reg_defaults,
|
||||
.num_reg_defaults = ARRAY_SIZE(ssm4567_reg_defaults),
|
||||
};
|
||||
|
||||
static int ssm4567_i2c_probe(struct i2c_client *i2c,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct ssm4567 *ssm4567;
|
||||
int ret;
|
||||
|
||||
ssm4567 = devm_kzalloc(&i2c->dev, sizeof(*ssm4567), GFP_KERNEL);
|
||||
if (ssm4567 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
i2c_set_clientdata(i2c, ssm4567);
|
||||
|
||||
ssm4567->regmap = devm_regmap_init_i2c(i2c, &ssm4567_regmap_config);
|
||||
if (IS_ERR(ssm4567->regmap))
|
||||
return PTR_ERR(ssm4567->regmap);
|
||||
|
||||
ret = regmap_write(ssm4567->regmap, SSM4567_REG_SOFT_RESET, 0x00);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = ssm4567_set_power(ssm4567, false);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return snd_soc_register_codec(&i2c->dev, &ssm4567_codec_driver,
|
||||
&ssm4567_dai, 1);
|
||||
}
|
||||
|
||||
static int ssm4567_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id ssm4567_i2c_ids[] = {
|
||||
{ "ssm4567", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, ssm4567_i2c_ids);
|
||||
|
||||
static struct i2c_driver ssm4567_driver = {
|
||||
.driver = {
|
||||
.name = "ssm4567",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = ssm4567_i2c_probe,
|
||||
.remove = ssm4567_i2c_remove,
|
||||
.id_table = ssm4567_i2c_ids,
|
||||
};
|
||||
module_i2c_driver(ssm4567_driver);
|
||||
|
||||
MODULE_DESCRIPTION("ASoC SSM4567 driver");
|
||||
MODULE_AUTHOR("Anatol Pomozov <anatol@chromium.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
@ -15,7 +15,6 @@
|
||||
|
||||
#include <linux/bitrev.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/clk-private.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_device.h>
|
||||
|
||||
@ -10,10 +10,13 @@
|
||||
*/
|
||||
#include <linux/clk.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_gpio.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/string.h>
|
||||
#include <sound/jack.h>
|
||||
#include <sound/simple_card.h>
|
||||
#include <sound/soc-dai.h>
|
||||
#include <sound/soc.h>
|
||||
@ -25,9 +28,15 @@ struct simple_card_data {
|
||||
struct asoc_simple_dai codec_dai;
|
||||
} *dai_props;
|
||||
unsigned int mclk_fs;
|
||||
int gpio_hp_det;
|
||||
int gpio_mic_det;
|
||||
struct snd_soc_dai_link dai_link[]; /* dynamically allocated */
|
||||
};
|
||||
|
||||
#define simple_priv_to_dev(priv) ((priv)->snd_card.dev)
|
||||
#define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + i)
|
||||
#define simple_priv_to_props(priv, i) ((priv)->dai_props + i)
|
||||
|
||||
static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params)
|
||||
{
|
||||
@ -50,6 +59,32 @@ static struct snd_soc_ops asoc_simple_card_ops = {
|
||||
.hw_params = asoc_simple_card_hw_params,
|
||||
};
|
||||
|
||||
static struct snd_soc_jack simple_card_hp_jack;
|
||||
static struct snd_soc_jack_pin simple_card_hp_jack_pins[] = {
|
||||
{
|
||||
.pin = "Headphones",
|
||||
.mask = SND_JACK_HEADPHONE,
|
||||
},
|
||||
};
|
||||
static struct snd_soc_jack_gpio simple_card_hp_jack_gpio = {
|
||||
.name = "Headphone detection",
|
||||
.report = SND_JACK_HEADPHONE,
|
||||
.debounce_time = 150,
|
||||
};
|
||||
|
||||
static struct snd_soc_jack simple_card_mic_jack;
|
||||
static struct snd_soc_jack_pin simple_card_mic_jack_pins[] = {
|
||||
{
|
||||
.pin = "Mic Jack",
|
||||
.mask = SND_JACK_MICROPHONE,
|
||||
},
|
||||
};
|
||||
static struct snd_soc_jack_gpio simple_card_mic_jack_gpio = {
|
||||
.name = "Mic detection",
|
||||
.report = SND_JACK_MICROPHONE,
|
||||
.debounce_time = 150,
|
||||
};
|
||||
|
||||
static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
|
||||
struct asoc_simple_dai *set)
|
||||
{
|
||||
@ -105,42 +140,70 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (gpio_is_valid(priv->gpio_hp_det)) {
|
||||
snd_soc_jack_new(codec->codec, "Headphones", SND_JACK_HEADPHONE,
|
||||
&simple_card_hp_jack);
|
||||
snd_soc_jack_add_pins(&simple_card_hp_jack,
|
||||
ARRAY_SIZE(simple_card_hp_jack_pins),
|
||||
simple_card_hp_jack_pins);
|
||||
|
||||
simple_card_hp_jack_gpio.gpio = priv->gpio_hp_det;
|
||||
snd_soc_jack_add_gpios(&simple_card_hp_jack, 1,
|
||||
&simple_card_hp_jack_gpio);
|
||||
}
|
||||
|
||||
if (gpio_is_valid(priv->gpio_mic_det)) {
|
||||
snd_soc_jack_new(codec->codec, "Mic Jack", SND_JACK_MICROPHONE,
|
||||
&simple_card_mic_jack);
|
||||
snd_soc_jack_add_pins(&simple_card_mic_jack,
|
||||
ARRAY_SIZE(simple_card_mic_jack_pins),
|
||||
simple_card_mic_jack_pins);
|
||||
simple_card_mic_jack_gpio.gpio = priv->gpio_mic_det;
|
||||
snd_soc_jack_add_gpios(&simple_card_mic_jack, 1,
|
||||
&simple_card_mic_jack_gpio);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
asoc_simple_card_sub_parse_of(struct device_node *np,
|
||||
struct asoc_simple_dai *dai,
|
||||
const struct device_node **p_node,
|
||||
const char **name)
|
||||
struct device_node **p_node,
|
||||
const char **name,
|
||||
int *args_count)
|
||||
{
|
||||
struct device_node *node;
|
||||
struct of_phandle_args args;
|
||||
struct clk *clk;
|
||||
u32 val;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* get node via "sound-dai = <&phandle port>"
|
||||
* Get node via "sound-dai = <&phandle port>"
|
||||
* it will be used as xxx_of_node on soc_bind_dai_link()
|
||||
*/
|
||||
node = of_parse_phandle(np, "sound-dai", 0);
|
||||
if (!node)
|
||||
return -ENODEV;
|
||||
*p_node = node;
|
||||
ret = of_parse_phandle_with_args(np, "sound-dai",
|
||||
"#sound-dai-cells", 0, &args);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* get dai->name */
|
||||
*p_node = args.np;
|
||||
|
||||
if (args_count)
|
||||
*args_count = args.args_count;
|
||||
|
||||
/* Get dai->name */
|
||||
ret = snd_soc_of_get_dai_name(np, name);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* parse TDM slot */
|
||||
/* Parse TDM slot */
|
||||
ret = snd_soc_of_parse_tdm_slot(np, &dai->slots, &dai->slot_width);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* dai->sysclk come from
|
||||
* "clocks = <&xxx>" (if system has common clock)
|
||||
* Parse dai->sysclk come from "clocks = <&xxx>"
|
||||
* (if system has common clock)
|
||||
* or "system-clock-frequency = <xxx>"
|
||||
* or device's module clock.
|
||||
*/
|
||||
@ -155,7 +218,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
|
||||
} else if (!of_property_read_u32(np, "system-clock-frequency", &val)) {
|
||||
dai->sysclk = val;
|
||||
} else {
|
||||
clk = of_clk_get(node, 0);
|
||||
clk = of_clk_get(args.np, 0);
|
||||
if (!IS_ERR(clk))
|
||||
dai->sysclk = clk_get_rate(clk);
|
||||
}
|
||||
@ -163,12 +226,14 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int simple_card_dai_link_of(struct device_node *node,
|
||||
struct device *dev,
|
||||
struct snd_soc_dai_link *dai_link,
|
||||
struct simple_dai_props *dai_props,
|
||||
bool is_top_level_node)
|
||||
static int asoc_simple_card_dai_link_of(struct device_node *node,
|
||||
struct simple_card_data *priv,
|
||||
int idx,
|
||||
bool is_top_level_node)
|
||||
{
|
||||
struct device *dev = simple_priv_to_dev(priv);
|
||||
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, idx);
|
||||
struct simple_dai_props *dai_props = simple_priv_to_props(priv, idx);
|
||||
struct device_node *np = NULL;
|
||||
struct device_node *bitclkmaster = NULL;
|
||||
struct device_node *framemaster = NULL;
|
||||
@ -176,8 +241,9 @@ static int simple_card_dai_link_of(struct device_node *node,
|
||||
char *name;
|
||||
char prop[128];
|
||||
char *prefix = "";
|
||||
int ret;
|
||||
int ret, cpu_args;
|
||||
|
||||
/* For single DAI link & old style of DT node */
|
||||
if (is_top_level_node)
|
||||
prefix = "simple-audio-card,";
|
||||
|
||||
@ -195,7 +261,8 @@ static int simple_card_dai_link_of(struct device_node *node,
|
||||
|
||||
ret = asoc_simple_card_sub_parse_of(np, &dai_props->cpu_dai,
|
||||
&dai_link->cpu_of_node,
|
||||
&dai_link->cpu_dai_name);
|
||||
&dai_link->cpu_dai_name,
|
||||
&cpu_args);
|
||||
if (ret < 0)
|
||||
goto dai_link_of_err;
|
||||
|
||||
@ -226,14 +293,16 @@ static int simple_card_dai_link_of(struct device_node *node,
|
||||
|
||||
ret = asoc_simple_card_sub_parse_of(np, &dai_props->codec_dai,
|
||||
&dai_link->codec_of_node,
|
||||
&dai_link->codec_dai_name);
|
||||
&dai_link->codec_dai_name, NULL);
|
||||
if (ret < 0)
|
||||
goto dai_link_of_err;
|
||||
|
||||
if (strlen(prefix) && !bitclkmaster && !framemaster) {
|
||||
/* No dai-link level and master setting was not found from
|
||||
sound node level, revert back to legacy DT parsing and
|
||||
take the settings from codec node. */
|
||||
/*
|
||||
* No DAI link level and master setting was found
|
||||
* from sound node level, revert back to legacy DT
|
||||
* parsing and take the settings from codec node.
|
||||
*/
|
||||
dev_dbg(dev, "%s: Revert to legacy daifmt parsing\n",
|
||||
__func__);
|
||||
dai_props->cpu_dai.fmt = dai_props->codec_dai.fmt =
|
||||
@ -262,10 +331,10 @@ static int simple_card_dai_link_of(struct device_node *node,
|
||||
goto dai_link_of_err;
|
||||
}
|
||||
|
||||
/* simple-card assumes platform == cpu */
|
||||
/* Simple Card assumes platform == cpu */
|
||||
dai_link->platform_of_node = dai_link->cpu_of_node;
|
||||
|
||||
/* Link name is created from CPU/CODEC dai name */
|
||||
/* DAI link name is created from CPU/CODEC dai name */
|
||||
name = devm_kzalloc(dev,
|
||||
strlen(dai_link->cpu_dai_name) +
|
||||
strlen(dai_link->codec_dai_name) + 2,
|
||||
@ -274,6 +343,7 @@ static int simple_card_dai_link_of(struct device_node *node,
|
||||
dai_link->codec_dai_name);
|
||||
dai_link->name = dai_link->stream_name = name;
|
||||
dai_link->ops = &asoc_simple_card_ops;
|
||||
dai_link->init = asoc_simple_card_dai_init;
|
||||
|
||||
dev_dbg(dev, "\tname : %s\n", dai_link->stream_name);
|
||||
dev_dbg(dev, "\tcpu : %s / %04x / %d\n",
|
||||
@ -285,6 +355,18 @@ static int simple_card_dai_link_of(struct device_node *node,
|
||||
dai_props->codec_dai.fmt,
|
||||
dai_props->codec_dai.sysclk);
|
||||
|
||||
/*
|
||||
* In soc_bind_dai_link() will check cpu name after
|
||||
* of_node matching if dai_link has cpu_dai_name.
|
||||
* but, it will never match if name was created by
|
||||
* fmt_single_name() remove cpu_dai_name if cpu_args
|
||||
* was 0. See:
|
||||
* fmt_single_name()
|
||||
* fmt_multiple_name()
|
||||
*/
|
||||
if (!cpu_args)
|
||||
dai_link->cpu_dai_name = NULL;
|
||||
|
||||
dai_link_of_err:
|
||||
if (np)
|
||||
of_node_put(np);
|
||||
@ -296,19 +378,19 @@ dai_link_of_err:
|
||||
}
|
||||
|
||||
static int asoc_simple_card_parse_of(struct device_node *node,
|
||||
struct simple_card_data *priv,
|
||||
struct device *dev,
|
||||
int multi)
|
||||
struct simple_card_data *priv)
|
||||
{
|
||||
struct snd_soc_dai_link *dai_link = priv->snd_card.dai_link;
|
||||
struct simple_dai_props *dai_props = priv->dai_props;
|
||||
struct device *dev = simple_priv_to_dev(priv);
|
||||
u32 val;
|
||||
int ret;
|
||||
|
||||
/* parsing the card name from DT */
|
||||
if (!node)
|
||||
return -EINVAL;
|
||||
|
||||
/* Parse the card name from DT */
|
||||
snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
|
||||
|
||||
/* off-codec widgets */
|
||||
/* The off-codec widgets */
|
||||
if (of_property_read_bool(node, "simple-audio-card,widgets")) {
|
||||
ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card,
|
||||
"simple-audio-card,widgets");
|
||||
@ -332,32 +414,45 @@ static int asoc_simple_card_parse_of(struct device_node *node,
|
||||
dev_dbg(dev, "New simple-card: %s\n", priv->snd_card.name ?
|
||||
priv->snd_card.name : "");
|
||||
|
||||
if (multi) {
|
||||
/* Single/Muti DAI link(s) & New style of DT node */
|
||||
if (of_get_child_by_name(node, "simple-audio-card,dai-link")) {
|
||||
struct device_node *np = NULL;
|
||||
int i;
|
||||
for (i = 0; (np = of_get_next_child(node, np)); i++) {
|
||||
int i = 0;
|
||||
|
||||
for_each_child_of_node(node, np) {
|
||||
dev_dbg(dev, "\tlink %d:\n", i);
|
||||
ret = simple_card_dai_link_of(np, dev, dai_link + i,
|
||||
dai_props + i, false);
|
||||
ret = asoc_simple_card_dai_link_of(np, priv,
|
||||
i, false);
|
||||
if (ret < 0) {
|
||||
of_node_put(np);
|
||||
return ret;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
} else {
|
||||
ret = simple_card_dai_link_of(node, dev, dai_link, dai_props,
|
||||
true);
|
||||
/* For single DAI link & old style of DT node */
|
||||
ret = asoc_simple_card_dai_link_of(node, priv, 0, true);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
priv->gpio_hp_det = of_get_named_gpio(node,
|
||||
"simple-audio-card,hp-det-gpio", 0);
|
||||
if (priv->gpio_hp_det == -EPROBE_DEFER)
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
priv->gpio_mic_det = of_get_named_gpio(node,
|
||||
"simple-audio-card,mic-det-gpio", 0);
|
||||
if (priv->gpio_mic_det == -EPROBE_DEFER)
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
if (!priv->snd_card.name)
|
||||
priv->snd_card.name = priv->snd_card.dai_link->name;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* update the reference count of the devices nodes at end of probe */
|
||||
/* Decrease the reference count of the device nodes */
|
||||
static int asoc_simple_card_unref(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
@ -384,34 +479,29 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
|
||||
struct snd_soc_dai_link *dai_link;
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct device *dev = &pdev->dev;
|
||||
int num_links, multi, ret;
|
||||
int num_links, ret;
|
||||
|
||||
/* get the number of DAI links */
|
||||
if (np && of_get_child_by_name(np, "simple-audio-card,dai-link")) {
|
||||
/* Get the number of DAI links */
|
||||
if (np && of_get_child_by_name(np, "simple-audio-card,dai-link"))
|
||||
num_links = of_get_child_count(np);
|
||||
multi = 1;
|
||||
} else {
|
||||
else
|
||||
num_links = 1;
|
||||
multi = 0;
|
||||
}
|
||||
|
||||
/* allocate the private data and the DAI link array */
|
||||
/* Allocate the private data and the DAI link array */
|
||||
priv = devm_kzalloc(dev,
|
||||
sizeof(*priv) + sizeof(*dai_link) * num_links,
|
||||
GFP_KERNEL);
|
||||
if (!priv)
|
||||
return -ENOMEM;
|
||||
|
||||
/*
|
||||
* init snd_soc_card
|
||||
*/
|
||||
/* Init snd_soc_card */
|
||||
priv->snd_card.owner = THIS_MODULE;
|
||||
priv->snd_card.dev = dev;
|
||||
dai_link = priv->dai_link;
|
||||
priv->snd_card.dai_link = dai_link;
|
||||
priv->snd_card.num_links = num_links;
|
||||
|
||||
/* get room for the other properties */
|
||||
/* Get room for the other properties */
|
||||
priv->dai_props = devm_kzalloc(dev,
|
||||
sizeof(*priv->dai_props) * num_links,
|
||||
GFP_KERNEL);
|
||||
@ -420,25 +510,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
|
||||
|
||||
if (np && of_device_is_available(np)) {
|
||||
|
||||
ret = asoc_simple_card_parse_of(np, priv, dev, multi);
|
||||
ret = asoc_simple_card_parse_of(np, priv);
|
||||
if (ret < 0) {
|
||||
if (ret != -EPROBE_DEFER)
|
||||
dev_err(dev, "parse error %d\n", ret);
|
||||
goto err;
|
||||
}
|
||||
|
||||
/*
|
||||
* soc_bind_dai_link() will check cpu name
|
||||
* after of_node matching if dai_link has cpu_dai_name.
|
||||
* but, it will never match if name was created by fmt_single_name()
|
||||
* remove cpu_dai_name to escape name matching.
|
||||
* see
|
||||
* fmt_single_name()
|
||||
* fmt_multiple_name()
|
||||
*/
|
||||
if (num_links == 1)
|
||||
dai_link->cpu_dai_name = NULL;
|
||||
|
||||
} else {
|
||||
struct asoc_simple_card_info *cinfo;
|
||||
|
||||
@ -464,6 +542,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
|
||||
dai_link->codec_name = cinfo->codec;
|
||||
dai_link->cpu_dai_name = cinfo->cpu_dai.name;
|
||||
dai_link->codec_dai_name = cinfo->codec_dai.name;
|
||||
dai_link->init = asoc_simple_card_dai_init;
|
||||
memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai,
|
||||
sizeof(priv->dai_props->cpu_dai));
|
||||
memcpy(&priv->dai_props->codec_dai, &cinfo->codec_dai,
|
||||
@ -473,11 +552,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
|
||||
priv->dai_props->codec_dai.fmt |= cinfo->daifmt;
|
||||
}
|
||||
|
||||
/*
|
||||
* init snd_soc_dai_link
|
||||
*/
|
||||
dai_link->init = asoc_simple_card_dai_init;
|
||||
|
||||
snd_soc_card_set_drvdata(&priv->snd_card, priv);
|
||||
|
||||
ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
|
||||
@ -491,6 +565,16 @@ err:
|
||||
|
||||
static int asoc_simple_card_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
struct simple_card_data *priv = snd_soc_card_get_drvdata(card);
|
||||
|
||||
if (gpio_is_valid(priv->gpio_hp_det))
|
||||
snd_soc_jack_free_gpios(&simple_card_hp_jack, 1,
|
||||
&simple_card_hp_jack_gpio);
|
||||
if (gpio_is_valid(priv->gpio_mic_det))
|
||||
snd_soc_jack_free_gpios(&simple_card_mic_jack, 1,
|
||||
&simple_card_mic_jack_gpio);
|
||||
|
||||
return asoc_simple_card_unref(pdev);
|
||||
}
|
||||
|
||||
|
||||
@ -100,6 +100,16 @@ static int sirf_usp_pcm_set_dai_fmt(struct snd_soc_dai *dai,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
|
||||
case SND_SOC_DAIFMT_NB_NF:
|
||||
break;
|
||||
case SND_SOC_DAIFMT_IB_NF:
|
||||
usp->daifmt_format |= (fmt & SND_SOC_DAIFMT_INV_MASK);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -177,7 +187,7 @@ static int sirf_usp_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||
|
||||
shifter_len = data_len;
|
||||
|
||||
switch (usp->daifmt_format) {
|
||||
switch (usp->daifmt_format & SND_SOC_DAIFMT_FORMAT_MASK) {
|
||||
case SND_SOC_DAIFMT_I2S:
|
||||
regmap_update_bits(usp->regmap, USP_RX_FRAME_CTRL,
|
||||
USP_I2S_SYNC_CHG, USP_I2S_SYNC_CHG);
|
||||
@ -193,6 +203,18 @@ static int sirf_usp_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (usp->daifmt_format & SND_SOC_DAIFMT_INV_MASK) {
|
||||
case SND_SOC_DAIFMT_NB_NF:
|
||||
break;
|
||||
case SND_SOC_DAIFMT_IB_NF:
|
||||
regmap_update_bits(usp->regmap, USP_MODE1,
|
||||
USP_RXD_ACT_EDGE_FALLING | USP_TXD_ACT_EDGE_FALLING,
|
||||
USP_RXD_ACT_EDGE_FALLING);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
regmap_update_bits(usp->regmap, USP_TX_FRAME_CTRL,
|
||||
USP_TXC_DATA_LEN_MASK | USP_TXC_FRAME_LEN_MASK
|
||||
|
||||
Loading…
Reference in New Issue
Block a user