Merge remote-tracking branches 'asoc/topic/max98373', 'asoc/topic/mtk',... (17124877) · Commits · 戴 / test

include/sound/soc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -841,7 +841,7 @@ struct snd_soc_component_driver {
	/* bits */		/* bits */
	unsigned int idle_bias_on:1;		unsigned int idle_bias_on:1;
	unsigned int suspend_bias_off:1;		unsigned int suspend_bias_off:1;
	unsigned int pmdown_time:1; /* care pmdown_time at stop */		unsigned int use_pmdown_time:1; /* care pmdown_time at stop */
	unsigned int endianness:1;		unsigned int endianness:1;
	unsigned int non_legacy_dai_naming:1;		unsigned int non_legacy_dai_naming:1;
	};		};

sound/soc/atmel/sam9g20_wm8731.c

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -110,16 +110,15 @@ static const struct snd_soc_dapm_route intercon[] = {
	static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)		static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)
	{		{
	struct snd_soc_dai *codec_dai = rtd->codec_dai;		struct snd_soc_dai *codec_dai = rtd->codec_dai;
			struct device *dev = rtd->dev;
	int ret;		int ret;

	printk(KERN_DEBUG		dev_dbg(dev, "%s called\n", __func__);
	"at91sam9g20ek_wm8731 "
	": at91sam9g20ek_wm8731_init() called\n");

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK,		ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK,
	MCLK_RATE, SND_SOC_CLOCK_IN);		MCLK_RATE, SND_SOC_CLOCK_IN);
	if (ret < 0) {		if (ret < 0) {
	printk(KERN_ERR "Failed to set WM8731 SYSCLK: %d\n", ret);		dev_err(dev, "Failed to set WM8731 SYSCLK: %d\n", ret);
	return ret;		return ret;
	}		}

	@@ -179,21 +178,21 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
	*/		*/
	mclk = clk_get(NULL, "pck0");		mclk = clk_get(NULL, "pck0");
	if (IS_ERR(mclk)) {		if (IS_ERR(mclk)) {
	printk(KERN_ERR "ASoC: Failed to get MCLK\n");		dev_err(&pdev->dev, "Failed to get MCLK\n");
	ret = PTR_ERR(mclk);		ret = PTR_ERR(mclk);
	goto err;		goto err;
	}		}

	pllb = clk_get(NULL, "pllb");		pllb = clk_get(NULL, "pllb");
	if (IS_ERR(pllb)) {		if (IS_ERR(pllb)) {
	printk(KERN_ERR "ASoC: Failed to get PLLB\n");		dev_err(&pdev->dev, "Failed to get PLLB\n");
	ret = PTR_ERR(pllb);		ret = PTR_ERR(pllb);
	goto err_mclk;		goto err_mclk;
	}		}
	ret = clk_set_parent(mclk, pllb);		ret = clk_set_parent(mclk, pllb);
	clk_put(pllb);		clk_put(pllb);
	if (ret != 0) {		if (ret != 0) {
	printk(KERN_ERR "ASoC: Failed to set MCLK parent\n");		dev_err(&pdev->dev, "Failed to set MCLK parent\n");
	goto err_mclk;		goto err_mclk;
	}		}

	@@ -236,7 +235,7 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)

	ret = snd_soc_register_card(card);		ret = snd_soc_register_card(card);
	if (ret) {		if (ret) {
	printk(KERN_ERR "ASoC: snd_soc_register_card() failed\n");		dev_err(&pdev->dev, "snd_soc_register_card() failed\n");
	}		}

	return ret;		return ret;

sound/soc/codecs/max98373.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	/* SPDX-License-Identifier: GPL-2.0 */		// SPDX-License-Identifier: GPL-2.0
	/* Copyright (c) 2017, Maxim Integrated */		// Copyright (c) 2017, Maxim Integrated

	#include <linux/acpi.h>		#include <linux/acpi.h>
	#include <linux/i2c.h>		#include <linux/i2c.h>

sound/soc/codecs/max98373.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	/* SPDX-License-Identifier: GPL-2.0 */		// SPDX-License-Identifier: GPL-2.0
	/* Copyright (c) 2017, Maxim Integrated */		// Copyright (c) 2017, Maxim Integrated

	#ifndef _MAX98373_H		#ifndef _MAX98373_H
	#define _MAX98373_H		#define _MAX98373_H

sound/soc/mediatek/mt2701/mt2701-afe-pcm.c

+18 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1405,9 +1405,24 @@ static int mt2701_afe_runtime_resume(struct device *dev)
	return mt2701_afe_enable_clock(afe);		return mt2701_afe_enable_clock(afe);
	}		}

	static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)		static int mt2701_afe_add_component(struct mtk_base_afe *afe)
	{		{
	struct snd_soc_component *component;		struct snd_soc_component *component;

			component = kzalloc(sizeof(*component), GFP_KERNEL);
			if (!component)
			return -ENOMEM;

			component->regmap = afe->regmap;

			return snd_soc_add_component(afe->dev, component,
			&mt2701_afe_pcm_dai_component,
			mt2701_afe_pcm_dais,
			ARRAY_SIZE(mt2701_afe_pcm_dais));
			}

			static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
			{
	struct mtk_base_afe *afe;		struct mtk_base_afe *afe;
	struct mt2701_afe_private *afe_priv;		struct mt2701_afe_private *afe_priv;
	struct device *dev;		struct device *dev;
	@@ -1477,12 +1492,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
	= &mt2701_i2s_data[i][I2S_IN];		= &mt2701_i2s_data[i][I2S_IN];
	}		}

	component = kzalloc(sizeof(*component), GFP_KERNEL);
	if (!component)
	return -ENOMEM;

	component->regmap = afe->regmap;

	afe->mtk_afe_hardware = &mt2701_afe_hardware;		afe->mtk_afe_hardware = &mt2701_afe_hardware;
	afe->memif_fs = mt2701_memif_fs;		afe->memif_fs = mt2701_memif_fs;
	afe->irq_fs = mt2701_irq_fs;		afe->irq_fs = mt2701_irq_fs;
	@@ -1495,7 +1504,7 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
	ret = mt2701_init_clock(afe);		ret = mt2701_init_clock(afe);
	if (ret) {		if (ret) {
	dev_err(dev, "init clock error\n");		dev_err(dev, "init clock error\n");
	goto err_init_clock;		return ret;
	}		}

	platform_set_drvdata(pdev, afe);		platform_set_drvdata(pdev, afe);
	@@ -1514,10 +1523,7 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
	goto err_platform;		goto err_platform;
	}		}

	ret = snd_soc_add_component(dev, component,		ret = mt2701_afe_add_component(afe);
	&mt2701_afe_pcm_dai_component,
	mt2701_afe_pcm_dais,
	ARRAY_SIZE(mt2701_afe_pcm_dais));
	if (ret) {		if (ret) {
	dev_warn(dev, "err_dai_component\n");		dev_warn(dev, "err_dai_component\n");
	goto err_dai_component;		goto err_dai_component;
	@@ -1531,8 +1537,6 @@ err_platform:
	pm_runtime_put_sync(dev);		pm_runtime_put_sync(dev);
	err_pm_disable:		err_pm_disable:
	pm_runtime_disable(dev);		pm_runtime_disable(dev);
	err_init_clock:
	kfree(component);

	return ret;		return ret;
	}		}

Admin message