8000 Merge tag 'sound-4.7-rc7' of git://git.kernel.org/pub/scm/linux/kerne… · bsd-unix/linux@4cdbbbd · GitHub
[go: up one dir, main page]
Skip to content

Commit 4cdbbbd

Browse files
torvaldstorvalds
committed
Merge tag 'sound-4.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Here are a collection of small fixes: at this time, we've got a slightly high amount, but all small and trivial fixes, and nothing scary can be seen there" * tag 'sound-4.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits) ALSA: hda/realtek: Add Lenovo L460 to docking unit fixup ALSA: timer: Fix negative queue usage by racy accesses ASoC: rt5645: fix reg-2f default value. ASoC: fsl_ssi: Fix number of words per frame for I2S-slave mode ALSA: au88x0: Fix calculation in vortex_wtdma_bufshift() ALSA: hda - Add PCI ID for Kabylake-H ALSA: echoaudio: Fix memory allocation ASoC: Intel: atom: fix missing breaks that would cause the wrong operation to execute ALSA: hda - fix read before array start ASoC: cx20442: set tty->receiver_room in v253_open ASoC: ak4613: Enable cache usage to fix crashes on resume ASoC: wm8940: Enable cache usage to fix crashes on resume ASoC: Intel: Skylake: Initialize module list for Broxton ASoC: wm5102: Correct supported channels on trace compressed DAI ASoC: wm5110: Add missing route from OUT3R to SYSCLK ASoC: rt5670: fix HP Playback Volume control ASoC: hdmi-codec: select CONFIG_HDMI ASoC: davinci-mcasp: Fix dra7 DMA offset when using CFG port ASoC: hdac_hdmi: Fix potential NULL dereference ASoC: ak4613: Remove owner assignment from platform_driver ...
2 parents 4d0a279 + 9cd2574 commit 4cdbbbd

File tree

21 files changed

+113
-29
lines changed

21 files changed

+113
-29
lines changed

‎sound/core/timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1955,6 +1955,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
19551955

19561956
qhead = tu->qhead++;
19571957
tu->qhead %= tu->queue_size;
1958+
tu->qused--;
19581959
spin_unlock_irq(&tu->qlock);
19591960

19601961
if (tu->tread) {
@@ -1968,7 +1969,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
19681969
}
19691970

19701971
spin_lock_irq(&tu->qlock);
1971-
tu->qused--;
19721972
if (err < 0)
19731973
goto _error;
19741974
result += unit;

‎sound/pci/au88x0/au88x0_core.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,9 +1444,8 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma)
14441444
int page, p, pp, delta, i;
14451445

14461446
page =
1447-
(hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)) &
1448-
WT_SUBBUF_MASK)
1449-
>> WT_SUBBUF_SHIFT;
1447+
(hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2))
1448+
>> WT_SUBBUF_SHIFT) & WT_SUBBUF_MASK;
14501449
if (dma->nr_periods >= 4)
14511450
delta = (page - dma->period_real) & 3;
14521451
else {

‎sound/pci/echoaudio/echoaudio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2200,11 +2200,11 @@ static int snd_echo_resume(struct device *dev)
22002200
u32 pipe_alloc_mask;
22012201
int err;
22022202

2203-
commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
2203+
commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL);
22042204
if (commpage_bak == NULL)
22052205
return -ENOMEM;
22062206
commpage = chip->comm_page;
2207-
memcpy(commpage_bak, commpage, sizeof(struct comm_page));
2207+
memcpy(commpage_bak, commpage, sizeof(*commpage));
22082208

