Unverified Commit aeb2e9c4 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes 

Merge the fixes branch up so we can apply further AMD work.
parents 863b9179 3d1bb6cc

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,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
@@ -4911,7 +4911,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/dai.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -84,8 +84,8 @@ enum sof_ipc_dai_type {







	SOF_DAI_AMD_BT,			/**< AMD ACP BT*/









	SOF_DAI_AMD_SP,			/**< AMD ACP SP */









	SOF_DAI_AMD_DMIC,		/**< AMD ACP DMIC */









	SOF_DAI_AMD_HS,			/**< Amd HS */









	SOF_DAI_MEDIATEK_AFE,		/**< Mediatek AFE */









	SOF_DAI_AMD_HS,			/**< Amd HS */









};



















/* general purpose DAI configuration */