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

Commit 4da5cc2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

parents 25c862cc c6f43290

CREDITS

+1 −0
Original line number Original line Diff line number Diff line
@@ -1883,6 +1883,7 @@ N: Jaya Kumar 
E: jayalk@intworks.biz

E: jayalk@intworks.biz

W: http://www.intworks.biz

W: http://www.intworks.biz

D: Arc monochrome LCD framebuffer driver, x86 reboot fixups

D: Arc monochrome LCD framebuffer driver, x86 reboot fixups

D: pirq addr, CS5535 alsa audio driver

S: Gurgaon, India

S: Gurgaon, India

S: Kuala Lumpur, Malaysia

S: Kuala Lumpur, Malaysia

Documentation/sound/alsa/ALSA-Configuration.txt

+130 −64

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+347 −245

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/sound/alsa/Procfile.txt

+16 −0
Original line number Original line Diff line number Diff line
@@ -138,6 +138,22 @@ card*/codec97#0/ac97#?-?+regs 
	# echo 02 9f1f > /proc/asound/card0/codec97#0/ac97#0-0+regs

	# echo 02 9f1f > /proc/asound/card0/codec97#0/ac97#0-0+regs









USB Audio Streams

-----------------



card*/stream*

	Shows the assignment and the current status of each audio stream

	of the given card.  This information is very useful for debugging.





HD-Audio Codecs

---------------



card*/codec#*

	Shows the general codec information and the attribute of each

	widget node.





Sequencer Information

Sequencer Information

---------------------

---------------------

Documentation/sound/alsa/hda_codec.txt

+7 −7
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ The bus instance is created via snd_hda_bus_new(). You need to pass 
the card instance, the template, and the pointer to store the

the card instance, the template, and the pointer to store the

resultant bus instance.

resultant bus instance.





int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp,

int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,

		    struct hda_bus **busp);

		    struct hda_bus **busp);





It returns zero if successful.  A negative return value means any

It returns zero if successful.  A negative return value means any
@@ -166,14 +166,14 @@ The ops field contains the following callback functions: 




struct hda_pcm_ops {

struct hda_pcm_ops {

	int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,

	int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,

		    snd_pcm_substream_t *substream);

		    struct snd_pcm_substream *substream);

	int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,

	int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,

		     snd_pcm_substream_t *substream);

		     struct snd_pcm_substream *substream);

	int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,

	int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,

		       unsigned int stream_tag, unsigned int format,

		       unsigned int stream_tag, unsigned int format,

		       snd_pcm_substream_t *substream);

		       struct snd_pcm_substream *substream);

	int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,

	int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,

		       snd_pcm_substream_t *substream);

		       struct snd_pcm_substream *substream);

};

};





All are non-NULL, so you can call them safely without NULL check.

All are non-NULL, so you can call them safely without NULL check.
@@ -284,7 +284,7 @@ parameter, and PCI subsystem IDs. If the matching entry is found, it 
returns the config field value.

returns the config field value.





snd_hda_add_new_ctls() can be used to create and add control entries.

snd_hda_add_new_ctls() can be used to create and add control entries.

Pass the zero-terminated array of snd_kcontrol_new_t.  The same array

Pass the zero-terminated array of struct snd_kcontrol_new.  The same array

can be passed to snd_hda_resume_ctls() for resume.

can be passed to snd_hda_resume_ctls() for resume.

Note that this will call control->put callback of these entries.  So,

Note that this will call control->put callback of these entries.  So,

put callback should check codec->in_resume and force to restore the

put callback should check codec->in_resume and force to restore the
@@ -292,7 +292,7 @@ given value if it's non-zero even if the value is identical with the 
cached value.

cached value.





Macros HDA_CODEC_VOLUME(), HDA_CODEC_MUTE() and their variables can be

Macros HDA_CODEC_VOLUME(), HDA_CODEC_MUTE() and their variables can be

used for the entry of snd_kcontrol_new_t.

used for the entry of struct snd_kcontrol_new.





The input MUX helper callbacks for such a control are provided, too:

The input MUX helper callbacks for such a control are provided, too:

snd_hda_input_mux_info() and snd_hda_input_mux_put().  See

snd_hda_input_mux_info() and snd_hda_input_mux_put().  See