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

Commit 083533b1 authored by Banajit Goswami's avatar Banajit Goswami Committed by Karthikeyan Mani
Browse files

ASoC: wcd: remove unused wcd9330 codec driver 



WCD9330 codec driver is not used anymore on newer MSM
targets. Remove these unused drivers.

Change-Id: If96cacbf7100933dd06ee3b98e42c08f36524bbe
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent 2d097a73

sound/soc/codecs/Kconfig

+2 −13
Original line number Diff line number Diff line
@@ -878,13 +878,6 @@ config SND_SOC_UDA1380 
config SND_SOC_WCD934X_DSD

        tristate



config SND_SOC_WCD9320

        tristate



config SND_SOC_WCD9330

        tristate

	depends on WCD9330_CODEC



config SND_SOC_WCD9335

        tristate

	depends on WCD9335_CODEC
@@ -916,21 +909,17 @@ config SND_SOC_WSA881X_ANALOG 
        tristate

	select REGMAP_I2C



config SND_SOC_WCD9XXX

	tristate

	default y if SND_SOC_WCD9320=y || SND_SOC_WCD9330=y || SND_SOC_WCD9335=y



config SND_SOC_WCD9XXX_V2

	tristate

	default y if SND_SOC_WCD9335=y



config SND_SOC_WCD_CPE

	tristate

	default y if SND_SOC_WCD9330=y || SND_SOC_WCD9335=y

	default y if SND_SOC_WCD9335=y



config AUDIO_EXT_CLK

	tristate

	default y if SND_SOC_WCD9335=y || SND_SOC_WCD9330=y || SND_SOC_SDM660_CDC=y

	default y if SND_SOC_WCD9335=y || SND_SOC_SDM660_CDC=y



config SND_SOC_WCD_MBHC

	tristate

sound/soc/codecs/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -158,11 +158,8 @@ snd-soc-twl4030-objs := twl4030.o 
snd-soc-twl6040-objs := twl6040.o

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

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

snd-soc-wcd9320-objs := wcd9320.o wcd9320-tables.o

snd-soc-wcd9330-objs := wcd9330.o wcd9330-tables.o

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

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

snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o wcdcal-hwdep.o

snd-soc-wcd9xxx-v2-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o wcdcal-hwdep.o

ifeq ($(CONFIG_COMMON_CLK_MSM), y)

	audio-ext-clock-objs := audio-ext-clk.o
@@ -407,7 +404,6 @@ obj-$(CONFIG_SND_SOC_TWL6040) += snd-soc-twl6040.o 
obj-$(CONFIG_SND_SOC_UDA134X)	+= snd-soc-uda134x.o

obj-$(CONFIG_SND_SOC_UDA1380)	+= snd-soc-uda1380.o

obj-$(CONFIG_SND_SOC_WCD9320)	+= snd-soc-wcd9320.o

obj-$(CONFIG_SND_SOC_WCD9330)	+= snd-soc-wcd9330.o

obj-$(CONFIG_SND_SOC_WCD9335)	+= snd-soc-wcd9335.o

obj-$(CONFIG_SND_SOC_WCD934X)	+= wcd934x/

ifeq ($(CONFIG_COMMON_CLK_MSM), y)
@@ -416,7 +412,6 @@ endif 
ifeq ($(CONFIG_COMMON_CLK_QCOM), y)

	obj-$(CONFIG_AUDIO_EXT_CLK)     += audio-ext-clock-up.o

endif

obj-$(CONFIG_SND_SOC_WCD9XXX)   += snd-soc-wcd9xxx.o

obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += snd-soc-wcd9xxx-v2.o

obj-$(CONFIG_SND_SOC_WCD_CPE)   += snd-soc-wcd-cpe.o

obj-$(CONFIG_SND_SOC_WCD_MBHC)  += snd-soc-wcd-mbhc.o

sound/soc/codecs/wcd9330-tables.c

deleted100644 → 0
+0 −1675

File deleted.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wcd9330.c

deleted100644 → 0
+0 −9113

File deleted.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wcd9330.h

deleted100644 → 0
+0 −128
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, 2017 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 WCD9330_H

#define WCD9330_H



#include <sound/soc.h>

#include <sound/jack.h>

#include <sound/apr_audio-v2.h>

#include <linux/mfd/wcd9xxx/wcd9xxx-slimslave.h>

