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

Commit 6de15b2a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into for-linus

parents 775b2449 8a390576

sound/pci/hda/Makefile

+1 −1
Original line number Diff line number Diff line 
snd-hda-intel-objs := hda_intel.o



snd-hda-codec-y := hda_codec.o hda_jack.o

snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o

snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o

snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o

snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

sound/pci/hda/hda_auto_parser.c

0 → 100644
+760 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/hda_auto_parser.h

0 → 100644
+160 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/hda_codec.c

+282 −745

File changed.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/hda_codec.h

+8 −7
Original line number Diff line number Diff line
@@ -704,8 +704,6 @@ struct hda_codec_ops { 
				unsigned int power_state);

#ifdef CONFIG_PM

	int (*suspend)(struct hda_codec *codec, pm_message_t state);

	int (*post_suspend)(struct hda_codec *codec);

	int (*pre_resume)(struct hda_codec *codec);

	int (*resume)(struct hda_codec *codec);

#endif

#ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -829,6 +827,7 @@ struct hda_codec { 


	struct mutex spdif_mutex;

	struct mutex control_mutex;

	struct mutex hash_mutex;

	struct snd_array spdif_out;

	unsigned int spdif_in_enable;	/* SPDIF input enable? */

	const hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */
@@ -861,12 +860,13 @@ struct hda_codec { 
	unsigned int no_jack_detect:1;	/* Machine has no jack-detection */

#ifdef CONFIG_SND_HDA_POWER_SAVE

	unsigned int power_on :1;	/* current (global) power-state */

	unsigned int power_transition :1; /* power-state in transition */

	int power_transition;	/* power-state in transition */

	int power_count;	/* current (global) power refcount */

	struct delayed_work power_work; /* delayed task for powerdown */

	unsigned long power_on_acct;

	unsigned long power_off_acct;

	unsigned long power_jiffies;

	spinlock_t power_lock;

#endif



	/* codec-specific additional proc output */
@@ -911,10 +911,13 @@ int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid, 
			  hda_nid_t *start_id);

int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,

			    hda_nid_t *conn_list, int max_conns);

static inline int

snd_hda_get_num_conns(struct hda_codec *codec, hda_nid_t nid)

{

	return snd_hda_get_connections(codec, nid, NULL, 0);

}

int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid,

			    hda_nid_t *conn_list, int max_conns);

int snd_hda_get_conn_list(struct hda_codec *codec, hda_nid_t nid,

			  const hda_nid_t **listp);

int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums,

			  const hda_nid_t *list);

int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
@@ -1051,12 +1054,10 @@ const char *snd_hda_get_jack_location(u32 cfg); 
#ifdef CONFIG_SND_HDA_POWER_SAVE

void snd_hda_power_up(struct hda_codec *codec);

void snd_hda_power_down(struct hda_codec *codec);

#define snd_hda_codec_needs_resume(codec) codec->power_count

void snd_hda_update_power_acct(struct hda_codec *codec);

#else

static inline void snd_hda_power_up(struct hda_codec *codec) {}

static inline void snd_hda_power_down(struct hda_codec *codec) {}

#define snd_hda_codec_needs_resume(codec) 1

#endif



#ifdef CONFIG_SND_HDA_PATCH_LOADER