22092209
err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device);
22102210
if (err < 0) {

‎sound/pci/hda/hda_generic.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3977,6 +3977,8 @@ static hda_nid_t set_path_power(struct hda_codec *codec, hda_nid_t nid,
39773977

39783978
for (n = 0; n < spec->paths.used; n++) {
39793979
path = snd_array_elem(&spec->paths, n);
3980+
if (!path->depth)
3981+
continue;
39803982
if (path->path[0] == nid ||
39813983
path->path[path->depth - 1] == nid) {
39823984
bool pin_old = path->pin_enabled;

‎sound/pci/hda/hda_intel.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,10 @@ enum {
367367
#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)
368368
#define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)
369369
#define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)
370+
#define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0)
370371
#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
371372
#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \
372-
IS_KBL(pci) || IS_KBL_LP(pci)
373+
IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci)
373374

374375
static char *driver_short_names[] = {
375376
[AZX_DRIVER_ICH] = "HDA Intel",
@@ -2190,6 +2191,9 @@ static const struct pci_device_id azx_ids[] = {
21902191
/* Kabylake-LP */
21912192
{ PCI_DEVICE(0x8086, 0x9d71),
21922193
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
2194+
/* Kabylake-H */
2195+
{ PCI_DEVICE(0x8086, 0xa2f0),
2196+
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
21932197
/* Broxton-P(Apollolake) */
21942198
{ PCI_DEVICE(0x8086, 0x5a98),
21952199
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },

‎sound/pci/hda/patch_realtek.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5651,6 +5651,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
56515651
SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),
56525652
SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),
56535653
SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460),
5654+
SND_PCI_QUIRK(0x17aa, 0x5051, "Thinkpad L460", ALC292_FIXUP_TPT460),
56545655
SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460),
56555656
SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
56565657
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

‎sound/soc/codecs/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,10 @@ config SND_SOC_DMIC
483483
tristate
484484

485485
config SND_SOC_HDMI_CODEC
486-
tristate
487-
select SND_PCM_ELD
488-
select SND_PCM_IEC958
486+
tristate
487+
select SND_PCM_ELD
488+
select SND_PCM_IEC958
489+
select HDMI
489490

490491
config SND_SOC_ES8328
491492
tristate "Everest Semi ES8328 CODEC"

‎sound/soc/codecs/ak4613.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ static const struct regmap_config ak4613_regmap_cfg = {
146146
.max_register = 0x16,
147147
.reg_defaults = ak4613_reg,
148148
.num_reg_defaults = ARRAY_SIZE(ak4613_reg),
149+
.cache_type = REGCACHE_RBTREE,
149150
};
150151

151152
static const struct of_device_id ak4613_of_match[] = {
@@ -530,7 +531,6 @@ static int ak4613_i2c_remove(struct i2c_client *client)
530531
static struct i2c_driver ak4613_i2c_driver = {
531532
.driver = {
532533
.name = "ak4613-codec",
533-
.owner = THIS_MODULE,
534534
.of_match_table = ak4613_of_match,
535535
},
536536
.probe = ak4613_i2c_probe,

‎sound/soc/codecs/cx20442.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ static int v253_open(struct tty_struct *tty)
226226
if (!tty->disc_data)
227227
return -ENODEV;
228228

229+
tty->receive_room = 16;
229230
if (tty->ops->write(tty, v253_init, len) != len) {
230231
ret = -EIO;
231232
goto err;

‎sound/soc/codecs/hdac_hdmi.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,6 +1474,11 @@ static int hdmi_codec_probe(struct snd_soc_codec *codec)
14741474
* exit, we call pm_runtime_suspend() so that will do for us
14751475
*/
14761476
hlink = snd_hdac_ext_bus_get_link(edev->ebus, dev_name(&edev->hdac.dev));
1477+ 93C6
if (!hlink) {
1478+
dev_err(&edev->hdac.dev, "hdac link not found\n");
1479+
return -EIO;
1480+
}
1481+
14771482
snd_hdac_ext_bus_link_get(edev->ebus, hlink);
14781483

14791484
ret = create_fill_widget_route_map(dapm);
@@ -1634,6 +1639,11 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev)
16341639

16351640
/* hold the ref while we probe */
16361641
hlink = snd_hdac_ext_bus_get_link(edev->ebus, dev_name(&edev->hdac.dev));
1642+
if (!hlink) {
1643+
dev_err(&edev->hdac.dev, "hdac link not found\n");
1644+
return -EIO;
1645+
}
1646+
16371647
snd_hdac_ext_bus_link_get(edev->ebus, hlink);
16381648

16391649
hdmi_priv = devm_kzalloc(&codec->dev, sizeof(*hdmi_priv), GFP_KERNEL);
@@ -1744,6 +1754,11 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
17441754
}
17451755

17461756
hlink = snd_hdac_ext_bus_get_link(ebus, dev_name(dev));
1757+
if (!hlink) {
1758+
dev_err(dev, "hdac link not found\n");
1759+
return -EIO;
1760+
}
1761+
17471762
snd_hdac_ext_bus_link_put(ebus, hlink);
17481763

17491764
return 0;
@@ -1765,6 +1780,11 @@ static int hdac_hdmi_runtime_resume(struct device *dev)
17651780
return 0;
17661781

17671782
hlink = snd_hdac_ext_bus_get_link(ebus, dev_name(dev));
1783+
if (!hlink) {
1784+
dev_err(dev, "hdac link not found\n");
1785+
return -EIO;
1786+
}
1787+
17681788
snd_hdac_ext_bus_link_get(ebus, hlink);
17691789

17701790
err = snd_hdac_display_power(bus, true);

‎sound/soc/codecs/rt5645.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static const struct reg_default rt5650_reg[] = {
253253
{ 0x2b, 0x5454 },
254254
{ 0x2c, 0xaaa0 },
255255
{ 0x2d, 0x0000 },
256-
{ 0x2f, 0x1002 },
256+
{ 0x2f, 0x5002 },
257257
{ 0x31, 0x5000 },
258258
{ 0x32, 0x0000 },
259259
{ 0x33, 0x0000 },

‎sound/soc/codecs/rt5670.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ static const struct snd_kcontrol_new rt5670_snd_controls[] = {
619619
RT5670_L_MUTE_SFT, RT5670_R_MUTE_SFT, 1, 1),
620620
SOC_DOUBLE_TLV("HP Playback Volume", RT5670_HP_VOL,
621621
RT5670_L_VOL_SFT, RT5670_R_VOL_SFT,
622-
39, 0, out_vol_tlv),
622+
39, 1, out_vol_tlv),
623623
/* OUTPUT Control */
624624
SOC_DOUBLE("OUT Channel Switch", RT5670_LOUT1,
625625
RT5670_VOL_L_SFT, RT5670_VOL_R_SFT, 1, 1),

‎sound/soc/codecs/wm5102.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
18721872
.capture = {
18731873
.stream_name = "Audio Trace CPU",
18741874
.channels_min = 1,
1875-
.channels_max = 6,
1875+
.channels_max = 4,
18761876
.rates = WM5102_RATES,
18771877
.formats = WM5102_FORMATS,
18781878
},

‎sound/soc/codecs/wm5110.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,7 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
17231723
{ "OUT2L", NULL, "SYSCLK" },
17241724
{ "OUT2R", NULL, "SYSCLK" },
17251725
{ "OUT3L", NULL, "SYSCLK" },
1726+
{ "OUT3R", NULL, "SYSCLK" },
17261727
{ "OUT4L", NULL, "SYSCLK" },
17271728
{ "OUT4R", NULL, "SYSCLK" },
17281729
{ "OUT5L", NULL, "SYSCLK" },

‎sound/soc/codecs/wm8940.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,7 @@ static const struct regmap_config wm8940_regmap = {
743743
.max_register = WM8940_MONOMIX,
744744
.reg_defaults = wm8940_reg_defaults,
745745
.num_reg_defaults = ARRAY_SIZE(wm8940_reg_defaults),
746+
.cache_type = REGCACHE_RBTREE,
746747

747748
.readable_reg = wm8940_readable_register,
748749
.volatile_reg = wm8940_volatile_register,

‎sound/soc/davinci/davinci-mcasp.c

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,8 +1513,9 @@ static struct davinci_mcasp_pdata am33xx_mcasp_pdata = {
15131513
};
15141514

15151515
static struct davinci_mcasp_pdata dra7_mcasp_pdata = {
1516-
.tx_dma_offset = 0x200,
1517-
.rx_dma_offset = 0x284,
1516+
/* The CFG port offset will be calculated if it is needed */
1517+
.tx_dma_offset = 0,
1518+
.rx_dma_offset = 0,
15181519
.version = MCASP_VERSION_4,
15191520
};
15201521

@@ -1734,6 +1735,52 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp)
17341735
return PCM_EDMA;
17351736
}
17361737

1738+
static u32 davinci_mcasp_txdma_offset(struct davinci_mcasp_pdata *pdata)
1739+
{
1740+
int i;
1741+
u32 offset = 0;
1742+
1743+
if (pdata->version != MCASP_VERSION_4)
1744+
return pdata->tx_dma_offset;
1745+
1746+
for (i = 0; i < pdata->num_serializer; i++) {
1747+
if (pdata->serial_dir[i] == TX_MODE) {
1748+
if (!offset) {
1749+
offset = DAVINCI_MCASP_TXBUF_REG(i);
1750+
} else {
1751+
pr_err("%s: Only one serializer allowed!\n",
1752+
__func__);
1753+
break;
1754+
}
1755+
}
1756+
}
1757+
1758+
return offset;
1759+
}
1760+
1761+
static u32 davinci_mcasp_rxdma_offset(struct davinci_mcasp_pdata *pdata)
1762+
{
1763+
int i;
1764+
u32 offset = 0;
1765+
1766+
if (pdata->version != MCASP_VERSION_4)
1767+
return pdata->rx_dma_offset;
1768+
1769+
for (i = 0; i < pdata->num_serializer; i++) {
1770+
if (pdata->serial_dir[i] == RX_MODE) {
1771+
if (!offset) {
1772+
offset = DAVINCI_MCASP_RXBUF_REG(i);
1773+
} else {
1774+
pr_err("%s: Only one serializer allowed!\n",
1775+
__func__);
1776+
break;
1777+
}
1778+
}
1779+
}
1780+
1781+
return offset;
1782+
}
1783+
17371784
static int davinci_mcasp_probe(struct platform_device *pdev)
17381785
{
17391786
struct snd_dmaengine_dai_dma_data *dma_data;
@@ -1862,7 +1909,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
18621909
if (dat)
18631910
dma_data->addr = dat->start;
18641911
else
1865-
dma_data->addr = mem->start + pdata->tx_dma_offset;
1912+
dma_data->addr = mem->start + davinci_mcasp_txdma_offset(pdata);
18661913

18671914
dma = &mcasp->dma_request[SNDRV_PCM_STREAM_PLAYBACK];
18681915
res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
@@ -1883,7 +1930,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
18831930
if (dat)
18841931
dma_data->addr = dat->start;
18851932
else
1886-
dma_data->addr = mem->start + pdata->rx_dma_offset;
1933+
dma_data->addr =
1934+
mem->start + davinci_mcasp_rxdma_offset(pdata);
18871935

18881936
dma = &mcasp->dma_request[SNDRV_PCM_STREAM_CAPTURE];
18891937
res = platform_get_resource(pdev, IORESOURCE_DMA, 1);

‎sound/soc/davinci/davinci-mcasp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
(n << 2))
8686

8787
/* Transmit Buffer for Serializer n */
88-
#define DAVINCI_MCASP_TXBUF_REG 0x200
88+
#define DAVINCI_MCASP_TXBUF_REG(n) (0x200 + (n << 2))
8989
/* Receive Buffer for Serializer n */
90-
#define DAVINCI_MCASP_RXBUF_REG 0x280
90+
#define DAVINCI_MCASP_RXBUF_REG(n) (0x280 + (n << 2))
9191

9292
/* McASP FIFO Registers */
9393
#define DAVINCI_MCASP_V2_AFIFO_BASE (0x1010)

‎sound/soc/fsl/fsl_ssi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -952,16 +952,16 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
952952
ssi_private->i2s_mode = CCSR_SSI_SCR_NET;
953953
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
954954
case SND_SOC_DAIFMT_I2S:
955+
regmap_update_bits(regs, CCSR_SSI_STCCR,
956+
CCSR_SSI_SxCCR_DC_MASK,
957+
CCSR_SSI_SxCCR_DC(2));
958+
regmap_update_bits(regs, CCSR_SSI_SRCCR,
959+
CCSR_SSI_SxCCR_DC_MASK,
960+
CCSR_SSI_SxCCR_DC(2));
955961
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
956962
case SND_SOC_DAIFMT_CBM_CFS:
957963
case SND_SOC_DAIFMT_CBS_CFS:
958964
ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_MASTER;
959-
regmap_update_bits(regs, CCSR_SSI_STCCR,
960-
CCSR_SSI_SxCCR_DC_MASK,
961-
CCSR_SSI_SxCCR_DC(2));
962-
regmap_update_bits(regs, CCSR_SSI_SRCCR,
963-
CCSR_SSI_SxCCR_DC_MASK,
964-
CCSR_SSI_SxCCR_DC(2));
965965
break;
966966
case SND_SOC_DAIFMT_CBM_CFM:
967967
ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE;

‎sound/soc/intel/atom/sst-mfld-platform-compress.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,24 +182,29 @@ static int sst_platform_compr_trigger(struct snd_compr_stream *cstream, int cmd)
182182
case SNDRV_PCM_TRIGGER_START:
183183
if (stream->compr_ops->stream_start)
184184
return stream->compr_ops->stream_start(sst->dev, stream->id);
185+
break;
185186
case SNDRV_PCM_TRIGGER_STOP:
186187
if (stream->compr_ops->stream_drop)
187188
return stream->compr_ops->stream_drop(sst->dev, stream->id);
189+
break;
188190
case SND_COMPR_TRIGGER_DRAIN:
189191
if (stream->compr_ops->stream_drain)
190192
return stream->compr_ops->stream_drain(sst->dev, stream->id);
193+
break;
191194
case SND_COMPR_TRIGGER_PARTIAL_DRAIN:
192195
if (stream->compr_ops->stream_partial_drain)
193196
return stream->compr_ops->stream_partial_drain(sst->dev, stream->id);
197+
break;
194198
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
195199
if (stream->compr_ops->stream_pause)
196200
return stream->compr_ops->stream_pause(sst->dev, stream->id);
201+
break;
197202
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
198203
if (stream->compr_ops->stream_pause_release)
199204
return stream->compr_ops->stream_pause_release(sst->dev, stream->id);
200-
default:
201-
return -EINVAL;
205+
break;
202206
}
207+
return -EINVAL;
203208
}
204209

205210
static int sst_platform_compr_pointer(struct snd_compr_stream *cstream,

‎sound/soc/intel/skylake/bxt-sst.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
291291
sst_dsp_mailbox_init(sst, (BXT_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ),
292292
SKL_ADSP_W0_UP_SZ, BXT_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ);
293293

294+
INIT_LIST_HEAD(&sst->module_list);
294295
ret = skl_ipc_init(dev, skl);
295296
if (ret)
296297
return ret;

‎sound/soc/sh/rcar/adg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
518518
}
519519
}
520520

521-
rsnd_mod_bset(adg_mod, SSICKR, 0x00FF0000, ckr);
521+
rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr);
522522
rsnd_mod_write(adg_mod, BRRA, rbga);
523523
rsnd_mod_write(adg_mod, BRRB, rbgb);
524524

0 commit comments

Comments
 (0)
0