#include "wcd9xxx-mbhc.h"

#include "wcd9xxx-resmgr.h"

#include "wcd9xxx-common.h"



#define TOMTOM_NUM_REGISTERS 0x400

#define TOMTOM_MAX_REGISTER (TOMTOM_NUM_REGISTERS-1)

#define TOMTOM_CACHE_SIZE TOMTOM_NUM_REGISTERS



#define TOMTOM_REG_VAL(reg, val)		{reg, 0, val}

#define TOMTOM_MCLK_ID 0



#define TOMTOM_REGISTER_START_OFFSET 0x800

#define TOMTOM_SB_PGD_PORT_RX_BASE   0x40

#define TOMTOM_SB_PGD_PORT_TX_BASE   0x50



#define WCD9330_DMIC_CLK_DIV_2 0x00

#define WCD9330_DMIC_CLK_DIV_3 0x01

#define WCD9330_DMIC_CLK_DIV_4 0x02

#define WCD9330_DMIC_CLK_DIV_6 0x03

#define WCD9330_DMIC_CLK_DIV_16 0x04



#define TOMTOM_ZDET_SUPPORTED true



extern const u8 tomtom_reset_reg_defaults[TOMTOM_CACHE_SIZE];

struct tomtom_codec_dai_data {

	u32 rate;

	u32 *ch_num;

	u32 ch_act;

	u32 ch_tot;

};



enum tomtom_pid_current {

	TOMTOM_PID_MIC_2P5_UA,

	TOMTOM_PID_MIC_5_UA,

	TOMTOM_PID_MIC_10_UA,

	TOMTOM_PID_MIC_20_UA,

};



enum tomtom_mbhc_analog_pwr_cfg {

	TOMTOM_ANALOG_PWR_COLLAPSED = 0,

	TOMTOM_ANALOG_PWR_ON,

	TOMTOM_NUM_ANALOG_PWR_CONFIGS,

};



enum {

	HPH_PA_NONE = 0,

	HPH_PA_R,

	HPH_PA_L,

	HPH_PA_L_R,

};



/* Number of input and output Slimbus port */

enum {

	TOMTOM_RX1 = 0,

	TOMTOM_RX2,

	TOMTOM_RX3,

	TOMTOM_RX4,

	TOMTOM_RX5,

	TOMTOM_RX6,

	TOMTOM_RX7,

	TOMTOM_RX8,

	TOMTOM_RX9,

	TOMTOM_RX10,

	TOMTOM_RX11,

	TOMTOM_RX12,

	TOMTOM_RX13,

	TOMTOM_RX_MAX,

};



enum {

	TOMTOM_TX1 = 0,

	TOMTOM_TX2,

	TOMTOM_TX3,

	TOMTOM_TX4,

	TOMTOM_TX5,

	TOMTOM_TX6,

	TOMTOM_TX7,

	TOMTOM_TX8,

	TOMTOM_TX9,

	TOMTOM_TX10,

	TOMTOM_TX11,

	TOMTOM_TX12,

	TOMTOM_TX13,

	TOMTOM_TX14,

	TOMTOM_TX15,

	TOMTOM_TX16,

	TOMTOM_TX_MAX,

};



extern int tomtom_mclk_enable(struct snd_soc_codec *codec, int mclk_enable,

			     bool dapm);

extern int tomtom_codec_mclk_enable(struct snd_soc_codec *codec,

				    int mclk_enable, bool dapm);

extern int tomtom_hs_detect(struct snd_soc_codec *codec,

			   struct wcd9xxx_mbhc_config *mbhc_cfg);

extern void tomtom_hs_detect_exit(struct snd_soc_codec *codec);

extern void *tomtom_get_afe_config(struct snd_soc_codec *codec,

				  enum afe_config_type config_type);



extern void tomtom_event_register(

	int (*machine_event_cb)(struct snd_soc_codec *codec,

				enum wcd9xxx_codec_event),

	struct snd_soc_codec *codec);

extern void tomtom_register_ext_clk_cb(

	int (*codec_ext_clk_en)(struct snd_soc_codec *codec,

				int enable, bool dapm),

	int (*get_ext_clk_cnt)(void),

	struct snd_soc_codec *codec);

extern int tomtom_enable_qfuse_sensing(struct snd_soc_codec *codec);

#endif