Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a9a72e0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge 4.19-devel branch into 4.20 for applying FireWire patches
cleanly.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 2e75b676 709ae62e

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -13432,9 +13432,8 @@ F: drivers/i2c/busses/i2c-synquacer.c 
F:	Documentation/devicetree/bindings/i2c/i2c-synquacer.txt



SOCIONEXT UNIPHIER SOUND DRIVER

M:	Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

S:	Orphan

F:	sound/soc/uniphier/



SOEKRIS NET48XX LED SUPPORT

drivers/gpu/vga/vga_switcheroo.c

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ static void vga_switcheroo_enable(void) 
			return;



		client->id = ret | ID_BIT_AUDIO;

		if (client->ops->gpu_bound)

			client->ops->gpu_bound(client->pdev, ret);

	}



	vga_switcheroo_debugfs_init(&vgasr_priv);

include/linux/vga_switcheroo.h

+3 −0
Original line number Diff line number Diff line
@@ -133,15 +133,18 @@ struct vga_switcheroo_handler { 
 * @can_switch: check if the device is in a position to switch now.

 * 	Mandatory. The client should return false if a user space process

 * 	has one of its device files open

 * @gpu_bound: notify the client id to audio client when the GPU is bound.

 *

 * Client callbacks. A client can be either a GPU or an audio device on a GPU.

 * The @set_gpu_state and @can_switch methods are mandatory, @reprobe may be

 * set to NULL. For audio clients, the @reprobe member is bogus.

 * OTOH, @gpu_bound is only for audio clients, and not used for GPU clients.

 */

struct vga_switcheroo_client_ops {

	void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state);

	void (*reprobe)(struct pci_dev *dev);

	bool (*can_switch)(struct pci_dev *dev);

	void (*gpu_bound)(struct pci_dev *dev, enum vga_switcheroo_client_id);

};



#if defined(CONFIG_VGA_SWITCHEROO)

include/sound/hdaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus); 
void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus);

void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus);

void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus);

int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset);



void snd_hdac_bus_update_rirb(struct hdac_bus *bus);

int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);

void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);

int snd_soc_dapm_new_pcm(struct snd_soc_card *card,

			 struct snd_soc_pcm_runtime *rtd,

			 const struct snd_soc_pcm_stream *params,

			 unsigned int num_params,

			 struct snd_soc_dapm_widget *source,