Commit c09e28cd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge of 5.11 devel branch for more works on USB-audio.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 915183b6 532a208a

Documentation/sound/alsa-configuration.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -1501,7 +1501,7 @@ Module for Digigram miXart8 sound cards. 




This module supports multiple cards.

This module supports multiple cards.

Note: One miXart8 board will be represented as 4 alsa cards.

Note: One miXart8 board will be represented as 4 alsa cards.

See MIXART.txt for details.

See Documentation/sound/cards/mixart.rst for details.





When the driver is compiled as a module and the hotplug firmware

When the driver is compiled as a module and the hotplug firmware

is supported, the firmware data is loaded via hotplug automatically.

is supported, the firmware data is loaded via hotplug automatically.

drivers/clk/tegra/clk-tegra30.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1256,6 +1256,8 @@ static struct tegra_clk_init_table init_table[] __initdata = { 
	{ TEGRA30_CLK_I2S3_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },

	{ TEGRA30_CLK_I2S3_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },

	{ TEGRA30_CLK_I2S4_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },

	{ TEGRA30_CLK_I2S4_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },

	{ TEGRA30_CLK_VIMCLK_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },

	{ TEGRA30_CLK_VIMCLK_SYNC, TEGRA30_CLK_CLK_MAX, 24000000, 0 },

	{ TEGRA30_CLK_HDA, TEGRA30_CLK_PLL_P, 102000000, 0 },

	{ TEGRA30_CLK_HDA2CODEC_2X, TEGRA30_CLK_PLL_P, 48000000, 0 },

	/* must be the last entry */

	/* must be the last entry */

	{ TEGRA30_CLK_CLK_MAX, TEGRA30_CLK_CLK_MAX, 0, 0 },

	{ TEGRA30_CLK_CLK_MAX, TEGRA30_CLK_CLK_MAX, 0, 0 },

};

};

sound/core/seq/oss/seq_oss_synth.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -611,7 +611,8 @@ snd_seq_oss_synth_make_info(struct seq_oss_devinfo *dp, int dev, struct synth_in 




	if (info->is_midi) {

	if (info->is_midi) {

		struct midi_info minf;

		struct midi_info minf;

		snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf);

		if (snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf))

			return -ENXIO;

		inf->synth_type = SYNTH_TYPE_MIDI;

		inf->synth_type = SYNTH_TYPE_MIDI;

		inf->synth_subtype = 0;

		inf->synth_subtype = 0;

		inf->nr_voices = 16;

		inf->nr_voices = 16;

sound/firewire/fireface/ff-transaction.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ static void transmit_midi_msg(struct snd_ff *ff, unsigned int port) 




	/* Set interval to next transaction. */

	/* Set interval to next transaction. */

	ff->next_ktime[port] = ktime_add_ns(ktime_get(),

	ff->next_ktime[port] = ktime_add_ns(ktime_get(),

				ff->rx_bytes[port] * 8 * NSEC_PER_SEC / 31250);

			ff->rx_bytes[port] * 8 * (NSEC_PER_SEC / 31250));





	if (quad_count == 1)

	if (quad_count == 1)

		tcode = TCODE_WRITE_QUADLET_REQUEST;

		tcode = TCODE_WRITE_QUADLET_REQUEST;

sound/firewire/tascam/tascam-transaction.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ static void midi_port_work(struct work_struct *work) 




	/* Set interval to next transaction. */

	/* Set interval to next transaction. */

	port->next_ktime = ktime_add_ns(ktime_get(),

	port->next_ktime = ktime_add_ns(ktime_get(),

				port->consume_bytes * 8 * NSEC_PER_SEC / 31250);

			port->consume_bytes * 8 * (NSEC_PER_SEC / 31250));





	/* Start this transaction. */

	/* Start this transaction. */

	port->idling = false;

	port->idling = false;