Skip to content

Commit 534e9cf

Browse files
committed
Merge tag 'asoc-v6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Additional v6.16 updates A couple more updates on top of the last set I sent you, a new driver for the ES8375 and a fix for the Cirrus KUnit tests from Jaroslav.
2 parents aca89f1 + 43a38a0 commit 534e9cf

File tree

6 files changed

+996
-1
lines changed

6 files changed

+996
-1
lines changed
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/everest,es8375.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Everest ES8375 audio CODEC
8+
9+
maintainers:
10+
- Michael Zhang <zhangyi@everest-semi.com>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: everest,es8375
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
items:
24+
- description: clock for master clock (MCLK)
25+
26+
clock-names:
27+
items:
28+
- const: mclk
29+
30+
vdda-supply:
31+
description:
32+
Analogue power supply.
33+
34+
vddd-supply:
35+
description:
36+
Interface power supply.
37+
38+
everest,mclk-src:
39+
$ref: /schemas/types.yaml#/definitions/uint8
40+
description: |
41+
Represents the MCLK/SCLK pair pins used as the internal clock.
42+
0 represents selecting MCLK.
43+
1 represents selecting SCLK.
44+
enum: [0, 1]
45+
default: 0
46+
47+
"#sound-dai-cells":
48+
const: 0
49+
50+
required:
51+
- compatible
52+
- reg
53+
- "#sound-dai-cells"
54+
- vdda-supply
55+
- vddd-supply
56+
57+
additionalProperties: false
58+
59+
examples:
60+
- |
61+
i2c {
62+
#address-cells = <1>;
63+
#size-cells = <0>;
64+
es8375: codec@18 {
65+
compatible = "everest,es8375";
66+
reg = <0x18>;
67+
vdda-supply = <&vdd3v3>;
68+
vddd-supply = <&vdd3v3>;
69+
#sound-dai-cells = <0>;
70+
};
71+
};

drivers/firmware/cirrus/test/cs_dsp_mock_bin.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@ static void cs_dsp_mock_bin_add_name_or_info(struct cs_dsp_mock_bin_builder *bui
9696

9797
if (info_len % 4) {
9898
/* Create a padded string with length a multiple of 4 */
99+
size_t copy_len = info_len;
99100
info_len = round_up(info_len, 4);
100101
tmp = kunit_kzalloc(builder->test_priv->test, info_len, GFP_KERNEL);
101102
KUNIT_ASSERT_NOT_ERR_OR_NULL(builder->test_priv->test, tmp);
102-
memcpy(tmp, info, info_len);
103+
memcpy(tmp, info, copy_len);
103104
info = tmp;
104105
}
105106

sound/soc/codecs/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ config SND_SOC_ALL_CODECS
120120
imply SND_SOC_ES8326
121121
imply SND_SOC_ES8328_SPI
122122
imply SND_SOC_ES8328_I2C
123+
imply SND_SOC_ES8375
123124
imply SND_SOC_ES8389
124125
imply SND_SOC_ES7134
125126
imply SND_SOC_ES7241
@@ -1212,6 +1213,10 @@ config SND_SOC_ES8328_SPI
12121213
depends on SPI_MASTER
12131214
select SND_SOC_ES8328
12141215

1216+
config SND_SOC_ES8375
1217+
tristate "Everest Semi ES8375 CODEC"
1218+
depends on I2C
1219+
12151220
config SND_SOC_ES8389
12161221
tristate "Everest Semi ES8389 CODEC"
12171222
depends on I2C

sound/soc/codecs/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ snd-soc-es8326-y := es8326.o
134134
snd-soc-es8328-y := es8328.o
135135
snd-soc-es8328-i2c-y := es8328-i2c.o
136136
snd-soc-es8328-spi-y := es8328-spi.o
137+
snd-soc-es8375-y := es8375.o
137138
snd-soc-es8389-y := es8389.o
138139
snd-soc-framer-y := framer-codec.o
139140
snd-soc-gtm601-y := gtm601.o
@@ -557,6 +558,7 @@ obj-$(CONFIG_SND_SOC_ES8326) += snd-soc-es8326.o
557558
obj-$(CONFIG_SND_SOC_ES8328) += snd-soc-es8328.o
558559
obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o
559560
obj-$(CONFIG_SND_SOC_ES8328_SPI)+= snd-soc-es8328-spi.o
561+
obj-$(CONFIG_SND_SOC_ES8375) += snd-soc-es8375.o
560562
obj-$(CONFIG_SND_SOC_ES8389) += snd-soc-es8389.o
561563
obj-$(CONFIG_SND_SOC_FRAMER) += snd-soc-framer.o
562564
obj-$(CONFIG_SND_SOC_GTM601) += snd-soc-gtm601.o

0 commit comments

Comments
 (0)