projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7590c6a
f63550e
)
ASoC: Merge up fixes for CI
author
Mark Brown
<broonie@kernel.org>
Fri, 12 May 2023 04:14:20 +0000
(13:14 +0900)
committer
Mark Brown
<broonie@kernel.org>
Mon, 15 May 2023 10:55:52 +0000
(19:55 +0900)
Avoid tripping over fixed issues in CI.
1
2
Documentation/devicetree/bindings/sound/tas2562.yaml
patch
|
diff1
|
diff2
|
blob
|
history
Documentation/devicetree/bindings/sound/tas2770.yaml
patch
|
diff1
|
diff2
|
blob
|
history
Documentation/devicetree/bindings/sound/tas27xx.yaml
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/amd/yc/acp6x-mach.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/dwc/dwc-i2s.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/soc/jz4740/jz4740-i2s.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/devicetree/bindings/sound/tas2562.yaml
Simple merge
diff --cc
Documentation/devicetree/bindings/sound/tas2770.yaml
Simple merge
diff --cc
Documentation/devicetree/bindings/sound/tas27xx.yaml
Simple merge
diff --cc
sound/soc/amd/yc/acp6x-mach.c
index
a134eba
,
4406a5d
..
31e4669
---
1
/
sound/soc/amd/yc/acp6x-mach.c
---
2
/
sound/soc/amd/yc/acp6x-mach.c
+++ b/
sound/soc/amd/yc/acp6x-mach.c
@@@
-314,10
-314,10
+314,17
@@@
static const struct dmi_system_id yc_ac
{
.driver_data = &acp6x_card,
.matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "MECHREVO"),
+ DMI_MATCH(DMI_BOARD_NAME, "MRID6"),
+ }
+ },
++ {
++ .driver_data = &acp6x_card,
++ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
+ DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
+ }
+ },
{}
};
diff --cc
sound/soc/dwc/dwc-i2s.c
Simple merge
diff --cc
sound/soc/jz4740/jz4740-i2s.c
Simple merge