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

Commit 15c825d0 authored by Meng Wang's avatar Meng Wang Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: codec: Update codec driver to component driver 



Some alsa API are removed in kernel-4.19 which would cause
codec driver compile failure. Update codec driver to fix it.

Change-Id: Ie358ec1863082166958059c179300b453d2a03ad
Signed-off-by: default avatarMeng Wang <mengw@codeaurora.org>
parent ee084a06

asoc/codecs/aqt1000/aqt1000-api.h

+5 −4
Original line number Diff line number Diff line
@@ -10,11 +10,12 @@ 
#include <linux/of_device.h>

#include <sound/soc.h>



extern int aqt_mbhc_micb_adjust_voltage(struct snd_soc_codec *codec,

extern int aqt_mbhc_micb_adjust_voltage(struct snd_soc_component *component,

					int volt, int micb_num);

extern int aqt_cdc_mclk_enable(struct snd_soc_codec *codec, bool enable);

extern int aqt_cdc_mclk_enable(struct snd_soc_component *component,

			       bool enable);

extern int aqt_get_micb_vout_ctl_val(u32 micb_mv);

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

			       int req, bool is_dapm);

extern int aqt_micbias_control(struct snd_soc_component *component,

			       int micb_num, int req, bool is_dapm);



#endif /* AQT1000_API_H */

asoc/codecs/aqt1000/aqt1000-clsh.c

+212 −176

File changed.

Preview size limit exceeded, changes collapsed.

asoc/codecs/aqt1000/aqt1000-clsh.h

+3 −3
Original line number Diff line number Diff line
@@ -94,14 +94,14 @@ struct aqt_reg_mask_val { 
	u8 val;

};



extern void aqt_clsh_fsm(struct snd_soc_codec *codec,

extern void aqt_clsh_fsm(struct snd_soc_component *component,

		struct aqt_clsh_cdc_data *cdc_clsh_d,

		u8 clsh_event, u8 req_state,

		int int_mode);



extern void aqt_clsh_init(struct aqt_clsh_cdc_data *clsh);

extern int aqt_clsh_get_clsh_state(struct aqt_clsh_cdc_data *clsh);

extern void aqt_clsh_imped_config(struct snd_soc_codec *codec, int imped,

		bool reset);

extern void aqt_clsh_imped_config(struct snd_soc_component *component,

		int imped, bool reset);



#endif /* _AQT1000_CLSH_H */

asoc/codecs/aqt1000/aqt1000-irq.c

+3 −1
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static struct irq_chip aqt_irq_chip = { 
};



static struct lock_class_key aqt_irq_lock_class;

static struct lock_class_key aqt_irq_lock_requested_class;



static int aqt_irq_map(struct irq_domain *irqd, unsigned int virq,

			irq_hw_number_t hw)
@@ -162,7 +163,8 @@ static int aqt_irq_map(struct irq_domain *irqd, unsigned int virq, 


	irq_set_chip_data(virq, data);

	irq_set_chip_and_handler(virq, &aqt_irq_chip, handle_simple_irq);

	irq_set_lockdep_class(virq, &aqt_irq_lock_class);

	irq_set_lockdep_class(virq, &aqt_irq_lock_class,

			      &aqt_irq_lock_requested_class);

	irq_set_nested_thread(virq, 1);

	irq_set_noprobe(virq);

asoc/codecs/aqt1000/aqt1000-mbhc.c

+204 −166

File changed.

Preview size limit exceeded, changes collapsed.