Merge branch 'for-5.7' of... (2f8eae39) · Commits · 戴 / test

Documentation/devicetree/bindings/sound/nau8825.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,5 +101,5 @@ Example:
		nuvoton,crosstalk-enable;

		clock-names = "mclk";
		clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;
		clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_2>;
		};

+1 −2

Original line number	Diff line number	Diff line
		@@ -860,8 +860,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,

		wm8960->is_stream_in_use[tx] = true;

		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON &&
		!wm8960->is_stream_in_use[!tx])
		if (!wm8960->is_stream_in_use[!tx])
		return wm8960_configure_clocking(component);

		return 0;

+1 −2

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ static const struct reg_default wm8962_reg[] = {
		{ 5, 0x0018 }, /* R5 - ADC & DAC Control 1 */
		{ 6, 0x2008 }, /* R6 - ADC & DAC Control 2 */
		{ 7, 0x000A }, /* R7 - Audio Interface 0 */

		{ 8, 0x01E4 }, /* R8 - Clocking2 */
		{ 9, 0x0300 }, /* R9 - Audio Interface 1 */
		{ 10, 0x00C0 }, /* R10 - Left DAC volume */
		{ 11, 0x00C0 }, /* R11 - Right DAC volume */
		@@ -788,7 +788,6 @@ static bool wm8962_volatile_register(struct device *dev, unsigned int reg)
		{
		switch (reg) {
		case WM8962_CLOCKING1:
		case WM8962_CLOCKING2:
		case WM8962_SOFTWARE_RESET:
		case WM8962_THERMAL_SHUTDOWN_STATUS:
		case WM8962_ADDITIONAL_CONTROL_4:

+4 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,10 @@ static irqreturn_t esai_isr(int irq, void *devid)
		if ((saisr & (ESAI_SAISR_TUE \| ESAI_SAISR_ROE)) &&
		esai_priv->reset_at_xrun) {
		dev_dbg(&pdev->dev, "reset module for xrun\n");
		regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR,
		ESAI_xCR_xEIE_MASK, 0);
		regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR,
		ESAI_xCR_xEIE_MASK, 0);
		tasklet_schedule(&esai_priv->task);
		}

+1 −6

Original line number	Diff line number	Diff line
		@@ -205,13 +205,11 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
		if (ret) {
		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
		ret);
		goto err_fini_utils;
		goto err_put_cpu_of_node;
		}

		return 0;

		err_fini_utils:
		tegra_asoc_utils_fini(&alc5632->util_data);
		err_put_cpu_of_node:
		of_node_put(tegra_alc5632_dai.cpus->of_node);
		tegra_alc5632_dai.cpus->of_node = NULL;
		@@ -226,12 +224,9 @@ err:
		static int tegra_alc5632_remove(struct platform_device *pdev)
		{
		struct snd_soc_card *card = platform_get_drvdata(pdev);
		struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);

		snd_soc_unregister_card(card);

		tegra_asoc_utils_fini(&machine->util_data);

		of_node_put(tegra_alc5632_dai.cpus->of_node);
		tegra_alc5632_dai.cpus->of_node = NULL;
		tegra_alc5632_dai.platforms->of_node = NULL;