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

Merge branch 'for-linus' into for-next 



Back-merge the development process for catching up the HD-audio fix
(and apply a new one on top of that).

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 0a671dc5 1a7f60b9

include/sound/hda_register.h

+3 −0
Original line number Diff line number Diff line
@@ -264,6 +264,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 
#define AZX_REG_ML_LOUTPAY		0x20

#define AZX_REG_ML_LINPAY		0x30



/* bit0 is reserved, with BIT(1) mapping to stream1 */

#define ML_LOSIDV_STREAM_MASK		0xFFFE



#define ML_LCTL_SCF_MASK			0xF

#define AZX_MLCTL_SPA				(0x1 << 16)

#define AZX_MLCTL_CPA				(0x1 << 23)

include/sound/simple_card_utils.h

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, 
			       struct link_info *li);



#ifdef DEBUG

inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,

static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,

					 char *name,

					 struct asoc_simple_dai *dai)

{
@@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, 
		dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));

}



inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)

static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)

{

	struct snd_soc_card *card = simple_priv_to_card(priv);

	struct device *dev = simple_priv_to_dev(priv);

sound/firewire/bebob/bebob_stream.c

+1 −2
Original line number Diff line number Diff line
@@ -252,8 +252,7 @@ int snd_bebob_stream_get_clock_src(struct snd_bebob *bebob, 
	return err;

}



static unsigned int

map_data_channels(struct snd_bebob *bebob, struct amdtp_stream *s)

static int map_data_channels(struct snd_bebob *bebob, struct amdtp_stream *s)

{

	unsigned int sec, sections, ch, channels;

	unsigned int pcm, midi, location;

sound/hda/ext/hdac_ext_controller.c

+5 −0
Original line number Diff line number Diff line
@@ -270,6 +270,11 @@ int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, 


		ret = snd_hdac_ext_bus_link_power_up(link);



		/*

		 * clear the register to invalidate all the output streams

		 */

		snd_hdac_updatew(link->ml_addr, AZX_REG_ML_LOSIDV,

				 ML_LOSIDV_STREAM_MASK, 0);

		/*

		 *  wait for 521usec for codec to report status

		 *  HDA spec section 4.3 - Codec Discovery

sound/hda/hdac_controller.c

+0 −2
Original line number Diff line number Diff line
@@ -447,8 +447,6 @@ static void azx_int_disable(struct hdac_bus *bus) 
	list_for_each_entry(azx_dev, &bus->stream_list, list)

		snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_INT_MASK, 0);



	synchronize_irq(bus->irq);



	/* disable SIE for all streams */

	snd_hdac_chip_writeb(bus, INTCTL, 0);