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

Unverified Commit 7fa89d61 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/twl4030', 'asoc/topic/twl6040',... 

Merge remote-tracking branches 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/uda134x', 'asoc/topic/uda1380' and 'asoc/topic/uniphier' into asoc-next
parents ec67b19f c68e7f5b 83eca9f5 2ab7fb08 b40822d9 7c3c20f2

Documentation/devicetree/bindings/sound/uniphier,aio.txt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
Socionext UniPhier SoC audio driver



The Socionext UniPhier audio subsystem consists of I2S and S/PDIF blocks in

the same register space.



Required properties:

- compatible      : should be one of the following:

		    "socionext,uniphier-ld11-aio"

		    "socionext,uniphier-ld20-aio"

		    "socionext,uniphier-pxs2-aio"

- reg             : offset and length of the register set for the device.

- interrupts      : should contain I2S or S/PDIF interrupt.

- pinctrl-names   : should be "default".

- pinctrl-0       : defined I2S signal pins for an external codec chip.

- clock-names     : should include following entries:

                    "aio"

- clocks          : a list of phandle, should contain an entry for each

                    entry in clock-names.

- reset-names     : should include following entries:

                    "aio"

- resets          : a list of phandle, should contain an entry for each

                    entry in reset-names.

- #sound-dai-cells: should be 1.



Optional properties:

- socionext,syscon: a phandle, should contain soc-glue.

                    The soc-glue is used for changing mode of S/PDIF signal pin

                    to Output from Hi-Z. This property is optional if you use

                    I2S signal pins only.



Example:

	audio {

		compatible = "socionext,uniphier-ld20-aio";

		reg = <0x56000000 0x80000>;

		interrupts = <0 144 4>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_aout>;

		clock-names = "aio";

		clocks = <&sys_clk 40>;

		reset-names = "aio";

		resets = <&sys_rst 40>;

		#sound-dai-cells = <1>;



		socionext,syscon = <&sg>;

	};

sound/soc/codecs/twl4030.c

+187 −196

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/twl6040.c

+130 −139

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/twl6040.h

