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

ASoC: dt-bindings: Add bindings for WCD9335 DAIs 

Merge series from Yassine Oudjana <yassine.oudjana@gmail.com>:

Add DT bindings for WCD9335 DAIs and use them in the driver as well
as all device trees currently using WCD9335.
parents d15534a6 66348f17

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -16250,6 +16250,7 @@ M: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> 
M:	Banajit Goswami <bgoswami@quicinc.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	include/dt-bindings/sound/qcom,wcd9335.h

F:	sound/soc/codecs/lpass-rx-macro.*

F:	sound/soc/codecs/lpass-tx-macro.*

F:	sound/soc/codecs/lpass-va-macro.c

include/dt-bindings/sound/qcom,wcd9335.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */



#ifndef __DT_SOUND_QCOM_WCD9335_H

#define __DT_SOUND_QCOM_WCD9335_H



#define AIF1_PB                 0

#define AIF1_CAP                1

#define AIF2_PB                 2

#define AIF2_CAP                3

#define AIF3_PB                 4

#define AIF3_CAP                5

#define AIF4_PB                 6

#define NUM_CODEC_DAIS          7



#endif

sound/soc/codecs/wcd9335.c

+2 −11
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "wcd9335.h"

#include "wcd-clsh-v2.h"



#include <dt-bindings/sound/qcom,wcd9335.h>



#define WCD9335_RATES_MASK (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\

			    SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\

			    SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000)
@@ -203,17 +205,6 @@ enum wcd9335_sido_voltage { 
	SIDO_VOLTAGE_NOMINAL_MV = 1100,

};



enum {

	AIF1_PB = 0,

	AIF1_CAP,

	AIF2_PB,

	AIF2_CAP,

	AIF3_PB,

	AIF3_CAP,

	AIF4_PB,

	NUM_CODEC_DAIS,

};



enum {

	COMPANDER_1, /* HPH_L */

	COMPANDER_2, /* HPH_R */