Unverified Commit 426c7bf4 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Mark Brown
Browse files

ASoC: tlv320aic3x: remove support for platform data 



Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://lore.kernel.org/r/20221102232004.1721864-2-dmitry.torokhov@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent faf3b5cb

include/sound/tlv320aic3x.h

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Platform data for Texas Instruments TLV320AIC3x codec

 *

 * Author: Jarkko Nikula <jarkko.nikula@bitmer.com>

 */

#ifndef __TLV320AIC3x_H__

#define __TLV320AIC3x_H__



/* GPIO API */

enum {

	AIC3X_GPIO1_FUNC_DISABLED		= 0,

	AIC3X_GPIO1_FUNC_AUDIO_WORDCLK_ADC	= 1,

	AIC3X_GPIO1_FUNC_CLOCK_MUX		= 2,

	AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV2		= 3,

	AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV4		= 4,

	AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV8		= 5,

	AIC3X_GPIO1_FUNC_SHORT_CIRCUIT_IRQ	= 6,

	AIC3X_GPIO1_FUNC_AGC_NOISE_IRQ		= 7,

	AIC3X_GPIO1_FUNC_INPUT			= 8,

	AIC3X_GPIO1_FUNC_OUTPUT			= 9,

	AIC3X_GPIO1_FUNC_DIGITAL_MIC_MODCLK	= 10,

	AIC3X_GPIO1_FUNC_AUDIO_WORDCLK		= 11,

	AIC3X_GPIO1_FUNC_BUTTON_IRQ		= 12,

	AIC3X_GPIO1_FUNC_HEADSET_DETECT_IRQ	= 13,

	AIC3X_GPIO1_FUNC_HEADSET_DETECT_OR_BUTTON_IRQ	= 14,

	AIC3X_GPIO1_FUNC_ALL_IRQ		= 16

};



enum {

	AIC3X_GPIO2_FUNC_DISABLED		= 0,

	AIC3X_GPIO2_FUNC_HEADSET_DETECT_IRQ	= 2,

	AIC3X_GPIO2_FUNC_INPUT			= 3,

	AIC3X_GPIO2_FUNC_OUTPUT			= 4,

	AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT	= 5,

	AIC3X_GPIO2_FUNC_AUDIO_BITCLK		= 8,

	AIC3X_GPIO2_FUNC_HEADSET_DETECT_OR_BUTTON_IRQ = 9,

	AIC3X_GPIO2_FUNC_ALL_IRQ		= 10,

	AIC3X_GPIO2_FUNC_SHORT_CIRCUIT_OR_AGC_IRQ = 11,

	AIC3X_GPIO2_FUNC_HEADSET_OR_BUTTON_PRESS_OR_SHORT_CIRCUIT_IRQ = 12,

	AIC3X_GPIO2_FUNC_SHORT_CIRCUIT_IRQ	= 13,

	AIC3X_GPIO2_FUNC_AGC_NOISE_IRQ		= 14,

	AIC3X_GPIO2_FUNC_BUTTON_PRESS_IRQ	= 15

};



enum aic3x_micbias_voltage {

	AIC3X_MICBIAS_OFF = 0,

	AIC3X_MICBIAS_2_0V = 1,

	AIC3X_MICBIAS_2_5V = 2,

	AIC3X_MICBIAS_AVDDV = 3,

};



struct aic3x_setup_data {

	unsigned int gpio_func[2];

};



struct aic3x_pdata {

	int gpio_reset; /* < 0 if not used */

	struct aic3x_setup_data *setup;



	/* Selects the micbias voltage */

	enum aic3x_micbias_voltage micbias_vg;

};



#endif

sound/soc/codecs/tlv320aic3x.c

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

#include <sound/initval.h>

#include <sound/tlv.h>

#include <sound/tlv320aic3x.h>



#include "tlv320aic3x.h"
@@ -66,6 +65,10 @@ struct aic3x_disable_nb { 
	struct aic3x_priv *aic3x;

};



struct aic3x_setup_data {

	unsigned int gpio_func[2];

};



/* codec private data */

struct aic3x_priv {

