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

Commit a2342ae3 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Factor out shared code from WM8993 



The WM8993 analogue control is shared with other devices in the same
product line.  Since this is a very substantial proportion of the
driver move the definitions of these controls into a new wm_hubs module
which allows them to be shared between the two.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e9ade7f9

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ config SND_SOC_ALL_CODECS 


          If unsure select "N".



config SND_SOC_WM_HUBS

	tristate

	default y if SND_SOC_WM8993=y

	default m if SND_SOC_WM8993=m



config SND_SOC_AC97_CODEC

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ snd-soc-wm9081-objs := wm9081.o 
snd-soc-wm9705-objs := wm9705.o

snd-soc-wm9712-objs := wm9712.o

snd-soc-wm9713-objs := wm9713.o

snd-soc-wm-hubs-objs := wm_hubs.o



# Amp

snd-soc-max9877-objs := max9877.o
@@ -88,6 +89,7 @@ obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-wm9081.o 
obj-$(CONFIG_SND_SOC_WM9705)	+= snd-soc-wm9705.o

obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-wm9712.o

obj-$(CONFIG_SND_SOC_WM9713)	+= snd-soc-wm9713.o

obj-$(CONFIG_SND_SOC_WM_HUBS)	+= snd-soc-wm-hubs.o



# Amp

obj-$(CONFIG_SND_SOC_MAX9877)	+= snd-soc-max9877.o

sound/soc/codecs/wm8993.c

+22 −694

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wm_hubs.c

0 → 100644
+758 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wm_hubs.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * wm_hubs.h  --  WM899x common code

 *

 * Copyright 2009 Wolfson Microelectronics plc

 *

 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>

 *

 *

 * 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 _WM_HUBS_H

#define _WM_HUBS_H



struct snd_soc_codec;



extern const unsigned int wm_hubs_spkmix_tlv[];



extern int wm_hubs_add_analogue_controls(struct snd_soc_codec *);

extern int wm_hubs_add_analogue_routes(struct snd_soc_codec *, int, int);



#endif