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

Commit 71d091e2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: wcd937x: move export functions to new header"

parents f9a3368f 838f0b88

asoc/codecs/wcd937x/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -168,6 +168,4 @@ extern int wcd937x_mbhc_micb_adjust_voltage(struct snd_soc_codec *codec, 
extern int wcd937x_get_micb_vout_ctl_val(u32 micb_mv);

extern int wcd937x_micbias_control(struct snd_soc_codec *codec, int micb_num,

			int req, bool is_dapm);

extern int wcd937x_info_create_codec_entry(struct snd_info_entry *codec_root,

				    struct snd_soc_codec *codec);

#endif

asoc/codecs/wcd937x/wcd937x.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <sound/soc.h>

#include <sound/soc-dapm.h>

#include "internal.h"

#include "wcd937x.h"

#include "../wcdcal-hwdep.h"

#include "wcd937x-registers.h"

#include "../msm-cdc-pinctrl.h"

asoc/codecs/wcd937x/wcd937x.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

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

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

 * only version 2 as published by the Free Software Foundation.



 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef _WCD937X_H

#define _WCD937X_H



#ifdef CONFIG_SND_SOC_WCD937X

extern int wcd937x_info_create_codec_entry(struct snd_info_entry *codec_root,

				    struct snd_soc_codec *codec);

#else

extern int wcd937x_info_create_codec_entry(struct snd_info_entry *codec_root,

				    struct snd_soc_codec *codec)

{

	return 0;

}

#endif /* CONFIG_SND_SOC_WCD937X */



#endif

asoc/sm6150.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include "codecs/bolero/bolero-cdc.h"

#include <dt-bindings/sound/audio-codec-port-types.h>

#include "codecs/bolero/wsa-macro.h"

#include "codecs/wcd937x/internal.h"

#include "codecs/wcd937x/wcd937x.h"



#define DRV_NAME "sm6150-asoc-snd"