+5 −5
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ enum twl6040_trim { 
#define TWL6040_HSF_TRIM_LEFT(x)	(x & 0x0f)

#define TWL6040_HSF_TRIM_RIGHT(x)	((x >> 4) & 0x0f)



int twl6040_get_dl1_gain(struct snd_soc_codec *codec);

void twl6040_hs_jack_detect(struct snd_soc_codec *codec,

int twl6040_get_dl1_gain(struct snd_soc_component *component);

void twl6040_hs_jack_detect(struct snd_soc_component *component,

			    struct snd_soc_jack *jack, int report);

int twl6040_get_clk_id(struct snd_soc_codec *codec);

int twl6040_get_trim_value(struct snd_soc_codec *codec, enum twl6040_trim trim);

int twl6040_get_hs_step_size(struct snd_soc_codec *codec);

int twl6040_get_clk_id(struct snd_soc_component *component);

int twl6040_get_trim_value(struct snd_soc_component *component, enum twl6040_trim trim);

int twl6040_get_hs_step_size(struct snd_soc_component *component);



#endif /* End of __TWL6040_H__ */

sound/soc/codecs/uda134x.c

+36 −42
Original line number Diff line number Diff line
@@ -110,9 +110,9 @@ static int uda134x_regmap_write(void *context, unsigned int reg, 
	return 0;

}



static inline void uda134x_reset(struct snd_soc_codec *codec)

static inline void uda134x_reset(struct snd_soc_component *component)

{

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);

	unsigned int mask = 1<<6;



	regmap_update_bits(uda134x->regmap, UDA134X_STATUS0, mask, mask);
@@ -122,7 +122,7 @@ static inline void uda134x_reset(struct snd_soc_codec *codec) 


static int uda134x_mute(struct snd_soc_dai *dai, int mute)

{

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(dai->codec);

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(dai->component);

	unsigned int mask = 1<<2;

	unsigned int val;
@@ -139,8 +139,8 @@ static int uda134x_mute(struct snd_soc_dai *dai, int mute) 
static int uda134x_startup(struct snd_pcm_substream *substream,

	struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *master_runtime;



	if (uda134x->master_substream) {
@@ -168,8 +168,8 @@ static int uda134x_startup(struct snd_pcm_substream *substream, 
static void uda134x_shutdown(struct snd_pcm_substream *substream,

	struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);



	if (uda134x->master_substream == substream)

		uda134x->master_substream = uda134x->slave_substream;
@@ -181,8 +181,8 @@ static int uda134x_hw_params(struct snd_pcm_substream *substream, 
	struct snd_pcm_hw_params *params,

	struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = dai->component;

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);

	unsigned int hw_params = 0;



	if (substream == uda134x->slave_substream) {
@@ -248,8 +248,8 @@ static int uda134x_hw_params(struct snd_pcm_substream *substream, 
static int uda134x_set_dai_sysclk(struct snd_soc_dai *codec_dai,

				  int clk_id, unsigned int freq, int dir)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);



	pr_debug("%s clk_id: %d, freq: %u, dir: %d\n", __func__,

		 clk_id, freq, dir);
@@ -270,8 +270,8 @@ static int uda134x_set_dai_sysclk(struct snd_soc_dai *codec_dai, 
static int uda134x_set_dai_fmt(struct snd_soc_dai *codec_dai,

			       unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_component *component = codec_dai->component;

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);



	pr_debug("%s fmt: %08X\n", __func__, fmt);
@@ -294,10 +294,10 @@ static int uda134x_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	return 0;

}



static int uda134x_set_bias_level(struct snd_soc_codec *codec,

static int uda134x_set_bias_level(struct snd_soc_component *component,

				  enum snd_soc_bias_level level)

{

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);

	struct uda134x_platform_data *pd = uda134x->pd;

	pr_debug("%s bias level %d\n", __func__, level);
@@ -446,10 +446,10 @@ static struct snd_soc_dai_driver uda134x_dai = { 
	.ops = &uda134x_dai_ops,

};



static int uda134x_soc_probe(struct snd_soc_codec *codec)

static int uda134x_soc_probe(struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct uda134x_priv *uda134x = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct uda134x_priv *uda134x = snd_soc_component_get_drvdata(component);

	struct uda134x_platform_data *pd = uda134x->pd;

	const struct snd_soc_dapm_widget *widgets;

	unsigned num_widgets;
@@ -473,7 +473,7 @@ static int uda134x_soc_probe(struct snd_soc_codec *codec) 
	if (pd->power)

		pd->power(1);



	uda134x_reset(codec);

	uda134x_reset(component);



	if (pd->model == UDA134X_UDA1341) {

		widgets = uda1341_dapm_widgets;
@@ -493,15 +493,15 @@ static int uda134x_soc_probe(struct snd_soc_codec *codec) 
	switch (pd->model) {

	case UDA134X_UDA1340:

	case UDA134X_UDA1344:

		ret = snd_soc_add_codec_controls(codec, uda1340_snd_controls,

		ret = snd_soc_add_component_controls(component, uda1340_snd_controls,

					ARRAY_SIZE(uda1340_snd_controls));

	break;

	case UDA134X_UDA1341:

		ret = snd_soc_add_codec_controls(codec, uda1341_snd_controls,

		ret = snd_soc_add_component_controls(component, uda1341_snd_controls,

					ARRAY_SIZE(uda1341_snd_controls));

	break;

	case UDA134X_UDA1345:

		ret = snd_soc_add_codec_controls(codec, uda1345_snd_controls,

		ret = snd_soc_add_component_controls(component, uda1345_snd_controls,

					ARRAY_SIZE(uda1345_snd_controls));

	break;

	default:
@@ -518,17 +518,18 @@ static int uda134x_soc_probe(struct snd_soc_codec *codec) 
	return 0;

}



static const struct snd_soc_codec_driver soc_codec_dev_uda134x = {

static const struct snd_soc_component_driver soc_component_dev_uda134x = {

	.probe			= uda134x_soc_probe,

	.set_bias_level		= uda134x_set_bias_level,

	.suspend_bias_off = true,



	.component_driver = {

	.dapm_widgets		= uda134x_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(uda134x_dapm_widgets),

	.dapm_routes		= uda134x_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(uda134x_dapm_routes),

	},

	.suspend_bias_off	= 1,

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static const struct regmap_config uda134x_regmap_config = {
@@ -571,14 +572,8 @@ static int uda134x_codec_probe(struct platform_device *pdev) 
	if (IS_ERR(uda134x->regmap))

		return PTR_ERR(uda134x->regmap);



	return snd_soc_register_codec(&pdev->dev,

			&soc_codec_dev_uda134x, &uda134x_dai, 1);

}



static int uda134x_codec_remove(struct platform_device *pdev)

{

	snd_soc_unregister_codec(&pdev->dev);

	return 0;

	return devm_snd_soc_register_component(&pdev->dev,

			&soc_component_dev_uda134x, &uda134x_dai, 1);

}



static struct platform_driver uda134x_codec_driver = {
@@ -586,7 +581,6 @@ static struct platform_driver uda134x_codec_driver = { 
		.name = "uda134x-codec",

	},

	.probe = uda134x_codec_probe,

	.remove = uda134x_codec_remove,

};



module_platform_driver(uda134x_codec_driver);