apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc/topic/omap' and 'asoc/topic/platform-drvdata' into asoc-next

Browse Source
This commit is contained in:
Mark Brown
2016-09-29 12:44:31 -07:00
parent 3b495e4bf3 ec10396477 519302954b 9be072a6f9 1e81403095
commit 971dec826c
15 changed files with 1210 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/devicetree/bindings/sound/nau8810.txt
+16
View File
@@ -0,0 +1,16 @@
NAU8810 audio CODEC
This device supports I2C only.
Required properties:
- compatible : "nuvoton,nau8810"
- reg : the I2C address of the device.
Example:
codec: nau8810@1a {
compatible = "nuvoton,nau8810";
reg = <0x1a>;
};
include/sound/soc.h
-11
View File
@@ -1539,17 +1539,6 @@ static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platfo
return snd_soc_component_get_drvdata(&platform->component);
}
static inline void snd_soc_pcm_set_drvdata(struct snd_soc_pcm_runtime *rtd,
void *data)
{
dev_set_drvdata(rtd->dev, data);
}
static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
{
return dev_get_drvdata(rtd->dev);
}
static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
{
INIT_LIST_HEAD(&card->codec_dev_list);
sound/soc/codecs/Kconfig
+5
View File
@@ -92,6 +92,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_MAX9877 if I2C
select SND_SOC_MC13783 if MFD_MC13XXX
select SND_SOC_ML26124 if I2C
select SND_SOC_NAU8810 if I2C
select SND_SOC_NAU8825 if I2C
select SND_SOC_HDMI_CODEC
select SND_SOC_PCM1681 if I2C
@@ -1064,6 +1065,10 @@ config SND_SOC_MC13783
config SND_SOC_ML26124
tristate
config SND_SOC_NAU8810
tristate "Nuvoton Technology Corporation NAU88C10 CODEC"
depends on I2C
config SND_SOC_NAU8825
tristate
sound/soc/codecs/Makefile
+2
View File
@@ -86,6 +86,7 @@ snd-soc-max9850-objs := max9850.o
snd-soc-max9860-objs := max9860.o
snd-soc-mc13783-objs := mc13783.o
snd-soc-ml26124-objs := ml26124.o
snd-soc-nau8810-objs := nau8810.o
snd-soc-nau8825-objs := nau8825.o
snd-soc-hdmi-codec-objs := hdmi-codec.o
snd-soc-pcm1681-objs := pcm1681.o
@@ -307,6 +308,7 @@ obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o
obj-$(CONFIG_SND_SOC_MAX9860) += snd-soc-max9860.o
obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o
obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o
obj-$(CONFIG_SND_SOC_NAU8810) += snd-soc-nau8810.o
obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o
obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o
obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o
sound/soc/codecs/ab8500-codec.c
+5 -5
View File
@@ -2408,28 +2408,28 @@ static void ab8500_codec_of_probe(struct device *dev, struct device_node *np,
{
u32 value;
if (of_get_property(np, "stericsson,amic1-type-single-ended", NULL))
if (of_property_read_bool(np, "stericsson,amic1-type-single-ended"))
codec->amics.mic1_type = AMIC_TYPE_SINGLE_ENDED;
else
codec->amics.mic1_type = AMIC_TYPE_DIFFERENTIAL;
if (of_get_property(np, "stericsson,amic2-type-single-ended", NULL))
if (of_property_read_bool(np, "stericsson,amic2-type-single-ended"))
codec->amics.mic2_type = AMIC_TYPE_SINGLE_ENDED;
else
codec->amics.mic2_type = AMIC_TYPE_DIFFERENTIAL;
/* Has a non-standard Vamic been requested? */
if (of_get_property(np, "stericsson,amic1a-bias-vamic2", NULL))
if (of_property_read_bool(np, "stericsson,amic1a-bias-vamic2"))
codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC2;
else
codec->amics.mic1a_micbias = AMIC_MICBIAS_VAMIC1;
if (of_get_property(np, "stericsson,amic1b-bias-vamic2", NULL))
if (of_property_read_bool(np, "stericsson,amic1b-bias-vamic2"))
codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC2;
else
codec->amics.mic1b_micbias = AMIC_MICBIAS_VAMIC1;
if (of_get_property(np, "stericsson,amic2-bias-vamic1", NULL))
if (of_property_read_bool(np, "stericsson,amic2-bias-vamic1"))
codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC1;
else
codec->amics.mic2_micbias = AMIC_MICBIAS_VAMIC2;
sound/soc/codecs/nau8810.c
+884
View File
File diff suppressed because it is too large Load Diff
sound/soc/codecs/nau8810.h
+281
View File
@@ -0,0 +1,281 @@
/*
* NAU8810 ALSA SoC audio driver
*
* Copyright 2016 Nuvoton Technology Corp.
* Author: David Lin <ctlin0@nuvoton.com>
*
* 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.
*/
#ifndef __NAU8810_H__
#define __NAU8810_H__
#define NAU8810_REG_RESET 0x00
#define NAU8810_REG_POWER1 0x01
#define NAU8810_REG_POWER2 0x02
#define NAU8810_REG_POWER3 0x03
#define NAU8810_REG_IFACE 0x04
#define NAU8810_REG_COMP 0x05
#define NAU8810_REG_CLOCK 0x06
#define NAU8810_REG_SMPLR 0x07
#define NAU8810_REG_DAC 0x0A
#define NAU8810_REG_DACGAIN 0x0B
#define NAU8810_REG_ADC 0x0E
#define NAU8810_REG_ADCGAIN 0x0F
#define NAU8810_REG_EQ1 0x12
#define NAU8810_REG_EQ2 0x13
#define NAU8810_REG_EQ3 0x14
#define NAU8810_REG_EQ4 0x15
#define NAU8810_REG_EQ5 0x16
#define NAU8810_REG_DACLIM1 0x18
#define NAU8810_REG_DACLIM2 0x19
#define NAU8810_REG_NOTCH1 0x1B
#define NAU8810_REG_NOTCH2 0x1C
#define NAU8810_REG_NOTCH3 0x1D
#define NAU8810_REG_NOTCH4 0x1E
#define NAU8810_REG_ALC1 0x20
#define NAU8810_REG_ALC2 0x21
#define NAU8810_REG_ALC3 0x22
#define NAU8810_REG_NOISEGATE 0x23
#define NAU8810_REG_PLLN 0x24
#define NAU8810_REG_PLLK1 0x25
#define NAU8810_REG_PLLK2 0x26
#define NAU8810_REG_PLLK3 0x27
#define NAU8810_REG_ATTEN 0x28
#define NAU8810_REG_INPUT_SIGNAL 0x2C
#define NAU8810_REG_PGAGAIN 0x2D
#define NAU8810_REG_ADCBOOST 0x2F
#define NAU8810_REG_OUTPUT 0x31
#define NAU8810_REG_SPKMIX 0x32
#define NAU8810_REG_SPKGAIN 0x36
#define NAU8810_REG_MONOMIX 0x38
#define NAU8810_REG_POWER4 0x3A
#define NAU8810_REG_TSLOTCTL1 0x3B
#define NAU8810_REG_TSLOTCTL2 0x3C
#define NAU8810_REG_DEVICE_REVID 0x3E
#define NAU8810_REG_I2C_DEVICEID 0x3F
#define NAU8810_REG_ADDITIONID 0x40
#define NAU8810_REG_RESERVE 0x41
#define NAU8810_REG_OUTCTL 0x45
#define NAU8810_REG_ALC1ENHAN1 0x46
#define NAU8810_REG_ALC1ENHAN2 0x47
#define NAU8810_REG_MISCCTL 0x49
#define NAU8810_REG_OUTTIEOFF 0x4B
#define NAU8810_REG_AGCP2POUT 0x4C
#define NAU8810_REG_AGCPOUT 0x4D
#define NAU8810_REG_AMTCTL 0x4E
#define NAU8810_REG_OUTTIEOFFMAN 0x4F
#define NAU8810_REG_MAX NAU8810_REG_OUTTIEOFFMAN
/* NAU8810_REG_POWER1 (0x1) */
#define NAU8810_DCBUF_EN (0x1 << 8)
#define NAU8810_PLL_EN_SFT 5
#define NAU8810_MICBIAS_EN_SFT 4
#define NAU8810_ABIAS_EN (0x1 << 3)
#define NAU8810_IOBUF_EN (0x1 << 2)
#define NAU8810_REFIMP_MASK 0x3
#define NAU8810_REFIMP_DIS 0x0
#define NAU8810_REFIMP_80K 0x1
#define NAU8810_REFIMP_300K 0x2
#define NAU8810_REFIMP_3K 0x3
/* NAU8810_REG_POWER2 (0x2) */
#define NAU8810_BST_EN_SFT 4
#define NAU8810_PGA_EN_SFT 2
#define NAU8810_ADC_EN_SFT 0
/* NAU8810_REG_POWER3 (0x3) */
#define NAU8810_DAC_EN_SFT 0
#define NAU8810_SPKMX_EN_SFT 2
#define NAU8810_MOUTMX_EN_SFT 3
#define NAU8810_PSPK_EN_SFT 5
#define NAU8810_NSPK_EN_SFT 6
#define NAU8810_MOUT_EN_SFT 7
/* NAU8810_REG_IFACE (0x4) */
#define NAU8810_AIFMT_SFT 3
#define NAU8810_AIFMT_MASK (0x3 << NAU8810_AIFMT_SFT)
#define NAU8810_AIFMT_RIGHT (0x0 << NAU8810_AIFMT_SFT)
#define NAU8810_AIFMT_LEFT (0x1 << NAU8810_AIFMT_SFT)
#define NAU8810_AIFMT_I2S (0x2 << NAU8810_AIFMT_SFT)
#define NAU8810_AIFMT_PCM_A (0x3 << NAU8810_AIFMT_SFT)
#define NAU8810_WLEN_SFT 5
#define NAU8810_WLEN_MASK (0x3 << NAU8810_WLEN_SFT)
#define NAU8810_WLEN_16 (0x0 << NAU8810_WLEN_SFT)
#define NAU8810_WLEN_20 (0x1 << NAU8810_WLEN_SFT)
#define NAU8810_WLEN_24 (0x2 << NAU8810_WLEN_SFT)
#define NAU8810_WLEN_32 (0x3 << NAU8810_WLEN_SFT)
#define NAU8810_FSP_IF (0x1 << 7)
#define NAU8810_BCLKP_IB (0x1 << 8)
/* NAU8810_REG_COMP (0x5) */
#define NAU8810_ADDAP_SFT 0
#define NAU8810_ADCCM_SFT 1
#define NAU8810_DACCM_SFT 3
/* NAU8810_REG_CLOCK (0x6) */
#define NAU8810_CLKIO_MASK 0x1
#define NAU8810_CLKIO_SLAVE 0x0
#define NAU8810_CLKIO_MASTER 0x1
#define NAU8810_BCLKSEL_SFT 2
#define NAU8810_BCLKSEL_MASK (0x7 << NAU8810_BCLKSEL_SFT)
#define NAU8810_BCLKDIV_1 (0x0 << NAU8810_BCLKSEL_SFT)
#define NAU8810_BCLKDIV_2 (0x1 << NAU8810_BCLKSEL_SFT)
#define NAU8810_BCLKDIV_4 (0x2 << NAU8810_BCLKSEL_SFT)
#define NAU8810_BCLKDIV_8 (0x3 << NAU8810_BCLKSEL_SFT)
#define NAU8810_BCLKDIV_16 (0x4 << NAU8810_BCLKSEL_SFT)
#define NAU8810_BCLKDIV_32 (0x5 << NAU8810_BCLKSEL_SFT)
#define NAU8810_MCLKSEL_SFT 5
#define NAU8810_MCLKSEL_MASK (0x7 << NAU8810_MCLKSEL_SFT)
#define NAU8810_CLKM_SFT 8
#define NAU8810_CLKM_MASK (0x1 << NAU8810_CLKM_SFT)
#define NAU8810_CLKM_MCLK (0x0 << NAU8810_CLKM_SFT)
#define NAU8810_CLKM_PLL (0x1 << NAU8810_CLKM_SFT)
/* NAU8810_REG_SMPLR (0x7) */
#define NAU8810_SMPLR_SFT 1
#define NAU8810_SMPLR_MASK (0x7 << NAU8810_SMPLR_SFT)
#define NAU8810_SMPLR_48K (0x0 << NAU8810_SMPLR_SFT)
#define NAU8810_SMPLR_32K (0x1 << NAU8810_SMPLR_SFT)
#define NAU8810_SMPLR_24K (0x2 << NAU8810_SMPLR_SFT)
#define NAU8810_SMPLR_16K (0x3 << NAU8810_SMPLR_SFT)
#define NAU8810_SMPLR_12K (0x4 << NAU8810_SMPLR_SFT)
#define NAU8810_SMPLR_8K (0x5 << NAU8810_SMPLR_SFT)
/* NAU8810_REG_DAC (0xA) */
#define NAU8810_DACPL_SFT 0
#define NAU8810_DACOS_SFT 3
#define NAU8810_DEEMP_SFT 4
/* NAU8810_REG_DACGAIN (0xB) */
#define NAU8810_DACGAIN_SFT 0
/* NAU8810_REG_ADC (0xE) */
#define NAU8810_ADCPL_SFT 0
#define NAU8810_ADCOS_SFT 3
#define NAU8810_HPF_SFT 4
#define NAU8810_HPFEN_SFT 8
/* NAU8810_REG_ADCGAIN (0xF) */
#define NAU8810_ADCGAIN_SFT 0
/* NAU8810_REG_EQ1 (0x12) */
#define NAU8810_EQ1GC_SFT 0
#define NAU8810_EQ1CF_SFT 5
#define NAU8810_EQM_SFT 8
/* NAU8810_REG_EQ2 (0x13) */
#define NAU8810_EQ2GC_SFT 0
#define NAU8810_EQ2CF_SFT 5
#define NAU8810_EQ2BW_SFT 8
/* NAU8810_REG_EQ3 (0x14) */
#define NAU8810_EQ3GC_SFT 0
#define NAU8810_EQ3CF_SFT 5
#define NAU8810_EQ3BW_SFT 8
/* NAU8810_REG_EQ4 (0x15) */
#define NAU8810_EQ4GC_SFT 0
#define NAU8810_EQ4CF_SFT 5
#define NAU8810_EQ4BW_SFT 8
/* NAU8810_REG_EQ5 (0x16) */
#define NAU8810_EQ5GC_SFT 0
#define NAU8810_EQ5CF_SFT 5
/* NAU8810_REG_DACLIM1 (0x18) */
#define NAU8810_DACLIMATK_SFT 0
#define NAU8810_DACLIMDCY_SFT 4
#define NAU8810_DACLIMEN_SFT 8
/* NAU8810_REG_DACLIM2 (0x19) */
#define NAU8810_DACLIMBST_SFT 0
#define NAU8810_DACLIMTHL_SFT 4
/* NAU8810_REG_ALC1 (0x20) */
#define NAU8810_ALCMINGAIN_SFT 0
#define NAU8810_ALCMXGAIN_SFT 3
#define NAU8810_ALCEN_SFT 8
/* NAU8810_REG_ALC2 (0x21) */
#define NAU8810_ALCSL_SFT 0
#define NAU8810_ALCHT_SFT 4
#define NAU8810_ALCZC_SFT 8
/* NAU8810_REG_ALC3 (0x22) */
#define NAU8810_ALCATK_SFT 0
#define NAU8810_ALCDCY_SFT 4
#define NAU8810_ALCM_SFT 8
/* NAU8810_REG_NOISEGATE (0x23) */
#define NAU8810_ALCNTH_SFT 0
#define NAU8810_ALCNEN_SFT 3
/* NAU8810_REG_PLLN (0x24) */
#define NAU8810_PLLN_MASK 0xF
#define NAU8810_PLLMCLK_DIV2 (0x1 << 4)
/* NAU8810_REG_PLLK1 (0x25) */
#define NAU8810_PLLK1_SFT 18
#define NAU8810_PLLK1_MASK 0x3F
/* NAU8810_REG_PLLK2 (0x26) */
#define NAU8810_PLLK2_SFT 9
#define NAU8810_PLLK2_MASK 0x1FF
/* NAU8810_REG_PLLK3 (0x27) */
#define NAU8810_PLLK3_MASK 0x1FF
/* NAU8810_REG_INPUT_SIGNAL (0x2C) */
#define NAU8810_PMICPGA_SFT 0
#define NAU8810_NMICPGA_SFT 1
/* NAU8810_REG_PGAGAIN (0x2D) */
#define NAU8810_PGAGAIN_SFT 0
#define NAU8810_PGAMT_SFT 6
#define NAU8810_PGAZC_SFT 7
/* NAU8810_REG_ADCBOOST (0x2F) */
#define NAU8810_PMICBSTGAIN_SFT 4
#define NAU8810_PGABST_SFT 8
/* NAU8810_REG_SPKMIX (0x32) */
#define NAU8810_DACSPK_SFT 0
#define NAU8810_BYPSPK_SFT 1
/* NAU8810_REG_SPKGAIN (0x36) */
#define NAU8810_SPKGAIN_SFT 0
#define NAU8810_SPKMT_SFT 6
#define NAU8810_SPKZC_SFT 7
/* NAU8810_REG_MONOMIX (0x38) */
#define NAU8810_DACMOUT_SFT 0
#define NAU8810_BYPMOUT_SFT 1
#define NAU8810_MOUTMXMT_SFT 6
/* System Clock Source */
enum {
NAU8810_SCLK_MCLK,
NAU8810_SCLK_PLL,
};
struct nau8810_pll {
int pre_factor;
int mclk_scaler;
int pll_frac;
int pll_int;
};
struct nau8810 {
struct device *dev;
struct regmap *regmap;
struct nau8810_pll pll;
int sysclk;
int clk_id;
};
#endif
sound/soc/davinci/davinci-mcasp.c
+1 -1
View File
@@ -1218,7 +1218,7 @@ static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params,
snd_mask_none(&nfmt);
for (i = 0; i < SNDRV_PCM_FORMAT_LAST; i++) {
for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) {
if (snd_mask_test(fmt, i)) {
uint sbits = snd_pcm_format_width(i);
int ppm;
sound/soc/omap/mcbsp.c
+2 -1
View File
@@ -221,7 +221,8 @@ void omap_mcbsp_config(struct omap_mcbsp *mcbsp,
/* Enable TX/RX sync error interrupts by default */
if (mcbsp->irq)
MCBSP_WRITE(mcbsp, IRQEN, RSYNCERREN | XSYNCERREN);
MCBSP_WRITE(mcbsp, IRQEN, RSYNCERREN | XSYNCERREN |
RUNDFLEN | ROVFLEN | XUNDFLEN | XOVFLEN);
}
/**
sound/soc/omap/omap-abe-twl6040.c
+2 -12
View File
@@ -305,23 +305,14 @@ static int omap_abe_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(card, priv);
ret = snd_soc_register_card(card);
ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n",
ret);
return ret;
}
static int omap_abe_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
snd_soc_unregister_card(card);
return 0;
}
static const struct of_device_id omap_abe_of_match[] = {
{.compatible = "ti,abe-twl6040", },
{ },
@@ -335,7 +326,6 @@ static struct platform_driver omap_abe_driver = {
.of_match_table = omap_abe_of_match,
},
.probe = omap_abe_probe,
.remove = omap_abe_remove,
};
static int __init omap_abe_init(void)
sound/soc/omap/omap-pcm.c
+1 -1
View File
@@ -58,7 +58,7 @@ static void omap_pcm_limit_supported_formats(void)
{
int i;
for (i = 0; i < SNDRV_PCM_FORMAT_LAST; i++) {
for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) {
switch (snd_pcm_format_physical_width(i)) {
case 8:
case 16:
sound/soc/qcom/lpass-platform.c
+7 -7
View File
@@ -84,9 +84,9 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
struct lpass_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(soc_runtime);
struct lpass_data *drvdata =
snd_soc_platform_get_drvdata(soc_runtime->platform);
struct lpass_pcm_data *pcm_data = drvdata->private_data;
struct lpass_variant *v = drvdata->variant;
snd_pcm_format_t format = params_format(params);
unsigned int channels = params_channels(params);
@@ -177,9 +177,9 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream,
static int lpass_platform_pcmops_hw_free(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
struct lpass_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(soc_runtime);
struct lpass_data *drvdata =
snd_soc_platform_get_drvdata(soc_runtime->platform);
struct lpass_pcm_data *pcm_data = drvdata->private_data;
struct lpass_variant *v = drvdata->variant;
unsigned int reg;
int ret;
@@ -201,9 +201,9 @@ static int lpass_platform_pcmops_prepare(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
struct lpass_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(soc_runtime);
struct lpass_data *drvdata =
snd_soc_platform_get_drvdata(soc_runtime->platform);
struct lpass_pcm_data *pcm_data = drvdata->private_data;
struct lpass_variant *v = drvdata->variant;
int ret, ch, dir = substream->stream;
@@ -255,9 +255,9 @@ static int lpass_platform_pcmops_trigger(struct snd_pcm_substream *substream,
int cmd)
{
struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
struct lpass_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(soc_runtime);
struct lpass_data *drvdata =
snd_soc_platform_get_drvdata(soc_runtime->platform);
struct lpass_pcm_data *pcm_data = drvdata->private_data;
struct lpass_variant *v = drvdata->variant;
int ret, ch, dir = substream->stream;
@@ -331,9 +331,9 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer(
struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
struct lpass_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(soc_runtime);
struct lpass_data *drvdata =
snd_soc_platform_get_drvdata(soc_runtime->platform);
struct lpass_pcm_data *pcm_data = drvdata->private_data;
struct lpass_variant *v = drvdata->variant;
unsigned int base_addr, curr_addr;
int ret, ch, dir = substream->stream;
@@ -483,7 +483,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
return -ENOMEM;
data->i2s_port = cpu_dai->driver->id;
snd_soc_pcm_set_drvdata(soc_runtime, data);
drvdata->private_data = data;
psubstream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
if (psubstream) {
@@ -570,8 +570,8 @@ static void lpass_platform_pcm_free(struct snd_pcm *pcm)
substream = pcm->streams[i].substream;
if (substream) {
rt = substream->private_data;
data = snd_soc_pcm_get_drvdata(rt);
drvdata = snd_soc_platform_get_drvdata(rt->platform);
data = drvdata->private_data;
ch = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
? data->rdma_ch
sound/soc/qcom/lpass.h
+2
View File
@@ -58,6 +58,8 @@ struct lpass_data {
/* 8016 specific */
struct clk *pcnoc_mport_clk;
struct clk *pcnoc_sway_clk;
void *private_data;
};
/* Vairant data per each SOC */
sound/soc/sh/rcar/ssi.c
+1 -1
View File
@@ -928,7 +928,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
}
ops = &rsnd_ssi_non_ops;
if (of_get_property(np, "pio-transfer", NULL))
if (of_property_read_bool(np, "pio-transfer"))
ops = &rsnd_ssi_pio_ops;
else
ops = &rsnd_ssi_dma_ops;
sound/soc/soc-core.c
+1 -1
View File
@@ -3719,7 +3719,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
* SND_SOC_DAIFMT_CLOCK_MASK area
*/
snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix);
if (of_get_property(np, prop, NULL))
if (of_property_read_bool(np, prop))
format |= SND_SOC_DAIFMT_CONT;
else
format |= SND_SOC_DAIFMT_GATED;