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

Commit 01a805eb authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: codec: Fix CFI error caused by missing members"

parents d8d15d34 a977db96

asoc/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ endif 
# for SM6150 sound card driver

ifdef CONFIG_SND_SOC_SM6150

	MACHINE_OBJS += sm6150.o

	MACHINE_OBJS += machine_615x_init.o

endif



# For sa6155 sound card driver

asoc/codecs/wcd934x/wcd934x.c

+2 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ struct wcd_swr_ctrl_platform_data { 
	int (*write)(void *handle, int reg, int val);

	int (*bulk_write)(void *handle, u32 *reg, u32 *val, size_t len);

	int (*clk)(void *handle, bool enable);

	int (*core_vote)(void *handle, bool enable);

	int (*handle_irq)(void *handle,

			  irqreturn_t (*swrm_irq_handler)(int irq, void *data),

			  void *swrm_handle, int action);
@@ -11375,6 +11376,7 @@ static int tavil_probe(struct platform_device *pdev) 
	tavil->swr.plat_data.bulk_write = tavil_swrm_bulk_write;

	tavil->swr.plat_data.clk = tavil_swrm_clock;

	tavil->swr.plat_data.handle_irq = tavil_swrm_handle_irq;

	tavil->swr.plat_data.core_vote = NULL;

	tavil->swr.spkr_gain_offset = WCD934X_RX_GAIN_OFFSET_0_DB;



	/* Register for Clock */

asoc/sm6150.c

+354 −1043

File changed.

Preview size limit exceeded, changes collapsed.