Unverified Commit 81113108 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes 

For the benefit of CI
parents 59146c3c e6475ce2

sound/soc/codecs/max98363.c

+5 −4
Original line number Diff line number Diff line
@@ -174,10 +174,10 @@ static int max98363_io_init(struct sdw_slave *slave) 
	pm_runtime_get_noresume(dev);



	ret = regmap_read(max98363->regmap, MAX98363_R21FF_REV_ID, &reg);

	if (!ret) {

	if (!ret)

		dev_info(dev, "Revision ID: %X\n", reg);

		return ret;

	}

	else

		goto out;



	if (max98363->first_hw_init) {

		regcache_cache_bypass(max98363->regmap, false);
@@ -187,10 +187,11 @@ static int max98363_io_init(struct sdw_slave *slave) 
	max98363->first_hw_init = true;

	max98363->hw_init = true;



out:

	pm_runtime_mark_last_busy(dev);

	pm_runtime_put_autosuspend(dev);



	return 0;

	return ret;

}



#define MAX98363_RATES SNDRV_PCM_RATE_8000_192000

sound/soc/codecs/rt5665.c

+2 −0
Original line number Diff line number Diff line
@@ -4472,6 +4472,8 @@ static void rt5665_remove(struct snd_soc_component *component) 
	struct rt5665_priv *rt5665 = snd_soc_component_get_drvdata(component);



	regmap_write(rt5665->regmap, RT5665_RESET, 0);



	regulator_bulk_disable(ARRAY_SIZE(rt5665->supplies), rt5665->supplies);

}



#ifdef CONFIG_PM

sound/soc/fsl/fsl_micfil.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

// Copyright 2018 NXP



#include <linux/bitfield.h>
@@ -1318,4 +1318,4 @@ module_platform_driver(fsl_micfil_driver); 


MODULE_AUTHOR("Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>");

MODULE_DESCRIPTION("NXP PDM Microphone Interface (MICFIL) driver");

MODULE_LICENSE("GPL v2");
 
MODULE_LICENSE("Dual BSD/GPL");

sound/soc/fsl/fsl_micfil.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * PDM Microphone Interface for the NXP i.MX SoC

 * Copyright 2018 NXP

sound/soc/intel/boards/sof_sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Lunar Lake Client Platform"),

		},

		.driver_data = (void *)(RT711_JD2_100K),

		.driver_data = (void *)(RT711_JD2),

	},

	{}

};