Merge branch 'for-next' into for-linus (14b9e4ab) · Commits · git / linux-nf

Documentation/sound/kernel-api/writing-an-alsa-driver.rst

+4 −2

Original line number	Diff line number	Diff line
		@@ -3864,14 +3864,16 @@ corresponding destructor.

		And next, set suspend/resume callbacks to the pci_driver::

		static SIMPLE_DEV_PM_OPS(snd_my_pm_ops, mychip_suspend, mychip_resume);
		static DEFINE_SIMPLE_DEV_PM_OPS(snd_my_pm_ops, mychip_suspend, mychip_resume);

		static struct pci_driver driver = {
		.name = KBUILD_MODNAME,
		.id_table = snd_my_ids,
		.probe = snd_my_probe,
		.remove = snd_my_remove,
		.driver.pm = &snd_my_pm_ops,
		.driver = {
		.pm = &snd_my_pm_ops,
		},
		};

		Module Parameters

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -5014,6 +5014,7 @@ F: include/linux/mfd/cs42l43*
		F: include/sound/cs*
		F: sound/pci/hda/cirrus*
		F: sound/pci/hda/cs*
		F: sound/pci/hda/hda_component*
		F: sound/pci/hda/hda_cs_dsp_ctl.*
		F: sound/soc/codecs/cs*

		@@ -20485,6 +20486,12 @@ F: include/uapi/sound/compress_*
		F: sound/core/compress_offload.c
		F: sound/soc/soc-compress.c

		SOUND - CORE KUNIT TEST
		M: Ivan Orlov <ivan.orlov0322@gmail.com>
		L: linux-sound@vger.kernel.org
		S: Supported
		F: sound/core/sound_kunit.c

		SOUND - DMAENGINE HELPERS
		M: Lars-Peter Clausen <lars@metafoo.de>
		S: Supported

drivers/acpi/scan.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1725,7 +1725,9 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
		{"BSG1160", },
		{"BSG2150", },
		{"CSC3551", },
		{"CSC3554", },
		{"CSC3556", },
		{"CSC3557", },
		{"INT33FE", },
		{"INT3515", },
		/* Non-conforming _HID for Cirrus Logic already released */

drivers/platform/x86/serial-multi-instantiate.c

+28 −0

Original line number	Diff line number	Diff line
		@@ -329,6 +329,19 @@ static const struct smi_node cs35l41_hda = {
		.bus_type = SMI_AUTO_DETECT,
		};

		static const struct smi_node cs35l54_hda = {
		.instances = {
		{ "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
		{ "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
		{ "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
		{ "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
		/* a 5th entry is an alias address, not a real device */
		{ "cs35l54-hda_dummy_dev" },
		{}
		},
		.bus_type = SMI_AUTO_DETECT,
		};

		static const struct smi_node cs35l56_hda = {
		.instances = {
		{ "cs35l56-hda", IRQ_RESOURCE_AUTO, 0 },
		@@ -342,6 +355,19 @@ static const struct smi_node cs35l56_hda = {
		.bus_type = SMI_AUTO_DETECT,
		};

		static const struct smi_node cs35l57_hda = {
		.instances = {
		{ "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
		{ "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
		{ "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
		{ "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
		/* a 5th entry is an alias address, not a real device */
		{ "cs35l57-hda_dummy_dev" },
		{}
		},
		.bus_type = SMI_AUTO_DETECT,
		};

		/*
		* Note new device-ids must also be added to ignore_serial_bus_ids in
		* drivers/acpi/scan.c: acpi_device_enumeration_by_parent().
		@@ -350,7 +376,9 @@ static const struct acpi_device_id smi_acpi_ids[] = {
		{ "BSG1160", (unsigned long)&bsg1160_data },
		{ "BSG2150", (unsigned long)&bsg2150_data },
		{ "CSC3551", (unsigned long)&cs35l41_hda },
		{ "CSC3554", (unsigned long)&cs35l54_hda },
		{ "CSC3556", (unsigned long)&cs35l56_hda },
		{ "CSC3557", (unsigned long)&cs35l57_hda },
		{ "INT3515", (unsigned long)&int3515_data },
		/* Non-conforming _HID for Cirrus Logic already released */
		{ "CLSA0100", (unsigned long)&cs35l41_hda },

include/sound/ak4531_codec.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,9 @@ int snd_ak4531_mixer(struct snd_card card, struct snd_ak4531 _ak4531,
		#ifdef CONFIG_PM
		void snd_ak4531_suspend(struct snd_ak4531 *ak4531);
		void snd_ak4531_resume(struct snd_ak4531 *ak4531);
		#else
		static inline void snd_ak4531_suspend(struct snd_ak4531 *ak4531) {}
		static inline void snd_ak4531_resume(struct snd_ak4531 *ak4531) {}
		#endif

		#endif /* __SOUND_AK4531_CODEC_H */