	struct snd_soc_component *component;
@@ -1748,7 +1751,6 @@ static const struct reg_sequence aic3007_class_d[] = { 


int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver_data)

{

	struct aic3x_pdata *pdata = dev->platform_data;

	struct aic3x_priv *aic3x;

	struct aic3x_setup_data *ai3x_setup;

	struct device_node *np = dev->of_node;
@@ -1768,11 +1770,7 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver 
	regcache_cache_only(aic3x->regmap, true);



	dev_set_drvdata(dev, aic3x);

	if (pdata) {

		aic3x->gpio_reset = pdata->gpio_reset;

		aic3x->setup = pdata->setup;

		aic3x->micbias_vg = pdata->micbias_vg;

	} else if (np) {

	if (np) {

		ai3x_setup = devm_kzalloc(dev, sizeof(*ai3x_setup), GFP_KERNEL);

		if (!ai3x_setup)

			return -ENOMEM;

sound/soc/codecs/tlv320aic3x.h

+43 −0
Original line number Diff line number Diff line
@@ -298,4 +298,47 @@ enum { 
#define AIC3X_BUTTON_DEBOUNCE_SHIFT 	0

#define AIC3X_BUTTON_DEBOUNCE_MASK	3



/* GPIO API */

enum {

	AIC3X_GPIO1_FUNC_DISABLED		= 0,

	AIC3X_GPIO1_FUNC_AUDIO_WORDCLK_ADC	= 1,

	AIC3X_GPIO1_FUNC_CLOCK_MUX		= 2,

	AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV2		= 3,

	AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV4		= 4,

	AIC3X_GPIO1_FUNC_CLOCK_MUX_DIV8		= 5,

	AIC3X_GPIO1_FUNC_SHORT_CIRCUIT_IRQ	= 6,

	AIC3X_GPIO1_FUNC_AGC_NOISE_IRQ		= 7,

	AIC3X_GPIO1_FUNC_INPUT			= 8,

	AIC3X_GPIO1_FUNC_OUTPUT			= 9,

	AIC3X_GPIO1_FUNC_DIGITAL_MIC_MODCLK	= 10,

	AIC3X_GPIO1_FUNC_AUDIO_WORDCLK		= 11,

	AIC3X_GPIO1_FUNC_BUTTON_IRQ		= 12,

	AIC3X_GPIO1_FUNC_HEADSET_DETECT_IRQ	= 13,

	AIC3X_GPIO1_FUNC_HEADSET_DETECT_OR_BUTTON_IRQ	= 14,

	AIC3X_GPIO1_FUNC_ALL_IRQ		= 16

};



enum {

	AIC3X_GPIO2_FUNC_DISABLED		= 0,

	AIC3X_GPIO2_FUNC_HEADSET_DETECT_IRQ	= 2,

	AIC3X_GPIO2_FUNC_INPUT			= 3,

	AIC3X_GPIO2_FUNC_OUTPUT			= 4,

	AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT	= 5,

	AIC3X_GPIO2_FUNC_AUDIO_BITCLK		= 8,

	AIC3X_GPIO2_FUNC_HEADSET_DETECT_OR_BUTTON_IRQ = 9,

	AIC3X_GPIO2_FUNC_ALL_IRQ		= 10,

	AIC3X_GPIO2_FUNC_SHORT_CIRCUIT_OR_AGC_IRQ = 11,

	AIC3X_GPIO2_FUNC_HEADSET_OR_BUTTON_PRESS_OR_SHORT_CIRCUIT_IRQ = 12,

	AIC3X_GPIO2_FUNC_SHORT_CIRCUIT_IRQ	= 13,

	AIC3X_GPIO2_FUNC_AGC_NOISE_IRQ		= 14,

	AIC3X_GPIO2_FUNC_BUTTON_PRESS_IRQ	= 15

};



enum aic3x_micbias_voltage {

	AIC3X_MICBIAS_OFF = 0,

	AIC3X_MICBIAS_2_0V = 1,

	AIC3X_MICBIAS_2_5V = 2,

	AIC3X_MICBIAS_AVDDV = 3,

};



#endif /* _AIC3X_H */