Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8ee67bb8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5651',... 

Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5651', 'asoc/topic/rt5659' and 'asoc/topic/rt5660' into asoc-next
parents bffd6430 79223bf1 6b2d9924 ce571b80 ca04dd8a

Documentation/devicetree/bindings/sound/rt5651.txt

+3 −3
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ Optional properties: 


- realtek,jack-detect-source

  u32. Valid values:

  1: Use JD1_1 pin for jack-dectect

  2: Use JD1_2 pin for jack-dectect

  3: Use JD2 pin for jack-dectect

  1: Use JD1_1 pin for jack-detect

  2: Use JD1_2 pin for jack-detect

  3: Use JD2 pin for jack-detect



- realtek,over-current-threshold-microamp

  u32, micbias over-current detection threshold in µA, valid values are

include/dt-bindings/sound/rt5651.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __DT_RT5651_H

#define __DT_RT5651_H



#define RT5651_JD_NULL			0

#define RT5651_JD1_1			1

#define RT5651_JD1_2			2

#define RT5651_JD2			3



#define RT5651_OVCD_SF_0P5		0

#define RT5651_OVCD_SF_0P75		1

#define RT5651_OVCD_SF_1P0		2

#define RT5651_OVCD_SF_1P5		3



#endif /* __DT_RT5651_H */

include/sound/rt5651.h

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*

 * linux/sound/rt286.h -- Platform data for RT286

 *

 * Copyright 2013 Realtek Microelectronics

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __LINUX_SND_RT5651_H

#define __LINUX_SND_RT5651_H



/*

 * Note these MUST match the values from the DT binding:

 * Documentation/devicetree/bindings/sound/rt5651.txt

 */

enum rt5651_jd_src {

	RT5651_JD_NULL,

	RT5651_JD1_1,

	RT5651_JD1_2,

	RT5651_JD2,

};



/*

 * Note these MUST match the values from the DT binding:

 * Documentation/devicetree/bindings/sound/rt5651.txt

 */

enum rt5651_ovcd_sf {

	RT5651_OVCD_SF_0P5,

	RT5651_OVCD_SF_0P75,

	RT5651_OVCD_SF_1P0,

	RT5651_OVCD_SF_1P5,

};



#endif

include/sound/rt5659.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ enum rt5659_dmic2_data_pin { 
enum rt5659_jd_src {

	RT5659_JD_NULL,

	RT5659_JD3,

	RT5659_JD_HDA_HEADER,

};



struct rt5659_platform_data {

sound/soc/amd/acp-rt5645.c

+2 −2
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ static int cz_init(struct snd_soc_pcm_runtime *rtd) 
{

	int ret;

	struct snd_soc_card *card;

	struct snd_soc_codec *codec;

	struct snd_soc_component *codec;



	codec = rtd->codec;

	codec = rtd->codec_dai->component;

	card = rtd->card;



	ret = snd_soc_card_jack_new(card, "Headset Jack",