Commit 5534bbb7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.2-rc4' of... 

Merge tag 'asoc-fix-v6.2-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.1

A relatively large collection of fixes and new platform quirks here,
they're all fairly minor though - the widest possible impact is the fix
to the use of prefixes on regulator names which would have broken any
device that integrates regulators with DAPM and was used in a system
where it had a name prefix assigning to it.
parents 9d8e536d 7d945b04

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org> 
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Audio codec controlled by ChromeOS EC 


maintainers:

  - Cheng-Yi Chiang <cychiang@chromium.org>

  - Tzung-Bi Shih <tzungbi@google.com>

  - Tzung-Bi Shih <tzungbi@kernel.org>



description: |

  Google's ChromeOS EC codec is a digital mic codec provided by the

Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Realtek rt1015p codec devicetree bindings



maintainers:

  - Tzung-Bi Shih <tzungbi@google.com>

  - Tzung-Bi Shih <tzungbi@kernel.org>



description: |

  Rt1015p is a rt1015 variant which does not support I2C and

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4906,7 +4906,7 @@ F: drivers/platform/chrome/ 








CHROMEOS EC CODEC DRIVER









M:	Cheng-Yi Chiang <cychiang@chromium.org>









M:	Tzung-Bi Shih <tzungbi@google.com>









M:	Tzung-Bi Shih <tzungbi@kernel.org>









R:	Guenter Roeck <groeck@chromium.org>









L:	chrome-platform@lists.linux.dev









S:	Maintained
































include/sound/sof/info.h



+4
−0






























Original line number
Diff line number
Diff line







@@ -36,6 +36,10 @@ enum sof_ipc_ext_data {







	SOF_IPC_EXT_USER_ABI_INFO	= 4,









};



















/* Build u32 number in format MMmmmppp */









#define SOF_FW_VER(MAJOR, MINOR, PATCH) ((uint32_t)( \









	((MAJOR) << 24) | ((MINOR) << 12) | (PATCH)))



















/* FW version - SOF_IPC_GLB_VERSION */









struct sof_ipc_fw_version {









	struct sof_ipc_hdr hdr;